diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs index 03fe9651f04..4669fcb9ea6 100644 --- a/Content.Server/Body/Systems/RespiratorSystem.cs +++ b/Content.Server/Body/Systems/RespiratorSystem.cs @@ -89,7 +89,7 @@ public override void Update(float frameTime) respirator.Status = RespiratorStatus.Exhaling; break; case RespiratorStatus.Exhaling: - Exhale(uid, body); + Exhale(uid, respirator, body); respirator.Status = RespiratorStatus.Inhaling; break; } @@ -143,7 +143,7 @@ public void Inhale(EntityUid uid, BodyComponent? body = null) } } - public void Exhale(EntityUid uid, BodyComponent? body = null) + public void Exhale(EntityUid uid, RespiratorComponent? respirator = null, BodyComponent? body = null) { if (!Resolve(uid, ref body, false)) return; @@ -158,7 +158,7 @@ public void Exhale(EntityUid uid, BodyComponent? body = null) if (ev.Gas == null) { // start-backmen: blob zombie - if (respirator.HasImmunity) + if (Resolve(uid, ref respirator, false) && respirator!.HasImmunity) return; // end-backmen: blob zombie diff --git a/Resources/Prototypes/Backmen/Adminbuse/CentCommKid.yml b/Resources/Prototypes/Backmen/Adminbuse/CentCommKid.yml index dfdfdaa6468..c5c553d7d68 100644 --- a/Resources/Prototypes/Backmen/Adminbuse/CentCommKid.yml +++ b/Resources/Prototypes/Backmen/Adminbuse/CentCommKid.yml @@ -485,7 +485,7 @@ - Prying useSound: path: /Audio/Items/crowbar.ogg - - type: TilePrying + - type: ToolTileCompatible - type: entity parent: ClothingHandsBase diff --git a/Resources/Prototypes/Backmen/Tiles/floors.yml b/Resources/Prototypes/Backmen/Tiles/floors.yml index 4edc86902f1..25d39649a5b 100644 --- a/Resources/Prototypes/Backmen/Tiles/floors.yml +++ b/Resources/Prototypes/Backmen/Tiles/floors.yml @@ -4,7 +4,7 @@ sprite: /Textures/Backmen/Tiles/red_circuit.png baseTurf: Plating isSubfloor: false - canCrowbar: true + deconstructTools: [ Prying ] footstepSounds: collection: FootstepHull itemDrop: FloorTileItemRCircuit diff --git a/Resources/Prototypes/Corvax/Palletes/text.yml b/Resources/Prototypes/Corvax/Palletes/text.yml index 02365eb3f2c..f81cf0d871c 100644 --- a/Resources/Prototypes/Corvax/Palletes/text.yml +++ b/Resources/Prototypes/Corvax/Palletes/text.yml @@ -1,35 +1,35 @@ -- type: palette - id: Material - name: Material - colors: - red: "#a91409" - red-darken-2: "#a72323" - red-accent-2: "#9b0000" - purple: "#7d1f8d" - purple-accent-2: "#8d03a5" - purple-accent-4: "#8800cc" - blue: "#0a6ab6" - blue-lighten-2: "#08528d" - blue-darken-2: "#145ea8" - cyan: "#0096aa" - cyan-lighten-2: "#198896" - cyan-darken-2: "#007986" - cyan-accent-2: "#00bebe" - cyan-accent-4: "#0093aa" - teal: "#00786d" - teal-lighten-2: "#3b8f89" - teal-accent-2: "#009076" - teal-accent-4: "#009984" - green: "#3d8c40" - green-darken-2: "#2d7230" - green-accent-2: "#0e885b" - green-accent-4: "#00a042" - lime: "#737a15" - lime-darken-2: "#8c9022" - lime-accent-2: "#737c00" - lime-accent-4: "#8bbb00" - amber: "#967000" - amber-lighten-2: "#755900" - amber-darken-2: "#cc8000" - amber-accent-2: "#7c6200" - amber-accent-4: "#996700" +#- type: palette +# id: Material +# name: Material +# colors: +# red: "#a91409" +# red-darken-2: "#a72323" +# red-accent-2: "#9b0000" +# purple: "#7d1f8d" +# purple-accent-2: "#8d03a5" +# purple-accent-4: "#8800cc" +# blue: "#0a6ab6" +# blue-lighten-2: "#08528d" +# blue-darken-2: "#145ea8" +# cyan: "#0096aa" +# cyan-lighten-2: "#198896" +# cyan-darken-2: "#007986" +# cyan-accent-2: "#00bebe" +# cyan-accent-4: "#0093aa" +# teal: "#00786d" +# teal-lighten-2: "#3b8f89" +# teal-accent-2: "#009076" +# teal-accent-4: "#009984" +# green: "#3d8c40" +# green-darken-2: "#2d7230" +# green-accent-2: "#0e885b" +# green-accent-4: "#00a042" +# lime: "#737a15" +# lime-darken-2: "#8c9022" +# lime-accent-2: "#737c00" +# lime-accent-4: "#8bbb00" +# amber: "#967000" +# amber-lighten-2: "#755900" +# amber-darken-2: "#cc8000" +# amber-accent-2: "#7c6200" +# amber-accent-4: "#996700" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/flesh_hands.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/flesh_hands.yml index 941258611d0..0a2552514bd 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/flesh_hands.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/flesh_hands.yml @@ -13,8 +13,7 @@ netsync: false - type: Item size: Ginormous - - type: TilePrying - - type: LatticeCutting + - type: ToolTileCompatible - type: Tool qualities: - Prying