From ef71cfb9e2273df4dd6761fbe4181081a652623e Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 1 Aug 2023 18:14:44 +0200 Subject: [PATCH] [MIRROR] Updates all the icons in under/suits.dmi and related sorting/cleanup [MDB IGNORE] (#22819) * Updates all the icons in under/suits.dmi and related sorting/cleanup (#76865) Somebody was pointing out how our suits varied WILDLY in quality Figured I'd go through and tidy them up * Updates all the icons in under/suits.dmi and related sorting/cleanup * Rename Amish suit, remove scratch suit (was removed upstream) * Fixes a rogue path --------- Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com> Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com> --- _maps/RandomZLevels/moonoutpost19.dmm | 792 ++--- .../map_files/IceBoxStation/IceBoxStation.dmm | 3094 ++++++++--------- _maps/map_files/MetaStation/MetaStation.dmm | 255 +- .../greyscale_configs/greyscale_clothes.dm | 4 +- .../json_configs/buttondown_shorts.json | 6 +- .../json_configs/buttondown_slacks.json | 6 +- code/game/objects/effects/spawners/costume.dm | 6 +- code/game/objects/items/storage/backpack.dm | 2 +- .../crates_lockers/closets/job_closets.dm | 6 +- .../crates_lockers/closets/secure/medical.dm | 3 +- code/modules/admin/topic.dm | 2 +- code/modules/clothing/outfits/standard.dm | 2 +- code/modules/clothing/under/costume.dm | 13 + .../clothing/under/jobs/civilian/civilian.dm | 2 +- code/modules/clothing/under/suits.dm | 167 +- code/modules/jobs/job_types/psychologist.dm | 2 +- code/modules/mafia/outfits.dm | 4 +- code/modules/vending/autodrobe.dm | 6 +- code/modules/vending/clothesmate.dm | 2 +- code/modules/vending/wardrobes.dm | 6 +- icons/mob/clothing/under/suits.dmi | Bin 23075 -> 8369 bytes .../clothing/under/shorts_pants_shirts.dmi | Bin 1469 -> 1519 bytes icons/obj/clothing/under/suits.dmi | Bin 8699 -> 3404 bytes .../under/loadout_datum_under.dm | 8 +- .../modules/modular_vending/code/wardrobes.dm | 2 +- 25 files changed, 2179 insertions(+), 2211 deletions(-) diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index 0217ec7b820..010ed2b20ab 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -199,9 +199,12 @@ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) -"bj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/turf/open/floor/plating, +"bg" = ( +/obj/machinery/light/warm/no_nightlight/directional/west, +/obj/item/cigbutt{ + pixel_x = 4 + }, +/turf/open/floor/plastic, /area/awaymission/moonoutpost19/arrivals) "bk" = ( /obj/effect/turf_decal/siding/wood/corner{ @@ -246,6 +249,26 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) +"br" = ( +/obj/machinery/light/small/directional/north, +/obj/structure/window/reinforced/spawner/directional/east{ + layer = 2.9 + }, +/obj/structure/table, +/obj/structure/bedsheetbin, +/obj/item/clothing/neck/tie/black, +/obj/item/clothing/under/costume/buttondown/slacks/service, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria{ + initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; + temperature = 251 + }, +/area/awaymission/moonoutpost19/arrivals) "bt" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -266,10 +289,6 @@ temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) -"bA" = ( -/obj/structure/reagent_dispensers/fueltank/large, -/turf/open/floor/plastic, -/area/awaymission/moonoutpost19/arrivals) "bJ" = ( /obj/structure/alien/weeds, /obj/structure/alien/egg/burst, @@ -305,9 +324,6 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) -"ce" = ( -/turf/closed/indestructible/reinforced, -/area/awaymission/moonoutpost19/arrivals) "cn" = ( /obj/structure/railing{ dir = 5 @@ -413,6 +429,27 @@ /obj/effect/turf_decal/siding/thinplating_new/light, /turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) +"cZ" = ( +/obj/structure/closet/firecloset{ + name = "fire-proof closet" + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/tank/internals/plasma/full{ + pixel_y = -8 + }, +/obj/item/tank/internals/plasma/full{ + pixel_y = -4 + }, +/obj/item/fuel_pellet, +/obj/item/fuel_pellet{ + pixel_y = 4 + }, +/obj/item/fuel_pellet{ + pixel_y = 8 + }, +/obj/item/clothing/under/shorts/black, +/turf/open/floor/plastic, +/area/awaymission/moonoutpost19/arrivals) "dd" = ( /obj/structure/fluff/minepost, /obj/item/stack/sheet/mineral/plasma/thirty, @@ -467,6 +504,16 @@ temperature = 251 }, /area/awaymission/moonoutpost19/main) +"dw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/plating, +/area/awaymission/moonoutpost19/arrivals) "dz" = ( /obj/structure/alien/weeds, /obj/structure/bed/nest, @@ -503,13 +550,16 @@ }, /area/awaymission/moonoutpost19/arrivals) "dP" = ( -/obj/machinery/airalarm/directional/east{ - req_access = "150" +/obj/structure/railing{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/airalarm/unlocked, -/turf/open/floor/iron, -/area/awaymission/moonoutpost19/syndicate) +/obj/item/cigbutt{ + pixel_x = -6 + }, +/obj/item/cigbutt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/plastic, +/area/awaymission/moonoutpost19/arrivals) "dR" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral, @@ -699,13 +749,6 @@ temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) -"eU" = ( -/obj/machinery/door/poddoor/shutters{ - id = "awaymission19atvs" - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/moonoutpost19/arrivals) "fb" = ( /obj/effect/turf_decal/stripes/asteroid/line, /obj/effect/turf_decal/lunar_sand/plating, @@ -786,13 +829,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) -"fD" = ( -/obj/machinery/door/puzzle/keycard{ - name = "ATV Shed Door"; - puzzle_id = "atvs" - }, -/turf/open/floor/plating, -/area/awaymission/moonoutpost19/arrivals) "fE" = ( /obj/machinery/door/poddoor/preopen{ desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating."; @@ -986,15 +1022,6 @@ /obj/structure/alien/weeds, /turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) -"gK" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/lunar_sand/plating, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/turf/open/floor/plating, -/area/awaymission/moonoutpost19/arrivals) "gM" = ( /obj/structure/disposalpipe/segment{ desc = "An underfloor disposal pipe. This one has been applied with an acid-proof coating."; @@ -1154,29 +1181,12 @@ temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) -"hZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/turf/open/floor/plating, -/area/awaymission/moonoutpost19/arrivals) "ib" = ( /obj/item/stack/sheet/mineral/wood, /turf/open/misc/asteroid/moon{ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) -"ic" = ( -/obj/effect/turf_decal/caution/stand_clear{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/turf/open/floor/plating, -/area/awaymission/moonoutpost19/arrivals) "ij" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/closed, @@ -1332,14 +1342,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/moonoutpost19/syndicate) -"jc" = ( -/obj/structure/extinguisher_cabinet/directional/south, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/lunar_sand/plating, -/turf/open/floor/plating, -/area/awaymission/moonoutpost19/arrivals) "je" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/duct, @@ -1535,6 +1537,11 @@ dir = 1 }, /area/awaymission/moonoutpost19/research) +"kF" = ( +/obj/item/radio/intercom/directional/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plastic, +/area/awaymission/moonoutpost19/arrivals) "kH" = ( /obj/machinery/door/firedoor, /obj/structure/extinguisher_cabinet/directional/south, @@ -1575,19 +1582,6 @@ /obj/structure/sign/poster/contraband/smoke/directional/south, /turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/arrivals) -"kU" = ( -/obj/machinery/light/warm/no_nightlight/directional/west, -/obj/item/cigbutt{ - pixel_x = 4 - }, -/turf/open/floor/plastic, -/area/awaymission/moonoutpost19/arrivals) -"kW" = ( -/obj/machinery/door/poddoor/shutters{ - id = "awaymission19atvs" - }, -/turf/open/floor/plating, -/area/awaymission/moonoutpost19/arrivals) "kX" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/misc/asteroid/moon{ @@ -2123,6 +2117,15 @@ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) +"nK" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/lunar_sand/plating, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/plating, +/area/awaymission/moonoutpost19/arrivals) "nL" = ( /obj/structure/table, /obj/machinery/recharger{ @@ -2151,6 +2154,21 @@ /obj/machinery/door/airlock/maintenance, /turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) +"nZ" = ( +/obj/item/key/atv{ + pixel_x = -6; + pixel_y = 26 + }, +/obj/structure/noticeboard/directional/north{ + pixel_x = -15; + pixel_y = 26 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, +/area/awaymission/moonoutpost19/arrivals) "od" = ( /obj/effect/decal/cleanable/xenoblood/xgibs/larva/body, /turf/open/misc/asteroid/moon{ @@ -2274,13 +2292,6 @@ /obj/item/clothing/under/rank/engineering/atmospheric_technician, /turf/open/floor/plating, /area/awaymission/moonoutpost19/research) -"oQ" = ( -/obj/machinery/computer/exoscanner_control, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/floor/plastic, -/area/awaymission/moonoutpost19/arrivals) "oV" = ( /obj/machinery/firealarm/directional/east, /obj/effect/decal/cleanable/dirt, @@ -2371,26 +2382,6 @@ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/syndicate) -"pF" = ( -/obj/machinery/light/small/directional/north, -/obj/structure/window/reinforced/spawner/directional/east{ - layer = 2.9 - }, -/obj/structure/table, -/obj/structure/bedsheetbin, -/obj/item/clothing/neck/tie/black, -/obj/item/clothing/under/suit/black, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/cafeteria{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - temperature = 251 - }, -/area/awaymission/moonoutpost19/arrivals) "pH" = ( /obj/structure/table, /obj/item/folder/red, @@ -2415,6 +2406,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/moonoutpost19/research) +"pO" = ( +/obj/structure/reagent_dispensers/fueltank/large, +/turf/open/floor/plastic, +/area/awaymission/moonoutpost19/arrivals) "pP" = ( /obj/machinery/door/airlock{ name = "Unit 2" @@ -2490,6 +2485,15 @@ }, /turf/open/floor/carpet, /area/awaymission/moonoutpost19/arrivals) +"qc" = ( +/obj/machinery/light/floor, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/lunar_sand/plating, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/turf/open/floor/plating, +/area/awaymission/moonoutpost19/arrivals) "qg" = ( /obj/effect/decal/cleanable/generic, /obj/effect/decal/cleanable/dirt, @@ -2634,6 +2638,22 @@ }, /turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) +"qY" = ( +/obj/structure/closet/mini_fridge/grimy, +/obj/item/food/pizzaslice/margherita, +/obj/item/food/pizzaslice/margherita{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/food/pizzaslice/ants{ + pixel_x = -4; + pixel_y = 7 + }, +/obj/structure/fluff/paper/corner, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/pod/dark, +/area/awaymission/moonoutpost19/tent) "ra" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -2728,17 +2748,6 @@ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) -"rw" = ( -/obj/machinery/light/floor, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/lunar_sand/plating, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/open/floor/plating, -/area/awaymission/moonoutpost19/arrivals) "rx" = ( /obj/structure/disposaloutlet, /obj/structure/disposalpipe/trunk{ @@ -2900,6 +2909,14 @@ temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) +"ss" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/lunar_sand/plating, +/turf/open/floor/plating, +/area/awaymission/moonoutpost19/arrivals) "st" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -2981,6 +2998,17 @@ temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) +"sX" = ( +/obj/structure/rack, +/obj/item/stack/ducts/fifty, +/obj/item/weldingtool{ + pixel_x = 7 + }, +/obj/item/weldingtool{ + pixel_x = -7 + }, +/turf/open/floor/plating, +/area/awaymission/moonoutpost19/arrivals) "sY" = ( /obj/machinery/vending/coffee, /obj/effect/turf_decal/siding/thinplating_new/light{ @@ -3000,18 +3028,6 @@ "tb" = ( /turf/closed/mineral/random, /area/awaymission/moonoutpost19/mines) -"tc" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/dark, -/area/awaymission/moonoutpost19/syndicate) "ti" = ( /obj/structure/fence/corner, /turf/open/misc/asteroid/moon{ @@ -3142,6 +3158,13 @@ temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) +"uf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/plating, +/area/awaymission/moonoutpost19/arrivals) "ug" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/lunar_sand, @@ -3192,6 +3215,18 @@ }, /turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) +"uz" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner, +/obj/item/cigbutt{ + pixel_x = -9; + pixel_y = -6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/plastic, +/area/awaymission/moonoutpost19/arrivals) "uF" = ( /obj/machinery/light/small/directional/east, /turf/open/misc/asteroid/moon{ @@ -3233,10 +3268,6 @@ /obj/item/clothing/under/misc/assistantformal, /turf/open/floor/carpet/red, /area/awaymission/moonoutpost19/arrivals) -"uO" = ( -/obj/effect/turf_decal/lunar_sand, -/turf/open/floor/plating, -/area/awaymission/moonoutpost19/arrivals) "uR" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical{ @@ -3410,22 +3441,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/closed/wall/r_wall, /area/awaymission/moonoutpost19/research) -"vI" = ( -/obj/structure/closet/mini_fridge/grimy, -/obj/item/food/pizzaslice/margherita, -/obj/item/food/pizzaslice/margherita{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/food/pizzaslice/ants{ - pixel_x = -4; - pixel_y = 7 - }, -/obj/structure/fluff/paper/corner, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, -/turf/open/floor/pod/dark, -/area/awaymission/moonoutpost19/tent) "vK" = ( /obj/machinery/power/terminal{ dir = 4 @@ -3435,6 +3450,13 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/moonoutpost19/research) +"vL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/plating, +/area/awaymission/moonoutpost19/arrivals) "vR" = ( /obj/structure/bed, /obj/item/bedsheet, @@ -3660,15 +3682,6 @@ temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) -"xF" = ( -/obj/vehicle/ridden/atv{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating, -/area/awaymission/moonoutpost19/arrivals) "xG" = ( /obj/machinery/firealarm/directional/east, /obj/effect/decal/cleanable/dirt, @@ -3806,6 +3819,15 @@ temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) +"yO" = ( +/obj/vehicle/ridden/atv{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/awaymission/moonoutpost19/arrivals) "yP" = ( /obj/item/pen{ pixel_x = -8 @@ -3896,6 +3918,11 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/moonoutpost19/research) +"zw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/plating, +/area/awaymission/moonoutpost19/arrivals) "zx" = ( /obj/structure/table, /obj/item/radio/off, @@ -3954,6 +3981,13 @@ /obj/effect/turf_decal/lunar_sand/plating, /turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) +"zM" = ( +/obj/effect/turf_decal/caution/stand_clear{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/plating, +/area/awaymission/moonoutpost19/arrivals) "zN" = ( /obj/structure/sink{ pixel_y = 28 @@ -4145,6 +4179,13 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) +"Bg" = ( +/obj/machinery/computer/exoscanner_control, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/plastic, +/area/awaymission/moonoutpost19/arrivals) "Bk" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/duct, @@ -4355,11 +4396,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) -"Cv" = ( -/obj/item/radio/intercom/directional/west, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plastic, -/area/awaymission/moonoutpost19/arrivals) "CK" = ( /obj/structure/toilet{ dir = 4 @@ -4417,13 +4453,6 @@ }, /turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) -"De" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/plating, -/area/awaymission/moonoutpost19/arrivals) "Df" = ( /obj/structure/grille/broken, /obj/item/stack/rods, @@ -4483,6 +4512,13 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) +"Dt" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/chair/plastic, +/turf/open/floor/plastic, +/area/awaymission/moonoutpost19/arrivals) "Dw" = ( /obj/item/stack/tile/iron, /turf/open/misc/asteroid/moon{ @@ -4504,17 +4540,6 @@ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) -"DG" = ( -/obj/structure/rack, -/obj/item/stack/ducts/fifty, -/obj/item/weldingtool{ - pixel_x = 7 - }, -/obj/item/weldingtool{ - pixel_x = -7 - }, -/turf/open/floor/plating, -/area/awaymission/moonoutpost19/arrivals) "DH" = ( /obj/structure/grille/broken, /obj/item/stack/rods, @@ -4546,6 +4571,12 @@ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) +"DR" = ( +/obj/machinery/door/poddoor/shutters{ + id = "awaymission19atvs" + }, +/turf/open/floor/plating, +/area/awaymission/moonoutpost19/arrivals) "DS" = ( /obj/structure/fence{ dir = 4 @@ -4561,11 +4592,6 @@ }, /turf/open/floor/iron/freezer, /area/awaymission/moonoutpost19/arrivals) -"DX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/turf/open/floor/plating, -/area/awaymission/moonoutpost19/arrivals) "DZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/siding/thinplating_new/light/corner{ @@ -4573,6 +4599,23 @@ }, /turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) +"Ea" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ + pixel_x = -5; + pixel_y = 15 + }, +/obj/item/reagent_containers/cup/glass/colocup{ + pixel_x = -9 + }, +/obj/machinery/button/door{ + id = "awaymission19atvs"; + name = "Biohazard Shutter Control"; + pixel_y = 8; + req_access = "201" + }, +/turf/open/floor/plastic, +/area/awaymission/moonoutpost19/arrivals) "Eg" = ( /obj/machinery/conveyor{ id = "awaysyndie" @@ -4908,6 +4951,14 @@ }, /turf/open/floor/iron/cafeteria, /area/awaymission/moonoutpost19/arrivals) +"GI" = ( +/obj/machinery/airalarm/directional/east{ + req_access = "150" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airalarm/unlocked, +/turf/open/floor/iron, +/area/awaymission/moonoutpost19/syndicate) "GK" = ( /obj/structure/table, /obj/item/book/manual/wiki/detective, @@ -5087,6 +5138,16 @@ }, /turf/open/floor/iron, /area/awaymission/moonoutpost19/research) +"HX" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/components/unary/portables_connector{ + dir = 1 + }, +/turf/open/floor/plastic, +/area/awaymission/moonoutpost19/arrivals) "HY" = ( /obj/structure/sign/departments/science{ pixel_y = 32 @@ -5170,23 +5231,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/awaymission/moonoutpost19/research) -"Iv" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ - pixel_x = -5; - pixel_y = 15 - }, -/obj/item/reagent_containers/cup/glass/colocup{ - pixel_x = -9 - }, -/obj/machinery/button/door{ - id = "awaymission19atvs"; - name = "Biohazard Shutter Control"; - pixel_y = 8; - req_access = "201" - }, -/turf/open/floor/plastic, -/area/awaymission/moonoutpost19/arrivals) "IB" = ( /obj/structure/chair/pew/right{ dir = 8 @@ -5217,25 +5261,6 @@ "IP" = ( /turf/closed/wall/mineral/titanium/survival, /area/awaymission/moonoutpost19/tent) -"IU" = ( -/obj/vehicle/ridden/atv{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, -/area/awaymission/moonoutpost19/arrivals) -"IV" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/dark, -/area/awaymission/moonoutpost19/syndicate) "IW" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -5291,6 +5316,24 @@ }, /turf/open/floor/plating, /area/awaymission/moonoutpost19/research) +"Ji" = ( +/obj/machinery/door/puzzle/keycard{ + name = "ATV Shed Door"; + puzzle_id = "atvs" + }, +/turf/open/floor/plating, +/area/awaymission/moonoutpost19/arrivals) +"Jj" = ( +/obj/machinery/light/floor, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/lunar_sand/plating, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/open/floor/plating, +/area/awaymission/moonoutpost19/arrivals) "Jl" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -5347,6 +5390,10 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/syndicate) +"JD" = ( +/obj/structure/chair/stool/directional/south, +/turf/open/floor/iron, +/area/awaymission/moonoutpost19/syndicate) "JF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red, @@ -5484,6 +5531,10 @@ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) +"KI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/plating, +/area/awaymission/moonoutpost19/arrivals) "KL" = ( /obj/structure/table, /obj/item/clothing/gloves/latex, @@ -5494,21 +5545,6 @@ dir = 1 }, /area/awaymission/moonoutpost19/research) -"KS" = ( -/obj/item/key/atv{ - pixel_x = -6; - pixel_y = 26 - }, -/obj/structure/noticeboard/directional/north{ - pixel_x = -15; - pixel_y = 26 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plating, -/area/awaymission/moonoutpost19/arrivals) "Lc" = ( /obj/machinery/conveyor{ id = "awaysyndie" @@ -5591,6 +5627,14 @@ }, /turf/open/floor/iron/white/corner, /area/awaymission/moonoutpost19/arrivals) +"LN" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/lunar_sand/plating, +/turf/open/floor/plating, +/area/awaymission/moonoutpost19/arrivals) "LQ" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 4 @@ -5658,6 +5702,14 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/engine, /area/awaymission/moonoutpost19/research) +"Mn" = ( +/obj/vehicle/ridden/atv{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/awaymission/moonoutpost19/arrivals) "Mt" = ( /obj/structure/table, /obj/item/toy/cards/deck, @@ -5700,15 +5752,6 @@ }, /turf/open/floor/plating, /area/awaymission/moonoutpost19/research) -"ME" = ( -/obj/machinery/light/floor, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/lunar_sand/plating, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/plating, -/area/awaymission/moonoutpost19/arrivals) "MF" = ( /obj/structure/flora/rock/style_random{ pixel_y = -2 @@ -5963,6 +6006,10 @@ }, /turf/open/floor/iron, /area/awaymission/moonoutpost19/research) +"Ol" = ( +/obj/effect/turf_decal/lunar_sand, +/turf/open/floor/plating, +/area/awaymission/moonoutpost19/arrivals) "Oq" = ( /obj/structure/alien/weeds, /obj/structure/alien/resin/membrane, @@ -6218,6 +6265,18 @@ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) +"Pz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark, +/area/awaymission/moonoutpost19/syndicate) "PE" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 8 @@ -6257,18 +6316,6 @@ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) -"PL" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, -/obj/item/cigbutt{ - pixel_x = -9; - pixel_y = -6 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/turf/open/floor/plastic, -/area/awaymission/moonoutpost19/arrivals) "PP" = ( /obj/item/stack/ore/silver{ amount = 11 @@ -6374,21 +6421,6 @@ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) -"Qv" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/plating, -/area/awaymission/moonoutpost19/arrivals) -"Qw" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/turf_decal/lunar_sand/plating, -/turf/open/floor/plating, -/area/awaymission/moonoutpost19/arrivals) "Qx" = ( /obj/effect/turf_decal/lunar_sand/plating, /turf/open/floor/pod/light, @@ -6473,27 +6505,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) -"Rf" = ( -/obj/structure/closet/firecloset{ - name = "fire-proof closet" - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/tank/internals/plasma/full{ - pixel_y = -8 - }, -/obj/item/tank/internals/plasma/full{ - pixel_y = -4 - }, -/obj/item/fuel_pellet, -/obj/item/fuel_pellet{ - pixel_y = 4 - }, -/obj/item/fuel_pellet{ - pixel_y = 8 - }, -/obj/item/clothing/under/shorts/black, -/turf/open/floor/plastic, -/area/awaymission/moonoutpost19/arrivals) "Rk" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/siding/thinplating_new/light/corner{ @@ -6644,6 +6655,17 @@ temperature = 251 }, /area/awaymission/moonoutpost19/syndicate) +"Si" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/awaymission/moonoutpost19/syndicate) "Sk" = ( /obj/structure/bed, /obj/item/bedsheet, @@ -6703,6 +6725,19 @@ }, /turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) +"SC" = ( +/obj/item/key/atv{ + pixel_x = 12; + pixel_y = 24 + }, +/obj/item/flashlight{ + pixel_x = -3; + pixel_y = 4 + }, +/obj/structure/rack, +/obj/item/flashlight, +/turf/open/floor/plating, +/area/awaymission/moonoutpost19/arrivals) "SD" = ( /obj/item/trash/can{ pixel_x = 7; @@ -6754,6 +6789,13 @@ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/main) +"SL" = ( +/obj/machinery/door/poddoor/shutters{ + id = "awaymission19atvs" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/moonoutpost19/arrivals) "SX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/siding/purple{ @@ -6902,17 +6944,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/awaymission/moonoutpost19/arrivals) -"Ug" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/item/cigbutt{ - pixel_x = -6 - }, -/obj/item/cigbutt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/turf/open/floor/plastic, -/area/awaymission/moonoutpost19/arrivals) "Uh" = ( /obj/machinery/space_heater, /obj/machinery/light/small/directional/north, @@ -7270,19 +7301,6 @@ temperature = 251 }, /area/awaymission/moonoutpost19/arrivals) -"WN" = ( -/obj/item/key/atv{ - pixel_x = 12; - pixel_y = 24 - }, -/obj/item/flashlight{ - pixel_x = -3; - pixel_y = 4 - }, -/obj/structure/rack, -/obj/item/flashlight, -/turf/open/floor/plating, -/area/awaymission/moonoutpost19/arrivals) "WP" = ( /obj/structure/table, /obj/item/mmi, @@ -7356,6 +7374,15 @@ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251" }, /area/awaymission/moonoutpost19/arrivals) +"Xe" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/effect/mapping_helpers/apc/unlocked, +/obj/effect/mapping_helpers/apc/cell_10k, +/obj/structure/cable, +/obj/effect/turf_decal/lunar_sand, +/turf/open/floor/plating, +/area/awaymission/moonoutpost19/arrivals) "Xf" = ( /obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, @@ -7482,15 +7509,6 @@ }, /turf/open/floor/iron, /area/awaymission/moonoutpost19/research) -"Yg" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/mapping_helpers/apc/full_charge, -/obj/effect/mapping_helpers/apc/unlocked, -/obj/effect/mapping_helpers/apc/cell_10k, -/obj/structure/cable, -/obj/effect/turf_decal/lunar_sand, -/turf/open/floor/plating, -/area/awaymission/moonoutpost19/arrivals) "Yh" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -7542,11 +7560,7 @@ /turf/open/floor/iron, /area/awaymission/moonoutpost19/arrivals) "YE" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/chair/plastic, -/turf/open/floor/plastic, +/turf/closed/indestructible/reinforced, /area/awaymission/moonoutpost19/arrivals) "YF" = ( /obj/structure/closet/secure_closet/personal/cabinet{ @@ -7583,16 +7597,6 @@ /obj/structure/frame/machine, /turf/open/floor/iron/dark, /area/awaymission/moonoutpost19/arrivals) -"YP" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/atmospherics/components/unary/portables_connector{ - dir = 1 - }, -/turf/open/floor/plastic, -/area/awaymission/moonoutpost19/arrivals) "YR" = ( /obj/effect/decal/cleanable/blood/tracks{ desc = "Your instincts say you shouldn't be following these."; @@ -7753,10 +7757,6 @@ }, /turf/open/floor/iron, /area/awaymission/moonoutpost19/syndicate) -"ZF" = ( -/obj/structure/chair/stool/directional/south, -/turf/open/floor/iron, -/area/awaymission/moonoutpost19/syndicate) "ZH" = ( /obj/structure/chair{ dir = 8 @@ -31644,13 +31644,13 @@ My My My Ia -ce +YE hI -ce +YE hI -ce +YE hI -ce +YE dA dA dA @@ -31901,12 +31901,12 @@ My My My Qs -ce -Rf -Cv -kU -bA -Iv +YE +cZ +kF +bg +pO +Ea hI dA dA @@ -32158,12 +32158,12 @@ My My My Ia -ce -oQ YE -PL -Ug -YP +Bg +Dt +uz +dP +HX hI dA dA @@ -32415,13 +32415,13 @@ My Wg My Qs -ce -WN -IU -ic -xF -DG -ce +YE +SC +Mn +zM +yO +sX +YE dA dA dA @@ -32672,12 +32672,12 @@ My My My Qs -ce -KS -De -bj -hZ -Qv +YE +nZ +uf +KI +dw +vL hI dA dA @@ -32929,11 +32929,11 @@ My My My Qs -ce -Yg +YE +Xe Ue -DX -uO +zw +Ol Ue hI dA @@ -33186,13 +33186,13 @@ My My My Uj -ce -Qw -ME -gK -rw -jc -ce +YE +LN +qc +nK +Jj +ss +YE dA dA dA @@ -33443,13 +33443,13 @@ My My My xm -ce -eU -kW -fD -kW -kW -ce +YE +SL +DR +Ji +DR +DR +YE dA dA Wg @@ -37484,7 +37484,7 @@ IP MW ZY CP -vI +qY Au Bz My @@ -39090,7 +39090,7 @@ hI hI hJ hJ -pF +br RY dF WF @@ -41264,9 +41264,9 @@ hq Ii hO ut -tc +Pz Pn -ZF +JD GE at iW @@ -42292,9 +42292,9 @@ zO EI hO gN -IV +Si xk -dP +GI OJ at wD diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 7779d7d6a4d..5cd4f981989 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -41,6 +41,10 @@ /obj/item/flashlight/lamp/green, /turf/open/floor/carpet/red, /area/station/commons/vacant_room/office) +"aaX" = ( +/obj/structure/chair/sofa/bench/right, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "abb" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 5 @@ -3538,11 +3542,6 @@ /obj/structure/reagent_dispensers/plumbed, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) -"bgn" = ( -/obj/structure/railing, -/obj/structure/flora/grass/green/style_random, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "bgs" = ( /obj/structure/sign/poster/random/directional/east, /obj/structure/cable, @@ -6161,6 +6160,12 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/eighties/red, /area/station/security/prison/safe) +"bSz" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "bSG" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 8 @@ -10763,10 +10768,6 @@ dir = 8 }, /area/station/security/brig/entrance) -"dla" = ( -/obj/structure/marker_beacon/cerulean, -/turf/open/genturf, -/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "dlt" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 8 @@ -12256,10 +12257,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply, /turf/open/floor/iron/dark, /area/station/medical/virology) -"dJf" = ( -/obj/structure/chair/sofa/bench/right, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "dJx" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -12498,12 +12495,6 @@ }, /turf/open/floor/iron, /area/station/command/bridge) -"dNf" = ( -/obj/structure/railing{ - dir = 6 - }, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "dNt" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -13475,22 +13466,6 @@ /obj/effect/mapping_helpers/mail_sorting/engineering/atmospherics, /turf/open/floor/iron, /area/station/engineering/lobby) -"eff" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/industrial_lift{ - radial_travel = 0 - }, -/obj/structure/railing{ - dir = 5 - }, -/obj/machinery/elevator_control_panel/directional/north{ - linked_elevator_id = "publicElevator"; - preset_destination_names = list("3"="Icemoon Level","4"="Station Level") - }, -/turf/open/floor/plating/elevatorshaft, -/area/mine/storage) "efh" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/machinery/computer/slot_machine{ @@ -14033,6 +14008,12 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"enX" = ( +/obj/structure/railing{ + dir = 6 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "eog" = ( /obj/structure/table/wood, /obj/machinery/newscaster/directional/north, @@ -16693,6 +16674,10 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore) +"fhB" = ( +/obj/structure/chair/sofa/bench/left, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "fhL" = ( /obj/item/clothing/suit/apron/surgical, /obj/effect/mapping_helpers/broken_floor, @@ -17481,6 +17466,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"fuZ" = ( +/obj/structure/railing, +/obj/structure/flora/tree/pine/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "fvk" = ( /turf/open/floor/glass/reinforced, /area/station/science/xenobiology) @@ -18595,12 +18585,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/kitchen/diagonal, /area/station/service/kitchen) -"fMU" = ( -/obj/structure/railing, -/obj/structure/marker_beacon/cerulean, -/obj/structure/flora/tree/pine/style_random, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "fNa" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/emcloset, @@ -20521,11 +20505,6 @@ dir = 9 }, /area/station/science/research) -"gwq" = ( -/obj/structure/railing, -/obj/structure/marker_beacon/cerulean, -/turf/open/genturf, -/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "gwy" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/flora/bush/sparsegrass/style_random, @@ -24125,6 +24104,9 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"hHG" = ( +/turf/open/cliff/snowrock, +/area/icemoon/surface/outdoors/nospawn) "hHI" = ( /obj/machinery/chem_dispenser, /obj/effect/turf_decal/tile/yellow/full, @@ -25928,10 +25910,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/service/bar) -"ikV" = ( -/obj/structure/chair/sofa/bench/left, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "ikW" = ( /obj/structure/railing/corner{ dir = 8 @@ -29218,6 +29196,12 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"jpx" = ( +/obj/structure/railing{ + dir = 10 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "jpy" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -31886,6 +31870,10 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/atmos) +"khz" = ( +/obj/structure/marker_beacon/cerulean, +/turf/open/genturf, +/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "khA" = ( /obj/machinery/firealarm/directional/west, /obj/item/kirbyplants/random, @@ -33359,6 +33347,9 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/cargo/sorting) +"kDs" = ( +/turf/closed/mineral/snowmountain/cavern/icemoon, +/area/icemoon/surface/outdoors/nospawn) "kDu" = ( /obj/machinery/reagentgrinder, /obj/structure/table, @@ -33950,9 +33941,6 @@ /obj/structure/cable, /turf/open/floor/iron/large, /area/station/engineering/atmos/storage/gas) -"kNo" = ( -/turf/closed/mineral/snowmountain/cavern/icemoon, -/area/icemoon/surface/outdoors/nospawn) "kNp" = ( /obj/structure/cable, /turf/open/floor/iron/dark/telecomms, @@ -34100,6 +34088,11 @@ }, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +"kPS" = ( +/obj/structure/railing, +/obj/structure/marker_beacon/cerulean, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "kQc" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -35153,6 +35146,11 @@ }, /turf/open/floor/iron/textured, /area/station/security/brig) +"lgH" = ( +/obj/structure/flora/tree/pine/style_random, +/obj/structure/marker_beacon/cerulean, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "lgK" = ( /turf/closed/wall, /area/station/security/prison/visit) @@ -36964,11 +36962,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"lKW" = ( -/obj/structure/railing, -/obj/structure/flora/tree/pine/style_random, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "lKZ" = ( /obj/structure/railing/corner{ dir = 8 @@ -42225,10 +42218,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) -"nxo" = ( -/obj/structure/fake_stairs/wood/directional/north, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "nxD" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42434,11 +42423,6 @@ dir = 1 }, /area/station/medical/chemistry) -"nzO" = ( -/obj/structure/railing, -/obj/structure/marker_beacon/cerulean, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "nzT" = ( /obj/effect/turf_decal/trimline/white/end{ dir = 8 @@ -43865,15 +43849,6 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/wood/parquet, /area/station/commons/lounge) -"nWB" = ( -/obj/structure/closet, -/obj/item/clothing/under/suit/black, -/obj/item/clothing/under/rank/civilian/lawyer/black/skirt, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/station/commons/dorms/laundry) "nWH" = ( /turf/closed/wall, /area/station/maintenance/department/cargo) @@ -45322,6 +45297,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/courtroom) +"otC" = ( +/obj/structure/railing, +/turf/open/genturf, +/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "otK" = ( /obj/machinery/light_switch/directional/west, /obj/structure/disposalpipe/segment, @@ -45820,11 +45799,6 @@ /obj/structure/table, /turf/open/floor/plating, /area/station/hallway/secondary/service) -"oBr" = ( -/obj/structure/flora/tree/pine/style_random, -/obj/structure/marker_beacon/cerulean, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "oBs" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=Security"; @@ -46147,10 +46121,6 @@ }, /turf/open/floor/plating, /area/station/cargo/drone_bay) -"oGj" = ( -/obj/structure/railing, -/turf/open/genturf, -/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "oGm" = ( /obj/machinery/power/solar_control{ dir = 1; @@ -50731,10 +50701,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/carpet/red, /area/station/security/prison/work) -"qdI" = ( -/obj/structure/marker_beacon/cerulean, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "qdK" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -53182,6 +53148,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/command/meeting_room) +"qRv" = ( +/obj/structure/railing, +/obj/structure/marker_beacon/cerulean, +/obj/structure/flora/tree/pine/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "qRO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -54737,9 +54709,6 @@ /obj/machinery/light_switch/directional/west, /turf/open/floor/iron/dark, /area/station/medical/virology) -"rrb" = ( -/turf/open/lava/plasma/ice_moon, -/area/icemoon/surface/outdoors/nospawn) "rrf" = ( /obj/structure/table/wood, /turf/open/floor/iron/dark, @@ -55526,13 +55495,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"rDW" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/fake_stairs/wood/directional/north, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "rDZ" = ( /turf/open/floor/engine, /area/station/science/explab) @@ -56129,6 +56091,13 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"rPp" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/fake_stairs/wood/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "rPu" = ( /obj/machinery/power/smes, /obj/structure/cable, @@ -56339,6 +56308,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) +"rST" = ( +/obj/structure/marker_beacon/cerulean, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "rSW" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -60450,6 +60423,9 @@ dir = 9 }, /area/station/science/research) +"tkU" = ( +/turf/open/lava/plasma/ice_moon, +/area/icemoon/surface/outdoors/nospawn) "tkV" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/window/reinforced/spawner/directional/west, @@ -62992,6 +62968,15 @@ /obj/structure/sign/warning/electric_shock, /turf/closed/wall/r_wall, /area/station/engineering/supermatter) +"ucZ" = ( +/obj/structure/closet, +/obj/item/clothing/under/suit/black, +/obj/item/clothing/under/suit/black/skirt, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) "udc" = ( /obj/structure/cable/multilayer/multiz, /obj/machinery/light/small/dim/directional/west, @@ -64612,6 +64597,11 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/processing) +"uFg" = ( +/obj/structure/railing, +/obj/structure/marker_beacon/cerulean, +/turf/open/genturf, +/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "uFh" = ( /turf/open/floor/plating, /area/station/construction) @@ -66770,12 +66760,6 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"vpy" = ( -/obj/structure/railing{ - dir = 10 - }, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "vpR" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, @@ -67458,9 +67442,6 @@ /obj/item/papercutter, /turf/open/floor/iron/showroomfloor, /area/station/security/warden) -"vAv" = ( -/turf/open/cliff/snowrock, -/area/icemoon/surface/outdoors/nospawn) "vAx" = ( /obj/machinery/light/small/directional/east, /obj/effect/mapping_helpers/burnt_floor, @@ -68263,6 +68244,22 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) +"vOY" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/industrial_lift{ + radial_travel = 0 + }, +/obj/structure/railing{ + dir = 5 + }, +/obj/machinery/elevator_control_panel/directional/north{ + linked_elevator_id = "publicElevator"; + preset_destination_names = list("3"="Icemoon Level","4"="Station Level") + }, +/turf/open/floor/plating/elevatorshaft, +/area/mine/storage) "vPh" = ( /obj/machinery/light/directional/north, /obj/machinery/digital_clock/directional/north, @@ -70404,12 +70401,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"wwy" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "wwB" = ( /obj/structure/table/wood, /obj/item/pinpointer/nuke, @@ -71916,6 +71907,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +"wUD" = ( +/obj/structure/fake_stairs/wood/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "wUE" = ( /obj/machinery/light_switch/directional/north{ pixel_x = -7 @@ -73251,13 +73246,6 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/atmos) -"xoN" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/fake_stairs/wood/directional/north, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "xpo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -74135,6 +74123,13 @@ /obj/effect/landmark/start/prisoner, /turf/open/floor/iron, /area/station/security/prison/workout) +"xDQ" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/fake_stairs/wood/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "xDU" = ( /obj/structure/table, /obj/effect/spawner/random/entertainment/drugs, @@ -75276,6 +75271,11 @@ dir = 1 }, /area/station/engineering/atmos/storage/gas) +"xXk" = ( +/obj/structure/railing, +/obj/structure/flora/grass/green/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "xXt" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, @@ -160516,7 +160516,7 @@ iwS iqT tDG tDG -nWB +ucZ iwS tKI wkj @@ -170031,7 +170031,7 @@ iDt vcj vcj vcj -eff +vOY koA uFw vcj @@ -207182,10 +207182,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -207439,10 +207439,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -207697,9 +207697,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -207954,9 +207954,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -208211,9 +208211,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -208468,9 +208468,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -208725,9 +208725,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -208982,9 +208982,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -209239,9 +209239,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -209496,9 +209496,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -209752,10 +209752,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -210009,10 +210009,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -210266,10 +210266,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -210523,10 +210523,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -210780,10 +210780,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -211037,10 +211037,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -211294,10 +211294,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -211551,10 +211551,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -211808,10 +211808,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -212065,10 +212065,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -212322,10 +212322,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -212579,10 +212579,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -212836,10 +212836,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -213093,10 +213093,10 @@ wNO wNO wNO uer -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -213349,11 +213349,11 @@ wNO wNO wNO wNO -dJf -oGj -vAv -vAv -vAv +aaX +otC +hHG +hHG +hHG wNO wNO wNO @@ -213606,11 +213606,11 @@ wNO wNO wNO wNO -ikV -oGj -vAv -vAv -vAv +fhB +otC +hHG +hHG +hHG wNO wNO wNO @@ -213865,8 +213865,8 @@ wNO bln bln bln -rDW -rDW +xDQ +xDQ bln wNO wNO @@ -214122,8 +214122,8 @@ wNO bln bln bln -xoN -xoN +rPp +rPp bln wNO wNO @@ -214378,10 +214378,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -214635,10 +214635,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -214892,10 +214892,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -215149,10 +215149,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -215406,10 +215406,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -215663,10 +215663,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -215920,10 +215920,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -216177,10 +216177,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -216434,10 +216434,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -216691,10 +216691,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -216948,10 +216948,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -217205,10 +217205,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -217462,10 +217462,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -217719,10 +217719,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -217976,10 +217976,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -218233,10 +218233,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -218490,10 +218490,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -218747,10 +218747,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -219004,10 +219004,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -219261,10 +219261,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -219518,10 +219518,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -219775,10 +219775,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -220032,10 +220032,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -220289,10 +220289,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -220546,10 +220546,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -220803,10 +220803,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -221060,10 +221060,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -221317,10 +221317,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -221574,10 +221574,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -221831,10 +221831,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -222088,10 +222088,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -222345,10 +222345,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -222602,10 +222602,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -222859,10 +222859,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -223116,10 +223116,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -223373,10 +223373,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -223630,10 +223630,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -223888,9 +223888,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -224145,9 +224145,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -224402,9 +224402,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -224659,9 +224659,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -224916,9 +224916,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -225173,9 +225173,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -225430,9 +225430,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -225687,9 +225687,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -225943,10 +225943,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -226200,10 +226200,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -226457,10 +226457,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -226714,10 +226714,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -226971,10 +226971,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -227228,10 +227228,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -227485,10 +227485,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -227742,10 +227742,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -227999,10 +227999,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -228256,10 +228256,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -228513,10 +228513,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -228770,10 +228770,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -229028,9 +229028,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -229285,9 +229285,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -229542,9 +229542,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -229799,9 +229799,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -230056,9 +230056,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -230313,9 +230313,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -230570,9 +230570,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -230827,9 +230827,9 @@ wNO wNO wNO wNO -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -231083,10 +231083,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -231340,10 +231340,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -231597,10 +231597,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -231854,10 +231854,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -232111,10 +232111,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -232368,10 +232368,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -232625,10 +232625,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -232882,10 +232882,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -233139,10 +233139,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -233396,10 +233396,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -233653,10 +233653,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -233910,10 +233910,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -234167,10 +234167,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -234424,10 +234424,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -234681,10 +234681,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -234938,10 +234938,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -235195,10 +235195,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -235452,10 +235452,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -235709,10 +235709,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -235966,10 +235966,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -236223,10 +236223,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -236480,10 +236480,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -236737,10 +236737,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -236994,10 +236994,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -237251,10 +237251,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -237508,10 +237508,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -237765,10 +237765,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -238022,10 +238022,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -238279,10 +238279,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -238536,10 +238536,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -238793,10 +238793,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -239050,10 +239050,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -239307,10 +239307,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -239564,10 +239564,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -239821,10 +239821,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -240078,10 +240078,10 @@ bln bln bln bln -lKW -vAv -vAv -vAv +fuZ +hHG +hHG +hHG wNO wNO wNO @@ -240333,12 +240333,12 @@ wNO lBD lBD bln -rrb +tkU bln vbG -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -240589,13 +240589,13 @@ bln bln lBD vbG -rrb -rrb -rrb +tkU +tkU +tkU vbG -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -240845,16 +240845,16 @@ wNO bln uer bln -dNf -rrb -rrb -rrb -bgn -vAv -vAv -vAv +enX +tkU +tkU +tkU +xXk +hHG +hHG +hHG wNO -rrb +tkU wNO wNO wNO @@ -241100,20 +241100,20 @@ wNO wNO wNO bln -dJf +aaX vbG -rrb -rrb -rrb -rrb -bgn -vAv -vAv -vAv +tkU +tkU +tkU +tkU +xXk +hHG +hHG +hHG wNO -rrb -rrb -rrb +tkU +tkU +tkU wNO wNO wNO @@ -241357,20 +241357,20 @@ wNO wNO wNO bln -ikV +fhB vbG -rrb -rrb -rrb -rrb -bgn -vAv -vAv -vAv -rrb -rrb -rrb -rrb +tkU +tkU +tkU +tkU +xXk +hHG +hHG +hHG +tkU +tkU +tkU +tkU wNO wNO wNO @@ -241616,19 +241616,19 @@ wNO bln lBD vbG -rrb -rrb -rrb -rrb +tkU +tkU +tkU +tkU bln -vAv -vAv -vAv -rrb -rrb -rrb -rrb -rrb +hHG +hHG +hHG +tkU +tkU +tkU +tkU +tkU wNO wNO wNO @@ -241873,19 +241873,19 @@ wNO lBD lBD vbG -rrb -rrb -rrb -rrb +tkU +tkU +tkU +tkU bln -vAv -vAv -vAv -rrb -rrb -rrb -rrb -rrb +hHG +hHG +hHG +tkU +tkU +tkU +tkU +tkU wNO wNO wNO @@ -242130,19 +242130,19 @@ wNO lBD lBD vbG -rrb -rrb -rrb -rrb +tkU +tkU +tkU +tkU bln -vAv -vAv -vAv -rrb -rrb -rrb -rrb -rrb +hHG +hHG +hHG +tkU +tkU +tkU +tkU +tkU wNO wNO wNO @@ -242387,18 +242387,18 @@ wNO bln bln vbG -rrb -rrb -rrb -rrb +tkU +tkU +tkU +tkU bln -vAv -vAv -vAv -rrb -rrb -rrb -rrb +hHG +hHG +hHG +tkU +tkU +tkU +tkU wNO wNO wNO @@ -242644,18 +242644,18 @@ wNO bln bln vbG -rrb -rrb -rrb -rrb -lKW -vAv -vAv -vAv +tkU +tkU +tkU +tkU +fuZ +hHG +hHG +hHG wNO -rrb -rrb -rrb +tkU +tkU +tkU wNO wNO wNO @@ -242901,17 +242901,17 @@ wNO bln bln lBD -vpy -rrb -rrb -rrb +jpx +tkU +tkU +tkU vbG -vAv -vAv -vAv +hHG +hHG +hHG wNO -rrb -rrb +tkU +tkU wNO wNO wNO @@ -243159,13 +243159,13 @@ bln bln lBD vbG -rrb -rrb -rrb +tkU +tkU +tkU vbG -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -243416,13 +243416,13 @@ bln uer lBD bln -vpy -rrb -rrb +jpx +tkU +tkU vbG -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -243674,12 +243674,12 @@ bln lBD bln bln -wwy -wwy +bSz +bSz vbG -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -243930,17 +243930,17 @@ bln bln lBD bln -qdI +rST bln bln -fMU -vAv -vAv -vAv +qRv +hHG +hHG +hHG wNO wNO wNO -dla +khz wNO wNO wNO @@ -244191,10 +244191,10 @@ lBD bln bln bln -rDW -rDW +xDQ +xDQ bln -dla +khz wNO wNO wNO @@ -244448,8 +244448,8 @@ lBD bln lBD bln -nxo -nxo +wUD +wUD bln wNO wNO @@ -244705,8 +244705,8 @@ bln bln lBD lBD -nxo -nxo +wUD +wUD bln wNO wNO @@ -244962,8 +244962,8 @@ lBD lBD bln bln -nxo -nxo +wUD +wUD bln wNO wNO @@ -245219,8 +245219,8 @@ bln lBD bln bln -xoN -xoN +rPp +rPp bln wNO wNO @@ -245475,14 +245475,14 @@ lBD bln bln bln -nzO -vAv -vAv -vAv -dla +kPS +hHG +hHG +hHG +khz wNO wNO -dla +khz wNO wNO wNO @@ -245733,9 +245733,9 @@ bln bln uer vbG -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -245990,9 +245990,9 @@ wNO wNO bln bln -vAv -vAv -vAv +hHG +hHG +hHG wNO wNO wNO @@ -246245,11 +246245,11 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv -vAv +otC +hHG +hHG +hHG +hHG wNO wNO wNO @@ -246502,11 +246502,11 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv -vAv +otC +hHG +hHG +hHG +hHG wNO wNO wNO @@ -246759,11 +246759,11 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv -vAv +otC +hHG +hHG +hHG +hHG wNO wNO wNO @@ -247016,11 +247016,11 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv -vAv +otC +hHG +hHG +hHG +hHG wNO wNO wNO @@ -247273,11 +247273,11 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv -vAv +otC +hHG +hHG +hHG +hHG wNO wNO wNO @@ -247530,11 +247530,11 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv -vAv +otC +hHG +hHG +hHG +hHG wNO wNO wNO @@ -247787,11 +247787,11 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv -vAv +otC +hHG +hHG +hHG +hHG wNO wNO wNO @@ -248045,10 +248045,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -248302,10 +248302,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -248559,10 +248559,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -248816,10 +248816,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -249073,10 +249073,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -249330,10 +249330,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -249587,10 +249587,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -249844,10 +249844,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -250101,10 +250101,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -250358,10 +250358,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -250615,10 +250615,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -250872,10 +250872,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -251129,10 +251129,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -251386,10 +251386,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -251643,10 +251643,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -251900,10 +251900,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -252157,10 +252157,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -252414,10 +252414,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -252671,10 +252671,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -252928,10 +252928,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -253185,10 +253185,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -253442,10 +253442,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -253699,10 +253699,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -253956,10 +253956,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -254213,10 +254213,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -254470,10 +254470,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -254727,10 +254727,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -254984,10 +254984,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -255241,10 +255241,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -255498,10 +255498,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -255755,10 +255755,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -256012,10 +256012,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -256269,10 +256269,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -256524,12 +256524,12 @@ wNO wNO wNO wNO -dla +khz wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -256783,14 +256783,14 @@ wNO wNO wNO wNO -gwq -vAv -vAv -vAv -dla +uFg +hHG +hHG +hHG +khz wNO wNO -dla +khz wNO wNO wNO @@ -257041,8 +257041,8 @@ wNO wNO bln bln -rDW -rDW +xDQ +xDQ bln bln bln @@ -257298,8 +257298,8 @@ wNO wNO bln bln -nxo -nxo +wUD +wUD bln bln bln @@ -257555,8 +257555,8 @@ wNO wNO bln bln -xoN -xoN +rPp +rPp bln bln bln @@ -257811,10 +257811,10 @@ wNO wNO wNO uer -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -258065,17 +258065,17 @@ wNO wNO wNO wNO -dla +khz wNO -dJf -oGj -vAv -vAv -vAv -dla +aaX +otC +hHG +hHG +hHG +khz wNO wNO -dla +khz wNO wNO wNO @@ -258324,11 +258324,11 @@ wNO wNO wNO wNO -ikV -oGj -vAv -vAv -vAv +fhB +otC +hHG +hHG +hHG wNO wNO wNO @@ -258582,10 +258582,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -258839,10 +258839,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -259096,10 +259096,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -259353,10 +259353,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -259610,10 +259610,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -259867,10 +259867,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -260124,10 +260124,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -260381,10 +260381,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -260621,16 +260621,16 @@ wNO wNO "} (209,1,3) = {" -rrb -rrb -rrb -rrb -rrb -rrb -rrb -rrb -rrb -rrb +tkU +tkU +tkU +tkU +tkU +tkU +tkU +tkU +tkU +tkU wNO wNO wNO @@ -260638,10 +260638,10 @@ wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -260878,27 +260878,27 @@ wNO wNO "} (210,1,3) = {" -rrb -rrb -rrb -rrb -rrb -rrb -rrb -rrb -rrb -rrb -rrb +tkU +tkU +tkU +tkU +tkU +tkU +tkU +tkU +tkU +tkU +tkU wNO wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -261135,27 +261135,27 @@ wNO wNO "} (211,1,3) = {" -rrb -rrb -rrb -rrb -rrb -rrb -rrb -rrb -rrb -rrb -rrb +tkU +tkU +tkU +tkU +tkU +tkU +tkU +tkU +tkU +tkU +tkU wNO wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -261392,27 +261392,27 @@ wNO wNO "} (212,1,3) = {" -kNo -kNo -kNo -kNo -kNo -kNo +kDs +kDs +kDs +kDs +kDs +kDs wNO wNO -rrb -rrb -rrb +tkU +tkU +tkU wNO wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -261649,27 +261649,27 @@ wNO wNO "} (213,1,3) = {" -kNo -kNo -kNo -kNo -kNo -kNo -kNo +kDs +kDs +kDs +kDs +kDs +kDs +kDs wNO wNO -rrb -rrb +tkU +tkU wNO wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -261906,27 +261906,27 @@ wNO wNO "} (214,1,3) = {" -kNo -kNo -kNo -kNo -kNo -kNo -kNo -kNo +kDs +kDs +kDs +kDs +kDs +kDs +kDs +kDs wNO wNO -rrb -rrb -rrb +tkU +tkU +tkU wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -262167,23 +262167,23 @@ wNO wNO wNO wNO -oBr -kNo -kNo -kNo +lgH +kDs +kDs +kDs wNO wNO wNO -rrb -rrb +tkU +tkU wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -262425,22 +262425,22 @@ wNO wNO wNO wNO -kNo -kNo -kNo -kNo -kNo +kDs +kDs +kDs +kDs +kDs wNO -rrb -rrb -rrb +tkU +tkU +tkU wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -262683,21 +262683,21 @@ wNO wNO wNO wNO -vAv -vAv -vAv -vAv -vAv -vAv -rrb -rrb +hHG +hHG +hHG +hHG +hHG +hHG +tkU +tkU wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -262937,24 +262937,24 @@ wNO wNO wNO wNO -rrb -rrb -oBr -vAv -vAv -vAv -vAv -vAv -vAv -rrb -rrb +tkU +tkU +lgH +hHG +hHG +hHG +hHG +hHG +hHG +tkU +tkU wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -263193,25 +263193,25 @@ wNO (219,1,3) = {" wNO wNO -rrb -rrb -rrb +tkU +tkU +tkU wNO -vAv -vAv -vAv -vAv -vAv -vAv -rrb -rrb +hHG +hHG +hHG +hHG +hHG +hHG +tkU +tkU wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -263450,25 +263450,25 @@ wNO (220,1,3) = {" wNO wNO -rrb -rrb -rrb +tkU +tkU +tkU wNO -vAv -vAv -vAv -vAv -vAv -vAv -rrb +hHG +hHG +hHG +hHG +hHG +hHG +tkU wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -263707,25 +263707,25 @@ wNO (221,1,3) = {" wNO wNO -rrb -rrb -rrb +tkU +tkU +tkU wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -263964,25 +263964,25 @@ wNO (222,1,3) = {" wNO wNO -rrb -rrb -rrb -oBr -vAv -vAv -vAv -vAv -vAv -vAv +tkU +tkU +tkU +lgH +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -264222,24 +264222,24 @@ wNO wNO wNO wNO -rrb -rrb +tkU +tkU wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -264479,24 +264479,24 @@ wNO wNO wNO wNO -rrb -rrb +tkU +tkU wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -264736,24 +264736,24 @@ wNO wNO wNO wNO -rrb -rrb +tkU +tkU wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -264993,24 +264993,24 @@ wNO wNO wNO wNO -rrb -rrb +tkU +tkU wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -265250,24 +265250,24 @@ wNO wNO wNO wNO -rrb -rrb +tkU +tkU wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -265507,24 +265507,24 @@ wNO wNO wNO wNO -rrb -rrb -oBr -vAv -vAv -vAv -vAv -vAv -vAv +tkU +tkU +lgH +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -265764,24 +265764,24 @@ wNO wNO wNO wNO -rrb -rrb +tkU +tkU wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -266022,23 +266022,23 @@ wNO wNO wNO wNO -rrb +tkU wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -266279,23 +266279,23 @@ wNO wNO wNO wNO -rrb +tkU wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -266536,23 +266536,23 @@ wNO wNO wNO wNO -rrb +tkU wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -266793,23 +266793,23 @@ wNO wNO wNO wNO -rrb +tkU wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -267051,22 +267051,22 @@ wNO wNO wNO wNO -oBr -vAv -vAv -vAv -vAv -vAv -vAv +lgH +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -267305,25 +267305,25 @@ wNO (235,1,3) = {" wNO wNO -oBr +lgH wNO wNO wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -267562,25 +267562,25 @@ wNO (236,1,3) = {" wNO wNO -dJf +aaX wNO wNO wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -267819,25 +267819,25 @@ wNO (237,1,3) = {" wNO wNO -ikV +fhB wNO wNO wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -268079,22 +268079,22 @@ wNO wNO wNO wNO -oBr -vAv -vAv -vAv -vAv -vAv -vAv +lgH +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -268337,21 +268337,21 @@ wNO wNO wNO wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -268594,21 +268594,21 @@ wNO wNO wNO wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -268851,21 +268851,21 @@ wNO wNO wNO wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -269108,21 +269108,21 @@ wNO wNO wNO wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG uer wNO wNO @@ -269364,23 +269364,23 @@ wNO wNO wNO wNO -oBr -vAv -vAv -vAv -vAv -vAv -vAv +lgH +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv -dJf +otC +hHG +hHG +hHG +aaX wNO wNO wNO @@ -269622,22 +269622,22 @@ wNO wNO wNO wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv -ikV +otC +hHG +hHG +hHG +fhB wNO wNO wNO @@ -269879,21 +269879,21 @@ wNO wNO wNO wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG bln wNO wNO @@ -270135,21 +270135,21 @@ wNO wNO wNO wNO -oBr -vAv -vAv -vAv -vAv -vAv -vAv +lgH +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO bln bln -rDW -rDW +xDQ +xDQ bln bln wNO @@ -270393,20 +270393,20 @@ wNO wNO wNO wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO bln bln -nxo -nxo +wUD +wUD bln bln bln @@ -270650,20 +270650,20 @@ wNO wNO wNO wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO bln bln -xoN -xoN +rPp +rPp bln bln bln @@ -270907,21 +270907,21 @@ wNO wNO wNO wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG bln wNO wNO @@ -271163,22 +271163,22 @@ wNO wNO wNO wNO -oBr -vAv -vAv -vAv -vAv -vAv -vAv +lgH +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG bln wNO wNO @@ -271421,21 +271421,21 @@ wNO wNO wNO wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -271678,21 +271678,21 @@ wNO wNO wNO wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -271934,22 +271934,22 @@ wNO wNO wNO wNO -oBr -vAv -vAv -vAv -vAv -vAv -vAv +lgH +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -272192,21 +272192,21 @@ wNO wNO wNO wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO @@ -272449,21 +272449,21 @@ wNO wNO wNO wNO -vAv -vAv -vAv -vAv -vAv -vAv +hHG +hHG +hHG +hHG +hHG +hHG wNO wNO wNO wNO wNO -oGj -vAv -vAv -vAv +otC +hHG +hHG +hHG wNO wNO wNO diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 0f224ceb261..0281852306f 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -561,6 +561,12 @@ }, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain/private) +"als" = ( +/obj/structure/table, +/obj/item/clothing/under/costume/buttondown/slacks/service, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "alE" = ( /turf/open/floor/iron, /area/station/security/courtroom) @@ -3961,6 +3967,21 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) +"buE" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/window/spawner/directional/west, +/obj/effect/turf_decal/trimline/dark_red/line{ + dir = 8 + }, +/obj/effect/turf_decal/arrows/red{ + dir = 4 + }, +/obj/effect/landmark/start/hangover, +/obj/structure/cable, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/station/commons/fitness) "buF" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -17499,6 +17520,13 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"gEN" = ( +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "gES" = ( /obj/machinery/computer/shuttle/labor{ dir = 4 @@ -19286,12 +19314,6 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/space/nearstation) -"hnt" = ( -/obj/structure/cable, -/turf/open/floor/iron/white/side{ - dir = 4 - }, -/area/station/commons/fitness) "hnv" = ( /obj/effect/turf_decal/bot, /obj/structure/mecha_wreckage/ripley, @@ -19347,22 +19369,6 @@ /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/iron/white, /area/station/medical/pharmacy) -"hoQ" = ( -/obj/structure/table, -/obj/item/clothing/under/suit/black/skirt, -/obj/item/clothing/under/suit/black_really, -/obj/machinery/light/small/directional/north, -/obj/item/radio/intercom/directional/north, -/obj/item/clothing/accessory/waistcoat, -/obj/item/clothing/suit/toggle/lawyer/black, -/obj/item/clothing/under/suit/red, -/obj/item/clothing/neck/tie/black, -/obj/item/clothing/under/suit/black, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/station/commons/dorms) "hoY" = ( /obj/structure/chair/office{ dir = 4 @@ -19416,6 +19422,21 @@ }, /turf/closed/wall/r_wall, /area/station/engineering/atmos/pumproom) +"hqu" = ( +/obj/structure/table, +/obj/item/clothing/under/suit/black_really, +/obj/machinery/light/small/directional/north, +/obj/item/radio/intercom/directional/north, +/obj/item/clothing/accessory/waistcoat, +/obj/item/clothing/suit/toggle/lawyer/black, +/obj/item/clothing/under/suit/red, +/obj/item/clothing/neck/tie/black, +/obj/item/clothing/under/costume/buttondown/slacks/service, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms) "hqE" = ( /obj/machinery/telecomms/bus/preset_four, /turf/open/floor/circuit/telecomms/mainframe, @@ -20287,11 +20308,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) -"hGG" = ( -/obj/effect/turf_decal/trimline/dark_red/mid_joiner, -/obj/effect/turf_decal/trimline/dark_red/line, -/turf/open/floor/iron/white/smooth_half, -/area/station/commons/fitness) "hGL" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -24912,14 +24928,6 @@ }, /turf/open/floor/iron, /area/station/engineering/gravity_generator) -"jhP" = ( -/obj/structure/closet/athletic_mixed, -/obj/effect/landmark/start/hangover/closet, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) "jhS" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -27984,12 +27992,6 @@ /obj/effect/mapping_helpers/mail_sorting/science/rd_office, /turf/open/floor/iron/white, /area/station/science/research) -"kjL" = ( -/obj/structure/table, -/obj/item/clothing/under/suit/sl, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/commons/fitness/recreation) "kjO" = ( /obj/structure/table, /obj/item/restraints/handcuffs/cable/white, @@ -31212,6 +31214,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) +"lus" = ( +/obj/structure/closet/athletic_mixed, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "luE" = ( /obj/structure/rack, /obj/item/integrated_circuit/loaded/hello_world, @@ -35284,15 +35294,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/space_hut) -"mSf" = ( -/obj/structure/weightmachine/weightlifter, -/obj/effect/turf_decal/tile/dark_red/half/contrasted, -/obj/effect/landmark/start/hangover, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/white/textured_edge{ - dir = 1 - }, -/area/station/commons/fitness) "mSk" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -37683,19 +37684,6 @@ /obj/structure/easel, /turf/open/floor/plating, /area/station/maintenance/disposal) -"nIL" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark/corner, -/area/station/engineering/storage_shared) "nIP" = ( /obj/structure/table/glass, /obj/item/paper_bin{ @@ -47006,13 +46994,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"rci" = ( -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/commons/fitness/recreation) "rcq" = ( /obj/machinery/atmospherics/pipe/layer_manifold/purple/visible, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5{ @@ -47296,6 +47277,15 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/wood, /area/station/commons/lounge) +"rjl" = ( +/obj/structure/weightmachine/weightlifter, +/obj/effect/turf_decal/tile/dark_red/half/contrasted, +/obj/effect/landmark/start/hangover, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/white/textured_edge{ + dir = 1 + }, +/area/station/commons/fitness) "rjz" = ( /obj/machinery/power/shieldwallgen, /obj/structure/extinguisher_cabinet/directional/west, @@ -49473,18 +49463,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/construction/storage_wing) -"rVL" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/effect/spawner/random/maintenance, -/obj/item/storage/belt/utility, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 1 - }, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/turf/open/floor/iron/dark/corner, -/area/station/engineering/storage_shared) "rVY" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52886,21 +52864,6 @@ dir = 1 }, /area/station/engineering/atmos/pumproom) -"tho" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/window/spawner/directional/west, -/obj/effect/turf_decal/trimline/dark_red/line{ - dir = 8 - }, -/obj/effect/turf_decal/arrows/red{ - dir = 4 - }, -/obj/effect/landmark/start/hangover, -/obj/structure/cable, -/turf/open/floor/iron/white/smooth_edge{ - dir = 4 - }, -/area/station/commons/fitness) "thQ" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -55477,6 +55440,12 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/port) +"ubs" = ( +/obj/structure/cable, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/station/commons/fitness) "ubw" = ( /obj/structure/lattice, /obj/structure/window/reinforced/spawner/directional/north, @@ -55676,6 +55645,18 @@ }, /turf/open/floor/iron, /area/station/security/office) +"uew" = ( +/obj/structure/table/reinforced, +/obj/machinery/microwave{ + pixel_y = 6 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/checker, +/area/station/engineering/storage_shared) "ueB" = ( /obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/yellow/half/contrasted, @@ -56737,18 +56718,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/server) -"uzg" = ( -/obj/structure/table/reinforced, -/obj/machinery/microwave{ - pixel_y = 6 - }, -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/checker, -/area/station/engineering/storage_shared) "uzi" = ( /obj/structure/lattice, /obj/structure/chair/sofa/corp/left{ @@ -57869,6 +57838,19 @@ /obj/effect/spawner/random/structure/closet_maintenance, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"uUL" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/storage_shared) "uUX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable/layer3, @@ -60597,6 +60579,18 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) +"vPV" = ( +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/effect/spawner/random/maintenance, +/obj/item/storage/belt/utility, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/dark/corner, +/area/station/engineering/storage_shared) "vPW" = ( /obj/item/extinguisher, /turf/open/floor/plating, @@ -63112,13 +63106,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"wLi" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white/side{ - dir = 1 - }, -/area/station/commons/fitness) "wLu" = ( /obj/structure/chair/office{ dir = 8 @@ -64795,6 +64782,13 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) +"xpb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/station/commons/fitness) "xpi" = ( /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -67126,6 +67120,11 @@ }, /turf/open/floor/plating, /area/station/medical/chemistry) +"yfm" = ( +/obj/effect/turf_decal/trimline/dark_red/mid_joiner, +/obj/effect/turf_decal/trimline/dark_red/line, +/turf/open/floor/iron/white/smooth_half, +/area/station/commons/fitness) "yfn" = ( /obj/machinery/vending/dinnerware, /obj/structure/cable, @@ -102757,8 +102756,8 @@ rrt aaa aaa iHc -hGG -wLi +yfm +xpb cMG qMe fqB @@ -102779,7 +102778,7 @@ lnc cqp wvF lnc -hoQ +hqu wcr ikb urK @@ -103014,15 +103013,15 @@ rrt lMJ blx aag -mSf +rjl htk -hnt +ubs cfy jlJ eZN ewf ewf -kjL +als lhk rwE tgo @@ -103273,7 +103272,7 @@ aaa iHc gpF pHe -tho +buE aag szp jjG @@ -103789,7 +103788,7 @@ iHc iHc aag aag -jhP +lus clE byz biF @@ -104304,7 +104303,7 @@ lMJ aaa szp szp -rci +gEN sqH jAs aiw @@ -109225,7 +109224,7 @@ qjl wlx qPT jRb -uzg +uew qsv sKD lUz @@ -109739,7 +109738,7 @@ nJM lOg pom pom -nIL +uUL qsv bjH bbi @@ -109996,7 +109995,7 @@ uJz iHy vSC eKw -rVL +vPV qsv lfd eup 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 99f295d9f0c..a2ee0402c8b 100644 --- a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm +++ b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm @@ -332,7 +332,7 @@ SKYRAT EDIT END */ /datum/greyscale_config/buttondown_slacks/worn name = "Buttondown with Slacks (Worn)" icon_file = 'icons/mob/clothing/under/shorts_pants_shirts.dmi' - json_config = 'code/datums/greyscale/json_configs/buttondown_slacks_worn.json' + json_config = 'code/datums/greyscale/json_configs/buttondown_slacks_worn.json' //Needed a unique object .json to fix height issues, so the worn is separate /datum/greyscale_config/buttondown_shorts name = "Buttondown with Shorts" @@ -342,7 +342,7 @@ SKYRAT EDIT END */ /datum/greyscale_config/buttondown_shorts/worn name = "Buttondown with Shorts (Worn)" icon_file = 'icons/mob/clothing/under/shorts_pants_shirts.dmi' - json_config = 'code/datums/greyscale/json_configs/buttondown_shorts_worn.json' + json_config = 'code/datums/greyscale/json_configs/buttondown_shorts_worn.json' //Ditto // // SUITS diff --git a/code/datums/greyscale/json_configs/buttondown_shorts.json b/code/datums/greyscale/json_configs/buttondown_shorts.json index 8c4f4daf067..3a8bba407fc 100644 --- a/code/datums/greyscale/json_configs/buttondown_shorts.json +++ b/code/datums/greyscale/json_configs/buttondown_shorts.json @@ -8,19 +8,19 @@ }, { "type": "icon_state", - "icon_state": "buckle", + "icon_state": "buttondown_obj_buckle", "blend_mode": "overlay", "color_ids": [ 2 ] }, { "type": "icon_state", - "icon_state": "belt", + "icon_state": "buttondown_obj_belt", "blend_mode": "overlay", "color_ids": [ 3 ] }, { "type": "icon_state", - "icon_state": "shorts", + "icon_state": "buttondown_obj_shorts", "blend_mode": "overlay", "color_ids": [ 4 ] } diff --git a/code/datums/greyscale/json_configs/buttondown_slacks.json b/code/datums/greyscale/json_configs/buttondown_slacks.json index e92706ef5bc..73d091e3d70 100644 --- a/code/datums/greyscale/json_configs/buttondown_slacks.json +++ b/code/datums/greyscale/json_configs/buttondown_slacks.json @@ -8,19 +8,19 @@ }, { "type": "icon_state", - "icon_state": "buckle", + "icon_state": "buttondown_obj_buckle", "blend_mode": "overlay", "color_ids": [ 2 ] }, { "type": "icon_state", - "icon_state": "belt", + "icon_state": "buttondown_obj_belt", "blend_mode": "overlay", "color_ids": [ 3 ] }, { "type": "icon_state", - "icon_state": "slacks", + "icon_state": "buttondown_obj_slacks", "blend_mode": "overlay", "color_ids": [ 4 ] } diff --git a/code/game/objects/effects/spawners/costume.dm b/code/game/objects/effects/spawners/costume.dm index c1581ef9ae9..68f189587b8 100644 --- a/code/game/objects/effects/spawners/costume.dm +++ b/code/game/objects/effects/spawners/costume.dm @@ -65,7 +65,7 @@ name = "butler costume spawner" items = list( /obj/item/clothing/accessory/waistcoat, - /obj/item/clothing/under/suit/black, + /obj/item/clothing/under/costume/buttondown/slacks/service, /obj/item/clothing/neck/tie/black, /obj/item/clothing/head/hats/tophat, ) @@ -95,7 +95,7 @@ /obj/effect/spawner/random/clothing/bowler_or_that, /obj/item/clothing/shoes/sneakers/black, /obj/item/cane, - /obj/item/clothing/under/suit/sl, + /obj/item/clothing/under/costume/buttondown/slacks/service, /obj/item/clothing/mask/fakemoustache, ) @@ -210,7 +210,7 @@ name = "black mafia outfit spawner" items = list( /obj/item/clothing/head/fedora, - /obj/item/clothing/under/suit/blacktwopiece, + /obj/item/clothing/under/suit/black, /obj/item/clothing/shoes/laceup, ) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index fb4ac67596f..ec4e0ec3a01 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -656,7 +656,7 @@ inhand_icon_state = "duffel-syndieammo" /obj/item/storage/backpack/duffelbag/syndie/hitman/PopulateContents() - new /obj/item/clothing/under/suit/black(src) + new /obj/item/clothing/under/costume/buttondown/slacks/service(src) new /obj/item/clothing/neck/tie/red/hitman(src) new /obj/item/clothing/accessory/waistcoat(src) new /obj/item/clothing/suit/toggle/lawyer/black(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 59a9eb1ff98..ef93a289421 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -10,7 +10,7 @@ var/static/items_inside = list( /obj/item/clothing/head/hats/tophat = 2, /obj/item/radio/headset/headset_srv = 2, - /obj/item/clothing/under/suit/sl = 2, + /obj/item/clothing/under/costume/buttondown/slacks/service = 2, /obj/item/clothing/under/rank/civilian/bartender = 2, /obj/item/clothing/accessory/waistcoat = 2, /obj/item/clothing/head/soft/black = 2, @@ -80,7 +80,7 @@ /obj/structure/closet/lawcloset/PopulateContents() ..() - new /obj/item/clothing/under/suit/blacktwopiece(src) + new /obj/item/clothing/under/suit/black(src) new /obj/item/clothing/under/rank/civilian/lawyer/beige(src) new /obj/item/clothing/under/rank/civilian/lawyer/black(src) new /obj/item/clothing/under/rank/civilian/lawyer/red(src) @@ -89,7 +89,7 @@ new /obj/item/clothing/suit/toggle/lawyer(src) new /obj/item/clothing/under/rank/civilian/lawyer/purpsuit(src) new /obj/item/clothing/suit/toggle/lawyer/purple(src) - new /obj/item/clothing/under/suit/black(src) + new /obj/item/clothing/under/costume/buttondown/slacks/service(src) new /obj/item/clothing/neck/tie/black(src) new /obj/item/clothing/suit/toggle/lawyer/black(src) new /obj/item/clothing/shoes/laceup(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 4e3d8b2b49b..463d446c8ba 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -55,8 +55,7 @@ /obj/structure/closet/secure_closet/psychology/PopulateContents() ..() - new /obj/item/clothing/under/suit/black(src) - new /obj/item/clothing/under/suit/black/skirt(src) + new /obj/item/clothing/under/costume/buttondown/slacks/service(src) new /obj/item/clothing/neck/tie/black(src) new /obj/item/clothing/shoes/laceup(src) new /obj/item/storage/backpack/medic(src) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 4dc402e0063..4c14298879e 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -694,7 +694,7 @@ if(ishuman(L)) var/mob/living/carbon/human/observer = L - observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit/black(observer), ITEM_SLOT_ICLOTHING) + observer.equip_to_slot_or_del(new /obj/item/clothing/under/costume/buttondown/slacks/service(observer), ITEM_SLOT_ICLOTHING) observer.equip_to_slot_or_del(new /obj/item/clothing/neck/tie/black/tied(observer), ITEM_SLOT_NECK) observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(observer), ITEM_SLOT_FEET) L.Unconscious(100) diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index 01ee43f4d29..a130bc6d09d 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -188,7 +188,7 @@ id = /obj/item/card/id/advanced/chameleon/black id_trim = /datum/id_trim/reaper_assassin - uniform = /obj/item/clothing/under/suit/black + uniform = /obj/item/clothing/under/costume/buttondown/slacks/service neck = /obj/item/clothing/neck/tie/red/hitman/tied belt = /obj/item/modular_computer/pda/heads ears = /obj/item/radio/headset diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm index 7442978b7dc..de811974185 100644 --- a/code/modules/clothing/under/costume.dm +++ b/code/modules/clothing/under/costume.dm @@ -277,6 +277,9 @@ greyscale_colors = "#EEEEEE#EE8E2E#222227#D8D39C" flags_1 = IS_PLAYER_COLORABLE_1 +/obj/item/clothing/under/costume/buttondown/slacks/service //preset one to be a formal white shirt and black pants + greyscale_colors = "#EEEEEE#CBDBFC#17171B#222227" + /obj/item/clothing/under/costume/buttondown/shorts name = "buttondown shirt with shorts" desc = "A fancy buttondown shirt with shorts." @@ -362,3 +365,13 @@ inhand_icon_state = null female_sprite_flags = NO_FEMALE_UNIFORM can_adjust = FALSE + +/obj/item/clothing/under/costume/henchmen + name = "henchmen jumpsuit" + desc = "A very gaudy jumpsuit for a proper Henchman. Guild regulations, you understand." + icon = 'icons/obj/clothing/under/syndicate.dmi' + worn_icon = 'icons/mob/clothing/under/syndicate.dmi' + icon_state = "henchmen" + inhand_icon_state = null + body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS|HEAD + flags_inv = HIDEGLOVES|HIDESHOES|HIDEEARS|HIDEEYES|HIDEHAIR diff --git a/code/modules/clothing/under/jobs/civilian/civilian.dm b/code/modules/clothing/under/jobs/civilian/civilian.dm index 86860e796c2..31a691668a2 100644 --- a/code/modules/clothing/under/jobs/civilian/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian/civilian.dm @@ -173,6 +173,7 @@ desc = "A tacky suit perfect for a CRIMINAL lawyer!" icon_state = "good_suit" inhand_icon_state = "good_suit" + icon = 'icons/obj/clothing/under/suits.dmi' worn_icon = 'icons/mob/clothing/under/suits.dmi' /obj/item/clothing/under/rank/civilian/lawyer/beige/skirt @@ -180,7 +181,6 @@ desc = "A tacky suitskirt perfect for a CRIMINAL lawyer!" icon_state = "good_suit_skirt" inhand_icon_state = "good_suit" - worn_icon = 'icons/mob/clothing/under/suits.dmi' dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON diff --git a/code/modules/clothing/under/suits.dm b/code/modules/clothing/under/suits.dm index 775a37d77d6..02f047c2f48 100644 --- a/code/modules/clothing/under/suits.dm +++ b/code/modules/clothing/under/suits.dm @@ -3,27 +3,81 @@ worn_icon = 'icons/mob/clothing/under/suits.dmi' can_adjust = FALSE female_sprite_flags = FEMALE_UNIFORM_NO_BREASTS - -/obj/item/clothing/under/suit/white_on_white - name = "white suit" - desc = "A white suit, suitable for an excellent host." - icon_state = "scratch" inhand_icon_state = null +/obj/item/clothing/under/suit/green + name = "green suit" + desc = "A green suit and yellow necktie. Baller." + icon = 'icons/obj/clothing/under/captain.dmi' + icon_state = "green_suit" + inhand_icon_state = "dg_suit" + worn_icon = 'icons/mob/clothing/under/captain.dmi' + +/obj/item/clothing/under/suit/red //Also used by the Curator's suit, /obj/item/clothing/under/rank/civilian/curator + name = "red suit" + desc = "A red suit and blue tie. Somewhat formal." + icon_state = "red_suit" + inhand_icon_state = "r_suit" + +/obj/item/clothing/under/suit/charcoal + name = "charcoal suit" + desc = "A charcoal suit and red tie. Very professional." + icon_state = "charcoal_suit" + +/obj/item/clothing/under/suit/navy + name = "navy suit" + desc = "A navy suit and red tie, intended for the station's finest." + icon_state = "navy_suit" + +/obj/item/clothing/under/suit/burgundy + name = "burgundy suit" + desc = "A burgundy suit and black tie. Somewhat formal." + icon_state = "burgundy_suit" + +/obj/item/clothing/under/suit/checkered + name = "checkered suit" + desc = "That's a very nice suit you have there. Shame if something were to happen to it, eh?" + icon_state = "checkered_suit" + +/obj/item/clothing/under/suit/beige + name = "beige suit" + desc = "An excellent light colored suit, experts in the field stress that it should not to be confused with the inferior tan suit." + icon_state = "beige_suit" + +/obj/item/clothing/under/suit/black + name = "black two piece suit" + desc = "A black suit with charcoal pants and a red tie. Very formal." + icon_state = "black_suit" + +/obj/item/clothing/under/suit/black/skirt + name = "black two piece suit" + desc = "A black suit with a charcoal skirt and a red tie. Very formal." + icon_state = "black_suit_skirt" + body_parts_covered = CHEST|GROIN|ARMS + dying_key = DYE_REGISTRY_JUMPSKIRT + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON + +/obj/item/clothing/under/suit/white + name = "white suit" + desc = "A white suit and jacket with a blue shirt. You wanna play rough? OKAY!" + icon_state = "white_suit" + inhand_icon_state = "white_suit" + /obj/item/clothing/under/suit/white/skirt name = "white suitskirt" desc = "A white suitskirt, suitable for an excellent host." icon_state = "white_suit_skirt" - inhand_icon_state = null body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT - female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY|FEMALE_UNIFORM_NO_BREASTS + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/under/suit/sl - desc = "It's a very amish looking suit." - name = "amish suit" - icon_state = "sl_suit" +/obj/item/clothing/under/suit/tan + name = "tan suit" + desc = "A tan suit. Smart, but casual." + icon_state = "tan_suit" + inhand_icon_state = "tan_suit" /obj/item/clothing/under/suit/waiter name = "waiter's outfit" @@ -32,31 +86,6 @@ inhand_icon_state = "waiter" supports_variations_flags = CLOTHING_MONKEY_VARIATION -/obj/item/clothing/under/suit/blacktwopiece - name = "black two piece suit" - desc = "A black suit and red tie. Very formal." - icon_state = "black_suit" - inhand_icon_state = null - -/obj/item/clothing/under/suit/black - name = "black suit" - desc = "A professional looking black suit. Ready for some serious law." - icon_state = "blacksuit" - inhand_icon_state = null - can_adjust = TRUE - alt_covers_chest = TRUE - -/obj/item/clothing/under/suit/black/skirt - name = "black suitskirt" - desc = "A professional black suitskirt. Nanotrasen Investigation Bureau approved!" - icon_state = "blacksuit_skirt" - inhand_icon_state = "bar_suit" - alt_covers_chest = TRUE - body_parts_covered = CHEST|GROIN|ARMS - dying_key = DYE_REGISTRY_JUMPSKIRT - female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY|FEMALE_UNIFORM_NO_BREASTS - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - /obj/item/clothing/under/suit/black_really name = "executive suit" desc = "A formal black suit, intended for the station's finest." @@ -73,72 +102,6 @@ female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY|FEMALE_UNIFORM_NO_BREASTS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/under/suit/green - name = "green suit" - desc = "A green suit and yellow necktie. Baller." - icon = 'icons/obj/clothing/under/captain.dmi' - icon_state = "green_suit" - inhand_icon_state = "dg_suit" - worn_icon = 'icons/mob/clothing/under/captain.dmi' - -/obj/item/clothing/under/suit/red - name = "red suit" - desc = "A red suit and blue tie. Somewhat formal." - icon_state = "red_suit" - inhand_icon_state = "r_suit" - -/obj/item/clothing/under/suit/charcoal - name = "charcoal suit" - desc = "A charcoal suit and red tie. Very professional." - icon_state = "charcoal_suit" - inhand_icon_state = null - -/obj/item/clothing/under/suit/navy - name = "navy suit" - desc = "A navy suit and red tie, intended for the station's finest." - icon_state = "navy_suit" - inhand_icon_state = null - -/obj/item/clothing/under/suit/burgundy - name = "burgundy suit" - desc = "A burgundy suit and black tie. Somewhat formal." - icon_state = "burgundy_suit" - inhand_icon_state = null - -/obj/item/clothing/under/suit/checkered - name = "checkered suit" - desc = "That's a very nice suit you have there. Shame if something were to happen to it, eh?" - icon_state = "checkered_suit" - inhand_icon_state = null - -/obj/item/clothing/under/suit/tan - name = "tan suit" - desc = "A tan suit. Smart, but casual." - icon_state = "tan_suit" - inhand_icon_state = "tan_suit" - -/obj/item/clothing/under/suit/white - name = "white suit" - desc = "A white suit and jacket with a blue shirt. You wanna play rough? OKAY!" - icon_state = "white_suit" - inhand_icon_state = "white_suit" - -/obj/item/clothing/under/suit/beige - name = "beige suit" - desc = "An excellent light colored suit, experts in the field stress that it should not to be confused with the inferior tan suit." - icon_state = "beige_suit" - inhand_icon_state = null - -/obj/item/clothing/under/suit/henchmen - name = "henchmen jumpsuit" - desc = "A very gaudy jumpsuit for a proper Henchman. Guild regulations, you understand." - icon = 'icons/obj/clothing/under/syndicate.dmi' - worn_icon = 'icons/mob/clothing/under/syndicate.dmi' - icon_state = "henchmen" - inhand_icon_state = null - body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS|HEAD - flags_inv = HIDEGLOVES|HIDESHOES|HIDEEARS|HIDEEYES|HIDEHAIR - /obj/item/clothing/under/suit/tuxedo name = "tuxedo" desc = "A formal black tuxedo. It exudes classiness." diff --git a/code/modules/jobs/job_types/psychologist.dm b/code/modules/jobs/job_types/psychologist.dm index d35edfb1476..3ece5c84371 100644 --- a/code/modules/jobs/job_types/psychologist.dm +++ b/code/modules/jobs/job_types/psychologist.dm @@ -40,7 +40,7 @@ id = /obj/item/card/id/advanced id_trim = /datum/id_trim/job/psychologist - uniform = /obj/item/clothing/under/suit/black + uniform = /obj/item/clothing/under/costume/buttondown/slacks/service backpack_contents = list( /obj/item/storage/pill_bottle/happinesspsych, /obj/item/storage/pill_bottle/lsdpsych, diff --git a/code/modules/mafia/outfits.dm b/code/modules/mafia/outfits.dm index ff5749ef43c..43ccfe73a1e 100644 --- a/code/modules/mafia/outfits.dm +++ b/code/modules/mafia/outfits.dm @@ -46,7 +46,7 @@ gloves = /obj/item/clothing/gloves/color/white shoes = /obj/item/clothing/shoes/laceup suit = /obj/item/clothing/suit/costume/gothcoat - uniform = /obj/item/clothing/under/suit/black + uniform = /obj/item/clothing/under/costume/buttondown/slacks/service //town @@ -69,7 +69,7 @@ /datum/outfit/mafia/psychologist name = "Mafia Psychologist" - uniform = /obj/item/clothing/under/suit/black + uniform = /obj/item/clothing/under/costume/buttondown/slacks/service neck = /obj/item/clothing/neck/tie/black/tied shoes = /obj/item/clothing/shoes/laceup diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index c18a77ac1b5..5d6a57315a1 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -46,7 +46,7 @@ /obj/item/clothing/under/costume/referee = 1, /obj/item/clothing/mask/whistle = 1, /obj/item/storage/backpack/henchmen = 5, - /obj/item/clothing/under/suit/henchmen = 5, + /obj/item/clothing/under/costume/henchmen = 5, /obj/item/clothing/head/costume/jackbros = 5, /obj/item/clothing/under/costume/jackbros = 5, /obj/item/clothing/under/costume/deckers = 5, @@ -104,7 +104,6 @@ /obj/item/clothing/shoes/singerb = 1, /obj/item/clothing/under/costume/singer/blue = 1, /obj/item/clothing/head/costume/cueball = 1, - /obj/item/clothing/under/suit/white_on_white = 1, ), ), list( @@ -160,8 +159,7 @@ "name" = "Service", "icon" = "kitchen-set", "products" = list( - /obj/item/clothing/under/suit/black = 1, - /obj/item/clothing/under/suit/sl = 1, + /obj/item/clothing/under/costume/buttondown/slacks/service = 1, /obj/item/clothing/accessory/waistcoat = 1, /obj/item/clothing/under/suit/waiter = 1, /obj/item/clothing/suit/apron = 1, diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 3913832dbf5..b933a55591a 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -100,7 +100,7 @@ /obj/item/clothing/under/suit/burgundy = 1, /obj/item/clothing/under/suit/charcoal = 1, /obj/item/clothing/under/suit/white = 1, - /obj/item/clothing/under/suit/sl = 1, + /obj/item/clothing/under/costume/buttondown/slacks/service = 1, /obj/item/clothing/suit/jacket/bomber = 2, /obj/item/clothing/suit/jacket/puffer/vest = 2, /obj/item/clothing/suit/jacket/puffer = 2, diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 39f96ce0f28..0b3828bfec7 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -167,7 +167,7 @@ /obj/item/clothing/head/costume/mailman = 1, /obj/item/clothing/under/misc/mailman = 1, /obj/item/clothing/under/rank/cargo/miner = 3, - + ) refill_canister = /obj/item/vending_refill/wardrobe/cargo_wardrobe payment_department = ACCOUNT_CAR @@ -229,7 +229,7 @@ /obj/item/storage/backpack/satchel/science = 3, /obj/item/storage/backpack/duffelbag/science = 3, /obj/item/radio/headset/headset_sci = 3, - + ) refill_canister = /obj/item/vending_refill/wardrobe/science_wardrobe payment_department = ACCOUNT_SCI @@ -350,7 +350,7 @@ /obj/item/clothing/head/hats/tophat = 2, /obj/item/clothing/head/soft/black = 2, /obj/item/clothing/neck/petcollar = 1, - /obj/item/clothing/under/suit/sl = 2, + /obj/item/clothing/under/costume/buttondown/slacks/service = 2, /obj/item/clothing/under/rank/civilian/bartender = 2, /obj/item/clothing/under/rank/civilian/bartender/purple = 2, /obj/item/clothing/under/rank/civilian/bartender/skirt = 2, diff --git a/icons/mob/clothing/under/suits.dmi b/icons/mob/clothing/under/suits.dmi index 16278b334144d6e09e3ef4da40cdd49a7d92482c..e0981dbe580a5b4a8e4c748d973b7a668f2f0462 100644 GIT binary patch literal 8369 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 literal 23075 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

$fVc@jU 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 O8DgMos#B}w81o;)YA-zi diff --git a/icons/obj/clothing/under/shorts_pants_shirts.dmi b/icons/obj/clothing/under/shorts_pants_shirts.dmi index c9b71d31ce12c488e17e2e00d06b9d63eea2289a..36d283dbfc4d3c2830dd78b856b047f3ec722745 100644 GIT binary patch delta 1516 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 RbDQRE0WVKKk1}^|`hP~6WzYZs diff --git a/icons/obj/clothing/under/suits.dmi b/icons/obj/clothing/under/suits.dmi index 0ebdd51147f6ff433e6a4a9637687422161b40cd..604e3787b24e66ebe32d75171587e79c0387cf71 100644 GIT binary patch literal 3404 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 PP8v{G)>f)eunPSjm~PCW 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 7cd27339b87..5baa7beae07 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 @@ -614,8 +614,8 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ /datum/loadout_item/under/formal /datum/loadout_item/under/formal/amish_suit - name = "Amish Suit" - item_path = /obj/item/clothing/under/suit/sl + name = "White Buttondown Shirt with Black Slacks" + item_path = /obj/item/clothing/under/costume/buttondown/slacks/service /datum/loadout_item/under/formal/formaldressred name = "Formal Red Dress" @@ -749,10 +749,6 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Sailor Dress" item_path = /obj/item/clothing/under/dress/sailor -/datum/loadout_item/under/formal/scratch_suit - name = "Scratch Suit" - item_path = /obj/item/clothing/under/suit/white_on_white - /datum/loadout_item/under/formal/sensible_suit name = "Sensible Suit" item_path = /obj/item/clothing/under/rank/civilian/curator diff --git a/modular_skyrat/modules/modular_vending/code/wardrobes.dm b/modular_skyrat/modules/modular_vending/code/wardrobes.dm index 697a9bdd50b..482848792d2 100644 --- a/modular_skyrat/modules/modular_vending/code/wardrobes.dm +++ b/modular_skyrat/modules/modular_vending/code/wardrobes.dm @@ -179,7 +179,7 @@ products = list( /obj/item/clothing/head/hats/tophat = 2, /obj/item/radio/headset/headset_srv = 0, - /obj/item/clothing/under/suit/sl = 2, + /obj/item/clothing/under/costume/buttondown/slacks/service = 2, /obj/item/clothing/under/rank/civilian/bartender = 2, /obj/item/clothing/under/rank/civilian/bartender/purple = 2, /obj/item/clothing/under/rank/civilian/bartender/skirt = 2,