diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index 4fbfabaf2b..ed2403fcfa 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -1240,20 +1240,19 @@
/turf/open/floor/plasteel/white,
/area/crew_quarters/heads/hop)
"abL" = (
-/obj/structure/rack,
-/obj/effect/decal/cleanable/cobweb,
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 2;
- name = "2maintenance loot spawner"
- },
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel,
+/obj/structure/sign/warning/securearea,
+/turf/closed/wall,
/area/maintenance/starboard/fore)
"abM" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/airlock/external{
+ name = "External Airlock";
+ req_access_txt = "13"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
/turf/open/floor/plasteel,
/area/maintenance/starboard/fore)
"abN" = (
@@ -1606,10 +1605,14 @@
/turf/open/floor/plasteel/white,
/area/crew_quarters/heads/hop)
"acu" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 6
+/obj/structure/sign/warning/vacuum{
+ pixel_x = 32;
+ pixel_y = 32
},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/effect/landmark/xeno_spawn,
+/turf/open/floor/plasteel,
/area/maintenance/starboard/fore)
"acv" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -2150,6 +2153,16 @@
/obj/machinery/status_display/supply,
/turf/closed/wall,
/area/quartermaster/storage)
+"adq" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/closet/emcloset/anchored,
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore)
"adr" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -2177,6 +2190,24 @@
},
/turf/open/floor/plating,
/area/engine/supermatter)
+"adt" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/airlock/external{
+ name = "External Airlock";
+ req_access_txt = "13"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore)
+"adu" = (
+/turf/closed/wall,
+/area/quartermaster/qm)
"adv" = (
/obj/structure/closet/crate{
icon_state = "crateopen"
@@ -2195,6 +2226,9 @@
/obj/item/clothing/head/helmet/space/orange,
/turf/open/floor/plating,
/area/asteroid/nearstation)
+"ady" = (
+/turf/closed/wall/rust,
+/area/quartermaster/qm)
"adz" = (
/obj/structure/sign/warning/vacuum,
/turf/closed/wall,
@@ -2340,6 +2374,14 @@
/obj/structure/closet/crate/bin,
/turf/open/floor/wood,
/area/crew_quarters/heads/captain/private)
+"adM" = (
+/obj/structure/sign/warning/vacuum{
+ pixel_x = 32;
+ pixel_y = 32
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"adN" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/item/radio/intercom{
@@ -2439,32 +2481,67 @@
"adX" = (
/turf/closed/wall,
/area/crew_quarters/heads/hop)
+"adY" = (
+/obj/structure/reagent_dispensers/watertank,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/sign/poster/ripped{
+ pixel_x = 32
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore)
"adZ" = (
-/obj/item/radio/intercom{
- name = "Station Intercom";
- pixel_x = -28
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/structure/closet/secure_closet/quartermaster,
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = -24
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
},
/obj/machinery/camera{
- c_tag = "Cargo Bay North"
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/conveyor/inverted{
- dir = 5;
- id = "cargounload"
+ c_tag = "Quartermaster's Office";
+ dir = 4
},
/turf/open/floor/plasteel,
-/area/quartermaster/storage)
+/area/quartermaster/qm)
"aea" = (
-/obj/machinery/conveyor{
- dir = 8;
- id = "cargounload"
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/item/stamp/qm,
+/obj/item/radio/intercom{
+ name = "Station Intercom";
+ pixel_y = 24
},
-/obj/structure/sign/nanotrasen{
- pixel_y = 32
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
},
-/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/plasteel,
-/area/quartermaster/storage)
+/area/quartermaster/qm)
+"aeb" = (
+/obj/structure/filingcabinet,
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/qm)
"aec" = (
/obj/machinery/conveyor{
dir = 8;
@@ -2501,6 +2578,12 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
+"aef" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"aeg" = (
/obj/machinery/conveyor{
dir = 8;
@@ -2522,6 +2605,40 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/quartermaster/storage)
+"aei" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/rack,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/bot,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 2;
+ name = "2maintenance loot spawner"
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore)
+"aej" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/closed/wall,
+/area/quartermaster/qm)
+"aek" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/obj/structure/cable/white{
+ icon_state = "2-4"
+ },
+/obj/machinery/airalarm{
+ dir = 4;
+ pixel_x = -22
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/qm)
"ael" = (
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance{
@@ -2535,6 +2652,19 @@
icon_state = "platingdmg3"
},
/area/asteroid/nearstation)
+"aen" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/structure/chair/office/dark{
+ dir = 1
+ },
+/obj/effect/landmark/start/quartermaster,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/holopad,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/quartermaster/qm)
"aeo" = (
/obj/structure/table,
/obj/item/extinguisher/mini,
@@ -2903,16 +3033,49 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/hop)
"aeP" = (
-/obj/machinery/status_display/supply{
- pixel_x = -32
+/obj/structure/cable/white{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/quartermaster/qm";
+ dir = 4;
+ name = "Quartermaster's Office APC";
+ pixel_x = 26
+ },
+/obj/machinery/computer/card/minor/qm{
+ icon_state = "computer";
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown,
+/obj/machinery/keycard_auth{
+ pixel_x = 24;
+ pixel_y = 24
},
-/obj/effect/turf_decal/loading_area,
/turf/open/floor/plasteel,
-/area/quartermaster/storage)
+/area/quartermaster/qm)
"aeQ" = (
-/obj/effect/turf_decal/loading_area,
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/mining/glass{
+ name = "Quartermaster";
+ req_access_txt = "41"
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
/turf/open/floor/plasteel,
-/area/quartermaster/storage)
+/area/quartermaster/qm)
+"aeR" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plating,
+/area/quartermaster/qm)
"aeS" = (
/obj/structure/closet/crate,
/obj/effect/turf_decal/delivery,
@@ -2930,11 +3093,57 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
+"aeV" = (
+/obj/item/radio/intercom{
+ name = "Station Intercom";
+ pixel_x = -28
+ },
+/obj/machinery/camera{
+ c_tag = "Cargo Bay North"
+ },
+/obj/structure/sign/nanotrasen{
+ pixel_y = 32
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"aeW" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
"aeX" = (
/obj/machinery/light/small,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
+"aeY" = (
+/obj/machinery/conveyor/inverted{
+ dir = 5;
+ id = "cargounload"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
"aeZ" = (
/obj/docking_port/stationary{
dir = 4;
@@ -2946,6 +3155,18 @@
},
/turf/open/space/basic,
/area/space)
+"afa" = (
+/obj/machinery/status_display/supply{
+ pixel_x = -32
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
"afb" = (
/obj/structure/door_assembly/door_assembly_mhatch,
/obj/effect/turf_decal/stripes/line,
@@ -2954,6 +3175,23 @@
},
/turf/open/floor/plating,
/area/asteroid/nearstation)
+"afc" = (
+/obj/effect/landmark/event_spawn,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
"afd" = (
/obj/structure/table/wood,
/obj/item/taperecorder,
@@ -3330,7 +3568,9 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"afD" = (
-/obj/effect/landmark/event_spawn,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -3341,6 +3581,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"afE" = (
@@ -3416,6 +3659,28 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
+"afJ" = (
+/obj/effect/turf_decal/delivery,
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"afK" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/mining{
+ name = "Cargo Bay";
+ req_one_access_txt = "48;50"
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
"afL" = (
/obj/structure/girder/reinforced,
/turf/open/floor/plating,
@@ -3431,6 +3696,18 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating,
/area/asteroid/nearstation)
+"afO" = (
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
"afP" = (
/obj/structure/table/wood,
/obj/item/book/manual/wiki/security_space_law,
@@ -3700,6 +3977,26 @@
},
/turf/open/floor/plasteel/dark,
/area/bridge)
+"agm" = (
+/obj/structure/cable/white{
+ icon_state = "1-4"
+ },
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/landmark/start/security_officer,
+/turf/open/floor/plasteel,
+/area/security/brig)
"agn" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable/white,
@@ -3815,9 +4112,6 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"agw" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
- },
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -3828,6 +4122,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/structure/cable/white{
+ icon_state = "1-4"
+ },
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"agx" = (
@@ -3846,6 +4143,23 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
+"agy" = (
+/obj/effect/landmark/start/cargo_technician,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
"agz" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -3896,6 +4210,16 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
+"agD" = (
+/obj/effect/landmark/event_spawn,
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
"agE" = (
/obj/item/stack/ore/silver,
/obj/item/stack/ore/iron,
@@ -4331,31 +4655,41 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"ahl" = (
+/obj/structure/closet/crate,
/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"ahm" = (
-/obj/machinery/light,
-/obj/machinery/camera{
- c_tag = "Cargo Bay South";
+/obj/effect/turf_decal/tile/neutral{
dir = 1
},
-/obj/effect/turf_decal/loading_area{
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
dir = 4
},
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"ahn" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/effect/turf_decal/stripes/corner,
-/obj/machinery/conveyor{
- dir = 5;
- id = "cargoload"
- },
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aho" = (
/obj/machinery/conveyor{
@@ -4407,6 +4741,32 @@
},
/turf/open/floor/plating,
/area/quartermaster/storage)
+"ahs" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"aht" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
"ahu" = (
/turf/closed/wall/r_wall,
/area/asteroid/nearstation)
@@ -4744,6 +5104,26 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/nuke_storage)
+"ahW" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable/white{
+ icon_state = "2-4"
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
"ahX" = (
/obj/machinery/airalarm{
dir = 8;
@@ -4797,17 +5177,21 @@
/turf/open/floor/plasteel/dark,
/area/hallway/primary/starboard/fore)
"aid" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/mining{
- name = "Cargo Bay";
- req_one_access_txt = "48;50"
+/obj/structure/cable/white{
+ icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
dir = 1
},
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/landmark/start/head_of_security,
/turf/open/floor/plasteel,
-/area/quartermaster/storage)
+/area/security/brig)
"aie" = (
/obj/machinery/conveyor{
dir = 1;
@@ -4828,11 +5212,90 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/quartermaster/storage)
+"aig" = (
+/obj/machinery/button/door{
+ desc = "A remote control switch for the medbay foyer.";
+ id = "secexterior";
+ name = "Security Exterior Doors Control";
+ normaldoorcontrol = 1;
+ pixel_x = 38;
+ pixel_y = 24
+ },
+/obj/machinery/button/door{
+ desc = "A remote control switch for the medbay foyer.";
+ id = "secinterior";
+ name = "Security Interior Doors Control";
+ normaldoorcontrol = 1;
+ pixel_x = 24;
+ pixel_y = 24
+ },
+/obj/machinery/button/door{
+ id = "brigfront";
+ name = "Brig Access Control";
+ pixel_x = 24;
+ pixel_y = 38;
+ req_access_txt = "63"
+ },
+/obj/structure/chair/office/dark{
+ dir = 4
+ },
+/obj/machinery/light_switch{
+ pixel_x = 38;
+ pixel_y = 38
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/landmark/start/warden,
+/turf/open/floor/plasteel,
+/area/security/brig)
+"aih" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"aii" = (
+/obj/machinery/light,
+/obj/machinery/camera{
+ c_tag = "Cargo Bay South";
+ dir = 1
+ },
+/obj/effect/turf_decal/loading_area{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"aij" = (
+/obj/structure/chair/office/light{
+ dir = 1
+ },
+/obj/effect/turf_decal/bot,
+/obj/effect/landmark/start/chemist,
+/turf/open/floor/plasteel,
+/area/medical/chemistry)
"aik" = (
/obj/structure/barricade/wooden,
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating,
/area/asteroid/nearstation)
+"ail" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/landmark/start/chief_medical_officer,
+/turf/open/floor/plasteel/dark,
+/area/medical/morgue)
"aim" = (
/obj/structure/rack,
/obj/item/storage/box/rubbershot,
@@ -5119,14 +5582,22 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aiJ" = (
-/obj/effect/turf_decal/tile/brown{
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/tile/yellow{
dir = 1
},
-/obj/effect/turf_decal/tile/brown{
+/obj/effect/turf_decal/tile/yellow,
+/obj/effect/turf_decal/tile/yellow{
dir = 4
},
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/landmark/start/chemist,
/turf/open/floor/plasteel,
-/area/quartermaster/storage)
+/area/medical/chemistry)
"aiK" = (
/obj/structure/closet/crate/bin,
/obj/effect/turf_decal/tile/brown{
@@ -5193,6 +5664,41 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
+"aiP" = (
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/obj/structure/cable/white{
+ icon_state = "1-8"
+ },
+/obj/structure/cable/white{
+ icon_state = "1-4"
+ },
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/effect/landmark/start/research_director,
+/turf/open/floor/plasteel/white,
+/area/science/research)
+"aiQ" = (
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/landmark/start/paramedic,
+/turf/open/floor/plasteel,
+/area/medical/medbay/zone3)
"aiR" = (
/obj/structure/rack,
/obj/item/gun/energy/e_gun/advtaser{
@@ -5713,6 +6219,22 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/starboard/fore)
+"ajG" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/landmark/start/chief_medical_officer,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/zone3)
"ajH" = (
/obj/structure/plasticflaps/opaque,
/obj/effect/turf_decal/delivery,
@@ -5775,6 +6297,54 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
+"ajN" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/cable/white{
+ icon_state = "2-8"
+ },
+/obj/structure/cable/white{
+ icon_state = "2-4"
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/landmark/start/paramedic,
+/turf/open/floor/plasteel,
+/area/medical/medbay/zone3)
+"ajO" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/landmark/start/paramedic,
+/turf/open/floor/plasteel,
+/area/medical/medbay/zone3)
+"ajP" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/effect/landmark/start/research_director,
+/turf/open/floor/plasteel,
+/area/science/mixing)
"ajQ" = (
/obj/item/stack/ore/iron,
/obj/effect/turf_decal/sand/plating,
@@ -5871,24 +6441,10 @@
/turf/open/floor/plasteel,
/area/security/brig)
"ajX" = (
-/obj/structure/cable/white{
- icon_state = "1-4"
- },
-/obj/structure/cable/white{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/security/brig)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/sand/plating,
+/turf/open/floor/plating,
+/area/asteroid/nearstation)
"ajY" = (
/obj/structure/cable/white{
icon_state = "4-8"
@@ -6482,32 +7038,20 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"akM" = (
-/obj/effect/landmark/event_spawn,
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/quartermaster/storage)
+/obj/item/stack/ore/silver,
+/obj/item/stack/ore/iron,
+/turf/open/floor/plating/asteroid,
+/area/asteroid/nearstation)
"akN" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/brown{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 8
},
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/quartermaster/storage)
+/turf/closed/wall/r_wall,
+/area/crew_quarters/heads/chief)
"akO" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/brown{
- dir = 1
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/quartermaster/storage)
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/crew_quarters/heads/chief)
"akP" = (
/obj/machinery/photocopier,
/obj/effect/turf_decal/tile/brown{
@@ -6519,6 +7063,42 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
+"akQ" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/effect/turf_decal/stripes/corner,
+/obj/machinery/conveyor{
+ dir = 5;
+ id = "cargoload"
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/quartermaster/storage)
+"akR" = (
+/obj/structure/cable/white{
+ icon_state = "1-8"
+ },
+/obj/structure/cable/white{
+ icon_state = "2-8"
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/engine/atmos)
+"akS" = (
+/turf/closed/wall/r_wall/rust,
+/area/crew_quarters/heads/chief)
"akT" = (
/obj/structure/sign/warning/electricshock{
pixel_x = -32
@@ -6927,9 +7507,9 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"alE" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/cable/white{
- icon_state = "2-4"
+/obj/structure/filingcabinet/chestdrawer,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -6938,11 +7518,12 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
+/obj/machinery/camera{
+ c_tag = "Chief Engineer's Office"
},
-/turf/open/floor/plasteel,
-/area/quartermaster/storage)
+/mob/living/simple_animal/parrot/Poly,
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/heads/chief)
"alF" = (
/obj/machinery/power/apc{
areastring = "/area/quartermaster/storage";
@@ -6992,20 +7573,8 @@
/turf/open/floor/plasteel,
/area/security/brig)
"alI" = (
-/obj/structure/cable/white{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/security/brig)
+/turf/closed/wall/r_wall,
+/area/crew_quarters/heads/chief)
"alJ" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
@@ -7555,6 +8124,32 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/quartermaster/miningdock)
+"amE" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 6
+ },
+/turf/closed/wall/r_wall,
+/area/crew_quarters/heads/chief)
+"amF" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/structure/table/reinforced,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/item/stamp/ce,
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/heads/chief)
"amG" = (
/obj/structure/table,
/obj/item/clothing/mask/gas,
@@ -7748,6 +8343,24 @@
},
/turf/open/floor/plasteel/dark,
/area/teleporter)
+"amU" = (
+/obj/machinery/computer/card/minor/ce,
+/obj/machinery/keycard_auth{
+ pixel_x = 24;
+ pixel_y = -8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/heads/chief)
"amV" = (
/obj/structure/table/reinforced,
/obj/item/storage/belt/utility,
@@ -7987,6 +8600,44 @@
/obj/structure/sign/warning/vacuum,
/turf/open/floor/plating,
/area/quartermaster/miningdock)
+"anu" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/command/glass{
+ name = "Chief Engineer";
+ req_access_txt = "56"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/heads/chief)
+"anv" = (
+/obj/effect/turf_decal/stripes/end{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow,
+/turf/open/floor/plasteel,
+/area/crew_quarters/heads/chief)
+"anw" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow,
+/turf/open/floor/plasteel,
+/area/crew_quarters/heads/chief)
"anx" = (
/obj/structure/grille,
/turf/closed/wall/r_wall,
@@ -8028,44 +8679,26 @@
/turf/open/floor/plasteel,
/area/security/brig)
"anA" = (
-/obj/machinery/button/door{
- desc = "A remote control switch for the medbay foyer.";
- id = "secexterior";
- name = "Security Exterior Doors Control";
- normaldoorcontrol = 1;
- pixel_x = 38;
- pixel_y = 24
- },
-/obj/machinery/button/door{
- desc = "A remote control switch for the medbay foyer.";
- id = "secinterior";
- name = "Security Interior Doors Control";
- normaldoorcontrol = 1;
- pixel_x = 24;
- pixel_y = 24
- },
-/obj/machinery/button/door{
- id = "brigfront";
- name = "Brig Access Control";
- pixel_x = 24;
- pixel_y = 38;
- req_access_txt = "63"
- },
/obj/structure/chair/office/dark{
- dir = 4
+ dir = 1
},
-/obj/machinery/light_switch{
- pixel_x = 38;
- pixel_y = 38
+/obj/effect/landmark/start/chief_engineer,
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
},
-/obj/effect/landmark/start/security_officer,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 4
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow,
+/obj/machinery/requests_console{
+ announcementConsole = 1;
+ department = "Chief Engineer's Desk";
+ departmentType = 3;
+ name = "Chief Engineer RC";
+ pixel_x = 32
},
/turf/open/floor/plasteel,
-/area/security/brig)
+/area/crew_quarters/heads/chief)
"anB" = (
/obj/machinery/door/firedoor,
/obj/structure/table/reinforced,
@@ -8176,6 +8809,25 @@
},
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/restrooms)
+"anK" = (
+/obj/structure/closet/secure_closet/engineering_chief,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/item/radio/intercom{
+ name = "Station Intercom";
+ pixel_x = -26
+ },
+/obj/item/twohanded/rcl/pre_loaded,
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/heads/chief)
"anL" = (
/obj/machinery/door/window/northleft{
dir = 4;
@@ -8208,6 +8860,18 @@
/obj/item/beacon,
/turf/open/floor/plasteel,
/area/teleporter)
+"anO" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/holopad,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow,
+/turf/open/floor/plasteel,
+/area/crew_quarters/heads/chief)
"anP" = (
/obj/machinery/teleport/station,
/obj/machinery/light{
@@ -8505,6 +9169,68 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
+"aon" = (
+/obj/item/twohanded/required/kirbyplants{
+ icon_state = "plant-21"
+ },
+/obj/structure/cable/white{
+ icon_state = "0-2"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow,
+/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/heads/chief";
+ dir = 4;
+ name = "Chief Engineer's Office APC";
+ pixel_x = 26
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/heads/chief)
+"aoo" = (
+/obj/machinery/suit_storage_unit/ce,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/airalarm{
+ dir = 4;
+ pixel_x = -23
+ },
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/heads/chief)
+"aop" = (
+/obj/effect/landmark/start/chief_engineer,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow,
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_x = -32;
+ pixel_y = -26
+ },
+/obj/machinery/computer/security/telescreen/ce{
+ dir = 1;
+ icon_state = "telescreen";
+ pixel_y = -24
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/heads/chief)
"aoq" = (
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
@@ -9137,6 +9863,22 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
+"apo" = (
+/obj/structure/cable/white{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow,
+/turf/open/floor/plasteel,
+/area/crew_quarters/heads/chief)
"app" = (
/obj/docking_port/stationary{
dir = 4;
@@ -9149,6 +9891,108 @@
},
/turf/open/space/basic,
/area/space)
+"apq" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/delivery,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/extinguisher_cabinet{
+ pixel_x = 8;
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/heads/chief)
+"apr" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/airlock/command/glass{
+ name = "Chief Engineer";
+ req_access_txt = "56"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/heads/chief)
+"aps" = (
+/obj/structure/cable/white{
+ icon_state = "2-4"
+ },
+/obj/machinery/button/door{
+ id = "engstorage";
+ name = "Engineering Secure Storage Control";
+ pixel_y = 24;
+ req_access_txt = "10"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
+ },
+/turf/open/floor/engine,
+/area/engine/engineering)
+"apt" = (
+/obj/structure/cable/white{
+ icon_state = "1-8"
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"apu" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/sign/departments/custodian{
+ pixel_x = 32;
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/port/aft)
"apv" = (
/obj/machinery/air_sensor/atmos/mix_tank,
/turf/open/floor/engine/vacuum,
@@ -15091,25 +15935,6 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
-"aAw" = (
-/obj/structure/cable/white{
- icon_state = "1-8"
- },
-/obj/structure/cable/white{
- icon_state = "2-8"
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/engine/atmos)
"aAx" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/obj/effect/turf_decal/tile/neutral{
@@ -18339,12 +19164,6 @@
"aGe" = (
/turf/closed/wall/r_wall,
/area/engine/gravity_generator)
-"aGf" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 6
- },
-/turf/closed/wall/r_wall,
-/area/engine/engineering)
"aGg" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -18907,27 +19726,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall/r_wall,
/area/engine/engineering)
-"aHi" = (
-/obj/structure/cable/white{
- icon_state = "2-4"
- },
-/obj/machinery/button/door{
- id = "engstorage";
- name = "Engineering Secure Storage Control";
- pixel_y = 24;
- req_access_txt = "10"
- },
-/obj/item/twohanded/required/kirbyplants{
- icon_state = "plant-21"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 6
- },
-/turf/open/floor/engine,
-/area/engine/engineering)
"aHj" = (
/obj/structure/cable/white{
icon_state = "4-8"
@@ -20945,25 +21743,6 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
-"aKJ" = (
-/obj/structure/cable/white{
- icon_state = "1-8"
- },
-/obj/structure/cable/white{
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/engine/engineering)
"aKK" = (
/obj/structure/table/reinforced,
/obj/structure/cable/white{
@@ -22621,10 +23400,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
-"aOe" = (
-/obj/structure/sign/nanotrasen,
-/turf/closed/wall,
-/area/janitor)
"aOf" = (
/obj/machinery/door/airlock{
name = "Custodial Closet";
@@ -22968,19 +23743,6 @@
heat_capacity = 1e+006
},
/area/hallway/primary/port/aft)
-"aOQ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/cable/white{
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/port/aft)
"aOR" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
@@ -24726,13 +25488,6 @@
/obj/item/storage/pill_bottle/mutadone,
/turf/open/floor/plasteel,
/area/medical/chemistry)
-"aSm" = (
-/obj/structure/chair/office/light{
- dir = 1
- },
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel,
-/area/medical/chemistry)
"aSn" = (
/obj/machinery/chem_dispenser,
/obj/machinery/button/door{
@@ -25686,16 +26441,6 @@
},
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
-"aUm" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/medical/morgue)
"aUn" = (
/obj/effect/spawner/structure/window/reinforced/tinted,
/turf/open/floor/plating,
@@ -25758,22 +26503,6 @@
},
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
-"aUu" = (
-/obj/structure/cable/white{
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/medical/chemistry)
"aUv" = (
/obj/machinery/holopad,
/obj/structure/cable/white{
@@ -27498,22 +28227,6 @@
},
/turf/open/floor/plasteel/white,
/area/science/research)
-"aXD" = (
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
-/obj/structure/cable/white{
- icon_state = "1-2"
- },
-/obj/structure/cable/white{
- icon_state = "1-8"
- },
-/obj/structure/cable/white{
- icon_state = "1-4"
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
-/turf/open/floor/plasteel/white,
-/area/science/research)
"aXE" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -27783,23 +28496,6 @@
},
/turf/open/floor/plasteel,
/area/medical/medbay/zone3)
-"aXY" = (
-/obj/structure/cable/white{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/medical/medbay/zone3)
"aXZ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/closet/crate/bin,
@@ -28710,21 +29406,6 @@
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/zone3)
-"aZE" = (
-/obj/structure/cable/white{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/zone3)
"aZF" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass{
@@ -28785,31 +29466,6 @@
},
/turf/open/floor/plasteel,
/area/medical/medbay/zone3)
-"aZJ" = (
-/obj/structure/cable/white{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/structure/cable/white{
- icon_state = "2-8"
- },
-/obj/structure/cable/white{
- icon_state = "2-4"
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/medical/medbay/zone3)
"aZK" = (
/obj/machinery/holopad,
/obj/structure/cable/white{
@@ -29423,20 +30079,6 @@
},
/turf/open/floor/plasteel,
/area/medical/medbay/zone3)
-"baE" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/medical/medbay/zone3)
"baF" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/tile/blue,
@@ -36079,12 +36721,6 @@
},
/turf/closed/wall/r_wall/rust,
/area/tcommsat/server)
-"bwX" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 6
- },
-/turf/closed/wall/r_wall,
-/area/engine/gravity_generator)
"bwY" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -36438,70 +37074,6 @@
"bye" = (
/turf/closed/wall/rust,
/area/maintenance/fore)
-"byf" = (
-/obj/structure/sign/warning/vacuum,
-/turf/closed/wall,
-/area/maintenance/starboard/fore)
-"byg" = (
-/obj/structure/closet/emcloset/anchored,
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel,
-/area/maintenance/starboard/fore)
-"byi" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/plating{
- icon_state = "panelscorched"
- },
-/area/maintenance/starboard/fore)
-"byj" = (
-/obj/machinery/door/airlock/external{
- name = "External Airlock";
- req_access_txt = "13"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/maintenance/starboard/fore)
-"byk" = (
-/obj/effect/decal/cleanable/blood/old,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
- },
-/obj/effect/landmark/xeno_spawn,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel,
-/area/maintenance/starboard/fore)
-"byl" = (
-/obj/machinery/door/airlock/external{
- name = "External Airlock";
- req_access_txt = "13"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/maintenance/starboard/fore)
"bym" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable/white{
@@ -36734,17 +37306,6 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
-"cKy" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable/white{
- icon_state = "0-2"
- },
-/obj/structure/cable/white,
-/obj/structure/cable/white{
- icon_state = "2-8"
- },
-/turf/open/floor/plating,
-/area/ai_monitored/nuke_storage)
"cRz" = (
/obj/machinery/button/door{
id = "supplybridge";
@@ -39036,10 +39597,6 @@
/obj/structure/flora/ausbushes/grassybush,
/turf/open/floor/grass,
/area/hallway/secondary/entry)
-"pEH" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plating,
-/area/asteroid/nearstation)
"pHH" = (
/obj/machinery/light,
/obj/machinery/atmospherics/components/binary/valve{
@@ -39463,9 +40020,6 @@
"swz" = (
/turf/closed/wall/r_wall/rust,
/area/crew_quarters/heads/hop)
-"swA" = (
-/turf/closed/wall/rust,
-/area/maintenance/starboard/fore)
"swC" = (
/turf/closed/wall/r_wall/rust,
/area/crew_quarters/heads/captain/private)
@@ -40212,12 +40766,6 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
-"sIA" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/barricade/wooden,
-/obj/effect/turf_decal/sand/plating,
-/turf/open/floor/plating,
-/area/engine/engineering)
"sIB" = (
/turf/closed/wall/rust,
/area/hydroponics)
@@ -70939,8 +71487,8 @@ tgp
dgV
fYx
aCG
-pEH
-pEH
+ajX
+ajX
qpG
uBJ
aIb
@@ -71196,8 +71744,8 @@ oCy
orI
xyo
hNO
-aad
-acF
+aaW
+abu
aGe
aId
aIc
@@ -71453,8 +72001,8 @@ anx
anx
anx
uok
-aad
-aad
+akM
+abu
aGe
aHg
aId
@@ -71709,9 +72257,9 @@ uSs
xIm
rVj
aAg
-uok
-aad
-aad
+akN
+akO
+anu
aGe
aGe
sIu
@@ -71966,11 +72514,11 @@ eva
aqA
qsc
lUu
-uok
-aad
-aad
-afL
-afM
+akN
+alE
+anv
+anK
+aoo
aGe
aJk
aKt
@@ -72223,12 +72771,12 @@ uSs
xIm
mgs
aAg
-uok
-abi
-aad
-abT
-agE
-bwX
+akN
+amF
+anw
+anO
+aop
+aGe
aJl
aKu
aLI
@@ -72480,11 +73028,11 @@ vVA
anx
anx
anx
-uok
-aad
-aad
-abu
-afL
+akN
+amU
+anA
+aon
+apo
sII
aJm
aKv
@@ -72737,11 +73285,11 @@ dFV
aAh
aBp
awA
-uok
-sHV
-aEt
-aEt
-abu
+akN
+akS
+alI
+alI
+apq
bwY
aJn
aKw
@@ -72997,8 +73545,8 @@ aCs
uok
aEn
aFq
-aGf
-sIA
+amE
+apr
aIe
abQ
aKx
@@ -73255,7 +73803,7 @@ uok
aEo
aFr
aGg
-aHi
+aps
aIf
aJp
aKy
@@ -76312,7 +76860,7 @@ aad
aad
aad
afL
-ahu
+agF
agF
agF
swZ
@@ -76569,7 +77117,7 @@ aad
aad
abT
agE
-sxc
+swZ
aim
aiR
ajR
@@ -76826,12 +77374,12 @@ aad
aad
afL
abj
-sxc
+swZ
ain
aiS
ajS
akU
-alI
+aid
amI
anz
aot
@@ -77083,14 +77631,14 @@ aad
aad
afM
aaV
-ahu
+agF
aio
aiT
ajT
akV
alJ
amJ
-anA
+aig
aou
akV
aqK
@@ -77103,7 +77651,7 @@ aqz
axv
ayn
azu
-aAw
+akR
aBE
aCI
aDx
@@ -77113,7 +77661,7 @@ aGq
aHx
aIt
aJC
-aKJ
+apt
aLZ
aNb
aEt
@@ -78114,7 +78662,7 @@ agF
ahx
ais
aiX
-ajX
+agm
akY
alN
amM
@@ -78425,11 +78973,11 @@ baj
aad
aad
aad
-abT
-abT
-swN
-abT
-abT
+bfu
+bfu
+sLf
+bfu
+bfu
aad
aad
aad
@@ -79173,7 +79721,7 @@ bxP
geZ
aNi
anH
-aOQ
+apu
aPY
aQY
aSa
@@ -79389,14 +79937,14 @@ aad
aad
aad
aad
-abT
-abT
-abT
-swN
-swN
-abT
-abT
-swN
+abv
+abv
+abv
+swG
+swG
+abv
+abv
+swG
agF
ajc
ajc
@@ -79429,7 +79977,7 @@ aIB
aIB
aIB
aIB
-aOe
+aIB
aOR
aPZ
aQZ
@@ -80977,14 +81525,14 @@ aQe
aRe
aSg
aTl
-aUm
+ail
aVe
aWa
aWJ
aSh
aXQ
aYI
-aZE
+ajG
bav
aSh
bce
@@ -82269,7 +82817,7 @@ aRf
aXp
aXU
aYN
-aZJ
+ajN
baA
bbq
bbq
@@ -83033,7 +83581,7 @@ aQg
aRh
aSl
aTs
-aUu
+aiJ
aVl
aWh
aRh
@@ -83288,17 +83836,17 @@ aOj
aPf
aQj
aRi
-aSm
+aij
aTt
aUv
aVm
aWi
aWN
aXt
-aXY
+aiQ
aYR
aZN
-baE
+ajO
bbt
bcj
bdb
@@ -85559,7 +86107,7 @@ swy
abF
ack
adc
-cKy
+adP
aeE
afr
afr
@@ -88177,7 +88725,7 @@ aUF
aVy
aWq
aWq
-aXD
+aiP
aYo
aZg
aZZ
@@ -88636,9 +89184,9 @@ aaa
aae
aaa
aaa
-aad
-aah
-aad
+aac
+abL
+bxZ
swz
abs
abs
@@ -88892,13 +89440,13 @@ aaa
aaa
aae
aad
-aad
-aad
-aad
-aad
-swA
-abL
+aac
+bvg
+abM
acu
+adt
+adM
+aef
adm
bxw
bym
@@ -89151,11 +89699,11 @@ aah
aad
aad
aad
-aad
-aad
bxZ
-abM
-byi
+adq
+bxZ
+adY
+aei
adn
adn
adn
@@ -89408,14 +89956,14 @@ aad
aad
aad
aad
-aad
-aad
bxZ
-byf
-byj
-adn
-adZ
-aeP
+bxZ
+adu
+adu
+aej
+adu
+aeV
+afa
afC
agv
ahk
@@ -89667,19 +90215,19 @@ aac
aad
aad
aad
-swA
-byg
-byk
-adn
-aea
+ady
+adZ
+aek
aeQ
+aeW
+aeW
+afc
+afD
+afJ
+afK
+afO
afD
agw
-ajI
-aid
-aiJ
-agw
-afE
afE
amw
anm
@@ -89924,19 +90472,19 @@ aad
aad
aad
aad
-bxZ
-byf
-byl
-swL
-aed
-aeT
-afE
-agx
+adu
+aea
+aen
+aeR
+aeY
ahl
+ahm
+ahn
+aih
ado
aiK
agx
-afF
+agy
alB
amx
ado
@@ -90181,19 +90729,19 @@ aaa
aad
aad
aad
-bvg
-bvg
-bvg
-adn
+adu
+aeb
+aeP
+adu
aec
aeS
afF
agx
-ahm
+aii
adp
aiL
ajJ
-akM
+agD
alC
amy
adn
@@ -90438,19 +90986,19 @@ aaa
aaa
aac
aac
-aac
-bvg
-aad
-adn
+adu
+adu
+adu
+adu
aed
aeT
afG
agz
-ahn
+akQ
aie
aiM
ajK
-akN
+ahs
alD
amz
ann
@@ -90707,8 +91255,8 @@ aho
aif
aiN
ajL
-akO
-alE
+aht
+ahW
amA
ano
aog
@@ -91522,7 +92070,7 @@ aad
hns
xLe
hVE
-sPq
+ajP
hVE
pXH
sVt
diff --git a/code/__DEFINES/time.dm b/code/__DEFINES/time.dm
index af618cf828..9233a69108 100644
--- a/code/__DEFINES/time.dm
+++ b/code/__DEFINES/time.dm
@@ -18,6 +18,7 @@
#define VALENTINES "Valentine's Day"
#define APRIL_FOOLS "April Fool's Day"
#define EASTER "Easter"
+#define PRIDE_MONTH "Pride Month"
#define HALLOWEEN "Halloween"
#define CHRISTMAS "Christmas"
#define FESTIVE_SEASON "Festive Season"
diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index e0714a87b3..e62bcc6738 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -216,6 +216,7 @@
"ipc_screen" = snowflake_ipc_antenna_list ? pick(snowflake_ipc_antenna_list) : "None",
"ipc_antenna" = "None",
"flavor_text" = "",
+ "silicon_flavor_text" = "",
"meat_type" = "Mammalian",
"body_model" = body_model,
"body_size" = RESIZE_DEFAULT_SIZE
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index 86aff44e02..8c9a3636c8 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -694,15 +694,12 @@
..()
var/suited = !preference_source || preference_source.prefs.jumpsuit_style == PREF_SUIT
if (CONFIG_GET(flag/grey_assistants))
- if(suited)
- uniform = /obj/item/clothing/under/color/grey
- else
- uniform = /obj/item/clothing/under/color/jumpskirt/grey
+ uniform = suited ? /obj/item/clothing/under/color/grey : /obj/item/clothing/under/color/jumpskirt/grey
else
- if(suited)
- uniform = /obj/item/clothing/under/color/random
+ if(SSevents.holidays && SSevents.holidays[PRIDE_MONTH])
+ uniform = suited ? /obj/item/clothing/under/color/rainbow : /obj/item/clothing/under/color/jumpskirt/rainbow
else
- uniform = /obj/item/clothing/under/color/jumpskirt/random
+ uniform = suited ? /obj/item/clothing/under/color/random : /obj/item/clothing/under/color/jumpskirt/random
/obj/item/storage/box/syndie_kit/chameleon/ghostcafe
name = "ghost cafe costuming kit"
diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm
index 06cd38a4c3..2f4e2e0eee 100644
--- a/code/game/turfs/simulated/floor/fancy_floor.dm
+++ b/code/game/turfs/simulated/floor/fancy_floor.dm
@@ -157,7 +157,7 @@
planetary_atmos = TRUE
floor_tile = null
initial_gas_mix = FROZEN_ATMOS
- slowdown = 2
+ slowdown = 1.5 //So digging it out paths are usefull.
bullet_sizzle = TRUE
footstep = FOOTSTEP_SAND
barefootstep = FOOTSTEP_SAND
diff --git a/code/modules/antagonists/clockcult/clock_helpers/clock_powerdrain.dm b/code/modules/antagonists/clockcult/clock_helpers/clock_powerdrain.dm
index 7658f7e715..1d65cf9209 100644
--- a/code/modules/antagonists/clockcult/clock_helpers/clock_powerdrain.dm
+++ b/code/modules/antagonists/clockcult/clock_helpers/clock_powerdrain.dm
@@ -1,21 +1,31 @@
//horrifying power drain proc made for clockcult's power drain in lieu of six istypes or six for(x in view) loops
-/atom/movable/proc/power_drain(clockcult_user)
+/atom/movable/proc/power_drain(clockcult_user, drain_weapons = FALSE) //This proc as of now is only in use for void volt
var/obj/item/stock_parts/cell/cell = get_cell()
if(cell)
return cell.power_drain(clockcult_user)
- return 0
+ return 0 //Returns 0 instead of FALSE to symbolise it returning the power amount in other cases, not TRUE aka 1
-/obj/item/melee/baton/power_drain(clockcult_user) //balance memes
- return 0
+/obj/item/melee/baton/power_drain(clockcult_user, drain_weapons = FALSE) //balance memes
+ if(!drain_weapons)
+ return 0
+ return ..()
-/obj/item/gun/power_drain(clockcult_user) //balance memes
- return 0
+/obj/item/gun/power_drain(clockcult_user, drain_weapons = FALSE) //balance memes
+ if(!drain_weapons)
+ return 0
+ var/obj/item/stock_parts/cell/cell = get_cell()
+ if(!cell)
+ return 0
+ if(cell.charge)
+ . = min(cell.charge, MIN_CLOCKCULT_POWER*4) //Done snowflakey because guns have far smaller cells than batons / other equipment
+ cell.use(.)
+ update_icon()
-/obj/machinery/power/apc/power_drain(clockcult_user)
+/obj/machinery/power/apc/power_drain(clockcult_user, drain_weapons = FALSE)
if(cell && cell.charge)
playsound(src, "sparks", 50, 1)
flick("apc-spark", src)
- . = min(cell.charge, MIN_CLOCKCULT_POWER*3)
+ . = min(cell.charge, MIN_CLOCKCULT_POWER*4)
cell.use(.) //Better than a power sink!
if(!cell.charge && !shorted)
shorted = 1
@@ -23,9 +33,9 @@
update()
update_icon()
-/obj/machinery/power/smes/power_drain(clockcult_user)
+/obj/machinery/power/smes/power_drain(clockcult_user, drain_weapons = FALSE)
if(charge)
- . = min(charge, MIN_CLOCKCULT_POWER*3)
+ . = min(charge, MIN_CLOCKCULT_POWER*4)
charge -= . * 50
if(!charge && !panel_open)
panel_open = TRUE
@@ -34,19 +44,19 @@
visible_message("[src]'s panel flies open with a flurry of sparks!")
update_icon()
-/obj/item/stock_parts/cell/power_drain(clockcult_user)
+/obj/item/stock_parts/cell/power_drain(clockcult_user, drain_weapons = FALSE)
if(charge)
- . = min(charge, MIN_CLOCKCULT_POWER*3)
- charge = use(.)
+ . = min(charge, MIN_CLOCKCULT_POWER * 4) //Done like this because normal cells are usually quite a bit bigger than the ones used in guns / APCs
+ use(min(charge, . * 10)) //Usually cell-powered equipment that is not a gun has at least ten times the capacity of a gun / 5 times the amount of an APC. This adjusts the drain to account for that.
update_icon()
-/mob/living/silicon/robot/power_drain(clockcult_user)
+/mob/living/silicon/robot/power_drain(clockcult_user, drain_weapons = FALSE)
if((!clockcult_user || !is_servant_of_ratvar(src)) && cell && cell.charge)
. = min(cell.charge, MIN_CLOCKCULT_POWER*4)
cell.use(.)
spark_system.start()
-/obj/mecha/power_drain(clockcult_user)
+/obj/mecha/power_drain(clockcult_user, drain_weapons = FALSE)
if((!clockcult_user || (occupant && !is_servant_of_ratvar(occupant))) && cell && cell.charge)
. = min(cell.charge, MIN_CLOCKCULT_POWER*4)
cell.use(.)
diff --git a/code/modules/antagonists/clockcult/clock_scripture.dm b/code/modules/antagonists/clockcult/clock_scripture.dm
index 16d251fe92..1ebefe4d05 100644
--- a/code/modules/antagonists/clockcult/clock_scripture.dm
+++ b/code/modules/antagonists/clockcult/clock_scripture.dm
@@ -203,6 +203,10 @@ Applications: 8 servants, 3 caches, and 100 CV
if(!do_after(invoker, chant_interval, target = invoker, extra_checks = CALLBACK(src, .proc/can_recite)))
break
clockwork_say(invoker, text2ratvar(pick(chant_invocations)), whispered)
+ if(multiple_invokers_used)
+ for(var/mob/living/L in range(1, get_turf(invoker)))
+ if(can_recite_scripture(L) && L != invoker)
+ clockwork_say(L, text2ratvar(pick(chant_invocations)), whispered)
if(!chant_effects(i))
break
if(invoker && slab)
diff --git a/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm b/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm
index 9d5118e393..d22a2f69b7 100644
--- a/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm
+++ b/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm
@@ -115,7 +115,7 @@
tier = SCRIPTURE_SCRIPT
space_allowed = TRUE
primary_component = VANGUARD_COGWHEEL
- sort_priority = 5
+ sort_priority = 6
quickbind = TRUE
quickbind_desc = "Creates a Ratvarian shield, which can absorb energy from attacks for use in powerful bashes."
@@ -131,7 +131,7 @@
usage_tip = "Throwing the spear at a mob will do massive damage and knock them down, but break the spear. You will need to wait for 30 seconds before resummoning it."
tier = SCRIPTURE_SCRIPT
primary_component = VANGUARD_COGWHEEL
- sort_priority = 6
+ sort_priority = 7
important = TRUE
quickbind = TRUE
quickbind_desc = "Permanently binds clockwork armor and a Ratvarian spear to you."
@@ -231,7 +231,7 @@
usage_tip = "This gateway is strictly one-way and will only allow things through the invoker's portal."
tier = SCRIPTURE_SCRIPT
primary_component = GEIS_CAPACITOR
- sort_priority = 7
+ sort_priority = 9
quickbind = TRUE
quickbind_desc = "Allows you to create a one-way Spatial Gateway to a living Servant or Clockwork Obelisk."
@@ -276,7 +276,7 @@
usage_tip = "This is a very effective way to rapidly reinforce a base after an attack."
tier = SCRIPTURE_SCRIPT
primary_component = VANGUARD_COGWHEEL
- sort_priority = 7
+ sort_priority = 8
quickbind = TRUE
quickbind_desc = "Repairs nearby structures and constructs. Servants wearing clockwork armor will also be healed.
Maximum 10 chants."
var/heal_attempts = 4
@@ -388,8 +388,8 @@
power_cost = 500
usage_tip = "Though it requires you to stand still, this scripture can do massive damage."
tier = SCRIPTURE_SCRIPT
- primary_component = HIEROPHANT_ANSIBLE
- sort_priority = 10
+ primary_component = BELLIGERENT_EYE
+ sort_priority = 5
quickbind = TRUE
quickbind_desc = "Allows you to fire energy rays at target locations.
Maximum 5 chants."
var/static/list/nzcrentr_insults = list("You're not very good at aiming.", "You hunt badly.", "What a waste of energy.", "Almost funny to watch.",
@@ -420,3 +420,70 @@
ranged_message = "You charge the clockwork slab with shocking might.\n\
Left-click a target to fire, quickly!"
timeout_time = 20
+
+/datum/clockwork_scripture/channeled/void_volt
+ descname = "Channeled, Power Drain"
+ name = "Void Volt"
+ desc = "A channeled spell that quickly drains any powercells in a radius of eight tiles, but burns the invoker. \
+ Can be channeled with more cultists to increase range and split the caused damage evenly over all invokers. \
+ Also charges clockwork power by a small percentage of the drained power amount, which can help offset this scriptures powercost."
+ invocations = list("Channel their energy through my body... ", "... so it may fuel Engine!")
+ chant_invocations = list("Make their lights fall dark!", "They shall be powerless!", "Rob them of their power!")
+ chant_amount = 20
+ chant_interval = 10 //100KW drain per pulse for guns / APCs / 1MW for other cells = 10 chants / 100ds / 10s to drain a charged weapon or a baton with a nonupgraded cell
+ channel_time = 50
+ power_cost = 300
+ multiple_invokers_used = TRUE
+ multiple_invokers_optional = TRUE
+ usage_tip = "It may be useful to end channelling early if the burning becomes too much to handle.."
+ tier = SCRIPTURE_SCRIPT
+ primary_component = GEIS_CAPACITOR
+ sort_priority = 10
+ quickbind = TRUE
+ quickbind_desc = "Quickly drains power in an area around the invoker, causing burns proportional to the amount of energy drained.
Maximum of 20 chants."
+
+/datum/clockwork_scripture/channeled/void_volt/scripture_effects()
+ invoker.visible_message("[invoker] glows in a brilliant golden light!")
+ invoker.add_atom_colour("#FFD700", ADMIN_COLOUR_PRIORITY)
+ invoker.light_power = 2
+ invoker.light_range = 4
+ invoker.light_color = LIGHT_COLOR_FIRE
+ invoker.update_light()
+ return ..()
+
+
+/datum/clockwork_scripture/channeled/void_volt/chant_effects(chant_number)
+ var/power_drained = 0
+ var/power_mod = 0.005 //Amount of power drained (generally) is multiplied with this, and subsequently dealt in damage to the invoker, then 15 times that is added to the clockwork cult's power reserves.
+ var/drain_range = 8
+ var/additional_chanters = 0
+ var/list/chanters = list()
+ chanters += invoker
+ for(var/mob/living/L in range(1, invoker))
+ if(!L.stat && is_servant_of_ratvar(L))
+ additional_chanters++
+ chanters += L
+ drain_range = min(drain_range + 2 * additional_chanters, drain_range * 2) //s u c c
+ for(var/t in spiral_range_turfs(drain_range, invoker))
+ var/turf/T = t
+ for(var/M in T)
+ var/atom/movable/A = M
+ power_drained += A.power_drain(TRUE, TRUE) //Yes, this absolutely does drain weaponry. 10 pulses to drain guns / batons, though of course they can just be recharged.
+ new /obj/effect/temp_visual/ratvar/sigil/transgression(invoker.loc, 1 + (power_drained * power_mod))
+ var/datum/effect_system/spark_spread/S = new
+ S.set_up(round(1 + (power_drained * power_mod), 1), 0, get_turf(invoker))
+ S.start()
+ adjust_clockwork_power(power_drained * power_mod * 15)
+ for(var/mob/living/L in chanters)
+ L.adjustFireLoss(round(clamp(power_drained * power_mod / (1 + additional_chanters), 0, 20), 0.1)) //No you won't just immediately melt if you do this in a very power-rich area
+
+
+ return TRUE
+
+/datum/clockwork_scripture/channeled/void_volt/chant_end_effects()
+ invoker.visible_message("[invoker] stops glowing...")
+ invoker.remove_atom_colour(ADMIN_COLOUR_PRIORITY)
+ invoker.light_power = 0
+ invoker.light_range = 0
+ invoker.update_light()
+ return ..()
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index ec3656f007..c0ac79e449 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -154,6 +154,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
"ipc_screen" = "Sunburst",
"ipc_antenna" = "None",
"flavor_text" = "",
+ "silicon_flavor_text" = "",
"ooc_notes" = "",
"meat_type" = "Mammalian",
"body_model" = MALE,
@@ -367,6 +368,15 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "[features["flavor_text"]]"
else
dat += "[TextPreview(features["flavor_text"])]...
"
+ dat += "Silicon Flavor Text
"
+ dat += "Set Silicon Examine Text
"
+ if(length(features["silicon_flavor_text"]) <= 40)
+ if(!length(features["silicon_flavor_text"]))
+ dat += "\[...\]"
+ else
+ dat += "[features["silicon_flavor_text"]]"
+ else
+ dat += "[TextPreview(features["silicon_flavor_text"])]...
"
dat += "OOC notes
"
dat += "Set OOC notes
"
var/ooc_notes_len = length(features["ooc_notes"])
@@ -1615,6 +1625,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/msg = stripped_multiline_input(usr, "Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!", "Flavor Text", features["flavor_text"], MAX_FLAVOR_LEN, TRUE)
if(!isnull(msg))
features["flavor_text"] = html_decode(msg)
+
+ if("silicon_flavor_text")
+ var/msg = stripped_multiline_input(usr, "Set the silicon flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!", "Silicon Flavor Text", features["silicon_flavor_text"], MAX_FLAVOR_LEN, TRUE)
+ if(!isnull(msg))
+ features["silicon_flavor_text"] = html_decode(msg)
if("ooc_notes")
var/msg = stripped_multiline_input(usr, "Set always-visible OOC notes related to content preferences. THIS IS NOT FOR CHARACTER DESCRIPTIONS!", "OOC notes", features["ooc_notes"], MAX_FLAVOR_LEN, TRUE)
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index a2da5d1ae2..c173dfa625 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -552,8 +552,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
else //We have no old flavortext, default to new
S["feature_flavor_text"] >> features["flavor_text"]
+
+
+ S["silicon_feature_flavor_text"] >> features["silicon_flavor_text"]
S["feature_ooc_notes"] >> features["ooc_notes"]
+ S["silicon_flavor_text"] >> features["silicon_flavor_text"]
S["vore_flags"] >> vore_flags
S["vore_taste"] >> vore_taste
@@ -678,6 +682,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
features["flavor_text"] = copytext(features["flavor_text"], 1, MAX_FLAVOR_LEN)
+ features["silicon_flavor_text"] = copytext(features["silicon_flavor_text"], 1, MAX_FLAVOR_LEN)
features["ooc_notes"] = copytext(features["ooc_notes"], 1, MAX_FLAVOR_LEN)
joblessrole = sanitize_integer(joblessrole, 1, 3, initial(joblessrole))
diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm
index 68001db517..d63e011f5b 100644
--- a/code/modules/holiday/holidays.dm
+++ b/code/modules/holiday/holidays.dm
@@ -412,6 +412,15 @@
begin_month = JUNE
begin_weekday = SUNDAY
+/datum/holiday/pride
+ name = PRIDE_MONTH
+ begin_day = 1
+ begin_month = JUNE
+ end_day = 30
+
+/datum/holiday/pride/getStationPrefix()
+ return pick("Pride", "Gay", "Bi", "Trans", "Lesbian", "Ace", "Aro", "Agender", pick("Enby", "Enbie"), "Pan", "Intersex", "Demi", "Poly", "Closeted", "Genderfluid")
+
/datum/holiday/moth
name = "Moth Week"
diff --git a/code/modules/instruments/instruments/item.dm b/code/modules/instruments/instruments/item.dm
index dde35a9f75..0141a4baee 100644
--- a/code/modules/instruments/instruments/item.dm
+++ b/code/modules/instruments/instruments/item.dm
@@ -69,7 +69,7 @@
/obj/item/instrument/dropped(mob/user)
. = ..()
if((loc != user) && (user.machine == src))
- user.set_machine(null)
+ user.unset_machine()
/obj/item/instrument/interact(mob/user)
ui_interact(user)
diff --git a/code/modules/instruments/instruments/stationary.dm b/code/modules/instruments/instruments/stationary.dm
index f236927c38..f54132984f 100644
--- a/code/modules/instruments/instruments/stationary.dm
+++ b/code/modules/instruments/instruments/stationary.dm
@@ -24,6 +24,7 @@
/obj/structure/musician/ui_interact(mob/user)
. = ..()
+ user.set_machine(src)
song.ui_interact(user)
/obj/structure/musician/wrench_act(mob/living/user, obj/item/I)
diff --git a/code/modules/instruments/songs/_song.dm b/code/modules/instruments/songs/_song.dm
index 0fb4418a30..463398d2f2 100644
--- a/code/modules/instruments/songs/_song.dm
+++ b/code/modules/instruments/songs/_song.dm
@@ -223,8 +223,6 @@
/// Updates the window for our user. Override in subtypes.
/datum/song/proc/updateDialog(mob/user = usr)
- if(user.machine != src)
- return
ui_interact(user)
/datum/song/process(wait)
diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm
index 91b3a3f581..b8fc963989 100644
--- a/code/modules/jobs/job_types/assistant.dm
+++ b/code/modules/jobs/job_types/assistant.dm
@@ -35,12 +35,9 @@ Assistant
..()
var/suited = !preference_source || preference_source.prefs.jumpsuit_style == PREF_SUIT
if (CONFIG_GET(flag/grey_assistants))
- if(suited)
- uniform = /obj/item/clothing/under/color/grey
- else
- uniform = /obj/item/clothing/under/color/jumpskirt/grey
+ uniform = suited ? /obj/item/clothing/under/color/grey : /obj/item/clothing/under/color/jumpskirt/grey
else
- if(suited)
- uniform = /obj/item/clothing/under/color/random
+ if(SSevents.holidays && SSevents.holidays[PRIDE_MONTH])
+ uniform = suited ? /obj/item/clothing/under/color/rainbow : /obj/item/clothing/under/color/jumpskirt/rainbow
else
- uniform = /obj/item/clothing/under/color/jumpskirt/random
+ uniform = suited ? /obj/item/clothing/under/color/random : /obj/item/clothing/under/color/jumpskirt/random
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index bf693d70b6..59dfcd3003 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -93,6 +93,7 @@
return new storage_type(src)
/obj/item/robot_module/proc/add_module(obj/item/I, nonstandard, requires_rebuild)
+ rad_flags |= RAD_NO_CONTAMINATE
if(istype(I, /obj/item/stack))
var/obj/item/stack/S = I
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 0d0f7f9c97..173db6f69b 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -56,6 +56,12 @@
diag_hud_set_status()
diag_hud_set_health()
+/mob/living/silicon/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/flavor_text, _name = "Silicon Flavor Text", _save_key = "silicon_flavor_text")
+ AddElement(/datum/element/flavor_text, "", "Temporary Flavor Text", "This should be used only for things pertaining to the current round!")
+ AddElement(/datum/element/flavor_text, _name = "OOC Notes", _addendum = "Put information on ERP/vore/lewd-related preferences here. THIS SHOULD NOT CONTAIN REGULAR FLAVORTEXT!!", _always_show = TRUE, _save_key = "ooc_notes", _examine_no_preview = TRUE)
+
/mob/living/silicon/med_hud_set_health()
return //we use a different hud
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index 38aafc665f..4cf50cd072 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -326,19 +326,18 @@
var/datum/reagent/R = addiction
if(C && R)
R.addiction_stage++
- switch(R.addiction_stage)
- if(1 to R.addiction_stage1_end)
- need_mob_update += R.addiction_act_stage1(C)
- if(R.addiction_stage1_end to R.addiction_stage2_end)
- need_mob_update += R.addiction_act_stage2(C)
- if(R.addiction_stage2_end to R.addiction_stage3_end)
- need_mob_update += R.addiction_act_stage3(C)
- if(R.addiction_stage3_end to R.addiction_stage4_end)
- need_mob_update += R.addiction_act_stage4(C)
- if(R.addiction_stage4_end to INFINITY)
- remove_addiction(R)
- else
- SEND_SIGNAL(C, COMSIG_CLEAR_MOOD_EVENT, "[R.type]_overdose")
+ if(1 <= R.addiction_stage && R.addiction_stage <= R.addiction_stage1_end)
+ need_mob_update += R.addiction_act_stage1(C)
+ else if(R.addiction_stage1_end < R.addiction_stage && R.addiction_stage <= R.addiction_stage2_end)
+ need_mob_update += R.addiction_act_stage2(C)
+ else if(R.addiction_stage2_end < R.addiction_stage && R.addiction_stage <= R.addiction_stage3_end)
+ need_mob_update += R.addiction_act_stage3(C)
+ else if(R.addiction_stage3_end < R.addiction_stage && R.addiction_stage <= R.addiction_stage4_end)
+ need_mob_update += R.addiction_act_stage4(C)
+ else if(R.addiction_stage4_end < R.addiction_stage)
+ remove_addiction(R)
+ else
+ SEND_SIGNAL(C, COMSIG_CLEAR_MOOD_EVENT, "[R.type]_overdose")
addiction_tick++
if(C && need_mob_update) //some of the metabolized reagents had effects on the mob that requires some updates.
C.updatehealth()
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index 287d9492fb..584a0a189a 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -66,7 +66,6 @@
toolspeed = 0.5
attack_verb = list("attacked", "pinched")
-
/obj/item/cautery
name = "cautery"
desc = "This stops bleeding."
@@ -91,7 +90,6 @@
toolspeed = 0.5
attack_verb = list("burnt")
-
/obj/item/surgicaldrill
name = "surgical drill"
desc = "You can drill using this item. You dig?"
@@ -148,7 +146,6 @@
toolspeed = 0.5
attack_verb = list("drilled")
-
/obj/item/scalpel
name = "scalpel"
desc = "Cut, cut, and once more cut."
@@ -229,7 +226,6 @@
user.visible_message("[user] is slitting [user.p_their()] [pick("wrists", "throat", "stomach")] with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
return (BRUTELOSS)
-
/obj/item/circular_saw
name = "circular saw"
desc = "For heavy duty cutting."
diff --git a/modular_citadel/code/modules/client/preferences_savefile.dm b/modular_citadel/code/modules/client/preferences_savefile.dm
index d0363d228f..c747c4cf32 100644
--- a/modular_citadel/code/modules/client/preferences_savefile.dm
+++ b/modular_citadel/code/modules/client/preferences_savefile.dm
@@ -35,4 +35,5 @@
WRITE_FILE(S["feature_xeno_head"], features["xenohead"])
//flavor text
WRITE_FILE(S["feature_flavor_text"], features["flavor_text"])
+ WRITE_FILE(S["silicon_feature_flavor_text"], features["silicon_flavor_text"])