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 9880722840a..a7fbb5764ee 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -43,7 +43,6 @@ icon_closed = "black" /obj/structure/closet/chefcloset/fill() - new /obj/item/clothing/under/sundress(src) new /obj/item/clothing/under/waiter(src) new /obj/item/clothing/under/waiter(src) if(prob(1)) @@ -52,8 +51,10 @@ new /obj/item/device/radio/headset/headset_service(src) new /obj/item/storage/box/gloves(src) new /obj/item/storage/box/mousetraps(src) - new /obj/item/clothing/under/rank/chef(src) - new /obj/item/clothing/head/chefhat(src) + new /obj/item/clothing/under/rank/chef/nt(src) + new /obj/item/clothing/under/rank/chef/idris(src) + new /obj/item/clothing/head/chefhat/nt(src) + new /obj/item/clothing/head/chefhat/idris(src) new /obj/item/clothing/head/surgery/hairnet(src) new /obj/item/clothing/head/surgery/hairnet(src) @@ -68,7 +69,8 @@ icon_opened = "janitorialopen" /obj/structure/closet/jcloset/fill() - new /obj/item/clothing/under/rank/janitor(src) + new /obj/item/clothing/under/rank/janitor/nt(src) + new /obj/item/clothing/under/rank/janitor/idris(src) new /obj/item/device/radio/headset/headset_service(src) new /obj/item/clothing/gloves/black(src) new /obj/item/clothing/head/softcap/janitor(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 510714384bc..932f91ef345 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -77,7 +77,6 @@ if ("purple") new /obj/item/clothing/under/rank/medical/purple(src) new /obj/item/clothing/head/surgery/purple(src) - new /obj/item/clothing/under/rank/medical(src) new /obj/item/clothing/suit/storage/toggle/labcoat(src) new /obj/item/clothing/suit/storage/toggle/fr_jacket(src) new /obj/item/clothing/shoes/medical(src) @@ -110,7 +109,9 @@ new /obj/item/storage/backpack/medic/first_responder(src) new /obj/item/clothing/suit/storage/medical_chest_rig(src) new /obj/item/clothing/suit/storage/medical_chest_rig/first_responder(src) - new /obj/item/clothing/under/rank/medical/first_responder(src) + new /obj/item/clothing/under/rank/medical/first_responder/nt(src) + new /obj/item/clothing/under/rank/medical/first_responder/zeng(src) + new /obj/item/clothing/under/rank/medical/first_responder/pmc(src) new /obj/item/clothing/shoes/jackboots(src) new /obj/item/device/flashlight/pen(src) new /obj/item/clothing/accessory/stethoscope(src) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index f7bac249fd6..f2c0e1f7149 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -11,12 +11,12 @@ /obj/structure/closet/wardrobe/red/fill() ..() - new /obj/item/clothing/under/rank/security(src) - new /obj/item/clothing/under/rank/security(src) - new /obj/item/clothing/under/rank/security(src) - new /obj/item/clothing/under/rank/cadet(src) - new /obj/item/clothing/under/rank/cadet(src) - new /obj/item/clothing/under/rank/cadet(src) + new /obj/item/clothing/under/rank/security/zavod(src) + new /obj/item/clothing/under/rank/security/pmc(src) + new /obj/item/clothing/under/rank/security/idris(src) + new /obj/item/clothing/under/rank/cadet/zavod(src) + new /obj/item/clothing/under/rank/cadet/pmc(src) + new /obj/item/clothing/under/rank/cadet/idris(src) new /obj/item/clothing/gloves/black_leather(src) new /obj/item/clothing/gloves/black_leather(src) new /obj/item/clothing/gloves/black_leather(src) @@ -170,9 +170,8 @@ /obj/structure/closet/wardrobe/atmospherics_yellow/fill() ..() - new /obj/item/clothing/under/rank/atmospheric_technician(src) - new /obj/item/clothing/under/rank/atmospheric_technician(src) - new /obj/item/clothing/under/rank/atmospheric_technician(src) + new /obj/item/clothing/under/rank/atmospheric_technician/heph(src) + new /obj/item/clothing/under/rank/atmospheric_technician/zavod(src) new /obj/item/clothing/shoes/black(src) new /obj/item/clothing/shoes/black(src) new /obj/item/clothing/shoes/black(src) @@ -199,11 +198,10 @@ /obj/structure/closet/wardrobe/engineering_yellow/fill() ..() - new /obj/item/clothing/under/rank/engineer(src) - new /obj/item/clothing/under/rank/engineer(src) - new /obj/item/clothing/under/rank/engineer(src) - new /obj/item/clothing/under/rank/engineer/apprentice(src) - new /obj/item/clothing/under/rank/engineer/apprentice(src) + new /obj/item/clothing/under/rank/engineer/heph(src) + new /obj/item/clothing/under/rank/engineer/zavod(src) + new /obj/item/clothing/under/rank/engineer/apprentice/heph(src) + new /obj/item/clothing/under/rank/engineer/apprentice/zavod(src) new /obj/item/clothing/shoes/orange(src) new /obj/item/clothing/shoes/orange(src) new /obj/item/clothing/shoes/orange(src) @@ -261,9 +259,9 @@ /obj/structure/closet/wardrobe/toxins_white/fill() ..() - new /obj/item/clothing/under/rank/scientist(src) - new /obj/item/clothing/under/rank/scientist(src) - new /obj/item/clothing/under/rank/scientist(src) + new /obj/item/clothing/under/rank/scientist/zavod(src) + new /obj/item/clothing/under/rank/scientist/nt(src) + new /obj/item/clothing/under/rank/scientist/zeng(src) new /obj/item/clothing/suit/storage/toggle/labcoat(src) new /obj/item/clothing/suit/storage/toggle/labcoat(src) new /obj/item/clothing/suit/storage/toggle/labcoat(src) @@ -286,8 +284,8 @@ /obj/structure/closet/wardrobe/robotics_black/fill() ..() - new /obj/item/clothing/under/rank/machinist(src) - new /obj/item/clothing/under/rank/machinist(src) + new /obj/item/clothing/under/rank/machinist/orion(src) + new /obj/item/clothing/under/rank/machinist/heph(src) new /obj/item/clothing/suit/storage/toggle/labcoat(src) new /obj/item/clothing/suit/storage/toggle/labcoat(src) new /obj/item/clothing/shoes/black(src) @@ -304,8 +302,9 @@ /obj/structure/closet/wardrobe/pharmacy_white/fill() ..() - new /obj/item/clothing/under/rank/pharmacist(src) - new /obj/item/clothing/under/rank/pharmacist(src) + new /obj/item/clothing/under/rank/pharmacist/zeng(src) + new /obj/item/clothing/under/rank/pharmacist/nt(src) + new /obj/item/clothing/under/rank/pharmacist/pmc(src) new /obj/item/clothing/shoes/chemist(src) new /obj/item/clothing/shoes/chemist(src) new /obj/item/clothing/suit/storage/toggle/labcoat/pharmacist(src) diff --git a/maps/sccv_horizon/placeholder-3_deck_3.dmm b/maps/sccv_horizon/placeholder-3_deck_3.dmm index 3e802ced1a1..d68e2f0271a 100644 --- a/maps/sccv_horizon/placeholder-3_deck_3.dmm +++ b/maps/sccv_horizon/placeholder-3_deck_3.dmm @@ -2222,9 +2222,6 @@ }, /turf/simulated/floor/wood, /area/bridge/meeting_room) -"eN" = ( -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, -/area/crew_quarters/theatre) "eO" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -6848,7 +6845,7 @@ icon_state = "tube1" }, /turf/simulated/floor/reinforced, -/area/crew_quarters/theatre) +/area/hallway/crew_area) "qt" = ( /obj/structure/table/standard, /obj/machinery/light/small/red{ @@ -7843,12 +7840,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) -"sP" = ( -/obj/structure/grille, -/obj/structure/window/shuttle/scc_space_ship, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/crew_quarters/theatre) "sQ" = ( /obj/machinery/shower{ pixel_y = 21 @@ -10728,7 +10719,7 @@ icon_state = "tube1" }, /turf/simulated/floor/reinforced, -/area/crew_quarters/theatre) +/area/hallway/crew_area) "Aw" = ( /obj/machinery/light{ dir = 8 @@ -19316,7 +19307,7 @@ icon_state = "tube1" }, /turf/simulated/floor/reinforced, -/area/crew_quarters/theatre) +/area/hallway/crew_area) "VI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -31026,17 +31017,17 @@ at at at at -eN -sP -sP -eN -sP -sP -sP -sP -eN -sP -sP +eb +GQ +GQ +eb +GQ +GQ +GQ +GQ +eb +GQ +GQ eb QC Ku @@ -31228,7 +31219,7 @@ at at at at -sP +GQ QL QL QL @@ -31430,7 +31421,7 @@ at at at qs -eN +eb QL QL QL @@ -31632,7 +31623,7 @@ at at at at -sP +GQ QL QL QL @@ -31834,7 +31825,7 @@ at at at at -sP +GQ QL QL QL @@ -32036,7 +32027,7 @@ at at at at -sP +GQ QL QL QL @@ -32238,7 +32229,7 @@ at at at qs -eN +eb QL QL QL @@ -32440,7 +32431,7 @@ at at at at -sP +GQ QL QL QL @@ -32642,17 +32633,17 @@ at at at at -eN -sP -sP -eN -sP -sP -sP -sP -eN -sP -sP +eb +GQ +GQ +eb +GQ +GQ +GQ +GQ +eb +GQ +GQ eb mr gE