diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 9b413c7f713..1e9760b545d 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -42695,7 +42695,6 @@ /turf/simulated/floor/carpet, /area/lawoffice) "ccC" = ( -/obj/structure/closet/lawcloset, /obj/machinery/light{ dir = 4 }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 6cd35393cc2..766360c3762 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -65530,7 +65530,6 @@ }, /area/security/permabrig) "kyo" = ( -/obj/structure/closet/lawcloset, /obj/machinery/light{ dir = 8 }, diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm index 36a45a94c2e..9e51207803b 100644 --- a/_maps/map_files/cerestation/cerestation.dmm +++ b/_maps/map_files/cerestation/cerestation.dmm @@ -17167,7 +17167,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/structure/closet/secure_closet/iaa, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -28062,7 +28061,7 @@ }, /area/maintenance/disposal) "cLb" = ( -/obj/structure/closet/lawcloset, +/obj/structure/closet/secure_closet/iaa, /turf/simulated/floor/carpet, /area/lawoffice) "cLj" = ( diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index ba409aa54e1..93e69697e68 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -9392,12 +9392,6 @@ icon_state = "dark" }, /area/security/interrogation) -"aAD" = ( -/obj/structure/closet/lawcloset, -/turf/simulated/floor/plasteel{ - icon_state = "cult" - }, -/area/lawoffice) "aAE" = ( /obj/machinery/light{ dir = 8 @@ -65638,7 +65632,7 @@ inlet_injector_autolink_id = "o2_in"; name = "Oxygen Supply Control"; outlet_vent_autolink_id = "o2_out"; - autolink_sensors = list("o2_sensor" = "Tank") + autolink_sensors = list("o2_sensor"="Tank") }, /turf/simulated/floor/plasteel{ dir = 0; @@ -66751,7 +66745,7 @@ inlet_injector_autolink_id = "n2_in"; name = "Nitrogen Supply Control"; outlet_vent_autolink_id = "n2_out"; - autolink_sensors = list("n2_sensor" = "Tank") + autolink_sensors = list("n2_sensor"="Tank") }, /obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/simulated/floor/plasteel{ @@ -67622,7 +67616,7 @@ /obj/machinery/computer/general_air_control{ dir = 4; name = "Tank Monitor"; - autolink_sensors = list("n2_sensor" = "Nitrogen", "o2_sensor" = "Oxygen", "co2_sensor" = "Carbon Dioxide", "tox_sensor" = "Toxins", "n2o_sensor" = "Nitrous Oxide", "waste_sensor" = "Gas Mix Tank") + autolink_sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank") }, /turf/simulated/floor/plasteel, /area/atmos/control) @@ -74492,7 +74486,7 @@ inlet_injector_autolink_id = "co2_in"; name = "Carbon Dioxide Supply Control"; outlet_vent_autolink_id = "co2_out"; - autolink_sensors = list("co2_sensor" = "Tank") + autolink_sensors = list("co2_sensor"="Tank") }, /turf/simulated/floor/plasteel{ dir = 4; @@ -76179,7 +76173,7 @@ dir = 1; level = 3; name = "Distribution and Waste Monitor"; - autolink_sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Waste Loop") + autolink_sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop") }, /turf/simulated/floor/plasteel, /area/engine/controlroom) @@ -79535,7 +79529,7 @@ inlet_injector_autolink_id = "tox_in"; name = "Toxin Supply Control"; outlet_vent_autolink_id = "tox_out"; - autolink_sensors = list("tox_sensor" = "Tank") + autolink_sensors = list("tox_sensor"="Tank") }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, @@ -79755,7 +79749,7 @@ dir = 8; level = 3; name = "Distribution and Waste Monitor"; - autolink_sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Waste Loop") + autolink_sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop") }, /turf/simulated/floor/plasteel, /area/atmos/control) @@ -81507,7 +81501,7 @@ }, /obj/machinery/computer/general_air_control{ name = "Bomb Mix Monitor"; - autolink_sensors = list("burn_sensor" = "Burn Mix") + autolink_sensors = list("burn_sensor"="Burn Mix") }, /obj/machinery/door_control{ id = "ToxinsVenting"; @@ -82631,7 +82625,7 @@ }, /obj/machinery/computer/general_air_control{ name = "Tank Monitor"; - autolink_sensors = list("n2_sensor" = "Nitrogen", "o2_sensor" = "Oxygen", "co2_sensor" = "Carbon Dioxide", "tox_sensor" = "Toxins", "n2o_sensor" = "Nitrous Oxide", "waste_sensor" = "Gas Mix Tank") + autolink_sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank") }, /turf/simulated/floor/plasteel{ dir = 4; @@ -83249,7 +83243,7 @@ name = "Mixed Air Supply Control"; outlet_vent_autolink_id = "air_out"; outlet_setting = 2000; - autolink_sensors = list("air_sensor" = "Tank") + autolink_sensors = list("air_sensor"="Tank") }, /turf/simulated/floor/plasteel{ icon_state = "arrival" @@ -87145,7 +87139,7 @@ inlet_injector_autolink_id = "waste_in"; name = "Gas Mix Tank Control"; outlet_vent_autolink_id = "waste_out"; - autolink_sensors = list("waste_sensor" = "Tank") + autolink_sensors = list("waste_sensor"="Tank") }, /turf/simulated/floor/plasteel{ dir = 4; @@ -90646,7 +90640,7 @@ inlet_injector_autolink_id = "n2o_in"; name = "Nitrous Oxide Supply Control"; outlet_vent_autolink_id = "n2o_out"; - autolink_sensors = list("n2o_sensor" = "Tank") + autolink_sensors = list("n2o_sensor"="Tank") }, /turf/simulated/floor/plasteel{ dir = 4; @@ -117028,7 +117022,7 @@ asN asN asN azA -aAD +aKs aCb aDa aDL diff --git a/code/game/objects/items/weapons/storage/garment.dm b/code/game/objects/items/weapons/storage/garment.dm index 2b3d91127c0..62ba14cf80c 100644 --- a/code/game/objects/items/weapons/storage/garment.dm +++ b/code/game/objects/items/weapons/storage/garment.dm @@ -186,7 +186,7 @@ new /obj/item/clothing/accessory/blue(src) /obj/item/storage/bag/garment/quartermaster - name = "quatermaster's garment bag" + name = "quartermaster's garment bag" desc = "A bag for storing extra clothes and shoes. This one belongs to the quartermaster." /obj/item/storage/bag/garment/quartermaster/populate_contents() @@ -199,3 +199,79 @@ new /obj/item/clothing/gloves/fingerless(src) new /obj/item/clothing/suit/fire/firefighter(src) new /obj/item/tank/internals/emergency_oxygen(src) + +/obj/item/storage/bag/garment/warden + name = "warden's garment bag" + desc = "A bag for storing extra clothes and shoes. This one belongs to the warden." + +/obj/item/storage/bag/garment/warden/populate_contents() + new /obj/item/clothing/suit/armor/vest/warden(src) + new /obj/item/clothing/head/warden(src) + new /obj/item/clothing/suit/armor/vest/warden/alt(src) + new /obj/item/clothing/head/beret/sec/warden(src) + new /obj/item/clothing/under/rank/security/warden(src) + new /obj/item/clothing/under/rank/security/formal/warden(src) + new /obj/item/clothing/under/rank/security/warden/corporate(src) + new /obj/item/clothing/under/rank/security/warden/skirt(src) + new /obj/item/clothing/under/rank/security/warden/skirt/corporate(src) + new /obj/item/clothing/mask/gas/sechailer/warden(src) + new /obj/item/clothing/glasses/hud/security/sunglasses(src) + +/obj/item/storage/bag/garment/detective + name = "detective's garment bag" + desc = "A bag for storing extra clothes and shoes. This one belongs to the detective." + +/obj/item/storage/bag/garment/detective/populate_contents() + new /obj/item/clothing/under/rank/security/detective(src) + new /obj/item/clothing/suit/storage/det_suit(src) + new /obj/item/clothing/suit/storage/det_suit/forensics/blue(src) + new /obj/item/clothing/suit/storage/det_suit/forensics/red(src) + new /obj/item/clothing/gloves/color/black/forensics(src) + new /obj/item/clothing/head/det_hat(src) + new /obj/item/clothing/shoes/brown(src) + new /obj/item/clothing/suit/armor/vest/det_suit(src) + new /obj/item/clothing/accessory/black(src) + new /obj/item/clothing/accessory/holster/armpit(src) + new /obj/item/clothing/glasses/sunglasses/yeah(src) + +/obj/item/storage/bag/garment/iaa + name = "internal affairs agent's garment bag" + desc = "A bag for storing extra clothes and shoes. This one belongs to the internal affairs agent." + +/obj/item/storage/bag/garment/iaa/populate_contents() + new /obj/item/clothing/under/rank/civilian/lawyer/black(src) + new /obj/item/clothing/under/rank/civilian/lawyer/red(src) + new /obj/item/clothing/under/rank/civilian/lawyer/blue(src) + new /obj/item/clothing/under/rank/civilian/lawyer/purple(src) + new /obj/item/clothing/under/rank/civilian/lawyer/bluesuit(src) + new /obj/item/clothing/under/suit/female(src) + new /obj/item/clothing/suit/storage/lawyer/bluejacket(src) + new /obj/item/clothing/suit/storage/lawyer/purpjacket(src) + new /obj/item/clothing/shoes/brown(src) + new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/under/rank/civilian/internalaffairs(src) + new /obj/item/clothing/suit/storage/internalaffairs(src) + new /obj/item/clothing/glasses/sunglasses/big(src) + new /obj/item/clothing/glasses/sunglasses/big(src) + +/obj/item/storage/bag/garment/chaplain + name = "chaplain's garment bag" + desc = "A bag for storing extra clothes and shoes. This one belongs to the chaplain." + +/obj/item/storage/bag/garment/chaplain/populate_contents() + new /obj/item/clothing/under/rank/civilian/chaplain(src) + new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/suit/hooded/nun(src) + new /obj/item/clothing/suit/hooded/chaplain_hoodie(src) + new /obj/item/clothing/suit/hooded/monk(src) + new /obj/item/clothing/suit/witchhunter(src) + new /obj/item/clothing/head/witchhunter_hat(src) + new /obj/item/clothing/suit/holidaypriest(src) + new /obj/item/clothing/under/dress/wedding/bride_white(src) + new /obj/item/clothing/head/helmet/riot/knight/templar(src) + new /obj/item/clothing/suit/armor/riot/knight/templar(src) + new /obj/item/clothing/suit/storage/labcoat(src) + new /obj/item/clothing/gloves/ring/silver(src) + new /obj/item/clothing/gloves/ring/silver(src) + new /obj/item/clothing/gloves/ring/gold(src) + new /obj/item/clothing/gloves/ring/gold(src) diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 433067a7a3f..5ad3d90b25e 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -104,28 +104,6 @@ new /obj/item/clothing/under/rank/civilian/janitor(src) new /obj/item/cartridge/janitor(src) -/* - * Lawyer - */ -/obj/structure/closet/lawcloset - name = "legal closet" - desc = "It's a storage unit for courtroom apparel and items." - icon_state = "blue" - icon_opened = "generic_open" - open_door_sprite = "generic_door" - -/obj/structure/closet/lawcloset/populate_contents() - new /obj/item/clothing/under/rank/civilian/lawyer/black(src) - new /obj/item/clothing/under/rank/civilian/lawyer/red(src) - new /obj/item/clothing/under/rank/civilian/lawyer/blue(src) - new /obj/item/clothing/under/rank/civilian/lawyer/purple(src) - new /obj/item/clothing/under/rank/civilian/lawyer/bluesuit(src) - new /obj/item/clothing/under/suit/female(src) - new /obj/item/clothing/suit/storage/lawyer/bluejacket(src) - new /obj/item/clothing/suit/storage/lawyer/purpjacket(src) - new /obj/item/clothing/shoes/brown(src) - new /obj/item/clothing/shoes/black(src) - //Paramedic /obj/structure/closet/paramedic diff --git a/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm b/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm index 4c8524ab39c..ba3921954fc 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm @@ -6,24 +6,9 @@ open_door_sprite = "chaplain_door" /obj/structure/closet/secure_closet/chaplain/populate_contents() - new /obj/item/clothing/under/rank/civilian/chaplain(src) - new /obj/item/clothing/shoes/black(src) - new /obj/item/clothing/suit/hooded/nun(src) - new /obj/item/clothing/suit/hooded/chaplain_hoodie(src) - new /obj/item/clothing/suit/hooded/monk(src) - new /obj/item/clothing/suit/witchhunter(src) - new /obj/item/clothing/head/witchhunter_hat(src) - new /obj/item/clothing/suit/holidaypriest(src) - new /obj/item/clothing/under/dress/wedding/bride_white(src) + new /obj/item/storage/bag/garment/chaplain(src) new /obj/item/storage/backpack/cultpack(src) - new /obj/item/clothing/head/helmet/riot/knight/templar(src) - new /obj/item/clothing/suit/armor/riot/knight/templar(src) - new /obj/item/clothing/suit/storage/labcoat(src) new /obj/item/soulstone/anybody/purified/chaplain(src) new /obj/item/storage/fancy/candle_box/eternal(src) new /obj/item/storage/fancy/candle_box/eternal(src) new /obj/item/storage/fancy/candle_box/eternal(src) - new /obj/item/clothing/gloves/ring/silver(src) - new /obj/item/clothing/gloves/ring/silver(src) - new /obj/item/clothing/gloves/ring/gold(src) - new /obj/item/clothing/gloves/ring/gold(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm index edc37813484..8f2dcd19cd8 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm @@ -20,7 +20,6 @@ new /obj/item/reagent_containers/food/drinks/mug/cap(src) new /obj/item/tank/internals/emergency_oxygen/double(src) - /obj/structure/closet/secure_closet/hop name = "head of personnel's locker" req_access = list(ACCESS_HOP) @@ -78,19 +77,9 @@ new /obj/item/storage/backpack/security(src) else new /obj/item/storage/backpack/satchel_sec(src) + new /obj/item/storage/bag/garment/warden(src) new /obj/item/radio/headset/headset_sec/alt(src) - new /obj/item/clothing/suit/armor/vest/warden(src) - new /obj/item/clothing/head/warden(src) - new /obj/item/clothing/suit/armor/vest/warden/alt(src) - new /obj/item/clothing/head/beret/sec/warden(src) - new /obj/item/clothing/under/rank/security/warden(src) - new /obj/item/clothing/under/rank/security/formal/warden(src) - new /obj/item/clothing/under/rank/security/warden/corporate(src) - new /obj/item/clothing/under/rank/security/warden/skirt(src) - new /obj/item/clothing/under/rank/security/warden/skirt/corporate(src) - new /obj/item/clothing/glasses/hud/security/sunglasses(src) new /obj/item/holosign_creator/security(src) - new /obj/item/clothing/mask/gas/sechailer/warden(src) new /obj/item/storage/box/zipties(src) new /obj/item/storage/box/flashbangs(src) new /obj/item/storage/belt/security/full(src) @@ -98,7 +87,6 @@ new /obj/item/storage/box/holobadge(src) new /obj/item/clothing/gloves/color/black/krav_maga/sec(src) - /obj/structure/closet/secure_closet/security name = "security officer's locker" req_access = list(ACCESS_SECURITY) @@ -159,28 +147,24 @@ new /obj/item/clothing/accessory/armband/cargo(src) new /obj/item/encryptionkey/headset_cargo(src) - /obj/structure/closet/secure_closet/security/engine /obj/structure/closet/secure_closet/security/engine/populate_contents() new /obj/item/clothing/accessory/armband/engine(src) new /obj/item/encryptionkey/headset_eng(src) - /obj/structure/closet/secure_closet/security/science /obj/structure/closet/secure_closet/security/science/populate_contents() new /obj/item/clothing/accessory/armband/science(src) new /obj/item/encryptionkey/headset_sci(src) - /obj/structure/closet/secure_closet/security/med /obj/structure/closet/secure_closet/security/med/populate_contents() new /obj/item/clothing/accessory/armband/medgreen(src) new /obj/item/encryptionkey/headset_med(src) - /obj/structure/closet/secure_closet/detective name = "detective's cabinet" req_access = list(ACCESS_FORENSICS_LOCKERS) @@ -192,27 +176,17 @@ close_sound = 'sound/machines/wooden_closet_close.ogg' /obj/structure/closet/secure_closet/detective/populate_contents() - new /obj/item/clothing/under/rank/security/detective(src) - new /obj/item/clothing/suit/storage/det_suit(src) - new /obj/item/clothing/suit/storage/det_suit/forensics/blue(src) - new /obj/item/clothing/suit/storage/det_suit/forensics/red(src) - new /obj/item/clothing/gloves/color/black/forensics(src) + new /obj/item/storage/bag/garment/detective(src) new /obj/item/storage/belt/security(src) - new /obj/item/clothing/head/det_hat(src) - new /obj/item/clothing/shoes/brown(src) new /obj/item/storage/box/evidence(src) new /obj/item/clipboard(src) new /obj/item/radio/headset/headset_sec/alt(src) new /obj/item/detective_scanner(src) - new /obj/item/clothing/suit/armor/vest/det_suit(src) new /obj/item/ammo_box/magazine/detective/speedcharger(src) new /obj/item/ammo_box/magazine/detective/speedcharger(src) new /obj/effect/spawner/detgun(src) - new /obj/item/clothing/accessory/holster/armpit(src) - new /obj/item/clothing/glasses/sunglasses/yeah(src) new /obj/item/flashlight/seclite(src) new /obj/item/holosign_creator/security(src) - new /obj/item/clothing/accessory/black(src) new /obj/item/taperecorder(src) new /obj/item/storage/box/tapes(src) @@ -224,7 +198,6 @@ new /obj/item/reagent_containers/syringe/lethal(src) new /obj/item/reagent_containers/syringe/lethal(src) - /obj/structure/closet/secure_closet/brig name = "brig locker" req_access = list(ACCESS_BRIG) @@ -296,15 +269,12 @@ open_door_sprite = "chaplain_door" /obj/structure/closet/secure_closet/iaa/populate_contents() + new /obj/item/storage/bag/garment/iaa(src) new /obj/item/book/manual/wiki/faxes(src) new /obj/item/storage/box/tapes(src) new /obj/item/storage/secure/briefcase(src) new /obj/item/storage/briefcase(src) new /obj/item/storage/briefcase(src) new /obj/item/radio/headset/headset_iaa(src) - new /obj/item/clothing/under/rank/civilian/internalaffairs(src) - new /obj/item/clothing/suit/storage/internalaffairs(src) - new /obj/item/clothing/glasses/sunglasses/big(src) - new /obj/item/clothing/glasses/sunglasses/big(src) new /obj/item/clothing/accessory/lawyers_badge(src) new /obj/item/clothing/accessory/lawyers_badge(src)