diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 3b2ee52e24..ddb80a3319 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -3988,7 +3988,6 @@ /obj/item/clothing/under/suit/waiter, /obj/item/clothing/under/suit/waiter, /obj/item/clothing/under/suit/waiter, -/obj/item/clothing/suit/straight_jacket, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "ahD" = ( @@ -7882,11 +7881,7 @@ /turf/open/floor/wood, /area/lawoffice) "aqa" = ( -/obj/structure/closet/secure_closet/personal{ - desc = "Swipe your ID on this locker to claim it. You can drag it around and use it as your own personal storage area. Very useful."; - name = "Personal ID-Locked Locker"; - pixel_y = 10 - }, +/obj/structure/closet/secure_closet/personal, /turf/open/floor/carpet, /area/crew_quarters/dorms) "aqb" = ( @@ -8021,11 +8016,7 @@ /turf/open/floor/carpet, /area/crew_quarters/dorms) "aqo" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here."; - name = "Personal ID-Locked Closet"; - pixel_y = 15 - }, +/obj/structure/closet/secure_closet/personal/cabinet, /turf/open/floor/wood, /area/crew_quarters/dorms) "aqp" = ( @@ -8846,14 +8837,10 @@ /area/security/vacantoffice/b) "ask" = ( /obj/item/flashlight/lamp/green{ - pixel_x = -3; - pixel_y = 22 - }, -/obj/structure/dresser{ - desc = "There's plenty of clothes here to change into! It has a surprising amount of variety, too."; - name = "Dresser"; - pixel_y = 7 + pixel_x = -2; + pixel_y = 15 }, +/obj/structure/dresser, /turf/open/floor/wood, /area/crew_quarters/dorms) "asl" = ( @@ -8864,7 +8851,6 @@ /turf/open/floor/plating, /area/security/vacantoffice/b) "asm" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/chair/comfy/brown{ dir = 4 }, @@ -14488,8 +14474,10 @@ /turf/open/floor/plasteel, /area/gateway) "aHw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, /turf/open/floor/wood, /area/crew_quarters/dorms) "aHx" = ( @@ -23035,11 +23023,7 @@ /turf/open/floor/carpet, /area/bridge/meeting_room) "bdJ" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here."; - name = "Personal ID-Locked Closet"; - pixel_y = 15 - }, +/obj/structure/closet/secure_closet/personal/cabinet, /turf/open/floor/plating, /area/maintenance/port) "bdK" = ( @@ -26479,7 +26463,9 @@ /turf/open/floor/plating, /area/maintenance/disposal) "blU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, /turf/open/floor/wood, /area/crew_quarters/dorms) "blV" = ( @@ -54427,11 +54413,7 @@ /turf/open/space/basic, /area/space/nearstation) "eSe" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here."; - name = "Personal ID-Locked Closet"; - pixel_y = 15 - }, +/obj/structure/closet/secure_closet/personal/cabinet, /turf/open/floor/carpet, /area/crew_quarters/dorms) "eVC" = ( @@ -54800,6 +54782,12 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"fPL" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "fTg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -55323,7 +55311,9 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "hPs" = ( -/obj/structure/fireplace, +/obj/structure/fireplace{ + pixel_y = -6 + }, /obj/machinery/airalarm{ dir = 8; pixel_x = 23 @@ -56095,18 +56085,13 @@ /turf/open/floor/plasteel, /area/crew_quarters/dorms) "kmS" = ( +/obj/structure/dresser, /obj/item/flashlight/lamp/green{ - pixel_x = -3; - pixel_y = 22 + pixel_x = -2; + pixel_y = 15 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4; - pixel_y = 5 - }, -/obj/structure/dresser{ - desc = "There's plenty of clothes here to change into! It has a surprising amount of variety, too."; - name = "Dresser"; - pixel_y = 7 + dir = 4 }, /turf/open/floor/carpet, /area/crew_quarters/dorms) @@ -57329,8 +57314,8 @@ /area/security/prison) "omY" = ( /obj/item/flashlight/lamp/green{ - pixel_x = -3; - pixel_y = 22 + pixel_x = -2; + pixel_y = 15 }, /obj/structure/dresser{ desc = "There's plenty of clothes here to change into! It has a surprising amount of variety, too."; @@ -57442,7 +57427,9 @@ /turf/closed/wall, /area/crew_quarters/bar) "oAB" = ( -/obj/structure/fireplace, +/obj/structure/fireplace{ + pixel_y = -6 + }, /turf/open/floor/carpet, /area/crew_quarters/dorms) "oDm" = ( @@ -59716,15 +59703,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"vDR" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/structure/closet/secure_closet/personal/cabinet{ - desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here."; - name = "Personal ID-Locked Closet"; - pixel_y = 15 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) "vEi" = ( /obj/structure/cable{ icon_state = "4-8" @@ -92643,7 +92621,7 @@ aqe arf aqo atm -atm +fPL arf avv awu @@ -92899,7 +92877,7 @@ cSA aqe arf asm -blU +atm blU avg awp @@ -93671,7 +93649,7 @@ aqi arf ask atm -atm +fPL arf awq axO @@ -93926,8 +93904,8 @@ ajo aps aqk arf -vDR -blU +aqo +atm aHw avn awv diff --git a/_maps/map_files/LambdaStation/lambda.dmm b/_maps/map_files/LambdaStation/lambda.dmm index 6d1469d483..5d9018f4cc 100644 --- a/_maps/map_files/LambdaStation/lambda.dmm +++ b/_maps/map_files/LambdaStation/lambda.dmm @@ -267,7 +267,6 @@ /area/space) "aaT" = ( /obj/docking_port/stationary{ - dir = 1; dwidth = 1; height = 4; roundstart_template = /datum/map_template/shuttle/escape_pod/default; @@ -382,7 +381,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -538,7 +536,6 @@ dir = 4 }, /obj/structure/disposaloutlet{ - icon_state = "outlet"; dir = 8 }, /turf/open/floor/plating/asteroid/airless, @@ -630,9 +627,7 @@ /obj/machinery/button/door{ id = "permawindows"; name = "Emergency Shutters"; - normaldoorcontrol = 0; - pixel_y = 25; - specialfunctions = 1 + pixel_y = 25 }, /turf/open/floor/plasteel/dark, /area/security/prison) @@ -700,7 +695,6 @@ /area/science/research) "acb" = ( /obj/machinery/doppler_array/research/science{ - icon_state = "tdoppler"; dir = 1 }, /obj/machinery/status_display/ai{ @@ -745,7 +739,6 @@ dir = 5 }, /obj/machinery/button/massdriver{ - dir = 2; id = "toxinsdriver"; pixel_x = 24; pixel_y = 24 @@ -1023,14 +1016,13 @@ /obj/effect/decal/cleanable/tomato_smudge, /obj/effect/landmark/xeno_spawn, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plating, /area/medical/abandoned) "acK" = ( /obj/structure/sign/warning/vacuum/external{ - pixel_x = 30; + pixel_x = 30 }, /turf/open/floor/plating, /area/science/mixing) @@ -1241,14 +1233,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/prison) -"adm" = ( -/obj/machinery/door/poddoor{ - density = 1; - id = "SecJusticeChamber"; - name = "Justice Vent" - }, -/turf/open/floor/plating, -/area/security/execution/education) "adn" = ( /obj/structure/cable{ icon_state = "2-4" @@ -1288,9 +1272,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore) -"ads" = ( -/turf/closed/wall/r_wall, -/area/science/nanite) "adt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -1303,7 +1284,7 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/white, -/area/science/nanite) +/area/science/circuit) "adu" = ( /turf/closed/wall/r_wall, /area/science/storage) @@ -1396,7 +1377,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -1474,9 +1454,9 @@ /area/science/research) "adR" = ( /obj/machinery/power/apc{ + areastring = "/area/maintenance/fore"; dir = 1; name = "Fore Maintenance APC"; - areastring = "/area/maintenance/fore"; pixel_y = 24 }, /obj/structure/cable{ @@ -1497,8 +1477,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/table, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "adT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -1510,13 +1492,10 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/science/nanite) +/area/science/circuit) "adU" = ( /turf/open/floor/plasteel, -/area/science/nanite) -"adV" = ( -/turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "adW" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral{ @@ -1539,7 +1518,7 @@ light_color = "#cee5d2" }, /turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "adX" = ( /obj/effect/turf_decal/bot, /obj/structure/sign/poster/random{ @@ -1559,7 +1538,7 @@ /obj/item/integrated_electronics/analyzer, /obj/item/integrated_circuit_printer, /turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "adY" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -1578,7 +1557,7 @@ /obj/item/stock_parts/cell/high, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "adZ" = ( /obj/effect/turf_decal/delivery, /obj/machinery/portable_atmospherics/canister/toxins, @@ -1653,10 +1632,8 @@ "aej" = ( /obj/machinery/door/window/westleft{ base_state = "right"; - dir = 8; icon_state = "right"; - name = "Unisex Showers"; - req_access_txt = "0" + name = "Unisex Showers" }, /turf/open/floor/plasteel/freezer, /area/security/prison) @@ -1669,7 +1646,6 @@ /area/security/prison) "ael" = ( /obj/machinery/sparker{ - dir = 2; id = "executionburn"; pixel_x = -25 }, @@ -1930,7 +1906,7 @@ pixel_x = -26 }, /turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "aeM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ @@ -1944,20 +1920,19 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/science/nanite) +/area/science/circuit) "aeN" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, -/area/science/nanite) +/area/science/circuit) "aeO" = ( /obj/structure/chair/office/light{ dir = 1 }, /turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "aeP" = ( /obj/machinery/status_display/ai{ pixel_x = 32 @@ -1967,7 +1942,7 @@ /obj/item/stack/sheet/glass/fifty, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "aeQ" = ( /obj/machinery/portable_atmospherics/canister/toxins, /obj/effect/turf_decal/delivery, @@ -1985,17 +1960,12 @@ }, /turf/open/floor/plasteel/white, /area/science/storage) -"aeT" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, -/area/science/storage) "aeU" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, /obj/machinery/status_display/ai{ - pixel_x = -32; + pixel_x = -32 }, /turf/open/floor/plasteel/white, /area/science/mixing) @@ -2017,7 +1987,6 @@ pixel_x = 32 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -2092,8 +2061,7 @@ /area/security/prison) "afj" = ( /obj/machinery/door/airlock{ - name = "Unisex Restroom"; - req_access_txt = "0" + name = "Unisex Restroom" }, /turf/open/floor/plasteel/freezer, /area/security/prison) @@ -2113,7 +2081,6 @@ /area/security/execution/education) "afm" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 2; name = "justice injector" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -2224,7 +2191,6 @@ /area/security/processing) "aft" = ( /obj/effect/turf_decal/arrows/red{ - icon_state = "arrows_red"; dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -2302,7 +2268,6 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /obj/structure/table/reinforced, @@ -2376,25 +2341,9 @@ dir = 8 }, /turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "afH" = ( /obj/structure/table/reinforced, -/obj/item/nanite_scanner{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/nanite_scanner{ - pixel_x = 4; - pixel_y = -4 - }, -/obj/item/nanite_remote{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/nanite_remote{ - pixel_x = 4; - pixel_y = 4 - }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -2406,22 +2355,11 @@ dir = 8 }, /obj/effect/turf_decal/bot, +/obj/machinery/cell_charger{ + pixel_y = 5 + }, /turf/open/floor/plasteel/dark, -/area/science/nanite) -"afI" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/item/twohanded/required/kirbyplants/random, -/turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "afJ" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -2488,7 +2426,6 @@ light_color = "#e8eaff" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -2570,7 +2507,6 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/machinery/door/window/brigdoor{ - dir = 2; name = "Justice Chamber"; req_access_txt = "3" }, @@ -2630,7 +2566,6 @@ "agg" = ( /obj/effect/turf_decal/tile/red, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -2726,7 +2661,7 @@ icon_state = "2-4" }, /turf/open/floor/plasteel, -/area/science/nanite) +/area/science/circuit) "agp" = ( /obj/effect/landmark/start/scientist, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -2741,29 +2676,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/science/nanite) -"agq" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "agr" = ( /obj/machinery/door/airlock/research{ name = "Toxins Secure Storage"; @@ -2834,7 +2747,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -2956,6 +2868,8 @@ /obj/structure/table/optable{ name = "Robotics Operating Table" }, +/obj/item/tank/internals/anesthetic, +/obj/item/clothing/mask/breath, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) "agH" = ( @@ -3111,7 +3025,6 @@ req_access_txt = "1" }, /obj/machinery/button/door{ - dir = 2; id = "SecJusticeChamber"; layer = 4; name = "Justice Vent Control"; @@ -3264,7 +3177,6 @@ /turf/open/floor/plating, /area/science/xenobiology) "ahj" = ( -/obj/machinery/nanite_program_hub, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -3283,7 +3195,7 @@ dir = 8 }, /turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "ahk" = ( /obj/structure/disposalpipe/junction{ dir = 1 @@ -3297,13 +3209,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, -/area/science/nanite) +/area/science/circuit) "ahl" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plasteel, -/area/science/nanite) +/area/science/circuit) "ahm" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -3320,16 +3232,11 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/item/storage/box/disks_nanite{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/storage/box/disks_nanite{ - pixel_x = 4; - pixel_y = 2 +/obj/machinery/cell_charger{ + pixel_y = 5 }, /turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "ahn" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -3350,7 +3257,7 @@ pixel_x = 24 }, /turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "aho" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/effect/turf_decal/delivery, @@ -3381,7 +3288,6 @@ }, /obj/machinery/power/apc/highcap/five_k{ areastring = "/area/science/storage"; - dir = 2; name = "Toxins Storage APC"; pixel_y = -25 }, @@ -3405,7 +3311,6 @@ /area/maintenance/fore/secondary) "aht" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -3501,7 +3406,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -3599,7 +3503,6 @@ /area/security/processing) "ahN" = ( /obj/machinery/computer/shuttle/labor{ - icon_state = "computer"; dir = 8 }, /obj/structure/cable{ @@ -3636,7 +3539,6 @@ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -3650,14 +3552,6 @@ }, /turf/open/floor/engine, /area/science/xenobiology) -"ahU" = ( -/obj/structure/disposaloutlet{ - icon_state = "outlet"; - dir = 8 - }, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/engine, -/area/science/xenobiology) "ahV" = ( /turf/closed/wall, /area/science/xenobiology) @@ -3667,9 +3561,8 @@ /area/science/xenobiology) "ahX" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ - name = "euthanization chamber freezer"; - icon_state = "freezer_1"; - dir = 4 + dir = 4; + name = "euthanization chamber freezer" }, /obj/effect/turf_decal/stripes/end{ dir = 4 @@ -3722,8 +3615,9 @@ /area/science/xenobiology) "aid" = ( /obj/machinery/airalarm/directional/north, +/obj/machinery/vending/assist, /turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "aie" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3737,29 +3631,30 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/science/nanite) +/area/science/circuit) "aif" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, -/area/science/nanite) +/area/science/circuit) "aig" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "aih" = ( /obj/structure/chair/office/light, /turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "aii" = ( /obj/machinery/status_display/evac{ pixel_x = 32 }, /obj/effect/turf_decal/loading_area, +/obj/structure/table, +/obj/item/stack/sheet/glass/fifty, /turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "aij" = ( /obj/machinery/door/airlock/research{ name = "Toxins Secure Storage"; @@ -3872,7 +3767,6 @@ /area/maintenance/fore/secondary) "ait" = ( /obj/effect/turf_decal/arrows/red{ - icon_state = "arrows_red"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -4136,7 +4030,6 @@ /turf/open/floor/plating, /area/science/xenobiology) "aiY" = ( -/obj/machinery/computer/nanite_cloud_controller, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/neutral{ @@ -4149,8 +4042,17 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/closet/crate, +/obj/item/gun/energy/laser/practice, +/obj/item/gun/energy/laser/practice, +/obj/item/target/syndicate, +/obj/item/target/syndicate, +/obj/item/target/clown, +/obj/item/target/clown, +/obj/item/target/alien, +/obj/item/target/alien, /turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "aiZ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4162,23 +4064,22 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/science/nanite) +/area/science/circuit) "aja" = ( /obj/machinery/firealarm{ dir = 1; pixel_y = -24 }, /turf/open/floor/plasteel, -/area/science/nanite) +/area/science/circuit) "ajb" = ( /obj/structure/disposalpipe/trunk{ dir = 1 }, /obj/machinery/disposal/bin, /turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "ajc" = ( -/obj/machinery/nanite_programmer, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -4191,13 +4092,14 @@ dir = 8 }, /obj/machinery/light, +/obj/structure/table, +/obj/item/screwdriver, +/obj/item/multitool, +/obj/item/pen, +/obj/item/paper_bin, /turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "ajd" = ( -/obj/machinery/computer/nanite_chamber_control{ - icon_state = "computer"; - dir = 1 - }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -4209,10 +4111,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/table, +/obj/item/integrated_circuit_printer, +/obj/item/integrated_electronics/analyzer, /turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "aje" = ( -/obj/machinery/nanite_chamber, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -4223,8 +4127,13 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/table, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/integrated_electronics/wirer, +/obj/item/integrated_electronics/debugger, /turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "ajf" = ( /obj/effect/turf_decal/tile/purple{ dir = 8 @@ -4233,9 +4142,9 @@ dir = 4 }, /obj/machinery/power/apc{ + areastring = "/area/science/mixing"; dir = 8; name = "Toxins Lab APC"; - areastring = "/area/science/mixing"; pixel_x = -26; pixel_y = 3 }, @@ -4319,7 +4228,6 @@ }, /obj/machinery/camera{ c_tag = "Toxins - Lab"; - dir = 2; network = list("ss13","rd") }, /obj/effect/turf_decal/delivery, @@ -4498,7 +4406,6 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/mecha_part_fabricator, /obj/item/radio/intercom{ - dir = 2; pixel_y = 28 }, /turf/open/floor/plasteel, @@ -4574,7 +4481,6 @@ }, /obj/item/radio/intercom{ desc = "Talk through this. It looks like it has been modified to not broadcast."; - dir = 2; name = "Prison Intercom (General)"; pixel_y = 24; prison_radio = 1 @@ -4604,7 +4510,6 @@ }, /obj/item/radio/intercom{ desc = "Talk through this. It looks like it has been modified to not broadcast."; - dir = 2; name = "Prison Intercom (General)"; pixel_y = 24; prison_radio = 1 @@ -4646,7 +4551,6 @@ name = "Cell Bolt Control"; normaldoorcontrol = 1; pixel_y = 25; - req_access_txt = "0"; specialfunctions = 4 }, /obj/structure/chair, @@ -4661,7 +4565,6 @@ }, /obj/item/radio/intercom{ desc = "Talk through this. It looks like it has been modified to not broadcast."; - dir = 2; name = "Prison Intercom (General)"; pixel_y = 24; prison_radio = 1 @@ -4681,7 +4584,6 @@ name = "Cell Bolt Control"; normaldoorcontrol = 1; pixel_y = 25; - req_access_txt = "0"; specialfunctions = 4 }, /obj/structure/chair, @@ -4711,9 +4613,7 @@ }, /obj/machinery/meter, /obj/machinery/door/window/westleft{ - base_state = "left"; dir = 4; - icon_state = "left"; name = "gas ports" }, /obj/effect/turf_decal/tile/neutral{ @@ -4733,7 +4633,6 @@ /area/security/execution/education) "ajT" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -4745,9 +4644,8 @@ /obj/structure/sink/kitchen{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; dir = 8; - icon_state = "sink_alt"; name = "old sink"; - pixel_x = 15; + pixel_x = 15 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -4846,7 +4744,6 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -4911,7 +4808,6 @@ /area/science/xenobiology) "akj" = ( /obj/machinery/atmospherics/pipe/layer_manifold{ - icon_state = "manifoldlayer"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -4949,9 +4845,6 @@ }, /turf/open/floor/circuit, /area/science/xenobiology) -"akp" = ( -/turf/closed/wall, -/area/science/nanite) "akq" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4974,13 +4867,12 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, -/area/science/nanite) +/area/science/circuit) "akr" = ( /turf/closed/wall, /area/science/misc_lab/range) "aks" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /obj/item/radio/intercom{ @@ -5068,7 +4960,6 @@ /area/science/mixing) "akA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -5120,7 +5011,6 @@ /obj/item/storage/box/monkeycubes, /obj/structure/table/glass, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel/white, @@ -5149,7 +5039,6 @@ }, /obj/item/reagent_containers/dropper, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/status_display/ai{ @@ -5171,16 +5060,6 @@ }, /turf/open/floor/plasteel/white, /area/science/robotics/lab) -"akL" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/prison) "akM" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -5193,7 +5072,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -5271,7 +5149,6 @@ "akU" = ( /obj/machinery/power/apc{ areastring = "/area/security/execution/education"; - dir = 2; name = "Prisoner Education Chamber APC"; pixel_y = -24 }, @@ -5323,7 +5200,6 @@ "ala" = ( /obj/effect/turf_decal/stripes/corner, /obj/machinery/computer/security/labor{ - icon_state = "computer"; dir = 1 }, /obj/effect/turf_decal/tile/red, @@ -5579,12 +5455,10 @@ pixel_x = -4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/camera{ c_tag = "Xenobiology Lab - Fore"; - dir = 2; network = list("ss13","rd") }, /turf/open/floor/plasteel/white, @@ -5635,7 +5509,6 @@ receive_ore_updates = 1 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -5649,29 +5522,10 @@ }, /turf/open/floor/circuit, /area/science/xenobiology) -"alB" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/prison) -"alC" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/prison) "alD" = ( /obj/structure/bodycontainer/morgue, /obj/structure/window/reinforced, /obj/effect/turf_decal/trimline/white/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -5781,7 +5635,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -5825,7 +5678,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/effect/turf_decal/trimline/white/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -5846,7 +5698,6 @@ /area/science/robotics/lab) "alY" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -5936,7 +5787,6 @@ "amf" = ( /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/trimline/white/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -6008,8 +5858,7 @@ dir = 8 }, /obj/item/radio/intercom{ - dir = 2; - pixel_x = -29; + pixel_x = -29 }, /turf/open/floor/plasteel, /area/science/xenobiology) @@ -6092,7 +5941,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -6108,7 +5956,6 @@ pixel_y = 8 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel/white, @@ -6118,7 +5965,6 @@ /obj/structure/table, /obj/item/stack/cable_coil/random, /obj/effect/turf_decal/trimline/white/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -6127,7 +5973,6 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/mecha_part_fabricator, /obj/effect/turf_decal/trimline/white/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -6244,7 +6089,6 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -6400,8 +6244,7 @@ pixel_y = -3 }, /obj/machinery/camera/motion{ - c_tag = "Armory Motion Sensor"; - dir = 2 + c_tag = "Armory Motion Sensor" }, /obj/effect/turf_decal/tile/red{ dir = 4 @@ -6474,7 +6317,7 @@ pixel_y = 1 }, /obj/item/grenade/barrier{ - pixel_x = 6; + pixel_x = 6 }, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -6708,7 +6551,6 @@ /area/science/robotics/lab) "anE" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -6819,7 +6661,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -6858,7 +6699,6 @@ /area/science/robotics/lab) "anU" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -6866,7 +6706,6 @@ "anV" = ( /obj/machinery/turnstile{ dir = 1; - icon_state = "turnstile_map"; name = "Genpop Exit Turnstile"; req_access_txt = "70" }, @@ -6888,7 +6727,6 @@ dir = 6 }, /obj/effect/turf_decal/trimline/white/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -6917,7 +6755,6 @@ /area/security/prison) "anY" = ( /obj/effect/turf_decal/arrows/red{ - icon_state = "arrows_red"; dir = 1 }, /obj/effect/turf_decal/tile/neutral, @@ -6940,7 +6777,6 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -6967,7 +6803,7 @@ }, /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "aob" = ( /obj/structure/cable{ icon_state = "2-4" @@ -7248,7 +7084,6 @@ /area/security/armory) "aoo" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -7371,7 +7206,6 @@ /area/science/xenobiology) "aoy" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/status_display/ai{ @@ -7390,7 +7224,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/structure/cable{ @@ -7446,7 +7279,6 @@ "aoE" = ( /obj/machinery/processor/slime, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -7456,7 +7288,6 @@ /area/science/xenobiology) "aoF" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/structure/cable{ @@ -7485,7 +7316,6 @@ /area/science/xenobiology) "aoI" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -7628,13 +7458,6 @@ /obj/effect/turf_decal/trimline/purple/filled/line, /turf/open/floor/plasteel/white, /area/science/research) -"aoQ" = ( -/obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/science/research) "aoR" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -7645,7 +7468,6 @@ icon_state = "2-4" }, /obj/effect/turf_decal/trimline/white/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -7665,7 +7487,6 @@ /area/maintenance/fore) "aoU" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/structure/cable{ @@ -7712,11 +7533,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -7774,7 +7593,6 @@ /area/security/prison) "api" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /obj/effect/turf_decal/trimline/neutral/filled/corner, @@ -7823,6 +7641,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, /area/security/prison) "apo" = ( @@ -7874,7 +7695,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -7940,7 +7760,6 @@ /area/security/prison) "apu" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -8002,7 +7821,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, @@ -8016,14 +7834,12 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/dark, /area/security/prison) "apB" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel/dark, @@ -8110,7 +7926,6 @@ icon_state = "secbot1"; idcheck = 1; name = "Sergeant-at-Armsky"; - on = 1; weaponscheck = 1 }, /turf/open/floor/plasteel/dark, @@ -8162,7 +7977,6 @@ /area/science/xenobiology) "apK" = ( /obj/structure/disposaloutlet{ - icon_state = "outlet"; dir = 8 }, /obj/structure/disposalpipe/trunk{ @@ -8271,7 +8085,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -8286,10 +8099,9 @@ areastring = "/area/science/xenobiology"; dir = 4; name = "Xenobiology APC"; - pixel_x = 24; + pixel_x = 24 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -8354,11 +8166,9 @@ /area/science/misc_lab/range) "aqe" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -8431,7 +8241,6 @@ /area/science/robotics/lab) "aqm" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -8462,7 +8271,6 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/light, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -8505,7 +8313,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/camera/autoname{ @@ -8534,7 +8341,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/white/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -8559,16 +8365,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"aqx" = ( -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/security/prison) "aqy" = ( /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, @@ -8589,7 +8385,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -8716,7 +8511,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/light{ @@ -8727,7 +8521,6 @@ "aqN" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /obj/machinery/camera/autoname{ @@ -8998,7 +8791,6 @@ dir = 5 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -9032,14 +8824,12 @@ pixel_x = 32 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, /area/science/research) "ark" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel/dark, @@ -9056,7 +8846,6 @@ dir = 9 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel/dark, @@ -9076,7 +8865,6 @@ /area/science/mixing) "arq" = ( /obj/machinery/sparker/toxmix{ - dir = 2; pixel_x = 25 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -9154,7 +8942,6 @@ /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/glass/fifty, /obj/effect/turf_decal/trimline/white/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -9255,11 +9042,9 @@ "arF" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /obj/item/radio/intercom{ @@ -9271,7 +9056,6 @@ /area/security/prison) "arG" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/corner, @@ -9510,7 +9294,6 @@ "arW" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /obj/effect/turf_decal/tile/purple{ @@ -10063,7 +9846,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -10092,19 +9874,6 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) -"asQ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/security/prison) "asR" = ( /obj/machinery/door/firedoor, /obj/structure/cable{ @@ -10133,7 +9902,6 @@ /area/science/misc_lab/range) "asS" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel, @@ -10161,7 +9929,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -10179,9 +9946,7 @@ /turf/open/floor/engine, /area/science/mixing) "asY" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{ - dir = 2 - }, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix, /obj/effect/landmark/blobstart, /turf/open/floor/engine, /area/science/mixing) @@ -10198,7 +9963,6 @@ /area/science/mixing) "atb" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/camera{ @@ -10353,7 +10117,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/structure/cable{ @@ -10430,7 +10193,6 @@ /area/security/armory) "aty" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -10471,7 +10233,6 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -10502,7 +10263,6 @@ dir = 10 }, /obj/machinery/computer/camera_advanced/xenobio{ - icon_state = "computer"; dir = 1 }, /turf/open/floor/plasteel, @@ -10535,7 +10295,6 @@ dir = 6 }, /obj/machinery/computer/camera_advanced/xenobio{ - icon_state = "computer"; dir = 1 }, /turf/open/floor/plasteel, @@ -10568,14 +10327,6 @@ "atH" = ( /turf/closed/wall/r_wall, /area/science/server) -"atI" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/security/prison) "atJ" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -10616,14 +10367,12 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, /area/security/prison) "atM" = ( /obj/machinery/sparker/toxmix{ - dir = 2; pixel_x = 25 }, /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input{ @@ -10754,14 +10503,12 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel, /area/security/prison) "atW" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -10772,7 +10519,6 @@ sortType = 14 }, /obj/effect/turf_decal/trimline/white/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -10780,9 +10526,9 @@ "atY" = ( /obj/effect/turf_decal/bot, /obj/machinery/power/apc/highcap/ten_k{ + areastring = "/area/science/robotics/mechbay"; dir = 1; name = "Mech Bay APC"; - areastring = "/area/science/robotics/mechbay"; pixel_y = 28 }, /obj/structure/cable{ @@ -10815,7 +10561,6 @@ /area/science/robotics/mechbay) "auc" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /obj/machinery/light_switch{ @@ -10856,7 +10601,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -10911,11 +10655,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -11029,17 +10771,7 @@ pixel_y = 26 }, /turf/open/floor/plasteel, -/area/science/nanite) -"auu" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/brig) +/area/science/circuit) "auv" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -11238,7 +10970,6 @@ /area/science/server) "auM" = ( /obj/machinery/atmospherics/pipe/layer_manifold{ - icon_state = "manifoldlayer"; dir = 4 }, /turf/open/floor/plating/asteroid/airless, @@ -11247,16 +10978,6 @@ /obj/structure/table, /turf/open/floor/plasteel/dark, /area/science/server) -"auO" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/brig) "auP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, @@ -11376,7 +11097,6 @@ /area/science/robotics/mechbay) "ava" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -11403,7 +11123,6 @@ /area/hallway/primary/fore) "avc" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/corner, @@ -11429,7 +11148,6 @@ pixel_y = 3 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /obj/item/paper/guides/jobs/security/range{ @@ -11462,7 +11180,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -11535,7 +11252,6 @@ icon_state = "0-8" }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/structure/rack, @@ -11543,7 +11259,7 @@ areastring = "/area/science/misc_lab/range"; dir = 4; name = "Research Firing Range APC"; - pixel_x = 28; + pixel_x = 28 }, /obj/item/target, /obj/item/target, @@ -11604,7 +11320,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/white/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -11728,7 +11443,6 @@ "avB" = ( /obj/machinery/camera{ c_tag = "Server Room"; - dir = 2; network = list("ss13","rd"); pixel_x = 22 }, @@ -11751,7 +11465,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -11794,10 +11507,9 @@ dir = 4 }, /obj/machinery/status_display/ai{ - pixel_x = 32; + pixel_x = 32 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile/purple{ @@ -11805,19 +11517,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"avH" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/brig) "avI" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -11847,11 +11546,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -11867,7 +11564,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -11878,7 +11574,6 @@ pixel_y = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /obj/machinery/light_switch{ @@ -11887,41 +11582,27 @@ }, /turf/open/floor/plasteel/white, /area/science/misc_lab/range) -"avM" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) "avN" = ( /obj/machinery/light{ dir = 8; light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, /area/science/research) "avO" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel/white, /area/science/research) "avP" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel/white, @@ -12235,7 +11916,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -12253,7 +11933,6 @@ /area/science/server) "aws" = ( /obj/machinery/computer/rdservercontrol{ - icon_state = "computer"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -12262,7 +11941,6 @@ /obj/structure/cable, /obj/machinery/power/apc{ areastring = "/area/science/server"; - dir = 2; name = "Server Room APC"; pixel_y = -23 }, @@ -12666,7 +12344,6 @@ /area/science/robotics/mechbay) "awP" = ( /obj/effect/turf_decal/trimline/white/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -12714,7 +12391,6 @@ }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/red/corner{ - icon_state = "warninglinecorner_red"; dir = 8 }, /turf/open/floor/plasteel, @@ -12726,7 +12402,6 @@ }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/red/line{ - icon_state = "warningline_red"; dir = 1 }, /obj/effect/turf_decal/arrows/red, @@ -12744,7 +12419,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/red/corner{ - icon_state = "warninglinecorner_red"; dir = 4 }, /turf/open/floor/plasteel, @@ -12756,7 +12430,7 @@ }, /obj/item/reagent_containers/syringe, /obj/machinery/newscaster{ - pixel_x = -32; + pixel_x = -32 }, /turf/open/floor/plasteel/freezer, /area/security/prison) @@ -12815,7 +12489,6 @@ }, /obj/machinery/turnstile{ dir = 1; - icon_state = "turnstile_map"; name = "Genpop Exit Turnstile"; req_access_txt = "70" }, @@ -12919,9 +12592,9 @@ dir = 8 }, /obj/machinery/power/apc{ + areastring = "/area/security/warden"; dir = 4; name = "Warden's Office APC"; - areastring = "/area/security/warden"; pixel_x = 26 }, /obj/structure/cable{ @@ -12952,7 +12625,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile/purple{ @@ -12972,7 +12644,6 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -13027,11 +12698,9 @@ dir = 1 }, /obj/effect/turf_decal/trimline/red/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -13051,11 +12720,9 @@ /area/science/research) "axo" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -13063,20 +12730,6 @@ "axp" = ( /turf/open/floor/circuit/green, /area/science/robotics/mechbay) -"axq" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/brig) "axr" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -13157,7 +12810,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/red/corner{ - icon_state = "warninglinecorner_red"; dir = 1 }, /turf/open/floor/plasteel, @@ -13204,7 +12856,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -13214,7 +12865,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /obj/machinery/button/door{ @@ -13226,22 +12876,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/prison) -"axE" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) "axF" = ( /turf/closed/wall/r_wall, /area/crew_quarters/heads/hos) @@ -13265,7 +12899,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -13280,7 +12913,6 @@ layer = 2.9 }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 9 }, /turf/open/floor/plasteel/dark, @@ -13296,14 +12928,12 @@ pixel_y = -32 }, /obj/effect/turf_decal/stripes/red/corner{ - icon_state = "warninglinecorner_red"; dir = 1 }, /obj/effect/turf_decal/tile/red{ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -13383,11 +13013,9 @@ /area/crew_quarters/heads/hor) "axS" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -13436,7 +13064,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/red/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -13466,7 +13093,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/red/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -13552,9 +13178,9 @@ "ayd" = ( /obj/effect/turf_decal/tile/red, /obj/machinery/power/apc{ + areastring = "/area/security/range"; dir = 4; name = "Shooting Range APC"; - areastring = "/area/security/range"; pixel_x = 24 }, /obj/structure/cable{ @@ -13648,7 +13274,6 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /obj/structure/cable{ @@ -13724,8 +13349,7 @@ "ayq" = ( /obj/structure/bed, /obj/machinery/camera{ - c_tag = "Security - Head of Security's Quarters"; - dir = 2 + c_tag = "Security - Head of Security's Quarters" }, /obj/item/bedsheet/hos, /obj/machinery/status_display{ @@ -13750,7 +13374,7 @@ /obj/machinery/button/door{ id = "hosspace"; name = "Space Shutters Control"; - pixel_x = 25; + pixel_x = 25 }, /obj/machinery/status_display/evac{ pixel_y = 32 @@ -13762,14 +13386,12 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel, /area/science/robotics/mechbay) "ayu" = ( /obj/machinery/atmospherics/pipe/layer_manifold{ - icon_state = "manifoldlayer"; dir = 4 }, /turf/open/floor/plating, @@ -13851,7 +13473,6 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/research{ - id_tag = null; name = "Break Room"; req_one_access_txt = "47" }, @@ -13881,7 +13502,6 @@ /obj/machinery/computer/security/research, /obj/machinery/camera{ c_tag = "Research Director's Office Fore"; - dir = 2; name = "science camera"; network = list("ss13","rd") }, @@ -13933,11 +13553,9 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -13960,7 +13578,6 @@ /area/science/research) "ayR" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel/white, @@ -14036,7 +13653,6 @@ /area/security/range) "ayZ" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer3{ - icon_state = "inje_map-2"; dir = 4 }, /turf/open/floor/plating, @@ -14148,14 +13764,6 @@ /obj/effect/turf_decal/trimline/purple/filled/line, /turf/open/floor/plasteel/white, /area/science/research) -"azk" = ( -/obj/effect/turf_decal/trimline/purple/filled/line, -/obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/science/research) "azl" = ( /obj/structure/cable{ icon_state = "4-8" @@ -14232,7 +13840,6 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -14502,7 +14109,6 @@ /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/purple/filled/line, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -14533,7 +14139,6 @@ "azS" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -14583,7 +14188,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /obj/effect/turf_decal/trimline/purple/filled/line, /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -14835,9 +14439,9 @@ /area/security/brig) "aAo" = ( /obj/machinery/power/apc/highcap/ten_k{ + areastring = "/area/science/research"; dir = 1; name = "Research Division APC"; - areastring = "/area/science/research"; pixel_y = 25 }, /obj/structure/cable{ @@ -14970,7 +14574,6 @@ /area/crew_quarters/heads/hos) "aAy" = ( /obj/machinery/computer/prisoner{ - icon_state = "computer"; dir = 8 }, /obj/effect/turf_decal/tile/red{ @@ -15017,7 +14620,6 @@ /area/security/checkpoint/science) "aAB" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -15031,7 +14633,6 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -15139,7 +14740,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -15196,7 +14796,6 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/line, @@ -15204,11 +14803,9 @@ /area/science/research) "aAV" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -15287,17 +14884,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"aBe" = ( -/obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) "aBf" = ( /obj/machinery/computer/secure_data, /turf/open/floor/carpet, @@ -15348,26 +14934,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/security/brig) -"aBm" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) "aBn" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -15386,29 +14957,10 @@ dir = 10 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, /area/science/research) -"aBp" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/robotics/mechbay) -"aBq" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) "aBr" = ( /obj/structure/cable{ icon_state = "4-8" @@ -15424,7 +14976,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/arrows/red{ - icon_state = "arrows_red"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -15435,13 +14986,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/prison) -"aBs" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/science/research) "aBt" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -15469,7 +15013,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -15479,7 +15022,6 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/cafeteria, @@ -15511,7 +15053,6 @@ /area/crew_quarters/heads/hos) "aBz" = ( /obj/machinery/computer/security/hos{ - icon_state = "computer"; dir = 8 }, /obj/structure/cable{ @@ -15552,9 +15093,8 @@ /area/security/checkpoint/science) "aBC" = ( /obj/machinery/power/apc{ - dir = 2; - name = "Science Security APC"; areastring = "/area/security/checkpoint/science"; + name = "Science Security APC"; pixel_y = -24 }, /obj/structure/cable, @@ -15623,7 +15163,6 @@ "aBH" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/item/radio/intercom{ @@ -15632,7 +15171,6 @@ pixel_y = -28 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -15660,8 +15198,6 @@ }, /obj/structure/chair/stool, /obj/item/radio/intercom{ - freerange = 0; - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29 }, @@ -15675,9 +15211,8 @@ icon_state = "4-8" }, /obj/machinery/power/apc{ - dir = 2; - name = "RD Office APC"; areastring = "/area/crew_quarters/heads/hor"; + name = "RD Office APC"; pixel_y = -27 }, /obj/structure/cable{ @@ -15717,7 +15252,6 @@ /area/crew_quarters/heads/hor) "aBP" = ( /obj/machinery/computer/aifixer{ - icon_state = "computer"; dir = 1 }, /turf/open/floor/plasteel/cafeteria, @@ -15741,7 +15275,6 @@ /area/crew_quarters/heads/hor) "aBS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -15769,7 +15302,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -15798,14 +15330,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/science) -"aBZ" = ( -/obj/machinery/light, -/obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/science/research) "aCa" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ @@ -15830,7 +15354,6 @@ "aCb" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel/white, @@ -15841,9 +15364,9 @@ /area/maintenance/fore/secondary) "aCd" = ( /obj/machinery/power/apc{ + areastring = "/area/security/detectives_office"; dir = 8; name = "Detective APC"; - areastring = "/area/security/detectives_office"; pixel_x = -24 }, /obj/structure/cable{ @@ -15898,7 +15421,6 @@ /obj/effect/turf_decal/trimline/purple/filled/line, /obj/machinery/camera{ c_tag = "Science Hallway Fore"; - dir = 2; name = "science camera"; network = list("ss13","rd") }, @@ -15934,7 +15456,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -16121,7 +15642,6 @@ }, /obj/structure/noticeboard{ dir = 1; - icon_state = "nboard00"; pixel_y = -30 }, /turf/open/floor/plasteel/white, @@ -16174,7 +15694,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -16435,7 +15954,7 @@ /obj/item/bedsheet/medical, /obj/machinery/iv_drip, /obj/structure/sign/poster/official/cleanliness{ - pixel_x = 32; + pixel_x = 32 }, /turf/open/floor/plasteel/white, /area/security/brig) @@ -16574,14 +16093,6 @@ /obj/item/healthanalyzer, /turf/open/floor/plasteel/white, /area/science/explab) -"aDq" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/science/research) "aDr" = ( /turf/closed/wall/r_wall, /area/science/explab) @@ -16592,10 +16103,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/status_display/evac{ - pixel_x = 32; + pixel_x = 32 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -16609,32 +16119,26 @@ }, /obj/structure/chair/stool, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/white, /area/science/research) "aDu" = ( /obj/machinery/button/door{ - dir = 2; id = "Skynet_launch"; name = "Mech Bay Door Control"; pixel_x = 26; pixel_y = 6; req_one_access_txt = "29" }, -/obj/effect/turf_decal/tile/neutral{ - dir = 2 - }, +/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel, /area/science/robotics/mechbay) "aDv" = ( /obj/machinery/button/door{ - dir = 2; id = "Skynet_launch"; name = "Mech Bay Door Control"; pixel_x = -26; @@ -16645,11 +16149,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -16679,11 +16181,9 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -16754,14 +16254,12 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile/purple{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -16829,7 +16327,6 @@ /area/security/brig) "aDN" = ( /obj/machinery/turnstile{ - icon_state = "turnstile_map"; dir = 4 }, /obj/machinery/door/firedoor, @@ -16856,10 +16353,9 @@ dir = 4 }, /obj/machinery/status_display/evac{ - pixel_x = 32; + pixel_x = 32 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile/purple{ @@ -16876,7 +16372,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/corner, @@ -17031,11 +16526,9 @@ "aEf" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 10 }, /turf/open/floor/plasteel, @@ -17061,11 +16554,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -17085,16 +16576,15 @@ dir = 8 }, /obj/machinery/power/apc{ + areastring = "/area/hallway/primary/fore"; dir = 8; name = "Fore Primary Hallway APC"; - areastring = "/area/hallway/primary/fore"; pixel_x = -24 }, /obj/structure/cable{ icon_state = "0-4" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -17242,7 +16732,6 @@ }, /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -17299,7 +16788,6 @@ dir = 9 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/grimy, @@ -17415,7 +16903,6 @@ dir = 4 }, /obj/effect/turf_decal/arrows/red{ - icon_state = "arrows_red"; dir = 8 }, /turf/open/floor/plasteel, @@ -17428,7 +16915,6 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -17543,7 +17029,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -17653,9 +17138,8 @@ /area/science/explab) "aFe" = ( /obj/machinery/power/apc{ - dir = 2; - name = "Experimentation Lab APC"; areastring = "/area/science/explab"; + name = "Experimentation Lab APC"; pixel_y = -24 }, /obj/structure/cable, @@ -17674,9 +17158,9 @@ dir = 1 }, /obj/machinery/power/apc{ + areastring = "/area/security/brig"; dir = 1; name = "Brig APC"; - areastring = "/area/security/brig"; pixel_y = 24 }, /obj/structure/cable{ @@ -17713,7 +17197,6 @@ /area/science/lab) "aFk" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, @@ -17734,7 +17217,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/camera/autoname{ @@ -17818,7 +17300,6 @@ /area/security/brig) "aFv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel, @@ -17926,14 +17407,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/quartermaster/office) -"aFH" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) "aFI" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -17958,16 +17431,8 @@ "aFL" = ( /turf/open/floor/plating/asteroid/basalt, /area/asteroid/nearstation) -"aFM" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 10 - }, -/turf/open/floor/plasteel, -/area/security/brig) "aFN" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /obj/item/radio/intercom{ @@ -18002,7 +17467,6 @@ "aFR" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -18019,7 +17483,6 @@ /area/science/research) "aFT" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/grimy, @@ -18066,11 +17529,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -18103,11 +17564,10 @@ /area/hallway/primary/fore) "aFZ" = ( /obj/structure/chair/sofa{ - icon_state = "sofamiddle"; dir = 8 }, /obj/machinery/status_display/evac{ - pixel_x = 32; + pixel_x = 32 }, /turf/open/floor/plasteel/grimy, /area/hallway/primary/fore) @@ -18293,11 +17753,9 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -18416,11 +17874,9 @@ icon_state = "2-4" }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -18431,7 +17887,6 @@ }, /obj/effect/landmark/start/security_officer, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -18519,7 +17974,6 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -18573,7 +18027,6 @@ light_color = "#c1caff" }, /obj/structure/chair/sofa{ - icon_state = "sofamiddle"; dir = 8 }, /turf/open/floor/plasteel/grimy, @@ -18709,7 +18162,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -18888,11 +18340,9 @@ "aHr" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -18904,11 +18354,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -18930,14 +18378,12 @@ /area/science/lab) "aHu" = ( /obj/structure/chair/sofa/left{ - icon_state = "sofaend_left"; dir = 1 }, /turf/open/floor/plasteel/grimy, /area/hallway/primary/fore) "aHv" = ( /obj/structure/chair/sofa/corner{ - icon_state = "sofacorner"; dir = 8 }, /turf/open/floor/plasteel/grimy, @@ -18945,9 +18391,9 @@ "aHw" = ( /obj/structure/table, /obj/machinery/power/apc{ + areastring = "/area/storage/art"; dir = 8; name = "Art Storage APC"; - areastring = "/area/storage/art"; pixel_x = -25 }, /obj/item/paper_bin, @@ -18980,60 +18426,28 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "aHB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, /area/security/brig) -"aHC" = ( -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/brig) "aHD" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel, /area/security/brig) -"aHE" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/security/brig) "aHF" = ( /obj/structure/chair{ name = "Judge" }, /turf/open/floor/plasteel, /area/security/courtroom) -"aHG" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/security/brig) "aHH" = ( /obj/structure/cable{ icon_state = "4-8" @@ -19085,7 +18499,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -19094,7 +18507,6 @@ /obj/effect/turf_decal/tile/red, /obj/machinery/light, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -19111,7 +18523,6 @@ light_color = "#e8eaff" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -19150,14 +18561,13 @@ /area/security/courtroom) "aHS" = ( /obj/docking_port/stationary{ - name = "mining shuttle bay"; - icon_state = "pinonalert"; - dir = 1; - id = "mining_home"; - width = 7; - height = 5; dwidth = 3; - roundstart_template = /datum/map_template/shuttle/mining/box + height = 5; + icon_state = "pinonalert"; + id = "mining_home"; + name = "mining shuttle bay"; + roundstart_template = /datum/map_template/shuttle/mining/box; + width = 7 }, /turf/open/space, /area/space) @@ -19174,7 +18584,6 @@ /area/hallway/primary/fore) "aHW" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -19211,7 +18620,6 @@ /area/hallway/primary/fore) "aIc" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -19322,7 +18730,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /obj/effect/turf_decal/arrows/red{ - icon_state = "arrows_red"; dir = 4 }, /turf/open/floor/plasteel, @@ -19627,11 +19034,9 @@ dir = 4 }, /obj/effect/turf_decal/stripes/red/corner{ - icon_state = "warninglinecorner_red"; dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/tile/red{ @@ -19649,9 +19054,9 @@ /area/security/brig) "aIy" = ( /obj/machinery/power/apc{ + areastring = "/area/lawoffice"; dir = 1; name = "Law Office APC"; - areastring = "/area/lawoffice"; pixel_y = 24 }, /obj/structure/cable{ @@ -19747,7 +19152,6 @@ icon_state = "2-4" }, /obj/effect/turf_decal/stripes/red/line{ - icon_state = "warningline_red"; dir = 1 }, /obj/effect/turf_decal/arrows/red, @@ -19778,7 +19182,6 @@ /area/crew_quarters/heads/hor) "aIK" = ( /obj/docking_port/stationary{ - dir = 1; dwidth = 5; height = 7; id = "supply_home"; @@ -19844,7 +19247,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -19871,22 +19273,11 @@ }, /turf/open/floor/plasteel, /area/storage/art) -"aIT" = ( -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/security/brig) "aIU" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel, @@ -19894,7 +19285,6 @@ "aIV" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel, @@ -19904,7 +19294,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -19955,7 +19344,6 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -19989,11 +19377,9 @@ dir = 4 }, /obj/effect/turf_decal/stripes/red/corner{ - icon_state = "warninglinecorner_red"; dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /obj/effect/turf_decal/tile/red{ @@ -20003,7 +19389,6 @@ /area/security/brig) "aJe" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -20011,7 +19396,6 @@ "aJf" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -20026,7 +19410,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -20048,7 +19431,6 @@ /area/lawoffice) "aJj" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -20056,7 +19438,7 @@ "aJk" = ( /obj/machinery/requests_console{ department = "Law office"; - pixel_x = 31; + pixel_x = 31 }, /turf/open/floor/plasteel/grimy, /area/lawoffice) @@ -20122,7 +19504,6 @@ /area/security/courtroom) "aJr" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -20141,18 +19522,6 @@ /obj/structure/sign/warning/vacuum/external, /turf/closed/wall/r_wall, /area/quartermaster/storage) -"aJu" = ( -/obj/machinery/conveyor{ - dir = 1; - id = "QMLoad" - }, -/obj/machinery/door/poddoor{ - density = 1; - id = "QMLoaddoor"; - name = "Supply Dock Loading Door" - }, -/turf/open/floor/plating, -/area/quartermaster/storage) "aJv" = ( /obj/machinery/door/airlock/external{ name = "Supply Dock Airlock"; @@ -20166,17 +19535,6 @@ /obj/structure/sign/warning/vacuum/external, /turf/open/floor/plating, /area/quartermaster/storage) -"aJx" = ( -/obj/machinery/door/poddoor{ - density = 1; - id = "QMLoaddoor2"; - name = "Supply Dock Loading Door" - }, -/obj/machinery/conveyor{ - id = "QMLoad2" - }, -/turf/open/floor/plating, -/area/quartermaster/storage) "aJy" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -20239,7 +19597,6 @@ /area/hallway/primary/fore) "aJG" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel/white, @@ -20265,7 +19622,6 @@ /area/hallway/primary/fore) "aJI" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -20283,7 +19639,6 @@ /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/purple/filled/line, /obj/effect/turf_decal/trimline/purple/line{ - icon_state = "trimline"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -20326,17 +19681,6 @@ /obj/item/storage/box/lights, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"aJO" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/brig) "aJP" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -20347,11 +19691,9 @@ "aJQ" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /obj/machinery/camera{ @@ -20371,7 +19713,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/corner, @@ -20427,7 +19768,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile/purple{ @@ -20474,7 +19814,6 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -20513,7 +19852,6 @@ icon_state = "2-8" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -20628,11 +19966,9 @@ /area/maintenance/fore) "aKu" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel, @@ -20665,7 +20001,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/effect/turf_decal/trimline/purple/filled/line, /obj/effect/turf_decal/trimline/purple/line{ - icon_state = "trimline"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -20673,7 +20008,6 @@ "aKx" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line, @@ -20681,11 +20015,9 @@ /area/hallway/primary/fore) "aKy" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, @@ -20704,15 +20036,12 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/purple/line{ - icon_state = "trimline"; dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -20729,7 +20058,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -20739,7 +20067,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -20749,7 +20076,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -20762,11 +20088,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/purple/corner{ - icon_state = "trimline_corner"; dir = 4 }, /turf/open/floor/plasteel, @@ -20779,11 +20103,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/purple/line{ - icon_state = "trimline"; dir = 1 }, /turf/open/floor/plasteel, @@ -20803,15 +20125,12 @@ icon_state = "1-4" }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/purple/corner{ - icon_state = "trimline_corner"; dir = 4 }, /obj/effect/turf_decal/trimline/purple/line{ - icon_state = "trimline"; dir = 1 }, /turf/open/floor/plasteel, @@ -20830,40 +20149,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/purple/line{ - icon_state = "trimline"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) -"aKH" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/purple/line{ - icon_state = "trimline"; - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ dir = 1 }, /turf/open/floor/plasteel, @@ -20880,7 +20168,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/line{ - icon_state = "trimline"; dir = 1 }, /obj/effect/turf_decal/tile/neutral, @@ -20897,7 +20184,6 @@ /area/hallway/primary/fore) "aKJ" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel, @@ -20917,11 +20203,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -20974,21 +20258,12 @@ }, /turf/open/floor/plasteel/dark, /area/security/brig) -"aKP" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel, -/area/security/brig) "aKQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/tile/red{ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/tile/red, @@ -21024,7 +20299,6 @@ /area/security/brig) "aKU" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/camera/autoname{ @@ -21073,7 +20347,6 @@ pixel_y = -32 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/tile/red, @@ -21115,7 +20388,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -21216,7 +20488,6 @@ "aLn" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /obj/effect/turf_decal/tile/purple, @@ -21229,16 +20500,15 @@ /area/hallway/primary/fore) "aLo" = ( /obj/machinery/power/apc{ + areastring = "/area/quartermaster/miningoffice"; dir = 1; name = "Mining APC"; - areastring = "/area/quartermaster/miningoffice"; pixel_y = 24 }, /obj/structure/cable{ icon_state = "0-2" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /obj/item/radio/intercom{ @@ -21280,11 +20550,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -21306,7 +20574,6 @@ dir = 10 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -21331,7 +20598,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /obj/effect/turf_decal/tile/purple{ @@ -21354,7 +20620,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /obj/machinery/navbeacon{ @@ -21511,7 +20776,6 @@ /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/red/corner{ - icon_state = "warninglinecorner_red"; dir = 8 }, /turf/open/floor/plasteel, @@ -21523,7 +20787,6 @@ }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/red/line{ - icon_state = "warningline_red"; dir = 1 }, /obj/effect/turf_decal/arrows/red, @@ -21537,7 +20800,6 @@ /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/red/corner{ - icon_state = "warninglinecorner_red"; dir = 4 }, /turf/open/floor/plasteel, @@ -21551,7 +20813,6 @@ }, /obj/machinery/door/window/westleft{ base_state = "right"; - dir = 8; icon_state = "right"; name = "Outer Window" }, @@ -21695,7 +20956,6 @@ req_access_txt = "31" }, /obj/machinery/button/door{ - dir = 2; id = "QMLoaddoor2"; layer = 4; name = "Loading Doors"; @@ -21704,14 +20964,12 @@ req_access_txt = "31" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, /area/quartermaster/storage) "aLZ" = ( /obj/machinery/conveyor/inverted{ - icon_state = "conveyor_map_inverted"; dir = 9; id = "QMLoad2" }, @@ -21738,7 +20996,6 @@ "aMc" = ( /obj/machinery/conveyor{ dir = 6; - icon_state = "conveyor_map"; id = "QMLoad2" }, /turf/open/floor/plating, @@ -21816,7 +21073,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -21881,14 +21137,12 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, /area/security/brig) "aMr" = ( /obj/machinery/atmospherics/components/unary/portables_connector/layer1{ - icon_state = "connector_map-1"; dir = 8 }, /turf/open/floor/plating, @@ -21899,7 +21153,6 @@ }, /obj/machinery/computer/security/telescreen/interrogation{ dir = 4; - icon_state = "telescreen"; layer = 4; pixel_x = -28 }, @@ -21915,14 +21168,12 @@ }, /obj/item/radio/intercom{ desc = "Talk through this. It looks like it has been modified to not broadcast."; - dir = 2; name = "Prison Intercom (General)"; pixel_x = -25; pixel_y = -2; prison_radio = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -21936,20 +21187,9 @@ }, /turf/open/floor/plasteel, /area/security/brig) -"aMw" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/brig) "aMx" = ( /obj/item/radio/intercom{ desc = "Talk through this. It looks like it has been modified to not broadcast."; - dir = 2; name = "Prison Intercom (General)"; pixel_x = -25; pixel_y = -2; @@ -21959,22 +21199,10 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, /area/security/brig) -"aMy" = ( -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel, -/area/security/brig) "aMz" = ( /obj/effect/turf_decal/tile/red, /obj/structure/disposalpipe/segment, @@ -21987,9 +21215,6 @@ icon_state = "1-2" }, /obj/machinery/door/window/westleft{ - base_state = "left"; - dir = 8; - icon_state = "left"; name = "Outer Window" }, /obj/machinery/door/window/brigdoor{ @@ -22063,13 +21288,12 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/light_switch{ - pixel_x = -28; + pixel_x = -28 }, /turf/open/floor/plasteel/grimy, /area/lawoffice) "aME" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel/grimy, @@ -22086,9 +21310,8 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - dir = 2; - name = "Courtroom APC"; areastring = "/area/security/courtroom"; + name = "Courtroom APC"; pixel_x = 1; pixel_y = -24 }, @@ -22158,7 +21381,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -22212,7 +21434,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -22224,7 +21445,6 @@ pixel_x = -32 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel, @@ -22283,34 +21503,24 @@ /area/quartermaster/storage) "aMX" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel, /area/quartermaster/storage) "aMY" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /obj/structure/rack, /obj/item/flashlight/seclite, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) -"aMZ" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/quartermaster/miningoffice) "aNa" = ( /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "aNb" = ( /obj/machinery/computer/shuttle/mining, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -22318,7 +21528,6 @@ "aNc" = ( /obj/machinery/computer/security/mining, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -22337,7 +21546,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/door/airlock/security/glass{ @@ -22419,11 +21627,9 @@ "aNn" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /obj/machinery/light{ @@ -22536,7 +21742,7 @@ "aNy" = ( /obj/structure/filingcabinet/chestdrawer, /obj/structure/sign/poster/official/enlist{ - pixel_x = 32; + pixel_x = 32 }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/neutral{ @@ -22654,7 +21860,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/item/radio/intercom{ @@ -22666,11 +21871,9 @@ /area/hallway/primary/central) "aNK" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -22684,10 +21887,9 @@ areastring = "/area/quartermaster/qm"; dir = 8; name = "Quartermaster's Office APC"; - pixel_x = -25; + pixel_x = -25 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -22831,7 +22033,6 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -22854,7 +22055,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -22880,7 +22080,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -22934,11 +22133,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /obj/structure/cable{ @@ -22946,35 +22143,6 @@ }, /turf/open/floor/plasteel/white, /area/science/research) -"aOn" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/purple/line{ - icon_state = "trimline"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) "aOo" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, @@ -22982,9 +22150,9 @@ dir = 5 }, /obj/machinery/power/apc{ + areastring = "/area/science/lab"; dir = 8; name = "Research and Development Lab APC"; - areastring = "/area/science/lab"; pixel_x = -26; pixel_y = 3 }, @@ -22992,7 +22160,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -23146,8 +22313,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/door/airlock/grunge{ - name = "Courtroom"; - opacity = 1 + name = "Courtroom" }, /turf/open/floor/plasteel/dark, /area/security/courtroom) @@ -23162,7 +22328,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -23187,7 +22352,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -23201,7 +22365,6 @@ pixel_x = 24 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -23270,7 +22433,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -23283,7 +22445,6 @@ /area/quartermaster/miningoffice) "aOP" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -23392,7 +22553,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/purple/line{ - icon_state = "trimline"; dir = 1 }, /turf/open/floor/plasteel, @@ -23406,14 +22566,12 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel/white, /area/science/lab) "aPe" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /obj/machinery/light{ @@ -23434,14 +22592,12 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "aPh" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -23462,7 +22618,6 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -23489,7 +22644,6 @@ /area/security/brig) "aPl" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -23497,7 +22651,6 @@ "aPm" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel/white, @@ -23512,7 +22665,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel/white, @@ -23571,7 +22723,6 @@ /area/quartermaster/qm) "aPt" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -23605,7 +22756,6 @@ "aPv" = ( /obj/effect/landmark/start/shaft_miner, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -23616,7 +22766,6 @@ light_color = "#c1caff" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -23632,7 +22781,6 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -23649,7 +22797,6 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -23666,7 +22813,6 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -23677,7 +22823,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -23685,7 +22830,6 @@ "aPF" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel, @@ -23739,23 +22883,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) -"aPN" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/item/radio/intercom{ - dir = 4; - pixel_x = 27 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) "aPO" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/radio/intercom{ @@ -23822,7 +22949,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/purple/line{ - icon_state = "trimline"; dir = 1 }, /turf/open/floor/plasteel, @@ -23831,7 +22957,6 @@ /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile/purple, @@ -24195,7 +23320,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/navbeacon{ @@ -24236,7 +23360,6 @@ pixel_x = -5 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, @@ -24246,7 +23369,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel, @@ -24344,11 +23466,9 @@ /area/crew_quarters/heads/captain/private) "aQG" = ( /obj/structure/chair/sofa{ - icon_state = "sofamiddle"; dir = 8 }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 9 }, /obj/item/radio/intercom{ @@ -24369,7 +23489,6 @@ /area/science/explab) "aQI" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -24377,7 +23496,6 @@ "aQJ" = ( /obj/machinery/power/apc/highcap/ten_k{ areastring = "/area/crew_quarters/heads/hor/private"; - dir = 2; name = "Research Director's Quarters APC"; pixel_y = -24 }, @@ -24438,7 +23556,7 @@ req_access_txt = "63" }, /obj/structure/sign/nanotrasen{ - pixel_x = 32; + pixel_x = 32 }, /turf/open/floor/plasteel, /area/security/brig) @@ -24447,7 +23565,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, @@ -24455,7 +23572,6 @@ "aQR" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel, @@ -24508,12 +23624,9 @@ pixel_y = 32 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /obj/item/radio/intercom{ - freerange = 0; - frequency = 1459; name = "Station Intercom (General)"; pixel_x = -29 }, @@ -24532,7 +23645,6 @@ /obj/effect/turf_decal/tile/red, /obj/machinery/vending/cigarette, /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -24547,14 +23659,6 @@ }, /obj/machinery/light, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/security/brig) -"aRa" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -24565,12 +23669,10 @@ pixel_x = 24 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/structure/closet/secure_closet/quartermaster, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -24578,7 +23680,6 @@ "aRc" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -24594,7 +23695,6 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel, @@ -24605,7 +23705,6 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel, @@ -24682,7 +23781,7 @@ }, /obj/machinery/computer/med_data/laptop, /obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -32; + pixel_x = -32 }, /obj/structure/extinguisher_cabinet{ pixel_y = 29 @@ -24698,9 +23797,8 @@ icon_state = "4-8" }, /obj/machinery/power/apc/highcap/ten_k{ - dir = 2; - name = "Captain's Quarters APC"; areastring = "/area/crew_quarters/heads/captain/private"; + name = "Captain's Quarters APC"; pixel_y = -24 }, /obj/structure/cable{ @@ -24727,7 +23825,6 @@ /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile/purple, @@ -24739,7 +23836,6 @@ /area/hallway/primary/fore) "aRt" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -24781,9 +23877,7 @@ /obj/item/aiModule/core/freeformcore, /obj/structure/window/reinforced, /obj/machinery/door/window{ - base_state = "left"; dir = 4; - icon_state = "left"; name = "Core Modules"; req_access_txt = "20" }, @@ -24806,9 +23900,7 @@ dir = 1 }, /obj/machinery/door/window/westleft{ - base_state = "left"; dir = 2; - icon_state = "left"; layer = 3.1; name = "Cyborg Upload Console Window"; req_access_txt = "16" @@ -25104,7 +24196,6 @@ "aSa" = ( /obj/structure/noticeboard/qm{ dir = 1; - icon_state = "nboard00"; pixel_y = -30 }, /obj/effect/turf_decal/trimline/yellow/filled/line, @@ -25112,11 +24203,9 @@ /area/quartermaster/qm) "aSb" = ( /obj/machinery/computer/security/qm{ - icon_state = "computer"; dir = 8 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /obj/machinery/light_switch{ @@ -25125,14 +24214,6 @@ }, /turf/open/floor/plasteel, /area/quartermaster/qm) -"aSc" = ( -/obj/structure/closet/wardrobe/cargotech, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/quartermaster/storage) "aSd" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ dir = 8 @@ -25281,7 +24362,6 @@ "aSs" = ( /obj/structure/dresser, /obj/item/radio/intercom{ - dir = 2; pixel_y = 28 }, /turf/open/floor/carpet/blue, @@ -25318,11 +24398,9 @@ "aSw" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -25361,11 +24439,9 @@ "aSA" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -25497,8 +24573,7 @@ }, /obj/item/lighter, /obj/machinery/camera{ - c_tag = "Bar"; - dir = 2 + c_tag = "Bar" }, /turf/open/floor/plasteel, /area/crew_quarters/bar) @@ -25537,9 +24612,9 @@ dir = 1 }, /obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/crew_quarters/bar"; dir = 1; name = "Bar APC"; - areastring = "/area/crew_quarters/bar"; pixel_y = 25 }, /obj/structure/cable{ @@ -25554,7 +24629,6 @@ dir = 1 }, /obj/machinery/chem_dispenser/drinks{ - icon_state = "soda_dispenser"; dir = 8 }, /obj/structure/table, @@ -25601,7 +24675,6 @@ "aSU" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/structure/extinguisher_cabinet{ @@ -25629,7 +24702,6 @@ /area/hydroponics) "aSY" = ( /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -25712,7 +24784,6 @@ "aTg" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel, @@ -25723,7 +24794,6 @@ "aTi" = ( /obj/machinery/vending/cola/random, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -25731,7 +24801,6 @@ "aTj" = ( /obj/machinery/vending/snack/random, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel, @@ -25767,7 +24836,6 @@ pixel_x = 24 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile/yellow{ @@ -25780,28 +24848,24 @@ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aTp" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aTq" = ( /obj/effect/turf_decal/caution{ - icon_state = "caution"; dir = 1 }, /turf/open/floor/plasteel, /area/quartermaster/storage) "aTr" = ( /obj/effect/turf_decal/caution{ - icon_state = "caution"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -25809,7 +24873,6 @@ /area/quartermaster/storage) "aTs" = ( /obj/effect/turf_decal/caution{ - icon_state = "caution"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, @@ -26021,11 +25084,9 @@ /area/ai_monitored/turret_protected/ai_upload) "aTS" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /obj/item/radio/intercom{ @@ -26114,7 +25175,6 @@ icon_state = "1-4" }, /obj/effect/turf_decal/trimline/purple/line{ - icon_state = "trimline"; dir = 1 }, /turf/open/floor/plasteel, @@ -26158,7 +25218,6 @@ dir = 4 }, /obj/machinery/chem_dispenser/drinks/beer{ - icon_state = "booze_dispenser"; dir = 8 }, /obj/structure/table, @@ -26167,7 +25226,6 @@ "aUd" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/structure/cable{ @@ -26181,27 +25239,10 @@ }, /turf/open/floor/plasteel, /area/hydroponics) -"aUf" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hydroponics) "aUg" = ( /obj/item/storage/toolbox/mechanical, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"aUh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hydroponics) "aUi" = ( /obj/item/twohanded/required/kirbyplants/random, /obj/machinery/camera/autoname{ @@ -26216,7 +25257,6 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel, @@ -26326,7 +25366,6 @@ /area/hallway/primary/central) "aUx" = ( /obj/vehicle/ridden/scooter{ - icon_state = "scooter"; dir = 8 }, /obj/machinery/firealarm{ @@ -26334,7 +25373,6 @@ pixel_x = -24 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -26397,11 +25435,9 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -26474,7 +25510,7 @@ areastring = "/area/crew_quarters/heads/captain"; dir = 8; name = "Captain's Office APC"; - pixel_x = -25; + pixel_x = -25 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -26513,7 +25549,6 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -26601,7 +25636,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -26617,13 +25651,11 @@ /area/crew_quarters/bar/atrium) "aVg" = ( /obj/effect/turf_decal/stripes/red/corner{ - icon_state = "warninglinecorner_red"; dir = 1 }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -26718,7 +25750,6 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/green{ @@ -26728,7 +25759,6 @@ dir = 1 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -26758,7 +25788,6 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -26769,7 +25798,6 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -26824,7 +25852,6 @@ pixel_y = -28 }, /obj/machinery/computer/bounty{ - icon_state = "computer"; dir = 1 }, /turf/open/floor/plasteel, @@ -26843,9 +25870,8 @@ /area/hallway/primary/central) "aVz" = ( /obj/machinery/power/apc{ - dir = 2; - name = "Cargo Bay APC"; areastring = "/area/quartermaster/storage"; + name = "Cargo Bay APC"; pixel_x = 1; pixel_y = -24 }, @@ -26877,11 +25903,9 @@ /area/quartermaster/office) "aVB" = ( /obj/effect/turf_decal/caution{ - icon_state = "caution"; dir = 1 }, /obj/effect/turf_decal/trimline/yellow/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -26937,7 +25961,6 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -26966,12 +25989,10 @@ /obj/structure/table, /obj/item/export_scanner, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/camera{ c_tag = "Quartermaster's Office"; - dir = 2; name = "cargo camera" }, /turf/open/floor/plasteel, @@ -26989,11 +26010,9 @@ "aVO" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -27138,7 +26157,6 @@ /area/crew_quarters/bar) "aWh" = ( /obj/effect/turf_decal/trimline/green/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -27149,7 +26167,6 @@ pixel_y = 32 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -27163,7 +26180,6 @@ light_color = "#cee5d2" }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/status_display/evac{ @@ -27175,7 +26191,6 @@ /obj/structure/table/glass, /obj/item/book/manual/hydroponics_pod_people, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -27186,7 +26201,6 @@ light_color = "#cee5d2" }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /obj/machinery/status_display/ai{ @@ -27218,7 +26232,6 @@ pixel_x = 24 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -27233,7 +26246,6 @@ /area/hydroponics) "aWq" = ( /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/light{ @@ -27262,7 +26274,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/camera/autoname{ @@ -27282,7 +26293,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile/purple{ @@ -27304,7 +26314,6 @@ pixel_x = -24 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -27331,7 +26340,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -27350,7 +26358,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -27377,7 +26384,6 @@ /area/quartermaster/office) "aWD" = ( /obj/effect/turf_decal/caution{ - icon_state = "caution"; dir = 8 }, /turf/open/floor/plasteel, @@ -27385,20 +26391,12 @@ "aWE" = ( /obj/effect/turf_decal/stripes/full, /turf/open/floor/plasteel{ - icon_state = "yellowsiding"; - dir = 1 + dir = 1; + icon_state = "yellowsiding" }, /area/quartermaster/office) -"aWF" = ( -/obj/effect/turf_decal/caution{ - icon_state = "caution"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/quartermaster/warehouse) "aWG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -27421,7 +26419,6 @@ pixel_x = -22 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/wood, @@ -27438,7 +26435,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -27460,7 +26456,6 @@ /area/maintenance/fore) "aWO" = ( /obj/structure/chair/sofa/corp/left{ - icon_state = "corp_sofaend_left"; dir = 4 }, /turf/open/floor/wood, @@ -27530,7 +26525,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/light, @@ -27576,7 +26570,6 @@ /area/hallway/primary/central) "aXa" = ( /obj/machinery/computer/security/telescreen/aiupload{ - icon_state = "telescreen"; dir = 4 }, /turf/closed/wall/r_wall, @@ -27597,9 +26590,8 @@ }, /obj/effect/landmark/start/cyborg, /obj/machinery/power/apc{ - dir = 2; - name = "AI Upload Access APC"; areastring = "/area/ai_monitored/turret_protected/ai_upload_foyer"; + name = "AI Upload Access APC"; pixel_y = -27 }, /obj/item/radio/intercom{ @@ -27644,11 +26636,9 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 5 }, /turf/open/floor/plasteel, @@ -27690,7 +26680,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/line{ - icon_state = "trimline"; dir = 5 }, /turf/open/floor/plasteel, @@ -27703,29 +26692,6 @@ /mob/living/carbon/monkey/punpun, /turf/open/floor/plasteel, /area/crew_quarters/bar) -"aXi" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/purple/line{ - icon_state = "trimline"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) "aXj" = ( /obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel, @@ -27778,7 +26744,6 @@ pixel_y = 23 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -27798,9 +26763,9 @@ /area/hydroponics) "aXr" = ( /obj/machinery/power/apc{ + areastring = "/area/maintenance/central/secondary"; dir = 8; name = "Central Maintenance APC"; - areastring = "/area/maintenance/central/secondary"; pixel_x = -24 }, /obj/structure/cable{ @@ -27845,8 +26810,7 @@ id = "commissaryshutter"; name = "Commissary Shutter Control"; pixel_x = 3; - pixel_y = -25; - req_access_txt = "0" + pixel_y = -25 }, /obj/structure/chair/stool, /obj/effect/decal/cleanable/dirt, @@ -27884,7 +26848,6 @@ /obj/structure/chair/comfy/brown, /obj/effect/landmark/start/captain, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/wood, @@ -27897,7 +26860,6 @@ /area/maintenance/fore) "aXz" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel, @@ -27925,7 +26887,6 @@ "aXB" = ( /obj/effect/turf_decal/caution, /obj/effect/turf_decal/trimline/yellow/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -27939,7 +26900,6 @@ /area/hallway/primary/central) "aXD" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel, @@ -27983,7 +26943,6 @@ /area/quartermaster/warehouse) "aXL" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -28087,7 +27046,6 @@ dir = 8 }, /obj/structure/chair/sofa/corp/right{ - icon_state = "corp_sofaend_right"; dir = 4 }, /turf/open/floor/wood, @@ -28097,7 +27055,6 @@ /area/crew_quarters/heads/captain) "aXX" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -28157,7 +27114,6 @@ "aYc" = ( /obj/machinery/light/small, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/wood, @@ -28301,7 +27257,6 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/light{ @@ -28317,7 +27272,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile/purple{ @@ -28359,7 +27313,6 @@ /area/crew_quarters/bar) "aYp" = ( /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/structure/sink{ @@ -28393,7 +27346,6 @@ icon_state = "1-8" }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /obj/structure/extinguisher_cabinet{ @@ -28410,7 +27362,6 @@ dir = 9 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/structure/sink{ @@ -28423,7 +27374,6 @@ /obj/machinery/airalarm/directional/west, /obj/machinery/seed_extractor, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -28471,7 +27421,6 @@ /area/quartermaster/warehouse) "aYB" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel, @@ -28495,7 +27444,6 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -28506,11 +27454,9 @@ /area/hallway/primary/central) "aYF" = ( /obj/effect/turf_decal/caution{ - icon_state = "caution"; dir = 8 }, /obj/effect/turf_decal/trimline/yellow/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -28555,11 +27501,9 @@ /area/quartermaster/warehouse) "aYL" = ( /obj/effect/turf_decal/caution{ - icon_state = "caution"; dir = 4 }, /obj/effect/turf_decal/trimline/yellow/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -28629,7 +27573,6 @@ /area/crew_quarters/heads/captain) "aYS" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/carpet/red, @@ -28655,19 +27598,9 @@ /obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/wood, /area/crew_quarters/heads/captain) -"aYW" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/obj/effect/turf_decal/tile/purple, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) "aYX" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/structure/cable{ @@ -28676,43 +27609,18 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"aYY" = ( -/obj/machinery/light, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/obj/effect/turf_decal/tile/purple, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) "aYZ" = ( /obj/effect/turf_decal/tile/red{ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 5 }, /turf/open/floor/plasteel, /area/security/brig) -"aZa" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) "aZb" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral, @@ -28720,7 +27628,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile/purple, @@ -28731,7 +27638,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /mob/living/simple_animal/bot/medbot{ @@ -28749,7 +27655,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/tile/purple{ @@ -28804,7 +27709,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/light{ @@ -28901,16 +27805,6 @@ }, /turf/open/floor/plating, /area/maintenance/central) -"aZv" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "aZw" = ( /obj/structure/cable{ icon_state = "1-2" @@ -28934,9 +27828,9 @@ /area/hallway/primary/central) "aZx" = ( /obj/machinery/power/apc{ + areastring = "/area/quartermaster/warehouse"; dir = 4; name = "Cargo Warehouse APC"; - areastring = "/area/quartermaster/warehouse"; pixel_x = 26 }, /obj/structure/cable{ @@ -28944,7 +27838,6 @@ pixel_y = 1 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -28963,7 +27856,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -28975,14 +27867,12 @@ sortType = 8 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aZA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -29010,7 +27900,6 @@ dir = 10 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -29032,7 +27921,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -29080,7 +27968,6 @@ dir = 6 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -29115,7 +28002,6 @@ /obj/item/folder/red, /obj/item/taperecorder, /obj/item/radio/intercom{ - anyai = 1; broadcasting = 1; frequency = 1423; listening = 0; @@ -29151,7 +28037,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -29197,7 +28082,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/line{ - icon_state = "trimline"; dir = 4 }, /turf/open/floor/plasteel, @@ -29220,7 +28104,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/line{ - icon_state = "trimline"; dir = 4 }, /turf/open/floor/plasteel, @@ -29235,9 +28118,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/clothing/head/that{ - throwforce = 1 - }, +/obj/item/clothing/head/that, /turf/open/floor/plasteel, /area/crew_quarters/bar) "aZW" = ( @@ -29259,7 +28140,7 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_x = 32; + pixel_x = 32 }, /turf/open/floor/plasteel, /area/crew_quarters/bar) @@ -29267,7 +28148,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel, @@ -29283,7 +28163,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -29301,7 +28180,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel/dark, @@ -29313,25 +28191,6 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/fore) -"bad" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/command) "bae" = ( /obj/structure/cable{ icon_state = "4-8" @@ -29346,7 +28205,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -29390,9 +28248,9 @@ icon_state = "4-8" }, /obj/machinery/power/apc/highcap/ten_k{ + areastring = "/area/hallway/secondary/command"; dir = 1; name = "Command Hallway APC"; - areastring = "/area/hallway/secondary/command"; pixel_y = 25 }, /obj/structure/cable{ @@ -29408,7 +28266,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -29433,7 +28290,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -29452,11 +28308,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -29485,7 +28339,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -29656,9 +28509,9 @@ pixel_x = 32 }, /obj/machinery/power/apc{ + areastring = "/area/crew_quarters/theatre"; dir = 1; name = "Theatre APC"; - areastring = "/area/crew_quarters/theatre"; pixel_y = 25 }, /obj/structure/cable{ @@ -29683,9 +28536,6 @@ /area/crew_quarters/bar) "baB" = ( /obj/machinery/door/window/southleft{ - base_state = "left"; - dir = 2; - icon_state = "left"; name = "Bar Delivery"; req_access_txt = "25" }, @@ -29697,7 +28547,6 @@ /area/crew_quarters/bar) "baC" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/machinery/camera{ @@ -29725,7 +28574,6 @@ "baG" = ( /obj/machinery/biogenerator, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -29766,7 +28614,6 @@ "baK" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -29776,14 +28623,12 @@ /obj/item/folder/yellow, /obj/structure/disposalpipe/junction/flip, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, /area/quartermaster/office) "baM" = ( /obj/machinery/door/window/westleft{ - dir = 8; name = "Cargo Desk"; req_access_txt = "50" }, @@ -29798,7 +28643,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -29807,14 +28651,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, /area/hallway/primary/central) "baP" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -29822,7 +28664,6 @@ "baQ" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, @@ -29833,14 +28674,12 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, /area/quartermaster/office) "baS" = ( /obj/effect/turf_decal/caution{ - icon_state = "caution"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -29851,14 +28690,12 @@ /area/quartermaster/office) "baT" = ( /obj/effect/turf_decal/caution{ - icon_state = "caution"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -29871,7 +28708,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -29884,7 +28720,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -29894,7 +28729,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -29906,7 +28740,6 @@ /obj/effect/landmark/start/cargo_technician, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel, @@ -29994,14 +28827,12 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, /area/bridge) "bbf" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel/dark, @@ -30144,7 +28975,6 @@ /obj/structure/reagent_dispensers/watertank/high, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/structure/window/reinforced{ @@ -30180,7 +29010,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/blue/filled/corner, @@ -30272,7 +29101,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/red/corner{ - icon_state = "warninglinecorner_red"; dir = 8 }, /obj/structure/disposalpipe/segment, @@ -30282,7 +29110,6 @@ "bbz" = ( /obj/effect/turf_decal/arrows/red, /obj/effect/turf_decal/stripes/red/line{ - icon_state = "warningline_red"; dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line, @@ -30454,7 +29281,6 @@ pixel_y = -36 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/wood, @@ -30466,7 +29292,6 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -30482,7 +29307,6 @@ /obj/machinery/portable_atmospherics/canister/toxins, /obj/effect/turf_decal/delivery, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 5 }, /turf/open/floor/plasteel, @@ -30492,7 +29316,6 @@ /area/hallway/secondary/service) "bbW" = ( /obj/effect/turf_decal/stripes/red/corner{ - icon_state = "warninglinecorner_red"; dir = 4 }, /obj/structure/disposalpipe/segment, @@ -30568,7 +29391,6 @@ /area/quartermaster/office) "bcf" = ( /obj/machinery/computer/card{ - icon_state = "computer"; dir = 4 }, /turf/open/floor/carpet, @@ -30588,7 +29410,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -30635,11 +29456,9 @@ /area/bridge/meeting_room) "bcp" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -30786,7 +29605,6 @@ "bcK" = ( /obj/structure/closet/crate/hydroponics, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel, @@ -30817,7 +29635,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /obj/machinery/camera{ @@ -30831,7 +29648,6 @@ /area/security/prison) "bcQ" = ( /obj/effect/turf_decal/arrows/red{ - icon_state = "arrows_red"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -30882,34 +29698,31 @@ /area/maintenance/department/cargo) "bcV" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/structure/table, +/obj/item/stack/packageWrap, +/obj/item/stack/packageWrap, +/obj/item/stack/packageWrap, /turf/open/floor/plasteel, /area/quartermaster/sorting) "bcW" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /turf/open/floor/plasteel, /area/quartermaster/sorting) "bcX" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, @@ -30925,11 +29738,9 @@ /area/quartermaster/sorting) "bcY" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/item/hand_labeler_refill, @@ -30943,11 +29754,9 @@ /area/quartermaster/sorting) "bcZ" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile, @@ -31003,7 +29812,6 @@ /area/maintenance/department/cargo) "bdg" = ( /obj/machinery/computer/communications{ - icon_state = "computer"; dir = 4 }, /obj/machinery/light/small{ @@ -31119,7 +29927,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/door/airlock/security/glass{ @@ -31151,9 +29958,9 @@ dir = 6 }, /obj/machinery/power/apc/highcap/ten_k{ + areastring = "/area/teleporter"; dir = 1; name = "Teleporter APC"; - areastring = "/area/teleporter"; pixel_y = 28 }, /obj/effect/turf_decal/tile/neutral{ @@ -31386,8 +30193,7 @@ dir = 8 }, /obj/machinery/camera/motion{ - c_tag = "E.V.A. Storage"; - dir = 2 + c_tag = "E.V.A. Storage" }, /obj/machinery/cell_charger, /obj/structure/table, @@ -31412,7 +30218,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -31498,7 +30303,6 @@ }, /obj/effect/turf_decal/trimline/yellow/filled/corner, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel, @@ -31526,7 +30330,6 @@ /area/crew_quarters/bar) "bdZ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -31557,7 +30360,6 @@ "bed" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -31636,11 +30438,9 @@ dir = 4 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/structure/disposalpipe/trunk{ @@ -31649,7 +30449,6 @@ /obj/structure/disposaloutlet, /obj/machinery/conveyor{ backwards = 1; - dir = 2; forwards = 2; id = "trashsort" }, @@ -31666,14 +30465,12 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -31694,31 +30491,17 @@ /area/quartermaster/sorting) "bep" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel, /area/hydroponics) "beq" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile, /turf/open/floor/plasteel, /area/quartermaster/sorting) -"ber" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/conveyor{ - backwards = 1; - dir = 2; - forwards = 2; - id = "trashsort" - }, -/turf/open/floor/plating, -/area/quartermaster/sorting) "bes" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line{ @@ -31745,7 +30528,6 @@ /area/maintenance/department/cargo) "bev" = ( /obj/machinery/modular_computer/console/preset/command{ - icon_state = "console"; dir = 4 }, /turf/open/floor/carpet, @@ -31812,11 +30594,9 @@ /area/bridge) "beA" = ( /obj/machinery/computer/cargo/request{ - icon_state = "computer"; dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -31846,7 +30626,6 @@ /area/teleporter) "beD" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -31863,7 +30642,7 @@ areastring = "/area/bridge/meeting_room"; dir = 8; name = "Council Chambers APC"; - pixel_x = -25; + pixel_x = -25 }, /turf/open/floor/carpet, /area/bridge/meeting_room) @@ -31877,7 +30656,6 @@ /area/bridge/meeting_room) "beG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/carpet, @@ -31892,7 +30670,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -31970,9 +30747,9 @@ }, /obj/effect/turf_decal/stripes/corner, /obj/machinery/power/apc{ + areastring = "/area/ai_monitored/storage/eva"; dir = 8; name = "E.V.A. Storage APC"; - areastring = "/area/ai_monitored/storage/eva"; pixel_x = -24 }, /turf/open/floor/plasteel, @@ -32036,7 +30813,6 @@ "beX" = ( /obj/effect/landmark/start/bartender, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/wood, @@ -32151,7 +30927,6 @@ dir = 9 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, @@ -32164,22 +30939,13 @@ "bfp" = ( /obj/machinery/vending/wardrobe/hydro_wardrobe, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, /area/hydroponics) -"bfq" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engine/break_room) "bfr" = ( /obj/machinery/computer/scan_consolenew, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -32187,7 +30953,6 @@ "bfs" = ( /obj/machinery/dna_scannernew, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/structure/sign/warning/nosmoking{ @@ -32238,7 +31003,7 @@ areastring = "/area/security/checkpoint/supply"; dir = 8; name = "Cargo Security APC"; - pixel_x = -25; + pixel_x = -25 }, /obj/machinery/camera{ c_tag = "Security Post - Cargo"; @@ -32248,7 +31013,6 @@ /area/security/checkpoint/supply) "bfy" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel/freezer, @@ -32276,7 +31040,6 @@ /area/maintenance/department/cargo) "bfC" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile, @@ -32287,11 +31050,9 @@ /area/quartermaster/sorting) "bfD" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile, @@ -32460,7 +31221,6 @@ "bfT" = ( /obj/effect/landmark/start/cargo_technician, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -32513,7 +31273,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -32582,9 +31341,9 @@ icon_state = "0-8" }, /obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/bridge/showroom/corporate"; dir = 4; name = "Nanotrasen Corporate Showroom APC"; - areastring = "/area/bridge/showroom/corporate"; pixel_x = 28 }, /turf/open/floor/plasteel/dark, @@ -32675,7 +31434,6 @@ /area/crew_quarters/cafeteria) "bgq" = ( /obj/machinery/computer/arcade/battle{ - icon_state = "arcade"; dir = 4 }, /turf/open/floor/plasteel, @@ -32717,7 +31475,6 @@ dir = 6 }, /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /obj/item/radio/intercom{ @@ -32726,7 +31483,6 @@ pixel_x = -28 }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 5 }, /turf/open/floor/plasteel/white, @@ -32758,11 +31514,9 @@ /area/crew_quarters/kitchen/backroom) "bgB" = ( /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/structure/closet/secure_closet/freezer/kitchen, @@ -32780,11 +31534,9 @@ /area/crew_quarters/kitchen) "bgD" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /obj/item/radio/intercom{ @@ -32825,7 +31577,6 @@ "bgH" = ( /obj/machinery/conveyor/inverted{ dir = 9; - icon_state = "conveyor_map_inverted"; id = "trashsort" }, /turf/open/floor/plating, @@ -32844,7 +31595,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -32924,7 +31674,6 @@ dir = 4 }, /obj/machinery/conveyor{ - icon_state = "conveyor_map"; dir = 6; id = "garbage" }, @@ -32987,7 +31736,6 @@ /area/bridge) "bgV" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel/dark, @@ -32997,7 +31745,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/carpet, @@ -33033,7 +31780,6 @@ /area/teleporter) "bgZ" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -33055,7 +31801,6 @@ /area/maintenance/fore) "bhc" = ( /obj/machinery/door/window/westleft{ - dir = 8; name = "Bridge Deliveries"; req_access_txt = "19" }, @@ -33099,7 +31844,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -33156,11 +31900,9 @@ "bhn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -33209,7 +31951,6 @@ }, /obj/structure/rack, /obj/machinery/door/window/northleft{ - dir = 1; name = "Jetpack Storage"; pixel_x = -1; req_access_txt = "19" @@ -33244,7 +31985,6 @@ pixel_y = -3 }, /obj/machinery/door/window/northleft{ - dir = 1; name = "Magboot Storage"; pixel_x = -1; req_access_txt = "19" @@ -33360,63 +32100,35 @@ dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/item/storage/box/donkpockets, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) -"bhG" = ( -/obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; - dir = 8 - }, -/obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; - dir = 4 - }, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/kitchen) "bhH" = ( /obj/structure/sink/kitchen{ pixel_y = 28 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) -"bhI" = ( -/obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; - dir = 4 - }, -/obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; - dir = 8 - }, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/kitchen) "bhJ" = ( /obj/machinery/light{ dir = 1; light_color = "#cee5d2" }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /turf/open/floor/plasteel/cafeteria, @@ -33424,22 +32136,18 @@ "bhK" = ( /obj/machinery/vending/wardrobe/chef_wardrobe, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "bhL" = ( /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/structure/closet/secure_closet/freezer/fridge, @@ -33513,7 +32221,6 @@ "bhU" = ( /obj/machinery/conveyor/inverted{ dir = 5; - icon_state = "conveyor_map_inverted"; id = "garbage" }, /turf/open/floor/plating, @@ -33524,7 +32231,6 @@ }, /obj/structure/window/reinforced, /obj/machinery/conveyor{ - icon_state = "conveyor_map"; dir = 10; id = "garbage" }, @@ -33547,7 +32253,6 @@ }, /obj/machinery/power/apc{ areastring = "/area/security/armory"; - dir = 2; name = "Armoury APC"; pixel_y = -26 }, @@ -33600,7 +32305,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel/dark, @@ -33618,7 +32322,6 @@ }, /obj/item/storage/box/zipties, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -33681,7 +32384,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -33746,22 +32448,18 @@ /obj/machinery/holopad, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "bir" = ( /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -33910,7 +32608,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -33968,7 +32665,6 @@ "biO" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/light{ @@ -33982,7 +32678,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/light{ @@ -34041,61 +32736,41 @@ "biW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "biX" = ( /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) -"biY" = ( -/obj/machinery/deepfryer, -/obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; - dir = 8 - }, -/obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; - dir = 4 - }, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/kitchen) "biZ" = ( /obj/structure/table, /obj/item/hand_labeler, /obj/item/hand_labeler_refill, /obj/item/stack/packageWrap, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "bja" = ( /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -34106,22 +32781,18 @@ /obj/structure/table, /obj/item/book/manual/chef_recipes, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "bjc" = ( /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/structure/cable{ @@ -34137,11 +32808,9 @@ /area/crew_quarters/kitchen) "bjd" = ( /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/structure/cable{ @@ -34186,11 +32855,9 @@ "bjh" = ( /obj/structure/table, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/item/storage/bag/tray, @@ -34234,7 +32901,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -34278,7 +32944,6 @@ }, /obj/machinery/conveyor{ backwards = 1; - dir = 2; forwards = 2; id = "garbage" }, @@ -34430,7 +33095,6 @@ /area/crew_quarters/cafeteria) "bjK" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/structure/rack, @@ -34460,7 +33124,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -34491,7 +33154,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel, @@ -34509,11 +33171,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/effect/landmark/start/cook, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /turf/open/floor/plasteel/cafeteria, @@ -34522,11 +33182,9 @@ /obj/structure/table, /obj/item/storage/box/donkpockets, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /turf/open/floor/plasteel/cafeteria, @@ -34540,11 +33198,9 @@ layer = 5 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /turf/open/floor/plasteel/cafeteria, @@ -34552,11 +33208,9 @@ "bjU" = ( /obj/structure/table, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/machinery/reagentgrinder, @@ -34565,11 +33219,9 @@ "bjV" = ( /obj/effect/landmark/start/cook, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, @@ -34579,11 +33231,9 @@ "bjW" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/structure/cable{ @@ -34593,11 +33243,9 @@ /area/crew_quarters/kitchen) "bjX" = ( /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/machinery/vending/dinnerware, @@ -34667,7 +33315,6 @@ /mob/living/simple_animal/bot/cleanbot{ auto_patrol = 1; icon_state = "cleanbot1"; - mode = 0; name = "Mopficcer Sweepsky" }, /turf/open/floor/plasteel, @@ -34737,11 +33384,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/machinery/camera{ @@ -34840,39 +33485,18 @@ dir = 6 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; - dir = 4 - }, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/kitchen) -"bkr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; - dir = 8 - }, -/obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "bks" = ( /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, @@ -34882,11 +33506,9 @@ "bkt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/structure/cable{ @@ -34899,7 +33521,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile/purple{ @@ -34966,7 +33587,6 @@ "bkA" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel, @@ -35011,14 +33631,12 @@ }, /obj/machinery/door/window/eastright{ base_state = "left"; - dir = 4; icon_state = "left"; name = "Danger: Conveyor Access"; req_access_txt = "12" }, /obj/machinery/conveyor{ backwards = 1; - dir = 2; forwards = 2; id = "garbage" }, @@ -35037,13 +33655,11 @@ /area/maintenance/disposal) "bkG" = ( /obj/machinery/door/window/eastright{ - dir = 4; name = "Danger: Conveyor Access"; req_access_txt = "12" }, /obj/machinery/conveyor{ backwards = 1; - dir = 2; forwards = 2; id = "garbage" }, @@ -35052,7 +33668,6 @@ "bkH" = ( /obj/machinery/conveyor/inverted{ dir = 9; - icon_state = "conveyor_map_inverted"; id = "garbage" }, /turf/open/floor/plating, @@ -35173,11 +33788,9 @@ dir = 6 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /turf/open/floor/plasteel/cafeteria, @@ -35191,36 +33804,19 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"bkU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; - dir = 8 - }, -/obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; - dir = 4 - }, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/kitchen) "bkV" = ( /obj/effect/landmark/start/cook, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /turf/open/floor/plasteel/cafeteria, @@ -35231,11 +33827,9 @@ dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /turf/open/floor/plasteel/cafeteria, @@ -35253,11 +33847,9 @@ /area/crew_quarters/cafeteria) "bkY" = ( /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/structure/table, @@ -35338,15 +33930,6 @@ }, /turf/open/floor/plasteel, /area/janitor) -"blg" = ( -/obj/machinery/light, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "blh" = ( /obj/structure/cable{ icon_state = "1-2" @@ -35529,7 +34112,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/structure/sign/directions/security{ @@ -35539,7 +34121,6 @@ }, /obj/structure/sign/directions/science{ dir = 1; - icon_state = "direction_sci"; pixel_x = 32 }, /turf/open/floor/plasteel, @@ -35629,11 +34210,9 @@ dir = 9 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /turf/open/floor/plasteel/cafeteria, @@ -35664,11 +34243,9 @@ /area/crew_quarters/kitchen) "blE" = ( /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, @@ -35679,11 +34256,9 @@ /area/crew_quarters/kitchen) "blF" = ( /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/machinery/processor, @@ -35691,11 +34266,9 @@ /area/crew_quarters/kitchen) "blG" = ( /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/structure/cable{ @@ -35820,11 +34393,9 @@ /area/crew_quarters/kitchen) "blX" = ( /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/structure/table, @@ -35987,8 +34558,7 @@ "bmo" = ( /obj/structure/table, /obj/machinery/camera{ - c_tag = "Gateway - Atrium"; - dir = 2 + c_tag = "Gateway - Atrium" }, /obj/effect/turf_decal/bot{ dir = 1 @@ -36003,14 +34573,6 @@ }, /turf/open/floor/plasteel/grimy, /area/bridge) -"bmq" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "bmr" = ( /obj/structure/cable{ icon_state = "1-2" @@ -36032,19 +34594,10 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"bms" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "bmt" = ( /obj/effect/turf_decal/tile/bar, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -36055,7 +34608,6 @@ }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -36066,11 +34618,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -36084,7 +34634,6 @@ /obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -36092,15 +34641,6 @@ "bmy" = ( /obj/effect/turf_decal/trimline/green/filled/corner, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) -"bmz" = ( -/obj/effect/turf_decal/trimline/green/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -36114,7 +34654,6 @@ pixel_x = -25 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -36170,18 +34709,15 @@ /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/green/filled/line, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bmJ" = ( /obj/effect/turf_decal/trimline/green/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -36217,11 +34753,9 @@ dir = 1 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/machinery/disposal/bin, @@ -36234,7 +34768,6 @@ dir = 1 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /turf/open/floor/plasteel, @@ -36245,7 +34778,6 @@ dir = 1 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/machinery/status_display/ai{ @@ -36258,7 +34790,6 @@ dir = 1 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/machinery/airalarm/directional/north, @@ -36269,16 +34800,15 @@ dir = 1 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/structure/cable{ icon_state = "0-2" }, /obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/hallway/secondary/exit/departure_lounge"; dir = 1; name = "Departure Lounge APC"; - areastring = "/area/hallway/secondary/exit/departure_lounge"; pixel_y = 24 }, /turf/open/floor/plasteel, @@ -36289,7 +34819,6 @@ dir = 1 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/machinery/light{ @@ -36297,17 +34826,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) -"bmU" = ( -/obj/structure/chair, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/exit/departure_lounge) "bmV" = ( /obj/structure/chair, /obj/effect/landmark/start/assistant, @@ -36315,7 +34833,6 @@ dir = 1 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /turf/open/floor/plasteel, @@ -36325,7 +34842,6 @@ dir = 1 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/item/twohanded/required/kirbyplants/random, @@ -36336,7 +34852,6 @@ dir = 1 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/red, @@ -36400,7 +34915,7 @@ areastring = "/area/gateway"; dir = 8; name = "Gateway APC"; - pixel_x = -25; + pixel_x = -25 }, /obj/effect/turf_decal/stripes/end{ dir = 8 @@ -36448,7 +34963,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -36524,16 +35038,6 @@ }, /turf/open/floor/plasteel, /area/gateway) -"bnl" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "bnm" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /obj/effect/turf_decal/trimline/neutral/filled/line, @@ -36707,12 +35211,10 @@ /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/structure/sign/directions/supply{ dir = 4; - icon_state = "direction_supply"; pixel_y = 40 }, /obj/structure/sign/directions/evac{ dir = 4; - icon_state = "direction_evac"; pixel_y = 32 }, /obj/structure/sign/directions/medical{ @@ -36943,7 +35445,6 @@ }, /obj/machinery/camera{ c_tag = "Chapel Port"; - dir = 2; name = "chapel camera" }, /turf/open/floor/plasteel/chapel{ @@ -36975,13 +35476,6 @@ "bnL" = ( /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) -"bnM" = ( -/obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/exit/departure_lounge) "bnN" = ( /obj/structure/chair/stool, /obj/machinery/camera{ @@ -36993,19 +35487,6 @@ dir = 8 }, /area/chapel/main) -"bnO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/exit/departure_lounge) "bnP" = ( /obj/machinery/door/airlock/external{ name = "Departure Lounge Airlock" @@ -37059,7 +35540,6 @@ "bnU" = ( /obj/machinery/airalarm/directional/west, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/carpet, @@ -37079,8 +35559,8 @@ /obj/structure/closet/crate/goldcrate, /obj/machinery/camera/motion{ c_tag = "Vault"; - network = list("vault"); - dir = 1 + dir = 1; + network = list("vault") }, /turf/open/floor/plasteel/dark, /area/security/nuke_storage) @@ -37174,24 +35654,12 @@ }, /turf/open/floor/plating, /area/maintenance/fore) -"bog" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/light, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "boh" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -37205,7 +35673,6 @@ pixel_x = 24 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/grimy, @@ -37215,7 +35682,6 @@ dir = 5 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -37258,7 +35724,6 @@ /area/storage/emergency/starboard) "bop" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/red{ @@ -37300,7 +35765,6 @@ /area/hallway/secondary/exit/departure_lounge) "bou" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -37387,7 +35851,6 @@ "boE" = ( /obj/machinery/light, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel, @@ -37397,7 +35860,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel, @@ -37413,7 +35875,6 @@ /area/science/xenobiology) "boH" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/red{ @@ -37432,7 +35893,6 @@ /area/hallway/secondary/exit/departure_lounge) "boJ" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/red, @@ -37444,20 +35904,8 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) -"boK" = ( -/obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/obj/structure/chair{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/exit/departure_lounge) "boL" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /turf/open/floor/plasteel, @@ -37466,24 +35914,12 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) -"boN" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel, -/area/hallway/secondary/exit/departure_lounge) "boO" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "boP" = ( /obj/docking_port/stationary{ - dheight = 0; dir = 4; dwidth = 9; height = 25; @@ -37522,16 +35958,6 @@ "boU" = ( /turf/closed/wall, /area/hallway/primary/aft) -"boV" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "boW" = ( /obj/structure/cable{ icon_state = "1-2" @@ -37551,17 +35977,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"boX" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "boY" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, @@ -37602,15 +36017,6 @@ "bpe" = ( /turf/closed/wall, /area/hallway/primary/starboard) -"bpf" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "bpg" = ( /obj/structure/cable{ icon_state = "1-4" @@ -37626,20 +36032,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/command) -"bph" = ( -/obj/machinery/light{ - dir = 8; - light_color = "#e8eaff" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "bpi" = ( /turf/closed/wall, /area/hallway/secondary/exit) @@ -37655,7 +36047,6 @@ /area/hallway/secondary/exit/departure_lounge) "bpk" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/red, @@ -37686,28 +36077,6 @@ }, /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) -"bpn" = ( -/obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/item/twohanded/required/kirbyplants/random, -/turf/open/floor/plasteel, -/area/hallway/secondary/exit/departure_lounge) -"bpo" = ( -/obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; - dir = 4 - }, -/obj/effect/turf_decal/tile/red, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/exit/departure_lounge) "bpp" = ( /obj/structure/cable{ icon_state = "1-4" @@ -37743,7 +36112,6 @@ /area/maintenance/port/fore) "bpu" = ( /obj/machinery/mineral/stacking_unit_console{ - dir = 2; machinedir = 8; pixel_x = 32 }, @@ -37751,7 +36119,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plating, @@ -37812,16 +36179,6 @@ "bpC" = ( /turf/closed/wall, /area/medical/morgue) -"bpD" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "bpE" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -37831,7 +36188,6 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/structure/extinguisher_cabinet{ @@ -37840,17 +36196,8 @@ }, /turf/open/floor/plasteel, /area/security/brig) -"bpF" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "bpG" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel, @@ -37916,7 +36263,6 @@ req_access_txt = "55" }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/structure/cable{ @@ -37941,7 +36287,6 @@ /area/hallway/secondary/exit/departure_lounge) "bpN" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/red, @@ -37965,7 +36310,6 @@ "bpP" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/binary/pump{ - dir = 2; name = "Fuel Pipe to Incinerator" }, /obj/structure/cable/yellow{ @@ -37998,16 +36342,6 @@ /obj/structure/filingcabinet/security, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) -"bpS" = ( -/obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/exit/departure_lounge) "bpT" = ( /obj/machinery/door/window/brigdoor/westright{ name = "Holding Area"; @@ -38054,28 +36388,20 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) -"bpZ" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "bqa" = ( /obj/structure/cable{ icon_state = "0-2" }, /obj/machinery/power/apc{ + areastring = "/area/medical/genetics"; dir = 1; name = "Genetics Lab APC"; - areastring = "/area/medical/genetics"; pixel_y = 24 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, +/obj/structure/closet/secure_closet/medical1, /turf/open/floor/plasteel/white, /area/medical/genetics) "bqb" = ( @@ -38091,9 +36417,9 @@ light_color = "#cee5d2" }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, +/obj/structure/closet/secure_closet/personal/patient, /turf/open/floor/plasteel/white, /area/medical/genetics) "bqd" = ( @@ -38103,12 +36429,10 @@ }, /obj/machinery/requests_console{ department = "Genetics"; - departmentType = 0; name = "Genetics Requests Console"; - pixel_x = -32; + pixel_x = -32 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/structure/table/glass, @@ -38120,17 +36444,9 @@ }, /turf/open/floor/plasteel/white, /area/medical/genetics) -"bqe" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) "bqf" = ( /obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/structure/table/glass, @@ -38149,7 +36465,6 @@ "bqg" = ( /obj/structure/table/glass, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /obj/structure/noticeboard{ @@ -38230,7 +36545,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -38246,7 +36560,6 @@ /area/medical/abandoned) "bqt" = ( /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/item/radio/intercom{ @@ -38320,7 +36633,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/line{ - icon_state = "trimline"; dir = 4 }, /turf/open/floor/plasteel, @@ -38342,15 +36654,12 @@ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/white/line{ - icon_state = "trimline"; dir = 8 }, /turf/open/floor/plasteel, @@ -38374,7 +36683,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/white/line{ - icon_state = "trimline"; dir = 4 }, /turf/open/floor/plasteel, @@ -38510,14 +36818,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) -"bqK" = ( -/obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; - dir = 4 - }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel, -/area/hallway/secondary/exit/departure_lounge) "bqL" = ( /obj/structure/window/reinforced{ dir = 8 @@ -38536,7 +36836,6 @@ /area/hallway/secondary/exit/departure_lounge) "bqN" = ( /obj/machinery/computer/scan_consolenew{ - icon_state = "computer"; dir = 1 }, /obj/item/radio/intercom{ @@ -38563,7 +36862,6 @@ /area/medical/genetics) "bqQ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -38589,11 +36887,9 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -38659,22 +36955,18 @@ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 8 }, /turf/open/floor/plasteel, /area/hallway/primary/central) "brb" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -38705,7 +36997,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -38722,7 +37013,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -38760,7 +37050,6 @@ /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile/purple, @@ -38778,7 +37067,6 @@ }, /obj/machinery/camera{ c_tag = "Creamatorium"; - dir = 2; name = "chapel camera" }, /turf/open/floor/plasteel/dark, @@ -38911,18 +37199,10 @@ /obj/effect/landmark/start/geneticist, /obj/structure/chair/office/light, /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel/white, /area/medical/genetics) -"bru" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) "brv" = ( /obj/machinery/door/window/westleft{ name = "Monkey Enclosure"; @@ -38948,29 +37228,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"brz" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/line{ - icon_state = "trimline"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "brA" = ( /turf/closed/wall, /area/library) @@ -39000,7 +37257,6 @@ /area/library) "brE" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/machinery/light{ @@ -39063,7 +37319,6 @@ /area/medical/genetics) "brL" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /obj/structure/table/glass, @@ -39102,7 +37357,6 @@ "brN" = ( /obj/machinery/door/airlock/grunge{ name = "Morgue"; - opacity = 1; req_access_txt = "5" }, /obj/structure/cable{ @@ -39133,7 +37387,6 @@ "brO" = ( /obj/machinery/chem_master, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel/white, @@ -39141,7 +37394,6 @@ "brP" = ( /obj/structure/closet/secure_closet/personal/patient, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel/white, @@ -39164,7 +37416,6 @@ /area/medical/morgue) "brT" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -39201,7 +37452,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, @@ -39280,7 +37530,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /obj/structure/sign/directions/evac{ @@ -39295,7 +37544,6 @@ /area/library) "bsh" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/red{ @@ -39309,7 +37557,6 @@ /area/hallway/secondary/exit/departure_lounge) "bsi" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/red{ @@ -39321,20 +37568,8 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) -"bsj" = ( -/obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/structure/chair, -/turf/open/floor/plasteel, -/area/hallway/secondary/exit/departure_lounge) "bsk" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/red{ @@ -39378,7 +37613,6 @@ /obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -39400,15 +37634,12 @@ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/white/line{ - icon_state = "trimline"; dir = 8 }, /turf/open/floor/plasteel, @@ -39421,7 +37652,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -39456,7 +37686,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -39491,7 +37720,6 @@ pixel_x = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel/white, @@ -39501,7 +37729,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/camera/autoname{ @@ -39532,18 +37759,10 @@ dir = 1 }, /obj/effect/turf_decal/trimline/white/line{ - icon_state = "trimline"; dir = 4 }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"bsC" = ( -/obj/structure/chair/comfy/teal{ - icon_state = "comfychair"; - dir = 4 - }, -/turf/open/floor/wood, -/area/library) "bsD" = ( /obj/structure/cable{ icon_state = "1-2" @@ -39582,9 +37801,9 @@ icon_state = "0-8" }, /obj/machinery/power/apc{ + areastring = "/area/library"; dir = 4; name = "Library APC"; - areastring = "/area/library"; pixel_x = 24 }, /turf/open/floor/carpet, @@ -39619,7 +37838,6 @@ /obj/effect/turf_decal/bot_white/right, /obj/machinery/light, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -39652,14 +37870,12 @@ "bsT" = ( /obj/machinery/dna_scannernew, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) "bsU" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /obj/machinery/computer/cloning, @@ -39688,7 +37904,6 @@ }, /obj/structure/window/reinforced, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel/white, @@ -39711,7 +37926,6 @@ req_access_txt = "5" }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -39742,7 +37956,6 @@ req_access_txt = "5" }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -39791,17 +38004,16 @@ }, /obj/structure/window/reinforced, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, /area/medical/storage) "btd" = ( -/obj/machinery/iv_drip, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, +/obj/machinery/bloodbankgen, +/obj/machinery/iv_drip, /turf/open/floor/plasteel/white, /area/medical/storage) "bte" = ( @@ -39809,18 +38021,20 @@ icon_state = "4-8" }, /obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/medical/virology"; dir = 1; name = "Virology APC"; - areastring = "/area/medical/virology"; pixel_y = 24 }, /obj/structure/cable{ icon_state = "0-4" }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, +/obj/structure/table/glass, +/obj/item/radio/headset/headset_med, +/obj/item/hand_labeler, /turf/open/floor/plasteel/white, /area/medical/virology) "btf" = ( @@ -39828,7 +38042,6 @@ icon_state = "1-8" }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -39838,7 +38051,6 @@ /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -39846,7 +38058,6 @@ "bth" = ( /obj/machinery/smartfridge/chemistry/virology/preloaded, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -39861,9 +38072,8 @@ "btj" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc{ - dir = 2; - name = "Abandoned Medical Lab APC"; areastring = "/area/medical/abandoned"; + name = "Abandoned Medical Lab APC"; pixel_x = 1; pixel_y = -24 }, @@ -39917,7 +38127,6 @@ location = "9.2-Escape-2" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -39985,7 +38194,6 @@ }, /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 6 }, /turf/open/floor/plasteel, @@ -39993,7 +38201,6 @@ "btu" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/machinery/camera{ @@ -40030,40 +38237,36 @@ }, /obj/structure/table/glass, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/syringe/antiviral, /turf/open/floor/plasteel/white, /area/medical/virology) "btA" = ( /obj/structure/table/glass, -/obj/item/folder/white, -/obj/item/folder/white, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, +/obj/item/book/manual/wiki/infections, /turf/open/floor/plasteel/white, /area/medical/virology) "btB" = ( /obj/machinery/vending/wardrobe/chem_wardrobe, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel/white, /area/medical/chemistry) "btC" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -40073,7 +38276,6 @@ layer = 2.7 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -40102,7 +38304,6 @@ /obj/effect/turf_decal/bot, /obj/machinery/holopad, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -40119,18 +38320,15 @@ /obj/item/stack/packageWrap, /obj/item/hand_labeler, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel/white, /area/medical/chemistry) "btI" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel/white, @@ -40145,28 +38343,24 @@ /area/crew_quarters/kitchen/backroom) "btK" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel/white, /area/medical/chemistry) "btL" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) "btM" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) "btN" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -40214,9 +38408,11 @@ /area/medical/storage) "btT" = ( /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, +/obj/structure/table/glass, +/obj/item/folder/white, +/obj/item/folder/white, /turf/open/floor/plasteel/white, /area/medical/virology) "btU" = ( @@ -40236,20 +38432,6 @@ /obj/structure/bookcase/random/nonfiction, /turf/open/floor/wood, /area/library) -"btX" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "btY" = ( /obj/structure/cable{ icon_state = "1-4" @@ -40268,7 +38450,6 @@ /area/library) "bua" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/red, @@ -40280,7 +38461,6 @@ /area/hallway/secondary/exit/departure_lounge) "bub" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/red, @@ -40289,7 +38469,6 @@ /area/hallway/secondary/exit/departure_lounge) "buc" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/red, @@ -40303,7 +38482,6 @@ /area/hallway/secondary/exit/departure_lounge) "bud" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/red, @@ -40312,7 +38490,6 @@ /area/hallway/secondary/exit/departure_lounge) "bue" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/red, @@ -40323,7 +38500,6 @@ /area/hallway/secondary/exit/departure_lounge) "buf" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/red, @@ -40336,7 +38512,6 @@ /area/hallway/secondary/exit/departure_lounge) "bug" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/red, @@ -40345,12 +38520,10 @@ /area/hallway/secondary/exit/departure_lounge) "buh" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/machinery/computer/arcade, @@ -40358,7 +38531,6 @@ /area/hallway/secondary/exit/departure_lounge) "bui" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/red, @@ -40389,9 +38561,12 @@ receive_ore_updates = 1 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, +/obj/item/storage/box/syringes{ + pixel_x = 5; + pixel_y = 5 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "bum" = ( @@ -40484,11 +38659,9 @@ /obj/structure/table, /obj/machinery/reagentgrinder, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -40510,11 +38683,9 @@ pixel_x = 3 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -40523,7 +38694,6 @@ /obj/machinery/rnd/production/techfab/department/medical, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -40553,12 +38723,10 @@ /obj/structure/table/reinforced, /obj/structure/window/reinforced, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/camera{ c_tag = "Medbay Storage"; - dir = 2; name = "medbay camera"; network = list("ss13","medbay") }, @@ -40581,7 +38749,6 @@ "buC" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -40589,7 +38756,6 @@ "buD" = ( /obj/effect/landmark/start/geneticist, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -40632,7 +38798,6 @@ pixel_y = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -40650,11 +38815,9 @@ icon_state = "1-8" }, /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -40665,9 +38828,9 @@ }, /obj/structure/closet/secure_closet/medical3, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, +/obj/machinery/iv_drip, /turf/open/floor/plasteel/white, /area/medical/storage) "buJ" = ( @@ -40719,7 +38882,6 @@ receive_ore_updates = 1 }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 5 }, /turf/open/floor/plasteel/white, @@ -40787,15 +38949,16 @@ "buX" = ( /obj/structure/disposalpipe/segment, /obj/structure/table/glass, -/obj/item/book/manual/wiki/infections, /obj/machinery/light{ dir = 4; light_color = "#c1caff" }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, +/obj/item/clothing/glasses/hud/health, +/obj/item/healthanalyzer, +/obj/item/clothing/gloves/color/latex, /turf/open/floor/plasteel/white, /area/medical/virology) "buY" = ( @@ -40808,11 +38971,9 @@ /obj/item/book/manual/wiki/chemistry, /obj/item/book/manual/wiki/grenades, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -40821,11 +38982,9 @@ /obj/structure/table/glass, /obj/item/storage/box/syringes, /obj/effect/turf_decal/trimline/yellow/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/red/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -40845,7 +39004,6 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel/white, @@ -40867,11 +39025,9 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -40908,7 +39064,6 @@ }, /obj/structure/table, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel/white, @@ -40916,7 +39071,6 @@ "bvg" = ( /obj/machinery/vending/wardrobe/medi_wardrobe, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel/white, @@ -40944,9 +39098,8 @@ /area/medical/storage) "bvk" = ( /obj/machinery/power/apc{ - dir = 2; - name = "Medbay Storage APC"; areastring = "/area/medical/storage"; + name = "Medbay Storage APC"; pixel_y = -24 }, /obj/structure/cable{ @@ -41008,22 +39161,6 @@ }, /turf/open/floor/plasteel/dark, /area/medical/morgue) -"bvr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/command) "bvs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/structure/disposalpipe/segment, @@ -41049,9 +39186,7 @@ dir = 4 }, /obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plasteel/cult{ - dir = 2 - }, +/turf/open/floor/plasteel/cult, /area/library) "bvw" = ( /obj/structure/table/wood, @@ -41062,9 +39197,7 @@ pixel_x = 1; pixel_y = 5 }, -/turf/open/floor/plasteel/cult{ - dir = 2 - }, +/turf/open/floor/plasteel/cult, /area/library) "bvx" = ( /obj/effect/landmark/carpspawn, @@ -41085,9 +39218,8 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - dir = 2; - name = "Head of Personnel APC"; areastring = "/area/crew_quarters/heads/hop"; + name = "Head of Personnel APC"; pixel_y = -24 }, /turf/open/floor/wood, @@ -41125,7 +39257,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel, @@ -41136,7 +39267,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -41148,9 +39278,9 @@ "bvE" = ( /obj/structure/closet/secure_closet/medical3, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, +/obj/machinery/iv_drip, /turf/open/floor/plasteel/white, /area/medical/storage) "bvF" = ( @@ -41171,7 +39301,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/navbeacon{ @@ -41192,7 +39321,6 @@ }, /obj/machinery/light, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -41208,13 +39336,13 @@ network = list("ss13","medbay") }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, +/obj/item/radio/headset/headset_med, +/obj/item/folder/white, /turf/open/floor/plasteel/white, /area/medical/chemistry) "bvJ" = ( @@ -41224,11 +39352,9 @@ "bvK" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -41274,7 +39400,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/airlock/unres{ - icon_state = "airlock_unres_helper"; dir = 1 }, /obj/effect/turf_decal/tile/blue, @@ -41294,7 +39419,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/item/radio/intercom{ @@ -41330,32 +39454,16 @@ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/white/line{ - icon_state = "trimline"; dir = 10 }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"bvS" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "bvT" = ( /obj/machinery/light, /turf/open/floor/carpet, @@ -41392,25 +39500,16 @@ /obj/machinery/door/morgue{ name = "Study" }, -/turf/open/floor/plasteel/cult{ - dir = 2 - }, -/area/library) -"bvZ" = ( -/turf/open/floor/plasteel/cult{ - dir = 2 - }, +/turf/open/floor/plasteel/cult, /area/library) "bwa" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ - pixel_x = 32; + pixel_x = 32 }, /obj/item/folder, /obj/item/folder, -/turf/open/floor/plasteel/cult{ - dir = 2 - }, +/turf/open/floor/plasteel/cult, /area/library) "bwb" = ( /obj/machinery/light/small{ @@ -41426,13 +39525,19 @@ "bwd" = ( /obj/structure/table/glass, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/screwdriver{ + pixel_x = -2; + pixel_y = 6 + }, /turf/open/floor/plasteel/white, /area/medical/chemistry) "bwe" = ( @@ -41461,7 +39566,6 @@ "bwf" = ( /obj/machinery/door/airlock/grunge{ name = "Morgue"; - opacity = 1; req_access_txt = "5" }, /obj/structure/cable{ @@ -41492,26 +39596,12 @@ }, /turf/open/floor/plasteel/dark, /area/medical/morgue) -"bwg" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "bwh" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/maintenance/port/fore) "bwi" = ( /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel/white, @@ -41563,13 +39653,6 @@ /obj/effect/turf_decal/trimline/green/filled/line, /turf/open/floor/plasteel/white, /area/medical/virology) -"bwr" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; - dir = 6 - }, -/turf/open/floor/plasteel/white, -/area/medical/virology) "bws" = ( /obj/machinery/chem_heater, /obj/machinery/light{ @@ -41577,11 +39660,9 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -41600,18 +39681,15 @@ /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, /area/medical/chemistry) "bwu" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel/white, @@ -41626,7 +39704,6 @@ dir = 5 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -41637,7 +39714,6 @@ }, /obj/structure/reagent_dispensers/water_cooler, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -41648,7 +39724,6 @@ }, /obj/structure/chair/sofa/right, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -41660,7 +39735,6 @@ }, /obj/structure/chair/sofa, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -41703,14 +39777,6 @@ /obj/structure/table, /obj/item/storage/box/cups, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) -"bwC" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -41741,18 +39807,6 @@ }, /turf/open/floor/plasteel, /area/medical/cryo) -"bwG" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) "bwH" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -41851,17 +39905,6 @@ "bwR" = ( /turf/closed/wall, /area/medical/virology) -"bwS" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/obj/machinery/camera/autoname{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "bwT" = ( /obj/machinery/light, /obj/effect/turf_decal/trimline/green/filled/line, @@ -41898,7 +39941,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/line{ - icon_state = "trimline"; dir = 1 }, /obj/effect/turf_decal/tile/neutral, @@ -41932,7 +39974,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -41940,7 +39981,6 @@ "bwY" = ( /obj/machinery/sleeper, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel/white, @@ -41951,7 +39991,6 @@ location = "9.3-Escape-3" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -41971,7 +40010,6 @@ "bxd" = ( /obj/machinery/sleeper, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -41982,11 +40020,9 @@ /area/medical/chemistry) "bxf" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/item/radio/intercom{ @@ -42038,49 +40074,10 @@ /area/medical/medbay/central) "bxm" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, /area/medical/cryo) -"bxn" = ( -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/command) -"bxo" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/command) "bxp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -42126,22 +40123,18 @@ "bxt" = ( /obj/machinery/chem_master, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, /area/medical/chemistry) "bxu" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -42297,32 +40290,10 @@ layer = 2.9 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel/dark, /area/aisat) -"bxP" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/machinery/light/small{ - dir = 1; - light_color = "#ffc1c1"; - pixel_y = -5 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) -"bxQ" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "bxR" = ( /obj/structure/window/reinforced/spawner/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, @@ -42332,7 +40303,6 @@ pixel_y = -5 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -42346,7 +40316,6 @@ layer = 2.9 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel/dark, @@ -42378,7 +40347,6 @@ /area/medical/virology) "bxX" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -42391,7 +40359,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -42401,7 +40368,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -42415,7 +40381,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -42433,7 +40398,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -42443,14 +40407,12 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, /area/medical/cryo) "bye" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel/dark, @@ -42469,7 +40431,6 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/unres{ - icon_state = "airlock_unres_helper"; dir = 8 }, /obj/effect/turf_decal/tile/blue{ @@ -42486,7 +40447,6 @@ /area/medical/cryo) "byh" = ( /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel/white, @@ -42519,7 +40479,6 @@ /area/hallway/primary/starboard) "byj" = ( /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel/white, @@ -42529,7 +40488,6 @@ pixel_y = 32 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel/white, @@ -42543,7 +40501,6 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -42562,7 +40519,6 @@ /obj/structure/chair/comfy/black, /obj/effect/landmark/start/virologist, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -42573,7 +40529,6 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel/white, @@ -42760,7 +40715,6 @@ /area/medical/cryo) "byH" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, @@ -42780,7 +40734,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -42833,7 +40786,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -42864,11 +40816,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -42900,19 +40850,10 @@ layer = 2.9 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel/dark, /area/aisat) -"byW" = ( -/obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/filled/corner, -/turf/open/floor/plasteel/dark, -/area/aisat) "byX" = ( /obj/structure/window/reinforced/spawner, /obj/effect/turf_decal/trimline/blue/filled/line, @@ -42950,11 +40891,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -42991,11 +40930,9 @@ "bzf" = ( /obj/machinery/chem_dispenser, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel/white, @@ -43244,7 +41181,6 @@ }, /obj/machinery/power/apc{ areastring = "/area/medical/chemistry"; - dir = 2; name = "Chemistry Lab APC"; pixel_y = -25 }, @@ -43269,25 +41205,13 @@ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel/white, /area/medical/chemistry) -"bzH" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "bzI" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/vault{ @@ -43419,28 +41343,10 @@ dir = 10 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel/dark, /area/aisat) -"bzU" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 - }, -/obj/machinery/light/small{ - dir = 1; - light_color = "#ffc1c1"; - pixel_y = -5 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 9 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "bzV" = ( /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced{ @@ -43465,43 +41371,6 @@ }, /turf/open/space/basic, /area/space) -"bzZ" = ( -/obj/structure/window/reinforced/spawner, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 6 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) -"bAa" = ( -/obj/structure/window/reinforced/spawner, -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 10 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) -"bAb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 5 - }, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "bAc" = ( /obj/structure/window/reinforced/spawner, /obj/structure/window/reinforced{ @@ -43515,7 +41384,6 @@ dir = 6 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/wood, @@ -43533,7 +41401,6 @@ /area/maintenance/disposal) "bAf" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -43552,7 +41419,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -43568,7 +41434,6 @@ dir = 10 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -43581,7 +41446,6 @@ dir = 10 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -43604,7 +41468,6 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -43634,7 +41497,6 @@ pixel_y = -32 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/camera/autoname{ @@ -43645,7 +41507,6 @@ "bAp" = ( /obj/machinery/vending/wardrobe/viro_wardrobe, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -43664,7 +41525,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/structure/disposalpipe/junction/yjunction{ - icon_state = "pipe-y"; dir = 1 }, /obj/effect/turf_decal/tile/neutral, @@ -43719,7 +41579,6 @@ "bAu" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -43732,10 +41591,9 @@ areastring = "/area/medical/genetics/cloning"; dir = 8; name = "Cloning Lab APC"; - pixel_x = -25; + pixel_x = -25 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/camera{ @@ -43761,7 +41619,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel/white, @@ -43780,7 +41637,6 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/unres{ - icon_state = "airlock_unres_helper"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -43798,19 +41654,9 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, /area/medical/cryo) -"bAy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/virology) "bAz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -43846,7 +41692,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/camera/autoname{ @@ -43857,22 +41702,13 @@ "bAD" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) -"bAE" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/lobby) "bAF" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -43885,11 +41721,9 @@ }, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/unres{ - icon_state = "airlock_unres_helper"; dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -43899,7 +41733,6 @@ pixel_y = 32 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -43907,7 +41740,6 @@ "bAI" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -43964,9 +41796,7 @@ name = "Private Study"; req_access_txt = "37" }, -/turf/open/floor/plasteel/cult{ - dir = 2 - }, +/turf/open/floor/plasteel/cult, /area/library) "bAO" = ( /obj/machinery/airalarm/directional/west, @@ -43986,46 +41816,13 @@ "bAQ" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"bAR" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 1; - light_color = "#ffc1c1"; - pixel_y = -5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 5 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) -"bAS" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 9 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "bAT" = ( /obj/structure/chair/comfy/black{ dir = 8 @@ -44100,6 +41897,10 @@ /obj/item/storage/box/masks, /obj/structure/table/glass, /obj/effect/turf_decal/trimline/blue/filled/line, +/obj/item/storage/box/gloves{ + pixel_x = 3; + pixel_y = 4 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bBd" = ( @@ -44142,7 +41943,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -44152,7 +41952,6 @@ /obj/machinery/door/airlock/virology{ autoclose = 0; frequency = 1449; - icon_state = "closed"; id_tag = "virology_airlock_interior"; name = "Virology Interior Airlock"; req_access_txt = "39" @@ -44241,6 +42040,7 @@ "bBm" = ( /obj/structure/table/glass, /obj/effect/turf_decal/trimline/blue/filled/line, +/obj/item/reagent_containers/spray/cleaner, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bBn" = ( @@ -44323,7 +42123,6 @@ "bBu" = ( /obj/machinery/power/apc{ areastring = "/area/medical/cryo"; - dir = 2; name = "Cryogenics APC"; pixel_y = -24 }, @@ -44341,7 +42140,6 @@ pixel_y = 32 }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 5 }, /turf/open/floor/plasteel, @@ -44372,7 +42170,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -44411,7 +42208,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -44425,7 +42221,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -44476,7 +42271,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -44494,7 +42288,6 @@ /area/medical/medbay/lobby) "bBG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -44528,7 +42321,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/light{ @@ -44541,7 +42333,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/light{ @@ -44551,7 +42342,6 @@ /area/medical/medbay/central) "bBM" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/light{ @@ -44577,9 +42367,7 @@ pixel_x = -30 }, /obj/effect/landmark/blobstart, -/turf/open/floor/plasteel/cult{ - dir = 2 - }, +/turf/open/floor/plasteel/cult, /area/library) "bBQ" = ( /obj/structure/chair/comfy/brown{ @@ -44589,9 +42377,7 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = 30 }, -/turf/open/floor/plasteel/cult{ - dir = 2 - }, +/turf/open/floor/plasteel/cult, /area/library) "bBR" = ( /obj/structure/rack{ @@ -44604,9 +42390,7 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/open/floor/plasteel/cult{ - dir = 2 - }, +/turf/open/floor/plasteel/cult, /area/library) "bBS" = ( /obj/structure/chair/office/dark{ @@ -44674,7 +42458,6 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/unres{ - icon_state = "airlock_unres_helper"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -44697,7 +42480,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -44717,7 +42499,6 @@ /area/medical/medbay/central) "bCd" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -44762,7 +42543,6 @@ "bCj" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -44796,7 +42576,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -44815,7 +42594,6 @@ }, /obj/structure/cable, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -44825,7 +42603,6 @@ /area/medical/medbay/front_office) "bCr" = ( /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/light{ @@ -44833,7 +42610,6 @@ light_color = "#e8eaff" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -44847,14 +42623,12 @@ /area/security/checkpoint/medical) "bCu" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/white, /area/medical/chemistry) "bCv" = ( /obj/effect/turf_decal/trimline/green/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -44865,7 +42639,6 @@ dir = 4 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/turf_decal/tile, @@ -44890,7 +42663,6 @@ }, /obj/effect/turf_decal/tile, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, @@ -44908,7 +42680,6 @@ }, /obj/effect/turf_decal/tile, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -44922,7 +42693,6 @@ }, /obj/effect/turf_decal/tile, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /mob/living/simple_animal/pet/penguin/emperor{ @@ -44933,7 +42703,6 @@ /area/crew_quarters/heads/cmo) "bCA" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/turf_decal/tile, @@ -44954,7 +42723,6 @@ }, /obj/effect/turf_decal/tile, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/machinery/computer/security/telescreen/cmo{ @@ -44994,25 +42762,19 @@ /area/maintenance/department/medical) "bCF" = ( /obj/machinery/vending/wardrobe/curator_wardrobe, -/turf/open/floor/plasteel/cult{ - dir = 2 - }, +/turf/open/floor/plasteel/cult, /area/library) "bCG" = ( /obj/structure/destructible/cult/tome, /obj/item/clothing/under/suit/red, /obj/item/book/codex_gigas, -/turf/open/floor/plasteel/cult{ - dir = 2 - }, +/turf/open/floor/plasteel/cult, /area/library) "bCH" = ( /obj/structure/bookcase{ name = "Forbidden Knowledge" }, -/turf/open/floor/plasteel/cult{ - dir = 2 - }, +/turf/open/floor/plasteel/cult, /area/library) "bCI" = ( /obj/structure/table/wood, @@ -45024,18 +42786,14 @@ /obj/item/radio/intercom{ pixel_y = -29 }, -/turf/open/floor/plasteel/cult{ - dir = 2 - }, +/turf/open/floor/plasteel/cult, /area/library) "bCJ" = ( /obj/structure/table/wood, /obj/item/taperecorder, /obj/item/storage/photo_album, /obj/item/camera, -/turf/open/floor/plasteel/cult{ - dir = 2 - }, +/turf/open/floor/plasteel/cult, /area/library) "bCK" = ( /obj/machinery/firealarm{ @@ -45127,19 +42885,10 @@ dir = 8 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) -"bCV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/lobby) "bCW" = ( /obj/structure/window/reinforced{ dir = 1; @@ -45175,7 +42924,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -45186,7 +42934,6 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -45199,7 +42946,6 @@ dir = 9 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel/white, @@ -45213,16 +42959,13 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -45254,21 +42997,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"bDg" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/lobby) "bDh" = ( /turf/closed/wall/r_wall, /area/medical/medbay/front_office) @@ -45390,7 +43122,6 @@ }, /obj/effect/turf_decal/tile, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/structure/cable{ @@ -45419,7 +43150,6 @@ }, /obj/effect/turf_decal/tile, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -45445,7 +43175,6 @@ }, /obj/effect/turf_decal/tile, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/structure/table/glass, @@ -45465,7 +43194,6 @@ dir = 6 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/carpet, @@ -45475,7 +43203,6 @@ icon_state = "2-8" }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/turf_decal/tile, @@ -45496,14 +43223,12 @@ }, /obj/effect/turf_decal/tile, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/machinery/keycard_auth{ pixel_x = 30 }, /obj/machinery/computer/med_data{ - icon_state = "computer"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -45596,7 +43321,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -45622,7 +43346,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -45634,7 +43357,6 @@ }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/turf_decal/tile, @@ -45662,20 +43384,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/heads/cmo) -"bDJ" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 5 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "bDK" = ( /turf/closed/wall, /area/maintenance/bar) @@ -45711,7 +43419,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel/white, @@ -45739,7 +43446,6 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel, @@ -45752,14 +43458,12 @@ }, /obj/item/pen, /obj/machinery/camera{ - c_tag = "Security Post - Engineering"; - dir = 2 + c_tag = "Security Post - Engineering" }, /obj/machinery/newscaster{ pixel_y = 32 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -45770,7 +43474,6 @@ /area/hallway/secondary/command) "bDU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -45780,7 +43483,6 @@ /area/crew_quarters/heads/hop/private) "bDV" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel, @@ -45800,7 +43502,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -45814,14 +43515,12 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, /area/medical/virology) "bDZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/wood, @@ -45830,7 +43529,6 @@ /obj/structure/chair, /obj/effect/landmark/start/virologist, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel/white, @@ -45840,7 +43538,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/camera/autoname{ @@ -45934,7 +43631,6 @@ /area/medical/medbay/front_office) "bEi" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/freezer, @@ -45972,7 +43668,6 @@ }, /obj/effect/turf_decal/tile, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/structure/cable, @@ -45993,7 +43688,6 @@ }, /obj/effect/turf_decal/tile, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/machinery/holopad, @@ -46012,7 +43706,6 @@ }, /obj/effect/turf_decal/tile, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/structure/table/glass, @@ -46033,7 +43726,6 @@ }, /obj/effect/turf_decal/tile, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/landmark/start/chief_medical_officer, @@ -46057,7 +43749,6 @@ }, /obj/effect/turf_decal/tile, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/machinery/airalarm/directional/east, @@ -46188,7 +43879,6 @@ }, /obj/machinery/camera{ c_tag = "AI Chamber Fore"; - dir = 2; network = list("aicore") }, /obj/effect/turf_decal/tile/blue{ @@ -46274,17 +43964,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) -"bEK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 6 - }, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/filled/corner, -/turf/open/floor/plasteel/dark, -/area/aisat) "bEL" = ( /obj/item/electropack/shockcollar, /obj/item/assembly/signaler, @@ -46313,7 +43992,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -46323,7 +44001,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -46338,6 +44015,7 @@ /area/medical/virology) "bER" = ( /obj/structure/table, +/obj/item/storage/box/gloves, /turf/open/floor/plasteel/white, /area/medical/virology) "bES" = ( @@ -46348,7 +44026,6 @@ pixel_x = 27 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel, @@ -46365,7 +44042,6 @@ icon_state = "2-8" }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -46389,7 +44065,6 @@ /area/medical/cryo) "bEV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -46409,14 +44084,15 @@ /area/medical/virology) "bEY" = ( /obj/structure/table, -/obj/item/storage/box/gloves, /obj/machinery/light{ dir = 4 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, +/obj/machinery/reagentgrinder, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, /turf/open/floor/plasteel/white, /area/medical/virology) "bEZ" = ( @@ -46424,16 +44100,15 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "bFa" = ( /obj/machinery/power/apc{ + areastring = "/area/security/checkpoint/medical"; dir = 8; name = "Medbay Security APC"; - areastring = "/area/security/checkpoint/medical"; pixel_x = -25 }, /obj/structure/cable, @@ -46463,11 +44138,9 @@ /area/security/checkpoint/medical) "bFc" = ( /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -46498,7 +44171,6 @@ }, /obj/effect/turf_decal/tile, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/machinery/suit_storage_unit/cmo, @@ -46506,7 +44178,6 @@ /area/crew_quarters/heads/cmo) "bFf" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile/yellow{ @@ -46526,7 +44197,6 @@ }, /obj/effect/turf_decal/tile, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/machinery/light, @@ -46546,11 +44216,9 @@ }, /obj/effect/turf_decal/tile, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/machinery/computer/card/minor/cmo{ - icon_state = "computer"; dir = 1 }, /obj/machinery/requests_console{ @@ -46725,7 +44393,6 @@ /area/ai_monitored/turret_protected/ai) "bFA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -46753,13 +44420,12 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ + areastring = "/area/security/checkpoint/engineering"; dir = 8; name = "Engineering Security APC"; - areastring = "/area/security/checkpoint/engineering"; pixel_x = -24 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -46778,7 +44444,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -46802,7 +44467,6 @@ "bFL" = ( /obj/machinery/power/apc{ areastring = "/area/medical/medbay/lobby"; - dir = 2; name = "Medbay Lobby APC"; pixel_y = -24 }, @@ -46820,7 +44484,6 @@ pixel_y = -22 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel/white, @@ -46833,7 +44496,6 @@ }, /obj/machinery/power/apc/highcap/ten_k{ areastring = "/area/quartermaster/qm/private"; - dir = 2; name = "Quartermaster's Quarters APC"; pixel_y = -24 }, @@ -46912,11 +44574,9 @@ "bFX" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -46939,10 +44599,9 @@ /obj/machinery/requests_console{ department = "Security"; departmentType = 5; - pixel_x = -30; + pixel_x = -30 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel, @@ -46991,7 +44650,6 @@ }, /obj/item/radio/off, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, @@ -47041,7 +44699,6 @@ "bGi" = ( /obj/machinery/power/apc{ areastring = "/area/medical/medbay/front_office"; - dir = 2; name = "Medbay Front Office APC"; pixel_y = -24 }, @@ -47082,14 +44739,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bGm" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel/white, @@ -47103,7 +44758,6 @@ pixel_y = 15 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /obj/item/radio/intercom{ @@ -47151,6 +44805,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bGq" = ( @@ -47167,6 +44822,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bGr" = ( @@ -47174,7 +44830,6 @@ /obj/machinery/light, /obj/item/storage/box/donkpockets, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel/white, @@ -47196,11 +44851,9 @@ /area/storage/emergency/starboard) "bGu" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -47210,7 +44863,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/light_switch{ @@ -47222,7 +44874,6 @@ "bGw" = ( /obj/machinery/power/apc/highcap/ten_k{ areastring = "/area/crew_quarters/heads/hop/private"; - dir = 2; name = "Head of Personnel's Quarters APC"; pixel_y = -24 }, @@ -47575,7 +45226,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/light, @@ -47595,7 +45245,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -47686,7 +45335,6 @@ "bHn" = ( /obj/effect/landmark/start/ai/secondary, /obj/item/radio/intercom{ - anyai = 1; freerange = 1; listening = 0; name = "Custom Channel"; @@ -47699,7 +45347,6 @@ pixel_x = -27 }, /obj/item/radio/intercom{ - anyai = 1; freerange = 1; frequency = 1447; name = "Private Channel"; @@ -47709,10 +45356,10 @@ /obj/machinery/door/window{ base_state = "rightsecure"; dir = 4; - obj_integrity = 300; icon_state = "rightsecure"; layer = 4.1; name = "Secondary AI Core Access"; + obj_integrity = 300; pixel_x = 4; req_access_txt = "16" }, @@ -47753,14 +45400,12 @@ pixel_y = 7 }, /obj/item/radio/intercom{ - anyai = 1; freerange = 1; listening = 0; name = "Custom Channel"; pixel_y = 27 }, /obj/item/radio/intercom{ - anyai = 1; freerange = 1; frequency = 1447; name = "Private Channel"; @@ -47787,7 +45432,6 @@ "bHs" = ( /obj/effect/landmark/start/ai/secondary, /obj/item/radio/intercom{ - anyai = 1; freerange = 1; listening = 0; name = "Custom Channel"; @@ -47800,7 +45444,6 @@ pixel_x = 27 }, /obj/item/radio/intercom{ - anyai = 1; freerange = 1; frequency = 1447; name = "Private Channel"; @@ -47810,10 +45453,10 @@ /obj/machinery/door/window{ base_state = "leftsecure"; dir = 8; - obj_integrity = 300; icon_state = "leftsecure"; layer = 4.1; name = "Tertiary AI Core Access"; + obj_integrity = 300; pixel_x = -3; req_access_txt = "16" }, @@ -47842,9 +45485,8 @@ /obj/structure/sink/kitchen{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; dir = 8; - icon_state = "sink_alt"; name = "old sink"; - pixel_x = 15; + pixel_x = 15 }, /turf/open/floor/wood, /area/maintenance/bar) @@ -47872,7 +45514,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel/white, @@ -47881,7 +45522,6 @@ /obj/structure/bed, /obj/item/bedsheet, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel/white, @@ -47889,7 +45529,6 @@ "bHD" = ( /obj/machinery/iv_drip, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -47901,7 +45540,6 @@ /obj/structure/bed, /obj/item/bedsheet, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -47909,7 +45547,6 @@ "bHF" = ( /obj/structure/closet/secure_closet/personal/patient, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -47929,7 +45566,6 @@ light_color = "#cee5d2" }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -47947,7 +45583,6 @@ "bHI" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -47958,7 +45593,6 @@ light_color = "#706891" }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -47966,16 +45600,19 @@ "bHK" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bHL" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, +/obj/structure/table, +/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/mask/muzzle, +/obj/item/soap/nanotrasen, +/obj/item/gun/syringe/dart, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bHM" = ( @@ -47993,7 +45630,6 @@ /obj/item/wrench, /obj/item/multitool, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -48093,9 +45729,9 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ + areastring = "/area/maintenance/solars/starboard/aft"; dir = 8; name = "Starboard Quarter Solar APC"; - areastring = "/area/maintenance/solars/starboard/aft"; pixel_x = -26; pixel_y = 3 }, @@ -48139,7 +45775,6 @@ dir = 1 }, /obj/machinery/turnstile{ - icon_state = "turnstile_map"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -48148,7 +45783,6 @@ /obj/machinery/requests_console{ department = "AI"; departmentType = 5; - dir = 2; pixel_x = -30; pixel_y = -30 }, @@ -48183,9 +45817,9 @@ /obj/machinery/door/window{ base_state = "leftsecure"; dir = 8; - obj_integrity = 300; icon_state = "leftsecure"; name = "Primary AI Core Access"; + obj_integrity = 300; req_access_txt = "16" }, /obj/machinery/newscaster/security_unit{ @@ -48208,14 +45842,13 @@ /obj/machinery/door/window{ base_state = "rightsecure"; dir = 4; - obj_integrity = 300; icon_state = "rightsecure"; name = "Primary AI Core Access"; + obj_integrity = 300; req_access_txt = "16" }, /obj/machinery/camera{ c_tag = "AI Chamber - Core"; - dir = 2; network = list("aicore") }, /obj/effect/turf_decal/tile/neutral{ @@ -48304,7 +45937,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/camera/autoname, @@ -48345,7 +45977,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/blue/filled/corner, @@ -48365,7 +45996,6 @@ /obj/structure/table, /obj/structure/bedsheetbin, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -48384,7 +46014,6 @@ icon_state = "2-8" }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -48393,7 +46022,6 @@ /obj/structure/bed, /obj/item/bedsheet, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel/white, @@ -48449,9 +46077,9 @@ /area/maintenance/department/cargo) "bII" = ( /obj/machinery/power/apc{ + areastring = "/area/maintenance/starboard"; dir = 4; name = "Starboard Maintenance APC"; - areastring = "/area/maintenance/starboard"; pixel_x = 26 }, /obj/structure/cable, @@ -48711,7 +46339,6 @@ /area/maintenance/bar) "bJn" = ( /obj/effect/turf_decal/box/white/corners{ - icon_state = "box_corners_white"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -48835,9 +46462,8 @@ /area/medical/medbay/central) "bJz" = ( /obj/machinery/power/apc{ - dir = 2; - name = "Surgery APC"; areastring = "/area/medical/surgery"; + name = "Surgery APC"; pixel_y = -26 }, /obj/machinery/light, @@ -48862,7 +46488,6 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel/white, @@ -48923,7 +46548,6 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /obj/machinery/firealarm{ @@ -48946,7 +46570,6 @@ network = list("minisat") }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel/dark, @@ -48959,30 +46582,10 @@ icon_state = "2-4" }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel/white, /area/medical/patients_rooms/room_a) -"bJH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/camera/autoname{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/command) "bJI" = ( /obj/structure/extinguisher_cabinet{ dir = 4; @@ -48992,7 +46595,6 @@ dir = 6 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel/white, @@ -49002,7 +46604,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/landmark/xeno_spawn, @@ -49023,7 +46624,6 @@ dir = 9 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -49036,7 +46636,6 @@ dir = 10 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -49050,7 +46649,6 @@ pixel_y = 15 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel/white, @@ -49059,7 +46657,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -49072,7 +46669,6 @@ dir = 6 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -49088,7 +46684,6 @@ dir = 5 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -49179,7 +46774,6 @@ /area/maintenance/solars/starboard/aft) "bJW" = ( /obj/machinery/power/terminal{ - icon_state = "term"; dir = 8 }, /obj/structure/cable{ @@ -49192,8 +46786,7 @@ /obj/machinery/power/solar_control{ dir = 8; id = "aftstarboard"; - name = "Starboard Quarter Solar Control"; - track = 0 + name = "Starboard Quarter Solar Control" }, /obj/structure/cable, /obj/structure/cable{ @@ -49217,7 +46810,6 @@ dir = 10 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel/white, @@ -49234,7 +46826,6 @@ network = list("minisat") }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel/dark, @@ -49339,7 +46930,6 @@ pixel_y = 32 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -49359,7 +46949,6 @@ pixel_y = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -49392,7 +46981,6 @@ }, /obj/structure/table/glass, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -49407,7 +46995,6 @@ /obj/machinery/microwave, /obj/structure/table/glass, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -49423,14 +47010,12 @@ pixel_y = 22 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/white, /area/medical) "bKu" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel/white, @@ -49455,11 +47040,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -49470,7 +47053,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -49504,7 +47086,6 @@ "bKD" = ( /obj/structure/curtain, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -49546,11 +47127,9 @@ layer = 2.9 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -49569,7 +47148,6 @@ pixel_x = 30 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -49581,7 +47159,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel, @@ -49608,9 +47185,8 @@ /area/maintenance/port) "bKO" = ( /obj/machinery/power/apc/highcap/five_k{ - dir = 2; - name = "Port Maintenance APC"; areastring = "/area/maintenance/port"; + name = "Port Maintenance APC"; pixel_y = -24 }, /obj/structure/cable{ @@ -49646,7 +47222,6 @@ pixel_x = 5 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -49654,14 +47229,12 @@ "bKS" = ( /obj/effect/landmark/xeno_spawn, /obj/machinery/power/apc{ - dir = 2; - name = "Abandoned Garden APC"; areastring = "/area/hydroponics/garden/abandoned"; + name = "Abandoned Garden APC"; pixel_y = -26 }, /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plating, @@ -49680,20 +47253,6 @@ "bKV" = ( /turf/open/floor/plasteel/white, /area/medical/surgery) -"bKW" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "bKX" = ( /obj/structure/extinguisher_cabinet{ dir = 4; @@ -49701,7 +47260,6 @@ }, /obj/machinery/vending/cigarette, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -49715,26 +47273,11 @@ dir = 9 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /obj/effect/turf_decal/trimline/blue/filled/corner, /turf/open/floor/plasteel/dark, /area/aisat) -"bKZ" = ( -/obj/structure/window/reinforced/spawner, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 9 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 6 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "bLa" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -49784,14 +47327,13 @@ /area/medical) "bLf" = ( /obj/machinery/power/apc{ + areastring = "/area/medical/patients_rooms/room_a"; dir = 8; name = "Patient Room A APC"; - areastring = "/area/medical/patients_rooms/room_a"; pixel_x = -26 }, /obj/structure/cable, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -49807,7 +47349,6 @@ /obj/structure/bed, /obj/item/bedsheet/medical, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -49818,7 +47359,6 @@ light_color = "#d8b1b1" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/wood, @@ -49864,7 +47404,6 @@ /area/maintenance/central) "bLo" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, @@ -49874,7 +47413,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -49892,7 +47430,6 @@ light_color = "#c1caff" }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -49909,7 +47446,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -49920,7 +47456,6 @@ light_color = "#c1caff" }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -49936,7 +47471,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/white, @@ -49949,7 +47483,6 @@ }, /obj/machinery/vending/cola/random, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -49978,10 +47511,9 @@ "bLw" = ( /obj/machinery/light/small, /obj/machinery/vending/wallmed{ - pixel_x = -28; + pixel_x = -28 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel/white, @@ -49994,7 +47526,6 @@ }, /obj/item/clothing/neck/stethoscope, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel/white, @@ -50002,7 +47533,6 @@ "bLy" = ( /obj/structure/closet/crate/freezer/blood, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel/white, @@ -50041,7 +47571,6 @@ /obj/item/book/manual/wiki/surgery, /obj/item/surgical_drapes, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel/white, @@ -50051,7 +47580,6 @@ /obj/item/book/manual/wiki/surgery, /obj/item/surgical_drapes, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel/white, @@ -50077,7 +47605,6 @@ "bLG" = ( /obj/structure/closet/crate/freezer/blood, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel/white, @@ -50086,17 +47613,6 @@ /obj/structure/grille, /turf/open/space/basic, /area/space/nearstation) -"bLI" = ( -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "bLJ" = ( /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/aisat/foyer) @@ -50109,23 +47625,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/foyer) -"bLL" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "bLM" = ( /turf/open/floor/carpet/orange, /area/quartermaster/qm/private) "bLN" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /obj/machinery/airalarm{ @@ -50153,7 +47657,6 @@ pixel_y = -24 }, /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -50167,7 +47670,6 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/item/radio/intercom{ @@ -50302,9 +47804,7 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/satellite) "bMa" = ( -/obj/machinery/porta_turret/ai{ - dir = 2 - }, +/obj/machinery/porta_turret/ai, /obj/machinery/computer/security/telescreen{ desc = "Used for watching the RD's goons from the safety of his office."; dir = 4; @@ -50323,7 +47823,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel/white, @@ -50402,9 +47901,7 @@ /turf/open/floor/plasteel/white, /area/medical) "bMi" = ( -/obj/machinery/porta_turret/ai{ - dir = 2 - }, +/obj/machinery/porta_turret/ai, /obj/machinery/computer/security/telescreen/minisat{ dir = 8; pixel_x = 28 @@ -50417,7 +47914,6 @@ "bMj" = ( /obj/machinery/vending/coffee, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel/white, @@ -50476,11 +47972,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -50570,7 +48064,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -50670,11 +48163,9 @@ layer = 2.9 }, /obj/machinery/atmospherics/pipe/layer_manifold{ - icon_state = "manifoldlayer"; dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -50694,7 +48185,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -50704,7 +48194,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -50741,15 +48230,6 @@ dir = 10 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) -"bMM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -50774,25 +48254,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) -"bMQ" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) -"bMR" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "bMS" = ( /obj/structure/window/reinforced{ dir = 8; @@ -50840,7 +48301,6 @@ }, /obj/machinery/power/apc{ areastring = "/area/medical"; - dir = 2; name = "Breakroom APC"; pixel_y = -24 }, @@ -50904,18 +48364,6 @@ /obj/structure/window/reinforced/spawner, /turf/open/space, /area/space) -"bNg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/light{ - dir = 4; - light_color = "#e8eaff" - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "bNh" = ( /obj/machinery/airalarm{ dir = 4; @@ -50928,7 +48376,6 @@ /area/ai_monitored/turret_protected/aisat_interior) "bNi" = ( /obj/structure/showcase/cyborg/old{ - dir = 2; pixel_y = 20 }, /obj/effect/turf_decal/tile/blue{ @@ -50945,7 +48392,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel/dark, @@ -50969,11 +48415,9 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 4 }, /obj/machinery/navbeacon{ @@ -51008,15 +48452,12 @@ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 8 }, /obj/machinery/navbeacon{ @@ -51038,7 +48479,6 @@ "bNp" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel/dark, @@ -51167,7 +48607,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -51221,7 +48660,6 @@ /area/ai_monitored/turret_protected/aisat/foyer) "bNE" = ( /obj/structure/transit_tube/diagonal{ - icon_state = "diagonal"; dir = 8 }, /turf/open/space, @@ -51233,7 +48671,6 @@ "bNG" = ( /obj/machinery/vending/hydroseeds, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/camera/autoname{ @@ -51249,11 +48686,9 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 5 }, /turf/open/floor/plasteel, @@ -51266,28 +48701,12 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"bNK" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) -"bNL" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 5 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "bNM" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel, @@ -51301,7 +48720,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -51309,11 +48727,9 @@ "bNP" = ( /obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -51322,7 +48738,6 @@ /obj/effect/turf_decal/tile/neutral, /obj/machinery/light, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -51333,7 +48748,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -51342,7 +48756,6 @@ /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -51350,33 +48763,13 @@ "bNT" = ( /obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/white, /area/medical/surgery) -"bNU" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) -"bNV" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "bNW" = ( /obj/structure/cable{ icon_state = "4-8" @@ -51409,7 +48802,6 @@ /area/hallway/secondary/exit) "bNX" = ( /obj/structure/showcase/cyborg/old{ - dir = 2; pixel_y = 20 }, /obj/effect/turf_decal/tile/blue{ @@ -51423,14 +48815,12 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, /area/aisat) "bNZ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -51439,7 +48829,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -51662,9 +49051,7 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/satellite) "bOm" = ( -/obj/machinery/porta_turret/ai{ - dir = 2 - }, +/obj/machinery/porta_turret/ai, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -51834,7 +49221,6 @@ }, /obj/machinery/turretid{ control_area = "/area/ai_monitored/turret_protected/aisat/foyer"; - enabled = 1; icon_state = "control_stun"; name = "Antechamber Turret Control"; pixel_x = -32; @@ -51919,7 +49305,6 @@ "bOA" = ( /obj/structure/lattice/catwalk, /obj/structure/transit_tube/junction{ - icon_state = "junction0"; dir = 4 }, /obj/structure/cable{ @@ -52009,7 +49394,6 @@ /area/space/nearstation) "bOI" = ( /obj/structure/transit_tube/junction{ - icon_state = "junction0"; dir = 8 }, /obj/structure/lattice/catwalk, @@ -52196,7 +49580,6 @@ /area/hallway/primary/aft) "bOW" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel/dark, @@ -52330,7 +49713,6 @@ /area/hallway/primary/aft) "bPc" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel/dark, @@ -52500,39 +49882,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"bPk" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/white/line{ - icon_state = "trimline"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) -"bPl" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/starboard) "bPm" = ( /obj/structure/rack, /obj/item/circuitboard/machine/telecomms/bus{ @@ -52648,7 +49997,6 @@ }, /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -52678,11 +50026,9 @@ sortType = 10 }, /obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 4 }, /turf/open/floor/plasteel, @@ -52711,11 +50057,9 @@ icon_state = "2-4" }, /obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 4 }, /turf/open/floor/plasteel, @@ -52846,7 +50190,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -52859,9 +50202,8 @@ /obj/structure/cable, /obj/machinery/power/apc/highcap/five_k{ areastring = "/area/ai_monitored/turret_protected/aisat/foyer"; - dir = 2; name = "MiniSat Foyer APC"; - pixel_x = -29; + pixel_x = -29 }, /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -52870,7 +50212,6 @@ /area/ai_monitored/turret_protected/aisat_interior) "bPK" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -52879,7 +50220,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -52894,7 +50234,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -52907,14 +50246,12 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/satellite) "bPP" = ( /obj/effect/turf_decal/trimline/neutral/filled/end{ - icon_state = "trimline_end_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -52928,10 +50265,9 @@ areastring = "/area/aisat"; dir = 8; name = "MiniSat Exterior APC"; - pixel_x = -24; + pixel_x = -24 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -52942,7 +50278,6 @@ /area/space/nearstation) "bPS" = ( /obj/structure/transit_tube/diagonal{ - icon_state = "diagonal"; dir = 4 }, /turf/open/space/basic, @@ -52974,19 +50309,8 @@ }, /turf/open/floor/plasteel, /area/engine/transit_tube) -"bPV" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/starboard) "bPW" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/wood, @@ -53080,14 +50404,11 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/camera{ c_tag = "Arrivals Hallway Port"; - dir = 4; - name = "security camera"; - network = list("ss13") + dir = 4 }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) @@ -53105,7 +50426,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/camera{ @@ -53131,7 +50451,6 @@ /area/ai_monitored/storage/satellite) "bQm" = ( /obj/effect/turf_decal/trimline/neutral/filled/end{ - icon_state = "trimline_end_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -53163,7 +50482,6 @@ }, /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/effect/turf_decal/trimline/yellow/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -53173,14 +50491,12 @@ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/filled/end{ - icon_state = "trimline_end_fill"; dir = 4 }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bQq" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel, @@ -53194,7 +50510,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -53306,7 +50621,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -53345,38 +50659,19 @@ /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer1{ dir = 1; - icon_state = "connector_map-1"; name = "Auxiliary MiniSat Distribution Port" }, /turf/open/floor/plasteel, /area/ai_monitored/storage/satellite) "bQL" = ( -/obj/machinery/porta_turret/ai{ - dir = 2 - }, +/obj/machinery/porta_turret/ai, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/foyer) -"bQM" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/starboard) "bQN" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /turf/open/floor/plasteel, @@ -53401,24 +50696,6 @@ }, /turf/open/floor/carpet, /area/bridge) -"bQP" = ( -/obj/machinery/light{ - dir = 8; - light_color = "#e8eaff" - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/starboard) "bQQ" = ( /obj/machinery/door/firedoor, /obj/structure/cable{ @@ -53434,7 +50711,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -53450,7 +50726,6 @@ }, /obj/effect/turf_decal/tile/red, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 9 }, /turf/open/floor/plasteel, @@ -53461,7 +50736,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/binary/pump{ - dir = 2; name = "N2O to Pure" }, /obj/effect/turf_decal/tile/red, @@ -53480,7 +50754,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -53494,7 +50767,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel/dark, @@ -53589,7 +50861,6 @@ /obj/structure/table, /obj/machinery/requests_console{ department = "Tool Storage"; - departmentType = 0; pixel_y = 30 }, /obj/item/folder/yellow, @@ -53653,7 +50924,6 @@ /obj/structure/table/wood, /obj/item/instrument/violin, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 9 }, /turf/open/floor/carpet, @@ -53670,7 +50940,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/camera/autoname{ @@ -53703,11 +50972,9 @@ /area/crew_quarters/dorms) "bRo" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 10 }, /turf/open/floor/carpet, @@ -53721,29 +50988,14 @@ "bRq" = ( /obj/structure/showcase/mecha/ripley, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 10 }, /turf/open/floor/plasteel/dark, /area/bridge/showroom/corporate) -"bRr" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "bRs" = ( /obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) -"bRt" = ( -/obj/machinery/cryopod{ - icon_state = "cryopod-open"; - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/dorms) "bRu" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -53762,7 +51014,6 @@ pixel_y = 32 }, /obj/effect/turf_decal/trimline/green/filled/end{ - icon_state = "trimline_end_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -53889,34 +51140,12 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/cafeteria) -"bRM" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/obj/item/radio/intercom{ - dir = 1; - pixel_y = -29 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "bRN" = ( /obj/machinery/light{ dir = 4 }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) -"bRO" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/surgery) "bRP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 6 @@ -53931,14 +51160,12 @@ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel/white, /area/medical) "bRR" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/red, @@ -53958,7 +51185,6 @@ }, /obj/structure/sign/directions/science{ dir = 1; - icon_state = "direction_sci"; pixel_y = 32 }, /obj/structure/sign/directions/command{ @@ -53973,18 +51199,15 @@ pixel_x = -22 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/dark, /area/aisat) "bRU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -54004,13 +51227,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) -"bRW" = ( -/obj/effect/turf_decal/trimline/neutral/filled/end{ - icon_state = "trimline_end_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "bRX" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -54024,11 +51240,9 @@ "bRY" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -54036,11 +51250,9 @@ "bRZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -54088,13 +51300,6 @@ }, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) -"bSh" = ( -/obj/structure/showcase/cyborg/old{ - dir = 2; - pixel_y = 20 - }, -/turf/open/floor/plasteel/grimy, -/area/tcommsat/computer) "bSi" = ( /obj/machinery/light/small{ dir = 1 @@ -54152,7 +51357,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, @@ -54205,22 +51409,9 @@ }, /turf/open/floor/plasteel, /area/storage/primary) -"bSu" = ( -/obj/machinery/light{ - dir = 4; - light_color = "#c1caff" - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "bSv" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/camera/autoname{ @@ -54244,7 +51435,6 @@ "bSx" = ( /obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -54274,7 +51464,6 @@ icon_state = "1-2" }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 9 }, /turf/open/floor/plasteel, @@ -54289,24 +51478,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/wood, /area/crew_quarters/dorms) -"bSC" = ( -/obj/machinery/light{ - dir = 8; - light_color = "#e8eaff" - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "bSD" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -54320,24 +51496,10 @@ pixel_x = 29 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) -"bSF" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/obj/machinery/camera/autoname{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "bSG" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -54350,7 +51512,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/green/filled/end{ - icon_state = "trimline_end_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -54435,11 +51596,9 @@ /area/tcommsat/computer) "bSW" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -54515,9 +51674,9 @@ icon_state = "0-8" }, /obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/tcommsat/computer"; dir = 4; name = "Telecomms Control Room APC"; - areastring = "/area/tcommsat/computer"; pixel_x = 26 }, /turf/open/floor/plasteel/grimy, @@ -54666,7 +51825,6 @@ /area/storage/primary) "bTp" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel, @@ -54700,11 +51858,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /obj/machinery/camera/autoname{ @@ -54717,11 +51873,9 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /obj/machinery/camera/autoname{ @@ -54738,11 +51892,9 @@ /area/crew_quarters/fitness/recreation) "bTv" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -54802,7 +51954,6 @@ }, /obj/effect/turf_decal/trimline/green/filled/line, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -54818,15 +51969,12 @@ }, /obj/effect/turf_decal/trimline/green/filled/corner, /obj/effect/turf_decal/trimline/green/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/green/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/green/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -54834,14 +51982,12 @@ "bTC" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) "bTD" = ( /obj/effect/turf_decal/trimline/green/filled/end{ - icon_state = "trimline_end_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -54882,9 +52028,9 @@ /area/storage/tech) "bTI" = ( /obj/machinery/power/apc{ + areastring = "/area/storage/tech"; dir = 8; name = "Tech Storage APC"; - areastring = "/area/storage/tech"; pixel_x = -27 }, /obj/structure/cable{ @@ -54976,38 +52122,10 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"bTQ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/starboard) "bTR" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" @@ -55097,7 +52215,7 @@ areastring = "/area/storage/primary"; dir = 8; name = "Tool Storage APC"; - pixel_x = -25; + pixel_x = -25 }, /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -55263,7 +52381,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -55292,11 +52409,9 @@ "bUo" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 9 }, /turf/open/floor/plasteel, @@ -55327,16 +52442,13 @@ /area/crew_quarters/fitness/recreation) "bUr" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/dark/corner{ - icon_state = "darkcorner"; dir = 8 }, /area/hallway/primary/aft) @@ -55351,7 +52463,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/camera/autoname{ @@ -55403,7 +52514,6 @@ /area/crew_quarters/fitness/recreation) "bUx" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/camera{ @@ -55417,7 +52527,6 @@ "bUy" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel, @@ -55442,11 +52551,9 @@ "bUA" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -55522,20 +52629,6 @@ }, /turf/open/floor/plating, /area/storage/tech) -"bUN" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "bUO" = ( /obj/structure/cable{ icon_state = "0-8" @@ -55544,7 +52637,7 @@ areastring = "/area/maintenance/fore"; dir = 4; name = "Fore Maintenance APC"; - pixel_x = 24; + pixel_x = 24 }, /turf/open/floor/plating, /area/maintenance/fore) @@ -55626,18 +52719,16 @@ "bUY" = ( /obj/structure/closet/secure_closet/medical3, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 9 }, +/obj/machinery/iv_drip, /turf/open/floor/plasteel/white, /area/medical/storage) "bUZ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/wood, @@ -55666,7 +52757,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/structure/sign/directions/supply{ @@ -55777,7 +52867,6 @@ "bVk" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/navbeacon{ @@ -55785,7 +52874,6 @@ location = "aft1" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -55796,11 +52884,9 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -55821,16 +52907,6 @@ }, /turf/open/floor/plating, /area/storage/tech) -"bVn" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/exit) "bVo" = ( /obj/machinery/light{ dir = 1; @@ -55842,7 +52918,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/structure/sign/directions/medical{ dir = 4; - icon_state = "direction_med"; pixel_y = 40 }, /obj/structure/sign/directions/engineering{ @@ -55857,11 +52932,9 @@ /area/hallway/primary/aft) "bVp" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -55875,7 +52948,6 @@ uses = 10 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -55900,7 +52972,6 @@ }, /obj/machinery/camera{ c_tag = "Telecomms - Server Room - Fore-Port"; - dir = 2; network = list("ss13","tcomms") }, /turf/open/floor/plasteel/dark/telecomms, @@ -55910,7 +52981,6 @@ dir = 4 }, /obj/machinery/computer/arcade/orion_trail{ - icon_state = "arcade"; dir = 4 }, /turf/open/floor/plasteel, @@ -55962,7 +53032,6 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/neutral/filled/end{ - icon_state = "trimline_end_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -55977,7 +53046,7 @@ }, /obj/machinery/announcement_system, /obj/machinery/status_display/ai{ - pixel_x = 31; + pixel_x = 31 }, /turf/open/floor/carpet, /area/tcommsat/computer) @@ -56064,18 +53133,15 @@ /area/medical/morgue) "bVI" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 5 }, /turf/open/floor/plasteel, @@ -56086,14 +53152,12 @@ dir = 4 }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 10 }, /turf/open/floor/plasteel/white, /area/medical/virology) "bVK" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/navbeacon{ @@ -56101,7 +53165,6 @@ location = "starboard3" }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/blue, @@ -56200,11 +53263,9 @@ /area/library) "bVQ" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/light_switch{ @@ -56245,7 +53306,6 @@ icon_state = "1-8" }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /obj/machinery/light_switch{ @@ -56271,7 +53331,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /obj/structure/sign/directions/evac{ @@ -56293,26 +53352,21 @@ "bVX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) "bVY" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -56403,7 +53457,6 @@ /area/tcommsat/computer) "bWm" = ( /obj/machinery/computer/message_monitor{ - icon_state = "computer"; dir = 8 }, /turf/open/floor/carpet, @@ -56484,11 +53537,9 @@ /area/crew_quarters/fitness/recreation) "bWs" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -56504,7 +53555,6 @@ /area/crew_quarters/dorms) "bWu" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel, @@ -56523,7 +53573,6 @@ light_color = "#fff4bc" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/wood, @@ -56537,24 +53586,8 @@ }, /turf/open/floor/wood, /area/crew_quarters/dorms) -"bWx" = ( -/obj/machinery/light/small{ - dir = 4; - light_color = "#d8b1b1" - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; - dir = 8 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) "bWy" = ( /obj/effect/turf_decal/trimline/green/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /obj/machinery/camera/autoname{ @@ -56577,7 +53610,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/carpet, @@ -56605,11 +53637,9 @@ "bWF" = ( /obj/structure/closet/secure_closet/engineering_chief, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/machinery/status_display/ai{ @@ -56664,7 +53694,6 @@ /obj/machinery/telecomms/processor/preset_three, /obj/machinery/camera{ c_tag = "Telecomms - Server Room - Fore-Starboard"; - dir = 2; network = list("ss13","tcomms") }, /turf/open/floor/circuit/telecomms/mainframe, @@ -56690,7 +53719,6 @@ light_color = "#fff4bc" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/wood, @@ -56773,7 +53801,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/camera/autoname{ @@ -56829,11 +53856,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -56851,7 +53876,6 @@ "bXb" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -56882,18 +53906,6 @@ /obj/machinery/telecomms/server/presets/medical, /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) -"bXh" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "bXi" = ( /obj/machinery/telecomms/bus/preset_two, /turf/open/floor/circuit/telecomms/mainframe, @@ -56958,18 +53970,15 @@ "bXr" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 10 }, /turf/open/floor/plasteel/white, /area/medical/virology) "bXs" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/camera/autoname{ @@ -57077,11 +54086,9 @@ pixel_y = 32 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /turf/open/floor/plasteel, @@ -57094,11 +54101,9 @@ pixel_y = 32 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /turf/open/floor/plasteel, @@ -57108,11 +54113,9 @@ pixel_y = 24 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile, @@ -57236,7 +54239,6 @@ }, /obj/effect/turf_decal/trimline/blue/filled/corner, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -57255,7 +54257,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -57309,13 +54310,12 @@ pixel_x = 3 }, /obj/machinery/status_display/evac{ - pixel_x = 31; + pixel_x = 31 }, /turf/open/floor/carpet, /area/tcommsat/computer) "bXT" = ( /obj/structure/transit_tube/station{ - icon_state = "closed_station0"; dir = 8 }, /obj/structure/cable{ @@ -57328,7 +54328,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -57336,11 +54335,9 @@ "bXU" = ( /obj/structure/chair, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /obj/machinery/camera/autoname, @@ -57348,7 +54345,6 @@ /area/medical/virology) "bXV" = ( /obj/structure/chair/sofa/left{ - icon_state = "sofaend_left"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -57356,7 +54352,6 @@ "bXW" = ( /obj/machinery/airalarm/directional/south, /obj/structure/chair/sofa/right{ - icon_state = "sofaend_right"; dir = 1 }, /turf/open/floor/plasteel/white, @@ -57446,18 +54441,15 @@ "bYe" = ( /obj/machinery/washing_machine, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "bYf" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/item/radio/intercom{ @@ -57523,7 +54515,6 @@ "bYk" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile, @@ -57577,7 +54568,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -57617,7 +54607,6 @@ /area/engine/break_room) "bYs" = ( /obj/effect/turf_decal/trimline/neutral/filled/end{ - icon_state = "trimline_end_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -57648,9 +54637,8 @@ /area/maintenance/starboard/aft) "bYw" = ( /obj/machinery/power/apc/highcap/five_k{ - dir = 2; - name = "Starboard Quarter Maintenance APC"; areastring = "/area/maintenance/starboard/aft"; + name = "Starboard Quarter Maintenance APC"; pixel_y = -24 }, /obj/structure/cable{ @@ -57680,7 +54668,6 @@ /area/maintenance/starboard/aft) "bYA" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -57715,9 +54702,9 @@ /area/tcommsat/server) "bYF" = ( /obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/tcommsat/server"; dir = 4; name = "Telecomms Server Room APC"; - areastring = "/area/tcommsat/server"; pixel_x = 25 }, /obj/machinery/light/small{ @@ -57738,12 +54725,10 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/airalarm/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -57762,7 +54747,7 @@ dir = 4; freerange = 1; name = "Station Intercom (Telecomms)"; - pixel_x = 30; + pixel_x = 30 }, /turf/open/floor/carpet, /area/tcommsat/computer) @@ -57833,7 +54818,6 @@ dir = 10 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel, @@ -57887,7 +54871,6 @@ "bYU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile, @@ -57902,7 +54885,6 @@ }, /obj/structure/chair/stool, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -58022,7 +55004,6 @@ "bZk" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /obj/item/flashlight, @@ -58061,16 +55042,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"bZn" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "bZo" = ( /turf/open/floor/plasteel/dark, /area/science/robotics/lab) @@ -58193,11 +55164,9 @@ "bZA" = ( /obj/machinery/airalarm/directional/west, /obj/machinery/computer/card/minor/ce{ - icon_state = "computer"; dir = 4 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile, @@ -58205,7 +55174,6 @@ /area/crew_quarters/heads/chief) "bZB" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile, @@ -58214,11 +55182,9 @@ "bZC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile, @@ -58237,7 +55203,6 @@ dir = 8 }, /obj/machinery/modular_computer/console/preset/engineering{ - icon_state = "console"; dir = 8 }, /obj/structure/cable{ @@ -58282,7 +55247,6 @@ /area/engine/break_room) "bZG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/grimy, @@ -58311,25 +55275,14 @@ }, /obj/effect/turf_decal/tile, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/structure/closet/secure_closet/CMO, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 10 }, /turf/open/floor/plasteel/white, /area/crew_quarters/heads/cmo) -"bZJ" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/plasteel, -/area/engine/break_room) "bZK" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -58373,7 +55326,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -58398,11 +55350,9 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 5 }, /turf/open/floor/plasteel, @@ -58423,7 +55373,6 @@ /area/crew_quarters/fitness/recreation) "bZT" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /obj/machinery/camera{ @@ -58438,7 +55387,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/item/radio/intercom{ @@ -58468,7 +55416,6 @@ "bZY" = ( /obj/machinery/power/apc{ areastring = "/area/crew_quarters/toilet"; - dir = 2; name = "Restrooms APC"; pixel_y = -26 }, @@ -58480,7 +55427,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/camera/autoname{ @@ -58493,7 +55439,6 @@ dir = 8 }, /obj/machinery/computer/station_alert{ - icon_state = "computer"; dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -58571,7 +55516,7 @@ areastring = "/area/crew_quarters/heads/chief"; dir = 4; name = "Chief Engineer's APC"; - pixel_x = 26; + pixel_x = 26 }, /obj/structure/cable{ icon_state = "0-2"; @@ -58608,14 +55553,6 @@ }, /turf/open/floor/plasteel, /area/engine/break_room) -"cah" = ( -/obj/structure/chair/stool, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engine/break_room) "cai" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, @@ -58633,7 +55570,6 @@ }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile/yellow, @@ -58663,7 +55599,6 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -58695,7 +55630,7 @@ areastring = "/area/crew_quarters/locker"; dir = 8; name = "Locker Room APC"; - pixel_x = -28; + pixel_x = -28 }, /turf/open/floor/plasteel, /area/crew_quarters/locker) @@ -58712,13 +55647,6 @@ /obj/structure/table, /turf/open/floor/plasteel, /area/crew_quarters/locker) -"cav" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 5 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "caw" = ( /obj/machinery/light{ dir = 1 @@ -58791,17 +55719,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet) -"caB" = ( -/obj/structure/urinal{ - dir = 8; - icon_state = "urinal"; - pixel_x = 28 - }, -/turf/open/floor/plasteel/freezer, -/area/crew_quarters/toilet) "caC" = ( /obj/machinery/computer/apc_control{ - icon_state = "computer"; dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -58861,7 +55780,6 @@ }, /obj/effect/turf_decal/tile, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/structure/cable{ @@ -59044,9 +55962,9 @@ "caP" = ( /obj/structure/table, /obj/machinery/power/apc{ + areastring = "/area/storage/tcom"; dir = 8; name = "Telecomms Storage APC"; - areastring = "/area/storage/tcom"; pixel_x = -28 }, /obj/structure/cable, @@ -59121,7 +56039,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -59169,7 +56086,6 @@ }, /obj/structure/fans/tiny, /obj/effect/turf_decal/trimline/blue/filled/end{ - icon_state = "trimline_end_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -59179,7 +56095,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/camera{ @@ -59194,7 +56109,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel, @@ -59208,7 +56122,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -59242,14 +56155,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) -"cbh" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "cbi" = ( /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -59272,17 +56177,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) -"cbk" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "cbl" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -59305,13 +56199,12 @@ areastring = "/area/crew_quarters/dorms"; dir = 4; name = "Dormitories APC"; - pixel_x = 24; + pixel_x = 24 }, /obj/structure/cable{ icon_state = "0-8" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -59425,7 +56318,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -59456,7 +56348,6 @@ "cbx" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/light, @@ -59506,7 +56397,6 @@ /area/space) "cbD" = ( /obj/structure/transit_tube/curved/flipped{ - icon_state = "curved1"; dir = 1 }, /obj/structure/window/reinforced{ @@ -59514,7 +56404,6 @@ }, /obj/structure/window/reinforced, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel/dark, @@ -59549,29 +56438,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"cbI" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/line{ - icon_state = "trimline"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "cbJ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -59586,7 +56452,6 @@ /area/medical/patients_rooms/room_a) "cbK" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -59649,7 +56514,6 @@ /area/crew_quarters/fitness/recreation) "cbO" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plating, @@ -59657,7 +56521,6 @@ "cbP" = ( /obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -59673,7 +56536,6 @@ pixel_x = -26 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -59702,7 +56564,6 @@ /area/science/robotics/lab) "cbU" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plating, @@ -59721,7 +56582,6 @@ /obj/structure/table/reinforced, /obj/machinery/recharger, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 10 }, /turf/open/floor/plasteel/dark, @@ -59825,7 +56685,6 @@ "cch" = ( /obj/effect/landmark/xeno_spawn, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plating, @@ -59833,7 +56692,6 @@ "cci" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/camera{ @@ -59890,19 +56748,17 @@ /area/crew_quarters/fitness/recreation) "ccn" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "cco" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, /obj/machinery/computer/holodeck{ dir = 4 }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, /turf/open/floor/plasteel, /area/crew_quarters/locker) "ccp" = ( @@ -59928,14 +56784,12 @@ light_color = "#fff4bc" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/carpet/black, /area/crew_quarters/dorms) "ccr" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /obj/machinery/camera{ @@ -59951,7 +56805,6 @@ light_color = "#c1caff" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -59962,7 +56815,6 @@ light_color = "#d8b1b1" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/carpet/black, @@ -59982,7 +56834,6 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel, @@ -60077,7 +56928,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -60098,7 +56948,6 @@ /area/asteroid/nearstation) "ccI" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, @@ -60143,26 +56992,12 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engine/break_room) -"ccP" = ( -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engine/break_room) "ccQ" = ( /obj/machinery/light, /obj/effect/turf_decal/tile/red{ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/tile/yellow{ @@ -60201,7 +57036,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, @@ -60244,7 +57078,7 @@ areastring = "/area/crew_quarters/heads/cmo/private"; dir = 4; name = "Chief Medical Officer's Quarters APC"; - pixel_x = 24; + pixel_x = 24 }, /obj/structure/cable{ icon_state = "0-8" @@ -60261,7 +57095,6 @@ light_color = "#fff4bc" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/wood, @@ -60274,7 +57107,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -60285,7 +57117,6 @@ light_color = "#d8b1b1" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/wood, @@ -60312,7 +57143,6 @@ /obj/machinery/recharger, /obj/structure/table, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel, @@ -60428,7 +57258,6 @@ }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile/yellow, @@ -60579,7 +57408,6 @@ "cdI" = ( /obj/machinery/power/apc{ areastring = "/area/maintenance/dormitory"; - dir = 2; name = "Dormitory Maintenance APC"; pixel_y = -28 }, @@ -60614,7 +57442,6 @@ light_color = "#fff4bc" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/carpet, @@ -60628,7 +57455,6 @@ pixel_x = 27 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, @@ -60637,7 +57463,6 @@ /obj/machinery/microwave, /obj/structure/table, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel, @@ -60679,7 +57504,6 @@ }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile/yellow, @@ -60690,7 +57514,6 @@ dir = 6 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel, @@ -60752,7 +57575,6 @@ }, /obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -60790,7 +57612,6 @@ /area/crew_quarters/toilet) "ceh" = ( /obj/machinery/requests_console{ - announcementConsole = 0; department = "Engineering"; departmentType = 4; name = "Engineering RC" @@ -60957,7 +57778,6 @@ /area/maintenance/aft) "ceH" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /obj/machinery/camera/autoname, @@ -60974,7 +57794,6 @@ }, /obj/structure/bedsheetbin, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -61004,7 +57823,6 @@ /area/engine/break_room) "ceM" = ( /obj/machinery/door/window/southright{ - dir = 2; name = "Engineering Deliveries"; req_access_txt = "10" }, @@ -61020,11 +57838,9 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 5 }, /turf/open/floor/plasteel, @@ -61034,14 +57850,13 @@ /obj/item/bedsheet/cmo, /obj/structure/bed, /obj/machinery/status_display/ai{ - pixel_x = -32; + pixel_x = -32 }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo/private) "ceP" = ( /obj/structure/closet/radiation, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -61049,7 +57864,6 @@ "ceQ" = ( /obj/structure/closet/secure_closet/engineering_personal, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -61057,7 +57871,6 @@ "ceR" = ( /obj/machinery/vending/tool, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -61078,7 +57891,6 @@ /area/hallway/primary/aft) "ceU" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -61091,7 +57903,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -61200,7 +58011,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/white/line{ - icon_state = "trimline"; dir = 8 }, /turf/open/floor/plasteel, @@ -61210,7 +58020,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -61253,7 +58062,6 @@ /area/maintenance/aft) "cfq" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -61275,7 +58083,6 @@ /area/crew_quarters/locker) "cfs" = ( /obj/effect/turf_decal/trimline/neutral/filled/end{ - icon_state = "trimline_end_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -61285,7 +58092,6 @@ dir = 5 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel, @@ -61295,7 +58101,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -61316,7 +58121,6 @@ /area/engine/gravity_generator) "cfx" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel, @@ -61337,7 +58141,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel, @@ -61424,7 +58227,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -61438,7 +58240,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -61467,7 +58268,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/white/line{ - icon_state = "trimline"; dir = 8 }, /turf/open/floor/plasteel, @@ -61478,7 +58278,6 @@ light_color = "#d8b1b1" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/carpet, @@ -61610,7 +58409,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -61623,7 +58421,6 @@ "cgl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/grimy, @@ -61680,7 +58477,6 @@ /area/engine/gravity_generator) "cgs" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -61741,7 +58537,6 @@ }, /obj/structure/closet/radiation, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -61853,7 +58648,6 @@ /area/chapel/main) "cgP" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -61945,9 +58739,9 @@ /area/crew_quarters/heads/chief) "chd" = ( /obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/engine/gravity_generator"; dir = 1; name = "Gravity Generator APC"; - areastring = "/area/engine/gravity_generator"; pixel_y = 24 }, /obj/structure/cable/yellow{ @@ -61970,7 +58764,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -62007,7 +58800,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/status_display/ai{ @@ -62080,7 +58872,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -62129,7 +58920,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer3{ - icon_state = "inje_map-2"; dir = 4 }, /turf/open/floor/plating/airless, @@ -62178,7 +58968,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -62239,7 +59028,6 @@ "chK" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -62309,29 +59097,24 @@ "chR" = ( /obj/machinery/washing_machine, /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "chS" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "chT" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /obj/machinery/light{ @@ -62431,7 +59214,6 @@ }, /obj/effect/turf_decal/trimline/blue/filled/line, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -62460,17 +59242,15 @@ /area/engine/break_room) "cif" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel/dark, /area/security/execution/education) "cig" = ( /obj/structure/sign/warning/radiation/rad_area{ - pixel_x = -32; + pixel_x = -32 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -62480,11 +59260,9 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel, @@ -62601,7 +59379,6 @@ "cis" = ( /obj/structure/window/reinforced/spawner/north, /obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{ - icon_state = "filter_on"; dir = 8 }, /obj/effect/turf_decal/tile/red, @@ -62638,7 +59415,6 @@ "civ" = ( /obj/structure/window/reinforced/spawner/north, /obj/machinery/atmospherics/components/trinary/filter/atmos/co2{ - icon_state = "filter_on"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -62732,7 +59508,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/trinary/filter/atmos/plasma{ - icon_state = "filter_on"; dir = 8 }, /turf/open/floor/plasteel, @@ -62765,7 +59540,6 @@ /area/maintenance/port) "ciE" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer3{ - icon_state = "inje_map-2"; dir = 4 }, /turf/open/floor/plating/airless, @@ -62794,12 +59568,10 @@ dir = 4 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/machinery/camera{ c_tag = "Arrivals Hallway Stern"; - dir = 2; name = "arrivals camera" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -62853,7 +59625,6 @@ dir = 6 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -62890,7 +59661,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/freezer, @@ -62937,18 +59707,10 @@ }, /obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, /area/engine/break_room) -"ciZ" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engine/break_room) "cja" = ( /obj/machinery/door/airlock/atmos{ name = "Atmospherics"; @@ -63019,7 +59781,6 @@ "cjg" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -63154,7 +59915,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/line{ - icon_state = "trimline"; dir = 8 }, /turf/open/floor/plasteel, @@ -63167,7 +59927,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -63180,7 +59939,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -63261,7 +60019,6 @@ "cjG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -63277,7 +60034,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel/freezer, @@ -63468,7 +60224,6 @@ /area/engine/atmos) "ckg" = ( /obj/machinery/atmospherics/components/binary/pump{ - dir = 2; name = "Pure to Fuel Pipe" }, /turf/open/floor/plasteel, @@ -63520,7 +60275,6 @@ /area/chapel/main) "cko" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/machinery/camera{ @@ -63554,7 +60308,7 @@ "ckr" = ( /obj/machinery/vending/coffee, /obj/machinery/newscaster{ - pixel_x = 30; + pixel_x = 30 }, /turf/open/floor/plasteel/dark, /area/crew_quarters/fitness/recreation) @@ -63741,7 +60495,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -63850,7 +60603,7 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_x = -32; + pixel_x = -32 }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) @@ -63982,7 +60735,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -63992,7 +60744,7 @@ areastring = "/area/engine/engine_smes"; dir = 1; name = "SMES room APC"; - pixel_x = -26; + pixel_x = -26 }, /obj/structure/cable{ icon_state = "0-2"; @@ -64118,7 +60870,6 @@ /area/engine/atmos) "clA" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos{ - icon_state = "filter_on"; dir = 4 }, /turf/open/floor/plasteel, @@ -64128,11 +60879,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 9 }, /turf/open/floor/plasteel, @@ -64171,7 +60920,6 @@ /obj/item/storage/crayons, /obj/item/storage/crayons, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 9 }, /turf/open/floor/plasteel, @@ -64179,7 +60927,6 @@ "clG" = ( /obj/machinery/power/apc/highcap/five_k{ areastring = "/area/engine/break_room"; - dir = 2; name = "Engineering Foyer APC"; pixel_y = -24 }, @@ -64225,7 +60972,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -64233,7 +60979,6 @@ "clL" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -64251,12 +60996,10 @@ "clO" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile/yellow, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -64277,11 +61020,9 @@ pixel_y = -5 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -64397,7 +61138,6 @@ /area/crew_quarters/heads/chief) "cmf" = ( /obj/effect/turf_decal/box/white/corners{ - icon_state = "box_corners_white"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -64431,14 +61171,12 @@ "cmi" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ dir = 1 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -64477,7 +61215,6 @@ "cmm" = ( /obj/machinery/door/window/westleft{ base_state = "right"; - dir = 8; icon_state = "right" }, /obj/effect/spawner/lootdrop/maintenance, @@ -64491,7 +61228,6 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -64543,7 +61279,6 @@ }, /obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -64590,7 +61325,6 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/yellow/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -64605,7 +61339,6 @@ /obj/item/wrench, /obj/item/clothing/glasses/meson/engine, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel, @@ -64626,7 +61359,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -64635,7 +61367,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/grunge{ name = "Vacant Office"; - opacity = 1; req_access_txt = "32" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -64678,7 +61409,6 @@ /area/security/vacantoffice/a) "cmJ" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/item/radio/intercom{ @@ -64697,14 +61427,12 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ dir = 1 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -64720,14 +61448,12 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ dir = 1 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -64848,10 +61574,9 @@ areastring = "/area/engine/atmos"; dir = 1; name = "Atmospherics APC"; - pixel_x = -27; + pixel_x = -27 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -64897,7 +61622,6 @@ pixel_x = -28 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -64929,7 +61653,6 @@ /area/engine/atmos) "cnj" = ( /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /obj/structure/extinguisher_cabinet{ @@ -65002,7 +61725,6 @@ icon_state = "2-8" }, /obj/effect/turf_decal/trimline/yellow/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -65037,7 +61759,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -65066,7 +61787,6 @@ /area/security/vacantoffice/a) "cnz" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/grimy, @@ -65089,7 +61809,6 @@ /area/chapel/office) "cnC" = ( /obj/machinery/computer/arcade{ - icon_state = "arcade"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -65097,14 +61816,12 @@ "cnD" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ @@ -65159,11 +61876,9 @@ "cnH" = ( /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/machinery/camera{ @@ -65241,11 +61956,9 @@ pixel_y = -5 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -65258,15 +61971,12 @@ /area/hydroponics/garden) "cnQ" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -65281,7 +61991,6 @@ /obj/item/weldingtool, /obj/item/clothing/head/welding, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, @@ -65311,7 +62020,6 @@ products = list(/obj/item/clothing/under/rank/engineering/engineer = 4, /obj/item/clothing/shoes/sneakers/orange = 4, /obj/item/clothing/head/hardhat = 4, /obj/item/storage/belt/utility = 4, /obj/item/clothing/glasses/meson/engine = 4, /obj/item/clothing/gloves/color/yellow = 2, /obj/item/screwdriver = 12, /obj/item/crowbar = 12, /obj/item/wirecutters = 12, /obj/item/multitool = 12, /obj/item/wrench = 12, /obj/item/t_scanner = 12, /obj/item/stock_parts/cell = 8, /obj/item/weldingtool = 8, /obj/item/clothing/head/welding = 8, /obj/item/light/tube = 10, /obj/item/clothing/suit/fire = 4, /obj/item/stock_parts/scanning_module = 5, /obj/item/stock_parts/micro_laser = 5, /obj/item/stock_parts/matter_bin = 5, /obj/item/stock_parts/manipulator = 5) }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/status_display/evac{ @@ -65407,7 +62115,7 @@ pixel_x = 32 }, /turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "cod" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -65467,7 +62175,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -65477,14 +62184,12 @@ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, /area/engine/engineering) "col" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -65492,7 +62197,6 @@ "com" = ( /obj/machinery/rnd/production/protolathe/department/engineering, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel, @@ -65535,7 +62239,6 @@ /area/crew_quarters/locker) "cos" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -65557,11 +62260,9 @@ /area/chapel/office) "cou" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -65572,7 +62273,6 @@ pixel_x = -24 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/freezer, @@ -65629,11 +62329,9 @@ /area/crew_quarters/dorms) "coE" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel, @@ -65656,11 +62354,9 @@ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ @@ -65770,7 +62466,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -65783,7 +62478,6 @@ }, /obj/machinery/meter, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -65828,7 +62522,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -66080,7 +62773,6 @@ /obj/structure/window/reinforced/spawner, /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -66159,10 +62851,8 @@ dir = 4 }, /obj/machinery/power/apc{ - dir = 2; - lighting = 3; - name = "Chapel Office APC"; areastring = "/area/chapel/office"; + name = "Chapel Office APC"; pixel_y = -25 }, /turf/open/floor/plasteel/grimy, @@ -66184,8 +62874,8 @@ /area/chapel/office) "cpB" = ( /obj/structure/bodycontainer/crematorium{ - id = "crematoriumChapel"; - dir = 1 + dir = 1; + id = "crematoriumChapel" }, /obj/machinery/light, /obj/item/radio/intercom{ @@ -66222,7 +62912,6 @@ /area/hydroponics/garden) "cpG" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/light{ @@ -66241,7 +62930,6 @@ /obj/effect/landmark/start/depsec/engineering, /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -66252,7 +62940,6 @@ }, /obj/machinery/rnd/production/circuit_imprinter, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -66275,7 +62962,6 @@ /area/maintenance/port/fore) "cpM" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /obj/machinery/camera/autoname, @@ -66314,7 +63000,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/yellow/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -66357,7 +63042,6 @@ "cpT" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel, @@ -66383,7 +63067,6 @@ }, /obj/effect/turf_decal/trimline/red/filled/line, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -66460,7 +63143,6 @@ /area/hallway/secondary/entry) "cqh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -66501,7 +63183,6 @@ /area/hallway/secondary/entry) "cql" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -66509,7 +63190,6 @@ "cqm" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/camera/autoname{ @@ -66642,7 +63322,6 @@ /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/glass/fifty, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel, @@ -66676,7 +63355,6 @@ dir = 4 }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 9 }, /obj/machinery/light{ @@ -66730,7 +63408,6 @@ "cqF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/vending/wardrobe/atmos_wardrobe, @@ -66755,7 +63432,6 @@ pixel_y = 10 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /obj/machinery/power/apc{ @@ -66960,11 +63636,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -67002,18 +63676,15 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/satellite) "crl" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -67055,7 +63726,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/structure/cable{ @@ -67257,7 +63927,6 @@ /area/hallway/primary/fore) "crL" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/structure/chair{ @@ -67273,7 +63942,6 @@ /area/hallway/secondary/entry) "crM" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -67325,7 +63993,6 @@ dir = 1 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -67487,7 +64154,6 @@ dir = 4 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -67510,7 +64176,6 @@ dir = 4 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -67526,7 +64191,6 @@ dir = 4 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/blue, @@ -67655,7 +64319,6 @@ pixel_y = 23 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -67828,7 +64491,6 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/structure/chair{ @@ -67851,7 +64513,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -67864,15 +64525,12 @@ }, /obj/effect/turf_decal/tile, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /turf/open/floor/plasteel, @@ -67887,15 +64545,12 @@ }, /obj/effect/turf_decal/tile, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /turf/open/floor/plasteel, @@ -67903,7 +64558,6 @@ "ctc" = ( /obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -67914,7 +64568,6 @@ "ctd" = ( /obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/blue, @@ -67922,7 +64575,6 @@ /area/hallway/secondary/entry) "cte" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -67938,7 +64590,6 @@ icon_state = "2-4" }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -67954,7 +64605,6 @@ dir = 4 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -68043,7 +64693,6 @@ dir = 4 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /turf/open/floor/plasteel, @@ -68059,7 +64708,6 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -68079,7 +64727,6 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -68095,7 +64742,6 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -68117,7 +64763,6 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -68155,14 +64800,12 @@ /area/engine/engine_smes) "ctw" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, /area/engine/engineering) "ctx" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/airalarm/directional/north, @@ -68176,7 +64819,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -68194,7 +64836,6 @@ light_color = "#c1caff" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -68213,7 +64854,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -68222,6 +64862,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/open/floor/plasteel, /area/engine/engineering) "ctD" = ( @@ -68232,6 +64875,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/engine/engineering) "ctE" = ( @@ -68270,7 +64914,6 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -68307,7 +64950,6 @@ dir = 4 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -68330,7 +64972,6 @@ "ctP" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/binary/valve{ - dir = 2; name = "output gas to space" }, /turf/open/floor/plasteel, @@ -68395,7 +65036,6 @@ dir = 4 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -68480,7 +65120,6 @@ dir = 9 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -68507,7 +65146,6 @@ "cuk" = ( /obj/machinery/power/apc{ areastring = "/area/hydroponics/garden"; - dir = 2; name = "Garden APC"; pixel_y = -26 }, @@ -68536,7 +65174,6 @@ /obj/item/t_scanner, /obj/item/t_scanner, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 5 }, /obj/effect/turf_decal/trimline/neutral/filled/line, @@ -68606,7 +65243,6 @@ /area/engine/atmos) "cuA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/grimy, @@ -68640,7 +65276,6 @@ dir = 10 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -68654,7 +65289,6 @@ dir = 6 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -68672,7 +65306,6 @@ /area/engine/atmos) "cuH" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/blue, @@ -68695,11 +65328,12 @@ /turf/open/floor/plating, /area/maintenance/disposal/incinerator) "cuL" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 2 +/obj/machinery/door/poddoor{ + id = "SecJusticeChamber"; + name = "Justice Vent" }, -/turf/closed/wall/r_wall, -/area/maintenance/disposal/incinerator) +/turf/open/floor/plating, +/area/security/execution/education) "cuM" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, @@ -68736,7 +65370,6 @@ "cuS" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -68745,7 +65378,6 @@ /obj/machinery/light, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -68757,7 +65389,6 @@ }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -68769,7 +65400,6 @@ network = list("minisat") }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -68779,7 +65409,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -68858,7 +65487,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -68872,7 +65500,6 @@ dir = 9 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -68951,7 +65578,6 @@ /area/engine/atmos) "cvr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - icon_state = "pipe11-2"; dir = 5 }, /turf/closed/wall/r_wall, @@ -68968,7 +65594,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/binary/pump/on{ - dir = 2; name = "Incinerator Output Pump" }, /turf/open/space, @@ -69016,9 +65641,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 2 - }, +/obj/machinery/atmospherics/components/binary/pump/on, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -69043,7 +65666,6 @@ light_color = "#c1caff" }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/blue, @@ -69139,7 +65761,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/structure/cable{ @@ -69166,7 +65787,6 @@ "cvR" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel/grimy, @@ -69210,7 +65830,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/item/radio/intercom{ @@ -69265,7 +65884,7 @@ areastring = "/area/construction/mining/aux_base"; dir = 4; name = "Auxillary Base Construction APC"; - pixel_x = 24; + pixel_x = 24 }, /obj/structure/cable{ icon_state = "0-2" @@ -69278,7 +65897,6 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/turf_decal/tile, @@ -69333,9 +65951,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/power/apc{ + areastring = "/area/hallway/secondary/entry"; dir = 4; name = "Entry Hall APC"; - areastring = "/area/hallway/secondary/entry"; pixel_x = 24 }, /obj/structure/cable, @@ -69399,31 +66017,14 @@ /turf/open/floor/plating/airless, /area/engine/engineering) "cws" = ( -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, /obj/machinery/power/emitter/anchored{ dir = 4; state = 2 }, -/turf/open/floor/plating/airless, -/area/engine/engineering) -"cwt" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating/airless, -/area/engine/engineering) -"cwu" = ( -/obj/structure/cable/yellow{ +/obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, +/obj/structure/cable, /turf/open/floor/plating/airless, /area/engine/engineering) "cwv" = ( @@ -69503,7 +66104,6 @@ /area/construction/mining/aux_base) "cwE" = ( /obj/docking_port/stationary/public_mining_dock{ - icon_state = "pinonfar"; dir = 8 }, /turf/open/floor/plating, @@ -69602,7 +66202,6 @@ }, /obj/machinery/camera{ c_tag = "Cargobay Fore"; - dir = 2; name = "cargo camera" }, /turf/open/floor/plating, @@ -69655,7 +66254,6 @@ }, /obj/effect/turf_decal/tile/red, /obj/machinery/turnstile{ - icon_state = "turnstile_map"; dir = 1 }, /turf/open/floor/plasteel, @@ -69685,7 +66283,6 @@ "cwZ" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/blue, @@ -69693,7 +66290,6 @@ /area/hallway/secondary/entry) "cxa" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -69764,11 +66360,9 @@ /area/hallway/secondary/entry) "cxi" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -69797,7 +66391,6 @@ "cxl" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/chapel{ @@ -69822,11 +66415,6 @@ /turf/open/floor/plating, /area/maintenance/aft) "cxo" = ( -/obj/machinery/power/apc{ - areastring = "/area/science/nanite"; - name = "Nanite Lab APC"; - pixel_x = -24 - }, /obj/structure/cable{ icon_state = "0-4" }, @@ -69836,8 +66424,14 @@ name = "science camera"; network = list("ss13","rd") }, +/obj/machinery/power/apc{ + areastring = "/area/science/circuit"; + name = "Circuitry Lab APC"; + pixel_x = -24 + }, +/obj/structure/target_stake, /turf/open/floor/plasteel/dark, -/area/science/nanite) +/area/science/circuit) "cxp" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -69845,9 +66439,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, /turf/open/floor/plating/airless, /area/engine/engineering) "cxq" = ( @@ -69894,13 +66485,11 @@ /turf/open/floor/plasteel, /area/engine/engineering) "cxv" = ( -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, /obj/machinery/power/emitter/anchored{ dir = 8; state = 2 }, +/obj/structure/cable, /turf/open/floor/plating/airless, /area/engine/engineering) "cxw" = ( @@ -69908,6 +66497,9 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plating/airless, /area/engine/engineering) "cxx" = ( @@ -69941,7 +66533,6 @@ /area/space/nearstation) "cxC" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/blue, @@ -70040,9 +66631,7 @@ /turf/open/space/basic, /area/space/nearstation) "cxN" = ( -/obj/structure/disposaloutlet{ - dir = 2 - }, +/obj/structure/disposaloutlet, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -70065,7 +66654,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/blue, @@ -70164,7 +66752,6 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/light, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/blue, @@ -70173,7 +66760,6 @@ "cyc" = ( /obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, @@ -70205,7 +66791,6 @@ "cyh" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/blue, @@ -70214,7 +66799,6 @@ "cyi" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/blue, @@ -70242,7 +66826,6 @@ "cym" = ( /obj/structure/closet/wardrobe/cargotech, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/camera{ @@ -70266,7 +66849,7 @@ pixel_y = 26 }, /obj/item/radio/intercom{ - pixel_x = -26; + pixel_x = -26 }, /obj/item/stack/cable_coil/white{ pixel_x = 3; @@ -70449,11 +67032,9 @@ /area/engine/storage_shared) "cyF" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -70481,7 +67062,6 @@ "cyJ" = ( /obj/machinery/rnd/production/protolathe/department/cargo, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/camera{ @@ -70643,12 +67223,12 @@ /area/space) "cze" = ( /obj/docking_port/stationary{ - icon_state = "pinonalert"; dir = 8; - width = 3; - height = 4; dwidth = 1; - roundstart_template = /datum/map_template/shuttle/escape_pod/default + height = 4; + icon_state = "pinonalert"; + roundstart_template = /datum/map_template/shuttle/escape_pod/default; + width = 3 }, /obj/structure/fans/tiny/invisible, /turf/open/space/basic, @@ -70738,6 +67318,7 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, +/obj/machinery/power/rad_collector/anchored, /turf/open/floor/plating/airless, /area/engine/engineering) "czp" = ( @@ -70786,15 +67367,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/turf/open/floor/plating, -/area/hallway/secondary/entry) -"czu" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/hallway/secondary/entry) "czv" = ( @@ -70856,15 +67429,12 @@ }, /obj/effect/turf_decal/tile, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/machinery/atmospherics/components/binary/pump{ @@ -70911,7 +67481,6 @@ /area/gateway) "czF" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /obj/structure/sign/departments/science{ @@ -71005,7 +67574,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/white/line{ - icon_state = "trimline"; dir = 8 }, /turf/open/floor/plasteel, @@ -71041,7 +67609,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -71065,11 +67632,9 @@ /area/bridge) "czV" = ( /obj/effect/turf_decal/box/white/corners{ - icon_state = "box_corners_white"; dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -71107,7 +67672,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /obj/machinery/camera/autoname{ @@ -71154,21 +67718,18 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, /area/bridge) "cAb" = ( /obj/machinery/modular_computer/console/preset/engineering{ - icon_state = "console"; dir = 4 }, /obj/structure/cable{ icon_state = "0-4" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -71187,7 +67748,6 @@ icon_state = "1-8" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel/dark, @@ -71195,7 +67755,6 @@ "cAd" = ( /obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -71206,7 +67765,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -71222,11 +67780,9 @@ "cAh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -71267,22 +67823,6 @@ }, /turf/open/floor/plasteel/white, /area/hallway/primary/aft) -"cAn" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 1; - light_color = "#ffc1c1"; - pixel_y = -5 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 5 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "cAo" = ( /obj/effect/turf_decal/stripes/red/line, /obj/effect/turf_decal/arrows/red, @@ -71339,6 +67879,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/plating/airless, /area/engine/engineering) "cAu" = ( @@ -71362,11 +67905,9 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 4 }, /turf/open/floor/plasteel, @@ -71379,7 +67920,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -71418,7 +67958,6 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, @@ -71443,11 +67982,9 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 4 }, /turf/open/floor/plasteel, @@ -71472,7 +68009,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/white/line{ - icon_state = "trimline"; dir = 4 }, /turf/open/floor/plasteel, @@ -71496,11 +68032,9 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 4 }, /turf/open/floor/plasteel, @@ -71508,30 +68042,13 @@ "cAD" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"cAE" = ( -/obj/structure/window/reinforced/spawner, -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 5 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 10 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "cAF" = ( /obj/structure/cable{ icon_state = "1-2" @@ -71555,29 +68072,13 @@ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 4 }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"cAG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "cAH" = ( /obj/structure/cable{ icon_state = "1-2" @@ -71598,11 +68099,9 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 4 }, /turf/open/floor/plasteel, @@ -71626,11 +68125,9 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 4 }, /turf/open/floor/plasteel, @@ -71656,38 +68153,9 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/starboard) -"cAK" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 4 }, /turf/open/floor/plasteel, @@ -71712,11 +68180,9 @@ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 4 }, /turf/open/floor/plasteel, @@ -71741,26 +68207,13 @@ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 4 }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"cAN" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 5 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "cAO" = ( /obj/structure/cable{ icon_state = "1-2" @@ -71780,11 +68233,9 @@ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 4 }, /turf/open/floor/plasteel, @@ -71814,11 +68265,9 @@ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 4 }, /turf/open/floor/plasteel, @@ -71898,7 +68347,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -71906,7 +68354,6 @@ "cBb" = ( /obj/machinery/computer/arcade, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -71931,7 +68378,6 @@ network = list("minisat") }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel/dark, @@ -71941,7 +68387,6 @@ dir = 5 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -71977,11 +68422,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -71994,7 +68437,6 @@ "cBj" = ( /obj/machinery/computer/slot_machine, /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -72005,7 +68447,6 @@ pixel_x = 12 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -72015,7 +68456,7 @@ dir = 8 }, /obj/item/radio/intercom{ - pixel_x = 26; + pixel_x = 26 }, /turf/open/floor/plasteel/dark/corner, /area/engine/atmos) @@ -72025,14 +68466,12 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /turf/open/floor/plasteel, @@ -72042,7 +68481,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/corner, @@ -72051,7 +68489,6 @@ "cBo" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -72061,28 +68498,15 @@ icon_state = "2-4" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, /area/engine/storage) -"cBq" = ( -/obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "cBr" = ( /obj/structure/window/reinforced{ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -72099,7 +68523,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -72109,56 +68532,22 @@ uses = 10 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, /area/tcommsat/computer) -"cBv" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/starboard) -"cBw" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/starboard) "cBx" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel/grimy, /area/chapel/office) -"cBy" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "cBz" = ( /obj/machinery/power/apc{ areastring = "/area/hallway/primary/starboard"; dir = 4; name = "Starboard Hallway APC"; - pixel_x = 24; + pixel_x = 24 }, /obj/structure/cable{ icon_state = "0-8" @@ -72167,18 +68556,10 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"cBA" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/starboard) "cBB" = ( /obj/structure/cable{ icon_state = "4-8" @@ -72187,7 +68568,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -72195,7 +68575,6 @@ "cBC" = ( /obj/machinery/airalarm/directional/west, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -72209,7 +68588,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -72220,7 +68598,6 @@ pixel_x = 24 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -72231,40 +68608,24 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"cBG" = ( -/obj/machinery/light{ - dir = 4; - light_color = "#c1caff" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "cBH" = ( /obj/structure/cable{ icon_state = "0-8" }, /obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/hallway/primary/aft"; dir = 4; name = "Aft Hallway APC"; - areastring = "/area/hallway/primary/aft"; pixel_x = 24 }, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -72281,11 +68642,9 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/blue, @@ -72351,7 +68710,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /obj/machinery/navbeacon{ @@ -72365,7 +68723,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel, @@ -72435,14 +68792,12 @@ /area/hallway/primary/aft) "cBZ" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "cCa" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /obj/machinery/navbeacon{ @@ -72451,41 +68806,12 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"cCb" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) -"cCc" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "cCd" = ( /obj/structure/chair{ dir = 4 }, /obj/effect/landmark/start/chaplain, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -72504,61 +68830,25 @@ light_color = "#fff4bc" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/carpet/royalblack, /area/crew_quarters/dorms) -"cCf" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 5 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "cCg" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"cCh" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) -"cCi" = ( -/obj/machinery/light, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "cCj" = ( /obj/structure/cable{ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, /area/engine/storage) -"cCk" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "cCl" = ( /obj/machinery/light, /obj/structure/extinguisher_cabinet{ @@ -72567,7 +68857,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -72610,7 +68899,7 @@ dir = 8; name = "Auxillary Base Monitor"; network = list("auxbase"); - pixel_x = 25; + pixel_x = 25 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/structure/cable{ @@ -72621,7 +68910,6 @@ "cCp" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -72637,7 +68925,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /obj/structure/disposalpipe/junction/yjunction{ - icon_state = "pipe-y"; dir = 1 }, /obj/effect/turf_decal/tile/neutral, @@ -72652,28 +68939,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"cCr" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) -"cCs" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "cCt" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral{ @@ -72693,7 +68958,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -72718,18 +68982,15 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "cCx" = ( /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 5 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel, @@ -72743,7 +69004,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -72788,11 +69048,9 @@ /area/hallway/primary/aft) "cCD" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel, @@ -72804,7 +69062,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -72854,7 +69111,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -72879,7 +69135,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/line{ - icon_state = "trimline"; dir = 8 }, /turf/open/floor/plasteel, @@ -72899,7 +69154,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -72936,7 +69190,6 @@ /area/crew_quarters/fitness/recreation) "cCQ" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -72952,7 +69205,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/structure/fans/tiny, /turf/open/floor/plating, /area/engine/engineering) "cCS" = ( @@ -72976,22 +69228,10 @@ network = list("minisat") }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel/dark, /area/aisat) -"cCU" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/aisat) "cCV" = ( /obj/structure/window/reinforced/spawner/north, /obj/machinery/light/small{ @@ -73003,7 +69243,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -73013,7 +69252,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -73027,11 +69265,9 @@ /area/aisat) "cCY" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -73062,18 +69298,10 @@ /area/ai_monitored/turret_protected/ai) "cDc" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/foyer) -"cDd" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 9 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat/foyer) "cDe" = ( /obj/machinery/firealarm{ dir = 8; @@ -73081,7 +69309,6 @@ }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -73091,7 +69318,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/structure/extinguisher_cabinet{ @@ -73100,27 +69326,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/hallway) -"cDg" = ( -/obj/machinery/light, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat/hallway) -"cDh" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat/hallway) "cDi" = ( /obj/machinery/camera/motion{ c_tag = "MiniSat Foyer Starboard"; @@ -73135,7 +69340,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -73146,14 +69350,12 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cDl" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -73165,7 +69367,6 @@ }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -73175,25 +69376,16 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/foyer) -"cDo" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/aisat/foyer) "cDp" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -73201,7 +69393,6 @@ "cDq" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -73211,7 +69402,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -73219,7 +69409,6 @@ "cDs" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -73312,7 +69501,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/blue/filled/corner, @@ -73320,7 +69508,6 @@ /area/hallway/secondary/command) "cDA" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, @@ -73436,7 +69623,6 @@ /area/maintenance/fore/secondary) "cDP" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -73451,7 +69637,6 @@ "cDR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -73593,7 +69778,6 @@ /area/medical/morgue) "cEf" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output{ - icon_state = "vent_map_siphon_on-2"; dir = 1 }, /turf/open/floor/engine/air, @@ -73617,9 +69801,9 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ + areastring = "/area/medical/morgue"; dir = 4; name = "Morgue APC"; - areastring = "/area/medical/morgue"; pixel_x = 26 }, /turf/open/floor/plasteel/dark, @@ -73733,7 +69917,6 @@ "cEm" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -73894,7 +70077,6 @@ /area/medical/morgue) "cEy" = ( /obj/machinery/firealarm{ - dir = 2; pixel_y = 24 }, /obj/effect/turf_decal/bot, @@ -73902,11 +70084,9 @@ /area/science/mixing) "cEz" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/light{ @@ -73916,15 +70096,14 @@ /obj/machinery/status_display/evac{ pixel_y = 32 }, +/obj/structure/closet/wardrobe/chemistry_white, /turf/open/floor/plasteel/white, /area/medical/chemistry) "cEA" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/structure/closet/secure_closet/chemical, @@ -73938,17 +70117,19 @@ /obj/item/wrench/medical, /obj/structure/table/reinforced, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/status_display/ai{ pixel_y = 32 }, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone, /turf/open/floor/plasteel/white, /area/medical/cryo) "cEC" = ( /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /obj/machinery/computer/pandemic, @@ -74049,14 +70230,12 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/line{ - icon_state = "trimline"; dir = 8 }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "cEM" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -74083,7 +70262,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/white/line{ - icon_state = "trimline"; dir = 8 }, /turf/open/floor/plasteel, @@ -74096,7 +70274,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -74130,11 +70307,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 4 }, /turf/open/floor/plasteel, @@ -74147,7 +70322,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/navbeacon{ @@ -74158,7 +70332,6 @@ /area/hallway/primary/starboard) "cER" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -74171,14 +70344,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "cET" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -74209,25 +70380,10 @@ /area/crew_quarters/locker) "cEW" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, /area/crew_quarters/locker) -"cEX" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/obj/machinery/camera/autoname{ - icon_state = "camera"; - dir = 9 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/starboard) "cEY" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -74297,7 +70453,6 @@ pixel_x = 24 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/carpet/royalblack, @@ -74320,7 +70475,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -74330,11 +70484,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 8 }, /turf/open/floor/plasteel, @@ -74342,7 +70494,6 @@ "cFg" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/camera{ @@ -74392,7 +70543,6 @@ }, /obj/machinery/disposal/bin, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/structure/disposalpipe/trunk{ @@ -74408,7 +70558,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/monkey_recycler, @@ -74482,10 +70631,9 @@ "cFv" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/structure/fireaxecabinet{ - pixel_x = -31; + pixel_x = -31 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -74511,24 +70659,6 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/engine/air, /area/engine/atmos) -"cFA" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/locker) -"cFB" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "cFC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ @@ -74548,7 +70678,6 @@ /area/crew_quarters/fitness/recreation) "cFD" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/structure/closet/crate, @@ -74569,11 +70698,9 @@ "cFG" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -74598,7 +70725,6 @@ /area/crew_quarters/fitness/recreation) "cFK" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, @@ -74864,16 +70990,17 @@ "cFX" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, /area/crew_quarters/locker) "cFY" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, +/obj/machinery/vr_sleeper{ + dir = 8 + }, /turf/open/floor/plasteel, /area/crew_quarters/locker) "cFZ" = ( @@ -74949,7 +71076,6 @@ "cGe" = ( /obj/machinery/vending/clothing, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -74962,12 +71088,9 @@ c_tag = "Locker Room Aft"; dir = 1 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 2 - }, +/obj/effect/turf_decal/tile/neutral, /obj/machinery/vending/kink, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -74985,7 +71108,6 @@ }, /obj/machinery/camera{ c_tag = "Dorms - Port Fore"; - dir = 2; name = "dormitories camera" }, /obj/structure/sign/poster/official/no_erp{ @@ -75009,13 +71131,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) -"cGi" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 10 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/locker) "cGj" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral, @@ -75040,7 +71155,6 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -75051,7 +71165,6 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -75103,7 +71216,6 @@ "cGp" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -75126,7 +71238,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -75151,11 +71262,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /obj/structure/cable{ @@ -75226,7 +71335,6 @@ "cGy" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -75246,26 +71354,10 @@ light_color = "#c1caff" }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, /area/hallway/secondary/command) -"cGB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; - dir = 8 - }, -/obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; - dir = 4 - }, -/obj/machinery/light/small, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/kitchen) "cGC" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -75276,17 +71368,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"cGD" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/obj/machinery/light, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "cGE" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/green, @@ -75323,18 +71404,10 @@ /area/medical/virology) "cGG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, /area/construction/mining/aux_base) -"cGH" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "cGI" = ( /obj/machinery/button/door{ id = "aux_base_shutters"; @@ -75361,7 +71434,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -75384,7 +71456,6 @@ /area/engine/atmos) "cGL" = ( /obj/machinery/computer/camera_advanced/base_construction{ - icon_state = "computer"; dir = 1 }, /obj/machinery/light, @@ -75392,7 +71463,6 @@ /area/construction/mining/aux_base) "cGM" = ( /obj/machinery/computer/shuttle/mining{ - icon_state = "computer"; dir = 1 }, /turf/open/floor/plasteel, @@ -75429,7 +71499,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile/yellow{ @@ -75442,7 +71511,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel/dark, @@ -75466,7 +71534,6 @@ "cGT" = ( /obj/machinery/light/small, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -75489,7 +71556,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -75498,21 +71564,18 @@ /obj/structure/table, /obj/item/storage/fancy/donut_box, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, /area/security/courtroom) "cGX" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel/dark, /area/security/courtroom) "cGY" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel/dark, @@ -75554,7 +71617,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -75570,7 +71632,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -75595,7 +71656,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/white/line{ - icon_state = "trimline"; dir = 8 }, /turf/open/floor/plasteel, @@ -75616,7 +71676,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/button/door{ @@ -75633,6 +71692,9 @@ icon_state = "1-2" }, /obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/space/basic, /area/engine/engineering) "cHi" = ( @@ -75640,7 +71702,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/structure/reagent_dispensers/watertank, @@ -75656,7 +71717,6 @@ pixel_x = -32 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel/white, @@ -75731,7 +71791,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /obj/machinery/navbeacon{ @@ -75742,7 +71801,6 @@ /area/hallway/primary/aft) "cHs" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /obj/machinery/navbeacon{ @@ -75756,7 +71814,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/navbeacon{ @@ -75765,34 +71822,9 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"cHu" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/line{ - icon_state = "trimline"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "cHv" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/navbeacon{ @@ -75803,7 +71835,6 @@ /area/hallway/primary/aft) "cHw" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/navbeacon{ @@ -75833,7 +71864,6 @@ /area/hallway/secondary/entry) "cHy" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/navbeacon{ @@ -75881,16 +71911,6 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/engine/engineering) -"cHC" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engine/storage_shared) "cHD" = ( /obj/structure/cable{ icon_state = "1-2" @@ -75911,11 +71931,9 @@ dir = 8 }, /obj/effect/turf_decal/trimline/yellow/line{ - icon_state = "trimline"; dir = 4 }, /obj/effect/turf_decal/trimline/red/line{ - icon_state = "trimline"; dir = 4 }, /obj/structure/cable{ @@ -75931,7 +71949,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -75944,7 +71961,6 @@ dir = 6 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -75964,7 +71980,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -75975,7 +71990,6 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -75986,7 +72000,6 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel, @@ -75998,7 +72011,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 10 }, /turf/open/floor/plasteel, @@ -76020,7 +72032,6 @@ /area/engine/break_room) "cHM" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -76108,7 +72119,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel, @@ -76118,7 +72128,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -76130,7 +72139,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -76141,7 +72149,6 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -76151,7 +72158,6 @@ dir = 10 }, /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -76182,7 +72188,6 @@ }, /obj/structure/rack, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/item/screwdriver, @@ -76299,7 +72304,6 @@ /area/maintenance/starboard/aft) "cIi" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/light{ @@ -76314,14 +72318,12 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, /area/chapel/main) "cIk" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -76331,7 +72333,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/item/radio/intercom{ @@ -76346,11 +72347,9 @@ icon_state = "0-4" }, /obj/machinery/power/solar_control{ - name = "Port Bow Solar Control"; - icon_state = "computer"; dir = 4; id = "foreport"; - track = 0 + name = "Port Bow Solar Control" }, /obj/structure/cable, /obj/structure/sign/warning/vacuum/external{ @@ -76374,13 +72373,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/security/brig) -"cIo" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/security/brig) "cIp" = ( /obj/structure/cable{ icon_state = "1-2" @@ -76396,14 +72388,13 @@ /obj/structure/disposalpipe/segment, /obj/machinery/flasher{ id = "brigflashdoor"; - pixel_x = -26; + pixel_x = -26 }, /turf/open/floor/plasteel, /area/security/brig) "cIq" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/stripes/red/corner{ - icon_state = "warninglinecorner_red"; dir = 1 }, /obj/structure/disposalpipe/segment, @@ -76414,17 +72405,6 @@ }, /turf/open/floor/plasteel, /area/security/brig) -"cIr" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "cIs" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -76463,7 +72443,6 @@ "cIw" = ( /obj/structure/closet/wardrobe/white, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/bot, @@ -76472,7 +72451,6 @@ "cIx" = ( /obj/structure/closet/wardrobe/grey, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/bot, @@ -76520,42 +72498,18 @@ /area/gateway) "cID" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/gateway) -"cIE" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/gateway) -"cIF" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel/dark, /area/gateway) "cIG" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel/dark, /area/gateway) -"cIH" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/gateway) "cII" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -76566,7 +72520,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/status_display/ai{ @@ -76589,7 +72542,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /obj/effect/turf_decal/tile/blue{ @@ -76597,26 +72549,12 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"cIM" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/plasteel, -/area/hallway/primary/starboard) "cIN" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -76635,7 +72573,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/status_display/ai{ @@ -76658,7 +72595,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/status_display/evac{ @@ -76671,11 +72607,9 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/blue, @@ -76687,12 +72621,10 @@ light_color = "#c1caff" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /turf/open/floor/plasteel, @@ -76787,7 +72719,6 @@ }, /obj/structure/chair/sofa/left, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/status_display/evac{ @@ -76800,7 +72731,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /obj/machinery/status_display/evac{ @@ -76841,7 +72771,6 @@ dir = 10 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/status_display/evac{ @@ -76859,7 +72788,6 @@ "cJi" = ( /obj/structure/closet/secure_closet/personal/patient, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/status_display/ai{ @@ -76869,7 +72797,6 @@ /area/medical/medbay/central) "cJj" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/status_display/evac{ @@ -76934,7 +72861,6 @@ icon_state = "2-4" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -76959,8 +72885,7 @@ dir = 4 }, /obj/machinery/camera{ - c_tag = "Security - Head of Security's Office"; - dir = 2 + c_tag = "Security - Head of Security's Office" }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hos) @@ -77014,7 +72939,7 @@ /obj/structure/closet/secure_closet/hos, /obj/effect/turf_decal/tile/red, /obj/item/storage/secure/safe/HoS{ - pixel_x = 36; + pixel_x = 36 }, /obj/machinery/status_display/ai{ pixel_y = -32 @@ -77040,7 +72965,6 @@ /obj/machinery/light, /obj/structure/closet/wardrobe/green, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/bot, @@ -77057,7 +72981,6 @@ /area/crew_quarters/locker) "cJC" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/structure/chair/stool, @@ -77084,7 +73007,6 @@ "cJG" = ( /obj/structure/chair/stool, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -77139,7 +73061,6 @@ /obj/structure/reagent_dispensers/watertank/high, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel, @@ -77201,21 +73122,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"cJS" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "cJT" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/stripes/line{ @@ -77302,7 +73208,6 @@ light_color = "#e8eaff" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -77323,7 +73228,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -77335,18 +73239,15 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, /area/engine/engineering) "cKd" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -77360,7 +73261,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/landmark/xeno_spawn, @@ -77399,9 +73299,6 @@ /turf/open/floor/plating/airless, /area/engine/engineering) "cKh" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -77579,11 +73476,9 @@ "cKA" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -77594,7 +73489,6 @@ /area/crew_quarters/fitness/recreation) "cKC" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/light{ @@ -77657,8 +73551,8 @@ /area/construction) "cKI" = ( /obj/machinery/power/apc{ - name = "Construction Area APC"; areastring = "/area/construction"; + name = "Construction Area APC"; pixel_y = -24 }, /obj/structure/cable{ @@ -77928,7 +73822,6 @@ pixel_x = 24 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -77937,80 +73830,37 @@ "cLa" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel, /area/engine/atmos) "cLb" = ( /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 5 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) -"cLc" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engine/atmos) "cLd" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 5 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/engine/atmos) -"cLe" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engine/atmos) -"cLf" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engine/atmos) -"cLg" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engine/atmos) "cLh" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 10 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -78023,7 +73873,6 @@ "cLj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -78032,7 +73881,6 @@ /obj/machinery/atmospherics/pipe/simple/green/visible, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -78040,7 +73888,6 @@ "cLl" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -78051,12 +73898,9 @@ /turf/open/floor/carpet, /area/crew_quarters/dorms) "cLn" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 2 - }, +/obj/effect/turf_decal/tile/neutral, /obj/structure/closet/wardrobe/mixed, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/bot, @@ -78102,6 +73946,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, /area/engine/engineering) "cLs" = ( @@ -78134,7 +73981,6 @@ /area/engine/storage_shared) "cLv" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -78143,7 +73989,6 @@ "cLw" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/door/airlock/security/glass{ @@ -78160,7 +74005,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/door/airlock/security/glass{ @@ -78201,7 +74045,6 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/door/airlock/security/glass{ @@ -78211,13 +74054,6 @@ }, /turf/open/floor/plasteel, /area/security/brig) -"cLA" = ( -/obj/machinery/turnstile{ - icon_state = "turnstile_map"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/security/brig) "cLB" = ( /obj/structure/cable{ icon_state = "1-2" @@ -78303,33 +74139,18 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/dark/corner{ - icon_state = "darkcorner"; - dir = 8 - }, -/area/hallway/primary/aft) -"cLK" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/plasteel/dark/corner{ - icon_state = "darkcorner"; dir = 8 }, /area/hallway/primary/aft) "cLL" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -78337,40 +74158,25 @@ "cLM" = ( /obj/machinery/light, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/dark/corner{ - icon_state = "darkcorner"; dir = 8 }, /area/hallway/primary/aft) "cLN" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/dark/corner{ - icon_state = "darkcorner"; dir = 8 }, /area/hallway/primary/aft) -"cLO" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "cLP" = ( /obj/effect/turf_decal/bot, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/camera{ @@ -78418,7 +74224,6 @@ network = list("minisat") }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -78437,15 +74242,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel, /area/engine/transit_tube) -"cLW" = ( -/obj/structure/closet/secure_closet/personal, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, -/area/crew_quarters/locker) "cLX" = ( /obj/structure/transit_tube/curved/flipped{ dir = 8 @@ -78460,21 +74256,6 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/fore) -"cLZ" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "cMa" = ( /obj/structure/cable{ icon_state = "4-8" @@ -78487,15 +74268,12 @@ "cMb" = ( /obj/machinery/light, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -78531,14 +74309,13 @@ dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/item/radio/intercom{ dir = 4; freerange = 1; name = "Station Intercom (Telecomms)"; - pixel_x = 30; + pixel_x = 30 }, /turf/open/floor/plasteel/white, /area/science/xenobiology) @@ -78606,7 +74383,6 @@ /area/security/range) "cMi" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /obj/machinery/camera{ @@ -78624,7 +74400,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/camera{ @@ -78650,12 +74425,10 @@ /area/crew_quarters/heads/captain/private) "cMl" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/camera{ c_tag = "Science Entrance"; - dir = 2; name = "science camera"; network = list("ss13","rd") }, @@ -78665,7 +74438,6 @@ /obj/machinery/light, /obj/structure/closet/secure_closet/personal, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/effect/turf_decal/bot, @@ -78764,22 +74536,18 @@ /area/crew_quarters/fitness/recreation) "cMy" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "cMz" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/structure/extinguisher_cabinet{ @@ -78888,7 +74656,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -78924,14 +74691,12 @@ dir = 6 }, /obj/effect/turf_decal/trimline/blue/line{ - icon_state = "trimline"; dir = 9 }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "cMM" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /turf/open/floor/plating, @@ -78950,35 +74715,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"cMP" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/white/line{ - icon_state = "trimline"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "cMQ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -79001,7 +74737,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/line{ - icon_state = "trimline"; dir = 1 }, /turf/open/floor/plasteel, @@ -79032,7 +74767,6 @@ /obj/machinery/plantgenes, /obj/structure/table, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/camera{ @@ -79043,7 +74777,6 @@ /area/hydroponics) "cMU" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/red{ @@ -79061,15 +74794,13 @@ /area/hallway/secondary/exit/departure_lounge) "cMV" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/red{ dir = 1 }, /obj/machinery/camera{ - c_tag = "Departure Lounge - Starboard Fore"; - dir = 2 + c_tag = "Departure Lounge - Starboard Fore" }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) @@ -79080,7 +74811,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/machinery/camera{ c_tag = "Escape Hallway"; - dir = 2; name = "departures camera" }, /turf/open/floor/plasteel, @@ -79091,7 +74821,6 @@ }, /obj/machinery/camera{ c_tag = "Library"; - dir = 2; name = "library camera" }, /turf/open/floor/wood, @@ -79117,14 +74846,6 @@ }, /turf/open/floor/carpet, /area/library/lounge) -"cNa" = ( -/obj/effect/turf_decal/trimline/red/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "cNb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -79159,11 +74880,9 @@ "cNd" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 1 }, /turf/open/floor/plasteel, @@ -79171,7 +74890,6 @@ "cNe" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/structure/cable{ @@ -79195,7 +74913,6 @@ /obj/structure/table, /obj/item/storage/box/donkpockets, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -79206,7 +74923,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/camera/autoname, @@ -79242,7 +74958,6 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/camera/autoname{ @@ -79260,7 +74975,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/camera{ @@ -79271,7 +74985,6 @@ /area/engine/atmos) "cNm" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -79290,7 +75003,6 @@ /area/engine/atmos) "cNo" = ( /obj/machinery/computer/arcade{ - icon_state = "arcade"; dir = 8 }, /turf/open/floor/plating, @@ -79307,7 +75019,6 @@ /area/security/vacantoffice/a) "cNr" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/wood, @@ -79315,11 +75026,9 @@ "cNs" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 6 }, /turf/open/floor/plasteel, @@ -79329,7 +75038,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/camera/autoname{ @@ -79356,7 +75064,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -79376,7 +75083,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/camera/autoname{ @@ -79386,7 +75092,6 @@ /area/engine/storage) "cNz" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/light{ @@ -79411,7 +75116,6 @@ "cNB" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/navbeacon{ @@ -79428,7 +75132,6 @@ /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile/purple, @@ -79455,11 +75158,9 @@ }, /obj/effect/landmark/start/botanist, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 9 }, /turf/open/floor/plasteel, @@ -79467,9 +75168,8 @@ "cNF" = ( /obj/structure/cable, /obj/machinery/power/apc/highcap/five_k{ - dir = 2; - name = "Upload APC"; areastring = "/area/ai_monitored/turret_protected/ai_upload"; + name = "Upload APC"; pixel_y = -24 }, /obj/machinery/camera/motion{ @@ -79553,7 +75253,6 @@ /area/teleporter) "cNM" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/camera/autoname{ @@ -79578,7 +75277,6 @@ icon_state = "1-2" }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 9 }, /turf/open/floor/plasteel, @@ -79586,7 +75284,6 @@ "cNO" = ( /obj/machinery/vending/wardrobe/gene_wardrobe, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/camera/autoname, @@ -79617,7 +75314,6 @@ /area/medical/virology) "cNS" = ( /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 9 }, /turf/open/floor/plasteel/freezer, @@ -79636,7 +75332,6 @@ }, /obj/effect/turf_decal/delivery, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 9 }, /turf/open/floor/plasteel, @@ -79657,14 +75352,12 @@ /area/crew_quarters/toilet) "cNV" = ( /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 9 }, /turf/open/floor/plasteel/grimy, /area/hallway/secondary/entry) "cNW" = ( /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 9 }, /turf/open/floor/plasteel, @@ -79677,7 +75370,6 @@ icon_state = "1-2" }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 9 }, /turf/open/floor/plasteel, @@ -79700,7 +75392,6 @@ dir = 1 }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 6 }, /turf/open/floor/plasteel, @@ -79713,14 +75404,12 @@ pixel_x = 30 }, /obj/machinery/modular_computer/console/preset/engineering{ - icon_state = "console"; dir = 8 }, /obj/structure/cable{ icon_state = "0-8" }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 9 }, /turf/open/floor/plasteel/dark/corner, @@ -79729,7 +75418,6 @@ /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/turf_decal/bot, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 9 }, /turf/open/floor/plasteel, @@ -79749,7 +75437,6 @@ "cOd" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/camera/autoname, @@ -79778,7 +75465,6 @@ "cOg" = ( /obj/structure/disposalpipe/trunk, /obj/structure/disposaloutlet{ - icon_state = "outlet"; dir = 8 }, /turf/open/floor/plating/asteroid/airless, @@ -79936,7 +75622,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/light{ @@ -79975,7 +75660,6 @@ dir = 5 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -80013,12 +75697,14 @@ /area/engine/engineering) "cOJ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, /area/engine/engineering) "cOK" = ( @@ -80051,12 +75737,8 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/turf/open/floor/plasteel, -/area/engine/engineering) -"cOO" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-4" }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -80065,6 +75747,9 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/engine/engineering) "cOQ" = ( @@ -80176,7 +75861,6 @@ "cPe" = ( /obj/effect/landmark/xeno_spawn, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plating, @@ -80242,7 +75926,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -80273,7 +75956,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/line{ - icon_state = "trimline"; dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ @@ -80440,11 +76122,9 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/red/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel, @@ -80548,7 +76228,6 @@ /area/maintenance/fore/secondary) "cPW" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /turf/open/floor/plating, @@ -80675,9 +76354,8 @@ "cQo" = ( /obj/structure/table, /obj/machinery/power/apc{ - dir = 2; - name = "Cargo Office APC"; areastring = "/area/quartermaster/office"; + name = "Cargo Office APC"; pixel_x = 1; pixel_y = -24 }, @@ -80685,7 +76363,6 @@ icon_state = "0-8" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /obj/structure/extinguisher_cabinet{ @@ -80747,7 +76424,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/light{ @@ -80796,7 +76472,6 @@ "cQE" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/structure/extinguisher_cabinet{ @@ -80852,7 +76527,6 @@ dir = 8 }, /obj/machinery/camera/autoname{ - icon_state = "camera"; dir = 10 }, /turf/open/floor/plasteel, @@ -80896,7 +76570,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/structure/extinguisher_cabinet{ @@ -80907,14 +76580,12 @@ /area/hallway/primary/central) "cQP" = ( /obj/structure/chair/sofa/corp{ - icon_state = "corp_sofamiddle"; dir = 8 }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "cQQ" = ( /obj/structure/chair/sofa/corp/left{ - icon_state = "corp_sofaend_left"; dir = 8 }, /turf/open/floor/plating, @@ -80972,7 +76643,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/blue/line{ - icon_state = "trimline"; dir = 1 }, /turf/open/floor/plasteel, @@ -81029,16 +76699,13 @@ "cRe" = ( /obj/structure/cable, /obj/machinery/power/apc/highcap/five_k{ - dir = 2; name = "Kitchen APC"; pixel_y = -24 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/machinery/food_cart, @@ -81097,12 +76764,10 @@ /area/engine/transit_tube) "cRl" = ( /obj/structure/chair/sofa/right{ - icon_state = "sofaend_right"; dir = 1 }, /obj/machinery/power/apc{ areastring = "/area/engine/transit_tube"; - dir = 2; name = "Transit Tube APC"; pixel_y = -26 }, @@ -81239,7 +76904,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/white/line{ - icon_state = "trimline"; dir = 1 }, /turf/open/floor/plasteel, @@ -81281,7 +76945,6 @@ icon_state = "2-8" }, /obj/effect/turf_decal/trimline/blue/line{ - icon_state = "trimline"; dir = 1 }, /turf/open/floor/plasteel, @@ -81293,7 +76956,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /obj/structure/disposalpipe/junction/yjunction{ - icon_state = "pipe-y"; dir = 1 }, /obj/structure/cable{ @@ -81310,63 +76972,16 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/corner{ - icon_state = "trimline_corner"; dir = 1 }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"cRJ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/white/line{ - icon_state = "trimline"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "cRK" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/meter, /obj/machinery/atmospherics/pipe/manifold/general/visible, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) -"cRL" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/line{ - icon_state = "trimline"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "cRM" = ( /obj/machinery/door/airlock/public/glass{ name = "Holodeck Door" @@ -81422,7 +77037,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/white/line{ - icon_state = "trimline"; dir = 8 }, /turf/open/floor/plasteel, @@ -81455,7 +77069,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/white/line{ - icon_state = "trimline"; dir = 8 }, /turf/open/floor/plasteel, @@ -81488,7 +77101,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/white/line{ - icon_state = "trimline"; dir = 8 }, /turf/open/floor/plasteel, @@ -81518,7 +77130,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/line{ - icon_state = "trimline"; dir = 8 }, /turf/open/floor/plasteel, @@ -81552,7 +77163,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/white/line{ - icon_state = "trimline"; dir = 8 }, /turf/open/floor/plasteel, @@ -81579,7 +77189,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/line{ - icon_state = "trimline"; dir = 8 }, /turf/open/floor/plasteel, @@ -81603,7 +77212,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/blue/line{ - icon_state = "trimline"; dir = 8 }, /turf/open/floor/plasteel, @@ -81631,7 +77239,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/white/line{ - icon_state = "trimline"; dir = 8 }, /turf/open/floor/plasteel, @@ -81666,7 +77273,6 @@ icon_state = "2-4" }, /obj/effect/turf_decal/trimline/yellow/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -81705,7 +77311,6 @@ "cSi" = ( /obj/structure/bed/dogbed/ian, /obj/item/radio/intercom{ - dir = 2; pixel_y = 28 }, /turf/open/floor/wood, @@ -81762,48 +77367,32 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) -"cSo" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "cSp" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /turf/open/floor/plasteel, /area/crew_quarters/locker) "cSq" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ - icon_state = "trimline_corner_fill"; + dir = 4 + }, +/obj/machinery/vr_sleeper{ dir = 4 }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "cSr" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 4 }, /obj/structure/cable{ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /turf/open/floor/plasteel, @@ -81811,7 +77400,6 @@ "cSs" = ( /obj/machinery/light, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -81819,7 +77407,6 @@ "cSt" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/light{ @@ -81831,7 +77418,6 @@ "cSu" = ( /obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -81844,7 +77430,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /obj/machinery/door/poddoor/preopen{ @@ -81867,6 +77452,9 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/open/floor/plasteel, /area/engine/engineering) "cSx" = ( @@ -81876,7 +77464,6 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /obj/structure/sign/warning/nosmoking{ @@ -81884,24 +77471,14 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) -"cSy" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "cSz" = ( /obj/structure/cable{ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/red/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /turf/open/floor/plasteel, @@ -81909,11 +77486,9 @@ "cSA" = ( /obj/structure/table, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/item/reagent_containers/food/snacks/mint, @@ -81923,13 +77498,6 @@ }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) -"cSB" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "cSC" = ( /obj/machinery/vending/coffee, /turf/open/floor/plasteel, @@ -81939,7 +77507,6 @@ /area/maintenance/port/aft) "cSE" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -81949,19 +77516,16 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "cSG" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/structure/extinguisher_cabinet{ @@ -81997,7 +77561,6 @@ /area/hallway/primary/central) "cSK" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/structure/cable{ @@ -82015,7 +77578,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/structure/sign/directions/engineering{ @@ -82028,7 +77590,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/item/radio/intercom{ @@ -82323,7 +77884,6 @@ /area/engine/atmos) "cTA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -82334,7 +77894,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -82449,7 +78008,6 @@ "cTP" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /obj/structure/sign/departments/restroom{ @@ -82459,7 +78017,6 @@ /area/crew_quarters/fitness/recreation) "cTQ" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 6 }, /obj/structure/sign/departments/restroom{ @@ -82485,12 +78042,10 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/structure/sign/directions/evac{ dir = 8; - icon_state = "direction_evac"; pixel_x = 32 }, /obj/structure/sign/directions/engineering{ @@ -82530,7 +78085,6 @@ }, /obj/structure/sign/directions/medical{ dir = 1; - icon_state = "direction_med"; pixel_y = 40 }, /turf/open/floor/plasteel, @@ -82540,16 +78094,13 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /obj/structure/sign/directions/medical{ dir = 1; - icon_state = "direction_med"; pixel_x = 32; pixel_y = 40 }, @@ -82560,7 +78111,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/structure/sign/departments/engineering{ @@ -82573,7 +78123,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/structure/sign/departments/engineering{ @@ -82589,7 +78138,6 @@ /area/maintenance/department/cargo) "cUb" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/structure/cable{ @@ -82610,7 +78158,6 @@ "cUc" = ( /obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/structure/sign/departments/holy{ @@ -82655,7 +78202,6 @@ "cUi" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 9 }, /obj/effect/turf_decal/tile/blue, @@ -82699,7 +78245,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/structure/extinguisher_cabinet{ @@ -82710,7 +78255,6 @@ /area/medical/virology) "cUp" = ( /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -82726,13 +78270,12 @@ dir = 4 }, /obj/effect/turf_decal/trimline/green/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/doorButtons/airlock_controller{ idExterior = "virology_airlock_exterior"; - idSelf = "virology_airlock_control"; idInterior = "virology_airlock_interior"; + idSelf = "virology_airlock_control"; name = "Virology Access Console"; pixel_x = 26; pixel_y = 26; @@ -82847,7 +78390,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/structure/extinguisher_cabinet{ @@ -82917,7 +78459,6 @@ /area/maintenance/department/crew_quarters/dorms) "cUR" = ( /obj/structure/chair/sofa/corp/right{ - icon_state = "corp_sofaend_right"; dir = 8 }, /obj/item/storage/daki, @@ -82961,29 +78502,12 @@ /obj/item/storage/belt/utility, /turf/open/floor/plating, /area/maintenance/aft) -"cUZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engine/engineering) "cVa" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /obj/structure/reagent_dispensers/peppertank{ pixel_y = 30 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/structure/cable{ @@ -83001,7 +78525,6 @@ pixel_y = 30 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /obj/structure/cable{ @@ -83054,7 +78577,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /turf/open/floor/plasteel, @@ -83081,7 +78603,6 @@ }, /obj/structure/closet/secure_closet/security, /obj/effect/turf_decal/trimline/red/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/machinery/airalarm/directional/west, @@ -83473,7 +78994,6 @@ "cWo" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/item/crowbar, @@ -83491,15 +79011,12 @@ /area/crew_quarters/fitness/recreation) "cWr" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 8 }, /obj/structure/pool/Rboard, @@ -83556,7 +79073,6 @@ /area/maintenance/solars/starboard/aft) "cWx" = ( /obj/machinery/power/terminal{ - icon_state = "term"; dir = 8 }, /obj/structure/cable{ @@ -83582,7 +79098,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/machinery/airalarm/directional/west, @@ -83601,7 +79116,6 @@ /area/engine/break_room) "cWB" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 4 }, /obj/structure/sign/warning/enginesafety{ @@ -83700,7 +79214,6 @@ "cWL" = ( /obj/machinery/power/apc{ areastring = "/area/engine/storage"; - dir = 2; name = "Engineering Storage APC"; pixel_y = -26 }, @@ -83796,7 +79309,6 @@ /area/crew_quarters/locker) "cWV" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/machinery/status_display/evac{ @@ -83824,7 +79336,6 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -83846,7 +79357,6 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -83865,7 +79375,6 @@ dir = 4 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -83881,7 +79390,6 @@ dir = 4 }, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -84087,7 +79595,7 @@ areastring = "/area/maintenance/department/electrical"; dir = 4; name = "Electrical Maintenance APC"; - pixel_x = 24; + pixel_x = 24 }, /obj/structure/cable{ icon_state = "0-8" @@ -84187,7 +79695,6 @@ pixel_x = 24 }, /obj/effect/turf_decal/trimline/blue/filled/line{ - icon_state = "trimline_fill"; dir = 5 }, /obj/machinery/vending/medical{ @@ -84204,14 +79711,12 @@ }, /obj/effect/turf_decal/tile, /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 1 }, /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; dir = 8 }, /obj/effect/landmark/event_spawn, @@ -84245,7 +79750,6 @@ /area/medical/medbay/central) "cXL" = ( /obj/effect/turf_decal/tile{ - icon_state = "tile_corner"; dir = 8 }, /obj/effect/turf_decal/tile, @@ -84268,11 +79772,10 @@ /area/crew_quarters/heads/chief/private) "cXO" = ( /obj/machinery/status_display/ai{ - pixel_x = -32; + pixel_x = -32 }, /obj/machinery/power/apc/highcap/ten_k{ areastring = "/area/crew_quarters/heads/chief/private"; - dir = 2; name = "Chief Engineer's Quarters APC"; pixel_y = -24 }, @@ -84305,9 +79808,6 @@ /turf/open/floor/plasteel, /area/quartermaster/qm/private) "cXU" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -84326,18 +79826,17 @@ /obj/machinery/power/grounding_rod, /turf/open/floor/plating/airless, /area/engine/engineering) -"cXW" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plating/airless, -/area/engine/engineering) "cXX" = ( -/obj/structure/cable/yellow, /obj/machinery/power/emitter/anchored{ dir = 1; state = 2 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plating/airless, /area/engine/engineering) "cXY" = ( @@ -84345,7 +79844,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -84366,16 +79864,13 @@ /area/crew_quarters/cafeteria) "cYa" = ( /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 4 }, /obj/effect/turf_decal/tile/bar{ - icon_state = "tile_corner"; dir = 8 }, /obj/machinery/camera{ - c_tag = "Kitchen Starboard"; - dir = 2 + c_tag = "Kitchen Starboard" }, /obj/machinery/light{ dir = 1; @@ -84392,7 +79887,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/item/radio/intercom{ @@ -84407,7 +79901,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/neutral/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /obj/item/radio/intercom{ @@ -84451,7 +79944,6 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/yellow/filled/line{ - icon_state = "trimline_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -84467,7 +79959,6 @@ icon_state = "1-8" }, /obj/effect/turf_decal/trimline/yellow/filled/corner{ - icon_state = "trimline_corner_fill"; dir = 1 }, /turf/open/floor/plasteel, @@ -84495,6 +79986,2373 @@ /obj/structure/fans/tiny, /turf/open/floor/plating, /area/maintenance/aft) +"ddh" = ( +/obj/structure/window/reinforced/spawner/north, +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 + }, +/obj/machinery/light/small{ + dir = 1; + light_color = "#ffc1c1"; + pixel_y = -5 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) +"dgb" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) +"diH" = ( +/obj/structure/window/reinforced/spawner/north, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) +"doD" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/lobby) +"dsE" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/machinery/camera/autoname{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/starboard) +"duB" = ( +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/research) +"dwu" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/brig) +"dEp" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) +"dFe" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"dFG" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"dGX" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/security/brig) +"dIv" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) +"dPK" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/plasteel, +/area/security/brig) +"dQa" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) +"dQT" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/white/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"dRM" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 9 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat/foyer) +"dSS" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engine/atmos) +"dWj" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/gateway) +"dWs" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/science/research) +"dZP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) +"ean" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"ebs" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hydroponics) +"ect" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) +"eec" = ( +/obj/effect/turf_decal/tile{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red, +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) +"ehl" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/kitchen) +"eia" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/corner, +/turf/open/floor/plasteel/dark, +/area/aisat) +"ely" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"eqe" = ( +/obj/effect/turf_decal/caution{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/quartermaster/warehouse) +"eqk" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) +"eqX" = ( +/obj/structure/window/reinforced/spawner/north, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 1; + light_color = "#ffc1c1"; + pixel_y = -5 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) +"etb" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) +"evX" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/locker) +"ezo" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/space/basic, +/area/engine/engineering) +"eDP" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) +"eFp" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"eFG" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/power/grounding_rod, +/turf/open/floor/plating/airless, +/area/engine/engineering) +"eGt" = ( +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"eHx" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/starboard) +"eIr" = ( +/turf/open/floor/plasteel/cult, +/area/library) +"eJn" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/locker) +"eNI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/camera/autoname{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/command) +"ePb" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/space/basic, +/area/engine/engineering) +"ePe" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"eTx" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"eVg" = ( +/obj/machinery/cryopod{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/dorms) +"eXk" = ( +/obj/effect/turf_decal/tile{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) +"fjH" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/security/prison) +"fjJ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engine/engineering) +"fow" = ( +/obj/effect/turf_decal/tile{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/structure/chair, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) +"fqL" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/brig) +"fsj" = ( +/obj/structure/window/reinforced/spawner/north, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) +"fwg" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/locker) +"fDN" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) +"fEH" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) +"fKc" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) +"fMb" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/brig) +"fOO" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/plasteel, +/area/hallway/primary/starboard) +"fQN" = ( +/obj/structure/closet/secure_closet/personal, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, +/area/crew_quarters/locker) +"fSW" = ( +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/engine/engineering) +"fXq" = ( +/obj/structure/disposaloutlet{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/engine, +/area/science/xenobiology) +"fZL" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) +"fZN" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/medical/virology) +"ggi" = ( +/obj/machinery/light{ + dir = 8; + light_color = "#e8eaff" + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) +"gqj" = ( +/obj/machinery/light/small{ + dir = 4; + light_color = "#d8b1b1" + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms) +"gra" = ( +/obj/machinery/light, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat/hallway) +"guj" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plating/airless, +/area/engine/engineering) +"gyY" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/item/twohanded/required/kirbyplants/random, +/turf/open/floor/plasteel/dark, +/area/science/circuit) +"gIA" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/starboard) +"gMF" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/kitchen) +"gMV" = ( +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) +"gTB" = ( +/obj/machinery/atmospherics/pipe/simple/yellow/visible{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engine/atmos) +"gVl" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/security/prison) +"gVP" = ( +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) +"haK" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/starboard) +"hcn" = ( +/obj/machinery/atmospherics/pipe/simple/yellow/visible{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engine/atmos) +"hof" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/engine/engineering) +"hwC" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/starboard) +"hBS" = ( +/obj/machinery/deepfryer, +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/kitchen) +"hIv" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/security/brig) +"hMI" = ( +/obj/effect/turf_decal/tile{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) +"hST" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"hVN" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/power/tesla_coil, +/turf/open/floor/plating/airless, +/area/engine/engineering) +"ihw" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"ikz" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/conveyor{ + backwards = 1; + forwards = 2; + id = "trashsort" + }, +/turf/open/floor/plating, +/area/quartermaster/sorting) +"ipL" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) +"iqD" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"iup" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) +"iyH" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) +"iAi" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/gateway) +"iJE" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/space/basic, +/area/engine/engineering) +"iPN" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 6 + }, +/turf/open/floor/plasteel/white, +/area/medical/virology) +"iVC" = ( +/obj/structure/window/reinforced/spawner, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) +"joZ" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"jqb" = ( +/obj/structure/chair, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) +"juo" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/light, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"jCQ" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"jLE" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/security/brig) +"jNI" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) +"jSU" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engine/storage_shared) +"kcN" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line, +/obj/machinery/vr_sleeper{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/locker) +"kdD" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) +"khi" = ( +/obj/machinery/light{ + dir = 4; + light_color = "#c1caff" + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"kkw" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"kuT" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/security/brig) +"kDs" = ( +/obj/effect/turf_decal/tile{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/item/twohanded/required/kirbyplants/random, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) +"kNb" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/lobby) +"kXQ" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"lik" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/power/grounding_rod, +/turf/open/floor/plating/airless, +/area/engine/engineering) +"lkU" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/item/radio/intercom{ + dir = 4; + pixel_x = 27 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) +"lpx" = ( +/obj/structure/table, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) +"lqd" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/plasteel, +/area/security/brig) +"lCX" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"lLo" = ( +/obj/machinery/door/poddoor{ + id = "QMLoaddoor2"; + name = "Supply Dock Loading Door" + }, +/obj/machinery/conveyor{ + id = "QMLoad2" + }, +/turf/open/floor/plating, +/area/quartermaster/storage) +"lNj" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "QMLoad" + }, +/obj/machinery/door/poddoor{ + id = "QMLoaddoor"; + name = "Supply Dock Loading Door" + }, +/turf/open/floor/plating, +/area/quartermaster/storage) +"lRt" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hydroponics) +"lTj" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/science/circuit) +"lWO" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/space/basic, +/area/engine/engineering) +"mdU" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/space/basic, +/area/engine/engineering) +"mfy" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/power/grounding_rod, +/turf/open/floor/plating/airless, +/area/engine/engineering) +"mks" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"mqh" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/lobby) +"msN" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) +"mtV" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/brig) +"mNk" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/plasteel, +/area/engine/break_room) +"neT" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"ngt" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) +"nkH" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"nmx" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) +"nnp" = ( +/obj/machinery/turnstile{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/brig) +"ntW" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/command) +"nuO" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engine/break_room) +"nFt" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat/foyer) +"nRc" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/kitchen) +"nUG" = ( +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/research) +"nXH" = ( +/obj/machinery/light{ + dir = 8; + light_color = "#e8eaff" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"ofD" = ( +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/command) +"ojZ" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) +"onU" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/genetics) +"oxP" = ( +/obj/structure/showcase/cyborg/old{ + pixel_y = 20 + }, +/turf/open/floor/plasteel/grimy, +/area/tcommsat/computer) +"oCd" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/purple/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) +"oKO" = ( +/obj/machinery/light{ + dir = 8; + light_color = "#e8eaff" + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/starboard) +"phO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) +"pqo" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) +"pza" = ( +/obj/machinery/light, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/science/research) +"pHw" = ( +/obj/effect/turf_decal/tile{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) +"pWd" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/brig) +"qae" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/machinery/camera/autoname{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"qax" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/research) +"qUA" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"reY" = ( +/obj/effect/turf_decal/tile{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) +"rqY" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plating/airless, +/area/engine/engineering) +"rIV" = ( +/obj/structure/closet/wardrobe/cargotech, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/quartermaster/storage) +"rUI" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/security/brig) +"rYm" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"spX" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engine/break_room) +"sDf" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"tbT" = ( +/obj/machinery/power/emitter/anchored{ + dir = 1; + state = 2 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating/airless, +/area/engine/engineering) +"tfI" = ( +/obj/structure/chair/stool, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engine/break_room) +"thv" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/white/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"tjc" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/machinery/light/small, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/kitchen) +"tjO" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating/airless, +/area/engine/engineering) +"tkv" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit) +"tkG" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engine/break_room) +"tln" = ( +/obj/structure/window/reinforced/spawner, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) +"tlP" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/gateway) +"tnV" = ( +/obj/structure/window/reinforced/spawner, +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) +"tpJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/command) +"tsA" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating/airless, +/area/engine/engineering) +"tvc" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/starboard) +"txO" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"uaq" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/prison) +"ubl" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/space/basic, +/area/engine/engineering) +"ucq" = ( +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) +"ufs" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/aisat/hallway) +"ulq" = ( +/obj/machinery/light{ + dir = 4; + light_color = "#c1caff" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"umI" = ( +/obj/structure/urinal{ + dir = 8; + pixel_x = 28 + }, +/turf/open/floor/plasteel/freezer, +/area/crew_quarters/toilet) +"unn" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/obj/machinery/vr_sleeper{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) +"upC" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/white/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) +"urx" = ( +/obj/structure/chair/comfy/teal{ + dir = 4 + }, +/turf/open/floor/wood, +/area/library) +"utM" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"uwg" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/starboard) +"uFf" = ( +/turf/closed/wall/r_wall, +/area/science/circuit) +"uIi" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"uJe" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) +"uKJ" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"uKM" = ( +/obj/structure/window/reinforced/spawner/north, +/obj/machinery/light/small{ + dir = 1; + light_color = "#ffc1c1"; + pixel_y = -5 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) +"uLi" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"uLH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/medical/virology) +"uLR" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) +"uMl" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/robotics/mechbay) +"uNK" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/plasteel/dark/corner{ + dir = 8 + }, +/area/hallway/primary/aft) +"uPt" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/starboard) +"uQf" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"uRi" = ( +/obj/structure/window/reinforced/spawner/north, +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) +"uRw" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"uSM" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"uVs" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/brig) +"uWN" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) +"uWS" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/surgery) +"uYv" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"uZH" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"vhh" = ( +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/corner, +/turf/open/floor/plasteel/dark, +/area/aisat) +"voR" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/genetics) +"voS" = ( +/obj/machinery/light, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"vrE" = ( +/obj/machinery/light, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) +"vtT" = ( +/obj/machinery/light, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"vwv" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/light{ + dir = 4; + light_color = "#e8eaff" + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) +"vxz" = ( +/obj/structure/window/reinforced/spawner/north, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 1; + light_color = "#ffc1c1"; + pixel_y = -5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) +"vBE" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/security/prison) +"vDt" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/kitchen) +"vDW" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/command) +"vFo" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) +"vFP" = ( +/obj/structure/window/reinforced/spawner/north, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) +"vGr" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/trimline/yellow/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/starboard) +"vJb" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"vKZ" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) +"vLQ" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/machinery/camera/autoname{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"vPQ" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/quartermaster/miningoffice) +"vTO" = ( +/obj/structure/window/reinforced/spawner, +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) +"vWi" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) +"wsH" = ( +/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engine/atmos) +"wtQ" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) +"wwa" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/prison) +"wEY" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"wNs" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/science/circuit) +"wOj" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/power/grounding_rod, +/turf/open/floor/plating/airless, +/area/engine/engineering) +"wUP" = ( +/obj/structure/window/reinforced/spawner/north, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) +"wZC" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/item/radio/intercom{ + dir = 1; + pixel_y = -29 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"xag" = ( +/turf/closed/wall, +/area/science/circuit) +"xfQ" = ( +/obj/effect/turf_decal/trimline/neutral/filled/end{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) +"xjG" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/brig) +"xmV" = ( +/turf/open/floor/plasteel/dark, +/area/science/circuit) +"xyH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/aisat) +"xGE" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/security/prison) +"xGR" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"xQx" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) +"xYx" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/machinery/light, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"yfq" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/brig) (1,1,1) = {" aaa @@ -94685,9 +92543,9 @@ bIY bIY bIY byU -bAS +uRi bVp -bAa +tnV bKd bIY bIY @@ -94935,23 +92793,23 @@ aaa aaa aaa bxN -bAS -bLI -bLI -bLI -bLI -bLI -bLI +uRi +ucq +ucq +ucq +ucq +ucq +ucq bPK bRU bYA -bLI -bLI -bLI -bLI -bLI -bLI -bAa +ucq +ucq +ucq +ucq +ucq +ucq +tnV bzY aab aab @@ -95191,25 +93049,25 @@ aab aab aab bzS -bAS -bEK -bLL -bLL -bLL -bMM -bNg +uRi +eia +dQa +dQa +dQa +dZP +vwv bOa bPL bVq caW -bMM -bNg -bMM -bLL -bLL -bLL +dZP +vwv +dZP +dQa +dQa +dQa cAh -cAE +vTO bzY aab aav @@ -95447,9 +93305,9 @@ aab aab aab bzS -bzU -bEK -bKZ +ddh +eia +tln bBW bJg bJg @@ -95465,9 +93323,9 @@ bBX bSd bSS bAc -cAn -cAG -cAE +eqX +xyH +vTO bzY aav aab @@ -95703,9 +93561,9 @@ aav aab aab bzS -bAS -bEK -bKZ +uRi +eia +tln bzV aav aaa @@ -95723,9 +93581,9 @@ aab aav aab bAc -cAN -cAG -cAE +diH +xyH +vTO bBY aab aab @@ -95959,9 +93817,9 @@ aab aav aab bzS -bAS -bEK -bKZ +uRi +eia +tln bzV aab aav @@ -95981,9 +93839,9 @@ aav aab aab bAc -cAN -cAG -cAE +diH +xyH +vTO bzY aab aab @@ -96215,9 +94073,9 @@ aab aab aav bzS -bzU -bEK -bKZ +ddh +eia +tln bzV aab aab @@ -96239,9 +94097,9 @@ aab aab aab bAc -cAn -cAG -cAE +eqX +xyH +vTO bzY aab aab @@ -96471,8 +94329,8 @@ aab aab aab bDC -bAS -bEK +uRi +eia bKY bzV aab @@ -96497,9 +94355,9 @@ aab aab aab bAc -cAN -cAG -cAE +diH +xyH +vTO bzY aab aaa @@ -96727,8 +94585,8 @@ aab aab aab bzS -bAS -bEK +uRi +eia bJF bBW aab @@ -96757,7 +94615,7 @@ aab bAc cBd cBh -bAa +tnV bzY aaa aaa @@ -96983,8 +94841,8 @@ aac aab aab bzS -bzU -byW +ddh +vhh bKy bzV aav @@ -97014,8 +94872,8 @@ aab aab bAc clQ -cBq -bAa +eDP +tnV bzY aaa aaa @@ -97239,9 +95097,9 @@ aaa aac aab bzS -bAS -byW -bzZ +uRi +vhh +iVC bzV aab aav @@ -97271,9 +95129,9 @@ aab aab aab bYB -cAN -cBq -bAa +diH +eDP +tnV bJf aaa aac @@ -97495,9 +95353,9 @@ aaa aaa aac bzS -bAS -byW -bzZ +uRi +vhh +iVC bBW aav aav @@ -97529,9 +95387,9 @@ aav aav aav bYB -cAN -cBq -bAa +diH +eDP +tnV bJf aac aaa @@ -97751,9 +95609,9 @@ aaa aab aaa byU -bzU -byW -bzZ +ddh +vhh +iVC bBW aab aab @@ -97787,9 +95645,9 @@ aab aav aab bAc -cAn -cBq -bAa +eqX +eDP +tnV bKd aaa aab @@ -98008,8 +95866,8 @@ aaa aab bxN byV -byW -bzZ +vhh +iVC bBW aav aav @@ -98045,9 +95903,9 @@ bST bST aav bYB -cAN -cBq -bAa +diH +eDP +tnV bJf aab aab @@ -98264,8 +96122,8 @@ aaa aaa bwP bxO -byW -bzZ +vhh +iVC bzV aab aav @@ -98303,9 +96161,9 @@ bBX bBX bST bAc -cAN -cBq -bAa +diH +eDP +tnV bzX aab aaa @@ -98520,7 +96378,7 @@ aaa aaa aaa bwP -bxP +uKM byX bzV aab @@ -98561,7 +96419,7 @@ bUP bST aab bAc -bxQ +vFP byX cdz aab @@ -98777,7 +96635,7 @@ aaa aaa aaa bwP -bxQ +vFP byX bzW aav @@ -98818,7 +96676,7 @@ bUP bST aab cbC -bxP +uKM byX cdz aab @@ -99034,7 +96892,7 @@ aaa aaa aaa bwP -bxQ +vFP byX bzX aab @@ -99075,7 +96933,7 @@ bUP bST aab cbC -bxQ +vFP byX cdz aab @@ -99291,7 +97149,7 @@ aaa aaa aaa bwP -bxQ +vFP byX bzX aab @@ -99332,7 +97190,7 @@ bUP bST aab cbC -bxQ +vFP byX cdz aab @@ -99548,7 +97406,7 @@ aaa aaa aaa bwP -bxQ +vFP byX bzX aab @@ -99571,10 +97429,10 @@ bNj bNq bOk bPD -cDo +nFt ccT bLJ -bSh +oxP bSY bTU bUR @@ -99589,7 +97447,7 @@ bUP bST aab cbC -bxQ +vFP byX cdz aab @@ -99805,7 +97663,7 @@ aaa aaa aaa bwP -bxQ +vFP byX bzX aab @@ -99846,7 +97704,7 @@ bUP bST aab cbC -bxP +uKM byX cdz aab @@ -100319,7 +98177,7 @@ aaa aaa aaa bwP -bxQ +vFP byZ bzX aab @@ -100342,7 +98200,7 @@ bNp bNt bQm bOj -cDd +dRM cDs bLJ bSi @@ -100360,7 +98218,7 @@ bUP bST aab cbC -cCU +wUP byX cdz aab @@ -100576,7 +98434,7 @@ aaa aaa aaa bwP -bxQ +vFP byZ bzX aab @@ -100599,10 +98457,10 @@ bNj bNu bOn bPG -cDo +nFt cvc bLJ -bSh +oxP bTb bSV bUP @@ -100617,7 +98475,7 @@ bUP bST aab cbC -cCU +wUP byX cdz aab @@ -100833,7 +98691,7 @@ aaa aaa aaa bwP -bxQ +vFP byZ bzX aab @@ -100855,7 +98713,7 @@ bNX bNw bPc bOj -cDd +dRM cDq cvd bLJ @@ -101090,7 +98948,7 @@ aaa aaa aaa bwP -bxQ +vFP byZ bzX aab @@ -101131,7 +98989,7 @@ bSU bST bSc bzS -cCU +wUP byX cdz aab @@ -101347,7 +99205,7 @@ aaa aaa aaa bwP -bxQ +vFP byZ bzW aav @@ -101386,8 +99244,8 @@ bUS bSV bZP bZO -bLI -bLI +ucq +ucq cCW byX cdz @@ -101604,7 +99462,7 @@ aaa aaa aaa bwP -bxP +uKM byZ bzY aab @@ -101626,7 +99484,7 @@ bBX bME bPv bOt -cDh +ufs bBX aab bBX @@ -101863,7 +99721,7 @@ aaa bwP bxS bzb -bAa +tnV bzY aab aav @@ -101883,7 +99741,7 @@ bBX bBX bPv bOo -cDg +gra bBX aab aab @@ -101901,9 +99759,9 @@ bBX bBX bST caY -bxQ +vFP cCX -bzZ +iVC bzX aab aaa @@ -102120,8 +99978,8 @@ aaa aab bxT bzT -bAb -bAa +uLR +tnV bBY aav aav @@ -102140,7 +99998,7 @@ aab bBX bPv bOp -cDh +ufs bBX aab aab @@ -102157,9 +100015,9 @@ bST bST aav cap -bAS -bEK -bKZ +uRi +eia +tln cbE aab aab @@ -102377,9 +100235,9 @@ aaa aab aaa bxT -bAR -bAb -bAa +vxz +uLR +tnV bBY aab aab @@ -102413,9 +100271,9 @@ aab aav aab bzS -bzU -bEK -bKZ +ddh +eia +tln cbE aaa aab @@ -102635,9 +100493,9 @@ aab aaa aaa bAc -bDJ -bAb -bAa +fsj +uLR +tnV bBY aav aav @@ -102669,9 +100527,9 @@ aav aav aav bDC -bAS -bEK -bKZ +uRi +eia +tln cbE aaa aaa @@ -102893,9 +100751,9 @@ aaa aaa aab bAc -bDJ -bAb -bAa +fsj +uLR +tnV bzY aab aav @@ -102911,7 +100769,7 @@ aab bBX bPv bOo -cDh +ufs bBX aab aab @@ -102925,9 +100783,9 @@ aab aab aab bDC -bAS -bEK -bKZ +uRi +eia +tln caZ aac aac @@ -103151,8 +101009,8 @@ aaa aab aab bAc -bAR -bAb +vxz +uLR bKH bzY aav @@ -103168,7 +101026,7 @@ aab bBX bPv bOo -cDg +gra bBX aab aab @@ -103182,8 +101040,8 @@ aab aab bzS cnO -bEK -bKZ +eia +tln bzV aaa aaa @@ -103325,7 +101183,7 @@ cMv cOq abY ahd -ahU +fXq aiN aiN alm @@ -103409,7 +101267,7 @@ aab aab aab bAc -bDJ +fsj bFX bKa bBY @@ -103425,7 +101283,7 @@ bBX bBX bPv bOo -cDh +ufs bBX bBX bBX @@ -103439,7 +101297,7 @@ aaa bzS cCT cBn -bKZ +tln bzV aab aaa @@ -103667,9 +101525,9 @@ aab aab aab bAc -bDJ -bAb -bAa +fsj +uLR +tnV bzY aab aab @@ -103693,9 +101551,9 @@ aaa aaa aaa bxN -bAS -bEK -bKZ +uRi +eia +tln bzV aab aab @@ -103925,9 +101783,9 @@ aab aab aab bAc -bAR -bAb -bAa +vxz +uLR +tnV bzY aab aaa @@ -103949,9 +101807,9 @@ aaa aaa aaa bxN -bzU -bEK -bKZ +ddh +eia +tln bzV aab aab @@ -104183,9 +102041,9 @@ aab aab aab bAc -bDJ -bAb -bAa +fsj +uLR +tnV bzY aaa aac @@ -104205,9 +102063,9 @@ aac aaa aaa bxN -bAS -bEK -bKZ +uRi +eia +tln bzV aab aab @@ -104353,7 +102211,7 @@ aeG acw abY ahd -ahU +fXq aiN aiN alp @@ -104441,9 +102299,9 @@ aab aab aab bAc -bDJ -bAb -bAa +fsj +uLR +tnV bJf aac aaa @@ -104461,9 +102319,9 @@ aab aac aaa bxN -bAS -bEK -bKZ +uRi +eia +tln bzV aab aaa @@ -104699,9 +102557,9 @@ aab aab aab bAc -bAR -bAb -bAa +vxz +uLR +tnV bKd bIY chv @@ -104717,9 +102575,9 @@ bBX bSc bTe bzS -bzU -bEK -bKZ +ddh +eia +tln bBW aav aac @@ -104957,25 +102815,25 @@ aaa aaa aaa bxT -bDJ -bAb -bLI -bLI +fsj +uLR +ucq +ucq bMG -bMQ +iyH bNY bRT bPQ bXM cuV -bMQ +iyH cve -bMQ -bLI -bLI -bLI -bEK -bKZ +iyH +ucq +ucq +ucq +eia +tln bzV aav aab @@ -105215,23 +103073,23 @@ aaa aaa aaa bxT -bDJ -bLL -bLL +fsj +dQa +dQa bML -bMR -bMR +vWi +vWi bPH bQT bOw caX -bMR +vWi cvf -bLL -bLL -bLL -bLL -bKZ +dQa +dQa +dQa +dQa +tln bzV aab aav @@ -105381,7 +103239,7 @@ aeG acw abY ahd -ahU +fXq aiN aiN als @@ -106409,7 +104267,7 @@ acw aeJ abY ahd -ahU +fXq aiN aiN alv @@ -110258,15 +108116,15 @@ aaQ aaQ acy aaQ -ads -ads -ads -ads -ads -ads -ads -ads -ads +uFf +uFf +uFf +uFf +uFf +uFf +uFf +uFf +uFf aaQ aaQ any @@ -110515,15 +108373,15 @@ abH agn acz abe -ads +uFf adS aeL afG cxo ahj -adS +lTj aiY -akp +xag anE aoj anz @@ -110792,7 +108650,7 @@ aqc aqc avE awv -aBs +dWs axl aaQ azx @@ -111029,7 +108887,7 @@ aaQ aaQ acB aaQ -ads +uFf aut aeN adU @@ -111037,9 +108895,9 @@ agp ahl aif aja -akp +xag anU -aoQ +nUG apa arj atb @@ -111049,7 +108907,7 @@ avO atW ayR aPu -aBs +dWs aCU aaV azy @@ -111286,11 +109144,11 @@ aaA abp acC acY -ads +uFf aid -adV +xmV afH -agq +wNs ahm aig ajb @@ -111543,13 +109401,13 @@ aaA abp acD boY -ads +uFf adW -adV -afI +xmV +gyY aoa -afI -adV +gyY +xmV ajc abd alE @@ -111564,7 +109422,7 @@ aqd azd awy axS -aoQ +nUG aaV azA aAO @@ -111800,12 +109658,12 @@ aaA abp acD abc -ads +uFf adX aeO -adV -agq -adV +xmV +wNs +xmV aih ajd abd @@ -111820,7 +109678,7 @@ avU aqd azd aww -aBs +dWs abt aaV azB @@ -112057,11 +109915,11 @@ aaA abp acD cOv -ads +uFf adY aeP coc -agq +wNs ahn aii aje @@ -112077,7 +109935,7 @@ avL aqd azd aww -aBs +dWs aUi aaQ aaQ @@ -112334,7 +110192,7 @@ abJ abJ azf aww -aBs +dWs abt any azC @@ -112591,7 +110449,7 @@ arn bJo azd awz -aBs +dWs aCU any azD @@ -112981,12 +110839,12 @@ cvC cvC cwK cqk -cFB +ipL cqk cqk cqk cyK -cGH +iup cqk cza cvG @@ -113105,7 +110963,7 @@ aro abJ azd aww -aBs +dWs aFN any azF @@ -113362,7 +111220,7 @@ asV abJ aCi awB -aBs +dWs axl any azG @@ -113601,7 +111459,7 @@ acD ais adu aed -aeT +aed arg agw afO @@ -113619,7 +111477,7 @@ atM abJ bdT aww -aBs +dWs axL axL axL @@ -113876,7 +111734,7 @@ arr abJ azd aww -aBZ +pza axM aIJ azH @@ -114133,7 +111991,7 @@ atN auP azh awC -aBs +dWs axN ayE azI @@ -114165,7 +112023,7 @@ aVS aWR aYS aYT -bad +ntW bbq bcu bcu @@ -114390,7 +112248,7 @@ arr abJ azd awz -aBs +dWs axO ayF azJ @@ -114647,7 +112505,7 @@ atO abJ azi awz -aBs +dWs axL ayG ayN @@ -115161,7 +113019,7 @@ apY abJ azd awz -aBs +dWs axL ayI azK @@ -115418,7 +113276,7 @@ abJ abJ azd awz -aBs +dWs axP ayJ azL @@ -115930,9 +113788,9 @@ arx akt atS auQ -azk +duB awz -aBZ +pza axL ayL azM @@ -116018,7 +113876,7 @@ bMp bQx cLB bOS -cLK +uNK boU bQY bRG @@ -116189,7 +114047,7 @@ atT auR azQ awE -aBs +dWs axQ ayM azN @@ -116221,7 +114079,7 @@ aVY aTF aTF aSt -bad +ntW cGw cGy cGA @@ -116446,7 +114304,7 @@ atS auS azS awz -aBs +dWs axN ayN azO @@ -116532,7 +114390,7 @@ bMq boU cLD bOU -cLK +uNK boU bRa bRI @@ -116550,25 +114408,25 @@ cKF cKH boU cCz -bNU -bNU -cCr -bZn -bZn -bZn -bZn -bZn +uIi +uIi +uYv +dgb +dgb +dgb +dgb +dgb bkT bQg -bZn -bZn -bZn -bZn +dgb +dgb +dgb +dgb cCK -bZn +dgb cHc -bZn -cCr +dgb +uYv cEM cHw cER @@ -116703,7 +114561,7 @@ avA auQ azZ awF -aBs +dWs axR aTE azO @@ -116736,7 +114594,7 @@ aTH aTH boB bam -bvr +tpJ bcs bdz beK @@ -116789,7 +114647,7 @@ bMr boU cLE bOU -cLK +uNK boU bRb bRJ @@ -116809,22 +114667,22 @@ boU cCA cML cfS -cHu -cRJ -cRL -cRJ -cRL +lCX +upC +etb +upC +etb cRP -cRL +etb cRR -cRL +etb cRT -cRL -cRJ +etb +upC cRV cRX cRY -cRJ +upC cRZ cSa cHx @@ -116960,7 +114818,7 @@ afU afU aAo awG -aBs +dWs axL axL azP @@ -117064,9 +114922,9 @@ cKt cKI boU cBI -cMP +thv cCg -cCs +uKJ cfj cfO cfj @@ -117082,7 +114940,7 @@ cSN cHb cfj cfj -cCs +uKJ cEO cHy cET @@ -117215,15 +115073,15 @@ avo atf awJ auT -azk +duB awH aCb -aDq +qax aDz aFW aHr -aDq -aDq +qax +qax aJQ aKK aNn @@ -117250,7 +115108,7 @@ aTJ aTJ brk bao -bvr +tpJ bcs bdB beK @@ -117303,7 +115161,7 @@ bJs boU cJk bOU -cLK +uNK boU bRd bRJ @@ -117322,7 +115180,7 @@ cKJ boU cWR cMQ -cCh +uRw boU cqg cqg @@ -117483,7 +115341,7 @@ aBU axn aEs aEn -aBs +dWs aPf aaQ cMl @@ -117578,8 +115436,8 @@ cKt cKK boU cgm -cMP -cCh +thv +uRw boU cPF chI @@ -117764,7 +115622,7 @@ aTL aTJ brk bam -bvr +tpJ bct bdD beK @@ -117817,7 +115675,7 @@ cVB boU cLG bOU -cLO +ely boU bRf bSo @@ -117836,7 +115694,7 @@ cKL boU cCC cQV -cCh +uRw boU bYa ced @@ -118021,7 +115879,7 @@ aTL aTJ brk bam -bJH +eNI bcl bcl bcl @@ -118074,7 +115932,7 @@ bJs boU cLH bOU -cLO +ely boU bRg bRK @@ -118278,7 +116136,7 @@ aTL aTJ brl bbi -bxn +ofD bcl bdp bhl @@ -118331,7 +116189,7 @@ bJs boU cLI bOV -cLO +ely boU bDb boU @@ -118517,9 +116375,9 @@ aGH aCL cXq aJF -aFH -aKH -aYW +ngt +nmx +vFo apg aab aab @@ -118535,7 +116393,7 @@ aTK aTJ brr bam -bvr +tpJ bcl bdq beC @@ -118588,26 +116446,26 @@ bJs boU cWN bOU -cCf -cCr -bNU +qUA +uYv +uIi bSp bTl bUk bZm cCx -bNU -bNU -btX -bNU -bNU +uIi +uIi +nkH +uIi +uIi cMK cfP -bNU -cCr +uIi +uYv cHr -cMP -cCi +thv +voS boU cdB cRW @@ -118774,9 +116632,9 @@ aGI aBX cXq aJF -aFH -aKH -aYW +ngt +nmx +vFo bym aab aab @@ -118792,7 +116650,7 @@ aSt aSt bdC bbj -bxo +vDW beN bdr bij @@ -118845,23 +116703,23 @@ bLS boU bVo cCm -cbI +dFe cfi -cbI +dFe cfS cju czN cCL cfS -cbI +dFe cfS cEL cfS -cbI +dFe cEN -cbI +dFe cHd -cHu +lCX cfS cRI cCE @@ -119031,7 +116889,7 @@ aPi aHt aHV aJF -aFH +ngt bwV aYX bBZ @@ -119103,22 +116961,22 @@ boU cBI bOX cCa -cCs -cBy -cBy +uKJ +ean +ean bWZ -cBy -cBy -cBy -cBy -cBy -cBy -cBG +ean +ean +ean +ean +ean +ean +ulq cUG -cBy +ean cFf -bKW -cCs +sDf +uKJ cBR bOX cHv @@ -119272,8 +117130,8 @@ ati auG auY aBc -aBp -aBp +uMl +uMl aDu ayS azY @@ -119288,9 +117146,9 @@ aGK aBX aIb aJF -aFH -aKH -aYW +ngt +nmx +vFo cye aab aab @@ -119405,7 +117263,7 @@ cyh cvK cvK cue -cFB +ipL cqk cqk cqk @@ -119547,7 +117405,7 @@ aIc aJG aKx aKI -aYY +vrE apg aab aab @@ -119616,16 +117474,16 @@ cTt boU cBN bOX -cCi +voS bQz cUy bRh cFn -cIr +wtQ cKA -cIr -cIr -cIr +wtQ +wtQ +wtQ cLb cLL bQz @@ -119635,7 +117493,7 @@ bZQ car cFF cFO -cFY +evX bYJ cdB bYa @@ -119666,11 +117524,11 @@ cxm cvK cvK cvK -cGH +iup cqk cza czi -czu +cwl czw aab aab @@ -119782,28 +117640,28 @@ anR arG auk bXs -avM -avM +dEp +dEp axC -aBe -aBq -aBq +gVP +fKc +fKc aDv aEk aGJ aHA aXd -avM -avM -avM -avM +dEp +dEp +dEp +dEp aPg aPj -aBe -aBq -aBq +gVP +fKc +fKc aKy -aKH +nmx cNB apg aab @@ -119820,7 +117678,7 @@ aXa aWY btl bam -bvr +tpJ bcw bdK beT @@ -119829,8 +117687,8 @@ bgk bcw cIA cNM -cIE -cIE +dWj +dWj cIG bjC bmj @@ -119873,7 +117731,7 @@ cRh boU cBI bOX -cCh +uRw bQA cmx bRh @@ -119884,7 +117742,7 @@ cWp cJx cJx cJx -cLZ +xQx bQz cWQ bZg @@ -119892,7 +117750,7 @@ bZg bZg cJI cNb -cFY +evX bYJ cdB bYa @@ -120061,7 +117919,7 @@ aCM aJH aJM aPW -aYW +vFo apg aab aab @@ -120077,7 +117935,7 @@ aXb aWY brk bpH -bxo +vDW bcx bdL beU @@ -120088,7 +117946,7 @@ cIB bjz bkk bkL -cIH +tlP biQ bmk bne @@ -120105,14 +117963,14 @@ cPo bsN bte btT -btT +fZN bwi bwR byh bAi -bAy +uLH bWT -bAy +uLH bDa bsN aaA @@ -120130,7 +117988,7 @@ cPB boU cBI bOX -cCh +uRw bQA cUz bRh @@ -120298,27 +118156,27 @@ aWv avG aYm axi -axE -aBm +pqo +ect aJX -aBm -aBm -aBm -aPN +ect +ect +ect +lkU aDQ aDF bku -axE -aPN -aBm -aBm -aBm -aBm -aBm -aBm +pqo +lkU +ect +ect +ect +ect +ect +ect aLw -aOn -aYW +uWN +vFo apg aab aab @@ -120334,7 +118192,7 @@ aXc aYf btE cGt -bvr +tpJ bcw bdM beV @@ -120345,7 +118203,7 @@ cIC bjA bkl bkM -cIH +tlP blP bml bnf @@ -120370,7 +118228,7 @@ bAl bAz bBx bCr -bwr +iPN bsN aaA aaA @@ -120387,7 +118245,7 @@ bFI boU cIy bOX -cCh +uRw bQA cmx bRh @@ -120574,8 +118432,8 @@ apk aHX apk bPB -aOn -aYW +uWN +vFo apg aab aab @@ -120602,7 +118460,7 @@ cIB bjB bkm bkN -cIH +tlP biQ bmm bre @@ -120644,7 +118502,7 @@ boU cFZ cBI bOX -cCh +uRw bQA bRh bRh @@ -120655,7 +118513,7 @@ cJx cJx cJx cWs -cLZ +xQx bQz bZj cJB @@ -120831,8 +118689,8 @@ aEv aHY aFl aJD -aOn -aYW +uWN +vFo apg aab aab @@ -120848,7 +118706,7 @@ aWY aWY brk bam -bJH +eNI bcw bdO biG @@ -120856,9 +118714,9 @@ bfa bhs bcw cID -cIF -cIF -cIF +iAi +iAi +iAi cII bjC bmn @@ -120881,7 +118739,7 @@ bwT bwR byk bAp -btT +fZN bBz bFc bwR @@ -120912,7 +118770,7 @@ cJx cWq cJx cJx -cLZ +xQx bQz cjU cJA @@ -121088,8 +118946,8 @@ aHu aHY aFl aJD -aOn -aYW +uWN +vFo apg aab aab @@ -121105,7 +118963,7 @@ aWY aWY buq bam -bvr +tpJ bcw bdQ cJK @@ -121158,17 +119016,17 @@ boU cGb cBI bOX -cCh +uRw bQz cUB bRh cFG -cJS -cJS -cJS +fZL +fZL +fZL cWr -cJS -cJS +fZL +fZL cMy cFI cfq @@ -121345,8 +119203,8 @@ aHv aHY aFl aJD -aOn -aYW +uWN +vFo apg aab aab @@ -121362,7 +119220,7 @@ cEU aWY buu ban -bvr +tpJ bcw bht beY @@ -121415,7 +119273,7 @@ bMs boU cIz bOX -cCh +uRw bQA cUC bRh @@ -121602,8 +119460,8 @@ aGO aGO aGO aKv -aOn -aYY +uWN +vrE apg aab aab @@ -121619,7 +119477,7 @@ aOW aSt brk bam -bvr +tpJ bcw bdR bfa @@ -121672,26 +119530,26 @@ cVD boU cgm bOX -cCh +uRw bQA cUC bRh bXb bSw bVM -bRW -cbk -cbk +xfQ +kdD +kdD chS ccm cFI cfs -cFA +fwg cnQ -cFA +fwg cFM cFV -cLW +fQN bYJ cVK chI @@ -121860,7 +119718,7 @@ aHZ aIR aLt aPc -aYW +vFo apg aOl aPa @@ -121876,7 +119734,7 @@ aPV aSt brl bbi -bxn +ofD bcw bdS bfb @@ -121911,7 +119769,7 @@ byo cUo cUp cUq -bwr +iPN bsN bEa bEY @@ -121929,7 +119787,7 @@ bFI boU cBI bOX -cCh +uRw bQA cUC bRh @@ -121948,7 +119806,7 @@ cEV cEV cEV cFW -cLW +fQN bYJ cdB chI @@ -122118,34 +119976,34 @@ aIS aTf aTY aKJ -aZa -aZa +ojZ +ojZ aZd -aZv +uSM aQm bvQ -boX -aZv -aZv +joZ +uSM +uSM bEb -aZv +uSM biP -aZv +uSM brX bbm bvB bNH -bvS -bvS -bwg -aZv -aZv +utM +utM +iqD +uSM +uSM cQx -bvS -bvS -bwg -boX -aZv +utM +utM +iqD +joZ +uSM bqS bMu bNJ @@ -122186,7 +120044,7 @@ bKj bNb cBO bOZ -cCh +uRw bQz cUC bRN @@ -122200,10 +120058,10 @@ cbP cMz cFI cEW -cGi +eJn cQH cSp -cGi +eJn cQH cMm bYJ @@ -122374,9 +120232,9 @@ aIQ aIR aJD aXg -aXi -aXi -aXi +oCd +oCd +oCd aZT aZU bkc @@ -122405,7 +120263,7 @@ blq aQO bmr bAr -bNK +kXQ bTr aRZ cRb @@ -122443,7 +120301,7 @@ bIt boU cBI bOX -cCi +voS bQB bQB bQB @@ -122457,12 +120315,12 @@ bQB bQB bQB cIv -cJI +kcN cQH cFY -cJI +kcN cQH -cLW +fQN bYJ cVL bYN @@ -122638,31 +120496,31 @@ brh aZY aRY bkA -bpf +xGR aVO biO -bpF -bpF -bpF -bpF +uLi +uLi +uLi +uLi bsp blr -bpF -bpF -bpF -bpF +uLi +uLi +uLi +uLi bmv cQE -bpF -bpF -bpF -bpF +uLi +uLi +uLi +uLi bSv -bpf -bpF +xGR +uLi bDV bnn -bNK +kXQ bON aRZ boR @@ -122700,7 +120558,7 @@ bFI boU cBI bOX -cCh +uRw bQB bRl bWv @@ -122894,7 +120752,7 @@ axa axa bap aPY -blg +vtT aRH aRH aRH @@ -122919,7 +120777,7 @@ bgp bgp bRS aPY -bNK +kXQ aOz aRZ boR @@ -122957,7 +120815,7 @@ bFI boU cWO bOX -cCh +uRw bQB coD bRP @@ -123119,12 +120977,12 @@ adx adx ama aNh -aqx +vBE asO aFn -aqx -aqx -aqx +vBE +vBE +vBE axI awa awS @@ -123132,16 +120990,16 @@ axw aye aIw aWt -aHC +uVs aMq -auu -auu -axq -auu +dwu +dwu +pWd +dwu aZj -aHC -aHC -aHC +uVs +uVs +uVs aQX aqG aKL @@ -123151,7 +121009,7 @@ aMn axa bap aPY -bwS +vLQ aRH bBv cck @@ -123176,7 +121034,7 @@ bPX bgp cJa aPY -bNK +kXQ aOy aRZ boR @@ -123214,10 +121072,10 @@ bFH boU cBM bPa -cCh +uRw bQB bRn -bWx +gqj bQB bUw bWW @@ -123399,7 +121257,7 @@ aBl aGT aBl aWQ -aHE +xjG aqG aKM aKO @@ -123408,7 +121266,7 @@ aKO axa cHZ aPY -bms +kkw aRI aSF aTT @@ -123433,7 +121291,7 @@ bgr bii bgn aPY -bnl +dFG aRZ aRZ bpt @@ -123471,7 +121329,7 @@ aaA boU cBK bOX -cCh +uRw bQB bQB bQB @@ -123634,10 +121492,10 @@ afi abA aWS aob -asQ -asQ -asQ -asQ +gVl +gVl +gVl +gVl axj axK awc @@ -123649,14 +121507,14 @@ aAe aHD aEi bpE -auO -auO -auO +dGX +dGX +dGX bZZ -auO -aFM +dGX +kuT aIe -aHG +fqL aJT aKN aKN @@ -123665,7 +121523,7 @@ cND axa bap aPY -bms +kkw aRJ aSG aSG @@ -123690,7 +121548,7 @@ bko blT bDW bno -bnl +dFG aRZ cAs bpr @@ -123913,7 +121771,7 @@ aqG aqG aPp aIe -aIT +mtV aqG aKO aLy @@ -123947,7 +121805,7 @@ bls blU bFm bnp -cGD +xYx aRZ boR bpr @@ -123985,7 +121843,7 @@ aaA boU cBL bOX -cCh +uRw bQB cpR cEZ @@ -124160,7 +122018,7 @@ axz aqG aEu aAe -aHE +xjG aqG aCV aDI @@ -124204,7 +122062,7 @@ blt blV bFJ bnq -bSF +qae aRZ boR bps @@ -124242,7 +122100,7 @@ aaA boU cBI bOX -cCh +uRw bQB cpX cFc @@ -124417,7 +122275,7 @@ axA aqG cDE aAe -aHG +fqL aCl aqJ aDJ @@ -124430,13 +122288,13 @@ aIf aKX aqG aNv -cIo -cIo -cIo +rUI +rUI +rUI axa btt aPY -bms +kkw aRI aSG aTW @@ -124461,7 +122319,7 @@ bjH bii bgn aPY -bnl +dFG aRZ boU boU @@ -124499,7 +122357,7 @@ boU boU cBP bPb -cCk +uZH bQB bQB bQB @@ -124512,14 +122370,14 @@ bQB bQB bQB cGm -bRr +unn bXu cQH cco cor cQH bXu -bRr +unn cSq bQz cdB @@ -124684,7 +122542,7 @@ aGb aGV aPr aIg -aMy +lqd aJU aQY aXQ @@ -124718,45 +122576,45 @@ bqu bgp bnu bAs -bNL -boX -bNU +vJb +joZ +uIi bTt -bNU -bNU +uIi +uIi cec cfP cPl -bNU -bNU -bNU -bNU +uIi +uIi +uIi +uIi bVI -bUN +neT cBm -cCb +hST cEv bNv bBr byf -cCb -bUN -bUN -bUN -bNU +hST +neT +neT +neT +uIi bZR cfP -bNU +uIi cjv -bNU -btX +uIi +nkH cBF -bNU -bNU -bNU +uIi +uIi +uIi cBQ bOX -cCh +uRw bQB bRl bWN @@ -124931,7 +122789,7 @@ axA aqG aFf aAg -aHE +xjG aqG aCX aDL @@ -124950,7 +122808,7 @@ aZN axa bbt aPY -bmq +txO aRH aSK aTX @@ -124977,20 +122835,20 @@ bgn bqv bqx bqz -brz +wEY bsB -brz -bPk -brz -bPk +wEY +dQT +wEY +dQT cPm -bPk -brz +dQT +wEY cAB -brz -bPk -brz -bPk +wEY +dQT +wEY +dQT bQQ cAm cuX @@ -125198,7 +123056,7 @@ aCV aqG aQn aIh -aIT +mtV aqG aXP aXQ @@ -125207,7 +123065,7 @@ aYP axa cCB aPY -bmq +txO aRM aSL aZV @@ -125233,47 +123091,47 @@ bii cGC bns bNM -bpf -bNV -bNV -bSu -bNV -bNV +xGR +eFp +eFp +khi +eFp +eFp bUo clK -bNV -bSu +eFp +khi bAQ -bNV -bXh +eFp +eTx cSG -bXh -cCc +eTx +ihw cEw byf bBC cGd -cCc -bXh -bXh +ihw +eTx +eTx cIR -bKW -cBy -cBy -cBy +sDf +ean +ean +ean cBB -cBy -cBy -cBG +ean +ean +ulq clB cBH -cBy +ean bVV bOY bVk bQB bRn -bWx +gqj bQB bSw bXX @@ -125284,12 +123142,12 @@ bWV bQB cWP bSw -cNa +gMV cbS ckT cTK cMx -cSy +fEH bSw cSu bQz @@ -125455,7 +123313,7 @@ aqG aqG cDV aIe -aKP +dPK aqG aqG aLA @@ -125464,7 +123322,7 @@ aLA axa bap aPY -bmq +txO aRN aSM aTZ @@ -125489,7 +123347,7 @@ blx bii bgn bns -bnl +dFG aRZ boU boU @@ -125527,7 +123385,7 @@ boU boU cTW bOX -cCh +uRw bQB bQB bQB @@ -125541,12 +123399,12 @@ bQB bQB bTw bSw -cNa +gMV cSn cSn cSn cSn -cSy +fEH bSw cSE bQz @@ -125702,7 +123560,7 @@ axB ayh aFi aAj -aKP +dPK aCn aCY aDM @@ -125712,7 +123570,7 @@ aGc aGW aEq aIe -aMy +lqd aJV aKR aKR @@ -125721,7 +123579,7 @@ aNo axa bap aPY -bmq +txO aRN aSN aUa @@ -125746,7 +123604,7 @@ blv bii bgn bns -bnl +dFG aRZ czI bpw @@ -125764,11 +123622,11 @@ bws bxt bzf bsV -bAE +doD bBE bCU -bDg -bDg +mqh +mqh bEZ bFK bHC @@ -125784,32 +123642,32 @@ bMv boU cBS bOX -cCf +qUA bQC -bRr -bSC +vKZ +ggi bZT bSw bWQ -cav -bRr -bSC +eqk +vKZ +ggi cbQ bZU ccV cGh cPH -cSo +jNI cSr -cSo -cSo +jNI +jNI cSz cGh cSF cUb cSK cUc -bRr +vKZ chT czC bSw @@ -125969,7 +123827,7 @@ aGd aGX cDE aIe -aIT +mtV aqG aKS aLB @@ -125978,7 +123836,7 @@ aKR axa bap aPY -bRM +wZC aRN aSO aUb @@ -126003,7 +123861,7 @@ bkX bii bGO bnt -bnl +dFG aRZ boZ cAg @@ -126021,7 +123879,7 @@ btG btG bzg bzq -bAE +doD bBw bCm bCm @@ -126070,9 +123928,9 @@ bSw csZ czC bSw -cav -bRr -bRr +eqk +vKZ +vKZ cmb cmW brT @@ -126216,7 +124074,7 @@ aqG aqG cXc aAl -aIT +mtV aqG aDa aEJ @@ -126226,7 +124084,7 @@ aGe aGY cDF aIi -aHE +xjG aqG aqG aqG @@ -126235,7 +124093,7 @@ aqG axa bap aPY -blg +vtT aRN aSP aUc @@ -126260,7 +124118,7 @@ blx bii bgn bns -bSF +qae aRZ boZ cOS @@ -126280,8 +124138,8 @@ bzh bzr bAF bBF -bCV -bCV +kNb +kNb bGu bFN bFK @@ -126300,7 +124158,7 @@ cBT bPe bYs bQC -bRW +xfQ bSD bUq bVc @@ -126483,7 +124341,7 @@ aGf aqG aPp aIj -aRa +fMb aJW bRj aLC @@ -126517,7 +124375,7 @@ blv bii bgn bns -cGD +xYx aRZ boZ bDx @@ -126532,10 +124390,10 @@ bux bva btG bwk -btG +lpx bzl bsV -bAE +doD bBH bCo bDm @@ -126562,22 +124420,22 @@ bSw bYo bVc bYO -cbh -cbh -cbh -cbh -cbh +fDN +fDN +fDN +fDN +fDN cFg ccv cEY bZS cTP cSt -cbh +fDN cGk -cbh +fDN cGl -cbh +fDN bUy cay cft @@ -126730,7 +124588,7 @@ aqG aqG aFh aAl -aIT +mtV aqG aqG aDH @@ -126774,7 +124632,7 @@ bly bii bgn bns -bnl +dFG aRZ boZ bDx @@ -126792,7 +124650,7 @@ bwl bxa bzp bsQ -bAE +doD bBH bCW bDo @@ -126977,23 +124835,23 @@ apj aoC asS aNf -avH -auu -auu -axq -auu -auu +yfq +dwu +dwu +pWd +dwu +dwu aCk -avH +yfq aFk aAl aIU aYZ -auu -auu -auu -auu -auu +dwu +dwu +dwu +dwu +dwu cLx aQQ aIl @@ -127001,7 +124859,7 @@ aKu aqJ aBk aLE -aMw +jLE aNq aOr bap @@ -127031,7 +124889,7 @@ blx bii bgn bns -bnl +dFG aRZ czK bpx @@ -127069,7 +124927,7 @@ bCD boU cBS bOU -cCh +uRw boU bQB bQB @@ -127219,7 +125077,7 @@ aab aab aab acS -adm +cuL adF ael afk @@ -127254,7 +125112,7 @@ ayi cLy cdt cEt -aRa +fMb aqJ cDx aqG @@ -127306,14 +125164,14 @@ bwn bxc bzF bsQ -bwC +dIv bCc bCX bDE bEk bGk bCq -bwC +dIv bGU bJe bIy @@ -127326,15 +125184,15 @@ bMx boU cBV bOU -cCh +uRw boU -bRt -bRt -bRt +eVg +eVg +eVg bSH -bRt -bRt -bRt +eVg +eVg +eVg bWB bWY bWY @@ -127476,7 +125334,7 @@ aab aab aab acS -adm +cuL adG aem afl @@ -127491,27 +125349,27 @@ apj aoe aqe bdo -auO -auO -auO -auO -auO -auO +dGX +dGX +dGX +dGX +dGX +dGX aCF -auO -aFM +dGX +kuT aAn aIV aJf -aJO +hIv aKa aGo -aJO -aJO +hIv +hIv cLz aQR aIn -aRa +fMb aqJ aBk aLF @@ -127520,7 +125378,7 @@ aNr aOs bbv aPY -bmz +eGt aRQ cnj aUj @@ -127545,7 +125403,7 @@ bjH bgp bFQ bns -bnl +dFG aRZ boZ bpx @@ -127570,7 +125428,7 @@ bDh bEE bDh bCq -bwC +dIv cOi bJy bJC @@ -127583,7 +125441,7 @@ cPC boU cBW bOV -cCi +voS boU bRu bRX @@ -127733,7 +125591,7 @@ aab aab aab acS -adm +cuL cif aen afm @@ -127779,7 +125637,7 @@ bbv aQb aSA aRR -aUf +ebs cAw aVm aWk @@ -127802,13 +125660,13 @@ blz bgw bGg bHj -bnl +dFG aRZ boZ bpx bfs bqP -bru +voR bqT bpx bsV @@ -127833,14 +125691,14 @@ bJe bIy bJL bKp -bRO +uWS bLB bIx bCD boU cBX bPf -cCk +uZH boU bRv bRY @@ -128003,7 +125861,7 @@ akV abA apl aEI -atI +wwa aqK arY atq @@ -128025,21 +125883,21 @@ aGg aqG cDW aIp -aRa +fMb azm aKV aLE -aMw +jLE aNs aOr bbw aPY -bmz +eGt aRR -aUf +ebs czO aVm -aUf +ebs aXl aYq aYq @@ -128059,13 +125917,13 @@ blA blW bJT bnv -bnl +dFG aRZ boZ bpx cNO buC -bru +voR brs bsu brP @@ -128260,7 +126118,7 @@ akW amd apn aof -atI +wwa aqK arZ atr @@ -128293,10 +126151,10 @@ btR aQd bmI aRT -aUh +lRt cAy aUA -aUh +lRt aXm aYs aYs @@ -128306,11 +126164,11 @@ aYs aZo bfn aVo -bhG -bhG -bhG -bhG -bkr +gMF +gMF +gMF +gMF +ehl bki bgw bgw @@ -128354,7 +126212,7 @@ bCD boU cBS bPg -cCh +uRw boU bRx bRx @@ -128369,9 +126227,9 @@ bXz bXz bWB bZw -caB -caB -caB +umI +umI +umI bWB cXf bWB @@ -128548,12 +126406,12 @@ aNt aOt bby aQe -bmz +eGt aRU -aUf +ebs cAw aVn -aUf +ebs aXn aSX aSX @@ -128564,16 +126422,16 @@ cNJ aRO bgw bhH -bhG -bhG -bhG -bkr -bkU +gMF +gMF +gMF +ehl +nRc blB aPb bmB bnw -bog +juo aRZ bpa bpy @@ -128598,7 +126456,7 @@ bDl bEg bFd bCs -bwC +dIv bGZ bJe bIy @@ -128611,7 +126469,7 @@ cVC boU cBU bPg -cCh +uRw boU bQB bQB @@ -128764,14 +126622,14 @@ aby bsn adI acT -akL -akL -akL +uaq +uaq +uaq aqM -akL -akL +uaq +uaq aqt -akL +uaq apz aoh att @@ -128798,19 +126656,19 @@ bdE bwH aJZ cAo -cLA +nnp aLI aEG aNu -cLA +nnp bbz aQf -bmz +eGt aRR -aUf +ebs cAx aVm -aUf +ebs aXn aYq aYq @@ -128820,23 +126678,23 @@ aYq bfo aRR bgB -bhG -bhG +gMF +gMF biX -bhG -bkr -cGB +gMF +ehl +tjc blB aPb bmC bnx -bnl +dFG aRZ boZ bpx bqc -bqe -bqe +onU +onU brL bsu bsU @@ -128861,14 +126719,14 @@ bJe bIy bJO bKp -bRO +uWS bLE bIx bCD boU cBY bPg -cCh +uRw boU bRy bRy @@ -129062,12 +126920,12 @@ cIq aOu bbW aQg -bmz +eGt aRR -aUf +ebs cAw aVm -aUf +ebs aXo aYt aZk @@ -129076,13 +126934,13 @@ aSX aSX cAw bft -bhI -bhG +vDt +gMF blF -biY -biY -bkr -bkU +hBS +hBS +ehl +nRc blC aTh bmD @@ -129112,7 +126970,7 @@ bDF bET bGl bGp -bwG +msN bHa bJA bJD @@ -129170,9 +127028,9 @@ cCj cHg cNy cCj -cHC +jSU cHE -cHC +jSU cHF cHG cHH @@ -129279,14 +127137,14 @@ ado ayv acT akM -alB +fjH aSU -alC -alC +xGE +xGE amO -alB +fjH anZ -alC +xGE aqA atV aqL @@ -129319,7 +127177,7 @@ aNw axa cIs aPY -bmz +eGt aSQ cNE cAz @@ -129334,17 +127192,17 @@ aSX cAw bfu bhJ -bhG +gMF biq biZ bjS -bkr +ehl bkV blD aTh bmE bnz -bwS +vLQ aRZ boZ bpx @@ -129369,7 +127227,7 @@ bDn bEj bCl bFM -bwC +dIv bHb bJe bIy @@ -129382,7 +127240,7 @@ bMx boU cBS bPg -cCi +voS boU bRA bRA @@ -129567,7 +127425,7 @@ aGm arX aFh aIv -aHE +xjG aKc aLa aLL @@ -129590,18 +127448,18 @@ aYq aYq cAw bgy -bhI -bhG -bhG +vDt +gMF +gMF bjh bjT -bkr -bkU +ehl +nRc blD aTh bmF bnA -bRM +wZC aRZ boZ bpx @@ -129639,7 +127497,7 @@ bCD boU cBS bPg -cCh +uRw boU aaA aaA @@ -129678,7 +127536,7 @@ coJ cyd cyd cAr -cUZ +fjJ cnR col col @@ -129833,7 +127691,7 @@ aNy axa bcy aPY -bnl +dFG aRO aSS cAS @@ -129848,17 +127706,17 @@ aSX cAw aRR bhK -bhG -bhG +gMF +gMF bjb bjU -bkr -cGB +ehl +tjc blB aPo bmG bnB -bmq +txO aRZ boZ bpx @@ -129872,7 +127730,7 @@ cEu btS bvh bvM -bwC +dIv bxk byy bzw @@ -129883,7 +127741,7 @@ bDI bBI bBI bBI -bwC +dIv bHb bCl bIx @@ -129896,7 +127754,7 @@ bCD boU cBS bPg -cCh +uRw boU bRB bRB @@ -129935,7 +127793,7 @@ coJ cAr cAr cAr -cUZ +fjJ cxt cmZ cmZ @@ -130090,7 +127948,7 @@ aHL aHM cWH aQh -bnl +dFG aRO aSW aUk @@ -130105,7 +127963,7 @@ bbR bfp aRO bhL -bhG +gMF bir bjV bks @@ -130115,7 +127973,7 @@ blB aPo bmH bnC -bmq +txO aRZ boZ bpx @@ -130129,7 +127987,7 @@ btS buG bvi bwe -bwG +msN bxl byz bzx @@ -130153,7 +128011,7 @@ bCD boU cBU bPg -cCh +uRw boU bRB aaA @@ -130195,8 +128053,8 @@ cAr cYg cxu cmZ -cwT -cwT +cwU +cwU cwU cwT cwT @@ -130410,7 +128268,7 @@ bCD boU cBS bPg -cCh +uRw boU bRB aaA @@ -130437,13 +128295,13 @@ ceM cfz che cig -ciZ -ciZ -ciZ +tkG +tkG +tkG cmJ cNm -ciZ -ciZ +tkG +tkG cgs cty cBe @@ -130452,17 +128310,17 @@ cKc cYh cxt cmZ -cwU -cwU +iJE +ePb cws cxw -cwS +tsA cxw -cwS +tsA cxw -cwS -cwT -cwT +rqY +cwU +cwU cwU cwT cmZ @@ -130604,7 +128462,7 @@ aNA aOx bgn aPY -bog +juo aRO aSV aUe @@ -130629,7 +128487,7 @@ aTa aRZ bgn bns -bmq +txO aRZ cOQ bpx @@ -130667,7 +128525,7 @@ bMy boU cBV bPg -cCh +uRw boU bRB bRB @@ -130709,18 +128567,18 @@ cru cnR cyc cmZ -cwT +ubl cHA -cwt +cwS cyu cwS czy cwS cyu -cwS -cHA -cHA -cHA +guj +ePb +ePb +mdU cwU cmZ cmZ @@ -130924,7 +128782,7 @@ bCD boU cBW bPi -cCi +voS boU ccG bRB @@ -130966,18 +128824,18 @@ crv cmZ cmZ cmZ -cwU +ubl cvS -cwu +cCS cyz -cwu -cyz -cwu +cCS +lik +cCS cyz cCS cKg cwT -cwU +ubl cwU cmZ cmZ @@ -131143,7 +129001,7 @@ aTa aRZ bgn bns -bmq +txO aRZ czP bpA @@ -131181,7 +129039,7 @@ bCD boU cod bPg -cCh +uRw bDb ccK bRB @@ -131223,7 +129081,7 @@ crw cLq ctA cuq -cwT +ubl cvT cwR cwS @@ -131233,7 +129091,7 @@ cwS cwS cwR cKh -cXW +cwS cXX cwU cmZ @@ -131375,7 +129233,7 @@ aHM aHM bih aPY -bnl +dFG aRV aRZ aUp @@ -131400,7 +129258,7 @@ cKk blY cKm cKn -bmq +txO aRZ bpc bpA @@ -131438,7 +129296,7 @@ cVC boU cBS bPg -cCh +uRw bDb cdj bRB @@ -131480,7 +129338,7 @@ cLr cOJ cON cuq -cwT +ubl cwp cwS cwT @@ -131491,7 +129349,7 @@ cwT cwS cWG cwT -cwS +tjO cwU cmZ cmZ @@ -131632,7 +129490,7 @@ aND aOy bgn aPY -bnl +dFG aRW aRZ aUq @@ -131657,7 +129515,7 @@ bit bit bvp bns -bmq +txO aRZ bpc bpA @@ -131695,7 +129553,7 @@ bCD boU cBU bPg -cCh +uRw bDb cep bRB @@ -131735,9 +129593,9 @@ csz czb cNu cOK -cOO +hof cuq -cwT +ubl cwp cwS cwT @@ -131748,7 +129606,7 @@ cwT cwS cWG cwT -cwS +tjO cwT cmZ cmZ @@ -131889,7 +129747,7 @@ aND aOz bgn aPY -bnl +dFG cla cla aZu @@ -131914,7 +129772,7 @@ blH bit cWM bnt -bmq +txO aRZ bpc bpA @@ -131952,7 +129810,7 @@ bCD boU cGq bPg -cCh +uRw bDb ceX bRB @@ -131992,10 +129850,10 @@ csA cDy cOG cOL -cOO +hof cuq -cwT -cwp +ubl +eFG cwS cwU cwS @@ -132003,9 +129861,9 @@ cYj cwS cwU cwS -cWG +wOj cwT -cwS +tjO cwT cmZ cmZ @@ -132146,7 +130004,7 @@ aND aOy bgn aPY -bog +juo cla aTc aUt @@ -132171,7 +130029,7 @@ bka bit cIt bns -bmq +txO aRZ bpc bpA @@ -132209,7 +130067,7 @@ bCE boU cBS bPg -cCh +uRw bDb cBs bRB @@ -132249,9 +130107,9 @@ csz cFu cOH cOM -cOO +hof cuq -cwT +ubl cwp cwS cwT @@ -132262,7 +130120,7 @@ cwT cwS cWG cwT -cwS +tjO cwT cmZ cmZ @@ -132403,7 +130261,7 @@ aND aND cMA aPY -bnl +dFG cla aTd aUu @@ -132428,7 +130286,7 @@ blI bit bgn bns -blg +vtT aRZ bpd bpB @@ -132466,7 +130324,7 @@ bpc boU cBS bPg -cCh +uRw bDb ccK bRB @@ -132483,7 +130341,7 @@ cEG cEH cbv caJ -ccP +spX cbY bES bFG @@ -132508,7 +130366,7 @@ cOI crw cOP cuq -cwT +ubl cwp cwS cwT @@ -132519,7 +130377,7 @@ cwT cwS cWG cwT -cwS +tjO cwU cmZ cmZ @@ -132660,7 +130518,7 @@ cGW aND bgn aPY -bnl +dFG cla aTe aVu @@ -132685,7 +130543,7 @@ blJ bit bgn bns -bmq +txO aRZ czR bpA @@ -132764,8 +130622,8 @@ cqI crA coO ctC -cuq -cwT +fSW +lWO cwq cwR cwS @@ -132775,8 +130633,8 @@ cwS cwS cwR cXU -cXW -cXX +cwS +tbT cwU cmZ cmZ @@ -132980,7 +130838,7 @@ cED bpe cBX bPf -cCk +uZH boU bpe bSb @@ -132997,7 +130855,7 @@ cAT cAT cbv caL -ccP +spX bYn cNf cdi @@ -133022,18 +130880,18 @@ crB cmZ cmZ cmZ -cwU +ubl cwr cxp czc cxp -czc +mfy cxp cAt -czc +cxp cXV cwT -cwU +cHA cwU cmZ cmZ @@ -133175,88 +131033,88 @@ aOA biu aQl boF -bph -bpD -bpD -bpD -bpZ -bpZ +nXH +ePe +ePe +ePe +jCQ +jCQ bBK bsr -bpD +ePe bvC -bpD -bpD -bph -cSB -cSB -bpD +ePe +ePe +nXH +rYm +rYm +ePe bya byJ bsA bCb -bph -bpD +nXH +ePe bLo bns -bNL -aZv -bPl -bPl -bPl -bPl -bPl -bPl +vJb +uSM +tvc +tvc +tvc +tvc +tvc +tvc cmE bUt cWz -bQM -bQP -bQM +uPt +oKO +uPt cAD abN bVw bxv cIL -bQP -bQM +oKO +uPt cIN -bQM +uPt cBt -cBv +uwg cBa -bPl -bPl -cBA -cBA -bPl +tvc +tvc +haK +haK +tvc ceN -bPl -bPl -bPl +tvc +tvc +tvc cOC cBZ bPj cHs -cBv +uwg cTY -bPl -bPl +tvc +tvc cCw -bPl -bPl -bPl +tvc +tvc +tvc cHt bXe -bfq +nuO bYW -cah -cah +tfI +tfI ccI caL cdT coE -bfq +nuO cCN cdP cem @@ -133281,13 +131139,13 @@ ctD cCR cHh cHB -cwt +cwS czn cwS czn cwS +hVN cwS -czn cHA cHA cHA @@ -133462,48 +131320,48 @@ bsq bNn bvR bNl -bTQ -bTQ +vGr +vGr cAu cAA -bTQ -bTQ -bTQ -bTQ +vGr +vGr +vGr +vGr cAC bPA cAF bPz -bTQ -bTQ -bTQ -bTQ -bTQ +vGr +vGr +vGr +vGr +vGr cAH cAI -bTQ +vGr cAJ -cAK -cAK +eHx +eHx cAL -cAK -cAK -cAK -cAK -cAK -cAK +eHx +eHx +eHx +eHx +eHx +eHx cAM cEP -cAK +eHx cAO -cAK -cAK +eHx +eHx coF cAP cHD -cAK -cAK -cAK +eHx +eHx +eHx cIc bXJ bYr @@ -133536,17 +131394,17 @@ cnR csD ctE csD -cwU -cwU +ezo +ePb cxv czo cwS czo cwS -cwS czo -cwT -cwT +cwS +cwU +cwU cwU cwT cmZ @@ -133688,31 +131546,31 @@ bLO aND bjm aZc -boV -boV +uQf +uQf aTn -bzH +mks bFf brb brd bcp -bzH -bzH +mks +mks cGQ -boV +uQf bRk -boV -boV +uQf +uQf cQO bxY -boV -boV +uQf +uQf bBg -boV -boV -boV -boV -boV +uQf +uQf +uQf +uQf +uQf bxY bTs bVb @@ -133721,9 +131579,9 @@ byi bTp cSM chC -bPV +gIA byR -bPV +gIA bQN bwJ bwJ @@ -133731,45 +131589,45 @@ cUi cBJ bDc bVK -cIM -cIM -cIM -cIM +fOO +fOO +fOO +fOO cIQ -cEX -cBw -bPV +dsE +hwC +gIA cBz -bPV +gIA chC bMo cBD -bPV -bPV -bPV -bPV +gIA +gIA +gIA +gIA cTT cTX cEQ chC -cBw +hwC cTZ -bPV +gIA bYG -cEX +dsE cvO cCy -bPV -bPV +gIA +gIA bXe -bZJ +mNk clO cak cbu cHJ cHN cHS -bZJ +mNk cdq cdS cdR @@ -133793,8 +131651,8 @@ ctw cjS ctF cmZ -cwT -cwT +cwU +cwU cwU cwT cwT @@ -134235,9 +132093,9 @@ bzJ bUl brA brY -bsC -bsC -bsC +urx +urx +urx buL bsg bsg @@ -134746,7 +132604,7 @@ cAf bpi bQc bHi -bVn +tkv brB bsa bsE @@ -134815,7 +132673,7 @@ cTH coS cnd cKO -cLc +dSS cqO crF csG @@ -135003,7 +132861,7 @@ aRj bpi bQb bFn -bVn +tkv brB bsa bsF @@ -135230,8 +133088,8 @@ aOc aOP aPD cym -aSc -aSc +rIV +rIV aUx aUB aWz @@ -135242,8 +133100,8 @@ baR baX bcb bel -ber -ber +ikz +ikz bgH bda cmq @@ -135329,7 +133187,7 @@ cng coY cpU cKQ -cLe +gTB cqP crI csG @@ -135531,7 +133389,7 @@ bxC bsE bzK brA -bvZ +eIr bCG brA bEt @@ -135586,7 +133444,7 @@ cdy cnf cdy cKQ -cLf +hcn coU crO csI @@ -135774,7 +133632,7 @@ aRj bpi cMW bHi -bVn +tkv brA bsc bsE @@ -135788,7 +133646,7 @@ bxD bDt bzL brA -bvZ +eIr bCH brA bEq @@ -135843,7 +133701,7 @@ cni cnf cof cKQ -cLg +wsH chu crJ csJ @@ -136100,7 +133958,7 @@ cNp cnf cof cKQ -cLe +gTB coW ciw csH @@ -136249,9 +134107,9 @@ aaa aaa aab aab -aJu +lNj aKl -aJu +lNj aLW aMT aNR @@ -136288,7 +134146,7 @@ bix bpi bQb bHi -bVn +tkv brB bsa bsH @@ -136357,7 +134215,7 @@ cnY cnf cpV cKQ -cLe +gTB coW cix csG @@ -136545,7 +134403,7 @@ aRj bpi bQb bFn -bVn +tkv brB bsa bsH @@ -136614,7 +134472,7 @@ cmu cnf csx cKQ -cLe +gTB coX crG csI @@ -136802,7 +134660,7 @@ aQz bpi bQf bJS -bVn +tkv brB bsa bsH @@ -136871,7 +134729,7 @@ cmu cnf csx cKQ -cLg +wsH cpS crN csJ @@ -137035,8 +134893,8 @@ aVz aUH aXz aYL -aWF -aWF +eqe +eqe baT bpG aUH @@ -137059,7 +134917,7 @@ ccA bpi bQb bFn -bVn +tkv brA bse bsH @@ -137128,7 +134986,7 @@ cdy cnf cdy cNY -cLf +hcn cqQ cta csK @@ -137277,9 +135135,9 @@ aab aab aab aab -aJx +lLo aKn -aJx +lLo aLZ aMT aNR @@ -137385,7 +135243,7 @@ cnZ cpa cuo cKQ -cLf +hcn cqP ctb csG @@ -138156,7 +136014,7 @@ cdx cdx cvj cKQ -cLc +dSS cgB crR ctH @@ -138347,12 +136205,12 @@ bqB bnL brE bsh -bpS -bpS +pHw +pHw bua blZ bvv -bvZ +eIr brA aaA aaA @@ -138413,7 +136271,7 @@ cdy cdy cdy cKQ -cLc +dSS cqV crS csN @@ -138927,7 +136785,7 @@ cXh cpc cpc cKQ -cLc +dSS cqV crU cdy @@ -139184,7 +137042,7 @@ cMg cpd cpc cKT -cLc +dSS cqV crV cdy @@ -139372,9 +137230,9 @@ boI bpk bpN bqF -bqK -bpo -bnM +reY +hMI +eXk bsL bnL bue @@ -139441,7 +137299,7 @@ coe cpc cpc cKT -cLc +dSS cqV cOf cdy @@ -139698,7 +137556,7 @@ cXi cpc cpc cKQ -cLc +dSS cqV crU ccS @@ -139879,19 +137737,19 @@ aac aaa aab bma -bmU +jqb bnL bot -boK +eec bpl bip bqH brn brG -bsj +fow bsL bnL -boK +eec bma aaa aaa @@ -139955,7 +137813,7 @@ coH cpQ cdy cKU -cLc +dSS cqV crV cgF @@ -140136,19 +137994,19 @@ aac aaa aab bma -bmU +jqb bnL bot -boK +eec bpm bpQ bnL bro bpm -bsj +fow bsL bnL -boK +eec bma aaa aaa @@ -140212,7 +138070,7 @@ cdy cdy cdy cKQ -cLc +dSS cqX crU cgF @@ -140365,7 +138223,7 @@ aJy aKo aNa aMf -aMZ +vPQ aPy aNa aQq @@ -140405,7 +138263,7 @@ blZ bsk bsL bnL -boK +eec bma aaa aaa @@ -140622,7 +138480,7 @@ aJz aKp aLm aMe -aMZ +vPQ aOb aNa aQq @@ -140654,11 +138512,11 @@ bmW bnL bot boL -bpn -bpS -bpS -bpS -bpn +kDs +pHw +pHw +pHw +kDs bsl bsL bnL @@ -140908,7 +138766,7 @@ aac aav bma bmX -bnM +eXk btm bnL bnL @@ -140983,7 +138841,7 @@ cdx cdx cvj cKX -cLc +dSS cra crX csP @@ -141168,12 +139026,12 @@ bmY cMV bnL boM -bpo +hMI bnL -bqK +reY bnL -bpo -bnM +hMI +eXk bnL btu bui @@ -141422,17 +139280,17 @@ aaa aab aab bma -bnO +uJe bov -boN +phO cHm bpT bqL brq cHm -bnO +uJe bov -boN +phO bma aab aaa @@ -142530,9 +140388,9 @@ cre csb csT ctR -cuL +cuN cvv -cuL +cuN cwz cnp cnp diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index 6604811d34..c9e03389f1 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -71,6 +71,11 @@ #define MUT_EXTRA 2 #define MUT_OTHER 3 +//species use_skintones defines +#define NO_SKINTONES 0 +#define USE_SKINTONES 1 +#define USE_SKINTONES_GRAYSCALE_CUSTOM 2 //adds a "_g" suffix to limb overlays icon states if the skin_tone is a custom one. + //DNA - Because fuck you and your magic numbers being all over the codebase. #define DNA_BLOCK_SIZE 3 @@ -132,8 +137,9 @@ #define NOGENITALS 21 //Cannot create, use, or otherwise have genitals #define MATRIXED 22 //if icon is color matrix'd #define SKINTONE 23 //uses skin tones -#define HORNCOLOR 24 -#define WINGCOLOR 25 +#define CUSTOM_SKINTONE 24 //adds a "_g" suffix to bodypart overlays icon states if a custom skintone is used. +#define HORNCOLOR 25 +#define WINGCOLOR 26 //organ slots #define ORGAN_SLOT_BRAIN "brain" diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm index 72e6a12f84..a347fd7327 100644 --- a/code/__DEFINES/food.dm +++ b/code/__DEFINES/food.dm @@ -18,3 +18,4 @@ #define DRINK_VERYGOOD 3 #define DRINK_FANTASTIC 4 #define FOOD_AMAZING 5 +#define RACE_DRINK 6 \ No newline at end of file diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index f42d199d0d..b8fe76fb1d 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -139,6 +139,7 @@ #define STYLE_PAW_TAURIC (1<<3) #define STYLE_HOOF_TAURIC (1<<4) #define STYLE_ALL_TAURIC (STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC|STYLE_HOOF_TAURIC) +#define STYLE_NO_ANTHRO_ICON (1<<5) //When digis fit the default sprite fine and need no copypasted states. This is the case of skirts and winter coats, for example. //digitigrade legs settings. #define NOT_DIGITIGRADE 0 diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 4be0985fbc..439583c859 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -67,10 +67,15 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list( #define iscatperson(A) (ishumanbasic(A) && istype(A.dna.species, /datum/species/human/felinid) ) #define isdwarf(A) (is_species(A, /datum/species/dwarf)) #define isdullahan(A) (is_species(A, /datum/species/dullahan)) -#define isvampire(A) (is_species(A,/datum/species/vampire)) +#define isangel(A) (is_species(A, /datum/species/angel)) +#define isvampire(A) (is_species(A, /datum/species/vampire)) +#define ismush(A) (is_species(A, /datum/species/mush)) +#define isshadow(A) (is_species(A, /datum/species/shadow)) +#define isskeleton(A) (is_species(A, /datum/species/skeleton)) // Citadel specific species #define isipcperson(A) (is_species(A, /datum/species/ipc)) +#define issynthliz(A) (is_species(A, /datum/species/synthliz)) #define ismammal(A) (is_species(A, /datum/species/mammal)) #define isavian(A) (is_species(A, /datum/species/avian)) #define isaquatic(A) (is_species(A, /datum/species/aquatic)) diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index e022c10007..2827e40120 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -262,24 +262,30 @@ if(!findname(.)) break -/proc/random_skin_tone() - return pick(GLOB.skin_tones) +#define SKINTONE2HEX(skin_tone) GLOB.skin_tones[skin_tone] || skin_tone +/proc/random_skin_tone() + return pick(GLOB.skin_tones - GLOB.nonstandard_skin_tones) + +//ordered by amount of tan. Keep the nonstandard skin tones last. GLOBAL_LIST_INIT(skin_tones, list( - "albino", - "caucasian1", - "caucasian2", - "caucasian3", - "latino", - "mediterranean", - "asian1", - "asian2", - "arab", - "indian", - "african1", - "african2" + "albino" = "#fff4e6", + "caucasian1" = "#ffe0d1", + "caucasian2" = "#fcccb3", + "caucasian3" = "#e8b59b", + "latino" = "#d9ae96", + "mediterranean" = "#c79b8b", + "asian1" = "#ffdeb3", + "asian2" = "#e3ba84", + "arab" = "#c4915e", + "indian" = "#b87840", + "african1" = "#754523", + "african2" = "#471c18", + "orange" = "#ffc905" //Spray tan overdose. )) +GLOBAL_LIST_INIT(nonstandard_skin_tones, list("orange")) + GLOBAL_LIST_EMPTY(species_list) /proc/age2agedescription(age) diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index e825233bca..f85503a678 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -34,7 +34,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list( /obj/item/clothing/head/that = 1, /obj/item/clothing/head/ushanka = 1, /obj/item/clothing/head/welding = 1, - /obj/item/clothing/mask/gas = 15, + /obj/effect/spawner/lootdrop/breathing_masks = 15, /obj/item/clothing/suit/hazardvest = 1, /obj/item/clothing/under/misc/vice_officer = 1, /obj/item/clothing/suit/hooded/flashsuit = 2, @@ -86,9 +86,8 @@ GLOBAL_LIST_INIT(maintenance_loot, list( /obj/item/screwdriver = 3, /obj/item/tank/internals/emergency_oxygen = 2, /obj/item/vending_refill/cola = 1, - /obj/item/weldingtool = 3, - /obj/item/wirecutters = 1, - /obj/item/wrench = 4, + /obj/effect/spawner/lootdrop/welder_tools = 3, + /obj/effect/spawner/lootdrop/low_tools = 5, /obj/item/relic = 3, /obj/item/weaponcrafting/receiver = 2, /obj/item/clothing/head/cone = 2, diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index 63e3f489bd..bff3fade61 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -475,3 +475,7 @@ /datum/config_entry/number/body_size_slowdown_multiplier config_entry_value = 0.25 min_val = 0.1 //To encourage folks to disable the slowdown through the above config instead. + +//Allows players to set a hexadecimal color of their choice as skin tone, on top of the standard ones. +/datum/config_entry/number/allow_custom_skintones + config_entry_value = 1 diff --git a/code/datums/components/crafting/recipes/recipes_clothing.dm b/code/datums/components/crafting/recipes/recipes_clothing.dm index b9e3c379b4..6fc84409e4 100644 --- a/code/datums/components/crafting/recipes/recipes_clothing.dm +++ b/code/datums/components/crafting/recipes/recipes_clothing.dm @@ -39,6 +39,30 @@ time = 10 reqs = list(/obj/item/paper = 20) category = CAT_CLOTHING + +/datum/crafting_recipe/armwraps + name = "armwraps" + result = /obj/item/clothing/gloves/fingerless/pugilist + time = 60 + tools = list(TOOL_WIRECUTTER) + reqs = list(/obj/item/stack/sheet/cloth = 4, + /obj/item/stack/sheet/silk = 2, + /obj/item/stack/sheet/leather = 2) + category = CAT_CLOTHING + +/datum/crafting_recipe/armwrapsplusone + name = "armwraps of mighty fists" + result = /obj/item/clothing/gloves/fingerless/pugilist/magic + time = 300 + tools = list(TOOL_WIRECUTTER, /obj/item/book/codex_gigas, /obj/item/clothing/head/wizard, /obj/item/clothing/suit/wizrobe) + reqs = list(/obj/item/stack/sheet/cloth = 2, + /obj/item/stack/sheet/leather = 2, + /obj/item/stack/sheet/durathread = 2, + /datum/reagent/consumable/ethanol/sake = 100, + /datum/reagent/consumable/ethanol/wizz_fizz = 100, + /obj/item/stack/sheet/sinew = 1, + /obj/item/stack/sheet/mineral/gold = 50) + category = CAT_CLOTHING //////// //Huds// diff --git a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm index aa3f2d3969..b037f02f80 100644 --- a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm +++ b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm @@ -298,7 +298,7 @@ subcategory = CAT_AMMO /datum/crafting_recipe/ashen_arrow - name = "Fire Hardened Arrow" + name = "Ashen Arrow" result = /obj/item/ammo_casing/caseless/arrow/ash tools = list(TOOL_WELDER) time = 30 diff --git a/code/datums/dna.dm b/code/datums/dna.dm index 1c866ea535..e08d5c509c 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -17,6 +17,7 @@ var/mutation_index[DNA_MUTATION_BLOCKS] //List of which mutations this carbon has and its assigned block var/stability = 100 var/scrambled = FALSE //Did we take something like mutagen? In that case we cant get our genes scanned to instantly cheese all the powers. + var/skin_tone_override //because custom skin tones are not found in the skin_tones global list. /datum/dna/New(mob/living/new_holder) if(istype(new_holder)) @@ -45,6 +46,7 @@ destination.dna.unique_enzymes = unique_enzymes destination.dna.uni_identity = uni_identity destination.dna.blood_type = blood_type + destination.dna.skin_tone_override = skin_tone_override destination.set_species(species.type, icon_update=0) destination.dna.features = features.Copy() destination.dna.real_name = real_name @@ -66,6 +68,7 @@ new_dna.mutation_index = mutation_index new_dna.uni_identity = uni_identity new_dna.blood_type = blood_type + new_dna.skin_tone_override = skin_tone_override new_dna.features = features.Copy() new_dna.species = new species.type new_dna.real_name = real_name @@ -262,10 +265,11 @@ return /datum/dna/proc/is_same_as(datum/dna/D) - if(uni_identity == D.uni_identity && mutation_index == D.mutation_index && real_name == D.real_name && nameless == D.nameless && custom_species == D.custom_species) - if(species.type == D.species.type && features == D.features && blood_type == D.blood_type) - return 1 - return 0 + if(uni_identity != D.uni_identity || mutation_index != D.mutation_index || real_name != D.real_name || nameless != D.nameless || custom_species != D.custom_species) + return FALSE + if(species.type != D.species.type || features != D.features || blood_type != D.blood_type || skin_tone_override != D.skin_tone_override) + return FALSE + return TRUE /datum/dna/proc/update_instability(alert=TRUE) stability = 100 @@ -430,7 +434,7 @@ var/structure = dna.uni_identity hair_color = sanitize_hexcolor(getblock(structure, DNA_HAIR_COLOR_BLOCK)) facial_hair_color = sanitize_hexcolor(getblock(structure, DNA_FACIAL_HAIR_COLOR_BLOCK)) - skin_tone = GLOB.skin_tones[deconstruct_block(getblock(structure, DNA_SKIN_TONE_BLOCK), GLOB.skin_tones.len)] + skin_tone = dna.skin_tone_override || GLOB.skin_tones[deconstruct_block(getblock(structure, DNA_SKIN_TONE_BLOCK), GLOB.skin_tones.len)] eye_color = sanitize_hexcolor(getblock(structure, DNA_EYE_COLOR_BLOCK)) facial_hair_style = GLOB.facial_hair_styles_list[deconstruct_block(getblock(structure, DNA_FACIAL_HAIR_STYLE_BLOCK), GLOB.facial_hair_styles_list.len)] hair_style = GLOB.hair_styles_list[deconstruct_block(getblock(structure, DNA_HAIR_STYLE_BLOCK), GLOB.hair_styles_list.len)] diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm index 39fac11129..4b19ae25ca 100644 --- a/code/datums/martial/cqc.dm +++ b/code/datums/martial/cqc.dm @@ -168,24 +168,29 @@ return FALSE add_to_streak("D",D) var/obj/item/I = null - var/damage = (damage_roll(A,D)*0.5) + var/damage = damage_roll(A,D) + var/stunthreshold = A.dna.species.punchstunthreshold if(check_streak(A,D)) return TRUE - if(prob(65)) - if(CHECK_MOBILITY(D, MOBILITY_MOVE) || !restraining) + if(CHECK_MOBILITY(D, MOBILITY_MOVE) || !restraining) + A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) + if(damage >= stunthreshold) I = D.get_active_held_item() D.visible_message("[A] strikes [D]'s jaw with their hand!", \ - "[A] strikes your jaw, disorienting you!") + "[A] strikes your jaw, disorienting you!") playsound(get_turf(D), 'sound/weapons/cqchit1.ogg', 50, 1, -1) - if(I && D.temporarilyRemoveItemFromInventory(I)) - A.put_in_hands(I) + D.drop_all_held_items() D.Jitter(2) - D.apply_damage(damage, BRUTE) - else - D.visible_message("[A] attempted to disarm [D]!", \ - "[A] attempted to disarm [D]!") - playsound(D, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - log_combat(A, D, "disarmed (CQC)", "[I ? " grabbing \the [I]" : ""]") + D.Dizzy(damage) + D.apply_damage(damage*2 + 20, STAMINA) + D.apply_damage(damage*0.5, BRUTE) + else + D.visible_message("[A] strikes [D] in the chest!", \ + "[A] strikes in chest!") + playsound(D, 'sound/weapons/cqchit1.ogg', 25, 1, -1) + D.apply_damage(damage + 15, STAMINA) + D.apply_damage(damage*0.5, BRUTE) + log_combat(A, D, "disarmed (CQC)", "[I ? " grabbing \the [I]" : ""]") if(restraining && A.pulling == D) log_combat(A, D, "knocked out (Chokehold)(CQC)") D.visible_message("[A] puts [D] into a chokehold!", \ diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm index df42fba07d..6b3e2d3dc8 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -98,13 +98,13 @@ /datum/martial_art/krav_maga/proc/leg_sweep(mob/living/carbon/human/A, mob/living/carbon/human/D) var/obj/item/bodypart/affecting = D.get_bodypart(BODY_ZONE_CHEST) var/armor_block = D.run_armor_check(affecting, "melee") - var/damage = damage_roll(A,D) + var/damage = (damage_roll(A,D)*2 + 25) if(!CHECK_MOBILITY(D, MOBILITY_STAND)) return FALSE D.visible_message("[A] leg sweeps [D]!", \ "[A] leg sweeps you!") playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1) - D.apply_damage(damage + 25, STAMINA, affecting, armor_block) + D.apply_damage(damage, STAMINA, affecting, armor_block) D.DefaultCombatKnockdown(80, override_hardstun = 1, override_stamdmg = 0) log_combat(A, D, "leg sweeped") return TRUE @@ -165,14 +165,15 @@ return TRUE var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected)) var/armor_block = D.run_armor_check(affecting, "melee") - var/damage = (damage_roll(A,D)*2) - if(D.mobility_flags & MOBILITY_STAND) + var/damage = damage_roll(A,D) + var/stunthreshold = A.dna.species.punchstunthreshold + if(CHECK_MOBILITY(D, MOBILITY_STAND)) D.visible_message("[A] reprimands [D]!", \ "You're slapped by [A]!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) to_chat(A, "You jab [D]!") A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) playsound(D, 'sound/effects/hit_punch.ogg', 50, TRUE, -1) - D.apply_damage(damage + 5, STAMINA, affecting, armor_block) + D.apply_damage(damage*2 + 15, STAMINA, affecting, armor_block) log_combat(A, D, "punched nonlethally") else D.visible_message("[A] reprimands [D]!", \ @@ -180,11 +181,12 @@ to_chat(A, "You stomp [D]!") A.do_attack_animation(D, ATTACK_EFFECT_KICK) playsound(D, 'sound/effects/hit_punch.ogg', 50, TRUE, -1) - D.apply_damage(damage + 10, STAMINA, affecting, armor_block) + D.apply_damage(damage*2 + 20, STAMINA, affecting, armor_block) log_combat(A, D, "stomped nonlethally") - if(prob(D.getStaminaLoss())) + if(damage >= stunthreshold) D.visible_message("[D] sputters and recoils in pain!", "You recoil in pain as you are jabbed in a nerve!") D.drop_all_held_items() + return TRUE //Krav Maga Gloves diff --git a/code/datums/martial/rising_bass.dm b/code/datums/martial/rising_bass.dm index 2d760fc10a..087867a9c1 100644 --- a/code/datums/martial/rising_bass.dm +++ b/code/datums/martial/rising_bass.dm @@ -1,5 +1,5 @@ -#define REPULSE_PUNCH_COMBO "HDHD" -#define SHOULDER_FLIP_COMBO "GHDGHH" +#define REPULSE_PUNCH_COMBO "HDD" +#define SHOULDER_FLIP_COMBO "DHDHG" #define FOOT_SMASH_COMBO "HH" #define SIDE_KICK_COMBO "skick" #define DEFT_SWITCH_COMBO "deft" @@ -37,7 +37,6 @@ return FALSE -//Repulse Punch - Slams the opponent far away from you. /datum/action/risingbassmove name = "" icon_icon = 'icons/mob/actions/actions_items.dmi' @@ -89,7 +88,7 @@ "[A] kicks you in the side, forcing you to step away!") playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1) D.apply_damage(damage, BRUTE, BODY_ZONE_CHEST) - D.DefaultCombatKnockdown(60) + D.DefaultCombatKnockdown(60, override_hardstun = 1, override_stamdmg = damage) var/L = !checkfordensity(H,D) ? (!checkfordensity(K,D) ? D.loc : K) : H D.forceMove(L) log_combat(A, D, "side kicked (Rising Bass)") @@ -97,24 +96,25 @@ return TRUE /datum/martial_art/the_rising_bass/proc/shoulderFlip(mob/living/carbon/human/A, mob/living/carbon/human/D) - var/damage = (damage_roll(A,D) + 25) - if(CHECK_MOBILITY(D, MOBILITY_STAND)) - var/turf/H = get_step(A, get_dir(D,A)) - var/L = checkfordensity(H,D) ? H : A.loc - A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) - D.visible_message("[A] flips [D] over their shoulder, slamming them into the ground!", \ - "[A] flips you over their shoulder, slamming you into the ground!") - playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - D.emote("scream") - D.apply_damage(damage, BRUTE, BODY_ZONE_CHEST) - D.apply_damage(damage, BRUTE, BODY_ZONE_HEAD) + var/damage = damage_roll(A,D) + var/stunthreshold = A.dna.species.punchstunthreshold + var/turf/H = get_step(A, get_dir(D,A)) + var/L = checkfordensity(H,D) ? H : A.loc + A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) + D.visible_message("[A] flips [D] over their shoulder, slamming them into the ground!", \ + "[A] flips you over their shoulder, slamming you into the ground!") + playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + D.emote("scream") + D.apply_damage(damage + 10, BRUTE, BODY_ZONE_CHEST) + D.apply_damage(damage + 10, BRUTE, BODY_ZONE_HEAD) + if(damage >= stunthreshold) D.Sleeping(60) - D.DefaultCombatKnockdown(300) - D.forceMove(L) - log_combat(A, D, "shoulder flipped (Rising Bass)") - return TRUE - return FALSE + D.DefaultCombatKnockdown(300, override_hardstun = 1, override_stamdmg = 50) + D.forceMove(L) + log_combat(A, D, "shoulder flipped (Rising Bass)") + return TRUE +//Repulse Punch - Slams the opponent far away from you. /datum/martial_art/the_rising_bass/proc/repulsePunch(mob/living/carbon/human/A, mob/living/carbon/human/D) var/damage = damage_roll(A,D) if(CHECK_MOBILITY(D, MOBILITY_STAND) && repulsecool < world.time) @@ -125,7 +125,8 @@ var/atom/F = get_edge_target_turf(D, get_dir(A, get_step_away(D, A))) D.throw_at(F, 10, 1) D.apply_damage(damage, BRUTE, BODY_ZONE_CHEST) - D.DefaultCombatKnockdown(90) + D.DefaultCombatKnockdown(90, override_hardstun = 1, override_stamdmg = damage*2) + D.confused += min(damage, 20) log_combat(A, D, "repulse punched (Rising Bass)") repulsecool = world.time + 3 SECONDS return TRUE @@ -162,7 +163,23 @@ add_to_streak("D",D) if(check_streak(A,D)) return TRUE - return ..() + var/damage = damage_roll(A,D) + var/stunthreshold = A.dna.species.punchstunthreshold + A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) + if(CHECK_MOBILITY(D, MOBILITY_STAND) && damage >= stunthreshold) + D.visible_message("[A] trips [D]!", \ + "You're tripped by [A]!", "You hear something thump against the floor!", COMBAT_MESSAGE_RANGE, A) + to_chat(A, "You trip [D]!") + D.DefaultCombatKnockdown(10, override_hardstun = 0.01, override_stamdmg = damage) + D.Dizzy(damage) + else + D.visible_message("[A] jabs [D] in the stomach!", \ + "You're jabbed in the stomach by [A]!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) + to_chat(A, "You jab [D] in the stomach!") + D.apply_damage(damage*2 + 10, STAMINA) + D.disgust = min(damage, 20) + playsound(D, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + return TRUE /datum/martial_art/the_rising_bass/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) add_to_streak("H",D) @@ -203,9 +220,9 @@ to_chat(usr, "You retreat inward and recall the teachings of the Rising Bass...") to_chat(usr, "Side Kick: Forces opponent to step to the side.") - to_chat(usr, "Shoulder Flip: Grab Harm Disarm Grab Harm Harm. Flips opponent over your shoulder and stuns.") - to_chat(usr, "Repulse Punch: Harm Disarm Harm Disarm. Slams the opponent far away from you.") - to_chat(usr, "Foot Smash: Harm Harm. Stuns opponent, minor damage.") + to_chat(usr, "Shoulder Flip: Disarm Harm Disarm Harm Grab. Flips opponent over your shoulder and stuns.") + to_chat(usr, "Repulse Punch: Harm Disarm Disarm. Slams the opponent far away from you.") + to_chat(usr, "Foot Smash: Harm Harm. Knocks opponent prone, minor damage.") to_chat(usr, "Deft Switch: Switches the opponent's held item for your own. Most useful with nothing in your hand.") /datum/martial_art/the_rising_bass/teach(mob/living/carbon/human/H, make_temporary = FALSE) diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 527ee01206..ae5fa98acb 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -23,7 +23,7 @@ return TRUE return FALSE -///Gnashing Teeth: Harm Harm, consistent 20 force punch on every second harm punch, has a chance to crit +///Gnashing Teeth: Harm Harm, high force punch on every second harm punch, has a chance to crit for near triple damage /datum/martial_art/the_sleeping_carp/proc/strongPunch(mob/living/carbon/human/A, mob/living/carbon/human/D) ///this var is so that the strong punch is always aiming for the body part the user is targeting and not trying to apply to the chest before deviating var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected)) @@ -44,7 +44,7 @@ playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, TRUE, -1) log_combat(A, D, "strong punched (Sleeping Carp)")//so as to not double up on logging D.apply_damage((damage + 15) + crit_damage, BRUTE, affecting) - return + return TRUE ///Crashing Wave Kick: Harm Disarm combo, throws people seven tiles backwards /datum/martial_art/the_sleeping_carp/proc/launchKick(mob/living/carbon/human/A, mob/living/carbon/human/D) @@ -57,7 +57,7 @@ D.throw_at(throw_target, 7, 14, A) D.apply_damage(damage, BRUTE, BODY_ZONE_CHEST) log_combat(A, D, "launchkicked (Sleeping Carp)") - return + return TRUE ///Keelhaul: Harm Grab combo, knocks people down, deals stamina damage while they're on the floor /datum/martial_art/the_sleeping_carp/proc/dropKick(mob/living/carbon/human/A, mob/living/carbon/human/D) @@ -77,7 +77,7 @@ D.visible_message("[A] kicks [D] in the head!", \ "You are kicked in the head by [A]!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) log_combat(A, D, "dropkicked (Sleeping Carp)") - return + return TRUE /datum/martial_art/the_sleeping_carp/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D) add_to_streak("G",D) @@ -89,6 +89,7 @@ /datum/martial_art/the_sleeping_carp/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) add_to_streak("H",D) var/damage = (damage_roll(A,D) + 5) + var/stunthreshold = A.dna.species.punchstunthreshold if(check_streak(A,D)) return TRUE var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected)) @@ -99,6 +100,9 @@ to_chat(A, "You [atk_verb] [D]!") D.apply_damage(damage, BRUTE, affecting) playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, TRUE, -1) + if(CHECK_MOBILITY(D, MOBILITY_STAND) && damage >= stunthreshold) + to_chat(D, "You stumble and fall!") + D.DefaultCombatKnockdown(10, override_hardstun = 0.01, override_stamdmg = damage) log_combat(A, D, "punched (Sleeping Carp)") return TRUE diff --git a/code/datums/mood_events/drink_events.dm b/code/datums/mood_events/drink_events.dm index 70acffdb8f..4107fd7380 100644 --- a/code/datums/mood_events/drink_events.dm +++ b/code/datums/mood_events/drink_events.dm @@ -23,6 +23,11 @@ mood_change = 4 timeout = 2 MINUTES +/datum/mood_event/race_drink + description = "That drink was made for me!\n" + mood_change = 6 + timeout = 5 MINUTES + /datum/mood_event/amazingtaste description = "Amazing taste!\n" mood_change = 50 //Is this not really high..? diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index f78a05244e..2d9880578c 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -55,7 +55,7 @@ /obj/item/stack/tile/fakespace/loaded = ARCADE_WEIGHT_TRICK, /obj/item/stack/tile/fakepit/loaded = ARCADE_WEIGHT_TRICK, /obj/item/restraints/handcuffs/fake = ARCADE_WEIGHT_TRICK, - /obj/item/clothing/gloves/fingerless/pugilist/rapid/hug = ARCADE_WEIGHT_TRICK, + /obj/item/clothing/gloves/fingerless/pugilist/hug = ARCADE_WEIGHT_TRICK, /obj/item/grenade/chem_grenade/glitter/pink = ARCADE_WEIGHT_TRICK, /obj/item/grenade/chem_grenade/glitter/blue = ARCADE_WEIGHT_TRICK, diff --git a/code/game/objects/effects/spawners/gibspawner.dm b/code/game/objects/effects/spawners/gibspawner.dm index c135458873..231c1465cd 100644 --- a/code/game/objects/effects/spawners/gibspawner.dm +++ b/code/game/objects/effects/spawners/gibspawner.dm @@ -37,7 +37,7 @@ if(ishuman(source_mob)) var/mob/living/carbon/human/H = source_mob if(H.dna.species.use_skintones) - body_coloring = "#[skintone2hex(H.skin_tone)]" + body_coloring = SKINTONE2HEX(H.skin_tone) else body_coloring = "#[H.dna.features["mcolor"]]" @@ -49,7 +49,7 @@ H.set_species(gib_mob_species) dna_to_add = temp_mob.get_blood_dna_list() if(H.dna.species.use_skintones) - body_coloring = "#[skintone2hex(H.skin_tone)]" + body_coloring = SKINTONE2HEX(H.skin_tone) else body_coloring = "#[H.dna.features["mcolor"]]" else diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index cef0b86c34..2cdf57bf70 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -264,7 +264,6 @@ LAZYSET(loot, M, our_chance) return ..() - // Tech storage circuit board spawners // For these, make sure that lootcount equals the number of list items @@ -526,6 +525,105 @@ /obj/item/clothing/shoes/sneakers/noslip = 10 ) +/obj/effect/spawner/lootdrop/low_tools + name = "random basic tool(s) spawner" + lootcount = 1 + loot = list( + /obj/item/screwdriver = 1, + /obj/item/wrench = 1, + /obj/item/weldingtool/mini = 1, + /obj/item/crowbar = 1, + /obj/item/wirecutters = 1, + /obj/item/analyzer = 1, + /obj/item/t_scanner = 1 + ) + +/obj/effect/spawner/lootdrop/high_tools + name = "random adv tool(s) spawner" + lootcount = 1 + loot = list( + /obj/item/screwdriver/power = 1, + /obj/item/weldingtool/experimental = 1, + /obj/item/crowbar/power = 1, + /obj/item/analyzer = 1, + /obj/item/multitool = 1 + ) + +/obj/effect/spawner/lootdrop/welder_tools + name = "random safe welder tool(s) spawner" + lootcount = 1 + loot = list( + /obj/item/weldingtool = 1, + /obj/item/weldingtool/mini = 1, + /obj/item/weldingtool/hugetank = 1, + /obj/item/weldingtool/largetank = 1 + ) + +/obj/effect/spawner/lootdrop/tool_box + name = "random safe tool box(es) spawner" + lootcount = 1 + loot = list( + /obj/item/storage/toolbox/mechanical = 1, + /obj/item/storage/toolbox/mechanical/old = 1, + /obj/item/storage/toolbox/emergency = 1, + /obj/item/storage/toolbox/emergency/old = 1, + /obj/item/storage/toolbox/electrical = 1, + /obj/item/storage/toolbox/syndicate = 1, + /obj/item/storage/toolbox/artistic = 1, + /obj/item/storage/toolbox/gold_fake = 1, + /obj/item/storage/toolbox/rubber = 1 + ) + +/obj/effect/spawner/lootdrop/healing_kits + name = "random safe medical kit(s) spawner" + lootcount = 1 + loot = list( + /obj/item/storage/firstaid/regular = 1, + /obj/item/storage/firstaid/ancient = 1, + /obj/item/storage/firstaid/fire = 1, + /obj/item/storage/firstaid/toxin = 1, + /obj/item/storage/firstaid/radbgone = 1, + /obj/item/storage/firstaid/o2 = 1, + /obj/item/storage/firstaid/brute = 1 + ) + +/obj/effect/spawner/lootdrop/breathing_tanks + name = "random internal tank(s) spawner" + lootcount = 1 + loot = list( + /obj/item/tank/internals/oxygen = 1, + /obj/item/tank/internals/oxygen/yellow = 1, + /obj/item/tank/internals/oxygen/red = 1, + /obj/item/tank/internals/air = 1, + /obj/item/tank/internals/plasmaman = 1, + /obj/item/tank/internals/plasmaman/belt = 1, + /obj/item/tank/internals/emergency_oxygen = 1, + /obj/item/tank/internals/emergency_oxygen/engi = 1, + /obj/item/tank/internals/emergency_oxygen/double = 1 + ) + +/obj/effect/spawner/lootdrop/breathing_masks + name = "random internal mask(s) spawner" + lootcount = 1 + loot = list( + /obj/item/clothing/mask/gas = 2, + /obj/item/clothing/mask/gas/glass = 4, + /obj/item/clothing/mask/breath = 5, + /obj/item/clothing/mask/breath/medical = 1 + ) + +/obj/effect/spawner/lootdrop/welder_tools/no_turf + spawn_on_turf = FALSE + +/obj/effect/spawner/lootdrop/low_tools/no_turf + spawn_on_turf = FALSE + +/obj/effect/spawner/lootdrop/breathing_tanks/no_turf + spawn_on_turf = FALSE + +/obj/effect/spawner/lootdrop/breathing_masks/no_turf + spawn_on_turf = FALSE + /obj/effect/spawner/lootdrop/coin/no_turf spawn_on_turf = FALSE diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 22769b05b1..5c80b81ba5 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -19,9 +19,12 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) ///Icon file for mob worn overlays. ///no var for state because it should *always* be the same as icon_state var/icon/mob_overlay_icon - //Forced mob worn layer instead of the standard preferred ssize. + //Forced mob worn layer instead of the standard preferred size. var/alternate_worn_layer + var/icon/anthro_mob_worn_overlay //Version of the above dedicated to muzzles/digitigrade + var/icon/taur_mob_worn_overlay // Idem but for taurs. Currently only used by suits. + var/list/alternate_screams = list() //REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE //Dimensions of the icon file used when this item is worn, eg: hats.dmi diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 890a17e52c..fe6452ecc0 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -245,7 +245,7 @@ /obj/machinery/vending/autodrobe = "AutoDrobe", /obj/machinery/vending/assist = "\improper Vendomat", /obj/machinery/vending/engivend = "\improper Engi-Vend", - /obj/machinery/vending/engivend = "\improper YouTool", + /obj/machinery/vending/tool = "\improper YouTool", /obj/machinery/vending/sustenance = "\improper Sustenance Vendor", /obj/machinery/vending/dinnerware = "\improper Plasteel Chef's Dinnerware Vendor", /obj/machinery/vending/cart = "\improper PTech", diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index ac60a322d8..c262920ec5 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -187,6 +187,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS allowed = list(/obj/item/storage/book/bible, HOLY_WEAPONS, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) hoodtype = /obj/item/clothing/head/hooded/chaplain_hood + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/head/hooded/chaplain_hood name = "follower hood" diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm index 136d58ba41..ba73bbc187 100644 --- a/code/game/objects/items/religion.dm +++ b/code/game/objects/items/religion.dm @@ -189,6 +189,7 @@ slowdown = 2.0 //gotta pretend we're balanced. body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 40, "bomb" = 60, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60) + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/armor/plate/crusader/red icon_state = "crusader-red" diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index a8f3dc0676..9ed2fbdeb5 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -26,7 +26,7 @@ if (prob(40)) new /obj/item/storage/toolbox/emergency(src) - switch (pickweight(list("small" = 40, "aid" = 25, "tank" = 20, "both" = 10, "nothing" = 5))) + switch (pickweight(list("small" = 35, "aid" = 25, "tank" = 20, "both" = 10, "nothing" = 5, "rng" = 5))) if ("small") new /obj/item/tank/internals/emergency_oxygen(src) new /obj/item/tank/internals/emergency_oxygen(src) @@ -49,6 +49,12 @@ if ("nothing") // doot + if ("rng") + new /obj/effect/spawner/lootdrop/breathing_tanks/no_turf(src) + new /obj/effect/spawner/lootdrop/breathing_tanks/no_turf(src) + new /obj/effect/spawner/lootdrop/breathing_masks/no_turf(src) + new /obj/effect/spawner/lootdrop/breathing_masks/no_turf(src) + return /* @@ -100,13 +106,15 @@ if(prob(70)) new /obj/item/wrench(src) if(prob(70)) - new /obj/item/weldingtool(src) + new /obj/effect/spawner/lootdrop/welder_tools/no_turf(src) if(prob(70)) new /obj/item/crowbar(src) if(prob(70)) new /obj/item/wirecutters(src) if(prob(70)) new /obj/item/t_scanner(src) + if(prob(70)) + new /obj/effect/spawner/lootdrop/low_tools/no_turf(src) //Spare random basic tool if(prob(20)) new /obj/item/storage/belt/utility(src) if(prob(30)) diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index e5ca09c7b8..be783f387e 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -158,11 +158,24 @@ H.set_species(newrace, icon_update=0) if(H.dna.species.use_skintones) - var/new_s_tone = input(user, "Choose your skin tone:", "Race change") as null|anything in GLOB.skin_tones - + var/list/choices = GLOB.skin_tones + if(CONFIG_GET(number/allow_custom_skintones)) + choices += "custom" + var/new_s_tone = input(H, "Choose your skin tone:", "Race change") as null|anything in choices if(new_s_tone) - H.skin_tone = new_s_tone - H.dna.update_ui_block(DNA_SKIN_TONE_BLOCK) + if(new_s_tone == "custom") + var/default = H.dna.skin_tone_override || null + var/custom_tone = input(user, "Choose your custom skin tone:", "Race change", default) as color|null + if(custom_tone) + var/temp_hsv = RGBtoHSV(new_s_tone) + if(ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) + to_chat(H,"Invalid color. Your color is not bright enough.") + else + H.skin_tone = custom_tone + H.dna.skin_tone_override = custom_tone + else + H.skin_tone = new_s_tone + H.dna.update_ui_block(DNA_SKIN_TONE_BLOCK) if(MUTCOLORS in H.dna.species.species_traits) var/new_mutantcolor = input(user, "Choose your skin color:", "Race change","#"+H.dna.features["mcolor"]) as color|null diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm index 3e604856c5..59651b17d5 100644 --- a/code/modules/admin/create_mob.dm +++ b/code/modules/admin/create_mob.dm @@ -18,6 +18,7 @@ H.undie_color = random_short_color() H.undershirt = random_undershirt(H.gender) H.shirt_color = random_short_color() + H.dna.skin_tone_override = null H.skin_tone = random_skin_tone() H.hair_style = random_hair_style(H.gender) H.facial_hair_style = random_facial_hair_style(H.gender) diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm index a9f97942a1..42e3f71037 100644 --- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm +++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm @@ -22,6 +22,7 @@ /obj/item/gun/energy, /obj/item/restraints/handcuffs ) + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON var/mode = VEST_STEALTH var/stealth_active = 0 var/combat_cooldown = 10 diff --git a/code/modules/antagonists/bloodsucker/powers/veil.dm b/code/modules/antagonists/bloodsucker/powers/veil.dm index ecb0611940..671f88f2c1 100644 --- a/code/modules/antagonists/bloodsucker/powers/veil.dm +++ b/code/modules/antagonists/bloodsucker/powers/veil.dm @@ -82,6 +82,7 @@ // Change Appearance, not randomizing clothes colour, itll just be janky H.gender = pick(MALE, FEMALE) + H.dna.skin_tone_override = null H.skin_tone = random_skin_tone() H.hair_style = random_hair_style(H.gender) H.facial_hair_style = pick(random_facial_hair_style(H.gender),"Shaved") @@ -124,6 +125,8 @@ // Revert Appearance H.gender = prev_gender H.skin_tone = prev_skin_tone + if(!GLOB.skin_tones[H.skin_tone]) + H.dna.skin_tone_override = H.skin_tone H.hair_style = prev_hair_style H.facial_hair_style = prev_facial_hair_style H.hair_color = prev_hair_color diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index 8514df4bd6..aefeb43db9 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -489,6 +489,7 @@ clothing_flags = STOPSPRESSUREDAMAGE //Not THICKMATERIAL because it's organic tissue, so if somebody tries to inject something into it, it still ends up in your blood. (also balance but muh fluff) allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/oxygen) armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90) //No armor at all. + mutantrace_variation = NONE /obj/item/clothing/suit/space/changeling/Initialize() . = ..() diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 50dd1e5608..5dc11ed100 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -205,6 +205,8 @@ H.facial_hair_style = random_facial_hair_style(gender) if(skin_tone) H.skin_tone = skin_tone + if(!GLOB.skin_tones[H.skin_tone]) + H.dna.skin_tone_override = H.skin_tone else H.skin_tone = random_skin_tone() H.update_hair() diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 408da744ec..174f13a9d6 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -89,11 +89,14 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/facial_hair_style = "Shaved" //Face hair type var/facial_hair_color = "000" //Facial hair color var/skin_tone = "caucasian1" //Skin color + var/use_custom_skin_tone = FALSE var/eye_color = "000" //Eye color var/horn_color = "85615a" //Horn color var/wing_color = "fff" //Wing color var/datum/species/pref_species = new /datum/species/human() //Mutant race var/list/features = list("mcolor" = "FFF", + "mcolor2" = "FFF", + "mcolor3" = "FFF", "tail_lizard" = "Smooth", "tail_human" = "None", "snout" = "Round", @@ -108,8 +111,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) "insect_wings" = "Plain", "insect_fluff" = "None", "insect_markings" = "None", - "mcolor2" = "FFF", - "mcolor3" = "FFF", "mam_body_markings" = "Plain", "mam_ears" = "None", "mam_snouts" = "None", @@ -361,7 +362,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "

Skin Tone

" - dat += "[skin_tone]
" + dat += "[use_custom_skin_tone ? "custom:    " : skin_tone]
" var/mutant_colors if((MUTCOLORS in pref_species.species_traits) || (MUTCOLORS_PARTSONLY in pref_species.species_traits)) @@ -763,7 +764,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(features["has_cock"]) if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE) dat += "Penis Color:
" - dat += "   (Skin tone overriding)
" + dat += "   (Skin tone overriding)
" else dat += "Penis Color:
" dat += "    Change
" @@ -781,7 +782,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(features["has_balls"]) if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE) dat += "Testicles Color:
" - dat += "   (Skin tone overriding)
" + dat += "   (Skin tone overriding)
" else dat += "Testicles Color:
" dat += "    Change
" @@ -793,7 +794,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Vagina Type: [features["vag_shape"]]" if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE) dat += "Vagina Color:
" - dat += "   (Skin tone overriding)
" + dat += "   (Skin tone overriding)
" else dat += "Vagina Color:
" dat += "    Change
" @@ -806,7 +807,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(features["has_breasts"]) if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE) dat += "Color:
" - dat += "   (Skin tone overriding)
" + dat += "   (Skin tone overriding)
" else dat += "Color:
" dat += "    Change
" @@ -1443,6 +1444,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) eye_color = random_eye_color() if("s_tone") skin_tone = random_skin_tone() + use_custom_skin_tone = null if("bag") backbag = pick(GLOB.backbaglist) if("suit") @@ -1550,7 +1552,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) underwear = new_underwear if("undie_color") - var/n_undie_color = input(user, "Choose your underwear's color.", "Character Preference", undie_color) as color|null + var/n_undie_color = input(user, "Choose your underwear's color.", "Character Preference", "#[undie_color]") as color|null if(n_undie_color) undie_color = sanitize_hexcolor(n_undie_color) @@ -1560,7 +1562,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) undershirt = new_undershirt if("shirt_color") - var/n_shirt_color = input(user, "Choose your undershirt's color.", "Character Preference", shirt_color) as color|null + var/n_shirt_color = input(user, "Choose your undershirt's color.", "Character Preference", "#[shirt_color]") as color|null if(n_shirt_color) shirt_color = sanitize_hexcolor(n_shirt_color) @@ -1570,7 +1572,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) socks = new_socks if("socks_color") - var/n_socks_color = input(user, "Choose your socks' color.", "Character Preference", socks_color) as color|null + var/n_socks_color = input(user, "Choose your socks' color.", "Character Preference", "#[socks_color]") as color|null if(n_socks_color) socks_color = sanitize_hexcolor(n_socks_color) @@ -1839,9 +1841,24 @@ GLOBAL_LIST_EMPTY(preferences_datums) features["insect_markings"] = new_insect_markings if("s_tone") - var/new_s_tone = input(user, "Choose your character's skin-tone:", "Character Preference") as null|anything in GLOB.skin_tones + var/list/choices = GLOB.skin_tones - GLOB.nonstandard_skin_tones + if(CONFIG_GET(number/allow_custom_skintones)) + choices += "custom" + var/new_s_tone = input(user, "Choose your character's skin tone:", "Character Preference") as null|anything in choices if(new_s_tone) - skin_tone = new_s_tone + if(new_s_tone == "custom") + var/default = use_custom_skin_tone ? skin_tone : null + var/custom_tone = input(user, "Choose your custom skin tone:", "Character Preference", default) as color|null + if(custom_tone) + var/temp_hsv = RGBtoHSV(custom_tone) + if(ReadHSV(temp_hsv)[3] < ReadHSV("#333333")[3]) // rgb(50,50,50) + to_chat(user,"Invalid color. Your color is not bright enough.") + else + use_custom_skin_tone = TRUE + skin_tone = custom_tone + else + use_custom_skin_tone = FALSE + skin_tone = new_s_tone if("taur") var/list/snowflake_taur_list = list() @@ -1944,7 +1961,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/temp_hsv = RGBtoHSV(new_cockcolor) if(new_cockcolor == "#000000") features["cock_color"] = pref_species.default_color - else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) + else if(ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) features["cock_color"] = sanitize_hexcolor(new_cockcolor) else to_chat(user,"Invalid color. Your color is not bright enough.") @@ -1984,7 +2001,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/temp_hsv = RGBtoHSV(new_ballscolor) if(new_ballscolor == "#000000") features["balls_color"] = pref_species.default_color - else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) + else if(ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) features["balls_color"] = sanitize_hexcolor(new_ballscolor) else to_chat(user,"Invalid color. Your color is not bright enough.") @@ -2011,7 +2028,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/temp_hsv = RGBtoHSV(new_breasts_color) if(new_breasts_color == "#000000") features["breasts_color"] = pref_species.default_color - else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) + else if(ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) features["breasts_color"] = sanitize_hexcolor(new_breasts_color) else to_chat(user,"Invalid color. Your color is not bright enough.") @@ -2033,7 +2050,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/temp_hsv = RGBtoHSV(new_vagcolor) if(new_vagcolor == "#000000") features["vag_color"] = pref_species.default_color - else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) + else if(ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) features["vag_color"] = sanitize_hexcolor(new_vagcolor) else to_chat(user,"Invalid color. Your color is not bright enough.") @@ -2438,6 +2455,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) character.wing_color = wing_color character.skin_tone = skin_tone + character.dna.skin_tone_override = use_custom_skin_tone ? skin_tone : null character.hair_style = hair_style character.facial_hair_style = facial_hair_style character.underwear = underwear diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 7da9d5a1dc..6d99ef63aa 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -400,6 +400,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["hair_color"] >> hair_color S["facial_hair_color"] >> facial_hair_color S["eye_color"] >> eye_color + S["use_custom_skin_tone"] >> use_custom_skin_tone S["skin_tone"] >> skin_tone S["hair_style_name"] >> hair_style S["facial_style_name"] >> facial_hair_style @@ -548,7 +549,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car hair_color = sanitize_hexcolor(hair_color, 3, 0) facial_hair_color = sanitize_hexcolor(facial_hair_color, 3, 0) eye_color = sanitize_hexcolor(eye_color, 3, 0) - skin_tone = sanitize_inlist(skin_tone, GLOB.skin_tones) + use_custom_skin_tone = sanitize_integer(use_custom_skin_tone, FALSE, TRUE, initial(use_custom_skin_tone)) + if(use_custom_skin_tone && CONFIG_GET(number/allow_custom_skintones)) + skin_tone = sanitize_hexcolor(skin_tone, 6, TRUE, "#FFFFFF") + else + skin_tone = sanitize_inlist(skin_tone, GLOB.skin_tones - GLOB.nonstandard_skin_tones, initial(skin_tone)) horn_color = sanitize_hexcolor(horn_color, 3, FALSE) wing_color = sanitize_hexcolor(wing_color, 3, FALSE, "#FFFFFF") backbag = sanitize_inlist(backbag, GLOB.backbaglist, initial(backbag)) @@ -657,6 +662,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["hair_color"] , hair_color) WRITE_FILE(S["facial_hair_color"] , facial_hair_color) WRITE_FILE(S["eye_color"] , eye_color) + WRITE_FILE(S["use_custom_skin_tone"] , use_custom_skin_tone) WRITE_FILE(S["skin_tone"] , skin_tone) WRITE_FILE(S["hair_style_name"] , hair_style) WRITE_FILE(S["facial_style_name"] , facial_hair_style) diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 948f14a960..b1c6746351 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -53,7 +53,7 @@ name = "armwraps of unyielding resolve" desc = "A series of armwraps, soaked in holy water. Makes you pretty keen to smite evil magic users." resistance_flags = FIRE_PROOF | ACID_PROOF - enhancement = 1 //It is not magic that makes you punch harder, but force of will. Trust me. + enhancement = 2 //It is not magic that makes you punch harder, but force of will. Trust me. secondary_trait = TRAIT_ANTIMAGIC var/chaplain_spawnable = TRUE @@ -116,14 +116,15 @@ if(input) warcry = input -/obj/item/clothing/gloves/fingerless/pugilist/rapid/hug +/obj/item/clothing/gloves/fingerless/pugilist/hug name = "Hugs of the North Star" desc = "The armbands of a humble friend. Makes you pretty keen to go let everyone know how much you appreciate them!" - warcry = "owo" //Shouldn't ever come into play + icon_state = "rapid" + item_state = "rapid" enhancement = 0 secondary_trait = TRAIT_PACIFISM //You are only here to hug and be friends! -/obj/item/clothing/gloves/fingerless/pugilist/rapid/hug/Touch(mob/target, proximity = TRUE) +/obj/item/clothing/gloves/fingerless/pugilist/hug/Touch(mob/target, proximity = TRUE) if(!isliving(target)) return @@ -138,9 +139,6 @@ return FALSE -/obj/item/clothing/gloves/fingerless/pugilist/rapid/hug/AltClick(mob/user) - return FALSE - /obj/item/clothing/gloves/botanic_leather name = "botanist's leather gloves" desc = "These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin. They're also quite warm." diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 0df1b1e18c..fa5e64a630 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -21,6 +21,7 @@ icon_state = "officerbluejacket" item_state = "officerbluejacket" body_parts_covered = CHEST|ARMS + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/armor/vest name = "armor vest" @@ -29,6 +30,7 @@ item_state = "armoralt" blood_overlay_type = "armor" dog_fashion = /datum/dog_fashion/back + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/armor/vest/alt desc = "A Type I armored vest that provides decent protection against most types of damage." @@ -59,6 +61,7 @@ cold_protection = CHEST|GROIN|LEGS|ARMS heat_protection = CHEST|GROIN|LEGS|ARMS strip_delay = 80 + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/armor/hos/navyblue name = "head of security's jacket" @@ -89,6 +92,7 @@ strip_delay = 70 resistance_flags = FLAMMABLE dog_fashion = null + mutantrace_variation = STYLE_DIGITIGRADE /obj/item/clothing/suit/armor/vest/warden/alt name = "warden's armored jacket" @@ -101,6 +105,7 @@ icon_state = "wardenbluejacket" item_state = "wardenbluejacket" body_parts_covered = CHEST|ARMS + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/armor/vest/leather name = "security overcoat" @@ -126,6 +131,7 @@ name = "syndicate captain's vest" desc = "A sinister looking vest of advanced armor worn over a black and red fireproof jacket. The gold collar and shoulders denote that this belongs to a high ranking syndicate officer." icon_state = "syndievest" + mutantrace_variation = STYLE_DIGITIGRADE /obj/item/clothing/suit/armor/vest/capcarapace/alt name = "captain's parade jacket" @@ -164,6 +170,7 @@ armor = list("melee" = 15, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) strip_delay = 70 equip_delay_other = 50 + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/armor/laserproof name = "reflector vest" @@ -173,6 +180,7 @@ blood_overlay_type = "armor" armor = list("melee" = 10, "bullet" = 10, "laser" = 60, "energy" = 50, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100) resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON var/hit_reflect_chance = 40 var/list/protected_zones = list(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_GROIN) @@ -297,6 +305,7 @@ icon_state = "rus_armor" item_state = "rus_armor" armor = list("melee" = 25, "bullet" = 30, "laser" = 0, "energy" = 15, "bomb" = 10, "bio" = 0, "rad" = 20, "fire" = 20, "acid" = 50) + /obj/item/clothing/suit/armor/vest/russian_coat name = "russian battle coat" desc = "Used in extremly cold fronts, made out of real bears." diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index efadb8a035..fa55dcf1c1 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -12,6 +12,7 @@ body_parts_covered = CHEST|GROIN allowed = list(/obj/item/reagent_containers/spray/plantbgone, /obj/item/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/cultivator, /obj/item/reagent_containers/spray/pestspray, /obj/item/hatchet, /obj/item/storage/bag/plants) + //Captain /obj/item/clothing/suit/captunic name = "captain's parade tunic" @@ -35,6 +36,7 @@ item_state = "nun" body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS flags_inv = HIDESHOES|HIDEJUMPSUIT + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/chaplain/studentuni name = "student robe" @@ -49,6 +51,7 @@ icon_state = "witchhunter" item_state = "witchhunter" body_parts_covered = CHEST|GROIN|LEGS|ARMS + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/chaplain/pharaoh name = "pharaoh tunic" @@ -56,6 +59,7 @@ icon_state = "pharaoh" icon_state = "pharaoh" body_parts_covered = CHEST|GROIN + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/chaplain/holidaypriest name = "holiday priest" @@ -64,6 +68,7 @@ item_state = "w_suit" body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDEJUMPSUIT + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON //Chef @@ -77,6 +82,7 @@ body_parts_covered = CHEST|GROIN|ARMS allowed = list(/obj/item/kitchen) togglename = "sleeves" + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON //Cook /obj/item/clothing/suit/apron/chef @@ -99,6 +105,7 @@ armor = list("melee" = 25, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 45) cold_protection = CHEST|GROIN|LEGS|ARMS heat_protection = CHEST|GROIN|LEGS|ARMS + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/det_suit/Initialize() . = ..() @@ -119,6 +126,7 @@ blood_overlay_type = "armor" allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/t_scanner, /obj/item/radio) resistance_flags = NONE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON //Lawyer /obj/item/clothing/suit/toggle/lawyer @@ -129,6 +137,7 @@ blood_overlay_type = "coat" body_parts_covered = CHEST|ARMS togglename = "buttons" + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/toggle/lawyer/purple name = "purple suit jacket" @@ -154,6 +163,7 @@ icon_state = "suspenders" blood_overlay_type = "armor" //it's the less thing that I can put here body_parts_covered = NONE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON //Surgeon /obj/item/clothing/suit/apron/surgical @@ -174,6 +184,7 @@ armor = list("melee" = 25, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 45) cold_protection = CHEST|ARMS heat_protection = CHEST|ARMS + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON //Robotocist @@ -185,7 +196,7 @@ item_state = "techpriest" body_parts_covered = CHEST|GROIN|LEGS|ARMS hoodtype = /obj/item/clothing/head/hooded/techpriest - mutantrace_variation = NONE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/head/hooded/techpriest name = "techpriest's hood" @@ -204,9 +215,11 @@ desc = "A dark blue vest with reflective strips for emergency medical technicians." icon_state = "paramedic-vest" item_state = "paramedic-vest" + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/toggle/labcoat/emt name = "emt vest" desc = "A dark blue vest with reflective strips for emergency medical technicians." icon_state = "labcoat_emt" - item_state = "labcoat_emt" \ No newline at end of file + item_state = "labcoat_emt" + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON \ No newline at end of file diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index c133ea7c88..4bbb6ae23f 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -17,6 +17,7 @@ body_parts_covered = CHEST allowed = list (/obj/item/gun/energy/laser/bluetag) resistance_flags = NONE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/redtag name = "red laser tag armor" @@ -27,6 +28,7 @@ body_parts_covered = CHEST allowed = list (/obj/item/gun/energy/laser/redtag) resistance_flags = NONE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /* * Costume @@ -38,6 +40,7 @@ item_state = "armor" body_parts_covered = CHEST|GROIN hoodtype = /obj/item/clothing/head/hooded/flashsuit + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/head/hooded/flashsuit name = "flash button" @@ -58,6 +61,7 @@ desc = "Yarr." icon_state = "hgpirate" item_state = "hgpirate" + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/cyborg_suit @@ -88,6 +92,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS allowed = list(/obj/item/storage/fancy/cigarettes, /obj/item/stack/spacecash) flags_inv = HIDEJUMPSUIT + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/apron/overalls @@ -103,6 +108,7 @@ icon_state = "purplebartenderapron" item_state = "purplebartenderapron" body_parts_covered = CHEST + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/syndicatefake name = "black and red space suit replica" @@ -121,7 +127,7 @@ item_state = "hastur" body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT - + mutantrace_variation = NONE /obj/item/clothing/suit/imperium_monk name = "\improper Imperium monk suit" @@ -131,7 +137,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDESHOES|HIDEJUMPSUIT allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen) - + mutantrace_variation = NONE /obj/item/clothing/suit/chickensuit name = "chicken suit" @@ -205,6 +211,7 @@ item_state = "snowman" body_parts_covered = CHEST|GROIN flags_inv = HIDEJUMPSUIT + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/poncho name = "poncho" @@ -212,6 +219,7 @@ icon_state = "classicponcho" item_state = "classicponcho" body_parts_covered = CHEST|GROIN + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/poncho/green name = "green poncho" @@ -242,6 +250,7 @@ item_state = "w_suit" body_parts_covered = CHEST|GROIN|LEGS|FEET flags_inv = HIDEJUMPSUIT|HIDESHOES + mutantrace_variation = NONE /obj/item/clothing/suit/hooded/carp_costume name = "carp costume" @@ -288,6 +297,7 @@ body_parts_covered = CHEST|GROIN|ARMS clothing_flags = THICKMATERIAL hoodtype = /obj/item/clothing/head/hooded/bee_hood + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/head/hooded/bee_hood name = "bee hood" @@ -307,7 +317,7 @@ allowed = list() actions_types = list(/datum/action/item_action/toggle_human_head) hoodtype = /obj/item/clothing/head/hooded/human_head - + mutantrace_variation = NONE /obj/item/clothing/head/hooded/human_head name = "bloated human head" @@ -323,6 +333,7 @@ icon_state = "officertanjacket" item_state = "officertanjacket" body_parts_covered = CHEST|ARMS + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/ran name = "shikigami costume" @@ -332,6 +343,7 @@ body_parts_covered = CHEST|GROIN|LEGS flags_inv = HIDEJUMPSUIT|HIDETAUR heat_protection = CHEST|GROIN|LEGS //fluffy tails! + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/head/ran name = "shikigami hat" @@ -361,6 +373,7 @@ icon_state = "ianshirt" item_state = "ianshirt" body_parts_covered = CHEST|GROIN + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/nerdshirt name = "gamer shirt" @@ -368,6 +381,7 @@ icon_state = "nerdshirt" item_state = "nerdshirt" body_parts_covered = CHEST|GROIN + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/vapeshirt //wearing this is asking to get beat. name = "Vape Naysh shirt" @@ -375,6 +389,7 @@ icon_state = "vapeshirt" item_state = "vapeshirt" body_parts_covered = CHEST|GROIN + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/jacket name = "bomber jacket" @@ -385,6 +400,7 @@ body_parts_covered = CHEST|ARMS cold_protection = CHEST|GROIN|ARMS min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/jacket/leather name = "leather jacket" @@ -401,6 +417,7 @@ icon_state = "leathercoat" body_parts_covered = CHEST|GROIN|ARMS|LEGS cold_protection = CHEST|GROIN|ARMS|LEGS + mutantrace_variation = STYLE_DIGITIGRADE /obj/item/clothing/suit/jacket/puffer name = "puffer jacket" @@ -492,6 +509,7 @@ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter) + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/head/hooded/winterhood name = "winter hood" @@ -897,6 +915,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS|HEAD user_vars_to_edit = list("name" = "Spooky Ghost", "real_name" = "Spooky Ghost" , "incorporeal_move" = INCORPOREAL_MOVE_BASIC, "appearance_flags" = KEEP_TOGETHER|TILE_BOUND, "alpha" = 150) alternate_worn_layer = ABOVE_BODY_FRONT_LAYER //so the bedsheet goes over everything but fire + mutantrace_variation = NONE /obj/item/clothing/suit/bronze name = "bronze suit" @@ -918,6 +937,7 @@ flags_inv = HIDEGLOVES|HIDEEARS|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS|HEAD alternate_worn_layer = UNDER_HEAD_LAYER + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/flakjack name = "flak jacket" @@ -928,6 +948,7 @@ body_parts_covered = CHEST resistance_flags = NONE armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 5, "bio" = 0, "rad" = 0, "fire" = -5, "acid" = -15) //nylon sucks against acid + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/assu_suit name = "DAB suit" diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm index c8f54f8bda..c9b7695779 100644 --- a/code/modules/clothing/suits/reactive_armour.dm +++ b/code/modules/clothing/suits/reactive_armour.dm @@ -38,6 +38,7 @@ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE var/hit_reaction_chance = 50 + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/suit/armor/reactive/attack_self(mob/user) active = !(active) diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index c3ddda2328..8b5e87d63b 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -79,6 +79,7 @@ strip_delay = 50 equip_delay_other = 50 resistance_flags = FIRE_PROOF | ACID_PROOF + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON var/magic_flags = SPELL_WIZARD_ROBE /obj/item/clothing/suit/wizrobe/ComponentInitialize() @@ -115,6 +116,7 @@ desc = "A set of armored robes that seem to radiate a dark power." icon_state = "magusblue" item_state = "magusblue" + mutantrace_variation = STYLE_DIGITIGRADE magic_flags = SPELL_WIZARD_ROBE|SPELL_CULT_ARMOR /obj/item/clothing/suit/wizrobe/magusred @@ -122,6 +124,7 @@ desc = "A set of armored robes that seem to radiate a dark power." icon_state = "magusred" item_state = "magusred" + mutantrace_variation = STYLE_DIGITIGRADE magic_flags = SPELL_WIZARD_ROBE|SPELL_CULT_ARMOR /obj/item/clothing/suit/wizrobe/santa @@ -129,6 +132,7 @@ desc = "Festive!" icon_state = "santa" item_state = "santa" + mutantrace_variation = STYLE_DIGITIGRADE /obj/item/clothing/suit/wizrobe/fake desc = "A rather dull blue robe meant to mimick real wizard robes." diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 4b04a16b79..824f026e8c 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -6,6 +6,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/color/random icon_state = "random_jumpsuit" diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm index 69a1dc67b3..7e37d83baa 100644 --- a/code/modules/clothing/under/costume.dm +++ b/code/modules/clothing/under/costume.dm @@ -6,6 +6,7 @@ can_adjust = FALSE strip_delay = 100 resistance_flags = NONE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/costume/jabroni name = "Jabroni Outfit" @@ -34,6 +35,7 @@ body_parts_covered = CHEST|GROIN|ARMS fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/costume/schoolgirl/red name = "red schoolgirl uniform" @@ -92,7 +94,7 @@ desc = "It's not a skirt!" icon_state = "polykilt" body_parts_covered = CHEST|GROIN|ARMS|LEGS - mutantrace_variation = NONE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/costume/kilt/polychromic/ComponentInitialize() . = ..() @@ -107,6 +109,7 @@ fitted = NO_FEMALE_UNIFORM can_adjust = FALSE resistance_flags = NONE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/costume/gladiator/ash_walker desc = "This gladiator uniform appears to be covered in ash and fairly dated." @@ -120,6 +123,7 @@ body_parts_covered = CHEST|GROIN fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/costume/maid/Initialize() . = ..() @@ -152,6 +156,7 @@ icon_state = "geisha" body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/costume/villain name = "villain suit" @@ -200,6 +205,7 @@ body_parts_covered = CHEST|GROIN|ARMS fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + mutantrace_variation = NONE /obj/item/clothing/under/costume/drfreeze name = "doctor freeze's jumpsuit" @@ -207,6 +213,7 @@ icon_state = "drfreeze" item_state = "drfreeze" can_adjust = FALSE + mutantrace_variation = NONE /obj/item/clothing/under/costume/lobster name = "foam lobster suit" @@ -215,6 +222,7 @@ item_state = "lobster" fitted = NO_FEMALE_UNIFORM can_adjust = FALSE + mutantrace_variation = NONE /obj/item/clothing/under/costume/gondola name = "gondola hide suit" @@ -240,6 +248,7 @@ icon_state = "christmasmaler" item_state = "christmasmaler" can_adjust = FALSE + mutantrace_variation = NONE /obj/item/clothing/under/costume/christmas/green name = "green christmas suit" @@ -253,6 +262,7 @@ icon_state = "christmasfemaler" item_state = "christmasfemaler" body_parts_covered = CHEST|GROIN + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/costume/christmas/croptop/green name = "green feminine christmas suit" @@ -268,7 +278,7 @@ item_state = "qipao" body_parts_covered = CHEST|GROIN can_adjust = FALSE - mutantrace_variation = NONE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/costume/qipao/white name = "White Qipao" diff --git a/code/modules/clothing/under/jobs/cargo.dm b/code/modules/clothing/under/jobs/cargo.dm index 3ee00996a4..92afe238ef 100644 --- a/code/modules/clothing/under/jobs/cargo.dm +++ b/code/modules/clothing/under/jobs/cargo.dm @@ -13,6 +13,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/cargo/tech name = "cargo technician's jumpsuit" @@ -30,6 +31,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/cargo/miner desc = "It's a snappy jumpsuit with a sturdy set of overalls. It is very dirty." diff --git a/code/modules/clothing/under/jobs/civilian/civilian.dm b/code/modules/clothing/under/jobs/civilian/civilian.dm index 6f1066de5d..4eb6a18258 100644 --- a/code/modules/clothing/under/jobs/civilian/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian/civilian.dm @@ -11,6 +11,7 @@ icon_state = "purplebartender" item_state = "purplebartender" can_adjust = FALSE + fitted = FEMALE_UNIFORM_TOP /obj/item/clothing/under/rank/civilian/bartender/skirt name = "bartender's skirt" @@ -20,6 +21,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/civilian/chaplain desc = "It's a black jumpsuit, often worn by religious folk." @@ -36,6 +38,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/civilian/chef name = "cook's suit" @@ -50,6 +53,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/civilian/head_of_personnel desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"." @@ -66,6 +70,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/civilian/head_of_personnel/suit name = "head of personnel's suit" @@ -82,6 +87,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/civilian/hydroponics desc = "It's a jumpsuit designed to protect against minor plant-related hazards." @@ -98,6 +104,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/civilian/janitor desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards." @@ -112,6 +119,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/civilian/janitor/maid name = "maid uniform" @@ -121,6 +129,7 @@ body_parts_covered = CHEST|GROIN fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/civilian/lawyer desc = "Slick threads." @@ -145,6 +154,7 @@ icon_state = "blacksuit_skirt" can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/civilian/lawyer/really_black name = "executive suit" @@ -160,12 +170,14 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/civilian/lawyer/black/skirt name = "lawyer black suitskirt" icon_state = "lawyer_black_skirt" item_state = "lawyer_black" fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/civilian/lawyer/female name = "female black suit" @@ -182,12 +194,14 @@ icon_state = "black_suit_fem_skirt" item_state = "bl_suit" fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/civilian/lawyer/red/skirt name = "lawyer red suitskirt" icon_state = "lawyer_red_skirt" item_state = "lawyer_red" fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/civilian/lawyer/blue name = "lawyer blue suit" @@ -199,6 +213,7 @@ icon_state = "lawyer_blue_skirt" item_state = "lawyer_blue" fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/civilian/lawyer/bluesuit name = "blue suit" @@ -216,6 +231,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/civilian/lawyer/purpsuit name = "purple suit" @@ -232,3 +248,4 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON diff --git a/code/modules/clothing/under/jobs/civilian/clown_mime.dm b/code/modules/clothing/under/jobs/civilian/clown_mime.dm index 848a15f83b..5b3b84fd6e 100644 --- a/code/modules/clothing/under/jobs/civilian/clown_mime.dm +++ b/code/modules/clothing/under/jobs/civilian/clown_mime.dm @@ -12,6 +12,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/civilian/mime/sexy name = "sexy mime outfit" @@ -37,7 +38,7 @@ item_state = "blueclown" fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE - mutantrace_variation = NONE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/civilian/clown/green name = "green clown suit" @@ -46,7 +47,7 @@ item_state = "greenclown" fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE - mutantrace_variation = NONE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/civilian/clown/yellow name = "yellow clown suit" @@ -55,7 +56,7 @@ item_state = "yellowclown" fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE - mutantrace_variation = NONE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/civilian/clown/purple name = "purple clown suit" @@ -64,7 +65,7 @@ item_state = "purpleclown" fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE - mutantrace_variation = NONE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/civilian/clown/orange name = "orange clown suit" @@ -73,7 +74,7 @@ item_state = "orangeclown" fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE - mutantrace_variation = NONE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/civilian/clown/rainbow name = "rainbow clown suit" @@ -82,7 +83,7 @@ item_state = "rainbowclown" fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE - mutantrace_variation = NONE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/civilian/clown/jester name = "jester suit" diff --git a/code/modules/clothing/under/jobs/civilian/curator.dm b/code/modules/clothing/under/jobs/civilian/curator.dm index 792aa64a2b..c82f9c24aa 100644 --- a/code/modules/clothing/under/jobs/civilian/curator.dm +++ b/code/modules/clothing/under/jobs/civilian/curator.dm @@ -10,6 +10,7 @@ icon_state = "red_suit_skirt" body_parts_covered = CHEST|GROIN|ARMS fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/civilian/curator/treasure_hunter name = "treasure hunter uniform" diff --git a/code/modules/clothing/under/jobs/command.dm b/code/modules/clothing/under/jobs/command.dm index 885ffaed7a..0d6e6aea62 100644 --- a/code/modules/clothing/under/jobs/command.dm +++ b/code/modules/clothing/under/jobs/command.dm @@ -14,6 +14,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/captain/suit name = "captain's suit" @@ -30,6 +31,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/captain/parade name = "captain's parade uniform" diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm index 365d90e188..3eaaa42620 100644 --- a/code/modules/clothing/under/jobs/engineering.dm +++ b/code/modules/clothing/under/jobs/engineering.dm @@ -15,6 +15,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/engineering/atmospheric_technician desc = "It's a jumpsuit worn by atmospheric technicians." @@ -31,6 +32,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/engineering/engineer desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding." @@ -55,3 +57,4 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON diff --git a/code/modules/clothing/under/jobs/medical.dm b/code/modules/clothing/under/jobs/medical.dm index d5f4f1f5f9..846aae4f18 100644 --- a/code/modules/clothing/under/jobs/medical.dm +++ b/code/modules/clothing/under/jobs/medical.dm @@ -14,12 +14,11 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck desc = "It's a turtleneck worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection, for an officer with a superior sense of style and practicality." name = "chief medical officer's turtleneck" - mob_overlay_icon = 'modular_citadel/icons/mob/clothing/turtlenecks.dmi' - icon = 'modular_citadel/icons/obj/clothing/turtlenecks.dmi' icon_state = "cmoturtle" item_state = "w_suit" alt_covers_chest = TRUE @@ -41,6 +40,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/medical/virologist desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it." @@ -58,6 +58,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/medical/chemist desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it." @@ -75,6 +76,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/medical/paramedic desc = "It's made of a special fiber that provides minor protection against biohazards. It has a white cross on the chest denoting that the wearer is a trained paramedic." @@ -98,6 +100,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/medical/paramedic/skirt/light desc = "It's made of a special fiber that provides minor protection against biohazards. It has a dark blue cross on the chest denoting that the wearer is a trained paramedic." @@ -113,6 +116,7 @@ body_parts_covered = CHEST|GROIN|ARMS fitted = NO_FEMALE_UNIFORM can_adjust = FALSE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/medical/doctor desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel." @@ -148,3 +152,4 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON diff --git a/code/modules/clothing/under/jobs/rnd.dm b/code/modules/clothing/under/jobs/rnd.dm index 71c5766849..f7bd6d5e33 100644 --- a/code/modules/clothing/under/jobs/rnd.dm +++ b/code/modules/clothing/under/jobs/rnd.dm @@ -13,6 +13,7 @@ item_state = "lb_suit" body_parts_covered = CHEST|GROIN|ARMS fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/rnd/research_director/alt desc = "Maybe you'll engineer your own half-man, half-pig creature some day. Its fabric provides minor protection from biological contaminants." @@ -31,6 +32,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/rnd/research_director/turtleneck desc = "A dark purple turtleneck and tan khakis, for a director with a superior sense of style." @@ -49,6 +51,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/rnd/scientist desc = "It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist." @@ -66,6 +69,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/rnd/roboticist desc = "It's a slimming black with reinforced seams; great for industrial work." @@ -82,3 +86,4 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 0d4b916610..0061a4bc2d 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -35,6 +35,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE //you know now that i think of it if you adjust the skirt and the sprite disappears isn't that just like flashing everyone fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/security/officer/formal name = "security officer's formal uniform" @@ -82,6 +83,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/security/warden/formal desc = "The insignia on this uniform tells you that this uniform belongs to the Warden." @@ -109,6 +111,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/security/detective/grey name = "noir suit" @@ -124,6 +127,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /* * Head of Security @@ -145,6 +149,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/security/head_of_security/grey name = "head of security's grey jumpsuit" @@ -166,6 +171,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/rank/security/head_of_security/formal desc = "The insignia on this uniform tells you that this uniform belongs to the Head of Security." diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 4ff3a3f9de..35a3267837 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -36,6 +36,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/misc/mailman name = "mailman's jumpsuit" @@ -187,6 +188,7 @@ item_state = "duraskirt" can_adjust = FALSE body_parts_covered = CHEST|GROIN|ARMS + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/misc/squatter name = "slav squatter tracksuit" @@ -210,7 +212,7 @@ icon_state = "keyholesweater" item_state = "keyholesweater" can_adjust = FALSE - mutantrace_variation = NONE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/misc/stripper name = "pink stripper outfit" @@ -218,6 +220,7 @@ item_state = "stripper_p" body_parts_covered = CHEST|GROIN can_adjust = FALSE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/misc/stripper/green name = "green stripper outfit" @@ -279,7 +282,7 @@ item_state = "rainbow" body_parts_covered = CHEST|ARMS //Because there's no bottom included can_adjust = FALSE - mutantrace_variation = NONE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/misc/poly_bottomless/ComponentInitialize() . = ..() @@ -292,7 +295,7 @@ item_state = "rainbow" body_parts_covered = CHEST|GROIN can_adjust = FALSE - mutantrace_variation = NONE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON var/list/poly_states = 3 var/list/poly_colors = list("#808080", "#FFFFFF", "#8CC6FF") diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index f61a41e4c3..b1194da479 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -48,5 +48,6 @@ icon_state = "polypantsu" item_state = "rainbow" body_parts_covered = GROIN - mutantrace_variation = NONE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON + poly_colors = list("#FFFFFF", "#8CC6FF") diff --git a/code/modules/clothing/under/skirt_dress.dm b/code/modules/clothing/under/skirt_dress.dm index 94483f5804..8dd2b06f34 100644 --- a/code/modules/clothing/under/skirt_dress.dm +++ b/code/modules/clothing/under/skirt_dress.dm @@ -1,3 +1,5 @@ +/obj/item/clothing/under/dress/skirt + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/dress/skirt name = "black skirt" diff --git a/code/modules/clothing/under/suits.dm b/code/modules/clothing/under/suits.dm index 087262dd1e..fe23003b38 100644 --- a/code/modules/clothing/under/suits.dm +++ b/code/modules/clothing/under/suits.dm @@ -14,6 +14,7 @@ body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/suit/sl desc = "It's a very amish looking suit." diff --git a/code/modules/clothing/under/sweaters.dm b/code/modules/clothing/under/sweaters.dm index d8e8373d71..2f6226c0f2 100644 --- a/code/modules/clothing/under/sweaters.dm +++ b/code/modules/clothing/under/sweaters.dm @@ -5,9 +5,7 @@ item_state = "w_suit" body_parts_covered = CHEST|GROIN|ARMS can_adjust = TRUE - icon = 'modular_citadel/icons/obj/clothing/turtlenecks.dmi' - mob_overlay_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' - mutantrace_variation = NONE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/sweater/black name = "black sweater" diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index 986196a212..4fc62893b5 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -16,6 +16,7 @@ armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) alt_covers_chest = TRUE fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/syndicate/bloodred name = "blood-red sneaksuit" @@ -48,6 +49,7 @@ item_state = "bl_suit" armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) fitted = FEMALE_UNIFORM_TOP + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/syndicate/cosmetic name = "tactitool turtleneck" @@ -85,6 +87,7 @@ desc = "With a suit lined with this many pockets, you are ready to operate." icon_state = "syndicate_combat" can_adjust = FALSE + mutantrace_variation = NONE /obj/item/clothing/under/syndicate/rus_army name = "advanced military tracksuit" @@ -93,6 +96,7 @@ can_adjust = FALSE armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) resistance_flags = NONE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/clothing/under/syndicate/baseball name = "major league, number unknown" @@ -102,4 +106,5 @@ has_sensor = NO_SENSORS armor = list("melee" = 15, "bullet" = 5, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) alt_covers_chest = TRUE + mutantrace_variation = NONE diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index e1c0646e80..8d8049194b 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -915,3 +915,80 @@ results = list(/datum/reagent/consumable/ethanol/commander_and_chief = 50) required_reagents = list(/datum/reagent/consumable/ethanol/alliescocktail = 50, /datum/reagent/consumable/ethanol/champagne = 20, /datum/reagent/consumable/doctor_delight = 10, /datum/reagent/consumable/ethanol/quintuple_sec = 10, /datum/reagent/consumable/ethanol/screwdrivercocktail = 10) mix_message = "When your powers combine, I am Captain Pl-..." + +////////////////////////////////////////// Race Base Drinks ////////////////////////////////////// + +/datum/chemical_reaction/coldscales + name = "Cold Scales" + id = /datum/reagent/consumable/ethanol/coldscales + results = list(/datum/reagent/consumable/ethanol/coldscales = 3) + required_reagents = list(/datum/reagent/consumable/tea = 1, /datum/reagent/toxin/slimejelly = 1, /datum/reagent/consumable/menthol = 1) + +/datum/chemical_reaction/oil_drum + name = "Oil Drum" + id = /datum/reagent/consumable/ethanol/oil_drum + results = list(/datum/reagent/consumable/ethanol/oil_drum = 3) + required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/oil = 1, /datum/reagent/consumable/ethanol/champagne = 12) + +/datum/chemical_reaction/nord_king + name = "Nord King" + id = /datum/reagent/consumable/ethanol/nord_king + results = list(/datum/reagent/consumable/ethanol/nord_king = 10) + required_reagents = list(/datum/reagent/consumable/ethanol = 5, /datum/reagent/consumable/honey = 1, /datum/reagent/consumable/ethanol/red_mead = 10) + +/datum/chemical_reaction/velvet_kiss + name = "Velvet Kiss" + id = /datum/reagent/consumable/ethanol/velvet_kiss + results = list(/datum/reagent/consumable/ethanol/velvet_kiss = 15) //Limited races use this + required_reagents = list(/datum/reagent/blood = 5, /datum/reagent/consumable/tea = 1, /datum/reagent/consumable/ethanol/wine = 10) + +/datum/chemical_reaction/abduction_fruit + name = "Abduction Fruit" + id = /datum/reagent/consumable/ethanol/abduction_fruit + results = list(/datum/reagent/consumable/ethanol/abduction_fruit = 3) + required_reagents = list(/datum/reagent/consumable/limejuice = 10, /datum/reagent/consumable/strawberryjuice = 5, /datum/reagent/consumable/watermelonjuice = 10) + +/datum/chemical_reaction/bug_zapper + name = "Bug Zapper" + id = /datum/reagent/consumable/ethanol/bug_zapper + results = list(/datum/reagent/consumable/ethanol/bug_zapper = 20) //Harder to make + required_reagents = list(/datum/reagent/consumable/lemonjuice = 10, /datum/reagent/teslium = 1, /datum/reagent/copper = 10) + +/datum/chemical_reaction/mush_crush + name = "Mush Crush" + id = /datum/reagent/consumable/ethanol/mush_crush + results = list(/datum/reagent/consumable/ethanol/mush_crush = 10) + required_reagents = list(/datum/reagent/iron = 5, /datum/reagent/ash = 5, /datum/reagent/toxin/coffeepowder = 10) + +/datum/chemical_reaction/darkbrew + name = "Darkbrew" + id = /datum/reagent/consumable/ethanol/darkbrew + results = list(/datum/reagent/consumable/ethanol/darkbrew = 20)//Limited races use this + required_reagents = list(/datum/reagent/liquid_dark_matter = 5, /datum/reagent/toxin/bungotoxin = 5, /datum/reagent/toxin/coffeepowder = 10) + +/datum/chemical_reaction/hollow_bone + name = "Hollow Bone" + id = /datum/reagent/consumable/ethanol/hollow_bone + results = list(/datum/reagent/consumable/ethanol/hollow_bone = 10) + required_reagents = list(/datum/reagent/toxin/bonehurtingjuice = 5, /datum/reagent/consumable/milk = 10, /datum/reagent/consumable/coconutmilk = 10) + +/datum/chemical_reaction/frisky_kitty + name = "Frisky Kitty" + id = /datum/reagent/consumable/ethanol/frisky_kitty + results = list(/datum/reagent/consumable/ethanol/frisky_kitty = 2) + required_reagents = list(/datum/reagent/consumable/catnip_tea = 1, /datum/reagent/consumable/milk = 1) + required_temp = 296 //Just above room temp (22.85'C) + +/datum/chemical_reaction/jell_wyrm + name = "Jell Wyrm" + id = /datum/reagent/consumable/ethanol/jell_wyrm + results = list(/datum/reagent/consumable/ethanol/jell_wyrm = 2) + required_reagents = list(/datum/reagent/toxin/slimejelly = 1, /datum/reagent/toxin/carpotoxin = 1, /datum/reagent/carbondioxide = 5) + required_temp = 333 // (59.85'C) + +/datum/chemical_reaction/laval_spit + name = "Laval Spit" + id = /datum/reagent/consumable/ethanol/laval_spit + results = list(/datum/reagent/consumable/ethanol/laval_spit = 20) //Limited use + required_reagents = list(/datum/reagent/iron = 5, /datum/reagent/consumable/ethanol/mauna_loa = 10, /datum/reagent/sulfur = 5) + required_temp = 900 // (626.85'C) diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 4843d863c5..8b0dcdaae1 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -318,3 +318,4 @@ bitesize_mod = 8 tastes = list("wax" = 1) foodtype = SUGAR + distill_reagent = /datum/reagent/consumable/ethanol/mead diff --git a/code/modules/hydroponics/grown/tea_coffee.dm b/code/modules/hydroponics/grown/tea_coffee.dm index 44e11c372d..48990d88c9 100644 --- a/code/modules/hydroponics/grown/tea_coffee.dm +++ b/code/modules/hydroponics/grown/tea_coffee.dm @@ -51,6 +51,7 @@ desc = "Long stocks with flowering tips that has a chemical to make feline attracted to it." species = "catnip" plantname = "Catnip Plant" + growthstages = 3 product = /obj/item/reagent_containers/food/snacks/grown/tea/catnip reagents_add = list(/datum/reagent/pax/catnip = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.06, /datum/reagent/toxin/teapowder = 0.3) rarity = 50 diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm index 916fb50844..94f5be65bf 100644 --- a/code/modules/mining/abandoned_crates.dm +++ b/code/modules/mining/abandoned_crates.dm @@ -75,8 +75,7 @@ new /obj/item/clothing/neck/petcollar(src) if(63 to 64) for(var/i in 1 to rand(4, 7)) - var/newcoin = pick(/obj/item/coin/silver, /obj/item/coin/silver, /obj/item/coin/silver, /obj/item/coin/iron, /obj/item/coin/iron, /obj/item/coin/iron, /obj/item/coin/gold, /obj/item/coin/diamond, /obj/item/coin/plasma, /obj/item/coin/uranium) - new newcoin(src) + new /obj/effect/spawner/lootdrop/coin(src) if(65 to 66) new /obj/item/clothing/suit/ianshirt(src) new /obj/item/clothing/suit/hooded/ian_costume(src) diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm index a7fdf2d914..b669e30a06 100644 --- a/code/modules/mob/dead/new_player/preferences_setup.dm +++ b/code/modules/mob/dead/new_player/preferences_setup.dm @@ -11,6 +11,7 @@ shirt_color = random_short_color() socks = random_socks() socks_color = random_short_color() + use_custom_skin_tone = FALSE skin_tone = random_skin_tone() hair_style = random_hair_style(gender) facial_hair_style = random_facial_hair_style(gender) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index e39ce7d488..32e492f5fa 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -39,7 +39,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) var/horn_color //specific horn colors, because why not? var/wing_color - var/use_skintones = 0 // does it use skintones or not? (spoiler alert this is only used by humans) + var/use_skintones = NO_SKINTONES // does it use skintones or not? (spoiler alert this is only used by humans) var/exotic_blood = "" // If your race wants to bleed something other than bog standard blood, change this to reagent id. var/exotic_bloodtype = "" //If your race uses a non standard bloodtype (A+, O-, AB-, etc) var/meat = /obj/item/reagent_containers/food/snacks/meat/slab/human //What the species drops on gibbing @@ -853,7 +853,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) if(!forced_colour) switch(S.color_src) if(SKINTONE) - accessory_overlay.color = "#[skintone2hex(H.skin_tone)]" + accessory_overlay.color = SKINTONE2HEX(H.skin_tone) if(MUTCOLORS) if(fixed_mut_color) accessory_overlay.color = "#[fixed_mut_color]" @@ -1456,12 +1456,12 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) if(target.check_martial_melee_block()) target.visible_message("[target] blocks [user]'s attack!") return FALSE - + if(HAS_TRAIT(user, TRAIT_PUGILIST))//CITADEL CHANGE - makes punching cause staminaloss but funny martial artist types get a discount user.adjustStaminaLossBuffered(1.5) else user.adjustStaminaLossBuffered(3.5) - + if(attacker_style && attacker_style.harm_act(user,target)) return TRUE else @@ -1499,10 +1499,12 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) var/miss_chance = 100//calculate the odds that a punch misses entirely. considers stamina and brute damage of the puncher. punches miss by default to prevent weird cases if(user.dna.species.punchdamagelow) + if(HAS_TRAIT(user, TRAIT_PUGILIST)) //pugilists have a flat 10% miss chance + miss_chance = 10 if(atk_verb == ATTACK_EFFECT_KICK) //kicks never miss (provided your species deals more than 0 damage) miss_chance = 0 else - miss_chance = min(10 + ((puncherstam + puncherbrute)*0.5), 100) //probability of miss has a base of 10, and modified based on half your stamina and brute total. Capped at max 100 and min 0 to prevent weirdness in prob() + miss_chance = min(10 + ((puncherstam + puncherbrute)*0.5), 100) //probability of miss has a base of 10, and modified based on half brute total. Capped at max 100 to prevent weirdness in prob() if(!damage || !affecting || prob(miss_chance))//future-proofing for species that have 0 damage/weird cases where no zone is targeted playsound(target.loc, user.dna.species.miss_sound, 25, TRUE, -1) @@ -1526,7 +1528,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) if(user.limb_destroyer) target.dismembering_strike(user, affecting.body_zone) - + if(atk_verb == ATTACK_EFFECT_KICK)//kicks deal 1.5x raw damage + 0.5x stamina damage target.apply_damage(damage*1.5, BRUTE, affecting, armor_block) target.apply_damage(damage*0.5, STAMINA, affecting, armor_block) @@ -1538,21 +1540,21 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) if((target.stat != DEAD) && damage >= user.dna.species.punchstunthreshold) if((punchedstam > 50) && prob(punchedstam*0.5)) //If our punch victim has been hit above the threshold, and they have more than 50 stamina damage, roll for stun, probability of 1% per 2 stamina damage - + target.visible_message("[user] knocks [target] down!", \ "You're knocked down by [user]!", "You hear aggressive shuffling followed by a loud thud!", COMBAT_MESSAGE_RANGE, user) to_chat(user, "You knock [target] down!") - + var/knockdown_duration = 40 + (punchedstam + (punchedbrute*0.5))*0.8 - armor_block target.DefaultCombatKnockdown(knockdown_duration) target.forcesay(GLOB.hit_appends) log_combat(user, target, "got a stun punch with their previous punch") - + if(HAS_TRAIT(user, TRAIT_KI_VAMPIRE) && !HAS_TRAIT(target, TRAIT_NOBREATH) && (punchedbrute < 100)) //If we're a ki vampire we also sap them of lifeforce, but only if they're not too beat up. Also living organics only. user.adjustBruteLoss(-5) user.adjustFireLoss(-5) user.adjustStaminaLoss(-20) - + target.adjustCloneLoss(10) target.adjustBruteLoss(10) @@ -1613,13 +1615,18 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) "You hear a slap." ) return FALSE - else if(attacker_style && attacker_style.disarm_act(user,target)) - return 1 + else user.do_attack_animation(target, ATTACK_EFFECT_DISARM) - user.adjustStaminaLossBuffered(3) //CITADEL CHANGE - makes disarmspam cause staminaloss - + if(HAS_TRAIT(user, TRAIT_PUGILIST))//CITADEL CHANGE - makes disarmspam cause staminaloss, pugilists can do it almost effortlessly + user.adjustStaminaLossBuffered(1) + else + user.adjustStaminaLossBuffered(3) + + if(attacker_style && attacker_style.disarm_act(user,target)) + return TRUE + if(target.w_uniform) target.w_uniform.add_fingerprint(user) //var/randomized_zone = ran_zone(user.zone_selected) CIT CHANGE - comments out to prevent compiling errors @@ -1647,8 +1654,12 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) if(!(target.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE)) //CITADEL CHANGE randn += 25 //CITADEL CHANGE - Makes it harder to disarm outside of combat mode if(user.pulling == target) - randn += -20 //If you have the time to get someone in a grab, you should have a greater chance at snatching the thing in their hand. Will be made completely obsolete by the grab rework but i've got a poor track record for releasing big projects on time so w/e i guess - + randn -= 20 //If you have the time to get someone in a grab, you should have a greater chance at snatching the thing in their hand. Will be made completely obsolete by the grab rework but i've got a poor track record for releasing big projects on time so w/e i guess + if(HAS_TRAIT(user, TRAIT_PUGILIST)) + randn -= 25 //if you are a pugilist, you're slapping that item from them pretty reliably + if(HAS_TRAIT(target, TRAIT_PUGILIST)) + randn += 25 //meanwhile, pugilists are less likely to get disarmed + if(randn <= 35)//CIT CHANGE - changes this back to a 35% chance to accomodate for the above being commented out in favor of right-click pushing var/obj/item/I = null if(target.pulling) diff --git a/code/modules/mob/living/carbon/human/species_types/angel.dm b/code/modules/mob/living/carbon/human/species_types/angel.dm index 5474adcf88..1a92da3b0a 100644 --- a/code/modules/mob/living/carbon/human/species_types/angel.dm +++ b/code/modules/mob/living/carbon/human/species_types/angel.dm @@ -4,7 +4,7 @@ default_color = "FFFFFF" species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS) mutant_bodyparts = list("tail_human" = "None", "ears" = "None", "wings" = "Angel") - use_skintones = 1 + use_skintones = USE_SKINTONES_GRAYSCALE_CUSTOM no_equip = list(SLOT_BACK) blacklisted = 1 limbs_id = "human" diff --git a/code/modules/mob/living/carbon/human/species_types/corporate.dm b/code/modules/mob/living/carbon/human/species_types/corporate.dm index 3de530ff5b..e062e1cbf7 100644 --- a/code/modules/mob/living/carbon/human/species_types/corporate.dm +++ b/code/modules/mob/living/carbon/human/species_types/corporate.dm @@ -13,8 +13,7 @@ punchstunthreshold = 25 attack_verb = "smash" attack_sound = 'sound/weapons/resonator_blast.ogg' - blacklisted = 1 - use_skintones = 0 + blacklisted = TRUE species_traits = list(NOBLOOD,EYECOLOR,NOGENITALS) inherent_traits = list(TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER,TRAIT_NOLIMBDISABLE,TRAIT_NOHUNGER) sexes = 0 diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm index a41cc8c55a..ef730da219 100644 --- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm +++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm @@ -5,7 +5,7 @@ species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS) inherent_traits = list(TRAIT_NOHUNGER,TRAIT_NOBREATH) mutant_bodyparts = list("tail_human" = "None", "ears" = "None", "deco_wings" = "None") - use_skintones = TRUE + use_skintones = USE_SKINTONES_GRAYSCALE_CUSTOM mutant_brain = /obj/item/organ/brain/dullahan mutanteyes = /obj/item/organ/eyes/dullahan mutanttongue = /obj/item/organ/tongue/dullahan diff --git a/code/modules/mob/living/carbon/human/species_types/dwarves.dm b/code/modules/mob/living/carbon/human/species_types/dwarves.dm index bb2c08aa9b..235dacc70a 100644 --- a/code/modules/mob/living/carbon/human/species_types/dwarves.dm +++ b/code/modules/mob/living/carbon/human/species_types/dwarves.dm @@ -9,7 +9,7 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) // species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,NO_UNDERWEAR) inherent_traits = list() limbs_id = "human" - use_skintones = 1 + use_skintones = USE_SKINTONES_GRAYSCALE_CUSTOM say_mod = "bellows" //high energy, EXTRA BIOLOGICAL FUEL damage_overlay_type = "human" skinned_type = /obj/item/stack/sheet/animalhide/human diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm index 02cff6d924..606b7a8bfd 100644 --- a/code/modules/mob/living/carbon/human/species_types/humans.dm +++ b/code/modules/mob/living/carbon/human/species_types/humans.dm @@ -5,7 +5,7 @@ species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,MUTCOLORS_PARTSONLY,WINGCOLOR) mutant_bodyparts = list("mcolor" = "FFF", "mcolor2" = "FFF","mcolor3" = "FFF","tail_human" = "None", "ears" = "None", "taur" = "None", "deco_wings" = "None") - use_skintones = 1 + use_skintones = USE_SKINTONES_GRAYSCALE_CUSTOM skinned_type = /obj/item/stack/sheet/animalhide/human disliked_food = GROSS | RAW liked_food = JUNKFOOD | FRIED diff --git a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm index cb8fdbf101..5390d9e7f4 100644 --- a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm @@ -22,7 +22,6 @@ heatmod = 1.5 mutanteyes = /obj/item/organ/eyes/night_vision/mushroom - use_skintones = FALSE var/datum/martial_art/mushpunch/mush /datum/species/mush/after_equip_job(datum/job/J, mob/living/carbon/human/H) diff --git a/code/modules/mob/living/carbon/human/species_types/synths.dm b/code/modules/mob/living/carbon/human/species_types/synths.dm index 6c42e622fe..deab31dec3 100644 --- a/code/modules/mob/living/carbon/human/species_types/synths.dm +++ b/code/modules/mob/living/carbon/human/species_types/synths.dm @@ -80,7 +80,7 @@ fake_species = null meat = initial(meat) limbs_id = "synth" - use_skintones = 0 + use_skintones = FALSE sexes = 0 fixed_mut_color = "" hair_color = "" diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index 415cd9889c..f37e718462 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -7,7 +7,7 @@ inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID mutant_bodyparts = list("mcolor" = "FFF", "tail_human" = "None", "ears" = "None", "deco_wings" = "None") exotic_bloodtype = "U" - use_skintones = TRUE + use_skintones = USE_SKINTONES_GRAYSCALE_CUSTOM mutant_heart = /obj/item/organ/heart/vampire mutanttongue = /obj/item/organ/tongue/vampire blacklisted = TRUE @@ -23,7 +23,8 @@ /datum/species/vampire/on_species_gain(mob/living/carbon/human/C, datum/species/old_species) . = ..() to_chat(C, "[info_text]") - C.skin_tone = "albino" + if(!C.dna.skin_tone_override) + C.skin_tone = "albino" C.update_body(0) var/obj/effect/proc_holder/spell/targeted/shapeshift/bat/B = new C.AddSpell(B) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 63e772e07c..b049b7e967 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -5,7 +5,7 @@ This system allows you to update individual mob-overlays, without regenerating them all each time. When we generate overlays we generate the standing version and then rotate the mob as necessary.. -As of the time of writing there are 20 layers within this list. Please try to keep this from increasing. //22 and counting, good job guys +As of the time of writing there are 20 layers within this list. Please try to keep this from increasing. //32 and counting, good job guys var/overlays_standing[20] //For the standing stance Most of the time we only wish to update one overlay: @@ -125,8 +125,8 @@ There are several things that need to be remembered: var/alt_worn = U.mob_overlay_icon || 'icons/mob/clothing/uniform.dmi' var/variant_flag = NONE - if((DIGITIGRADE in dna.species.species_traits) && U.mutantrace_variation & STYLE_DIGITIGRADE) - alt_worn = 'icons/mob/clothing/uniform_digi.dmi' + if((DIGITIGRADE in dna.species.species_traits) && U.mutantrace_variation & STYLE_DIGITIGRADE && !(U.mutantrace_variation & STYLE_NO_ANTHRO_ICON)) + alt_worn = U.anthro_mob_worn_overlay || 'icons/mob/clothing/uniform_digi.dmi' variant_flag |= STYLE_DIGITIGRADE var/mutable_appearance/uniform_overlay @@ -279,8 +279,8 @@ There are several things that need to be remembered: var/alt_icon = S.mob_overlay_icon || 'icons/mob/clothing/feet.dmi' var/variation_flag = NONE - if((DIGITIGRADE in dna.species.species_traits) && S.mutantrace_variation & STYLE_DIGITIGRADE) - alt_icon = 'icons/mob/clothing/feet_digi.dmi' + if((DIGITIGRADE in dna.species.species_traits) && S.mutantrace_variation & STYLE_DIGITIGRADE && !(S.mutantrace_variation & STYLE_NO_ANTHRO_ICON)) + alt_icon = S.anthro_mob_worn_overlay || 'icons/mob/clothing/feet_digi.dmi' variation_flag |= STYLE_DIGITIGRADE overlays_standing[SHOES_LAYER] = shoes.build_worn_icon(SHOES_LAYER, alt_icon, FALSE, NO_FEMALE_UNIFORM, variation_flag, FALSE) @@ -340,8 +340,8 @@ There are several things that need to be remembered: muzzled = TRUE else if(dna.species.mutant_bodyparts["snout"] && dna.features["snout"] != "None") muzzled = TRUE - if(muzzled && H.mutantrace_variation & STYLE_MUZZLE) - alt_icon = 'icons/mob/clothing/head_muzzled.dmi' + if(muzzled && H.mutantrace_variation & STYLE_MUZZLE && !(H.mutantrace_variation & STYLE_NO_ANTHRO_ICON)) + alt_icon = H.anthro_mob_worn_overlay || 'icons/mob/clothing/head_muzzled.dmi' variation_flag |= STYLE_MUZZLE overlays_standing[HEAD_LAYER] = H.build_worn_icon(HEAD_LAYER, alt_icon, FALSE, NO_FEMALE_UNIFORM, H.icon_state, variation_flag, FALSE) @@ -392,6 +392,7 @@ There are several things that need to be remembered: update_observer_view(wear_suit,1) var/worn_icon = wear_suit.mob_overlay_icon || 'icons/mob/clothing/suit.dmi' + var/worn_state = wear_suit.icon_state var/center = FALSE var/dimension_x = 32 var/dimension_y = 32 @@ -401,6 +402,7 @@ There are several things that need to be remembered: T = GLOB.taur_list[dna.features["taur"]] if(S.mutantrace_variation) + if(T?.taur_mode) var/init_worn_icon = worn_icon variation_flag |= S.mutantrace_variation & T.taur_mode || S.mutantrace_variation & T.alt_taur_mode @@ -412,14 +414,19 @@ There are several things that need to be remembered: if(STYLE_PAW_TAURIC) worn_icon = 'icons/mob/clothing/taur_canine.dmi' if(worn_icon != init_worn_icon) //worn icon sprite was changed, taur offsets will have to be applied. + if(S.taur_mob_worn_overlay) //not going to make several new variables for all taur types. Nope. + var/static/list/icon_to_state = list('icons/mob/clothing/taur_hooved.dmi' = "_hooved", 'icons/mob/clothing/taur_naga.dmi' = "_naga", 'icons/mob/clothing/taur_canine.dmi' = "_paws") + worn_state += icon_to_state[worn_icon] + worn_icon = S.taur_mob_worn_overlay center = T.center dimension_x = T.dimension_x dimension_y = T.dimension_y - else if((DIGITIGRADE in dna.species.species_traits) && S.mutantrace_variation & STYLE_DIGITIGRADE) //not a taur, but digitigrade legs. - worn_icon = 'icons/mob/clothing/suit_digi.dmi' + + else if((DIGITIGRADE in dna.species.species_traits) && S.mutantrace_variation & STYLE_DIGITIGRADE && !(S.mutantrace_variation & STYLE_NO_ANTHRO_ICON)) //not a taur, but digitigrade legs. + worn_icon = S.anthro_mob_worn_overlay || 'icons/mob/clothing/suit_digi.dmi' variation_flag |= STYLE_DIGITIGRADE - overlays_standing[SUIT_LAYER] = S.build_worn_icon(SUIT_LAYER, worn_icon, FALSE, NO_FEMALE_UNIFORM, wear_suit.icon_state, variation_flag, FALSE) + overlays_standing[SUIT_LAYER] = S.build_worn_icon(SUIT_LAYER, worn_icon, FALSE, NO_FEMALE_UNIFORM, worn_state, variation_flag, FALSE) var/mutable_appearance/suit_overlay = overlays_standing[SUIT_LAYER] if(OFFSET_SUIT in dna.species.offset_features) suit_overlay.pixel_x += dna.species.offset_features[OFFSET_SUIT][1] @@ -483,8 +490,8 @@ There are several things that need to be remembered: muzzled = TRUE else if(dna.species.mutant_bodyparts["snout"] && dna.features["snout"] != "None") muzzled = TRUE - if(muzzled && M.mutantrace_variation & STYLE_MUZZLE) - alt_icon = 'icons/mob/clothing/mask_muzzled.dmi' + if(muzzled && M.mutantrace_variation & STYLE_MUZZLE && !(M.mutantrace_variation & STYLE_NO_ANTHRO_ICON)) + alt_icon = M.anthro_mob_worn_overlay || 'icons/mob/clothing/mask_muzzled.dmi' variation_flag |= STYLE_MUZZLE var/mutable_appearance/mask_overlay = M.build_worn_icon(FACEMASK_LAYER, alt_icon, FALSE, NO_FEMALE_UNIFORM, wear_mask.icon_state, variation_flag, FALSE) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 473a7d4c98..4c0f50e548 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -146,11 +146,9 @@ has_snowflake_deadsprite = TRUE cyborg_pixel_offset = -16 hat_offset = INFINITY - var/obj/item/I = new /obj/item/analyzer/nose/flavour(src) - basic_modules += I - I = new /obj/item/soap/tongue/flavour(src) - basic_modules += I - I = new /obj/item/dogborg/sleeper/K9/flavour(src) + basic_modules += new /obj/item/dogborg_nose(src) + basic_modules += new /obj/item/dogborg_tongue(src) + var/obj/item/dogborg/sleeper/K9/flavour/I = new(src) if(istype(src, /obj/item/robot_module/engineering)) I.icon_state = "decompiler" if(istype(src, /obj/item/robot_module/security)) diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index af342118a2..d2794a3a78 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -152,7 +152,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians to_chat(src, "Not a valid name, please try again.") guardianrename() return - visible_message("Your new name [new_name] anchors itself in your mind.") + to_chat(src, "Your new name [new_name] anchors itself in your mind.") fully_replace_character_name(null, new_name) /mob/living/simple_animal/hostile/guardian/Life() //Dies if the summoner dies diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 36005232f3..02ff4127eb 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -312,10 +312,9 @@ /obj/machinery/light/update_overlays() . = ..() + SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays) if(on && status == LIGHT_OK) - var/mutable_appearance/glowybit = mutable_appearance(overlayicon, base_state, EMISSIVE_LAYER, EMISSIVE_PLANE) - glowybit.alpha = CLAMP(light_power*250, 30, 200) - . += glowybit + SSvis_overlays.add_vis_overlay(src, overlayicon, base_state, EMISSIVE_LAYER, EMISSIVE_PLANE, dir, CLAMP(light_power*250, 30, 200)) // update the icon_state and luminosity of the light depending on its state diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 7ee233b449..abe5c7de46 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -2356,6 +2356,219 @@ All effects don't start immediately, but rather get worse over time; the rate is M.adjustStaminaLoss(-2) return ..() +//////////////////// +//Race-Base-Drinks// +//////////////////// + +/datum/reagent/consumable/ethanol/coldscales + name = "Coldscales" + color = "#5AEB52" //(90, 235, 82) + description = "A cold looking drink made for people with scales." + boozepwr = 50 //strong! + taste_description = "dead flies" + glass_icon_state = "coldscales" + glass_name = "glass of Coldscales" + glass_desc = "A soft green drink that looks inviting!" + +/datum/reagent/consumable/ethanol/coldscales/on_mob_life(mob/living/carbon/M) + if(islizard(M)) + quality = RACE_DRINK + else + M.adjust_disgust(25) + return ..() + +/datum/reagent/consumable/ethanol/oil_drum + name = "Oil Drum" + color = "#000000" //(0, 0, 0) + description = "Industeral grade oil mixed with some ethanol to make it a drink. Somehow not known to be toxic." + boozepwr = 45 + taste_description = "oil spill" + glass_icon_state = "oil_drum" + glass_name = "Drum of oil" + glass_desc = "A gray can of booze and oil..." + +/datum/reagent/consumable/ethanol/oil_drum/on_mob_life(mob/living/carbon/M) + if(isipcperson(M) || issynthliz(M)) + quality = RACE_DRINK + else + M.adjust_disgust(25) + return ..() + +/datum/reagent/consumable/ethanol/nord_king + name = "Nord King" + color = "#EB1010" //(235, 16, 16) + description = "Strong mead mixed with more honey and ethanol. Known to beloved by most palettes." + boozepwr = 50 //strong! + taste_description = "honey and red wine" + glass_icon_state = "nord_king" + glass_name = "Keg of Nord King" + glass_desc = "A dripping keg of red mead." + +/datum/reagent/consumable/ethanol/nord_king/on_mob_life(mob/living/carbon/M) + if(ishumanbasic(M) || isdwarf(M) || isangel(M)) //Humans and angel races are rare + quality = RACE_DRINK + else + M.adjust_disgust(25) + return ..() + +/datum/reagent/consumable/ethanol/velvet_kiss + name = "Velvet Kiss" + color = "#EB1010" //(235, 16, 16) + description = "A bloody drink mixed with wine." + boozepwr = 10 //weak + taste_description = "iron with grapejuice" + glass_icon_state = "velvet_kiss" + glass_name = "glass of Velvet Kiss" + glass_desc = "Red and white drink for the upper classes or undead." + +/datum/reagent/consumable/ethanol/velvet_kiss/on_mob_life(mob/living/carbon/M) + if(iszombie(M) || isvampire(M) || isdullahan(M)) //Rare races! + quality = RACE_DRINK + else + M.adjust_disgust(25) + return ..() + +/datum/reagent/consumable/ethanol/abduction_fruit + name = "Abduction Fruit" + color = "#DEFACD" //(222, 250, 205) + description = "Mixing of juices to make an alien taste." + boozepwr = 80 //Strong + taste_description = "grass and lime" + glass_icon_state = "abduction_fruit" + glass_name = "glass of Abduction Fruit" + glass_desc = "Mixed fruits that were never ment to be mixed..." + +/datum/reagent/consumable/ethanol/abduction_fruit/on_mob_life(mob/living/carbon/M) + if(isabductor(M) || isxenoperson(M)) + quality = RACE_DRINK + else + M.adjust_disgust(25) + return ..() + +/datum/reagent/consumable/ethanol/bug_zapper + name = "Bug Zapper" + color = "#F5882A" //(222, 250, 205) + description = "Metals and lemon juice. Hardly even a drink." + boozepwr = 5 //No booze really + taste_description = "copper and AC power" + glass_icon_state = "bug_zapper" + glass_name = "glass of Bug Zapper" + glass_desc = "An odd mix of copper, lemon juice and power meant for non-human consumption." + +/datum/reagent/consumable/ethanol/bug_zapper/on_mob_life(mob/living/carbon/M) + if(isinsect(M) || isflyperson(M) || ismoth(M)) + quality = RACE_DRINK + else + M.adjust_disgust(25) + return ..() + +/datum/reagent/consumable/ethanol/mush_crush + name = "Mush Crush" + color = "#F5882A" //(222, 250, 205) + description = "Soil in a glass." + boozepwr = 5 //No booze really + taste_description = "dirt and iron" + glass_icon_state = "mush_crush" + glass_name = "glass of Mush Crush" + glass_desc = "Popular among people that want to grow their own food rather then drink the soil." + +/datum/reagent/consumable/ethanol/mush_crush/on_mob_life(mob/living/carbon/M) + if(ispodperson(M) || ismush(M)) + quality = RACE_DRINK + else + M.adjust_disgust(25) + return ..() + +/datum/reagent/consumable/ethanol/darkbrew + name = "Darkbrew" + color = "#000000" //(0, 0, 0) + description = "Contained dark matter mixed with coffee." + boozepwr = 5 //No booze really + taste_description = "Shadows and coffee trees" + glass_icon_state = "darkbrew" + glass_name = "glass of Darkbrew" + glass_desc = "A pitch black drink that's commonly confused with a type of coffee." + +/datum/reagent/consumable/ethanol/darkbrew/on_mob_life(mob/living/carbon/M) + if(isshadow(M)) + quality = RACE_DRINK + else + M.adjust_disgust(25) + return ..() + +/datum/reagent/consumable/ethanol/hollow_bone + name = "Hollow Bone" + color = "#FCF7D4" //(252, 247, 212) + description = "Shockingly none-harmful mix of toxins and milk." + boozepwr = 15 + taste_description = "Milk and salt" + glass_icon_state = "hollow_bone" + glass_name = "skull of Hollow Bone" + glass_desc = "Mixing of milk and bone hurting juice for enjoyment for rather skinny people." + +/datum/reagent/consumable/ethanol/hollow_bone/on_mob_life(mob/living/carbon/M) + if(isplasmaman(M) || isskeleton(M)) + quality = RACE_DRINK + else + M.adjust_disgust(25) + return ..() + +/datum/reagent/consumable/ethanol/frisky_kitty + name = "Frisky Kitty" + color = "#FCF7D4" //(252, 247, 212) + description = "Warm milk mixed with a catnip." + boozepwr = 0 //No one dont get drunk off milk! + taste_description = "Warm milk and catnip" + glass_icon_state = "frisky_kitty" + glass_name = "cup of Drisky Kitty" + glass_desc = "Warm milk and some catnip." + +/datum/reagent/consumable/ethanol/frisky_kitty/on_mob_life(mob/living/carbon/M) + if(ismammal(M) || iscatperson(M)) //well its not to bad for mammals + quality = RACE_DRINK + else + M.adjust_disgust(25) + return ..() + +/datum/reagent/consumable/ethanol/jell_wyrm + name = "Jell Wyrm" + color = "#FF6200" //(255, 98, 0) + description = "Horrible mix of Co2, toxins and heat. Meant for slime based life." + boozepwr = 40 + taste_description = "tropical sea" + glass_icon_state = "jell_wyrm" + glass_name = "glass of Jell Wyrm" + glass_desc = "A bubbly drink that is rather inviting to those that don't know who it's meant for." + +/datum/reagent/consumable/ethanol/jell_wyrm/on_mob_life(mob/living/carbon/M) + if(isjellyperson(M) || isstartjelly(M) || isslimeperson(M) || isluminescent(M)) + quality = RACE_DRINK + else + M.adjust_disgust(25) + M.adjustToxLoss(1, 0) //Low tox do to being carp + jell toxins. + return ..() + +/datum/reagent/consumable/ethanol/laval_spit //Yes Laval + name = "Laval Spit" + color = "#DE3009" //(222, 48, 9) + description = "Heat minerals and some mauna loa. Meant for rock based life." + boozepwr = 30 + taste_description = "tropical island" + glass_icon_state = "laval_spit" + glass_name = "glass of Laval Spit" + glass_desc = "Piping hot drink for those who can stomach the heat of lava." + +/datum/reagent/consumable/ethanol/laval_spit/on_mob_life(mob/living/carbon/M) + if(isgolem(M)) + quality = RACE_DRINK + else + M.adjust_disgust(25) + return ..() + +/////////////// +//Barrle Wine// +/////////////// + /datum/reagent/consumable/ethanol/fruit_wine name = "Fruit Wine" description = "A wine made from grown plants." diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index 52c06bca9b..ebbce61c57 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -1,7 +1,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////////////// -/////////////////////// DRINKS BELOW, Beer is up there though, along with cola. Cap'n Pete's Cuban Spiced Rum//////////////////////////////// +//////DRINKS BELOW, Beer is up there though, along with cola. Cap'n Pete's Cuban Spiced Rum////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////// /datum/reagent/consumable/orangejuice diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index c003fc7111..39b687c64a 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -33,6 +33,8 @@ SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "quality_drink", /datum/mood_event/quality_verygood) if (DRINK_FANTASTIC) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "quality_drink", /datum/mood_event/quality_fantastic) + if (RACE_DRINK) + SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "quality_drink", /datum/mood_event/race_drink) if (FOOD_AMAZING) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "quality_food", /datum/mood_event/amazingtaste) return ..() diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index c2f14e69ec..e66ebc5f20 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -507,93 +507,83 @@ /datum/reagent/spraytan/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1) if(ishuman(M)) if(method == PATCH || method == VAPOR) - var/mob/living/carbon/human/N = M - if(N.dna.species.id == "human") - switch(N.skin_tone) - if("african1") - N.skin_tone = "african2" - if("indian") - N.skin_tone = "african1" - if("arab") - N.skin_tone = "indian" - if("asian2") - N.skin_tone = "arab" - if("asian1") - N.skin_tone = "asian2" - if("mediterranean") - N.skin_tone = "african1" - if("latino") - N.skin_tone = "mediterranean" - if("caucasian3") - N.skin_tone = "mediterranean" - if("caucasian2") - N.skin_tone = pick("caucasian3", "latino") - if("caucasian1") - N.skin_tone = "caucasian2" - if ("albino") - N.skin_tone = "caucasian1" + var/mob/living/carbon/human/H = M + if(H.dna.species.use_skintones) + if(!H.dna.skin_tone_override) + var/diff_len = length(GLOB.skin_tones - GLOB.nonstandard_skin_tones) + H.skin_tone = GLOB.skin_tones[min(diff_len, GLOB.skin_tones.Find(H.skin_tone) + 1)] + else + H.skin_tone = H.dna.skin_tone_override = tan_mutant_color(H.dna.skin_tone_override, "#202020") + if(MUTCOLORS in H.dna.species.species_traits) //take current alien color and darken it slightly + H.dna.features["mcolor"] = tan_mutant_color(H.dna.features["mcolor"]) + H.update_body() - if(MUTCOLORS in N.dna.species.species_traits) //take current alien color and darken it slightly - var/newcolor = "" - var/string = N.dna.features["mcolor"] - var/len = length(string) - var/char = "" - var/ascii = 0 - for(var/i=1, i<=len, i += length(char)) - char = string[i] - ascii = text2ascii(char) - switch(ascii) - if(48) - newcolor += "0" - if(49 to 57) - newcolor += ascii2text(ascii-1) //numbers 1 to 9 - if(97) - newcolor += "9" - if(98 to 102) - newcolor += ascii2text(ascii-1) //letters b to f lowercase - if(65) - newcolor += "9" - if(66 to 70) - newcolor += ascii2text(ascii+31) //letters B to F - translates to lowercase - else - break - if(ReadHSV(newcolor)[3] >= ReadHSV("#7F7F7F")[3]) - N.dna.features["mcolor"] = newcolor - N.regenerate_icons() + if(method == INGEST) + if(show_message) + to_chat(M, "That tasted horrible.") + return ..() +/datum/reagent/spraytan/proc/tan_mutant_color(color, limit = "#7F7F7F") + var/newcolor = "" + var/len = length(color) + var/char = "" + var/ascii = 0 + for(var/i=1, i<=len, i += length(char)) + char = color[i] + ascii = text2ascii(char) + switch(ascii) + if(35) + newcolor += "#" + if(48) + newcolor += "0" + if(49 to 57) + newcolor += ascii2text(ascii-1) //numbers 1 to 9 + if(97) + newcolor += "9" + if(98 to 102) + newcolor += ascii2text(ascii-1) //letters b to f lowercase + if(65) + newcolor += "9" + if(66 to 70) + newcolor += ascii2text(ascii+31) //letters B to F - translates to lowercase + else + break + if(ReadHSV(newcolor)[3] >= ReadHSV(limit)[3]) + return newcolor + return color - if(method == INGEST) - if(show_message) - to_chat(M, "That tasted horrible.") - ..() - +/datum/reagent/spraytan/overdose_start(mob/living/M) + . = ..() + if(ishuman(M)) + var/mob/living/carbon/human/H = M + H.hair_style = "Spiky" + H.facial_hair_style = "Shaved" + H.facial_hair_color = "000" + H.hair_color = "000" + if(!(HAIR in H.dna.species.species_traits)) //No hair? No problem! + H.dna.species.species_traits += HAIR + if(H.dna.species.use_skintones) + if(H.dna.skin_tone_override) + H.skin_tone = H.dna.skin_tone_override = "#FF8800" + else + H.skin_tone = "orange" + else if(MUTCOLORS in H.dna.species.species_traits) //Aliens with custom colors simply get turned orange + H.dna.features["mcolor"] = "f80" + H.update_body() /datum/reagent/spraytan/overdose_process(mob/living/M) metabolization_rate = 1 * REAGENTS_METABOLISM - if(ishuman(M)) - var/mob/living/carbon/human/N = M - N.hair_style = "Spiky" - N.facial_hair_style = "Shaved" - N.facial_hair_color = "000" - N.hair_color = "000" - if(!(HAIR in N.dna.species.species_traits)) //No hair? No problem! - N.dna.species.species_traits += HAIR - if(N.dna.species.use_skintones) - N.skin_tone = "orange" - else if(MUTCOLORS in N.dna.species.species_traits) //Aliens with custom colors simply get turned orange - N.dna.features["mcolor"] = "f80" - N.regenerate_icons() + var/mob/living/carbon/human/H = M if(prob(7)) - if(N.w_uniform) - M.visible_message(pick("[M]'s collar pops up without warning.", "[M] flexes [M.p_their()] arms.")) + if(H.w_uniform) + H.visible_message(pick("[H]'s collar pops up without warning.", "[H] flexes [H.p_their()] arms.")) else - M.visible_message("[M] flexes [M.p_their()] arms.") + H.visible_message("[H] flexes [H.p_their()] arms.") if(prob(10)) M.say(pick("Shit was SO cash.", "You are everything bad in the world.", "What sports do you play, other than 'jack off to naked drawn Japanese people?'", "Don’t be a stranger. Just hit me with your best shot.", "My name is John and I hate every single one of you."), forced = "spraytan") - ..() - return + return ..() /datum/reagent/mutationtoxin name = "Stable Mutation Toxin" diff --git a/code/modules/research/xenobiology/crossbreeding/regenerative.dm b/code/modules/research/xenobiology/crossbreeding/regenerative.dm index d230c22d2f..b33cee3a64 100644 --- a/code/modules/research/xenobiology/crossbreeding/regenerative.dm +++ b/code/modules/research/xenobiology/crossbreeding/regenerative.dm @@ -200,8 +200,7 @@ Regenerative extracts: colour = "gold" /obj/item/slimecross/regenerative/gold/core_effect(mob/living/target, mob/user) - var/newcoin = pick(/obj/item/coin/silver, /obj/item/coin/iron, /obj/item/coin/gold, /obj/item/coin/diamond, /obj/item/coin/plasma, /obj/item/coin/uranium) - var/obj/item/coin/C = new newcoin(target.loc) + var/obj/item/coin/C = new /obj/effect/spawner/lootdrop/coin(target.loc) playsound(C, 'sound/items/coinflip.ogg', 50, 1) target.put_in_hand(C) diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm index 54f2aef10d..d6f0866936 100644 --- a/code/modules/surgery/bodyparts/bodyparts.dm +++ b/code/modules/surgery/bodyparts/bodyparts.dm @@ -350,7 +350,8 @@ body_gender = H.dna.features["body_model"] should_draw_gender = S.sexes - if(MUTCOLORS in S.species_traits) + var/mut_colors = (MUTCOLORS in S.species_traits) + if(mut_colors) if(S.fixed_mut_color) species_color = S.fixed_mut_color else @@ -360,7 +361,7 @@ species_color = "" if(base_bp_icon != DEFAULT_BODYPART_ICON) - color_src = MUTCOLORS //TODO - Add color matrix support to base limbs + color_src = mut_colors ? MUTCOLORS : ((H.dna.skin_tone_override && S.use_skintones == USE_SKINTONES_GRAYSCALE_CUSTOM) ? CUSTOM_SKINTONE : SKINTONE) if(S.mutant_bodyparts["legs"]) if(body_zone == BODY_ZONE_L_LEG || body_zone == BODY_ZONE_R_LEG) @@ -544,13 +545,23 @@ return if(color_src) //TODO - add color matrix support for base species limbs - var/draw_color = mutation_color || species_color || (skin_tone && skintone2hex(skin_tone)) + var/draw_color = mutation_color || species_color + var/grayscale = FALSE + if(!draw_color) + draw_color = SKINTONE2HEX(skin_tone) + grayscale = color_src == CUSTOM_SKINTONE //Cause human limbs have a very pale pink hue by def. + else + draw_color = "#[draw_color]" if(draw_color) - limb.color = "#[draw_color]" + if(grayscale) + limb.icon_state += "_g" + limb.color = draw_color if(aux_icons) for(var/a in aux) var/image/I = a - I.color = "#[draw_color]" + if(grayscale) + I.icon_state += "_g" + I.color = draw_color if(!isnull(aux_marking)) for(var/a in auxmarking) var/image/I = a diff --git a/code/modules/surgery/bodyparts/helpers.dm b/code/modules/surgery/bodyparts/helpers.dm index aaca33685b..a1f1bd7daf 100644 --- a/code/modules/surgery/bodyparts/helpers.dm +++ b/code/modules/surgery/bodyparts/helpers.dm @@ -252,37 +252,6 @@ L.change_bodypart_status(BODYPART_ROBOTIC) . = L - -/proc/skintone2hex(skin_tone) - . = 0 - switch(skin_tone) - if("caucasian1") - . = "ffe0d1" - if("caucasian2") - . = "fcccb3" - if("caucasian3") - . = "e8b59b" - if("latino") - . = "d9ae96" - if("mediterranean") - . = "c79b8b" - if("asian1") - . = "ffdeb3" - if("asian2") - . = "e3ba84" - if("arab") - . = "c4915e" - if("indian") - . = "b87840" - if("african1") - . = "754523" - if("african2") - . = "471c18" - if("albino") - . = "fff4e6" - if("orange") - . = "ffc905" - /mob/living/carbon/proc/Digitigrade_Leg_Swap(swap_back) for(var/X in bodyparts) var/obj/item/bodypart/O = X diff --git a/config/game_options.txt b/config/game_options.txt index 51e68ac273..c5c936c3fc 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -635,4 +635,7 @@ THRESHOLD_BODY_SIZE_SLOWDOWN 0.85 ## Multiplier used in the smaller strides slowdown calculation. ## Doesn't apply to floating or crawling mobs. -BODY_SIZE_SLOWDOWN_MULTIPLIER 0.25 \ No newline at end of file +BODY_SIZE_SLOWDOWN_MULTIPLIER 0.25 + +## Allows players to set a hexadecimal color of their choice as skin tone, on top of the standard ones. +ALLOW_CUSTOM_SKINTONES \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-11774.yml b/html/changelogs/AutoChangeLog-pr-11774.yml new file mode 100644 index 0000000000..b694404e75 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11774.yml @@ -0,0 +1,6 @@ +author: "Trilbyspaceclone" +delete-after: True +changes: + - rscadd: "Maints have seen an uptick in left over types of welders, and tools. As well as different types of masks" + - rscadd: "New type of 02 locker - Rng! It can have almost any type of gas/breath mask and almost any type of o2 tank as well as even plasma men internals - Fancy!" + - tweak: "Tool lockers have 70% odds to have a spare random tool inside!" diff --git a/html/changelogs/AutoChangeLog-pr-11849.yml b/html/changelogs/AutoChangeLog-pr-11849.yml new file mode 100644 index 0000000000..2a5bf783dc --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11849.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - tweak: "Normalized box dorm lockers. Also removed a straight jacket found in the same area." diff --git a/html/changelogs/AutoChangeLog-pr-11852.yml b/html/changelogs/AutoChangeLog-pr-11852.yml new file mode 100644 index 0000000000..85a3295af4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11852.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - rscadd: "Custom skin tone preferences." diff --git a/html/changelogs/AutoChangeLog-pr-11857.yml b/html/changelogs/AutoChangeLog-pr-11857.yml new file mode 100644 index 0000000000..f6212d2d00 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11857.yml @@ -0,0 +1,6 @@ +author: "Trilbyspaceclone" +delete-after: True +changes: + - rscadd: "12 new more drinks for most races!" + - rscadd: "New animations for mauna loa, and colour swap from red to blue for a Paramedic Hardsuit helm" + - tweak: "Lowers cog champ ((the drink)) flare rate" diff --git a/html/changelogs/AutoChangeLog-pr-11863.yml b/html/changelogs/AutoChangeLog-pr-11863.yml new file mode 100644 index 0000000000..f7d9b75d51 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11863.yml @@ -0,0 +1,4 @@ +author: "Trilbyspaceclone" +delete-after: True +changes: + - rscadd: "Honey Palm now distills into mead rather then wine" diff --git a/html/changelogs/AutoChangeLog-pr-11869.yml b/html/changelogs/AutoChangeLog-pr-11869.yml new file mode 100644 index 0000000000..c75d84dd90 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11869.yml @@ -0,0 +1,15 @@ +author: "necromanceranne" +delete-after: True +changes: + - rscadd: "You can now craft armwraps!" + - balance: "Pugilists disarm you more easily and are harder to disarm. They also get a discount on disarm." + - balance: "Pugilists only suffer a flat 10% chance to miss you. It's just like old punches! Kinda." + - balance: "Chaplain's armbands are a +2, up from a +1!" + - balance: "Martial artists spend stamina when they disarm." + - balance: "Rising Bass had several moves shortened and made stronger. Has a disarm override attack which does stamina damage and trips people on a disarm stun punch." + - balance: "CQC had it's disarm move altered to be a stronger version of Krav Maga's. Dizzies and disarms on a disarm stun punch or just does some stamina damage and brute damage." + - balance: "Sleeping Carp can punch you to the floor on a harm stun punch." + - bugfix: "Hugs of the Northstar are no longer nodrop." + - bugfix: "Adding in some overrides and proper flag checks for martial arts." + - bugfix: "Stun thresholding stops disarm spams at extremely high stamina loss." + - tweak: "Ashen Arrows are actually called Ashen Arrows in the crafting menu." diff --git a/html/changelogs/AutoChangeLog-pr-11870.yml b/html/changelogs/AutoChangeLog-pr-11870.yml new file mode 100644 index 0000000000..a2861d1dad --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11870.yml @@ -0,0 +1,4 @@ +author: "Trilbyspaceclone" +delete-after: True +changes: + - bugfix: "Mimes have made catnip plants not become invisible. How helpful." diff --git a/html/changelogs/AutoChangeLog-pr-11877.yml b/html/changelogs/AutoChangeLog-pr-11877.yml new file mode 100644 index 0000000000..b75747a3cd --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11877.yml @@ -0,0 +1,4 @@ +author: "Detective-Google" +delete-after: True +changes: + - bugfix: "uncorks some of Lambda's rooms." diff --git a/html/changelogs/AutoChangeLog-pr-11880.yml b/html/changelogs/AutoChangeLog-pr-11880.yml new file mode 100644 index 0000000000..c2bf19a6b3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11880.yml @@ -0,0 +1,4 @@ +author: "Anonymous" +delete-after: True +changes: + - rscadd: "Xenohybrids will now scream like xeno." diff --git a/html/changelogs/AutoChangeLog-pr-11886.yml b/html/changelogs/AutoChangeLog-pr-11886.yml new file mode 100644 index 0000000000..ca6b194533 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11886.yml @@ -0,0 +1,4 @@ +author: "Jake Park" +delete-after: True +changes: + - bugfix: "fixed path name for youtool vending" diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index f2ea9fa55d..3c5dfe5012 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index a2ea222a68..803b4aa390 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/suit_digi.dmi b/icons/mob/clothing/suit_digi.dmi index 5287bac43c..ca2a088551 100644 Binary files a/icons/mob/clothing/suit_digi.dmi and b/icons/mob/clothing/suit_digi.dmi differ diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi index 4485a9a5f8..96ff50e138 100644 Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ diff --git a/icons/mob/clothing/uniform_digi.dmi b/icons/mob/clothing/uniform_digi.dmi index 6827581b85..94890dd6ad 100644 Binary files a/icons/mob/clothing/uniform_digi.dmi and b/icons/mob/clothing/uniform_digi.dmi differ diff --git a/icons/mob/human_parts_greyscale.dmi b/icons/mob/human_parts_greyscale.dmi index 3ecfc7bb0c..989ec8049c 100644 Binary files a/icons/mob/human_parts_greyscale.dmi and b/icons/mob/human_parts_greyscale.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 2e0906ea20..c88d1ce766 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index dfebe38155..a987f2484c 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 07e7bf1da8..c178cdba04 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/modular_citadel/code/modules/arousal/genitals.dm b/modular_citadel/code/modules/arousal/genitals.dm index 8fda73b199..68e9259183 100644 --- a/modular_citadel/code/modules/arousal/genitals.dm +++ b/modular_citadel/code/modules/arousal/genitals.dm @@ -319,7 +319,7 @@ genital_overlay = center_image(genital_overlay, dim_x, dim_y) if(dna.species.use_skintones && dna.features["genitals_use_skintone"]) - genital_overlay.color = "#[skintone2hex(skin_tone)]" + genital_overlay.color = SKINTONE2HEX(skin_tone) else switch(S.color_src) if("cock_color") @@ -331,7 +331,7 @@ if("vag_color") genital_overlay.color = "#[dna.features["vag_color"]]" - genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size][dna.species.use_skintones ? "_s" : ""]_[aroused_state]_[layertext]" + genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size][(dna.species.use_skintones && !dna.skin_tone_override) ? "_s" : ""]_[aroused_state]_[layertext]" if(layers_num[layer] == GENITALS_FRONT_LAYER && G.genital_flags & GENITAL_THROUGH_CLOTHES) genital_overlay.layer = -GENITALS_EXPOSED_LAYER @@ -361,9 +361,8 @@ var/willyCheck = getorganslot(ORGAN_SLOT_PENIS) if(organCheck == FALSE) - if(ishuman(src) && dna.species.id == "human") + if(ishuman(src) && dna.species.use_skintones) dna.features["genitals_use_skintone"] = TRUE - dna.species.use_skintones = TRUE if(src.dna.species.fixed_mut_color) dna.features["cock_color"] = "[dna.species.fixed_mut_color]" dna.features["breasts_color"] = "[dna.species.fixed_mut_color]" diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm index 8183ba92bc..c936eb9dc4 100644 --- a/modular_citadel/code/modules/arousal/organs/breasts.dm +++ b/modular_citadel/code/modules/arousal/organs/breasts.dm @@ -55,13 +55,14 @@ var/datum/sprite_accessory/S = GLOB.breasts_shapes_list[shape] var/icon_shape = S ? S.icon_state : "pair" var/icon_size = CLAMP(breast_values[size], BREASTS_ICON_MIN_SIZE, BREASTS_ICON_MAX_SIZE) - icon_state = "breasts_[icon_shape]_[breast_values[icon_size]]" + icon_state = "breasts_[icon_shape]_[icon_size]" if(owner) if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"]) if(ishuman(owner)) // Check before recasting type, although someone fucked up if you're not human AND have use_skintones somehow... var/mob/living/carbon/human/H = owner // only human mobs have skin_tone, which we need. - color = "#[skintone2hex(H.skin_tone)]" - icon_state += "_s" + color = SKINTONE2HEX(H.skin_tone) + if(!H.dna.skin_tone_override) + icon_state += "_s" else color = "#[owner.dna.features["breasts_color"]]" @@ -117,7 +118,7 @@ /obj/item/organ/genital/breasts/get_features(mob/living/carbon/human/H) var/datum/dna/D = H.dna if(D.species.use_skintones && D.features["genitals_use_skintone"]) - color = "#[skintone2hex(H.skin_tone)]" + color = SKINTONE2HEX(H.skin_tone) else color = "#[D.features["breasts_color"]]" size = D.features["breasts_size"] diff --git a/modular_citadel/code/modules/arousal/organs/penis.dm b/modular_citadel/code/modules/arousal/organs/penis.dm index b3ca0062f8..c05549aaa0 100644 --- a/modular_citadel/code/modules/arousal/organs/penis.dm +++ b/modular_citadel/code/modules/arousal/organs/penis.dm @@ -84,8 +84,9 @@ if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"]) if(ishuman(owner)) // Check before recasting type, although someone fucked up if you're not human AND have use_skintones somehow... var/mob/living/carbon/human/H = owner // only human mobs have skin_tone, which we need. - color = "#[skintone2hex(H.skin_tone)]" - icon_state += "_s" + color = SKINTONE2HEX(H.skin_tone) + if(!H.dna.skin_tone_override) + icon_state += "_s" else color = "#[owner.dna.features["cock_color"]]" if(genital_flags & GENITAL_CAN_TAUR && S?.taur_icon && (!S.feat_taur || owner.dna.features[S.feat_taur]) && owner.dna.species.mutant_bodyparts["taur"]) @@ -98,7 +99,7 @@ /obj/item/organ/genital/penis/get_features(mob/living/carbon/human/H) var/datum/dna/D = H.dna if(D.species.use_skintones && D.features["genitals_use_skintone"]) - color = "#[skintone2hex(H.skin_tone)]" + color = SKINTONE2HEX(H.skin_tone) else color = "#[D.features["cock_color"]]" length = D.features["cock_length"] diff --git a/modular_citadel/code/modules/arousal/organs/testicles.dm b/modular_citadel/code/modules/arousal/organs/testicles.dm index 4264cf5e48..a8946294b1 100644 --- a/modular_citadel/code/modules/arousal/organs/testicles.dm +++ b/modular_citadel/code/modules/arousal/organs/testicles.dm @@ -49,15 +49,16 @@ if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"]) if(ishuman(owner)) // Check before recasting type, although someone fucked up if you're not human AND have use_skintones somehow... var/mob/living/carbon/human/H = owner // only human mobs have skin_tone, which we need. - color = "#[skintone2hex(H.skin_tone)]" - icon_state += "_s" + color = SKINTONE2HEX(H.skin_tone) + if(!H.dna.skin_tone_override) + icon_state += "_s" else color = "#[owner.dna.features["balls_color"]]" /obj/item/organ/genital/testicles/get_features(mob/living/carbon/human/H) var/datum/dna/D = H.dna if(D.species.use_skintones && D.features["genitals_use_skintone"]) - color = "#[skintone2hex(H.skin_tone)]" + color = SKINTONE2HEX(H.skin_tone) else color = "#[D.features["balls_color"]]" shape = D.features["balls_shape"] diff --git a/modular_citadel/code/modules/arousal/organs/vagina.dm b/modular_citadel/code/modules/arousal/organs/vagina.dm index f7e8eddcbd..cdc7dc4927 100644 --- a/modular_citadel/code/modules/arousal/organs/vagina.dm +++ b/modular_citadel/code/modules/arousal/organs/vagina.dm @@ -55,8 +55,9 @@ if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"]) if(ishuman(owner)) // Check before recasting type, although someone fucked up if you're not human AND have use_skintones somehow... var/mob/living/carbon/human/H = owner // only human mobs have skin_tone, which we need. - color = "#[skintone2hex(H.skin_tone)]" - icon_state += "_s" + color = SKINTONE2HEX(H.skin_tone) + if(!H.dna.skin_tone_override) + icon_state += "_s" else color = "#[owner.dna.features["vag_color"]]" if(ishuman(owner)) @@ -66,7 +67,7 @@ /obj/item/organ/genital/vagina/get_features(mob/living/carbon/human/H) var/datum/dna/D = H.dna if(D.species.use_skintones && D.features["genitals_use_skintone"]) - color = "#[skintone2hex(H.skin_tone)]" + color = SKINTONE2HEX(H.skin_tone) else color = "[D.features["vag_color"]]" shape = "[D.features["vag_shape"]]" diff --git a/modular_citadel/code/modules/clothing/trek.dm b/modular_citadel/code/modules/clothing/trek.dm index b4ec9fbd61..c522d1af81 100644 --- a/modular_citadel/code/modules/clothing/trek.dm +++ b/modular_citadel/code/modules/clothing/trek.dm @@ -18,7 +18,7 @@ mob_overlay_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' item_state = "trek_ds9_coat" body_parts_covered = CHEST|GROIN|ARMS - mutantrace_variation = NONE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON permeability_coefficient = 0.50 allowed = list( /obj/item/flashlight, /obj/item/analyzer, @@ -47,7 +47,7 @@ mob_overlay_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' icon_state = "fedcoat" item_state = "fedcoat" - mutantrace_variation = NONE + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON blood_overlay_type = "coat" body_parts_covered = CHEST|GROIN|ARMS allowed = list( @@ -113,6 +113,7 @@ mob_overlay_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' icon_state = "fedmodern" item_state = "fedmodern" + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON body_parts_covered = CHEST|GROIN|ARMS allowed = list( /obj/item/flashlight, /obj/item/analyzer, diff --git a/modular_citadel/code/modules/mob/cit_emotes.dm b/modular_citadel/code/modules/mob/cit_emotes.dm index 2be83733e5..2fea5f56e0 100644 --- a/modular_citadel/code/modules/mob/cit_emotes.dm +++ b/modular_citadel/code/modules/mob/cit_emotes.dm @@ -54,6 +54,8 @@ sound = 'modular_citadel/sound/voice/scream_skeleton.ogg' if (is_species(user, /datum/species/fly) || is_species(user, /datum/species/insect)) sound = 'modular_citadel/sound/voice/scream_moth.ogg' + if (is_species(user, /datum/species/xeno)) + sound = 'sound/voice/hiss6.ogg' if(isalien(user)) sound = 'sound/voice/hiss6.ogg' LAZYINITLIST(user.alternate_screams) diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm b/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm index 0a3bdb727d..b0b18e63a0 100644 --- a/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm +++ b/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm @@ -265,20 +265,22 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm ! R.cell.give(500) return R.visible_message("[R] begins to lick \the [target.name] clean...", "You begin to lick \the [target.name] clean...") - else if(ishuman(target)) + else if(isliving(target)) var/mob/living/L = target - if(status == 0 && check_zone(R.zone_selected) == "head") - R.visible_message("\the [R] affectionally licks \the [L]'s face!", "You affectionally lick \the [L]'s face!") - playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1) - if(istype(L) && L.fire_stacks > 0) - L.adjust_fire_stacks(-10) - return - else if(status == 0) - R.visible_message("\the [R] affectionally licks \the [L]!", "You affectionally lick \the [L]!") - playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1) - if(istype(L) && L.fire_stacks > 0) - L.adjust_fire_stacks(-10) - return + if(!status) + if(L.ckey && !(L.client?.prefs.lickable)) + to_chat(R, "ERROR ERROR: Target not lickable. Aborting display-of-affection subroutine.") + return + if(check_zone(R.zone_selected) == "head") + R.visible_message("\the [R] affectionally licks \the [L]'s face!", "You affectionally lick \the [L]'s face!") + playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1) + if(istype(L) && L.fire_stacks > 0) + L.adjust_fire_stacks(-10) + else + R.visible_message("\the [R] affectionally licks \the [L]!", "You affectionally lick \the [L]!") + playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1) + if(istype(L) && L.fire_stacks > 0) + L.adjust_fire_stacks(-10) else if(R.cell.charge <= 800) to_chat(R, "Insufficent Power!") @@ -310,35 +312,43 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm ! return //Nerfed tongue for flavour reasons (haha geddit?). Used for aux skins for regular borgs -/obj/item/soap/tongue/flavour +/obj/item/dogborg_tongue + name = "synthetic tongue" + desc = "Useful for slurping mess off the floor before affectionally licking the crew members in the face." + icon = 'icons/mob/dogborg.dmi' + icon_state = "synthtongue" + hitsound = 'sound/effects/attackblob.ogg' desc = "For giving affectionate kisses." + item_flags = NOBLUDGEON -/obj/item/soap/tongue/flavour/attack_self(mob/user) - return - -/obj/item/soap/tongue/flavour/afterattack(atom/target, mob/user, proximity) - if(!proximity) +/obj/item/dogborg_tongue/afterattack(atom/target, mob/user, proximity) + . = ..() + if(!proximity || !isliving(target)) return var/mob/living/silicon/robot/R = user - if(ishuman(target)) - var/mob/living/L = target - if(status == 0 && check_zone(R.zone_selected) == "head") - R.visible_message("\the [R] affectionally licks \the [L]'s face!", "You affectionally lick \the [L]'s face!") - playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1) - return - else if(status == 0) - R.visible_message("\the [R] affectionally licks \the [L]!", "You affectionally lick \the [L]!") - playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1) - return + var/mob/living/L = target + if(L.ckey && !(L.client?.prefs.lickable)) + to_chat(R, "ERROR ERROR: Target not lickable. Aborting display-of-affection subroutine.") + return -//Same as above but for noses -/obj/item/analyzer/nose/flavour/AltClick(mob/user) - return + if(check_zone(R.zone_selected) == "head") + R.visible_message("\the [R] affectionally licks \the [L]'s face!", "You affectionally lick \the [L]'s face!") + playsound(R, 'sound/effects/attackblob.ogg', 50, 1) + else + R.visible_message("\the [R] affectionally licks \the [L]!", "You affectionally lick \the [L]!") + playsound(R, 'sound/effects/attackblob.ogg', 50, 1) -/obj/item/analyzer/nose/flavour/attack_self(mob/user) - return -/obj/item/analyzer/nose/flavour/afterattack(atom/target, mob/user, proximity) +/obj/item/dogborg_nose + name = "boop module" + icon = 'icons/mob/dogborg.dmi' + icon_state = "nose" + desc = "The BOOP module" + flags_1 = CONDUCT_1|NOBLUDGEON + force = 0 + +/obj/item/dogborg_nose/afterattack(atom/target, mob/user, proximity) + . = ..() if(!proximity) return do_attack_animation(target, null, src) diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm index 198e6c5c24..97261e07f2 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm @@ -68,11 +68,11 @@ B = new if(H.dna.species.use_skintones && H.dna.features["genitals_use_skintone"]) - B.color = skintone2hex(H.skin_tone) + B.color = SKINTONE2HEX(H.skin_tone) else if(M.dna.features["breasts_color"]) B.color = "#[M.dna.features["breasts_color"]]" else - B.color = skintone2hex(H.skin_tone) + B.color = SKINTONE2HEX(H.skin_tone) B.size = "flat" B.cached_size = 0 B.prev_size = 0 diff --git a/modular_citadel/icons/mob/citadel/uniforms.dmi b/modular_citadel/icons/mob/citadel/uniforms.dmi index 0a82392960..5f3b9a5fb7 100644 Binary files a/modular_citadel/icons/mob/citadel/uniforms.dmi and b/modular_citadel/icons/mob/citadel/uniforms.dmi differ diff --git a/modular_citadel/icons/mob/clothing/turtlenecks.dmi b/modular_citadel/icons/mob/clothing/turtlenecks.dmi deleted file mode 100644 index 857033fdce..0000000000 Binary files a/modular_citadel/icons/mob/clothing/turtlenecks.dmi and /dev/null differ diff --git a/modular_citadel/icons/obj/clothing/turtlenecks.dmi b/modular_citadel/icons/obj/clothing/turtlenecks.dmi deleted file mode 100644 index ec37880cd2..0000000000 Binary files a/modular_citadel/icons/obj/clothing/turtlenecks.dmi and /dev/null differ