From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Date: Tue, 9 Dec 2025 12:50:50 +0000 (-0800) Subject: Make door bolting powergaming no longer relevant anymore (#41138) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=67e18a0693c501f43b15fc8705720d7b6e14f31d;p=space-station-14.git Make door bolting powergaming no longer relevant anymore (#41138) * make door bolting powergaming no longer relevant anymore port and remove moff guard comments * update desc * One line bugefix --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> --- diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs index c031dcc7bd..310ea70bdc 100644 --- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs +++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs @@ -123,7 +123,7 @@ public abstract partial class SharedDoorSystem : EntitySystem if (!TryComp(uid, out var airlock)) return; - if (IsBolted(uid) || !airlock.Powered) + if (!airlock.Powered) return; if (door.State != DoorState.Closed) @@ -368,7 +368,7 @@ public abstract partial class SharedDoorSystem : EntitySystem Audio.PlayPvs(door.OpenSound, uid, AudioParams.Default.WithVolume(-5)); if (lastState == DoorState.Emagging && TryComp(uid, out var doorBoltComponent)) - SetBoltsDown((uid, doorBoltComponent), !doorBoltComponent.BoltsDown, user, true); + SetBoltsDown((uid, doorBoltComponent), true, user, true); } /// diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 9034c82fb8..bb00156885 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -284,7 +284,7 @@ uplink-toolbox-name = Toolbox uplink-toolbox-desc = A full compliment of tools for the mechanically inclined traitor. Includes a pair of insulated combat gloves and a syndicate gas mask as well. uplink-syndicate-jaws-of-life-name = Jaws Of Life -uplink-syndicate-jaws-of-life-desc = A combined prying and cutting tool. Useful for entering the station or its departments. +uplink-syndicate-jaws-of-life-desc = A combined prying and cutting tool. Useful for entering the station or its departments. Can even open bolted doors! uplink-duffel-surgery-name = Surgical Duffel Bag uplink-duffel-surgery-desc = A large duffel bag containing a full suite of surgical tools. diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml index 8c925b77ad..67ec0de197 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml @@ -67,6 +67,7 @@ - state: syn_inhand-right size: Normal - type: Prying + force: true speedModifier: 3.0 - type: MultipleTool entries: