diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/engine_teg.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/engine_teg.dmm
index f8d701debe..2d66300953 100644
--- a/_maps/RandomRuins/StationRuins/Box/Engine/engine_teg.dmm
+++ b/_maps/RandomRuins/StationRuins/Box/Engine/engine_teg.dmm
@@ -71,8 +71,9 @@
/turf/closed/wall/r_wall,
/area/engine/engineering)
"di" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall,
+/obj/structure/reagent_dispensers/fueltank,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
/area/engine/engineering)
"dl" = (
/obj/structure/cable{
@@ -304,12 +305,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
/turf/open/floor/plasteel,
/area/engine/engineering)
"kH" = (
@@ -523,6 +518,9 @@
/obj/machinery/light{
dir = 4
},
+/obj/structure/sign/warning/enginesafety{
+ pixel_x = 32
+ },
/turf/open/floor/plasteel,
/area/engine/engineering)
"qv" = (
@@ -543,7 +541,13 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
/area/engine/engineering)
"qN" = (
/obj/structure/table/reinforced,
@@ -848,6 +852,10 @@
/obj/machinery/igniter{
id = "TEG_igniter"
},
+/mob/living/carbon/monkey{
+ name = "Mumkey Jones"
+ },
+/obj/item/clothing/head/hardhat/atmos,
/turf/open/floor/engine/vacuum,
/area/engine/engineering)
"An" = (
@@ -882,14 +890,6 @@
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 1
},
-/obj/machinery/camera{
- c_tag = "TEG - North Center";
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/plasteel,
/area/engine/engineering)
"AX" = (
@@ -1042,12 +1042,6 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
-"EI" = (
-/obj/effect/turf_decal/delivery,
-/obj/structure/reagent_dispensers/fueltank,
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/turf/open/floor/plasteel,
-/area/engine/engineering)
"EL" = (
/turf/closed/wall,
/area/engine/engineering)
@@ -1082,6 +1076,11 @@
/obj/structure/window/reinforced,
/turf/open/floor/plasteel,
/area/engine/engineering)
+"Fs" = (
+/obj/structure/rack,
+/obj/item/pipe_dispenser,
+/turf/open/floor/plasteel,
+/area/engine/engineering)
"FG" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 10
@@ -1218,11 +1217,6 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"Jd" = (
-/obj/machinery/light,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow,
/obj/machinery/atmospherics/pipe/manifold/orange/visible,
/turf/open/floor/plasteel,
/area/engine/engineering)
@@ -1312,15 +1306,6 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/light{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
/turf/open/floor/plasteel,
/area/engine/engineering)
"LD" = (
@@ -1372,6 +1357,7 @@
/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
dir = 4
},
+/obj/machinery/meter,
/turf/open/floor/plasteel,
/area/engine/engineering)
"Nz" = (
@@ -1429,12 +1415,10 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
},
-/obj/machinery/airalarm{
- dir = 1;
- locked = 0;
- pixel_y = -22
- },
/obj/machinery/light,
+/obj/structure/sign/nanotrasen{
+ pixel_y = -32
+ },
/turf/open/floor/plasteel,
/area/engine/engineering)
"Pz" = (
@@ -1452,6 +1436,9 @@
/obj/machinery/light{
dir = 1
},
+/obj/structure/sign/warning/nosmoking{
+ pixel_y = 30
+ },
/turf/open/floor/plasteel,
/area/engine/engineering)
"PK" = (
@@ -1522,12 +1509,11 @@
/turf/open/space,
/area/space/nearstation)
"Rl" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 1
- },
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/obj/machinery/meter,
/turf/open/floor/plasteel,
/area/engine/engineering)
"Rz" = (
@@ -1602,7 +1588,13 @@
/turf/open/floor/plating,
/area/engine/engineering)
"TE" = (
-/obj/structure/closet/crate/internals,
+/obj/structure/closet/crate{
+ icon_state = "crateopen"
+ },
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 2;
+ name = "2maintenance loot spawner"
+ },
/turf/open/floor/plasteel,
/area/engine/engineering)
"TH" = (
@@ -1648,6 +1640,10 @@
dir = 4
},
/obj/effect/turf_decal/tile/yellow,
+/obj/machinery/camera{
+ c_tag = "TEG - North Center";
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/engine/engineering)
"Uq" = (
@@ -1671,18 +1667,15 @@
/area/engine/engineering)
"UT" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
/turf/open/floor/plasteel,
/area/engine/engineering)
"UY" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
+/obj/machinery/airalarm{
+ pixel_y = 23
+ },
/turf/open/floor/plasteel,
/area/engine/engineering)
"Vi" = (
@@ -1811,10 +1804,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
},
-/obj/structure/extinguisher_cabinet{
- dir = 4;
- pixel_y = -27
- },
/turf/open/floor/plasteel,
/area/engine/engineering)
"YC" = (
@@ -1837,9 +1826,10 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"YP" = (
-/obj/structure/rack,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/obj/item/pipe_dispenser,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/plasteel,
/area/engine/engineering)
"YQ" = (
@@ -1878,7 +1868,9 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"Zu" = (
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+ dir = 6
+ },
/obj/machinery/meter,
/turf/open/floor/plasteel,
/area/engine/engineering)
@@ -1887,13 +1879,6 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/sign/warning/securearea{
- pixel_y = -32
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/plasteel,
/area/engine/engineering)
"ZC" = (
@@ -2170,7 +2155,7 @@ iD
MP
MP
MP
-ij
+MP
yX
qn
qn
@@ -2251,11 +2236,11 @@ ME
QS
uB
Ok
-Ok
-Ok
+di
+di
Ok
Bz
-Zu
+lI
Wc
Ok
zG
@@ -2307,8 +2292,8 @@ iP
wk
go
fF
-EI
-EI
+UT
+UT
sn
qc
Nh
@@ -2367,7 +2352,7 @@ KA
KA
Ok
dZ
-bO
+Zu
ev
tl
qb
@@ -2477,7 +2462,7 @@ IP
Zs
sD
Jd
-EL
+YP
YG
AX
PK
@@ -2505,7 +2490,7 @@ SX
ou
vG
Zv
-di
+Xe
qJ
Lw
Xe
@@ -2595,7 +2580,7 @@ PK
Dv
Dv
bO
-YP
+sH
As
yN
yN
@@ -2651,7 +2636,7 @@ eh
zx
XW
ST
-Ok
+Fs
MP
tw
tw
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index fb5ad3eee6..ca2a724ccd 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -1257,6 +1257,16 @@
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
"acV" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/lattice/catwalk,
+/turf/open/space,
+/area/solar/port/fore)
+"acW" = (
/obj/structure/cable{
icon_state = "0-2"
},
@@ -1266,11 +1276,6 @@
},
/turf/open/floor/plasteel/airless/solarpanel,
/area/solar/port/fore)
-"acW" = (
-/obj/structure/cable,
-/obj/structure/lattice/catwalk,
-/turf/open/space,
-/area/solar/port/fore)
"acX" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -1489,7 +1494,12 @@
/obj/structure/lattice/catwalk,
/turf/open/space,
/area/solar/starboard/fore)
-"adu" = (
+"adw" = (
+/obj/structure/cable,
+/obj/structure/lattice/catwalk,
+/turf/open/space,
+/area/solar/port/fore)
+"adx" = (
/obj/structure/cable{
icon_state = "4-8"
},
@@ -1502,56 +1512,17 @@
/obj/structure/lattice/catwalk,
/turf/open/space,
/area/solar/port/fore)
-"adv" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/structure/lattice/catwalk,
-/turf/open/space,
-/area/solar/port/fore)
-"adw" = (
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/structure/lattice/catwalk,
-/turf/open/space,
-/area/solar/port/fore)
-"adx" = (
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/structure/lattice/catwalk,
-/turf/open/space,
-/area/solar/port/fore)
"ady" = (
/obj/structure/lattice/catwalk,
/turf/open/space,
/area/solar/port/fore)
-"adz" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/structure/lattice/catwalk,
-/turf/open/space,
-/area/solar/port/fore)
"adA" = (
-/obj/structure/cable{
- icon_state = "2-8"
+/obj/structure/cable,
+/obj/machinery/power/solar{
+ id = "auxsolareast";
+ name = "Port Auxiliary Solar Array"
},
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/structure/lattice/catwalk,
-/turf/open/space,
+/turf/open/floor/plasteel/airless/solarpanel,
/area/solar/port/fore)
"adB" = (
/obj/structure/cable{
@@ -1817,12 +1788,11 @@
/turf/open/space,
/area/solar/starboard/fore)
"adZ" = (
-/obj/structure/cable,
-/obj/machinery/power/solar{
- id = "auxsolareast";
- name = "Port Auxiliary Solar Array"
+/obj/structure/cable{
+ icon_state = "0-8"
},
-/turf/open/floor/plasteel/airless/solarpanel,
+/obj/structure/lattice/catwalk,
+/turf/open/space,
/area/solar/port/fore)
"aea" = (
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
@@ -5054,12 +5024,16 @@
/turf/open/floor/plasteel/dark,
/area/security/courtroom)
"ajq" = (
-/obj/structure/lattice/catwalk,
+/obj/machinery/door/airlock/external{
+ name = "Solar Maintenance";
+ req_access_txt = "10; 13"
+ },
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/open/space,
-/area/solar/port/fore)
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/turf/open/floor/plating,
+/area/maintenance/solars/port/fore)
"ajr" = (
/obj/structure/table/wood,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -5417,16 +5391,12 @@
/turf/open/floor/plating,
/area/maintenance/solars/port/fore)
"ajW" = (
-/obj/machinery/door/airlock/external{
- name = "Solar Maintenance";
- req_access_txt = "10; 13"
- },
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "0-4"
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/turf/open/floor/plating,
-/area/maintenance/solars/port/fore)
+/obj/structure/lattice/catwalk,
+/turf/open/space,
+/area/solar/port/fore)
"ajX" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -6668,15 +6638,17 @@
/area/security/courtroom)
"amv" = (
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-8"
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/machinery/door/airlock/external{
- name = "Solar Maintenance";
- req_access_txt = "10; 13"
+/obj/structure/cable{
+ icon_state = "2-8"
},
-/turf/open/floor/plating,
-/area/maintenance/solars/starboard/fore)
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/lattice/catwalk,
+/turf/open/space,
+/area/solar/port/fore)
"amw" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -8572,13 +8544,15 @@
/turf/open/floor/plasteel,
/area/security/processing)
"aqJ" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/machinery/door/airlock/external{
- name = "External Access";
- req_access_txt = "13"
+/obj/structure/cable{
+ icon_state = "2-8"
},
-/turf/open/floor/plating,
-/area/maintenance/port/fore)
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/lattice/catwalk,
+/turf/open/space,
+/area/solar/port/fore)
"aqK" = (
/obj/structure/chair/stool,
/turf/open/floor/plasteel,
@@ -42365,15 +42339,9 @@
/turf/open/floor/plasteel,
/area/science/circuit)
"bXv" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/machinery/door/airlock/external{
- name = "External Access";
- req_access_txt = "13"
- },
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
+/obj/item/stack/rods,
+/turf/open/space,
+/area/space)
"bXw" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/turf/open/floor/plasteel,
@@ -45087,7 +45055,7 @@
dir = 4
},
/turf/closed/wall/r_wall,
-/area/engine/engineering)
+/area/engine/atmos)
"cez" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/turf/open/floor/plasteel,
@@ -45541,9 +45509,12 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"cfK" = (
-/obj/structure/sign/warning/securearea,
-/turf/closed/wall,
-/area/engine/engineering)
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/space,
+/area/solar/port/fore)
"cfL" = (
/obj/machinery/firealarm{
pixel_y = 24
@@ -46343,18 +46314,11 @@
/turf/open/floor/plating,
/area/maintenance/solars/port/aft)
"chO" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
/obj/machinery/door/airlock/external{
- name = "Solar Maintenance";
- req_access_txt = "10; 13"
+ req_access_txt = "13"
},
/turf/open/floor/plating,
-/area/maintenance/solars/port/aft)
+/area/maintenance/fore/secondary)
"chP" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -49372,15 +49336,16 @@
/turf/open/space,
/area/maintenance/aft)
"csg" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
+/obj/structure/cable{
+ icon_state = "1-2"
},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/external{
- name = "Engineering External Access";
- req_access_txt = "10;13"
+ name = "Solar Maintenance";
+ req_access_txt = "10; 13"
},
/turf/open/floor/plating,
-/area/engine/engineering)
+/area/maintenance/solars/starboard/fore)
"csi" = (
/obj/structure/transit_tube/curved/flipped{
dir = 1
@@ -51173,13 +51138,10 @@
/turf/open/floor/plasteel,
/area/security/processing)
"cxW" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/machinery/door/airlock/external{
- name = "External Access";
- req_access_txt = "13"
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/obj/structure/lattice,
+/obj/structure/lattice/catwalk,
+/turf/open/space,
+/area/space/nearstation)
"cxY" = (
/obj/machinery/camera{
c_tag = "Arrivals Escape Pod 1";
@@ -51278,14 +51240,13 @@
/turf/open/floor/plating,
/area/hallway/secondary/entry)
"cyC" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/external{
+ name = "External Access";
req_access_txt = "13"
},
/turf/open/floor/plating,
-/area/maintenance/starboard)
+/area/maintenance/port/fore)
"cyD" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
@@ -51307,15 +51268,13 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cyG" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/external{
- name = "Atmospherics External Airlock";
- req_access_txt = "24"
+ name = "External Access";
+ req_access_txt = "13"
},
/turf/open/floor/plating,
-/area/engine/atmos)
+/area/maintenance/starboard/fore)
"cyK" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -51361,18 +51320,14 @@
/turf/open/space/basic,
/area/space)
"cyU" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
+ dir = 8
},
/obj/machinery/door/airlock/external{
- name = "Solar Maintenance";
- req_access_txt = "10; 13"
+ req_access_txt = "13"
},
/turf/open/floor/plating,
-/area/maintenance/solars/starboard/aft)
+/area/maintenance/starboard)
"czg" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
@@ -52278,10 +52233,9 @@
/turf/open/space,
/area/space/nearstation)
"cCS" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
/obj/structure/lattice,
-/turf/open/space,
-/area/space/nearstation)
+/turf/closed/wall/r_wall,
+/area/engine/atmos)
"cCT" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
@@ -52348,12 +52302,15 @@
/turf/closed/wall,
/area/engine/engineering)
"cDY" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 9
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
},
-/turf/open/space,
-/area/space/nearstation)
+/obj/machinery/door/airlock/external{
+ name = "External Access";
+ req_access_txt = "13"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"cDZ" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -53632,18 +53589,11 @@
dir = 8
},
/area/crew_quarters/fitness/pool)
-"dCT" = (
-/obj/machinery/conveyor{
- dir = 8;
- id = "QMLoad"
- },
-/obj/machinery/door/poddoor{
- id = "QMLoaddoor";
- name = "supply dock loading door"
- },
-/obj/structure/fans/tiny,
-/turf/open/floor/plating,
-/area/quartermaster/storage)
+"dCt" = (
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
"dCV" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -54322,6 +54272,12 @@
},
/turf/open/floor/plasteel,
/area/security/range)
+"fty" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
"ftE" = (
/obj/item/radio/intercom{
pixel_y = 25
@@ -54892,10 +54848,6 @@
dir = 8
},
/area/medical/sleeper)
-"haL" = (
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/space)
"haM" = (
/obj/item/radio/intercom{
name = "Station Intercom (General)";
@@ -55182,6 +55134,13 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
+"imk" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+ dir = 9
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
"imH" = (
/obj/structure/falsewall,
/turf/open/floor/plating,
@@ -55477,6 +55436,10 @@
},
/turf/open/floor/wood,
/area/crew_quarters/bar)
+"jiK" = (
+/obj/structure/sign/warning/securearea,
+/turf/closed/wall,
+/area/engine/engineering)
"jjC" = (
/obj/structure/table/wood,
/obj/item/toy/cards/deck,
@@ -56803,6 +56766,19 @@
/obj/structure/table/wood,
/turf/open/floor/wood,
/area/maintenance/bar)
+"mQp" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/machinery/door/airlock/external{
+ name = "Solar Maintenance";
+ req_access_txt = "10; 13"
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/starboard/aft)
"mQS" = (
/obj/machinery/light{
dir = 8;
@@ -58950,14 +58926,10 @@
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/pool)
"tAH" = (
-/obj/machinery/door/airlock/external{
- req_access_txt = "13"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
"tCa" = (
/obj/structure/table/wood,
/obj/item/instrument/guitar{
@@ -58980,6 +58952,19 @@
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
+"tEK" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/obj/machinery/door/airlock/external{
+ name = "Solar Maintenance";
+ req_access_txt = "10; 13"
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/port/aft)
"tHh" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/tile/red,
@@ -59350,7 +59335,7 @@
"uDO" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
- icon_state = "0-2"
+ icon_state = "1-2"
},
/turf/open/space,
/area/solar/port/fore)
@@ -60094,6 +60079,16 @@
/obj/machinery/holopad,
/turf/open/floor/plasteel/showroomfloor,
/area/security/main)
+"wmu" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/machinery/door/airlock/external{
+ name = "Engineering External Access";
+ req_access_txt = "10;13"
+ },
+/turf/open/floor/plating,
+/area/engine/engineering)
"woR" = (
/obj/machinery/cryopod/tele,
/turf/open/floor/carpet,
@@ -60251,6 +60246,16 @@
/obj/item/hand_labeler,
/turf/open/floor/plasteel,
/area/hallway/secondary/service)
+"wWi" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/machinery/door/airlock/external{
+ name = "Atmospherics External Airlock";
+ req_access_txt = "24"
+ },
+/turf/open/floor/plating,
+/area/engine/atmos)
"wWT" = (
/obj/effect/landmark/start/roboticist,
/turf/open/floor/plasteel/white,
@@ -67641,7 +67646,7 @@ gXs
gXs
gJi
gJi
-haL
+gXs
aag
gJi
aaa
@@ -68395,7 +68400,7 @@ aaa
aaa
aaa
aae
-ktS
+aaa
gXs
aaa
aaa
@@ -68652,7 +68657,7 @@ aaa
aaa
aaa
aaa
-ktS
+aaa
gXs
aaa
aaa
@@ -68909,7 +68914,7 @@ aaa
aaa
aaa
aaa
-ktS
+aaa
gXs
aaa
aaa
@@ -69166,7 +69171,7 @@ aaa
aaa
aaa
aaa
-ktS
+aaa
gXs
aaa
cqq
@@ -69423,7 +69428,7 @@ aaf
aaf
aaf
aaa
-ktS
+aaa
arB
asE
cyb
@@ -73785,11 +73790,11 @@ aaa
aae
aaa
aaa
-aaa
aag
alU
alU
alU
+alU
aCW
amC
asK
@@ -74042,9 +74047,9 @@ aaa
aaa
aaa
aaa
-aaa
aag
-aqJ
+cyC
+amC
amC
gLH
ase
@@ -74299,7 +74304,7 @@ aaa
aaa
aaa
aaa
-aaa
+gJi
alU
alU
alU
@@ -75048,7 +75053,6 @@ aaa
aaa
aaa
aaa
-aaa
aaS
aaS
aaS
@@ -75067,6 +75071,7 @@ aaS
aaf
aaf
aaf
+aaf
aaa
aaa
aaa
@@ -75305,7 +75310,6 @@ aaa
aaa
aaa
aaa
-aaa
abY
aaa
aaf
@@ -75318,7 +75322,7 @@ acy
aaa
aaf
aaa
-aiS
+bXv
aaa
aaS
aaa
@@ -75327,6 +75331,7 @@ aaa
aaa
aaa
aaa
+aaa
alU
aoR
apO
@@ -75562,25 +75567,25 @@ aaa
aaa
aaa
aaa
-aaa
abY
aaa
+acW
acV
-adv
-adZ
+adA
aaa
+acW
acV
-adv
-adZ
+adA
aaa
+acW
acV
-adv
-adZ
+adA
aaa
aaS
aaf
aaf
aaf
+aaf
aaa
aaa
aaa
@@ -75816,23 +75821,22 @@ aaa
aaa
aaa
aaa
-aaa
aae
aaa
aaa
abY
aaf
-acV
-adu
-adZ
+acW
+adx
+adA
aaa
-acV
-adu
-adZ
+acW
+adx
+adA
aaa
-acV
-adu
-adZ
+acW
+adx
+adA
aaf
aaf
aaa
@@ -75841,6 +75845,7 @@ aaa
aaa
aaa
aaa
+aaa
alU
alU
alU
@@ -76076,20 +76081,19 @@ aaa
aaa
aaa
aaa
-aaa
abY
aaa
-acV
-adu
-adZ
+acW
+adx
+adA
aaf
-acV
-adu
-adZ
+acW
+adx
+adA
aaf
-acV
-adu
-adZ
+acW
+adx
+adA
aaa
aaf
aaa
@@ -76098,6 +76102,7 @@ aaa
aaa
aaa
aaa
+aaa
aaf
aaa
ali
@@ -76333,20 +76338,20 @@ aaa
aaa
aaa
aaa
-aaa
aaf
aaf
-acV
-adu
-adZ
+acW
+adx
+adA
aaa
-acV
-adu
-adZ
+acW
+adx
+adA
aaa
-acV
-adu
-adZ
+acW
+adx
+adA
+aaf
aaf
aaf
aaf
@@ -76587,26 +76592,26 @@ aaa
aaa
aaa
aaa
-aaa
aaS
aaS
aaS
aaf
aaa
-acV
-adu
-adZ
+acW
+adx
+adA
aaa
-acV
-adu
-adZ
+acW
+adx
+adA
aaa
-acV
-adu
-adZ
+acW
+adx
+adA
aaa
aaf
aaa
+aaa
ajV
alR
alR
@@ -76844,27 +76849,27 @@ aaa
aaa
aaa
aaa
-aaa
aaS
aaa
aaf
aaa
aaa
aaa
-adw
+adZ
aaa
aaa
aaa
-adw
+adZ
aaa
aaa
aaa
-adw
+adZ
aaa
aaa
ajV
ajV
ajV
+ajV
alQ
amy
ang
@@ -77101,13 +77106,12 @@ aaa
aaa
aaa
aaa
-aaa
aaS
aaf
abs
abZ
abZ
-acW
+adw
ady
ady
ady
@@ -77117,9 +77121,10 @@ ady
ady
ady
ady
+cfK
uDO
ajq
-ajW
+akB
akB
alh
alT
@@ -77358,27 +77363,27 @@ aaa
aaa
aaa
aaa
-aaa
aaS
aaa
aaf
aaa
aaa
aaa
-adx
+ajW
aaa
aaa
aaa
-adx
+ajW
aaa
aaa
aaa
-adx
+ajW
aaa
aaa
ajV
ajV
ajV
+ajV
alS
amz
anh
@@ -77615,26 +77620,26 @@ aaa
aaa
aaa
aaa
-aaa
aaS
aba
aaS
aaf
aaa
-acV
-adz
-adZ
+acW
+amv
+adA
aaa
-acV
-adz
-adZ
+acW
+amv
+adA
aaa
-acV
-adz
-adZ
+acW
+amv
+adA
aaa
aaf
aaa
+aaa
ajV
alR
alR
@@ -77875,22 +77880,22 @@ aaa
aaa
aaa
aaa
+aaf
+aaf
+acW
+amv
+adA
aaa
-aaf
-aaf
-acV
-adz
-adZ
+acW
+amv
+adA
aaa
-acV
-adz
-adZ
+acW
+amv
+adA
+aaf
+aaf
aaa
-acV
-adz
-adZ
-aaf
-aaf
aaa
aaa
aaa
@@ -78132,24 +78137,24 @@ aaa
aaa
aaa
aaa
-aaa
aaS
aaa
-acV
-adz
-adZ
+acW
+amv
+adA
aaf
-acV
-adz
-adZ
+acW
+amv
+adA
aaf
-acV
-adz
-adZ
+acW
+amv
+adA
aaa
aaf
aaf
aaf
+aaf
gXs
alU
alF
@@ -78389,25 +78394,25 @@ aaa
aaa
aaa
aaa
-aaa
aaS
aaf
-acV
-adz
-adZ
+acW
+amv
+adA
aaa
-acV
-adz
-adZ
+acW
+amv
+adA
aaa
-acV
-adz
-adZ
+acW
+amv
+adA
aaf
aaf
aaa
aaa
aaa
+aaa
alU
alU
ank
@@ -78646,22 +78651,22 @@ aaa
aaa
aaa
aaa
+aaS
+aaa
+acW
+aqJ
+adA
+aaa
+acW
+aqJ
+adA
+aaa
+acW
+aqJ
+adA
aaa
aaS
aaa
-acV
-adA
-adZ
-aaa
-acV
-adA
-adZ
-aaa
-acV
-adA
-adZ
-aaa
-aaS
aaa
aaa
aaa
@@ -78748,9 +78753,9 @@ aaf
aaa
aaf
aaa
-aaa
+aaf
hrF
-aaa
+aaf
aaa
aaf
aaa
@@ -78903,7 +78908,6 @@ aaa
aaa
aaa
aaa
-aaa
aaS
aaa
aaf
@@ -78921,6 +78925,7 @@ aaa
aaS
aaf
aaf
+aaf
gXs
alU
amC
@@ -79005,9 +79010,9 @@ aaf
aaf
aaf
aaf
-aaf
-hrF
-aaf
+cfx
+tEK
+cfx
aaf
aaf
aaf
@@ -79160,7 +79165,6 @@ aaa
aaa
aaa
aaa
-aaa
aaS
aaS
aaS
@@ -79179,6 +79183,7 @@ aaS
aaa
aaa
aaa
+aaa
alU
amE
ann
@@ -79263,7 +79268,7 @@ aaf
aaa
aaa
cfx
-chO
+chN
cfx
aaa
aaf
@@ -79511,8 +79516,8 @@ caf
aoV
aag
aaf
-aaa
-aaa
+gXs
+gXs
aaf
aaa
aaa
@@ -79765,9 +79770,9 @@ bLv
bCq
aoV
cbj
-aoV
-aag
-aaf
+bLv
+cDY
+bLv
aaf
bCq
bCq
@@ -80023,7 +80028,7 @@ bCq
bCq
cbj
bLv
-bXv
+bHE
bLv
aaf
bCq
@@ -80039,7 +80044,7 @@ ciQ
cfw
aaa
aaa
-aaa
+gXs
aaf
aaf
aaa
@@ -80294,9 +80299,9 @@ cgC
chR
ciS
cfw
-aaa
-aaa
-aaa
+aag
+aag
+aag
aaa
aaf
aaf
@@ -80551,9 +80556,9 @@ cgB
chQ
ciR
cfw
-aag
-aag
-aag
+bCq
+cDY
+bCq
aaa
aaa
aaf
@@ -80809,7 +80814,7 @@ chS
cfw
cfw
bCq
-bXv
+bHE
bCq
aaa
aaa
@@ -90305,7 +90310,7 @@ bUE
bWM
bXJ
bMK
-bMK
+bYH
bYH
bYH
bVg
@@ -92621,10 +92626,10 @@ bWQ
bWQ
caD
bWQ
-ccw
-ccw
+bLK
+bLK
cey
-ccw
+bLK
ccw
ccw
ccw
@@ -92900,14 +92905,14 @@ ckF
cpE
cjR
crW
-csg
+ciZ
+wmu
aag
aaa
aaa
aaa
aaa
aaa
-aaa
ctv
ctv
ctv
@@ -93157,14 +93162,14 @@ crw
cjO
ccw
crX
-cfK
+ciZ
+jiK
aag
aaa
aaa
aaa
aaa
aaa
-aaa
aaT
aaT
aaT
@@ -93415,7 +93420,7 @@ cjm
ccw
ccw
cig
-aag
+cig
aag
aag
aag
@@ -95093,10 +95098,10 @@ aaa
aaa
aaa
aaa
-aaa
acw
abp
abp
+abp
adR
abp
lJC
@@ -95349,10 +95354,10 @@ aaa
aaa
aaa
aaa
-aaa
aaf
aag
acU
+anF
adr
sXy
aeC
@@ -95607,12 +95612,12 @@ aaa
aaa
aaa
aaa
-aaa
aag
abp
abp
abp
abp
+abp
mxn
abp
abp
@@ -96135,7 +96140,7 @@ aaa
ahn
ahn
ahn
-tAH
+anF
ahn
eMs
anG
@@ -96391,8 +96396,8 @@ aaa
aaa
aaa
aaa
-gJi
-gJi
+ahn
+chO
ahn
ahn
khB
@@ -96480,10 +96485,10 @@ bQA
bPj
bOh
cCQ
-bLK
-cyG
-bLK
-aoV
+cCS
+chg
+cCS
+aaf
aoV
aoV
aaf
@@ -96648,8 +96653,8 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
+gJi
+gJi
dFX
wWW
dqb
@@ -96736,21 +96741,21 @@ cbI
ccC
cdD
bOh
-cCG
+cCQ
cCS
+wWi
cCS
-cCI
-cCI
-cCI
-cCI
-cCI
-cCI
-cCI
-cCI
-cCI
-cCI
-cCI
-cDY
+aaa
+aaa
+aaa
+gXs
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+cCQ
aaf
aaf
aaf
@@ -96993,21 +96998,21 @@ cbH
ccB
cbH
bOh
-aaf
-aaa
-aoV
-aaf
-aoV
-aoV
-aoV
-aaf
-aoV
-aoV
-aoV
-aoV
-aoV
-aoV
-gXs
+cCG
+tAH
+dCt
+fty
+dCt
+dCt
+dCt
+fty
+dCt
+dCt
+dCt
+dCt
+dCt
+dCt
+imk
aoV
aaa
aaa
@@ -97251,11 +97256,11 @@ ccD
cbH
bOh
aaf
-aaf
-aaf
-aaf
-aaf
-aoV
+aaa
+aaa
+aaa
+aaa
+aaa
aoV
aaf
aoV
@@ -100514,7 +100519,7 @@ aaa
aaa
aaa
aaa
-aaa
+gXs
aaf
aaf
alO
@@ -100770,8 +100775,8 @@ aaa
aaa
aaa
aaa
-aaa
-aag
+gJi
+alO
alO
arp
alO
@@ -101027,9 +101032,9 @@ aaa
aaa
aaa
aaa
-aaa
-aag
-cxW
+gJi
+cyG
+anf
anf
aqv
ayf
@@ -101284,10 +101289,10 @@ aaf
aaf
aaf
aaf
-aaf
-aag
+cxW
alO
anf
+anf
alO
mAH
jaF
@@ -101793,7 +101798,7 @@ aaa
aaa
aaf
aaa
-aaa
+amw
amw
amw
amw
@@ -102050,8 +102055,8 @@ eaR
jIs
jIs
jIs
-acx
-amv
+csg
+ane
ane
cxN
aog
@@ -102307,7 +102312,7 @@ aaa
aaa
aaf
aaa
-aaa
+amw
amw
amw
amw
@@ -110625,7 +110630,7 @@ cmw
cnj
cnj
cnj
-aaa
+cnj
aaa
aaf
aaa
@@ -110832,7 +110837,7 @@ aaf
aaf
aaf
bky
-cyC
+btp
bns
boF
bqe
@@ -110881,8 +110886,8 @@ clx
cmv
cnk
cnK
-cyU
-cpi
+cnK
+mQp
cpi
cpi
cqJ
@@ -111087,9 +111092,9 @@ aQE
aNa
aaa
aaf
-aaa
-aaf
-aaa
+gXs
+bky
+cyU
bns
boF
bqe
@@ -111139,7 +111144,7 @@ cmx
cnj
cnj
cnj
-aaa
+cnj
aaa
aaf
aaa
@@ -111344,7 +111349,7 @@ afE
aNa
aaa
aaa
-aaa
+gXs
aaf
aaa
bns
@@ -112926,7 +112931,7 @@ aaa
aaa
aaf
cNW
-cPI
+cOe
cNW
aaf
aaf
@@ -113182,9 +113187,9 @@ aaa
aaa
aaa
aaf
-aag
-aag
-aag
+cNW
+cPI
+cNW
aaf
aaa
aaa
@@ -113438,11 +113443,11 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
+gXs
aag
-aaa
-aaa
+aag
+aag
+gXs
aaa
aaa
aaa
@@ -113697,7 +113702,7 @@ aaa
aaa
aaa
aaa
-aaf
+aag
aaa
aaa
aaa
diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm
index 5500e72f43..d0dd1ba731 100644
--- a/_maps/map_files/CogStation/CogStation.dmm
+++ b/_maps/map_files/CogStation/CogStation.dmm
@@ -1848,9 +1848,6 @@
dir = 8
},
/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/light_switch{
- pixel_y = -24
- },
/turf/open/floor/plasteel/dark,
/area/crew_quarters/observatory)
"aez" = (
@@ -2177,6 +2174,9 @@
dir = 4
},
/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/light_switch{
+ pixel_x = 24
+ },
/turf/open/floor/plasteel/dark,
/area/crew_quarters/observatory)
"afl" = (
@@ -2722,10 +2722,6 @@
dir = 1;
pixel_y = -22
},
-/obj/machinery/camera{
- c_tag = "Observatory Viewing Area";
- dir = 4
- },
/obj/machinery/light/small{
dir = 8
},
@@ -3188,6 +3184,9 @@
/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
dir = 1
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"ahL" = (
@@ -3327,15 +3326,12 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/observatory)
"aif" = (
-/obj/machinery/firealarm{
- pixel_y = 26
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aig" = (
@@ -4483,17 +4479,8 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"akN" = (
-/obj/structure/plasticflaps,
-/obj/structure/fans/tiny,
-/obj/machinery/door/poddoor/preopen{
- id = "secblock";
- name = "Security Router"
- },
-/obj/machinery/conveyor/auto{
- id = "sec"
- },
-/turf/open/floor/plating,
-/area/router/sec)
+/turf/open/space/basic,
+/area/router/aux)
"akO" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -6200,12 +6187,20 @@
/turf/open/floor/grass,
/area/hydroponics)
"aoJ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/visible,
-/obj/machinery/space_heater,
-/turf/open/floor/plasteel,
-/area/engine/engineering{
- name = "Engine Room"
- })
+/obj/machinery/firealarm{
+ pixel_y = 26
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"aoK" = (
/turf/closed/wall/r_wall,
/area/router/service)
@@ -6300,7 +6295,7 @@
/obj/machinery/conveyor{
id = "serv_off"
},
-/obj/machinery/door/poddoor/preopen{
+/obj/machinery/door/poddoor{
id = "servblock";
name = "Service Router"
},
@@ -6309,7 +6304,7 @@
"aoT" = (
/obj/structure/plasticflaps,
/obj/structure/fans/tiny,
-/obj/machinery/door/poddoor/preopen{
+/obj/machinery/door/poddoor{
id = "servblock";
name = "Service Router"
},
@@ -15009,13 +15004,19 @@
/turf/open/floor/plasteel/stairs/medium,
/area/hallway/secondary/entry)
"aHa" = (
-/obj/structure/disposalpipe/junction/yjunction,
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
- dir = 8
+/obj/structure/cable,
+/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/locker";
+ dir = 8;
+ name = "Locker Room APC";
+ pixel_x = -24
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel,
-/area/hallway/primary/port/fore)
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating,
+/area/maintenance/fore)
"aHb" = (
/obj/structure/chair,
/obj/machinery/firealarm{
@@ -15163,12 +15164,12 @@
/turf/open/floor/plasteel,
/area/tcommsat/computer)
"aHp" = (
-/obj/structure/disposalpipe/segment{
- dir = 9
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold4w/supplymain/hidden,
-/turf/open/floor/plasteel,
-/area/hallway/primary/port/fore)
+/turf/open/floor/plating,
+/area/maintenance/fore)
"aHq" = (
/obj/effect/turf_decal/bot,
/obj/structure/disposalpipe/segment,
@@ -15839,12 +15840,16 @@
/turf/open/floor/carpet/royalblue,
/area/bridge)
"aIJ" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/maintenance{
+ name = "Fore Maintenance";
+ req_one_access_txt = "12;46"
},
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
-/turf/open/floor/plasteel,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating,
/area/hallway/primary/port/fore)
"aIK" = (
/obj/structure/table/wood,
@@ -17085,13 +17090,22 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"aLc" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance{
- name = "Central Maintenance";
- req_one_access_txt = "12"
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
/area/hallway/primary/port/fore)
"aLd" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
@@ -17717,14 +17731,16 @@
/turf/closed/wall,
/area/maintenance/department/chapel)
"aMo" = (
-/obj/structure/disposalpipe/segment{
- dir = 6
+/obj/structure/disposalpipe/junction/yjunction,
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
+ dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "1-4"
},
-/turf/open/floor/plating,
-/area/maintenance/starboard/central)
+/turf/open/floor/plasteel,
+/area/hallway/primary/port/fore)
"aMp" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
@@ -17876,18 +17892,15 @@
},
/area/chapel/main)
"aMG" = (
-/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/supplymain/hidden,
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "2-8"
},
-/obj/machinery/camera{
- c_tag = "Central Starboard Maintenance";
- dir = 8;
- pixel_y = -22
- },
-/mob/living/simple_animal/hostile/retaliate/bat,
-/turf/open/floor/plating,
-/area/maintenance/starboard/central)
+/turf/open/floor/plasteel,
+/area/hallway/primary/port/fore)
"aMH" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -19876,9 +19889,16 @@
/turf/open/floor/plasteel/white,
/area/crew_quarters/fitness/cogpool)
"aQS" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
-/turf/open/floor/plating,
-/area/maintenance/central)
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/port/fore)
"aQT" = (
/obj/machinery/door/airlock/engineering{
name = "Thermo-Electric Generator";
@@ -22380,6 +22400,18 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/department/eva)
+"aWr" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/maintenance{
+ name = "Central Maintenance";
+ req_one_access_txt = "12"
+ },
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating,
+/area/hallway/primary/port/fore)
"aWs" = (
/obj/machinery/light{
dir = 8;
@@ -22407,16 +22439,10 @@
/turf/open/floor/plating,
/area/maintenance/central)
"aWu" = (
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/power/apc{
- areastring = "/area/crew_quarters/fitness/cogpool";
- dir = 4;
- name = "Pool APC";
- pixel_x = 24
- },
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plating,
/area/maintenance/central)
"aWv" = (
@@ -22783,9 +22809,9 @@
/turf/open/floor/carpet,
/area/library)
"aXg" = (
-/obj/structure/bookcase/random/reference,
-/turf/open/floor/wood,
-/area/library)
+/obj/machinery/vending/coffee,
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
"aXh" = (
/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 6
@@ -22833,6 +22859,12 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
+"aXm" = (
+/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
+ dir = 1
+ },
+/turf/closed/wall/r_wall,
+/area/tcommsat/computer)
"aXn" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -22872,6 +22904,15 @@
"aXr" = (
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
+"aXs" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/tcommsat/computer)
"aXt" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/warning/securearea,
@@ -24420,10 +24461,12 @@
/turf/open/floor/plasteel/dark,
/area/security/checkpoint/customs)
"baE" = (
-/obj/structure/disposalpipe/segment{
- dir = 9
+/obj/structure/bookcase/random/reference,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
},
-/turf/open/floor/wood,
+/turf/open/floor/plasteel/dark,
/area/library)
"baF" = (
/obj/structure/chair/office/dark{
@@ -24972,18 +25015,21 @@
/turf/open/floor/plating,
/area/security/checkpoint/customs)
"bbQ" = (
-/obj/structure/sign/warning/vacuum/external{
- pixel_x = -32;
- pixel_y = 32
+/obj/structure/cable{
+ icon_state = "0-2"
},
+/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/fitness/cogpool";
+ dir = 4;
+ name = "Pool APC";
+ pixel_x = 24
+ },
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
-/turf/open/floor/plasteel,
-/area/engine/engineering{
- name = "Engine Room"
- })
+/turf/open/floor/plating,
+/area/maintenance/central)
"bbR" = (
/obj/structure/closet/crate/hydroponics,
/obj/effect/turf_decal/tile/green,
@@ -27389,19 +27435,16 @@
/turf/open/floor/wood,
/area/medical/medbay/lobby)
"bhy" = (
-/obj/structure/closet/crate/science,
-/obj/item/stack/sheet/metal/ten,
-/obj/item/stack/sheet/glass/five,
-/obj/item/stack/rods/twentyfive,
-/obj/item/target/syndicate,
-/obj/item/target/alien,
-/obj/item/target,
-/obj/item/target/clown,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 10
+/obj/structure/plasticflaps,
+/obj/structure/fans/tiny,
+/obj/machinery/conveyor/auto{
+ id = "sec"
},
-/turf/open/floor/plasteel,
-/area/science/mixing)
+/obj/machinery/door/poddoor{
+ name = "Security Router"
+ },
+/turf/open/floor/plating,
+/area/router/sec)
"bhz" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
@@ -27770,8 +27813,15 @@
/turf/open/floor/plating,
/area/quartermaster/storage)
"bim" = (
-/turf/open/space/basic,
-/area/space/nearstation)
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/button/massdriver{
+ id = "router_in";
+ name = "mass driver button (Router)";
+ pixel_x = 24;
+ pixel_y = -8
+ },
+/turf/open/floor/plating,
+/area/maintenance/disposal)
"bin" = (
/obj/machinery/computer/mecha{
dir = 4
@@ -30312,6 +30362,18 @@
},
/turf/open/floor/plasteel,
/area/science/mixing)
+"bnl" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/central)
"bnm" = (
/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
dir = 4
@@ -33863,9 +33925,18 @@
/area/janitor)
"bvb" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/landmark/blobstart,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/airlock/engineering{
+ name = "Electrical Substation";
+ req_access_txt = "10"
+ },
+/obj/structure/fans/tiny,
/turf/open/floor/plating,
-/area/maintenance/starboard/central)
+/area/engine/storage_shared{
+ name = "Electrical Substation"
+ })
"bvc" = (
/obj/machinery/computer/cargo/request,
/obj/machinery/airalarm{
@@ -34419,10 +34490,13 @@
/turf/open/floor/plating,
/area/maintenance/starboard/central)
"bwp" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "1-8"
+/obj/structure/disposalpipe/segment{
+ dir = 6
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plating,
/area/maintenance/starboard/central)
"bwq" = (
@@ -34646,6 +34720,20 @@
},
/turf/open/floor/plating,
/area/router)
+"bwM" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/camera{
+ c_tag = "Central Starboard Maintenance";
+ dir = 8;
+ pixel_y = -22
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/mob/living/simple_animal/hostile/retaliate/bat,
+/turf/open/floor/plating,
+/area/maintenance/starboard/central)
"bwN" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 4
@@ -34917,11 +35005,16 @@
/turf/open/floor/plating,
/area/maintenance/department/chapel)
"bxq" = (
+/obj/structure/disposalpipe/segment,
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-2"
},
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plating,
-/area/tcommsat/computer)
+/area/maintenance/starboard/central)
"bxr" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/purple,
@@ -35424,32 +35517,29 @@
/turf/open/floor/plasteel,
/area/router/eva)
"byt" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/turf/open/floor/plating,
+/area/maintenance/starboard/central)
+"byu" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/landmark/blobstart,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/turf/open/floor/plating,
+/area/maintenance/starboard/central)
+"byv" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/camera{
c_tag = "Central Starboard Exterior Access"
},
-/turf/open/floor/plating,
-/area/maintenance/starboard/central)
-"byu" = (
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
-/obj/machinery/door/airlock/external{
- name = "Central Starboard Exterior Access";
- req_access_txt = "13"
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/central)
-"byv" = (
-/obj/structure/disposalpipe/junction/flip{
- dir = 1
- },
/turf/open/floor/plating,
/area/maintenance/starboard/central)
"byw" = (
@@ -36132,14 +36222,19 @@
/turf/open/floor/plasteel,
/area/gateway)
"bAd" = (
-/obj/structure/cable{
- icon_state = "1-4"
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
},
-/obj/structure/cable{
- icon_state = "2-4"
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/door/airlock/external{
+ name = "Central Starboard Exterior Access";
+ req_access_txt = "13"
},
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 5
+ dir = 4
},
/turf/open/floor/plating,
/area/maintenance/starboard/central)
@@ -36371,6 +36466,15 @@
/area/medical/medbay/zone2{
name = "Medbay Treatment Center"
})
+"bAz" = (
+/obj/structure/disposalpipe/junction/flip{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 9
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/central)
"bAA" = (
/obj/structure/lattice,
/obj/structure/cable{
@@ -36528,6 +36632,19 @@
/area/medical/medbay/zone2{
name = "Medbay Treatment Center"
})
+"bAN" = (
+/obj/structure/rack,
+/obj/item/clothing/suit/space/fragile,
+/obj/item/clothing/head/helmet/space/fragile,
+/obj/item/tank/internals/air,
+/obj/item/flashlight,
+/obj/machinery/airalarm{
+ dir = 1;
+ locked = 0;
+ pixel_y = -22
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/central)
"bAO" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 4
@@ -38154,16 +38271,20 @@
},
/area/crew_quarters/heads/captain)
"bEr" = (
-/obj/structure/cable,
-/obj/machinery/power/apc{
- areastring = "/area/crew_quarters/locker";
- dir = 8;
- name = "Locker Room APC";
- pixel_x = -24
+/obj/structure/sign/warning/vacuum/external{
+ pixel_x = -32;
+ pixel_y = 32
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plating,
-/area/maintenance/fore)
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/engine/engineering{
+ name = "Engine Room"
+ })
"bEs" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/effect/turf_decal/tile/yellow{
@@ -38351,9 +38472,15 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/bar)
"bEK" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plating,
-/area/maintenance/fore)
+/obj/machinery/atmospherics/pipe/simple/supply/visible,
+/obj/machinery/space_heater,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/engine/engineering{
+ name = "Engine Room"
+ })
"bEL" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -38587,9 +38714,19 @@
/turf/open/floor/plasteel,
/area/ai_monitored/turret_protected/ai)
"bFg" = (
-/obj/effect/turf_decal/tile/brown,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
+/obj/machinery/suit_storage_unit/engine,
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
+ dir = 4
+ },
+/obj/machinery/airalarm{
+ dir = 4;
+ pixel_x = -23
+ },
/turf/open/floor/plasteel,
-/area/quartermaster/miningoffice)
+/area/engine/engineering{
+ name = "Engine Room"
+ })
"bFh" = (
/obj/effect/turf_decal/tile/brown,
/obj/machinery/light,
@@ -39243,14 +39380,15 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bGu" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance{
- name = "Fore Maintenance";
- req_one_access_txt = "12;46"
+/obj/structure/cable{
+ icon_state = "1-4"
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plating,
-/area/hallway/primary/port/fore)
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/freezer,
+/area/crew_quarters/toilet/restrooms)
"bGv" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -39617,20 +39755,15 @@
/turf/open/floor/plasteel,
/area/security/main)
"bHi" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
+/obj/effect/landmark/event_spawn,
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/port/fore)
+/turf/open/floor/plasteel/freezer,
+/area/crew_quarters/toilet/restrooms)
"bHj" = (
/obj/structure/table,
/obj/structure/bedsheetbin/towel,
@@ -40736,7 +40869,11 @@
/obj/machinery/airalarm{
pixel_y = 24
},
-/turf/open/floor/wood,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
/area/library)
"bJD" = (
/obj/machinery/disposal/bin{
@@ -40887,15 +41024,11 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bJU" = (
-/obj/effect/turf_decal/tile/brown,
-/obj/machinery/light{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/effect/turf_decal/tile/purple{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/quartermaster/miningoffice)
+/turf/open/floor/plasteel/freezer,
+/area/crew_quarters/toilet/restrooms)
"bJV" = (
/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{
dir = 1;
@@ -41357,7 +41490,11 @@
/area/science/robotics/lab)
"bKR" = (
/obj/structure/bookcase/random/religion,
-/turf/open/floor/wood,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
/area/library)
"bKS" = (
/obj/machinery/door/firedoor,
@@ -42977,22 +43114,30 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"bOn" = (
-/obj/machinery/door/airlock/external/glass{
- name = "Shuttle Maintenance Access"
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/maintenance{
+ name = "Bathroom Maintenance";
+ req_access_txt = "12"
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/toilet/restrooms)
"bOo" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/warning/docking,
/turf/open/floor/plating,
/area/hallway/secondary/exit)
"bOp" = (
-/obj/machinery/door/airlock/external/glass{
- name = "Departures Shuttle Dock"
+/obj/structure/cable{
+ icon_state = "2-8"
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating,
+/area/maintenance/aft)
"bOq" = (
/obj/machinery/power/tracker,
/obj/structure/cable,
@@ -44921,8 +45066,12 @@
/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
"bRZ" = (
-/obj/structure/bookcase/random/fiction,
-/turf/open/floor/wood,
+/obj/structure/bookcase/random/nonfiction,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
/area/library)
"bSa" = (
/obj/structure/closet/secure_closet/medical3,
@@ -46565,15 +46714,15 @@
/turf/open/floor/plasteel,
/area/quartermaster/sorting)
"bVt" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
},
-/obj/structure/cable{
- icon_state = "1-4"
+/obj/effect/turf_decal/tile/purple{
+ dir = 4
},
-/turf/open/floor/plating,
-/area/maintenance/starboard/central)
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/turf/open/floor/plasteel,
+/area/quartermaster/miningoffice)
"bVu" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/radio/intercom{
@@ -47897,11 +48046,9 @@
/turf/open/floor/plating,
/area/router)
"bXN" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/obj/machinery/smartfridge/organ/preloaded,
+/turf/closed/wall,
+/area/medical/morgue)
"bXO" = (
/obj/structure/table/glass,
/obj/machinery/reagentgrinder,
@@ -47918,7 +48065,7 @@
/obj/structure/cable{
icon_state = "0-4"
},
-/turf/open/floor/plating,
+/turf/open/floor/plating/airless,
/area/space/nearstation)
"bXQ" = (
/obj/structure/closet/l3closet/scientist,
@@ -47975,7 +48122,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/turf/open/floor/plating,
+/turf/open/floor/plating/airless,
/area/space/nearstation)
"bXW" = (
/obj/structure/disposalpipe/segment{
@@ -48667,8 +48814,10 @@
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/restrooms)
"bZo" = (
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet/restrooms)
+/obj/effect/turf_decal/tile/brown,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/turf/open/floor/plasteel,
+/area/quartermaster/miningoffice)
"bZp" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -48702,13 +48851,13 @@
/turf/open/floor/plating,
/area/hallway/primary/central)
"bZs" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance{
- name = "Bathroom Maintenance";
- req_access_txt = "12"
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/purple{
+ dir = 4
},
-/turf/open/floor/plating,
-/area/crew_quarters/toilet/restrooms)
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/turf/open/floor/plasteel,
+/area/quartermaster/miningoffice)
"bZt" = (
/turf/closed/wall,
/area/maintenance/starboard/aft)
@@ -48855,8 +49004,11 @@
/turf/open/floor/carpet,
/area/library)
"bZK" = (
-/obj/structure/bookcase/random/nonfiction,
-/turf/open/floor/wood,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
/area/library)
"bZL" = (
/obj/machinery/air_sensor/atmos/nitrous_tank,
@@ -52608,9 +52760,8 @@
/turf/open/floor/plasteel,
/area/engine/teg_hot)
"chC" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/maintenance/disposal)
+/turf/closed/wall/r_wall/rust,
+/area/space/nearstation)
"chD" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -53085,6 +53236,17 @@
},
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"ciA" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/purple{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/turf/open/floor/plasteel,
+/area/quartermaster/miningoffice)
"ciB" = (
/obj/structure/frame/computer,
/obj/structure/disposalpipe/segment,
@@ -54651,18 +54813,15 @@
/turf/open/floor/circuit/telecomms/mainframe,
/area/tcommsat/server)
"clO" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/purple{
+ dir = 4
},
-/obj/machinery/door/airlock/engineering{
- name = "Electrical Substation";
- req_access_txt = "10"
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
},
-/turf/open/floor/plating,
-/area/engine/storage_shared{
- name = "Electrical Substation"
- })
+/turf/open/floor/plasteel,
+/area/quartermaster/miningoffice)
"clP" = (
/obj/structure/table,
/obj/item/stock_parts/subspace/amplifier,
@@ -55621,6 +55780,29 @@
icon_state = "panelscorched"
},
/area/maintenance/port/fore)
+"cnG" = (
+/obj/machinery/door/airlock/external/glass{
+ name = "Shuttle Maintenance Access"
+ },
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit)
+"cnH" = (
+/obj/machinery/door/airlock/external/glass{
+ name = "Departures Shuttle Dock"
+ },
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit)
+"cnI" = (
+/turf/open/floor/plating{
+ icon_state = "platingdmg3"
+ },
+/area/space/nearstation)
+"cnJ" = (
+/obj/structure/girder,
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"cnK" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -55630,10 +55812,47 @@
},
/turf/open/floor/plasteel,
/area/engine/teg_hot)
+"cnL" = (
+/obj/structure/closet/crate/science,
+/obj/item/stack/sheet/metal/ten,
+/obj/item/stack/sheet/glass/five,
+/obj/item/stack/rods/twentyfive,
+/obj/item/target/syndicate,
+/obj/item/target/alien,
+/obj/item/target,
+/obj/item/target/clown,
+/turf/open/floor/plasteel,
+/area/science/mixing)
+"cnM" = (
+/obj/machinery/mass_driver{
+ dir = 8;
+ id = "pb_in";
+ name = "Router Driver"
+ },
+/turf/open/floor/plating/airless,
+/area/router/aux)
+"cnN" = (
+/obj/structure/bookcase/random/fiction,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/library)
"cnO" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/engine,
/area/science/storage)
+"cnP" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/item/kirbyplants{
+ icon_state = "plant-21";
+ pixel_y = 3
+ },
+/turf/open/floor/wood,
+/area/library)
"cnS" = (
/obj/structure/cable{
icon_state = "0-2"
@@ -61152,18 +61371,6 @@
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
-"cyd" = (
-/obj/effect/turf_decal/tile/brown{
- dir = 1
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 5
- },
-/turf/open/floor/plasteel,
-/area/quartermaster/miningoffice)
"cye" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -67710,13 +67917,6 @@
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/restrooms)
-"cJg" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet/restrooms)
"cJh" = (
/obj/structure/table,
/obj/structure/bedsheetbin/towel,
@@ -67815,16 +68015,6 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall/r_wall,
-/area/engine/engineering{
- name = "Engine Room"
- })
-"cJq" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/obj/machinery/suit_storage_unit/engine,
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel,
/area/engine/engineering{
name = "Engine Room"
})
@@ -69799,13 +69989,6 @@
"cNB" = (
/turf/open/floor/plating,
/area/quartermaster/miningdock/airless)
-"cNC" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1
- },
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet/restrooms)
"cND" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel,
@@ -85536,8 +85719,8 @@ aaU
aaa
aaU
aEa
-cMK
-bxq
+aXm
+aXs
bxC
akI
bxK
@@ -92528,7 +92711,7 @@ aaa
aaa
aaa
aaa
-aaU
+aaa
bcy
bed
boJ
@@ -93042,11 +93225,11 @@ aaa
aaa
aaa
aaa
-aaa
+aaU
+bQe
+aaU
aaU
aaU
-aaa
-aaa
bcw
bdf
bdf
@@ -93299,13 +93482,13 @@ aaa
aaa
aaa
aaa
-aaa
-bim
+aaU
+aye
+aaU
aaU
aaU
-aaa
bcw
-bhy
+cnL
bdf
bpR
bJw
@@ -93557,10 +93740,10 @@ aaa
aaa
aaa
aaU
-aaa
-aaa
-aaU
-aaU
+chC
+abp
+abp
+abp
bcy
biK
bdf
@@ -93814,10 +93997,10 @@ aaa
aaa
aaa
aaU
-aaa
-aaa
-aaa
-aaU
+brs
+brs
+brs
+brs
bcw
biT
bdf
@@ -94071,8 +94254,8 @@ aaU
aaU
aaU
aaU
-aaa
-aaa
+cnI
+cnJ
bgW
bgW
bgW
@@ -97834,16 +98017,16 @@ aaa
aaa
aaa
aaa
-aak
-aak
-aak
+aaU
+aaa
+aaU
aaa
aaa
aaa
aaa
aaa
aaa
-akN
+bhy
alq
alq
apn
@@ -98169,7 +98352,7 @@ aZy
aZy
aZy
aZy
-beJ
+aXg
bfd
bjg
bUt
@@ -98348,9 +98531,9 @@ aaa
aaa
aaa
aaa
-aWj
-aWj
-aWj
+aaU
+aaa
+aaU
aaa
aaa
aaa
@@ -98598,16 +98781,16 @@ aaU
aar
abM
ace
-aWj
-aWj
-aWj
-aWj
-aWj
-aWj
-aWj
-aWj
+aaU
+aaU
+aaU
+aaU
+aaU
+aaU
+aaU
+aaU
abp
-aWj
+aaU
aaU
aaU
aaU
@@ -98855,16 +99038,16 @@ aaU
aar
abR
ace
-aWj
+aaU
aaa
aaa
aaa
aaa
aaa
aaa
-aWj
-aWj
-aWj
+aaU
+aaa
+aaU
aaa
aaa
aaa
@@ -99112,7 +99295,7 @@ aaU
aar
abM
acf
-aWj
+aaU
aaa
aaa
aaa
@@ -99368,8 +99551,8 @@ aaa
aaU
aaa
acM
-aWj
-aWj
+aaa
+aaU
aaa
aaa
aaa
@@ -99454,8 +99637,8 @@ bWi
aWh
cmN
aZy
-aXg
-bZK
+baE
+bRZ
bZF
csH
bay
@@ -99625,7 +99808,7 @@ aaa
aaU
aaa
aaU
-aWj
+aaa
aaU
aaa
aaa
@@ -99712,7 +99895,7 @@ baS
bbr
aZy
bJC
-bZF
+bZK
bZF
cjx
bay
@@ -99882,7 +100065,7 @@ aaa
aaU
aaa
aaU
-aWj
+aaa
aaU
aaa
aaa
@@ -99969,10 +100152,10 @@ cdE
bbs
aZy
bKR
-bRZ
+cnN
bZF
cCJ
-baE
+cnP
bZS
bZS
bGI
@@ -100139,7 +100322,7 @@ aaa
aaU
aaa
aaU
-aWj
+aaa
aaU
add
adC
@@ -100396,7 +100579,7 @@ aaa
aaU
aaa
aaU
-aWj
+aaa
aaU
adf
aad
@@ -100653,7 +100836,7 @@ aaa
aaU
aaa
aaU
-aWj
+aaa
aaU
adf
aad
@@ -100910,7 +101093,7 @@ aaa
aaU
aaa
aaU
-aWj
+aaa
aaU
adf
aad
@@ -101167,7 +101350,7 @@ aaa
aaU
aaa
aaU
-aWj
+aaa
aaU
adf
aad
@@ -101424,7 +101607,7 @@ aaa
aaU
aaa
aaU
-aWj
+aaa
aaU
adf
aad
@@ -101681,7 +101864,7 @@ aaa
aaU
aaa
aaU
-aWj
+aaa
aaU
adh
adC
@@ -101938,7 +102121,7 @@ aaa
aaU
aaa
aaU
-aWj
+aaa
aaU
aaa
aaa
@@ -102193,9 +102376,9 @@ aaa
aaa
aaa
aaU
-aar
aaU
-aWj
+aaU
+aaU
aaU
aaU
aaU
@@ -102450,9 +102633,9 @@ aaa
aaa
aaa
abp
-aar
+akN
aTd
-aWj
+aaa
abp
aaa
aaU
@@ -102707,9 +102890,9 @@ aaa
aaa
aaa
aaU
-aar
aaU
-aWj
+aaU
+aaU
aaU
aaU
aaU
@@ -102966,7 +103149,7 @@ aaa
aaU
aaa
aaU
-aWj
+aaa
aaU
aaa
aaa
@@ -103223,7 +103406,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaU
aaa
adj
@@ -103480,7 +103663,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaU
adj
adj
@@ -103737,7 +103920,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaU
adj
adF
@@ -103994,7 +104177,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaU
adj
adF
@@ -104251,7 +104434,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaU
adj
adF
@@ -104285,12 +104468,12 @@ aJF
aJF
aJF
aJF
-bEr
-bEK
-bEK
-bGu
-bHi
aHa
+aHp
+aHp
+aIJ
+aLc
+aMo
cBj
cBw
cBF
@@ -104508,7 +104691,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaU
adj
adF
@@ -104547,15 +104730,15 @@ aim
aim
aEh
aEq
-aHp
-aIJ
-aLc
-aQS
-aQS
-aQS
-aQS
+aMG
aQS
+aWr
aWu
+aWu
+aWu
+aWu
+aWu
+bbQ
aWA
aXd
bre
@@ -104765,7 +104948,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaU
adj
adF
@@ -105022,7 +105205,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaU
adj
adj
@@ -105279,7 +105462,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaU
adj
@@ -105536,7 +105719,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaa
@@ -105660,7 +105843,7 @@ cbm
byQ
bHK
cGU
-byQ
+bXN
bHK
bIu
bJh
@@ -105793,7 +105976,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaa
@@ -106050,7 +106233,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaa
@@ -106307,7 +106490,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaa
@@ -106564,7 +106747,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaa
@@ -106821,7 +107004,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaa
@@ -107078,7 +107261,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaa
@@ -107191,11 +107374,11 @@ cIA
cIP
cIY
cJf
-cJg
-cNC
-bZo
-bZs
-bXN
+bGu
+bHi
+bJU
+bOn
+bOp
bJp
bJp
cyT
@@ -107335,7 +107518,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaa
@@ -107592,7 +107775,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaU
@@ -107849,7 +108032,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaa
@@ -108104,9 +108287,9 @@ aaa
aaa
aaa
aaU
-aar
+aaU
aTd
-aWj
+aaU
aaU
aaU
aaU
@@ -108363,7 +108546,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaa
@@ -108620,7 +108803,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaa
@@ -108877,7 +109060,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaa
@@ -109013,7 +109196,7 @@ bme
bme
bme
bme
-bOn
+cnG
bme
bOo
aaa
@@ -109134,7 +109317,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaa
@@ -109272,7 +109455,7 @@ bOe
bOi
cnd
bOl
-bOp
+cnH
aaa
aaa
aaa
@@ -109391,7 +109574,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaa
@@ -109648,7 +109831,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aae
aaa
aaa
@@ -109786,7 +109969,7 @@ bme
bOh
cne
bOm
-bOp
+cnH
aaa
aaa
aaa
@@ -109905,7 +110088,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaa
@@ -110162,7 +110345,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaa
@@ -110242,7 +110425,7 @@ bsz
aej
agc
agT
-cJq
+bFg
apm
aqS
arP
@@ -110419,7 +110602,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaa
@@ -110480,7 +110663,7 @@ bpH
ang
coh
cfy
-clO
+bvb
aRu
aSv
aSy
@@ -110498,7 +110681,7 @@ cxa
bPr
sVC
aNH
-bbQ
+bEr
cJA
aqO
anE
@@ -110676,7 +110859,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaa
@@ -110755,7 +110938,7 @@ cxb
bsz
aej
agC
-aoJ
+bEK
cJB
apm
aqT
@@ -110933,7 +111116,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaa
@@ -111188,9 +111371,9 @@ aaa
aaa
aaa
aaU
-aav
+aaU
aTd
-aWj
+aaU
aaU
aaU
aaU
@@ -111328,7 +111511,7 @@ bme
bOi
bOj
bOl
-bOp
+cnH
cnE
aaa
aaa
@@ -111447,7 +111630,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaa
@@ -111704,7 +111887,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaU
@@ -111842,7 +112025,7 @@ bOe
bOh
cnc
bOm
-bOp
+cnH
aaa
aaa
aaa
@@ -111961,7 +112144,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaa
@@ -111982,7 +112165,7 @@ afm
apT
adS
bEu
-ahN
+aif
afa
aha
ahx
@@ -112097,7 +112280,7 @@ bme
bme
bme
bme
-bOn
+cnG
bme
bOo
aaa
@@ -112218,7 +112401,7 @@ aaa
aaa
aaa
aaU
-aWj
+aaa
aaa
aaa
aaa
@@ -112239,7 +112422,7 @@ aiV
anv
aec
axS
-ahN
+aif
afK
ahb
ahx
@@ -112288,7 +112471,7 @@ bxP
arE
aMI
cgX
-chC
+bim
cik
bwW
bsT
@@ -112475,7 +112658,7 @@ aaa
aaU
aaa
aaU
-aWj
+aaa
aaU
aaa
aaa
@@ -112496,7 +112679,7 @@ aja
aoM
aec
agi
-ahN
+aif
afK
ahc
ahx
@@ -112730,9 +112913,9 @@ aaa
aaa
aaa
aaU
-aav
aaU
-aWj
+aaU
+aaU
aaU
aaU
aaU
@@ -112753,7 +112936,7 @@ bEp
bEp
bEp
bEp
-ahN
+aif
afK
ahd
ahx
@@ -112798,8 +112981,8 @@ arE
att
cqr
arE
-byt
-bzo
+byv
+bAN
aMI
cgZ
cif
@@ -112987,9 +113170,9 @@ aaa
aaa
aaa
abp
-aav
+aaa
aTd
-aWj
+aaa
abp
aaa
aaa
@@ -113010,7 +113193,7 @@ ajS
aHj
bvm
ahP
-ahN
+aif
afK
afK
ahT
@@ -113055,7 +113238,7 @@ att
btP
bwo
arE
-byu
+bAd
arE
aMI
cha
@@ -113244,19 +113427,19 @@ aaa
aaa
aaa
aaU
-aav
aaU
-aWj
-aWj
-aWj
-aWj
-aWj
-aWj
-aWj
-aWj
-aWj
-aWj
-aWj
+aaU
+aaU
+aaU
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaU
aaV
aaU
aaU
@@ -113267,7 +113450,7 @@ ahP
ahP
bzp
ahP
-ahN
+aif
aiB
afK
ahU
@@ -113306,13 +113489,13 @@ aYF
beQ
bjw
bwu
-bAd
-aMo
-aMG
-bVt
+bnl
bwp
-bvb
-byv
+bwM
+bxq
+byt
+byu
+bAz
ceQ
cgT
chc
@@ -113503,7 +113686,7 @@ aaa
aaU
aaa
aaU
-aWj
+aaa
aaU
aaa
aaa
@@ -113524,7 +113707,7 @@ akn
aJR
bEg
ahP
-aif
+aoJ
ass
afK
afK
@@ -113760,7 +113943,7 @@ aaa
aaU
aaa
aaU
-aWj
+aaa
aaU
aaa
aaa
@@ -114017,7 +114200,7 @@ aaa
aaU
aaa
aaU
-aWj
+aaa
aaU
aaa
aaa
@@ -114274,7 +114457,7 @@ aaa
aaU
aaa
aaU
-aWj
+aaa
aaU
aaa
aaa
@@ -114531,7 +114714,7 @@ aaa
aaU
aaa
aaU
-aWj
+aaa
aaU
aaa
aaa
@@ -114788,7 +114971,7 @@ aaa
aaU
aaa
aaU
-aWj
+aaa
aaU
aaa
aaa
@@ -115045,7 +115228,7 @@ aaa
aaU
aaa
aaU
-aWj
+aaa
aaU
aaa
aaa
@@ -115302,7 +115485,7 @@ aaa
aaU
aaa
aaU
-aWj
+aaa
aaU
aaa
aaa
@@ -115559,7 +115742,7 @@ aaa
aaU
aaa
aaU
-aWj
+aaa
aaU
aaa
aaa
@@ -115816,7 +115999,7 @@ aaa
aaU
aaa
aaU
-aWj
+aaa
aaU
aaa
aaa
@@ -116073,7 +116256,7 @@ aaa
aaU
aaa
aaU
-aWj
+aaa
aaU
aaa
aaa
@@ -116330,7 +116513,7 @@ aaa
aaU
aaa
ahv
-aWj
+aaa
aaU
aaa
aaa
@@ -116585,7 +116768,7 @@ aaa
aaa
aaa
aaU
-aav
+cnM
abM
acj
aaU
@@ -119537,13 +119720,13 @@ cjb
cxV
cyb
cyc
-cyd
-bFg
-bHR
-bHR
-bHR
-bJU
-bHR
+bVt
+bZo
+bZs
+bZs
+bZs
+ciA
+clO
bHR
bLb
boK
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index d0db7b142a..9a9a4b88a9 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -1464,19 +1464,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/machinery/door/airlock/external{
- name = "External Solar Access";
- req_access_txt = "10; 13"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
+/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/maintenance/solars/starboard/fore)
"acQ" = (
@@ -17256,19 +17244,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/machinery/door/airlock/external{
- name = "External Solar Access";
- req_one_access_txt = "13; 24; 10"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
+/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/maintenance/solars/port/fore)
"aIk" = (
@@ -25107,14 +25083,8 @@
/turf/open/floor/plasteel/dark,
/area/security/execution/education)
"aUK" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/machinery/door/airlock/external{
- name = "Security External Airlock";
- req_access_txt = "63"
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/structure/sign/warning/vacuum/external{
+ pixel_x = 32
},
/turf/open/floor/plating,
/area/security/prison)
@@ -43327,21 +43297,16 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai)
"bzd" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/cobweb,
-/obj/structure/closet/emcloset/anchored,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
+/obj/structure/lattice,
+/turf/closed/wall,
+/area/construction/mining/aux_base)
"bze" = (
-/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"bzf" = (
-/obj/machinery/light/small{
- dir = 4
- },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/emcloset/anchored,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
@@ -44447,122 +44412,83 @@
/turf/open/floor/plasteel/dark,
/area/engine/gravity_generator)
"bAI" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 6
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/gravity_generator)
-"bAJ" = (
-/obj/structure/cable/white{
- icon_state = "0-2"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/sign/warning/electricshock{
- pixel_y = 32
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/engine/gravity_generator)
-"bAK" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light{
- dir = 1
- },
-/obj/machinery/status_display/evac{
- pixel_y = 32
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"bAL" = (
-/obj/machinery/power/apc/highcap/five_k{
- areastring = "/area/engine/gravity_generator";
- dir = 1;
- name = "Gravity Generator APC";
- pixel_y = 24
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"bAM" = (
-/obj/machinery/power/terminal{
- dir = 4
- },
-/obj/item/radio/intercom{
- name = "Station Intercom";
- pixel_y = 26
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 10
- },
-/obj/structure/cable/white{
- icon_state = "0-2"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"bAN" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/machinery/power/smes{
- charge = 5e+006
- },
-/obj/structure/sign/nanotrasen{
- pixel_y = 32
- },
-/obj/structure/extinguisher_cabinet{
- pixel_x = 26
- },
-/obj/structure/cable{
- icon_state = "0-2"
- },
+/obj/structure/closet/firecloset,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"bAO" = (
-/turf/closed/wall,
-/area/engine/gravity_generator)
-"bAP" = (
-/obj/machinery/door/firedoor,
+/area/construction/mining/aux_base)
+"bAJ" = (
+/obj/structure/reagent_dispensers/watertank,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/construction/mining/aux_base)
+"bAK" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
+ dir = 8
},
/obj/machinery/door/airlock/external{
- name = "External Airlock";
- req_access_txt = "13"
+ name = "External Solar Access";
+ req_access_txt = "10; 13"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/solars/starboard/fore)
+"bAL" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/space,
+/area/solar/port/fore)
+"bAM" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/obj/machinery/door/airlock/external{
+ name = "External Solar Access";
+ req_one_access_txt = "13; 24; 10"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/solars/port/fore)
+"bAN" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/door/airlock/external{
+ name = "Security External Airlock";
+ req_access_txt = "63"
},
-/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/turf/open/floor/plating,
+/area/security/prison)
+"bAO" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/effect/turf_decal/delivery,
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"bAP" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"bAQ" = (
@@ -45609,7 +45535,7 @@
},
/turf/open/floor/circuit/green,
/area/ai_monitored/turret_protected/ai)
-"bCw" = (
+"bCx" = (
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -45623,37 +45549,9 @@
},
/turf/open/floor/plasteel/dark,
/area/engine/gravity_generator)
-"bCx" = (
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/gravity_generator)
-"bCy" = (
-/obj/effect/turf_decal/bot_white/left,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/gravity_generator)
"bCz" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -45668,26 +45566,91 @@
/turf/open/floor/plasteel/dark,
/area/engine/gravity_generator)
"bCA" = (
-/obj/structure/cable/white,
/obj/structure/cable/white{
icon_state = "0-2"
},
/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/sign/warning/electricshock{
+ pixel_y = 32
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/engine/gravity_generator)
"bCB" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/machinery/status_display/evac{
+ pixel_y = 32
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/obj/effect/turf_decal/stripes/line{
- dir = 8
+ dir = 9
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"bCC" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/engine/gravity_generator";
+ dir = 1;
+ name = "Gravity Generator APC";
+ pixel_y = 24
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/structure/cable{
- icon_state = "1-4"
+ icon_state = "0-2"
},
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"bCD" = (
+/obj/machinery/power/terminal{
+ dir = 4
+ },
+/obj/item/radio/intercom{
+ name = "Station Intercom";
+ pixel_y = 26
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
+ },
+/obj/structure/cable/white{
+ icon_state = "0-2"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"bCE" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/machinery/power/smes{
+ charge = 5e+006
+ },
+/obj/structure/sign/nanotrasen{
+ pixel_y = 32
+ },
+/obj/structure/extinguisher_cabinet{
+ pixel_x = 26
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"bCF" = (
+/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -45698,80 +45661,26 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"bCD" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable/white{
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"bCE" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"bCF" = (
-/obj/structure/sign/warning/radiation,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/closed/wall/r_wall,
-/area/engine/gravity_generator)
-"bCG" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm{
- pixel_y = 23
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 1
- },
-/obj/machinery/camera{
- c_tag = "Engineering - Gravity Generator Foyer";
- dir = 4;
- name = "engineering camera"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
/area/engine/gravity_generator)
"bCH" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/machinery/door/airlock/external{
+ name = "External Airlock";
+ req_access_txt = "13"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
},
-/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"bCI" = (
-/obj/structure/closet/radiation,
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/structure/extinguisher_cabinet{
- pixel_x = 26
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/turf/open/floor/plasteel,
+/turf/closed/wall,
/area/engine/gravity_generator)
"bCJ" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -45784,9 +45693,6 @@
icon_state = "0-4"
},
/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
/turf/open/floor/plating,
/area/engine/break_room)
"bCL" = (
@@ -45801,13 +45707,13 @@
/obj/structure/cable/white{
icon_state = "2-8"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 1
- },
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
/turf/open/floor/plasteel,
/area/engine/break_room)
"bCM" = (
@@ -47193,11 +47099,8 @@
/turf/open/floor/circuit/green,
/area/ai_monitored/turret_protected/ai)
"bEn" = (
-/obj/machinery/light{
- dir = 8
- },
-/obj/structure/sign/warning/radiation{
- pixel_x = -32
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -47212,112 +47115,124 @@
/turf/open/floor/plasteel/dark,
/area/engine/gravity_generator)
"bEo" = (
-/turf/open/floor/circuit/green,
-/area/engine/gravity_generator)
-"bEp" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/command/glass{
- name = "Gravity Generator Chamber";
- req_access_txt = "19; 61"
+/obj/effect/turf_decal/bot_white,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
},
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
dir = 4
},
-/obj/structure/cable/white{
- icon_state = "1-4"
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
},
-/obj/structure/cable/white{
- icon_state = "2-4"
- },
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
/area/engine/gravity_generator)
"bEq" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/structure/cable/white{
- icon_state = "4-8"
- },
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"bEr" = (
-/obj/machinery/holopad,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/bot,
-/obj/structure/cable/white{
- icon_state = "4-8"
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-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
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"bEs" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/obj/structure/cable/white{
- icon_state = "1-4"
+ icon_state = "1-2"
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/structure/cable/white{
- icon_state = "1-8"
- },
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"bEt" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/white{
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"bEu" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/highsecurity{
- name = "Gravity Generator Room";
- req_access_txt = "19;23"
- },
-/obj/structure/cable/white{
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"bEv" = (
-/obj/structure/cable/white{
- icon_state = "2-4"
- },
-/obj/structure/cable/white{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"bEw" = (
-/obj/machinery/holopad,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/white{
- icon_state = "4-8"
+/obj/structure/cable{
+ icon_state = "1-8"
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
-"bEx" = (
+"bEu" = (
+/obj/structure/sign/warning/radiation,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/closed/wall/r_wall,
+/area/engine/gravity_generator)
+"bEv" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm{
+ pixel_y = 23
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
+ },
+/obj/machinery/camera{
+ c_tag = "Engineering - Gravity Generator Foyer";
+ dir = 4;
+ name = "engineering camera"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/structure/cable/white{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"bEw" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/delivery,
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 6
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"bEx" = (
+/obj/structure/closet/radiation,
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/structure/extinguisher_cabinet{
+ pixel_x = 26
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
},
-/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"bEy" = (
@@ -47330,9 +47245,6 @@
req_access_txt = "10"
},
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -47342,18 +47254,21 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/engine/break_room)
"bEz" = (
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
/obj/effect/turf_decal/stripes/end{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/engine/break_room)
"bEA" = (
@@ -47363,27 +47278,26 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/engine/break_room)
"bEB" = (
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 6
+ },
/turf/open/floor/plasteel,
/area/engine/break_room)
"bEC" = (
@@ -47393,25 +47307,25 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 1
- },
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/engine/break_room)
"bED" = (
+/obj/effect/turf_decal/stripes/end{
+ dir = 4
+ },
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/stripes/end{
- dir = 4
- },
/turf/open/floor/plasteel,
/area/engine/break_room)
"bEE" = (
@@ -48446,22 +48360,15 @@
/turf/open/floor/plasteel/dark,
/area/aisat)
"bFW" = (
-/obj/machinery/gravity_generator/main/station,
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/circuit/green,
/area/engine/gravity_generator)
"bFX" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/structure/sign/warning/radiation{
+ pixel_x = -32
+ },
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -48475,89 +48382,89 @@
/turf/open/floor/plasteel/dark,
/area/engine/gravity_generator)
"bFY" = (
-/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"bFZ" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- 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/holopad,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/bot,
+/obj/structure/cable/white{
+ icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"bGa" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 1
+/obj/structure/cable/white{
+ icon_state = "1-4"
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/structure/cable/white{
+ icon_state = "1-8"
+ },
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"bGb" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/port_gen/pacman,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"bGc" = (
-/obj/structure/sign/warning/radiation,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/closed/wall/r_wall,
-/area/engine/gravity_generator)
-"bGd" = (
/obj/structure/cable/white{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"bGe" = (
-/obj/machinery/status_display/evac{
- pixel_x = 32;
- pixel_y = -32
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 1
+ icon_state = "4-8"
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
-"bGf" = (
-/obj/structure/closet/radiation,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 9
+"bGc" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/highsecurity{
+ name = "Gravity Generator Room";
+ req_access_txt = "19;23"
+ },
+/obj/structure/cable/white{
+ icon_state = "4-8"
},
-/obj/machinery/light/small,
/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"bGd" = (
+/obj/structure/cable/white{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/delivery,
+/obj/structure/cable/white{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"bGe" = (
+/obj/machinery/holopad,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
+"bGf" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/light/small,
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
"bGg" = (
/obj/machinery/firealarm{
dir = 4;
@@ -48565,6 +48472,9 @@
},
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/engine/break_room)
"bGh" = (
@@ -48579,6 +48489,9 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark/corner,
/area/engine/break_room)
"bGi" = (
@@ -48586,15 +48499,16 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/open/floor/plasteel/dark/corner,
/area/engine/break_room)
"bGj" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
- },
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 8
+ },
/turf/open/floor/plasteel/dark/corner,
/area/engine/break_room)
"bGk" = (
@@ -49624,9 +49538,7 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai)
"bHN" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5
- },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -49641,68 +49553,50 @@
/area/engine/gravity_generator)
"bHO" = (
/obj/structure/cable/white,
+/obj/structure/cable/white{
+ icon_state = "0-2"
+ },
/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/sign/warning/electricshock{
- pixel_y = -32
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
/turf/open/floor/plating,
/area/engine/gravity_generator)
"bHP" = (
-/obj/machinery/light,
-/obj/machinery/status_display/evac{
- pixel_y = -32
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/machinery/camera{
- c_tag = "Engineering - Gravity Generator";
- dir = 1;
- name = "engineering camera"
- },
+/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
- dir = 10
+ dir = 8
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"bHQ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm{
- dir = 1;
- pixel_y = -22
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
-/obj/effect/turf_decal/stripes/line,
+/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/gravity_generator)
"bHR" = (
-/obj/machinery/newscaster{
- pixel_y = -32
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 9
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 1
},
/obj/effect/turf_decal/stripes/line{
- dir = 6
+ dir = 4
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"bHS" = (
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = 24
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/port_gen/pacman,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
},
-/obj/machinery/light_switch{
- pixel_y = -26
- },
-/obj/structure/table/reinforced,
-/obj/item/stack/sheet/plasteel/twenty,
-/obj/item/wrench,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
@@ -49710,27 +49604,23 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/machinery/door/poddoor/preopen{
- id = "transitlock";
- name = "Transit Tube Lockdown Door"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
- dir = 1
+ dir = 10
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"bHU" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/poddoor/preopen{
- id = "transitlock";
- name = "Transit Tube Lockdown Door"
+/obj/machinery/status_display/evac{
+ pixel_x = 32;
+ pixel_y = -32
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 4
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
@@ -51017,27 +50907,30 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/machinery/door/airlock/hatch{
- name = "MiniSat Transit Tube Access";
- req_one_access_txt = "32;19"
+/obj/machinery/door/poddoor/preopen{
+ id = "transitlock";
+ name = "Transit Tube Lockdown Door"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/neutral{
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/transit_tube)
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
"bJP" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/poddoor/preopen{
+ id = "transitlock";
+ name = "Transit Tube Lockdown Door"
+ },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall/r_wall,
-/area/engine/transit_tube)
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
"bJQ" = (
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/tile/neutral{
@@ -52186,50 +52079,54 @@
/turf/closed/wall/r_wall,
/area/engine/transit_tube)
"bLG" = (
-/obj/structure/closet/emcloset/anchored,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/command/glass{
+ name = "Gravity Generator Chamber";
+ req_access_txt = "19; 61"
},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
+/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/turf/open/floor/plasteel/dark,
-/area/engine/transit_tube)
-"bLH" = (
-/obj/machinery/status_display/evac,
-/turf/closed/wall,
-/area/engine/transit_tube)
-"bLI" = (
-/obj/machinery/power/apc/highcap/five_k{
- areastring = "/area/engine/transit_tube";
- dir = 1;
- name = "Transit Tube Access APC";
- pixel_y = 24
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
+/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
/obj/structure/cable/white{
- icon_state = "0-4"
+ icon_state = "1-4"
+ },
+/obj/structure/cable/white{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"bLH" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/closed/wall,
+/area/engine/break_room)
+"bLI" = (
+/obj/machinery/gravity_generator/main/station,
+/obj/effect/turf_decal/bot_white,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/engine/transit_tube)
+/area/engine/gravity_generator)
"bLJ" = (
/obj/structure/cable/white{
icon_state = "1-2"
},
+/obj/machinery/door/airlock/hatch{
+ name = "MiniSat Transit Tube Access";
+ req_one_access_txt = "32;19"
+ },
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -52241,35 +52138,11 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/obj/structure/cable/white{
- icon_state = "1-8"
- },
/turf/open/floor/plasteel/dark,
/area/engine/transit_tube)
"bLK" = (
-/obj/item/kirbyplants/random,
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = 24
- },
-/obj/machinery/button/door{
- id = "transitlock";
- name = "Transit Tube Lockdown Control";
- pixel_y = 26;
- req_access_txt = "39; 19"
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/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/dark,
+/turf/closed/wall/r_wall,
/area/engine/transit_tube)
"bLL" = (
/obj/item/kirbyplants/random,
@@ -53595,29 +53468,14 @@
/turf/open/space,
/area/space/nearstation)
"bNH" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/cable/white{
- icon_state = "2-4"
+/obj/structure/sign/warning/radiation,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 6
- },
-/turf/open/space,
-/area/space/nearstation)
+/turf/closed/wall/r_wall,
+/area/engine/gravity_generator)
"bNI" = (
-/obj/structure/cable/white{
- icon_state = "4-8"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/machinery/door/airlock/hatch{
- name = "MiniSat Exterior Access";
- req_one_access_txt = "32;19"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
+/obj/structure/closet/emcloset/anchored,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -53631,12 +53489,6 @@
/turf/open/floor/plasteel/dark,
/area/engine/transit_tube)
"bNJ" = (
-/obj/structure/cable/white{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -53647,39 +53499,21 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/structure/closet/firecloset,
/turf/open/floor/plasteel/dark,
/area/engine/transit_tube)
"bNK" = (
-/obj/structure/cable/white{
- icon_state = "4-8"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/machinery/door/airlock/hatch{
- name = "MiniSat Exterior Access";
- req_one_access_txt = "32;19"
- },
-/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
- },
-/turf/open/floor/plasteel/dark,
+/obj/machinery/status_display/evac,
+/turf/closed/wall,
/area/engine/transit_tube)
"bNL" = (
-/obj/structure/cable/white{
- icon_state = "4-8"
+/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/engine/transit_tube";
+ dir = 1;
+ name = "Transit Tube Access APC";
+ pixel_y = 24
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -53690,15 +53524,16 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/structure/cable/white{
+ icon_state = "0-4"
+ },
/turf/open/floor/plasteel/dark,
/area/engine/transit_tube)
"bNM" = (
/obj/structure/cable/white{
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 9
+ icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -53709,11 +53544,22 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/structure/cable/white{
+ icon_state = "1-8"
+ },
/turf/open/floor/plasteel/dark,
/area/engine/transit_tube)
"bNN" = (
-/obj/machinery/light/small{
- dir = 4
+/obj/item/kirbyplants/random,
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = 24
+ },
+/obj/machinery/button/door{
+ id = "transitlock";
+ name = "Transit Tube Lockdown Control";
+ pixel_y = 26;
+ req_access_txt = "39; 19"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/tile/neutral{
@@ -54901,9 +54747,38 @@
/turf/open/space,
/area/space/nearstation)
"bPL" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/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/light/small,
-/obj/structure/sign/warning/vacuum{
- pixel_x = -32
+/turf/open/floor/plasteel/dark,
+/area/engine/transit_tube)
+"bPM" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/machinery/door/airlock/hatch{
+ name = "MiniSat Exterior Access";
+ req_one_access_txt = "32;19"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -54917,20 +54792,11 @@
},
/turf/open/floor/plasteel/dark,
/area/engine/transit_tube)
-"bPM" = (
-/turf/closed/wall,
-/area/engine/transit_tube)
"bPN" = (
-/obj/item/kirbyplants/random,
-/obj/machinery/airalarm{
- dir = 4;
- pixel_x = -23
- },
-/obj/machinery/flasher{
- id = "AI";
- pixel_x = -26;
- pixel_y = -26
+/obj/structure/cable/white{
+ icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -54944,6 +54810,9 @@
/turf/open/floor/plasteel/dark,
/area/engine/transit_tube)
"bPO" = (
+/obj/structure/cable/white{
+ icon_state = "1-8"
+ },
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -54954,15 +54823,16 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/engine/transit_tube)
"bPP" = (
-/obj/item/kirbyplants/random,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/light_switch{
- pixel_x = 22;
- pixel_y = -10
+/obj/machinery/light/small{
+ dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -56192,13 +56062,15 @@
/turf/open/space,
/area/space/nearstation)
"bRV" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/engine/transit_tube)
-"bRW" = (
-/obj/machinery/door/airlock/hatch{
- name = "MiniSat Transit Tube Access";
- req_one_access_txt = "32;19"
+/obj/item/kirbyplants/random,
+/obj/machinery/airalarm{
+ dir = 4;
+ pixel_x = -23
+ },
+/obj/machinery/flasher{
+ id = "AI";
+ pixel_x = -26;
+ pixel_y = -26
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -56212,10 +56084,38 @@
},
/turf/open/floor/plasteel/dark,
/area/engine/transit_tube)
+"bRW" = (
+/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/supply/hidden,
+/turf/open/floor/plasteel/dark,
+/area/engine/transit_tube)
"bRX" = (
-/obj/effect/spawner/structure/window/reinforced,
+/obj/item/kirbyplants/random,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plating,
+/obj/machinery/light_switch{
+ pixel_x = 22;
+ pixel_y = -10
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
/area/engine/transit_tube)
"bRY" = (
/obj/machinery/keycard_auth{
@@ -57376,22 +57276,9 @@
/turf/open/space,
/area/space/nearstation)
"bTL" = (
-/obj/structure/window/reinforced{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
},
-/obj/structure/table/reinforced,
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/machinery/camera{
- c_tag = "AI Satellite - Transit Tube";
- name = "ai camera";
- network = list("minisat");
- start_active = 1
- },
-/obj/item/clipboard,
-/obj/item/folder/blue,
-/obj/item/pen,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -57403,30 +57290,16 @@
dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/engine/transit_tube)
+/area/engine/gravity_generator)
"bTM" = (
-/obj/structure/chair/office/dark{
- dir = 8
- },
-/obj/machinery/flasher{
- id = "AI";
- pixel_x = -26;
- pixel_y = 26
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
/area/engine/transit_tube)
"bTN" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/machinery/door/airlock/hatch{
+ name = "MiniSat Transit Tube Access";
+ req_one_access_txt = "32;19"
+ },
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -57437,22 +57310,13 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/engine/transit_tube)
"bTO" = (
-/obj/item/kirbyplants/random,
+/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/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/dark,
+/turf/open/floor/plating,
/area/engine/transit_tube)
"bTP" = (
/obj/machinery/computer/station_alert{
@@ -59145,9 +59009,6 @@
/turf/open/floor/plasteel/dark,
/area/engine/transit_tube)
"bWc" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -59158,10 +59019,15 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 1
+ },
+/obj/structure/chair/office/light{
+ dir = 8
+ },
/turf/open/floor/plasteel/dark,
/area/engine/transit_tube)
"bWd" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -59172,6 +59038,12 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/engine/transit_tube)
"bWe" = (
@@ -60847,6 +60719,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
/turf/open/floor/plasteel/dark,
/area/engine/transit_tube)
"bYp" = (
@@ -72264,7 +72139,7 @@
pixel_y = 32
},
/turf/open/space,
-/area/space/nearstation)
+/area/space)
"crE" = (
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
@@ -83035,22 +82910,16 @@
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"cJI" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+/obj/structure/cable/white,
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/sign/warning/electricshock{
+ pixel_y = -32
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/machinery/door/airlock/external{
- name = "External Airlock";
- req_access_txt = "13"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/maintenance/port)
+/turf/open/floor/plating,
+/area/engine/gravity_generator)
"cJJ" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
@@ -108364,19 +108233,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/machinery/door/airlock/external{
- name = "External Solar Access";
- req_access_txt = "10; 13"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
+/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/maintenance/solars/starboard/aft)
"dBN" = (
@@ -115581,6 +115438,10 @@
/turf/open/floor/plasteel,
/area/maintenance/port/aft)
"dOc" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/maintenance/port/aft)
+"dOd" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
@@ -115597,11 +115458,6 @@
},
/turf/open/floor/plasteel,
/area/maintenance/port/aft)
-"dOd" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel,
-/area/maintenance/port/aft)
"dOe" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral{
@@ -115610,6 +115466,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel{
heat_capacity = 1e+006
},
@@ -122648,19 +122505,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/machinery/door/airlock/external{
- name = "External Solar Access";
- req_access_txt = "10; 13"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
+/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/maintenance/solars/port/aft)
"ebE" = (
@@ -124004,14 +123849,16 @@
/turf/open/floor/plasteel/grimy,
/area/chapel/office)
"edX" = (
-/obj/machinery/door/airlock/maintenance_hatch{
- name = "Maintenance Hatch";
- req_access_txt = "12"
- },
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/machinery/door/airlock/external{
+ name = "External Airlock";
+ req_access_txt = "13"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/door/firedoor,
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"edY" = (
@@ -124731,16 +124578,6 @@
/turf/open/floor/carpet,
/area/chapel/office)
"eft" = (
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/machinery/door/airlock/external{
- name = "External Airlock";
- req_access_txt = "13"
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"efu" = (
@@ -125581,6 +125418,24 @@
/obj/machinery/chem_dispenser/apothecary,
/turf/open/floor/plasteel/dark,
/area/medical/medbay/central)
+"eMb" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate{
+ icon_state = "crateopen"
+ },
+/obj/item/flashlight,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel{
+ heat_capacity = 1e+006
+ },
+/area/maintenance/port)
"eMD" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/white{
@@ -125733,6 +125588,9 @@
},
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
+"fMf" = (
+/turf/closed/wall,
+/area/engine/transit_tube)
"fRK" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -126031,6 +125889,24 @@
/obj/item/reagent_containers/glass/beaker,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
+"ikq" = (
+/obj/machinery/light,
+/obj/machinery/status_display/evac{
+ pixel_y = -32
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/camera{
+ c_tag = "Engineering - Gravity Generator";
+ dir = 1;
+ name = "engineering camera"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
"imI" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/turf_decal/tile/neutral{
@@ -126158,6 +126034,25 @@
},
/turf/open/floor/plasteel/dark,
/area/science/mixing)
+"iUc" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/obj/machinery/door/airlock/external{
+ name = "External Solar Access";
+ req_access_txt = "10; 13"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/solars/port/aft)
"jdx" = (
/obj/structure/lattice,
/obj/structure/grille,
@@ -126359,6 +126254,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/science/mixing)
+"jUu" = (
+/turf/closed/wall/r_wall,
+/area/space/nearstation)
"jYx" = (
/obj/effect/turf_decal/bot,
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
@@ -126751,6 +126649,20 @@
},
/turf/open/floor/plasteel/dark,
/area/science/mixing)
+"mte" = (
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = 24
+ },
+/obj/machinery/light_switch{
+ pixel_y = -26
+ },
+/obj/structure/table/reinforced,
+/obj/item/stack/sheet/plasteel/twenty,
+/obj/item/wrench,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
"mvm" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/white{
@@ -126892,6 +126804,18 @@
},
/turf/open/floor/plasteel,
/area/maintenance/port/fore)
+"nYv" = (
+/obj/machinery/newscaster{
+ pixel_y = -32
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 9
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
"odz" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
@@ -127186,6 +127110,25 @@
dir = 9
},
/area/science/circuit)
+"qhB" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/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
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/transit_tube)
"qnx" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input,
/turf/open/floor/engine/vacuum,
@@ -127423,6 +127366,25 @@
},
/turf/open/floor/plasteel/grimy,
/area/library)
+"tML" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/machinery/door/airlock/external{
+ name = "External Solar Access";
+ req_access_txt = "10; 13"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/solars/starboard/aft)
"tNT" = (
/obj/effect/landmark/carpspawn,
/turf/open/space,
@@ -127682,6 +127644,32 @@
/obj/machinery/atmospherics/pipe/simple/green/visible,
/turf/open/floor/plasteel/dark,
/area/engine/atmos)
+"vFT" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/obj/machinery/door/airlock/hatch{
+ name = "MiniSat Exterior Access";
+ req_one_access_txt = "32;19"
+ },
+/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
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/transit_tube)
"vHN" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/tile/neutral{
@@ -127717,6 +127705,18 @@
},
/turf/open/floor/plasteel,
/area/maintenance/port/aft)
+"vYo" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm{
+ dir = 1;
+ pixel_y = -22
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
"wei" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
@@ -127779,6 +127779,16 @@
/obj/effect/turf_decal/tile/purple,
/turf/open/floor/plasteel/white,
/area/science/misc_lab)
+"wFK" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable/white{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
+/turf/open/space,
+/area/space/nearstation)
"wZT" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -128001,6 +128011,23 @@
},
/turf/open/floor/plating,
/area/engine/atmos)
+"yja" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/obj/machinery/door/airlock/external{
+ name = "External Airlock";
+ req_access_txt = "13"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/port)
"yjc" = (
/obj/machinery/power/apc{
areastring = "/area/science/research/abandoned";
@@ -145343,12 +145370,12 @@ aaa
aaa
aaa
aaa
+aaa
ajr
ajr
aad
ajr
ajr
-ajr
aad
ajr
ajr
@@ -145600,11 +145627,11 @@ aaa
aaa
aaa
aaa
+aaa
ajr
aaa
aaa
aad
-aaa
aad
aaa
aad
@@ -145857,11 +145884,11 @@ aaa
aaa
aaa
aaa
+aaa
ajr
aad
ajr
ajr
-aad
ajr
ajr
ajr
@@ -146114,6 +146141,7 @@ aaa
aaa
aaa
aaa
+aaa
ajr
aaa
ajr
@@ -146125,7 +146153,6 @@ aad
aad
aad
aad
-aad
ajr
aaa
bNF
@@ -146371,6 +146398,7 @@ aaa
aaa
aaa
aaa
+aaa
aad
aaa
ajr
@@ -146381,12 +146409,11 @@ bxC
bxC
bxC
bxC
-bxC
-aad
+jUu
aad
aad
bNF
-aad
+qgU
bVZ
aad
aad
@@ -146628,20 +146655,20 @@ aaa
aaa
aaa
aaa
-ajr
-aad
-ajr
-aad
-bxC
-bAH
-bAH
-bEn
-bAH
-bAH
-bxC
-aad
-ajr
aaa
+ajr
+aad
+ajr
+aad
+bxC
+bAH
+bAH
+bFX
+bAH
+bAH
+jUu
+aad
+ajr
bNF
aaa
bVZ
@@ -146885,20 +146912,20 @@ aaa
aaa
aaa
aaa
+aaa
ajr
aaa
aad
aad
bxC
bAH
-bCw
bCx
-bCy
+bEo
+bCF
bAH
-bxC
+jUu
aad
ajr
-aaa
bNF
aaa
bVZ
@@ -146925,8 +146952,8 @@ cdB
cdB
cdB
car
-aad
-abj
+caE
+yja
caE
caE
cOj
@@ -147119,7 +147146,7 @@ aAP
aAP
avY
ask
-ask
+bAL
aad
abj
abj
@@ -147142,22 +147169,22 @@ aaa
aaa
aaa
aaa
+aaa
ajr
aad
ajr
aad
bxC
bAH
-bCx
bEo
bFW
+bLI
bAH
-bxC
-aad
+jUu
aad
aad
bNF
-aad
+qgU
bVY
aad
aad
@@ -147182,8 +147209,8 @@ car
car
car
car
-caE
-cJI
+eMb
+cqI
caE
cme
cOk
@@ -147375,9 +147402,9 @@ aad
aad
aad
aad
-aad
-apK
-aad
+aFp
+bAM
+aFp
aLb
aad
aaa
@@ -147399,20 +147426,20 @@ aaa
aaa
aaa
aaa
+aaa
aad
aaa
ajr
aad
bxC
bAH
-bCy
+bCF
+bEo
bCx
-bCw
bAH
-bxC
+jUu
aad
ajr
-aaa
bNF
aaa
bVZ
@@ -147657,19 +147684,19 @@ ajr
ajr
aad
ajr
+ajr
aad
ajr
aad
bxC
-bAI
bCz
+bEn
bAH
-bFX
bHN
-bxC
+bTL
+jUu
aad
aad
-aaa
bNF
aaa
bVZ
@@ -147917,18 +147944,18 @@ aad
aaa
aaa
aad
+aad
bxC
-bAJ
-bCA
-bEp
bCA
bHO
-bxC
+bLG
+bHO
+cJI
+jUu
aad
-bNH
-bPK
+wFK
bRU
-aad
+qgU
bVZ
aad
car
@@ -148174,18 +148201,18 @@ ajr
ajr
aad
aad
+aad
bxC
-bAK
bCB
bEq
bFY
bHP
-bxC
-aad
-bNF
-aad
-aad
-aad
+ikq
+bLF
+bLF
+vFT
+bLF
+qgU
bVZ
aad
car
@@ -148431,18 +148458,18 @@ aad
aad
aad
aad
+aad
bxC
-bAL
bCC
bEr
bFZ
bHQ
-bxC
+vYo
bLF
bNI
+qhB
bLF
-bLF
-aad
+qgU
bVZ
aad
car
@@ -148688,18 +148715,18 @@ aRF
aRF
aad
aad
+aad
bxC
-bAM
bCD
bEs
bGa
bHR
-bxC
-bLG
+nYv
+bLF
bNJ
bPL
bLF
-bTK
+qgU
bWa
bTK
car
@@ -148945,18 +148972,18 @@ bpO
aRF
aad
aad
+aad
bxC
-bAN
bCE
bEt
bGb
bHS
-bxC
-bLH
+mte
+bLF
bNK
bPM
+fMf
bLF
-bTL
bWb
bYn
car
@@ -149201,15 +149228,15 @@ bpO
btK
aRF
aad
+qgU
+qgU
bxC
bxC
-bxC
-bCF
bEu
bGc
+bNH
bxC
-bxC
-bLI
+bLF
bNL
bPN
bRV
@@ -149459,9 +149486,9 @@ btL
aRF
abj
bxC
-bzd
-bAO
-bCG
+bxC
+bxC
+bCI
bEv
bGd
bHT
@@ -150232,9 +150259,9 @@ aMG
bxE
bzg
bzg
-bCJ
-bEy
bzg
+bEy
+bLH
bHV
bJQ
bLL
@@ -154689,7 +154716,7 @@ aaa
aad
aad
aad
-ajr
+qgU
aad
ebC
aad
@@ -154947,9 +154974,9 @@ ajr
aad
aad
aad
-aad
-ebC
-aad
+eak
+iUc
+eak
aad
aaa
aac
@@ -169944,8 +169971,8 @@ aaa
aaa
aaa
aad
-aad
abi
+bAI
abR
abi
acp
@@ -170201,9 +170228,9 @@ aaa
aaa
aaa
abj
-abj
abH
abS
+abS
acd
acq
acH
@@ -170457,9 +170484,9 @@ aaa
aaa
aaa
aaa
-aaa
-aad
+qgU
abi
+bAJ
abT
abi
acr
@@ -170713,9 +170740,9 @@ aaa
aaa
aaa
aaa
-aaa
-aac
+jdx
aad
+bzd
abi
abi
ace
@@ -170970,8 +170997,8 @@ aaa
aaa
aaa
aaa
-aaa
-aac
+jdx
+aad
aad
aad
aad
@@ -171227,7 +171254,7 @@ aaa
aaa
aaa
aaa
-aaa
+aac
aac
aac
aad
@@ -172518,9 +172545,9 @@ aac
aaa
aad
aad
-aad
-acQ
-aad
+acf
+bAK
+acf
aad
aaa
abi
@@ -172774,7 +172801,7 @@ aaa
aac
aac
aad
-aac
+aad
aad
aaj
aad
@@ -182675,9 +182702,9 @@ aaA
aaa
aaa
aad
-aaa
-dBN
-aad
+dyV
+tML
+dyV
aad
aaa
aad
@@ -182931,9 +182958,9 @@ aci
aaA
aaa
aaa
-ajr
-aad
-dBO
+qgU
+qgU
+dBN
aad
aaa
dFy
@@ -184902,7 +184929,7 @@ aaa
ajr
ajr
ajr
-aaa
+qgU
aKZ
aKZ
aKZ
@@ -185159,9 +185186,9 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
+qgU
abj
+bAN
aUK
aWs
aXT
@@ -185417,11 +185444,11 @@ aaa
aaa
aaa
aaa
-aaa
aad
aKV
aKV
aKV
+aKV
aZK
bbt
aNJ
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 8ea2a01a4f..e88fb3644a 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -2134,14 +2134,11 @@
/turf/open/floor/plasteel/dark,
/area/maintenance/port)
"adM" = (
-/obj/machinery/door/airlock/external{
- name = "Abandoned External Airlock"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/open/floor/plasteel/dark,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
/area/maintenance/fore)
"adN" = (
/obj/effect/turf_decal/loading_area{
@@ -2160,11 +2157,16 @@
/turf/open/floor/engine,
/area/ai_monitored/storage/satellite)
"adO" = (
+/obj/machinery/door/airlock/external{
+ name = "Satellite External Airlock";
+ req_one_access_txt = "32;19"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/open/floor/engine,
+/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/atmos)
"adP" = (
/obj/machinery/status_display/ai,
@@ -2513,6 +2515,9 @@
/turf/open/floor/plating,
/area/security/execution/education)
"aeD" = (
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating/airless,
/area/space/nearstation)
@@ -2598,13 +2603,20 @@
},
/obj/machinery/light/small,
/turf/open/floor/plating/airless,
-/area/maintenance/starboard/fore)
+/area/space/nearstation)
"aeL" = (
+/obj/machinery/door/airlock/external{
+ name = "Abandoned External Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/structure/cable{
- icon_state = "2-8"
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating/airless,
+/turf/open/floor/plasteel/dark,
/area/maintenance/starboard/fore)
"aeM" = (
/obj/machinery/photocopier,
@@ -5704,13 +5716,6 @@
/turf/open/floor/plasteel/dark,
/area/security/courtroom)
"ajI" = (
-/obj/machinery/door/airlock/external{
- name = "Abandoned External Airlock"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/structure/cable{
icon_state = "1-2"
},
@@ -6935,7 +6940,6 @@
dir = 4
},
/obj/structure/closet/emcloset/anchored,
-/obj/effect/decal/cleanable/cobweb,
/obj/machinery/light/small{
dir = 8
},
@@ -9658,12 +9662,19 @@
/turf/open/floor/plasteel/showroomfloor,
/area/medical/genetics)
"aqp" = (
+/obj/machinery/door/airlock/external{
+ name = "Solar Maintenance";
+ req_access_txt = "10; 13"
+ },
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/structure/lattice/catwalk,
-/turf/open/floor/plating/airless,
-/area/solar/port/fore)
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/maintenance/solars/port/fore)
"aqq" = (
/obj/machinery/status_display/ai{
pixel_x = -32
@@ -12462,12 +12473,18 @@
/turf/open/floor/plasteel,
/area/bridge)
"auN" = (
+/obj/machinery/door/airlock/external{
+ name = "Solar Maintenance";
+ req_access_txt = "10; 13"
+ },
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/structure/lattice/catwalk,
-/turf/open/floor/plating/airless,
-/area/solar/starboard/fore)
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/starboard/fore)
"auO" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
@@ -64779,11 +64796,15 @@
/turf/open/floor/plasteel/dark,
/area/hallway/primary/starboard)
"bZG" = (
-/obj/structure/sign/warning/vacuum/external{
- pixel_y = 32
+/obj/machinery/door/airlock/external{
+ name = "Abandoned External Airlock"
},
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/maintenance/fore)
"bZH" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -64902,9 +64923,18 @@
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"bZP" = (
-/obj/structure/cable,
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
+/obj/machinery/door/airlock/external{
+ name = "Prison External Airlock";
+ req_access_txt = "2"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"bZQ" = (
/obj/structure/closet/l3closet/janitor,
/obj/structure/window/reinforced,
@@ -67688,11 +67718,6 @@
},
/area/ai_monitored/turret_protected/ai)
"ceA" = (
-/obj/machinery/door/airlock/external{
- name = "Satellite External Airlock";
- req_one_access_txt = "32;19"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable{
icon_state = "1-2"
@@ -69608,15 +69633,12 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"chO" = (
-/obj/structure/sign/warning/vacuum/external,
-/turf/closed/wall,
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/atmos)
"chP" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/structure/reagent_dispensers/watertank,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/light,
-/turf/open/floor/plasteel/dark,
+/obj/structure/sign/warning/vacuum/external,
+/turf/closed/wall,
/area/ai_monitored/turret_protected/aisat/atmos)
"chQ" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -69695,12 +69717,19 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"chU" = (
+/obj/machinery/door/airlock/external{
+ name = "Solar Maintenance";
+ req_access_txt = "10; 13"
+ },
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/structure/lattice/catwalk,
-/turf/open/floor/plating/airless,
-/area/solar/port/aft)
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/maintenance/solars/port/aft)
"chW" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/hatch{
@@ -71341,16 +71370,9 @@
/turf/open/floor/plating,
/area/engine/engineering)
"ckJ" = (
-/obj/machinery/door/airlock/external{
- name = "Solar Maintenance";
- req_access_txt = "10; 13"
- },
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
/turf/open/floor/plating,
/area/maintenance/solars/starboard/aft)
"ckK" = (
@@ -71761,16 +71783,9 @@
/turf/open/space/basic,
/area/space/nearstation)
"clx" = (
-/obj/machinery/door/airlock/external{
- name = "Solar Maintenance";
- req_access_txt = "10; 13"
- },
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/maintenance/solars/port/aft)
@@ -74871,6 +74886,9 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/turf/open/floor/plating{
icon_state = "platingdmg1"
},
@@ -74940,6 +74958,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel/dark,
/area/maintenance/disposal)
"crg" = (
@@ -76408,14 +76429,12 @@
/turf/open/floor/plating/airless,
/area/solar/starboard/aft)
"ctO" = (
-/obj/machinery/door/airlock/external{
- name = "External Airlock";
- req_access_txt = "13"
- },
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plating{
+ icon_state = "platingdmg1"
+ },
/area/maintenance/disposal)
"ctP" = (
/obj/structure/cable{
@@ -76436,16 +76455,9 @@
/turf/open/floor/plating/airless,
/area/solar/starboard/aft)
"ctS" = (
-/obj/machinery/door/airlock/external{
- name = "Solar Maintenance";
- req_access_txt = "10; 13"
- },
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/maintenance/solars/port/fore)
@@ -77671,12 +77683,18 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"cwb" = (
+/obj/machinery/door/airlock/external{
+ name = "Solar Maintenance";
+ req_access_txt = "10; 13"
+ },
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/structure/lattice/catwalk,
-/turf/open/floor/plating/airless,
-/area/solar/starboard/aft)
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/starboard/aft)
"cwc" = (
/obj/machinery/atmospherics/components/binary/pump/on,
/obj/machinery/airlock_sensor/incinerator_atmos{
@@ -77772,9 +77790,9 @@
/area/maintenance/starboard/aft)
"cwk" = (
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "2-8"
},
-/turf/open/floor/plating/asteroid/airless,
+/turf/open/floor/plating/airless,
/area/space/nearstation)
"cwl" = (
/obj/structure/cable{
@@ -77952,13 +77970,6 @@
/turf/open/floor/plating,
/area/maintenance/starboard)
"cwD" = (
-/obj/machinery/door/airlock/external{
- name = "External Airlock";
- req_access_txt = "13"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
/turf/open/floor/plasteel/dark,
/area/maintenance/starboard)
"cwE" = (
@@ -78129,6 +78140,9 @@
icon_state = "1-8"
},
/obj/effect/decal/cleanable/blood/old,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plating,
/area/maintenance/disposal)
"cwQ" = (
@@ -78242,6 +78256,9 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
@@ -78299,6 +78316,9 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/old,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
/turf/open/floor/plating,
/area/maintenance/disposal)
"cxh" = (
@@ -78338,6 +78358,9 @@
/area/maintenance/disposal)
"cxj" = (
/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
@@ -78385,17 +78408,21 @@
},
/area/maintenance/port/fore)
"cxp" = (
-/obj/structure/cable{
- icon_state = "1-4"
+/obj/machinery/door/airlock/external{
+ name = "External Airlock";
+ req_access_txt = "13"
},
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/maintenance/disposal)
"cxq" = (
-/obj/structure/cable{
- icon_state = "2-8"
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/floor/plating{
+ icon_state = "platingdmg1"
},
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
+/area/maintenance/fore)
"cxr" = (
/obj/structure/sign/poster/contraband/clown,
/turf/closed/wall/rust,
@@ -83808,16 +83835,9 @@
},
/area/maintenance/starboard)
"cMH" = (
-/obj/machinery/door/airlock/external{
- name = "Solar Maintenance";
- req_access_txt = "10; 13"
- },
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
/turf/open/floor/plating,
/area/maintenance/solars/starboard/fore)
"cMI" = (
@@ -84485,13 +84505,6 @@
/turf/open/space/basic,
/area/space/nearstation)
"cUD" = (
-/obj/machinery/door/airlock/external{
- name = "Prison External Airlock";
- req_access_txt = "2"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
/obj/structure/cable{
icon_state = "1-2"
},
@@ -84509,6 +84522,10 @@
icon_state = "wood-broken"
},
/area/security/vacantoffice)
+"dky" = (
+/obj/structure/cable,
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"dlg" = (
/obj/machinery/light,
/turf/open/floor/wood,
@@ -84660,6 +84677,12 @@
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/closed/mineral/random/labormineral,
/area/space/nearstation)
+"fAn" = (
+/obj/structure/sign/warning/vacuum/external{
+ pixel_y = 32
+ },
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"fXq" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -85112,6 +85135,16 @@
/obj/structure/sign/poster/ripped,
/turf/closed/wall,
/area/crew_quarters/fitness/recreation)
+"lqz" = (
+/obj/machinery/door/airlock/external{
+ name = "External Airlock";
+ req_access_txt = "13"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/maintenance/starboard)
"lKu" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko,
@@ -85169,6 +85202,9 @@
},
/turf/open/floor/plasteel/dark,
/area/science/research)
+"mKj" = (
+/turf/closed/wall/rust,
+/area/security/execution/education)
"mKp" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -85535,6 +85571,12 @@
icon_state = "wood-broken4"
},
/area/maintenance/port/fore)
+"yaV" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"ydo" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -99348,9 +99390,9 @@ bTK
bVs
hNk
bXG
+abp
cZm
-bZG
-aeU
+fAn
aeU
aeU
aeU
@@ -99607,7 +99649,7 @@ cTF
bXH
cUD
bZP
-aeU
+dky
coy
aeU
aeU
@@ -99860,19 +99902,19 @@ aaG
aez
cIj
aeB
-cZm
+mKj
+aez
aez
aez
cko
cko
-cko
-aeU
aeU
aeU
aeU
aeU
+cnS
chU
-aeU
+cnS
aUz
aeU
aeu
@@ -100315,9 +100357,9 @@ aeu
aeU
aeU
aeU
-aeU
+ctH
aqp
-aeU
+ctH
aeu
aeu
aeu
@@ -112389,7 +112431,7 @@ aaa
aaa
aeU
aUz
-aeu
+adH
adH
adH
adH
@@ -112646,8 +112688,8 @@ aaa
aaa
acm
aeU
-aeU
adQ
+cxq
alN
chj
aoc
@@ -112903,7 +112945,7 @@ aeR
aeR
aes
aes
-aes
+bZG
adM
alO
amL
@@ -113160,7 +113202,7 @@ aaa
aaa
acm
aaa
-aaa
+adH
adH
adH
adQ
@@ -120601,9 +120643,9 @@ aaa
aaa
aaa
aaa
-aeU
aeK
baH
+baH
afb
baH
baH
@@ -124310,9 +124352,9 @@ cpb
crf
cnu
cnu
+cnu
cko
aeu
-aeu
aaa
aaa
aaa
@@ -124568,7 +124610,7 @@ cxg
cxj
ctO
cxp
-aeU
+yaV
ciQ
aeU
aaa
@@ -124824,7 +124866,7 @@ cnu
cnd
cnu
cnu
-cxq
+cnu
cwk
cxu
aeU
@@ -126358,9 +126400,9 @@ bzG
bzG
aeu
aeu
-aeU
+ckz
cwb
-aeU
+ckz
aeU
aUz
aeU
@@ -129380,9 +129422,9 @@ aaQ
aeo
aeo
acm
-acm
-acK
-acm
+bkd
+lqz
+bkd
aaa
aaa
aaa
@@ -129615,9 +129657,9 @@ aeu
aeu
aeu
aeu
-aeU
+cLM
auN
-aeU
+cLM
aeu
aeu
aeu
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 1b86bfaa03..9d151a3118 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -793,10 +793,16 @@
/turf/open/floor/plating,
/area/security/prison)
"abN" = (
-/turf/open/floor/plating{
- icon_state = "platingdmg3"
+/obj/machinery/door/airlock/external{
+ name = "Solar Maintenance";
+ req_access_txt = "10; 13"
},
-/area/security/prison)
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/turf/open/floor/plating,
+/area/maintenance/solars/port/fore)
"abO" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -954,6 +960,9 @@
/area/security/prison)
"acg" = (
/obj/machinery/light/small,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
/turf/open/floor/plating{
icon_state = "panelscorched"
},
@@ -962,18 +971,22 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/turf/open/floor/plating,
-/area/security/prison)
-"aci" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
/obj/machinery/door/airlock/external{
name = "Security External Airlock";
req_access_txt = "1"
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
/turf/open/floor/plating,
/area/security/prison)
+"aci" = (
+/obj/structure/lattice/catwalk,
+/obj/machinery/door/airlock/external{
+ req_one_access_txt = "13,8"
+ },
+/turf/open/space,
+/area/maintenance/starboard/fore)
"acj" = (
/obj/machinery/light/small{
dir = 1
@@ -2047,14 +2060,12 @@
/turf/open/floor/plating,
/area/maintenance/solars/port/fore)
"aef" = (
-/obj/machinery/door/airlock/external{
- name = "Solar Maintenance";
- req_access_txt = "10; 13"
- },
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
/turf/open/floor/plating,
/area/maintenance/solars/port/fore)
"aeg" = (
@@ -2310,9 +2321,6 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
/turf/open/floor/plating,
/area/maintenance/solars/port/fore)
"aeH" = (
@@ -7007,14 +7015,8 @@
/turf/closed/wall,
/area/crew_quarters/fitness/recreation)
"amG" = (
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/turf/closed/wall,
+/area/space)
"amH" = (
/obj/machinery/door/airlock/external{
req_one_access_txt = "13,8"
@@ -11553,19 +11555,15 @@
/turf/open/floor/plating/airless,
/area/space/nearstation)
"avJ" = (
-/obj/machinery/door/airlock/external,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
+/obj/structure/sign/warning/vacuum/external{
+ pixel_x = 32
},
/turf/open/floor/plating,
-/area/maintenance/port/fore)
+/area/maintenance/starboard/fore)
"avK" = (
/obj/structure/sign/warning/vacuum/external{
pixel_y = 32
},
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
/turf/open/floor/plating,
/area/maintenance/port/fore)
"avL" = (
@@ -37959,12 +37957,8 @@
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"bwl" = (
-/obj/machinery/door/airlock/hatch{
- name = "MiniSat Space Access Airlock";
- req_one_access_txt = "32;19"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
},
/turf/open/floor/plasteel/dark,
/area/engine/break_room)
@@ -38524,9 +38518,6 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
/turf/open/floor/plasteel/dark,
/area/engine/break_room)
"bxn" = (
@@ -44779,7 +44770,7 @@
dir = 8
},
/turf/open/space,
-/area/aisat)
+/area/space/nearstation)
"bKR" = (
/obj/structure/window/reinforced{
dir = 8
@@ -46796,14 +46787,14 @@
/turf/open/floor/plasteel/showroomfloor,
/area/crew_quarters/kitchen)
"bOY" = (
-/obj/structure/sign/warning/vacuum/external{
- pixel_x = 32
+/obj/machinery/door/airlock/external{
+ req_access_txt = "13"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
},
/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/area/space/nearstation)
"bOZ" = (
/obj/machinery/chem_master/condimaster{
name = "CondiMaster Neo";
@@ -53609,9 +53600,6 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
/turf/open/floor/plating,
/area/engine/atmos)
"ccY" = (
@@ -54894,17 +54882,12 @@
/turf/open/space,
/area/solar/port/aft)
"cfA" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/door/airlock/external{
- req_access_txt = "13"
- },
+/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
-/area/maintenance/port/aft)
+/area/maintenance/port/fore)
"cfB" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable/yellow{
@@ -63173,12 +63156,9 @@
/turf/open/space,
/area/solar/port/aft)
"cvj" = (
-/obj/structure/closet/emcloset,
-/obj/structure/sign/warning/vacuum/external{
- pixel_x = -32
- },
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
+/obj/structure/lattice,
+/turf/closed/wall/r_wall,
+/area/engine/break_room)
"cvk" = (
/obj/structure/closet/crate,
/obj/item/crowbar/red,
@@ -63664,7 +63644,10 @@
/turf/open/floor/plasteel,
/area/science/circuit)
"cwc" = (
-/obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/airlock/external{
+ name = "Auxiliary Escape Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/maintenance/aft)
"cwd" = (
@@ -63693,9 +63676,14 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/structure/lattice/catwalk,
-/turf/open/space,
-/area/space/nearstation)
+/obj/machinery/door/airlock/external{
+ req_access_txt = "13"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"cwh" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -70269,7 +70257,7 @@
pixel_x = -32
},
/turf/open/space,
-/area/space/nearstation)
+/area/space)
"cIz" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -70553,17 +70541,19 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cJf" = (
/obj/structure/cable/yellow{
- icon_state = "0-8"
+ icon_state = "4-8"
},
-/obj/structure/lattice/catwalk,
-/turf/open/space,
+/obj/machinery/door/airlock/external{
+ req_access_txt = "13"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/turf/open/floor/plating,
/area/space/nearstation)
"cJg" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -71813,6 +71803,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/aft)
"cLA" = (
@@ -72157,15 +72148,12 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"cMk" = (
-/obj/machinery/power/apc/highcap/five_k{
- areastring = "/area/maintenance/aft";
- name = "Aft Maintenance APC";
- pixel_y = -24
+/obj/structure/window/reinforced{
+ dir = 1;
+ pixel_y = 1
},
-/obj/structure/cable/yellow,
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/turf/open/space,
+/area/space)
"cMl" = (
/obj/structure/table,
/obj/item/stack/sheet/glass/fifty{
@@ -72750,10 +72738,6 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"cNe" = (
-/obj/machinery/door/airlock/external{
- name = "Auxiliary Escape Airlock"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/maintenance/aft)
"cNf" = (
@@ -76631,9 +76615,6 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
/turf/open/floor/plating,
/area/maintenance/solars/starboard/aft)
"dbR" = (
@@ -81313,6 +81294,19 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"gsT" = (
+/obj/machinery/door/airlock/external{
+ name = "Solar Maintenance";
+ req_access_txt = "10; 13"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/solar/starboard/aft)
"gEk" = (
/obj/structure/cable/yellow{
icon_state = "2-8"
@@ -81350,9 +81344,7 @@
/turf/open/floor/plasteel,
/area/science/misc_lab)
"gNe" = (
-/obj/machinery/light/small{
- dir = 8
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/aft)
"gRS" = (
@@ -81393,6 +81385,10 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"hKW" = (
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/maintenance/aft)
"ioI" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -81526,13 +81522,6 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/door/airlock/external{
- name = "Solar Maintenance";
- req_access_txt = "10; 13"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
/turf/open/floor/plating,
/area/maintenance/solars/port/aft)
"jAj" = (
@@ -81656,17 +81645,15 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"kDM" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/door/airlock/external{
- req_access_txt = "13"
+/obj/machinery/door/airlock/hatch{
+ name = "MiniSat Space Access Airlock";
+ req_one_access_txt = "32;19"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
+/turf/open/floor/plasteel/dark,
+/area/engine/break_room)
"kJW" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 1;
@@ -81775,14 +81762,9 @@
/turf/open/space/basic,
/area/space/nearstation)
"lNZ" = (
-/obj/machinery/door/airlock/external{
- req_access_txt = "13"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/obj/structure/lattice/catwalk,
+/turf/closed/wall/r_wall,
+/area/engine/atmos)
"lOi" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -81902,6 +81884,12 @@
},
/turf/open/floor/plating,
/area/maintenance/port)
+"mSd" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"mWg" = (
/obj/structure/girder,
/obj/structure/grille,
@@ -82477,8 +82465,9 @@
/turf/open/floor/plasteel,
/area/science/circuit)
"sdw" = (
-/turf/open/space/basic,
-/area/space/nearstation)
+/obj/structure/window/reinforced,
+/turf/open/space,
+/area/space)
"siF" = (
/obj/structure/grille,
/turf/open/floor/plating/airless,
@@ -82576,6 +82565,12 @@
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/cryopod)
+"sUM" = (
+/obj/structure/sign/warning/vacuum/external{
+ pixel_x = -32
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"sZN" = (
/obj/structure/closet/firecloset,
/turf/open/floor/plating,
@@ -82662,6 +82657,13 @@
/obj/machinery/cryopod,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/cryopod)
+"uim" = (
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/obj/structure/lattice/catwalk,
+/turf/open/space,
+/area/space/nearstation)
"uku" = (
/obj/machinery/atmospherics/pipe/manifold4w/general/visible,
/turf/open/floor/plasteel,
@@ -82836,6 +82838,10 @@
},
/turf/open/floor/plating,
/area/security/prison)
+"wkz" = (
+/obj/structure/lattice/catwalk,
+/turf/open/space,
+/area/space)
"wlH" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -82857,12 +82863,8 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"wxc" = (
-/obj/machinery/door/airlock/external{
- name = "Atmospherics External Airlock";
- req_access_txt = "24"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
},
/turf/open/floor/plating,
/area/engine/atmos)
@@ -82873,10 +82875,13 @@
/turf/open/floor/plating,
/area/crew_quarters/cryopod)
"wFH" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
+/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/maintenance/aft";
+ name = "Aft Maintenance APC";
+ pixel_y = -24
},
-/obj/effect/landmark/blobstart,
+/obj/structure/cable/yellow,
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"wKo" = (
@@ -82884,8 +82889,15 @@
/turf/closed/wall,
/area/science/circuit)
"wOE" = (
+/obj/machinery/door/airlock/external{
+ name = "Atmospherics External Airlock";
+ req_access_txt = "24"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
/turf/open/floor/plating,
-/area/maintenance/aft)
+/area/engine/atmos)
"wOY" = (
/obj/structure/fans/tiny/invisible,
/turf/open/space/basic,
@@ -82944,15 +82956,11 @@
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"xse" = (
-/obj/machinery/door/airlock/external{
- name = "Solar Maintenance";
- req_access_txt = "10; 13"
- },
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
},
/turf/open/floor/plating,
/area/maintenance/solars/starboard/aft)
@@ -83060,6 +83068,19 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"yfW" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/airlock/external{
+ name = "Solar Maintenance";
+ req_access_txt = "10; 13"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/port/aft)
"ygk" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -95242,9 +95263,9 @@ anS
anS
aaf
aaf
-aqB
-anS
-aaf
+dne
+cfA
+dne
aaf
aaf
aaf
@@ -95500,7 +95521,7 @@ aaa
aaa
aaf
dne
-avJ
+avL
dne
aaf
aaa
@@ -96585,7 +96606,7 @@ bXt
bYC
bYC
bYC
-aaa
+bYC
aaa
aaf
aaa
@@ -96842,8 +96863,8 @@ bXu
bYD
bZN
jyQ
+yfW
cda
-cej
cfz
cED
chY
@@ -97099,7 +97120,7 @@ bXv
bYC
bYC
bYC
-aaa
+bYC
aaa
aaf
aaa
@@ -99172,7 +99193,7 @@ ckN
aaa
aaf
aaf
-aaa
+lMJ
aaa
aaf
aaa
@@ -99427,7 +99448,7 @@ ckQ
cjt
ckN
aaf
-aaf
+ack
cwf
ack
aaf
@@ -99684,10 +99705,10 @@ cjt
diJ
dux
dux
-ack
+dux
cwg
-ack
-ack
+dux
+dux
aaf
aaa
aaa
@@ -99941,9 +99962,9 @@ crh
dxv
ctn
dux
-dux
-cfA
-dux
+sUM
+cwh
+dyw
dux
aaf
aaf
@@ -100198,8 +100219,8 @@ dvt
csf
cto
dux
-cvj
-cwh
+cfF
+mSd
cxb
dux
aaa
@@ -101651,7 +101672,7 @@ aaa
aaa
acT
aaa
-aaf
+aee
aee
aee
aee
@@ -101908,7 +101929,7 @@ aaf
aaf
acU
aak
-aak
+abN
aef
aeG
afE
@@ -102165,7 +102186,7 @@ aaa
aaa
aaf
aaa
-aaf
+aee
aee
aee
aee
@@ -108584,7 +108605,7 @@ aaa
aaa
aaa
wOY
-abN
+abe
ach
aax
acN
@@ -108842,7 +108863,7 @@ urv
abe
abe
abe
-aci
+abL
aax
acO
adh
@@ -112810,7 +112831,7 @@ cFh
cKH
cLz
wFH
-cMk
+bTs
bTs
bTs
bTs
@@ -113067,8 +113088,8 @@ cJN
cCq
cgN
cMl
-wOE
bTs
+hKW
aaf
aaf
aaf
@@ -113325,7 +113346,7 @@ cCq
cLA
bTs
bTs
-bTs
+hKW
aaf
aaa
aaa
@@ -119489,7 +119510,7 @@ aaf
aaa
aaf
dvY
-kDM
+cJd
dvY
aaa
dbN
@@ -119745,13 +119766,13 @@ cEA
aaf
aaa
aaa
-ack
+blx
cJf
-ack
-aaa
-aaf
-dbR
+blx
aaa
+dbN
+gsT
+dbN
aaa
aaa
aaa
@@ -119897,7 +119918,7 @@ aaf
aaa
aaa
aaa
-sdw
+aaa
aaa
acP
acP
@@ -120002,9 +120023,9 @@ blx
aaa
aaa
aaa
-aaa
-aaf
-aaa
+wkz
+uim
+wkz
aaa
aaf
dbR
@@ -121527,7 +121548,7 @@ cpK
ciL
csc
dvY
-vLD
+lMJ
krD
jyv
ohj
@@ -121784,7 +121805,7 @@ cpL
crb
csd
dvY
-vLD
+lMJ
krD
krD
noG
@@ -123505,7 +123526,7 @@ aaa
aaa
aaf
dni
-amG
+asB
amH
anN
dnS
@@ -123762,7 +123783,7 @@ aaf
aaf
aaf
dnh
-amH
+avG
dnh
apd
dnS
@@ -124018,8 +124039,8 @@ aaa
aaf
aaa
aaf
-aaa
-ack
+dnh
+aci
dnh
ape
dnS
@@ -127144,8 +127165,8 @@ aaa
aaf
bpw
aaf
-aaf
-ack
+cvj
+kDM
bxc
bzg
bAP
@@ -127402,7 +127423,7 @@ aaf
bpw
aaa
aaf
-aaf
+ack
bxc
bzh
bAQ
@@ -128194,9 +128215,9 @@ gJs
bFZ
bAR
aaf
-bxc
+lNZ
wxc
-bxc
+lNZ
aaf
aaa
aaf
@@ -128451,9 +128472,9 @@ bVN
bXr
bAR
aaf
-aMr
-ccY
-bBb
+lNZ
+wOE
+lNZ
aaf
aaa
aaf
@@ -128708,7 +128729,7 @@ bVO
bUJ
bAR
aaf
-aMq
+sdw
ccY
bgo
aTQ
@@ -129165,8 +129186,8 @@ aaa
ack
ack
atn
-bOY
-avG
+anN
+dnS
dqT
aaf
aaa
@@ -129222,7 +129243,7 @@ bAR
bAR
bAR
aaf
-aMq
+sdw
ccY
aVk
aNC
@@ -129422,8 +129443,8 @@ aaf
aaf
aaf
dnh
-dnh
-lNZ
+avJ
+avG
dqT
aaf
aaa
@@ -129678,9 +129699,9 @@ aaa
aaa
aaf
aaa
-aaa
-aaf
-ack
+amG
+blx
+bOY
dqT
aaf
anT
@@ -135882,7 +135903,7 @@ blA
bnu
bpH
brU
-aOV
+cMk
aaa
aMq
bzm
@@ -136124,7 +136145,7 @@ aOU
aOY
aOY
aOY
-aTT
+aNC
aaa
aaa
aaa
@@ -136142,7 +136163,7 @@ brV
aRy
aaa
aaa
-aTT
+aNC
aOY
aOY
aOY
@@ -136381,7 +136402,7 @@ aOV
aaa
aaa
aaa
-aTU
+aaf
aaa
aRy
aRy
@@ -136406,7 +136427,7 @@ aaa
aaa
aaa
aaa
-aTU
+aaf
aaa
aaa
aaa
@@ -139465,7 +139486,7 @@ aOV
aaa
aaa
aaa
-aTU
+aaf
aaa
aRy
aRy
@@ -139483,14 +139504,14 @@ bsh
aRy
bvt
aaa
-aTU
+aaf
aaa
aaa
aaa
aaa
aaa
aaa
-aTU
+aaf
aaa
aaa
aaa
@@ -139722,7 +139743,7 @@ aOX
aNw
aNw
aNw
-aTY
+bJl
aaa
aaa
aaa
@@ -139740,14 +139761,14 @@ bsi
aRy
aaa
aaa
-aTY
+bJl
aNw
aNw
aNw
aNw
aNw
aNw
-aTY
+bJl
aNw
aNw
aNw
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index 7222a6abec..72fe6cf3fa 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -1244,15 +1244,7 @@
/turf/closed/wall,
/area/maintenance/starboard/fore)
"abM" = (
-/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
- },
+/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/maintenance/starboard/fore)
"abN" = (
@@ -23608,22 +23600,9 @@
/turf/open/floor/engine,
/area/engine/supermatter)
"aKB" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/door/airlock/external{
- name = "External Airlock";
- req_access_txt = "13"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
/turf/open/floor/plasteel,
/area/maintenance/port/aft)
"aKC" = (
@@ -23645,14 +23624,23 @@
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"aKF" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/structure/sign/warning/vacuum{
- pixel_x = -32;
- pixel_y = 32
+/obj/machinery/door/airlock/external{
+ name = "External Airlock";
+ req_access_txt = "13"
},
-/turf/open/floor/plating,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
/area/maintenance/port/aft)
"aKG" = (
/obj/structure/cable/white{
@@ -39608,9 +39596,17 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"edA" = (
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/space)
+/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)
"eew" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable{
@@ -42891,9 +42887,6 @@
/obj/structure/sign/warning/securearea,
/turf/closed/wall/rust,
/area/maintenance/starboard)
-"sIO" = (
-/turf/open/space/basic,
-/area/space/nearstation)
"sIP" = (
/obj/machinery/vending/cola/random,
/obj/effect/turf_decal/bot,
@@ -71476,7 +71469,7 @@ aaa
aaa
aaa
aaa
-aaa
+sdX
uhz
uhz
oxn
@@ -71733,7 +71726,7 @@ aac
aac
aac
aac
-aaa
+sdX
uhz
iye
mJP
@@ -91235,7 +91228,7 @@ aaa
aae
aaa
aaa
-aac
+bxZ
abL
bxZ
swz
@@ -91492,7 +91485,7 @@ aaa
aae
aad
aac
-bvg
+edA
abM
acu
adt
@@ -91749,7 +91742,7 @@ aad
aah
aad
aad
-aad
+bxZ
bxZ
adq
bxZ
@@ -93074,7 +93067,7 @@ aRz
sIc
sIv
sFs
-sIO
+aaa
sIU
sJe
sIU
@@ -98492,9 +98485,9 @@ aac
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aac
aac
aac
@@ -98749,9 +98742,9 @@ aac
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aac
aaa
@@ -99006,9 +98999,9 @@ aaa
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -99263,9 +99256,9 @@ aaa
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -99520,9 +99513,9 @@ aaa
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -99777,9 +99770,9 @@ aaa
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -100034,9 +100027,9 @@ jFP
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -100291,9 +100284,9 @@ jFP
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -100548,9 +100541,9 @@ jFP
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -100805,9 +100798,9 @@ jFP
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -101062,9 +101055,9 @@ jFP
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -101319,9 +101312,9 @@ jFP
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -101576,9 +101569,9 @@ jFP
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -101833,9 +101826,9 @@ jFP
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -102090,9 +102083,9 @@ jFP
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -102347,9 +102340,9 @@ jFP
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -102604,9 +102597,9 @@ jFP
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -102861,9 +102854,9 @@ jFP
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -103118,9 +103111,9 @@ jFP
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -103375,9 +103368,9 @@ jFP
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -103632,9 +103625,9 @@ jFP
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -103889,9 +103882,9 @@ jFP
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -104146,9 +104139,9 @@ jFP
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -104403,9 +104396,9 @@ jFP
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -104660,9 +104653,9 @@ jFP
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -104917,9 +104910,9 @@ aaa
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -105174,9 +105167,9 @@ aaa
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
@@ -105431,9 +105424,9 @@ aaa
aaa
aaa
aaa
-edA
+sdX
aaa
-edA
+sdX
aaa
aaa
aaa
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 8f220ac250..2309a42e29 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -1846,7 +1846,7 @@
network = list("minisat")
},
/turf/open/space,
-/area/ai_monitored/turret_protected/AIsatextAS)
+/area/ai_monitored/turret_protected/AIsatextAP)
"aeA" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
@@ -2622,9 +2622,6 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/structure/sign/warning/vacuum/external{
- pixel_x = 32
- },
/obj/structure/sign/warning/vacuum/external{
pixel_x = -32
},
@@ -2744,12 +2741,8 @@
/turf/open/floor/plating,
/area/security/main)
"agR" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/obj/machinery/door/airlock/external{
- name = "MiniSat External Access";
- req_access_txt = "65"
+/obj/structure/sign/warning/vacuum/external{
+ pixel_x = 32
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/aisat_interior)
@@ -2821,11 +2814,14 @@
/turf/open/floor/plasteel/showroomfloor,
/area/security/main)
"ahh" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/showcase/cyborg/old{
- pixel_y = 20
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
},
-/turf/open/space,
+/obj/machinery/door/airlock/external{
+ name = "MiniSat External Access";
+ req_access_txt = "65"
+ },
+/turf/open/floor/plating,
/area/space/nearstation)
"ahi" = (
/obj/structure/lattice/catwalk,
@@ -2927,13 +2923,8 @@
/turf/open/floor/plasteel/showroomfloor,
/area/security/main)
"ahr" = (
-/obj/structure/lattice,
-/obj/machinery/camera/motion{
- c_tag = "MiniSat Entrance";
- network = list("minisat")
- },
-/turf/open/space,
-/area/space/nearstation)
+/turf/closed/wall/r_wall,
+/area/space)
"ahs" = (
/obj/structure/lattice/catwalk,
/obj/structure/transit_tube,
@@ -4690,8 +4681,12 @@
/turf/open/space/basic,
/area/space/nearstation)
"alb" = (
-/turf/open/floor/wood,
-/area/maintenance/department/crew_quarters/dorms)
+/obj/structure/lattice/catwalk,
+/obj/structure/showcase/cyborg/old{
+ pixel_y = 20
+ },
+/turf/open/space,
+/area/space)
"alc" = (
/obj/structure/table,
/obj/item/storage/fancy/cigarettes/cigars,
@@ -8703,13 +8698,9 @@
/turf/closed/wall,
/area/bridge)
"atZ" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/machinery/door/airlock/external{
- name = "Bridge External Access";
- req_access_txt = "10;13"
- },
-/turf/open/floor/plating,
-/area/ai_monitored/turret_protected/aisat_interior)
+/obj/structure/lattice/catwalk,
+/turf/open/space,
+/area/space)
"aua" = (
/obj/structure/closet/secure_closet/freezer/money,
/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
@@ -9124,9 +9115,6 @@
/obj/structure/sign/warning/vacuum/external{
pixel_x = -32
},
-/obj/machinery/light/small{
- dir = 1
- },
/turf/open/floor/plating,
/area/bridge)
"auV" = (
@@ -13689,14 +13677,13 @@
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"aFj" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
+/obj/structure/lattice,
+/obj/machinery/camera/motion{
+ c_tag = "MiniSat Entrance";
+ network = list("minisat")
},
-/obj/machinery/door/airlock/external{
- req_access_txt = "13"
- },
-/turf/open/floor/plating,
-/area/maintenance/department/cargo)
+/turf/open/space,
+/area/space/nearstation)
"aFk" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/spawner/lootdrop/minor/bowler_or_that,
@@ -22864,11 +22851,13 @@
/turf/closed/wall,
/area/maintenance/solars/starboard)
"baH" = (
-/obj/structure/rack,
-/obj/item/clothing/mask/gas,
-/obj/item/multitool,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/door/airlock/external{
+ name = "Bridge External Access";
+ req_access_txt = "10;13"
+ },
/turf/open/floor/plating,
-/area/maintenance/solars/starboard)
+/area/ai_monitored/turret_protected/aisat_interior)
"baI" = (
/obj/structure/cable{
icon_state = "0-8"
@@ -23315,13 +23304,6 @@
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
"bbL" = (
-/obj/machinery/power/smes,
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/turf/open/floor/plating,
-/area/maintenance/solars/starboard)
-"bbM" = (
/obj/machinery/power/terminal{
dir = 8
},
@@ -23333,17 +23315,10 @@
},
/turf/open/floor/plating,
/area/maintenance/solars/starboard)
-"bbO" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/machinery/door/airlock/external{
- name = "Solar Maintenance";
- req_access_txt = "10; 13"
- },
+"bbM" = (
+/obj/structure/rack,
+/obj/item/clothing/mask/gas,
+/obj/item/multitool,
/turf/open/floor/plating,
/area/maintenance/solars/starboard)
"bbP" = (
@@ -23757,16 +23732,6 @@
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"bcJ" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/door/airlock/engineering{
- name = "Starboard Solar Access";
- req_access_txt = "10"
- },
-/turf/open/floor/plating,
-/area/maintenance/solars/starboard)
-"bcK" = (
/obj/structure/cable{
icon_state = "1-2"
},
@@ -23775,25 +23740,39 @@
},
/turf/open/floor/plating,
/area/maintenance/solars/starboard)
-"bcL" = (
+"bcK" = (
/obj/structure/cable{
icon_state = "1-4"
},
/turf/open/floor/plating,
/area/maintenance/solars/starboard)
-"bcN" = (
-/obj/machinery/power/solar_control{
- dir = 8;
- id = "starboardsolar";
- name = "Starboard Solar Control"
+"bcL" = (
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/structure/cable,
/turf/open/floor/plating,
/area/maintenance/solars/starboard)
+"bcN" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/floor/plating,
+/area/bridge)
"bcO" = (
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/machinery/door/airlock/external{
+ name = "Solar Maintenance";
+ req_access_txt = "10; 13"
+ },
/turf/open/floor/plating,
/area/maintenance/solars/starboard)
"bcQ" = (
@@ -24156,17 +24135,17 @@
},
/area/maintenance/department/cargo)
"bdR" = (
-/obj/structure/cable,
-/obj/machinery/power/apc{
- dir = 8;
- name = "Starboard Solar APC";
- pixel_x = -24
- },
+/obj/structure/chair/stool,
+/obj/item/cigbutt/cigarbutt,
/turf/open/floor/plating,
/area/maintenance/solars/starboard)
"bdS" = (
-/obj/structure/chair/stool,
-/obj/item/cigbutt/cigarbutt,
+/obj/machinery/power/solar_control{
+ dir = 8;
+ id = "starboardsolar";
+ name = "Starboard Solar Control"
+ },
+/obj/structure/cable,
/turf/open/floor/plating,
/area/maintenance/solars/starboard)
"bdU" = (
@@ -27986,7 +27965,7 @@
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/storage/emergency/port)
+/area/medical/medbay/zone3)
"bny" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/firealarm{
@@ -28005,7 +27984,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/storage/emergency/port)
+/area/medical/medbay/zone3)
"bnz" = (
/obj/structure/table,
/obj/item/folder/white,
@@ -43266,7 +43245,7 @@
/obj/structure/closet/firecloset,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
-/area/engine/atmos)
+/area/engine/break_room)
"bTR" = (
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 4
@@ -43455,7 +43434,7 @@
/obj/effect/turf_decal/delivery,
/obj/structure/closet/firecloset,
/turf/open/floor/plasteel,
-/area/engine/atmos)
+/area/engine/break_room)
"bUp" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/turf/open/floor/plasteel,
@@ -43848,7 +43827,7 @@
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
/turf/open/floor/plasteel,
-/area/engine/atmos)
+/area/engine/break_room)
"bVd" = (
/obj/machinery/door/airlock/atmos{
name = "Atmospherics";
@@ -45016,10 +44995,6 @@
/turf/open/floor/plating,
/area/chapel/asteroid/monastery)
"bXN" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/machinery/door/airlock/external,
/turf/open/floor/plating,
/area/chapel/asteroid/monastery)
"bXS" = (
@@ -45926,12 +45901,21 @@
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{
dir = 8
},
+/obj/machinery/air_sensor/atmos/incinerator_tank{
+ pixel_x = 32;
+ pixel_y = -32
+ },
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
"bZV" = (
-/obj/structure/sign/warning/fire,
-/turf/closed/wall/r_wall,
-/area/maintenance/disposal/incinerator)
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/machinery/door/airlock/external{
+ req_access_txt = "13"
+ },
+/turf/open/floor/plating,
+/area/maintenance/department/cargo)
"bZY" = (
/turf/closed/wall,
/area/chapel/office)
@@ -46149,13 +46133,15 @@
icon_state = "4-8"
},
/obj/machinery/igniter/incinerator_atmos,
-/obj/machinery/air_sensor/atmos/incinerator_tank{
- pixel_x = 32;
- pixel_y = -32
- },
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
"caP" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/turf/open/floor/engine,
+/area/maintenance/disposal/incinerator)
+"caQ" = (
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -46167,13 +46153,9 @@
dir = 8;
luminosity = 2
},
-/obj/machinery/camera{
- c_tag = "Turbine Chamber";
- network = list("turbine")
- },
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
-"caQ" = (
+"caR" = (
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -46183,10 +46165,6 @@
},
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
-"caR" = (
-/obj/machinery/door/poddoor/incinerator_atmos_main,
-/turf/open/floor/engine/vacuum,
-/area/maintenance/disposal/incinerator)
"caS" = (
/turf/closed/wall,
/area/chapel/asteroid/monastery)
@@ -46611,9 +46589,9 @@
/turf/open/floor/plasteel/dark,
/area/maintenance/disposal/incinerator)
"ccs" = (
-/obj/machinery/door/poddoor/incinerator_atmos_aux,
-/turf/open/floor/engine/vacuum,
-/area/maintenance/disposal/incinerator)
+/obj/structure/lattice,
+/turf/closed/wall,
+/area/maintenance/department/cargo)
"ccu" = (
/obj/structure/flora/ausbushes/leafybush,
/turf/open/floor/plating/asteroid,
@@ -46786,13 +46764,6 @@
/turf/open/floor/plating,
/area/maintenance/disposal/incinerator)
"cdl" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/machinery/door/airlock/external{
- name = "Atmospherics External Access";
- req_access_txt = "24"
- },
/turf/open/floor/plating,
/area/maintenance/disposal/incinerator)
"cdm" = (
@@ -47328,6 +47299,9 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"cfu" = (
@@ -47446,14 +47420,12 @@
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"cfQ" = (
-/obj/structure/chair{
- dir = 8
+/obj/machinery/power/smes,
+/obj/structure/cable{
+ icon_state = "0-2"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 9
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
+/turf/open/floor/plating,
+/area/maintenance/solars/starboard)
"cfS" = (
/obj/structure/table/reinforced,
/obj/item/tank/internals/emergency_oxygen/engi,
@@ -47579,14 +47551,12 @@
/turf/open/floor/plating,
/area/engine/engineering)
"cgs" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/machinery/door/airlock/external{
- name = "Engineering External Access";
- req_access_txt = "61"
- },
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/light/small{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/engine/engineering)
"cgu" = (
@@ -47678,9 +47648,6 @@
/turf/open/floor/plating/airless,
/area/space/nearstation)
"cgQ" = (
-/obj/machinery/light/small{
- dir = 8
- },
/obj/structure/sign/warning/vacuum/external{
pixel_x = -32
},
@@ -49453,7 +49420,7 @@
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/space/basic,
-/area/ai_monitored/turret_protected/AIsatextAS)
+/area/ai_monitored/turret_protected/AIsatextAP)
"cnJ" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/vending/wardrobe/sec_wardrobe,
@@ -50434,6 +50401,15 @@
/turf/open/floor/plating,
/area/maintenance/department/engine)
"crB" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
+"crC" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
@@ -50445,15 +50421,6 @@
},
/turf/open/floor/plating,
/area/maintenance/department/engine)
-"crC" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/maintenance/department/engine)
"crD" = (
/obj/structure/table/wood/fancy,
/obj/item/storage/box/bodybags,
@@ -53207,6 +53174,10 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
+"dhS" = (
+/obj/structure/window/reinforced,
+/turf/open/space/basic,
+/area/space)
"dir" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 5
@@ -53580,13 +53551,15 @@
/turf/open/floor/plating,
/area/maintenance/department/engine)
"dWp" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/door/airlock/external{
+ name = "Engineering External Access";
+ req_access_txt = "61"
},
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plating,
/area/engine/engineering)
"dYe" = (
/obj/structure/cable{
@@ -53957,6 +53930,9 @@
/obj/effect/turf_decal/arrows{
dir = 8
},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"eWi" = (
@@ -54358,6 +54334,9 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
+"fRr" = (
+/turf/open/floor/engine/vacuum,
+/area/maintenance/disposal/incinerator)
"fRs" = (
/turf/closed/wall,
/area/crew_quarters/heads/hor)
@@ -54570,6 +54549,16 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
+"gmZ" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/machinery/door/airlock/external{
+ name = "Atmospherics External Access";
+ req_access_txt = "24"
+ },
+/turf/open/floor/plating,
+/area/maintenance/disposal/incinerator)
"gna" = (
/turf/open/floor/plasteel/stairs/medium,
/area/maintenance/department/crew_quarters/dorms)
@@ -54930,6 +54919,10 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/engine/engineering)
+"hbl" = (
+/obj/machinery/door/poddoor/incinerator_atmos_main,
+/turf/open/floor/engine/vacuum,
+/area/space)
"heC" = (
/obj/machinery/power/apc/highcap/five_k{
dir = 8;
@@ -55277,14 +55270,15 @@
/turf/open/floor/engine,
/area/engine/engineering)
"hSM" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/machinery/door/airlock/external{
- req_access_txt = "13"
+/obj/machinery/door/airlock/engineering{
+ name = "Starboard Solar Access";
+ req_access_txt = "10"
},
/turf/open/floor/plating,
-/area/maintenance/department/science)
+/area/maintenance/solars/starboard)
"hTl" = (
/obj/structure/sink{
dir = 4;
@@ -55393,6 +55387,13 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
/area/engine/engineering)
+"igB" = (
+/obj/machinery/camera{
+ c_tag = "Turbine Chamber";
+ network = list("turbine")
+ },
+/turf/open/floor/engine,
+/area/maintenance/disposal/incinerator)
"igE" = (
/obj/structure/table/reinforced,
/obj/machinery/button/door{
@@ -55665,7 +55666,7 @@
dir = 9
},
/turf/open/floor/plasteel/white,
-/area/storage/emergency/port)
+/area/medical/medbay/zone3)
"iJi" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
@@ -57267,6 +57268,15 @@
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
+"mvm" = (
+/obj/structure/cable,
+/obj/machinery/power/apc{
+ dir = 8;
+ name = "Starboard Solar APC";
+ pixel_x = -24
+ },
+/turf/open/floor/plating,
+/area/maintenance/solars/starboard)
"mwg" = (
/obj/structure/closet/crate{
icon_state = "crateopen"
@@ -57457,6 +57467,10 @@
/obj/effect/landmark/start/paramedic,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
+"nbu" = (
+/obj/structure/sign/warning/fire,
+/turf/closed/wall/r_wall,
+/area/space)
"ncm" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
dir = 4
@@ -58033,6 +58047,10 @@
},
/turf/open/floor/plasteel/dark,
/area/tcommsat/computer)
+"ore" = (
+/obj/structure/closet/firecloset,
+/turf/open/floor/plating,
+/area/engine/engineering)
"ost" = (
/obj/structure/table/glass,
/obj/item/paper_bin{
@@ -58144,13 +58162,6 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/machinery/door/airlock/external{
- name = "Solar Maintenance";
- req_access_txt = "10; 13"
- },
/turf/open/floor/plating,
/area/maintenance/solars/starboard)
"oDP" = (
@@ -58219,6 +58230,12 @@
/obj/item/stack/sheet/mineral/wood,
/turf/open/floor/plasteel,
/area/maintenance/department/engine)
+"oGw" = (
+/obj/item/clothing/mask/gas,
+/turf/open/floor/plating{
+ icon_state = "platingdmg3"
+ },
+/area/maintenance/disposal/incinerator)
"oHa" = (
/obj/machinery/power/emitter/anchored{
dir = 8;
@@ -59253,6 +59270,10 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
+"qVk" = (
+/obj/machinery/door/poddoor/incinerator_atmos_aux,
+/turf/open/space/basic,
+/area/maintenance/disposal/incinerator)
"qVP" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -59561,6 +59582,13 @@
icon_state = "panelscorched"
},
/area/maintenance/department/engine)
+"rzF" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/machinery/door/airlock/external,
+/turf/open/floor/plating,
+/area/space/nearstation)
"rBh" = (
/obj/structure/mopbucket,
/obj/item/mop,
@@ -60876,12 +60904,16 @@
/turf/open/floor/plasteel,
/area/science/xenobiology)
"uXH" = (
-/obj/structure/cable{
- icon_state = "2-4"
- },
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/obj/machinery/door/airlock/external{
+ name = "Solar Maintenance";
+ req_access_txt = "10; 13"
+ },
/turf/open/floor/plating,
/area/maintenance/solars/starboard)
"uZb" = (
@@ -61179,6 +61211,15 @@
},
/turf/open/floor/plating,
/area/maintenance/department/engine)
+"vHf" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/machinery/door/airlock/external{
+ req_access_txt = "13"
+ },
+/turf/open/floor/plating,
+/area/maintenance/department/science)
"vIc" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -62244,7 +62285,9 @@
/obj/structure/chair{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 9
+ },
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
@@ -77499,9 +77542,9 @@ rLi
tlc
aiu
aht
-aaa
-azH
-aaa
+axB
+rKr
+axB
aaa
aaa
aaa
@@ -77759,7 +77802,7 @@ axC
axB
rKr
axB
-axC
+aaa
aaa
aaa
aaa
@@ -78016,7 +78059,7 @@ axC
ayz
azN
axB
-axC
+aaa
aaa
aaa
aaa
@@ -81852,7 +81895,7 @@ ahB
ahZ
aiB
ajc
-agy
+ajM
akB
alq
alZ
@@ -82109,7 +82152,7 @@ ahC
aia
aiC
ajc
-agy
+ajM
akC
alr
ama
@@ -82366,7 +82409,7 @@ ahD
aib
aiD
ajc
-agy
+ajM
akD
als
amb
@@ -82457,9 +82500,9 @@ aht
aaa
aaa
abI
-aaa
-bSZ
-ahi
+dhS
+cqS
+rzF
bNs
bOw
bOw
@@ -82623,7 +82666,7 @@ ahB
aic
aiE
agy
-agy
+ajM
akE
alt
amc
@@ -82715,7 +82758,7 @@ abI
abI
abI
aaa
-aht
+bSZ
ahi
bNs
bNs
@@ -84535,8 +84578,8 @@ aaa
aaa
aaa
aaa
-kSb
-kSb
+fon
+fon
aht
aht
nKo
@@ -88119,7 +88162,7 @@ bDi
bDi
bDi
bIZ
-mZE
+aaa
aaa
aaa
aaa
@@ -88376,8 +88419,8 @@ wNq
bva
gMO
bBX
-mZE
-mZE
+aaa
+aaa
aaa
aaa
aaa
@@ -88634,7 +88677,7 @@ bBX
fdS
bBX
bBX
-mZE
+aaa
aaa
aaa
aaa
@@ -90435,7 +90478,7 @@ gnq
bXk
ceU
eVy
-cfP
+bXk
bXk
bXk
bXk
@@ -90949,8 +90992,8 @@ cdM
bXq
xmE
ymb
-cfQ
bXk
+ore
qWG
bXk
paU
@@ -94697,7 +94740,7 @@ ags
adX
adX
adX
-aaa
+ahr
aaa
aaa
aaa
@@ -94953,8 +94996,8 @@ cnC
adX
adX
adX
-ahh
-aaa
+shH
+alb
aaa
aaa
aaa
@@ -94969,9 +95012,9 @@ aaa
aaa
aaa
aaa
-aaa
ahi
atY
+bcN
auU
atY
lQQ
@@ -95210,8 +95253,8 @@ bIK
agt
agD
agR
-ahi
-aaa
+ahh
+atZ
aaa
aaa
aaa
@@ -95226,9 +95269,9 @@ aaa
aaa
aaa
aaa
-aaa
ahi
-atZ
+baH
+auV
auV
awc
axg
@@ -95467,8 +95510,8 @@ agg
adX
adX
adX
-ahh
-aaa
+shH
+alb
aaa
aaa
aaa
@@ -95483,11 +95526,11 @@ aaa
aaa
aaa
aaa
-aaa
ahi
atY
atY
atY
+atY
axh
axh
axh
@@ -95725,8 +95768,8 @@ ags
adX
adX
adX
-ahr
-aht
+shH
+aFj
aht
aht
aht
@@ -98813,7 +98856,7 @@ iqc
ngp
cBr
cBs
-alb
+tap
gna
klV
xbJ
@@ -99583,7 +99626,7 @@ aju
ajt
alQ
mnG
-alb
+tap
tap
aiS
anY
@@ -99841,7 +99884,7 @@ alc
alR
amF
pzF
-alb
+tap
anm
ajv
ajv
@@ -101739,7 +101782,7 @@ caN
bZT
bYw
cdl
-bYw
+oGw
bYw
aaa
mau
@@ -101994,9 +102037,9 @@ bYw
bZU
caO
cbF
-ccs
-cdm
-cdm
+bYw
+gmZ
+bYw
bYw
aht
fon
@@ -102248,13 +102291,13 @@ bVo
bJP
aht
bYw
-bYw
+igB
caP
+fRr
+qVk
+cdm
+cdm
bYw
-bYw
-aaa
-aaa
-aaa
aaa
aaa
aaa
@@ -102504,11 +102547,11 @@ bWg
bVo
bJP
aaa
-aaa
+bYw
bYw
caQ
bYw
-aaa
+bYw
aaa
aaa
aaa
@@ -102761,10 +102804,10 @@ bJP
bJP
bJP
abI
-abI
-bZV
+aaa
+bYw
caR
-bZV
+bYw
aaa
aaa
aaa
@@ -103018,10 +103061,10 @@ aaa
aaa
abI
aaa
-aaa
-aaa
-aaa
-aaa
+abI
+nbu
+hbl
+nbu
aaa
aaa
aaa
@@ -106821,7 +106864,7 @@ aEl
aEj
aEj
aht
-aht
+ccs
aEj
aEl
aEl
@@ -107078,10 +107121,10 @@ aTu
aUB
aEl
aaa
-aaa
-aEl
+aEj
aZv
aUC
+aUC
bcH
aUC
aZw
@@ -107336,8 +107379,8 @@ aGO
aEj
aEj
aEj
-aEj
aTx
+aFi
aGO
bcI
aFi
@@ -107573,10 +107616,10 @@ aaa
aaa
aaa
aaa
+aEl
+aFi
aEj
-aFj
-aEj
-aEj
+aaa
aEj
aEl
aEj
@@ -107593,12 +107636,12 @@ aUC
aVE
aUC
aUC
-aUC
aZw
-aFi
-bcI
-aFi
-aFi
+aEj
+aEj
+hSM
+aEj
+aEj
kIo
bfN
aEj
@@ -107830,9 +107873,9 @@ aaa
aaa
aaa
aaa
-ahi
-ahi
-ahi
+aEj
+bZV
+aEj
aaa
aaa
aaa
@@ -107852,9 +107895,9 @@ aEj
aEj
aYC
baG
-baG
+cfQ
bcJ
-baG
+mvm
baG
aEj
aEj
@@ -108087,9 +108130,9 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
+ahi
+ahi
+ahi
aaa
aaa
aaa
@@ -108623,9 +108666,9 @@ aFi
aFi
aYD
baG
-baH
+rWE
uXH
-bcN
+rWE
baG
eZA
tDn
@@ -108881,7 +108924,7 @@ aXC
aYE
baG
rWE
-bbO
+oCX
rWE
baG
vzT
@@ -109901,7 +109944,7 @@ aaa
aaa
aaa
aaa
-mZE
+aaa
aaa
aaa
aaa
@@ -112503,7 +112546,7 @@ qcH
bnd
nNN
bwm
-hSM
+lWy
bwm
bwm
aaa
@@ -112759,10 +112802,10 @@ riW
jtf
bnd
aht
-ahi
-ahi
-ahi
-aht
+bwm
+vHf
+bwm
+aaa
aht
aby
aht
@@ -113016,9 +113059,9 @@ cOp
lGS
bnd
aaa
-aaa
-aaa
-aaa
+ahi
+ahi
+ahi
aht
aaa
aed
diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
index 7a188281d0..81b5c5620f 100644
--- a/code/__DEFINES/subsystems.dm
+++ b/code/__DEFINES/subsystems.dm
@@ -146,11 +146,11 @@
#define SSAIR_EQUALIZE 8
#define SSAIR_ACTIVETURFS 9
+// |= on overlays is not actually guaranteed to not add same appearances but we're optimistically using it anyway.
#define COMPILE_OVERLAYS(A)\
if (TRUE) {\
var/list/ad = A.add_overlays;\
var/list/rm = A.remove_overlays;\
- var/list/po = A.priority_overlays;\
if(LAZYLEN(rm)){\
A.overlays -= rm;\
A.remove_overlays = null;\
@@ -159,11 +159,5 @@
A.overlays |= ad;\
A.add_overlays = null;\
}\
- if(LAZYLEN(po)){\
- A.overlays |= po;\
- }\
- else{\
- A.priority_overlays = null;\
- }\
A.flags_1 &= ~OVERLAY_QUEUED_1;\
}
diff --git a/code/_onclick/hud/screen_objects/storage.dm b/code/_onclick/hud/screen_objects/storage.dm
index ce7bc96c96..72b2d035a3 100644
--- a/code/_onclick/hud/screen_objects/storage.dm
+++ b/code/_onclick/hud/screen_objects/storage.dm
@@ -122,13 +122,13 @@
if(pixel_size == pixels)
return
pixel_size = pixels
- cut_overlays(TRUE)
+ cut_overlays()
//our icon size is 32 pixels.
transform = matrix((pixels - (VOLUMETRIC_STORAGE_BOX_BORDER_SIZE * 2)) / VOLUMETRIC_STORAGE_BOX_ICON_SIZE, 0, 0, 0, 1, 0)
left.pixel_x = -((pixels - VOLUMETRIC_STORAGE_BOX_ICON_SIZE) * 0.5) - VOLUMETRIC_STORAGE_BOX_BORDER_SIZE
right.pixel_x = ((pixels - VOLUMETRIC_STORAGE_BOX_ICON_SIZE) * 0.5) + VOLUMETRIC_STORAGE_BOX_BORDER_SIZE
- add_overlay(left, TRUE)
- add_overlay(right, TRUE)
+ add_overlay(left)
+ add_overlay(right)
/obj/screen/storage/volumetric_edge
layer = VOLUMETRIC_STORAGE_BOX_LAYER
diff --git a/code/controllers/subsystem/acid.dm b/code/controllers/subsystem/acid.dm
index e3c415960b..7c9e7634ab 100644
--- a/code/controllers/subsystem/acid.dm
+++ b/code/controllers/subsystem/acid.dm
@@ -29,7 +29,7 @@ SUBSYSTEM_DEF(acid)
if(O.acid_level && O.acid_processing())
else
- O.cut_overlay(GLOB.acid_overlay, TRUE)
+ O.update_icon()
processing -= O
if (MC_TICK_CHECK)
diff --git a/code/controllers/subsystem/overlays.dm b/code/controllers/subsystem/overlays.dm
index 20eb2af001..ea0f82436c 100644
--- a/code/controllers/subsystem/overlays.dm
+++ b/code/controllers/subsystem/overlays.dm
@@ -114,67 +114,47 @@ SUBSYSTEM_DEF(overlays)
#define NOT_QUEUED_ALREADY (!(flags_1 & OVERLAY_QUEUED_1))
#define QUEUE_FOR_COMPILE flags_1 |= OVERLAY_QUEUED_1; SSoverlays.queue += src;
-/atom/proc/cut_overlays(priority = FALSE)
- LAZYINITLIST(priority_overlays)
+/atom/proc/cut_overlays()
LAZYINITLIST(remove_overlays)
LAZYINITLIST(add_overlays)
remove_overlays = overlays.Copy()
add_overlays.Cut()
- if(priority)
- priority_overlays.Cut()
-
//If not already queued for work and there are overlays to remove
if(NOT_QUEUED_ALREADY && remove_overlays.len)
QUEUE_FOR_COMPILE
-/atom/proc/cut_overlay(list/overlays, priority)
+/atom/proc/cut_overlay(list/overlays)
if(!overlays)
return
overlays = build_appearance_list(overlays)
LAZYINITLIST(add_overlays) //always initialized after this point
- LAZYINITLIST(priority_overlays)
LAZYINITLIST(remove_overlays)
var/a_len = add_overlays.len
var/r_len = remove_overlays.len
- var/p_len = priority_overlays.len
remove_overlays += overlays
add_overlays -= overlays
-
- if(priority)
- var/list/cached_priority = priority_overlays
- LAZYREMOVE(cached_priority, overlays)
-
var/fa_len = add_overlays.len
var/fr_len = remove_overlays.len
- var/fp_len = priority_overlays.len
//If not already queued and there is work to be done
- if(NOT_QUEUED_ALREADY && (fa_len != a_len || fr_len != r_len || fp_len != p_len))
+ if(NOT_QUEUED_ALREADY && (fa_len != a_len || fr_len != r_len))
QUEUE_FOR_COMPILE
-/atom/proc/add_overlay(list/overlays, priority = FALSE)
+/atom/proc/add_overlay(list/overlays)
if(!overlays)
return
overlays = build_appearance_list(overlays)
LAZYINITLIST(add_overlays) //always initialized after this point
- LAZYINITLIST(priority_overlays)
var/a_len = add_overlays.len
- var/p_len = priority_overlays.len
- if(priority)
- priority_overlays += overlays //or in the image. Can we use [image] = image?
- var/fp_len = priority_overlays.len
- if(NOT_QUEUED_ALREADY && fp_len != p_len)
- QUEUE_FOR_COMPILE
- else
- add_overlays += overlays
- var/fa_len = add_overlays.len
- if(NOT_QUEUED_ALREADY && fa_len != a_len)
- QUEUE_FOR_COMPILE
+ add_overlays += overlays
+ var/fa_len = add_overlays.len
+ if(NOT_QUEUED_ALREADY && fa_len != a_len)
+ QUEUE_FOR_COMPILE
/atom/proc/copy_overlays(atom/other, cut_old) //copys our_overlays from another atom
if(!other)
diff --git a/code/datums/action.dm b/code/datums/action.dm
index 0033df09d7..fbf7487e4d 100644
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -157,7 +157,7 @@
/datum/action/proc/ApplyIcon(obj/screen/movable/action_button/current_button, force = FALSE)
if(icon_icon && button_icon_state && ((current_button.button_icon_state != button_icon_state) || force))
- current_button.cut_overlays(TRUE)
+ current_button.cut_overlays()
current_button.add_overlay(mutable_appearance(icon_icon, button_icon_state))
current_button.button_icon_state = button_icon_state
diff --git a/code/datums/components/crafting/recipes/recipes_clothing.dm b/code/datums/components/crafting/recipes/recipes_clothing.dm
index 2a24c0b451..717e99e8b2 100644
--- a/code/datums/components/crafting/recipes/recipes_clothing.dm
+++ b/code/datums/components/crafting/recipes/recipes_clothing.dm
@@ -40,13 +40,23 @@
reqs = list(/obj/item/paper = 20)
category = CAT_CLOTHING
+/datum/crafting_recipe/balaclavabreath
+ name = "Breathaclava"
+ result = /obj/item/clothing/mask/balaclava/breath
+ time = 10
+ reqs = list(/obj/item/clothing/mask/balaclava = 1,
+ /obj/item/clothing/mask/breath = 1)
+ category = CAT_CLOTHING
+
+
+
/datum/crafting_recipe/armwraps
name = "Armwraps"
result = /obj/item/clothing/gloves/fingerless/pugilist
time = 60
tools = list(TOOL_WIRECUTTER)
reqs = list(/obj/item/stack/sheet/cloth = 4,
- /obj/item/stack/sheet/durathread = 2,
+ /obj/item/stack/sticky_tape = 2,
/obj/item/stack/sheet/leather = 2)
category = CAT_CLOTHING
diff --git a/code/datums/components/embedded.dm b/code/datums/components/embedded.dm
index 51098756d3..8c4e62979b 100644
--- a/code/datums/components/embedded.dm
+++ b/code/datums/components/embedded.dm
@@ -119,7 +119,7 @@
UnregisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING))
if(overlay)
var/atom/A = parent
- A.cut_overlay(overlay, TRUE)
+ UnregisterSignal(A,COMSIG_ATOM_UPDATE_OVERLAYS)
qdel(overlay)
return ..()
@@ -326,7 +326,8 @@
var/matrix/M = matrix()
M.Translate(pixelX, pixelY)
overlay.transform = M
- hit.add_overlay(overlay, TRUE)
+ RegisterSignal(hit,COMSIG_ATOM_UPDATE_OVERLAYS,.proc/apply_overlay)
+ hit.update_icon()
if(harmful)
hit.visible_message("[weapon] embeds itself in [hit]!")
@@ -339,6 +340,8 @@
else
hit.visible_message("[weapon] sticks itself to [hit]!")
+/datum/component/embedded/proc/apply_overlay(atom/source, list/overlay_list)
+ overlay_list += overlay
/datum/component/embedded/proc/examineTurf(datum/source, mob/user, list/examine_list)
if(harmful)
diff --git a/code/datums/components/shielded.dm b/code/datums/components/shielded.dm
index 2052e57f49..3cf70e80ef 100644
--- a/code/datums/components/shielded.dm
+++ b/code/datums/components/shielded.dm
@@ -14,6 +14,7 @@
var/mob/living/holder //who is currently benefiting from the shield.
var/dissipating = FALSE //Is this shield meant to dissipate over time instead of recharging.
var/del_on_overload = FALSE //will delete itself once it has no charges left.
+ var/cached_vis_overlay //text identifier of the visual overlay.
/datum/component/shielded/Initialize(current, max = 3, delay = 20 SECONDS, rate = 1, slots, state = "shield-old", broken, \
sound = 'sound/magic/charge.ogg', end_sound = 'sound/machines/ding.ogg', diss = FALSE, del_overload = FALSE)
@@ -47,9 +48,8 @@
holder = L
var/to_add = charges >= 1 ? shield_state : broken_state
if(to_add)
- var/mutable_appearance/M = mutable_appearance('icons/effects/effects.dmi', to_add)
- M.layer = (L.layer > MOB_LAYER ? L.layer : MOB_LAYER) + 0.01
- holder.add_overlay(M, TRUE)
+ var/layer = (L.layer > MOB_LAYER ? L.layer : MOB_LAYER) + 0.01
+ SSvis_overlays.add_vis_overlay(L, 'icons/effects/effects.dmi', to_add, layer, GAME_PLANE, L.dir)
/datum/component/shielded/UnregisterFromParent()
. = ..()
@@ -57,9 +57,9 @@
UnregisterSignal(parent, list(COMSIG_ITEM_RUN_BLOCK,COMSIG_ITEM_CHECK_BLOCK,COMSIG_ITEM_EQUIPPED,COMSIG_ITEM_DROPPED))
if(holder)
UnregisterSignal(holder, list(COMSIG_LIVING_RUN_BLOCK, COMSIG_LIVING_GET_BLOCKING_ITEMS))
- var/to_remove = charges >= 1 ? shield_state : broken_state
- if(to_remove)
- holder.cut_overlay(mutable_appearance('icons/effects/effects.dmi', to_remove), TRUE)
+ if(cached_vis_overlay)
+ SSvis_overlays.remove_vis_overlay(holder, cached_vis_overlay)
+ cached_vis_overlay = null
holder = null
/datum/component/shielded/process()
@@ -80,7 +80,7 @@
holder.visible_message("[holder]'s shield overloads!")
qdel(src)
return
- if(holder && (old_charges < 1 && charges >= 1) || (!del_on_overload && old_charges >= 1 && charges < 1))
+ if(holder && ((old_charges < 1 && charges >= 1) || (!del_on_overload && old_charges >= 1 && charges < 1)))
update_shield_overlay(charges < 1)
/datum/component/shielded/proc/adjust_charges(amount)
@@ -93,20 +93,19 @@
holder.visible_message("[holder]'s shield overloads!")
qdel(src)
return
- if(holder && (old_charges < 1 && charges >= 1) || (!del_on_overload && old_charges >= 1 && charges < 1))
+ if(holder && ((old_charges < 1 && charges >= 1) || (!del_on_overload && old_charges >= 1 && charges < 1)))
update_shield_overlay(charges < 1)
/datum/component/shielded/proc/update_shield_overlay(broken)
if(!holder)
return
- var/to_remove = broken ? shield_state : broken_state
var/to_add = broken ? broken_state : shield_state
- if(to_remove)
- holder.cut_overlay(mutable_appearance('icons/effects/effects.dmi', to_remove), TRUE)
+ if(cached_vis_overlay)
+ SSvis_overlays.remove_vis_overlay(holder, cached_vis_overlay)
+ cached_vis_overlay = null
if(to_add)
- var/mutable_appearance/M = mutable_appearance('icons/effects/effects.dmi', to_add)
- M.layer = (holder.layer > MOB_LAYER ? holder.layer : MOB_LAYER) + 0.01
- holder.add_overlay(M, TRUE)
+ var/layer = (holder.layer > MOB_LAYER ? holder.layer : MOB_LAYER) + 0.01
+ SSvis_overlays.add_vis_overlay(holder, 'icons/effects/effects.dmi', to_add, layer, GAME_PLANE, holder.dir)
/datum/component/shielded/proc/on_equip(obj/item/source, mob/living/equipper, slot)
if(!(accepted_slots & slotdefine2slotbit(slot)))
@@ -117,17 +116,16 @@
RegisterSignal(equipper, COMSIG_LIVING_GET_BLOCKING_ITEMS, .proc/include_shield)
var/to_add = charges >= 1 ? shield_state : broken_state
if(to_add)
- var/mutable_appearance/M = mutable_appearance('icons/effects/effects.dmi', to_add)
- M.layer = (holder.layer > MOB_LAYER ? holder.layer : MOB_LAYER) + 0.01
- equipper.add_overlay(M, TRUE)
+ var/layer = (holder.layer > MOB_LAYER ? holder.layer : MOB_LAYER) + 0.01
+ cached_vis_overlay = SSvis_overlays.add_vis_overlay(holder, 'icons/effects/effects.dmi', to_add, layer, GAME_PLANE, holder.dir)
/datum/component/shielded/proc/on_drop(obj/item/source, mob/dropper)
if(holder == dropper)
UnregisterSignal(holder, COMSIG_LIVING_GET_BLOCKING_ITEMS)
UnregisterSignal(parent, list(COMSIG_ITEM_RUN_BLOCK, COMSIG_ITEM_CHECK_BLOCK))
- var/to_remove = charges >= 1 ? shield_state : broken_state
- if(to_remove)
- holder.cut_overlay(mutable_appearance('icons/effects/effects.dmi', to_remove), TRUE)
+ if(cached_vis_overlay)
+ SSvis_overlays.remove_vis_overlay(holder, cached_vis_overlay)
+ cached_vis_overlay = null
holder = null
/datum/component/shielded/proc/include_shield(mob/source, list/items)
diff --git a/code/datums/elements/decal.dm b/code/datums/elements/decal.dm
index 4bd482915a..50519b08e7 100644
--- a/code/datums/elements/decal.dm
+++ b/code/datums/elements/decal.dm
@@ -33,39 +33,34 @@
if(description)
RegisterSignal(A, COMSIG_PARENT_EXAMINE, .proc/examine)
- apply(A, TRUE)
-
num_decals_per_atom[A]++
+ apply(A)
/datum/element/decal/Detach(datum/target)
var/atom/A = target
- remove(A, A.dir)
- UnregisterSignal(A, list(COMSIG_ATOM_DIR_CHANGE, COMSIG_COMPONENT_CLEAN_ACT, COMSIG_PARENT_EXAMINE))
- LAZYREMOVE(num_decals_per_atom, A)
+ num_decals_per_atom[A]--
+ apply(A, TRUE)
+ if(!num_decals_per_atom[A])
+ UnregisterSignal(A, list(COMSIG_ATOM_DIR_CHANGE, COMSIG_COMPONENT_CLEAN_ACT, COMSIG_PARENT_EXAMINE, COMSIG_ATOM_UPDATE_OVERLAYS))
+ LAZYREMOVE(num_decals_per_atom, A)
return ..()
-/datum/element/decal/proc/remove(atom/target, old_dir)
- pic.dir = first_dir == NORTH ? target.dir : turn(first_dir, dir2angle(old_dir))
- for(var/i in 1 to num_decals_per_atom[target])
- target.cut_overlay(pic, TRUE)
+/datum/element/decal/proc/apply(atom/target, removing = FALSE)
+ if(num_decals_per_atom[target] == 1 && !removing)
+ RegisterSignal(target, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/apply_overlay, TRUE)
+ target.update_icon()
if(isitem(target))
addtimer(CALLBACK(target, /obj/item/.proc/update_slot_icon), 0, TIMER_UNIQUE)
-/datum/element/decal/proc/apply(atom/target, init = FALSE)
- pic.dir = first_dir == NORTH ? target.dir : turn(first_dir, dir2angle(target.dir))
- if(init)
- target.add_overlay(pic, TRUE)
- else
- for(var/i in 1 to num_decals_per_atom[target])
- target.add_overlay(pic, TRUE)
- if(isitem(target))
- addtimer(CALLBACK(target, /obj/item/.proc/update_slot_icon), 0, TIMER_UNIQUE)
+/datum/element/decal/proc/apply_overlay(atom/source, list/overlay_list)
+ pic.dir = first_dir == NORTH ? source.dir : turn(first_dir, dir2angle(source.dir))
+ for(var/i in 1 to num_decals_per_atom[source])
+ overlay_list += pic
-/datum/element/decal/proc/rotate_react(datum/source, old_dir, new_dir)
+/datum/element/decal/proc/rotate_react(atom/source, old_dir, new_dir)
if(old_dir == new_dir)
return
- remove(source, old_dir)
- apply(source)
+ source.update_icon()
/datum/element/decal/proc/clean_react(datum/source, strength)
if(strength >= cleanable)
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 7adbb8e949..ee48758c7e 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -26,7 +26,6 @@
var/list/atom_colours //used to store the different colors on an atom
//its inherent color, the colored paint applied on it, special color effect etc...
- var/list/priority_overlays //overlays that should remain on top and not normally removed when using cut_overlay functions, like c4.
var/list/remove_overlays // a very temporary list of overlays to remove
var/list/add_overlays // a very temporary list of overlays to add
@@ -149,7 +148,6 @@
qdel(reagents)
LAZYCLEARLIST(overlays)
- LAZYCLEARLIST(priority_overlays)
for(var/i in targeted_by)
var/mob/M = i
@@ -1134,4 +1132,4 @@
* Override this if you want custom behaviour in whatever gets hit by the rust
*/
/atom/proc/rust_heretic_act()
- return
+ return
diff --git a/code/game/gamemodes/dynamic/dynamic_storytellers.dm b/code/game/gamemodes/dynamic/dynamic_storytellers.dm
index 561b38fde1..148de9568a 100644
--- a/code/game/gamemodes/dynamic/dynamic_storytellers.dm
+++ b/code/game/gamemodes/dynamic/dynamic_storytellers.dm
@@ -50,10 +50,6 @@ Property weights are:
for(var/r in SSevents.running)
var/datum/round_event/R = r
threat += R.threat()
- for(var/mob/living/simple_animal/hostile/H in GLOB.mob_living_list)
- var/turf/T = get_turf(H)
- if(H.stat != DEAD && is_station_level(T.z) && !("Station" in H.faction))
- threat += H.threat()
for(var/obj/item/phylactery/P in GLOB.poi_list)
threat += 25 // can't be giving them too much of a break
for (var/mob/M in mode.current_players[CURRENT_LIVING_PLAYERS])
@@ -91,6 +87,8 @@ Property weights are:
mean += 2.5
if(CHAOS_MAX)
mean += 5
+ else
+ voters += 0.5
if(voters)
GLOB.dynamic_curve_centre += (mean/voters)
if(flags & USE_PREV_ROUND_WEIGHTS)
@@ -128,7 +126,8 @@ Property weights are:
for(var/property in property_weights)
if(property in rule.property_weights) // just treat it as 0 if it's not in there
property_weight += rule.property_weights[property] * property_weights[property]
- drafted_rules[rule] = (rule.get_weight() * property_weight)*rule.weight_mult
+ if(property_weight > 0)
+ drafted_rules[rule] = rule.get_weight() * property_weight * rule.weight_mult
return drafted_rules
/datum/dynamic_storyteller/proc/midround_draft()
@@ -140,25 +139,26 @@ Property weights are:
if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET)))
continue
rule.trim_candidates()
- var/threat_weight = 1
- if(!(rule.flags & MINOR_RULESET)) // makes the traitor rulesets always possible anyway
- var/cost_difference = abs(rule.cost-(mode.threat_level-mode.threat))
- /* Basically, the closer the cost is to the current threat-level-away-from-threat, the more likely it is to
- pick this particular ruleset.
- Let's use a toy example: there's 60 threat level and 10 threat spent.
- We want to pick a ruleset that's close to that, so we run the below equation, on two rulesets.
- Ruleset 1 has 30 cost, ruleset 2 has 5 cost.
- When we do the math, ruleset 1's threat_weight is 0.538, and ruleset 2's is 0.238, meaning ruleset 1
- is 2.26 times as likely to be picked, all other things considered.
- Of course, we don't want it to GUARANTEE the closest, that's no fun, so it's just a weight.
- */
- threat_weight = abs(1-abs(1-LOGISTIC_FUNCTION(2,0.05,cost_difference,0)))
if (rule.ready())
var/property_weight = 0
for(var/property in property_weights)
- if(property in rule.property_weights)
+ if(property in rule.property_weights) // just treat it as 0 if it's not in there
property_weight += rule.property_weights[property] * property_weights[property]
- drafted_rules[rule] = round(((rule.get_weight() * property_weight)*rule.weight_mult*threat_weight)*1000,1)
+ if(property_weight > 0)
+ var/threat_weight = 1
+ if(!(rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET)) // makes the traitor rulesets always possible anyway
+ var/cost_difference = abs(rule.cost-(mode.threat_level-mode.threat))
+ /* Basically, the closer the cost is to the current threat-level-away-from-threat, the more likely it is to
+ pick this particular ruleset.
+ Let's use a toy example: there's 60 threat level and 10 threat spent.
+ We want to pick a ruleset that's close to that, so we run the below equation, on two rulesets.
+ Ruleset 1 has 30 cost, ruleset 2 has 5 cost.
+ When we do the math, ruleset 1's threat_weight is 0.538, and ruleset 2's is 0.238, meaning ruleset 1
+ is 2.26 times as likely to be picked, all other things considered.
+ Of course, we don't want it to GUARANTEE the closest, that's no fun, so it's just a weight.
+ */
+ threat_weight = abs(1-abs(1-LOGISTIC_FUNCTION(2,0.05,cost_difference,0)))
+ drafted_rules[rule] = rule.get_weight() * property_weight * rule.weight_mult * threat_weight
return drafted_rules
/datum/dynamic_storyteller/proc/latejoin_draft(mob/living/carbon/human/newPlayer)
@@ -175,28 +175,29 @@ Property weights are:
rule.candidates = list(newPlayer)
rule.trim_candidates()
- var/threat_weight = 1
- if(!(rule.flags & MINOR_RULESET))
- var/cost_difference = abs(rule.cost-(mode.threat_level-mode.threat))
- threat_weight = 1-abs(1-(LOGISTIC_FUNCTION(2,0.05,cost_difference,0)))
if (rule.ready())
var/property_weight = 0
for(var/property in property_weights)
if(property in rule.property_weights)
property_weight += rule.property_weights[property] * property_weights[property]
- drafted_rules[rule] = round(((rule.get_weight() * property_weight)*rule.weight_mult*threat_weight)*1000,1)
+ if(property_weight > 0)
+ var/threat_weight = 1
+ if(!(rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET))
+ var/cost_difference = abs(rule.cost-(mode.threat_level-mode.threat))
+ threat_weight = 1-abs(1-(LOGISTIC_FUNCTION(2,0.05,cost_difference,0)))
+ drafted_rules[rule] = rule.get_weight() * property_weight * rule.weight_mult * threat_weight
return drafted_rules
/datum/dynamic_storyteller/proc/event_draft()
var/list/drafted_rules = list()
for(var/datum/dynamic_ruleset/event/rule in mode.events)
- if(rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level) && (mode.threat_level - mode.threat) >= rule.cost)
- if(rule.ready())
- var/property_weight = 0
- for(var/property in property_weights)
- if(property in rule.property_weights)
- property_weight += rule.property_weights[property] * property_weights[property]
- drafted_rules[rule] = (rule.get_weight() + property_weight)*rule.weight_mult
+ if(rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level) && (mode.threat_level + 20 - mode.threat) >= rule.cost && rule.ready())
+ var/property_weight = 0
+ for(var/property in property_weights)
+ if(property in rule.property_weights)
+ property_weight += rule.property_weights[property] * property_weights[property]
+ if(property_weight > 0)
+ drafted_rules[rule] = rule.get_weight() + property_weight * rule.weight_mult
return drafted_rules
@@ -313,9 +314,8 @@ Property weights are:
/datum/dynamic_storyteller/random/event_draft()
var/list/drafted_rules = list()
for(var/datum/dynamic_ruleset/event/rule in mode.events)
- if(rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level))
- if(rule.ready())
- drafted_rules[rule] = 1
+ if(rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level) && rule.ready())
+ drafted_rules[rule] = 1
return drafted_rules
/datum/dynamic_storyteller/story
@@ -330,7 +330,7 @@ Property weights are:
/datum/dynamic_storyteller/story/calculate_threat()
var/current_time = (world.time / SSautotransfer.targettime)*180
- mode.threat_level = round(mode.initial_threat_level*(sin(current_time)+0.25),0.1)
+ mode.threat_level = round((mode.initial_threat_level*(sin(current_time)/2)+0.75),0.1)
return ..()
/datum/dynamic_storyteller/classic
diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm
index a2b0e3edd4..014487332c 100644
--- a/code/game/objects/items/grenades/plastic.dm
+++ b/code/game/objects/items/grenades/plastic.dm
@@ -60,7 +60,8 @@
if(target)
if(!QDELETED(target))
location = get_turf(target)
- target.cut_overlay(plastic_overlay, TRUE)
+ target.cut_overlay(plastic_overlay)
+ UnregisterSignal(target, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/add_plastic_overlay)
if(!ismob(target) || full_damage_on_mobs)
target.ex_act(EXPLODE_HEAVY, target)
else
@@ -126,13 +127,17 @@
I.embedding["embed_chance"] = 0
I.updateEmbedding()
- target.add_overlay(plastic_overlay, TRUE)
+ RegisterSignal(target, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/add_plastic_overlay)
+ target.update_icon()
if(!nadeassembly)
to_chat(user, "You plant the bomb. Timer counting down from [det_time].")
addtimer(CALLBACK(src, .proc/prime), det_time*10)
else
qdel(src) //How?
+/obj/item/grenade/plastic/proc/add_plastic_overlay(atom/source, list/overlay_list)
+ overlay_list += plastic_overlay
+
/obj/item/grenade/plastic/proc/shout_syndicate_crap(mob/M)
if(!M)
return
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index b5f8612244..f462050789 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -252,6 +252,10 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/katana/timestop
name = "temporal katana"
desc = "Delicately balanced, this finely-crafted blade hums with barely-restrained potential."
+ icon_state = "temporalkatana"
+ item_state = "temporalkatana"
+ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
block_chance = 0 // oops
force = 27.5 // oops
item_flags = ITEM_CAN_PARRY
@@ -263,6 +267,21 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
flynn.emote("smirk")
new /obj/effect/timestop/magic(get_turf(owner), 1, 50, list(owner)) // null roddies counter
+/obj/item/katana/timestop/suicide_act(mob/living/user) // stolen from hierophant staff
+ new /obj/effect/timestop/magic(get_turf(user), 1, 50, list(user)) // free usage for dying
+ user.visible_message("[user] poses menacingly with the [src]! It looks like [user.p_theyre()] trying to teleport behind someone!")
+ user.say("Heh.. Nothing personnel, kid..", forced = "temporal katana suicide")
+ sleep(20)
+ if(!user)
+ return
+ user.visible_message("[user] vanishes into a cloud of falling dust and burning embers, likely off to style on some poor sod in the distance!")
+ playsound(user,'sound/magic/blink.ogg', 75, TRUE)
+ for(var/obj/item/I in user)
+ if(I != src)
+ user.dropItemToGround(I)
+ user.dropItemToGround(src) //Drop us last, so it goes on top of their stuff
+ qdel(user)
+
/obj/item/melee/bokken // parrying stick
name = "bokken"
desc = "A space-Japanese training sword made of wood and shaped like a katana."
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index 14017ffb2d..f5003e035b 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -186,7 +186,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
if(!acid_level)
SSacid.processing[src] = src
- add_overlay(GLOB.acid_overlay, TRUE)
+ update_icon()
var/acid_cap = acidpwr * 300 //so we cannot use huge amounts of weak acids to do as well as strong acids.
if(acid_level < acid_cap)
acid_level = min(acid_level + acidpwr * acid_volume, acid_cap)
@@ -224,7 +224,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
if(!(resistance_flags & ON_FIRE) && (resistance_flags & FLAMMABLE))
resistance_flags |= ON_FIRE
SSfire_burning.processing[src] = src
- add_overlay(GLOB.fire_overlay, TRUE)
+ update_icon()
return 1
//called when the obj is destroyed by fire
@@ -236,7 +236,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
/obj/proc/extinguish()
if(resistance_flags & ON_FIRE)
resistance_flags &= ~ON_FIRE
- cut_overlay(GLOB.fire_overlay, TRUE)
+ update_icon()
SSfire_burning.processing -= src
/obj/zap_act(power, zap_flags, shocked_targets)
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 1927adb477..99b302e9ce 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -317,6 +317,13 @@
icon_state = unique_reskin[choice]
to_chat(M, "[src] is now skinned as '[choice]'.")
+/obj/update_overlays()
+ . = ..()
+ if(acid_level)
+ . += GLOB.acid_overlay
+ if(resistance_flags & ON_FIRE)
+ . += GLOB.fire_overlay
+
//Called when the object is constructed by an autolathe
//Has a reference to the autolathe so you can do !!FUN!! things with hacked lathes
/obj/proc/autolathe_crafted(obj/machinery/autolathe/A)
diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm
index c5f880c955..14f7b34309 100644
--- a/code/modules/antagonists/_common/antag_datum.dm
+++ b/code/modules/antagonists/_common/antag_datum.dm
@@ -281,7 +281,6 @@ GLOBAL_LIST_EMPTY(antagonists)
. = CONFIG_GET(keyed_list/antag_threat)[lowertext(name)]
if(. == null)
return threat
- return threat
//This one is created by admin tools for custom objectives
/datum/antagonist/custom
diff --git a/code/modules/antagonists/blob/blob.dm b/code/modules/antagonists/blob/blob.dm
index 9a82bb546b..c449bd3012 100644
--- a/code/modules/antagonists/blob/blob.dm
+++ b/code/modules/antagonists/blob/blob.dm
@@ -4,11 +4,17 @@
antagpanel_category = "Blob"
show_to_ghosts = TRUE
job_rank = ROLE_BLOB
- threat = 20
+ threat = 50
var/datum/action/innate/blobpop/pop_action
var/starting_points_human_blob = 60
var/point_rate_human_blob = 2
+/datum/antagonist/blob/threat()
+ . = ..()
+ if(isovermind(owner.current))
+ var/mob/camera/blob/overmind = owner.current
+ . *= (overmind.blobs_legit.len / overmind.max_count)
+
/datum/antagonist/blob/roundend_report()
var/basic_report = ..()
//Display max blobpoints for blebs that lost
diff --git a/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm b/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm
index ba2363ecc0..f9763b92fd 100644
--- a/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm
+++ b/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm
@@ -75,7 +75,6 @@
desc = "A floating, fragile spore."
icon_state = "blobpod"
icon_living = "blobpod"
- threat = 0.2
health = 30
maxHealth = 30
verb_say = "psychically pulses"
diff --git a/code/modules/antagonists/clockcult/clock_mobs.dm b/code/modules/antagonists/clockcult/clock_mobs.dm
index 87466d65f2..2f00fd4e4a 100644
--- a/code/modules/antagonists/clockcult/clock_mobs.dm
+++ b/code/modules/antagonists/clockcult/clock_mobs.dm
@@ -6,7 +6,6 @@
unique_name = 1
minbodytemp = 0
unsuitable_atmos_damage = 0
- threat = 1
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) //Robotic
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
healable = FALSE
diff --git a/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm b/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm
index 79b919b1e9..76c9db7231 100644
--- a/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm
+++ b/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm
@@ -9,7 +9,6 @@
desc = "The stalwart apparition of a soldier, blazing with crimson flames. It's armed with a gladius and shield."
icon_state = "clockwork_marauder"
mob_biotypes = MOB_HUMANOID
- threat = 3
health = 120
maxHealth = 120
force_threshold = 8
diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm
index b7503f4b22..305c4fadb7 100644
--- a/code/modules/antagonists/swarmer/swarmer.dm
+++ b/code/modules/antagonists/swarmer/swarmer.dm
@@ -70,7 +70,6 @@
icon_living = "swarmer"
icon_dead = "swarmer_unactivated"
icon_gib = null
- threat = 0.5
wander = 0
harm_intent_damage = 5
minbodytemp = 0
diff --git a/code/modules/antagonists/xeno/xeno.dm b/code/modules/antagonists/xeno/xeno.dm
index 2cc8e34b99..f10506a0d9 100644
--- a/code/modules/antagonists/xeno/xeno.dm
+++ b/code/modules/antagonists/xeno/xeno.dm
@@ -16,6 +16,18 @@
var/datum/team/xeno/xeno_team
threat = 3
+/datum/antagonist/xeno/threat()
+ . = 1
+ if(isalienhunter(owner))
+ . = 2
+ else if(isaliensentinel(owner))
+ . = 4
+ else if(isalienroyal(owner))
+ if(isalienqueen(owner))
+ . = 8
+ else
+ . = 6
+
/datum/antagonist/xeno/create_team(datum/team/xeno/new_team)
if(!new_team)
for(var/datum/antagonist/xeno/X in GLOB.antagonists)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index d540336b86..2fbe738acb 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -118,8 +118,7 @@
// Set the clothing's integrity back to 100%, remove all damage to bodyparts, and generally fix it up
/obj/item/clothing/proc/repair(mob/user, params)
- damaged_clothes = CLOTHING_PRISTINE
- update_clothes_damaged_state(FALSE)
+ update_clothes_damaged_state(CLOTHING_PRISTINE)
obj_integrity = max_integrity
name = initial(name) // remove "tattered" or "shredded" if there's a prefix
body_parts_covered = initial(body_parts_covered)
@@ -196,7 +195,7 @@
if(3 to INFINITY) // take better care of your shit, dude
name = "tattered [initial(name)]"
- update_clothes_damaged_state()
+ update_clothes_damaged_state(CLOTHING_DAMAGED)
/obj/item/clothing/Destroy()
user_vars_remembered = null //Oh god somebody put REFERENCES in here? not to worry, we'll clean it up
@@ -257,7 +256,7 @@
how_cool_are_your_threads += "Adding or removing items from [src] makes no noise.\n"
how_cool_are_your_threads += ""
. += how_cool_are_your_threads.Join()
-
+
if(LAZYLEN(armor_list))
armor_list.Cut()
if(armor.bio)
@@ -346,10 +345,16 @@
var/mob/M = loc
to_chat(M, "Your [name] starts to fall apart!")
-/obj/item/clothing/proc/update_clothes_damaged_state(damaging = TRUE)
- var/index = "[REF(initial(icon))]-[initial(icon_state)]"
- var/static/list/damaged_clothes_icons = list()
- if(damaging)
+//This mostly exists so subtypes can call appriopriate update icon calls on the wearer.
+/obj/item/clothing/proc/update_clothes_damaged_state(damaged_state = CLOTHING_DAMAGED)
+ damaged_clothes = damaged_state
+ update_icon()
+
+/obj/item/clothing/update_overlays()
+ . = ..()
+ if(damaged_clothes)
+ var/index = "[REF(initial(icon))]-[initial(icon_state)]"
+ var/static/list/damaged_clothes_icons = list()
var/icon/damaged_clothes_icon = damaged_clothes_icons[index]
if(!damaged_clothes_icon)
damaged_clothes_icon = icon(initial(icon), initial(icon_state), , 1) //we only want to apply damaged effect to the initial icon_state for each object
@@ -357,9 +362,7 @@
damaged_clothes_icon.Blend(icon('icons/effects/item_damage.dmi', "itemdamaged"), ICON_MULTIPLY) //adds damage effect and the remaining white areas become transparant
damaged_clothes_icon = fcopy_rsc(damaged_clothes_icon)
damaged_clothes_icons[index] = damaged_clothes_icon
- add_overlay(damaged_clothes_icon, TRUE)
- else
- cut_overlay(damaged_clothes_icons[index], TRUE)
+ . += damaged_clothes_icon
/*
SEE_SELF // can see self, no matter what
diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm
index f11c89d00c..6701b53c10 100644
--- a/code/modules/clothing/masks/boxing.dm
+++ b/code/modules/clothing/masks/boxing.dm
@@ -12,6 +12,10 @@
/obj/item/clothing/mask/balaclava/attack_self(mob/user)
adjustmask(user)
+/obj/item/clothing/mask/balaclava/breath
+ name = "breathaclava"
+ clothing_flags = ALLOWINTERNALS
+
/obj/item/clothing/mask/infiltrator
name = "insidious balaclava"
desc = "An incredibly suspicious balaclava made with Syndicate nanofibers to absorb impacts slightly while obfuscating the voice and face using a garbled vocoder."
diff --git a/code/modules/events/alien_infestation.dm b/code/modules/events/alien_infestation.dm
index 69e9a974eb..993577cb30 100644
--- a/code/modules/events/alien_infestation.dm
+++ b/code/modules/events/alien_infestation.dm
@@ -3,7 +3,7 @@
typepath = /datum/round_event/ghost_role/alien_infestation
weight = 5
gamemode_blacklist = list("dynamic")
- min_players = 10
+ min_players = 25
max_occurrences = 1
/datum/round_event/ghost_role/alien_infestation
diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm
index da5b4c0cb2..1c88e68377 100644
--- a/code/modules/events/brand_intelligence.dm
+++ b/code/modules/events/brand_intelligence.dm
@@ -27,7 +27,6 @@
"How do I vore people?",
"ERP?",
"Not epic bros...")
- threat = 5
/datum/round_event/brand_intelligence/announce(fake)
diff --git a/code/modules/events/wizard/magicarp.dm b/code/modules/events/wizard/magicarp.dm
index 4d2e8e624c..57e2a2a051 100644
--- a/code/modules/events/wizard/magicarp.dm
+++ b/code/modules/events/wizard/magicarp.dm
@@ -30,7 +30,6 @@
icon_dead = "magicarp_dead"
icon_gib = "magicarp_gib"
ranged = 1
- threat = 4
retreat_distance = 2
minimum_distance = 0 //Between shots they can and will close in to nash
projectiletype = /obj/item/projectile/magic
@@ -52,7 +51,6 @@
color = "#00FFFF"
maxHealth = 75
health = 75
- threat = 7
/mob/living/simple_animal/hostile/carp/ranged/chaos/Shoot()
projectiletype = pick(allowed_projectile_types)
diff --git a/code/modules/holiday/halloween/halloween.dm b/code/modules/holiday/halloween/halloween.dm
index 6c9e527f38..d3b9b92b4f 100644
--- a/code/modules/holiday/halloween/halloween.dm
+++ b/code/modules/holiday/halloween/halloween.dm
@@ -190,7 +190,6 @@
icon_dead = "scary_clown"
icon_gib = "scary_clown"
speak = list("...", ". . .")
- threat = 3
maxHealth = 120
health = 120
emote_see = list("silently stares")
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm b/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm
index 7319652ebe..f514ef54db 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm
@@ -157,7 +157,7 @@
/datum/sprite_accessory/snouts/mam_snouts
color_src = MATRIXED
icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
- recommended_species = list("mammal", "slimeperson", "insect", "podweak")
+ recommended_species = list("mammal", "slimeperson", "insect", "podweak", "lizard")
mutant_part_string = "snout"
relevant_layers = list(BODY_ADJ_LAYER, BODY_FRONT_LAYER)
diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm
index 1e2a375b39..2f5c94b784 100644
--- a/code/modules/mob/living/carbon/human/dummy.dm
+++ b/code/modules/mob/living/carbon/human/dummy.dm
@@ -21,7 +21,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
/mob/living/carbon/human/dummy/proc/wipe_state()
delete_equipment()
icon_render_key = null
- cut_overlays(TRUE)
+ cut_overlays()
//Inefficient pooling/caching way.
GLOBAL_LIST_EMPTY(human_dummy_list)
diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
index 995f860fce..9c01a15406 100644
--- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
@@ -5,7 +5,6 @@
say_mod = "hisses"
default_color = "00FF00"
species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,LIPS,HORNCOLOR,WINGCOLOR,HAS_FLESH,HAS_BONE)
- mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings", "legs", "taur", "deco_wings")
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_REPTILE
mutanttongue = /obj/item/organ/tongue/lizard
mutanttail = /obj/item/organ/tail/lizard
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index 354bc9ed0f..95bd8d8991 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -11,7 +11,6 @@
response_disarm_simple = "flail at"
response_harm_continuous = "punches"
response_harm_simple = "punch"
- threat = 1
speak_chance = 1
icon = 'icons/mob/mob.dmi'
speed = 0
@@ -122,7 +121,6 @@
desc = "A massive, armored construct built to spearhead attacks and soak up enemy fire."
icon_state = "behemoth"
icon_living = "behemoth"
- threat = 3
maxHealth = 150
health = 150
response_harm_continuous = "harmlessly punches"
@@ -187,7 +185,6 @@
desc = "A wicked, clawed shell constructed to assassinate enemies and sow chaos behind enemy lines."
icon_state = "floating"
icon_living = "floating"
- threat = 3
maxHealth = 65
health = 65
melee_damage_lower = 20
diff --git a/code/modules/mob/living/simple_animal/friendly/gondola.dm b/code/modules/mob/living/simple_animal/friendly/gondola.dm
index 0cfea3548b..e29cbb8062 100644
--- a/code/modules/mob/living/simple_animal/friendly/gondola.dm
+++ b/code/modules/mob/living/simple_animal/friendly/gondola.dm
@@ -58,7 +58,7 @@
eyes_overlay.pixel_y = -8
moustache_overlay.pixel_y = -8
- cut_overlays(TRUE)
+ cut_overlays()
add_overlay(body_overlay)
add_overlay(eyes_overlay)
add_overlay(moustache_overlay)
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index fb24b0fc09..7abecc7c81 100644
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm
@@ -8,7 +8,6 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
name = "Guardian Spirit"
real_name = "Guardian Spirit"
desc = "A mysterious being that stands by its charge, ever vigilant."
- threat = 5
speak_emote = list("hisses")
gender = NEUTER
mob_biotypes = NONE
diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm
index 7120ab6d0a..86467624b5 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien.dm
@@ -7,7 +7,6 @@
icon_dead = "alienh_dead"
icon_gib = "syndicate_gib"
gender = FEMALE
- threat = 1
response_help_continuous = "pokes"
response_help_simple = "poke"
response_disarm_continuous = "shoves"
@@ -69,7 +68,6 @@
icon_state = "aliens"
icon_living = "aliens"
icon_dead = "aliens_dead"
- threat = 3
health = 150
maxHealth = 150
melee_damage_lower = 15
@@ -87,7 +85,6 @@
icon_living = "alienq"
icon_dead = "alienq_dead"
pixel_x = -16
- threat = 8
health = 250
maxHealth = 250
melee_damage_lower = 15
@@ -167,7 +164,6 @@
name = "lusty xenomorph maid"
melee_damage_lower = 0
melee_damage_upper = 0
- threat = -1
a_intent = INTENT_HELP
friendly_verb_continuous = "caresses"
friendly_verb_simple = "caress"
diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index da16ec581b..1be90a07f8 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -2,7 +2,6 @@
/mob/living/simple_animal/hostile/bear
name = "space bear"
desc = "You don't need to be faster than a space bear, you just need to outrun your crewmates."
- threat = 1
icon_state = "bear"
icon_living = "bear"
icon_dead = "bear_dead"
diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm
index 5f3d4f11c1..0a3cde3ef8 100644
--- a/code/modules/mob/living/simple_animal/hostile/bees.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bees.dm
@@ -16,7 +16,6 @@
icon_state = ""
icon_living = ""
icon = 'icons/mob/bees.dmi'
- threat = 0.3
gender = FEMALE
speak_emote = list("buzzes")
emote_hear = list("buzzes")
diff --git a/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm b/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm
index cde63adffd..b4d60af198 100644
--- a/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm
@@ -1,7 +1,6 @@
/mob/living/simple_animal/hostile/boss
name = "A Perfectly Generic Boss Placeholder"
desc = ""
- threat = 10
robust_searching = TRUE
stat_attack = UNCONSCIOUS
status_flags = NONE
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index f775d6600c..51a646f668 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -7,7 +7,6 @@
icon_living = "carp"
icon_dead = "carp_dead"
icon_gib = "carp_gib"
- threat = 0.1
mob_biotypes = MOB_ORGANIC|MOB_BEAST
speak_chance = 0
turns_per_move = 5
@@ -74,7 +73,6 @@
icon_living = "megacarp"
icon_dead = "megacarp_dead"
icon_gib = "megacarp_gib"
- threat = 3
regen_amount = 6
maxHealth = 30
@@ -98,7 +96,6 @@
name = "Cayenne"
desc = "A failed Syndicate experiment in weaponized space carp technology, it now serves as a lovable mascot."
gender = FEMALE
- threat = 5
regen_amount = 8
speak_emote = list("squeaks")
diff --git a/code/modules/mob/living/simple_animal/hostile/dark_wizard.dm b/code/modules/mob/living/simple_animal/hostile/dark_wizard.dm
index 48266e3e76..9b50587b3d 100644
--- a/code/modules/mob/living/simple_animal/hostile/dark_wizard.dm
+++ b/code/modules/mob/living/simple_animal/hostile/dark_wizard.dm
@@ -1,7 +1,6 @@
/mob/living/simple_animal/hostile/dark_wizard
name = "Dark Wizard"
desc = "Killing amateurs since the dawn of times."
- threat = 3
icon = 'icons/mob/simple_human.dmi'
icon_state = "dark_wizard"
icon_living = "dark_wizard"
diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm
index 4f8d2fef6c..b44a2502ef 100644
--- a/code/modules/mob/living/simple_animal/hostile/faithless.dm
+++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm
@@ -4,7 +4,6 @@
icon_state = "faithless"
icon_living = "faithless"
icon_dead = "faithless_dead"
- threat = 1
mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
gender = MALE
speak_chance = 0
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index a253ecfd96..a8799f4e8c 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -17,7 +17,6 @@
//basic spider mob, these generally guard nests
/mob/living/simple_animal/hostile/poison/giant_spider
- threat = 1
name = "giant spider"
desc = "Furry and black, it makes you shudder to look at it. This one has deep red eyes."
icon_state = "guard"
diff --git a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
index f48eef083b..ec0b7acd07 100644
--- a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
+++ b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
@@ -9,7 +9,6 @@
icon_state = "crawling"
icon_living = "crawling"
icon_dead = "dead"
- threat = 0.5
mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
speak_chance = 80
maxHealth = 220
diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm
index a17e5e8129..f0a06af9e4 100644
--- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm
+++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm
@@ -6,7 +6,6 @@
icon_state = "headcrab"
icon_living = "headcrab"
icon_dead = "headcrab_dead"
- threat = 1
gender = NEUTER
health = 50
maxHealth = 50
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index 5ed3cd0cdd..186fe36a10 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -3,7 +3,6 @@
stop_automated_movement_when_pulled = 0
obj_damage = 40
environment_smash = ENVIRONMENT_SMASH_STRUCTURES //Bitflags. Set to ENVIRONMENT_SMASH_STRUCTURES to break closets,tables,racks, etc; ENVIRONMENT_SMASH_WALLS for walls; ENVIRONMENT_SMASH_RWALLS for rwalls
- var/threat = 0 // for dynamic
var/atom/target
var/ranged = FALSE
var/rapid = 0 //How many shots per volley.
@@ -600,6 +599,3 @@ mob/living/simple_animal/hostile/proc/DestroySurroundings() // for use with mega
. += M
else if (M.loc.type in hostile_machines)
. += M.loc
-
-/mob/living/simple_animal/hostile/proc/threat()
- return threat
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm
index 55046d6555..362432b2af 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm
@@ -11,7 +11,6 @@
icon_living = "leaper"
icon_dead = "leaper_dead"
mob_biotypes = MOB_ORGANIC|MOB_BEAST
- threat = 2
maxHealth = 300
health = 300
ranged = TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm b/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm
index 99349168f0..31303bd7f1 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm
@@ -8,7 +8,6 @@
icon_living = "arachnid"
icon_dead = "arachnid_dead"
mob_biotypes = MOB_ORGANIC|MOB_BUG
- threat = 2
melee_damage_lower = 30
melee_damage_upper = 30
maxHealth = 300
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm b/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm
index 6efa0cf468..2d964f5721 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm
@@ -14,7 +14,6 @@
icon_living = "mook"
icon_dead = "mook_dead"
mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
- threat = 0.5
pixel_x = -16
maxHealth = 45
health = 45
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm b/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm
index 0521afa9e9..7565a686bf 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm
@@ -13,7 +13,6 @@
icon_state = "seedling"
icon_living = "seedling"
icon_dead = "seedling_dead"
- threat = 0.5
maxHealth = 100
health = 100
melee_damage_lower = 30
diff --git a/code/modules/mob/living/simple_animal/hostile/killertomato.dm b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
index 9cb65d7c30..b86d5d87fc 100644
--- a/code/modules/mob/living/simple_animal/hostile/killertomato.dm
+++ b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
@@ -5,7 +5,6 @@
icon_living = "tomato"
icon_dead = "tomato_dead"
gender = NEUTER
- threat = 0.3
speak_chance = 0
turns_per_move = 5
maxHealth = 30
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
index 5c1229c130..2a5f279386 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
@@ -23,7 +23,6 @@ Difficulty: Medium
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner
name = "blood-drunk miner"
desc = "A miner destined to wander forever, engaged in an endless hunt."
- threat = 15
health = 900
maxHealth = 900
icon_state = "miner"
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
index b191eaf3fb..519d6402e6 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -26,7 +26,6 @@ Difficulty: Hard
/mob/living/simple_animal/hostile/megafauna/bubblegum
name = "bubblegum"
desc = "In what passes for a hierarchy among slaughter demons, this one is king."
- threat = 35
health = 2500
maxHealth = 2500
attack_verb_continuous = "rends"
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index 18abb019d3..883ad39261 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -24,7 +24,6 @@ Difficulty: Very Hard
/mob/living/simple_animal/hostile/megafauna/colossus
name = "colossus"
desc = "A monstrous creature protected by heavy shielding."
- threat = 40
health = 2500
maxHealth = 2500
attack_verb_continuous = "judges"
@@ -603,7 +602,6 @@ Difficulty: Very Hard
icon_state = "lightgeist"
icon_living = "lightgeist"
icon_dead = "butterfly_dead"
- threat = -0.7
turns_per_move = 1
response_help_continuous = "waves away"
response_help_simple = "wave away"
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
index 2e2808d3de..7a3aa2d394 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
@@ -38,7 +38,6 @@ Difficulty: Medium
/mob/living/simple_animal/hostile/megafauna/dragon
name = "ash drake"
desc = "Guardians of the necropolis."
- threat = 30
health = 2500
maxHealth = 2500
spacewalk = TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
index c00d7c3130..525388fa61 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -37,7 +37,6 @@ Difficulty: Normal
/mob/living/simple_animal/hostile/megafauna/hierophant
name = "hierophant"
desc = "A massive metal club that hangs in the air as though waiting. It'll make you dance to its beat."
- threat = 30
health = 2500
maxHealth = 2500
attack_verb_continuous = "clubs"
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
index 78c02fb7a7..795184bad5 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
@@ -18,7 +18,6 @@ Difficulty: Medium
/mob/living/simple_animal/hostile/megafauna/legion
name = "Legion"
- threat = 30
health = 800
maxHealth = 800
spacewalk = TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm
index 13738b20e1..61be1f6287 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm
@@ -8,7 +8,6 @@
icon_aggro = "Basilisk_alert"
icon_dead = "Basilisk_dead"
icon_gib = "syndicate_gib"
- threat = 4
mob_biotypes = MOB_ORGANIC|MOB_BEAST
move_to_delay = 20
projectiletype = /obj/item/projectile/temp/basilisk
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm
index 11cc0fe67e..ed056c2ad9 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm
@@ -10,7 +10,6 @@
move_to_delay = 5
vision_range = 20
aggro_vision_range = 20
- threat = 1
maxHealth = 40 //easy to kill, but oh, will you be seeing a lot of them.
health = 40
melee_damage_lower = 10
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
index 87ec79abcf..e3edd171c0 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
@@ -11,7 +11,6 @@
robust_searching = TRUE
ranged_ignores_vision = TRUE
ranged = TRUE
- threat = 5
obj_damage = 5
vision_range = 6
aggro_vision_range = 18
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm
index 80489e0e40..d9f3cfba3d 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm
@@ -25,7 +25,6 @@
icon_aggro = "broodmother"
icon_dead = "egg_sac"
icon_gib = "syndicate_gib"
- threat = 10
maxHealth = 800
health = 800
melee_damage_lower = 30
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm
index 78b24acfb0..fce5b636e4 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm
@@ -24,7 +24,6 @@
icon_aggro = "herald"
icon_dead = "herald_dying"
icon_gib = "syndicate_gib"
- threat = 10
maxHealth = 800
health = 800
melee_damage_lower = 20
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm
index 31f925fb2b..15ed0135fe 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm
@@ -24,7 +24,6 @@
icon_aggro = "legionnaire"
icon_dead = "legionnaire_dead"
icon_gib = "syndicate_gib"
- threat = 10
maxHealth = 800
health = 800
melee_damage_lower = 30
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm
index cdef0c50d3..7995e4d20f 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm
@@ -24,7 +24,6 @@
icon_aggro = "pandora"
icon_dead = "pandora_dead"
icon_gib = "syndicate_gib"
- threat = 10
maxHealth = 800
health = 800
melee_damage_lower = 15
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm
index 4a3497055a..3845c6f406 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm
@@ -8,7 +8,6 @@
icon_aggro = "Goldgrub_alert"
icon_dead = "Goldgrub_dead"
icon_gib = "syndicate_gib"
- threat = 0.2
mob_biotypes = MOB_ORGANIC|MOB_BEAST
vision_range = 2
aggro_vision_range = 9
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
index 5f6c21bbbd..12f0b41d4e 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
@@ -10,7 +10,6 @@
icon_gib = "syndicate_gib"
mob_biotypes = MOB_ORGANIC|MOB_BEAST
mouse_opacity = MOUSE_OPACITY_OPAQUE
- threat = 2
move_to_delay = 10
ranged = 1
ranged_cooldown_time = 60
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
index 16f892bbff..11ce4f9214 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
@@ -9,7 +9,6 @@
icon_gib = "syndicate_gib"
mob_biotypes = MOB_ORGANIC
mouse_opacity = MOUSE_OPACITY_OPAQUE
- threat = 4
move_to_delay = 14
ranged = 1
vision_range = 4
@@ -241,7 +240,6 @@
icon_state = "legion"
icon_living = "legion"
icon_dead = "legion"
- threat = 5
health = 450
maxHealth = 450
melee_damage_lower = 20
diff --git a/code/modules/mob/living/simple_animal/hostile/netherworld.dm b/code/modules/mob/living/simple_animal/hostile/netherworld.dm
index e21e3e0693..92f331071a 100644
--- a/code/modules/mob/living/simple_animal/hostile/netherworld.dm
+++ b/code/modules/mob/living/simple_animal/hostile/netherworld.dm
@@ -10,7 +10,6 @@
obj_damage = 100
melee_damage_lower = 25
melee_damage_upper = 50
- threat = 2
attack_verb_continuous = "slashes"
attack_verb_simple = "slash"
attack_sound = 'sound/weapons/bladeslice.ogg'
diff --git a/code/modules/mob/living/simple_animal/hostile/pirate.dm b/code/modules/mob/living/simple_animal/hostile/pirate.dm
index 0544ddc676..74e37bea21 100644
--- a/code/modules/mob/living/simple_animal/hostile/pirate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/pirate.dm
@@ -10,7 +10,6 @@
turns_per_move = 5
response_help_continuous = "pushes"
response_help_simple = "push"
- threat = 3
speed = 0
maxHealth = 115
health = 115
diff --git a/code/modules/mob/living/simple_animal/hostile/russian.dm b/code/modules/mob/living/simple_animal/hostile/russian.dm
index f7a46658c4..e9879f38ec 100644
--- a/code/modules/mob/living/simple_animal/hostile/russian.dm
+++ b/code/modules/mob/living/simple_animal/hostile/russian.dm
@@ -10,7 +10,6 @@
speak_chance = 0
turns_per_move = 5
speed = 0
- threat = 1
maxHealth = 100
health = 100
harm_intent_damage = 5
diff --git a/code/modules/mob/living/simple_animal/hostile/sharks.dm b/code/modules/mob/living/simple_animal/hostile/sharks.dm
index 1263a23d26..af61149130 100644
--- a/code/modules/mob/living/simple_animal/hostile/sharks.dm
+++ b/code/modules/mob/living/simple_animal/hostile/sharks.dm
@@ -19,7 +19,6 @@
response_harm_continuous = "kicks"
response_harm_simple = "kick"
speed = 0
- threat = 1
maxHealth = 75
health = 75
harm_intent_damage = 18
diff --git a/code/modules/mob/living/simple_animal/hostile/skeleton.dm b/code/modules/mob/living/simple_animal/hostile/skeleton.dm
index 3091949552..ebacf1edef 100644
--- a/code/modules/mob/living/simple_animal/hostile/skeleton.dm
+++ b/code/modules/mob/living/simple_animal/hostile/skeleton.dm
@@ -11,7 +11,6 @@
speak_emote = list("rattles")
emote_see = list("rattles")
a_intent = INTENT_HARM
- threat = 0.5
maxHealth = 40
blood_volume = 0
health = 40
@@ -64,7 +63,6 @@
icon_state = "templar"
icon_living = "templar"
icon_dead = "templar_dead"
- threat = 1.5
maxHealth = 150
health = 150
weather_immunities = list("snow")
@@ -98,7 +96,6 @@
icon_state = "plasma_miner"
icon_living = "plasma_miner"
icon_dead = "plasma_miner"
- threat = 2
maxHealth = 150
health = 150
harm_intent_damage = 10
@@ -116,7 +113,6 @@
icon_state = "plasma_miner_tool"
icon_living = "plasma_miner_tool"
icon_dead = "plasma_miner_tool"
- threat = 3
maxHealth = 185
health = 185
harm_intent_damage = 15
diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm
index 3490d757a1..600d60eb4d 100644
--- a/code/modules/mob/living/simple_animal/hostile/statue.dm
+++ b/code/modules/mob/living/simple_animal/hostile/statue.dm
@@ -10,7 +10,6 @@
gender = NEUTER
a_intent = INTENT_HARM
mob_biotypes = MOB_HUMANOID
- threat = 3
response_help_continuous = "touches"
response_help_simple = "touch"
response_disarm_continuous = "pushes"
diff --git a/code/modules/mob/living/simple_animal/hostile/stickman.dm b/code/modules/mob/living/simple_animal/hostile/stickman.dm
index 226af952b1..6eeeabc877 100644
--- a/code/modules/mob/living/simple_animal/hostile/stickman.dm
+++ b/code/modules/mob/living/simple_animal/hostile/stickman.dm
@@ -5,7 +5,6 @@
icon_living = "stickman"
icon_dead = "stickman_dead"
icon_gib = "syndicate_gib"
- threat = 0.5
mob_biotypes = MOB_HUMANOID
gender = MALE
speak_chance = 0
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
index fd37bb26aa..103868e1d3 100644
--- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
@@ -25,7 +25,6 @@
mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
speak_chance = 0
turns_per_move = 5
- threat = 1
speed = 0
stat_attack = UNCONSCIOUS
robust_searching = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm
index 2b9f4eea35..46a5a8ec68 100644
--- a/code/modules/mob/living/simple_animal/hostile/tree.dm
+++ b/code/modules/mob/living/simple_animal/hostile/tree.dm
@@ -7,7 +7,6 @@
icon_dead = "pine_1"
icon_gib = "pine_1"
gender = NEUTER
- threat = 1
speak_chance = 0
turns_per_move = 5
response_help_continuous = "brushes"
diff --git a/code/modules/mob/living/simple_animal/hostile/wizard.dm b/code/modules/mob/living/simple_animal/hostile/wizard.dm
index 57fb6f829d..b3523fc42c 100644
--- a/code/modules/mob/living/simple_animal/hostile/wizard.dm
+++ b/code/modules/mob/living/simple_animal/hostile/wizard.dm
@@ -8,7 +8,6 @@
mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
speak_chance = 0
turns_per_move = 3
- threat = 3
speed = 0
maxHealth = 100
health = 100
diff --git a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
index dc6154c05e..bce1a01c8a 100644
--- a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
+++ b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
@@ -11,7 +11,6 @@
mob_biotypes = MOB_ORGANIC|MOB_BEAST
mouse_opacity = MOUSE_OPACITY_ICON
move_to_delay = 5
- threat = 1
friendly_verb_continuous = "floats near"
friendly_verb_simple = "float near"
speak_emote = list("puffs")
diff --git a/code/modules/mob/living/simple_animal/hostile/zombie.dm b/code/modules/mob/living/simple_animal/hostile/zombie.dm
index 6e4cbac022..1217084ce3 100644
--- a/code/modules/mob/living/simple_animal/hostile/zombie.dm
+++ b/code/modules/mob/living/simple_animal/hostile/zombie.dm
@@ -7,7 +7,6 @@
mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
speak_chance = 0
stat_attack = UNCONSCIOUS //braains
- threat = 1
maxHealth = 100
health = 100
harm_intent_damage = 5
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index a70e508476..2480288484 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -1009,7 +1009,7 @@
. = UI_INTERACTIVE
/obj/machinery/power/apc/ui_act(action, params)
- if(..() || !can_use(usr, 1) || (locked && area.hasSiliconAccessInArea(usr, PRIVILEDGES_SILICON|PRIVILEDGES_DRONE) && !failure_timer && action != "toggle_nightshift") || (integration_cog && (is_servant_of_ratvar(usr))))
+ if(..() || !can_use(usr, 1) || (locked && !area.hasSiliconAccessInArea(usr, PRIVILEDGES_SILICON|PRIVILEDGES_DRONE) && !failure_timer && action != "toggle_nightshift" && (!integration_cog || !(is_servant_of_ratvar(usr)))))
return
switch(action)
if("lock")
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index ee073dbfcd..8cddd5d02f 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -62,7 +62,8 @@
var/no_pin_required = FALSE //whether the gun can be fired without a pin
var/obj/item/flashlight/gun_light
- var/can_flashlight = 0
+ var/can_flashlight = FALSE
+ var/gunlight_state = "flight"
var/obj/item/kitchen/knife/bayonet
var/mutable_appearance/knife_overlay
var/can_bayonet = FALSE
@@ -417,14 +418,7 @@
return
to_chat(user, "You attach \the [K] to the front of \the [src].")
bayonet = K
- var/state = "bayonet" //Generic state.
- if(bayonet.icon_state in icon_states('icons/obj/guns/bayonets.dmi')) //Snowflake state?
- state = bayonet.icon_state
- var/icon/bayonet_icons = 'icons/obj/guns/bayonets.dmi'
- knife_overlay = mutable_appearance(bayonet_icons, state)
- knife_overlay.pixel_x = knife_x_offset
- knife_overlay.pixel_y = knife_y_offset
- add_overlay(knife_overlay, TRUE)
+ update_icon()
else if(istype(I, /obj/item/screwdriver))
if(gun_light)
var/obj/item/flashlight/seclite/S = gun_light
@@ -439,8 +433,7 @@
var/obj/item/kitchen/knife/K = bayonet
K.forceMove(get_turf(user))
bayonet = null
- cut_overlay(knife_overlay, TRUE)
- knife_overlay = null
+ update_icon()
else
return ..()
@@ -468,22 +461,35 @@
set_light(gun_light.brightness_on, gun_light.flashlight_power, gun_light.light_color)
else
set_light(0)
- cut_overlays(flashlight_overlay, TRUE)
- var/state = "flight[gun_light.on? "_on":""]" //Generic state.
+ else
+ set_light(0)
+ update_icon()
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.UpdateButtonIcon()
+
+/obj/item/gun/update_overlays()
+ . = ..()
+ if(gun_light)
+ var/mutable_appearance/flashlight_overlay
+ var/state = "[gunlight_state][gun_light.on? "_on":""]" //Generic state.
if(gun_light.icon_state in icon_states('icons/obj/guns/flashlights.dmi')) //Snowflake state?
state = gun_light.icon_state
flashlight_overlay = mutable_appearance('icons/obj/guns/flashlights.dmi', state)
flashlight_overlay.pixel_x = flight_x_offset
flashlight_overlay.pixel_y = flight_y_offset
- add_overlay(flashlight_overlay, TRUE)
- else
- set_light(0)
- cut_overlays(flashlight_overlay, TRUE)
- flashlight_overlay = null
- update_icon(TRUE)
- for(var/X in actions)
- var/datum/action/A = X
- A.UpdateButtonIcon()
+ . += flashlight_overlay
+
+ if(bayonet)
+ var/mutable_appearance/knife_overlay
+ var/state = "bayonet" //Generic state.
+ if(bayonet.icon_state in icon_states('icons/obj/guns/bayonets.dmi')) //Snowflake state?
+ state = bayonet.icon_state
+ var/icon/bayonet_icons = 'icons/obj/guns/bayonets.dmi'
+ knife_overlay = mutable_appearance(bayonet_icons, state)
+ knife_overlay.pixel_x = knife_x_offset
+ knife_overlay.pixel_y = knife_y_offset
+ . += knife_overlay
/obj/item/gun/item_action_slot_check(slot, mob/user, datum/action/A)
if(istype(A, /datum/action/item_action/toggle_scope_zoom) && slot != SLOT_HANDS)
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index b31fd2d1e0..9210e66f22 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -18,13 +18,15 @@
/obj/item/gun/ballistic/automatic/proto/unrestricted
pin = /obj/item/firing_pin
-/obj/item/gun/ballistic/automatic/update_icon()
- ..()
+/obj/item/gun/ballistic/automatic/update_overlays()
+ . = ..()
if(automatic_burst_overlay)
if(!select)
- add_overlay("[initial(icon_state)]semi")
+ . += ("[initial(icon_state)]semi")
if(select == 1)
- add_overlay("[initial(icon_state)]burst")
+ . += "[initial(icon_state)]burst"
+
+/obj/item/gun/ballistic/automatic/update_icon_state()
icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
/obj/item/gun/ballistic/automatic/attackby(obj/item/A, mob/user, params)
@@ -115,8 +117,7 @@
. = ..()
empty_alarm()
-/obj/item/gun/ballistic/automatic/c20r/update_icon()
- ..()
+/obj/item/gun/ballistic/automatic/c20r/update_icon_state()
icon_state = "c20r[magazine ? "-[CEILING(get_ammo(0)/4, 1)*4]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
/obj/item/gun/ballistic/automatic/wt550
@@ -141,9 +142,8 @@
. = ..()
spread = 0
-/obj/item/gun/ballistic/automatic/wt550/update_icon()
- ..()
- icon_state = "wt550[magazine ? "-[CEILING(( (get_ammo(FALSE) / magazine.max_ammo) * 20) /4, 1)*4]" : "-0"]" //Sprites only support up to 20.
+/obj/item/gun/ballistic/automatic/wt550/update_icon_state()
+ icon_state = "wt550[magazine ? "-[CEILING(((get_ammo(FALSE) / magazine.max_ammo) * 20) /4, 1)*4]" : "-0"]" //Sprites only support up to 20.
/obj/item/gun/ballistic/automatic/mini_uzi
name = "\improper Type U3 Uzi"
@@ -160,6 +160,7 @@
mag_type = /obj/item/ammo_box/magazine/m556
fire_sound = 'sound/weapons/gunshot_smg.ogg'
can_suppress = FALSE
+ automatic_burst_overlay = FALSE
var/obj/item/gun/ballistic/revolver/grenadelauncher/underbarrel
burst_size = 3
burst_shot_delay = 2
@@ -191,18 +192,19 @@
underbarrel.attackby(A, user, params)
else
..()
-/obj/item/gun/ballistic/automatic/m90/update_icon()
- ..()
- cut_overlays()
+/obj/item/gun/ballistic/automatic/m90/update_overlays()
+ . = ..()
switch(select)
if(0)
- add_overlay("[initial(icon_state)]semi")
+ . += "[initial(icon_state)]semi"
if(1)
- add_overlay("[initial(icon_state)]burst")
+ . += "[initial(icon_state)]burst"
if(2)
- add_overlay("[initial(icon_state)]gren")
+ . += "[initial(icon_state)]gren"
+
+/obj/item/gun/ballistic/automatic/m90/update_icon_state()
icon_state = "[initial(icon_state)][magazine ? "" : "-e"]"
- return
+
/obj/item/gun/ballistic/automatic/m90/burst_select()
var/mob/living/carbon/human/user = usr
switch(select)
@@ -257,6 +259,7 @@
weapon_weight = WEAPON_MEDIUM
mag_type = /obj/item/ammo_box/magazine/m12g
fire_sound = 'sound/weapons/gunshot.ogg'
+ automatic_burst_overlay = FALSE
can_suppress = FALSE
burst_size = 1
pin = /obj/item/firing_pin/implant/pindicate
@@ -269,10 +272,13 @@
. = ..()
update_icon()
-/obj/item/gun/ballistic/automatic/shotgun/bulldog/update_icon()
- cut_overlays()
+/obj/item/gun/ballistic/automatic/shotgun/bulldog/update_icon_state()
+ return
+
+/obj/item/gun/ballistic/automatic/shotgun/bulldog/update_overlays()
+ . = ..()
if(magazine)
- add_overlay("[magazine.icon_state]")
+ . += "[magazine.icon_state]"
icon_state = "bulldog[chambered ? "" : "-e"]"
/obj/item/gun/ballistic/automatic/shotgun/bulldog/afterattack()
@@ -298,6 +304,7 @@
burst_shot_delay = 1
spread = 7
pin = /obj/item/firing_pin/implant/pindicate
+ automatic_burst_overlay = FALSE
/obj/item/gun/ballistic/automatic/l6_saw/unrestricted
pin = /obj/item/firing_pin
@@ -316,7 +323,7 @@
playsound(user, 'sound/weapons/sawclose.ogg', 60, 1)
update_icon()
-/obj/item/gun/ballistic/automatic/l6_saw/update_icon()
+/obj/item/gun/ballistic/automatic/l6_saw/update_icon_state()
icon_state = "l6[cover_open ? "open" : "closed"][magazine ? CEILING(get_ammo(0)/12.5, 1)*25 : "-empty"][suppressed ? "-suppressed" : ""]"
item_state = "l6[cover_open ? "openmag" : "closedmag"]"
@@ -369,9 +376,10 @@
zoom_amt = 10 //Long range, enough to see in front of you, but no tiles behind you.
zoom_out_amt = 13
slot_flags = ITEM_SLOT_BACK
+ automatic_burst_overlay = FALSE
actions_types = list()
-/obj/item/gun/ballistic/automatic/sniper_rifle/update_icon()
+/obj/item/gun/ballistic/automatic/sniper_rifle/update_icon_state()
if(magazine)
icon_state = "sniper-mag"
else
@@ -397,9 +405,10 @@
can_suppress = TRUE
w_class = WEIGHT_CLASS_HUGE
slot_flags = ITEM_SLOT_BACK
+ automatic_burst_overlay = FALSE
actions_types = list()
-/obj/item/gun/ballistic/automatic/surplus/update_icon()
+/obj/item/gun/ballistic/automatic/surplus/update_icon_state()
if(magazine)
icon_state = "surplus"
else
@@ -413,6 +422,7 @@
icon_state = "oldrifle"
item_state = "arg"
mag_type = /obj/item/ammo_box/magazine/recharge
+ automatic_burst_overlay = FALSE
fire_delay = 2
can_suppress = FALSE
burst_size = 1
@@ -420,7 +430,5 @@
fire_sound = 'sound/weapons/laser.ogg'
casing_ejector = FALSE
-/obj/item/gun/ballistic/automatic/laser/update_icon()
- ..()
+/obj/item/gun/ballistic/automatic/laser/update_icon_state()
icon_state = "oldrifle[magazine ? "-[CEILING(get_ammo(0)/4, 1)*4]" : ""]"
- return
diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm
index 004f78235a..9e03207888 100644
--- a/code/modules/projectiles/guns/ballistic/launchers.dm
+++ b/code/modules/projectiles/guns/ballistic/launchers.dm
@@ -42,8 +42,7 @@
actions_types = list()
casing_ejector = FALSE
-/obj/item/gun/ballistic/automatic/gyropistol/update_icon()
- ..()
+/obj/item/gun/ballistic/automatic/gyropistol/update_icon_state()
icon_state = "[initial(icon_state)][magazine ? "loaded" : ""]"
/obj/item/gun/ballistic/automatic/speargun
@@ -54,6 +53,7 @@
w_class = WEIGHT_CLASS_BULKY
force = 10
can_suppress = FALSE
+ automatic_burst_overlay = FALSE
mag_type = /obj/item/ammo_box/magazine/internal/speargun
fire_sound = 'sound/weapons/grenadelaunch.ogg'
burst_size = 1
@@ -62,8 +62,9 @@
actions_types = list()
casing_ejector = FALSE
-/obj/item/gun/ballistic/automatic/speargun/update_icon()
- return
+/obj/item/gun/ballistic/automatic/speargun/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/update_icon_blocker)
/obj/item/gun/ballistic/automatic/speargun/attack_self()
return
@@ -137,7 +138,7 @@
chamber_round()
update_icon()
-/obj/item/gun/ballistic/rocketlauncher/update_icon()
+/obj/item/gun/ballistic/rocketlauncher/update_icon_state()
icon_state = "[initial(icon_state)]-[chambered ? "1" : "0"]"
/obj/item/gun/ballistic/rocketlauncher/suicide_act(mob/living/user)
diff --git a/code/modules/projectiles/guns/ballistic/magweapon.dm b/code/modules/projectiles/guns/ballistic/magweapon.dm
index 74b8b210a7..4e27a73300 100644
--- a/code/modules/projectiles/guns/ballistic/magweapon.dm
+++ b/code/modules/projectiles/guns/ballistic/magweapon.dm
@@ -75,8 +75,7 @@
recoil = 2
weapon_weight = WEAPON_HEAVY
-/obj/item/gun/ballistic/automatic/magrifle/hyperburst/update_icon()
- ..()
+/obj/item/gun/ballistic/automatic/magrifle/hyperburst/update_icon_state()
icon_state = "hyperburst[magazine ? "-[get_ammo()]" : ""][chambered ? "" : "-e"]"
///magpistol///
@@ -92,12 +91,14 @@
fire_delay = 2
inaccuracy_modifier = 0.25
cell_type = /obj/item/stock_parts/cell/magnetic/pistol
+ automatic_burst_overlay = FALSE
-/obj/item/gun/ballistic/automatic/magrifle/pistol/update_icon()
- ..()
- cut_overlays()
+/obj/item/gun/ballistic/automatic/magrifle/pistol/update_overlays()
+ . = ..()
if(magazine)
- add_overlay("magpistol-magazine")
+ . += "magpistol-magazine"
+
+/obj/item/gun/ballistic/automatic/magrifle/pistol/update_icon_state()
icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
/obj/item/gun/ballistic/automatic/magrifle/pistol/nopin
diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm
index cdaadb5c3b..e775fdc05a 100644
--- a/code/modules/projectiles/guns/ballistic/pistol.dm
+++ b/code/modules/projectiles/guns/ballistic/pistol.dm
@@ -8,12 +8,12 @@
burst_size = 1
fire_delay = 0
actions_types = list()
+ automatic_burst_overlay = FALSE
/obj/item/gun/ballistic/automatic/pistol/no_mag
spawnwithmagazine = FALSE
-/obj/item/gun/ballistic/automatic/pistol/update_icon()
- ..()
+/obj/item/gun/ballistic/automatic/pistol/update_icon_state()
icon_state = "[initial(icon_state)][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
/obj/item/gun/ballistic/automatic/pistol/suppressed/Initialize(mapload)
@@ -28,6 +28,7 @@
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "cde"
can_unsuppress = TRUE
+ automatic_burst_overlay = FALSE
obj_flags = UNIQUE_RENAME
unique_reskin = list("Default" = "cde",
"N-99" = "n99",
@@ -38,20 +39,18 @@
"PX4 Storm" = "px4"
)
-/obj/item/gun/ballistic/automatic/pistol/modular/update_icon()
- ..()
+/obj/item/gun/ballistic/automatic/pistol/modular/update_icon_state()
if(current_skin)
icon_state = "[unique_reskin[current_skin]][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
else
icon_state = "[initial(icon_state)][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
+
+/obj/item/gun/ballistic/automatic/pistol/modular/update_overlays()
+ . = ..()
if(magazine && suppressed)
- cut_overlays()
- add_overlay("[unique_reskin[current_skin]]-magazine-sup") //Yes, this means the default iconstate can't have a magazine overlay
+ . += "[unique_reskin[current_skin]]-magazine-sup" //Yes, this means the default iconstate can't have a magazine overlay
else if (magazine)
- cut_overlays()
- add_overlay("[unique_reskin[current_skin]]-magazine")
- else
- cut_overlays()
+ . += "[unique_reskin[current_skin]]-magazine"
/obj/item/gun/ballistic/automatic/pistol/m1911
name = "\improper M1911"
@@ -77,14 +76,14 @@
force = 14
mag_type = /obj/item/ammo_box/magazine/m50
can_suppress = FALSE
+ automatic_burst_overlay = FALSE
-/obj/item/gun/ballistic/automatic/pistol/deagle/update_icon()
- ..()
+/obj/item/gun/ballistic/automatic/pistol/deagle/update_overlays()
+ . = ..()
if(magazine)
- cut_overlays()
- add_overlay("deagle_magazine")
- else
- cut_overlays()
+ . += "deagle_magazine"
+
+/obj/item/gun/ballistic/automatic/pistol/deagle/update_icon_state()
icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
/obj/item/gun/ballistic/automatic/pistol/deagle/gold
@@ -142,14 +141,14 @@
actions_types = list()
fire_sound = 'sound/weapons/blastcannon.ogg'
spread = 20 //damn thing has no rifling.
+ automatic_burst_overlay = FALSE
-/obj/item/gun/ballistic/automatic/pistol/antitank/update_icon()
- ..()
+/obj/item/gun/ballistic/automatic/pistol/antitank/update_overlays()
+ . = ..()
if(magazine)
- cut_overlays()
- add_overlay("atp-mag")
- else
- cut_overlays()
+ . += "atp-mag"
+
+/obj/item/gun/ballistic/automatic/pistol/antitank/update_icon_state()
icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
/obj/item/gun/ballistic/automatic/pistol/antitank/syndicate
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index a5ed45dd48..6f1fb96af5 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -348,10 +348,10 @@
else
to_chat(user, "You need at least ten lengths of cable if you want to make a sling!")
-/obj/item/gun/ballistic/revolver/doublebarrel/improvised/update_icon()
- ..()
+/obj/item/gun/ballistic/revolver/doublebarrel/improvised/update_overlays()
+ . = ..()
if(slung)
- icon_state += "sling"
+ . += "[icon_state]sling"
/obj/item/gun/ballistic/revolver/doublebarrel/improvised/sawoff(mob/user)
. = ..()
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index 873b129c8f..ecf6e538b8 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -164,10 +164,10 @@
else
to_chat(user, "You need at least ten lengths of cable if you want to make a sling!")
-/obj/item/gun/ballistic/shotgun/boltaction/improvised/update_icon()
- ..()
+/obj/item/gun/ballistic/shotgun/boltaction/improvised/update_overlays()
+ . = ..()
if(slung)
- icon_state += "sling"
+ . += "[icon_state]sling"
/obj/item/gun/ballistic/shotgun/boltaction/enchanted
name = "enchanted bolt action rifle"
@@ -272,7 +272,7 @@
spread = 2
update_icon()
-/obj/item/gun/ballistic/shotgun/automatic/combat/compact/update_icon()
+/obj/item/gun/ballistic/shotgun/automatic/combat/compact/update_icon_state()
icon_state = "[current_skin ? unique_reskin[current_skin] : "cshotgun"][stock ? "" : "c"]"
//Dual Feed Shotgun
diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm
index 1f66cfdf8a..e7f26670d4 100644
--- a/code/modules/projectiles/guns/ballistic/toy.dm
+++ b/code/modules/projectiles/guns/ballistic/toy.dm
@@ -27,9 +27,9 @@
burst_size = 1
fire_delay = 0
actions_types = list()
+ automatic_burst_overlay = FALSE
-/obj/item/gun/ballistic/automatic/toy/pistol/update_icon()
- ..()
+/obj/item/gun/ballistic/automatic/toy/pistol/update_icon_state()
icon_state = "[initial(icon_state)][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
/obj/item/gun/ballistic/automatic/toy/pistol/riot
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index c2b821dfcf..17dcfa96e6 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -29,7 +29,6 @@
var/charge_sections = 4
ammo_x_offset = 2
var/shaded_charge = FALSE //if this gun uses a stateful charge bar for more detail
- var/old_ratio = 0 // stores the gun's previous ammo "ratio" to see if it needs an updated icon
var/selfcharge = EGUN_NO_SELFCHARGE // EGUN_SELFCHARGE if true, EGUN_SELFCHARGE_BORG drains the cyborg's cell to recharge its own
var/charge_tick = 0
var/charge_delay = 4
@@ -64,10 +63,20 @@
START_PROCESSING(SSobj, src)
update_icon()
+/obj/item/gun/energy/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/update_icon_updates_onmob)
+
/obj/item/gun/energy/Destroy()
STOP_PROCESSING(SSobj, src)
return ..()
+/obj/item/gun/energy/handle_atom_del(atom/A)
+ if(A == cell)
+ cell = null
+ update_icon()
+ return ..()
+
/obj/item/gun/energy/examine(mob/user)
. = ..()
if(!right_click_overridden)
@@ -226,46 +235,47 @@
#undef DECREMENT_OR_WRAP
#undef IS_VALID_INDEX
-/obj/item/gun/energy/update_icon(force_update)
- if(QDELETED(src))
+/obj/item/gun/energy/update_icon_state()
+ if(initial(item_state))
return
..()
+ var/ratio = get_charge_ratio()
+ var/new_item_state = ""
+ new_item_state = initial(icon_state)
+ if(modifystate)
+ var/obj/item/ammo_casing/energy/shot = ammo_type[current_firemode_index]
+ new_item_state += "[shot.select_name]"
+ new_item_state += "[ratio]"
+ item_state = new_item_state
+
+/obj/item/gun/energy/update_overlays()
+ . = ..()
+ if(QDELETED(src))
+ return
if(!automatic_charge_overlays)
return
- var/ratio = can_shoot() ? CEILING(clamp(cell.charge / cell.maxcharge, 0, 1) * charge_sections, 1) : 0
- // Sets the ratio to 0 if the gun doesn't have enough charge to fire, or if it's power cell is removed.
- // TG issues #5361 & #47908
- if(ratio == old_ratio && !force_update)
- return
- old_ratio = ratio
- cut_overlays()
- var/iconState = "[icon_state]_charge"
- var/itemState = null
- if(!initial(item_state))
- itemState = icon_state
+ var/overlay_icon_state = "[icon_state]_charge"
+ var/ratio = get_charge_ratio()
if (modifystate)
var/obj/item/ammo_casing/energy/shot = ammo_type[current_firemode_index]
- add_overlay("[icon_state]_[shot.select_name]")
- iconState += "_[shot.select_name]"
- if(itemState)
- itemState += "[shot.select_name]"
+ . += "[icon_state]_[shot.select_name]"
+ overlay_icon_state += "_[shot.select_name]"
if(ratio == 0)
- add_overlay("[icon_state]_empty")
+ . += "[icon_state]_empty"
else
if(!shaded_charge)
- var/mutable_appearance/charge_overlay = mutable_appearance(icon, iconState)
+ var/mutable_appearance/charge_overlay = mutable_appearance(icon, overlay_icon_state)
for(var/i = ratio, i >= 1, i--)
charge_overlay.pixel_x = ammo_x_offset * (i - 1)
charge_overlay.pixel_y = ammo_y_offset * (i - 1)
- add_overlay(charge_overlay)
+ . += charge_overlay
else
- add_overlay("[icon_state]_charge[ratio]")
- if(itemState)
- itemState += "[ratio]"
- item_state = itemState
- if(ismob(loc)) //forces inhands to update
- var/mob/M = loc
- M.update_inv_hands()
+ . += "[icon_state]_charge[ratio]"
+
+///Used by update_icon_state() and update_overlays()
+/obj/item/gun/energy/proc/get_charge_ratio()
+ return can_shoot() ? CEILING(clamp(cell.charge / cell.maxcharge, 0, 1) * charge_sections, 1) : 0
+ // Sets the ratio to 0 if the gun doesn't have enough charge to fire, or if its power cell is removed.
/obj/item/gun/energy/suicide_act(mob/living/user)
if (istype(user) && can_shoot() && can_trigger_gun(user) && user.get_bodypart(BODY_ZONE_HEAD))
diff --git a/code/modules/projectiles/guns/energy/dueling.dm b/code/modules/projectiles/guns/energy/dueling.dm
index 80bb269b21..04eff5afa9 100644
--- a/code/modules/projectiles/guns/energy/dueling.dm
+++ b/code/modules/projectiles/guns/energy/dueling.dm
@@ -207,12 +207,11 @@
to_chat(user,"You switch [src] setting to [setting] mode.")
update_icon()
-/obj/item/gun/energy/dueling/update_icon(force_update)
+/obj/item/gun/energy/dueling/update_overlays(force_update)
. = ..()
if(setting_overlay)
- cut_overlay(setting_overlay)
setting_overlay.icon_state = setting_iconstate()
- add_overlay(setting_overlay)
+ . += setting_overlay
/obj/item/gun/energy/dueling/Destroy()
if(duel)
@@ -363,8 +362,7 @@
STR.max_items = 2
STR.can_hold = typecacheof(/obj/item/gun/energy/dueling)
-/obj/item/storage/lockbox/dueling/update_icon()
- cut_overlays()
+/obj/item/storage/lockbox/dueling/update_icon_state()
var/locked = SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED)
if(locked)
icon_state = "medalbox+l"
diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm
index 1b835d35a4..2c9794f391 100644
--- a/code/modules/projectiles/guns/energy/energy_gun.dm
+++ b/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -19,17 +19,13 @@
cell_type = /obj/item/stock_parts/cell{charge = 600; maxcharge = 600}
ammo_x_offset = 2
charge_sections = 3
+ gunlight_state = "mini-light"
can_flashlight = 0 // Can't attach or detach the flashlight, and override it's icon update
/obj/item/gun/energy/e_gun/mini/Initialize()
gun_light = new /obj/item/flashlight/seclite(src)
return ..()
-/obj/item/gun/energy/e_gun/mini/update_icon()
- ..()
- if(gun_light && gun_light.on)
- add_overlay("mini-light")
-
/obj/item/gun/energy/e_gun/stun
name = "tactical energy gun"
desc = "Military issue energy gun, is able to fire stun rounds."
@@ -138,15 +134,15 @@
return
fail_chance = min(fail_chance + round(15/severity), 100)
-/obj/item/gun/energy/e_gun/nuclear/update_icon()
- ..()
+/obj/item/gun/energy/e_gun/nuclear/update_overlays()
+ . = ..()
if(crit_fail)
- add_overlay("[icon_state]_fail_3")
+ . += "[icon_state]_fail_3"
else
switch(fail_tick)
if(0)
- add_overlay("[icon_state]_fail_0")
+ . += "[icon_state]_fail_0"
if(1 to 150)
- add_overlay("[icon_state]_fail_1")
+ . += "[icon_state]_fail_1"
if(151 to INFINITY)
- add_overlay("[icon_state]_fail_2")
+ . += "[icon_state]_fail_2"
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index 1c4360d971..dfee9d15d0 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -46,13 +46,6 @@
range = 4
log_override = TRUE
-/obj/item/gun/energy/kinetic_accelerator/premiumka/update_icon()
- ..()
- if(!can_shoot())
- add_overlay("[icon_state]_empty")
- else
- cut_overlays()
-
/obj/item/gun/energy/kinetic_accelerator/getinaccuracy(mob/living/user, bonus_spread, stamloss)
var/old_fire_delay = fire_delay //It's pretty irrelevant tbh but whatever.
fire_delay = overheat_time
@@ -187,12 +180,10 @@
update_icon()
overheat = FALSE
*/
-/obj/item/gun/energy/kinetic_accelerator/update_icon()
- ..()
+/obj/item/gun/energy/kinetic_accelerator/update_overlays()
+ . = ..()
if(!can_shoot())
- add_overlay("[icon_state]_empty")
- else
- cut_overlays()
+ . += "[icon_state]_empty"
//Casing
/obj/item/ammo_casing/energy/kinetic
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 20e847326e..19ca42022d 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -34,11 +34,11 @@
pin = null
ammo_x_offset = 1
-/obj/item/gun/energy/decloner/update_icon()
+/obj/item/gun/energy/decloner/update_overlays()
..()
var/obj/item/ammo_casing/energy/shot = ammo_type[current_firemode_index]
if(!QDELETED(cell) && (cell.charge > shot.e_cost))
- add_overlay("decloner_spin")
+ . += "decloner_spin"
/obj/item/gun/energy/floragun
name = "floral somatoray"
@@ -134,9 +134,10 @@
tool_behaviour = TOOL_WELDER
toolspeed = 0.7 //plasmacutters can be used as welders, and are faster than standard welders
-/obj/item/gun/energy/plasmacutter/Initialize()
+/obj/item/gun/energy/plasmacutter/ComponentInitialize()
. = ..()
AddComponent(/datum/component/butchering, 25, 105, 0, 'sound/weapons/plasma_cutter.ogg')
+ AddElement(/datum/element/update_icon_blocker)
/obj/item/gun/energy/plasmacutter/examine(mob/user)
. = ..()
@@ -166,9 +167,6 @@
/obj/item/gun/energy/plasmacutter/use(amount)
return cell.use(amount * 100)
-/obj/item/gun/energy/plasmacutter/update_icon()
- return
-
/obj/item/gun/energy/plasmacutter/adv
name = "advanced plasma cutter"
icon_state = "adv_plasmacutter"
@@ -183,11 +181,12 @@
icon_state = "wormhole_projector"
pin = null
inaccuracy_modifier = 0.25
+ automatic_charge_overlays = FALSE
var/obj/effect/portal/p_blue
var/obj/effect/portal/p_orange
var/atmos_link = FALSE
-/obj/item/gun/energy/wormhole_projector/update_icon()
+/obj/item/gun/energy/wormhole_projector/update_icon_state()
icon_state = "[initial(icon_state)][current_firemode_index]"
item_state = icon_state
@@ -256,8 +255,9 @@
can_charge = 0
use_cyborg_cell = 1
-/obj/item/gun/energy/printer/update_icon()
- return
+/obj/item/gun/energy/printer/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/update_icon_blocker)
/obj/item/gun/energy/printer/emp_act()
return
@@ -321,14 +321,14 @@
inaccuracy_modifier = 0.25
cell_type = /obj/item/stock_parts/cell/super
ammo_type = list(/obj/item/ammo_casing/energy/emitter)
+ automatic_charge_overlays = FALSE
-/obj/item/gun/energy/emitter/update_icon()
- ..()
+/obj/item/gun/energy/emitter/update_icon_state()
var/obj/item/ammo_casing/energy/shot = ammo_type[current_firemode_index]
if(!QDELETED(cell) && (cell.charge > shot.e_cost))
- add_overlay("emitter_carbine_empty")
+ icon_state = "emitter_carbine_empty"
else
- add_overlay("emitter_carbine")
+ icon_state = "emitter_carbine"
//the pickle ray
/obj/item/gun/energy/pickle_gun
diff --git a/code/modules/projectiles/guns/misc/beam_rifle.dm b/code/modules/projectiles/guns/misc/beam_rifle.dm
index fd09aa7f9d..5e250d44e2 100644
--- a/code/modules/projectiles/guns/misc/beam_rifle.dm
+++ b/code/modules/projectiles/guns/misc/beam_rifle.dm
@@ -35,6 +35,7 @@
slowdown = 1
item_flags = NO_MAT_REDEMPTION | SLOWS_WHILE_IN_HAND | NEEDS_PERMIT
pin = null
+ automatic_charge_overlays = FALSE
var/aiming = FALSE
var/aiming_time = 14
var/aiming_time_fire_threshold = 5
@@ -152,13 +153,13 @@
current_zoom_x = 0
current_zoom_y = 0
-/obj/item/gun/energy/beam_rifle/update_icon()
- cut_overlays()
+/obj/item/gun/energy/beam_rifle/update_overlays()
+ . = ..()
var/obj/item/ammo_casing/energy/primary_ammo = ammo_type[1]
if(!QDELETED(cell) && (cell.charge > primary_ammo.e_cost))
- add_overlay(charged_overlay)
+ . += charged_overlay
else
- add_overlay(drained_overlay)
+ . += drained_overlay
/obj/item/gun/energy/beam_rifle/attack_self(mob/user)
if(!structure_piercing)
diff --git a/code/modules/projectiles/guns/misc/blastcannon.dm b/code/modules/projectiles/guns/misc/blastcannon.dm
index 1c8d519ba8..60b7565333 100644
--- a/code/modules/projectiles/guns/misc/blastcannon.dm
+++ b/code/modules/projectiles/guns/misc/blastcannon.dm
@@ -41,18 +41,16 @@
user.put_in_hands(bomb)
user.visible_message("[user] detaches [bomb] from [src].")
bomb = null
+ name = initial(name)
+ desc = initial(desc)
update_icon()
return ..()
-/obj/item/gun/blastcannon/update_icon()
+/obj/item/gun/blastcannon/update_icon_state()
if(bomb)
icon_state = icon_state_loaded
- name = "blast cannon"
- desc = "A makeshift device used to concentrate a bomb's blast energy to a narrow wave."
else
icon_state = initial(icon_state)
- name = initial(name)
- desc = initial(desc)
/obj/item/gun/blastcannon/attackby(obj/O, mob/user)
if(istype(O, /obj/item/transfer_valve))
@@ -65,6 +63,8 @@
return FALSE
user.visible_message("[user] attaches [T] to [src]!")
bomb = T
+ name = "blast cannon"
+ desc = "A makeshift device used to concentrate a bomb's blast energy to a narrow wave."
update_icon()
return TRUE
return ..()
diff --git a/code/modules/ruins/spaceruin_code/clericsden.dm b/code/modules/ruins/spaceruin_code/clericsden.dm
index 7d1fda6740..3fe4cad794 100644
--- a/code/modules/ruins/spaceruin_code/clericsden.dm
+++ b/code/modules/ruins/spaceruin_code/clericsden.dm
@@ -21,7 +21,6 @@
desc = "A weaker construct meant to scour ruins for objects of Nar'Sie's affection. Those barbed claws are no joke."
icon_state = "proteon"
icon_living = "proteon"
- threat = 0.4
maxHealth = 35
health = 35
melee_damage_lower = 8
diff --git a/html/changelogs/AutoChangeLog-pr-13181.yml b/html/changelogs/AutoChangeLog-pr-13181.yml
new file mode 100644
index 0000000000..c067c640a4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13181.yml
@@ -0,0 +1,8 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - balance: "Simplemobs no longer count in dynamic."
+ - balance: "\"Story\" storyteller no longer starts at a ludicrously low threat, always."
+ - balance: "Blob threat now scales with coverage."
+ - tweak: "One person with their pref on no longer overpowers 40 people who might not even know there is one."
+ - bugfix: "Negative-weight rulesets are no longer put into the list."
diff --git a/html/changelogs/AutoChangeLog-pr-13201.yml b/html/changelogs/AutoChangeLog-pr-13201.yml
new file mode 100644
index 0000000000..f733b8fbc7
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13201.yml
@@ -0,0 +1,4 @@
+author: "kiwedespars"
+delete-after: True
+changes:
+ - tweak: "removed durathread from armwraps recipe."
diff --git a/html/changelogs/AutoChangeLog-pr-13203.yml b/html/changelogs/AutoChangeLog-pr-13203.yml
new file mode 100644
index 0000000000..326f0627fa
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13203.yml
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes:
+ - tweak: "Minor adjustments to the TEG engine."
diff --git a/html/changelogs/AutoChangeLog-pr-13205.yml b/html/changelogs/AutoChangeLog-pr-13205.yml
new file mode 100644
index 0000000000..9543c2f82d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13205.yml
@@ -0,0 +1,7 @@
+author: "EmeraldSundisk"
+delete-after: True
+changes:
+ - rscadd: "Medbay now has a smartfridge for organ storage"
+ - rscadd: "Slight enhancements to the station's electrical wiring layout"
+ - rscadd: "Very small library renovation"
+ - bugfix: "Exterior airlocks have been given proper air systems for safety's sake"
diff --git a/html/changelogs/AutoChangeLog-pr-13213.yml b/html/changelogs/AutoChangeLog-pr-13213.yml
new file mode 100644
index 0000000000..e3de668889
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13213.yml
@@ -0,0 +1,4 @@
+author: "lolman360"
+delete-after: True
+changes:
+ - rscadd: "breath mask balaclava"
diff --git a/html/changelogs/AutoChangeLog-pr-13220.yml b/html/changelogs/AutoChangeLog-pr-13220.yml
new file mode 100644
index 0000000000..a9eb8e48f4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13220.yml
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes:
+ - tweak: "Increases the majority of airlocks by 1 tile."
diff --git a/html/changelogs/AutoChangeLog-pr-13221.yml b/html/changelogs/AutoChangeLog-pr-13221.yml
new file mode 100644
index 0000000000..e7f000a430
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13221.yml
@@ -0,0 +1,4 @@
+author: "Ludox235"
+delete-after: True
+changes:
+ - tweak: "no more 10 pop xenos (25pop now)"
diff --git a/html/changelogs/AutoChangeLog-pr-13224.yml b/html/changelogs/AutoChangeLog-pr-13224.yml
new file mode 100644
index 0000000000..d86493bb47
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13224.yml
@@ -0,0 +1,5 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Stops shielded hardsuits from slowly turning the wearer into a big glowing ball of stacked energy shield overlays."
+ - tweak: "the shielding overlay is merely visual as result. Aim your clicks."
diff --git a/html/changelogs/AutoChangeLog-pr-13226.yml b/html/changelogs/AutoChangeLog-pr-13226.yml
new file mode 100644
index 0000000000..7f378d45dc
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13226.yml
@@ -0,0 +1,6 @@
+author: "zeroisthebiggay"
+delete-after: True
+changes:
+ - rscadd: "new sprites for the temporal katana"
+ - rscadd: "suiciding with the temporal katana omae wa mou shinderius you into the shadow realm"
+ - soundadd: "twilight isnt earrape"
diff --git a/html/changelogs/AutoChangeLog-pr-13228.yml b/html/changelogs/AutoChangeLog-pr-13228.yml
new file mode 100644
index 0000000000..27c3a08e86
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13228.yml
@@ -0,0 +1,4 @@
+author: "DeltaFire15"
+delete-after: True
+changes:
+ - bugfix: "silicons and clockies can now access APCs properly"
diff --git a/html/changelogs/AutoChangeLog-pr-13236.yml b/html/changelogs/AutoChangeLog-pr-13236.yml
new file mode 100644
index 0000000000..37de51de0f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13236.yml
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes:
+ - bugfix: "lizards are now a recommended species for mam snouts"
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index 9490595484..8594af8ec2 100644
Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ
diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi
index 52ef75020c..4ac82ca299 100644
Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ
diff --git a/icons/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi
index 0ca36ad43d..23d80af9ef 100644
Binary files a/icons/mob/inhands/weapons/swords_lefthand.dmi and b/icons/mob/inhands/weapons/swords_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/swords_righthand.dmi
index 59d7bbce69..702c0299b5 100644
Binary files a/icons/mob/inhands/weapons/swords_righthand.dmi and b/icons/mob/inhands/weapons/swords_righthand.dmi differ
diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi
index 9c6df36f49..00670916db 100644
Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index 57105cc089..c5aca2394f 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ
diff --git a/modular_citadel/code/modules/projectiles/guns/ballistic/handguns.dm b/modular_citadel/code/modules/projectiles/guns/ballistic/handguns.dm
index 20917c4ba5..4829fd921c 100644
--- a/modular_citadel/code/modules/projectiles/guns/ballistic/handguns.dm
+++ b/modular_citadel/code/modules/projectiles/guns/ballistic/handguns.dm
@@ -16,13 +16,12 @@
spread = 20
actions_types = list()
-/obj/item/gun/ballistic/automatic/toy/pistol/stealth/update_icon()
- ..()
+/obj/item/gun/ballistic/automatic/toy/pistol/stealth/update_overlays()
+ . = ..()
if(magazine)
- cut_overlays()
- add_overlay("foamsp-magazine")
- else
- cut_overlays()
+ . += "foamsp-magazine"
+
+/obj/item/gun/ballistic/automatic/toy/pistol/stealth/update_icon_state()
icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
/////////RAYGUN MEMES/////////
diff --git a/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm b/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm
index 8a1310d2f1..c2bf251de9 100644
--- a/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm
+++ b/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm
@@ -155,11 +155,15 @@
casing_ejector = 0
spread = 10
recoil = 0.05
+ automatic_burst_overlay = FALSE
+ var/magtype = "flechettegun"
-/obj/item/gun/ballistic/automatic/flechette/update_icon()
- cut_overlays()
+/obj/item/gun/ballistic/automatic/flechette/update_overlays()
+ . = ..()
if(magazine)
- add_overlay("flechettegun-magazine")
+ . += "[magtype]-magazine"
+
+/obj/item/gun/ballistic/automatic/flechette/update_icon_state()
icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
///unique variant///
@@ -185,12 +189,7 @@
w_class = WEIGHT_CLASS_SMALL
spread = 15
recoil = 0.1
-
-/obj/item/gun/ballistic/automatic/flechette/shredder/update_icon()
- cut_overlays()
- if(magazine)
- add_overlay("shreddergun-magazine")
- icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
+ magtype = "shreddergun"
/*/////////////////////////////////////////////////////////////
//////////////////////// Zero's Meme //////////////////////////
@@ -218,17 +217,19 @@
burst_size = 4 //Shh.
fire_delay = 1
var/body_color = "#3333aa"
+ automatic_burst_overlay = FALSE
-/obj/item/gun/ballistic/automatic/AM4B/update_icon()
- ..()
+/obj/item/gun/ballistic/automatic/AM4B/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/update_icon_updates_onmob)
+
+/obj/item/gun/ballistic/automatic/AM4B/update_overlays()
+ . = ..()
var/mutable_appearance/body_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "AM4-Body")
if(body_color)
body_overlay.color = body_color
- cut_overlays() //So that it doesn't keep stacking overlays non-stop on top of each other
- add_overlay(body_overlay)
- if(ismob(loc))
- var/mob/M = loc
- M.update_inv_hands()
+ . += body_overlay
+
/obj/item/gun/ballistic/automatic/AM4B/AltClick(mob/living/user)
. = ..()
if(!in_range(src, user)) //Basic checks to prevent abuse
diff --git a/modular_citadel/code/modules/projectiles/guns/ballistic/spinfusor.dm b/modular_citadel/code/modules/projectiles/guns/ballistic/spinfusor.dm
index 3c0a47bfd7..c4cf8fc00f 100644
--- a/modular_citadel/code/modules/projectiles/guns/ballistic/spinfusor.dm
+++ b/modular_citadel/code/modules/projectiles/guns/ballistic/spinfusor.dm
@@ -55,8 +55,7 @@
/obj/item/gun/ballistic/automatic/spinfusor/attack_self(mob/living/user)
return //caseless rounds are too glitchy to unload properly. Best to make it so that you cannot remove disks from the spinfusor
-/obj/item/gun/ballistic/automatic/spinfusor/update_icon()
- ..()
+/obj/item/gun/ballistic/automatic/spinfusor/update_icon_state()
icon_state = "spinfusor[magazine ? "-[get_ammo(1)]" : ""]"
/obj/item/ammo_box/aspinfusor
diff --git a/modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm b/modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm
index 49d48e0000..65609f5830 100644
--- a/modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm
+++ b/modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -14,16 +14,16 @@ obj/item/gun/energy/e_gun/cx
flight_y_offset = 10
var/body_color = "#252528"
-obj/item/gun/energy/e_gun/cx/update_icon()
- ..()
+obj/item/gun/energy/e_gun/cx/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/update_icon_updates_onmob)
+
+obj/item/gun/energy/e_gun/cx/update_overlays()
+ . = ..()
var/mutable_appearance/body_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "cxegun_body")
if(body_color)
body_overlay.color = body_color
- add_overlay(body_overlay)
-
- if(ismob(loc))
- var/mob/M = loc
- M.update_inv_hands()
+ . += body_overlay
obj/item/gun/energy/e_gun/cx/AltClick(mob/living/user)
. = ..()
diff --git a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm
index b864a9fe25..e81c7c18d3 100644
--- a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm
+++ b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm
@@ -52,13 +52,13 @@
if(has_shot)
recharge_newshot(TRUE)
-/obj/item/gun/energy/pumpaction/update_icon() //adds racked indicators
+/obj/item/gun/energy/pumpaction/update_overlays() //adds racked indicators
..()
var/obj/item/ammo_casing/energy/shot = ammo_type[current_firemode_index]
if(chambered)
- add_overlay("[icon_state]_rack_[shot.select_name]")
+ . += "[icon_state]_rack_[shot.select_name]"
else
- add_overlay("[icon_state]_rack_empty")
+ . += "[icon_state]_rack_empty"
/obj/item/gun/energy/pumpaction/proc/pump(mob/M) //pumping proc. Checks if the gun is empty and plays a different sound if it is.
var/obj/item/ammo_casing/energy/shot = ammo_type[current_firemode_index]
diff --git a/sandcode/code/modules/mob/living/simple_animal/hostile/megafauna/glaurung.dm b/sandcode/code/modules/mob/living/simple_animal/hostile/megafauna/glaurung.dm
index 06d8cf586a..40ecd6208d 100644
--- a/sandcode/code/modules/mob/living/simple_animal/hostile/megafauna/glaurung.dm
+++ b/sandcode/code/modules/mob/living/simple_animal/hostile/megafauna/glaurung.dm
@@ -25,7 +25,6 @@ Difficulty: Medium
/mob/living/simple_animal/hostile/megafauna/dragon/glaurung
name = "Glaurung"
desc = "An ancient Ash Drake untouched except for age. It's eyes glow a soft blue color as opposed to a regular yellow. It carries itself with more strength than the standard drake, eyeing those who come near with caution. Perhaps it is smarter and capable of speech?"
- threat = 5
health = 2000
maxHealth = 2000
spacewalk = TRUE
diff --git a/sound/music/twilight.ogg b/sound/music/twilight.ogg
index 74b811b3e5..635663314d 100644
Binary files a/sound/music/twilight.ogg and b/sound/music/twilight.ogg differ