Skip to content

Commit

Permalink
upd
Browse files Browse the repository at this point in the history
  • Loading branch information
Rxup committed Jan 26, 2024
1 parent 8c81049 commit 58ae4b3
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 42 deletions.
6 changes: 3 additions & 3 deletions Content.Server/Body/Systems/RespiratorSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Backmen/Adminbuse/CentCommKid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@
- Prying
useSound:
path: /Audio/Items/crowbar.ogg
- type: TilePrying
- type: ToolTileCompatible

- type: entity
parent: ClothingHandsBase
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Backmen/Tiles/floors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
sprite: /Textures/Backmen/Tiles/red_circuit.png
baseTurf: Plating
isSubfloor: false
canCrowbar: true
deconstructTools: [ Prying ]
footstepSounds:
collection: FootstepHull
itemDrop: FloorTileItemRCircuit
Expand Down
70 changes: 35 additions & 35 deletions Resources/Prototypes/Corvax/Palletes/text.yml
Original file line number Diff line number Diff line change
@@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
netsync: false
- type: Item
size: Ginormous
- type: TilePrying
- type: LatticeCutting
- type: ToolTileCompatible
- type: Tool
qualities:
- Prying
Expand Down

0 comments on commit 58ae4b3

Please sign in to comment.