diff --git a/code/datums/supplypacks/medical.dm b/code/datums/supplypacks/medical.dm index 1b7207069e..b4d51ed1b5 100644 --- a/code/datums/supplypacks/medical.dm +++ b/code/datums/supplypacks/medical.dm @@ -90,7 +90,7 @@ /datum/supply_packs/med/sterile name = "Sterile equipment crate" contains = list( - /obj/item/clothing/under/rank/medical/green = 2, + /obj/item/clothing/under/rank/medical/scrubs/green = 2, /obj/item/clothing/head/surgery/green = 2, /obj/item/weapon/storage/box/masks, /obj/item/weapon/storage/box/gloves, @@ -188,8 +188,8 @@ contains = list( /obj/item/weapon/storage/belt/medical/emt, /obj/item/device/radio/headset/headset_med, - /obj/item/clothing/under/rank/medical/black, - /obj/item/clothing/accessory/armband/medgreen, + /obj/item/clothing/under/rank/medical/scrubs/black, + /obj/item/clothing/accessory/armband/medblue, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/suit/storage/toggle/labcoat/emt, /obj/item/clothing/under/rank/medical/paramedic, @@ -234,10 +234,10 @@ name = "Medical scrubs" contains = list( /obj/item/clothing/shoes/white = 3,, - /obj/item/clothing/under/rank/medical/blue = 3, - /obj/item/clothing/under/rank/medical/green = 3, - /obj/item/clothing/under/rank/medical/purple = 3, - /obj/item/clothing/under/rank/medical/black = 3, + /obj/item/clothing/under/rank/medical/scrubs = 3, + /obj/item/clothing/under/rank/medical/scrubs/green = 3, + /obj/item/clothing/under/rank/medical/scrubs/purple = 3, + /obj/item/clothing/under/rank/medical/scrubs/black = 3, /obj/item/clothing/head/surgery = 3, /obj/item/clothing/head/surgery/purple = 3, /obj/item/clothing/head/surgery/blue = 3, diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 589abbc0bc..11cc55e24b 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -69,7 +69,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/fr_jacket(H), slot_wear_suit) else if(has_alt_title(H, alt_title,"Surgeon")) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/blue(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/scrubs(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/blue(H), slot_head) else if(has_alt_title(H, alt_title,"Virologist")) @@ -92,7 +92,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/nurse(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/head/nursehat(H), slot_head) else - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/scrubs/purple(H), slot_w_uniform) else H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit) @@ -231,7 +231,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/paramedic(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/fr_jacket(H), slot_wear_suit) else if(has_alt_title(H, alt_title,"Paramedic")) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/black(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/scrubs(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/fr_jacket(H), slot_wear_suit) else H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform) diff --git a/code/game/objects/structures/crates_lockers/closets/fitness.dm b/code/game/objects/structures/crates_lockers/closets/fitness.dm index 8dbc0e609d..4e31b9e05c 100644 --- a/code/game/objects/structures/crates_lockers/closets/fitness.dm +++ b/code/game/objects/structures/crates_lockers/closets/fitness.dm @@ -17,6 +17,8 @@ new /obj/item/clothing/under/swimsuit/green(src) new /obj/item/clothing/under/swimsuit/purple(src) new /obj/item/clothing/under/swimsuit/striped(src) + new /obj/item/clothing/under/swimsuit/white(src) + new /obj/item/clothing/under/swimsuit/earth(src) //Maybe at some point make it randomly choose swimsuits, so that it doesn't overflow as we add more. new /obj/item/clothing/mask/snorkel(src) new /obj/item/clothing/mask/snorkel(src) new /obj/item/clothing/shoes/swimmingfins(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 7bc3ac06c1..92bc2ab469 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -72,35 +72,35 @@ new /obj/item/clothing/head/nursehat (src) switch(pick("blue", "green", "purple", "black", "navyblue")) if ("blue") - new /obj/item/clothing/under/rank/medical/blue(src) + new /obj/item/clothing/under/rank/medical/scrubs(src) new /obj/item/clothing/head/surgery/blue(src) if ("green") - new /obj/item/clothing/under/rank/medical/green(src) + new /obj/item/clothing/under/rank/medical/scrubs/green(src) new /obj/item/clothing/head/surgery/green(src) if ("purple") - new /obj/item/clothing/under/rank/medical/purple(src) + new /obj/item/clothing/under/rank/medical/scrubs/purple(src) new /obj/item/clothing/head/surgery/purple(src) if ("black") - new /obj/item/clothing/under/rank/medical/black(src) + new /obj/item/clothing/under/rank/medical/scrubs/black(src) new /obj/item/clothing/head/surgery/black(src) if ("navyblue") - new /obj/item/clothing/under/rank/medical/navyblue(src) + new /obj/item/clothing/under/rank/medical/scrubs/navyblue(src) new /obj/item/clothing/head/surgery/navyblue(src) switch(pick("blue", "green", "purple", "black", "navyblue")) if ("blue") - new /obj/item/clothing/under/rank/medical/blue(src) + new /obj/item/clothing/under/rank/medical/scrubs(src) new /obj/item/clothing/head/surgery/blue(src) if ("green") - new /obj/item/clothing/under/rank/medical/green(src) + new /obj/item/clothing/under/rank/medical/scrubs/green(src) new /obj/item/clothing/head/surgery/green(src) if ("purple") - new /obj/item/clothing/under/rank/medical/purple(src) + new /obj/item/clothing/under/rank/medical/scrubs/purple(src) new /obj/item/clothing/head/surgery/purple(src) if ("black") - new /obj/item/clothing/under/rank/medical/black(src) + new /obj/item/clothing/under/rank/medical/scrubs/black(src) new /obj/item/clothing/head/surgery/black(src) if ("navyblue") - new /obj/item/clothing/under/rank/medical/navyblue(src) + new /obj/item/clothing/under/rank/medical/scrubs/navyblue(src) new /obj/item/clothing/head/surgery/navyblue(src) new /obj/item/clothing/under/rank/medical(src) new /obj/item/clothing/under/rank/nurse(src) @@ -180,19 +180,19 @@ new /obj/item/clothing/shoes/white(src) switch(pick("blue", "green", "purple", "black", "navyblue")) if ("blue") - new /obj/item/clothing/under/rank/medical/blue(src) + new /obj/item/clothing/under/rank/medical/scrubs(src) new /obj/item/clothing/head/surgery/blue(src) if ("green") - new /obj/item/clothing/under/rank/medical/green(src) + new /obj/item/clothing/under/rank/medical/scrubs/green(src) new /obj/item/clothing/head/surgery/green(src) if ("purple") - new /obj/item/clothing/under/rank/medical/purple(src) + new /obj/item/clothing/under/rank/medical/scrubs/purple(src) new /obj/item/clothing/head/surgery/purple(src) if ("black") - new /obj/item/clothing/under/rank/medical/black(src) + new /obj/item/clothing/under/rank/medical/scrubs/black(src) new /obj/item/clothing/head/surgery/black(src) if ("navyblue") - new /obj/item/clothing/under/rank/medical/navyblue(src) + new /obj/item/clothing/under/rank/medical/scrubs/navyblue(src) new /obj/item/clothing/head/surgery/navyblue(src) new /obj/item/clothing/under/rank/chief_medical_officer(src) new /obj/item/clothing/under/rank/chief_medical_officer/skirt(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 28fc29ec2f..750a0e1b65 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -256,7 +256,7 @@ New() ..() - new /obj/item/clothing/accessory/armband/medgreen(src) + new /obj/item/clothing/accessory/armband/medblue(src) new /obj/item/device/encryptionkey/headset_med(src) return diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index d33927457f..ccba475259 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -475,11 +475,11 @@ new /obj/item/clothing/under/rank/medical(src) new /obj/item/clothing/under/rank/medical/skirt(src) new /obj/item/clothing/under/rank/medical/skirt(src) - new /obj/item/clothing/under/rank/medical/blue(src) - new /obj/item/clothing/under/rank/medical/green(src) - new /obj/item/clothing/under/rank/medical/purple(src) - new /obj/item/clothing/under/rank/medical/black(src) - new /obj/item/clothing/under/rank/medical/navyblue(src) + new /obj/item/clothing/under/rank/medical/scrubs(src) + new /obj/item/clothing/under/rank/medical/scrubs/green(src) + new /obj/item/clothing/under/rank/medical/scrubs/purple(src) + new /obj/item/clothing/under/rank/medical/scrubs/black(src) + new /obj/item/clothing/under/rank/medical/scrubs/navyblue(src) new /obj/item/clothing/head/surgery/navyblue(src) new /obj/item/clothing/head/surgery/purple(src) new /obj/item/clothing/head/surgery/blue(src) diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 9c831e7dfc..bbae19a02a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -10,7 +10,7 @@ /datum/gear/accessory/emt display_name = "armband, EMT" - path = /obj/item/clothing/accessory/armband/medgreen + path = /obj/item/clothing/accessory/armband/medblue /datum/gear/accessory/engineering display_name = "armband, engineering" diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 30b0a74f70..9edc5e81a1 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -240,26 +240,18 @@ path = /obj/item/clothing/under/rank/bartender/skirt allowed_roles = list("Bartender") -/datum/gear/uniform/scrubs - display_name = "scrubs, black" - path = /obj/item/clothing/under/rank/medical/black +/datum/gear/uniform/scrub + display_name = "scrubs selection" + path = /obj/item/clothing/under/rank/medical/scrubs allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Roboticist") -/datum/gear/uniform/scrubs/blue - display_name = "scrubs, blue" - path = /obj/item/clothing/under/rank/medical/blue - -/datum/gear/uniform/scrubs/purple - display_name = "scrubs, purple" - path = /obj/item/clothing/under/rank/medical/purple - -/datum/gear/uniform/scrubs/green - display_name = "scrubs, green" - path = /obj/item/clothing/under/rank/medical/green - -/datum/gear/uniform/scrubs/navyblue - display_name = "scrubs, navy blue" - path = /obj/item/clothing/under/rank/medical/navyblue +/datum/gear/uniform/scrub/New() + ..() + var/list/scrubs = list() + for(var/scrub in typesof(/obj/item/clothing/under/rank/medical/scrubs)) + var/obj/item/clothing/under/rank/medical/scrubs/scrub_type = scrub + scrubs[initial(scrub_type.name)] = scrub_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(scrubs)) /datum/gear/uniform/oldwoman display_name = "old woman attire" @@ -375,7 +367,7 @@ /datum/gear/uniform/dresses/janimaid display_name = "maid uniform" path = /obj/item/clothing/under/dress/janimaid - + /datum/gear/uniform/dresses/sexymaid display_name = "sexy maid uniform" path = /obj/item/clothing/under/dress/sexymaid diff --git a/code/modules/clothing/under/accessories/armband.dm b/code/modules/clothing/under/accessories/armband.dm index 6856b29466..3f53c44392 100644 --- a/code/modules/clothing/under/accessories/armband.dm +++ b/code/modules/clothing/under/accessories/armband.dm @@ -31,14 +31,14 @@ /obj/item/clothing/accessory/armband/med/cross name = "medic armband" - desc = "A white armband with a red cross on it. Typically used by people in the Medical department." + desc = "A white armband with a blue cross on it. Typically used by people in the Medical department." icon_state = "medicband" /obj/item/clothing/accessory/armband/med/color name = "armband" desc = "A fancy armband." -/obj/item/clothing/accessory/armband/medgreen +/obj/item/clothing/accessory/armband/medblue name = "EMT armband" - desc = "An armband, worn by the crew to display which department they're assigned to. This one is white and green." - icon_state = "medgreen" + desc = "An armband, worn by the crew to display which department they're assigned to. This one is white and blue." + icon_state = "medblue" diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm index 61a0802fa0..dff0740ace 100644 --- a/code/modules/clothing/under/accessories/clothing.dm +++ b/code/modules/clothing/under/accessories/clothing.dm @@ -179,6 +179,8 @@ name = "red sweatervest" icon_state = "sweatervest_red" +//Sweaters. + /obj/item/clothing/accessory/sweater name = "sweater" desc = "A warm knit sweater." @@ -197,7 +199,7 @@ /obj/item/clothing/accessory/sweater/mint name = "mint sweater" desc = "A warm knit sweater. This one has a minty tint to it." - icon_state = "mint_sweater" + icon_state = "sweater_mint" /obj/item/clothing/accessory/sweater/blue name = "blue sweater" diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index eeea6af3e9..7398efa44d 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -114,32 +114,32 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS rolled_sleeves = -1 -/obj/item/clothing/under/rank/medical/blue //Why are these not /obj/item/clothing/under/rank/medical/scrubs/ ? - name = "medical scrubs" +/obj/item/clothing/under/rank/medical/scrubs + name = "blue scrubs" desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue." icon_state = "scrubsblue" item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue") -/obj/item/clothing/under/rank/medical/green - name = "medical scrubs" +/obj/item/clothing/under/rank/medical/scrubs/green + name = "green scrubs" desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green." icon_state = "scrubsgreen" item_state_slots = list(slot_r_hand_str = "green", slot_l_hand_str = "green") -/obj/item/clothing/under/rank/medical/purple - name = "medical scrubs" +/obj/item/clothing/under/rank/medical/scrubs/purple + name = "purple scrubs" desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple." icon_state = "scrubspurple" item_state_slots = list(slot_r_hand_str = "purple", slot_l_hand_str = "purple") -/obj/item/clothing/under/rank/medical/black - name = "medical scrubs" +/obj/item/clothing/under/rank/medical/scrubs/black + name = "black scrubs" desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in black." icon_state = "scrubsblack" item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black") -/obj/item/clothing/under/rank/medical/navyblue - name = "medical scrubs" +/obj/item/clothing/under/rank/medical/scrubs/navyblue + name = "navy blue scrubs" desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in navy blue." icon_state = "scrubsnavyblue" item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue") diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 0a4752c639..9c8eb14582 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -532,7 +532,7 @@ /obj/item/clothing/under/cheongsam name = "white cheongsam" desc = "It is a white cheongsam dress." - icon_state = "mai_yang" + icon_state = "cheongsam-white" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS /obj/item/clothing/under/cheongsam/red @@ -550,6 +550,26 @@ desc = "It is a black cheongsam dress." icon_state = "cheongsam-black" +/obj/item/clothing/under/cheongsam/darkred + name = "dark red cheongsam" + desc = "It is a dark red cheongsam dress." + icon_state = "cheongsam-darkred" + +/obj/item/clothing/under/cheongsam/green + name = "green cheongsam" + desc = "It is a green cheongsam dress." + icon_state = "cheongsam-green" + +/obj/item/clothing/under/cheongsam/purple + name = "purple cheongsam" + desc = "It is a purple cheongsam dress." + icon_state = "cheongsam-purple" + +/obj/item/clothing/under/cheongsam/darkblue + name = "dark blue cheongsam" + desc = "It is a dark blue cheongsam dress." + icon_state = "cheongsam-darkblue" + /obj/item/clothing/under/blazer name = "blue blazer" desc = "A bold but yet conservative outfit, red corduroys, navy blazer and a tie." @@ -661,6 +681,32 @@ name = "striped swimsuit" desc = "A more revealing striped swimsuit." icon_state = "swim_striped" + +/obj/item/clothing/under/swimsuit/white + name = "white swimsuit" + desc = "A classic one piece." + icon_state = "swim_white" + +/obj/item/clothing/under/swimsuit/earth + name = "earthen swimsuit" + desc = "A design more popular on Earth these days." + icon_state = "swim_earth" + +/obj/item/clothing/under/swimsuit/stripper/stripper_pink + name = "pink swimsuit" + desc = "A rather skimpy pink swimsuit." + icon_state = "stripper_p" + +/obj/item/clothing/under/swimsuit/stripper/stripper_green + name = "green swimsuit" + desc = "A rather skimpy green swimsuit." + icon_state = "stripper_g" + +/obj/item/clothing/under/swimsuit/stripper/mankini + name = "mankini" + desc = "No honest man would wear this abomination" + icon_state = "mankini" + /* * pyjamas */ @@ -678,27 +724,6 @@ item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red") body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS -/obj/item/clothing/under/stripper - body_parts_covered = 0 - -/obj/item/clothing/under/stripper/stripper_pink - name = "pink swimsuit" - desc = "A rather skimpy pink swimsuit." - icon_state = "stripper_p" - siemens_coefficient = 1 - -/obj/item/clothing/under/stripper/stripper_green - name = "green swimsuit" - desc = "A rather skimpy green swimsuit." - icon_state = "stripper_g" - siemens_coefficient = 1 - -/obj/item/clothing/under/stripper/mankini - name = "mankini" - desc = "No honest man would wear this abomination" - icon_state = "mankini" - siemens_coefficient = 1 - /* *Misc Uniforms */ @@ -770,9 +795,17 @@ icon_state = "turtleneck" worn_state = "turtleneck" +//Uniforms end above here. + /obj/item/clothing/under/medigown name = "medical gown" desc = "A flimsy examination gown, the back ties never close." icon_state = "medicalgown" worn_state = "medicalgown" body_parts_covered = UPPER_TORSO|LOWER_TORSO + +/obj/item/clothing/under/bathrobe + name = "bathrobe" + desc = "A fluffy robe to keep you from showing off to the world." + icon_state = "bathrobe" + worn_state = "bathrobe" \ No newline at end of file diff --git a/icons/mob/items/lefthand_suits.dmi b/icons/mob/items/lefthand_suits.dmi index fda150d16f..8e4053f8a4 100644 Binary files a/icons/mob/items/lefthand_suits.dmi and b/icons/mob/items/lefthand_suits.dmi differ diff --git a/icons/mob/items/lefthand_uniforms.dmi b/icons/mob/items/lefthand_uniforms.dmi index 7deef45a4a..02d12e4f79 100644 Binary files a/icons/mob/items/lefthand_uniforms.dmi and b/icons/mob/items/lefthand_uniforms.dmi differ diff --git a/icons/mob/items/righthand_suits.dmi b/icons/mob/items/righthand_suits.dmi index 6b88f909ed..5fe5403304 100644 Binary files a/icons/mob/items/righthand_suits.dmi and b/icons/mob/items/righthand_suits.dmi differ diff --git a/icons/mob/items/righthand_uniforms.dmi b/icons/mob/items/righthand_uniforms.dmi index 506482dee8..88710db2d5 100644 Binary files a/icons/mob/items/righthand_uniforms.dmi and b/icons/mob/items/righthand_uniforms.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index d41fe53698..5c0fed70f1 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index a1eaad12fb..f121d14ca4 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 57ec5488e0..b3c82552d4 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index a922f8fc0a..14feefefe6 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/maps/northern_star/polaris-1.dmm b/maps/northern_star/polaris-1.dmm index d338fde50b..4a91144d1e 100644 --- a/maps/northern_star/polaris-1.dmm +++ b/maps/northern_star/polaris-1.dmm @@ -1987,7 +1987,7 @@ "aMk" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/light{dir = 8},/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aMl" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aMm" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) -"aMn" = (/obj/item/weapon/soap/nanotrasen,/obj/item/weapon/soap/nanotrasen,/obj/structure/table/standard,/obj/random/soap,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom) +"aMn" = (/obj/item/weapon/soap/nanotrasen,/obj/item/weapon/soap/nanotrasen,/obj/structure/table/standard,/obj/random/soap,/obj/item/clothing/under/bathrobe,/obj/item/clothing/under/bathrobe,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom) "aMo" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom) "aMp" = (/obj/structure/mirror{pixel_x = 28},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom) "aMq" = (/obj/machinery/door/airlock{name = "Unisex Showers"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom) diff --git a/maps/northern_star/polaris-2.dmm b/maps/northern_star/polaris-2.dmm index c555be4d81..1ee5f51d31 100644 --- a/maps/northern_star/polaris-2.dmm +++ b/maps/northern_star/polaris-2.dmm @@ -515,7 +515,7 @@ "jU" = (/obj/structure/table/steel_reinforced,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jV" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/lipstick/black,/obj/item/weapon/lipstick/jade,/obj/item/weapon/lipstick/purple,/obj/item/weapon/lipstick,/obj/item/weapon/lipstick/random,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jW" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/webbing,/obj/item/clothing/accessory/storage/webbing,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/scarf/white,/obj/item/clothing/accessory/scarf/lightblue,/obj/item/clothing/accessory/scarf/red,/obj/item/clothing/accessory/scarf/purple,/obj/item/clothing/accessory/armband/science,/obj/item/clothing/accessory/armband/med,/obj/item/clothing/accessory/armband/engine,/obj/item/clothing/accessory/armband/cargo,/obj/item/clothing/accessory/armband,/obj/item/clothing/accessory/medal/nobel_science,/obj/item/clothing/accessory/medal/silver,/obj/item/clothing/accessory/medal/gold,/obj/item/clothing/accessory/medal/bronze_heart,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"jX" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/under/cheongsam,/obj/item/clothing/under/hosformalmale,/obj/item/clothing/under/hosformalfem,/obj/item/clothing/under/harness,/obj/item/clothing/under/gladiator,/obj/item/clothing/under/ert,/obj/item/clothing/under/schoolgirl,/obj/item/clothing/under/redcoat,/obj/item/clothing/under/sexymime,/obj/item/clothing/under/sexyclown,/obj/item/clothing/under/soviet,/obj/item/clothing/under/space,/obj/item/clothing/under/stripper/mankini,/obj/item/clothing/under/suit_jacket/female,/obj/item/clothing/under/rank/psych/turtleneck,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/under/syndicate/tacticool,/obj/item/clothing/under/syndicate/tacticool,/obj/item/clothing/under/dress/sailordress,/obj/item/clothing/under/dress/redeveninggown,/obj/item/clothing/under/dress/dress_saloon,/obj/item/clothing/under/dress/blacktango,/obj/item/clothing/under/dress/blacktango/alt,/obj/item/clothing/under/dress/dress_orange,/obj/item/clothing/under/dress/janimaid,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"jX" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/under/cheongsam,/obj/item/clothing/under/hosformalmale,/obj/item/clothing/under/hosformalfem,/obj/item/clothing/under/harness,/obj/item/clothing/under/gladiator,/obj/item/clothing/under/ert,/obj/item/clothing/under/schoolgirl,/obj/item/clothing/under/redcoat,/obj/item/clothing/under/sexymime,/obj/item/clothing/under/sexyclown,/obj/item/clothing/under/soviet,/obj/item/clothing/under/space,/obj/item/clothing/under/swimsuit/stripper/mankini,/obj/item/clothing/under/suit_jacket/female,/obj/item/clothing/under/rank/psych/turtleneck,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/under/syndicate/tacticool,/obj/item/clothing/under/syndicate/tacticool,/obj/item/clothing/under/dress/sailordress,/obj/item/clothing/under/dress/redeveninggown,/obj/item/clothing/under/dress/dress_saloon,/obj/item/clothing/under/dress/blacktango,/obj/item/clothing/under/dress/blacktango/alt,/obj/item/clothing/under/dress/dress_orange,/obj/item/clothing/under/dress/janimaid,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jY" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/suit/hgpirate,/obj/item/clothing/suit/imperium_monk,/obj/item/clothing/suit/leathercoat,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/pirate,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jZ" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/structure/closet/crate/solar,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "ka" = (/turf/space/transit/north,/area/shuttle/escape_pod6/transit) @@ -2401,7 +2401,7 @@ "Ui" = (/obj/machinery/computer/teleporter,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "Uj" = (/obj/machinery/teleport/station,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "Uk" = (/obj/machinery/teleport/hub,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) - + (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabacacacacacacacadadaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeacaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeaeacafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafagagagagagagagagagagagagagafafafafafafafafafafafafafafafafafafafafahaiaiaiaiaiaiaiaiaiaiahaiaiaiaiaiaiaiaiaiaiahaiaiaiaiaiaiaiaiaiaiahaiaiaiaiaiaiaiaiaiaiahaiaiaiaiaiaiaiaiaiaiahaiaiaiaiaiaiaiaiaiaiahaiaiaiaiaiaiaiaiaiaiah aaajajajajajajajajajajajajajajajajajajajajajajajajajajajajajaaacacacacacacacadacacacacacacacacacacacacacacacacacacacacacacacadacaeacacacacacacacacacacacacacacacacacacacacacacacaeacafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafagakalagakalagakalagakalagafafafafafafafafafafafafafafafafafafafafamanananaoananananananapaqaraqaraqaqaraqaraqapasatatatatatatatatatapauavawawawawawawawawapaxaxaxaxaxaxaxaxaxaxapayayayayayayayayayayapazaAaBaCaDaDaDaDaDaEaF @@ -2659,3 +2659,4 @@ lYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlY afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf "} +