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 16278b33414..e0981dbe580 100644 Binary files a/icons/mob/clothing/under/suits.dmi and b/icons/mob/clothing/under/suits.dmi differ diff --git a/icons/obj/clothing/under/shorts_pants_shirts.dmi b/icons/obj/clothing/under/shorts_pants_shirts.dmi index c9b71d31ce1..36d283dbfc4 100644 Binary files a/icons/obj/clothing/under/shorts_pants_shirts.dmi and b/icons/obj/clothing/under/shorts_pants_shirts.dmi differ diff --git a/icons/obj/clothing/under/suits.dmi b/icons/obj/clothing/under/suits.dmi index 0ebdd51147f..604e3787b24 100644 Binary files a/icons/obj/clothing/under/suits.dmi and b/icons/obj/clothing/under/suits.dmi differ diff --git a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm index 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,