Biosuit Code Cleanup and Tweaks (#15233)

This commit is contained in:
SleepyGemmy
2022-12-08 21:33:05 +01:00
committed by GitHub
parent c6b2930176
commit df52af42ca
49 changed files with 236 additions and 341 deletions
@@ -0,0 +1,62 @@
//
// Hazmat Closets
//
// Parent Object
/obj/structure/closet/hazmat
name = "hazmat gear closet parent object"
desc = DESC_PARENT
// General
/obj/structure/closet/hazmat/general
name = "hazmat gear closet"
desc = "A closet for hazmat gear."
icon_state = "hazmat"
/obj/structure/closet/hazmat/general/fill()
new /obj/item/clothing/head/hazmat/general(src)
new /obj/item/clothing/head/hazmat/general(src)
new /obj/item/clothing/suit/hazmat/general(src)
new /obj/item/clothing/suit/hazmat/general(src)
new /obj/item/clothing/mask/gas/half(src)
new /obj/item/clothing/mask/gas/half(src)
// Research
/obj/structure/closet/hazmat/research
name = "research hazmat gear closet"
desc = "A closet for research hazmat gear."
icon_state = "hazmat"
/obj/structure/closet/hazmat/research/fill()
new /obj/item/clothing/head/hazmat/research(src)
new /obj/item/clothing/head/hazmat/research(src)
new /obj/item/clothing/suit/hazmat/research(src)
new /obj/item/clothing/suit/hazmat/research(src)
new /obj/item/clothing/mask/gas/half(src)
new /obj/item/clothing/mask/gas/half(src)
// Security
/obj/structure/closet/hazmat/security
name = "security hazmat gear closet"
desc = "A closet for security hazmat gear."
icon_state = "hazmat"
/obj/structure/closet/hazmat/security/fill()
new /obj/item/clothing/head/hazmat/security(src)
new /obj/item/clothing/head/hazmat/security(src)
new /obj/item/clothing/suit/hazmat/security(src)
new /obj/item/clothing/suit/hazmat/security(src)
new /obj/item/clothing/mask/gas/half(src)
new /obj/item/clothing/mask/gas/half(src)
// Custodial
/obj/structure/closet/hazmat/custodial
name = "custodial hazmat gear closet"
desc = "A closet for custodial hazmat gear."
icon_state = "hazmat_custodial"
/obj/structure/closet/hazmat/custodial/fill()
new /obj/item/clothing/head/hazmat/custodial(src)
new /obj/item/clothing/suit/hazmat/custodial(src)
new /obj/item/clothing/mask/gas/half(src)
new /obj/item/watertank/janitor(src)
@@ -1,51 +0,0 @@
/obj/structure/closet/l3closet
name = "level-3 biohazard suit closet"
desc = "It's a storage unit for level-3 biohazard gear."
icon_state = "bio"
/obj/structure/closet/l3closet/general/fill()
new /obj/item/clothing/suit/bio_suit/general(src)
new /obj/item/clothing/head/bio_hood/general(src)
new /obj/item/clothing/mask/gas/half(src)
new /obj/item/clothing/suit/bio_suit/general(src)
new /obj/item/clothing/head/bio_hood/general(src)
new /obj/item/clothing/mask/gas/half(src)
/obj/structure/closet/l3closet/virology
icon_state = "bio_viro"
/obj/structure/closet/l3closet/virology/fill()
new /obj/item/clothing/suit/bio_suit/virology(src)
new /obj/item/clothing/head/bio_hood/virology(src)
new /obj/item/clothing/mask/gas/half(src)
new /obj/item/tank/oxygen(src)
/obj/structure/closet/l3closet/security
icon_state = "bio_sec"
/obj/structure/closet/l3closet/security/fill()
new /obj/item/clothing/suit/bio_suit/security(src)
new /obj/item/clothing/head/bio_hood/security(src)
new /obj/item/clothing/mask/gas/half(src)
/obj/structure/closet/l3closet/janitor
name = "level 3 biohazard custodial gear closet"
desc = "It's a storage unit for level 3 biohazard custodial gear."
icon_state = "bio_jan"
/obj/structure/closet/l3closet/janitor/fill()
new /obj/item/clothing/suit/bio_suit/janitor(src)
new /obj/item/clothing/head/bio_hood/janitor(src)
new /obj/item/clothing/mask/gas/half(src)
new /obj/item/watertank/janitor(src)
/obj/structure/closet/l3closet/scientist
icon_state = "bio_scientist"
/obj/structure/closet/l3closet/scientist/fill()
new /obj/item/clothing/suit/bio_suit/scientist(src)
new /obj/item/clothing/head/bio_hood/scientist(src)
new /obj/item/clothing/mask/gas/half(src)
@@ -119,8 +119,6 @@
else
new /obj/item/storage/backpack/satchel/med(src)
new /obj/item/storage/backpack/duffel/med(src)
new /obj/item/clothing/suit/bio_suit/cmo(src)
new /obj/item/clothing/head/bio_hood/cmo(src)
new /obj/item/clothing/shoes/medical(src)
new /obj/item/clothing/under/rank/chief_medical_officer(src)
new /obj/item/clothing/gloves/latex/nitrile(src)
@@ -19,8 +19,8 @@
icon_state = "rd"
/obj/structure/closet/secure_closet/RD/fill()
new /obj/item/clothing/suit/bio_suit/scientist(src)
new /obj/item/clothing/head/bio_hood/scientist(src)
new /obj/item/clothing/suit/hazmat/research(src)
new /obj/item/clothing/head/hazmat/research(src)
new /obj/item/clothing/under/rank/research_director(src)
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
new /obj/item/clothing/shoes/science(src)
+2 -2
View File
@@ -170,10 +170,10 @@
/obj/item/clothing/glasses/sunglasses = 1,
/obj/item/clothing/glasses/welding = 1,
/obj/item/clothing/gloves/yellow = 1,
/obj/item/clothing/head/bio_hood/general = 1,
/obj/item/clothing/head/hazmat/general = 1,
/obj/item/clothing/head/ushanka = 1,
/obj/item/clothing/shoes/syndigaloshes = 1,
/obj/item/clothing/suit/bio_suit/general = 1,
/obj/item/clothing/suit/hazmat/general = 1,
/obj/item/clothing/suit/space/emergency = 1,
/obj/item/clothing/under/gearharness = 1,
/obj/item/clothing/under/tactical = 1,