cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Return of the clear gas masks (#11571)

Browse Source 
Co-authored-by: TheToaster98 <51209769+TheToaster98@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-09-05 05:28:52 -07:00
committed by GitHub
parent d9abf0bec2
commit e222cae832
20 changed files with 64 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/game/objects/structures/crates_lockers/closets/l3closet.dm
View File

@@ -17,10 +17,12 @@
closet_appearance = /decl/closet_appearance/bio/virology
starts_with = list(
/obj/item/clothing/suit/bio_suit/virology = 2, // CHOMP Block Edit Start
// CHOMPEdit Start
/obj/item/clothing/suit/bio_suit/virology = 2,
/obj/item/clothing/head/bio_hood/virology = 2,
/obj/item/clothing/mask/gas/clear = 2, //CHOMPEdit: Clear gas mask implementation
/obj/item/tank/oxygen = 2) // CHOMP Block Edit End
/obj/item/clothing/mask/gas/clear = 2,
/obj/item/tank/oxygen = 2)
// CHOMPEdit End
/obj/structure/closet/l3closet/security
@@ -38,7 +40,7 @@
starts_with = list(
/obj/item/clothing/suit/bio_suit/janitor = 2,
/obj/item/clothing/head/bio_hood/janitor = 2,
/obj/item/clothing/mask/gas/clear = 2, //CHOMPEdit: Clear gas mask implementation
/obj/item/clothing/mask/gas/clear = 2,
/obj/item/tank/emergency/oxygen/engi = 2)
@@ -68,5 +70,5 @@
starts_with = list(
/obj/item/clothing/suit/bio_suit/general = 3,
/obj/item/clothing/head/bio_hood/general = 3,
/obj/item/clothing/mask/gas/clear = 3, // CHOMP Block Edit Start //CHOMPEdit: Clear gas mask implementation
/obj/item/tank/oxygen = 3) // CHOMP Block Edit End
/obj/item/clothing/mask/gas/clear = 3,
/obj/item/tank/oxygen = 3) // CHOMPAdd

2
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
View File

@@ -52,7 +52,7 @@
/obj/item/clothing/gloves/black,
/obj/item/clothing/gloves/fingerless,
/obj/item/tank/emergency/oxygen,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/glasses/meson,
/obj/item/clothing/head/soft,
/obj/item/clothing/suit/storage/hooded/wintercoat/cargo,

4
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
View File

@@ -99,7 +99,7 @@
/obj/item/radio/headset/alt/headset_eng,
/obj/item/radio/headset/earbud/headset_eng,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/glasses/meson,
/obj/item/cartridge/engineering,
/obj/item/taperoll/engineering,
@@ -137,7 +137,7 @@
/obj/item/radio/headset/alt/headset_eng,
/obj/item/radio/headset/earbud/headset_eng,
/obj/item/clothing/suit/storage/hazardvest/atmos, //VOREStation edit. Eng locker gets regular haz-vest, atmos gets the themed one of their own
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/cartridge/atmos,
/obj/item/taperoll/atmos,
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos,

2
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
View File

@@ -38,7 +38,7 @@
/obj/structure/closet/secure_closet/hydroponics/sci/Initialize(mapload)
starts_with += /obj/item/clothing/head/bio_hood/scientist
starts_with += /obj/item/clothing/suit/bio_suit/scientist
starts_with += /obj/item/clothing/mask/gas/clear // VOREStation Edit: Gasmasks we use are different //Chompedit: not anymore!
starts_with += /obj/item/clothing/mask/gas/clear // VOREStation Edit: Gasmasks we use are different
if(prob(1))
starts_with += /obj/item/chainsaw

4
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
View File

@@ -103,7 +103,7 @@
/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/reagent_containers/glass/bottle/antitoxin,
/obj/item/storage/belt/medical/emt,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/suit/storage/toggle/fr_jacket,
/obj/item/clothing/suit/storage/toggle/labcoat/emt,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical/para,
@@ -155,7 +155,7 @@
/obj/item/clothing/head/beret/medical/cmo,
/obj/item/clothing/head/beret/medical/cmo/blue,
/obj/item/storage/box/freezer,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/taperoll/medical,
/obj/item/clothing/suit/bio_suit/cmo,
/obj/item/clothing/head/bio_hood/cmo,

4
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
View File

@@ -9,7 +9,7 @@
/obj/item/clothing/shoes/white,
/obj/item/radio/headset/headset_sci,
/obj/item/tank/air,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/clothing/suit/storage/hooded/wintercoat/science,
/obj/item/clothing/shoes/boots/winter/science)
@@ -48,7 +48,7 @@
/obj/item/radio/headset/alt/heads/rd,
/obj/item/radio/headset/earbud/heads/rd,
/obj/item/tank/air,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/flash,
/obj/item/clothing/suit/storage/hooded/wintercoat/science,
/obj/item/clothing/suit/storage/hooded/wintercoat/science/rd,

10
code/game/objects/structures/crates_lockers/closets/utility_closets.dm
View File

@@ -61,7 +61,7 @@
/obj/structure/closet/emcloset/legacy
starts_with = list(
/obj/item/tank/oxygen,
/obj/item/clothing/mask/gas)
/obj/item/clothing/mask/gas/clear)
/*
* Fire Closet
@@ -73,7 +73,7 @@
starts_with = list(
/obj/item/clothing/suit/fire,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/tank/oxygen/red,
/obj/item/extinguisher,
/obj/item/clothing/head/hardhat/red)
@@ -81,7 +81,7 @@
/obj/structure/closet/firecloset/full
starts_with = list(
/obj/item/clothing/suit/fire,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/flashlight,
/obj/item/tank/oxygen/red,
/obj/item/extinguisher,
@@ -90,7 +90,7 @@
/obj/structure/closet/firecloset/full/double
starts_with = list(
/obj/item/clothing/suit/fire = 2,
/obj/item/clothing/mask/gas = 2,
/obj/item/clothing/mask/gas/clear = 2,
/obj/item/flashlight = 2,
/obj/item/tank/oxygen/red = 2,
/obj/item/extinguisher = 2,
@@ -214,7 +214,7 @@
starts_with = list(
/obj/item/clothing/suit/fire/firefighter,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/flashlight,
/obj/item/tank/oxygen/red,
/obj/item/extinguisher,

2
code/game/objects/structures/crates_lockers/closets/walllocker.dm
View File

@@ -214,7 +214,7 @@
starts_with = list(
/obj/item/clothing/suit/fire,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas/clear,
/obj/item/flashlight,
/obj/item/tank/oxygen/red,
/obj/item/extinguisher,