diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 2ac5d8b01f3..1232e8f364e 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -2816,23 +2816,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) -"aId" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/status_display/evac/directional/south, -/obj/effect/turf_decal/bot, -/obj/structure/sign/directions/arrival{ - dir = 1; - pixel_x = 32; - pixel_y = -4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/disposal/bin/tagger, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) "aIm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -3894,14 +3877,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/service/chapel/funeral) -"aWB" = ( -/obj/structure/table/reinforced, -/obj/item/storage/medkit/regular, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/command/bridge) "aWF" = ( /obj/structure/cable, /obj/effect/turf_decal/delivery, @@ -4080,14 +4055,6 @@ /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, /area/station/engineering/main) -"aYZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/table/wood, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/computer/security/wooden_tv, -/turf/open/floor/iron/grimy, -/area/station/command/bridge) "aZj" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -7653,6 +7620,17 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/plating, /area/station/service/abandoned_gambling_den) +"bQC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/hallway/secondary/exit/departure_lounge) "bQN" = ( /obj/item/radio/intercom/directional/east, /obj/effect/decal/cleanable/dirt, @@ -7871,6 +7849,14 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"bSv" = ( +/obj/structure/table/reinforced, +/obj/item/storage/medkit/regular, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) "bSx" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 @@ -8738,17 +8724,6 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron, /area/station/engineering/supermatter/room) -"cdJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/hallway/secondary/exit/departure_lounge) "cdN" = ( /obj/effect/spawner/random/structure/girder, /obj/effect/spawner/random/structure/grille, @@ -10429,30 +10404,6 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"czF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/newscaster/directional/west, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/hallway/secondary/exit/departure_lounge) -"czI" = ( -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/structure/sign/warning/deathsposal/directional/east, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 1 - }, -/obj/machinery/disposal/bin/tagger, -/turf/open/floor/iron, -/area/station/science/xenobiology) "czL" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -11130,22 +11081,6 @@ /obj/structure/chair/stool/directional/north, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"cHx" = ( -/obj/structure/sign/warning/deathsposal/directional/east, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/siding/purple{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 8 - }, -/obj/machinery/disposal/bin/tagger, -/turf/open/floor/iron, -/area/station/science/xenobiology) "cHB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -12763,6 +12698,16 @@ }, /turf/open/floor/iron, /area/station/maintenance/department/security) +"ddO" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/spawner/random/structure/closet_private, +/obj/item/clothing/head/costume/kitty, +/obj/item/clothing/under/costume/maid, +/obj/item/clothing/head/costume/rabbitears, +/obj/item/clothing/under/dress/eveninggown, +/turf/open/floor/wood, +/area/station/commons/dorms) "ddW" = ( /obj/effect/turf_decal/box/white/corners, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -15778,6 +15723,17 @@ "dPR" = ( /turf/closed/wall/r_wall, /area/station/maintenance/solars/port/aft) +"dPX" = ( +/obj/machinery/door/airlock/grunge{ + name = "Morgue" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, +/turf/open/floor/iron, +/area/station/maintenance/department/medical/morgue) "dPY" = ( /obj/effect/turf_decal/bot_white/left, /obj/effect/turf_decal/tile/neutral{ @@ -17955,15 +17911,6 @@ }, /turf/open/floor/wood/large, /area/station/command/corporate_showroom) -"etA" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/bot, -/obj/machinery/disposal/bin/tagger, -/turf/open/floor/iron, -/area/station/engineering/storage) "etI" = ( /obj/machinery/door/airlock/external{ name = "External Docking Port" @@ -22819,19 +22766,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/service/abandoned_gambling_den) -"fER" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/status_display/evac/directional/west, -/obj/effect/turf_decal/siding/purple{ - dir = 4 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/light/directional/west, -/obj/machinery/disposal/bin/tagger, -/turf/open/floor/iron, -/area/station/science/lab) "fEX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26623,6 +26557,23 @@ /obj/effect/mapping_helpers/mail_sorting/service/law_office, /turf/open/floor/plating, /area/station/maintenance/department/security) +"gzg" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/bot, +/obj/structure/sign/directions/arrival{ + dir = 1; + pixel_x = 32; + pixel_y = -4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/disposal/bin/tagger, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) "gzj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/prisoner, @@ -32459,30 +32410,6 @@ dir = 8 }, /area/station/engineering/atmos/project) -"iaK" = ( -/obj/structure/safe/vault, -/obj/item/clothing/neck/stethoscope, -/obj/item/book{ - desc = "An undeniably handy book."; - icon_state = "bookknock"; - name = "\improper A Simpleton's Guide to Safe-cracking with Stethoscopes" - }, -/obj/item/stack/sheet/mineral/diamond, -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c500, -/obj/item/stack/spacecash/c500, -/obj/item/stack/spacecash/c500, -/obj/item/stack/spacecash/c500, -/obj/item/stack/spacecash/c500, -/obj/item/gun/ballistic/automatic/pistol/deagle, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/status_display/evac/directional/south, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/command/nuke_storage) "iaL" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -33659,6 +33586,18 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron, /area/station/maintenance/port) +"ioF" = ( +/obj/machinery/light/small/directional/north, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/disposal/bin/tagger, +/turf/open/floor/iron, +/area/station/security/brig) "ioN" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -35699,18 +35638,6 @@ dir = 1 }, /area/station/service/kitchen) -"iRs" = ( -/obj/machinery/light/small/directional/north, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/disposal/bin/tagger, -/turf/open/floor/iron, -/area/station/security/brig) "iRt" = ( /obj/effect/turf_decal/tile/purple{ dir = 8 @@ -37015,17 +36942,6 @@ }, /turf/open/floor/iron, /area/station/security/prison/garden) -"jgl" = ( -/obj/machinery/door/airlock/grunge{ - name = "Morgue" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, -/turf/open/floor/iron, -/area/station/maintenance/department/medical/morgue) "jgq" = ( /obj/structure/chair/office{ dir = 1 @@ -42746,6 +42662,19 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark/smooth_large, /area/station/security/detectives_office) +"kBr" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/status_display/evac/directional/west, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/light/directional/west, +/obj/machinery/disposal/bin/tagger, +/turf/open/floor/iron, +/area/station/science/lab) "kBz" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -48013,6 +47942,18 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/maintenance/port) +"lRM" = ( +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/sign/warning/deathsposal/directional/east, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/disposal/bin/tagger, +/turf/open/floor/iron, +/area/station/science/xenobiology) "lSh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -54311,6 +54252,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) +"nBB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/newscaster/directional/west, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/hallway/secondary/exit/departure_lounge) "nBC" = ( /obj/item/kirbyplants/random, /obj/machinery/light/small/directional/north, @@ -68945,16 +68898,6 @@ }, /turf/open/floor/iron/grimy, /area/station/service/library) -"rkL" = ( -/obj/machinery/airalarm/directional/north, -/obj/effect/landmark/start/hangover/closet, -/obj/effect/spawner/random/structure/closet_private, -/obj/item/clothing/head/costume/kitty, -/obj/item/clothing/under/costume/maid, -/obj/item/clothing/head/costume/rabbitears, -/obj/item/clothing/under/dress/redeveninggown, -/turf/open/floor/wood, -/area/station/commons/dorms) "rkN" = ( /obj/item/kirbyplants/random, /obj/machinery/status_display/evac/directional/south, @@ -79512,19 +79455,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) -"tPT" = ( -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/trunk, -/obj/machinery/camera/directional/north{ - c_tag = "Security - Office Fore"; - dir = 9 - }, -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/directional/north, -/obj/machinery/disposal/bin/tagger, -/turf/open/floor/iron/dark, -/area/station/security/office) "tPY" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -84563,16 +84493,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/department/chapel) -"vbt" = ( -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/light/directional/east, -/obj/machinery/disposal/bin/tagger, -/turf/open/floor/iron, -/area/station/medical/medbay) "vbH" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -84948,6 +84868,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) +"vgD" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, +/obj/machinery/disposal/bin/tagger, +/turf/open/floor/iron, +/area/station/engineering/storage) "vgE" = ( /turf/open/floor/circuit/telecomms, /area/station/science/xenobiology) @@ -85047,13 +84976,6 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) -"vis" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/secure_safe/caps_spare, -/obj/structure/table/wood, -/turf/open/floor/iron/grimy, -/area/station/command/bridge) "vit" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/red/anticorner/contrasted, @@ -85896,6 +85818,19 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/station/command/bridge) +"vuy" = ( +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/trunk, +/obj/machinery/camera/directional/north{ + c_tag = "Security - Office Fore"; + dir = 9 + }, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/directional/north, +/obj/machinery/disposal/bin/tagger, +/turf/open/floor/iron/dark, +/area/station/security/office) "vuE" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -86779,6 +86714,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/engineering/main) +"vED" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/table/wood, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/computer/security/wooden_tv, +/turf/open/floor/iron/grimy, +/area/station/command/bridge) "vEV" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -86966,6 +86909,16 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) +"vGO" = ( +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/light/directional/east, +/obj/machinery/disposal/bin/tagger, +/turf/open/floor/iron, +/area/station/medical/medbay) "vGP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/railing{ @@ -88029,6 +87982,30 @@ /obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron/dark/smooth_large, /area/station/commons/fitness/recreation) +"vWT" = ( +/obj/structure/safe/vault, +/obj/item/clothing/neck/stethoscope, +/obj/item/book{ + desc = "An undeniably handy book."; + icon_state = "bookknock"; + name = "\improper A Simpleton's Guide to Safe-cracking with Stethoscopes" + }, +/obj/item/stack/sheet/mineral/diamond, +/obj/item/stack/spacecash/c1000, +/obj/item/stack/spacecash/c1000, +/obj/item/stack/spacecash/c1000, +/obj/item/stack/spacecash/c1000, +/obj/item/stack/spacecash/c1000, +/obj/item/stack/spacecash/c500, +/obj/item/stack/spacecash/c500, +/obj/item/stack/spacecash/c500, +/obj/item/stack/spacecash/c500, +/obj/item/stack/spacecash/c500, +/obj/item/gun/ballistic/automatic/pistol/deagle, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) "vWU" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -89376,6 +89353,13 @@ dir = 8 }, /area/station/hallway/secondary/entry) +"wnH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/secure_safe/caps_spare, +/obj/structure/table/wood, +/turf/open/floor/iron/grimy, +/area/station/command/bridge) "wnI" = ( /obj/item/sign, /obj/effect/spawner/random/structure/closet_empty/crate, @@ -91973,6 +91957,22 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/storage/tech) +"wVW" = ( +/obj/structure/sign/warning/deathsposal/directional/east, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/obj/machinery/disposal/bin/tagger, +/turf/open/floor/iron, +/area/station/science/xenobiology) "wWn" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/glass, @@ -117807,7 +117807,7 @@ rqy jKx rTW tuk -czI +lRM hvl uhb hSi @@ -122432,7 +122432,7 @@ wDq sEc xNv kpx -cHx +wVW dJD jDd jDd @@ -123447,7 +123447,7 @@ bID xwu fAe ybJ -etA +vgD euV pTC hlX @@ -131427,7 +131427,7 @@ qVJ qlp bBL iZt -fER +kBr nXI qVz iuU @@ -131856,7 +131856,7 @@ mcE kBz bhU cVe -aId +gzg tNu hnB fRo @@ -134721,7 +134721,7 @@ xms aaa wyH fIx -aWB +bSv cQv drj bog @@ -136266,7 +136266,7 @@ eTF jgq cQv sHn -vis +wnH wIe goc eVl @@ -136320,7 +136320,7 @@ irD irD rQB veM -vbt +vGO ako cBP pdl @@ -136343,7 +136343,7 @@ rhp tPm nJQ tGj -jgl +dPX xBc grq oQa @@ -136523,7 +136523,7 @@ cnW iGB cQv sHn -aYZ +vED rHn bCh eVl @@ -138655,10 +138655,10 @@ yho lvZ tOv iEN -czF +nBB fPw sYf -cdJ +bQC rrt qRF qRF @@ -142689,7 +142689,7 @@ qea eQr rgL eQr -iaK +vWT lhY aaa mjz @@ -148602,7 +148602,7 @@ tDt hMP ozm fJq -iRs +ioF aFv cDm pEz @@ -149658,7 +149658,7 @@ yaI qkv nTU yaI -rkL +ddO xnF tnR yaI @@ -150388,7 +150388,7 @@ qIH aaa aaa cjN -tPT +vuy agb ajc pyW diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm index 2101ef51e13..a285c2503ed 100644 --- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm +++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm @@ -313,7 +313,7 @@ "agV" = ( /obj/structure/closet/wardrobe/grey, /obj/item/clothing/under/dress/tango, -/obj/item/clothing/under/dress/redeveninggown, +/obj/item/clothing/under/dress/eveninggown, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "ahk" = ( diff --git a/code/datums/elements/gags_recolorable.dm b/code/datums/elements/gags_recolorable.dm index bf37a4ba973..93b21c5d31d 100644 --- a/code/datums/elements/gags_recolorable.dm +++ b/code/datums/elements/gags_recolorable.dm @@ -10,7 +10,7 @@ /datum/element/gags_recolorable/proc/on_examine(atom/source, mob/user, list/examine_text) SIGNAL_HANDLER - examine_text += span_notice("You could recolor [source.p_them()] with a spraycan...") + examine_text += span_notice("Now utilising PPP recolouring technology, capable of absorbing paint and pigments for changing it's colours!") /datum/element/gags_recolorable/proc/on_attackby(datum/source, obj/item/attacking_item, mob/user) SIGNAL_HANDLER diff --git a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm index f60bce952e7..28b31b025cc 100644 --- a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm +++ b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm @@ -333,6 +333,42 @@ SKYRAT EDIT END */ name = "Sundress (Worn)" icon_file = 'icons/mob/clothing/under/dress.dmi' +/datum/greyscale_config/striped_dress + name = "Striped dress" + icon_file = 'icons/obj/clothing/under/dress.dmi' + json_config = 'code/datums/greyscale/json_configs/striped_dress.json' + +/datum/greyscale_config/striped_dress/worn + name = "Striped dress (Worn)" + icon_file = 'icons/mob/clothing/under/dress.dmi' + +/datum/greyscale_config/evening_dress + name = "Evening gown" + icon_file = 'icons/obj/clothing/under/dress.dmi' + json_config = 'code/datums/greyscale/json_configs/eveningdress.json' + +/datum/greyscale_config/evening_dress/worn + name = "Evening gown (Worn)" + icon_file = 'icons/mob/clothing/under/dress.dmi' + +/datum/greyscale_config/cardiganskirt + name = "Cardigan Skirt" + icon_file = 'icons/obj/clothing/under/dress.dmi' + json_config = 'code/datums/greyscale/json_configs/cardiganskirt.json' + +/datum/greyscale_config/cardiganskirt/worn + name = "Cardigan Skirt(Worn)" + icon_file = 'icons/mob/clothing/under/dress.dmi' + +/datum/greyscale_config/sailor_dress + name = "Sailor Dress" + icon_file = 'icons/obj/clothing/under/dress.dmi' + json_config = 'code/datums/greyscale/json_configs/sailor_dress.json' + +/datum/greyscale_config/sailor_dress/worn + name = "Sailor Dress(Worn)" + icon_file = 'icons/mob/clothing/under/dress.dmi' + // SHIRTS, PANTS AND SHORTS /datum/greyscale_config/slacks name = "Slacks" diff --git a/code/datums/greyscale/json_configs/cardiganskirt.json b/code/datums/greyscale/json_configs/cardiganskirt.json new file mode 100644 index 00000000000..97a87b6405c --- /dev/null +++ b/code/datums/greyscale/json_configs/cardiganskirt.json @@ -0,0 +1,21 @@ +{ + "cardiganskirt": [ + { + "type": "icon_state", + "icon_state": "cardiganskirt_skirt", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "cardiganskirt_cardigan", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "cardiganskirt_collar", + "blend_mode": "overlay" + } + ] +} diff --git a/code/datums/greyscale/json_configs/eveningdress.json b/code/datums/greyscale/json_configs/eveningdress.json new file mode 100644 index 00000000000..d08dc95bbbe --- /dev/null +++ b/code/datums/greyscale/json_configs/eveningdress.json @@ -0,0 +1,10 @@ +{ + "evening_gown": [ + { + "type": "icon_state", + "icon_state": "evening_gown", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/sailor_dress.json b/code/datums/greyscale/json_configs/sailor_dress.json new file mode 100644 index 00000000000..86787f4a251 --- /dev/null +++ b/code/datums/greyscale/json_configs/sailor_dress.json @@ -0,0 +1,27 @@ +{ + "sailor_dress": [ + { + "type": "icon_state", + "icon_state": "sailor_dress_skirt", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "sailor_dress_jacket", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "sailor_dress_stripes", + "blend_mode": "overlay", + "color_ids": [ 3 ] + }, + { + "type": "icon_state", + "icon_state": "sailor_dress_badge", + "blend_mode": "overlay" + } + ] +} diff --git a/code/datums/greyscale/json_configs/striped_dress.json b/code/datums/greyscale/json_configs/striped_dress.json new file mode 100644 index 00000000000..e4b95329e46 --- /dev/null +++ b/code/datums/greyscale/json_configs/striped_dress.json @@ -0,0 +1,22 @@ +{ + "stripeddress": [ + { + "type": "icon_state", + "icon_state": "stripeddress_jacket", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "stripeddress_base", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "stripeddress_stripes", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ] +} diff --git a/code/modules/clothing/under/skirt_dress.dm b/code/modules/clothing/under/skirt_dress.dm index 0b870156f47..11ed224e9cf 100644 --- a/code/modules/clothing/under/skirt_dress.dm +++ b/code/modules/clothing/under/skirt_dress.dm @@ -6,18 +6,31 @@ icon = 'icons/obj/clothing/under/dress.dmi' worn_icon = 'icons/mob/clothing/under/dress.dmi' +/obj/item/clothing/under/dress/striped/Initialize(mapload) + . = ..() + AddElement(/datum/element/gags_recolorable) + update_icon(UPDATE_OVERLAYS) + /obj/item/clothing/under/dress/striped name = "striped dress" desc = "Fashion in space." - icon_state = "striped_dress" + icon_state = "stripeddress" inhand_icon_state = null female_sprite_flags = FEMALE_UNIFORM_FULL + greyscale_config = /datum/greyscale_config/striped_dress + greyscale_config_worn = /datum/greyscale_config/striped_dress/worn + flags_1 = IS_PLAYER_COLORABLE_1 + greyscale_colors = "#003284#000000#ffffff" /obj/item/clothing/under/dress/sailor name = "sailor dress" desc = "Formal wear for a leading lady." icon_state = "sailor_dress" - inhand_icon_state = null + greyscale_config = /datum/greyscale_config/sailor_dress + greyscale_config_worn = /datum/greyscale_config/sailor_dress/worn + greyscale_colors = "#0000ff#cc0000#eaeaea" + inhand_icon_state = "blackskirt" + flags_1 = IS_PLAYER_COLORABLE_1 /obj/item/clothing/under/dress/wedding_dress name = "wedding dress" @@ -27,17 +40,25 @@ body_parts_covered = CHEST|GROIN|LEGS flags_inv = HIDESHOES -/obj/item/clothing/under/dress/redeveninggown - name = "red evening gown" +/obj/item/clothing/under/dress/eveninggown + name = "evening gown" desc = "Fancy dress for space bar singers." - icon_state = "red_evening_gown" + icon_state = "evening_gown" inhand_icon_state = null + greyscale_config = /datum/greyscale_config/evening_dress + greyscale_config_worn = /datum/greyscale_config/evening_dress/worn + flags_1 = IS_PLAYER_COLORABLE_1 + greyscale_colors = "#e11f1f" /obj/item/clothing/under/dress/skirt - name = "black skirt" - desc = "A black skirt, very fancy!" - icon_state = "blackskirt" + name = "cardigan skirt" + desc = "A nice skirt with a cute cardigan, very fancy!" + icon_state = "cardiganskirt" + greyscale_config = /datum/greyscale_config/cardiganskirt + greyscale_config_worn = /datum/greyscale_config/cardiganskirt/worn + greyscale_colors = "#bf504d#545454" inhand_icon_state = "blackskirt" + flags_1 = IS_PLAYER_COLORABLE_1 /obj/item/clothing/under/dress/skirt/plaid name = "plaid skirt" diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 47276acb259..bf260ab76bc 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -82,7 +82,7 @@ /obj/item/clothing/under/costume/kilt = 1, /obj/item/clothing/under/dress/striped = 1, /obj/item/clothing/under/dress/sailor = 1, - /obj/item/clothing/under/dress/redeveninggown = 1, + /obj/item/clothing/under/dress/eveninggown = 1, /obj/item/clothing/under/misc/pj/blue = 2, /obj/item/clothing/under/misc/pj/red = 2, ), diff --git a/icons/mob/clothing/under/dress.dmi b/icons/mob/clothing/under/dress.dmi index be6e7715c48..e6cd3c27ac5 100644 Binary files a/icons/mob/clothing/under/dress.dmi and b/icons/mob/clothing/under/dress.dmi differ diff --git a/icons/obj/clothing/under/dress.dmi b/icons/obj/clothing/under/dress.dmi index d38b53746be..a79f390cd53 100644 Binary files a/icons/obj/clothing/under/dress.dmi and b/icons/obj/clothing/under/dress.dmi differ diff --git a/modular_skyrat/master_files/code/modules/clothing/under/skirts_dresses.dm b/modular_skyrat/master_files/code/modules/clothing/under/skirts_dresses.dm index 224bd78eccd..cef9c7c5eda 100644 --- a/modular_skyrat/master_files/code/modules/clothing/under/skirts_dresses.dm +++ b/modular_skyrat/master_files/code/modules/clothing/under/skirts_dresses.dm @@ -15,6 +15,10 @@ /obj/item/clothing/under/dress/skirt/skyrat //Just so they can stay under TG's skirts in case code needs subtypes of them (also SDMM dropdown looks nicer like this) icon = 'modular_skyrat/master_files/icons/obj/clothing/under/skirts_dresses.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/skirts_dresses.dmi' + // TG gave these greyscales but ours don't get them yet + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null //TG's icons only have a dress.dmi, but that means its not ABC-sorted to be beside shorts_pants_shirts.dmi. So its skirts_dresses for us. diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/skirts_dresses.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/skirts_dresses.dmi index 7253f892f6b..34abeab41a1 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/skirts_dresses.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/skirts_dresses.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/under/skirts_dresses.dmi b/modular_skyrat/master_files/icons/obj/clothing/under/skirts_dresses.dmi index 588c3a012f1..339160876f0 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/under/skirts_dresses.dmi and b/modular_skyrat/master_files/icons/obj/clothing/under/skirts_dresses.dmi differ diff --git a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm index 504c18629cf..7c977c1828b 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm @@ -748,7 +748,7 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ /datum/loadout_item/under/formal/red_gown name = "Red Evening Gown" - item_path = /obj/item/clothing/under/dress/redeveninggown + item_path = /obj/item/clothing/under/dress/eveninggown /datum/loadout_item/under/formal/sailor name = "Sailor Suit" diff --git a/tools/UpdatePaths/Scripts/65236_clothingunderrepath.txt b/tools/UpdatePaths/Scripts/65236_clothingunderrepath.txt index 8ca7a3750e3..f1b3da2a199 100644 --- a/tools/UpdatePaths/Scripts/65236_clothingunderrepath.txt +++ b/tools/UpdatePaths/Scripts/65236_clothingunderrepath.txt @@ -34,7 +34,7 @@ /obj/item/clothing/under/blacktango : /obj/item/clothing/under/dress/blacktango /obj/item/clothing/under/stripeddress : /obj/item/clothing/under/dress/striped /obj/item/clothing/under/sailordress : /obj/item/clothing/under/dress/sailor -/obj/item/clothing/under/redeveninggown : /obj/item/clothing/under/dress/redeveninggown +/obj/item/clothing/under/eveninggown : /obj/item/clothing/under/dress/eveninggown /obj/item/clothing/under/plaid_skirt : /obj/item/clothing/under/dress/skirt/plaid /obj/item/clothing/under/plaid_skirt/blue : /obj/item/clothing/under/dress/skirt/plaid/blue /obj/item/clothing/under/plaid_skirt/purple : /obj/item/clothing/under/dress/skirt/plaid/purple