From ab05da3a9ddaab788d5d459231eba45444402698 Mon Sep 17 00:00:00 2001 From: VASHKENT Date: Fri, 17 Apr 2026 17:24:47 +0300 Subject: [PATCH 01/10] SubFloor-and-scp173 --- Content.Server/_Scp/Scp173/Scp173System.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Content.Server/_Scp/Scp173/Scp173System.cs b/Content.Server/_Scp/Scp173/Scp173System.cs index 9576354cbf..b017043983 100644 --- a/Content.Server/_Scp/Scp173/Scp173System.cs +++ b/Content.Server/_Scp/Scp173/Scp173System.cs @@ -26,6 +26,7 @@ using Content.Shared.Physics; using Content.Shared.Popups; using Content.Shared.Storage.Components; +using Content.Shared.SubFloor; using Robust.Server.Audio; using Robust.Server.GameObjects; using Robust.Shared.Audio; @@ -131,6 +132,11 @@ private void OnStructureDamage(Entity uid, ref Scp173DamageStru foreach (var ent in lookup) { + // Проверяем, скрыта ли труба под плиткой + var isUnderCover = TryComp(ent, out var subFloor) && subFloor.IsUnderCover; + if (isUnderCover) + continue; // Не ломаем то, что под полом + // Наносим случайным вещам структурный дамаг var dspec = new DamageSpecifier(); var damageValue = _random.Next(20, 80); From 6b48ec747f3d672275ea70db2cdc49d4eef0878b Mon Sep 17 00:00:00 2001 From: VASHKENT Date: Fri, 17 Apr 2026 20:24:09 +0300 Subject: [PATCH 02/10] changes-082 --- .../Entities/Mobs/Player/Scp/Main/scp082.yml | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp082.yml b/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp082.yml index 739084af9f..52a388a116 100644 --- a/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp082.yml +++ b/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp082.yml @@ -34,6 +34,8 @@ templateId: scp082 - type: FieldOfView angle: 240 + - type: Hunger + - type: Thirst - type: Sprite noRot: true drawdepth: Mobs @@ -51,10 +53,11 @@ enum.StoreUiKey.Key: type: StoreBoundUserInterface - type: MovementSpeedModifier - baseWalkSpeed: 1.5 - baseSprintSpeed: 2.5 + baseWalkSpeed: 1.5 # TO DO: добиться изменения его скорости до указанных значений, на данный момент при спавне ему задается значение 2.5 и меняется из-за Fixtures + baseSprintSpeed: 2.5 # TO DO: добиться изменения его скорости до указанных значений, на данный момент при спавне ему задается значение 4.5 и меняется из-за Fixtures - type: ScpRestriction canPull: true + canCarry: true - type: Pullable - type: Puller needsHands: true @@ -70,6 +73,9 @@ - DoorBumpOpener - type: MeleeWeapon hidden: true + altDisarm: false + animation: WeaponArcPunch + wideAnimation: WeaponArcPunch soundHit: collection: Punch damage: @@ -77,6 +83,9 @@ Blunt: 40 attackRate: 1.25 range: 2 + - type: MeleeThrowOnHit + speed: 2 + distance: 0.25 - type: TTS voice: Dota2Pudge - type: GuideHelp @@ -93,3 +102,20 @@ path: /Audio/_Scp/Scp096/prydoor.ogg params: volume: -4 + - type: Bloodstream + bloodRefreshAmount: 5 + bloodReferenceSolution: + reagents: + - ReagentId: Blood + Quantity: 1500 + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.25,-0.4,0.25,0.4" + density: 500 + mask: + - MobMask + layer: + - MobLayer From 9e808d53036709ee9ee84717d09917ccc4d71e12 Mon Sep 17 00:00:00 2001 From: VASHKENT Date: Fri, 17 Apr 2026 20:37:48 +0300 Subject: [PATCH 03/10] bottles-and-049 --- Resources/Prototypes/_Scp/Entities/Clothing/Bags/scp049.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_Scp/Entities/Clothing/Bags/scp049.yml b/Resources/Prototypes/_Scp/Entities/Clothing/Bags/scp049.yml index 9bf002754c..82acf67e80 100644 --- a/Resources/Prototypes/_Scp/Entities/Clothing/Bags/scp049.yml +++ b/Resources/Prototypes/_Scp/Entities/Clothing/Bags/scp049.yml @@ -26,6 +26,7 @@ - SunriseUplink # рыбаплинк - PillCanister - Pen + - Bottle - type: StorageFill contents: - id: BookScp049Diary From 74a9aefa92e0dd3c12ea5e0c1f57ae7b54fa4126 Mon Sep 17 00:00:00 2001 From: VASHKENT Date: Fri, 17 Apr 2026 23:15:31 +0300 Subject: [PATCH 04/10] fix-lookup --- Content.Server/_Scp/Scp173/Scp173System.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Content.Server/_Scp/Scp173/Scp173System.cs b/Content.Server/_Scp/Scp173/Scp173System.cs index b017043983..ed121b403e 100644 --- a/Content.Server/_Scp/Scp173/Scp173System.cs +++ b/Content.Server/_Scp/Scp173/Scp173System.cs @@ -63,6 +63,8 @@ public sealed partial class Scp173System : SharedScp173System private TimeSpan _nextReagentCheck; + private EntityQuery _subFloorQuery; + public override void Initialize() { base.Initialize(); @@ -70,6 +72,7 @@ public override void Initialize() SubscribeLocalEvent(OnStructureDamage); SubscribeLocalEvent(OnClog); SubscribeLocalEvent(OnFastMovement); + _subFloorQuery = GetEntityQuery(); } public override void Update(float frameTime) @@ -133,8 +136,7 @@ private void OnStructureDamage(Entity uid, ref Scp173DamageStru foreach (var ent in lookup) { // Проверяем, скрыта ли труба под плиткой - var isUnderCover = TryComp(ent, out var subFloor) && subFloor.IsUnderCover; - if (isUnderCover) + if (_subFloorQuery.TryComp(ent, out var subFloor) && subFloor.IsUnderCover && subFloor.BlockInteractions) continue; // Не ломаем то, что под полом // Наносим случайным вещам структурный дамаг From 5be02883f6c848ff3c0b53e25e267a7220e643be Mon Sep 17 00:00:00 2001 From: VASHKENT Date: Sat, 18 Apr 2026 11:28:58 +0300 Subject: [PATCH 05/10] remove-carry --- .../Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp082.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp082.yml b/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp082.yml index 52a388a116..ff1f5e3406 100644 --- a/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp082.yml +++ b/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp082.yml @@ -57,7 +57,6 @@ baseSprintSpeed: 2.5 # TO DO: добиться изменения его скорости до указанных значений, на данный момент при спавне ему задается значение 4.5 и меняется из-за Fixtures - type: ScpRestriction canPull: true - canCarry: true - type: Pullable - type: Puller needsHands: true @@ -74,8 +73,8 @@ - type: MeleeWeapon hidden: true altDisarm: false - animation: WeaponArcPunch - wideAnimation: WeaponArcPunch + animation: WeaponArcSmash + wideAnimation: WeaponArcSmash soundHit: collection: Punch damage: From 96aa2f425b831cf7f825f0d8297aa5968538676b Mon Sep 17 00:00:00 2001 From: VASHKENT Date: Sat, 18 Apr 2026 11:51:24 +0300 Subject: [PATCH 06/10] fix-movementspeed-049-082 --- .../Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp049.yml | 1 - .../Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp082.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp049.yml b/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp049.yml index edc83ec96e..60b55a44f2 100644 --- a/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp049.yml +++ b/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp049.yml @@ -47,7 +47,6 @@ - type: Hands - type: Body prototype: Human - requiredLegs: 2 - type: ComplexInteraction - type: Buckle - type: Stripping diff --git a/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp082.yml b/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp082.yml index ff1f5e3406..67d80ae341 100644 --- a/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp082.yml +++ b/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp082.yml @@ -29,7 +29,6 @@ 10000: Dead - type: Body prototype: Human - requiredLegs: 2 - type: Inventory templateId: scp082 - type: FieldOfView From ed502d185575fdd518c4fba362f3d88852715feb Mon Sep 17 00:00:00 2001 From: VASHKENT Date: Sat, 18 Apr 2026 11:59:26 +0300 Subject: [PATCH 07/10] zabyl --- .../Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp082.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp082.yml b/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp082.yml index 67d80ae341..ecb1800cad 100644 --- a/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp082.yml +++ b/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp082.yml @@ -52,8 +52,8 @@ enum.StoreUiKey.Key: type: StoreBoundUserInterface - type: MovementSpeedModifier - baseWalkSpeed: 1.5 # TO DO: добиться изменения его скорости до указанных значений, на данный момент при спавне ему задается значение 2.5 и меняется из-за Fixtures - baseSprintSpeed: 2.5 # TO DO: добиться изменения его скорости до указанных значений, на данный момент при спавне ему задается значение 4.5 и меняется из-за Fixtures + baseWalkSpeed: 1.5 + baseSprintSpeed: 2.5 - type: ScpRestriction canPull: true - type: Pullable From 88b69cc82e97f6c86621f2a9f7658bdc810ee301 Mon Sep 17 00:00:00 2001 From: VASHKENT Date: Sun, 19 Apr 2026 12:40:11 +0300 Subject: [PATCH 08/10] doperlo --- Content.Server/_Scp/Scp173/Scp173System.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Content.Server/_Scp/Scp173/Scp173System.cs b/Content.Server/_Scp/Scp173/Scp173System.cs index ed121b403e..2a290a99a0 100644 --- a/Content.Server/_Scp/Scp173/Scp173System.cs +++ b/Content.Server/_Scp/Scp173/Scp173System.cs @@ -63,8 +63,6 @@ public sealed partial class Scp173System : SharedScp173System private TimeSpan _nextReagentCheck; - private EntityQuery _subFloorQuery; - public override void Initialize() { base.Initialize(); @@ -72,7 +70,6 @@ public override void Initialize() SubscribeLocalEvent(OnStructureDamage); SubscribeLocalEvent(OnClog); SubscribeLocalEvent(OnFastMovement); - _subFloorQuery = GetEntityQuery(); } public override void Update(float frameTime) @@ -124,7 +121,7 @@ private void OnStructureDamage(Entity uid, ref Scp173DamageStru return; } - var lookup = _lookup.GetEntitiesInRange(uid, 4f) + var lookup = _lookup.GetEntitiesInRange(uid, 4f, LookupFlags.Static) .Where(ent => _interaction.InRangeUnobstructed(uid.Owner, ent, ExamineSystemShared.ExamineRange)); var entityStorage = GetEntityQuery(); @@ -136,7 +133,8 @@ private void OnStructureDamage(Entity uid, ref Scp173DamageStru foreach (var ent in lookup) { // Проверяем, скрыта ли труба под плиткой - if (_subFloorQuery.TryComp(ent, out var subFloor) && subFloor.IsUnderCover && subFloor.BlockInteractions) + var isUnderCover = TryComp(ent, out var subFloor) && subFloor.IsUnderCover; + if (isUnderCover) continue; // Не ломаем то, что под полом // Наносим случайным вещам структурный дамаг From 387ba1816e4bfd95afff5b6757d18327f4e4f6d1 Mon Sep 17 00:00:00 2001 From: VASHKENT Date: Thu, 23 Apr 2026 18:34:28 +0300 Subject: [PATCH 09/10] net --- Content.Server/_Scp/Scp173/Scp173System.cs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Content.Server/_Scp/Scp173/Scp173System.cs b/Content.Server/_Scp/Scp173/Scp173System.cs index 2a290a99a0..bb54ce687b 100644 --- a/Content.Server/_Scp/Scp173/Scp173System.cs +++ b/Content.Server/_Scp/Scp173/Scp173System.cs @@ -121,7 +121,7 @@ private void OnStructureDamage(Entity uid, ref Scp173DamageStru return; } - var lookup = _lookup.GetEntitiesInRange(uid, 4f, LookupFlags.Static) + var lookup = _lookup.GetEntitiesInRange(uid, 4f) .Where(ent => _interaction.InRangeUnobstructed(uid.Owner, ent, ExamineSystemShared.ExamineRange)); var entityStorage = GetEntityQuery(); @@ -132,11 +132,6 @@ private void OnStructureDamage(Entity uid, ref Scp173DamageStru foreach (var ent in lookup) { - // Проверяем, скрыта ли труба под плиткой - var isUnderCover = TryComp(ent, out var subFloor) && subFloor.IsUnderCover; - if (isUnderCover) - continue; // Не ломаем то, что под полом - // Наносим случайным вещам структурный дамаг var dspec = new DamageSpecifier(); var damageValue = _random.Next(20, 80); From cb6ea6d60d1b5502019ff39478b9b37675e8064d Mon Sep 17 00:00:00 2001 From: VASHKENT Date: Thu, 23 Apr 2026 18:36:44 +0300 Subject: [PATCH 10/10] teper-tochno-ubral --- Content.Server/_Scp/Scp173/Scp173System.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Content.Server/_Scp/Scp173/Scp173System.cs b/Content.Server/_Scp/Scp173/Scp173System.cs index bb54ce687b..9576354cbf 100644 --- a/Content.Server/_Scp/Scp173/Scp173System.cs +++ b/Content.Server/_Scp/Scp173/Scp173System.cs @@ -26,7 +26,6 @@ using Content.Shared.Physics; using Content.Shared.Popups; using Content.Shared.Storage.Components; -using Content.Shared.SubFloor; using Robust.Server.Audio; using Robust.Server.GameObjects; using Robust.Shared.Audio;