From dce66d8fc73d13013aa6b51f35b1c39e0924d74c Mon Sep 17 00:00:00 2001 From: DimWhat <40079883+DimWhat@users.noreply.github.com> Date: Wed, 21 Apr 2021 00:27:17 -0500 Subject: [PATCH] Adds medical clothing lockers to most maps, adds a uniform locker to destiny, increases clothing locker contents. and removes a double define of the nurse dress (#4348) * BEGONE DOUBLE DEFINITION * little more special clothes * to all but kondaru * sure, med coats and more outfits * have your uniform locker back clarion * moving it and swapping it * removes double locker * it is finally over --- code/obj/item/clothing/suits.dm | 10 ---------- code/obj/storage/closets.dm | 9 +++++---- maps/atlas.dmm | 2 +- maps/clarion.dmm | 8 ++++---- maps/cogmap.dmm | 8 +++++++- maps/cogmap2.dmm | 6 +++++- maps/destiny.dmm | 2 ++ maps/horizon.dmm | 3 ++- maps/oshan.dmm | 3 ++- 9 files changed, 28 insertions(+), 23 deletions(-) diff --git a/code/obj/item/clothing/suits.dm b/code/obj/item/clothing/suits.dm index 9708009b110f5..51e3c0b54c2bd 100644 --- a/code/obj/item/clothing/suits.dm +++ b/code/obj/item/clothing/suits.dm @@ -1507,16 +1507,6 @@ permeability_coefficient = 0 over_hair = 1 -/obj/item/clothing/suit/nursedress - name = "nurse dress" - desc = "A traditional dress worn by a nurse." - icon = 'icons/obj/clothing/overcoats/item_suit_gimmick.dmi' - wear_image_icon = 'icons/mob/overcoats/worn_suit_gimmick.dmi' - inhand_image_icon = 'icons/mob/inhand/overcoat/hand_suit_gimmick.dmi' - icon_state = "nursedress" - item_state = "nursedress" - body_parts_covered = TORSO|LEGS|ARMS - /obj/item/clothing/suit/security_badge name = "Security Badge" desc = "An official badge for a Nanotrasen Security Worker." diff --git a/code/obj/storage/closets.dm b/code/obj/storage/closets.dm index 54c717ea35e42..7aac67354d0c0 100644 --- a/code/obj/storage/closets.dm +++ b/code/obj/storage/closets.dm @@ -514,10 +514,11 @@ icon_state = "medical_clothes" icon_opened = "secure_white-open" desc = "A handy medical locker for storing your doctoring apparel." - spawn_contents = list(/obj/item/clothing/head/nursehat = 1, - /obj/item/clothing/suit/nursedress = 1, - /obj/item/clothing/head/headmirror = 1, - /obj/item/clothing/suit/labcoat/medical = 2) + spawn_contents = list(/obj/item/clothing/head/nursehat = 3, + /obj/item/clothing/suit/nursedress = 3, + /obj/item/clothing/suit/wintercoat/medical = 3, + /obj/item/clothing/head/headmirror = 3, + /obj/item/clothing/suit/labcoat/medical = 3) /obj/storage/closet/command/ruined //replacements for azones and mining level flavor name = "Dented command locker" diff --git a/maps/atlas.dmm b/maps/atlas.dmm index d6070124d3780..adb2e43f266f6 100644 --- a/maps/atlas.dmm +++ b/maps/atlas.dmm @@ -12977,7 +12977,7 @@ }, /area/station/medical/medbay) "FE" = ( -/obj/storage/secure/closet/medical/uniforms, +/obj/storage/closet/medicalclothes, /turf/simulated/floor/bluewhite{ dir = 1 }, diff --git a/maps/clarion.dmm b/maps/clarion.dmm index 17b00ad286137..65032ebd53d17 100644 --- a/maps/clarion.dmm +++ b/maps/clarion.dmm @@ -24482,13 +24482,13 @@ dir = 8; pixel_x = -10 }, -/obj/rack, -/obj/item/storage/box/stma_kit, -/obj/item/storage/box/lglo_kit, +/obj/storage/closet/medicalclothes, /turf/simulated/floor/black, /area/station/medical/medbay/surgery) "aXz" = ( /obj/rack, +/obj/item/storage/box/lglo_kit, +/obj/item/storage/box/stma_kit, /obj/item/clothing/under/scrub/teal, /obj/item/clothing/under/scrub/maroon, /obj/item/clothing/under/scrub/blue, @@ -29733,8 +29733,8 @@ /area/station/medical/medbay) "bjC" = ( /obj/disposalpipe/segment, -/obj/storage/secure/closet/medical/uniforms, /obj/machinery/light, +/obj/storage/secure/closet/medical/uniforms, /turf/simulated/floor/white, /area/station/medical/medbay) "bjD" = ( diff --git a/maps/cogmap.dmm b/maps/cogmap.dmm index dcb7571b4d71c..6315c6e658f61 100644 --- a/maps/cogmap.dmm +++ b/maps/cogmap.dmm @@ -60227,6 +60227,12 @@ /obj/decal/xmas_lights/ephemeral, /turf/simulated/floor/plating, /area/station/medical/cdc) +"nhf" = ( +/obj/storage/closet/medicalclothes, +/turf/simulated/floor/arrival{ + dir = 6 + }, +/area/station/medical/medbay) "nhn" = ( /obj/item/device/radio/beacon, /obj/machinery/light{ @@ -100599,7 +100605,7 @@ sMR cuf cuW nIv -cvU +nhf ckG fOM adC diff --git a/maps/cogmap2.dmm b/maps/cogmap2.dmm index 0a62cb9ada52b..0fa85b65cf6bb 100644 --- a/maps/cogmap2.dmm +++ b/maps/cogmap2.dmm @@ -79683,6 +79683,10 @@ icon_state = "fgreen5" }, /area/station/hydroponics/bay) +"vxs" = ( +/obj/storage/closet/medicalclothes, +/turf/simulated/floor/blue, +/area/station/medical/medbay) "vyj" = ( /obj/table/auto, /obj/item/plate, @@ -110884,7 +110888,7 @@ cQA cSn cTG cVj -cQA +vxs cXG cYQ cZH diff --git a/maps/destiny.dmm b/maps/destiny.dmm index a3ea1bddc5bee..28153bbedc96b 100644 --- a/maps/destiny.dmm +++ b/maps/destiny.dmm @@ -49454,6 +49454,7 @@ /obj/machinery/light/emergency{ dir = 4 }, +/obj/storage/closet/medicalclothes, /turf/simulated/floor/bluewhite/corner{ dir = 8 }, @@ -50986,6 +50987,7 @@ name = "autoname - SS13" }, /obj/disposalpipe/segment/morgue, +/obj/storage/secure/closet/medical/uniforms, /turf/simulated/floor/bluewhite/corner{ dir = 1 }, diff --git a/maps/horizon.dmm b/maps/horizon.dmm index 3bb05d8670697..5316c5210acbc 100644 --- a/maps/horizon.dmm +++ b/maps/horizon.dmm @@ -14860,7 +14860,7 @@ layer = 9.1; pixel_y = 21 }, -/obj/stool/bed/moveable/hospital, +/obj/storage/closet/medicalclothes, /turf/simulated/floor/bluewhite{ dir = 1 }, @@ -19302,6 +19302,7 @@ /turf/simulated/floor/plating/random, /area/station/mining/refinery) "aUI" = ( +/obj/stool/bed/moveable/hospital, /turf/simulated/floor/bluewhite, /area/station/medical/medbay) "aUJ" = ( diff --git a/maps/oshan.dmm b/maps/oshan.dmm index bbe72b248a011..4472c359f25bd 100644 --- a/maps/oshan.dmm +++ b/maps/oshan.dmm @@ -3315,7 +3315,7 @@ /turf/simulated/floor/bluegreen, /area/station/medical/medbay/treatment2) "aht" = ( -/obj/storage/secure/closet/fridge/blood, +/obj/storage/closet/medicalclothes, /turf/simulated/floor/red/checker, /area/station/medical/medbay/surgery/storage) "ahu" = ( @@ -6040,6 +6040,7 @@ icon_state = "line2" }, /obj/blind_switch/area/west, +/obj/storage/secure/closet/fridge/blood, /turf/simulated/floor/white, /area/station/medical/medbay/surgery) "anX" = (