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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds the old gas mask back. #3184

Merged
merged 2 commits into from
Dec 22, 2020
Merged

Adds the old gas mask back. #3184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c59bda3
pain
Archanial Dec 17, 2020
1828bfd
e
Archanial Dec 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/_globalvars/lists/maintenance_loot.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
/obj/item/clothing/head/that = 1,
/obj/item/clothing/head/ushanka = 1,
/obj/item/clothing/head/welding = 1,
/obj/item/clothing/mask/gas = 15,
/obj/item/clothing/mask/gas/old = 15, //greytide
/obj/item/clothing/suit/hazardvest = 1,
/obj/item/clothing/under/misc/vice_officer = 1,
/obj/item/clothing/suit/hooded/flashsuit = 2,
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/subsystem/traumas.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ SUBSYSTEM_DEF(traumas)
/obj/item/pda/clown, /obj/item/grown/bananapeel)),

"greytide" = typecacheof(list(/obj/item/clothing/under/color/grey, /obj/item/melee/baton/cattleprod,
/obj/item/twohanded/spear, /obj/item/clothing/mask/gas)),
/obj/item/twohanded/spear, /obj/item/clothing/mask/gas/old)),

"lizards" = typecacheof(list(/obj/item/toy/plush/lizardplushie, /obj/item/reagent_containers/food/snacks/kebab/tail,
/obj/item/organ/tail/lizard, /obj/item/reagent_containers/food/drinks/bottle/lizardwine)),
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/gulag_teleporter.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ The console is located at computer/gulag_teleporter.dm
/obj/item/clothing/head/helmet/space/plasmaman,
/obj/item/tank/internals,
/obj/item/clothing/mask/breath,
/obj/item/clothing/mask/gas))
/obj/item/clothing/mask/gas/old)) //makes more sense to give prisoners older models of masks

/obj/machinery/gulag_teleporter/Initialize()
. = ..()
Expand Down
5 changes: 5 additions & 0 deletions code/modules/clothing/masks/gasmask.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,3 +210,8 @@
item_state = "hunter"
resistance_flags = FIRE_PROOF | ACID_PROOF
flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEYES|HIDEEARS|HIDEHAIR

/obj/item/clothing/mask/gas/old
desc = "A face-covering mask that can be connected to an air supply. This one appears to be one of the older models."
icon_state = "gas_alt_old"
item_state = "gas_alt_old"
4 changes: 2 additions & 2 deletions code/modules/shuttle/emergency.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,8 +577,8 @@
new /obj/item/clothing/head/helmet/space/orange(src)
new /obj/item/clothing/suit/space/orange(src)
new /obj/item/clothing/suit/space/orange(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/mask/gas/old(src) //emergency means older models
new /obj/item/clothing/mask/gas/old(src)
new /obj/item/tank/internals/oxygen/red(src)
new /obj/item/tank/internals/oxygen/red(src)
new /obj/item/pickaxe/emergency(src)
Expand Down
Binary file modified icons/mob/mask.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/clothing/masks.dmi
View file
Open in desktop
Binary file not shown.