diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
index e0ecd3bd02a..35a48d4e719 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
@@ -28,7 +28,7 @@
"aB" = (/obj/effect/decal/cleanable/dirt,/obj/structure/chair{dir = 1},/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/comm)
"aC" = (/obj/structure/table,/obj/effect/decal/cleanable/dirt,/obj/item/toy/cards/deck,/obj/item/folder/blue,/obj/item/pen,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/comm)
"aD" = (/obj/machinery/door/airlock/highsecurity,/turf/simulated/floor/plating,/area/ruin/space/ancientstation/hivebot)
-"aE" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/effect/decal/cleanable/dirt,/obj/machinery/power/apc{dir = 4; name = "Charlie Command APC"; pixel_x = 24; start_charge = 0},/turf/simulated/floor/plating,/area/ruin/space/ancientstation/comm)
+"aE" = (/obj/structure/cable,/obj/machinery/power/apc{dir = 4; name = "Beta Engineering APC"; pixel_x = 24; report_power_alarm = 0; start_charge = 0},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel/airless,/area/ruin/space/ancientstation/atmo)
"aF" = (/obj/structure/table,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/comm)
"aG" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/comm)
"aH" = (/obj/item/solar_assembly,/turf/template_noop,/area/template_noop)
@@ -149,15 +149,15 @@
"cS" = (/obj/structure/sign/poster/official/nanomichi_ad,/turf/simulated/wall/rust,/area/ruin/space/ancientstation/betanorth)
"cT" = (/obj/machinery/light/small{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel/airless,/area/ruin/space/ancientstation/betanorth)
"cU" = (/turf/simulated/wall/rust,/area/ruin/space/ancientstation/engi)
-"cV" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light/small{dir = 8},/obj/machinery/alarm/all_access{dir = 4; pixel_x = -24},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation)
-"cW" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/effect/decal/cleanable/dirt,/obj/structure/chair{dir = 1},/obj/machinery/alarm/all_access{dir = 8; pixel_x = 24},/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 4},/area/ruin/space/ancientstation/comm)
+"cV" = (/obj/structure/cable{d2 = 4; icon_state = "0-4"},/obj/effect/decal/cleanable/dirt,/obj/machinery/power/apc{dir = 1; name = "Delta Prototype Lab APC"; pixel_y = 24; report_power_alarm = 0; start_charge = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/ruin/space/ancientstation/proto)
+"cW" = (/obj/machinery/alarm/all_access{pixel_y = 24; report_danger_level = 0},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "white"},/area/ruin/space/ancientstation/proto)
"cX" = (/obj/structure/transit_tube,/turf/template_noop,/area/template_noop)
"cY" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/hydroponics)
"cZ" = (/obj/machinery/hydroponics/soil,/turf/simulated/floor/grass,/area/ruin/space/ancientstation/hydroponics)
"da" = (/obj/structure/reagent_dispensers/watertank/high,/obj/item/reagent_containers/glass/bucket,/obj/item/reagent_containers/glass/bucket,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/hydroponics)
"db" = (/obj/item/solar_assembly,/obj/structure/lattice,/turf/template_noop,/area/template_noop)
"dc" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/structure/chair{dir = 1},/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 10},/area/ruin/space/ancientstation/comm)
-"dd" = (/obj/machinery/light/small{dir = 4},/obj/effect/decal/cleanable/dirt,/obj/machinery/alarm/all_access{dir = 8; pixel_x = 24},/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation)
+"dd" = (/obj/structure/cable,/obj/machinery/power/apc{dir = 4; name = "Charlie Main Corridor APC"; pixel_x = 24; report_power_alarm = 0; start_charge = 0},/obj/structure/closet/crate,/obj/item/storage/backpack/old,/obj/item/storage/backpack/old,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/ruin/space/ancientstation)
"de" = (/obj/structure/transit_tube{icon_state = "E-W-Pass"},/turf/template_noop,/area/template_noop)
"df" = (/obj/structure/cable/yellow,/turf/simulated/floor/plating/airless,/area/template_noop)
"dg" = (/turf/simulated/wall/rust,/area/ruin/space/ancientstation/sec)
@@ -181,7 +181,7 @@
"dy" = (/obj/machinery/computer{desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."; name = "Broken Computer"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/sec)
"dz" = (/obj/structure/transit_tube/station/reverse,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/warning_stripes/arrow,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation)
"dA" = (/obj/structure/sign/poster/contraband/donut_corp,/turf/simulated/wall/rust,/area/ruin/space/ancientstation/sec)
-"dB" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm/all_access{dir = 4; pixel_x = -24},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/deltacorridor)
+"dB" = (/obj/machinery/alarm/all_access{dir = 8; pixel_x = 24; report_danger_level = 0},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel/airless,/area/ruin/space/ancientstation/atmo)
"dC" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/deltacorridor)
"dD" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 9; icon_state = "whitepurple"},/area/ruin/space/ancientstation/rnd)
"dE" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "white"},/area/ruin/space/ancientstation/rnd)
@@ -203,7 +203,7 @@
"dU" = (/obj/structure/table,/obj/item/seeds/harebell,/obj/item/seeds/carrot,/obj/item/seeds/potato,/obj/item/seeds/ambrosia,/obj/item/seeds/poppy,/obj/item/seeds/grape,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/hydroponics)
"dV" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation)
"dW" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation)
-"dX" = (/obj/structure/table,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/power/apc{dir = 8; name = "Charlie Security APC"; pixel_x = -24; shock_proof = 0; start_charge = 0},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 9},/area/ruin/space/ancientstation/sec)
+"dX" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/effect/decal/cleanable/dirt,/obj/machinery/power/apc{dir = 4; name = "Charlie Command APC"; pixel_x = 24; report_power_alarm = 0; start_charge = 0},/turf/simulated/floor/plating,/area/ruin/space/ancientstation/comm)
"dY" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/sec)
"dZ" = (/obj/machinery/computer{desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."; name = "Broken Computer"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/ruin/space/ancientstation/sec)
"ea" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/firealarm{dir = 4; pixel_x = -28},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/deltacorridor)
@@ -243,7 +243,7 @@
"eI" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 4},/area/ruin/space/ancientstation/sec)
"eJ" = (/obj/structure/table,/obj/machinery/atmospherics/unary/vent_pump/on,/obj/item/tank/oxygen,/obj/item/clothing/mask/breath,/turf/simulated/floor/plasteel{dir = 9; icon_state = "yellow"},/area/ruin/space/ancientstation/engi)
"eK" = (/turf/simulated/floor/plating/airless,/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating/airless/catwalk,/area/template_noop)
-"eL" = (/obj/structure/rack,/obj/item/clothing/suit/space/nasavoid/old,/obj/machinery/alarm/all_access{dir = 8; pixel_x = 24},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "yellow"; dir = 5},/area/ruin/space/ancientstation/engi)
+"eL" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/effect/decal/cleanable/dirt,/obj/structure/chair{dir = 1},/obj/machinery/alarm/all_access{dir = 8; pixel_x = 24; report_danger_level = 0},/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 4},/area/ruin/space/ancientstation/comm)
"eM" = (/obj/machinery/door/firedoor,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation)
"eN" = (/obj/structure/sign/poster/official/here_for_your_safety,/turf/simulated/wall/rust,/area/ruin/space/ancientstation/sec)
"eO" = (/obj/structure/table,/obj/item/paper,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/sec)
@@ -267,7 +267,7 @@
"fg" = (/obj/structure/table,/obj/item/book/manual/security_space_law,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 5},/area/ruin/space/ancientstation/sec)
"fh" = (/obj/structure/table,/obj/item/pen,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/sec)
"fi" = (/obj/item/apc_electronics,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/ruin/space/ancientstation/deltacorridor)
-"fj" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/effect/decal/cleanable/dirt,/obj/machinery/power/apc{dir = 1; name = "Delta Main Corridor APC"; pixel_y = 24; start_charge = 0},/turf/simulated/floor/plating,/area/ruin/space/ancientstation/deltacorridor)
+"fj" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light/small{dir = 8},/obj/machinery/alarm/all_access{dir = 4; pixel_x = -24; report_danger_level = 0},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation)
"fk" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/deltacorridor)
"fl" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/deltacorridor)
"fm" = (/obj/machinery/light{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 10; icon_state = "whitepurple"},/area/ruin/space/ancientstation/rnd)
@@ -296,10 +296,10 @@
"fJ" = (/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation)
"fK" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/maintenance_hatch,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/ruin/space/ancientstation)
"fL" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/ruin/space/ancientstation)
-"fM" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d2 = 4; icon_state = "0-4"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/power/apc{dir = 1; name = "Charlie Hydroponics APC"; pixel_y = 24; start_charge = 0},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/ruin/space/ancientstation/hydroponics)
+"fM" = (/obj/machinery/light/small{dir = 4},/obj/effect/decal/cleanable/dirt,/obj/machinery/alarm/all_access{dir = 8; pixel_x = 24; report_danger_level = 0},/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation)
"fN" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/ruin/space/ancientstation)
"fO" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/ruin/space/ancientstation)
-"fP" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 2; name = "Charlie Kitchen APC"; pixel_y = -24; start_charge = 0},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/ruin/space/ancientstation/kitchen)
+"fP" = (/obj/structure/rack,/obj/item/clothing/suit/space/nasavoid/old,/obj/machinery/alarm/all_access{dir = 8; pixel_x = 24; report_danger_level = 0},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "yellow"; dir = 5},/area/ruin/space/ancientstation/engi)
"fQ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/maintenance_hatch,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/ruin/space/ancientstation)
"fR" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation)
"fS" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation)
@@ -314,7 +314,7 @@
"gb" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/ruin/space/ancientstation/deltacorridor)
"gc" = (/mob/living/simple_animal/hostile/carp,/turf/template_noop,/area/template_noop)
"gd" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/deltacorridor)
-"ge" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "Delta RnD APC"; pixel_x = 24; start_charge = 0},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/rnd)
+"ge" = (/obj/structure/table,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/power/apc{dir = 8; name = "Charlie Security APC"; pixel_x = -24; report_power_alarm = 0; shock_proof = 0; start_charge = 0},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 9},/area/ruin/space/ancientstation/sec)
"gf" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/rnd)
"gg" = (/obj/structure/table,/obj/effect/decal/cleanable/dirt,/obj/item/stack/sheet/metal/fifty,/obj/item/stack/sheet/glass/fifty{pixel_x = 2; pixel_y = -2},/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/rnd)
"gh" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/structure/table,/obj/effect/decal/cleanable/dirt,/obj/item/storage/toolbox/mechanical/old,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/rnd)
@@ -345,7 +345,7 @@
"gG" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/ruin/space/ancientstation/kitchen)
"gH" = (/obj/machinery/light/small{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/ruin/space/ancientstation/kitchen)
"gI" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/ruin/space/ancientstation/kitchen)
-"gJ" = (/obj/effect/decal/cleanable/egg_smudge,/obj/machinery/alarm/all_access{pixel_y = 24},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/ruin/space/ancientstation/kitchen)
+"gJ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm/all_access{dir = 4; pixel_x = -24; report_danger_level = 0},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/deltacorridor)
"gK" = (/obj/machinery/processor,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/ruin/space/ancientstation/kitchen)
"gL" = (/obj/structure/table,/obj/machinery/kitchen_machine/microwave,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/ruin/space/ancientstation/kitchen)
"gM" = (/obj/structure/table,/obj/item/folder/red,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/sec)
@@ -371,7 +371,7 @@
"hg" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/structure/chair,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/rnd)
"hh" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitecorner"},/area/ruin/space/ancientstation/rnd)
"hi" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitecorner"},/area/ruin/space/ancientstation/rnd)
-"hj" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/decal/cleanable/dirt,/obj/machinery/alarm/all_access{dir = 8; pixel_x = 24},/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/rnd)
+"hj" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/alarm/all_access{dir = 8; pixel_x = 24; report_danger_level = 0},/mob/living/simple_animal/hostile/hivebot,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/deltacorridor)
"hk" = (/obj/structure/table,/obj/effect/decal/cleanable/dirt,/obj/item/reagent_containers/glass/bottle/water{pixel_y = 6},/obj/item/reagent_containers/glass/bottle/hydrogen{pixel_x = 5},/obj/item/reagent_containers/glass/bottle/fluorine{pixel_x = -3},/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/rnd)
"hl" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/item/stack/cable_coil{amount = 2},/turf/simulated/floor/plating/airless,/area/template_noop)
"hm" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/ruin/space/ancientstation/engi)
@@ -417,7 +417,7 @@
"ia" = (/obj/structure/table,/obj/item/reagent_containers/food/condiment/saltshaker{pixel_x = -2; pixel_y = 2},/obj/item/reagent_containers/food/condiment/peppermill{pixel_x = 5; pixel_y = -2},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/ruin/space/ancientstation/kitchen)
"ib" = (/obj/structure/table,/obj/item/trash/plate,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/ruin/space/ancientstation/kitchen)
"ic" = (/obj/machinery/light/small{dir = 4},/obj/structure/chair{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/ruin/space/ancientstation/kitchen)
-"id" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/alarm/all_access{dir = 8; pixel_x = 24},/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation)
+"id" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/effect/decal/cleanable/dirt,/obj/machinery/power/apc{dir = 1; name = "Delta Main Corridor APC"; pixel_y = 24; report_power_alarm = 0; start_charge = 0},/turf/simulated/floor/plating,/area/ruin/space/ancientstation/deltacorridor)
"ie" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/deltacorridor)
"if" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/deltacorridor)
"ig" = (/obj/effect/decal/cleanable/dirt,/obj/structure/chair{dir = 1},/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/rnd)
@@ -462,7 +462,7 @@
"iT" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/deltacorridor)
"iU" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/decal/cleanable/dirt,/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/deltacorridor)
"iV" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/light{dir = 1; in_use = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/deltacorridor)
-"iW" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/alarm/all_access{dir = 8; pixel_x = 24},/mob/living/simple_animal/hostile/hivebot,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/deltacorridor)
+"iW" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d2 = 4; icon_state = "0-4"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/power/apc{dir = 1; name = "Charlie Hydroponics APC"; pixel_y = 24; report_power_alarm = 0; start_charge = 0},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/ruin/space/ancientstation/hydroponics)
"iX" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/deltacorridor)
"iY" = (/obj/machinery/light/small{dir = 4},/obj/effect/decal/cleanable/dirt,/obj/structure/closet/crate/secure/weapon,/obj/item/flash,/obj/item/flash,/turf/simulated/floor/plating,/area/ruin/space/ancientstation/deltacorridor)
"iZ" = (/obj/structure/closet/crate/radiation,/obj/item/stack/sheet/mineral/uranium{amount = 10},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/ruin/space/ancientstation/engi)
@@ -496,10 +496,10 @@
"jB" = (/obj/structure/table/reinforced,/obj/item/clothing/suit/space/hardsuit/ancient,/obj/item/clothing/head/helmet/space/hardsuit/ancient,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "white"},/area/ruin/space/ancientstation/proto)
"jC" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/door/poddoor{id_tag = "proto"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/ruin/space/ancientstation/proto)
"jD" = (/obj/machinery/light{dir = 1; in_use = 1},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/warning_stripes/west,/turf/simulated/floor/plasteel{icon_state = "white"},/area/ruin/space/ancientstation/proto)
-"jE" = (/obj/structure/cable{d2 = 4; icon_state = "0-4"},/obj/effect/decal/cleanable/dirt,/obj/machinery/power/apc{dir = 1; name = "Delta Prototype Lab APC"; pixel_y = 24; start_charge = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/ruin/space/ancientstation/proto)
+"jE" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 2; name = "Charlie Kitchen APC"; pixel_y = -24; report_power_alarm = 0; start_charge = 0},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/ruin/space/ancientstation/kitchen)
"jF" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "white"},/area/ruin/space/ancientstation/proto)
"jG" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "white"},/area/ruin/space/ancientstation/proto)
-"jH" = (/obj/machinery/alarm/all_access{pixel_y = 24},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "white"},/area/ruin/space/ancientstation/proto)
+"jH" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "Delta RnD APC"; pixel_x = 24; report_power_alarm = 0; start_charge = 0},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/rnd)
"jI" = (/obj/machinery/light{dir = 1; in_use = 1},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/warning_stripes/east,/turf/simulated/floor/plasteel{icon_state = "white"},/area/ruin/space/ancientstation/proto)
"jJ" = (/obj/structure/table/reinforced,/obj/machinery/the_singularitygen,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "white"},/area/ruin/space/ancientstation/proto)
"jK" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/engine/vacuum,/area/ruin/space/ancientstation/atmo)
@@ -541,7 +541,7 @@
"ku" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 8},/turf/simulated/floor/plating/airless,/area/ruin/space/ancientstation/atmo)
"kv" = (/turf/simulated/floor/plating,/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating/airless/catwalk,/area/template_noop)
"kw" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/engine,/area/ruin/space/ancientstation/atmo)
-"kx" = (/obj/structure/cable,/obj/machinery/power/apc{dir = 4; name = "Charlie Main Corridor APC"; pixel_x = 24; start_charge = 0},/obj/structure/closet/crate,/obj/item/storage/backpack/old,/obj/item/storage/backpack/old,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/ruin/space/ancientstation)
+"kx" = (/obj/effect/decal/cleanable/egg_smudge,/obj/machinery/alarm/all_access{pixel_y = 24; report_danger_level = 0},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/ruin/space/ancientstation/kitchen)
"ky" = (/obj/structure/table/reinforced,/obj/item/healthanalyzer/advanced{desc = "A prototype hand-held body scanner able to distinguish vital signs of the subject."; name = "prototype health analyzer"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "white"},/area/ruin/space/ancientstation/proto)
"kz" = (/obj/machinery/light,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "white"},/area/ruin/space/ancientstation/proto)
"kA" = (/obj/machinery/computer{desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."; name = "Broken Computer"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "white"},/area/ruin/space/ancientstation/proto)
@@ -571,8 +571,8 @@
"kY" = (/obj/effect/decal/cleanable/dirt,/obj/structure/particle_accelerator/power_box{icon = 'icons/obj/machines/particle_accelerator3.dmi'},/turf/simulated/floor/plating,/area/ruin/space/ancientstation/deltacorridor)
"kZ" = (/turf/simulated/floor/plating,/turf/simulated/floor/plating/airless/catwalk,/area/template_noop)
"la" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/decal/cleanable/dirt,/mob/living/simple_animal/hostile/hivebot,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/rnd)
-"lb" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm/all_access{dir = 4; pixel_x = -24},/obj/effect/decal/cleanable/dirt,/mob/living/simple_animal/hostile/hivebot,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/deltacorridor)
-"lc" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/alarm/all_access{dir = 8; pixel_x = 24},/mob/living/simple_animal/hostile/hivebot,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/deltacorridor)
+"lb" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/decal/cleanable/dirt,/obj/machinery/alarm/all_access{dir = 8; pixel_x = 24; report_danger_level = 0},/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/rnd)
+"lc" = (/obj/structure/rack,/obj/item/stack/cable_coil,/obj/structure/cable,/obj/machinery/power/apc{dir = 4; name = "Charlie Engineering APC"; pixel_x = 24; report_power_alarm = 0; start_charge = 0},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 6; icon_state = "yellow"},/area/ruin/space/ancientstation/engi)
"ld" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/decal/cleanable/dirt,/mob/living/simple_animal/hostile/hivebot,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/deltacorridor)
"le" = (/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/effect/decal/cleanable/dirt,/mob/living/simple_animal/hostile/hivebot,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/deltacorridor)
"lf" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/light{dir = 1; in_use = 1},/obj/effect/decal/cleanable/dirt,/mob/living/simple_animal/hostile/hivebot,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/deltacorridor)
@@ -596,20 +596,20 @@
"lx" = (/obj/item/solar_assembly,/obj/item/solar_assembly,/obj/item/solar_assembly,/obj/item/solar_assembly,/obj/item/solar_assembly,/obj/item/solar_assembly,/obj/item/stack/sheet/glass{amount = 30},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 0; icon_state = "yellow"},/area/ruin/space/ancientstation/engi)
"ly" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 8; icon_state = "cautioncorner"},/area/ruin/space/ancientstation/engi)
"lz" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellow"},/area/ruin/space/ancientstation/engi)
-"lA" = (/obj/structure/cable,/obj/machinery/power/apc{dir = 4; name = "Beta Engineering APC"; pixel_x = 24; start_charge = 0},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel/airless,/area/ruin/space/ancientstation/atmo)
+"lA" = (/obj/machinery/alarm/all_access{dir = 4; pixel_x = -24; report_danger_level = 0},/obj/structure/rack,/obj/item/gun/energy/laser/retro/old{pixel_x = -3; pixel_y = -3},/obj/item/gun/energy/laser/retro/old,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 10; icon_state = "red"},/area/ruin/space/ancientstation/sec)
"lB" = (/obj/structure/table,/obj/item/clothing/gloves/color/fyellow/old,/obj/item/clothing/gloves/color/fyellow/old,/obj/item/multitool,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 10; icon_state = "yellow"},/area/ruin/space/ancientstation/engi)
"lC" = (/obj/structure/rack,/obj/item/storage/toolbox/mechanical/old,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 0; icon_state = "yellow"},/area/ruin/space/ancientstation/engi)
-"lD" = (/obj/structure/rack,/obj/item/stack/cable_coil,/obj/structure/cable,/obj/machinery/power/apc{dir = 4; name = "Charlie Engineering APC"; pixel_x = 24; start_charge = 0},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 6; icon_state = "yellow"},/area/ruin/space/ancientstation/engi)
+"lD" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm/all_access{dir = 4; pixel_x = -24; report_danger_level = 0},/obj/effect/decal/cleanable/dirt,/mob/living/simple_animal/hostile/hivebot,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/deltacorridor)
"lE" = (/obj/machinery/light/small{dir = 4},/obj/machinery/pipedispenser,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel/airless,/area/ruin/space/ancientstation/atmo)
"lF" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 8; icon_state = "red"},/area/ruin/space/ancientstation/sec)
"lG" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 2; icon_state = "redcorner"},/area/ruin/space/ancientstation/sec)
"lH" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 0; icon_state = "red"},/area/ruin/space/ancientstation/sec)
"lI" = (/obj/structure/table,/obj/item/restraints/handcuffs,/obj/item/clothing/mask/gas,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/ruin/space/ancientstation/sec)
"lJ" = (/obj/machinery/atmospherics/binary/pump{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel/airless,/area/ruin/space/ancientstation/atmo)
-"lK" = (/obj/machinery/alarm/all_access{dir = 4; pixel_x = -24},/obj/structure/rack,/obj/item/gun/energy/laser/retro/old{pixel_x = -3; pixel_y = -3},/obj/item/gun/energy/laser/retro/old,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 10; icon_state = "red"},/area/ruin/space/ancientstation/sec)
+"lK" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/alarm/all_access{dir = 8; pixel_x = 24; report_danger_level = 0},/mob/living/simple_animal/hostile/hivebot,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/deltacorridor)
"lL" = (/obj/structure/rack,/obj/item/clothing/suit/armor/vest/old,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 0; icon_state = "red"},/area/ruin/space/ancientstation/sec)
"lM" = (/obj/structure/rack,/obj/item/clothing/head/helmet/old,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/ruin/space/ancientstation/sec)
-"lN" = (/obj/machinery/alarm/all_access{dir = 8; pixel_x = 24},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel/airless,/area/ruin/space/ancientstation/atmo)
+"lN" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/alarm/all_access{dir = 8; pixel_x = 24; report_danger_level = 0},/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation)
"lO" = (/obj/structure/transit_tube/station/reverse,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/warning_stripes/arrow,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/deltacorridor)
(1,1,1) = {"
@@ -620,8 +620,8 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabVaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalamanananananamalaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaababacapcoaccvapacapapapaiaqaoacaraiaiasaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalalaMaOauavawaYbhalalaaaaaaaaaaaaaaaaabababaaaaaaaaaaagababacapapacapcKacapapahapahcLaccPcLayasaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaazazalaMaOataAaBaCataYbhalazazazaaaaagaaabkHkHabaaagaaaaaaagababacaiahaDaoahaDapdsaiapcLahaDcLcLaiasaa
-aaaaaaaaaaaaaaaaaaagaaaaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaazaEalbiaFaGaGaGatataFbjalaIaJazagagaaaaabkHkHabaaaaaaaaagaaababacaxahaDahajaDapapapapcLahaDcLcLayasaa
-aaaaaaaaaaaaabaaaaaaaaagagagagagagagagagagagagagagagagagazaKaLalbkatataGaNaGatatcWalaPaQazaaaaaaagaaababaaaaaaagaaaaaaababaccoapacaiahacapaiahapahcLaccLcLaiasaa
+aaaaaaaaaaaaaaaaaaagaaaaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaazdXalbiaFaGaGaGatataFbjalaIaJazagagaaaaabkHkHabaaaaaaaaagaaababacaxahaDahajaDapapapapcLahaDcLcLayasaa
+aaaaaaaaaaaaabaaaaaaaaagagagagagagagagagagagagagagagagagazaKaLalbkatataGaNaGatateLalaPaQazaaaaaaagaaababaaaaaaagaaaaaaababaccoapacaiahacapaiahapahcLaccLcLaiasaa
aaaaaaagaaabkHabagaaagaaaaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaazaRaLalbiaSataGaTaGataFbjalaUazazaaaaaaaaaaaacXaaaaaaaaaaaaaaababacapapaccoapacapapapaiajaoacahaoayasaa
aaaVaWaVagabkHababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaazaXaLaldcdtataGaZaGatdudvalbabbazaaaaaaaaaaaaaaaaaaaaaaaaaaaaababacbcapacdsapacahahaoahahahacbdacababaa
aVbebfaVaVabababaaaaaaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaazbgaLalaldLdMdtaZdudPdxalalblbmazaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaababacacacbnbnacacacacacacacacacababaaaa
@@ -629,30 +629,30 @@ aVbfbfbfbobfbfbfbfbfaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaazazazazazbpazalambqbqbrbqbqam
agbybebebebebfbebebzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabAbBbCbDbEbFbGbHbIbGbGbJbGbGbIbHbGbGbKbLbCbCbAaacXaaaaaaaaaabMbNbObPbubububububQbRbRbQbubububububububudHbTbuaa
aVbybebebebebUbebYbWcXcXdecXcXcXcXcXcXcXcXcXdecXcXbXdzbCbZcacbcdcecdcdcdcfbGbGcgbHbGbGbCchbCcibXcXaadkaaaadncXcjclcmcndKcpcqevcpevcrewbOewbObOewcsbOctcudHeybuaa
aVbzbfbfbebebfcwbebzaHaaaaaaaaaaaaaaaaaaaaaaaaaaaabAbCcxbDcyczcAcAcBcBcBcBcBcBcBcAcAcEcFbLcGbCbAaaaacXaaaaaaaabMcIcJbPfwfxcMfycNfzcNfycNfycOcNfycMgWhnbubScQbuaa
-aaaVcRcSbecTbfbfbfbfbfaaaaaaagaaagaaagaaaaaaaaaacUcUcUcUcUcVbJcAemepcZcZdacZcZeFeHcAbJdddgdgdgdgdgaaaaaaaaaaaabubububudhdidjdjdjdjdjdmdmdjdjdjdjdjdodqbubububuaa
-agbedrbzbebebfaVaVagaWagagaeckaeckaeeKdpagagcUcUcUeJeteLcUcabJcBdwdwdwdwdwdwdwdwcYcBbJbCdgdXdZeldAdgdgaaaaababaaaaaabudBdCdjdDdEdEdFdGdGhTdEdEdFdjewiWbuaaaaaaaa
+aaaVcRcSbecTbfbfbfbfbfaaaaaaagaaagaaagaaaaaaaaaacUcUcUcUcUfjbJcAemepcZcZdacZcZeFeHcAbJfMdgdgdgdgdgaaaaaaaaaaaabubububudhdidjdjdjdjdjdmdmdjdjdjdjdjdodqbubububuaa
+agbedrbzbebebfaVaVagaWagagaeckaeckaeeKdpagagcUcUcUeJetfPcUcabJcBdwdwdwdwdwdwdwdwcYcBbJbCdggedZeldAdgdgaaaaababaaaaaabugJdCdjdDdEdEdFdGdGhTdEdEdFdjewhjbuaaaaaaaa
aVbebedIbebebfdJagagaaaaaaaeckaeckaehfaeaaaacUgXgZdNdOhmcUdQbJdRdwdwdwdSdTdUdwdwdwdRdVdWdgeudYeIeRfgdgaadnabababaaaabueadCdjebecedkLdGdGdEeeefegdjbOehbubububuaa
aVeiejbzekekbfaVaVaaaaaaaaaehfcHeKcDckaeaaaacUhodOeneohpcUhCeqcBhDdwdweresdwdwdwhFcBdVbCdgfXdYdYdYgvdgaaaaaaababaaaabukMkNdjexdEdEdEdGdGdEdEdEdEdjkOkObuezezbubu
aaaVeAbfbebebfbeeBaVaaaaaaaackaahfaackaaaaaaeCdOeDeEdOhGcUhHeGcAhMcZcZiQliljcZcZlkcAeGeMeNeueOePeQgNdgaaaaaaaabubububueSdCdjdEeTeUdEkPdGkLeVeWdEdjbOcJbuezeXeXbu
-aaagaaaWbebebzbeaVaVagaaaaaackaahfaackaaeCeCeCdOeYeZfadNfbcafccAcAcAcAcAfdcAcAcAcAcAfebCffgQfhdyeQhedgagagagagbufifjbukQkRdjfmdEdEfndGdGfodEdEfpdjkSkSbuezeXeXbu
-aaagaaaVfrfsftfsfufvfvagaghlhshJiBhJhshJhLfBfAfCfDfEfFfGfHfIfJfKfLfLfMfLfNfOfPfOfOfQfRfSfTfUfVfVfWhKfYbtbtbtbtfZgagbhEgdgedjgfggghgigjgkgfglgmgfdjfqfqcubSbSeXbu
+aaagaaaWbebebzbeaVaVagaaaaaackaahfaackaaeCeCeCdOeYeZfadNfbcafccAcAcAcAcAfdcAcAcAcAcAfebCffgQfhdyeQhedgagagagagbufiidbukQkRdjfmdEdEfndGdGfodEdEfpdjkSkSbuezeXeXbu
+aaagaaaVfrfsftfsfufvfvagaghlhshJiBhJhshJhLfBfAfCfDfEfFfGfHfIfJfKfLfLiWfLfNfOjEfOfOfQfRfSfTfUfVfVfWhKfYbtbtbtbtfZgagbhEgdjHdjgfggghgigjgkgfglgmgfdjfqfqcubSbSeXbu
aaagaaaagnbebzbegoaVagaaaaaaiOaahfaahfaaeCeCeCgpeYgqdOgrfbcafcgsgsgsgsgsgtgsgsgsgsgsfebCffllgudyeQlmdgagagagagbugwgxbufkfldjgygygygydGgzdjdjdjdjdjkSkSbubSgAgAbu
-aaaeagagaVaVbfgBaVaVaaaaaaaaiOaackaahfaaaaaaeCgpgCgDdOlpcUlqeGgsgEgFgGgHgIgJgGgKgLgseGeMdglngMePeQlodgaaaaaaaabubububugOgPdjdGdGkXdGdGgzdjkWgRgSdjgTgUbubSgAgAbu
-aaagaaaaaagVaWaaagaaaaaaaacCiPaeckaehfaeaaaacUlsdOdOgYltcUhCdVhagGgGhbhchdhcgGgGgGhadVdWdglueQeQeQlvdgaaaaaaaaaaaaaabufkfldjhghghhgfhihjdjgfgfhkdjkSkSbubShUhVbu
+aaaeagagaVaVbfgBaVaVaaaaaaaaiOaackaahfaaaaaaeCgpgCgDdOlpcUlqeGgsgEgFgGgHgIkxgGgKgLgseGeMdglngMePeQlodgaaaaaaaabubububugOgPdjdGdGkXdGdGgzdjkWgRgSdjgTgUbubSgAgAbu
+aaagaaaaaagVaWaaagaaaaaaaacCiPaeckaehfaeaaaacUlsdOdOgYltcUhCdVhagGgGhbhchdhcgGgGgGhadVdWdglueQeQeQlvdgaaaaaaaaaaaaaabufkfldjhghghhgfhilbdjgfgfhkdjkSkSbubShUhVbu
aaagaaaaaaagaaaaagagafaaaaaekZcCjwaeklcDaaaacUlwlxlydOlzcUhqdVhrgGgGgGgGgGhbgGgGgGhrdVbCdglFeQlGlHlIdgaaaaaaaaaaaaaabuhtfldjhuhvgihwlahxhyhzhAhBdjfqfqbujmkTkUbu
-aaagaaaaaaagagagaeaeccagagaekvaeckaehfaeagagcUcUcUlBlClDcUdQdVhagGgGhIgGgGgGgGgGgGhadVbCdglKlLlMdgdgdgaaaaaaaaaaaaaabulbkRdjhNhOgfhPgfhQdjhRgfhSdjkSlcbukVkYbubu
-aaagaaaaaaagaaaaaaaaaaaaaaagkZaghfagckagaaaaaaaacUcUcUcUcUcVdVgshWhXhYhZiahYhZibicgsdViddgdgdgdgdgaaaaaaaaaaaabubububuieifdjigigihgfiihQdjijikildjfqimbubububuaa
+aaagaaaaaaagagagaeaeccagagaekvaeckaehfaeagagcUcUcUlBlClccUdQdVhagGgGhIgGgGgGgGgGgGhadVbCdglAlLlMdgdgdgaaaaaaaaaaaaaabulDkRdjhNhOgfhPgfhQdjhRgfhSdjkSlKbukVkYbubu
+aaagaaaaaaagaaaaaaaaaaaaaaagkZaghfagckagaaaaaaaacUcUcUcUcUfjdVgshWhXhYhZiahYhZibicgsdVlNdgdgdgdgdgaaaaaaaaaaaabubububuieifdjigigihgfiihQdjijikildjfqimbubububuaa
inioipaaagagaaaaaaaaaaaaaaaeiOaeckaehfaeaaaaaaaacUiqirisitcyiugsgshahahahahahahagsgsivcFbLcGbCbAaaaaaaaaaaaaaabMfqiwbPfkfldjdjdjdjdjdmixdjdjdjdjdjiyizbudHiAbuaa
aglriniClrlraaaaaaaaaaaaaaaekZaeckaehfcDaaaaaaaacUiDiEiFiGiHiIiJiKiJiJiJiLiJiJiJiKiJiMbCiNbCkFbXcXcXcXdecXcXcXcjlOfqcnfkiRiSldiUiVldiTleiTlfiTldiSiXfqcudHiYbuaa
inlrlrininlraaaaaeagagagagcHiPaeckaeklcDagagagagcUiZjajbitjcjdjeeMjfbCbCdVbCbCjfeMbCbCjgbLbCbCbAaaaaaaaaaaaaaabMfqfqbPjhjijjlgjkjilgjlkRfqlhfqkSjnfqjobudHbSbuaa
injpipdbininaaaaaaaaaaaaaaaaagaadfaaagaaaaaaaaaacUcUcUcUcUazjqazazazbAbAjrbAbAazazazjsazazazazazaaaaaaaaaaaaaabubububububujtjtjtjtjtjujvjtjtjtjtjtbubububububuaa
-inlAipipaainaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaazjxjyazazjzbCbCdVbCbCbCazazbgjAazaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajtjBjCjDjEjFjGjHjIjCjJjtaaaaaaaaaaaaaa
+inaEipipaainaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaazjxjyazazjzbCbCdVbCbCbCazazbgjAazaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajtjBjCjDcVjFjGcWjIjCjJjtaaaaaaaaaaaaaa
lrlrjKjLaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaazjMjNazjObCjPbCjQbCkIbCjRazbgbgazaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajtjSjTjUjVjVjGjVjWjXjYjtaaaaaaaaaaaaaa
jZlrkajLaaagaaaaaaaaagaaaaaaaaaaaaagaaaaaaaaaaaaaaaaaaaaazkbkcazkdbCbCbCdVkebCbCkfazkgkhazaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajtjtjtkijVjVjGjVkjjtjtjtaaaaaaaaaaaaaa
kkinlEjLagaaagagagagaaaaaaaaagdlagaaaaagagagagagagagagagazazkmazknbCkJbCkKbCjPbCkoazkpazazagagagagagagagagagagagagagagagagjtkqjTjUjVkrksjVjWjXktjtaaaaaaaaaaaaaa
-kulJkwjLaaaaaaaaaaaaaaaaaaagaaababaaaaaaaaaaaaaaaaaaaaaaaaazkxazkdbCbCbCdVbCbCbCkfazbgazaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajtkyjCjUkzkAkAkzjWjCkBjtaaaaaaaaaaaaaa
+kulJkwjLaaaaaaaaaaaaaaaaaaagaaababaaaaaaaaaaaaaaaaaaaaaaaaazddazkdbCbCbCdVbCbCbCkfazbgazaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajtkyjCjUkzkAkAkzjWjCkBjtaaaaaaaaaaaaaa
kClrkDjLaaagaaaaaaaaaaaaagaaaHabababaaagaaaaaaaaaaaaaaaaaaazazazbCbCjPbCjQbCjPbCbCazazazaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaajtjtjtjtjtkEkEjtjtjtjtjtaaaaaaaaaaaaaa
-aalNipipaaaaaaaaaaaaaaaaaaaaabkHkHabaaaaaaaaaaaaaaaaaaaaaaaaaaazazjfbCbCkGbCbCjfazazaaaaaaaaaaaaaaaaaaaaababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aadBipipaaaaaaaaaaaaaaaaaaaaabkHkHabaaaaaaaaaaaaaaaaaaaaaaaaaaazazjfbCbCkGbCbCjfazazaaaaaaaaaaaaaaaaaaaaababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
agipipaaaaaaaaaaaaaaaaaaaaaaabkHkHabaaaaaaaaaaaaaaaaaaaaaaaaaaaaazazbAazbAazbAazazaaaaaaaaaaaaaaaaaaaaabababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaababkHkHabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagcaaaaaa
aaaaaaaaaaaaaaaaaaaagcaaaaaaaaaaaaaaaaaagcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaababkHkHabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/_maps/map_files/cyberiad/z6.dmm b/_maps/map_files/cyberiad/z6.dmm
index e69905fc814..1e97fc39c60 100644
--- a/_maps/map_files/cyberiad/z6.dmm
+++ b/_maps/map_files/cyberiad/z6.dmm
@@ -6,155 +6,155 @@
"af" = (/turf/simulated/wall,/area/djstation)
"ag" = (/obj/effect/spawner/window/reinforced,/turf/simulated/floor/plating,/area/djstation)
"ah" = (/turf/simulated/floor/plating,/area/djstation)
-"ai" = (/obj/machinery/light{dir = 1},/obj/machinery/telecomms/relay/preset/ruskie,/obj/machinery/status_display{layer = 4;pixel_x = 0;pixel_y = 32},/turf/simulated/floor/plating,/area/djstation)
+"ai" = (/obj/machinery/light{dir = 1},/obj/machinery/telecomms/relay/preset/ruskie,/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/plating,/area/djstation)
"aj" = (/obj/machinery/power/terminal,/turf/simulated/floor/plating,/area/djstation)
"ak" = (/obj/item/multitool,/turf/simulated/floor/plating,/area/djstation)
-"al" = (/obj/item/storage/toolbox/mechanical{pixel_x = -2;pixel_y = -1},/turf/simulated/floor/plating,/area/djstation)
+"al" = (/obj/item/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/turf/simulated/floor/plating,/area/djstation)
"am" = (/obj/item/extinguisher,/turf/simulated/floor/plating,/area/djstation)
-"an" = (/obj/structure/cable{icon_state = "0-2";d2 = 2},/obj/machinery/power/smes/magical{desc = "A high-capacity superconducting magnetic energy storage (SMES) unit.";name = "power storage unit"},/turf/simulated/floor/plating,/area/djstation)
-"ao" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/turf/simulated/floor/plating,/area/djstation)
-"ap" = (/obj/structure/cable{icon_state = "0-4";d2 = 4},/obj/machinery/power/apc/noalarm{dir = 0;name = "Worn-out APC";pixel_y = -24},/turf/simulated/floor/plating,/area/djstation)
-"aq" = (/obj/structure/cable{d1 = 1;d2 = 8;icon_state = "1-8";tag = ""},/turf/simulated/floor/plating,/area/djstation)
-"ar" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/obj/item/storage/box/lights/mixed,/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'";icon_state = "shock";name = "HIGH VOLTAGE";pixel_x = 0;pixel_y = -32},/turf/simulated/floor/plating,/area/djstation)
+"an" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/smes/magical{desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."; name = "power storage unit"},/turf/simulated/floor/plating,/area/djstation)
+"ao" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating,/area/djstation)
+"ap" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/apc/noalarm{dir = 0; name = "Worn-out APC"; pixel_y = -24},/turf/simulated/floor/plating,/area/djstation)
+"aq" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/turf/simulated/floor/plating,/area/djstation)
+"ar" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/obj/item/storage/box/lights/mixed,/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/plating,/area/djstation)
"as" = (/obj/machinery/light_switch{pixel_y = -28},/turf/simulated/floor/plating,/area/djstation)
"at" = (/obj/structure/rack,/obj/item/clothing/suit/space/syndicate/orange,/obj/item/clothing/head/helmet/space/syndicate/orange,/obj/item/clothing/mask/breath,/turf/simulated/floor/plating,/area/djstation)
"au" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "0"},/turf/simulated/floor/plating,/area/djstation)
"av" = (/turf/simulated/floor/plating/airless,/area/space)
-"aw" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)";icon_state = "cafeteria";dir = 5},/area/djstation)
-"ax" = (/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)";icon_state = "cafeteria";dir = 5},/area/djstation)
-"ay" = (/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)";icon_state = "cafeteria";dir = 5},/area/djstation)
+"aw" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/djstation)
+"ax" = (/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/djstation)
+"ay" = (/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/djstation)
"az" = (/turf/simulated/floor/plasteel/airless,/area/space)
"aA" = (/turf/simulated/wall/r_wall,/area/space)
"aB" = (/obj/structure/table,/obj/machinery/cell_charger,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/djstation)
-"aC" = (/obj/machinery/status_display{layer = 4;pixel_x = 0;pixel_y = 32},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/djstation)
+"aC" = (/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/djstation)
"aD" = (/turf/simulated/floor/plasteel{icon_state = "bar"},/area/djstation)
"aE" = (/obj/machinery/light_switch{pixel_y = 24},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/djstation)
"aF" = (/obj/structure/closet,/obj/item/clothing/under/syndicate,/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/djstation)
-"aG" = (/obj/machinery/status_display{layer = 4;pixel_x = 0;pixel_y = 32},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/djstation)
+"aG" = (/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/djstation)
"aH" = (/obj/structure/bed,/obj/item/bedsheet,/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/djstation)
"aI" = (/obj/structure/table,/obj/structure/safe/floor,/obj/item/gun/projectile/automatic/pistol,/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/djstation)
"aJ" = (/obj/structure/table,/obj/machinery/kitchen_machine/microwave{pixel_y = 8},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/djstation)
-"aK" = (/obj/machinery/door/airlock/public/glass{name = "Kitchen"},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)";icon_state = "cafeteria";dir = 5},/area/djstation)
-"aL" = (/obj/structure/chair/office/light,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)";icon_state = "cafeteria";dir = 5},/area/djstation)
-"aM" = (/obj/structure/table,/obj/item/radio/intercom/pirate,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)";icon_state = "cafeteria";dir = 5},/area/djstation)
-"aN" = (/obj/machinery/door/airlock/public/glass{name = "Cabin"},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)";icon_state = "cafeteria";dir = 5},/area/djstation)
+"aK" = (/obj/machinery/door/airlock/public/glass{name = "Kitchen"},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/djstation)
+"aL" = (/obj/structure/chair/office/light,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/djstation)
+"aM" = (/obj/structure/table,/obj/item/radio/intercom/pirate,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/djstation)
+"aN" = (/obj/machinery/door/airlock/public/glass{name = "Cabin"},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/djstation)
"aO" = (/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/djstation)
"aP" = (/obj/structure/girder/reinforced,/turf/simulated/floor/plating/airless,/area/space)
"aQ" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/djstation)
"aR" = (/obj/machinery/light/small,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/djstation)
"aS" = (/obj/structure/chair{dir = 1},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/djstation)
-"aT" = (/obj/structure/table,/obj/item/storage/fancy/cigarettes/dromedaryco,/obj/item/lighter/zippo/engraved,/obj/item/ashtray/glass{pixel_y = 7},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)";icon_state = "cafeteria";dir = 5},/area/djstation)
-"aU" = (/obj/structure/table,/obj/item/paper/djstation{info = "Welcome new owner!
You have purchased the latest in listening equipment. The telecommunication setup we created is the best in listening to common and private radio fequencies. Here is a step by step guide to start listening in on those saucy radio channels:
- Equip yourself with a multi-tool
- Use the multitool on each machine, that is the broadcaster, receiver and the relay.
- Turn all the machines on, it has already been configured for you to listen on.
Simple as that. Now to listen to the private channels, you'll have to configure the intercoms, located on the front desk. Here is a list of frequencies for you to listen on.
- 145.7 - Common Channel
- 144.7 - Private AI Channel
- 135.9 - Security Channel
- 135.7 - Engineering Channel
- 135.5 - Medical Channel
- 135.3 - Command Channel
- 135.1 - Science Channel
- 134.7 - Supply Channel
"},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)";icon_state = "cafeteria";dir = 5},/area/djstation)
+"aT" = (/obj/structure/table,/obj/item/storage/fancy/cigarettes/dromedaryco,/obj/item/lighter/zippo/engraved,/obj/item/ashtray/glass{pixel_y = 7},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/djstation)
+"aU" = (/obj/structure/table,/obj/item/paper/djstation{info = "Welcome new owner!
You have purchased the latest in listening equipment. The telecommunication setup we created is the best in listening to common and private radio fequencies. Here is a step by step guide to start listening in on those saucy radio channels:
- Equip yourself with a multi-tool
- Use the multitool on each machine, that is the broadcaster, receiver and the relay.
- Turn all the machines on, it has already been configured for you to listen on.
Simple as that. Now to listen to the private channels, you'll have to configure the intercoms, located on the front desk. Here is a list of frequencies for you to listen on.
- 145.7 - Common Channel
- 144.7 - Private AI Channel
- 135.9 - Security Channel
- 135.7 - Engineering Channel
- 135.5 - Medical Channel
- 135.3 - Command Channel
- 135.1 - Science Channel
- 134.7 - Supply Channel
"},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/djstation)
"aV" = (/obj/structure/computerframe{anchored = 1},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/djstation)
"aW" = (/obj/structure/chair{dir = 8},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/djstation)
"aX" = (/obj/machinery/sleeper{dir = 8},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/djstation)
"aY" = (/obj/machinery/light/small,/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/djstation)
"aZ" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall,/area/djstation)
-"ba" = (/obj/machinery/door/airlock{name = "Restroom";req_access_txt = "0"},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/djstation)
-"bb" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)";icon_state = "cafeteria";dir = 5},/area/djstation)
+"ba" = (/obj/machinery/door/airlock{name = "Restroom"; req_access_txt = "0"},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/djstation)
+"bb" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/djstation)
"bc" = (/turf/simulated/wall/r_wall,/area/derelict/solar_control)
-"bd" = (/obj/machinery/door/airlock/engineering{name = "Turbine Maintenance";req_access_txt = "10"},/turf/simulated/floor/plating,/area/derelict/solar_control)
+"bd" = (/obj/machinery/door/airlock/engineering{name = "Turbine Maintenance"; req_access_txt = "10"},/turf/simulated/floor/plating,/area/derelict/solar_control)
"be" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating/airless,/area/space)
-"bf" = (/obj/machinery/light_switch{pixel_x = -24;pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/djstation)
-"bg" = (/obj/structure/chair{dir = 4},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)";icon_state = "cafeteria";dir = 5},/area/djstation)
-"bh" = (/obj/machinery/light_switch{pixel_x = 28;pixel_y = 0},/obj/machinery/status_display{layer = 4;pixel_x = 32;pixel_y = 0},/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/unary/portables_connector,/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)";icon_state = "cafeteria";dir = 5},/area/djstation)
-"bi" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/rack{dir = 4},/obj/item/clothing/under/soviet,/obj/item/clothing/head/ushanka,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)";icon_state = "cafeteria";dir = 5},/area/djstation)
+"bf" = (/obj/machinery/light_switch{pixel_x = -24; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/djstation)
+"bg" = (/obj/structure/chair{dir = 4},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/djstation)
+"bh" = (/obj/machinery/light_switch{pixel_x = 28; pixel_y = 0},/obj/machinery/status_display{layer = 4; pixel_x = 32; pixel_y = 0},/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/unary/portables_connector,/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/djstation)
+"bi" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/rack{dir = 4},/obj/item/clothing/under/soviet,/obj/item/clothing/head/ushanka,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/djstation)
"bj" = (/obj/structure/grille,/turf/space,/area/space)
"bk" = (/turf/simulated/wall,/area/derelict/solar_control)
"bl" = (/turf/simulated/floor/plasteel,/area/derelict/solar_control)
"bm" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel,/area/derelict/solar_control)
-"bn" = (/obj/structure/sink{icon_state = "sink";dir = 8;pixel_x = -12;pixel_y = 2},/obj/machinery/light/small,/obj/structure/mirror{dir = 4;pixel_x = -32;pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/djstation)
+"bn" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/light/small,/obj/structure/mirror{dir = 4; pixel_x = -32; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/djstation)
"bo" = (/obj/structure/toilet{pixel_y = 8},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/djstation)
-"bp" = (/obj/structure/table,/obj/item/paper_bin{pixel_x = 1;pixel_y = 9},/obj/item/pen,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)";icon_state = "cafeteria";dir = 5},/area/djstation)
-"bq" = (/obj/machinery/light_switch{pixel_x = 28;pixel_y = 28},/obj/machinery/access_button{command = "cycle_interior";frequency = 1479;master_tag = "dj_station_airlock";name = "interior access button";pixel_x = 25;pixel_y = -25;req_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)";icon_state = "cafeteria";dir = 5},/area/djstation)
-"br" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";icon_state = "space";layer = 4;name = "EXTERNAL AIRLOCK";pixel_x = 0;pixel_y = -32},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)";icon_state = "cafeteria";dir = 5},/area/djstation)
+"bp" = (/obj/structure/table,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/pen,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/djstation)
+"bq" = (/obj/machinery/light_switch{pixel_x = 28; pixel_y = 28},/obj/machinery/access_button{command = "cycle_interior"; frequency = 1479; master_tag = "dj_station_airlock"; name = "interior access button"; pixel_x = 25; pixel_y = -25; req_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/djstation)
+"br" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/djstation)
"bs" = (/obj/structure/lattice,/obj/structure/grille,/turf/space,/area/space)
-"bt" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5;max_integrity = 1e+007},/turf/simulated/floor/plating,/area/derelict/solar_control)
+"bt" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; max_integrity = 1e+007},/turf/simulated/floor/plating,/area/derelict/solar_control)
"bu" = (/turf/simulated/floor/plating,/area/derelict/solar_control)
-"bv" = (/obj/machinery/door/airlock/external{frequency = 1479;icon_state = "door_locked";id_tag = "dj_station_inner";locked = 1;name = "DJ Station Interior Access";req_access = null;req_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/plating,/area/djstation)
+"bv" = (/obj/machinery/door/airlock/external{frequency = 1479; icon_state = "door_locked"; id_tag = "dj_station_inner"; locked = 1; name = "DJ Station Interior Access"; req_access = null; req_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/plating,/area/djstation)
"bw" = (/obj/machinery/door/airlock/external{name = "Air Bridge Access"},/turf/simulated/floor/plating,/area/derelict/solar_control)
"bx" = (/obj/structure/disposalpipe/trunk{dir = 1},/obj/structure/disposaloutlet,/turf/simulated/floor/plating/airless,/area/space)
-"by" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1;frequency = 1479;id_tag = "dj_station_pump"},/obj/machinery/airlock_sensor{frequency = 1479;id_tag = "dj_station_sensor";pixel_x = 25;pixel_y = -5},/obj/machinery/embedded_controller/radio/airlock/airlock_controller{frequency = 1479;id_tag = "dj_station_airlock";pixel_x = -25;req_access_txt = "0";tag_airpump = "dj_station_pump";tag_chamber_sensor = "dj_station_sensor";tag_exterior_door = "dj_station_outer";tag_interior_door = "dj_station_inner"},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/djstation)
+"by" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; frequency = 1479; id_tag = "dj_station_pump"},/obj/machinery/airlock_sensor{frequency = 1479; id_tag = "dj_station_sensor"; pixel_x = 25; pixel_y = -5},/obj/machinery/embedded_controller/radio/airlock/airlock_controller{frequency = 1479; id_tag = "dj_station_airlock"; pixel_x = -25; req_access_txt = "0"; tag_airpump = "dj_station_pump"; tag_chamber_sensor = "dj_station_sensor"; tag_exterior_door = "dj_station_outer"; tag_interior_door = "dj_station_inner"},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/djstation)
"bz" = (/obj/machinery/door/airlock/external{name = "External Engineering"},/turf/simulated/floor/plating,/area/derelict/solar_control)
-"bA" = (/obj/machinery/door/airlock/external{frequency = 1479;icon_state = "door_locked";id_tag = "dj_station_outer";locked = 1;name = "DJ Station External Access";req_access = null;req_access_txt = "0"},/turf/simulated/floor/plating,/area/djstation)
+"bA" = (/obj/machinery/door/airlock/external{frequency = 1479; icon_state = "door_locked"; id_tag = "dj_station_outer"; locked = 1; name = "DJ Station External Access"; req_access = null; req_access_txt = "0"},/turf/simulated/floor/plating,/area/djstation)
"bB" = (/turf/simulated/wall,/area/space)
-"bC" = (/obj/machinery/access_button{command = "cycle_exterior";frequency = 1479;master_tag = "dj_station_airlock";name = "exterior access button";pixel_x = 25;pixel_y = 25;req_access_txt = "0"},/turf/space,/area/space)
+"bC" = (/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1479; master_tag = "dj_station_airlock"; name = "exterior access button"; pixel_x = 25; pixel_y = 25; req_access_txt = "0"},/turf/space,/area/space)
"bD" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel,/area/derelict/solar_control)
-"bE" = (/obj/structure/cable{icon_state = "0-4";d2 = 4},/obj/machinery/power/solar{id = "derelictsolar";name = "Derelict Solar Array"},/turf/simulated/floor/plasteel/airless,/area/solar/derelict_starboard)
-"bF" = (/obj/structure/cable{d2 = 8;icon_state = "0-8"},/obj/machinery/power/solar{id = "derelictsolar";name = "Derelict Solar Array"},/turf/simulated/floor/plasteel/airless,/area/solar/derelict_starboard)
-"bG" = (/obj/structure/cable{d2 = 8;icon_state = "0-8"},/obj/structure/cable{icon_state = "0-4";d2 = 4},/obj/structure/cable{icon_state = "0-2";d2 = 2},/turf/simulated/floor/plating/airless,/area/solar/derelict_starboard)
-"bH" = (/obj/machinery/power/smes,/obj/structure/cable{d2 = 8;icon_state = "0-8"},/turf/simulated/floor/plasteel,/area/derelict/solar_control)
-"bI" = (/obj/structure/cable{icon_state = "0-4";d2 = 4},/obj/structure/cable{icon_state = "0-2";d2 = 2},/obj/machinery/power/apc/noalarm{dir = 1;environ = 0;equipment = 0;lighting = 0;locked = 0;name = "Starboard Solar APC";pixel_y = 24},/turf/simulated/floor/plasteel,/area/derelict/solar_control)
-"bJ" = (/obj/structure/cable{icon_state = "0-2";d2 = 2},/obj/machinery/power/solar_control{id = "derelictsolar";name = "Primary Solar Control";track = 0},/turf/simulated/floor/plasteel,/area/derelict/solar_control)
+"bE" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/solar{id = "derelictsolar"; name = "Derelict Solar Array"},/turf/simulated/floor/plasteel/airless,/area/solar/derelict_starboard)
+"bF" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/solar{id = "derelictsolar"; name = "Derelict Solar Array"},/turf/simulated/floor/plasteel/airless,/area/solar/derelict_starboard)
+"bG" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating/airless,/area/solar/derelict_starboard)
+"bH" = (/obj/machinery/power/smes,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plasteel,/area/derelict/solar_control)
+"bI" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/apc/noalarm{dir = 1; environ = 0; equipment = 0; lighting = 0; locked = 0; name = "Starboard Solar APC"; pixel_y = 24},/turf/simulated/floor/plasteel,/area/derelict/solar_control)
+"bJ" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/solar_control{id = "derelictsolar"; name = "Primary Solar Control"; track = 0},/turf/simulated/floor/plasteel,/area/derelict/solar_control)
"bK" = (/obj/machinery/light/small{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel,/area/derelict/solar_control)
"bL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/derelict/solar_control)
-"bM" = (/obj/structure/cable{d2 = 8;icon_state = "0-8"},/obj/structure/cable{icon_state = "0-4";d2 = 4},/obj/structure/cable{icon_state = "0-2";d2 = 2},/obj/structure/cable,/turf/simulated/floor/plating/airless,/area/solar/derelict_starboard)
-"bN" = (/obj/machinery/power/terminal{icon_state = "term";dir = 1},/obj/structure/cable{icon_state = "0-4";d2 = 4},/turf/simulated/floor/plasteel,/area/derelict/solar_control)
-"bO" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/turf/simulated/floor/plasteel,/area/derelict/solar_control)
-"bP" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/obj/structure/cable{d1 = 2;d2 = 8;icon_state = "2-8";tag = ""},/turf/simulated/floor/plasteel,/area/derelict/solar_control)
+"bM" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable,/turf/simulated/floor/plating/airless,/area/solar/derelict_starboard)
+"bN" = (/obj/machinery/power/terminal{icon_state = "term"; dir = 1},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plasteel,/area/derelict/solar_control)
+"bO" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plasteel,/area/derelict/solar_control)
+"bP" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/turf/simulated/floor/plasteel,/area/derelict/solar_control)
"bQ" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel,/area/derelict/solar_control)
-"bR" = (/obj/structure/cable{icon_state = "0-2";d2 = 2},/obj/structure/cable,/obj/machinery/computer/monitor,/turf/simulated/floor/plasteel,/area/derelict/solar_control)
-"bS" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/obj/machinery/door/window/eastleft,/turf/simulated/floor/plasteel,/area/derelict/solar_control)
-"bT" = (/obj/structure/cable{d1 = 1;d2 = 4;icon_state = "1-4";tag = ""},/turf/simulated/floor/plating,/area/derelict/solar_control)
-"bU" = (/obj/structure/cable{d1 = 2;d2 = 8;icon_state = "2-8";tag = ""},/turf/simulated/floor/plasteel,/area/derelict/solar_control)
-"bV" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/turf/simulated/floor/plasteel,/area/derelict/solar_control)
+"bR" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable,/obj/machinery/computer/monitor,/turf/simulated/floor/plasteel,/area/derelict/solar_control)
+"bS" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/obj/machinery/door/window/eastleft,/turf/simulated/floor/plasteel,/area/derelict/solar_control)
+"bT" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/turf/simulated/floor/plating,/area/derelict/solar_control)
+"bU" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/turf/simulated/floor/plasteel,/area/derelict/solar_control)
+"bV" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/floor/plasteel,/area/derelict/solar_control)
"bW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/derelict/solar_control)
-"bX" = (/obj/structure/cable{icon_state = "0-2";d2 = 2},/obj/structure/cable,/turf/simulated/floor/plating/airless,/area/solar/derelict_starboard)
-"bY" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel,/area/derelict/solar_control)
+"bX" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable,/turf/simulated/floor/plating/airless,/area/solar/derelict_starboard)
+"bY" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel,/area/derelict/solar_control)
"bZ" = (/obj/structure/window/reinforced,/turf/simulated/floor/plasteel,/area/derelict/solar_control)
"ca" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel,/area/derelict/solar_control)
-"cb" = (/obj/structure/cable{d1 = 1;d2 = 4;icon_state = "1-4";tag = ""},/turf/simulated/floor/plasteel,/area/derelict/solar_control)
-"cc" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/turf/simulated/floor/plating/airless,/area/solar/derelict_starboard)
-"cd" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/obj/machinery/door/airlock/external{name = "External Engineering"},/turf/simulated/floor/plating,/area/derelict/solar_control)
-"ce" = (/obj/structure/cable{icon_state = "0-4";d2 = 4},/turf/simulated/floor/plating/airless,/area/solar/derelict_starboard)
-"cf" = (/obj/structure/cable{d2 = 8;icon_state = "0-8"},/turf/simulated/floor/plating/airless,/area/solar/derelict_starboard)
-"cg" = (/obj/structure/cable,/obj/structure/cable{icon_state = "0-2";d2 = 2},/obj/structure/cable{icon_state = "0-4";d2 = 4},/obj/structure/cable{d2 = 8;icon_state = "0-8"},/turf/simulated/floor/plating/airless,/area/solar/derelict_starboard)
-"ch" = (/obj/structure/cable,/obj/structure/cable{icon_state = "0-2";d2 = 2},/obj/structure/cable{d2 = 8;icon_state = "0-8"},/turf/simulated/floor/plating/airless,/area/solar/derelict_starboard)
+"cb" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/turf/simulated/floor/plasteel,/area/derelict/solar_control)
+"cc" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/floor/plating/airless,/area/solar/derelict_starboard)
+"cd" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/obj/machinery/door/airlock/external{name = "External Engineering"},/turf/simulated/floor/plating,/area/derelict/solar_control)
+"ce" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating/airless,/area/solar/derelict_starboard)
+"cf" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating/airless,/area/solar/derelict_starboard)
+"cg" = (/obj/structure/cable,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating/airless,/area/solar/derelict_starboard)
+"ch" = (/obj/structure/cable,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating/airless,/area/solar/derelict_starboard)
"ci" = (/turf/simulated/floor/plating/airless,/area/solar/derelict_starboard)
"cj" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/derelict/solar_control)
"ck" = (/turf/simulated/wall,/area/derelict/bridge/access)
-"cl" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/turf/simulated/wall,/area/derelict/bridge/access)
-"cm" = (/obj/machinery/door/airlock/engineering{name = "Starboard Solar Access";req_access_txt = "10"},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
+"cl" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/wall,/area/derelict/bridge/access)
+"cm" = (/obj/machinery/door/airlock/engineering{name = "Starboard Solar Access"; req_access_txt = "10"},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
"cn" = (/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
"co" = (/obj/structure/rack,/obj/item/melee/classic_baton,/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
"cp" = (/obj/structure/rack,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
"cq" = (/obj/structure/rack,/obj/item/clothing/head/helmet/swat,/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
"cr" = (/obj/structure/rack,/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
-"cs" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
-"ct" = (/obj/structure/cable{icon_state = "0-2";d2 = 2},/obj/structure/cable{icon_state = "0-4";d2 = 4},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
-"cu" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
-"cv" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/turf/simulated/wall,/area/derelict/bridge/access)
-"cw" = (/obj/structure/cable{d1 = 1;d2 = 8;icon_state = "1-8";tag = ""},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
-"cx" = (/obj/structure/cable{d2 = 8;icon_state = "0-8"},/obj/structure/cable{icon_state = "0-4";d2 = 4},/obj/structure/cable,/turf/simulated/floor/plating/airless,/area/solar/derelict_starboard)
-"cy" = (/obj/structure/grille,/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/derelict/bridge/access)
-"cz" = (/obj/machinery/door/airlock/command{name = "E.V.A.";req_access = null;req_access_txt = "18"},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
+"cs" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
+"ct" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
+"cu" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
+"cv" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/wall,/area/derelict/bridge/access)
+"cw" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
+"cx" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable,/turf/simulated/floor/plating/airless,/area/solar/derelict_starboard)
+"cy" = (/obj/structure/grille,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/derelict/bridge/access)
+"cz" = (/obj/machinery/door/airlock/command{name = "E.V.A."; req_access = null; req_access_txt = "18"},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
"cA" = (/turf/simulated/floor/plating,/area/derelict/bridge/access)
"cB" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
"cC" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/derelict/bridge/access)
-"cD" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/turf/simulated/floor/plating,/area/derelict/bridge/access)
+"cD" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating,/area/derelict/bridge/access)
"cE" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/derelict/bridge/access)
-"cF" = (/obj/structure/cable{icon_state = "0-2";d2 = 2},/obj/structure/cable,/obj/structure/window/reinforced,/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
+"cF" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable,/obj/structure/window/reinforced,/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
"cG" = (/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
"cH" = (/obj/item/stack/cable_coil/cut,/turf/simulated/floor/plating/airless,/area/space)
"cI" = (/turf/simulated/floor/plasteel/airless{icon_state = "solarpanel"},/area/space)
"cJ" = (/obj/item/stack/cable_coil/cut,/turf/space,/area/space)
"cK" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
-"cL" = (/obj/machinery/door/airlock/engineering{name = "Engineering Access";req_access_txt = "10"},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
+"cL" = (/obj/machinery/door/airlock/engineering{name = "Engineering Access"; req_access_txt = "10"},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
"cM" = (/obj/machinery/door/firedoor,/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
"cN" = (/obj/machinery/door/airlock/public/glass,/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
"cO" = (/turf/simulated/wall/r_wall,/area/derelict/singularity_engine)
"cP" = (/obj/structure/window/reinforced,/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
"cQ" = (/obj/machinery/door/window{dir = 2},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
-"cR" = (/obj/machinery/door/airlock/engineering{name = "Engineering Access";req_access_txt = "10"},/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/singularity_engine)
+"cR" = (/obj/machinery/door/airlock/engineering{name = "Engineering Access"; req_access_txt = "10"},/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/singularity_engine)
"cS" = (/turf/simulated/wall,/area/derelict/bridge)
"cT" = (/obj/structure/sign/electricshock,/turf/simulated/wall/r_wall,/area/derelict/singularity_engine)
"cU" = (/obj/structure/sign/securearea,/turf/simulated/wall/r_wall,/area/derelict/singularity_engine)
-"cV" = (/obj/structure/computerframe,/obj/structure/cable{icon_state = "0-2";d2 = 2},/turf/simulated/floor/plasteel,/area/derelict/bridge)
-"cW" = (/obj/structure/table,/obj/item/stack/cable_coil{pixel_x = 3;pixel_y = -7},/turf/simulated/floor/plasteel,/area/derelict/bridge)
+"cV" = (/obj/structure/computerframe,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plasteel,/area/derelict/bridge)
+"cW" = (/obj/structure/table,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/turf/simulated/floor/plasteel,/area/derelict/bridge)
"cX" = (/obj/structure/sign/securearea{name = "ENGINEERING ACCESS"},/turf/simulated/wall/r_wall,/area/derelict/singularity_engine)
"cY" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
"cZ" = (/obj/structure/computerframe,/turf/simulated/floor/plasteel,/area/derelict/bridge)
-"da" = (/obj/structure/table,/obj/item/paper_bin{pixel_x = -3;pixel_y = 7},/turf/simulated/floor/plasteel,/area/derelict/bridge)
+"da" = (/obj/structure/table,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/turf/simulated/floor/plasteel,/area/derelict/bridge)
"db" = (/obj/structure/table,/turf/simulated/floor/plasteel,/area/derelict/bridge)
"dc" = (/obj/machinery/computer/security{network = list("")},/turf/simulated/floor/plasteel,/area/derelict/bridge)
"dd" = (/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/singularity_engine)
@@ -164,56 +164,56 @@
"dh" = (/obj/structure/window/reinforced,/obj/machinery/portable_atmospherics/canister/toxins,/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/singularity_engine)
"di" = (/obj/structure/window/reinforced,/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/singularity_engine)
"dj" = (/obj/machinery/light/small{dir = 8},/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/singularity_engine)
-"dk" = (/obj/machinery/power/emitter{dir = 1;icon_state = "emitter"},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
-"dl" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
+"dk" = (/obj/machinery/power/emitter{dir = 1; icon_state = "emitter"},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
+"dl" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
"dm" = (/turf/simulated/wall,/area/derelict/singularity_engine)
"dn" = (/turf/simulated/floor/plasteel,/area/derelict/bridge)
"do" = (/turf/simulated/floor/plating,/area/derelict/bridge)
"dp" = (/obj/structure/table,/obj/item/paper/crumpled,/turf/simulated/floor/plasteel,/area/derelict/bridge)
"dq" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel,/area/derelict/bridge)
-"dr" = (/obj/structure/window/reinforced{dir = 5;max_integrity = 1e+007},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
+"dr" = (/obj/structure/window/reinforced{dir = 5; max_integrity = 1e+007},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
"ds" = (/obj/effect/landmark/damageturf,/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
-"dt" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";pixel_y = 0;tag = ""},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
+"dt" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
"du" = (/obj/item/disk/data/demo,/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
-"dv" = (/obj/machinery/door/window/eastleft{name = "Heads of Staff";req_access_txt = "19"},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
+"dv" = (/obj/machinery/door/window/eastleft{name = "Heads of Staff"; req_access_txt = "19"},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
"dw" = (/obj/structure/table,/obj/item/stock_parts/cell,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel,/area/derelict/bridge)
"dx" = (/obj/item/storage/toolbox/syndicate,/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/singularity_engine)
"dy" = (/obj/item/stack/cable_coil/cut,/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/singularity_engine)
"dz" = (/obj/machinery/field/generator,/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
-"dA" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";pixel_y = 0;tag = ""},/obj/structure/cable{d1 = 2;d2 = 4;icon_state = "2-4";tag = ""},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
-"dB" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";pixel_x = 0;tag = ""},/turf/simulated/floor/plating,/area/derelict/bridge/access)
+"dA" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
+"dB" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plating,/area/derelict/bridge/access)
"dC" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel,/area/derelict/bridge)
"dD" = (/obj/item/stack/rods,/turf/simulated/floor/plating/airless,/area/space)
"dE" = (/obj/structure/grille,/obj/structure/window/reinforced,/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
"dF" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
"dG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
"dH" = (/obj/structure/noticeboard{pixel_y = 28},/turf/simulated/wall,/area/derelict/singularity_engine)
-"dI" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";pixel_x = 0;tag = ""},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
-"dJ" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";pixel_x = 0;tag = ""},/turf/simulated/floor/plasteel,/area/derelict/bridge)
-"dK" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";pixel_x = 0;tag = ""},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
+"dI" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
+"dJ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plasteel,/area/derelict/bridge)
+"dK" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
"dL" = (/mob/living/simple_animal/bot/secbot/buzzsky,/turf/simulated/floor/plasteel,/area/derelict/bridge)
"dM" = (/obj/structure/table,/obj/item/paicard,/turf/simulated/floor/plasteel,/area/derelict/bridge)
"dN" = (/obj/structure/chair/stool,/turf/simulated/floor/plasteel,/area/derelict/bridge)
-"dO" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/turf/simulated/floor/plasteel,/area/derelict/bridge)
-"dP" = (/obj/structure/cable{d1 = 2;d2 = 8;icon_state = "2-8";tag = ""},/turf/simulated/floor/plasteel,/area/derelict/bridge)
+"dO" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/floor/plasteel,/area/derelict/bridge)
+"dP" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/turf/simulated/floor/plasteel,/area/derelict/bridge)
"dQ" = (/obj/item/paper/russiannuclearoperativeobj,/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/singularity_engine)
-"dR" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";pixel_y = 0;tag = ""},/turf/simulated/floor/plasteel,/area/derelict/bridge)
-"dS" = (/obj/item/shard,/obj/structure/grille/broken,/obj/effect/decal/remains/human{desc = "This guy seemed to have died in terrible way! Half his remains are dust.";icon_state = "remains";name = "Syndicate agent remains"},/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/singularity_engine)
+"dR" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/plasteel,/area/derelict/bridge)
+"dS" = (/obj/item/shard,/obj/structure/grille/broken,/obj/effect/decal/remains/human{desc = "This guy seemed to have died in terrible way! Half his remains are dust."; icon_state = "remains"; name = "Syndicate agent remains"},/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/singularity_engine)
"dT" = (/obj/item/shard,/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/singularity_engine)
-"dU" = (/obj/structure/table,/obj/machinery/power/apc/noalarm{dir = 0;name = "Worn-out APC";pixel_y = -24},/obj/structure/cable,/turf/simulated/floor/plasteel,/area/derelict/bridge)
+"dU" = (/obj/structure/table,/obj/machinery/power/apc/noalarm{dir = 0; name = "Worn-out APC"; pixel_y = -24},/obj/structure/cable,/turf/simulated/floor/plasteel,/area/derelict/bridge)
"dV" = (/obj/structure/window/reinforced{dir = 8},/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/singularity_engine)
-"dW" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/obj/machinery/door/window{dir = 2},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
-"dX" = (/obj/machinery/door/window{dir = 2;name = "Captain's Quarters";req_access_txt = "20"},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/bridge)
+"dW" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/door/window{dir = 2},/turf/simulated/floor/plasteel,/area/derelict/bridge/access)
+"dX" = (/obj/machinery/door/window{dir = 2; name = "Captain's Quarters"; req_access_txt = "20"},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/bridge)
"dY" = (/obj/structure/table,/obj/item/screwdriver,/turf/simulated/floor/plasteel,/area/derelict/bridge)
"dZ" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/derelict/bridge/access)
"ea" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/light/small{dir = 8},/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/singularity_engine)
"eb" = (/obj/structure/chair,/turf/simulated/floor/plasteel,/area/derelict/bridge)
-"ec" = (/obj/structure/table,/obj/item/stock_parts/cell{charge = 100;maxcharge = 15000},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/access)
+"ec" = (/obj/structure/table,/obj/item/stock_parts/cell{charge = 100; maxcharge = 15000},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/access)
"ed" = (/obj/item/stack/rods,/turf/space,/area/space)
"ee" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
-"ef" = (/obj/structure/table,/obj/item/stack/cable_coil{pixel_x = 3;pixel_y = -7},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/access)
+"ef" = (/obj/structure/table,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/access)
"eg" = (/obj/item/clothing/suit/space/syndicate/black/engie,/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
-"eh" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/access)
+"eh" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/access)
"ei" = (/obj/structure/table,/obj/item/rack_parts,/turf/simulated/floor/plasteel,/area/derelict/bridge)
"ej" = (/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
"ek" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
@@ -221,21 +221,21 @@
"em" = (/obj/item/shard{icon_state = "small"},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
"en" = (/obj/structure/table,/obj/structure/window/basic,/turf/simulated/floor/plasteel,/area/derelict/bridge)
"eo" = (/obj/structure/window/basic,/turf/simulated/floor/plasteel,/area/derelict/bridge)
-"ep" = (/obj/item/storage/toolbox/electrical{pixel_x = 1;pixel_y = -1},/obj/structure/cable{d1 = 2;d2 = 4;icon_state = "2-4";tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/access)
+"ep" = (/obj/item/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/access)
"eq" = (/obj/structure/table,/obj/machinery/light/small,/turf/simulated/floor/plasteel,/area/derelict/bridge)
-"er" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";pixel_x = 0;tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/access)
+"er" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/access)
"es" = (/obj/item/clothing/head/helmet/space/syndicate/black/engie,/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
-"et" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";pixel_x = 0;tag = ""},/turf/simulated/floor/plating/airless,/area/derelict/bridge/access)
+"et" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plating/airless,/area/derelict/bridge/access)
"eu" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
"ev" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
-"ew" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/obj/structure/cable{d1 = 1;d2 = 8;icon_state = "1-8";tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/access)
+"ew" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/access)
"ex" = (/turf/simulated/wall/r_wall,/area/derelict/bridge)
"ey" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/singularity_engine)
"ez" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
"eA" = (/turf/simulated/floor/plasteel/airless,/area/derelict/singularity_engine)
"eB" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
"eC" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
-"eD" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";pixel_y = 0;tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/access)
+"eD" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/access)
"eE" = (/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/access)
"eF" = (/obj/structure/table,/obj/item/aicard,/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/access)
"eG" = (/obj/structure/table,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/access)
@@ -246,28 +246,28 @@
"eL" = (/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
"eM" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
"eN" = (/obj/item/shard{icon_state = "medium"},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
-"eO" = (/obj/machinery/door/airlock/maintenance{name = "Tech Storage";req_access_txt = "23"},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/access)
-"eP" = (/obj/structure/cable,/obj/machinery/power/apc/noalarm{dir = 0;name = "Worn-out APC";pixel_y = -24},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/access)
+"eO" = (/obj/machinery/door/airlock/maintenance{name = "Tech Storage"; req_access_txt = "23"},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/access)
+"eP" = (/obj/structure/cable,/obj/machinery/power/apc/noalarm{dir = 0; name = "Worn-out APC"; pixel_y = -24},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/access)
"eQ" = (/obj/structure/window/reinforced{dir = 4},/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/singularity_engine)
"eR" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/access)
"eS" = (/obj/item/stack/rods,/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/singularity_engine)
"eT" = (/obj/structure/table,/obj/machinery/light/small{dir = 4},/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/singularity_engine)
-"eU" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/obj/effect/landmark/damageturf,/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
+"eU" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/effect/landmark/damageturf,/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
"eV" = (/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
"eW" = (/obj/item/stack/rods,/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
-"eX" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
+"eX" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
"eY" = (/turf/simulated/floor/plating/airless,/area/derelict/bridge/access)
"eZ" = (/obj/effect/landmark/damageturf,/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
-"fa" = (/obj/structure/cable{d1 = 2;d2 = 4;icon_state = "2-4";tag = ""},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
+"fa" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
"fb" = (/obj/item/screwdriver,/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
-"fc" = (/obj/structure/cable{d1 = 1;d2 = 8;icon_state = "1-8";tag = ""},/obj/effect/landmark/damageturf,/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
-"fd" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
+"fc" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/obj/effect/landmark/damageturf,/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
+"fd" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
"fe" = (/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/space)
"ff" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating/airless,/area/derelict/bridge/access)
"fg" = (/obj/effect/landmark/burnturf,/turf/simulated/floor/plasteel/airless,/area/space)
"fh" = (/obj/machinery/light/small{dir = 4},/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/singularity_engine)
"fi" = (/obj/item/shard{icon_state = "medium"},/obj/item/stack/cable_coil/cut,/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
-"fj" = (/obj/structure/cable{d1 = 1;d2 = 8;icon_state = "1-8";tag = ""},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
+"fj" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
"fk" = (/obj/item/stack/ore/slag,/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
"fl" = (/obj/machinery/light/small,/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
"fm" = (/turf/simulated/wall,/area/derelict/hallway/primary)
@@ -280,29 +280,29 @@
"ft" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
"fu" = (/turf/simulated/wall/r_wall,/area/derelict/hallway/primary)
"fv" = (/obj/machinery/light/small,/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/singularity_engine)
-"fw" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";pixel_y = 0;tag = ""},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
+"fw" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
"fx" = (/obj/structure/window/basic{dir = 4},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
-"fy" = (/obj/machinery/door/airlock/medical{name = "Morgue";req_access_txt = "6"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/derelict/medical/chapel)
+"fy" = (/obj/machinery/door/airlock/medical{name = "Morgue"; req_access_txt = "6"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/derelict/medical/chapel)
"fz" = (/obj/item/crowbar,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
"fA" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
"fB" = (/obj/effect/landmark/damageturf,/turf/simulated/floor/plating/airless,/area/space)
"fC" = (/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless{icon_state = "floorscorched2"},/area/space)
-"fD" = (/obj/machinery/door/morgue{name = "coffin storage";req_access_txt = "22"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/derelict/medical/chapel)
+"fD" = (/obj/machinery/door/morgue{name = "coffin storage"; req_access_txt = "22"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/derelict/medical/chapel)
"fE" = (/turf/simulated/floor/plasteel/airless{icon_state = "floorscorched2"},/area/derelict/hallway/primary)
"fF" = (/obj/machinery/light/small,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
"fG" = (/obj/structure/grille,/obj/structure/window/basic{dir = 8},/turf/simulated/floor/plating/airless,/area/space)
"fH" = (/turf/simulated/floor/plasteel/airless{icon_state = "floorscorched2"},/area/space)
-"fI" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
+"fI" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
"fJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
"fK" = (/obj/machinery/door/window{dir = 2},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
-"fL" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plasteel{dir = 1;icon_state = "chapel"},/area/derelict/medical/chapel)
+"fL" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plasteel{dir = 1; icon_state = "chapel"},/area/derelict/medical/chapel)
"fM" = (/obj/item/shard{icon_state = "small"},/obj/item/shard{icon_state = "medium"},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
"fN" = (/obj/structure/grille/broken,/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
-"fO" = (/turf/simulated/floor/plasteel{dir = 1;icon_state = "chapel"},/area/derelict/medical/chapel)
+"fO" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "chapel"},/area/derelict/medical/chapel)
"fP" = (/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
"fQ" = (/obj/item/circuitboard/white_ship,/turf/space,/area/space)
"fR" = (/obj/structure/grille,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
-"fS" = (/turf/simulated/floor/plasteel{dir = 4;icon_state = "chapel"},/area/derelict/medical/chapel)
+"fS" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "chapel"},/area/derelict/medical/chapel)
"fT" = (/obj/structure/chair{dir = 8},/obj/item/pen,/turf/simulated/floor/plasteel,/area/derelict/arrival)
"fU" = (/obj/structure/window/reinforced,/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
"fV" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
@@ -317,7 +317,7 @@
"ge" = (/obj/structure/chair,/turf/simulated/floor/plasteel,/area/derelict/arrival)
"gf" = (/turf/simulated/floor/plasteel,/area/derelict/arrival)
"gg" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel,/area/derelict/arrival)
-"gh" = (/obj/machinery/light{icon_state = "tube1";dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/medical)
+"gh" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/medical)
"gi" = (/obj/structure/chair{dir = 8},/turf/simulated/floor/plasteel,/area/derelict/arrival)
"gj" = (/turf/simulated/wall,/area/derelict/medical/chapel)
"gk" = (/obj/item/shard,/obj/structure/grille/broken,/turf/simulated/floor/plating/airless,/area/derelict/medical)
@@ -326,7 +326,7 @@
"gn" = (/obj/structure/lattice,/obj/structure/window/basic,/turf/space,/area/space)
"go" = (/turf/simulated/floor/plasteel/airless{icon_state = "floorscorched2"},/area/derelict/arrival)
"gp" = (/turf/simulated/floor/plating/airless,/area/derelict/arrival)
-"gq" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plasteel{dir = 8;icon_state = "chapel"},/area/derelict/medical/chapel)
+"gq" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "chapel"},/area/derelict/medical/chapel)
"gr" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/derelict/medical/chapel)
"gs" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/derelict/medical/chapel)
"gt" = (/obj/structure/closet/coffin,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/derelict/medical/chapel)
@@ -337,205 +337,205 @@
"gy" = (/turf/simulated/floor/plating/airless,/area/derelict/medical)
"gz" = (/obj/item/storage/box/lights/mixed,/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
"gA" = (/obj/machinery/door/airlock/external{name = "External Engineering"},/turf/simulated/floor/plating/airless,/area/space)
-"gB" = (/turf/simulated/floor/plasteel{dir = 8;icon_state = "chapel"},/area/derelict/medical/chapel)
+"gB" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "chapel"},/area/derelict/medical/chapel)
"gC" = (/obj/machinery/door/window{dir = 8},/turf/simulated/floor/plasteel,/area/derelict/arrival)
"gD" = (/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
"gE" = (/obj/item/shard{icon_state = "small"},/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
-"gF" = (/obj/machinery/door/airlock/public/glass{name = "Med-Sci";req_access_txt = "9"},/turf/simulated/floor/plating/airless,/area/derelict/medical)
-"gG" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";pixel_y = 0;tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
+"gF" = (/obj/machinery/door/airlock/public/glass{name = "Med-Sci"; req_access_txt = "9"},/turf/simulated/floor/plating/airless,/area/derelict/medical)
+"gG" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
"gH" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/plating/airless,/area/derelict/medical)
-"gI" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{dir = 1;icon_state = "chapel"},/area/derelict/medical/chapel)
-"gJ" = (/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{dir = 1;icon_state = "chapel"},/area/derelict/medical/chapel)
+"gI" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{dir = 1; icon_state = "chapel"},/area/derelict/medical/chapel)
+"gJ" = (/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{dir = 1; icon_state = "chapel"},/area/derelict/medical/chapel)
"gK" = (/obj/structure/window/basic{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
"gL" = (/obj/structure/lattice,/obj/structure/window/basic{dir = 1},/turf/space,/area/space)
"gM" = (/obj/structure/lattice,/obj/structure/lattice,/obj/structure/window/basic{dir = 1},/turf/space,/area/space)
"gN" = (/turf/simulated/floor/plating,/area/derelict/arrival)
-"gO" = (/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{dir = 4;icon_state = "chapel"},/area/derelict/medical/chapel)
+"gO" = (/obj/structure/window/reinforced,/turf/simulated/floor/plasteel{dir = 4; icon_state = "chapel"},/area/derelict/medical/chapel)
"gP" = (/obj/item/stack/medical/bruise_pack,/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
-"gQ" = (/obj/structure/cable{d1 = 2;d2 = 4;icon_state = "2-4";tag = ""},/turf/simulated/wall,/area/derelict/medical/chapel)
+"gQ" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/turf/simulated/wall,/area/derelict/medical/chapel)
"gR" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel,/area/derelict/arrival)
"gS" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel,/area/derelict/arrival)
"gT" = (/obj/machinery/light/small,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/derelict/medical/chapel)
"gU" = (/obj/item/shard{icon_state = "medium"},/turf/space,/area/space)
-"gV" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
+"gV" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
"gW" = (/obj/structure/chair{dir = 1},/turf/simulated/floor/plasteel,/area/derelict/arrival)
"gX" = (/obj/structure/chair{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel,/area/derelict/arrival)
-"gY" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/turf/simulated/wall,/area/derelict/medical/chapel)
+"gY" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/wall,/area/derelict/medical/chapel)
"gZ" = (/obj/structure/morgue,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/derelict/medical/chapel)
"ha" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
"hb" = (/obj/structure/window/reinforced,/turf/simulated/floor/plating/airless,/area/space)
"hc" = (/obj/structure/window/reinforced,/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/space)
-"hd" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";pixel_x = 0;tag = ""},/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
+"hd" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
"he" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel,/area/derelict/arrival)
"hf" = (/obj/structure/window/reinforced{dir = 4},/turf/space,/area/space)
-"hg" = (/obj/structure/cable{d1 = 2;d2 = 4;icon_state = "2-4";tag = ""},/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";pixel_x = 0;tag = ""},/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
-"hh" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
-"hi" = (/obj/structure/cable{d1 = 2;d2 = 8;icon_state = "2-8";tag = ""},/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
+"hg" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
+"hh" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
+"hi" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
"hj" = (/obj/item/cigbutt,/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
-"hk" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
-"hl" = (/obj/machinery/door/poddoor{id_tag = "derelict_gun";name = "Derelict Mass Driver"},/turf/simulated/floor/plating,/area/derelict/medical/chapel)
-"hm" = (/obj/machinery/mass_driver{dir = 8;icon_state = "mass_driver";id_tag = "derelict_gun"},/obj/machinery/door/window{dir = 4;req_access_txt = "25"},/obj/structure/closet/coffin,/turf/simulated/floor/plating,/area/derelict/medical/chapel)
+"hk" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
+"hl" = (/obj/machinery/door/poddoor{id_tag = "derelict_gun"; name = "Derelict Mass Driver"},/turf/simulated/floor/plating,/area/derelict/medical/chapel)
+"hm" = (/obj/machinery/mass_driver{dir = 8; icon_state = "mass_driver"; id_tag = "derelict_gun"},/obj/machinery/door/window{dir = 4; req_access_txt = "25"},/obj/structure/closet/coffin,/turf/simulated/floor/plating,/area/derelict/medical/chapel)
"hn" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/space)
-"ho" = (/obj/structure/cable,/obj/machinery/power/apc/noalarm{dir = 4;name = "Worn-out APC";pixel_x = 24;pixel_y = 0},/turf/simulated/floor/plasteel/airless,/area/derelict/medical/chapel)
-"hp" = (/obj/machinery/power/apc/noalarm{dir = 0;name = "Worn-out APC";pixel_y = -24},/obj/structure/cable,/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
+"ho" = (/obj/structure/cable,/obj/machinery/power/apc/noalarm{dir = 4; name = "Worn-out APC"; pixel_x = 24; pixel_y = 0},/turf/simulated/floor/plasteel/airless,/area/derelict/medical/chapel)
+"hp" = (/obj/machinery/power/apc/noalarm{dir = 0; name = "Worn-out APC"; pixel_y = -24},/obj/structure/cable,/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
"hq" = (/turf/simulated/floor/plasteel{icon_state = "chapel"},/area/derelict/medical/chapel)
-"hr" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
+"hr" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
"hs" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
"ht" = (/obj/item/shard,/turf/simulated/floor/plating/airless,/area/space)
"hu" = (/obj/item/shard{icon_state = "medium"},/turf/simulated/floor/plating/airless,/area/space)
-"hv" = (/obj/machinery/light{icon_state = "tube1";dir = 4},/turf/simulated/floor/plasteel,/area/derelict/arrival)
+"hv" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/plasteel,/area/derelict/arrival)
"hw" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plasteel,/area/derelict/arrival)
"hx" = (/obj/structure/window/reinforced,/turf/space,/area/space)
"hy" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/space,/area/space)
-"hz" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plasteel{dir = 1;icon_state = "chapel"},/area/derelict/medical/chapel)
-"hA" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plasteel{dir = 1;icon_state = "chapel"},/area/derelict/medical/chapel)
-"hB" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plasteel{dir = 4;icon_state = "chapel"},/area/derelict/medical/chapel)
-"hC" = (/obj/machinery/door/window/southleft,/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
+"hz" = (/obj/structure/table,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "chapel"},/area/derelict/medical/chapel)
+"hA" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "chapel"},/area/derelict/medical/chapel)
+"hB" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "chapel"},/area/derelict/medical/chapel)
+"hC" = (/obj/machinery/door/window/southleft,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
"hD" = (/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/space)
-"hE" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/obj/structure/cable{d1 = 1;d2 = 4;icon_state = "1-4";tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
-"hF" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
-"hG" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
-"hH" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/obj/machinery/door/airlock/research{name = "Toxins Research";req_access_txt = "7"},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
-"hI" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/turf/simulated/floor/plating/airless,/area/space)
+"hE" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
+"hF" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
+"hG" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
+"hH" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/obj/machinery/door/airlock/research{name = "Toxins Research"; req_access_txt = "7"},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
+"hI" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/floor/plating/airless,/area/space)
"hJ" = (/obj/structure/closet/wardrobe/genetics_white,/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
"hK" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/space)
"hL" = (/obj/item/pen,/turf/simulated/floor/plasteel,/area/derelict/arrival)
"hM" = (/obj/item/cigbutt,/turf/space,/area/space)
"hN" = (/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/space)
-"hO" = (/obj/structure/cable{d1 = 2;d2 = 8;icon_state = "2-8";tag = ""},/turf/simulated/floor/plating/airless,/area/space)
+"hO" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/turf/simulated/floor/plating/airless,/area/space)
"hP" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
"hQ" = (/obj/structure/table,/obj/item/stock_parts/cell,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
-"hR" = (/obj/structure/cable{d1 = 1;d2 = 4;icon_state = "1-4";tag = ""},/turf/simulated/floor/plasteel/airless,/area/space)
+"hR" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/space)
"hS" = (/turf/simulated/floor/plating,/area/derelict/medical/chapel)
-"hT" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/turf/simulated/floor/plasteel/airless,/area/space)
+"hT" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/space)
"hU" = (/obj/machinery/door/window{dir = 8},/turf/simulated/floor/plasteel/airless,/area/derelict/medical/chapel)
"hV" = (/turf/simulated/floor/plasteel/airless,/area/derelict/medical/chapel)
"hW" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel/airless,/area/derelict/medical/chapel)
-"hX" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/turf/simulated/floor/plating/airless,/area/space)
+"hX" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/floor/plating/airless,/area/space)
"hY" = (/obj/machinery/sleeper{dir = 8},/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
-"hZ" = (/obj/structure/window/basic{dir = 1},/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/turf/simulated/floor/plasteel/airless,/area/space)
-"ia" = (/obj/structure/window/basic,/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/turf/simulated/floor/plating/airless,/area/space)
+"hZ" = (/obj/structure/window/basic{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/space)
+"ia" = (/obj/structure/window/basic,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/floor/plating/airless,/area/space)
"ib" = (/obj/item/stack/medical/ointment,/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
-"ic" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/turf/simulated/floor/plasteel/airless,/area/space)
+"ic" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/space)
"id" = (/obj/structure/closet/l3closet/general,/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
"ie" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/space)
"if" = (/obj/structure/window/basic,/turf/space,/area/space)
"ig" = (/obj/structure/window/basic{dir = 8},/turf/space,/area/space)
-"ih" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/turf/simulated/floor/plasteel,/area/derelict/arrival)
+"ih" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/floor/plasteel,/area/derelict/arrival)
"ii" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/derelict/arrival)
"ij" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/derelict/arrival)
"ik" = (/obj/structure/window/reinforced{dir = 1},/turf/space,/area/space)
"il" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/space,/area/space)
-"im" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/obj/machinery/door/airlock/research{name = "Toxins Research";req_access_txt = "7"},/turf/simulated/floor/plasteel/airless,/area/derelict/arrival)
-"in" = (/obj/structure/cable{d1 = 2;d2 = 8;icon_state = "2-8";tag = ""},/turf/simulated/floor/plasteel,/area/derelict/arrival)
-"io" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/turf/simulated/floor/plating,/area/derelict/arrival)
+"im" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/obj/machinery/door/airlock/research{name = "Toxins Research"; req_access_txt = "7"},/turf/simulated/floor/plasteel/airless,/area/derelict/arrival)
+"in" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/turf/simulated/floor/plasteel,/area/derelict/arrival)
+"io" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/floor/plating,/area/derelict/arrival)
"ip" = (/obj/machinery/door/window{dir = 2},/turf/simulated/floor/plasteel/airless,/area/derelict/medical/chapel)
-"iq" = (/obj/machinery/light/small,/turf/simulated/floor/plasteel{dir = 4;icon_state = "chapel"},/area/derelict/medical/chapel)
+"iq" = (/obj/machinery/light/small,/turf/simulated/floor/plasteel{dir = 4; icon_state = "chapel"},/area/derelict/medical/chapel)
"ir" = (/obj/machinery/door/window/southright,/turf/simulated/floor/plasteel/airless{icon_state = "white"},/area/derelict/medical)
-"is" = (/obj/structure/cable{d1 = 1;d2 = 4;icon_state = "1-4";tag = ""},/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
-"it" = (/obj/structure/cable{d1 = 2;d2 = 8;icon_state = "2-8";tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
-"iu" = (/obj/item/assembly/prox_sensor{pixel_x = -8;pixel_y = 4},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
-"iv" = (/obj/structure/cable,/obj/machinery/power/apc/noalarm{dir = 0;name = "Worn-out APC";pixel_y = -24},/turf/simulated/floor/plasteel,/area/derelict/arrival)
-"iw" = (/obj/structure/table,/obj/machinery/computer/pod/old{name = "ProComp IIe";pixel_y = 7;id_tags = list("derelict_gun")},/turf/simulated/floor/plasteel{icon_state = "chapel"},/area/derelict/medical/chapel)
-"ix" = (/obj/machinery/door/window{base_state = "right";dir = 4;icon_state = "right"},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
+"is" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
+"it" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
+"iu" = (/obj/item/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
+"iv" = (/obj/structure/cable,/obj/machinery/power/apc/noalarm{dir = 0; name = "Worn-out APC"; pixel_y = -24},/turf/simulated/floor/plasteel,/area/derelict/arrival)
+"iw" = (/obj/structure/table,/obj/machinery/computer/pod/old{name = "ProComp IIe"; pixel_y = 7; id_tags = list("derelict_gun")},/turf/simulated/floor/plasteel{icon_state = "chapel"},/area/derelict/medical/chapel)
+"ix" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
"iy" = (/obj/structure/window/basic{dir = 8},/obj/structure/window/basic,/turf/space,/area/space)
"iz" = (/obj/machinery/door/airlock/external{name = "Arrival Airlock"},/turf/simulated/floor/plating,/area/derelict/arrival)
"iA" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
-"iB" = (/obj/structure/cable{d1 = 2;d2 = 4;icon_state = "2-4";tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
-"iC" = (/obj/structure/cable{d1 = 1;d2 = 8;icon_state = "1-8";tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
-"iD" = (/obj/structure/cable{d1 = 1;d2 = 4;icon_state = "1-4";tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
-"iE" = (/obj/machinery/door/window{base_state = "right";dir = 4;icon_state = "right"},/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
-"iF" = (/obj/structure/cable{d2 = 8;icon_state = "0-8"},/obj/structure/cable{icon_state = "0-2";d2 = 2},/obj/structure/cable{icon_state = "0-4";d2 = 4},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
-"iG" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/turf/simulated/wall/r_wall,/area/derelict/hallway/primary)
-"iH" = (/obj/machinery/door/airlock/security{name = "Gas Storage";req_access = null;req_access_txt = "3"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
-"iI" = (/obj/machinery/door/airlock/security{name = "Security";req_access = null;req_access_txt = "1"},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
-"iJ" = (/obj/structure/cable,/obj/machinery/power/apc/noalarm{dir = 0;name = "Worn-out APC";pixel_y = -24},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
-"iK" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/turf/simulated/floor/plasteel/airless,/area/space)
-"iL" = (/obj/machinery/door/airlock/maintenance{name = "Atmospherics Access";req_access_txt = "24"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
+"iB" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
+"iC" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
+"iD" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
+"iE" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
+"iF" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
+"iG" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/wall/r_wall,/area/derelict/hallway/primary)
+"iH" = (/obj/machinery/door/airlock/security{name = "Gas Storage"; req_access = null; req_access_txt = "3"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
+"iI" = (/obj/machinery/door/airlock/security{name = "Security"; req_access = null; req_access_txt = "1"},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
+"iJ" = (/obj/structure/cable,/obj/machinery/power/apc/noalarm{dir = 0; name = "Worn-out APC"; pixel_y = -24},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
+"iK" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/space)
+"iL" = (/obj/machinery/door/airlock/maintenance{name = "Atmospherics Access"; req_access_txt = "24"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
"iM" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
"iN" = (/obj/effect/landmark/burnturf,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
-"iO" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel/airless,/area/space)
+"iO" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/window/reinforced,/turf/simulated/floor/plasteel/airless,/area/space)
"iP" = (/obj/effect/landmark/burnturf,/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
"iQ" = (/obj/structure/window/basic{dir = 1},/turf/space,/area/space)
"iR" = (/obj/structure/window/basic{dir = 5},/turf/simulated/floor/plating/airless,/area/space)
"iS" = (/obj/structure/grille,/obj/structure/window/basic{dir = 1},/turf/space,/area/space)
"iT" = (/obj/structure/window/basic{dir = 1},/turf/simulated/floor/plating/airless,/area/space)
-"iU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5;max_integrity = 1e+007},/turf/simulated/floor/plating,/area/derelict/arrival)
+"iU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; max_integrity = 1e+007},/turf/simulated/floor/plating,/area/derelict/arrival)
"iV" = (/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor/plasteel,/area/derelict/arrival)
-"iW" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/turf/simulated/floor/plating/airless,/area/space)
-"iX" = (/obj/structure/cable{d1 = 1;d2 = 4;icon_state = "1-4";tag = ""},/turf/simulated/floor/plating/airless,/area/space)
-"iY" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/turf/simulated/wall/r_wall,/area/space)
-"iZ" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/turf/simulated/wall/r_wall,/area/derelict/hallway/secondary)
+"iW" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating/airless,/area/space)
+"iX" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/turf/simulated/floor/plating/airless,/area/space)
+"iY" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/wall/r_wall,/area/space)
+"iZ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/wall/r_wall,/area/derelict/hallway/secondary)
"ja" = (/obj/structure/girder,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
"jb" = (/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor/plasteel,/area/derelict/arrival)
"jc" = (/obj/machinery/door/window{dir = 2},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
-"jd" = (/obj/structure/window/basic{dir = 1},/obj/structure/cable{d1 = 2;d2 = 8;icon_state = "2-8";tag = ""},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
-"je" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5;max_integrity = 1e+007},/turf/simulated/floor/plating/airless,/area/space)
-"jf" = (/obj/item/stack/rods,/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary)
-"jg" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/obj/item/wirecutters,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary)
-"jh" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary)
+"jd" = (/obj/structure/window/basic{dir = 1},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
+"je" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; max_integrity = 1e+007},/turf/simulated/floor/plating/airless,/area/space)
+"jf" = (/obj/item/stack/rods,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary)
+"jg" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/item/wirecutters,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary)
+"jh" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary)
"ji" = (/obj/structure/lattice,/obj/structure/window/basic{dir = 4},/turf/space,/area/space)
"jj" = (/obj/structure/girder,/obj/structure/window/basic,/turf/simulated/floor/plating/airless,/area/derelict/arrival)
"jk" = (/obj/structure/bed,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
"jl" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
"jm" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
"jn" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
-"jo" = (/obj/machinery/door/airlock/maintenance{name = "Aux Storage";req_access_txt = "23"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
+"jo" = (/obj/machinery/door/airlock/maintenance{name = "Aux Storage"; req_access_txt = "23"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
"jp" = (/obj/structure/grille,/obj/item/shard,/obj/item/shard{icon_state = "medium"},/turf/simulated/floor/plating/airless,/area/space)
"jq" = (/obj/structure/window/basic{dir = 1},/turf/simulated/floor/plating,/area/derelict/arrival)
"jr" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel,/area/derelict/arrival)
"js" = (/obj/structure/table,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
"jt" = (/obj/item/shard{icon_state = "small"},/turf/space,/area/space)
"ju" = (/obj/machinery/vending/sovietsoda,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
-"jv" = (/obj/structure/cable{icon_state = "0-2";d2 = 2},/obj/structure/cable,/obj/machinery/power/apc/noalarm{dir = 8;name = "Worn-out APC";pixel_x = -24;pixel_y = 0},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary)
+"jv" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable,/obj/machinery/power/apc/noalarm{dir = 8; name = "Worn-out APC"; pixel_x = -24; pixel_y = 0},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary)
"jw" = (/obj/structure/table,/turf/simulated/floor/plasteel/airless,/area/space)
"jx" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plasteel/airless,/area/space)
-"jy" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary)
+"jy" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary)
"jz" = (/obj/structure/lattice,/obj/item/stack/cable_coil/cut,/turf/space,/area/space)
"jA" = (/obj/structure/girder,/turf/simulated/floor/plating,/area/derelict/arrival)
"jB" = (/obj/structure/chair/stool,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
-"jC" = (/obj/structure/cable{d1 = 2;d2 = 4;icon_state = "2-4";tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary)
+"jC" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary)
"jD" = (/obj/structure/closet/wardrobe/orange,/turf/simulated/floor/plasteel/airless,/area/space)
"jE" = (/obj/structure/window/basic{dir = 4},/turf/space,/area/space)
"jF" = (/obj/structure/grille,/turf/simulated/floor/plating,/area/derelict/arrival)
"jG" = (/obj/structure/closet/wardrobe/generic,/turf/simulated/floor/plasteel,/area/derelict/arrival)
-"jH" = (/obj/structure/cable{d1 = 1;d2 = 8;icon_state = "1-8";tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary)
-"jI" = (/obj/machinery/door/airlock/command{name = "AI Upload";req_access_txt = "16"},/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
+"jH" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary)
+"jI" = (/obj/machinery/door/airlock/command{name = "AI Upload"; req_access_txt = "16"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
"jJ" = (/obj/structure/window/reinforced,/turf/simulated/floor/plasteel/airless,/area/space)
"jK" = (/obj/structure/grille,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/space)
"jL" = (/obj/structure/bed,/turf/simulated/floor/plasteel/airless,/area/space)
"jM" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel,/area/derelict/arrival)
"jN" = (/turf/simulated/floor/plasteel/airless{icon_state = "floorgrime"},/area/derelict/hallway/primary)
-"jO" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
+"jO" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
"jP" = (/obj/structure/table,/obj/item/healthanalyzer,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/primary)
"jQ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/space)
"jR" = (/obj/structure/closet/wardrobe/mixed,/turf/simulated/floor/plasteel,/area/derelict/arrival)
"jS" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/space)
-"jT" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8";pixel_x = 0;tag = ""},/turf/simulated/wall/r_wall,/area/derelict/bridge/ai_upload)
+"jT" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/wall/r_wall,/area/derelict/bridge/ai_upload)
"jU" = (/obj/machinery/door/airlock/external{name = "Escape Airlock"},/turf/simulated/floor/plating,/area/derelict/arrival)
-"jV" = (/obj/structure/cable{d1 = 2;d2 = 4;icon_state = "2-4";tag = ""},/turf/simulated/wall/r_wall,/area/derelict/bridge/ai_upload)
+"jV" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/turf/simulated/wall/r_wall,/area/derelict/bridge/ai_upload)
"jW" = (/turf/simulated/wall,/area/derelict/hallway/secondary)
"jX" = (/obj/structure/girder,/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
"jY" = (/turf/simulated/wall/r_wall,/area/derelict/hallway/secondary)
"jZ" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless,/area/space)
-"ka" = (/obj/machinery/door/airlock/command{name = "AI Upload";req_access_txt = "16"},/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/obj/structure/cable{d1 = 1;d2 = 8;icon_state = "1-8";tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
+"ka" = (/obj/machinery/door/airlock/command{name = "AI Upload"; req_access_txt = "16"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
"kb" = (/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
-"kc" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
-"kd" = (/obj/machinery/power/terminal{icon_state = "term";dir = 1},/obj/structure/cable{icon_state = "0-2";d2 = 2},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
-"ke" = (/obj/structure/cable{icon_state = "0-2";d2 = 2},/obj/structure/cable,/obj/machinery/power/solar_control{id = "derelictsolar";name = "Primary Solar Control";track = 0},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
-"kf" = (/obj/structure/cable,/obj/machinery/power/apc/noalarm{dir = 8;environ = 0;equipment = 0;lighting = 0;locked = 0;name = "Worn-out APC";pixel_x = -24;pixel_y = 0},/turf/simulated/floor/plating/airless,/area/derelict/bridge/ai_upload)
+"kc" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
+"kd" = (/obj/machinery/power/terminal{icon_state = "term"; dir = 1},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
+"ke" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable,/obj/machinery/power/solar_control{id = "derelictsolar"; name = "Primary Solar Control"; track = 0},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
+"kf" = (/obj/structure/cable,/obj/machinery/power/apc/noalarm{dir = 8; environ = 0; equipment = 0; lighting = 0; locked = 0; name = "Worn-out APC"; pixel_x = -24; pixel_y = 0},/turf/simulated/floor/plating/airless,/area/derelict/bridge/ai_upload)
"kg" = (/obj/structure/girder,/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
"kh" = (/obj/item/paper/russiantraitorobj,/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
"ki" = (/obj/item/storage/toolbox/syndicate,/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
-"kj" = (/obj/machinery/door/window{base_state = "right";dir = 4;icon_state = "right"},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
+"kj" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
"kk" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
-"kl" = (/obj/machinery/door/window{base_state = "right";dir = 4;icon_state = "right"},/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/obj/machinery/light/small,/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
+"kl" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/light/small,/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
"km" = (/obj/item/stack/cable_coil/cut,/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
"kn" = (/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary)
"ko" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary)
-"kp" = (/obj/effect/decal/remains/human{desc = "This guy seemed to have died in terrible way! Half his remains are dust.";icon_state = "remains";name = "Syndicate agent remains"},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
+"kp" = (/obj/effect/decal/remains/human{desc = "This guy seemed to have died in terrible way! Half his remains are dust."; icon_state = "remains"; name = "Syndicate agent remains"},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
"kq" = (/obj/structure/falsewall,/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
-"kr" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/turf/simulated/wall/r_wall,/area/derelict/bridge/ai_upload)
+"kr" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/wall/r_wall,/area/derelict/bridge/ai_upload)
"ks" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
"kt" = (/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
"ku" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary)
@@ -547,9 +547,9 @@
"kA" = (/turf/simulated/floor/plasteel/airless{icon_state = "derelict14"},/area/derelict/hallway/secondary)
"kB" = (/turf/simulated/floor/plasteel/airless{icon_state = "derelict15"},/area/derelict/hallway/secondary)
"kC" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel/airless{icon_state = "derelict16"},/area/derelict/hallway/secondary)
-"kD" = (/obj/structure/cable{icon_state = "0-2";d2 = 2},/turf/simulated/floor/plating/airless,/area/solar/derelict_aft)
-"kE" = (/obj/structure/cable{icon_state = "0-2";d2 = 2},/obj/machinery/power/solar{id = "derelictsolar";name = "Derelict Solar Array"},/turf/simulated/floor/plasteel/airless,/area/solar/derelict_aft)
-"kF" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/turf/simulated/floor/plating/airless,/area/solar/derelict_aft)
+"kD" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating/airless,/area/solar/derelict_aft)
+"kE" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/solar{id = "derelictsolar"; name = "Derelict Solar Array"},/turf/simulated/floor/plasteel/airless,/area/solar/derelict_aft)
+"kF" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating/airless,/area/solar/derelict_aft)
"kG" = (/turf/simulated/floor/plasteel/airless{icon_state = "derelict1"},/area/derelict/hallway/secondary)
"kH" = (/turf/simulated/floor/plasteel/airless{icon_state = "derelict2"},/area/derelict/hallway/secondary)
"kI" = (/turf/simulated/floor/plasteel/airless{icon_state = "derelict3"},/area/derelict/hallway/secondary)
@@ -563,44 +563,44 @@
"kQ" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
"kR" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
"kS" = (/turf/simulated/wall/r_wall,/area/derelict/bridge/ai_upload)
-"kT" = (/obj/structure/cable{icon_state = "0-2";d2 = 2},/obj/machinery/power/solar{id = "derelictsolar";name = "Derelict Solar Array"},/turf/simulated/floor/plating/airless,/area/solar/derelict_aft)
+"kT" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/solar{id = "derelictsolar"; name = "Derelict Solar Array"},/turf/simulated/floor/plating/airless,/area/solar/derelict_aft)
"kU" = (/obj/machinery/door/airlock/external{name = "Escape Airlock"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
-"kV" = (/obj/structure/cable{icon_state = "0-2";d2 = 2},/obj/structure/cable,/obj/structure/cable{icon_state = "0-4";d2 = 4},/obj/structure/cable{d2 = 8;icon_state = "0-8"},/turf/simulated/floor/plating/airless,/area/solar/derelict_aft)
+"kV" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating/airless,/area/solar/derelict_aft)
"kW" = (/obj/structure/window/basic{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
"kX" = (/obj/structure/window/basic{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
-"kY" = (/obj/structure/cable{icon_state = "0-2";d2 = 2},/obj/structure/cable,/obj/structure/cable{icon_state = "0-4";d2 = 4},/turf/simulated/floor/plating/airless,/area/solar/derelict_aft)
+"kY" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating/airless,/area/solar/derelict_aft)
"kZ" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plasteel/airless,/area/derelict/hallway/secondary)
"la" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
-"lb" = (/obj/structure/cable{icon_state = "0-4";d2 = 4},/obj/structure/cable{d2 = 8;icon_state = "0-8"},/turf/simulated/floor/plating/airless,/area/solar/derelict_aft)
-"lc" = (/obj/structure/cable{icon_state = "0-2";d2 = 2},/obj/structure/cable{icon_state = "0-4";d2 = 4},/obj/structure/cable{d2 = 8;icon_state = "0-8"},/obj/structure/cable,/turf/simulated/floor/plating/airless,/area/solar/derelict_aft)
-"ld" = (/obj/structure/cable,/obj/machinery/power/solar{id = "derelictsolar";name = "Derelict Solar Array"},/turf/simulated/floor/plasteel/airless,/area/solar/derelict_aft)
+"lb" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating/airless,/area/solar/derelict_aft)
+"lc" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable,/turf/simulated/floor/plating/airless,/area/solar/derelict_aft)
+"ld" = (/obj/structure/cable,/obj/machinery/power/solar{id = "derelictsolar"; name = "Derelict Solar Array"},/turf/simulated/floor/plasteel/airless,/area/solar/derelict_aft)
"le" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/derelict/bridge/ai_upload)
"lf" = (/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
"lg" = (/obj/machinery/power/smes,/obj/structure/cable,/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
-"lh" = (/obj/structure/cable,/obj/structure/cable{icon_state = "0-4";d2 = 4},/obj/structure/cable{d2 = 8;icon_state = "0-8"},/turf/simulated/floor/plating/airless,/area/solar/derelict_aft)
-"li" = (/obj/structure/cable{icon_state = "0-2";d2 = 2},/obj/structure/cable,/obj/structure/cable{d2 = 8;icon_state = "0-8"},/turf/simulated/floor/plating/airless,/area/solar/derelict_aft)
+"lh" = (/obj/structure/cable,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating/airless,/area/solar/derelict_aft)
+"li" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating/airless,/area/solar/derelict_aft)
"lj" = (/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
"lk" = (/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/teleporter)
"ll" = (/turf/simulated/floor/plating/airless,/area/derelict/bridge/ai_upload)
"lm" = (/obj/machinery/light_construct/small{dir = 1},/obj/effect/landmark/damageturf,/turf/simulated/floor/plasteel/airless,/area/derelict/teleporter)
-"ln" = (/obj/structure/table,/obj/item/stock_parts/cell{charge = 100;maxcharge = 15000},/turf/simulated/floor/plasteel/airless,/area/derelict/teleporter)
-"lo" = (/obj/machinery/power/apc/noalarm{dir = 0;name = "Worn-out APC";pixel_y = -24},/turf/simulated/floor/plasteel/airless,/area/derelict/teleporter)
-"lp" = (/obj/machinery/navbeacon/invisible{codes_txt = "patrol;next_patrol=SDNW";invisibility = 100;location = "SDNE"},/turf/simulated/floor/plating/airless/asteroid,/area/syndicate_depot/outer)
+"ln" = (/obj/structure/table,/obj/item/stock_parts/cell{charge = 100; maxcharge = 15000},/turf/simulated/floor/plasteel/airless,/area/derelict/teleporter)
+"lo" = (/obj/machinery/power/apc/noalarm{dir = 0; name = "Worn-out APC"; pixel_y = -24},/turf/simulated/floor/plasteel/airless,/area/derelict/teleporter)
+"lp" = (/obj/machinery/navbeacon/invisible{codes_txt = "patrol;next_patrol=SDNW"; invisibility = 100; location = "SDNE"},/turf/simulated/floor/plating/airless/asteroid,/area/syndicate_depot/outer)
"lq" = (/obj/machinery/light/small{dir = 4},/obj/item/clothing/head/helmet/space/syndicate/black/red,/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
"lr" = (/obj/item/stack/rods,/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
"ls" = (/obj/machinery/door/window{dir = 8},/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
-"lt" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion_r (NORTH)";icon_state = "propulsion_r";dir = 1},/turf/space,/area/space)
-"lu" = (/turf/space,/turf/simulated/shuttle/wall{dir = 2;icon_state = "swall_f6";tag = "icon-swall_f6"},/area/space)
+"lt" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion_r (NORTH)"; icon_state = "propulsion_r"; dir = 1},/turf/space,/area/space)
+"lu" = (/turf/space,/turf/simulated/shuttle/wall{dir = 2; icon_state = "swall_f6"; tag = "icon-swall_f6"},/area/space)
"lv" = (/obj/item/clothing/suit/space/syndicate/black/red,/turf/simulated/floor/plasteel/airless,/area/derelict/bridge/ai_upload)
-"lw" = (/obj/structure/shuttle/engine/heater{tag = "icon-heater (NORTH)";icon_state = "heater";dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating/airless,/area/space)
-"lx" = (/turf/space,/turf/simulated/shuttle/wall{tag = "icon-swall_f10";icon_state = "swall_f10";dir = 2},/area/space)
+"lw" = (/obj/structure/shuttle/engine/heater{tag = "icon-heater (NORTH)"; icon_state = "heater"; dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating/airless,/area/space)
+"lx" = (/turf/space,/turf/simulated/shuttle/wall{tag = "icon-swall_f10"; icon_state = "swall_f10"; dir = 2},/area/space)
"ly" = (/obj/structure/cable,/turf/simulated/floor/plating/airless,/area/solar/derelict_aft)
-"lz" = (/obj/machinery/light{dir = 1;on = 1},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"lA" = (/obj/machinery/door/poddoor{id_tag = "syndi_depot_lvl2";name = "Level 2 Blast Doors";protected = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"lB" = (/turf/simulated/shuttle/wall{tag = "icon-swall11";icon_state = "swall11";dir = 2},/area/space)
-"lC" = (/turf/simulated/shuttle/wall{icon_state = "swall7";dir = 2},/area/space)
+"lz" = (/obj/machinery/light{dir = 1; on = 1},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"lA" = (/obj/machinery/door/poddoor{id_tag = "syndi_depot_lvl2"; name = "Level 2 Blast Doors"; protected = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"lB" = (/turf/simulated/shuttle/wall{tag = "icon-swall11"; icon_state = "swall11"; dir = 2},/area/space)
+"lC" = (/turf/simulated/shuttle/wall{icon_state = "swall7"; dir = 2},/area/space)
"lD" = (/turf/simulated/floor/plating/airless,/area/solar/derelict_aft)
-"lE" = (/turf/simulated/floor/plating/airless/asteroid,/turf/simulated/shuttle/wall{icon_state = "swall_f5";dir = 2},/area/space)
+"lE" = (/turf/simulated/floor/plating/airless/asteroid,/turf/simulated/shuttle/wall{icon_state = "swall_f5"; dir = 2},/area/space)
"lF" = (/turf/space,/area/syndicate_depot/perimeter)
"lG" = (/obj/effect/landmark{name = "syndi_depot_backup"},/turf/space,/area/syndicate_depot/perimeter)
"lH" = (/turf/space,/area/syndicate_depot/outer)
@@ -610,28 +610,28 @@
"lL" = (/turf/simulated/floor/plating/airless,/area/derelict/teleporter)
"lM" = (/turf/simulated/wall/r_wall,/area/derelict/teleporter)
"lN" = (/turf/simulated/floor/plasteel/airless,/area/derelict/teleporter)
-"lO" = (/turf/space,/turf/simulated/shuttle/wall{tag = "icon-swall_f9";icon_state = "swall_f9";dir = 2},/area/space)
-"lP" = (/turf/simulated/shuttle/wall{icon_state = "swall3";dir = 2},/area/space)
+"lO" = (/turf/space,/turf/simulated/shuttle/wall{tag = "icon-swall_f9"; icon_state = "swall_f9"; dir = 2},/area/space)
+"lP" = (/turf/simulated/shuttle/wall{icon_state = "swall3"; dir = 2},/area/space)
"lQ" = (/obj/machinery/computer/teleporter,/turf/simulated/floor/plasteel/airless,/area/derelict/teleporter)
"lR" = (/obj/machinery/teleport/station,/turf/simulated/floor/plasteel/airless,/area/derelict/teleporter)
"lS" = (/obj/machinery/teleport/hub,/turf/simulated/floor/plasteel/airless,/area/derelict/teleporter)
"lT" = (/obj/machinery/light_construct/small{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/teleporter)
"lU" = (/obj/structure/spider,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/outer)
-"lV" = (/obj/machinery/light{dir = 1;on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"lV" = (/obj/machinery/light{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"lW" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/outer)
"lX" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/outer)
"lY" = (/obj/effect/decal/cleanable/spiderling_remains,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/outer)
"lZ" = (/obj/item/reagent_containers/food/snacks/spiderleg,/obj/structure/spider,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/outer)
"ma" = (/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/outer)
"mb" = (/obj/effect/landmark{name = "syndi_depot_bot"},/turf/simulated/floor/plating/airless/asteroid,/area/syndicate_depot/outer)
-"mc" = (/obj/machinery/light{dir = 1;on = 1},/obj/item/stack/sheet/metal{layer = 4.1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"md" = (/obj/item/flag/chameleon{icon_state = "syndiflag";name = "Syndicate Flag";used = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"mc" = (/obj/machinery/light{dir = 1; on = 1},/obj/item/stack/sheet/metal{layer = 4.1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"md" = (/obj/item/flag/chameleon{icon_state = "syndiflag"; name = "Syndicate Flag"; used = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"me" = (/turf/simulated/wall,/area/syndicate_depot/outer)
"mf" = (/obj/effect/spawner/random_spawners/syndicate/turret/external,/turf/simulated/floor/plating/airless/asteroid,/area/syndicate_depot/outer)
"mg" = (/obj/machinery/light,/turf/simulated/floor/plating/airless/asteroid,/area/syndicate_depot/outer)
-"mh" = (/obj/machinery/light{dir = 1;on = 1},/obj/effect/decal/warning_stripes/blue,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"mi" = (/obj/machinery/light{dir = 4;icon_state = "tube1"},/turf/simulated/floor/plating/airless/asteroid,/area/syndicate_depot/outer)
-"mj" = (/obj/machinery/navbeacon/invisible{codes_txt = "patrol;next_patrol=SDSW";invisibility = 100;location = "SDNW"},/turf/simulated/floor/plating/airless/asteroid,/area/syndicate_depot/outer)
+"mh" = (/obj/machinery/light{dir = 1; on = 1},/obj/effect/decal/warning_stripes/blue,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"mi" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/plating/airless/asteroid,/area/syndicate_depot/outer)
+"mj" = (/obj/machinery/navbeacon/invisible{codes_txt = "patrol;next_patrol=SDSW"; invisibility = 100; location = "SDNW"},/turf/simulated/floor/plating/airless/asteroid,/area/syndicate_depot/outer)
"mk" = (/obj/structure/table,/obj/item/reagent_containers/food/drinks/cans/beer,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/outer)
"ml" = (/obj/effect/decal/cleanable/cobweb2,/obj/structure/spider,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/outer)
"mm" = (/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
@@ -644,17 +644,17 @@
"mt" = (/obj/structure/chair{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"mu" = (/obj/structure/table,/obj/structure/reagent_dispensers/beerkeg,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"mv" = (/obj/item/reagent_containers/food/drinks/flask/barflask,/obj/structure/table,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"mw" = (/obj/machinery/light{dir = 1;on = 1},/obj/effect/spawner/random_spawners/syndicate/turret,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"mx" = (/turf/simulated/shuttle/wall{tag = "icon-swall12";icon_state = "swall12";dir = 2},/area/space)
-"my" = (/turf/simulated/floor/plating/airless/asteroid,/turf/simulated/shuttle/wall{tag = "icon-swall_f9";icon_state = "swall_f9";dir = 2},/area/space)
-"mz" = (/obj/structure/closet/crate{icon_state = "crateopen";opened = 1},/obj/item/stack/ore/bananium,/obj/item/grenade/bananade,/turf/simulated/floor/plasteel/airless,/area/space)
+"mw" = (/obj/machinery/light{dir = 1; on = 1},/obj/effect/spawner/random_spawners/syndicate/turret,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"mx" = (/turf/simulated/shuttle/wall{tag = "icon-swall12"; icon_state = "swall12"; dir = 2},/area/space)
+"my" = (/turf/simulated/floor/plating/airless/asteroid,/turf/simulated/shuttle/wall{tag = "icon-swall_f9"; icon_state = "swall_f9"; dir = 2},/area/space)
+"mz" = (/obj/structure/closet/crate{icon_state = "crateopen"; opened = 1},/obj/item/stack/ore/bananium,/obj/item/grenade/bananade,/turf/simulated/floor/plasteel/airless,/area/space)
"mA" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"mB" = (/obj/effect/spawner/random_spawners/syndicate/layout/door,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"mC" = (/obj/machinery/door/airlock/hatch/syndicate,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"mD" = (/obj/item/shard{icon_state = "medium"},/turf/simulated/floor/plasteel/airless,/area/space)
"mE" = (/obj/machinery/light/small,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"mF" = (/obj/structure/shuttle/engine/propulsion{dir = 4;icon_state = "propulsion_l";tag = "icon-propulsion_l (WEST)"},/obj/structure/shuttle/engine/propulsion{dir = 4;icon_state = "burst_r";tag = "icon-burst_r (WEST)"},/turf/space,/area/space)
-"mG" = (/obj/structure/shuttle/engine/heater{tag = "icon-heater (EAST)";icon_state = "heater";dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/space)
+"mF" = (/obj/structure/shuttle/engine/propulsion{dir = 4; icon_state = "propulsion_l"; tag = "icon-propulsion_l (WEST)"},/obj/structure/shuttle/engine/propulsion{dir = 4; icon_state = "burst_r"; tag = "icon-burst_r (WEST)"},/turf/space,/area/space)
+"mG" = (/obj/structure/shuttle/engine/heater{tag = "icon-heater (EAST)"; icon_state = "heater"; dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/space)
"mH" = (/turf/simulated/mineral,/area/space)
"mI" = (/turf/simulated/floor/plating/airless/asteroid,/area/space)
"mJ" = (/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
@@ -665,8 +665,8 @@
"mO" = (/obj/structure/sign/poster/contraband/lamarr,/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
"mP" = (/obj/structure/closet/crate,/obj/item/stack/ore/tranquillite,/obj/item/stack/ore/tranquillite,/obj/item/stack/ore/tranquillite,/obj/item/stack/ore/tranquillite,/obj/item/stack/ore/tranquillite,/obj/item/stack/ore/tranquillite,/obj/item/stack/ore/tranquillite,/obj/item/stack/ore/tranquillite,/turf/simulated/floor/plasteel/airless,/area/space)
"mQ" = (/obj/structure/closet/crate,/obj/item/stack/ore/tranquillite,/obj/item/stack/ore/tranquillite,/obj/item/stack/ore/tranquillite,/obj/item/stack/ore/tranquillite,/obj/item/stack/ore/tranquillite,/obj/item/stack/ore/tranquillite,/obj/item/stack/ore/tranquillite,/turf/simulated/floor/plasteel/airless,/area/space)
-"mR" = (/obj/machinery/light{dir = 1;on = 1},/obj/effect/spawner/random_spawners/syndicate/loot,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"mS" = (/obj/machinery/light{dir = 1;on = 1},/obj/effect/spawner/random_spawners/syndicate/loot/level2,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"mR" = (/obj/machinery/light{dir = 1; on = 1},/obj/effect/spawner/random_spawners/syndicate/loot,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"mS" = (/obj/machinery/light{dir = 1; on = 1},/obj/effect/spawner/random_spawners/syndicate/loot/level2,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"mT" = (/obj/item/shard,/turf/simulated/floor/plating/airless/asteroid,/area/space)
"mU" = (/obj/structure/closet/crate,/obj/item/stack/ore/bananium,/obj/item/stack/ore/bananium,/obj/item/stack/ore/bananium,/obj/item/stack/ore/bananium,/obj/item/stack/ore/bananium,/turf/simulated/floor/plasteel/airless,/area/space)
"mV" = (/obj/effect/mob_spawn/human/mime/corpse{name = "Mime Pilot"},/turf/simulated/floor/plasteel/airless,/area/space)
@@ -678,40 +678,40 @@
"nb" = (/obj/item/shard{icon_state = "small"},/turf/simulated/floor/plating/airless/asteroid,/area/space)
"nc" = (/obj/item/stack/ore/bananium,/turf/simulated/floor/plasteel/airless,/area/space)
"nd" = (/obj/item/stack/sheet/metal{layer = 4.1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"ne" = (/obj/structure/shuttle/engine/propulsion{dir = 4;icon_state = "propulsion_l";tag = "icon-propulsion_l (WEST)"},/turf/space,/area/space)
+"ne" = (/obj/structure/shuttle/engine/propulsion{dir = 4; icon_state = "propulsion_l"; tag = "icon-propulsion_l (WEST)"},/turf/space,/area/space)
"nf" = (/obj/effect/spawner/random_spawners/syndicate/trap/mine,/obj/item/stack/sheet/metal{layer = 4.1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"ng" = (/obj/item/paper/clownship,/turf/simulated/floor/plasteel/airless,/area/space)
"nh" = (/obj/item/shard,/obj/structure/chair{dir = 8},/turf/simulated/floor/plasteel/airless,/area/space)
-"ni" = (/obj/machinery/light{dir = 4;icon_state = "tube1"},/obj/effect/spawner/random_spawners/syndicate/loot,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"ni" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/effect/spawner/random_spawners/syndicate/loot,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"nj" = (/obj/effect/mob_spawn/human/clown/corpse,/turf/simulated/floor/plasteel/airless,/area/space)
"nk" = (/obj/machinery/computer/syndicate_depot/teleporter,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"nl" = (/obj/item/pickaxe,/turf/simulated/floor/plasteel/airless,/area/space)
"nm" = (/obj/structure/closet/crate,/obj/item/stack/ore/bananium,/obj/item/stack/ore/bananium,/obj/item/stack/ore/bananium,/obj/item/stack/ore/bananium,/turf/simulated/floor/plasteel/airless,/area/space)
-"nn" = (/turf/space,/turf/simulated/shuttle/wall{tag = "icon-swall_f5";icon_state = "swall_f5";dir = 2},/area/space)
+"nn" = (/turf/space,/turf/simulated/shuttle/wall{tag = "icon-swall_f5"; icon_state = "swall_f5"; dir = 2},/area/space)
"no" = (/obj/machinery/bluespace_beacon/syndicate,/obj/effect/decal/warning_stripes/yellow,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"np" = (/turf/simulated/floor/plasteel/airless,/turf/simulated/shuttle/wall{tag = "icon-swall_f10";icon_state = "swall_f10";dir = 2},/area/space)
-"nq" = (/obj/structure/shuttle/engine/propulsion{dir = 4;icon_state = "propulsion_l";tag = "icon-propulsion_l (WEST)"},/obj/structure/shuttle/engine/propulsion{dir = 4;icon_state = "propulsion_l";tag = "icon-propulsion_l (WEST)"},/turf/space,/area/space)
-"nr" = (/obj/effect/decal/warning_stripes/red,/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/fusionreactor,/obj/structure/cable{d2 = 8;icon_state = "0-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"np" = (/turf/simulated/floor/plasteel/airless,/turf/simulated/shuttle/wall{tag = "icon-swall_f10"; icon_state = "swall_f10"; dir = 2},/area/space)
+"nq" = (/obj/structure/shuttle/engine/propulsion{dir = 4; icon_state = "propulsion_l"; tag = "icon-propulsion_l (WEST)"},/obj/structure/shuttle/engine/propulsion{dir = 4; icon_state = "propulsion_l"; tag = "icon-propulsion_l (WEST)"},/turf/space,/area/space)
+"nr" = (/obj/effect/decal/warning_stripes/red,/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/fusionreactor,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"ns" = (/obj/structure/chair{dir = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"nt" = (/obj/structure/sign/poster/contraband/fun_police,/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
"nu" = (/obj/machinery/door/poddoor/multi_tile/two_tile_hor,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"nv" = (/obj/effect/spawner/random_spawners/syndicate/trap/medbot,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"nw" = (/obj/effect/spawner/random_spawners/syndicate/mob,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"nx" = (/obj/effect/spawner/random_spawners/syndicate/loot/level2,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"ny" = (/obj/structure/cable{d1 = 2;d2 = 4;icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"ny" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"nz" = (/obj/item/lighter/zippo/black,/obj/structure/table,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"nA" = (/obj/structure/sign/poster/contraband/lusty_xenomorph,/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
-"nB" = (/obj/effect/landmark{dir = 6;name = "syndi_depot_shield"},/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
-"nC" = (/obj/effect/spawner/random_spawners/syndicate/layout/door/vault,/obj/effect/landmark{dir = 4;name = "syndi_depot_shield"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"nD" = (/obj/effect/landmark{dir = 4;name = "syndi_depot_shield"},/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
-"nE" = (/obj/structure/sign/poster/contraband/energy_swords,/obj/effect/landmark{dir = 4;name = "syndi_depot_shield"},/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
+"nB" = (/obj/effect/landmark{dir = 6; name = "syndi_depot_shield"},/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
+"nC" = (/obj/effect/spawner/random_spawners/syndicate/layout/door/vault,/obj/effect/landmark{dir = 4; name = "syndi_depot_shield"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"nD" = (/obj/effect/landmark{dir = 4; name = "syndi_depot_shield"},/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
+"nE" = (/obj/structure/sign/poster/contraband/energy_swords,/obj/effect/landmark{dir = 4; name = "syndi_depot_shield"},/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
"nF" = (/obj/effect/spawner/random_spawners/syndicate/layout/spacepod,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"nG" = (/obj/machinery/atmospherics/pipe/simple/hidden,/obj/effect/landmark{dir = 4;name = "syndi_depot_shield"},/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
-"nH" = (/obj/effect/landmark{dir = 10;name = "syndi_depot_shield"},/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
+"nG" = (/obj/machinery/atmospherics/pipe/simple/hidden,/obj/effect/landmark{dir = 4; name = "syndi_depot_shield"},/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
+"nH" = (/obj/effect/landmark{dir = 10; name = "syndi_depot_shield"},/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
"nI" = (/obj/structure/sign/poster/official/high_class_martini,/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
-"nJ" = (/obj/machinery/light/small{tag = "icon-bulb1 (EAST)";icon_state = "bulb1";dir = 4},/turf/simulated/floor/mineral/silver,/area/syndicate_depot/core)
+"nJ" = (/obj/machinery/light/small{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/simulated/floor/mineral/silver,/area/syndicate_depot/core)
"nK" = (/obj/machinery/light{dir = 8},/obj/effect/spawner/random_spawners/syndicate/loot,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"nL" = (/obj/structure/cable{icon_state = "0-2";d2 = 2},/obj/machinery/power/smes/upgraded{charge = 5e+006;input_level = 20000;output_level = 100000},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"nL" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/smes/upgraded{charge = 5e+006; input_level = 20000; output_level = 100000},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"nM" = (/obj/effect/spawner/random_spawners/syndicate/turret,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"nN" = (/obj/item/shard{icon_state = "medium"},/obj/structure/chair{dir = 8},/turf/simulated/floor/plating/airless/asteroid,/area/space)
"nO" = (/obj/effect/mob_spawn/human/clown/corpse{name = "Clown Pilot"},/turf/simulated/floor/plasteel/airless,/area/space)
@@ -728,13 +728,13 @@
"nZ" = (/obj/structure/chair,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"oa" = (/obj/machinery/vending/syndisnack,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"ob" = (/obj/machinery/door/airlock/silver,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"oc" = (/obj/machinery/turretid/syndicate{name = "internal turret controls";pixel_y = 32},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"od" = (/obj/machinery/light{dir = 1;on = 1},/obj/effect/spawner/random_spawners/syndicate/loot/level4,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"oe" = (/obj/structure/sink{dir = 4;icon_state = "sink";pixel_x = 12;pixel_y = 0},/turf/simulated/floor/mineral/plasma,/area/syndicate_depot/core)
+"oc" = (/obj/machinery/turretid/syndicate{name = "internal turret controls"; pixel_y = 32},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"od" = (/obj/machinery/light{dir = 1; on = 1},/obj/effect/spawner/random_spawners/syndicate/loot/level4,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"oe" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 12; pixel_y = 0},/turf/simulated/floor/mineral/plasma,/area/syndicate_depot/core)
"of" = (/obj/structure/closet/secure_closet/syndicate/depot,/obj/effect/spawner/random_spawners/syndicate/trap/documents,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"og" = (/obj/machinery/computer/syndicate_depot/selfdestruct,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"oh" = (/obj/structure/cable{d1 = 2;d2 = 4;icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"oi" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/obj/structure/cable{d1 = 1;d2 = 8;icon_state = "1-8";tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"oh" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"oi" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"oj" = (/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"ok" = (/obj/structure/table,/obj/effect/spawner/random_spawners/syndicate/trap/pizzabomb,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"ol" = (/obj/structure/table,/obj/item/reagent_containers/food/snacks/syndicake,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
@@ -746,31 +746,31 @@
"or" = (/turf/simulated/floor/mineral/plasma,/area/syndicate_depot/core)
"os" = (/obj/structure/table,/obj/item/wrench,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"ot" = (/obj/structure/table,/obj/item/folder/syndicate/yellow,/obj/item/pen,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"ou" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"ou" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"ov" = (/obj/structure/cable,/obj/machinery/power/terminal,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"ow" = (/obj/structure/cable,/obj/machinery/power/apc/noalarm{dir = 4;pixel_x = 24;req_access = list(150)},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"ox" = (/obj/machinery/light{dir = 1;on = 1},/turf/simulated/floor/plating/airless/asteroid,/area/syndicate_depot/outer)
-"oy" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
-"oz" = (/obj/effect/landmark{dir = 5;name = "syndi_depot_shield"},/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
-"oA" = (/obj/structure/sign/poster/contraband/syndicate_pistol,/obj/effect/landmark{dir = 4;name = "syndi_depot_shield"},/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
+"ow" = (/obj/structure/cable,/obj/machinery/power/apc/noalarm{dir = 4; pixel_x = 24; req_access = list(150)},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"ox" = (/obj/machinery/light{dir = 1; on = 1},/turf/simulated/floor/plating/airless/asteroid,/area/syndicate_depot/outer)
+"oy" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
+"oz" = (/obj/effect/landmark{dir = 5; name = "syndi_depot_shield"},/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
+"oA" = (/obj/structure/sign/poster/contraband/syndicate_pistol,/obj/effect/landmark{dir = 4; name = "syndi_depot_shield"},/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
"oB" = (/obj/effect/spawner/random_spawners/syndicate/mob,/turf/simulated/floor/mineral/plasma,/area/syndicate_depot/core)
-"oC" = (/obj/effect/landmark{dir = 9;name = "syndi_depot_shield"},/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
+"oC" = (/obj/effect/landmark{dir = 9; name = "syndi_depot_shield"},/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
"oD" = (/obj/structure/sign/poster/official/state_laws,/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
"oE" = (/obj/effect/landmark{name = "syndi_depot_shield"},/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
-"oF" = (/obj/machinery/door_control{active_power_usage = 0;id = "syndi_depot_rear";idle_power_usage = 0;name = "mysterious button";normaldoorcontrol = 0;use_power = 0},/obj/structure/sign/poster/contraband/syndicate_recruitment,/turf/simulated/wall,/area/syndicate_depot/core)
+"oF" = (/obj/machinery/door_control{active_power_usage = 0; id = "syndi_depot_rear"; idle_power_usage = 0; name = "mysterious button"; normaldoorcontrol = 0; use_power = 0},/obj/structure/sign/poster/contraband/syndicate_recruitment,/turf/simulated/wall,/area/syndicate_depot/core)
"oG" = (/obj/effect/decal/warning_stripes/east,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"oH" = (/obj/machinery/light{dir = 1;on = 1},/obj/effect/spawner/random_spawners/syndicate/turret,/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"oI" = (/obj/machinery/light{dir = 1;on = 1},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"oH" = (/obj/machinery/light{dir = 1; on = 1},/obj/effect/spawner/random_spawners/syndicate/turret,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"oI" = (/obj/machinery/light{dir = 1; on = 1},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"oJ" = (/obj/effect/spawner/random_spawners/syndicate/loot/level4,/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"oK" = (/obj/effect/spawner/random_spawners/syndicate/loot/level4,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"oL" = (/obj/machinery/computer/syndicate_depot/aiterminal,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"oM" = (/obj/structure/mirror{pixel_x = -32},/turf/simulated/floor/mineral/silver,/area/syndicate_depot/core)
-"oN" = (/obj/machinery/door_control{active_power_usage = 0;id = "syndi_depot_rear";idle_power_usage = 0;name = "mysterious button";normaldoorcontrol = 0;pixel_x = 24;use_power = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"oN" = (/obj/machinery/door_control{active_power_usage = 0; id = "syndi_depot_rear"; idle_power_usage = 0; name = "mysterious button"; normaldoorcontrol = 0; pixel_x = 24; use_power = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"oO" = (/obj/structure/sign/poster/contraband/missing_gloves,/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
-"oP" = (/obj/machinery/door/poddoor{id_tag = "syndi_depot_rear";name = "Sealed Doors";protected = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"oP" = (/obj/machinery/door/poddoor{id_tag = "syndi_depot_rear"; name = "Sealed Doors"; protected = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"oQ" = (/obj/machinery/atmospherics/unary/passive_vent/high_volume{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"oR" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/obj/effect/spawner/random_spawners/syndicate/layout/door/vault,/obj/effect/landmark{name = "syndi_depot_shield"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"oS" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";tag = ""},/obj/machinery/light/small,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
+"oS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/light/small,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"oT" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/armory,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"oU" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"oV" = (/obj/effect/decal/warning_stripes/north,/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
@@ -781,11 +781,11 @@
"pa" = (/obj/structure/toilet{dir = 8},/turf/simulated/floor/mineral/silver,/area/syndicate_depot/core)
"pb" = (/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"pc" = (/obj/machinery/light,/obj/effect/spawner/random_spawners/syndicate/loot/level3,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"pd" = (/obj/machinery/navbeacon/invisible{codes_txt = "patrol;next_patrol=SDSE";invisibility = 100;location = "SDSW"},/turf/simulated/floor/plating/airless/asteroid,/area/syndicate_depot/outer)
-"pe" = (/obj/machinery/power/apc/noalarm{dir = 4;pixel_x = 24},/obj/structure/cable,/obj/machinery/turretid/syndicate{name = "external turret controls";pixel_y = 32},/turf/simulated/floor/plating/airless,/area/syndicate_depot/outer)
+"pd" = (/obj/machinery/navbeacon/invisible{codes_txt = "patrol;next_patrol=SDSE"; invisibility = 100; location = "SDSW"},/turf/simulated/floor/plating/airless/asteroid,/area/syndicate_depot/outer)
+"pe" = (/obj/machinery/power/apc/noalarm{dir = 4; pixel_x = 24},/obj/structure/cable,/obj/machinery/turretid/syndicate{name = "external turret controls"; pixel_y = 32},/turf/simulated/floor/plating/airless,/area/syndicate_depot/outer)
"pf" = (/obj/machinery/computer/syndicate_depot/shieldcontrol,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"pg" = (/obj/effect/spawner/random_spawners/syndicate/layout/door/vault,/obj/effect/landmark{name = "syndi_depot_shield"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
-"ph" = (/obj/machinery/navbeacon/invisible{codes_txt = "patrol;next_patrol=SDNE";invisibility = 100;location = "SDSE"},/turf/simulated/floor/plating/airless/asteroid,/area/syndicate_depot/outer)
+"ph" = (/obj/machinery/navbeacon/invisible{codes_txt = "patrol;next_patrol=SDNE"; invisibility = 100; location = "SDSE"},/turf/simulated/floor/plating/airless/asteroid,/area/syndicate_depot/outer)
"pi" = (/obj/structure/sign/poster/official/obey,/turf/simulated/wall/r_wall,/area/syndicate_depot/core)
"pn" = (/mob/living/silicon/decoy/syndicate/depot,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot/core)
"pp" = (/turf/simulated/mineral,/area/syndicate_depot/core)
@@ -1020,18 +1020,18 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamHmHmHmHmHmHmHmHmHmHmHmImImHmHaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamHmHmHmHmHmHmHmHmHmHmHmHmHmHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalFlHlHlHlIlIlIlKlKlKmmmmmmntnumAmmmmmAmAndmmmmmBmmnvmAmAmAnwmAnxmmmAmdmAmdmmlKlKlIlIlHlHlHlHlHlHlHlHlHlHlHlHlHlHlFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamHmHmHmHmHmHmHmHmHmHmHmHmImIaaaalumxmxmLmLmxmxmxmxlxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalFlHlHlHlIlIlIlIlKmfmmmAmAmAmAmAmmmmmmmmmmmmnzmAmmnxnxmAmAmAmAnxmmmCmmnAmmmmlKlKlIlIlHlHlIlHlHlHlHlHlHlHlHlHlHlHlFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamHmHmHmHmHmHmHmHmHmHmHmHmIlumxmymInjazazmUmUmzazmGmFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalFlHlHlHlHlIlIlIlKlKmmnFmAmAmAmAmmmMmRnxmmmSmAmAmmmmnImmmmmBmmmmmmmAmAmRmMmmlKlKlIlIlIlIlIlHlHlHlHlHlHlHlHlHlHlHlGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamHmHmHmHmHmHmHmHmHmHmHmHmHmHmHnbmXazazazazncazmGneaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalFlHlHlHlHlHlIlIlKlKmmnKmAmAmAnimmmAmAmAmBmAmAmAmBmAmAnMlVmAmAmAmBmAmAmAmAmmlKlKlIlIlIlHlHlHlHlHlHlHlHlHlHlHlHlHlFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamHmHmHmHmHmHmHmHmHmHmHmHmHmHmHnbmXazazazazncazmGneaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalFlHlHlHlHlHlIlIlKlKmmnKmAmAmAnimmmAmAmAmBmAmAmAmBmAmAmAlVmAmAmAmBmAmAmAmAmmlKlKlIlIlIlHlHlHlHlHlHlHlHlHlHlHlHlHlFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamHmHmHmHmHmHmHmHmHmHmHmHmHmHmWnNnOazngncazncazncmGneaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalFlHlHlHlHlHlIlIlKminQnPmAmAmAmAmBmAmAnwmmnMmAmAmmmAmAmAmAmAmAnRmmmdmtnSmAmmmnlKlKlIlIlIlHlHlHlHlHlHlHlHlHlHlHlHlFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamHmHmHmHmHmHmHmHmHmHmHmHmHnaaznhazmDaznjazazazncmGneaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalFlHlHlHlHlIlIlIlKlKmmnTnMmAmAnMmmnUmBmmmmmmnVmmmmnWnYnXnZnZmAoammmmmmmmobmmmflKlIlIlIlImelIlHlHlHlHlHlHlHlHlHlHlFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamHmHmHmHmHmHmHmHmHmHmHmHmHnnmxnpmYnlazaznmmUmUazmGnqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalFlHlHlHlIlIlIlKlKmfmmmmmmmBmmmmmmofmAlVmtognynrmmmAojnXolokmAomooonoqopormmlKlKlIlIlIlKlKlKmelHlHlHlHlHlHlHlHlHlFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamHmHmHmHmHmHmHmHmHmHmHmHmHmHmHnnmxmxmLmLmxmxmxmxlOaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalFlHlHlHlHlIlIlIlKlKlAmEmCmAmAosmmotmAmAmAmAovnBnDnCnGnEnDnHmBmmmmoommoBnJmmlKlKlIlIlKlKmelKlKlHlHlHlIlHlHlHlHlHlFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamHmHmHmHmHmHmHmHmHmHmHmHmHmHmHmHmHmHmHmHmHmHmHmHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalFlHlHlHlHlIlIlIlKlKmmmmoDmAnwmAmBmAnMmAnWmAnLoEocoGoJodoKoEmAmAmwoLmmoMoemmlKlKlIlImelKlIlKlKlHlHmelIlKlHlHlHlHlFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamHmHmHmHmHmHmHmHmHmHmHmHmHmHmHmHmHmHmHmHmHmHmHmHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalFlHlHlHlHlIlIlIlKlKmmmmoDmAnwmAmBmAmAmAnWmAnLoEocoGoJodoKoEmAmAlVoLmmoMoemmlKlKlIlImelKlIlKlKlHlHmelIlKlHlHlHlHlFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamHmHaamHmHmHmHmHmImImHmHmHmHmHmHmHmHmHmHmHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalFlHlHlHlHlHlIlIlKlKmimmmMmAmAnioOmAmAmAoQohoioRoUoToWoVoVoXoUoYmAnsmmoZpammmnlKlIlIlKlKlIlIlKlHlHlHlKlKlHlHlHlHlFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamHmHmHmHmImImImHmHmHmHmHmHmHmHmHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalFlHlHlHlHlHlIlIlKlKlKmmmmmmmBmmmmpbnXpcmAouowoEpfmAojmAmApgmAmAmAmAmmobmmmmlKlKlIlIlKlIlIlIlKlKlHlImelIlKlHlHlHlFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamHmHaaaaaaaamImImHmImHmHmImImIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalFlHlHlHlHlIlIlIlKlKmflKoxmmmAmAmmpimmmmmBoymmoznDoAnGnCnDoCnXnXmApnmmmAnMmmlKlKppoFpqlIlKlKlKlKmelIlHlIlHlHlHlHlGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamHaaaaaaaaaaaamImHmHmHmHmHmHmIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalGlHlHlHlHlIlIlIlKlKlKlKlKmmnwmAlVmAmAmmmAoHmmpbnXnXoImAptmmmmmmmBmmmmpuoNmmmCmmpppwpxmelKmelIlKlIlKlKlIlHlHlHlHlFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamHmHmHmHmIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalFlHlHlHlIlIlIlIlIlIlIlKlKmmmmnxpzpymAmBmAoumBmAmAmApAnWmAmBmAlVmAnfmBmAmAmCmEoPpDpCpqlIlKlIlKlKlKlIlKlIlIlHlHlHlFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalFlHlHlHlHlHlIlIlIlIlIlIlKlKmmmmmmmmmmmmpEoummmAmAnMmAmAmAmmnMmAmAmAmKmAmAmmmCmmpppppFlIlKlKlKlIlKlIlKmelHlHlHlHlFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalFlHlHlHlHlHlIlIlIlIlIlIlKlKmmmmmmmmmmmmpEoummmAmAmAmAmAmAmmnMmAmAmAmKmAmAmmmCmmpppppFlIlKlKlKlIlKlIlKmelHlHlHlHlFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalFlHlHlHlHlHlHlIlHlIlIlIlKmflKoxlKlKlKmmmmoymmmmmBmmmBmmmmmmmmnxmAmAmmmMmMmmlKlKlIlIlIlHlKlImelIlKlIlKlIlHlHlHlHlFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalFlHlHlHlHlHlHlHlHlHlIlIlIlKlKmblKlKlKlKlAoSmCmAmAmmmAmSnxnxmmnxmAnwmmmmmmmmlKlKlIlIlKlIlHlHlKlHlKlKlKlHlHlHlHlHlFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalFlHlHlHlHlHlHlHlHlIlIlHlIlIlKpdlKlKlKlKmmoymmpImAmBnwmAmAmAmBmAmAmAmmlKlKoxlKlKlIlIlKlKlHlHlHlHlKlKlHlHlHlHlHlHlFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -1060,3 +1060,4 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
"}
+
diff --git a/code/__DEFINES/components.dm b/code/__DEFINES/components.dm
index 3b31e34b2f4..87b9094b47e 100644
--- a/code/__DEFINES/components.dm
+++ b/code/__DEFINES/components.dm
@@ -158,6 +158,8 @@
// /obj signals
#define COMSIG_OBJ_DECONSTRUCT "obj_deconstruct" //from base of obj/deconstruct(): (disassembled)
#define COMSIG_OBJ_SETANCHORED "obj_setanchored" //called in /obj/structure/setAnchored(): (value)
+#define COMSIG_OBJ_UPDATE_ICON "obj_update_icon" //called in /obj/update_icon()
+
// /obj/item signals
#define COMSIG_ITEM_ATTACK "item_attack" //from base of obj/item/attack(): (/mob/living/target, /mob/living/user)
diff --git a/code/__DEFINES/gamemode.dm b/code/__DEFINES/gamemode.dm
index 38e820b4768..4a45b3e6a65 100644
--- a/code/__DEFINES/gamemode.dm
+++ b/code/__DEFINES/gamemode.dm
@@ -35,6 +35,7 @@
#define SPECIAL_ROLE_SHADOWLING "Shadowling"
#define SPECIAL_ROLE_SHADOWLING_THRALL "Shadowling Thrall"
#define SPECIAL_ROLE_SLAUGHTER_DEMON "Slaughter Demon"
+#define SPECIAL_ROLE_SUPER "Super"
#define SPECIAL_ROLE_SYNDICATE_DEATHSQUAD "Syndicate Commando"
#define SPECIAL_ROLE_TRAITOR "Traitor"
#define SPECIAL_ROLE_VAMPIRE "Vampire"
diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm
index 7d0a4ab1504..9da2c725a43 100644
--- a/code/__DEFINES/layers.dm
+++ b/code/__DEFINES/layers.dm
@@ -18,6 +18,7 @@
#define CLOSED_TURF_LAYER 2.05
#define BULLET_HOLE_LAYER 2.06
#define ABOVE_NORMAL_TURF_LAYER 2.08
+#define ABOVE_ICYOVERLAY_LAYER 2.11
#define LATTICE_LAYER 2.2
#define DISPOSAL_PIPE_LAYER 2.3
#define GAS_PIPE_HIDDEN_LAYER 2.35
diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm
index b4f004c8e49..874c87c0758 100644
--- a/code/_globalvars/misc.dm
+++ b/code/_globalvars/misc.dm
@@ -78,4 +78,9 @@ GLOBAL_VAR_INIT(timezoneOffset, 0) // The difference betwen midnight (of the hos
// However it'd be ok to use for accessing attack logs and such too, which are even laggier.
var/fileaccess_timer = 0
-GLOBAL_VAR_INIT(gametime_offset, 432000) // 12:00 in seconds
\ No newline at end of file
+GLOBAL_VAR_INIT(gametime_offset, 432000) // 12:00 in seconds
+
+//printers shutdown if too much shit printed
+var/copier_items_printed = 0
+var/copier_max_items = 300
+var/copier_items_printed_logged = FALSE
\ No newline at end of file
diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm
index cea30327af1..c8ef4c344b1 100644
--- a/code/_onclick/hud/radial.dm
+++ b/code/_onclick/hud/radial.dm
@@ -66,7 +66,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
var/max_elements
var/pages = 1
var/current_page = 1
-
+
var/hudfix_method = TRUE //TRUE to change anchor to user, FALSE to shift by py_shift
var/py_shift = 0
var/entry_animation = TRUE
@@ -74,9 +74,12 @@ GLOBAL_LIST_EMPTY(radial_menus)
//If we swap to vis_contens inventory these will need a redo
/datum/radial_menu/proc/check_screen_border(mob/user)
var/atom/movable/AM = anchor
- if(!istype(AM) || !AM.screen_loc)
+ if(!istype(AM))
return
- if(AM in user.client.screen)
+ var/mob/living/carbon/H
+ if(ishuman(user))
+ H = user
+ if((AM in user.client.screen) || (H && (AM in H.internal_organs)))
if(hudfix_method)
anchor = user
else
@@ -84,7 +87,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
restrict_to_dir(NORTH) //I was going to parse screen loc here but that's more effort than it's worth.
//Sets defaults
-//These assume 45 deg min_angle
+//These assume 45 deg min_angle
/datum/radial_menu/proc/restrict_to_dir(dir)
switch(dir)
if(NORTH)
@@ -105,7 +108,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
zone = ending_angle - starting_angle
else
zone = 360 - starting_angle + ending_angle
-
+
max_elements = round(zone / min_angle)
var/paged = max_elements < choices.len
if(elements.len < max_elements)
@@ -172,7 +175,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
else
E.pixel_y = py
E.pixel_x = px
-
+
//Visuals
E.alpha = 255
E.mouse_opacity = MOUSE_OPACITY_ICON
@@ -192,7 +195,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
E.next_page = FALSE
if(choices_icons[choice_id])
E.add_overlay(choices_icons[choice_id])
-
+
/datum/radial_menu/New()
close_button = new
close_button.parent = src
@@ -230,7 +233,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
MA.layer = ABOVE_HUD_LAYER
MA.appearance_flags |= RESET_TRANSFORM
return MA
-
+
/datum/radial_menu/proc/next_page()
if(pages > 1)
@@ -268,7 +271,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
. = ..()
/*
- Presents radial menu to user anchored to anchor (or user if the anchor is currently in users screen)
+ Presents radial menu to user anchored to anchor (or user if the anchor is currently in users screen)
Choices should be a list where list keys are movables or text used for element names and return value
and list values are movables/icons/images used for element icons
*/
@@ -297,4 +300,4 @@ GLOBAL_LIST_EMPTY(radial_menus)
GLOB.radial_menus -= uniqueid
return answer
-#undef ANIM_SPEED
\ No newline at end of file
+#undef ANIM_SPEED
diff --git a/code/datums/action.dm b/code/datums/action.dm
index a9c895f3482..31b62e868dc 100644
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -44,12 +44,14 @@
M.update_action_buttons()
/datum/action/proc/Remove(mob/M)
+ owner = null
+ if(!M)
+ return
if(M.client)
M.client.screen -= button
button.moved = FALSE //so the button appears in its normal position when given to another owner.
M.actions -= src
M.update_action_buttons()
- owner = null
/datum/action/proc/Trigger()
if(!IsAvailable())
@@ -102,20 +104,24 @@
/datum/action/item_action
check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUNNED|AB_CHECK_LYING|AB_CHECK_CONSCIOUS
var/use_itemicon = TRUE
-/datum/action/item_action/New(Target)
+/datum/action/item_action/New(Target, custom_icon, custom_icon_state)
..()
var/obj/item/I = target
I.actions += src
+ if(custom_icon && custom_icon_state)
+ use_itemicon = FALSE
+ icon_icon = custom_icon
+ button_icon_state = custom_icon_state
/datum/action/item_action/Destroy()
var/obj/item/I = target
I.actions -= src
return ..()
-/datum/action/item_action/Trigger()
+/datum/action/item_action/Trigger(attack_self = TRUE) //Maybe we don't want to click the thing itself
if(!..())
return 0
- if(target)
+ if(target && attack_self)
var/obj/item/I = target
I.ui_action_click(owner, type)
return 1
@@ -313,6 +319,14 @@
/datum/action/item_action/toggle_helmet
name = "Toggle Helmet"
+/datum/action/item_action/remove_tape
+ name = "Remove Duct Tape"
+
+/datum/action/item_action/remove_tape/Trigger(attack_self = FALSE)
+ if(..())
+ GET_COMPONENT_FROM(DT, /datum/component/ducttape, target)
+ DT.remove_tape(target, usr)
+
/datum/action/item_action/toggle_jetpack
name = "Toggle Jetpack"
@@ -443,6 +457,9 @@
return 0
var/obj/effect/proc_holder/spell/spell = target
+ if(spell.special_availability_check)
+ return 1
+
if(owner)
return spell.can_cast(owner)
return 0
diff --git a/code/datums/components/ducttape.dm b/code/datums/components/ducttape.dm
new file mode 100644
index 00000000000..5bbf99198fd
--- /dev/null
+++ b/code/datums/components/ducttape.dm
@@ -0,0 +1,70 @@
+/datum/component/ducttape
+ var/x_offset = 0
+ var/y_offset = 0
+ var/icon/tape_overlay = null
+
+/datum/component/ducttape/Initialize(obj/item/I, mob/user, x, y)
+ if(!istype(I)) //Something went wrong
+ return
+ x_offset = x
+ y_offset = y
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/add_tape_text)
+ RegisterSignal(parent, COMSIG_OBJ_UPDATE_ICON, .proc/add_tape_overlay)
+ RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/afterattack)
+ RegisterSignal(parent, COMSIG_ITEM_PICKUP, .proc/pick_up)
+ I.update_icon() //Do this first so the action button properly shows the icon
+ var/datum/action/item_action/remove_tape/RT = new(I)
+ if(I.loc == user)
+ RT.Grant(user)
+
+/datum/component/proc/add_tape_text(datum/source, mob/user)
+ to_chat(user, "There's some sticky tape attached to [source].")
+
+/datum/component/ducttape/proc/add_tape_overlay(obj/item/O)
+ tape_overlay = new('icons/obj/bureaucracy.dmi', "tape")
+ tape_overlay.Shift(EAST, x_offset - 2)
+ tape_overlay.Shift(NORTH, y_offset - 2)
+ O.overlays += tape_overlay
+
+/datum/component/ducttape/proc/remove_tape(obj/item/I, mob/user)
+ to_chat(user, "You tear the tape off [I]!")
+ playsound(I, 'sound/items/poster_ripped.ogg', 50, 1)
+ new /obj/item/trash/tapetrash(user.loc)
+ I.update_icon()
+ I.anchored = initial(I.anchored)
+ for(var/datum/action/item_action/remove_tape/RT in I.actions)
+ RT.Remove(user)
+ RT.Destroy()
+ I.overlays.Cut(tape_overlay)
+ user.transfer_fingerprints_to(I)
+ Destroy()
+
+/datum/component/ducttape/proc/afterattack(obj/item/I, atom/target, mob/user, proximity, params)
+ if(!proximity)
+ return
+ if(!isturf(target))
+ return
+ if(!user.unEquip(I))
+ return
+ var/turf/source_turf = get_turf(I)
+ var/turf/target_turf = target
+ var/list/clickparams = params2list(params)
+ var/x_offset = text2num(clickparams["icon-x"]) - 16
+ var/y_offset = text2num(clickparams["icon-y"]) - 16
+ if(target_turf != get_turf(I)) //Trying to stick it on a wall, don't move it to the actual wall or you can move the item through it. Instead set the pixels as appropriate
+ var/target_direction = get_dir(source_turf, target_turf)//The direction we clicked
+ if(target_direction & EAST)
+ x_offset += 32
+ else if(target_direction & WEST)
+ x_offset -= 32
+ if(target_direction & NORTH)
+ y_offset += 32
+ else if(target_direction & SOUTH)
+ y_offset -= 32
+ to_chat(user, "You stick [I] to [target_turf].")
+ I.pixel_x = x_offset
+ I.pixel_y = y_offset
+
+/datum/component/ducttape/proc/pick_up(obj/item/I, mob/user)
+ I.pixel_x = initial(I.pixel_x)
+ I.pixel_y = initial(I.pixel_y)
diff --git a/code/datums/spell.dm b/code/datums/spell.dm
index dee057c5568..21c0c3e5bce 100644
--- a/code/datums/spell.dm
+++ b/code/datums/spell.dm
@@ -100,6 +100,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
var/action_icon = 'icons/mob/actions/actions.dmi'
var/action_icon_state = "spell_default"
var/action_background_icon_state = "bg_spell"
+ var/special_availability_check = 0//Whether the spell needs to bypass the action button's IsAvailable()
var/sound = null //The sound the spell makes when it is cast
diff --git a/code/datums/spells/lightning.dm b/code/datums/spells/lightning.dm
index 257e98346d2..9567f48368f 100644
--- a/code/datums/spells/lightning.dm
+++ b/code/datums/spells/lightning.dm
@@ -10,6 +10,7 @@
cooldown_min = 30
selection_type = "view"
random_target = 1
+ special_availability_check = 1
var/start_time = 0
var/ready = 0
var/image/halo = null
diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index 89108071b09..614cd5bfa7c 100644
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -934,7 +934,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
/datum/supply_packs/science/oil
name = "Oil Tank Crate"
- contains = list(/obj/structure/reagent_dispensers/oil,
+ contains = list(/obj/structure/reagent_dispensers/oil,
/obj/item/reagent_containers/food/drinks/oilcan)
cost = 10
containertype = /obj/structure/largecrate
@@ -1341,6 +1341,15 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
cost = 15
containername = "bureaucracy crate"
+/datum/supply_packs/misc/tape
+ name = "Sticky Tape Crate"
+ contains = list(/obj/item/stack/tape_roll,
+ /obj/item/stack/tape_roll,
+ /obj/item/stack/tape_roll)
+ cost = 10
+ containername = "sticky tape crate"
+ containertype = /obj/structure/closet/crate/tape
+
/datum/supply_packs/misc/toner
name = "Toner Cartridges Crate"
contains = list(/obj/item/toner,
@@ -1711,6 +1720,14 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
)
containername = "hygiene station crate"
+/datum/supply_packs/misc/snow_machine
+ name = "Snow Machine Crate"
+ cost = 20
+ contains = list(
+ /obj/machinery/snow_machine
+ )
+ special = TRUE
+
//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Vending /////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index 8d871447cd3..3f3c394a7e6 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -163,6 +163,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/jobspecific
category = "Job Specific Tools"
cant_discount = TRUE
+ excludefrom = list(/datum/game_mode/nuclear) // Stops the job specific category appearing for nukies
//Clown
/datum/uplink_item/jobspecific/clowngrenade
diff --git a/code/game/area/depot-areas.dm b/code/game/area/depot-areas.dm
index 951e5ac4695..fc83279faa3 100644
--- a/code/game/area/depot-areas.dm
+++ b/code/game/area/depot-areas.dm
@@ -31,6 +31,7 @@
var/detected_mech = FALSE
var/detected_pod = FALSE
var/detected_double_agent = FALSE
+ var/mine_trigger_count = 0
var/obj/machinery/computer/syndicate_depot/syndiecomms/comms_computer = null
var/obj/structure/fusionreactor/reactor
@@ -81,8 +82,18 @@
detected_mech = FALSE
detected_pod = FALSE
detected_double_agent = FALSE
+ mine_trigger_count = 0
updateicon()
+ if(!istype(reactor))
+ for(var/obj/structure/fusionreactor/R in src)
+ reactor = R
+ R.has_overloaded = FALSE
+
+ for(var/obj/machinery/door/airlock/A in src)
+ if(A.density && A.locked)
+ spawn(0)
+ A.unlock()
alert_log += "Alert level reset."
@@ -119,6 +130,12 @@
if(on_peaceful)
increase_alert("Vandals!")
+/area/syndicate_depot/core/proc/mine_triggered(mob/living/M)
+ if(mine_trigger_count)
+ return TRUE
+ mine_trigger_count++
+ increase_alert("Intruder detected by sentry mine: [M]")
+
/area/syndicate_depot/core/proc/saw_mech(obj/mecha/E)
if(detected_mech)
return
@@ -292,11 +309,11 @@
for(var/obj/machinery/computer/syndicate_depot/C in src)
C.security_lockout = FALSE
-/area/syndicate_depot/core/proc/toggle_door_locks()
+/area/syndicate_depot/core/proc/set_emergency_access(var/openaccess)
for(var/obj/machinery/door/airlock/A in src)
- A.emergency = !A.emergency
- if(A.locked)
- A.locked = !A.locked
+ if(istype(A, /obj/machinery/door/airlock/hatch/syndicate/vault))
+ continue
+ A.emergency = !!openaccess
A.update_icon()
/area/syndicate_depot/core/proc/toggle_falsewalls()
@@ -315,9 +332,8 @@
if(!M.ckey)
continue
var/turf/T = get_turf(M)
- if(T.loc != src)
- continue
- receivers |= M
+ if(T && T.loc && T.loc == src)
+ receivers |= M
for(var/mob/R in receivers)
to_chat(R, msg_text)
R << sound('sound/misc/notice1.ogg')
@@ -335,6 +351,8 @@
if(!L.locked)
L.locked = !L.locked
L.update_icon()
+ for(var/obj/machinery/door/airlock/hatch/syndicate/vault/A in src)
+ A.lock()
/area/syndicate_depot/core/proc/shields_key_check()
if(!shield_list.len)
@@ -353,6 +371,8 @@
if(L.locked)
L.locked = !L.locked
L.update_icon()
+ for(var/obj/machinery/door/airlock/hatch/syndicate/vault/A in src)
+ A.unlock()
/area/syndicate_depot/core/proc/despawn_guards()
for(var/mob/thismob in list_getmobs(guard_list))
@@ -363,7 +383,7 @@
/area/syndicate_depot/core/proc/ghostlog(gmsg)
if(istype(reactor))
var/image/alert_overlay = image('icons/obj/flag.dmi', "syndiflag")
- notify_ghosts(gmsg, title = "Depot News", source = reactor, alert_overlay = alert_overlay, action = NOTIFY_JUMP)
+ notify_ghosts(gmsg, title = "Depot News", source = reactor.loc, alert_overlay = alert_overlay, action = NOTIFY_JUMP)
/area/syndicate_depot/core/proc/declare_started()
if(!run_started)
diff --git a/code/game/dna/genes/powers.dm b/code/game/dna/genes/powers.dm
index 1e5e6b66842..f526659d664 100644
--- a/code/game/dna/genes/powers.dm
+++ b/code/game/dna/genes/powers.dm
@@ -103,11 +103,13 @@
..(M,connected,flags)
M.pass_flags |= PASSTABLE
M.resize = 0.8
+ M.update_transform()
/datum/dna/gene/basic/midget/deactivate(var/mob/M, var/connected, var/flags)
..()
M.pass_flags &= ~PASSTABLE
M.resize = 1.25
+ M.update_transform()
// OLD HULK BEHAVIOR
/datum/dna/gene/basic/hulk
diff --git a/code/game/gamemodes/cult/cult_comms.dm b/code/game/gamemodes/cult/cult_comms.dm
index 8bd5fc3cc4f..2fbbcdc413d 100644
--- a/code/game/gamemodes/cult/cult_comms.dm
+++ b/code/game/gamemodes/cult/cult_comms.dm
@@ -17,14 +17,23 @@
cultist_commune(usr, input)
return
+
+
/proc/cultist_commune(mob/living/user, message)
if(!message)
return
- user.whisper("O bidai nabora se[pick("'","`")]sma!")
+
+ if((user.disabilities & MUTE) || user.mind.miming) //Under vow of silence/mute?
+ user.visible_message("[user] appears to whisper to themselves.","You begin to whisper to yourself.") //Make them do *something* abnormal.
+ else
+ user.whisper("O bidai nabora se[pick("'","`")]sma!") // Otherwise book club sayings.
sleep(10)
+
if(!user)
return
- user.whisper(message)
+
+ if(!((user.disabilities & MUTE) || user.mind.miming)) // If they aren't mute/miming, commence the whisperting
+ user.whisper(message)
var/my_message
if(istype(user, /mob/living/simple_animal/slaughter/cult)) //Harbringers of the Slaughter
my_message = "Harbringer of the Slaughter: [message]"
diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm
index 1f233a77818..68b06b8e000 100644
--- a/code/game/jobs/job/job.dm
+++ b/code/game/jobs/job/job.dm
@@ -169,8 +169,11 @@
back = backpack //Department backpack
if(box)
- backpack_contents.Insert(1, box) // Box always takes a first slot in backpack
- backpack_contents[box] = 1
+ var/spawnbox = box
+ if(H.dna.species.speciesbox)
+ spawnbox = H.dna.species.speciesbox
+ backpack_contents.Insert(1, spawnbox) // Box always takes a first slot in backpack
+ backpack_contents[spawnbox] = 1
if(allow_loadout && H.client && (H.client.prefs.gear && H.client.prefs.gear.len))
for(var/gear in H.client.prefs.gear)
diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm
index 28e81b33792..ce5fbd847bc 100644
--- a/code/game/jobs/job/supervisor.dm
+++ b/code/game/jobs/job/supervisor.dm
@@ -257,7 +257,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
suit = /obj/item/clothing/suit/storage/internalaffairs
shoes = /obj/item/clothing/shoes/brown
l_ear = /obj/item/radio/headset/headset_sec/alt
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/read_only
id = /obj/item/card/id/security
l_pocket = /obj/item/laser_pointer
r_pocket = /obj/item/flash
diff --git a/code/game/jobs/job/support_chaplain.dm b/code/game/jobs/job/support_chaplain.dm
index 18edfc1e6c2..7eb88a0f436 100644
--- a/code/game/jobs/job/support_chaplain.dm
+++ b/code/game/jobs/job/support_chaplain.dm
@@ -76,7 +76,7 @@
feedback_set_details("religion_name","[new_religion]")
var/deity_name = "Space Jesus"
- var/new_deity = sanitize(copytext(input(H, "Who or what do you worship? Default is Space Jesus.", "Name change", deity_name),1,MAX_NAME_LEN))
+ var/new_deity = sanitize(copytext(input(H, "Who or what do you worship? Default is Space Jesus.", "Name change", deity_name), 1, MAX_NAME_LEN))
if((length(new_deity) == 0) || (new_deity == "Space Jesus") )
new_deity = deity_name
@@ -91,9 +91,9 @@
var/new_book_style = "Bible"
while(!accepted)
- if(!B)
+ if(!B || !H.client)
break // prevents possible runtime errors
- new_book_style = input(H,"Which bible style would you like?") in list("Bible", "Koran", "Scrapbook", "Creeper", "White Bible", "Holy Light", "PlainRed", "Tome", "The King in Yellow", "Ithaqua", "Scientology", "the bible melts", "Necronomicon", "Greentext")
+ new_book_style = input(H, "Which bible style would you like?") in list("Bible", "Koran", "Scrapbook", "Creeper", "White Bible", "Holy Light", "PlainRed", "Tome", "The King in Yellow", "Ithaqua", "Scientology", "the bible melts", "Necronomicon", "Greentext")
switch(new_book_style)
if("Koran")
B.icon_state = "koran"
@@ -153,7 +153,9 @@
H.update_inv_l_hand() // so that it updates the bible's item_state in his hand
- switch(input(H,"Look at your bible - is this what you want?") in list("Yes","No"))
+ if(!B || !H.client)
+ break // prevents possible runtime errors
+ switch(input(H, "Look at your bible - is this what you want?") in list("Yes", "No"))
if("Yes")
accepted = 1
if("No")
@@ -166,7 +168,7 @@
ticker.Bible_item_state = B.item_state
ticker.Bible_name = B.name
ticker.Bible_deity_name = B.deity_name
- feedback_set_details("religion_deity","[new_deity]")
- feedback_set_details("religion_book","[new_book_style]")
+ feedback_set_details("religion_deity", "[new_deity]")
+ feedback_set_details("religion_book", "[new_book_style]")
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index b0ad5a23b1d..bd66901c4ab 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -998,7 +998,7 @@
to_chat(user, "You flip the switch on the underside of [src].")
active = 1
visible_message("[src] softly beeps and whirs to life!")
- playsound(src.loc, 'sound/machines/defib_SaftyOn.ogg', 25, 1)
+ playsound(src.loc, 'sound/machines/defib_saftyOn.ogg', 25, 1)
atom_say("This is ship ID #[rand(1,1000)] to Orion Port Authority. We're coming in for landing, over.")
sleep(20)
visible_message("[src] begins to vibrate...")
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index c72cfe1dbda..83c7bdf8b9f 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -4,10 +4,30 @@
name = "computer frame"
icon = 'icons/obj/stock_parts.dmi'
icon_state = "0"
+ max_integrity = 100
var/state = 0
var/obj/item/circuitboard/circuit = null
+ var/base_mineral = /obj/item/stack/sheet/metal
// weight = 1.0E8
+/obj/structure/computerframe/deconstruct(disassembled = TRUE)
+ drop_computer_parts()
+ return ..() // will qdel the frame
+
+/obj/structure/computerframe/obj_break(damage_flag)
+ deconstruct()
+
+/obj/structure/computerframe/proc/drop_computer_parts()
+ new base_mineral(loc, 5)
+ if(circuit)
+ circuit.forceMove(loc)
+ circuit = null
+ if(state >= 3)
+ var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( loc )
+ A.amount = 5
+ if(state >= 4)
+ new /obj/item/stack/sheet/glass(loc, 2)
+
/obj/item/circuitboard
density = 0
anchored = 0
@@ -420,8 +440,7 @@
if(do_after(user, 20 * WT.toolspeed, target = src))
if(!src || !WT.isOn()) return
to_chat(user, "You deconstruct the frame.")
- new /obj/item/stack/sheet/metal(loc, 5)
- qdel(src)
+ deconstruct(TRUE)
if(1)
if(istype(P, /obj/item/wrench))
playsound(loc, P.usesound, 50, 1)
@@ -525,6 +544,7 @@
/obj/structure/computerframe/HONKputer
name = "Bananium Computer-frame"
icon = 'icons/obj/machines/HONKputer.dmi'
+ base_mineral = /obj/item/stack/sheet/mineral/bananium
/obj/structure/computerframe/HONKputer/attackby(obj/item/P as obj, mob/user as mob, params)
switch(state)
@@ -544,8 +564,7 @@
if(do_after(user, 20 * WT.toolspeed, target = src))
if(!src || !WT.isOn()) return
to_chat(user, "You deconstruct the frame.")
- new /obj/item/stack/sheet/mineral/bananium(loc, 5)
- qdel(src)
+ deconstruct(TRUE)
if(1)
if(istype(P, /obj/item/wrench))
playsound(loc, P.usesound, 50, 1)
diff --git a/code/game/machinery/computer/depot.dm b/code/game/machinery/computer/depot.dm
index 580c0c9b53b..4e6afa0c229 100644
--- a/code/game/machinery/computer/depot.dm
+++ b/code/game/machinery/computer/depot.dm
@@ -125,6 +125,8 @@
/obj/machinery/computer/syndicate_depot/doors
name = "depot door control computer"
+ req_access = list()
+ var/pub_access = FALSE
/obj/machinery/computer/syndicate_depot/doors/get_menu(mob/user)
return {"Syndicate Depot Door Control Computer
@@ -136,8 +138,13 @@
if(..())
return
if(depotarea)
- depotarea.toggle_door_locks(src)
- to_chat(user, "Door locks toggled.")
+ pub_access = !pub_access
+ if(pub_access)
+ depotarea.set_emergency_access(TRUE)
+ to_chat(user, "Emergency Access enabled.")
+ else
+ depotarea.set_emergency_access(FALSE)
+ to_chat(user, "Emergency Access disabled.")
playsound(user, sound_yes, 50, 0)
/obj/machinery/computer/syndicate_depot/doors/secondary(mob/user, subcommand)
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index fc19325e594..1935869fb53 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -5,6 +5,7 @@
density = 1
anchored = 1
use_power = NO_POWER_USE
+ max_integrity = 100
var/obj/item/circuitboard/circuit = null
var/list/components = null
var/list/req_components = null
@@ -15,6 +16,19 @@
var/list/connected_parts = list()
var/pattern_idx=0
+/obj/machinery/constructable_frame/deconstruct(disassembled = TRUE)
+ new /obj/item/stack/sheet/metal(src.loc, 5)
+ if(state >= 3)
+ var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil(loc)
+ A.amount = 5
+ if(circuit)
+ circuit.forceMove(loc)
+ circuit = null
+ return ..()
+
+/obj/machinery/constructable_frame/obj_break(damage_flag)
+ deconstruct()
+
// unfortunately, we have to instance the objects really quickly to get the names
// fortunately, this is only called once when the board is added and the items are immediately GC'd
// and none of the parts do much in their constructors
@@ -89,8 +103,7 @@
if(istype(P, /obj/item/wrench))
playsound(src.loc, P.usesound, 75, 1)
to_chat(user, "You dismantle the frame.")
- new /obj/item/stack/sheet/metal(src.loc, 5)
- qdel(src)
+ deconstruct(TRUE)
if(2)
if(istype(P, /obj/item/circuitboard))
var/obj/item/circuitboard/B = P
@@ -317,6 +330,16 @@ to destroy them and players will be able to make replacements.
name = "circuit board (Freezer)"
to_chat(user, "You set the board to cooling.")
+/obj/item/circuitboard/snow_machine
+ name = "circuit board (snow machine)"
+ build_path = /obj/machinery/snow_machine
+ board_type = "machine"
+ origin_tech = "programming=2;materials=2"
+ frame_desc = "Requires 1 Matter Bin and 1 Micro Laser."
+ req_components = list(
+ /obj/item/stock_parts/matter_bin = 1,
+ /obj/item/stock_parts/micro_laser = 1)
+
/obj/item/circuitboard/biogenerator
name = "circuit board (Biogenerator)"
build_path = /obj/machinery/biogenerator
diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm
index 36dae285e57..a71081f0be1 100644
--- a/code/game/machinery/dance_machine.dm
+++ b/code/game/machinery/dance_machine.dm
@@ -148,7 +148,7 @@
selection = available[selected]
updateUsrDialog()
if("horn")
- deejay('sound/items/airhorn2.ogg')
+ deejay('sound/items/Airhorn2.ogg')
if("alert")
deejay('sound/misc/notice1.ogg')
if("siren")
@@ -462,7 +462,7 @@
if(!(M in rangers))
rangers[M] = TRUE
M.playsound_local(get_turf(M), null, 100, channel = CHANNEL_JUKEBOX, S = song_played)
- if(prob(5+(allowed(M) * 4)) && M.canmove)
+ if(prob(5+(allowed(M) * 4)) && M.canmove && isliving(M))
dance(M)
for(var/mob/L in rangers)
if(get_dist(src, L) > 10)
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 6f838319040..adf22a06850 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -1,7 +1,7 @@
/obj/machinery/door
name = "door"
desc = "It opens and closes."
- icon = 'icons/obj/doors/Doorint.dmi'
+ icon = 'icons/obj/doors/doorint.dmi'
icon_state = "door1"
anchored = TRUE
opacity = 1
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index 3770a311ed0..48561914a16 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -80,7 +80,7 @@
else if(glass)
user.visible_message("[user] bangs on \the [src].",
"You bang on \the [src].")
- playsound(get_turf(src), 'sound/effects/Glassknock.ogg', 10, 1)
+ playsound(get_turf(src), 'sound/effects/glassknock.ogg', 10, 1)
/obj/machinery/door/firedoor/attackby(obj/item/C, mob/user, params)
add_fingerprint(user)
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index 91615ea5302..49a05371050 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -206,9 +206,9 @@ var/list/holopads = list()
if(A)
LAZYADD(callnames[A], I)
callnames -= get_area(src)
- callnames = sortNames(callnames) //Sorts the now complete callable list for ease of use
+ var/list/sorted_callnames = sortAtom(callnames)
dialling_input = TRUE
- var/result = input(usr, "Choose an area to call", "Holocall") as null|anything in callnames
+ var/result = input(usr, "Choose an area to call", "Holocall") as null|anything in sorted_callnames
dialling_input = FALSE
if(QDELETED(usr) || !result || outgoing_call)
return
diff --git a/code/game/machinery/snow_machine.dm b/code/game/machinery/snow_machine.dm
new file mode 100644
index 00000000000..2ae3bf22977
--- /dev/null
+++ b/code/game/machinery/snow_machine.dm
@@ -0,0 +1,133 @@
+/obj/machinery/snow_machine
+ name = "snow machine"
+ desc = "Just add water and you too can have your own winter wonderland! Carol singers not included."
+ icon_state = "snow_machine_off"
+ density = TRUE
+ anchored = FALSE
+ layer = OBJ_LAYER
+ var/active = FALSE
+ var/power_used_this_cycle = 0
+ var/cooling_speed = 1
+ var/power_efficiency = 1
+ var/lower_temperature_limit = T0C - 10 //Set lower for a bigger freeze
+ var/infinite_snow = FALSE //Set this to have it not use water
+
+/obj/machinery/snow_machine/New()
+ ..()
+ create_reagents(300) //Makes 100 snow tiles!
+ reagents.add_reagent("water", 300) //But any reagent will do
+ reagents.flags |= REAGENT_NOREACT //Because a) this doesn't need to process and b) this way we can use any reagents without needing to worry about explosions and shit
+ container_type = REFILLABLE
+ component_parts = list()
+ component_parts += new /obj/item/circuitboard/snow_machine(null)
+ component_parts += new /obj/item/stock_parts/matter_bin(null)
+ component_parts += new /obj/item/stock_parts/micro_laser(null)
+ RefreshParts()
+
+/obj/machinery/snow_machine/examine(mob/user)
+ ..()
+ to_chat(user, "The internal reservoir indicates it is [infinite_snow ? "100" : round(reagents.total_volume / reagents.maximum_volume * 100)]% full.")
+
+/obj/machinery/snow_machine/RefreshParts()
+ power_efficiency = 0
+ cooling_speed = 0
+ for(var/obj/item/stock_parts/matter_bin/B in component_parts)
+ cooling_speed += B.rating
+ for(var/obj/item/stock_parts/micro_laser/L in component_parts)
+ power_efficiency += L.rating
+
+/obj/machinery/snow_machine/attack_hand(mob/user)
+ if(!powered() || !anchored)
+ return
+ if(turn_on_or_off(!active))
+ to_chat(user, "You [active ? "turn on" : "turn off"] [src].")
+ return ..()
+
+/obj/machinery/snow_machine/attackby(obj/item/I, mob/user)
+ if(isscrewdriver(I))
+ if(default_deconstruction_screwdriver(user, "snow_machine_openpanel", "snow_machine_off", I))
+ turn_on_or_off(FALSE)
+ else if(iscrowbar(I))
+ default_deconstruction_crowbar(I)
+ else if(iswrench(I))
+ var/obj/item/wrench/W = I
+ anchored = !anchored
+ to_chat(user, "You [anchored ? "tighten" : "loosen"] [src]'s wheels.")
+ playsound(loc, W.usesound, 50, TRUE)
+ turn_on_or_off(FALSE)
+ else
+ return ..()
+
+/obj/machinery/snow_machine/process()
+ if(power_used_this_cycle)
+ power_used_this_cycle /= power_efficiency
+ use_power(power_used_this_cycle)
+ power_used_this_cycle = 0
+ if(!active || !anchored)
+ return
+ if(!powered())
+ return
+ if(!reagents.has_reagent(reagents.get_master_reagent_id(), 3))
+ return //This means you don't need to top it up constantly to keep the nice snowclouds going
+ var/turf/T = get_turf(src)
+ if(isspaceturf(T) || T.density) //If the snowmachine is on a dense tile or in space, then it shouldn't be able to produce any snow and so will turn off
+ turn_on_or_off(FALSE, TRUE)
+ return
+ for(var/turf/TF in range(1, src))
+ if(issimulatedturf(TF))
+ var/turf/simulated/S = TF
+ affect_turf_temperature(S, cooling_speed)
+ if(prob(50))
+ continue
+ make_snowcloud(TF)
+
+/obj/machinery/snow_machine/power_change()
+ ..()
+ if(!powered())
+ turn_on_or_off(FALSE, TRUE)
+ update_icon()
+
+/obj/machinery/snow_machine/update_icon()
+ ..()
+ if(panel_open)
+ icon_state = "snow_machine_openpanel"
+ else
+ icon_state = "snow_machine_[active ? "on" : "off"]"
+
+/obj/machinery/snow_machine/proc/affect_turf_temperature(turf/T, modifier)
+ if(!issimulatedturf(T) || T.density)
+ return
+ var/turf/simulated/S = T
+ var/initial_temperature = S.air.temperature
+ if(initial_temperature <= lower_temperature_limit) //Can we actually cool this?
+ return
+ var/old_thermal_energy = S.air.thermal_energy()
+ var/amount_cooled = initial_temperature - modifier * 8000 / S.air.heat_capacity()
+ S.air.temperature = max(amount_cooled, lower_temperature_limit)
+ air_update_turf()
+ var/new_thermal_energy = S.air.thermal_energy()
+ power_used_this_cycle += (old_thermal_energy - new_thermal_energy) / 100
+
+/obj/machinery/snow_machine/proc/make_snowcloud(turf/T)
+ if(isspaceturf(T))
+ return
+ if(T.density)
+ return
+ if(issimulatedturf(T))
+ var/turf/simulated/S = T
+ if(S.air.temperature > T0C + 1)
+ return
+ if(locate(/obj/effect/snowcloud, T)) //Ice to see you
+ return
+ if(infinite_snow || !reagents.remove_reagent(reagents.get_master_reagent_id(), 3))
+ new /obj/effect/snowcloud(T, src)
+ power_used_this_cycle += 1000
+ return TRUE
+
+/obj/machinery/snow_machine/proc/turn_on_or_off(activate, give_message = FALSE)
+ active = activate ? TRUE : FALSE
+ if(!active && give_message)
+ visible_message("[src] switches off!")
+ playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
+ update_icon()
+ return TRUE
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index cf146b7a882..fcdd81a30e1 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -1218,6 +1218,7 @@
icon_state = "dinnerware"
products = list(/obj/item/storage/bag/tray = 8,/obj/item/kitchen/utensil/fork = 6,
/obj/item/kitchen/knife = 3,/obj/item/kitchen/rollingpin = 2,
+ /obj/item/kitchen/sushimat = 3,
/obj/item/reagent_containers/food/drinks/drinkingglass = 8, /obj/item/clothing/suit/chef/classic = 2,
/obj/item/reagent_containers/food/condiment/pack/ketchup = 5,
/obj/item/reagent_containers/food/condiment/pack/hotsauce = 5,
diff --git a/code/game/machinery/wishgranter.dm b/code/game/machinery/wishgranter.dm
index 248514179af..b2851129a29 100644
--- a/code/game/machinery/wishgranter.dm
+++ b/code/game/machinery/wishgranter.dm
@@ -39,4 +39,44 @@
user.mind.add_antag_datum(/datum/antagonist/wishgranter)
- to_chat(user, "You have a very bad feeling about this.")
\ No newline at end of file
+ to_chat(user, "You have a very bad feeling about this.")
+
+/obj/machinery/wish_granter/super
+ name = "super wish granter"
+ var/list/types = list()
+
+/obj/machinery/wish_granter/super/attack_hand(mob/living/carbon/user)
+ if(!ishuman(user))
+ to_chat(user, "You feel a dark stirring inside of the Wish Granter, something you want nothing of. Your instincts are better than any man's.")
+ return
+ else if(is_special_character(user) || jobban_isbanned(user, ROLE_TRAITOR) || jobban_isbanned(user, "Syndicate"))
+ to_chat(user, "Something instinctual makes you pull away.")
+ return
+ else
+
+ to_chat(user, "Your touch makes the Wish Granter stir. Are you really sure you want to do this?")
+
+ for(var/supname in GLOB.all_superheroes)
+ types += supname
+
+ var/wish
+ if(types.len == 1)
+ wish = pick(types)
+ else
+ wish = input("You want to become...","Wish") as null|anything in types
+
+ if(!src || !wish || user.stat == DEAD || (get_dist(src, user) > 4)) //another check after the input to check if someone already used it, closed it, or if they're dead, or if they ran off
+ return
+
+ var/datum/superheroes/S = GLOB.all_superheroes[wish]
+ if(S.activated)
+ to_chat(user,"There can only be one! Pick something else!")
+ return
+
+ S.create(user)
+ S.activated = TRUE //sets this superhero as taken so we don't have duplicates
+ playsound(src.loc, 'sound/effects/bamf.ogg', 50, 1)
+ visible_message("The wishgranter fades into mist..")
+ add_attack_logs(null, user, "Became [GLOB.all_superheroes[wish]]")
+ notify_ghosts("[GLOB.all_superheroes[wish]] has appeared in [get_area(user)].", source = user)
+ qdel(src)
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index 011b2c6fab8..f5fdecea3f6 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -516,7 +516,7 @@
energy_drain = 30
origin_tech = "materials=3;plasmatech=4;engineering=3"
projectile = /obj/item/projectile/plasma/adv/mech
- fire_sound = 'sound/weapons/laser.ogg'
+ fire_sound = 'sound/weapons/Laser.ogg'
/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma/can_attach(obj/mecha/M as obj)
if(istype(M, /obj/mecha/working))
diff --git a/code/game/objects/effects/decals/misc.dm b/code/game/objects/effects/decals/misc.dm
index e2f1399a922..52ad55c48a4 100644
--- a/code/game/objects/effects/decals/misc.dm
+++ b/code/game/objects/effects/decals/misc.dm
@@ -16,6 +16,7 @@
anchored = TRUE
layer = TURF_DECAL_LAYER
icon = 'icons/turf/snow.dmi'
+ icon_state = "snow"
/obj/effect/decal/snow/clean/edge
icon_state = "snow_corner"
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index 1b619faa41b..547df1b96ef 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -53,6 +53,15 @@
if(isliving(victim))
victim.Weaken(stun_time)
+/obj/effect/mine/depot
+ name = "sentry mine"
+
+/obj/effect/mine/depot/mineEffect(mob/living/victim)
+ var/area/syndicate_depot/core/depotarea = areaMaster
+ if(istype(depotarea))
+ if(depotarea.mine_triggered(victim))
+ explosion(loc, 1, 0, 0, 1) // devastate the tile you are on, but leave everything else untouched
+
/obj/effect/mine/dnascramble
name = "Radiation Mine"
var/radiation_amount
diff --git a/code/game/objects/effects/snowcloud.dm b/code/game/objects/effects/snowcloud.dm
new file mode 100644
index 00000000000..a67bbd3c5f7
--- /dev/null
+++ b/code/game/objects/effects/snowcloud.dm
@@ -0,0 +1,140 @@
+/obj/effect/snowcloud
+ name = "snow cloud"
+ desc = "Let it snow, let it snow, let it snow!"
+ icon_state = "snowcloud"
+ layer = FLY_LAYER
+ anchored = TRUE
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ var/obj/machinery/snow_machine/parent_machine
+
+/obj/effect/snowcloud/New(turf, obj/machinery/snow_machine/SM)
+ ..()
+ processing_objects.Add(src)
+ if(SM && istype(SM))
+ parent_machine = SM
+
+/obj/effect/snowcloud/Destroy()
+ processing_objects.Remove(src)
+ return ..()
+
+/obj/effect/snowcloud/process()
+ if(QDELETED(parent_machine))
+ parent_machine = null
+ var/turf/T = get_turf(src)
+ if(isspaceturf(T))
+ qdel(src)
+ return
+ var/turf_hotness
+ if(issimulatedturf(T))
+ var/turf/simulated/S = T
+ turf_hotness = S.air.temperature
+ if(turf_hotness > T0C && prob(10 * (turf_hotness - T0C))) //Cloud disappears if it's too warm
+ qdel(src)
+ return
+ if(!parent_machine || !parent_machine.active || parent_machine.stat & NOPOWER) //All reasons a cloud could dissipate
+ if(prob(10))
+ qdel(src)
+ return
+ try_to_snow()
+ try_to_spread_cloud()
+ parent_machine.affect_turf_temperature(T, 0.25 * parent_machine.cooling_speed)
+
+/obj/effect/snowcloud/proc/try_to_snow()
+ var/turf/T = get_turf(src)
+ if(locate(/obj/effect/snow, T))
+ return
+ if(issimulatedturf(T))
+ var/turf/simulated/S = T
+ if(prob(75 + S.air.temperature - T0C)) //Colder turf = more chance of snow
+ return
+ new /obj/effect/snow(T)
+
+/obj/effect/snowcloud/proc/try_to_spread_cloud()
+ if(prob(95 - parent_machine.cooling_speed * 5)) //10 / 15 / 20 / 25% chance to spawn a new cloud
+ return
+ var/list/random_dirs = shuffle(cardinal)
+ for(var/potential in random_dirs)
+ var/turf/T = get_turf(get_step(src, potential))
+ if(isspaceturf(T) || T.density)
+ continue
+ if(!T.CanAtmosPass(T))
+ continue
+ if(parent_machine.make_snowcloud(T))
+ return
+
+
+//Snow stuff below
+
+/obj/effect/snow
+ desc = "Perfect for making snow angels, or throwing at other people!"
+ icon = 'icons/effects/effects.dmi'
+ icon_state = "snow"
+ layer = ABOVE_ICYOVERLAY_LAYER
+ anchored = TRUE
+
+/obj/effect/snow/New()
+ processing_objects.Add(src)
+ icon_state = "snow[rand(1,6)]"
+ ..()
+
+/obj/effect/snow/Destroy()
+ processing_objects.Remove(src)
+ return ..()
+
+/obj/effect/snow/process()
+ var/turf/T = get_turf(src)
+ if(isspaceturf(T))
+ qdel(src)
+ return
+ else if(issimulatedturf(T))
+ var/turf/simulated/S = T
+ if(S.air.temperature <= T0C)
+ return
+ if(prob(10 + S.air.temperature - T0C))
+ qdel(src)
+
+/obj/effect/snow/attack_hand(mob/living/carbon/human/user)
+ if(!istype(user)) //Nonhumans don't have the balls to fight in the snow
+ return
+ user.changeNext_move(CLICK_CD_MELEE)
+ var/obj/item/snowball/SB = new(get_turf(user))
+ user.put_in_hands(SB)
+ to_chat(user, "You scoop up some snow and make \a [SB]!")
+
+/obj/effect/snow/attackby(obj/item/I, mob/user)
+ if(istype(I, /obj/item/shovel))
+ var/obj/item/shovel/S = I
+ user.visible_message("[user] is clearing away [src]...", "You begin clearing away [src]...", "You hear a wettish digging sound.")
+ playsound(loc, S.usesound, 50, TRUE)
+ if(!do_after(user, 50 * S.toolspeed, target = src))
+ return
+ user.visible_message("[user] clears away [src]!", "You clear away [src]!")
+ qdel(src)
+ else
+ return ..()
+
+/obj/effect/snow/fire_act()
+ qdel(src)
+
+/obj/effect/snow/ex_act(severity)
+ if(severity == 3 && prob(50))
+ return
+ qdel(src)
+
+/obj/item/snowball
+ name = "snowball"
+ desc = "Get ready for a snowball fight!"
+ force = 0
+ throwforce = 10
+ icon_state = "snowball"
+ damtype = STAMINA
+
+/obj/item/snowball/throw_impact(atom/target)
+ ..()
+ qdel(src)
+
+/obj/item/snowball/fire_act()
+ qdel(src)
+
+/obj/item/snowball/ex_act(severity)
+ qdel(src)
diff --git a/code/game/objects/effects/spawners/random_spawners.dm b/code/game/objects/effects/spawners/random_spawners.dm
index 1619eba14c4..18392256fb8 100644
--- a/code/game/objects/effects/spawners/random_spawners.dm
+++ b/code/game/objects/effects/spawners/random_spawners.dm
@@ -159,6 +159,7 @@
/obj/effect/spawner/random_spawners/syndicate/trap/pizzabomb
name = "50pc trap pizza"
result = list(/obj/item/pizzabox/meat = 1,
+ /obj/item/pizzabox/hawaiian = 1,
/obj/item/pizza_bomb/autoarm = 1)
/obj/effect/spawner/random_spawners/syndicate/trap/medbot
@@ -169,7 +170,7 @@
/obj/effect/spawner/random_spawners/syndicate/trap/mine
name = "50pc trap landmine"
result = list(/datum/nothing = 1,
- /obj/effect/mine/explosive = 1)
+ /obj/effect/mine/depot = 1)
/obj/effect/spawner/random_spawners/syndicate/trap/documents
name = "66pc trapped documents"
@@ -188,7 +189,6 @@
// Loot schema: costumes, toys, useless gimmick items, trapped items
result = list(/datum/nothing = 13,
/obj/item/storage/toolbox/syndicate = 1,
- /obj/item/storage/toolbox/syndicate/trapped = 1,
/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 1,
/obj/item/toy/cards/deck/syndicate = 1,
/obj/item/storage/secure/briefcase/syndie = 1,
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index f8798d77c5d..e3812286714 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -35,6 +35,8 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
var/list/actions = list() //list of /datum/action's that this item has.
var/list/actions_types = list() //list of paths of action datums to give to the item on New().
+ var/list/action_icon = list() //list of icons-sheets for a given action to override the icon.
+ var/list/action_icon_state = list() //list of icon states for a given action to override the icon_state.
var/list/materials = list()
//Since any item can now be a piece of clothing, this has to be put here so all items share it.
@@ -100,7 +102,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
/obj/item/New()
..()
for(var/path in actions_types)
- new path(src)
+ new path(src, action_icon[path], action_icon_state[path])
if(!hitsound)
if(damtype == "fire")
@@ -206,6 +208,9 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
msg += "*--------*"
to_chat(user, msg)
+/obj/item/afterattack(atom/target, mob/user, proximity, params)
+ SEND_SIGNAL(src, COMSIG_ITEM_AFTERATTACK, target, user, proximity, params)
+ ..()
/obj/item/attack_hand(mob/user as mob, pickupfireoverride = FALSE)
if(!user) return 0
@@ -252,6 +257,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
return 0
pickup(user)
+
add_fingerprint(user)
user.put_in_active_hand(src)
return 1
@@ -306,6 +312,25 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
else if(S.can_be_inserted(src))
S.handle_item_insertion(src)
+ else if(istype(I, /obj/item/stack/tape_roll))
+ if(istype(src, /obj/item/storage)) //Don't tape the bag if we can put the duct tape inside it instead
+ var/obj/item/storage/bag = src
+ if(bag.can_be_inserted(I))
+ return ..()
+ var/obj/item/stack/tape_roll/TR = I
+ var/list/clickparams = params2list(params)
+ var/x_offset = text2num(clickparams["icon-x"])
+ var/y_offset = text2num(clickparams["icon-y"])
+ if(GetComponent(/datum/component/ducttape))
+ to_chat(user, "[src] already has some tape attached!")
+ return
+ if(TR.use(1))
+ to_chat(user, "You apply some tape to [src].")
+ AddComponent(/datum/component/ducttape, src, user, x_offset, y_offset)
+ anchored = TRUE
+ user.transfer_fingerprints_to(src)
+ else
+ to_chat(user, "You don't have enough tape to do that!")
else
return ..()
@@ -329,7 +354,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
// called just as an item is picked up (loc is not yet changed)
/obj/item/proc/pickup(mob/user)
- return
+ SEND_SIGNAL(src, COMSIG_ITEM_PICKUP, user)
// called when this item is removed from a storage item, which is passed on as S. The loc variable is already set to the new destination before this is called.
/obj/item/proc/on_exit_storage(obj/item/storage/S as obj)
@@ -569,4 +594,4 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
target.visible_message("[target.name] blocks [src] and twists [user]'s arm behind [user.p_their()] back!",
"You block the attack!")
user.Stun(2)
- return TRUE
\ No newline at end of file
+ return TRUE
diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index 5056c90793f..c24fcc3c68a 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -194,7 +194,7 @@
/obj/item/flash/armimplant
name = "photon projector"
- desc = "A high-powered photon projector implant normally used for lighting purposes, but also doubles as a flashbulb weapon. Self-repair protocals fix the flashbulb if it ever burns out."
+ desc = "A high-powered photon projector implant normally used for lighting purposes, but also doubles as a flashbulb weapon. Self-repair protocols fix the flashbulb if it ever burns out."
var/flashcd = 20
var/overheat = 0
var/obj/item/organ/internal/cyberimp/arm/flash/I = null
diff --git a/code/game/objects/items/devices/pizza_bomb.dm b/code/game/objects/items/devices/pizza_bomb.dm
index 792115eade9..71cb95d436f 100644
--- a/code/game/objects/items/devices/pizza_bomb.dm
+++ b/code/game/objects/items/devices/pizza_bomb.dm
@@ -102,4 +102,4 @@
/obj/item/pizza_bomb/autoarm
timer_set = 1
- timer = 10
\ No newline at end of file
+ timer = 30 // 3 seconds
\ No newline at end of file
diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm
index d0c0622d1e5..9c080a4c256 100644
--- a/code/game/objects/items/devices/uplinks.dm
+++ b/code/game/objects/items/devices/uplinks.dm
@@ -24,6 +24,7 @@ var/list/world_uplinks = list()
var/job = null
var/show_descriptions = 0
+ var/temp_category
/obj/item/uplink/nano_host()
return loc
@@ -233,6 +234,7 @@ var/list/world_uplinks = list()
if(!nanoui_items)
generate_items(user)
data["nano_items"] = nanoui_items
+ data["category_choice"] = temp_category
data += nanoui_data
return data
@@ -260,9 +262,6 @@ var/list/world_uplinks = list()
hidden_crystals = 0
ui.close()
return 1
- if(href_list["return"])
- nanoui_menu = round(nanoui_menu/10)
- update_nano_data()
if(href_list["menu"])
nanoui_menu = text2num(href_list["menu"])
update_nano_data(href_list["id"])
@@ -272,6 +271,9 @@ var/list/world_uplinks = list()
if(href_list["descriptions"])
show_descriptions = !show_descriptions
update_nano_data()
+ if(href_list["category"])
+ temp_category = href_list["category"]
+ update_nano_data()
SSnanoui.update_uis(src)
return 1
diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm
index e6e6fcfc8a0..33194de71e1 100644
--- a/code/game/objects/items/random_items.dm
+++ b/code/game/objects/items/random_items.dm
@@ -9,8 +9,7 @@
var/list/types = list(/obj/item/gun/projectile/shotgun/toy/crossbow, /obj/item/toy/balloon,/obj/item/toy/spinningtoy,/obj/item/reagent_containers/spray/waterflower) + subtypesof(/obj/item/toy/prize)
var/T = pick(types)
new T(loc)
- spawn(1)
- qdel(src)
+ qdel(src)
// -------------------------------------
// Random cleanables, clearly this makes sense
@@ -24,8 +23,7 @@
var/list/list = subtypesof(/obj/effect/decal/cleanable) - list(/obj/effect/decal/cleanable/random,/obj/effect/decal/cleanable/cobweb,/obj/effect/decal/cleanable/cobweb2)
var/T = pick(list)
new T(loc)
- spawn(0)
- qdel(src)
+ qdel(src)
/obj/item/stack/sheet/animalhide/random
@@ -33,11 +31,10 @@
/obj/item/stack/sheet/animalhide/random/New()
..()
- spawn(1)
- var/htype = pick(/obj/item/stack/sheet/animalhide/cat,/obj/item/stack/sheet/animalhide/corgi,/obj/item/stack/sheet/animalhide/human,/obj/item/stack/sheet/animalhide/lizard,/obj/item/stack/sheet/animalhide/monkey)
- var/obj/item/stack/S = new htype(loc)
- S.amount = amount
- qdel(src)
+ var/htype = pick(/obj/item/stack/sheet/animalhide/cat,/obj/item/stack/sheet/animalhide/corgi,/obj/item/stack/sheet/animalhide/human,/obj/item/stack/sheet/animalhide/lizard,/obj/item/stack/sheet/animalhide/monkey)
+ var/obj/item/stack/S = new htype(loc)
+ S.amount = amount
+ qdel(src)
// -------------------------------------
// Not yet identified chemical.
@@ -121,8 +118,7 @@
icon_state = pick("alco-white","alco-green","alco-blue","alco-clear","alco-red")
pixel_x = rand(-5, 5)
pixel_y = rand(-5, 5)
- spawn(0)
- qdel(src)
+ qdel(src)
/obj/item/storage/pill_bottle/random_meds
name = "unlabelled pillbottle"
@@ -158,16 +154,10 @@
/obj/structure/closet/crate/secure/unknownchemicals/New()
..()
- new/obj/item/reagent_containers/glass/bottle/random_base_chem(src)
- new/obj/item/reagent_containers/glass/bottle/random_base_chem(src)
- new/obj/item/reagent_containers/glass/bottle/random_base_chem(src)
- new/obj/item/reagent_containers/glass/bottle/random_base_chem(src)
- new/obj/item/reagent_containers/glass/bottle/random_base_chem(src)
- new/obj/item/reagent_containers/glass/bottle/random_base_chem(src)
- new/obj/item/reagent_containers/glass/bottle/random_base_chem(src)
- new/obj/item/reagent_containers/glass/bottle/random_chem(src)
- new/obj/item/reagent_containers/glass/bottle/random_chem(src)
- new/obj/item/reagent_containers/glass/bottle/random_chem(src)
+ for(var/i in 1 to 7)
+ new/obj/item/reagent_containers/glass/bottle/random_base_chem(src)
+ for(var/i in 1 to 3)
+ new/obj/item/reagent_containers/glass/bottle/random_chem(src)
while(prob(50))
new/obj/item/reagent_containers/glass/bottle/random_reagent(src)
@@ -193,7 +183,7 @@
B.name = "unlabelled bottle"
B.desc = "Looks like the label fell off."
// B.identify_probability = 0
-
+//
/*
/obj/structure/closet/crate/bin/flowers
name = "flower barrel"
@@ -243,11 +233,8 @@
/obj/structure/closet/secure_closet/random_drinks/New()
..()
- new/obj/item/reagent_containers/food/drinks/bottle/random_drink(src)
- new/obj/item/reagent_containers/food/drinks/bottle/random_drink(src)
- new/obj/item/reagent_containers/food/drinks/bottle/random_drink(src)
- new/obj/item/reagent_containers/food/drinks/bottle/random_drink(src)
- new/obj/item/reagent_containers/food/drinks/bottle/random_drink(src)
+ for(var/i in 1 to 5)
+ new/obj/item/reagent_containers/food/drinks/bottle/random_drink(src)
while(prob(25))
new/obj/item/reagent_containers/food/drinks/bottle/random_reagent(src)
@@ -272,12 +259,12 @@
visible_message("Something falls out of the [src]!")
var/obj/item/grenade/clusterbuster/C = new(src.loc)
C.prime()
- spawn(10)
- new menace(src.loc)
- while(prob(15))
- new menace(get_step_rand(src.loc))
- ..()
- return 1
+ sleep(10)
+ new menace(src.loc)
+ while(prob(15))
+ new menace(get_step_rand(src.loc))
+ ..()
+ return TRUE
else
return ..()
@@ -296,19 +283,15 @@
/obj/structure/largecrate/schrodinger/attackby(obj/item/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/crowbar))
- var/mob/living/simple_animal/pet/cat/Cat1 = new(loc)
- Cat1.apply_damage(250)//,TOX)
- Cat1.name = "Schrodinger's Cat"
- Cat1.desc = "It seems it's been dead for a while."
-
- var/mob/living/simple_animal/pet/cat/Cat2 = new(loc)
- Cat2.name = "Schrodinger's Cat"
- Cat2.desc = "It's was alive the whole time!"
sleep(2)
+ var/mob/living/simple_animal/pet/cat/Cat = new(loc)
+ Cat.name = "Schrodinger's Cat"
+
if(prob(50))
- qdel(Cat1)
+ Cat.apply_damage(250,TOX)
+ Cat.desc = "It seems it's been dead for a while."
else
- qdel(Cat2)
+ Cat.desc = "It was alive the whole time!"
return ..()
// --------------------------------------
@@ -326,16 +309,6 @@
/obj/item/storage/box/grenades/New()
..()
- var/nade1 = pick(grenadelist)
- var/nade2 = pick(grenadelist)
- var/nade3 = pick(grenadelist)
- var/nade4 = pick(grenadelist)
- var/nade5 = pick(grenadelist)
- var/nade6 = pick(grenadelist)
-
- new nade1(src)
- new nade2(src)
- new nade3(src)
- new nade4(src)
- new nade5(src)
- new nade6(src)
+ for(var/i in 1 to 6)
+ var/nade = pick(grenadelist)
+ new nade(src)
\ No newline at end of file
diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm
index aaaa0dbc579..08e871c66a4 100644
--- a/code/game/objects/items/stacks/nanopaste.dm
+++ b/code/game/objects/items/stacks/nanopaste.dm
@@ -22,16 +22,42 @@
else
to_chat(user, "All [R]'s systems are nominal.")
- if(istype(M,/mob/living/carbon/human)) //Repairing robolimbs
+ if(istype(M,/mob/living/carbon/human)) //Repairing robotic limbs and IPCs
var/mob/living/carbon/human/H = M
var/obj/item/organ/external/S = H.get_organ(user.zone_sel.selecting)
if(S && S.is_robotic())
if(S.get_damage())
- S.heal_damage(15, 15, robo_repair = 1)
use(1)
- user.visible_message("\The [user] applies some nanite paste at[user != M ? " \the [M]'s" : " \the"][S.name] with \the [src].",\
- "You apply some nanite paste at [user == M ? "your" : "[M]'s"] [S.name].")
+ var/remheal = 15
+ var/nremheal = 0
+ S.heal_damage(robo_repair = 1) //should in, theory, heal the robotic organs in just the targeted area with it being S instead of E
+ var/childlist
+ if(!isnull(S.children))
+ childlist = S.children.Copy()
+ var/parenthealed = FALSE
+ while(remheal > 0)
+ var/obj/item/organ/external/E
+ if(S.get_damage())
+ E = S
+ else if(LAZYLEN(childlist))
+ E = pick_n_take(childlist)
+ if(!E.get_damage() || !E.is_robotic())
+ continue
+ else if(S.parent && !parenthealed)
+ E = S.parent
+ parenthealed = TRUE
+ if(!E.get_damage() || !E.is_robotic())
+ break
+ else
+ break
+ nremheal = max(remheal - E.get_damage(), 0)
+ E.heal_damage(remheal, 0, 0, 1) //Healing Brute
+ E.heal_damage(0, remheal, 0, 1) //Healing Burn
+ remheal = nremheal
+ user.visible_message("\The [user] applies some nanite paste at \the [M]'s [E.name] with \the [src].")
+ if(H.bleed_rate && H.isSynthetic())
+ H.bleed_rate = 0
else
to_chat(user, "Nothing to fix here.")
else
diff --git a/code/game/objects/items/weapons/RCL.dm b/code/game/objects/items/weapons/RCL.dm
index 86b4cc843ab..befe979078c 100644
--- a/code/game/objects/items/weapons/RCL.dm
+++ b/code/game/objects/items/weapons/RCL.dm
@@ -85,6 +85,7 @@
else
icon_state = "rcl-0"
item_state = "rcl-0"
+ ..()
/obj/item/twohanded/rcl/proc/is_empty(mob/user, loud = 1)
update_icon()
diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm
index 311f29273a8..bfe91b5a81b 100644
--- a/code/game/objects/items/weapons/cigs.dm
+++ b/code/game/objects/items/weapons/cigs.dm
@@ -196,7 +196,7 @@ LIGHTERS ARE IN LIGHTERS.DM
if(is_being_smoked) // if it's being smoked, transfer reagents to the mob
var/mob/living/carbon/C = loc
for (var/datum/reagent/R in reagents.reagent_list)
- reagents.trans_to(C, REAGENTS_METABOLISM)
+ reagents.trans_id_to(C, R.id, max(REAGENTS_METABOLISM / reagents.reagent_list.len, 0.1)) //transfer at least .1 of each chem
if(!reagents.total_volume) // There were reagents, but now they're gone
to_chat(C, "Your [name] loses its flavor.")
else // else just remove some of the reagents
@@ -232,7 +232,7 @@ LIGHTERS ARE IN LIGHTERS.DM
type_butt = /obj/item/cigbutt/roach
throw_speed = 0.5
item_state = "spliffoff"
- smoketime = 180
+ smoketime = 250
chem_volume = 100
/obj/item/clothing/mask/cigarette/rollie/New()
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index 1143954faef..4573545f969 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -32,7 +32,7 @@
desc = "Damn son, where'd you find this?"
icon_state = "air_horn"
origin_tech = "materials=4;engineering=4"
- honk_sounds = list('sound/items/airhorn2.ogg' = 1)
+ honk_sounds = list('sound/items/Airhorn2.ogg' = 1)
/obj/item/bikehorn/golden
name = "golden bike horn"
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
index 668cc74ac73..98422d8c680 100644
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -8,6 +8,7 @@
* Butcher's cleaver
* Rolling Pins
* Candy Moulds
+ * Sushi Mat
*/
/obj/item/kitchen
@@ -249,3 +250,17 @@
name = "sucker mould"
desc = "It has the shape of a sucker imprinted into it."
icon_state = "mould_loli"
+
+/*
+ * Sushi Mat
+ */
+/obj/item/kitchen/sushimat
+ name = "Sushi Mat"
+ desc = "A wooden mat used for efficient sushi crafting."
+ icon_state = "sushi_mat"
+ force = 5
+ throwforce = 5
+ throw_speed = 3
+ throw_range = 3
+ w_class = WEIGHT_CLASS_SMALL
+ attack_verb = list("rolled", "cracked", "battered", "thrashed")
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 6d45e5b7add..113a87fd01e 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -47,7 +47,7 @@
/obj/item/storage/backpack/holding/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/storage/backpack/holding))
- var/response = alert(user, "Are you sure you want to put the bag of holding inside another bag of holding?","Are you sure you want to die?","Yes","No")
+ var/response = alert(user, "This creates a singularity, destroying you and much of the station. Are you SURE?","IMMINENT DEATH!", "No", "Yes")
if(response == "Yes")
user.visible_message("[user] grins as [user.p_they()] begin[user.p_s()] to put a Bag of Holding into a Bag of Holding!", "You begin to put the Bag of Holding into the Bag of Holding!")
if(do_after(user, 30, target=src))
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 1d23049064f..b566dc81e37 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -74,6 +74,26 @@
new /obj/item/reagent_containers/hypospray/autoinjector( src )
return
+/obj/item/storage/box/survival_vox
+ icon_state = "box_vox"
+
+/obj/item/storage/box/survival_vox/New()
+ ..()
+ contents = list()
+ new /obj/item/clothing/mask/breath/vox(src)
+ new /obj/item/tank/emergency_oxygen/nitrogen(src)
+ new /obj/item/reagent_containers/hypospray/autoinjector(src)
+
+/obj/item/storage/box/survival_plasmaman
+ icon_state = "box_plasma"
+
+/obj/item/storage/box/survival_plasmaman/New()
+ ..()
+ contents = list()
+ new /obj/item/clothing/mask/breath(src)
+ new /obj/item/tank/emergency_oxygen/plasma(src)
+ new /obj/item/reagent_containers/hypospray/autoinjector(src)
+
/obj/item/storage/box/engineer
icon_state = "box_eng"
New()
diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm
index b944337ffaa..02544974442 100644
--- a/code/game/objects/items/weapons/storage/toolbox.dm
+++ b/code/game/objects/items/weapons/storage/toolbox.dm
@@ -94,16 +94,6 @@
new /obj/item/multitool(src)
new /obj/item/clothing/gloves/combat(src)
-
-/obj/item/storage/toolbox/syndicate/trapped
- name = "suspicious looking toolbox"
- desc = "Danger. Very robust. Has a small red marker by the handle."
-
-/obj/item/storage/toolbox/syndicate/trapped/New()
- ..()
- new /obj/item/grenade/chem_grenade/explosion/mine_armed(src)
-
-
/obj/item/storage/toolbox/drone
name = "mechanical toolbox"
icon_state = "blue"
diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm
index b8437f3b7ed..7084fdbc163 100644
--- a/code/game/objects/items/weapons/tape.dm
+++ b/code/game/objects/items/weapons/tape.dm
@@ -5,59 +5,42 @@
icon_state = "taperoll"
singular_name = "tape roll"
w_class = WEIGHT_CLASS_TINY
- amount = 10
- max_amount = 10
+ amount = 25
+ max_amount = 25
/obj/item/stack/tape_roll/New(var/loc, var/amount=null)
..()
update_icon()
-/obj/item/stack/tape_roll/attack(mob/living/carbon/human/M as mob, mob/living/user as mob)
+/obj/item/stack/tape_roll/attack(mob/living/carbon/human/M, mob/living/user)
+ if(!istype(M)) //What good is a duct tape mask if you are unable to speak?
+ return
if(M.wear_mask)
to_chat(user, "Remove [M.p_their()] mask first!")
- else if(amount < 2)
- to_chat(user, "You'll need more tape for this!")
- else if(!M.check_has_mouth())
- to_chat(user, "[M.p_they(TRUE)] [M.p_have()] no mouth to tape over!")
- else
- if(M == user)
- to_chat(user, "You try to tape your own mouth shut.")
- else
- to_chat(user, "You try to tape [M]'s mouth shut.")
- M.visible_message("[user] tries to tape [M]'s mouth closed!")
- if(do_after(user, 50, target = M))
- if(M == user)
- to_chat(user, "You cover your own mouth with a piece of duct tape.")
- else
- to_chat(user, "You cover [M]'s mouth with a piece of duct tape. That will shut [M.p_them()] up!")
- M.visible_message("[user] tapes [M]'s mouth shut!")
- var/obj/item/clothing/mask/muzzle/G = new /obj/item/clothing/mask/muzzle/tapegag
- M.equip_to_slot(G, slot_wear_mask)
- G.add_fingerprint(user)
- amount = amount - 2
- if(amount <= 0)
- user.unEquip(src, 1)
- qdel(src)
-
-
-
-/* -- Disabled for now until it has a use --
-/obj/item/stack/tape_roll/attack_self(mob/user as mob)
- to_chat(user, "You remove a length of tape from [src].")
-
- var/obj/item/ducttape/tape = new()
- user.put_in_hands(tape)
-*/
-
-/obj/item/stack/tape_roll/proc/stick(var/obj/item/W, mob/user)
- if(!istype(W, /obj/item/paper))
return
-
- user.unEquip(W)
- var/obj/item/ducttape/tape = new(get_turf(src))
- tape.attach(W)
- user.put_in_hands(tape)
+ if(amount < 2)
+ to_chat(user, "You'll need more tape for this!")
+ return
+ if(!M.check_has_mouth())
+ to_chat(user, "[M.p_they(TRUE)] [M.p_have()] no mouth to tape over!")
+ return
+ user.visible_message("[user] is taping [M]'s mouth closed!",
+ "You try to tape [M == user ? "your own" : "[M]'s"] mouth shut!",
+ "You hear tape ripping.")
+ if(!do_after(user, 50, target = M))
+ return
+ if(!use(2))
+ to_chat(user, "You don't have enough tape!")
+ return
+ if(M.wear_mask)
+ to_chat(user, "[M == user ? user : M]'s mouth is already covered!")
+ return
+ user.visible_message("[user] tapes [M]'s mouth shut!",
+ "You cover [M == user ? "your own" : "[M]'s"] mouth with a piece of duct tape.[M == user ? null : " That will shut them up."]")
+ var/obj/item/clothing/mask/muzzle/G = new /obj/item/clothing/mask/muzzle/tapegag
+ M.equip_to_slot(G, slot_wear_mask)
+ G.add_fingerprint(user)
/obj/item/stack/tape_roll/update_icon()
var/amount = get_amount()
@@ -71,73 +54,4 @@
icon_state = "taperoll-4"
else
icon_state = "taperoll-4"
-
-/obj/item/ducttape
- name = "tape"
- desc = "A piece of sticky tape."
- icon = 'icons/obj/bureaucracy.dmi'
- icon_state = "tape"
- w_class = WEIGHT_CLASS_TINY
- layer = 4
- anchored = 1 //it's sticky, no you cant move it
-
- var/obj/item/stuck = null
-
-/obj/item/ducttape/New()
..()
- flags |= NOBLUDGEON
-
-/obj/item/ducttape/examine(mob/user)
- return stuck.examine(user)
-
-/obj/item/ducttape/proc/attach(var/obj/item/W)
- stuck = W
- W.forceMove(src)
- icon_state = W.icon_state + "_taped"
- name = W.name + " (taped)"
- overlays = W.overlays
-
-/obj/item/ducttape/attack_self(mob/user)
- if(!stuck)
- return
-
- to_chat(user, "You remove \the [initial(name)] from [stuck].")
-
- user.unEquip(src)
- stuck.forceMove(get_turf(src))
- user.put_in_hands(stuck)
- stuck = null
- overlays = null
- qdel(src)
-
-/obj/item/ducttape/afterattack(var/A, mob/user, flag, params)
- if(!in_range(user, A) || istype(A, /obj/machinery/door) || !stuck)
- return
-
- var/turf/target_turf = get_turf(A)
- var/turf/source_turf = get_turf(user)
-
- var/dir_offset = 0
- if(target_turf != source_turf)
- dir_offset = get_dir(source_turf, target_turf)
- if(!(dir_offset in cardinal))
- to_chat(user, "You cannot reach that from here.")// can only place stuck papers in cardinal directions, to
- return // reduce papers around corners issue.
-
- user.unEquip(src)
- forceMove(source_turf)
-
- if(params)
- var/list/mouse_control = params2list(params)
- if(mouse_control["icon-x"])
- pixel_x = text2num(mouse_control["icon-x"]) - 16
- if(dir_offset & EAST)
- pixel_x += 32
- else if(dir_offset & WEST)
- pixel_x -= 32
- if(mouse_control["icon-y"])
- pixel_y = text2num(mouse_control["icon-y"]) - 16
- if(dir_offset & NORTH)
- pixel_y += 32
- else if(dir_offset & SOUTH)
- pixel_y -= 32
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index cbaa4cff554..22c4390110e 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -368,6 +368,7 @@
else
icon_state = "[initial(icon_state)][ratio]"
update_torch()
+ ..()
/obj/item/weldingtool/process()
switch(welding)
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index 9418df86368..1ffcc13207f 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -91,9 +91,6 @@
O.unwield(user)
return unwield(user)
-/obj/item/twohanded/update_icon()
- return
-
/obj/item/twohanded/attack_self(mob/user)
..()
if(wielded) //Trying to unwield it
@@ -182,6 +179,7 @@
/obj/item/twohanded/fireaxe/update_icon() //Currently only here to fuck with the on-mob icons.
icon_state = "fireaxe[wielded]"
+ ..()
/obj/item/twohanded/fireaxe/afterattack(atom/A, mob/user, proximity)
if(!proximity)
@@ -232,6 +230,7 @@
else
icon_state = "dualsaber0"
set_light(0)
+ ..()
/obj/item/twohanded/dualsaber/attack(mob/target, mob/living/user)
if(HULK in user.mutations)
@@ -327,6 +326,7 @@
icon_state = "spearbomb[wielded]"
else
icon_state = "spearglass[wielded]"
+ ..()
/obj/item/twohanded/spear/afterattack(atom/movable/AM, mob/user, proximity)
if(!proximity)
@@ -509,6 +509,7 @@
icon_state = "chainsaw[wielded]"
else
icon_state = "chainsaw0"
+ ..()
/obj/item/twohanded/chainsaw/attack(mob/target, mob/living/user)
if(wielded)
@@ -565,6 +566,7 @@
/obj/item/twohanded/singularityhammer/update_icon() //Currently only here to fuck with the on-mob icons.
icon_state = "mjollnir[wielded]"
+ ..()
/obj/item/twohanded/singularityhammer/proc/vortex(turf/pull, mob/wielder)
for(var/atom/movable/X in orange(5, pull))
@@ -640,6 +642,7 @@
/obj/item/twohanded/mjollnir/update_icon() //Currently only here to fuck with the on-mob icons.
icon_state = "mjollnir[wielded]"
+ ..()
/obj/item/twohanded/knighthammer
name = "singuloth knight's hammer"
@@ -670,6 +673,7 @@
/obj/item/twohanded/knighthammer/update_icon() //Currently only here to fuck with the on-mob icons.
icon_state = "knighthammer[wielded]"
+ ..()
/obj/item/twohanded/knighthammer/afterattack(atom/A, mob/user, proximity)
if(!proximity)
@@ -725,6 +729,7 @@
icon_state = "fireaxe2"
else
icon_state = "fireaxe0"
+ ..()
/obj/item/twohanded/energizedfireaxe/afterattack(atom/A, mob/user, proximity)
if(!proximity)
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index f13806b90f1..d9358c3a694 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -146,7 +146,7 @@
return
/obj/proc/update_icon()
- return
+ SEND_SIGNAL(src, COMSIG_OBJ_UPDATE_ICON)
/mob/proc/unset_machine()
if(machine)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/depot.dm b/code/game/objects/structures/crates_lockers/closets/secure/depot.dm
index be67d79272f..41fb0a768a4 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/depot.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/depot.dm
@@ -6,6 +6,7 @@
anchored = 1
health = 200
req_access = list()
+ layer = 2.9 // ensures the loot they drop always appears on top of them.
var/is_armory = FALSE
var/ignore_use = FALSE
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 03fca152fa9..663b3cbf160 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -245,6 +245,7 @@
new /obj/item/restraints/handcuffs(src)
new /obj/item/melee/baton/loaded(src)
new /obj/item/clothing/glasses/sunglasses(src)
+ new /obj/item/clothing/glasses/hud/security/sunglasses/read_only(src)
new /obj/item/clothing/glasses/hud/health/health_advanced
new /obj/item/clothing/head/beret/centcom/officer(src)
new /obj/item/clothing/head/beret/centcom/officer/navy(src)
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 87cae2fb993..c98fe24aa57 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -637,3 +637,8 @@
icon_state = "electricalcrate"
icon_opened = "electricalcrateopen"
icon_closed = "electricalcrate"
+
+/obj/structure/closet/crate/tape/New()
+ if(prob(10))
+ new /obj/item/bikehorn/rubberducky(src)
+ ..()
diff --git a/code/game/objects/structures/depot.dm b/code/game/objects/structures/depot.dm
index b655d010aa7..ac647e0a80d 100644
--- a/code/game/objects/structures/depot.dm
+++ b/code/game/objects/structures/depot.dm
@@ -9,17 +9,17 @@
var/area/syndicate_depot/core/depotarea
var/has_overloaded = FALSE
-/obj/structure/fusionreactor/Initialize()
- ..()
+/obj/structure/fusionreactor/New()
+ . = ..()
+ // Do not attempt to put the code below into Initialize() or even LateInitialize() with a "return INITIALIZE_HINT_LATELOAD". It won't work!
depotarea = areaMaster
if(istype(depotarea))
depotarea.reactor = src
- return INITIALIZE_HINT_LATELOAD
-
-/obj/structure/fusionreactor/LateInitialize()
- for(var/obj/machinery/porta_turret/syndicate/T in range(50, loc))
- if(!istype(T.depotarea))
- T.depotarea = depotarea
+ for(var/obj/machinery/porta_turret/syndicate/T in range(50, loc))
+ if(!istype(T.depotarea))
+ T.depotarea = depotarea
+ else
+ log_debug("[src] at [x],[y],[z] failed depotarea istype check during New()! Either it was spawned outside the depot area (bad idea), or a bug is happening.")
/obj/structure/fusionreactor/Destroy()
if(istype(depotarea))
@@ -84,8 +84,9 @@
var/max_fire_range = 9
var/area/syndicate_depot/core/depotarea
-/obj/effect/overload/Initialize()
+/obj/effect/overload/New()
. = ..()
+ // Do not attempt to put the code below into Initialize() or even LateInitialize() with a "return INITIALIZE_HINT_LATELOAD". It won't work!
processing_objects.Add(src)
depotarea = areaMaster
if(istype(depotarea))
@@ -93,6 +94,8 @@
depotarea.used_self_destruct = TRUE // Silences all further alerts from this point onwards.
depotarea.updateicon()
depotarea.shields_down()
+ else
+ log_debug("[src] at [x],[y],[z] failed depotarea istype check during New()! Either it was spawned outside the depot area (bad idea), or a bug is happening.")
/obj/effect/overload/process()
var/turf/T = get_turf(src)
@@ -116,6 +119,8 @@
L.open()
for(var/mob/living/M in range(30, T))
M.gib()
+ for(var/obj/mecha/E in range(30, T))
+ E.Destroy()
explosion(get_turf(src), 25, 35, 45, 55, 1, 1, 60, 0, 0)
processing_objects.Remove(src)
qdel(src)
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index 73938f77a46..543ebd7af91 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -107,6 +107,7 @@ var/global/list/captain_display_cases = list()
var/image/occupant_overlay = null
var/obj/item/airlock_electronics/circuit
var/start_showpiece_type = null //add type for items on display
+ var/alarm_needs_power = TRUE
/obj/structure/displaycase/New()
. = ..()
@@ -191,7 +192,12 @@ var/global/list/captain_display_cases = list()
playsound(get_turf(src), "shatter", 70, 1)
update_icon()
spawn(0)
- burglar_alarm()
+ if(!alarm_needs_power)
+ burglar_alarm()
+ else
+ var/area/a = get_area(src)
+ if(isarea(a) && a.power_equip)
+ burglar_alarm()
else
playsound(get_turf(src), 'sound/effects/Glasshit.ogg', 75, 1)
return
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 28114f46a8c..25314db064c 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -174,7 +174,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
user.changeNext_move(CLICK_CD_MELEE)
user.visible_message("Something knocks on [src].")
add_fingerprint(user)
- playsound(src, 'sound/effects/Glassknock.ogg', 50, 1)
+ playsound(src, 'sound/effects/glassknock.ogg', 50, 1)
/obj/structure/window/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)
if(!can_be_reached(user))
diff --git a/code/modules/admin/verbs/spawnfloorcluwne.dm b/code/modules/admin/verbs/spawnfloorcluwne.dm
index 02ff9eda6e2..37fd3057af4 100644
--- a/code/modules/admin/verbs/spawnfloorcluwne.dm
+++ b/code/modules/admin/verbs/spawnfloorcluwne.dm
@@ -2,25 +2,29 @@
set category = "Event"
set name = "Unleash Floor Cluwne"
set desc = "Pick a specific target or just let it select randomly and spawn the floor cluwne mob on the station. Be warned: spawning more than one may cause issues!"
- var/target
+ var/mob/living/carbon/human/target
if(!check_rights(R_EVENT))
return
- var/confirm = alert("Are you sure you want to release a floor cluwne and kill alot of people?", "Confirm Massacre", "Yes", "No")
+ var/confirm = alert("Are you sure you want to release a floor cluwne and kill a lot of people?", "Confirm Massacre", "Yes", "No")
if(confirm == "Yes")
var/turf/T = get_turf(usr)
- target = input("Any specific target in mind? Please note only live, non cluwned, human targets are valid.", "Target", target) as null|anything in GLOB.player_list
- if(isnull(target))
+ var/list/potential_targets = list()
+ for(var/mob/M in GLOB.player_list)
+ var/mob/living/carbon/human/H = M
+ if(!istype(H))
+ continue
+ if(H.mind.assigned_role == "Cluwne")
+ continue
+ potential_targets += H
+ if(!potential_targets.len) //You're probably the only player on this damn station, spawn it yourself
+ to_chat(src, "No valid targets!")
return
- if(target && ishuman(target))
- var/mob/living/carbon/human/H = target
- var/mob/living/simple_animal/hostile/floor_cluwne/FC = new /mob/living/simple_animal/hostile/floor_cluwne(T)
- FC.Acquire_Victim(H)
- else
- new /mob/living/simple_animal/hostile/floor_cluwne(T)
- log_admin("[key_name(usr)] spawned floor cluwne.")
- message_admins("[key_name(usr)] spawned floor cluwne.")
- else
- return
+ target = input("Any specific target in mind? Please note only live, non cluwned, human targets are valid.", "Target", target) as null|anything in potential_targets
+ var/mob/living/simple_animal/hostile/floor_cluwne/FC = new /mob/living/simple_animal/hostile/floor_cluwne(T)
+ if(target)
+ FC.Acquire_Victim(target)
+ log_admin("[key_name(usr)] spawned floor cluwne[target ? ", initially targetting [target]": null].")
+ message_admins("[key_name(usr)] spawned floor cluwne[target ? ", initially targetting [target]": null].")
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index ff8de1a6a82..fb4f3736d6c 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -83,6 +83,7 @@
origin_tech = "magnets=3;combat=2"
var/global/list/jobs[0]
HUDType = DATA_HUD_SECURITY_ADVANCED
+ var/read_only = FALSE
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
@@ -114,6 +115,9 @@
invis_view = SEE_INVISIBLE_MINIMUM //don't render darkness while wearing these
prescription_upgradable = 0
+/obj/item/clothing/glasses/hud/security/sunglasses/read_only
+ read_only = TRUE
+
/obj/item/clothing/glasses/hud/security/sunglasses
name = "HUDSunglasses"
desc = "Sunglasses with a HUD."
diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm
index ae694f8edf2..4ca71d73969 100644
--- a/code/modules/clothing/head/hardhat.dm
+++ b/code/modules/clothing/head/hardhat.dm
@@ -11,12 +11,15 @@
flags_inv = 0
actions_types = list(/datum/action/item_action/toggle_helmet_light)
burn_state = FIRE_PROOF
+ species_fit = list("Grey")
+ sprite_sheets = list(
+ "Grey" = 'icons/mob/species/grey/head.dmi'
+ )
/obj/item/clothing/head/hardhat/attack_self(mob/user)
on = !on
icon_state = "hardhat[on]_[item_color]"
item_state = "hardhat[on]_[item_color]"
-
if(on)
set_light(brightness_on)
else
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index dc8c4b59a4d..6a7a4b26358 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -70,6 +70,11 @@
desc = "A plastic replica of a syndicate agent's space helmet, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!"
flags = BLOCKHAIR
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
+ species_fit = list("Grey")
+ sprite_sheets = list(
+ "Grey" = 'icons/mob/species/grey/helmet.dmi'
+ )
+
/obj/item/clothing/head/cueball
name = "cueball helmet"
@@ -79,6 +84,10 @@
flags = BLOCKHAIR
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
+ species_fit = list("Grey")
+ sprite_sheets = list(
+ "Grey" = 'icons/mob/species/grey/head.dmi'
+ )
/obj/item/clothing/head/snowman
name = "snowman head"
@@ -88,6 +97,10 @@
flags = BLOCKHAIR
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
+ species_fit = list("Grey")
+ sprite_sheets = list(
+ "Grey" = 'icons/mob/species/grey/head.dmi'
+ )
/obj/item/clothing/head/that
name = "sturdy top-hat"
@@ -246,6 +259,10 @@
icon_state = "chickenhead"
item_state = "chickensuit"
flags = BLOCKHAIR
+ species_fit = list("Grey")
+ sprite_sheets = list(
+ "Grey" = 'icons/mob/species/grey/head.dmi'
+ )
/obj/item/clothing/head/corgi
name = "corgi suit head"
@@ -396,6 +413,10 @@
item_state = "griffinhat"
flags = BLOCKHAIR
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
+ species_fit = list("Grey")
+ sprite_sheets = list(
+ "Grey" = 'icons/mob/species/grey/head.dmi'
+ )
actions_types = list(/datum/action/item_action/caw)
/obj/item/clothing/head/griffin/attack_self()
@@ -425,6 +446,10 @@
icon_state = "papersack"
flags = BLOCKHAIR
flags_inv = HIDEFACE|HIDEEARS
+ species_fit = list("Grey")
+ sprite_sheets = list(
+ "Grey" = 'icons/mob/species/grey/head.dmi'
+ )
/obj/item/clothing/head/papersack/smiley
name = "paper sack hat"
@@ -432,6 +457,10 @@
icon_state = "papersack_smile"
flags = BLOCKHAIR
flags_inv = HIDEFACE|HIDEEARS
+ species_fit = list("Grey")
+ sprite_sheets = list(
+ "Grey" = 'icons/mob/species/grey/head.dmi'
+ )
/obj/item/clothing/head/crown
name = "crown"
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index ab42d17e469..81d9ed04958 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -131,6 +131,10 @@
flags_inv = HIDEEARS
cold_protection = HEAD
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
+ species_fit = list("Grey")
+ sprite_sheets = list(
+ "Grey" = 'icons/mob/species/grey/head.dmi'
+ )
/obj/item/clothing/head/ushanka/attack_self(mob/user as mob)
if(src.icon_state == "ushankadown")
@@ -154,6 +158,10 @@
flags = BLOCKHAIR
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
+ species_fit = list("Grey")
+ sprite_sheets = list(
+ "Grey" = 'icons/mob/species/grey/head.dmi'
+ )
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
brightness_on = 2 //luminosity when on
@@ -221,6 +229,11 @@
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
species_disguise = "High-tech robot"
+ species_fit = list("Grey")
+ sprite_sheets = list(
+ "Grey" = 'icons/mob/species/grey/head.dmi'
+ )
+
/obj/item/clothing/head/cardborg/equipped(mob/living/user, slot)
..()
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 789215a0f19..77fcd03c7df 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -98,14 +98,13 @@
"Grey" = 'icons/mob/species/grey/mask.dmi'
)
-/obj/item/clothing/mask/muzzle/tapegag/dropped(mob/living/carbon/human/user)
- var/atom/movable/R = new /obj/item/trash/tapetrash
- var/turf/T = get_turf(src)
- R.loc = T
- transfer_fingerprints_to(R)
- playsound(src,'sound/items/poster_ripped.ogg',40,1)
+/obj/item/clothing/mask/muzzle/tapegag/dropped(mob/user)
+ var/obj/item/trash/tapetrash/TT = new(drop_location(src))
+ transfer_fingerprints_to(TT)
+ user.transfer_fingerprints_to(TT)
+ playsound(src, 'sound/items/poster_ripped.ogg', 40, 1)
+ ..()
user.emote("scream")
- . = ..()
/obj/item/clothing/mask/muzzle/safety
name = "safety muzzle"
@@ -295,8 +294,10 @@
var/voicechange = 0
var/temporaryname = " the Horse"
var/originalname = ""
-
-
+ species_fit = list("Grey")
+ sprite_sheets = list(
+ "Grey" = 'icons/mob/species/grey/mask.dmi'
+ )
/obj/item/clothing/mask/horsehead/equipped(mob/user, slot)
if(flags & NODROP) //cursed masks only
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 304a7332bf6..607b67ccfb4 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -79,7 +79,6 @@
slowdown = SHOES_SLOWDOWN+1
item_color = "clown"
var/footstep = 1 //used for squeeks whilst walking
- silence_steps = 1
shoe_sound = "clownstep"
/obj/item/clothing/shoes/jackboots
@@ -93,7 +92,6 @@
put_on_delay = 50
burn_state = FIRE_PROOF
var/footstep = 1
- silence_steps = 1
shoe_sound = "jackboot"
/obj/item/clothing/shoes/jackboots/jacksandals
@@ -182,10 +180,10 @@
item_state = "noble_boot"
/obj/item/clothing/shoes/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/stack/tape_roll))
+ if(istype(I, /obj/item/stack/tape_roll) && !silence_steps)
var/obj/item/stack/tape_roll/TR = I
if((!silence_steps || shoe_sound) && TR.use(4))
- silence_steps = 1
+ silence_steps = TRUE
shoe_sound = null
to_chat(user, "You tape the soles of [src] to silence your footsteps.")
else
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 532522747ed..cbf7a0a0910 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -99,8 +99,22 @@
name = "Santa's hat"
desc = "Ho ho ho. Merrry X-mas!"
icon_state = "santahat"
+ species_fit = list("Grey, Drask")
+ sprite_sheets = list(
+ "Grey" = 'icons/mob/species/Grey/head.dmi',
+ "Drask" = 'icons/mob/species/Drask/helmet.dmi'
+ )
flags = BLOCKHAIR | STOPSPRESSUREDMAGE
flags_cover = HEADCOVERSEYES
+/obj/item/clothing/head/helmet/space/santahat/attack_self(mob/user as mob)
+ if(src.icon_state == "santahat")
+ src.icon_state = "santahat_beard"
+ src.item_state = "santahat_beard"
+ to_chat(user, "Santa's beard expands out from the hat!")
+ else
+ src.icon_state = "santahat"
+ src.item_state = "santahat"
+ to_chat(user, "The beard slinks back into the hat...")
/obj/item/clothing/suit/space/santa
name = "Santa's suit"
@@ -165,10 +179,9 @@
desc = "A brand new paramedic EVA suit. The nitrile seems a bit too thin to be space proof. Used for retrieving bodies in space."
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
species_restricted = list("exclude", "Diona", "Wryn")
- species_fit = list("Vox", "Grey" , "Skrell" , "Tajaran" , "Drask" , "Unathi" , "Vulpkanin")
+ species_fit = list("Vox", "Skrell" , "Tajaran" , "Drask" , "Unathi" , "Vulpkanin")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi',
- "Grey" = 'icons/mob/species/grey/suit.dmi',
"Skrell" = 'icons/mob/species/skrell/suit.dmi',
"Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
"Drask" = 'icons/mob/species/drask/suit.dmi',
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index 7880dcc1dd3..0c85db3d533 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -9,10 +9,11 @@
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
burn_state = FIRE_PROOF
- species_fit = list("Vox")
+ species_fit = list("Vox", "Grey")
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/helmet.dmi'
- )
+ "Vox" = 'icons/mob/species/vox/helmet.dmi',
+ "Grey" = 'icons/mob/species/grey/head.dmi'
+ )
/obj/item/clothing/suit/bio_suit
name = "bio suit"
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index e0b444afcd0..7f1ebfc101a 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -77,7 +77,8 @@
burn_state = FIRE_PROOF
species_fit = list("Vox")
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/helmet.dmi'
+ "Vox" = 'icons/mob/species/vox/helmet.dmi',
+ "Grey" = 'icons/mob/species/grey/head.dmi'
)
/obj/item/clothing/suit/bomb_suit
@@ -130,7 +131,8 @@
burn_state = FIRE_PROOF
species_fit = list("Vox")
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/head.dmi'
+ "Vox" = 'icons/mob/species/vox/head.dmi',
+ "Grey" = 'icons/mob/species/grey/head.dmi'
)
/obj/item/clothing/suit/radiation
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index e224f542db3..65ca57696c8 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -247,6 +247,14 @@
reqs = list(/obj/item/paper = 5)
category = CAT_MISC
+/datum/crafting_recipe/sushimat
+ name = "Sushi Mat"
+ result = /obj/item/kitchen/sushimat
+ time = 10
+ reqs = list(/obj/item/stack/sheet/wood = 1,
+ /obj/item/stack/cable_coil = 2)
+ category = CAT_MISC
+
/datum/crafting_recipe/notreallysoap
name = "Homemade Soap"
result = /obj/item/soap/ducttape
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index b72ddea8be1..3ab7fb61bab 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -114,6 +114,8 @@
reagents.chem_temp += 15
to_chat(user, "You heat [src] with [I].")
reagents.handle_reactions()
+ else
+ return ..()
/obj/item/reagent_containers/food/drinks/examine(mob/user)
if(!..(user, 1))
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
index 60642cab847..64a585e9051 100644
--- a/code/modules/food_and_drinks/food/condiment.dm
+++ b/code/modules/food_and_drinks/food/condiment.dm
@@ -26,9 +26,6 @@
"sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!"))
var/originalname = "condiment" //Can't use initial(name) for this. This stores the name set by condimasters.
-/obj/item/reagent_containers/food/condiment/attackby(obj/item/W, mob/user, params)
- return
-
/obj/item/reagent_containers/food/condiment/attack_self(mob/user)
return
@@ -55,9 +52,6 @@
playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
return 1
-/obj/item/reagent_containers/food/condiment/attackby(obj/item/I, mob/user, params)
- return
-
/obj/item/reagent_containers/food/condiment/afterattack(obj/target, mob/user , proximity)
if(!proximity)
return
diff --git a/code/modules/food_and_drinks/food/foods/seafood.dm b/code/modules/food_and_drinks/food/foods/seafood.dm
index 31a8f9e22c1..ad56ef00704 100644
--- a/code/modules/food_and_drinks/food/foods/seafood.dm
+++ b/code/modules/food_and_drinks/food/foods/seafood.dm
@@ -97,6 +97,16 @@
bitesize = 3
list_reagents = list("nutriment" = 2)
+/obj/item/reagent_containers/food/snacks/sliceable/Ebi_maki
+ name = "Ebi Makiroll"
+ desc = "A large unsliced roll of Ebi Sushi."
+ icon = 'icons/obj/food/seafood.dmi'
+ icon_state = "Ebi_maki"
+ slice_path = /obj/item/reagent_containers/food/snacks/sushi_Ebi
+ slices_num = 4
+ bitesize = 3
+ list_reagents = list("nutriment" = 8)
+
/obj/item/reagent_containers/food/snacks/sushi_Ebi
name = "Ebi Sushi"
desc = "A simple sushi consisting of cooked shrimp and rice."
@@ -105,6 +115,16 @@
bitesize = 3
list_reagents = list("nutriment" = 2)
+/obj/item/reagent_containers/food/snacks/sliceable/Ikura_maki
+ name = "Ikura Makiroll"
+ desc = "A large unsliced roll of Ikura Sushi."
+ icon = 'icons/obj/food/seafood.dmi'
+ icon_state = "Ikura_maki"
+ slice_path = /obj/item/reagent_containers/food/snacks/sushi_Ikura
+ slices_num = 4
+ bitesize = 3
+ list_reagents = list("nutriment" = 8, "protein" = 4)
+
/obj/item/reagent_containers/food/snacks/sushi_Ikura
name = "Ikura Sushi"
desc = "A simple sushi consisting of salmon roe."
@@ -113,6 +133,16 @@
bitesize = 3
list_reagents = list("nutriment" = 2, "protein" = 1)
+/obj/item/reagent_containers/food/snacks/sliceable/Sake_maki
+ name = "Sake Makiroll"
+ desc = "A large unsliced roll of Ebi Sushi."
+ icon = 'icons/obj/food/seafood.dmi'
+ icon_state = "Sake_maki"
+ slice_path = /obj/item/reagent_containers/food/snacks/sushi_Sake
+ slices_num = 4
+ bitesize = 3
+ list_reagents = list("nutriment" = 8)
+
/obj/item/reagent_containers/food/snacks/sushi_Sake
name = "Sake Sushi"
desc = "A simple sushi consisting of raw salmon and rice."
@@ -121,6 +151,16 @@
bitesize = 3
list_reagents = list("nutriment" = 2)
+/obj/item/reagent_containers/food/snacks/sliceable/SmokedSalmon_maki
+ name = "Smoked Salmon Makiroll"
+ desc = "A large unsliced roll of Smoked Salmon Sushi."
+ icon = 'icons/obj/food/seafood.dmi'
+ icon_state = "SmokedSalmon_maki"
+ slice_path = /obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon
+ slices_num = 4
+ bitesize = 3
+ list_reagents = list("nutriment" = 8)
+
/obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon
name = "Smoked Salmon Sushi"
desc = "A simple sushi consisting of cooked salmon and rice."
@@ -129,6 +169,16 @@
bitesize = 3
list_reagents = list("nutriment" = 2)
+/obj/item/reagent_containers/food/snacks/sliceable/Tamago_maki
+ name = "Tamago Makiroll"
+ desc = "A large unsliced roll of Tamago Sushi."
+ icon = 'icons/obj/food/seafood.dmi'
+ icon_state = "Tamago_maki"
+ slice_path = /obj/item/reagent_containers/food/snacks/sushi_Tamago
+ slices_num = 4
+ bitesize = 3
+ list_reagents = list("nutriment" = 8)
+
/obj/item/reagent_containers/food/snacks/sushi_Tamago
name = "Tamago Sushi"
desc = "A simple sushi consisting of egg and rice."
@@ -137,6 +187,16 @@
bitesize = 3
list_reagents = list("nutriment" = 2)
+/obj/item/reagent_containers/food/snacks/sliceable/Inari_maki
+ name = "Inari Makiroll"
+ desc = "A large unsliced roll of Inari Sushi."
+ icon = 'icons/obj/food/seafood.dmi'
+ icon_state = "Inari_maki"
+ slice_path = /obj/item/reagent_containers/food/snacks/sushi_Inari
+ slices_num = 4
+ bitesize = 3
+ list_reagents = list("nutriment" = 8)
+
/obj/item/reagent_containers/food/snacks/sushi_Inari
name = "Inari Sushi"
desc = "A piece of fried tofu stuffed with rice."
@@ -145,6 +205,16 @@
bitesize = 3
list_reagents = list("nutriment" = 2)
+/obj/item/reagent_containers/food/snacks/sliceable/Masago_maki
+ name = "Masago Makiroll"
+ desc = "A large unsliced roll of Masago Sushi."
+ icon = 'icons/obj/food/seafood.dmi'
+ icon_state = "Masago_maki"
+ slice_path = /obj/item/reagent_containers/food/snacks/sushi_Masago
+ slices_num = 4
+ bitesize = 3
+ list_reagents = list("nutriment" = 8, "protein" = 4)
+
/obj/item/reagent_containers/food/snacks/sushi_Masago
name = "Masago Sushi"
desc = "A simple sushi consisting of goldfish roe."
@@ -153,6 +223,16 @@
bitesize = 3
list_reagents = list("nutriment" = 2, "protein" = 1)
+/obj/item/reagent_containers/food/snacks/sliceable/Tobiko_maki
+ name = "Tobiko Makiroll"
+ desc = "A large unsliced roll of Tobkio Sushi."
+ icon = 'icons/obj/food/seafood.dmi'
+ icon_state = "Tobiko_maki"
+ slice_path = /obj/item/reagent_containers/food/snacks/sushi_Tobiko
+ slices_num = 4
+ bitesize = 3
+ list_reagents = list("nutriment" = 8, "protein" = 4)
+
/obj/item/reagent_containers/food/snacks/sushi_Tobiko
name = "Tobiko Sushi"
desc = "A simple sushi consisting of shark roe."
@@ -161,6 +241,16 @@
bitesize = 3
list_reagents = list("nutriment" = 2, "protein" = 1)
+/obj/item/reagent_containers/food/snacks/sliceable/TobikoEgg_maki
+ name = "Tobiko and Egg Makiroll"
+ desc = "A large unsliced roll of Tobkio and Egg Sushi."
+ icon = 'icons/obj/food/seafood.dmi'
+ icon_state = "TobikoEgg_maki"
+ slice_path = /obj/item/reagent_containers/food/snacks/sushi_TobikoEgg
+ slices_num = 4
+ bitesize = 3
+ list_reagents = list("nutriment" = 8, "protein" = 4)
+
/obj/item/reagent_containers/food/snacks/sushi_TobikoEgg
name = "Tobiko and Egg Sushi"
desc = "A sushi consisting of shark roe and an egg."
@@ -169,6 +259,16 @@
bitesize = 3
list_reagents = list("nutriment" = 2, "protein" = 1)
+/obj/item/reagent_containers/food/snacks/sliceable/Tai_maki
+ name = "Tai Makiroll"
+ desc = "A large unsliced roll of Tai Sushi."
+ icon = 'icons/obj/food/seafood.dmi'
+ icon_state = "Tai_maki"
+ slice_path = /obj/item/reagent_containers/food/snacks/sushi_Tai
+ slices_num = 4
+ bitesize = 3
+ list_reagents = list("nutriment" = 8)
+
/obj/item/reagent_containers/food/snacks/sushi_Tai
name = "Tai Sushi"
desc = "A simple sushi consisting of catfish and rice."
diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index d9b6c6694a7..bb857969d5c 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -79,7 +79,7 @@
if(istype(W,/obj/item/storage))
..() // -> item/attackby(, params)
- if(istype(W,/obj/item/kitchen/utensil))
+ else if(istype(W,/obj/item/kitchen/utensil))
var/obj/item/kitchen/utensil/U = W
@@ -116,6 +116,8 @@
TrashItem.forceMove(loc)
qdel(src)
return TRUE
+ else
+ return ..()
/obj/item/reagent_containers/food/snacks/proc/generate_trash(atom/location)
if(trash)
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm
index e5a7cb0ef2c..8d91fd14258 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm
@@ -82,6 +82,16 @@
result = /obj/item/reagent_containers/food/snacks/sushi_Ebi
category = CAT_FOOD
+/datum/crafting_recipe/Ebi_maki
+ name = "Ebi Makiroll"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/boiledrice = 1,
+ /obj/item/reagent_containers/food/snacks/boiled_shrimp = 4,
+ )
+ tools = list(/obj/item/kitchen/sushimat)
+ result = /obj/item/reagent_containers/food/snacks/sliceable/Ebi_maki
+ category = CAT_FOOD
+
/datum/crafting_recipe/sushi_Ikura
name = "Ikura Sushi"
reqs = list(
@@ -91,6 +101,16 @@
result = /obj/item/reagent_containers/food/snacks/sushi_Ikura
category = CAT_FOOD
+/datum/crafting_recipe/Ikura_maki
+ name = "Ikura Makiroll"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/boiledrice = 1,
+ /obj/item/fish_eggs/salmon = 4,
+ )
+ tools = list(/obj/item/kitchen/sushimat)
+ result = /obj/item/reagent_containers/food/snacks/sliceable/Ikura_maki
+ category = CAT_FOOD
+
/datum/crafting_recipe/sushi_Inari
name = "Inari Sushi"
reqs = list(
@@ -100,6 +120,16 @@
result = /obj/item/reagent_containers/food/snacks/sushi_Inari
category = CAT_FOOD
+/datum/crafting_recipe/Inari_maki
+ name = "Inari Makiroll"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/boiledrice = 1,
+ /obj/item/reagent_containers/food/snacks/fried_tofu = 4,
+ )
+ tools = list(/obj/item/kitchen/sushimat)
+ result = /obj/item/reagent_containers/food/snacks/sliceable/Inari_maki
+ category = CAT_FOOD
+
/datum/crafting_recipe/sushi_Sake
name = "Sake Sushi"
reqs = list(
@@ -109,6 +139,16 @@
result = /obj/item/reagent_containers/food/snacks/sushi_Sake
category = CAT_FOOD
+/datum/crafting_recipe/Sake_maki
+ name = "Sake Makiroll"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/boiledrice = 1,
+ /obj/item/reagent_containers/food/snacks/salmonmeat = 4,
+ )
+ tools = list(/obj/item/kitchen/sushimat)
+ result = /obj/item/reagent_containers/food/snacks/sliceable/Sake_maki
+ category = CAT_FOOD
+
/datum/crafting_recipe/sushi_SmokedSalmon
name = "Smoked Salmon Sushi"
reqs = list(
@@ -118,6 +158,16 @@
result = /obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon
category = CAT_FOOD
+/datum/crafting_recipe/SmokedSalmon_maki
+ name = "Smoked Salmon Makiroll"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/boiledrice = 1,
+ /obj/item/reagent_containers/food/snacks/salmonsteak = 4,
+ )
+ tools = list(/obj/item/kitchen/sushimat)
+ result = /obj/item/reagent_containers/food/snacks/sliceable/SmokedSalmon_maki
+ category = CAT_FOOD
+
/datum/crafting_recipe/sushi_Masago
name = "Masago Sushi"
reqs = list(
@@ -127,6 +177,16 @@
result = /obj/item/reagent_containers/food/snacks/sushi_Masago
category = CAT_FOOD
+/datum/crafting_recipe/Masago_maki
+ name = "Masago Makiroll"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/boiledrice = 1,
+ /obj/item/fish_eggs/goldfish = 4,
+ )
+ tools = list(/obj/item/kitchen/sushimat)
+ result = /obj/item/reagent_containers/food/snacks/sliceable/Masago_maki
+ category = CAT_FOOD
+
/datum/crafting_recipe/sushi_Tobiko
name = "Tobiko Sushi"
reqs = list(
@@ -136,6 +196,16 @@
result = /obj/item/reagent_containers/food/snacks/sushi_Tobiko
category = CAT_FOOD
+/datum/crafting_recipe/Tobiko_maki
+ name = "Tobiko Makiroll"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/boiledrice = 1,
+ /obj/item/fish_eggs/shark = 4,
+ )
+ tools = list(/obj/item/kitchen/sushimat)
+ result = /obj/item/reagent_containers/food/snacks/sliceable/Tobiko_maki
+ category = CAT_FOOD
+
/datum/crafting_recipe/sushi_TobikoEgg
name = "Tobiko and Egg Sushi"
reqs = list(
@@ -145,6 +215,26 @@
result = /obj/item/reagent_containers/food/snacks/sushi_TobikoEgg
category = CAT_FOOD
+/datum/crafting_recipe/TobikoEgg_maki
+ name = "Tobiko Makiroll"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/sushi_Tobiko = 4,
+ /obj/item/reagent_containers/food/snacks/egg = 4,
+ )
+ tools = list(/obj/item/kitchen/sushimat)
+ result = /obj/item/reagent_containers/food/snacks/sliceable/TobikoEgg_maki
+ category = CAT_FOOD
+
+/datum/crafting_recipe/Sake_maki
+ name = "Sake Makiroll"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/sushi_Tobiko = 4,
+ /obj/item/reagent_containers/food/snacks/egg = 4,
+ )
+ tools = list(/obj/item/kitchen/sushimat)
+ result = /obj/item/reagent_containers/food/snacks/sliceable/TobikoEgg_maki
+ category = CAT_FOOD
+
/datum/crafting_recipe/sushi_Tai
name = "Tai Sushi"
reqs = list(
@@ -153,3 +243,13 @@
)
result = /obj/item/reagent_containers/food/snacks/sushi_Tai
category = CAT_FOOD
+
+/datum/crafting_recipe/Tai_maki
+ name = "Tai Makiroll"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/boiledrice = 1,
+ /obj/item/reagent_containers/food/snacks/catfishmeat = 4,
+ )
+ tools = list(/obj/item/kitchen/sushimat)
+ result = /obj/item/reagent_containers/food/snacks/sliceable/Tai_maki
+ category = CAT_FOOD
\ No newline at end of file
diff --git a/code/modules/holiday/christmas.dm b/code/modules/holiday/christmas.dm
index 7b00171b348..5a9a8605442 100644
--- a/code/modules/holiday/christmas.dm
+++ b/code/modules/holiday/christmas.dm
@@ -6,6 +6,8 @@
new /obj/item/a_gift(T)
for(var/mob/living/simple_animal/pet/corgi/Ian/Ian in GLOB.mob_list)
Ian.place_on_head(new /obj/item/clothing/head/helmet/space/santahat(Ian))
+ var/datum/supply_packs/xmas = SSshuttle.supply_packs["[/datum/supply_packs/misc/snow_machine]"] //Snow!
+ xmas.special_enabled = TRUE
/datum/holiday/xmas/handle_event()
spawnTree()
diff --git a/code/modules/mob/living/autohiss.dm b/code/modules/mob/living/autohiss.dm
index 286901baf5c..78c12148ee3 100644
--- a/code/modules/mob/living/autohiss.dm
+++ b/code/modules/mob/living/autohiss.dm
@@ -58,6 +58,16 @@
)
autohiss_exempt = list("Chittin")
+/datum/species/drask
+ autohiss_basic_map = list(
+ "o" = list ("oo", "ooo"),
+ "u" = list ("uu", "uuu")
+ )
+ autohiss_extra_map = list(
+ "m" = list ("mm", "mmm")
+ )
+ autohiss_exempt = list("Orluum")
+
/datum/species/proc/handle_autohiss(message, datum/language/lang, mode)
if(!autohiss_basic_map)
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index be2b3506e67..03726353022 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -363,8 +363,8 @@
for(var/datum/data/record/R in data_core.security)
if(R.fields["id"] == E.fields["id"])
criminal = R.fields["criminal"]
-
- msg += "Criminal status: \[[criminal]\]\n"
+ var/criminal_status = hasHUD(user, "read_only_security") ? "\[[criminal]\]" : "\[[criminal]\]"
+ msg += "Criminal status: [criminal_status]\n"
msg += "Security records: \[View\] \[Add comment\]\n"
if(hasHUD(user,"medical"))
@@ -408,7 +408,12 @@
var/obj/item/organ/internal/cyberimp/eyes/hud/CIH = H.get_int_organ(/obj/item/organ/internal/cyberimp/eyes/hud)
switch(hudtype)
if("security")
- return istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/hud/security/sunglasses) || istype(CIH,/obj/item/organ/internal/cyberimp/eyes/hud/security)
+ return istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(CIH,/obj/item/organ/internal/cyberimp/eyes/hud/security)
+ if("read_only_security")
+ var/obj/item/clothing/glasses/hud/security/S
+ if(istype(H.glasses, /obj/item/clothing/glasses/hud/security))
+ S = H.glasses
+ return !istype(CIH,/obj/item/organ/internal/cyberimp/eyes/hud/security) && S && S.read_only
if("medical")
return istype(H.glasses, /obj/item/clothing/glasses/hud/health) || istype(H.glasses, /obj/item/clothing/glasses/hud/health/health_advanced) || istype(CIH,/obj/item/organ/internal/cyberimp/eyes/hud/medical)
else
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index 71a5f0396a1..33e855ab4d1 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -85,6 +85,13 @@
if(!(step_count % 2)) //every other turf makes a sound
return 0
+ if(istype(shoes, /obj/item/clothing/shoes))
+ var/obj/item/clothing/shoes/shooess = shoes
+ if(shooess.silence_steps)
+ return 0 //silent
+ if(shooess.shoe_sound)
+ return //Handle it on the shoe
+
var/range = -(world.view - 2)
if(m_intent == MOVE_INTENT_WALK)
range -= 0.333
@@ -104,11 +111,6 @@
if(!shoes)
volume -= 4
- if(istype(shoes, /obj/item/clothing/shoes))
- var/obj/item/clothing/shoes/shooess = shoes
- if(shooess.silence_steps)
- return 0 //silent
-
if(!has_organ("l_foot") && !has_organ("r_foot"))
return 0 //no feet no footsteps
diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm
index 06d45056ac4..fd376b8022c 100644
--- a/code/modules/mob/living/carbon/human/species/_species.dm
+++ b/code/modules/mob/living/carbon/human/species/_species.dm
@@ -156,6 +156,9 @@
// Mutant pieces
var/obj/item/organ/internal/ears/mutantears = /obj/item/organ/internal/ears
+ // Species specific boxes
+ var/speciesbox
+
/datum/species/New()
//If the species has eyes, they are the default vision organ
if(!vision_organ && has_organ["eyes"])
diff --git a/code/modules/mob/living/carbon/human/species/human.dm b/code/modules/mob/living/carbon/human/species/human.dm
index 2a161ab9318..2570fb060e7 100644
--- a/code/modules/mob/living/carbon/human/species/human.dm
+++ b/code/modules/mob/living/carbon/human/species/human.dm
@@ -17,4 +17,5 @@
worlds tumultous at best."
reagent_tag = PROCESS_ORG
- //Has standard darksight of 2.
\ No newline at end of file
+ //Has standard darksight of 2.
+
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm
index 82c875444d2..3ac2eca49a3 100644
--- a/code/modules/mob/living/carbon/human/species/plasmaman.dm
+++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm
@@ -39,6 +39,8 @@
"eyes" = /obj/item/organ/internal/eyes
)
+ speciesbox = /obj/item/storage/box/survival_plasmaman
+
/datum/species/plasmaman/say_filter(mob/M, message, datum/language/speaking)
if(copytext(message, 1, 2) != "*")
message = replacetext(message, "s", stutter("ss"))
diff --git a/code/modules/mob/living/carbon/human/species/vox.dm b/code/modules/mob/living/carbon/human/species/vox.dm
index d01f1ccf6fe..5b498e700f9 100644
--- a/code/modules/mob/living/carbon/human/species/vox.dm
+++ b/code/modules/mob/living/carbon/human/species/vox.dm
@@ -78,6 +78,8 @@
"is holding their breath!",
"is deeply inhaling oxygen!")
+ speciesbox = /obj/item/storage/box/survival_vox
+
/datum/species/vox/handle_death(mob/living/carbon/human/H)
H.stop_tail_wagging(1)
diff --git a/code/modules/mob/living/carbon/superheroes.dm b/code/modules/mob/living/carbon/superheroes.dm
index 50b22a2c8ed..4e04090b649 100644
--- a/code/modules/mob/living/carbon/superheroes.dm
+++ b/code/modules/mob/living/carbon/superheroes.dm
@@ -9,13 +9,15 @@
var/class
var/list/default_genes = list(REGEN, BREATHLESS, COLDRES)
var/list/default_spells = list()
-
+ var/activated = FALSE //for wishgranters to not give an option if someone already has it.
+
/datum/superheroes/proc/create(var/mob/living/carbon/human/H)
assign_genes(H)
assign_spells(H)
equip(H)
fixflags(H)
assign_id(H)
+ H.mind.special_role = SPECIAL_ROLE_SUPER
/datum/superheroes/proc/equip(var/mob/living/carbon/human/H)
H.rename_character(H.real_name, name)
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index a6400142086..2f9ad47399b 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -656,7 +656,21 @@ var/list/ai_verbs_default = list(
return
if(href_list["ai_take_control"]) //Mech domination
+
var/obj/mecha/M = locate(href_list["ai_take_control"])
+
+ if(!M)
+ return
+
+ var/mech_has_controlbeacon = FALSE
+ for(var/obj/item/mecha_parts/mecha_tracking/ai_control/A in M.trackers)
+ mech_has_controlbeacon = TRUE
+ break
+ if(!can_dominate_mechs && !mech_has_controlbeacon)
+ message_admins("Warning: possible href exploit by [key_name(usr)] - attempted control of a mecha without can_dominate_mechs or a control beacon in the mech.")
+ log_debug("Warning: possible href exploit by [key_name(usr)] - attempted control of a mecha without can_dominate_mechs or a control beacon in the mech.")
+ return
+
if(controlled_mech)
to_chat(src, "You are already loaded into an onboard computer!")
return
@@ -670,7 +684,7 @@ var/list/ai_verbs_default = list(
to_chat(src, "You aren't in your core!")
return
if(M)
- M.transfer_ai(AI_MECH_HACK,src, usr) //Called om the mech itself.
+ M.transfer_ai(AI_MECH_HACK, src, usr) //Called om the mech itself.
else if(href_list["faketrack"])
var/mob/target = locate(href_list["track"]) in GLOB.mob_list
diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm
index 1797fc8b4bd..fec27db5df8 100644
--- a/code/modules/mob/living/silicon/pai/recruit.dm
+++ b/code/modules/mob/living/silicon/pai/recruit.dm
@@ -23,24 +23,22 @@ var/datum/paiController/paiController // Global handler for pAI candidates
var/askDelay = 10 * 60 * 1 // One minute [ms * sec * min]
/datum/paiController/Topic(href, href_list[])
- if("signup" in href_list)
- var/mob/dead/observer/O = locate(href_list["signup"])
- if(!O) return
- if(!(O in GLOB.respawnable_list))
- to_chat(O, "You've given up your ability to respawn!")
+
+ var/datum/paiCandidate/candidate = locateUID(href_list["candidate"])
+
+ if(candidate)
+ if(!istype(candidate))
+ message_admins("Warning: possible href exploit by [key_name(usr)] (paiController/Topic, candidate is not a pAI)")
+ log_debug("Warning: possible href exploit by [key_name(usr)] (paiController/Topic, candidate is not a pAI)")
return
- if(!check_recruit(O)) return
- recruitWindow(O)
- return
if(href_list["download"])
- var/datum/paiCandidate/candidate = locate(href_list["candidate"])
var/obj/item/paicard/card = locate(href_list["device"])
if(card.pai)
return
if(usr.incapacitated() || isobserver(usr) || !card.Adjacent(usr))
return
- if(istype(card,/obj/item/paicard) && istype(candidate,/datum/paiCandidate))
+ if(istype(card, /obj/item/paicard) && istype(candidate, /datum/paiCandidate))
var/mob/living/silicon/pai/pai = new(card)
if(!candidate.name)
pai.name = pick(GLOB.ninja_names)
@@ -58,8 +56,27 @@ var/datum/paiController/paiController // Global handler for pAI candidates
pai_candidates -= candidate
usr << browse(null, "window=findPai")
+
+ if(candidate)
+ if(candidate.key && usr.key && candidate.key != usr.key)
+ message_admins("Warning: possible href exploit by [key_name(usr)] (paiController/Topic, candidate and usr are different mobs)")
+ log_debug("Warning: possible href exploit by [key_name(usr)] (paiController/Topic, candidate and usr are different mobs)")
+ return
+
+ if("signup" in href_list)
+ var/mob/dead/observer/O = locate(href_list["signup"])
+ if(!O)
+ return
+ if(!(O in GLOB.respawnable_list))
+ to_chat(O, "You've given up your ability to respawn!")
+ return
+ if(!check_recruit(O))
+ return
+ recruitWindow(O)
+ return
+
+
if(href_list["new"])
- var/datum/paiCandidate/candidate = locate(href_list["candidate"])
var/option = href_list["option"]
var/t = ""
@@ -183,28 +200,28 @@ var/datum/paiController/paiController // Global handler for pAI candidates
- | Name: |
+ Name: |
[candidate.name] |
| What you plan to call yourself. Suggestions: Any character name you would choose for a station character OR an AI. |
- | Description: |
+ Description: |
[candidate.description] |
| What sort of pAI you typically play; your mannerisms, your quirks, etc. This can be as sparse or as detailed as you like. |
- | Preferred Role: |
+ Preferred Role: |
[candidate.role] |
| Do you like to partner with sneaky social ninjas? Like to help security hunt down thugs? Enjoy watching an engineer's back while he saves the station yet again? This doesn't have to be limited to just station jobs. Pretty much any general descriptor for what you'd like to be doing works here. |
- | OOC Comments: |
+ OOC Comments: |
[candidate.comments] |
@@ -215,17 +232,17 @@ var/datum/paiController/paiController // Global handler for pAI candidates