Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Functional M5 Gasmask 2: Electric Boogaloo #5083

Merged
merged 6 commits into from
Dec 6, 2023
Merged

Functional M5 Gasmask 2: Electric Boogaloo #5083

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7de84dd
Functional M5 Gasmask
Ediblebomb Nov 29, 2023
1a15c22
Var names
Ediblebomb Nov 29, 2023
2d50963
I really hope this is better
Ediblebomb Dec 4, 2023
5c819ec
make shit better
Ediblebomb Dec 5, 2023
d398525
tweak it again
Ediblebomb Dec 5, 2023
684b9ca
Not sure how I didn't consider using this button before
Ediblebomb Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions code/game/objects/items/props/helmetgarb.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,32 @@
desc = "The USCM had its funding pulled for these when it became apparent that not every deployed enlisted was wearing a helmet 24/7; much to the bafflement of UA High Command."
icon_state = "helmet_gasmask"

/obj/item/prop/helmetgarb/helmet_gasmask/on_enter_storage(obj/item/storage/internal/HelmetInternalInv)
Ediblebomb marked this conversation as resolved.
Show resolved Hide resolved
if(!istype(HelmetInternalInv))
return

var/obj/item/Helmet = HelmetInternalInv.master_object
Ediblebomb marked this conversation as resolved.
Show resolved Hide resolved

if(!istype(Helmet, /obj/item/clothing/head/helmet))
Ediblebomb marked this conversation as resolved.
Show resolved Hide resolved
return

Helmet.flags_inventory = initial(Helmet.flags_inventory)+BLOCKGASEFFECT
Helmet.flags_inv_hide = initial(Helmet.flags_inv_hide)+HIDEFACE
Ediblebomb marked this conversation as resolved.
Show resolved Hide resolved
..()
Ediblebomb marked this conversation as resolved.
Show resolved Hide resolved

/obj/item/prop/helmetgarb/helmet_gasmask/on_exit_storage(obj/item/storage/internal/HelmetInternalInv)
Ediblebomb marked this conversation as resolved.
Show resolved Hide resolved
if(!istype(HelmetInternalInv))
return

var/obj/item/Helmet = HelmetInternalInv.master_object
Ediblebomb marked this conversation as resolved.
Show resolved Hide resolved

if(!istype(Helmet, /obj/item/clothing/head/helmet))
Ediblebomb marked this conversation as resolved.
Show resolved Hide resolved
return

Helmet.flags_inventory = initial(Helmet.flags_inventory)
Helmet.flags_inv_hide = initial(Helmet.flags_inv_hide)
return..()
Ediblebomb marked this conversation as resolved.
Show resolved Hide resolved

/obj/item/prop/helmetgarb/trimmed_wire
name = "trimmed barbed wire"
desc = "It is a length of barbed wire that's had most of the sharp points filed down so that it is safe to handle."
Expand Down