diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_5x5.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_5x5.dmm
index 2b24fa2a70..3b3328a8f0 100644
--- a/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_5x5.dmm
+++ b/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_5x5.dmm
@@ -295,9 +295,6 @@
},
/turf/open/floor/plating,
/area/engine/engineering)
-"fK" = (
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
"fW" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -427,9 +424,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
-"iU" = (
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
"jg" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
@@ -531,16 +525,19 @@
/obj/machinery/meter,
/turf/open/floor/engine,
/area/engine/engineering)
-"mE" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
- dir = 1
+"mG" = (
+/obj/machinery/power/rad_collector/anchored,
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
},
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/structure/window/plasma/reinforced{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/general/visible{
+ dir = 8
},
/turf/open/floor/engine,
-/area/engine/engineering)
+/area/engine/supermatter)
"mH" = (
/obj/structure/sign/poster/official/safety_eye_protection,
/turf/closed/wall/r_wall,
@@ -552,12 +549,6 @@
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/area/engine/engineering)
-"mW" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
- },
-/turf/open/floor/engine,
-/area/engine/supermatter)
"mX" = (
/obj/effect/turf_decal/stripes/corner,
/obj/structure/cable{
@@ -588,10 +579,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
-"ni" = (
-/obj/machinery/status_display/ai,
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
"nz" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -770,6 +757,19 @@
},
/turf/closed/wall/r_wall,
/area/engine/supermatter)
+"qP" = (
+/obj/machinery/power/rad_collector/anchored,
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
+/obj/structure/window/plasma/reinforced{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/general/visible{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/engine/supermatter)
"re" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
@@ -870,12 +870,6 @@
/obj/machinery/atmospherics/pipe/simple/green/visible,
/turf/open/floor/engine,
/area/engine/engineering)
-"ti" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/open/floor/engine,
-/area/engine/supermatter)
"tn" = (
/turf/open/floor/engine,
/area/engine/supermatter)
@@ -1288,14 +1282,6 @@
/obj/item/clothing/glasses/welding,
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
-"EX" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 1
- },
-/obj/effect/turf_decal/bot,
-/obj/machinery/portable_atmospherics/canister,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
"Fr" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 4
@@ -1451,13 +1437,6 @@
},
/turf/open/floor/plating,
/area/engine/engineering)
-"JK" = (
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
-"JL" = (
-/obj/structure/sign/warning/fire,
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
"JV" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
@@ -1898,12 +1877,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
-"UP" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/open/floor/engine,
-/area/engine/supermatter)
"Vg" = (
/obj/machinery/status_display/ai,
/turf/closed/wall/r_wall,
@@ -1912,14 +1885,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
-"VN" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 1
- },
-/obj/machinery/portable_atmospherics/canister/nitrogen,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
"VP" = (
/obj/item/wrench,
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -1928,12 +1893,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
-"Wf" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
- },
-/turf/open/floor/engine,
-/area/engine/supermatter)
"Ws" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 1;
@@ -1966,9 +1925,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
-"Xy" = (
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
"XA" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
@@ -2426,7 +2382,7 @@ Ne
yd
bW
VP
-EX
+rt
Vg
px
px
@@ -2454,14 +2410,14 @@ MP
zh
QD
Hj
-EX
+rt
un
CT
na
na
+mG
KX
-KX
-Xy
+vO
Ml
Ef
iD
@@ -2482,14 +2438,14 @@ MP
aC
ey
TO
-Xy
+vO
OR
-UP
-UP
-UP
-UP
-UP
-Xy
+Bk
+Bk
+Bk
+Bk
+Bk
+vO
WT
UM
MP
@@ -2573,7 +2529,7 @@ tn
tn
tn
tn
-JL
+jB
Nx
aw
iD
@@ -2593,15 +2549,15 @@ yf
MP
Bl
jp
-Xy
-JL
+vO
+jB
OR
-Wf
-Wf
-Wf
-Wf
-Wf
-Xy
+RA
+RA
+RA
+RA
+RA
+vO
WT
UM
MP
@@ -2620,16 +2576,16 @@ yf
(21,1,1) = {"
MP
nV
-mE
+hy
Ws
-VN
+Pa
wz
Dj
tE
tE
+qP
NU
-NU
-Xy
+vO
Np
YD
iD
@@ -2648,9 +2604,9 @@ yf
(22,1,1) = {"
iD
fa
-mE
+hy
js
-VN
+Pa
xB
Nw
Nw
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index b6463f7147..cfe7dd4335 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -49296,6 +49296,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"ctv" = (
@@ -49321,6 +49322,7 @@
/area/ai_monitored/turret_protected/aisat_interior)
"ctx" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"cty" = (
@@ -49328,6 +49330,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"ctz" = (
@@ -49381,6 +49384,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"ctH" = (
@@ -49405,6 +49409,7 @@
/area/ai_monitored/turret_protected/aisat_interior)
"ctI" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"ctJ" = (
@@ -49448,6 +49453,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"ctQ" = (
@@ -49483,6 +49489,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"ctT" = (
@@ -49493,6 +49500,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"ctU" = (
@@ -57196,8 +57204,7 @@
dir = 5
},
/obj/machinery/camera{
- c_tag = "Bar Backroom";
- dir = 2
+ c_tag = "Bar Backroom"
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index c59e0698f9..eb3140f281 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -197,7 +197,6 @@
/area/hallway/secondary/entry)
"abs" = (
/obj/docking_port/stationary{
- dir = 1;
dwidth = 1;
height = 4;
name = "escape pod loader";
@@ -256,9 +255,7 @@
name = "External Airlock";
req_access_txt = "13"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -269,9 +266,7 @@
/obj/machinery/door/airlock/external{
name = "Escape Pod 1"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -282,9 +277,7 @@
/obj/machinery/door/airlock/external{
name = "Escape Pod 2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -314,9 +307,7 @@
/area/construction/mining/aux_base)
"abZ" = (
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -360,9 +351,7 @@
name = "WARNING: EXTERNAL AIRLOCK";
pixel_x = 32
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -469,8 +458,8 @@
height = 17;
id = "arrivals_stationary";
name = "delta arrivals";
- width = 9;
- roundstart_template = /datum/map_template/shuttle/arrival/delta
+ roundstart_template = /datum/map_template/shuttle/arrival/delta;
+ width = 9
},
/turf/open/space/basic,
/area/space)
@@ -777,9 +766,8 @@
"adh" = (
/obj/structure/cable/white,
/obj/machinery/power/apc/highcap/ten_k{
- dir = 2;
- name = "Starboard Bow Solar APC";
areastring = "/area/maintenance/solars/starboard/fore";
+ name = "Starboard Bow Solar APC";
pixel_y = -26
},
/obj/effect/turf_decal/stripes/line{
@@ -802,8 +790,7 @@
/obj/machinery/power/solar_control{
dir = 8;
id = "forestarboard";
- name = "Starboard Bow Solar Control";
- track = 0
+ name = "Starboard Bow Solar Control"
},
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
@@ -977,9 +964,7 @@
name = "Auxiliary Construction Storage";
req_one_access_txt = "10;32;47;48"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -1394,9 +1379,9 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
+ areastring = "/area/construction/mining/aux_base";
dir = 8;
name = "Auxiliary Construction APC";
- areastring = "/area/construction/mining/aux_base";
pixel_x = -26;
pixel_y = 3
},
@@ -1837,9 +1822,7 @@
name = "Maintenance Hatch";
req_one_access_txt = "32;47;48"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -1847,7 +1830,6 @@
/area/maintenance/starboard/fore)
"aid" = (
/obj/docking_port/stationary{
- dir = 1;
dwidth = 2;
height = 13;
id = "ferry_home";
@@ -2263,9 +2245,7 @@
"ajd" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -2274,9 +2254,7 @@
"aje" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -2301,9 +2279,7 @@
/obj/machinery/door/firedoor,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -2317,9 +2293,7 @@
/obj/machinery/door/firedoor,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -2547,9 +2521,9 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
+ areastring = "/area/hallway/secondary/entry";
dir = 1;
name = "Arrivals Hallway APC";
- areastring = "/area/hallway/secondary/entry";
pixel_y = 24
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -2557,7 +2531,6 @@
},
/obj/machinery/camera{
c_tag = "Arrivals - Center Port";
- dir = 2;
name = "arrivals camera"
},
/obj/effect/turf_decal/tile/blue{
@@ -3049,9 +3022,7 @@
/obj/machinery/door/airlock{
name = "Auxiliary Storage Closet"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -3074,9 +3045,7 @@
req_access_txt = "32"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -3097,9 +3066,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -3840,9 +3807,9 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
+ areastring = "/area/security/checkpoint/customs";
dir = 8;
name = "Customs Desk APC";
- areastring = "/area/security/checkpoint/customs";
pixel_x = -26
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -3916,7 +3883,6 @@
/obj/item/flashlight/lamp,
/obj/machinery/camera{
c_tag = "Arrivals - Center";
- dir = 2;
name = "arrivals camera"
},
/turf/open/floor/plasteel/grimy,
@@ -4532,7 +4498,6 @@
"anz" = (
/obj/effect/decal/cleanable/cobweb,
/obj/machinery/computer/arcade{
- icon_state = "arcade";
dir = 4
},
/turf/open/floor/plating,
@@ -4542,9 +4507,9 @@
icon_state = "0-2"
},
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/starboard/fore";
dir = 1;
name = "Starboard Bow Maintenance APC";
- areastring = "/area/maintenance/starboard/fore";
pixel_y = 24
},
/obj/effect/decal/cleanable/dirt,
@@ -5731,9 +5696,7 @@
/obj/structure/sign/warning/vacuum{
pixel_y = 32
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -5747,9 +5710,7 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -5763,9 +5724,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -6026,9 +5985,8 @@
/area/security/vacantoffice)
"aqg" = (
/obj/machinery/power/apc{
- dir = 2;
- name = "Auxiliary Office APC";
areastring = "/area/security/vacantoffice";
+ name = "Auxiliary Office APC";
pixel_y = -26
},
/obj/effect/decal/cleanable/dirt,
@@ -6515,9 +6473,8 @@
/obj/item/twohanded/required/kirbyplants/random,
/obj/structure/cable/white,
/obj/machinery/power/apc{
- dir = 2;
- name = "Electronics Marketing APC";
areastring = "/area/crew_quarters/electronic_marketing_den";
+ name = "Electronics Marketing APC";
pixel_y = -26
},
/turf/open/floor/wood,
@@ -6545,9 +6502,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -6575,9 +6530,7 @@
req_access_txt = "19"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -6593,9 +6546,7 @@
req_access_txt = "63"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -6691,7 +6642,6 @@
/area/maintenance/disposal)
"ari" = (
/obj/machinery/mineral/stacking_unit_console{
- dir = 2;
machinedir = 8;
pixel_x = 32
},
@@ -6732,9 +6682,7 @@
req_one_access_txt = "24;10"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -6756,9 +6704,7 @@
name = "Reflector Access";
req_one_access_txt = "24;10"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -6821,9 +6767,7 @@
icon_state = "1-2"
},
/obj/structure/barricade/wooden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -6837,9 +6781,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/barricade/wooden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -7010,7 +6952,6 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera{
c_tag = "Arrivals - Aft";
- dir = 2;
name = "arrivals camera"
},
/obj/effect/turf_decal/bot,
@@ -7093,7 +7034,6 @@
/area/maintenance/starboard/fore)
"arX" = (
/obj/machinery/computer/arcade{
- icon_state = "arcade";
dir = 1
},
/turf/open/floor/plating,
@@ -7131,7 +7071,6 @@
"asa" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/arcade{
- icon_state = "arcade";
dir = 1
},
/turf/open/floor/plating,
@@ -7209,7 +7148,6 @@
"ash" = (
/obj/machinery/door/window/eastright{
base_state = "left";
- dir = 4;
icon_state = "left";
name = "Danger: Conveyor Access";
req_access_txt = "12"
@@ -8017,9 +7955,7 @@
req_access_txt = "12"
},
/obj/structure/barricade/wooden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -8127,7 +8063,6 @@
/area/maintenance/disposal)
"atF" = (
/obj/machinery/door/window/eastright{
- dir = 4;
name = "Danger: Conveyor Access";
req_access_txt = "12"
},
@@ -8466,9 +8401,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -8484,9 +8417,7 @@
req_access_txt = "12"
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -8916,9 +8847,8 @@
/area/maintenance/disposal)
"auO" = (
/obj/machinery/power/apc{
- dir = 2;
- name = "Disposal APC";
areastring = "/area/maintenance/disposal";
+ name = "Disposal APC";
pixel_y = -24
},
/obj/structure/disposalpipe/segment{
@@ -9308,9 +9238,9 @@
/area/janitor)
"avB" = (
/obj/machinery/power/apc{
+ areastring = "/area/janitor";
dir = 1;
name = "Custodial Closet APC";
- areastring = "/area/janitor";
pixel_y = 24
},
/obj/structure/cable/white{
@@ -9341,7 +9271,6 @@
},
/obj/machinery/camera{
c_tag = "Custodial Closet";
- dir = 2;
name = "service camera"
},
/obj/effect/turf_decal/bot,
@@ -9447,9 +9376,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -9459,11 +9386,8 @@
/obj/structure/sign/directions/evac{
pixel_y = -8
},
-/obj/structure/sign/directions/science{
- dir = 2
- },
+/obj/structure/sign/directions/science,
/obj/structure/sign/directions/engineering{
- dir = 2;
pixel_y = 8
},
/turf/closed/wall,
@@ -9475,9 +9399,7 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -9488,9 +9410,7 @@
/obj/machinery/door/airlock/public/glass{
name = "Fore Primary Hallway"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -9502,9 +9422,7 @@
/obj/machinery/door/airlock/public/glass{
name = "Fore Primary Hallway"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -9514,11 +9432,8 @@
/obj/structure/sign/directions/evac{
pixel_y = -8
},
-/obj/structure/sign/directions/medical{
- dir = 2
- },
+/obj/structure/sign/directions/medical,
/obj/structure/sign/directions/security{
- dir = 2;
pixel_y = 8
},
/turf/closed/wall,
@@ -9536,9 +9451,7 @@
req_access_txt = "31"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -9579,9 +9492,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -9982,7 +9893,6 @@
/obj/item/twohanded/required/kirbyplants/random,
/obj/machinery/camera{
c_tag = "Auxiliary Restroom";
- dir = 2;
name = "restroom camera"
},
/obj/effect/turf_decal/tile/neutral{
@@ -10112,7 +10022,6 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera{
c_tag = "Cargo - Warehouse";
- dir = 2;
name = "cargo camera"
},
/turf/open/floor/plating,
@@ -10388,7 +10297,6 @@
},
/obj/machinery/camera{
c_tag = "Supermatter Chamber";
- dir = 2;
network = list("engine")
},
/turf/open/floor/engine,
@@ -10712,9 +10620,8 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/apc{
- dir = 2;
- name = "Auxiliary Restrooms APC";
areastring = "/area/crew_quarters/toilet/auxiliary";
+ name = "Auxiliary Restrooms APC";
pixel_y = -26
},
/turf/open/floor/plating,
@@ -11164,9 +11071,8 @@
"ayU" = (
/obj/machinery/light/small,
/obj/machinery/power/apc{
- dir = 2;
- name = "Port Bow Maintenance APC";
areastring = "/area/maintenance/port/fore";
+ name = "Port Bow Maintenance APC";
pixel_y = -26
},
/obj/structure/cable/white,
@@ -11359,9 +11265,7 @@
/obj/machinery/door/airlock{
name = "Toilet Unit"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -11850,9 +11754,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -11863,9 +11765,7 @@
id = "custodialshutters";
name = "Custodial Closet Shutters"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -11883,9 +11783,7 @@
req_access_txt = "26"
},
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -13419,9 +13317,9 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
+ areastring = "/area/quartermaster/warehouse";
dir = 4;
name = "Cargo Warehouse APC";
- areastring = "/area/quartermaster/warehouse";
pixel_x = 26
},
/obj/effect/turf_decal/tile/brown,
@@ -13551,9 +13449,7 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aDg" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -13795,9 +13691,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -13986,7 +13880,6 @@
/area/quartermaster/storage)
"aEg" = (
/obj/machinery/button/door{
- dir = 2;
id = "cargounload";
layer = 4;
name = "Loading Doors";
@@ -14219,9 +14112,9 @@
/area/engine/atmospherics_engine)
"aEz" = (
/obj/machinery/power/apc{
+ areastring = "/area/engine/atmospherics_engine";
dir = 4;
name = "Atmospherics Engine APC";
- areastring = "/area/engine/atmospherics_engine";
pixel_x = 26
},
/obj/structure/cable/white{
@@ -14365,9 +14258,9 @@
"aEP" = (
/obj/structure/closet/secure_closet/bar,
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/bar";
dir = 1;
name = "Bar APC";
- areastring = "/area/crew_quarters/bar";
pixel_y = 24
},
/obj/machinery/light/small{
@@ -14397,7 +14290,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/obj/machinery/camera{
c_tag = "Bar Backroom";
- dir = 2;
name = "service camera"
},
/turf/open/floor/plasteel/dark,
@@ -14549,9 +14441,9 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
+ areastring = "/area/hallway/primary/fore";
dir = 8;
name = "Port Primary Hallway APC";
- areastring = "/area/hallway/primary/fore";
pixel_x = -26;
pixel_y = 3
},
@@ -14609,9 +14501,7 @@
req_access_txt = "31"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -14929,7 +14819,6 @@
/obj/structure/cable/white,
/obj/machinery/power/apc{
areastring = "/area/hydroponics/garden/abandoned";
- dir = 2;
name = "Maintenance Garden APC";
pixel_y = -26
},
@@ -15585,7 +15474,6 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera{
c_tag = "Prison - Garden";
- dir = 2;
name = "prison camera";
network = list("ss13","prison")
},
@@ -16000,9 +15888,7 @@
req_access_txt = "12"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -16018,9 +15904,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -16259,7 +16143,6 @@
"aHK" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/conveyor{
- dir = 2;
id = "cargodisposals"
},
/turf/open/floor/plating,
@@ -16719,9 +16602,9 @@
dir = 1
},
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/disposal/incinerator";
dir = 1;
name = "Turbine Generator APC";
- areastring = "/area/maintenance/disposal/incinerator";
pixel_y = 24
},
/obj/structure/cable/white{
@@ -16754,9 +16637,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/door/airlock/atmos{
name = "Atmospherics Access";
req_one_access_txt = "24;10"
@@ -16778,9 +16659,7 @@
icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/door/airlock/atmos{
name = "Atmospherics Engine Access";
req_one_access_txt = "24;10"
@@ -16823,9 +16702,7 @@
req_one_access_txt = "24;10"
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -17179,7 +17056,6 @@
"aJk" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/conveyor{
- dir = 2;
id = "cargodisposals"
},
/obj/effect/spawner/lootdrop/maintenance,
@@ -17361,8 +17237,7 @@
/obj/machinery/power/solar_control{
dir = 4;
id = "foreport";
- name = "Port Bow Solar Control";
- track = 0
+ name = "Port Bow Solar Control"
},
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
@@ -17384,9 +17259,8 @@
"aJG" = (
/obj/structure/cable/white,
/obj/machinery/power/apc/highcap/ten_k{
- dir = 2;
- name = "Port Bow Solar APC";
areastring = "/area/maintenance/solars/port/fore";
+ name = "Port Bow Solar APC";
pixel_y = -26
},
/obj/effect/turf_decal/stripes/line{
@@ -18262,9 +18136,7 @@
id = "justiceblast";
name = "Justice Blast door"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -18765,9 +18637,9 @@
pixel_y = -32
},
/obj/machinery/power/apc{
+ areastring = "/area/security/checkpoint/supply";
dir = 8;
name = "Security Post - Cargo APC";
- areastring = "/area/security/checkpoint/supply";
pixel_x = -26
},
/obj/effect/turf_decal/tile/red{
@@ -19139,9 +19011,7 @@
name = "Turbine Generator Access";
req_access_txt = "24"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -19162,9 +19032,7 @@
"aMH" = (
/obj/machinery/door/firedoor,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/door/airlock/atmos{
name = "Atmospherics Access";
req_one_access_txt = "24;10"
@@ -19187,9 +19055,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/door/airlock/atmos{
name = "Atmospherics Engine Access";
req_one_access_txt = "24;10"
@@ -19357,14 +19223,13 @@
dir = 1
},
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/bar/atrium";
dir = 1;
name = "Atrium APC";
- areastring = "/area/crew_quarters/bar/atrium";
pixel_y = 24
},
/obj/machinery/camera{
c_tag = "Theatre Stage";
- dir = 2;
name = "service camera"
},
/turf/open/floor/plasteel/grimy,
@@ -19495,7 +19360,6 @@
"aNp" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/conveyor{
- dir = 2;
id = "cargodisposals"
},
/obj/structure/plasticflaps,
@@ -19823,10 +19687,9 @@
/area/maintenance/disposal/incinerator)
"aNQ" = (
/obj/machinery/power/compressor{
- icon_state = "compressor";
+ comp_id = "incineratorturbine";
dir = 4;
- luminosity = 2;
- comp_id = "incineratorturbine"
+ luminosity = 2
},
/obj/structure/cable{
icon_state = "0-4"
@@ -19865,9 +19728,7 @@
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{
- dir = 2
- },
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos,
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
"aNU" = (
@@ -20262,9 +20123,9 @@
dir = 1
},
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/theatre";
dir = 1;
name = "Theatre Backstage APC";
- areastring = "/area/crew_quarters/theatre";
pixel_y = 24
},
/obj/effect/turf_decal/tile/red{
@@ -20469,9 +20330,9 @@
/obj/item/stack/packageWrap,
/obj/item/hand_labeler,
/obj/machinery/power/apc{
+ areastring = "/area/quartermaster/sorting";
dir = 8;
name = "Delivery Office APC";
- areastring = "/area/quartermaster/sorting";
pixel_x = -26;
pixel_y = 3
},
@@ -21928,7 +21789,6 @@
/obj/machinery/holopad,
/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
- dir = 2;
name = "Prison Intercom";
pixel_y = -28;
prison_radio = 1
@@ -21951,7 +21811,6 @@
/area/security/prison)
"aRi" = (
/obj/machinery/computer/arcade{
- icon_state = "arcade";
dir = 1
},
/turf/open/floor/plating,
@@ -22531,9 +22390,7 @@
req_one_access_txt = "48;50"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -22585,9 +22442,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -22608,9 +22463,9 @@
icon_state = "0-2"
},
/obj/machinery/power/apc{
+ areastring = "/area/quartermaster/storage";
dir = 8;
name = "Cargo Bay APC";
- areastring = "/area/quartermaster/storage";
pixel_x = -26;
pixel_y = 3
},
@@ -22760,9 +22615,9 @@
icon_state = "0-2"
},
/obj/machinery/power/apc{
+ areastring = "/area/quartermaster/qm";
dir = 1;
name = "Quartermaster's Office APC";
- areastring = "/area/quartermaster/qm";
pixel_y = 28
},
/obj/machinery/atmospherics/components/unary/vent_pump/on,
@@ -22887,9 +22742,7 @@
name = "Cell 3"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -22908,9 +22761,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -22927,9 +22778,7 @@
name = "Cell 1"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -23809,7 +23658,6 @@
},
/obj/machinery/camera{
c_tag = "Cargo - Office";
- dir = 2;
name = "cargo camera"
},
/obj/effect/turf_decal/tile/brown{
@@ -23824,9 +23672,9 @@
/obj/structure/table,
/obj/item/paper_bin,
/obj/machinery/power/apc{
+ areastring = "/area/quartermaster/office";
dir = 1;
name = "Cargo Office APC";
- areastring = "/area/quartermaster/office";
pixel_y = 28
},
/obj/structure/cable/white{
@@ -24263,7 +24111,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/machinery/camera{
c_tag = "Prison - Cell 3";
- dir = 2;
name = "prison camera";
network = list("ss13","prison")
},
@@ -24310,7 +24157,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/machinery/camera{
c_tag = "Prison - Cell 2";
- dir = 2;
name = "prison camera";
network = list("ss13","prison")
},
@@ -24343,7 +24189,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/machinery/camera{
c_tag = "Prison - Cell 1";
- dir = 2;
name = "prison camera";
network = list("ss13","prison")
},
@@ -24491,9 +24336,7 @@
name = "Security External Airlock";
req_access_txt = "63"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -25704,9 +25547,8 @@
"aWp" = (
/obj/structure/cable/white,
/obj/machinery/power/apc{
- dir = 2;
- name = "Education Chamber APC";
areastring = "/area/security/execution/education";
+ name = "Education Chamber APC";
pixel_y = -26
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
@@ -25929,9 +25771,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -26045,9 +25885,9 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
+ areastring = "/area/hallway/secondary/service";
dir = 8;
name = "Service Hall APC";
- areastring = "/area/hallway/secondary/service";
pixel_x = -26;
pixel_y = 3
},
@@ -26764,9 +26604,7 @@
name = "WARNING: EXTERNAL AIRLOCK";
pixel_x = 32
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -27678,8 +27516,7 @@
/area/security/prison)
"aZm" = (
/obj/machinery/camera{
- c_tag = "Security - Prison Port";
- dir = 2
+ c_tag = "Security - Prison Port"
},
/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
@@ -27756,9 +27593,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/prison)
"aZt" = (
@@ -27785,8 +27620,7 @@
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/machinery/camera{
- c_tag = "Security - Prison";
- dir = 2
+ c_tag = "Security - Prison"
},
/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
@@ -27827,9 +27661,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/prison)
"aZx" = (
@@ -27888,9 +27720,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/prison)
"aZB" = (
@@ -28027,8 +27857,7 @@
"aZK" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera{
- c_tag = "Security - Escape Pod";
- dir = 2
+ c_tag = "Security - Escape Pod"
},
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -28049,8 +27878,8 @@
dir = 4
},
/turf/open/floor/plating{
- luminosity = 2;
initial_gas_mix = "o2=0.01;n2=0.01";
+ luminosity = 2;
temperature = 2.7
},
/area/security/prison)
@@ -28372,9 +28201,7 @@
req_access_txt = "35"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -28401,9 +28228,7 @@
dir = 4
},
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/hallway/secondary/service)
"bax" = (
@@ -28412,9 +28237,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/hallway/secondary/service)
"bay" = (
@@ -28445,7 +28268,6 @@
},
/obj/machinery/camera{
c_tag = "Kitchen Cold Room";
- dir = 2;
name = "service camera"
},
/obj/effect/turf_decal/stripes/line{
@@ -28650,9 +28472,7 @@
req_access_txt = "48"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -28680,9 +28500,7 @@
req_access_txt = "48"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -28827,9 +28645,8 @@
"bbk" = (
/obj/structure/cable/white,
/obj/machinery/power/apc/highcap/five_k{
- dir = 2;
- name = "Prison Wing APC";
areastring = "/area/security/prison";
+ name = "Prison Wing APC";
pixel_x = 1;
pixel_y = -24
},
@@ -29380,9 +29197,7 @@
"bcm" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -29394,9 +29209,7 @@
},
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -29405,9 +29218,7 @@
"bco" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -29426,9 +29237,7 @@
req_one_access_txt = "48;50"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -29631,9 +29440,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -29652,9 +29459,7 @@
req_access_txt = "1"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -29819,8 +29624,8 @@
dir = 4
},
/turf/open/floor/plating{
- luminosity = 2;
initial_gas_mix = "o2=0.01;n2=0.01";
+ luminosity = 2;
temperature = 2.7
},
/area/security/prison)
@@ -30400,7 +30205,6 @@
"bdS" = (
/obj/machinery/camera{
c_tag = "Cargo - Waiting Room";
- dir = 2;
name = "cargo camera"
},
/obj/effect/turf_decal/loading_area{
@@ -31002,9 +30806,8 @@
"bfb" = (
/obj/structure/cable/white,
/obj/machinery/power/apc{
- dir = 2;
- name = "Kitchen APC";
areastring = "/area/crew_quarters/kitchen";
+ name = "Kitchen APC";
pixel_y = -26
},
/obj/effect/turf_decal/bot,
@@ -31597,9 +31400,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -31717,9 +31518,7 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -31734,9 +31533,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -31757,9 +31554,7 @@
req_access_txt = "28"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -32059,18 +31854,14 @@
/area/quartermaster/miningoffice)
"bgR" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
"bgS" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -32103,8 +31894,8 @@
height = 5;
id = "mining_home";
name = "mining shuttle bay";
- width = 7;
- roundstart_template = /datum/map_template/shuttle/mining/delta
+ roundstart_template = /datum/map_template/shuttle/mining/delta;
+ width = 7
},
/turf/open/space/basic,
/area/space)
@@ -32121,9 +31912,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -32151,9 +31940,7 @@
req_access_txt = "1"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -32237,9 +32024,9 @@
/area/engine/atmos)
"bhj" = (
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/engine/atmos";
dir = 1;
name = "Atmospherics APC";
- areastring = "/area/engine/atmos";
pixel_y = 24
},
/obj/structure/cable/white{
@@ -33065,8 +32852,7 @@
dir = 4
},
/obj/machinery/camera{
- c_tag = "Security - Medbay";
- dir = 2
+ c_tag = "Security - Medbay"
},
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -33188,8 +32974,7 @@
pixel_y = 32
},
/obj/machinery/camera{
- c_tag = "Security - Office Fore";
- dir = 2
+ c_tag = "Security - Office Fore"
},
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -34413,8 +34198,7 @@
pixel_y = 32
},
/obj/machinery/camera{
- c_tag = "Security - Head of Security's Office";
- dir = 2
+ c_tag = "Security - Head of Security's Office"
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -34866,7 +34650,6 @@
dir = 4
},
/obj/machinery/door/window/eastleft{
- dir = 4;
name = "Kitchen Desk";
req_access_txt = "28"
},
@@ -35187,9 +34970,9 @@
/obj/item/storage/firstaid/regular,
/obj/machinery/light,
/obj/machinery/power/apc{
+ areastring = "/area/quartermaster/miningoffice";
dir = 4;
name = "Mining Dock APC";
- areastring = "/area/quartermaster/miningoffice";
pixel_x = 26
},
/obj/machinery/camera{
@@ -35582,8 +35365,7 @@
pixel_y = 32
},
/obj/machinery/camera{
- c_tag = "Security - Head of Security's Quarters";
- dir = 2
+ c_tag = "Security - Head of Security's Quarters"
},
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/heads/hos)
@@ -36013,9 +35795,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -36054,9 +35834,7 @@
/obj/machinery/door/airlock/public/glass{
name = "Fore Primary Hallway"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -36071,9 +35849,7 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -36094,9 +35870,7 @@
/area/hallway/primary/fore)
"bnv" = (
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -36105,9 +35879,7 @@
"bnw" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -36120,9 +35892,7 @@
"bny" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -36160,9 +35930,7 @@
name = "Mining Dock";
req_access_txt = "48"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -36265,9 +36033,9 @@
/area/security/main)
"bnL" = (
/obj/machinery/power/apc{
+ areastring = "/area/security/main";
dir = 8;
name = "Security Office APC";
- areastring = "/area/security/main";
pixel_x = -26
},
/obj/structure/cable/white{
@@ -36623,9 +36391,7 @@
name = "Distribution Loop";
req_access_txt = "24"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -36664,9 +36430,7 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bor" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -36684,16 +36448,12 @@
/obj/item/clipboard,
/obj/effect/decal/cleanable/dirt,
/obj/item/toy/figure/atmos,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bot" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -36832,7 +36592,6 @@
},
/obj/machinery/camera{
c_tag = "Central Hallway - Fore Port";
- dir = 2;
name = "hallway camera"
},
/obj/effect/turf_decal/tile/neutral{
@@ -36929,7 +36688,6 @@
},
/obj/machinery/camera{
c_tag = "Central Hallway - Fore Starboard";
- dir = 2;
name = "hallway camera"
},
/obj/effect/turf_decal/tile/neutral{
@@ -36977,9 +36735,9 @@
dir = 4
},
/obj/machinery/power/apc{
+ areastring = "/area/hallway/primary/central";
dir = 1;
name = "Central Primary Hallway APC";
- areastring = "/area/hallway/primary/central";
pixel_y = 24
},
/obj/structure/cable/white{
@@ -37132,8 +36890,7 @@
pixel_y = 32
},
/obj/machinery/camera{
- c_tag = "Security - Transfer Centre";
- dir = 2
+ c_tag = "Security - Transfer Centre"
},
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -37647,7 +37404,6 @@
/area/engine/atmos)
"bpT" = (
/obj/machinery/atmospherics/components/binary/pump{
- dir = 2;
name = "Pure to Mix"
},
/obj/effect/decal/cleanable/dirt,
@@ -37726,9 +37482,7 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bqa" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/effect/landmark/start/atmospheric_technician,
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
dir = 4
@@ -37750,9 +37504,7 @@
/obj/item/clothing/head/welding,
/obj/structure/table/reinforced,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
dir = 4
@@ -37760,9 +37512,7 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bqc" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -39063,9 +38813,7 @@
/obj/structure/table/reinforced,
/obj/item/storage/belt/utility,
/obj/item/t_scanner,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/engine/atmos)
@@ -40253,9 +40001,7 @@
/area/engine/atmos)
"btU" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -40269,9 +40015,7 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"btV" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/engine/atmos)
@@ -40428,9 +40172,9 @@
/area/hallway/primary/port)
"bui" = (
/obj/machinery/power/apc{
+ areastring = "/area/hallway/primary/port";
dir = 4;
name = "Port Primary Hallway APC";
- areastring = "/area/hallway/primary/port";
pixel_x = 26
},
/obj/structure/cable/white{
@@ -40475,9 +40219,7 @@
"bun" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -40489,9 +40231,7 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -40501,9 +40241,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -40522,9 +40260,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -40550,9 +40286,7 @@
/turf/open/floor/plasteel,
/area/security/execution/transfer)
"buA" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -40782,9 +40516,8 @@
"buT" = (
/obj/item/twohanded/required/kirbyplants/random,
/obj/machinery/power/apc{
- dir = 2;
- name = "Head of Security's Office APC";
areastring = "/area/crew_quarters/heads/hos";
+ name = "Head of Security's Office APC";
pixel_y = -26
},
/obj/structure/cable/white,
@@ -40905,7 +40638,6 @@
/area/engine/atmos)
"bva" = (
/obj/machinery/atmospherics/components/binary/pump{
- dir = 2;
name = "Mix to Distro"
},
/obj/effect/turf_decal/tile/neutral{
@@ -41450,9 +41182,8 @@
"bwa" = (
/obj/structure/cable/white,
/obj/machinery/power/apc{
- dir = 2;
- name = "Security Transferring APC";
areastring = "/area/security/execution/transfer";
+ name = "Security Transferring APC";
pixel_y = -26
},
/obj/effect/turf_decal/tile/red,
@@ -41743,9 +41474,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/door/airlock/atmos{
name = "Atmospherics Access";
req_one_access_txt = "24;10"
@@ -42459,9 +42188,7 @@
name = "External Airlock";
req_access_txt = "13"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -43040,9 +42767,9 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
+ areastring = "/area/security/nuke_storage";
dir = 4;
name = "Vault APC";
- areastring = "/area/security/nuke_storage";
pixel_x = 26
},
/obj/effect/turf_decal/tile/neutral{
@@ -43561,9 +43288,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/door/airlock/atmos{
name = "Atmospherics Access";
req_one_access_txt = "24;10"
@@ -43740,9 +43465,7 @@
req_access_txt = "19;23"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -44055,8 +43778,8 @@
height = 5;
id = "laborcamp_home";
name = "fore bay 1";
- width = 9;
- roundstart_template = /datum/map_template/shuttle/labour/delta
+ roundstart_template = /datum/map_template/shuttle/labour/delta;
+ width = 9
},
/turf/open/space/basic,
/area/space)
@@ -44310,11 +44033,8 @@
icon_state = "1-8"
},
/obj/item/radio/intercom{
- anyai = 1;
- broadcasting = 0;
freerange = 1;
frequency = 1424;
- listening = 1;
name = "Interrogation Intercom";
pixel_y = -58
},
@@ -44575,9 +44295,9 @@
/area/engine/gravity_generator)
"bAL" = (
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/engine/gravity_generator";
dir = 1;
name = "Gravity Generator APC";
- areastring = "/area/engine/gravity_generator";
pixel_y = 24
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -44641,9 +44361,7 @@
req_access_txt = "13"
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -44715,9 +44433,7 @@
name = "Atmospherics Lockdown Blast door"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -44731,9 +44447,7 @@
id = "atmoslock";
name = "Atmospherics Lockdown Blast door"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -44751,9 +44465,7 @@
req_access_txt = "24"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -45003,9 +44715,7 @@
name = "Maintenance Hatch";
req_access_txt = "12"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -45023,7 +44733,6 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=2";
- dir = 2;
freq = 1400;
location = "Tool Storage"
},
@@ -45556,7 +45265,6 @@
/obj/structure/table/reinforced,
/obj/item/flashlight/lamp,
/obj/item/radio/intercom{
- anyai = 1;
broadcasting = 1;
freerange = 1;
frequency = 1424;
@@ -45892,9 +45600,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -45929,9 +45635,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -46014,9 +45718,9 @@
dir = 1
},
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/engine/break_room";
dir = 1;
name = "Engineering Foyer APC";
- areastring = "/area/engine/break_room";
pixel_y = 24
},
/obj/structure/cable/white{
@@ -47111,7 +46815,6 @@
/area/security/brig)
"bEf" = (
/obj/item/radio/intercom{
- anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
@@ -47119,15 +46822,11 @@
pixel_y = 22
},
/obj/item/radio/intercom{
- broadcasting = 0;
freerange = 1;
- listening = 1;
name = "Common Channel";
pixel_x = -27
},
/obj/item/radio/intercom{
- anyai = 1;
- broadcasting = 0;
freerange = 1;
frequency = 1447;
name = "Private Channel";
@@ -47259,7 +46958,6 @@
/area/ai_monitored/turret_protected/ai)
"bEm" = (
/obj/item/radio/intercom{
- anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
@@ -47267,15 +46965,11 @@
pixel_y = 22
},
/obj/item/radio/intercom{
- broadcasting = 0;
freerange = 1;
- listening = 1;
name = "Common Channel";
pixel_x = 27
},
/obj/item/radio/intercom{
- anyai = 1;
- broadcasting = 0;
freerange = 1;
frequency = 1447;
name = "Private Channel";
@@ -47469,9 +47163,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -47484,9 +47176,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -47502,9 +47192,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -47787,9 +47475,9 @@
},
/obj/item/stack/cable_coil/white,
/obj/machinery/power/apc{
+ areastring = "/area/storage/primary";
dir = 8;
name = "Primary Tool Storage APC";
- areastring = "/area/storage/primary";
pixel_x = -26;
pixel_y = 3
},
@@ -48478,23 +48166,18 @@
/area/ai_monitored/turret_protected/ai)
"bFT" = (
/obj/item/radio/intercom{
- broadcasting = 0;
freerange = 1;
- listening = 1;
name = "Common Channel";
pixel_x = -27;
pixel_y = -7
},
/obj/item/radio/intercom{
- anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
pixel_y = -27
},
/obj/item/radio/intercom{
- anyai = 1;
- broadcasting = 0;
freerange = 1;
frequency = 1447;
name = "Private Channel";
@@ -49218,9 +48901,8 @@
"bGY" = (
/obj/structure/cable/white,
/obj/machinery/power/apc{
- dir = 2;
- name = "Bridge APC";
areastring = "/area/bridge";
+ name = "Bridge APC";
pixel_y = -26
},
/obj/effect/turf_decal/tile/blue,
@@ -49829,9 +49511,7 @@
name = "Transit Tube Lockdown Door"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -49844,9 +49524,7 @@
name = "Transit Tube Lockdown Door"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -50100,9 +49778,9 @@
/obj/item/folder/yellow,
/obj/item/electronics/airlock,
/obj/machinery/power/apc{
+ areastring = "/area/storage/tech";
dir = 8;
name = "Technology Storage APC";
- areastring = "/area/storage/tech";
pixel_x = -26;
pixel_y = 3
},
@@ -50665,9 +50343,9 @@
icon_state = "0-2"
},
/obj/machinery/power/apc{
+ areastring = "/area/security/detectives_office";
dir = 1;
name = "Detective's Office APC";
- areastring = "/area/security/detectives_office";
pixel_y = 24
},
/obj/item/taperecorder,
@@ -51056,9 +50734,9 @@
dir = 6
},
/obj/machinery/power/apc{
+ areastring = "/area/ai_monitored/turret_protected/ai";
dir = 1;
name = "AI Chamber APC";
- areastring = "/area/ai_monitored/turret_protected/ai";
pixel_y = 24
},
/obj/effect/turf_decal/tile/neutral{
@@ -51640,9 +51318,9 @@
icon_state = "0-2"
},
/obj/machinery/power/apc/highcap/ten_k{
+ areastring = "/area/bridge/meeting_room/council";
dir = 1;
name = "Council Chambers APC";
- areastring = "/area/bridge/meeting_room/council";
pixel_y = 26
},
/turf/open/floor/wood,
@@ -51827,9 +51505,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -52325,9 +52001,9 @@
/area/engine/transit_tube)
"bLI" = (
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/engine/transit_tube";
dir = 1;
name = "Transit Tube Access APC";
- areastring = "/area/engine/transit_tube";
pixel_y = 24
},
/obj/machinery/atmospherics/components/unary/vent_pump/on,
@@ -52932,9 +52608,9 @@
/area/tcommsat/computer)
"bMz" = (
/obj/machinery/power/apc/highcap/ten_k{
+ areastring = "/area/tcommsat/computer";
dir = 1;
name = "Telecomms Monitoring APC";
- areastring = "/area/tcommsat/computer";
pixel_y = 28
},
/obj/item/twohanded/required/kirbyplants/random,
@@ -52952,7 +52628,6 @@
},
/obj/machinery/camera{
c_tag = "Telecomms - Monitoring";
- dir = 2;
name = "telecomms camera";
network = list("ss13","tcomms")
},
@@ -53126,9 +52801,9 @@
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/storage/tools";
dir = 1;
name = "Auxiliary Tool Storage APC";
- areastring = "/area/storage/tools";
pixel_y = 24
},
/obj/effect/turf_decal/tile/yellow{
@@ -55229,9 +54904,7 @@
req_access_txt = "10"
},
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -55669,9 +55342,8 @@
/area/crew_quarters/heads/captain)
"bQV" = (
/obj/machinery/power/apc/highcap/ten_k{
- dir = 2;
- name = "Captain's Office APC";
areastring = "/area/crew_quarters/heads/captain";
+ name = "Captain's Office APC";
pixel_y = -24
},
/obj/structure/cable/white,
@@ -56176,7 +55848,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera{
c_tag = "AI Satellite - Antechamber";
- dir = 2;
name = "ai camera";
network = list("minisat");
start_active = 1
@@ -56463,7 +56134,6 @@
},
/obj/machinery/camera{
c_tag = "Engineering - Chief Engineer's Quarters";
- dir = 2;
name = "engineering camera"
},
/obj/effect/turf_decal/stripes/line{
@@ -56577,9 +56247,7 @@
req_access_txt = "23"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -56591,9 +56259,7 @@
name = "Primary Tool Storage"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -56604,18 +56270,14 @@
/obj/machinery/door/airlock/engineering/glass{
name = "Primary Tool Storage"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel,
/area/storage/primary)
"bSv" = (
-/obj/structure/sign/directions/science{
- dir = 2
- },
+/obj/structure/sign/directions/science,
/obj/structure/sign/directions/engineering{
dir = 8;
pixel_y = 8
@@ -56629,9 +56291,7 @@
"bSw" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -56844,7 +56504,6 @@
/area/crew_quarters/heads/captain)
"bSS" = (
/obj/structure/sign/directions/science{
- dir = 2;
pixel_y = -8
},
/obj/structure/sign/directions/command{
@@ -57037,9 +56696,9 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
+ areastring = "/area/security/warden";
dir = 4;
name = "Warden's Office APC";
- areastring = "/area/security/warden";
pixel_x = 26
},
/obj/machinery/camera{
@@ -57327,8 +56986,6 @@
/obj/item/twohanded/required/kirbyplants/random,
/obj/machinery/turretid{
control_area = "/area/ai_monitored/turret_protected/aisat_interior";
- enabled = 1;
- icon_state = "control_standby";
name = "Antechamber Turret Control";
pixel_x = -32;
req_access = null;
@@ -57370,6 +57027,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"bTD" = (
@@ -57386,6 +57044,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"bTF" = (
@@ -57501,7 +57160,6 @@
},
/obj/machinery/camera{
c_tag = "AI Satellite - Transit Tube";
- dir = 2;
name = "ai camera";
network = list("minisat");
start_active = 1
@@ -57838,9 +57496,9 @@
/area/security/checkpoint/engineering)
"bUf" = (
/obj/machinery/power/apc{
+ areastring = "/area/security/checkpoint/engineering";
dir = 1;
name = "Security Post - Engineering APC";
- areastring = "/area/security/checkpoint/engineering";
pixel_y = 24
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -58073,7 +57731,6 @@
},
/obj/machinery/camera{
c_tag = "Engineering Hallway - Starboard";
- dir = 2;
name = "hallway camera"
},
/obj/effect/turf_decal/tile/neutral{
@@ -58404,7 +58061,6 @@
},
/obj/machinery/camera{
c_tag = "Security Hallway - Port";
- dir = 2;
name = "hallway camera"
},
/obj/effect/turf_decal/tile/neutral{
@@ -59010,6 +58666,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"bVL" = (
@@ -59029,6 +58686,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"bVM" = (
@@ -60885,9 +60543,8 @@
/obj/structure/window/reinforced,
/obj/structure/cable/white,
/obj/machinery/power/apc{
- dir = 2;
- name = "AI Satellite Exterior APC";
areastring = "/area/aisat";
+ name = "AI Satellite Exterior APC";
pixel_y = -26
},
/obj/effect/turf_decal/tile/neutral{
@@ -61059,9 +60716,8 @@
"bYu" = (
/obj/structure/cable/white,
/obj/machinery/power/apc{
- dir = 2;
- name = "Chief Engineer's APC";
areastring = "/area/crew_quarters/heads/chief";
+ name = "Chief Engineer's APC";
pixel_y = -26
},
/obj/effect/turf_decal/tile/neutral{
@@ -61725,9 +61381,8 @@
dir = 4
},
/obj/machinery/power/apc{
- dir = 2;
- name = "Starboard Primary Hallway APC";
areastring = "/area/hallway/primary/starboard";
+ name = "Starboard Primary Hallway APC";
pixel_y = -26
},
/obj/structure/cable/white{
@@ -62056,9 +61711,8 @@
pixel_x = -26
},
/obj/machinery/power/apc{
- dir = 2;
- name = "MiniSat APC";
areastring = "/area/ai_monitored/turret_protected/aisat_interior";
+ name = "MiniSat APC";
pixel_y = -27
},
/obj/structure/cable/white,
@@ -62377,9 +62031,7 @@
req_access_txt = "10"
},
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -62403,9 +62055,7 @@
req_access_txt = "63"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -62455,9 +62105,7 @@
req_access_txt = "12"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -62508,11 +62156,8 @@
/obj/structure/sign/directions/evac{
pixel_y = -8
},
-/obj/structure/sign/directions/medical{
- dir = 2
- },
+/obj/structure/sign/directions/medical,
/obj/structure/sign/directions/security{
- dir = 2;
pixel_y = 8
},
/turf/closed/wall,
@@ -62736,9 +62381,7 @@
/obj/structure/sign/directions/evac{
pixel_y = -8
},
-/obj/structure/sign/directions/medical{
- dir = 2
- },
+/obj/structure/sign/directions/medical,
/obj/structure/sign/directions/security{
dir = 4;
pixel_y = 8
@@ -63042,9 +62685,8 @@
"cbK" = (
/obj/structure/cable/white,
/obj/machinery/power/apc{
- dir = 2;
- name = "Armoury APC";
areastring = "/area/ai_monitored/security/armory";
+ name = "Armoury APC";
pixel_y = -26
},
/obj/machinery/camera{
@@ -63236,7 +62878,6 @@
},
/obj/machinery/camera{
c_tag = "Engineering - Fore";
- dir = 2;
name = "engineering camera"
},
/obj/effect/turf_decal/stripes/line{
@@ -63359,9 +63000,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -63601,7 +63240,6 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 2;
external_pressure_bound = 140;
name = "server vent";
pressure_checks = 0
@@ -63651,7 +63289,6 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 2;
external_pressure_bound = 120;
name = "server vent"
},
@@ -63818,8 +63455,7 @@
dir = 4
},
/obj/machinery/camera{
- c_tag = "Courtroom - Fore";
- dir = 2
+ c_tag = "Courtroom - Fore"
},
/obj/structure/sign/poster/official/report_crimes{
pixel_y = 32
@@ -63978,7 +63614,6 @@
/obj/item/folder/red,
/obj/item/pen,
/obj/machinery/door/window/brigdoor/southright{
- dir = 2;
name = "Security Desk";
req_access_txt = "63"
},
@@ -64080,9 +63715,7 @@
id = "armouryaccess";
name = "Armoury Access"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -64762,9 +64395,9 @@
/area/crew_quarters/heads/hop)
"cer" = (
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/heads/hop";
dir = 4;
name = "HoP Office APC";
- areastring = "/area/crew_quarters/heads/hop";
pixel_x = 26
},
/obj/structure/cable/white{
@@ -64784,9 +64417,9 @@
/area/crew_quarters/heads/hop)
"cet" = (
/obj/machinery/power/apc{
+ areastring = "/area/tcommsat/server";
dir = 8;
name = "Telecomms Server Room APC";
- areastring = "/area/tcommsat/server";
pixel_x = -26
},
/obj/structure/cable/white,
@@ -65073,7 +64706,6 @@
/area/security/courtroom)
"ceP" = (
/obj/structure/chair{
- dir = 2;
name = "Prosecution"
},
/obj/effect/turf_decal/tile/red{
@@ -65089,7 +64721,6 @@
/area/security/courtroom)
"ceQ" = (
/obj/structure/chair{
- dir = 2;
name = "Prosecution"
},
/obj/effect/turf_decal/tile/red{
@@ -65438,17 +65069,16 @@
icon_state = "0-8"
},
/obj/machinery/power/apc/highcap/ten_k{
+ areastring = "/area/security/brig";
dir = 1;
name = "Brig APC";
- areastring = "/area/security/brig";
pixel_y = 28
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/camera{
- c_tag = "Security - Gear Room";
- dir = 2
+ c_tag = "Security - Gear Room"
},
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -65534,8 +65164,8 @@
},
/obj/effect/spawner/lootdrop/aimodule_harmless{
fan_out_items = 1;
- lootdoubles = 0;
- lootcount = 3
+ lootcount = 3;
+ lootdoubles = 0
},
/obj/structure/sign/nanotrasen{
pixel_x = -32
@@ -65614,8 +65244,8 @@
},
/obj/effect/spawner/lootdrop/aimodule_harmful{
fan_out_items = 1;
- lootdoubles = 0;
- lootcount = 2
+ lootcount = 2;
+ lootdoubles = 0
},
/obj/item/aiModule/supplied/oxygen{
pixel_x = -3;
@@ -66102,9 +65732,8 @@
dir = 8
},
/obj/machinery/power/apc/highcap/ten_k{
- dir = 2;
- name = "Captain's Quarters APC";
areastring = "/area/crew_quarters/heads/captain/private";
+ name = "Captain's Quarters APC";
pixel_y = -24
},
/obj/structure/cable/white,
@@ -67114,7 +66743,6 @@
/obj/structure/bookcase/manuals/research_and_development,
/obj/machinery/camera{
c_tag = "Library";
- dir = 2;
name = "library camera"
},
/turf/open/floor/wood,
@@ -67272,9 +66900,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -67411,9 +67037,9 @@
},
/obj/structure/cable/white,
/obj/machinery/power/apc{
+ areastring = "/area/lawoffice";
dir = 8;
name = "Law Office APC";
- areastring = "/area/lawoffice";
pixel_x = -26;
pixel_y = 3
},
@@ -68496,9 +68122,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -68788,9 +68412,9 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
+ areastring = "/area/engine/engineering";
dir = 4;
name = "Engine Room APC";
- areastring = "/area/engine/engineering";
pixel_x = 26
},
/obj/effect/turf_decal/bot,
@@ -68953,9 +68577,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -69181,9 +68803,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -69417,8 +69037,8 @@
/obj/structure/table/reinforced,
/obj/effect/spawner/lootdrop/aimodule_neutral{
fan_out_items = 1;
- lootdoubles = 0;
- lootcount = 3
+ lootcount = 3;
+ lootdoubles = 0
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -69815,9 +69435,9 @@
/obj/structure/table,
/obj/item/hand_tele,
/obj/machinery/power/apc/highcap/ten_k{
+ areastring = "/area/teleporter";
dir = 1;
name = "Teleporter APC";
- areastring = "/area/teleporter";
pixel_y = 28
},
/obj/structure/cable/white{
@@ -70353,9 +69973,8 @@
/obj/machinery/light,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/power/apc{
- dir = 2;
- name = "AI Upload Access APC";
areastring = "/area/ai_monitored/turret_protected/ai_upload";
+ name = "AI Upload Access APC";
pixel_y = -27
},
/obj/effect/turf_decal/tile/neutral{
@@ -70505,9 +70124,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -71157,9 +70774,9 @@
"coN" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/apc{
+ areastring = "/area/security/range";
dir = 8;
name = "Shooting Range APC";
- areastring = "/area/security/range";
pixel_x = -26
},
/obj/structure/cable/white{
@@ -71375,9 +70992,7 @@
/obj/item/stack/sheet/mineral/plasma{
amount = 20
},
-/obj/item/gps/engineering{
- gpstag = "ENG0"
- },
+/obj/item/gps/engineering,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/engine/engineering)
@@ -71444,9 +71059,9 @@
/area/maintenance/port)
"cpr" = (
/obj/machinery/power/apc{
+ areastring = "/area/library";
dir = 8;
name = "Library APC";
- areastring = "/area/library";
pixel_x = -26;
pixel_y = 3
},
@@ -71780,9 +71395,9 @@
/area/security/courtroom)
"cqb" = (
/obj/machinery/power/apc{
+ areastring = "/area/security/courtroom";
dir = 4;
name = "Courtroom APC";
- areastring = "/area/security/courtroom";
pixel_x = 26
},
/obj/structure/cable/white{
@@ -71803,9 +71418,7 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -71829,9 +71442,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -71859,9 +71470,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -72214,9 +71823,7 @@
req_access_txt = "61"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -72228,9 +71835,7 @@
name = "Teleport Access";
req_access_txt = "17"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -72248,9 +71853,7 @@
id = "teleportershutters";
name = "Teleporter Shutters"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -72262,9 +71865,7 @@
name = "Teleporter Shutters"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -72792,9 +72393,7 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"crX" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -72802,9 +72401,7 @@
/area/engine/engineering)
"crY" = (
/obj/effect/decal/cleanable/oil,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -73055,9 +72652,9 @@
dir = 4
},
/obj/machinery/power/apc{
+ areastring = "/area/hallway/secondary/command";
dir = 1;
name = "Command Hall APC";
- areastring = "/area/hallway/secondary/command";
pixel_y = 24
},
/obj/structure/cable/white{
@@ -73099,7 +72696,6 @@
},
/obj/machinery/camera{
c_tag = "Central Hallway - Center";
- dir = 2;
name = "hallway camera"
},
/obj/effect/turf_decal/tile/neutral{
@@ -73396,7 +72992,6 @@
},
/obj/machinery/camera{
c_tag = "Locker Room - Fore";
- dir = 2;
name = "dormitories camera"
},
/obj/effect/turf_decal/tile/neutral{
@@ -74443,9 +74038,8 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small,
/obj/machinery/power/apc{
- dir = 2;
- name = "Starboard Maintenance APC";
areastring = "/area/maintenance/starboard";
+ name = "Starboard Maintenance APC";
pixel_y = -26
},
/obj/structure/cable/white,
@@ -74777,9 +74371,7 @@
req_access_txt = "18"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -74792,9 +74384,7 @@
req_access_txt = "18"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -74907,9 +74497,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -75040,7 +74628,6 @@
},
/obj/machinery/camera{
c_tag = "Dormitory Hallway";
- dir = 2;
name = "hallway camera"
},
/obj/effect/turf_decal/tile/neutral{
@@ -75304,7 +74891,6 @@
/obj/item/pen,
/obj/machinery/camera{
c_tag = "Recreation - Fore";
- dir = 2;
name = "recreation camera"
},
/obj/effect/turf_decal/tile/neutral{
@@ -75564,9 +75150,9 @@
/area/ai_monitored/storage/eva)
"cwF" = (
/obj/machinery/power/apc{
+ areastring = "/area/ai_monitored/storage/eva";
dir = 1;
name = "E.V.A. Storage APC";
- areastring = "/area/ai_monitored/storage/eva";
pixel_y = 26
},
/obj/structure/cable/white{
@@ -75603,7 +75189,6 @@
/obj/structure/table/reinforced,
/obj/machinery/camera{
c_tag = "Bridge - E.V.A. Fore";
- dir = 2;
name = "command camera"
},
/obj/effect/turf_decal/tile/neutral{
@@ -75721,9 +75306,9 @@
icon_state = "0-2"
},
/obj/machinery/power/apc/highcap/ten_k{
+ areastring = "/area/gateway";
dir = 1;
name = "Gateway APC";
- areastring = "/area/gateway";
pixel_y = 28
},
/obj/effect/decal/cleanable/dirt,
@@ -77798,9 +77383,7 @@
/obj/machinery/door/airlock{
name = "Primary Restroom"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -77929,9 +77512,9 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/locker";
dir = 4;
name = "Lockerroom APC";
- areastring = "/area/crew_quarters/locker";
pixel_x = 26
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -77949,9 +77532,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -78458,7 +78039,6 @@
},
/obj/machinery/camera{
c_tag = "Bridge - Corporate Lounge";
- dir = 2;
name = "command camera"
},
/obj/effect/turf_decal/tile/neutral{
@@ -78697,8 +78277,7 @@
/area/crew_quarters/toilet/restrooms)
"cBJ" = (
/obj/machinery/shower{
- dir = 8;
- icon_state = "shower"
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -78748,9 +78327,9 @@
icon_state = "0-2"
},
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/toilet/restrooms";
dir = 1;
name = "Primary Restroom APC";
- areastring = "/area/crew_quarters/toilet/restrooms";
pixel_y = 24
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -78758,7 +78337,6 @@
},
/obj/machinery/camera{
c_tag = "Primary Restroom";
- dir = 2;
name = "restroom camera"
},
/obj/effect/turf_decal/tile/neutral{
@@ -79522,9 +79100,9 @@
icon_state = "2-4"
},
/obj/machinery/power/apc{
+ areastring = "/area/bridge/showroom/corporate";
dir = 8;
name = "Corporate Lounge APC";
- areastring = "/area/bridge/showroom/corporate";
pixel_x = -26
},
/obj/structure/cable/white{
@@ -80294,9 +79872,9 @@
},
/obj/item/tank/jetpack/carbondioxide/eva,
/obj/machinery/power/apc{
+ areastring = "/area/engine/storage";
dir = 4;
name = "Engineering Storage APC";
- areastring = "/area/engine/storage";
pixel_x = 26
},
/obj/structure/cable/white{
@@ -80858,8 +80436,7 @@
/area/crew_quarters/toilet/restrooms)
"cFd" = (
/obj/machinery/shower{
- dir = 8;
- icon_state = "shower"
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -81158,7 +80735,6 @@
"cFG" = (
/obj/machinery/camera{
c_tag = "Holodeck - Fore";
- dir = 2;
name = "holodeck camera"
},
/turf/open/floor/engine{
@@ -81898,7 +81474,6 @@
},
/obj/item/reagent_containers/food/drinks/beer{
desc = "Whatever it is, it reeks of foul, putrid froth.";
- icon_state = "beer";
list_reagents = list("bacchus_blessing" = 15);
name = "Delta-Down";
pixel_x = 5;
@@ -82300,9 +81875,7 @@
name = "E.V.A. Storage Shutters"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -82313,9 +81886,7 @@
id = "evashutters";
name = "E.V.A. Storage Shutters"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -82333,9 +81904,7 @@
name = "E.V.A. Storage Shutters"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -82375,9 +81944,7 @@
name = "Gateway Atrium";
req_access_txt = "62"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -82396,9 +81963,7 @@
req_access_txt = "19"
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -82410,9 +81975,7 @@
name = "Gateway Chamber Shutters"
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -82423,9 +81986,7 @@
id = "gatewayshutters";
name = "Gateway Chamber Shutters"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -82522,9 +82083,7 @@
name = "Lockerroom"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -82537,9 +82096,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -82664,9 +82221,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -82735,7 +82290,6 @@
},
/obj/machinery/camera{
c_tag = "Central Hallway - Science Aft";
- dir = 2;
name = "hallway camera"
},
/obj/effect/turf_decal/stripes/corner{
@@ -82890,7 +82444,6 @@
},
/obj/machinery/camera{
c_tag = "Central Hallway - Medbay Aft";
- dir = 2;
name = "hallway camera"
},
/obj/effect/turf_decal/tile/neutral{
@@ -82965,9 +82518,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -83169,7 +82720,6 @@
},
/obj/machinery/camera{
c_tag = "Dormitories - Starboard";
- dir = 2;
name = "dormitories camera"
},
/obj/effect/turf_decal/tile/neutral{
@@ -83399,7 +82949,6 @@
},
/obj/machinery/camera{
c_tag = "Holodeck Control";
- dir = 2;
name = "holodeck camera"
},
/obj/effect/turf_decal/tile/neutral{
@@ -85264,9 +84813,8 @@
"cMy" = (
/obj/structure/cable/white,
/obj/machinery/power/apc{
- dir = 2;
- name = "Dormitories APC";
areastring = "/area/crew_quarters/dorms";
+ name = "Dormitories APC";
pixel_y = -26
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -85487,9 +85035,7 @@
req_access_txt = "24"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -85512,9 +85058,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -85675,7 +85219,6 @@
},
/obj/machinery/camera{
c_tag = "Xenobiology - Killroom Chamber";
- dir = 2;
name = "xenobiology camera";
network = list("ss13","xeno","rd")
},
@@ -85748,9 +85291,7 @@
"cNr" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -85762,9 +85303,7 @@
/area/science/research)
"cNt" = (
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -85790,9 +85329,7 @@
name = "Aft Primary Hallway"
},
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -85803,9 +85340,7 @@
/obj/machinery/door/airlock/public/glass{
name = "Aft Primary Hallway"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -85818,9 +85353,7 @@
name = "Aft Primary Hallway"
},
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -85845,9 +85378,7 @@
/area/medical/medbay/central)
"cNA" = (
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -85860,9 +85391,7 @@
"cNC" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -86474,7 +86003,6 @@
/area/science/xenobiology)
"cOO" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 2;
external_pressure_bound = 140;
name = "killroom vent";
pressure_checks = 0
@@ -86486,7 +86014,6 @@
/area/science/xenobiology)
"cOQ" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 2;
external_pressure_bound = 120;
name = "server vent"
},
@@ -86508,9 +86035,7 @@
req_access_txt = "47"
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -86811,16 +86336,16 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
+ areastring = "/area/medical/storage";
dir = 8;
name = "Medbay Storage APC";
- areastring = "/area/medical/storage";
pixel_x = -26
},
/obj/machinery/camera{
c_tag = "Medbay - Storage";
- network = list("ss13","medbay");
dir = 4;
- name = "medbay camera"
+ name = "medbay camera";
+ network = list("ss13","medbay")
},
/obj/item/twohanded/required/kirbyplants/random,
/obj/effect/turf_decal/tile/neutral,
@@ -87282,9 +86807,9 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/department/electrical";
dir = 4;
name = "Auxiliary Power APC";
- areastring = "/area/maintenance/department/electrical";
pixel_x = 26
},
/turf/open/floor/plating,
@@ -87313,9 +86838,7 @@
req_access_txt = "47"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -88182,7 +87705,6 @@
},
/obj/machinery/camera{
c_tag = "Xenobiology - Port";
- dir = 2;
name = "xenobiology camera";
network = list("ss13","xeno","rd")
},
@@ -88387,9 +87909,7 @@
name = "Xenobiology Kill Room";
req_access_txt = "47"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -88957,9 +88477,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -89310,7 +88828,6 @@
icon_state = "1-2"
},
/obj/machinery/door/window/brigdoor{
- dir = 2;
name = "Creature Pen";
req_access_txt = "47"
},
@@ -91128,9 +90645,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -91162,9 +90677,9 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/fitness/recreation";
dir = 8;
name = "Recreation Area APC";
- areastring = "/area/crew_quarters/fitness/recreation";
pixel_x = -26
},
/obj/effect/turf_decal/tile/neutral{
@@ -91466,9 +90981,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -91484,9 +90997,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -91496,9 +91007,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -91617,9 +91126,9 @@
pixel_y = -32
},
/obj/machinery/power/apc{
+ areastring = "/area/security/checkpoint/science/research";
dir = 8;
name = "Security Post - Science APC";
- areastring = "/area/security/checkpoint/science/research";
pixel_x = -26;
pixel_y = 3
},
@@ -91865,9 +91374,9 @@
/obj/machinery/light,
/obj/machinery/camera{
c_tag = "Medbay - Waiting Room";
- network = list("ss13","medbay");
dir = 1;
- name = "medbay camera"
+ name = "medbay camera";
+ network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
@@ -91991,9 +91500,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/structure/sign/poster/official/cleanliness{
pixel_x = -32
},
@@ -92008,9 +91515,7 @@
name = "Medbay Storage";
req_access_txt = "5"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -92040,9 +91545,8 @@
"cYc" = (
/obj/machinery/camera{
c_tag = "Medbay - Break Room";
- network = list("ss13","medbay");
- dir = 2;
- name = "medbay camera"
+ name = "medbay camera";
+ network = list("ss13","medbay")
},
/obj/machinery/airalarm{
pixel_y = 23
@@ -92693,9 +92197,7 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -92714,9 +92216,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -92871,9 +92371,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/camera{
c_tag = "Medbay - Fore Port";
- network = list("ss13","medbay");
dir = 8;
- name = "medbay camera"
+ name = "medbay camera";
+ network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -92891,9 +92391,9 @@
pixel_y = -32
},
/obj/machinery/power/apc{
+ areastring = "/area/security/checkpoint/medical";
dir = 8;
name = "Security Post - Medical APC";
- areastring = "/area/security/checkpoint/medical";
pixel_x = -26
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -92979,9 +92479,8 @@
/obj/item/stack/medical/ointment,
/obj/machinery/camera{
c_tag = "Medbay - Sleepers";
- network = list("ss13","medbay");
- dir = 2;
- name = "medbay camera"
+ name = "medbay camera";
+ network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -93430,9 +92929,7 @@
name = "Engineering Auxiliary Power";
req_access_txt = "10"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -93596,7 +93093,6 @@
/area/science/xenobiology)
"daE" = (
/obj/structure/chair/office/light{
- icon_state = "officechair_white";
dir = 4
},
/obj/effect/turf_decal/stripes/line{
@@ -93891,9 +93387,9 @@
icon_state = "0-2"
},
/obj/machinery/power/apc{
+ areastring = "/area/medical/chemistry";
dir = 1;
name = "Chemistry Lab APC";
- areastring = "/area/medical/chemistry";
pixel_y = 24
},
/obj/effect/turf_decal/tile/yellow{
@@ -94376,9 +93872,9 @@
dir = 4
},
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/port";
dir = 1;
name = "Port Maintenance APC";
- areastring = "/area/maintenance/port";
pixel_y = 28
},
/obj/structure/cable/white{
@@ -94533,7 +94029,6 @@
icon_state = "1-4"
},
/obj/machinery/door/window/brigdoor{
- dir = 2;
name = "Creature Pen";
req_access_txt = "47"
},
@@ -94584,7 +94079,6 @@
icon_state = "1-4"
},
/obj/machinery/door/window/brigdoor{
- dir = 2;
name = "Creature Pen";
req_access_txt = "47"
},
@@ -94639,7 +94133,6 @@
name = "Creature Cell #3"
},
/obj/machinery/door/window/brigdoor{
- dir = 2;
name = "Creature Pen";
req_access_txt = "47"
},
@@ -94733,9 +94226,9 @@
dir = 4
},
/obj/machinery/power/apc{
+ areastring = "/area/science/xenobiology";
dir = 4;
name = "Xenobiology Lab APC";
- areastring = "/area/science/xenobiology";
pixel_x = 26
},
/obj/effect/turf_decal/stripes/line,
@@ -96244,9 +95737,7 @@
name = "Xenobiology Lab";
req_access_txt = "47"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -96272,9 +95763,7 @@
"dfg" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -96283,9 +95772,7 @@
"dfh" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -96336,9 +95823,7 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -96355,9 +95840,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -96378,9 +95861,9 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
+ areastring = "/area/science/lab";
dir = 8;
name = "Research and Development Lab APC";
- areastring = "/area/science/lab";
pixel_x = -26;
pixel_y = 3
},
@@ -96515,9 +95998,9 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Chemistry";
- network = list("ss13","medbay");
dir = 8;
- name = "medbay camera"
+ name = "medbay camera";
+ network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/plasteel/white,
@@ -96572,9 +96055,7 @@
name = "Medical Cell";
req_access_txt = "63"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -96583,9 +96064,7 @@
"dfF" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -96594,9 +96073,7 @@
"dfG" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -96611,9 +96088,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -96631,9 +96106,7 @@
req_access_txt = "5"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -96819,9 +96292,9 @@
/obj/item/clothing/gloves/color/fyellow,
/obj/item/storage/toolbox/electrical,
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/abandoned_gambling_den";
dir = 1;
name = "Abandoned Gambling Den APC";
- areastring = "/area/crew_quarters/abandoned_gambling_den";
pixel_y = 24
},
/turf/open/floor/plating,
@@ -97061,7 +96534,6 @@
},
/obj/machinery/camera{
c_tag = "Science - Port";
- dir = 2;
name = "science camera";
network = list("ss13","rd")
},
@@ -97146,7 +96618,6 @@
},
/obj/machinery/camera{
c_tag = "Science - Center";
- dir = 2;
name = "science camera";
network = list("ss13","rd")
},
@@ -97557,9 +97028,8 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Center";
- network = list("ss13","medbay");
- dir = 2;
- name = "medbay camera"
+ name = "medbay camera";
+ network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -98174,7 +97644,6 @@
/area/science/lab)
"dil" = (
/obj/structure/chair/office/light{
- icon_state = "officechair_white";
dir = 4
},
/obj/effect/turf_decal/tile/purple,
@@ -99007,14 +98476,13 @@
icon_state = "0-2"
},
/obj/machinery/power/apc{
+ areastring = "/area/science/explab";
dir = 1;
name = "Experimentation Lab APC";
- areastring = "/area/science/explab";
pixel_y = 24
},
/obj/machinery/camera{
c_tag = "Science - Experimentation Lab";
- dir = 2;
name = "science camera";
network = list("ss13","rd")
},
@@ -99453,9 +98921,9 @@
/obj/machinery/light,
/obj/machinery/camera{
c_tag = "Medbay - Port";
- network = list("ss13","medbay");
dir = 1;
- name = "medbay camera"
+ name = "medbay camera";
+ network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -99583,9 +99051,9 @@
/obj/machinery/light,
/obj/machinery/camera{
c_tag = "Medbay - Starboard";
- network = list("ss13","medbay");
dir = 1;
- name = "medbay camera"
+ name = "medbay camera";
+ network = list("ss13","medbay")
},
/obj/structure/sign/poster/official/work_for_a_future{
pixel_y = -32
@@ -99649,9 +99117,8 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/white,
/obj/machinery/power/apc{
- dir = 2;
- name = "Abandoned Medical Lab APC";
areastring = "/area/medical/abandoned";
+ name = "Abandoned Medical Lab APC";
pixel_x = 1;
pixel_y = -24
},
@@ -100063,9 +99530,7 @@
name = "Research Division Access";
req_access_txt = "47"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -100178,9 +99643,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -100190,9 +99653,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -100200,9 +99661,7 @@
/area/hallway/primary/aft)
"dlR" = (
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -100216,9 +99675,7 @@
pixel_x = 24
},
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -100234,9 +99691,7 @@
req_access_txt = "5; 33"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -100259,9 +99714,7 @@
},
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -100272,9 +99725,7 @@
icon_state = "1-2"
},
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -100293,9 +99744,7 @@
name = "Surgery Observation"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -100310,9 +99759,7 @@
/obj/machinery/door/airlock/medical{
name = "Surgery Observation"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -100760,9 +100207,9 @@
icon_state = "0-8"
},
/obj/machinery/power/apc/highcap/ten_k{
+ areastring = "/area/science/robotics/mechbay";
dir = 1;
name = "Mech Bay APC";
- areastring = "/area/science/robotics/mechbay";
pixel_y = 28
},
/obj/effect/turf_decal/stripes/line{
@@ -100803,9 +100250,9 @@
"dni" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/department/medical";
dir = 1;
name = "Medical Maintenance APC";
- areastring = "/area/maintenance/department/medical";
pixel_y = 24
},
/obj/structure/cable/white{
@@ -100907,9 +100354,9 @@
icon_state = "0-2"
},
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/medical/genetics/cloning";
dir = 1;
name = "Cloning Lab APC";
- areastring = "/area/medical/genetics/cloning";
pixel_y = 24
},
/obj/item/folder/white,
@@ -101177,9 +100624,7 @@
"dnP" = (
/obj/machinery/pipedispenser,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -101187,9 +100632,7 @@
/area/hallway/secondary/construction)
"dnQ" = (
/obj/machinery/pipedispenser/disposal,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -101197,9 +100640,7 @@
/area/hallway/secondary/construction)
"dnR" = (
/obj/machinery/pipedispenser/disposal/transit_tube,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -103056,9 +102497,7 @@
/obj/machinery/door/airlock/medical{
name = "Surgery Observation"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -103201,7 +102640,6 @@
/obj/structure/cable/white,
/obj/machinery/power/apc{
areastring = "/area/science/circuit";
- dir = 2;
name = "Circuitry Lab APC";
pixel_x = 1;
pixel_y = -24
@@ -103335,9 +102773,7 @@
id = "rdtoxins";
name = "Toxins Lab Shutters"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -103352,9 +102788,9 @@
/area/science/mixing)
"drX" = (
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/heads/hor";
dir = 8;
name = "Research Director's Office APC";
- areastring = "/area/crew_quarters/heads/hor";
pixel_x = -26
},
/obj/structure/cable/white,
@@ -103640,9 +103076,9 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Cloning Lab";
- network = list("ss13","medbay");
dir = 1;
- name = "medbay camera"
+ name = "medbay camera";
+ network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/purple,
/turf/open/floor/plasteel/white,
@@ -103720,9 +103156,9 @@
/obj/structure/table/glass,
/obj/machinery/camera{
c_tag = "Medbay - Cryogenics";
- network = list("ss13","medbay");
dir = 1;
- name = "medbay camera"
+ name = "medbay camera";
+ network = list("ss13","medbay")
},
/obj/item/book/manual/wiki/medicine,
/obj/item/clothing/neck/stethoscope,
@@ -104175,9 +103611,7 @@
name = "Genetics Desk Maintenance";
req_access_txt = "9"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -104213,9 +103647,7 @@
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -104234,9 +103666,9 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
+ areastring = "/area/medical/medbay/central";
dir = 8;
name = "Medbay APC";
- areastring = "/area/medical/medbay/central";
pixel_x = -26
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -104328,9 +103760,9 @@
/obj/machinery/iv_drip,
/obj/machinery/camera{
c_tag = "Medbay - Recovery Room";
- network = list("ss13","medbay");
dir = 8;
- name = "medbay camera"
+ name = "medbay camera";
+ network = list("ss13","medbay")
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
@@ -105982,9 +105414,9 @@
/obj/item/clipboard,
/obj/item/toy/figure/geneticist,
/obj/machinery/power/apc{
+ areastring = "/area/medical/genetics";
dir = 4;
name = "Genetics Lab APC";
- areastring = "/area/medical/genetics";
pixel_x = 26
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -106011,9 +105443,9 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Genetics Lab";
- network = list("ss13","medbay");
dir = 4;
- name = "medbay camera"
+ name = "medbay camera";
+ network = list("ss13","medbay")
},
/obj/machinery/light_switch{
pixel_x = -26
@@ -106679,9 +106111,7 @@
req_access_txt = "30"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -106701,9 +106131,7 @@
icon_state = "1-2"
},
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -106713,9 +106141,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/airalarm{
dir = 8;
pixel_x = 24
@@ -106749,9 +106175,7 @@
name = "Robotics Lab";
req_access_txt = "29"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -106764,9 +106188,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -106785,9 +106207,9 @@
/obj/item/storage/box/disks,
/obj/machinery/camera{
c_tag = "Medbay - Genetics Desk";
- network = list("ss13","medbay");
dir = 4;
- name = "medbay camera"
+ name = "medbay camera";
+ network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/purple{
dir = 1
@@ -107218,16 +106640,15 @@
"dyI" = (
/obj/structure/cable/white,
/obj/machinery/power/apc{
- dir = 2;
- name = "Surgery APC";
areastring = "/area/medical/surgery";
+ name = "Surgery APC";
pixel_y = -26
},
/obj/machinery/camera{
c_tag = "Medbay - Surgery";
- network = list("ss13","medbay");
dir = 1;
- name = "medbay camera"
+ name = "medbay camera";
+ network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -107322,9 +106743,8 @@
/area/hallway/secondary/construction)
"dyP" = (
/obj/machinery/power/apc{
- dir = 2;
- name = "Auxiliary Construction Zone APC";
areastring = "/area/hallway/secondary/construction";
+ name = "Auxiliary Construction Zone APC";
pixel_y = -26
},
/obj/structure/cable/white{
@@ -107969,9 +107389,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/camera{
c_tag = "Medbay - Aft Port";
- network = list("ss13","medbay");
dir = 8;
- name = "medbay camera"
+ name = "medbay camera";
+ network = list("ss13","medbay")
},
/obj/item/clipboard,
/obj/item/healthanalyzer,
@@ -108042,16 +107462,16 @@
dir = 4
},
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/heads/cmo";
dir = 4;
name = "Chief Medical Officer's Office APC";
- areastring = "/area/crew_quarters/heads/cmo";
pixel_x = 26
},
/obj/machinery/camera{
c_tag = "Medbay - Chief Medical Officer's Office";
- network = list("ss13","medbay");
dir = 8;
- name = "medbay camera"
+ name = "medbay camera";
+ network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -108084,9 +107504,7 @@
req_access_txt = "12"
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -108101,9 +107519,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -108221,9 +107637,9 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
+ areastring = "/area/science/mixing";
dir = 8;
name = "Toxins Lab APC";
- areastring = "/area/science/mixing";
pixel_x = -26;
pixel_y = 3
},
@@ -108396,7 +107812,6 @@
/area/science/robotics/lab)
"dAO" = (
/obj/structure/chair/office/light{
- icon_state = "officechair_white";
dir = 4
},
/obj/effect/landmark/start/roboticist,
@@ -109414,9 +108829,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
/obj/machinery/power/apc{
+ areastring = "/area/hallway/primary/aft";
dir = 4;
name = "Aft Primary Hallway APC";
- areastring = "/area/hallway/primary/aft";
pixel_x = 26
},
/obj/structure/cable/white{
@@ -109438,9 +108853,7 @@
req_access_txt = "9"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -109470,9 +108883,7 @@
req_access_txt = "5"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -109559,9 +108970,9 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Aft Starboard";
- network = list("ss13","medbay");
dir = 4;
- name = "medbay camera"
+ name = "medbay camera";
+ network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -109764,9 +109175,8 @@
"dDc" = (
/obj/structure/cable/white,
/obj/machinery/power/apc/highcap/ten_k{
- dir = 2;
- name = "Starboard Quarter Solar APC";
areastring = "/area/maintenance/solars/starboard/aft";
+ name = "Starboard Quarter Solar APC";
pixel_y = -26
},
/obj/effect/turf_decal/stripes/line{
@@ -109785,8 +109195,7 @@
/obj/machinery/power/solar_control{
dir = 8;
id = "aftstarboard";
- name = "Starboard Quarter Solar Control";
- track = 0
+ name = "Starboard Quarter Solar Control"
},
/obj/structure/cable,
/obj/machinery/airalarm{
@@ -109958,9 +109367,7 @@
id = "rdtoxins";
name = "Toxins Lab Shutters"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -110533,9 +109940,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/barricade/wooden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -111094,9 +110499,7 @@
/turf/open/floor/plating,
/area/crew_quarters/theatre/abandoned)
"dFl" = (
-/obj/machinery/vending/autodrobe{
- req_access_txt = "0"
- },
+/obj/machinery/vending/autodrobe,
/obj/machinery/light/small{
dir = 1
},
@@ -111107,9 +110510,9 @@
icon_state = "0-2"
},
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/theatre/abandoned";
dir = 1;
name = "Abandoned Theatre APC";
- areastring = "/area/crew_quarters/theatre/abandoned";
pixel_y = 24
},
/turf/open/floor/plating,
@@ -111277,7 +110680,6 @@
/obj/item/clothing/mask/gas,
/obj/machinery/camera{
c_tag = "Science - Toxins Launch Site";
- dir = 2;
name = "science camera";
network = list("ss13","rd")
},
@@ -111327,9 +110729,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -111458,9 +110858,9 @@
dir = 4
},
/obj/machinery/power/apc{
+ areastring = "/area/science/server";
dir = 8;
name = "Research Division Server Room APC";
- areastring = "/area/science/server";
pixel_x = -26
},
/obj/machinery/light_switch{
@@ -111593,9 +110993,9 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
+ areastring = "/area/science/robotics/lab";
dir = 8;
name = "Robotics Lab APC";
- areastring = "/area/science/robotics/lab";
pixel_x = -26
},
/obj/structure/disposalpipe/trunk{
@@ -112905,9 +112305,9 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
+ areastring = "/area/security/detectives_office/private_investigators_office";
dir = 8;
name = "Private Investigator's Office APC";
- areastring = "/area/security/detectives_office/private_investigators_office";
pixel_x = -26;
pixel_y = 3
},
@@ -112952,7 +112352,6 @@
/area/science/test_area)
"dIj" = (
/obj/machinery/button/massdriver{
- dir = 2;
id = "toxinsdriver";
pixel_x = -24
},
@@ -112975,9 +112374,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/mixing)
"dIm" = (
@@ -112985,18 +112382,14 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/mixing)
"dIn" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/mixing)
"dIo" = (
@@ -113007,9 +112400,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/mixing)
"dIp" = (
@@ -113250,7 +112641,6 @@
/area/science/storage)
"dIF" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 2;
external_pressure_bound = 140;
name = "server vent";
pressure_checks = 0
@@ -113273,7 +112663,6 @@
/area/science/server)
"dIH" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 2;
external_pressure_bound = 120;
name = "server vent"
},
@@ -113329,9 +112718,9 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
+ areastring = "/area/science/research";
dir = 4;
name = "Research Division APC";
- areastring = "/area/science/research";
pixel_x = 26
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -113449,9 +112838,8 @@
"dIV" = (
/obj/structure/cable/white,
/obj/machinery/power/apc{
- dir = 2;
- name = "Morgue APC";
areastring = "/area/medical/morgue";
+ name = "Morgue APC";
pixel_y = -26
},
/turf/open/floor/plating,
@@ -113478,9 +112866,9 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera{
c_tag = "Medbay - Morgue";
- network = list("ss13","medbay");
dir = 1;
- name = "medbay camera"
+ name = "medbay camera";
+ network = list("ss13","medbay")
},
/obj/structure/sign/poster/official/bless_this_spess{
pixel_y = -32
@@ -113569,9 +112957,8 @@
"dJg" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/apc{
- dir = 2;
- name = "Morgue Maintenance APC";
areastring = "/area/maintenance/department/medical/morgue";
+ name = "Morgue Maintenance APC";
pixel_y = -26
},
/obj/structure/cable/white{
@@ -113619,9 +113006,9 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Chief Medical Officer's Quarters";
- network = list("ss13","medbay");
dir = 1;
- name = "medbay camera"
+ name = "medbay camera";
+ network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -114100,9 +113487,9 @@
/obj/machinery/portable_atmospherics/scrubber/huge,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/apc{
+ areastring = "/area/science/storage";
dir = 4;
name = "Toxins Storage APC";
- areastring = "/area/science/storage";
pixel_x = 26
},
/obj/structure/cable/white,
@@ -114172,9 +113559,7 @@
req_access_txt = "29"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -114216,9 +113601,7 @@
req_access_txt = "12"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -114237,9 +113620,7 @@
name = "Virology Access";
req_access_txt = "39"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -114390,9 +113771,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -114413,9 +113792,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -114447,9 +113824,7 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -115024,9 +114399,7 @@
/area/science/test_area)
"dLG" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating/airless,
/area/science/test_area)
"dLH" = (
@@ -115064,9 +114437,7 @@
/turf/open/floor/plasteel,
/area/science/mixing)
"dLM" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -115529,9 +114900,8 @@
},
/obj/structure/cable/white,
/obj/machinery/power/apc{
- dir = 2;
- name = "Aft Maintenance APC";
areastring = "/area/maintenance/aft";
+ name = "Aft Maintenance APC";
pixel_x = 1;
pixel_y = -24
},
@@ -116223,9 +115593,7 @@
req_access_txt = "19"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -116245,9 +115613,7 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -116258,9 +115624,7 @@
/obj/machinery/door/airlock/public/glass{
name = "Departures Lounge"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -116273,9 +115637,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -116820,9 +116182,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/structure/barricade/wooden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -116839,9 +116199,7 @@
icon_state = "1-2"
},
/obj/structure/barricade/wooden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -116871,9 +116229,7 @@
/obj/machinery/door/airlock{
name = "Bathroom"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -117100,9 +116456,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/virology{
autoclose = 0;
@@ -117301,9 +116655,9 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/port/aft";
dir = 1;
name = "Port Quarter Maintenance APC";
- areastring = "/area/maintenance/port/aft";
pixel_y = 24
},
/obj/structure/cable/white{
@@ -117601,9 +116955,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera{
c_tag = "Virology - Containment Lock";
- network = list("ss13","medbay");
dir = 8;
- name = "virology camera"
+ name = "virology camera";
+ network = list("ss13","medbay")
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
@@ -117865,9 +117219,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -118102,9 +117454,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -118120,9 +117470,7 @@
/obj/structure/cable/white{
icon_state = "1-4"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -118259,9 +117607,9 @@
},
/obj/machinery/camera{
c_tag = "Virology - Break Room";
- network = list("ss13","medbay");
dir = 8;
- name = "virology camera"
+ name = "virology camera";
+ network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/green{
dir = 4
@@ -119047,9 +118395,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -119145,9 +118491,7 @@
name = "Maintenance Hatch";
req_access_txt = "12"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
@@ -119194,9 +118538,7 @@
name = "Departures Lounge"
},
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -119207,9 +118549,7 @@
/obj/machinery/door/airlock/public/glass{
name = "Departures Lounge"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -119362,9 +118702,9 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
+ areastring = "/area/library/abandoned";
dir = 8;
name = "Abandoned Library APC";
- areastring = "/area/library/abandoned";
pixel_x = -26;
pixel_y = 3
},
@@ -119531,14 +118871,13 @@
/area/hallway/secondary/exit/departure_lounge)
"dTG" = (
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/hallway/secondary/exit/departure_lounge";
dir = 1;
name = "Departure Lounge APC";
- areastring = "/area/hallway/secondary/exit/departure_lounge";
pixel_y = 28
},
/obj/machinery/camera{
c_tag = "Departures - Fore";
- dir = 2;
name = "departures camera"
},
/obj/structure/cable/white{
@@ -120112,9 +119451,9 @@
dir = 4
},
/obj/machinery/power/apc{
+ areastring = "/area/medical/virology";
dir = 4;
name = "Virology Satellite APC";
- areastring = "/area/medical/virology";
pixel_x = 26
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -120383,8 +119722,8 @@
},
/obj/machinery/camera{
c_tag = "Virology - Lab";
- network = list("ss13","medbay");
- name = "virology camera"
+ name = "virology camera";
+ network = list("ss13","medbay")
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -120407,9 +119746,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/camera{
c_tag = "Virology - Hallway";
- network = list("ss13","medbay");
dir = 8;
- name = "virology camera"
+ name = "virology camera";
+ network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
@@ -121357,9 +120696,7 @@
/obj/structure/cable/white{
icon_state = "2-8"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -122381,7 +121718,6 @@
/obj/effect/landmark/start/assistant,
/obj/machinery/camera{
c_tag = "Departures - Center";
- dir = 2;
name = "departures camera"
},
/obj/effect/turf_decal/bot,
@@ -122520,9 +121856,9 @@
},
/obj/machinery/camera{
c_tag = "Virology - Cells";
- network = list("ss13","medbay");
dir = 8;
- name = "virology camera"
+ name = "virology camera";
+ network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/green,
/turf/open/floor/plasteel/white,
@@ -122646,9 +121982,9 @@
/area/chapel/office)
"dZQ" = (
/obj/machinery/power/apc{
+ areastring = "/area/chapel/main";
dir = 8;
name = "Chapel APC";
- areastring = "/area/chapel/main";
pixel_x = -26;
pixel_y = 3
},
@@ -122779,7 +122115,6 @@
/area/hallway/secondary/exit/departure_lounge)
"eab" = (
/obj/docking_port/stationary{
- dheight = 0;
dir = 4;
dwidth = 11;
height = 18;
@@ -122843,9 +122178,7 @@
req_access_txt = "39"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -123206,9 +122539,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/barricade/wooden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -123226,9 +122557,7 @@
name = "E.V.A. Storage Shutters"
},
/obj/structure/barricade/wooden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -123245,9 +122574,7 @@
icon_state = "1-2"
},
/obj/structure/barricade/wooden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -123260,9 +122587,7 @@
req_access_txt = "18"
},
/obj/structure/barricade/wooden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -123771,8 +123096,7 @@
/obj/machinery/power/solar_control{
dir = 4;
id = "aftport";
- name = "Port Quarter Solar Control";
- track = 0
+ name = "Port Quarter Solar Control"
},
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
@@ -123794,9 +123118,8 @@
"ecm" = (
/obj/structure/cable/white,
/obj/machinery/power/apc/highcap/ten_k{
- dir = 2;
- name = "Port Quarter Solar APC";
areastring = "/area/maintenance/solars/port/aft";
+ name = "Port Quarter Solar APC";
pixel_y = -26
},
/obj/effect/turf_decal/stripes/line{
@@ -124826,9 +124149,7 @@
name = "Maintenance Hatch";
req_access_txt = "12"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -124851,9 +124172,7 @@
req_access_txt = "63"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -124874,9 +124193,7 @@
/obj/structure/cable/white{
icon_state = "2-8"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -124917,9 +124234,7 @@
name = "Holding Area";
req_access_txt = "2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -125049,7 +124364,6 @@
pixel_x = -26
},
/obj/machinery/airalarm{
- dir = 2;
pixel_y = 22
},
/obj/effect/turf_decal/tile/neutral{
@@ -125075,9 +124389,9 @@
dir = 1
},
/obj/machinery/power/apc{
+ areastring = "/area/chapel/office";
dir = 1;
name = "Chapel Quarters APC";
- areastring = "/area/chapel/office";
pixel_y = 24
},
/obj/structure/cable/white{
@@ -125095,7 +124409,6 @@
/obj/item/twohanded/required/kirbyplants/random,
/obj/machinery/camera{
c_tag = "Chapel Quarters";
- dir = 2;
name = "chapel camera"
},
/turf/open/floor/plasteel/grimy,
@@ -125212,8 +124525,7 @@
pixel_y = 26
},
/obj/machinery/camera{
- c_tag = "Security - Departures Port";
- dir = 2
+ c_tag = "Security - Departures Port"
},
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -125376,9 +124688,7 @@
/turf/open/floor/plasteel,
/area/security/checkpoint/escape)
"eeT" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -125568,9 +124878,7 @@
name = "External Airlock";
req_access_txt = "13"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -126186,9 +125494,7 @@
name = "External Airlock";
req_access_txt = "13"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -126282,9 +125588,7 @@
/turf/open/floor/plasteel/dark/corner,
/area/engine/engineering)
"ehy" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -126353,9 +125657,7 @@
/turf/open/floor/plasteel/white,
/area/medical/storage)
"ehM" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -126771,9 +126073,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -126878,7 +126178,6 @@
dir = 8
},
/obj/machinery/computer/arcade{
- icon_state = "arcade";
dir = 1
},
/turf/open/floor/plasteel/dark,
@@ -126969,7 +126268,6 @@
/obj/structure/table/reinforced,
/obj/machinery/camera{
c_tag = "Science - Experimentation Lab";
- dir = 2;
name = "science camera";
network = list("ss13","rd")
},
@@ -127102,7 +126400,6 @@
dir = 8
},
/obj/machinery/computer/arcade{
- icon_state = "arcade";
dir = 4
},
/turf/open/floor/plasteel/dark,
@@ -127359,6 +126656,23 @@
},
/turf/open/floor/plasteel,
/area/maintenance/port/aft)
+"mgh" = (
+/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/effect/landmark/start/cyborg,
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/turret_protected/aisat_interior)
"mkm" = (
/obj/machinery/atmospherics/components/binary/valve,
/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{
@@ -127419,9 +126733,7 @@
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"mPj" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/chapel/office)
"mPH" = (
@@ -127498,7 +126810,6 @@
dir = 8
},
/obj/machinery/computer/arcade{
- icon_state = "arcade";
dir = 1
},
/turf/open/floor/plasteel/dark,
@@ -127894,7 +127205,6 @@
dir = 4
},
/obj/machinery/airalarm{
- dir = 2;
pixel_y = 22
},
/turf/open/floor/plasteel/dark,
@@ -128243,6 +127553,21 @@
},
/turf/open/floor/plating,
/area/science/research/abandoned)
+"ylW" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/landmark/start/cyborg,
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/turret_protected/aisat_interior)
(1,1,1) = {"
aaa
@@ -138137,7 +137462,7 @@ bPC
bRK
bTC
bVK
-bXW
+ylW
cal
bPC
aaa
@@ -138394,7 +137719,7 @@ bPC
bRL
bTC
bVx
-bXX
+mgh
cam
bPC
bRO
@@ -138651,7 +137976,7 @@ bPC
bRM
bTD
bVL
-bXX
+mgh
can
bPC
bkE
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 3516d61080..d31dbe1405 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -334,7 +334,6 @@
/area/solar/port/fore)
"abg" = (
/obj/machinery/door/poddoor{
- density = 1;
id = "SecJusticeChamber";
name = "Justice Vent"
},
@@ -448,7 +447,6 @@
/area/security/prison)
"abu" = (
/obj/docking_port/stationary{
- dir = 1;
dwidth = 1;
height = 4;
roundstart_template = /datum/map_template/shuttle/escape_pod/default;
@@ -662,7 +660,6 @@
dir = 8
},
/obj/machinery/sparker{
- dir = 2;
id = "executionburn";
pixel_x = -25
},
@@ -798,14 +795,11 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/dark,
/area/security/execution/education)
"aco" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 2;
name = "justice injector"
},
/obj/effect/turf_decal/stripes/line{
@@ -952,7 +946,6 @@
/area/security/execution/education)
"acC" = (
/obj/machinery/door/window/brigdoor{
- dir = 2;
name = "Justice Chamber";
req_access_txt = "3"
},
@@ -1025,7 +1018,6 @@
},
/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
- dir = 2;
name = "Prison Intercom (General)";
pixel_y = -28;
prison_radio = 1
@@ -1053,9 +1045,7 @@
/turf/open/floor/plasteel,
/area/security/prison)
"acK" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plasteel,
/area/security/prison)
"acL" = (
@@ -1129,7 +1119,6 @@
},
/obj/machinery/camera{
c_tag = "Prison Sanitarium";
- dir = 2;
network = list("ss13","prison")
},
/obj/effect/turf_decal/tile/red{
@@ -1220,7 +1209,6 @@
req_access_txt = "1"
},
/obj/machinery/button/door{
- dir = 2;
id = "SecJusticeChamber";
layer = 4;
name = "Justice Vent Control";
@@ -1291,9 +1279,9 @@
/area/security/execution/education)
"acZ" = (
/obj/machinery/power/apc{
+ areastring = "/area/security/execution/education";
dir = 1;
name = "Prisoner Education Chamber APC";
- areastring = "/area/security/execution/education";
pixel_y = 24
},
/obj/structure/cable/yellow{
@@ -1582,8 +1570,6 @@
/area/space/nearstation)
"adJ" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = -28
},
@@ -1630,9 +1616,7 @@
pixel_y = -25;
specialfunctions = 4
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -1793,9 +1777,7 @@
/turf/open/floor/plating,
/area/crew_quarters/heads/hos)
"aed" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/crew_quarters/fitness/recreation)
"aee" = (
@@ -1829,9 +1811,7 @@
},
/obj/machinery/meter,
/obj/machinery/door/window/westleft{
- base_state = "left";
dir = 1;
- icon_state = "left";
name = "gas ports"
},
/turf/open/floor/plasteel/dark,
@@ -1933,9 +1913,7 @@
/area/ai_monitored/security/armory)
"aer" = (
/obj/structure/rack,
-/obj/item/gun/energy/ionrifle{
- pin = /obj/item/firing_pin
- },
+/obj/item/gun/energy/ionrifle,
/obj/machinery/light{
dir = 1
},
@@ -2143,9 +2121,7 @@
/obj/structure/cable/yellow{
icon_state = "1-4"
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/prison)
"aeL" = (
@@ -2160,9 +2136,7 @@
name = "WARNING: Do Not Enter When Red Light Shows";
pixel_y = 32
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/prison)
"aeM" = (
@@ -2173,9 +2147,7 @@
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/prison)
"aeN" = (
@@ -2185,9 +2157,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/prison)
"aeO" = (
@@ -2209,9 +2179,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/prison)
"aeP" = (
@@ -2232,9 +2200,7 @@
c_tag = "Prison Hallway Port";
network = list("ss13","prison")
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/prison)
"aeQ" = (
@@ -2247,9 +2213,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/prison)
"aeR" = (
@@ -2260,9 +2224,7 @@
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/prison)
"aeS" = (
@@ -2285,9 +2247,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/prison)
"aeT" = (
@@ -2303,9 +2263,7 @@
network = list("prison");
pixel_y = 30
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/prison)
"aeU" = (
@@ -2316,9 +2274,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/prison)
"aeV" = (
@@ -2328,9 +2284,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/prison)
"aeW" = (
@@ -2353,16 +2307,14 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/prison)
"aeX" = (
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/security/prison";
dir = 1;
name = "Prison Wing APC";
- areastring = "/area/security/prison";
pixel_x = 1;
pixel_y = 24
},
@@ -2380,12 +2332,9 @@
},
/obj/machinery/camera{
c_tag = "Prison Hallway Starboard";
- dir = 2;
network = list("ss13","prison")
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/prison)
"aeY" = (
@@ -2395,9 +2344,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/prison)
"aeZ" = (
@@ -2410,9 +2357,7 @@
/obj/structure/sign/warning/pods{
pixel_y = 30
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/prison)
"afa" = (
@@ -2427,9 +2372,7 @@
id = "insaneflash";
pixel_y = 26
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/prison)
"afb" = (
@@ -2442,9 +2385,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/prison)
"afc" = (
@@ -2489,8 +2430,7 @@
pixel_y = 28
},
/obj/machinery/camera{
- c_tag = "Head of Security's Office";
- dir = 2
+ c_tag = "Head of Security's Office"
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/hos)
@@ -2525,8 +2465,6 @@
pixel_x = -22
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = -29;
pixel_y = 23
@@ -2844,9 +2782,7 @@
/turf/open/floor/plasteel,
/area/security/prison)
"afK" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/turf_decal/tile/red{
dir = 1
},
@@ -2865,9 +2801,7 @@
/turf/open/floor/plasteel,
/area/security/prison)
"afM" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
@@ -2895,8 +2829,6 @@
dir = 4
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = -30
},
@@ -2941,9 +2873,7 @@
/turf/open/floor/plasteel,
/area/security/prison)
"afT" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/machinery/light,
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -2990,8 +2920,6 @@
/area/ai_monitored/security/armory)
"afZ" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 24
},
@@ -3038,7 +2966,6 @@
icon_state = "secbot1";
idcheck = 1;
name = "Sergeant-at-Armsky";
- on = 1;
weaponscheck = 1
},
/turf/open/floor/plasteel/dark,
@@ -3250,8 +3177,7 @@
icon_state = "4-8"
},
/obj/machinery/camera{
- c_tag = "Fitness Room - Fore";
- dir = 2
+ c_tag = "Fitness Room - Fore"
},
/obj/machinery/airalarm{
pixel_y = 24
@@ -3282,9 +3208,9 @@
dir = 1
},
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/fitness/recreation";
dir = 1;
name = "Recreation Area APC";
- areastring = "/area/crew_quarters/fitness/recreation";
pixel_y = 24
},
/obj/structure/cable/yellow{
@@ -3307,8 +3233,7 @@
"agB" = (
/obj/machinery/power/solar_control{
id = "foreport";
- name = "Port Bow Solar Control";
- track = 0
+ name = "Port Bow Solar Control"
},
/obj/structure/cable{
icon_state = "0-4"
@@ -3647,15 +3572,15 @@
icon_gib = "guard_dead";
icon_living = "guard";
icon_state = "guard";
+ maxHealth = 250;
max_co2 = 5;
max_tox = 2;
- maxHealth = 250;
melee_damage_lower = 15;
melee_damage_upper = 20;
min_oxy = 5;
+ movement_type = 1;
name = "Sergeant Araneus";
real_name = "Sergeant Araneus";
- movement_type = 1;
response_help = "pets";
turns_per_move = 10
},
@@ -3695,16 +3620,12 @@
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"ahh" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"ahi" = (
/obj/structure/chair,
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"ahj" = (
@@ -3776,8 +3697,6 @@
dir = 4
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29
},
@@ -3926,9 +3845,8 @@
/area/ai_monitored/security/armory)
"ahF" = (
/obj/machinery/power/apc/highcap/five_k{
- dir = 2;
- name = "Armory APC";
areastring = "/area/ai_monitored/security/armory";
+ name = "Armory APC";
pixel_x = 1;
pixel_y = -24
},
@@ -4160,9 +4078,7 @@
dir = 1
},
/obj/machinery/door/window/eastright{
- base_state = "right";
dir = 8;
- icon_state = "right";
name = "Fitness Ring"
},
/turf/open/floor/plasteel/dark,
@@ -4293,9 +4209,9 @@
/area/maintenance/disposal)
"ail" = (
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/solars/port/fore";
dir = 8;
name = "Port Bow Solar APC";
- areastring = "/area/maintenance/solars/port/fore";
pixel_x = -25;
pixel_y = 3
},
@@ -4314,9 +4230,7 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/solars/port/fore)
"ain" = (
@@ -4458,8 +4372,7 @@
},
/obj/effect/landmark/blobstart,
/obj/machinery/camera{
- c_tag = "Evidence Storage";
- dir = 2
+ c_tag = "Evidence Storage"
},
/obj/item/storage/secure/safe{
name = "evidence safe";
@@ -4647,9 +4560,7 @@
desc = "Whoever wears this makes the rules.";
name = "referee suit"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"aiS" = (
@@ -5329,18 +5240,14 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/disposal)
"aki" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/disposal)
"akj" = (
@@ -5350,9 +5257,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/disposal)
"akk" = (
@@ -5480,8 +5385,6 @@
"aku" = (
/obj/structure/table,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 26
},
@@ -5723,8 +5626,6 @@
dir = 1
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 26
},
@@ -6027,9 +5928,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"alm" = (
@@ -6067,8 +5966,6 @@
dir = 1
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = -28
},
@@ -6192,7 +6089,6 @@
/area/maintenance/disposal)
"alB" = (
/obj/machinery/mineral/stacking_unit_console{
- dir = 2;
machinedir = 8;
pixel_x = 32
},
@@ -6312,9 +6208,7 @@
/area/security/brig)
"alP" = (
/obj/machinery/door/window/westleft{
- base_state = "left";
dir = 4;
- icon_state = "left";
name = "Infirmary"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -6567,9 +6461,9 @@
icon_state = "1-4"
},
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/security/warden";
dir = 8;
name = "Brig Control APC";
- areastring = "/area/security/warden";
pixel_x = -26
},
/obj/structure/cable/yellow,
@@ -6757,9 +6651,9 @@
req_access_txt = "1"
},
/obj/machinery/power/apc{
+ areastring = "/area/security/range";
dir = 4;
name = "Shooting Range APC";
- areastring = "/area/security/range";
pixel_x = 24
},
/obj/structure/cable/yellow{
@@ -6778,9 +6672,7 @@
/area/maintenance/fore)
"amu" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/fore)
"amw" = (
@@ -6824,9 +6716,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"amD" = (
@@ -6838,13 +6728,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
/area/crew_quarters/fitness/recreation)
-"amF" = (
-/obj/machinery/door/airlock/maintenance{
- name = "maintenance access";
- req_access_txt = "12"
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
"amG" = (
/obj/machinery/light/small{
dir = 8
@@ -6954,7 +6837,6 @@
"amQ" = (
/obj/machinery/door/window/eastright{
base_state = "left";
- dir = 4;
icon_state = "left";
name = "Danger: Conveyor Access";
req_access_txt = "12"
@@ -7304,9 +7186,9 @@
/area/security/main)
"anC" = (
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/security/main";
dir = 4;
name = "Security Office APC";
- areastring = "/area/security/main";
pixel_x = 24
},
/obj/structure/cable/yellow,
@@ -7475,7 +7357,6 @@
/area/maintenance/disposal)
"anY" = (
/obj/machinery/door/window/eastright{
- dir = 4;
name = "Danger: Conveyor Access";
req_access_txt = "12"
},
@@ -7953,9 +7834,8 @@
/area/maintenance/fore)
"aoO" = (
/obj/machinery/power/apc{
- dir = 2;
- name = "Disposal APC";
areastring = "/area/maintenance/disposal";
+ name = "Disposal APC";
pixel_y = -24
},
/obj/structure/cable/yellow,
@@ -7977,9 +7857,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -8051,9 +7929,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
@@ -8077,27 +7953,21 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"aoZ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"apa" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"apb" = (
@@ -8206,8 +8076,7 @@
"apn" = (
/obj/machinery/power/solar_control{
id = "forestarboard";
- name = "Starboard Bow Solar Control";
- track = 0
+ name = "Starboard Bow Solar Control"
},
/obj/structure/cable{
icon_state = "0-4"
@@ -8243,9 +8112,7 @@
freq = 1400;
location = "Disposals"
},
-/obj/structure/plasticflaps{
- opacity = 0
- },
+/obj/structure/plasticflaps,
/obj/machinery/door/window/northright{
dir = 2;
name = "delivery door";
@@ -8433,8 +8300,7 @@
dir = 1
},
/obj/machinery/camera{
- c_tag = "Warden's Office";
- dir = 2
+ c_tag = "Warden's Office"
},
/obj/structure/rack,
/obj/item/storage/toolbox/mechanical{
@@ -8639,9 +8505,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"aqj" = (
@@ -8671,8 +8535,6 @@
"aqk" = (
/obj/machinery/vending/coffee,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = -28
},
@@ -8763,9 +8625,9 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
+ areastring = "/area/engine/gravity_generator";
dir = 8;
name = "Gravity Generator APC";
- areastring = "/area/engine/gravity_generator";
pixel_x = -25;
pixel_y = 1
},
@@ -8852,8 +8714,6 @@
dir = 4
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29
},
@@ -9041,7 +8901,6 @@
},
/obj/machinery/computer/security/telescreen{
desc = "Used for watching Prison Wing holding areas.";
- dir = 2;
name = "Prison Monitor";
network = list("prison");
pixel_x = -30
@@ -9224,9 +9083,7 @@
/obj/structure/chair{
dir = 1
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/landmark/start/security_officer,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -9414,9 +9271,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"arQ" = (
@@ -9428,9 +9283,7 @@
dir = 9
},
/obj/machinery/holopad,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"arR" = (
@@ -9438,9 +9291,7 @@
dir = 1
},
/obj/machinery/power/terminal,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"arS" = (
@@ -9459,9 +9310,9 @@
/area/engine/gravity_generator)
"arT" = (
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/solars/starboard/fore";
dir = 8;
name = "Starboard Bow Solar APC";
- areastring = "/area/maintenance/solars/starboard/fore";
pixel_x = -25;
pixel_y = 3
},
@@ -9480,9 +9331,7 @@
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/solars/starboard/fore)
"arV" = (
@@ -9500,9 +9349,7 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/port/fore)
"arX" = (
@@ -10054,11 +9901,8 @@
},
/obj/structure/table/wood,
/obj/item/radio/intercom{
- anyai = 1;
- broadcasting = 0;
freerange = 1;
frequency = 1424;
- listening = 1;
name = "Interrogation Intercom";
pixel_y = -31
},
@@ -10170,9 +10014,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"ata" = (
@@ -10214,9 +10056,7 @@
/area/maintenance/starboard/fore)
"ate" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"atf" = (
@@ -10248,9 +10088,7 @@
icon_state = "1-8"
},
/obj/structure/table,
-/obj/item/paper/guides/jobs/engi/gravity_gen{
- layer = 3
- },
+/obj/item/paper/guides/jobs/engi/gravity_gen,
/obj/item/pen/blue,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
@@ -10308,9 +10146,7 @@
/obj/machinery/door/poddoor/shutters{
id = "supplybridge"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/port/fore)
"atr" = (
@@ -10335,9 +10171,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plating,
/area/maintenance/port/fore)
"atu" = (
@@ -10692,9 +10526,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"auk" = (
@@ -10993,9 +10825,9 @@
"auX" = (
/obj/machinery/photocopier,
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/heads/hos";
dir = 4;
name = "Head of Security's Office APC";
- areastring = "/area/crew_quarters/heads/hos";
pixel_x = 24
},
/obj/structure/cable/yellow{
@@ -11070,8 +10902,7 @@
dir = 1
},
/obj/machinery/camera{
- c_tag = "Brig - Hallway - Entrance";
- dir = 2
+ c_tag = "Brig - Hallway - Entrance"
},
/obj/effect/turf_decal/tile/red{
dir = 4
@@ -11090,8 +10921,6 @@
/area/security/brig)
"avd" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 26
},
@@ -11209,9 +11038,7 @@
/obj/structure/extinguisher_cabinet{
pixel_x = 27
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"avo" = (
@@ -11228,9 +11055,7 @@
/area/crew_quarters/dorms)
"avq" = (
/obj/item/cigbutt,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"avr" = (
@@ -11324,18 +11149,14 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"avy" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
@@ -11895,9 +11716,7 @@
c_tag = "Dormitories - Fore";
dir = 8
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"awG" = (
@@ -11983,9 +11802,7 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/port/fore)
"awR" = (
@@ -12004,9 +11821,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/port/fore)
"awU" = (
@@ -12055,9 +11870,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/brig)
"axc" = (
@@ -12093,9 +11906,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/security/brig)
"axf" = (
@@ -12126,17 +11937,13 @@
/turf/open/floor/plasteel,
/area/security/brig)
"axh" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/machinery/door_timer{
id = "Cell 3";
name = "Cell 3";
pixel_y = -32
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/brig)
"axi" = (
@@ -12186,9 +11993,8 @@
dir = 4
},
/obj/machinery/power/apc/highcap/ten_k{
- dir = 2;
- name = "Brig APC";
areastring = "/area/security/brig";
+ name = "Brig APC";
pixel_x = 1;
pixel_y = -24
},
@@ -12235,18 +12041,12 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/brig)
"axq" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/brig)
"axr" = (
@@ -12259,9 +12059,7 @@
req_access_txt = "1"
},
/obj/effect/landmark/event_spawn,
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/brig)
"axs" = (
@@ -12277,9 +12075,7 @@
c_tag = "Brig - Hallway - Starboard";
dir = 1
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/brig)
"axt" = (
@@ -12290,18 +12086,14 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/brig)
"axu" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/security/brig)
"axv" = (
@@ -12346,7 +12138,6 @@
/obj/item/folder/red,
/obj/item/taperecorder,
/obj/item/radio/intercom{
- anyai = 1;
broadcasting = 1;
freerange = 1;
frequency = 1424;
@@ -12487,9 +12278,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -12710,9 +12499,9 @@
/area/security/nuke_storage)
"ayr" = (
/obj/machinery/power/apc{
+ areastring = "/area/security/nuke_storage";
dir = 1;
name = "Vault APC";
- areastring = "/area/security/nuke_storage";
pixel_y = 25
},
/obj/structure/cable/yellow{
@@ -12980,9 +12769,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"ayQ" = (
@@ -13140,9 +12927,9 @@
/area/quartermaster/miningoffice)
"azn" = (
/obj/machinery/power/apc{
+ areastring = "/area/quartermaster/miningoffice";
dir = 1;
name = "Mining APC";
- areastring = "/area/quartermaster/miningoffice";
pixel_y = 24
},
/obj/structure/cable/yellow{
@@ -13551,9 +13338,9 @@
icon_state = "0-2"
},
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/fore";
dir = 1;
name = "Fore Maintenance APC";
- areastring = "/area/maintenance/fore";
pixel_y = 24
},
/turf/open/floor/plating,
@@ -13623,8 +13410,6 @@
dir = 1
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 28
},
@@ -13673,9 +13458,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"aAi" = (
@@ -13778,14 +13561,11 @@
/area/engine/engineering)
"aAr" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 21
},
/obj/machinery/camera{
- c_tag = "Engineering - Fore";
- dir = 2
+ c_tag = "Engineering - Fore"
},
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -13841,9 +13621,7 @@
pixel_y = 30
},
/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/plasteel/cult{
- dir = 2
- },
+/turf/open/floor/plasteel/cult,
/area/library)
"aAA" = (
/obj/docking_port/stationary{
@@ -13852,8 +13630,8 @@
height = 5;
id = "mining_home";
name = "mining shuttle bay";
- width = 7;
- roundstart_template = /datum/map_template/shuttle/mining/box
+ roundstart_template = /datum/map_template/shuttle/mining/box;
+ width = 7
},
/turf/open/space/basic,
/area/space)
@@ -14039,8 +13817,8 @@
height = 5;
id = "laborcamp_home";
name = "fore bay 1";
- width = 9;
- roundstart_template = /datum/map_template/shuttle/labour/box
+ roundstart_template = /datum/map_template/shuttle/labour/box;
+ width = 9
},
/turf/open/space/basic,
/area/space)
@@ -14244,9 +14022,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/fore)
"aBs" = (
@@ -14315,9 +14091,9 @@
dir = 1
},
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/dorms";
dir = 1;
name = "Dormitories APC";
- areastring = "/area/crew_quarters/dorms";
pixel_y = 24
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -14355,9 +14131,7 @@
/obj/structure/sign/warning/pods{
pixel_x = 30
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"aBC" = (
@@ -14409,8 +14183,7 @@
/area/engine/engineering)
"aBG" = (
/obj/machinery/camera{
- c_tag = "Engineering - Storage";
- dir = 2
+ c_tag = "Engineering - Storage"
},
/obj/machinery/suit_storage_unit/engine,
/obj/effect/turf_decal/bot{
@@ -14644,8 +14417,8 @@
"aCg" = (
/obj/machinery/camera/motion{
c_tag = "Vault";
- network = list("vault");
- dir = 1
+ dir = 1;
+ network = list("vault")
},
/obj/machinery/light,
/obj/structure/cable/yellow{
@@ -14814,9 +14587,9 @@
dir = 8
},
/obj/machinery/power/apc{
+ areastring = "/area/security/detectives_office";
dir = 8;
name = "Detective APC";
- areastring = "/area/security/detectives_office";
pixel_x = -24
},
/obj/structure/cable/yellow{
@@ -14955,9 +14728,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"aCJ" = (
@@ -15118,8 +14889,7 @@
},
/obj/machinery/computer/shuttle/mining{
dir = 4;
- req_access = null;
- req_one_access = null
+ req_access = null
},
/obj/effect/turf_decal/tile/brown{
dir = 1
@@ -15274,8 +15044,7 @@
pixel_y = 32
},
/obj/machinery/camera{
- c_tag = "Fore Primary Hallway Cells";
- dir = 2
+ c_tag = "Fore Primary Hallway Cells"
},
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -15396,8 +15165,6 @@
dir = 8
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29;
pixel_y = -2
@@ -15435,8 +15202,6 @@
"aDL" = (
/obj/machinery/light/small,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = -26
},
@@ -15534,9 +15299,7 @@
/obj/structure/cable/yellow{
icon_state = "2-8"
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/structure/urinal{
pixel_y = 29
},
@@ -15861,9 +15624,9 @@
/area/quartermaster/warehouse)
"aEE" = (
/obj/machinery/power/apc{
+ areastring = "/area/quartermaster/warehouse";
dir = 4;
name = "Warehouse APC";
- areastring = "/area/quartermaster/warehouse";
pixel_x = 27
},
/obj/structure/cable/yellow{
@@ -16030,7 +15793,6 @@
/obj/structure/table/reinforced,
/obj/machinery/door/window/westleft{
base_state = "right";
- dir = 8;
icon_state = "right";
name = "Outer Window"
},
@@ -16128,9 +15890,8 @@
"aFe" = (
/obj/machinery/light/small,
/obj/machinery/power/apc{
- dir = 2;
- name = "Restrooms APC";
areastring = "/area/crew_quarters/toilet/restrooms";
+ name = "Restrooms APC";
pixel_y = -26
},
/obj/structure/cable/yellow{
@@ -16214,9 +15975,7 @@
dir = 8;
pixel_x = 28
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"aFp" = (
@@ -16242,18 +16001,14 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"aFr" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/engine/engineering)
"aFs" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/engine/engineering)
"aFt" = (
@@ -16302,9 +16057,7 @@
/turf/open/floor/plating,
/area/engine/engineering)
"aFv" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -16381,9 +16134,7 @@
/obj/item/folder,
/obj/item/folder,
/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/plasteel/cult{
- dir = 2
- },
+/turf/open/floor/plasteel/cult,
/area/library)
"aFF" = (
/obj/structure/table,
@@ -16391,7 +16142,6 @@
/obj/item/pen,
/obj/machinery/requests_console{
department = "Mining";
- departmentType = 0;
pixel_y = -30
},
/obj/effect/turf_decal/tile/brown{
@@ -16698,9 +16448,8 @@
dir = 4
},
/obj/machinery/power/apc/highcap/five_k{
- dir = 2;
- name = "Fore Primary Hallway APC";
areastring = "/area/hallway/primary/fore";
+ name = "Fore Primary Hallway APC";
pixel_y = -27
},
/obj/structure/cable/yellow,
@@ -16724,8 +16473,6 @@
dir = 4
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = -26
},
@@ -16769,34 +16516,24 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"aGm" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"aGn" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"aGo" = (
/obj/item/beacon,
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"aGp" = (
@@ -16991,9 +16728,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"aGJ" = (
@@ -17005,9 +16740,7 @@
dir = 1;
pixel_y = -22
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"aGK" = (
@@ -17015,18 +16748,12 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"aGL" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"aGM" = (
@@ -17326,9 +17053,7 @@
/turf/open/floor/plasteel,
/area/construction/storage/wing)
"aHp" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/tile/brown{
dir = 8
},
@@ -17418,9 +17143,7 @@
/area/hallway/primary/fore)
"aHB" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"aHC" = (
@@ -17517,9 +17240,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"aHQ" = (
@@ -17716,8 +17437,7 @@
dir = 1
},
/obj/machinery/camera{
- c_tag = "Cargo Bay - Fore";
- dir = 2
+ c_tag = "Cargo Bay - Fore"
},
/obj/structure/sign/map/right{
desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown).";
@@ -17733,9 +17453,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/cable/yellow{
icon_state = "1-4"
},
@@ -17770,9 +17488,7 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aIp" = (
@@ -17785,9 +17501,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aIq" = (
@@ -17853,9 +17567,8 @@
dir = 4
},
/obj/machinery/power/apc{
- dir = 2;
- name = "Storage Wing APC";
areastring = "/area/construction/storage/wing";
+ name = "Storage Wing APC";
pixel_y = -27
},
/obj/structure/cable/yellow{
@@ -17897,12 +17610,8 @@
/obj/structure/cable/yellow{
icon_state = "1-8"
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = -26
},
@@ -18063,9 +17772,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"aIL" = (
@@ -18085,8 +17792,6 @@
/area/security/courtroom)
"aIN" = (
/obj/item/radio/intercom{
- broadcasting = 0;
- listening = 1;
name = "Station Intercom (General)";
pixel_y = 20
},
@@ -18118,8 +17823,7 @@
dir = 1
},
/obj/machinery/camera{
- c_tag = "Courtroom";
- dir = 2
+ c_tag = "Courtroom"
},
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -18200,9 +17904,9 @@
icon_state = "0-2"
},
/obj/machinery/power/apc{
+ areastring = "/area/lawoffice";
dir = 1;
name = "Law Office APC";
- areastring = "/area/lawoffice";
pixel_y = 24
},
/obj/item/twohanded/required/kirbyplants{
@@ -18222,9 +17926,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/fore)
"aJa" = (
@@ -18295,9 +17997,7 @@
/area/crew_quarters/dorms)
"aJg" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"aJh" = (
@@ -18326,8 +18026,7 @@
dir = 1
},
/obj/machinery/camera{
- c_tag = "Engineering - Secure Storage";
- dir = 2
+ c_tag = "Engineering - Secure Storage"
},
/turf/open/floor/plating,
/area/engine/engineering)
@@ -18545,9 +18244,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"aJW" = (
@@ -18911,7 +18608,6 @@
/area/engine/engineering)
"aKN" = (
/obj/machinery/door/poddoor{
- density = 1;
id = "QMLoaddoor2";
name = "Supply Dock Loading Door"
},
@@ -19215,8 +18911,8 @@
dir = 8
},
/obj/machinery/flasher{
- pixel_y = 24;
- id = "AI"
+ id = "AI";
+ pixel_y = 24
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai_upload)
@@ -19399,8 +19095,6 @@
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/obj/machinery/portable_atmospherics/scrubber,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 26
},
@@ -19414,8 +19108,7 @@
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
/obj/machinery/camera{
- c_tag = "Locker Room Starboard";
- dir = 2
+ c_tag = "Locker Room Starboard"
},
/obj/structure/sign/warning/pods{
pixel_y = 30
@@ -19498,8 +19191,7 @@
"aLX" = (
/obj/machinery/door/firedoor/border_only/closed{
dir = 8;
- name = "Animal Pen A";
- opacity = 1
+ name = "Animal Pen A"
},
/turf/open/floor/grass,
/area/hydroponics/garden)
@@ -19736,8 +19428,8 @@
/obj/effect/spawner/lootdrop/aimodule_neutral,
/obj/item/aiModule/core/full/custom,
/obj/machinery/flasher{
- pixel_y = 24;
- id = "AI"
+ id = "AI";
+ pixel_y = 24
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai_upload)
@@ -19747,16 +19439,14 @@
"aMI" = (
/obj/structure/table,
/obj/machinery/door/window{
- base_state = "left";
dir = 8;
- icon_state = "left";
name = "High-Risk Modules";
req_access_txt = "20"
},
/obj/structure/window/reinforced,
/obj/machinery/flasher{
- pixel_y = 24;
- id = "AI"
+ id = "AI";
+ pixel_y = 24
},
/obj/effect/spawner/lootdrop/aimodule_harmful,
/obj/item/aiModule/supplied/oxygen,
@@ -19768,8 +19458,6 @@
"aMJ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = -29
},
@@ -19943,9 +19631,7 @@
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aNa" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -20182,7 +19868,6 @@
pixel_y = -5
},
/obj/machinery/button/door{
- dir = 2;
id = "QMLoaddoor2";
layer = 4;
name = "Loading Doors";
@@ -20233,9 +19918,7 @@
dir = 4
},
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aNL" = (
@@ -20290,16 +19973,14 @@
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"aNP" = (
-/obj/machinery/camera/autoname{
- dir = 2
- },
+/obj/machinery/camera/autoname,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
/obj/machinery/power/apc{
+ areastring = "/area/quartermaster/qm";
dir = 1;
name = "Quartermaster's Office APC";
- areastring = "/area/quartermaster/qm";
pixel_y = 30
},
/obj/structure/cable/yellow{
@@ -20442,9 +20123,7 @@
dir = 8
},
/obj/machinery/door/window/westleft{
- base_state = "left";
dir = 2;
- icon_state = "left";
layer = 3.1;
name = "Cyborg Upload Console Window";
req_access_txt = "16"
@@ -20664,9 +20343,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aOC" = (
@@ -20706,9 +20383,7 @@
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aOF" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -20812,9 +20487,9 @@
/area/hydroponics/garden)
"aON" = (
/obj/machinery/power/apc{
+ areastring = "/area/hydroponics/garden";
dir = 4;
name = "Garden APC";
- areastring = "/area/hydroponics/garden";
pixel_x = 27;
pixel_y = 2
},
@@ -20837,9 +20512,9 @@
/area/hydroponics/garden)
"aOO" = (
/obj/machinery/power/apc/highcap/ten_k{
+ areastring = "/area/engine/engineering";
dir = 8;
name = "Engine Room APC";
- areastring = "/area/engine/engineering";
pixel_x = -26
},
/obj/structure/cable/yellow{
@@ -20884,8 +20559,6 @@
dir = 1
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 21
},
@@ -21079,9 +20752,7 @@
/obj/item/stack/packageWrap,
/obj/item/stack/packageWrap,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/brown{
- dir = 2
- },
+/obj/effect/turf_decal/tile/brown,
/turf/open/floor/plasteel,
/area/storage/primary)
"aPp" = (
@@ -21108,7 +20779,6 @@
},
/obj/machinery/requests_console{
department = "Tool Storage";
- departmentType = 0;
pixel_x = 30
},
/obj/machinery/light{
@@ -21200,9 +20870,7 @@
c_tag = "Fore Primary Hallway Aft";
dir = 8
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"aPB" = (
@@ -21306,9 +20974,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aPN" = (
@@ -21349,8 +21015,6 @@
/area/hydroponics/garden)
"aPR" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29
},
@@ -21424,8 +21088,7 @@
pixel_y = 32
},
/obj/machinery/camera{
- c_tag = "Engineering - Power Monitoring";
- dir = 2
+ c_tag = "Engineering - Power Monitoring"
},
/obj/machinery/modular_computer/console/preset/engineering,
/obj/effect/turf_decal/tile/neutral{
@@ -21491,7 +21154,6 @@
/area/engine/engineering)
"aQg" = (
/obj/machinery/door/poddoor{
- density = 1;
id = "QMLoaddoor";
name = "Supply Dock Loading Door"
},
@@ -21674,9 +21336,8 @@
/area/ai_monitored/turret_protected/ai_upload)
"aQA" = (
/obj/machinery/power/apc/highcap/five_k{
- dir = 2;
- name = "Upload APC";
areastring = "/area/ai_monitored/turret_protected/ai_upload";
+ name = "Upload APC";
pixel_y = -24
},
/obj/structure/cable/yellow{
@@ -21826,8 +21487,7 @@
icon_state = "4-8"
},
/obj/machinery/camera{
- c_tag = "Crew Quarters Entrance";
- dir = 2
+ c_tag = "Crew Quarters Entrance"
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -21887,9 +21547,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aQU" = (
@@ -21961,9 +21619,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aRb" = (
@@ -22025,8 +21681,7 @@
"aRg" = (
/obj/machinery/door/firedoor/border_only/closed{
dir = 8;
- name = "Animal Pen B";
- opacity = 1
+ name = "Animal Pen B"
},
/turf/open/floor/grass,
/area/hydroponics/garden)
@@ -22271,8 +21926,6 @@
dir = 1
},
/obj/item/radio/intercom{
- broadcasting = 0;
- listening = 1;
name = "Station Intercom (General)";
pixel_y = -28
},
@@ -22390,8 +22043,7 @@
"aRX" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/grunge{
- name = "Courtroom";
- opacity = 1
+ name = "Courtroom"
},
/turf/open/floor/plasteel/dark,
/area/security/courtroom)
@@ -22460,9 +22112,7 @@
pixel_x = 4;
pixel_y = -2
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aSj" = (
@@ -22553,9 +22203,7 @@
"aSq" = (
/obj/machinery/power/terminal,
/obj/structure/cable,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/engine/engineering)
"aSr" = (
@@ -22732,9 +22380,8 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
- dir = 2;
- name = "Auxillary Base Construction APC";
areastring = "/area/construction/mining/aux_base";
+ name = "Auxillary Base Construction APC";
pixel_y = -24
},
/obj/effect/turf_decal/tile/yellow,
@@ -22775,9 +22422,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/port)
"aSP" = (
@@ -22992,8 +22637,6 @@
/area/security/courtroom)
"aTm" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = -26
},
@@ -23046,18 +22689,14 @@
codes_txt = "patrol;next_patrol=14.3-Lockers-Dorms";
location = "14.2-Central-CrewQuarters"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTt" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTu" = (
@@ -23075,16 +22714,13 @@
dir = 4
},
/obj/machinery/power/apc{
- dir = 2;
- name = "Locker Room APC";
areastring = "/area/crew_quarters/locker";
+ name = "Locker Room APC";
pixel_x = -1;
pixel_y = -26
},
/obj/structure/cable/yellow,
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTw" = (
@@ -23092,8 +22728,6 @@
dir = 4
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = -26
},
@@ -23101,9 +22735,7 @@
c_tag = "Locker Room Port";
dir = 1
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTx" = (
@@ -23111,9 +22743,7 @@
dir = 4
},
/obj/machinery/light,
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTy" = (
@@ -23124,9 +22754,7 @@
dir = 1;
pixel_y = -24
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTz" = (
@@ -23137,27 +22765,21 @@
/obj/machinery/newscaster{
pixel_y = -32
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTA" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTB" = (
/obj/structure/extinguisher_cabinet{
pixel_x = 27
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTC" = (
@@ -23228,26 +22850,20 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/engine/engineering)
"aTH" = (
/obj/structure/disposalpipe/segment{
dir = 9
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plasteel,
/area/engine/engineering)
"aTI" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -23258,9 +22874,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
@@ -23316,7 +22930,6 @@
dir = 8
},
/obj/machinery/door/window{
- dir = 2;
name = "MiniSat Walkway Access"
},
/turf/open/floor/plasteel/dark,
@@ -23398,7 +23011,6 @@
},
/obj/machinery/door/window{
base_state = "right";
- dir = 2;
icon_state = "right";
name = "MiniSat Walkway Access"
},
@@ -23489,9 +23101,9 @@
/area/security/checkpoint/supply)
"aUk" = (
/obj/machinery/power/apc{
+ areastring = "/area/security/checkpoint/supply";
dir = 1;
name = "Security Post - Cargo Bay APC";
- areastring = "/area/security/checkpoint/supply";
pixel_x = 1;
pixel_y = 24
},
@@ -23656,9 +23268,8 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
- dir = 2;
- name = "AI Upload Access APC";
areastring = "/area/ai_monitored/turret_protected/ai_upload_foyer";
+ name = "AI Upload Access APC";
pixel_y = -27
},
/obj/machinery/light/small{
@@ -23700,6 +23311,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai_upload_foyer)
"aUA" = (
@@ -23736,7 +23348,6 @@
dir = 4
},
/obj/structure/sign/directions/command{
- dir = 2;
pixel_y = -8
},
/turf/closed/wall/r_wall,
@@ -23768,9 +23379,7 @@
/obj/machinery/door/airlock/public/glass{
name = "Fore Primary Hallway"
},
-/obj/effect/turf_decal/tile/red{
- dir = 2
- },
+/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"aUF" = (
@@ -23785,9 +23394,8 @@
/area/security/courtroom)
"aUG" = (
/obj/machinery/power/apc{
- dir = 2;
- name = "Courtroom APC";
areastring = "/area/security/courtroom";
+ name = "Courtroom APC";
pixel_x = 1;
pixel_y = -24
},
@@ -23852,9 +23460,7 @@
dir = 8;
pixel_x = 24
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aUM" = (
@@ -23995,9 +23601,7 @@
"aUX" = (
/obj/structure/closet/secure_closet/personal,
/obj/item/clothing/under/assistantformal,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/item/clothing/suit/hooded/wintercoat,
/obj/item/clothing/shoes/winterboots,
/obj/effect/turf_decal/tile/neutral{
@@ -24032,7 +23636,6 @@
/area/engine/engineering)
"aVa" = (
/obj/machinery/requests_console{
- announcementConsole = 0;
department = "Engineering";
departmentType = 4;
name = "Engineering RC"
@@ -24115,7 +23718,6 @@
/area/ai_monitored/turret_protected/ai)
"aVn" = (
/obj/structure/showcase/cyborg/old{
- dir = 2;
pixel_y = 20
},
/turf/open/floor/plasteel/dark,
@@ -24123,11 +23725,9 @@
"aVp" = (
/obj/machinery/camera{
c_tag = "AI Chamber - Fore";
- dir = 2;
network = list("aicore")
},
/obj/structure/showcase/cyborg/old{
- dir = 2;
pixel_y = 20
},
/obj/structure/cable{
@@ -24170,8 +23770,6 @@
/area/hallway/secondary/entry)
"aVv" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 21
},
@@ -24191,8 +23789,7 @@
"aVx" = (
/obj/structure/chair,
/obj/machinery/camera{
- c_tag = "Arrivals - Fore Arm - Far";
- dir = 2
+ c_tag = "Arrivals - Fore Arm - Far"
},
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -24240,9 +23837,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -24550,8 +24145,7 @@
/area/hallway/primary/central)
"aWd" = (
/obj/machinery/camera{
- c_tag = "Central Primary Hallway - Fore";
- dir = 2
+ c_tag = "Central Primary Hallway - Fore"
},
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -24623,8 +24217,6 @@
icon_state = "plant-16"
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 21
},
@@ -24644,8 +24236,7 @@
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/grunge{
- name = "Courtroom";
- opacity = 1
+ name = "Courtroom"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
@@ -24961,9 +24552,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
},
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"aWZ" = (
@@ -25273,9 +24862,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -25330,8 +24917,7 @@
dir = 1
},
/obj/machinery/camera{
- c_tag = "Central Primary Hallway - Fore - AI Upload";
- dir = 2
+ c_tag = "Central Primary Hallway - Fore - AI Upload"
},
/obj/structure/sign/warning/securearea{
desc = "A warning sign which reads 'HIGH-POWER TURRETS AHEAD'.";
@@ -25349,8 +24935,6 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 21
},
@@ -25372,9 +24956,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aXH" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/machinery/status_display/ai{
pixel_y = 32
},
@@ -25448,9 +25030,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aXO" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/plaque{
icon_state = "L9"
},
@@ -25499,9 +25079,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aXU" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -25534,9 +25112,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aXX" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
@@ -25694,8 +25270,6 @@
/obj/item/assembly/flash/handheld,
/obj/item/assembly/flash/handheld,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 28
},
@@ -25709,8 +25283,6 @@
/area/storage/tech)
"aYo" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = -29
},
@@ -25745,8 +25317,7 @@
pixel_y = 30
},
/obj/machinery/camera{
- c_tag = "Chief Engineer's Office";
- dir = 2
+ c_tag = "Chief Engineer's Office"
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -25763,9 +25334,9 @@
"aYr" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/heads/chief";
dir = 4;
name = "CE Office APC";
- areastring = "/area/crew_quarters/heads/chief";
pixel_x = 28
},
/obj/structure/cable/yellow,
@@ -25803,8 +25374,6 @@
/area/engine/engineering)
"aYt" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29
},
@@ -25982,9 +25551,7 @@
/area/quartermaster/storage)
"aYO" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aYP" = (
@@ -25992,17 +25559,13 @@
c_tag = "Cargo Bay - Aft";
dir = 1
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aYQ" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aYR" = (
@@ -26276,9 +25839,9 @@
/area/storage/tech)
"aZx" = (
/obj/machinery/power/apc{
+ areastring = "/area/storage/tech";
dir = 8;
name = "Tech Storage APC";
- areastring = "/area/storage/tech";
pixel_x = -27
},
/obj/structure/cable/yellow{
@@ -26398,9 +25961,7 @@
"aZD" = (
/obj/structure/table/reinforced,
/obj/item/flashlight/lamp,
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/heads/chief)
"aZE" = (
@@ -26560,7 +26121,6 @@
"aZQ" = (
/obj/effect/landmark/start/ai/secondary,
/obj/item/radio/intercom{
- anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
@@ -26568,15 +26128,11 @@
pixel_y = 22
},
/obj/item/radio/intercom{
- broadcasting = 0;
freerange = 1;
- listening = 1;
name = "Common Channel";
pixel_x = -27
},
/obj/item/radio/intercom{
- anyai = 1;
- broadcasting = 0;
freerange = 1;
frequency = 1447;
name = "Private Channel";
@@ -26586,10 +26142,10 @@
/obj/machinery/door/window{
base_state = "rightsecure";
dir = 4;
- obj_integrity = 300;
icon_state = "rightsecure";
layer = 4.1;
name = "Secondary AI Core Access";
+ obj_integrity = 300;
pixel_x = 4;
req_access_txt = "16"
},
@@ -26642,14 +26198,13 @@
/obj/machinery/door/window{
base_state = "rightsecure";
dir = 4;
- obj_integrity = 300;
icon_state = "rightsecure";
name = "Primary AI Core Access";
+ obj_integrity = 300;
req_access_txt = "16"
},
/obj/machinery/camera{
c_tag = "AI Chamber - Core";
- dir = 2;
network = list("aicore")
},
/obj/effect/turf_decal/tile/neutral{
@@ -26696,7 +26251,6 @@
"aZY" = (
/obj/effect/landmark/start/ai/secondary,
/obj/item/radio/intercom{
- anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
@@ -26704,15 +26258,11 @@
pixel_y = 22
},
/obj/item/radio/intercom{
- broadcasting = 0;
freerange = 1;
- listening = 1;
name = "Common Channel";
pixel_x = 27
},
/obj/item/radio/intercom{
- anyai = 1;
- broadcasting = 0;
freerange = 1;
frequency = 1447;
name = "Private Channel";
@@ -26722,19 +26272,17 @@
/obj/machinery/door/window{
base_state = "leftsecure";
dir = 8;
- obj_integrity = 300;
icon_state = "leftsecure";
layer = 4.1;
name = "Tertiary AI Core Access";
+ obj_integrity = 300;
pixel_x = -3;
req_access_txt = "16"
},
/turf/open/floor/circuit/green,
/area/ai_monitored/turret_protected/ai)
"aZZ" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/hallway/secondary/entry)
"baa" = (
@@ -26841,8 +26389,6 @@
/area/maintenance/port/fore)
"bal" = (
/obj/item/radio/intercom{
- broadcasting = 0;
- listening = 1;
name = "Station Intercom (General)";
pixel_y = -28
},
@@ -26874,9 +26420,7 @@
pixel_x = -8;
pixel_y = -2
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"bap" = (
@@ -26907,17 +26451,14 @@
pixel_x = 4;
pixel_y = 3
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"baq" = (
/obj/structure/rack,
/obj/machinery/power/apc{
- dir = 2;
- name = "Cargo Bay APC";
areastring = "/area/quartermaster/storage";
+ name = "Cargo Bay APC";
pixel_x = 1;
pixel_y = -24
},
@@ -26928,15 +26469,11 @@
/obj/item/screwdriver{
pixel_y = 10
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"bar" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/vending/wardrobe/cargo_wardrobe,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
@@ -27038,7 +26575,6 @@
/area/hallway/primary/port)
"baB" = (
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/obj/effect/turf_decal/tile/brown{
@@ -27112,9 +26648,7 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/obj/structure/sign/departments/custodian{
pixel_x = 32;
pixel_y = -32
@@ -27128,25 +26662,18 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"baJ" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/mob/living/simple_animal/bot/cleanbot{
auto_patrol = 1;
icon_state = "cleanbot1";
- mode = 0;
name = "Mopficcer Sweepsky"
},
/turf/open/floor/plasteel,
@@ -27159,9 +26686,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"baL" = (
@@ -27175,9 +26700,7 @@
/obj/structure/extinguisher_cabinet{
pixel_y = -30
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"baM" = (
@@ -27191,21 +26714,15 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"baN" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"baO" = (
@@ -27219,9 +26736,7 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"baP" = (
@@ -27229,30 +26744,20 @@
dir = 1;
pixel_y = -24
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"baQ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"baR" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"baS" = (
@@ -27322,9 +26827,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"baY" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/structure/extinguisher_cabinet{
pixel_y = -30
},
@@ -27338,8 +26841,6 @@
dir = 1
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = -27;
pixel_y = -29
@@ -27385,9 +26886,9 @@
/area/storage/tools)
"bbd" = (
/obj/machinery/power/apc{
+ areastring = "/area/storage/tools";
dir = 1;
name = "Auxiliary Tool Storage APC";
- areastring = "/area/storage/tools";
pixel_y = 24
},
/obj/structure/cable/yellow{
@@ -27419,8 +26920,6 @@
"bbf" = (
/obj/structure/closet/toolcloset,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 28
},
@@ -27481,8 +26980,6 @@
dir = 8
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29
},
@@ -27860,7 +27357,6 @@
/obj/structure/plasticflaps/opaque,
/obj/machinery/conveyor{
backwards = 1;
- dir = 2;
forwards = 2;
id = "packageSort2"
},
@@ -27875,9 +27371,9 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/power/apc{
+ areastring = "/area/quartermaster/office";
dir = 8;
name = "Cargo Office APC";
- areastring = "/area/quartermaster/office";
pixel_x = -24
},
/obj/structure/cable/yellow{
@@ -27944,7 +27440,6 @@
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
/obj/machinery/door/window/westleft{
- dir = 8;
name = "Cargo Desk";
req_access_txt = "50"
},
@@ -27991,8 +27486,6 @@
"bcb" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = -29
},
@@ -28007,9 +27500,7 @@
"bcc" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bcd" = (
@@ -28369,9 +27860,9 @@
/area/engine/engineering)
"bcL" = (
/obj/machinery/power/apc{
+ areastring = "/area/security/checkpoint/engineering";
dir = 8;
name = "Engineering Security APC";
- areastring = "/area/security/checkpoint/engineering";
pixel_x = -24
},
/obj/structure/cable/yellow{
@@ -28478,9 +27969,9 @@
/area/security/checkpoint/customs)
"bcY" = (
/obj/machinery/power/apc{
+ areastring = "/area/security/checkpoint/customs";
dir = 1;
name = "Customs APC";
- areastring = "/area/security/checkpoint/customs";
pixel_y = 24
},
/obj/structure/cable/yellow{
@@ -28499,7 +27990,6 @@
/area/security/checkpoint/customs)
"bcZ" = (
/obj/item/radio/intercom{
- broadcasting = 0;
name = "Station Intercom (General)";
pixel_y = 20
},
@@ -28523,8 +28013,7 @@
pixel_y = 30
},
/obj/machinery/camera{
- c_tag = "Customs Checkpoint";
- dir = 2
+ c_tag = "Customs Checkpoint"
},
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -28622,9 +28111,7 @@
dir = 4;
id = "packageSort2"
},
-/obj/structure/plasticflaps{
- opacity = 0
- },
+/obj/structure/plasticflaps,
/turf/open/floor/plating,
/area/quartermaster/sorting)
"bdk" = (
@@ -28776,9 +28263,7 @@
dir = 8;
pixel_x = 24
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bdA" = (
@@ -29079,8 +28564,6 @@
dir = 1
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = -28
},
@@ -29171,9 +28654,7 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/chief)
"bek" = (
-/obj/structure/closet/secure_closet/engineering_chief{
- req_access_txt = "0"
- },
+/obj/structure/closet/secure_closet/engineering_chief,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -29323,9 +28804,9 @@
/area/ai_monitored/turret_protected/ai)
"bew" = (
/obj/machinery/power/apc{
+ areastring = "/area/ai_monitored/turret_protected/ai";
dir = 1;
name = "AI Chamber APC";
- areastring = "/area/ai_monitored/turret_protected/ai";
pixel_y = 24
},
/obj/structure/cable{
@@ -29593,9 +29074,7 @@
/area/hallway/primary/central)
"bfi" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bfj" = (
@@ -29845,7 +29324,6 @@
dir = 4
},
/obj/structure/sign/directions/command{
- dir = 2;
pixel_y = -8
},
/turf/closed/wall/r_wall,
@@ -30229,7 +29707,6 @@
/obj/item/paper,
/obj/structure/table/reinforced,
/obj/machinery/door/window/brigdoor{
- dir = 2;
name = "Arrivals Security Checkpoint";
pixel_y = -8;
req_access_txt = "1"
@@ -30300,9 +29777,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/port/fore)
"bgD" = (
@@ -30364,7 +29839,6 @@
/area/quartermaster/sorting)
"bgK" = (
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -30409,9 +29883,7 @@
/turf/open/floor/plasteel,
/area/quartermaster/sorting)
"bgO" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -30546,9 +30018,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"bgY" = (
-/obj/effect/turf_decal/tile/brown{
- dir = 2
- },
+/obj/effect/turf_decal/tile/brown,
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"bgZ" = (
@@ -30561,9 +30031,9 @@
/area/hallway/primary/port)
"bha" = (
/obj/machinery/power/apc{
+ areastring = "/area/janitor";
dir = 8;
name = "Custodial Closet APC";
- areastring = "/area/janitor";
pixel_x = -24
},
/obj/structure/table,
@@ -30615,9 +30085,9 @@
"bhf" = (
/obj/effect/landmark/blobstart,
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/central";
dir = 4;
name = "Central Maintenance APC";
- areastring = "/area/maintenance/central";
pixel_x = 26
},
/obj/structure/cable/yellow,
@@ -30676,8 +30146,7 @@
pixel_y = 4
},
/obj/machinery/camera{
- c_tag = "Bridge - Central";
- dir = 2
+ c_tag = "Bridge - Central"
},
/obj/structure/table/glass,
/obj/effect/turf_decal/tile/brown{
@@ -30906,9 +30375,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"bhF" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
@@ -30941,8 +30408,7 @@
dir = 1
},
/obj/machinery/camera{
- c_tag = "Starboard Primary Hallway - Tech Storage";
- dir = 2
+ c_tag = "Starboard Primary Hallway - Tech Storage"
},
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -30950,9 +30416,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"bhJ" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -31036,9 +30500,9 @@
dir = 4
},
/obj/machinery/power/apc{
+ areastring = "/area/hallway/primary/starboard";
dir = 1;
name = "Starboard Hallway APC";
- areastring = "/area/hallway/primary/starboard";
pixel_y = 26
},
/obj/structure/cable/yellow{
@@ -31174,8 +30638,6 @@
/area/engine/break_room)
"bia" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 21
},
@@ -31979,9 +31441,7 @@
/obj/structure/disposalpipe/segment{
dir = 9
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -32129,8 +31589,6 @@
dir = 4
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 21
},
@@ -32166,9 +31624,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"bke" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/sign/map/left{
desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown).";
icon_state = "map-left-MS";
@@ -32249,8 +31705,6 @@
"bkk" = (
/obj/structure/filingcabinet/filingcabinet,
/obj/item/radio/intercom{
- broadcasting = 0;
- listening = 1;
name = "Station Intercom (General)";
pixel_y = -28
},
@@ -32324,9 +31778,9 @@
},
/obj/item/hand_labeler,
/obj/machinery/power/apc{
+ areastring = "/area/quartermaster/sorting";
dir = 4;
name = "Delivery Office APC";
- areastring = "/area/quartermaster/sorting";
pixel_x = 26
},
/obj/structure/cable/yellow{
@@ -32385,8 +31839,6 @@
pixel_x = 28
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = -28
},
@@ -32430,9 +31882,7 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/obj/effect/turf_decal/tile/brown{
- dir = 2
- },
+/obj/effect/turf_decal/tile/brown,
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"bkv" = (
@@ -32472,8 +31922,6 @@
/obj/structure/table,
/obj/item/toner,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 30
},
@@ -32497,9 +31945,7 @@
"bky" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bkz" = (
@@ -32589,9 +32035,7 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/obj/machinery/computer/security/mining{
- network = list("mine","auxbase")
- },
+/obj/machinery/computer/security/mining,
/obj/machinery/keycard_auth{
pixel_y = 24
},
@@ -32652,9 +32096,7 @@
/obj/structure/toilet{
pixel_y = 13
},
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/effect/landmark/start/captain,
/obj/machinery/light_switch{
pixel_y = -25
@@ -32720,9 +32162,7 @@
dir = 4
},
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/yellow{
- dir = 2
- },
+/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bkT" = (
@@ -32760,9 +32200,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"bkW" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
@@ -32815,9 +32253,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"blb" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
@@ -33068,7 +32504,6 @@
/area/ai_monitored/turret_protected/ai)
"blF" = (
/obj/structure/showcase/cyborg/old{
- dir = 2;
pixel_y = 20
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -33077,20 +32512,22 @@
/obj/effect/turf_decal/tile/blue{
dir = 1
},
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"blG" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"blH" = (
/obj/structure/showcase/cyborg/old{
- dir = 2;
pixel_y = 20
},
/obj/effect/turf_decal/tile/blue{
dir = 4
},
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"blI" = (
@@ -33162,7 +32599,6 @@
pixel_y = 26
},
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 2;
name = "Auxiliary MiniSat Distribution Port"
},
/obj/machinery/portable_atmospherics/canister/air,
@@ -33411,7 +32847,6 @@
dir = 4
},
/obj/structure/sign/directions/command{
- dir = 2;
pixel_y = -8
},
/turf/closed/wall/r_wall,
@@ -33425,9 +32860,7 @@
dir = 8;
pixel_x = 24
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bmo" = (
@@ -33573,7 +33006,6 @@
icon_state = "4-8"
},
/obj/machinery/door/window/brigdoor{
- dir = 2;
name = "Command Desk";
req_access_txt = "19"
},
@@ -33673,9 +33105,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/yellow{
- dir = 2
- },
+/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bmL" = (
@@ -33818,9 +33248,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plasteel,
/area/engine/break_room)
"bnb" = (
@@ -34044,8 +33472,6 @@
"bny" = (
/obj/machinery/turretid{
control_area = "/area/ai_monitored/turret_protected/aisat_interior";
- enabled = 1;
- icon_state = "control_standby";
name = "Antechamber Turret Control";
pixel_x = 30;
req_access_txt = "65"
@@ -34089,6 +33515,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 1
},
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"bnC" = (
@@ -34107,13 +33534,14 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"bnE" = (
/obj/machinery/power/apc{
+ areastring = "/area/ai_monitored/turret_protected/aisat_interior";
dir = 4;
name = "MiniSat Antechamber APC";
- areastring = "/area/ai_monitored/turret_protected/aisat_interior";
pixel_x = 29
},
/obj/structure/cable/yellow{
@@ -34319,9 +33747,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"bnY" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -34335,8 +33761,7 @@
dir = 1
},
/obj/machinery/camera{
- c_tag = "Port Primary Hallway - Middle";
- dir = 2
+ c_tag = "Port Primary Hallway - Middle"
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -34355,9 +33780,9 @@
/area/hallway/primary/port)
"bob" = (
/obj/machinery/power/apc{
+ areastring = "/area/hallway/primary/port";
dir = 1;
name = "Port Hallway APC";
- areastring = "/area/hallway/primary/port";
pixel_x = -1;
pixel_y = 26
},
@@ -34387,8 +33812,6 @@
dir = 4
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 21
},
@@ -34421,9 +33844,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/tile/brown{
dir = 4
},
@@ -34512,9 +33933,9 @@
/area/crew_quarters/heads/hop)
"bop" = (
/obj/machinery/power/apc/highcap/ten_k{
+ areastring = "/area/bridge";
dir = 8;
name = "Bridge APC";
- areastring = "/area/bridge";
pixel_x = -27
},
/obj/structure/cable/yellow,
@@ -34772,8 +34193,7 @@
/obj/item/stack/packageWrap,
/obj/item/gun/ballistic/revolver/doublebarrel,
/obj/machinery/camera{
- c_tag = "Bar - Backroom";
- dir = 2
+ c_tag = "Bar - Backroom"
},
/obj/structure/sink/kitchen{
pixel_y = 28
@@ -34788,9 +34208,6 @@
/area/crew_quarters/dorms)
"boT" = (
/obj/machinery/door/window/southleft{
- base_state = "left";
- dir = 2;
- icon_state = "left";
name = "Bar Delivery";
req_access_txt = "25"
},
@@ -35372,9 +34789,9 @@
/area/hallway/secondary/entry)
"bqd" = (
/obj/machinery/power/apc{
+ areastring = "/area/hallway/secondary/entry";
dir = 4;
name = "Arrivals APC";
- areastring = "/area/hallway/secondary/entry";
pixel_x = 24
},
/obj/structure/cable/yellow{
@@ -35467,9 +34884,9 @@
/obj/machinery/door/window{
base_state = "leftsecure";
dir = 8;
- obj_integrity = 300;
icon_state = "leftsecure";
name = "Primary AI Core Access";
+ obj_integrity = 300;
req_access_txt = "16"
},
/obj/machinery/newscaster/security_unit{
@@ -35629,9 +35046,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bqB" = (
@@ -35649,7 +35064,6 @@
icon_state = "1-2"
},
/obj/machinery/door/window{
- dir = 2;
name = "HoP's Desk";
req_access_txt = "57"
},
@@ -35667,8 +35081,6 @@
req_access_txt = "57"
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 21
},
@@ -35776,8 +35188,6 @@
/area/bridge)
"bqP" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = -29
},
@@ -35856,9 +35266,9 @@
/obj/structure/table/wood,
/obj/item/book/manual/wiki/security_space_law,
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/heads/captain/private";
dir = 8;
name = "Captain's Quarters APC";
- areastring = "/area/crew_quarters/heads/captain/private";
pixel_x = -24
},
/obj/structure/cable/yellow{
@@ -35937,9 +35347,9 @@
"brd" = (
/obj/structure/table,
/obj/machinery/power/apc{
+ areastring = "/area/storage/art";
dir = 8;
name = "Art Storage APC";
- areastring = "/area/storage/art";
pixel_x = -25
},
/obj/structure/cable/yellow{
@@ -36003,8 +35413,6 @@
dir = 4
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = -30
},
@@ -36101,9 +35509,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/open/floor/plating,
/area/maintenance/starboard)
"brt" = (
@@ -36192,9 +35598,7 @@
/obj/structure/sign/warning/securearea{
pixel_x = 32
},
-/turf/open/floor/plasteel/dark/corner{
- dir = 2
- },
+/turf/open/floor/plasteel/dark/corner,
/area/hallway/primary/starboard)
"brA" = (
/obj/machinery/vending/coffee,
@@ -36248,9 +35652,8 @@
dir = 4
},
/obj/machinery/power/apc{
- dir = 2;
- name = "Engineering Foyer APC";
areastring = "/area/engine/break_room";
+ name = "Engineering Foyer APC";
pixel_x = -1;
pixel_y = -26
},
@@ -36392,9 +35795,8 @@
network = list("minisat")
},
/obj/machinery/power/apc{
- dir = 2;
- name = "MiniSat Exterior APC";
areastring = "/area/aisat";
+ name = "MiniSat Exterior APC";
pixel_y = -24
},
/obj/structure/cable/yellow{
@@ -36418,7 +35820,6 @@
/area/aisat)
"brS" = (
/obj/machinery/door/window{
- dir = 2;
name = "MiniSat Walkway Access"
},
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
@@ -36477,9 +35878,7 @@
/obj/machinery/status_display/ai{
pixel_y = 32
},
-/obj/machinery/porta_turret/ai{
- dir = 2
- },
+/obj/machinery/porta_turret/ai,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
},
@@ -36507,9 +35906,8 @@
dir = 4
},
/obj/machinery/power/apc/highcap/five_k{
- dir = 2;
- name = "MiniSat Foyer APC";
areastring = "/area/ai_monitored/turret_protected/aisat/foyer";
+ name = "MiniSat Foyer APC";
pixel_y = -29
},
/obj/structure/cable/yellow,
@@ -36572,9 +35970,7 @@
/obj/machinery/status_display{
pixel_y = 32
},
-/obj/machinery/porta_turret/ai{
- dir = 2
- },
+/obj/machinery/porta_turret/ai,
/obj/machinery/computer/security/telescreen/minisat{
dir = 8;
pixel_x = 28
@@ -36749,15 +36145,11 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"bsw" = (
/obj/item/radio/intercom{
- broadcasting = 0;
- listening = 1;
name = "Station Intercom (General)";
pixel_y = -28
},
@@ -36789,9 +36181,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"bsz" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
@@ -36881,9 +36271,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"bsI" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/structure/extinguisher_cabinet{
pixel_y = -30
},
@@ -37383,8 +36771,6 @@
/area/engine/break_room)
"btE" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = -28
},
@@ -37426,9 +36812,9 @@
icon_state = "0-2"
},
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/heads/hop";
dir = 1;
name = "Head of Personnel APC";
- areastring = "/area/crew_quarters/heads/hop";
pixel_y = 24
},
/turf/open/floor/carpet,
@@ -37701,9 +37087,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bum" = (
@@ -38035,9 +37419,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard)
"buZ" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
@@ -38089,23 +37471,18 @@
/area/maintenance/starboard)
"bvf" = (
/obj/item/radio/intercom{
- broadcasting = 0;
freerange = 1;
- listening = 1;
name = "Common Channel";
pixel_x = -27;
pixel_y = -7
},
/obj/item/radio/intercom{
- anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
pixel_y = -27
},
/obj/item/radio/intercom{
- anyai = 1;
- broadcasting = 0;
freerange = 1;
frequency = 1447;
name = "Private Channel";
@@ -38211,9 +37588,7 @@
c_tag = "Engineering - Transit Tube Access";
dir = 8
},
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel/dark,
/area/engine/break_room)
"bvq" = (
@@ -38279,7 +37654,6 @@
"bvw" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/showcase/cyborg/old{
- dir = 2;
pixel_y = 20
},
/turf/open/floor/plasteel/grimy,
@@ -38296,7 +37670,6 @@
pixel_y = 28
},
/obj/structure/showcase/cyborg/old{
- dir = 2;
pixel_y = 20
},
/turf/open/floor/plasteel/grimy,
@@ -38416,9 +37789,7 @@
/obj/structure/cable/yellow{
icon_state = "1-8"
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -38598,9 +37969,7 @@
/obj/machinery/computer/security/telescreen/entertainment{
pixel_y = 30
},
-/turf/open/floor/plasteel/cult{
- dir = 2
- },
+/turf/open/floor/plasteel/cult,
/area/library)
"bwg" = (
/obj/structure/table/wood,
@@ -38609,9 +37978,7 @@
},
/obj/item/folder,
/obj/item/folder,
-/turf/open/floor/plasteel/cult{
- dir = 2
- },
+/turf/open/floor/plasteel/cult,
/area/library)
"bwh" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -38762,8 +38129,7 @@
/area/bridge)
"bwv" = (
/obj/machinery/camera{
- c_tag = "Council Chamber";
- dir = 2
+ c_tag = "Council Chamber"
},
/obj/machinery/light{
dir = 1
@@ -38853,9 +38219,7 @@
/turf/open/floor/carpet,
/area/crew_quarters/heads/captain/private)
"bwE" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -38957,8 +38321,7 @@
/area/crew_quarters/bar)
"bwM" = (
/obj/machinery/camera{
- c_tag = "Bar";
- dir = 2
+ c_tag = "Bar"
},
/obj/machinery/requests_console{
department = "Bar";
@@ -39030,9 +38393,9 @@
/area/crew_quarters/bar)
"bwR" = (
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/crew_quarters/bar";
dir = 1;
name = "Bar APC";
- areastring = "/area/crew_quarters/bar";
pixel_y = 25
},
/obj/structure/cable/yellow{
@@ -39060,8 +38423,6 @@
/area/crew_quarters/bar)
"bwU" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 21
},
@@ -39072,8 +38433,7 @@
dir = 1
},
/obj/machinery/camera{
- c_tag = "Club - Fore";
- dir = 2
+ c_tag = "Club - Fore"
},
/turf/open/floor/wood,
/area/crew_quarters/bar)
@@ -39341,15 +38701,11 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/blue{
- dir = 2
- },
+/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bxC" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
@@ -39376,8 +38732,6 @@
dir = 4
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = -25
},
@@ -39413,7 +38767,6 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/firealarm{
- dir = 2;
pixel_y = -24
},
/obj/effect/turf_decal/tile/neutral,
@@ -39563,17 +38916,14 @@
"bxS" = (
/obj/item/cigbutt,
/obj/machinery/power/apc/highcap/five_k{
- dir = 2;
- name = "Port Maintenance APC";
areastring = "/area/maintenance/port";
+ name = "Port Maintenance APC";
pixel_y = -24
},
/obj/structure/cable/yellow{
icon_state = "0-4"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/port)
"bxT" = (
@@ -39601,17 +38951,13 @@
/turf/open/floor/wood,
/area/library)
"bxW" = (
-/turf/open/floor/plasteel/cult{
- dir = 2
- },
+/turf/open/floor/plasteel/cult,
/area/library)
"bxX" = (
/obj/structure/chair/comfy/brown{
dir = 1
},
-/turf/open/floor/plasteel/cult{
- dir = 2
- },
+/turf/open/floor/plasteel/cult,
/area/library)
"bxY" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -39645,7 +38991,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/window/northleft{
dir = 2;
- icon_state = "left";
name = "Reception Window"
},
/obj/machinery/door/poddoor/preopen{
@@ -39814,9 +39159,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"byx" = (
-/obj/machinery/porta_turret/ai{
- dir = 2
- },
+/obj/machinery/porta_turret/ai,
/obj/machinery/flasher{
id = "AI";
pixel_y = 24
@@ -39901,9 +39244,7 @@
/turf/open/floor/wood,
/area/crew_quarters/bar)
"byG" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/structure/disposalpipe/junction/flip{
dir = 4
},
@@ -39943,9 +39284,9 @@
/area/engine/break_room)
"byL" = (
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/theatre";
dir = 1;
name = "Theatre APC";
- areastring = "/area/crew_quarters/theatre";
pixel_y = 25
},
/obj/structure/cable/yellow{
@@ -39978,9 +39319,8 @@
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/machinery/power/apc{
- dir = 2;
- name = "MiniSat Maint APC";
areastring = "/area/ai_monitored/storage/satellite";
+ name = "MiniSat Maint APC";
pixel_y = -26
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -40010,8 +39350,6 @@
/area/hallway/primary/starboard)
"byR" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = -30
},
@@ -40125,9 +39463,9 @@
/area/engine/atmos)
"byX" = (
/obj/machinery/power/apc/highcap/ten_k{
+ areastring = "/area/engine/atmos";
dir = 1;
name = "Atmospherics APC";
- areastring = "/area/engine/atmos";
pixel_y = 28
},
/obj/structure/cable/yellow{
@@ -40148,7 +39486,6 @@
"byZ" = (
/obj/machinery/space_heater,
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/obj/effect/turf_decal/stripes/line{
@@ -40359,9 +39696,9 @@
/area/tcommsat/computer)
"bzt" = (
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/tcommsat/computer";
dir = 4;
name = "Telecomms Control Room APC";
- areastring = "/area/tcommsat/computer";
pixel_x = 26
},
/obj/machinery/computer/telecomms/server{
@@ -40419,7 +39756,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/grunge/abandoned{
name = "Vacant Office";
- opacity = 1;
req_access_txt = "32"
},
/obj/structure/cable/yellow{
@@ -40474,17 +39810,13 @@
/obj/machinery/door/morgue{
name = "Study #1"
},
-/turf/open/floor/plasteel/cult{
- dir = 2
- },
+/turf/open/floor/plasteel/cult,
/area/library)
"bzH" = (
/obj/machinery/door/morgue{
name = "Study #2"
},
-/turf/open/floor/plasteel/cult{
- dir = 2
- },
+/turf/open/floor/plasteel/cult,
/area/library)
"bzI" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -40509,8 +39841,6 @@
/area/hallway/secondary/command)
"bzM" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 21
},
@@ -40529,8 +39859,6 @@
/area/hallway/secondary/command)
"bzO" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 21
},
@@ -40727,9 +40055,7 @@
/area/crew_quarters/bar)
"bAk" = (
/obj/structure/table/reinforced,
-/obj/item/clothing/head/that{
- throwforce = 1
- },
+/obj/item/clothing/head/that,
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
@@ -41637,7 +40963,6 @@
/obj/structure/table/reinforced,
/obj/machinery/door/window/northleft{
dir = 4;
- icon_state = "left";
name = "Atmospherics Desk";
req_access_txt = "24"
},
@@ -41929,9 +41254,8 @@
dir = 9
},
/obj/machinery/power/apc/highcap/five_k{
- dir = 2;
- name = "Auxiliary Restrooms APC";
areastring = "/area/crew_quarters/toilet/auxiliary";
+ name = "Auxiliary Restrooms APC";
pixel_y = -24
},
/obj/structure/cable/yellow,
@@ -42071,8 +41395,6 @@
dir = 4
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 21
},
@@ -42168,9 +41490,9 @@
dir = 4
},
/obj/machinery/power/apc/highcap/ten_k{
+ areastring = "/area/hallway/secondary/command";
dir = 1;
name = "Command Hallway APC";
- areastring = "/area/hallway/secondary/command";
pixel_y = 25
},
/obj/structure/cable/yellow{
@@ -42214,14 +41536,11 @@
dir = 4
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 21
},
/obj/machinery/camera{
- c_tag = "Command Hallway - Starboard";
- dir = 2
+ c_tag = "Command Hallway - Starboard"
},
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -42258,9 +41577,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/disposalpipe/segment{
dir = 5
},
@@ -42348,8 +41665,7 @@
"bDG" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/grunge{
- name = "Club";
- opacity = 1
+ name = "Club"
},
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -42536,14 +41852,12 @@
/obj/machinery/telecomms/processor/preset_one,
/obj/machinery/camera{
c_tag = "Telecomms - Server Room - Fore-Port";
- dir = 2;
network = list("ss13","tcomms")
},
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/tcommsat/server)
"bEg" = (
/obj/structure/showcase/cyborg/old{
- dir = 2;
pixel_y = 20
},
/turf/open/floor/plasteel/dark/telecomms,
@@ -42567,7 +41881,6 @@
/obj/machinery/telecomms/processor/preset_three,
/obj/machinery/camera{
c_tag = "Telecomms - Server Room - Fore-Starboard";
- dir = 2;
network = list("ss13","tcomms")
},
/turf/open/floor/circuit/green/telecomms/mainframe,
@@ -42718,9 +42031,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bED" = (
@@ -42862,9 +42173,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/machinery/newscaster{
pixel_y = -29
},
@@ -42893,9 +42202,7 @@
icon_state = "4-8"
},
/obj/machinery/light,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
@@ -42946,9 +42253,7 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bET" = (
@@ -42959,9 +42264,7 @@
icon_state = "4-8"
},
/obj/machinery/light,
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bEU" = (
@@ -42977,9 +42280,7 @@
/obj/structure/cable/yellow{
icon_state = "1-4"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bEV" = (
@@ -42995,9 +42296,7 @@
/obj/machinery/newscaster{
pixel_y = -29
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bEW" = (
@@ -43007,9 +42306,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bEX" = (
@@ -43023,9 +42320,7 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bEY" = (
@@ -43035,9 +42330,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bEZ" = (
@@ -43050,9 +42343,7 @@
/obj/structure/extinguisher_cabinet{
pixel_y = -30
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bFa" = (
@@ -43067,9 +42358,7 @@
dir = 1;
pixel_y = -24
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bFb" = (
@@ -43079,34 +42368,24 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bFc" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/effect/landmark/event_spawn,
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bFd" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bFe" = (
@@ -43122,9 +42401,7 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bFf" = (
@@ -43138,9 +42415,7 @@
/obj/machinery/door/airlock/public/glass{
name = "Command Hallway"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bFg" = (
@@ -43178,9 +42453,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bFj" = (
@@ -43250,9 +42523,7 @@
/turf/open/floor/plasteel,
/area/crew_quarters/bar)
"bFo" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -43271,8 +42542,7 @@
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/grunge{
- name = "Club";
- opacity = 1
+ name = "Club"
},
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -43506,9 +42776,7 @@
dir = 4
},
/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/plasteel/dark/corner{
- dir = 2
- },
+/turf/open/floor/plasteel/dark/corner,
/area/engine/atmos)
"bFK" = (
/obj/machinery/disposal/bin,
@@ -43782,9 +43050,7 @@
c_tag = "Central Primary Hallway - Port";
dir = 8
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bGx" = (
@@ -43905,9 +43171,7 @@
c_tag = "Command Hallway - Central";
dir = 8
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bGM" = (
@@ -44021,9 +43285,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bGY" = (
@@ -44044,9 +43306,7 @@
/turf/open/floor/plasteel,
/area/crew_quarters/bar)
"bHa" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
@@ -44098,9 +43358,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/wood,
/area/crew_quarters/bar)
"bHg" = (
@@ -44221,9 +43479,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/engine/atmos)
@@ -44595,19 +43851,16 @@
/turf/open/floor/plasteel/dark,
/area/teleporter)
"bIh" = (
-/obj/structure/closet/crate{
- icon_state = "crate";
- opened = 0
- },
+/obj/structure/closet/crate,
/obj/item/stack/cable_coil,
/obj/item/crowbar,
/obj/item/screwdriver{
pixel_y = 16
},
/obj/machinery/power/apc{
+ areastring = "/area/teleporter";
dir = 4;
name = "Teleporter APC";
- areastring = "/area/teleporter";
pixel_x = 24
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -44660,9 +43913,7 @@
/obj/structure/cable/yellow{
icon_state = "1-4"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bIl" = (
@@ -44719,9 +43970,9 @@
/obj/item/storage/toolbox/emergency,
/obj/item/flashlight,
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/gateway";
dir = 4;
name = "Gateway APC";
- areastring = "/area/gateway";
pixel_x = 28
},
/obj/structure/cable/yellow{
@@ -44754,9 +44005,7 @@
/area/hallway/primary/central)
"bIs" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bIt" = (
@@ -44777,8 +44026,6 @@
/area/crew_quarters/bar)
"bIu" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = -28
},
@@ -44912,9 +44159,7 @@
/area/engine/atmos)
"bIK" = (
/obj/machinery/portable_atmospherics/canister/nitrogen,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/engine/atmos)
@@ -45158,9 +44403,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -45184,8 +44427,6 @@
dir = 4
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = -29
},
@@ -45368,10 +44609,7 @@
/turf/open/floor/plasteel,
/area/teleporter)
"bJL" = (
-/obj/structure/closet/crate{
- icon_state = "crate";
- opened = 0
- },
+/obj/structure/closet/crate,
/obj/item/stack/sheet/rglass{
amount = 50
},
@@ -45429,9 +44667,7 @@
/obj/structure/chair{
dir = 1
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bJQ" = (
@@ -45452,9 +44688,7 @@
/obj/structure/cable/yellow{
icon_state = "1-4"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bJS" = (
@@ -45607,9 +44841,7 @@
"bKd" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bKe" = (
@@ -45681,9 +44913,7 @@
name = "Kitchen";
req_access_txt = "28"
},
-/turf/open/floor/plasteel/cafeteria{
- dir = 2
- },
+/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"bKl" = (
/obj/machinery/vending/snack/random,
@@ -45776,9 +45006,7 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bKx" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bKy" = (
@@ -45903,7 +45131,6 @@
},
/obj/machinery/door/window{
base_state = "right";
- dir = 2;
icon_state = "right";
name = "MiniSat Walkway Access"
},
@@ -45980,9 +45207,9 @@
/area/maintenance/port)
"bKY" = (
/obj/machinery/power/apc{
+ areastring = "/area/security/vacantoffice";
dir = 8;
name = "Vacant Office APC";
- areastring = "/area/security/vacantoffice";
pixel_x = -25
},
/obj/structure/cable/yellow{
@@ -46083,9 +45310,9 @@
pixel_y = -1
},
/obj/machinery/power/apc{
+ areastring = "/area/ai_monitored/storage/eva";
dir = 8;
name = "E.V.A. Storage APC";
- areastring = "/area/ai_monitored/storage/eva";
pixel_x = -24
},
/obj/structure/cable/yellow{
@@ -46354,9 +45581,7 @@
pixel_x = -26;
req_access_txt = "28"
},
-/turf/open/floor/plasteel/cafeteria{
- dir = 2
- },
+/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"bLJ" = (
/obj/structure/table,
@@ -46375,9 +45600,7 @@
pixel_x = 6;
pixel_y = 26
},
-/turf/open/floor/plasteel/cafeteria{
- dir = 2
- },
+/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"bLK" = (
/turf/open/floor/plasteel/cafeteria{
@@ -46543,8 +45766,6 @@
"bMe" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = -26
},
@@ -46661,9 +45882,9 @@
/area/tcommsat/server)
"bMs" = (
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/tcommsat/server";
dir = 4;
name = "Telecomms Server Room APC";
- areastring = "/area/tcommsat/server";
pixel_x = 25
},
/obj/machinery/light/small{
@@ -46708,8 +45929,6 @@
dir = 4
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = -25
},
@@ -46729,9 +45948,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 2
- },
+/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bMz" = (
@@ -46747,9 +45964,7 @@
/turf/open/floor/plasteel/white/corner,
/area/hallway/secondary/entry)
"bMA" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -46833,9 +46048,9 @@
"bMH" = (
/obj/machinery/light/small,
/obj/machinery/power/apc{
+ areastring = "/area/library";
dir = 8;
name = "Library APC";
- areastring = "/area/library";
pixel_x = -25
},
/obj/structure/cable/yellow{
@@ -46949,7 +46164,6 @@
/area/ai_monitored/storage/eva)
"bMU" = (
/obj/structure/tank_dispenser/oxygen{
- layer = 2.9;
pixel_x = -1;
pixel_y = 2
},
@@ -47075,8 +46289,6 @@
dir = 1
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 21
},
@@ -47100,8 +46312,7 @@
/obj/item/clothing/under/suit_jacket/really_black,
/obj/item/clothing/glasses/sunglasses,
/obj/machinery/camera{
- c_tag = "Corporate Showroom";
- dir = 2
+ c_tag = "Corporate Showroom"
},
/turf/open/floor/wood,
/area/bridge/showroom/corporate)
@@ -47269,9 +46480,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bNv" = (
@@ -47347,9 +46556,7 @@
pixel_x = 24
},
/obj/machinery/vending/dinnerware,
-/turf/open/floor/plasteel/cafeteria{
- dir = 2
- },
+/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"bND" = (
/obj/structure/extinguisher_cabinet{
@@ -47410,9 +46617,9 @@
dir = 8
},
/obj/machinery/power/apc{
+ areastring = "/area/storage/tcom";
dir = 8;
name = "Telecomms Storage APC";
- areastring = "/area/storage/tcom";
pixel_x = -28
},
/obj/structure/cable/yellow{
@@ -47495,7 +46702,6 @@
/obj/machinery/atmospherics/pipe/simple/green/visible,
/obj/machinery/door/window/northleft{
dir = 8;
- icon_state = "left";
name = "Inner Pipe Access";
req_access_txt = "24"
},
@@ -47506,7 +46712,6 @@
dir = 4
},
/obj/machinery/door/window{
- dir = 2;
name = "MiniSat Walkway Access"
},
/obj/machinery/camera{
@@ -47600,8 +46805,7 @@
"bOk" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/grunge{
- name = "Quiet Room";
- opacity = 1
+ name = "Quiet Room"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/wood,
@@ -47609,8 +46813,7 @@
"bOl" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/grunge{
- name = "Quiet Room";
- opacity = 1
+ name = "Quiet Room"
},
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -47809,9 +47012,9 @@
/area/bridge/showroom/corporate)
"bOF" = (
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/bridge/showroom/corporate";
dir = 4;
name = "Nanotrasen Corporate Showroom APC";
- areastring = "/area/bridge/showroom/corporate";
pixel_x = 28
},
/obj/structure/cable/yellow{
@@ -48262,9 +47465,7 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/hallway/secondary/entry)
"bPC" = (
@@ -48519,12 +47720,10 @@
icon_state = "1-2"
},
/obj/item/bodypart/chest/robot{
- name = "cyborg torso";
pixel_x = -2;
pixel_y = 2
},
/obj/item/bodypart/head/robot{
- name = "cyborg head";
pixel_x = 3;
pixel_y = 2
},
@@ -48613,12 +47812,8 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/gateway)
"bQs" = (
@@ -48800,9 +47995,7 @@
pixel_x = 30
},
/obj/machinery/processor,
-/turf/open/floor/plasteel/cafeteria{
- dir = 2
- },
+/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"bQI" = (
/obj/machinery/vending/wardrobe/chef_wardrobe,
@@ -48997,9 +48190,7 @@
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"bRq" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"bRr" = (
@@ -49078,7 +48269,6 @@
},
/obj/item/toy/beach_ball{
desc = "The simple beach ball is one of Nanotrasen's most popular products. 'Why do we make beach balls? Because we can! (TM)' - Nanotrasen";
- item_state = "beachball";
name = "Nanotrasen-brand beach ball";
pixel_y = 7
},
@@ -49111,12 +48301,10 @@
pixel_y = 3
},
/obj/item/clothing/mask/cigarette/cigar{
- name = "premium cigar";
pixel_x = 4;
pixel_y = 1
},
/obj/item/clothing/mask/cigarette/cigar{
- name = "premium cigar";
pixel_x = -4;
pixel_y = 1
},
@@ -49156,7 +48344,6 @@
pixel_y = -1
},
/obj/item/disk/tech_disk{
- name = "technology disk";
pixel_x = -2;
pixel_y = -3
},
@@ -49179,12 +48366,8 @@
/obj/structure/cable/yellow{
icon_state = "2-8"
},
-/obj/item/toy/gun{
- name = "cap gun"
- },
-/obj/item/restraints/handcuffs{
- name = "handcuffs"
- },
+/obj/item/toy/gun,
+/obj/item/restraints/handcuffs,
/obj/structure/table/wood,
/obj/item/clothing/head/collectable/HoS{
name = "novelty HoS hat"
@@ -49256,9 +48439,7 @@
},
/area/gateway)
"bRL" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/gateway)
"bRM" = (
@@ -49270,9 +48451,7 @@
c_tag = "Gateway - Access";
dir = 8
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/gateway)
"bRN" = (
@@ -49302,15 +48481,12 @@
pixel_x = -23
},
/obj/machinery/power/apc{
- dir = 2;
- name = "Kitchen APC";
areastring = "/area/crew_quarters/kitchen";
+ name = "Kitchen APC";
pixel_y = -24
},
/obj/structure/cable/yellow,
-/turf/open/floor/plasteel/cafeteria{
- dir = 2
- },
+/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"bRQ" = (
/obj/structure/table,
@@ -49320,9 +48496,7 @@
/obj/item/reagent_containers/food/condiment/enzyme{
layer = 5
},
-/turf/open/floor/plasteel/cafeteria{
- dir = 2
- },
+/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"bRR" = (
/obj/structure/table,
@@ -49351,9 +48525,7 @@
c_tag = "Kitchen";
dir = 1
},
-/turf/open/floor/plasteel/cafeteria{
- dir = 2
- },
+/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"bRT" = (
/obj/structure/extinguisher_cabinet{
@@ -49659,9 +48831,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -49831,9 +49001,7 @@
/area/hallway/primary/central)
"bSR" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/green{
- dir = 2
- },
+/obj/effect/turf_decal/tile/green,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bSS" = (
@@ -49945,9 +49113,9 @@
/area/maintenance/starboard)
"bTc" = (
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/starboard";
dir = 1;
name = "Starboard Maintenance APC";
- areastring = "/area/maintenance/starboard";
pixel_x = -1;
pixel_y = 26
},
@@ -49984,9 +49152,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard)
"bTf" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/general/visible,
/obj/machinery/meter,
/turf/open/floor/plating,
/area/maintenance/starboard)
@@ -50177,7 +49343,6 @@
dir = 4
},
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/obj/effect/turf_decal/stripes/corner{
@@ -50230,8 +49395,6 @@
dir = 4
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 21
},
@@ -50293,9 +49456,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bTR" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -50333,9 +49494,9 @@
dir = 1
},
/obj/machinery/power/apc/highcap/ten_k{
+ areastring = "/area/hallway/primary/central";
dir = 1;
name = "Central Primary Hallway APC";
- areastring = "/area/hallway/primary/central";
pixel_y = 24
},
/obj/structure/cable/yellow{
@@ -50379,8 +49540,6 @@
dir = 4
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 21
},
@@ -50406,9 +49565,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bTZ" = (
-/obj/structure/bookcase{
- name = "bookcase"
- },
+/obj/structure/bookcase,
/turf/open/floor/wood,
/area/bridge/showroom/corporate)
"bUa" = (
@@ -50694,8 +49851,6 @@
/area/engine/atmos)
"bUC" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 28
},
@@ -50783,9 +49938,9 @@
/area/aisat)
"bUN" = (
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/solars/port/aft";
dir = 8;
name = "Port Quarter Solar APC";
- areastring = "/area/maintenance/solars/port/aft";
pixel_x = -26;
pixel_y = 3
},
@@ -51175,12 +50330,8 @@
dir = 4;
pixel_x = 11
},
-/obj/effect/turf_decal/bot{
- dir = 2
- },
-/turf/open/floor/plasteel{
- dir = 2
- },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
/area/hydroponics)
"bVz" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -51287,9 +50438,7 @@
},
/area/engine/atmos)
"bVJ" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible,
/obj/machinery/meter,
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -51492,9 +50641,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
@@ -51574,9 +50721,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bWo" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bWp" = (
@@ -51596,9 +50741,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bWr" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/plaque{
icon_state = "L2"
},
@@ -51697,9 +50840,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bWC" = (
@@ -51710,9 +50851,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bWD" = (
@@ -51722,16 +50861,12 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bWE" = (
/obj/machinery/light,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/extinguisher_cabinet{
pixel_y = -30
},
@@ -51739,46 +50874,34 @@
c_tag = "Central Primary Hallway - Aft-Starboard Corner";
dir = 1
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bWF" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bWG" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/machinery/airalarm{
dir = 1;
pixel_y = -22
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bWH" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/green{
- dir = 2
- },
+/obj/effect/turf_decal/tile/green,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bWI" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -52180,8 +51303,7 @@
/obj/machinery/power/solar_control{
dir = 1;
id = "aftport";
- name = "Port Quarter Solar Control";
- track = 0
+ name = "Port Quarter Solar Control"
},
/obj/structure/cable{
icon_state = "0-4"
@@ -52193,9 +51315,7 @@
/obj/structure/cable{
icon_state = "2-8"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/solars/port/aft)
"bXv" = (
@@ -52261,9 +51381,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/port)
"bXH" = (
@@ -52353,22 +51471,16 @@
/area/hallway/primary/central)
"bXT" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/purple{
- dir = 2
- },
+/obj/effect/turf_decal/tile/purple,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bXU" = (
/obj/machinery/light/small,
-/obj/effect/turf_decal/tile/purple{
- dir = 2
- },
+/obj/effect/turf_decal/tile/purple,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bXV" = (
-/obj/effect/turf_decal/tile/purple{
- dir = 2
- },
+/obj/effect/turf_decal/tile/purple,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bXW" = (
@@ -52376,16 +51488,12 @@
c_tag = "Central Primary Hallway - Aft-Starboard";
dir = 1
},
-/obj/effect/turf_decal/tile/purple{
- dir = 2
- },
+/obj/effect/turf_decal/tile/purple,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bXX" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/purple{
- dir = 2
- },
+/obj/effect/turf_decal/tile/purple,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bXY" = (
@@ -52394,9 +51502,7 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/purple{
- dir = 2
- },
+/obj/effect/turf_decal/tile/purple,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bXZ" = (
@@ -52407,9 +51513,7 @@
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-10"
},
-/obj/effect/turf_decal/tile/purple{
- dir = 2
- },
+/obj/effect/turf_decal/tile/purple,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bYa" = (
@@ -52737,9 +51841,7 @@
/area/maintenance/port/aft)
"bYI" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"bYJ" = (
@@ -52850,7 +51952,6 @@
/obj/item/clothing/neck/stethoscope,
/obj/item/radio/intercom{
broadcasting = 1;
- freerange = 0;
frequency = 1485;
listening = 0;
name = "Station Intercom (Medbay)";
@@ -52914,9 +52015,9 @@
/area/medical/storage)
"bYX" = (
/obj/machinery/power/apc{
+ areastring = "/area/security/checkpoint/medical";
dir = 8;
name = "Medical Security Checkpoint APC";
- areastring = "/area/security/checkpoint/medical";
pixel_x = -24
},
/obj/machinery/airalarm{
@@ -52952,7 +52053,6 @@
},
/obj/machinery/camera{
c_tag = "Security Post - Medbay";
- dir = 2;
network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/red{
@@ -53004,16 +52104,12 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/firedoor,
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/medical/medbay/central)
"bZd" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/firedoor,
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/medical/medbay/central)
"bZe" = (
/obj/structure/sign/directions/security{
@@ -53056,9 +52152,7 @@
/obj/machinery/door/airlock/public/glass{
name = "Aft Primary Hallway"
},
-/obj/effect/turf_decal/tile/purple{
- dir = 2
- },
+/obj/effect/turf_decal/tile/purple,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bZi" = (
@@ -53084,9 +52178,7 @@
"bZl" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/science/research)
"bZm" = (
/obj/structure/cable/yellow{
@@ -53095,9 +52187,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/science/research)
"bZn" = (
/turf/closed/wall,
@@ -53225,8 +52315,6 @@
dir = 5
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = -30
},
@@ -53611,9 +52699,7 @@
/area/hallway/primary/aft)
"cas" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/purple{
- dir = 2
- },
+/obj/effect/turf_decal/tile/purple,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"cat" = (
@@ -53731,7 +52817,6 @@
},
/obj/machinery/camera{
c_tag = "Research Division - Lobby";
- dir = 2;
network = list("ss13","rd")
},
/obj/effect/turf_decal/tile/purple{
@@ -53935,12 +53020,8 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/effect/turf_decal/bot{
- dir = 2
- },
-/turf/open/floor/plasteel{
- dir = 2
- },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
/area/hydroponics)
"caQ" = (
/obj/structure/disposalpipe/segment{
@@ -53954,15 +53035,11 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/effect/turf_decal/bot{
- dir = 2
- },
+/obj/effect/turf_decal/bot,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
-/turf/open/floor/plasteel{
- dir = 2
- },
+/turf/open/floor/plasteel,
/area/hydroponics)
"caR" = (
/obj/structure/disposalpipe/segment{
@@ -54070,8 +53147,6 @@
/area/maintenance/disposal/incinerator)
"cbb" = (
/obj/machinery/door/window/northleft{
- dir = 1;
- icon_state = "left";
name = "Inner Pipe Access";
req_access_txt = "24"
},
@@ -54156,8 +53231,6 @@
dir = 8
},
/obj/machinery/door/window/northleft{
- dir = 1;
- icon_state = "left";
name = "Inner Pipe Access";
req_access_txt = "24"
},
@@ -54232,8 +53305,6 @@
dir = 4
},
/obj/machinery/door/window/northleft{
- dir = 1;
- icon_state = "left";
name = "Inner Pipe Access";
req_access_txt = "24"
},
@@ -54370,7 +53441,6 @@
/area/maintenance/port/aft)
"cby" = (
/obj/machinery/mecha_part_fabricator{
- dir = 2;
name = "counterfeit exosuit fabricator";
req_access = null
},
@@ -54506,9 +53576,7 @@
/turf/open/floor/plasteel/white,
/area/medical/storage)
"cbL" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -54551,7 +53619,6 @@
/area/medical/storage)
"cbP" = (
/obj/machinery/requests_console{
- announcementConsole = 0;
department = "Medbay";
departmentType = 1;
name = "Medbay RC"
@@ -54636,9 +53703,7 @@
/obj/structure/cable/yellow{
icon_state = "1-8"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/machinery/holopad,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
@@ -54881,9 +53946,8 @@
/obj/machinery/hydroponics/constructable,
/obj/machinery/light,
/obj/machinery/power/apc{
- dir = 2;
- name = "Hydroponics APC";
areastring = "/area/hydroponics";
+ name = "Hydroponics APC";
pixel_y = -28
},
/obj/structure/cable/yellow,
@@ -55158,13 +54222,11 @@
"ccZ" = (
/obj/machinery/door/window/northleft{
dir = 8;
- icon_state = "left";
name = "glass door";
req_access_txt = "24"
},
/obj/machinery/door/window/northleft{
dir = 4;
- icon_state = "left";
name = "glass door";
req_access_txt = "24"
},
@@ -55293,9 +54355,8 @@
},
/obj/structure/closet/l3closet,
/obj/machinery/power/apc{
- dir = 2;
- name = "Medbay Storage APC";
areastring = "/area/medical/storage";
+ name = "Medbay Storage APC";
pixel_y = -24
},
/obj/structure/cable/yellow,
@@ -55490,9 +54551,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/purple{
- dir = 2
- },
+/obj/effect/turf_decal/tile/purple,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"cdJ" = (
@@ -55711,7 +54770,6 @@
pixel_x = 32
},
/obj/machinery/atmospherics/components/binary/pump{
- dir = 2;
name = "Fuel Pipe to Incinerator"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -55967,10 +55025,7 @@
"ceF" = (
/obj/structure/bed/roller,
/obj/item/radio/intercom{
- broadcasting = 0;
- freerange = 0;
frequency = 1485;
- listening = 1;
name = "Station Intercom (Medbay)";
pixel_y = -30
},
@@ -56095,8 +55150,6 @@
dir = 4
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = -30
},
@@ -56226,9 +55279,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cfc" = (
@@ -56329,9 +55380,7 @@
/obj/structure/disposalpipe/segment{
dir = 9
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plating,
/area/maintenance/starboard)
"cfk" = (
@@ -56556,9 +55605,9 @@
},
/obj/item/pen,
/obj/machinery/power/apc{
+ areastring = "/area/medical/sleeper";
dir = 1;
name = "Sleeper Room APC";
- areastring = "/area/medical/sleeper";
pixel_y = 24
},
/obj/structure/cable/yellow{
@@ -56844,9 +55893,7 @@
dir = 8;
pixel_x = 24
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"cgd" = (
@@ -56913,9 +55960,9 @@
/area/science/research)
"cgj" = (
/obj/machinery/power/apc{
+ areastring = "/area/security/checkpoint/science/research";
dir = 8;
name = "Security Post - Research Division APC";
- areastring = "/area/security/checkpoint/science/research";
pixel_x = -24
},
/obj/structure/cable/yellow,
@@ -56957,9 +56004,7 @@
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cgn" = (
@@ -56989,9 +56034,9 @@
/area/maintenance/starboard/aft)
"cgt" = (
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/disposal/incinerator";
dir = 8;
name = "Incinerator APC";
- areastring = "/area/maintenance/disposal/incinerator";
pixel_x = -24
},
/obj/structure/cable/yellow{
@@ -57144,12 +56189,8 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cgM" = (
@@ -57494,9 +56535,7 @@
/area/hallway/primary/aft)
"chh" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"chi" = (
@@ -57511,8 +56550,6 @@
dir = 4
},
/obj/structure/noticeboard{
- desc = "A board for pinning important notices upon.";
- name = "notice board";
pixel_y = 31
},
/turf/open/floor/plasteel,
@@ -57656,7 +56693,6 @@
},
/obj/machinery/camera{
c_tag = "Experimentation Lab - Test Chamber";
- dir = 2;
network = list("ss13","rd")
},
/obj/machinery/light{
@@ -57746,7 +56782,6 @@
"chI" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/components/binary/valve{
- dir = 2;
name = "output gas to space"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -57777,7 +56812,6 @@
},
/obj/machinery/camera{
c_tag = "MiniSat Exterior - Aft";
- dir = 2;
network = list("minisat")
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -57987,9 +57021,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/tile/blue{
dir = 1
},
@@ -58025,9 +57057,9 @@
/area/medical/medbay/central)
"cip" = (
/obj/machinery/power/apc{
+ areastring = "/area/medical/medbay/central";
dir = 1;
name = "Medbay Central APC";
- areastring = "/area/medical/medbay/central";
pixel_y = 24
},
/obj/structure/cable/yellow{
@@ -58038,7 +57070,6 @@
},
/obj/machinery/camera{
c_tag = "Medbay Hallway Fore";
- dir = 2;
network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/blue{
@@ -58047,9 +57078,7 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"ciq" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/tile/blue{
dir = 1
},
@@ -58291,9 +57320,9 @@
/area/science/research)
"ciJ" = (
/obj/machinery/power/apc/highcap/ten_k{
+ areastring = "/area/science/research";
dir = 1;
name = "Research Division APC";
- areastring = "/area/science/research";
pixel_y = 25
},
/obj/structure/cable/yellow{
@@ -58304,7 +57333,6 @@
},
/obj/machinery/camera{
c_tag = "Research Division - Airlock";
- dir = 2;
network = list("ss13","rd")
},
/obj/effect/turf_decal/stripes/line{
@@ -58419,12 +57447,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/maintenance/disposal/incinerator)
-"ciZ" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
- dir = 2
- },
-/turf/closed/wall/r_wall,
-/area/maintenance/disposal/incinerator)
"cja" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior,
@@ -58488,9 +57510,7 @@
/turf/open/floor/engine/air,
/area/engine/atmos)
"cjl" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 2
- },
+/obj/machinery/atmospherics/components/binary/pump,
/turf/closed/wall/r_wall,
/area/engine/atmos)
"cjm" = (
@@ -58633,7 +57653,6 @@
/obj/structure/bed/roller,
/obj/item/radio/intercom{
broadcasting = 1;
- freerange = 0;
frequency = 1485;
listening = 0;
name = "Station Intercom (Medbay)";
@@ -58673,12 +57692,8 @@
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"cjH" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"cjI" = (
@@ -58753,9 +57768,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"cjO" = (
@@ -58799,9 +57812,7 @@
dir = 8;
name = "emergency shower"
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 2
- },
+/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"cjS" = (
@@ -59063,8 +58074,6 @@
"ckq" = (
/obj/machinery/vending/coffee,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29
},
@@ -59170,7 +58179,6 @@
"ckC" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/components/binary/pump/on{
- dir = 2;
name = "Incinerator Output Pump"
},
/obj/structure/disposalpipe/segment,
@@ -59211,9 +58219,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/machinery/atmospherics/components/binary/pump/on{
- dir = 2
- },
+/obj/machinery/atmospherics/components/binary/pump/on,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -59464,7 +58470,6 @@
"clm" = (
/obj/item/radio/intercom{
broadcasting = 1;
- freerange = 0;
frequency = 1485;
listening = 0;
name = "Station Intercom (Medbay)";
@@ -59473,9 +58478,7 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"cln" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 2
- },
+/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"clo" = (
@@ -59500,9 +58503,7 @@
pixel_y = -22
},
/obj/effect/landmark/event_spawn,
-/obj/effect/turf_decal/tile/yellow{
- dir = 2
- },
+/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"clr" = (
@@ -59624,9 +58625,7 @@
dir = 8;
pixel_x = 24
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"clz" = (
@@ -59703,9 +58702,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/white,
/area/science/research)
"clH" = (
@@ -59754,9 +58751,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"clN" = (
@@ -60115,9 +59110,7 @@
/obj/structure/sign/departments/science{
pixel_x = 32
},
-/obj/effect/turf_decal/tile/purple{
- dir = 2
- },
+/obj/effect/turf_decal/tile/purple,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"cmF" = (
@@ -60246,9 +59239,7 @@
},
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/explab)
"cmR" = (
@@ -60258,9 +59249,7 @@
pixel_y = 6
},
/obj/item/pen,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/explab)
"cmS" = (
@@ -60271,25 +59260,19 @@
/obj/item/stack/packageWrap,
/obj/item/taperecorder,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/explab)
"cmT" = (
/obj/machinery/computer/rdconsole/experiment,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/explab)
"cmU" = (
/obj/structure/table/reinforced,
/obj/item/clipboard,
/obj/item/book/manual/wiki/experimentor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/explab)
"cmV" = (
@@ -60317,18 +59300,14 @@
},
/obj/item/stack/medical/ointment,
/obj/item/healthanalyzer,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/explab)
"cmW" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/explab)
"cmX" = (
@@ -60440,9 +59419,7 @@
/obj/structure/table,
/obj/item/surgicaldrill,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/medical/surgery)
"cno" = (
/obj/structure/table,
@@ -60450,9 +59427,7 @@
pixel_y = 12
},
/obj/item/circular_saw,
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/medical/surgery)
"cnp" = (
/obj/structure/table,
@@ -60463,9 +59438,7 @@
/obj/item/razor{
pixel_y = 5
},
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/medical/surgery)
"cnq" = (
/obj/structure/table,
@@ -60479,21 +59452,16 @@
/obj/structure/extinguisher_cabinet{
pixel_x = -27
},
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/medical/surgery)
"cns" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/medical/surgery)
"cnt" = (
/obj/structure/table/reinforced,
/obj/item/radio/intercom{
broadcasting = 1;
- freerange = 0;
frequency = 1485;
listening = 0;
name = "Station Intercom (Medbay)";
@@ -60511,15 +59479,13 @@
/obj/item/storage/belt/medical{
pixel_y = 2
},
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/medical/surgery)
"cnu" = (
/obj/machinery/power/apc{
+ areastring = "/area/medical/cryo";
dir = 1;
name = "Cryogenics APC";
- areastring = "/area/medical/cryo";
pixel_y = 24
},
/obj/structure/cable/yellow{
@@ -60962,7 +59928,6 @@
},
/obj/machinery/camera{
c_tag = "Research Division Hallway - Central";
- dir = 2;
network = list("ss13","rd")
},
/turf/open/floor/plasteel/white,
@@ -60990,9 +59955,7 @@
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/science/research)
"cof" = (
/turf/open/floor/plasteel/white/side{
@@ -61001,8 +59964,6 @@
/area/science/research)
"cog" = (
/obj/item/radio/intercom{
- broadcasting = 0;
- listening = 1;
name = "Station Intercom (General)";
pixel_y = 20
},
@@ -61033,9 +59994,7 @@
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-10"
},
-/obj/effect/turf_decal/tile/purple{
- dir = 2
- },
+/obj/effect/turf_decal/tile/purple,
/turf/open/floor/plasteel/white,
/area/science/research)
"cok" = (
@@ -61204,9 +60163,9 @@
/area/medical/surgery)
"coC" = (
/obj/machinery/power/apc{
+ areastring = "/area/medical/surgery";
dir = 4;
name = "Surgery APC";
- areastring = "/area/medical/surgery";
pixel_x = 26
},
/obj/structure/cable/yellow{
@@ -61288,9 +60247,7 @@
/turf/open/floor/plasteel,
/area/medical/cryo)
"coK" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/general/visible,
/obj/effect/landmark/start/medical_doctor,
/turf/open/floor/plasteel,
/area/medical/cryo)
@@ -61371,9 +60328,9 @@
/area/crew_quarters/heads/cmo)
"coS" = (
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/heads/cmo";
dir = 4;
name = "CMO's Office APC";
- areastring = "/area/crew_quarters/heads/cmo";
pixel_x = 26
},
/obj/structure/cable/yellow{
@@ -61516,7 +60473,6 @@
"cpc" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/eastright{
- dir = 4;
name = "Research and Development Desk";
req_one_access_txt = "7;29"
},
@@ -61673,9 +60629,7 @@
/obj/structure/disposalpipe/junction/flip{
dir = 2
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plasteel/white,
/area/science/research)
"cpr" = (
@@ -61710,9 +60664,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plasteel/white,
/area/science/research)
"cpv" = (
@@ -62262,9 +61214,9 @@
/area/maintenance/aft)
"cqr" = (
/obj/machinery/power/apc{
+ areastring = "/area/medical/chemistry";
dir = 8;
name = "Chemistry APC";
- areastring = "/area/medical/chemistry";
pixel_x = -24
},
/obj/structure/closet/secure_closet/chemical{
@@ -62364,9 +61316,8 @@
maxcharge = 15000
},
/obj/machinery/power/apc{
- dir = 2;
- name = "Research Lab APC";
areastring = "/area/science/lab";
+ name = "Research Lab APC";
pixel_y = -26
},
/obj/structure/cable/yellow,
@@ -62532,9 +61483,7 @@
/area/science/research)
"cqL" = (
/obj/machinery/light,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/open/floor/plasteel/white,
/area/science/research)
"cqM" = (
@@ -62548,12 +61497,8 @@
/turf/open/floor/plasteel/white,
/area/science/research)
"cqN" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/effect/turf_decal/tile/purple,
/turf/open/floor/plasteel/white,
/area/science/research)
"cqO" = (
@@ -62599,9 +61544,8 @@
dir = 4
},
/obj/machinery/power/apc{
- dir = 2;
- name = "Experimentation Lab APC";
areastring = "/area/science/explab";
+ name = "Experimentation Lab APC";
pixel_y = -24
},
/obj/structure/cable/yellow,
@@ -62695,9 +61639,7 @@
/turf/open/space,
/area/space/nearstation)
"crd" = (
-/obj/structure/disposaloutlet{
- dir = 2
- },
+/obj/structure/disposaloutlet,
/obj/structure/disposalpipe/trunk{
dir = 8
},
@@ -62828,7 +61770,6 @@
},
/obj/item/radio/intercom{
broadcasting = 1;
- freerange = 0;
frequency = 1485;
listening = 0;
name = "Station Intercom (Medbay)";
@@ -62846,9 +61787,7 @@
name = "Connector Port (Air Supply)"
},
/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/medical/cryo)
"crv" = (
@@ -62876,9 +61815,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/blue{
- dir = 2
- },
+/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"cry" = (
@@ -62985,8 +61922,6 @@
"crF" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = -29
},
@@ -63007,9 +61942,9 @@
/area/hallway/primary/aft)
"crH" = (
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/hallway/primary/aft";
dir = 4;
name = "Aft Hallway APC";
- areastring = "/area/hallway/primary/aft";
pixel_x = 24
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -63276,7 +62211,6 @@
"csn" = (
/obj/item/radio/intercom{
broadcasting = 1;
- freerange = 0;
frequency = 1485;
listening = 0;
name = "Station Intercom (Medbay)";
@@ -63563,9 +62497,7 @@
dir = 8;
sortType = 23
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/aft)
"csI" = (
@@ -63609,9 +62541,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"csM" = (
@@ -63695,9 +62625,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/aft)
"csT" = (
@@ -63855,9 +62783,9 @@
"cti" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/science/storage";
dir = 1;
name = "Toxins Storage APC";
- areastring = "/area/science/storage";
pixel_y = 25
},
/obj/structure/cable/yellow{
@@ -64055,9 +62983,7 @@
"ctG" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"ctH" = (
@@ -64174,9 +63100,7 @@
/turf/open/floor/plasteel/white,
/area/crew_quarters/heads/hor)
"ctU" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/white,
/area/crew_quarters/heads/hor)
"ctV" = (
@@ -64326,9 +63250,9 @@
icon_state = "0-2"
},
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/port/aft";
dir = 1;
name = "Port Quarter Maintenance APC";
- areastring = "/area/maintenance/port/aft";
pixel_y = 24
},
/turf/open/floor/plating,
@@ -64344,9 +63268,9 @@
dir = 8
},
/obj/machinery/power/apc{
+ areastring = "/area/medical/patients_rooms/room_a";
dir = 8;
name = "Patient Room A APC";
- areastring = "/area/medical/patients_rooms/room_a";
pixel_x = -26
},
/obj/structure/cable/yellow{
@@ -64434,8 +63358,6 @@
},
/obj/item/storage/box/bodybags,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = -29
},
@@ -64475,7 +63397,6 @@
"cut" = (
/obj/machinery/requests_console{
department = "Genetics";
- departmentType = 0;
name = "Genetics Requests Console";
pixel_y = 30
},
@@ -64493,8 +63414,6 @@
pixel_y = 3
},
/obj/structure/noticeboard{
- desc = "A board for pinning important notices upon.";
- name = "notice board";
pixel_x = -32;
pixel_y = 32
},
@@ -64513,9 +63432,9 @@
/area/medical/genetics)
"cuu" = (
/obj/machinery/power/apc{
+ areastring = "/area/medical/genetics";
dir = 1;
name = "Genetics Lab APC";
- areastring = "/area/medical/genetics";
pixel_y = 24
},
/obj/structure/cable/yellow{
@@ -64708,9 +63627,7 @@
/area/science/research)
"cuK" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/blue{
- dir = 2
- },
+/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
/area/science/research)
"cuL" = (
@@ -64979,7 +63896,6 @@
dir = 4
},
/obj/machinery/door/window/southleft{
- dir = 2;
name = "Cloning Shower"
},
/obj/structure/mirror{
@@ -65000,7 +63916,6 @@
"cvv" = (
/obj/machinery/door/window/southleft{
base_state = "right";
- dir = 2;
icon_state = "right";
name = "Cloning Shower"
},
@@ -65026,8 +63941,6 @@
pixel_y = 2
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29
},
@@ -65195,9 +64108,7 @@
/obj/structure/extinguisher_cabinet{
pixel_x = 27
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"cvH" = (
@@ -65373,8 +64284,6 @@
"cvY" = (
/obj/machinery/portable_atmospherics/canister/toxins,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29
},
@@ -65661,8 +64570,6 @@
pixel_y = 2
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = -29
},
@@ -65734,8 +64641,6 @@
"cwJ" = (
/obj/machinery/computer/mech_bay_power_console,
/obj/item/radio/intercom{
- broadcasting = 0;
- listening = 1;
name = "Station Intercom (General)";
pixel_y = 20
},
@@ -65790,9 +64695,8 @@
/area/science/research)
"cwP" = (
/obj/machinery/power/apc{
- dir = 2;
- name = "RD Office APC";
areastring = "/area/crew_quarters/heads/hor";
+ name = "RD Office APC";
pixel_y = -27
},
/obj/structure/cable/yellow,
@@ -66008,9 +64912,7 @@
dir = 8
},
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/blue{
- dir = 2
- },
+/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
/area/medical/medbay/aft)
"cxl" = (
@@ -66042,9 +64944,7 @@
/turf/open/floor/plasteel/white,
/area/medical/genetics/cloning)
"cxo" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/machinery/dna_scannernew,
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -66194,9 +65094,7 @@
codes_txt = "patrol;next_patrol=9.1-Escape-1";
location = "8.1-Aft-to-Escape"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"cxC" = (
@@ -66252,8 +65150,6 @@
/area/science/misc_lab/range)
"cxJ" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29
},
@@ -66567,9 +65463,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"cyp" = (
@@ -66649,9 +65543,7 @@
/obj/structure/closet/l3closet/scientist{
pixel_x = -2
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/mixing)
"cyA" = (
@@ -66659,20 +65551,15 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/mixing)
"cyB" = (
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/obj/machinery/atmospherics/components/unary/thermomachine/freezer,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/mixing)
"cyC" = (
@@ -66681,16 +65568,12 @@
},
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/mixing)
"cyD" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/portable_atmospherics/canister,
/turf/open/floor/plasteel,
/area/science/mixing)
@@ -66700,14 +65583,11 @@
},
/obj/machinery/camera{
c_tag = "Toxins - Lab";
- dir = 2;
network = list("ss13","rd")
},
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/obj/machinery/portable_atmospherics/canister,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/mixing)
"cyF" = (
@@ -66715,9 +65595,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/airalarm/unlocked{
pixel_y = 24
},
@@ -66732,9 +65610,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/mixing)
"cyH" = (
@@ -66743,9 +65619,7 @@
dir = 4
},
/obj/machinery/portable_atmospherics/canister,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/mixing)
"cyI" = (
@@ -66787,9 +65661,7 @@
pixel_y = 4
},
/obj/structure/table/glass,
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/medical/medbay/aft)
"cyO" = (
/obj/machinery/disposal/bin,
@@ -66797,9 +65669,7 @@
/obj/machinery/status_display{
pixel_y = 32
},
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/medical/medbay/aft)
"cyP" = (
/obj/machinery/vending/coffee,
@@ -66808,9 +65678,7 @@
icon_state = "map-left-MS";
pixel_y = 32
},
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/medical/medbay/aft)
"cyQ" = (
/obj/structure/sign/map/right{
@@ -66819,18 +65687,14 @@
pixel_y = 32
},
/obj/machinery/vending/cola/random,
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/medical/medbay/aft)
"cyR" = (
/obj/machinery/vending/cigarette,
/obj/structure/noticeboard{
pixel_y = 32
},
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/medical/medbay/aft)
"cyT" = (
/obj/structure/cable/yellow{
@@ -66886,9 +65750,9 @@
dir = 9
},
/obj/machinery/power/apc/unlocked{
+ areastring = "/area/medical/genetics/cloning";
dir = 4;
name = "Cloning Lab APC";
- areastring = "/area/medical/genetics/cloning";
pixel_x = 24
},
/obj/structure/cable/yellow,
@@ -66988,8 +65852,6 @@
"czf" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = -26
},
@@ -67015,21 +65877,17 @@
dir = 4
},
/obj/machinery/button/door{
- dir = 2;
id = "Skynet_launch";
name = "Mech Bay Door Control";
pixel_x = 26;
pixel_y = 6;
req_one_access_txt = "29"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"czi" = (
/obj/machinery/button/door{
- dir = 2;
id = "Skynet_launch";
name = "Mech Bay Door Control";
pixel_x = -26;
@@ -67132,9 +65990,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/purple{
- dir = 2
- },
+/obj/effect/turf_decal/tile/purple,
/turf/open/floor/plasteel/white,
/area/science/research)
"czr" = (
@@ -67405,9 +66261,9 @@
/area/medical/medbay/aft)
"czW" = (
/obj/machinery/power/apc{
+ areastring = "/area/medical/medbay/aft";
dir = 4;
name = "Medbay Aft APC";
- areastring = "/area/medical/medbay/aft";
pixel_x = 26
},
/obj/structure/cable/yellow{
@@ -67611,9 +66467,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"cAk" = (
@@ -67668,9 +66522,9 @@
/area/science/robotics/mechbay)
"cAo" = (
/obj/machinery/power/apc{
+ areastring = "/area/science/robotics/mechbay";
dir = 4;
name = "Mech Bay APC";
- areastring = "/area/science/robotics/mechbay";
pixel_x = 28
},
/obj/structure/cable/yellow{
@@ -67973,7 +66827,6 @@
/obj/structure/chair/stool,
/obj/item/radio/intercom{
broadcasting = 1;
- freerange = 0;
frequency = 1485;
listening = 0;
name = "Station Intercom (Medbay)";
@@ -68024,9 +66877,7 @@
/turf/open/floor/plating,
/area/medical/medbay/aft)
"cAY" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/tile/blue{
dir = 1
},
@@ -68046,7 +66897,6 @@
/obj/structure/disposalpipe/segment,
/obj/item/radio/intercom{
broadcasting = 1;
- freerange = 0;
frequency = 1485;
listening = 0;
name = "Station Intercom (Medbay)";
@@ -68063,7 +66913,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/grunge{
name = "Genetics";
- opacity = 1;
req_access_txt = "9"
},
/turf/open/floor/plasteel/dark,
@@ -68109,8 +66958,6 @@
"cBj" = (
/obj/structure/table,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = -25
},
@@ -68143,9 +66990,8 @@
"cBl" = (
/obj/item/gun/energy/laser/practice,
/obj/machinery/power/apc{
- dir = 2;
- name = "Research Firing Range APC";
areastring = "/area/science/misc_lab/range";
+ name = "Research Firing Range APC";
pixel_y = -28
},
/obj/structure/table,
@@ -68378,7 +67224,6 @@
dir = 4
},
/obj/machinery/button/massdriver{
- dir = 2;
id = "toxinsdriver";
pixel_x = 24;
pixel_y = -24
@@ -68520,16 +67365,12 @@
pixel_x = -24
},
/obj/structure/closet/secure_closet/personal/patient,
-/turf/open/floor/plasteel/white/corner{
- dir = 2
- },
+/turf/open/floor/plasteel/white/corner,
/area/medical/medbay/aft)
"cCc" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/closet/secure_closet/personal/patient,
-/turf/open/floor/plasteel/white/side{
- dir = 2
- },
+/turf/open/floor/plasteel/white/side,
/area/medical/medbay/aft)
"cCd" = (
/obj/structure/closet/secure_closet/personal/patient,
@@ -68550,7 +67391,6 @@
/area/medical/morgue)
"cCi" = (
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/obj/machinery/light/small{
@@ -68582,14 +67422,10 @@
"cCm" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29
},
-/obj/effect/turf_decal/tile/purple{
- dir = 2
- },
+/obj/effect/turf_decal/tile/purple,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"cCn" = (
@@ -68706,8 +67542,6 @@
"cCx" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/item/radio/intercom{
- broadcasting = 0;
- listening = 1;
name = "Station Intercom (General)";
pixel_y = -28
},
@@ -68768,9 +67602,9 @@
pixel_y = -1
},
/obj/machinery/power/apc{
+ areastring = "/area/science/mixing";
dir = 4;
name = "Toxins Lab APC";
- areastring = "/area/science/mixing";
pixel_x = 26
},
/obj/structure/cable/yellow{
@@ -68804,9 +67638,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/corner,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/science/mixing)
@@ -68914,9 +67746,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plasteel/white,
/area/medical/medbay/aft)
"cCT" = (
@@ -68963,8 +67793,6 @@
/obj/item/storage/box/bodybags,
/obj/item/pen,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29
},
@@ -69006,12 +67834,8 @@
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"cDd" = (
-/obj/machinery/mecha_part_fabricator{
- dir = 2
- },
+/obj/machinery/mecha_part_fabricator,
/obj/item/radio/intercom{
- broadcasting = 0;
- listening = 1;
name = "Station Intercom (General)";
pixel_y = 20
},
@@ -69036,12 +67860,9 @@
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"cDf" = (
-/obj/machinery/mecha_part_fabricator{
- dir = 2
- },
+/obj/machinery/mecha_part_fabricator,
/obj/machinery/camera{
c_tag = "Robotics - Fore";
- dir = 2;
network = list("ss13","rd")
},
/obj/effect/turf_decal/delivery,
@@ -69049,9 +67870,9 @@
/area/science/robotics/lab)
"cDg" = (
/obj/machinery/power/apc{
+ areastring = "/area/science/robotics/lab";
dir = 1;
name = "Robotics Lab APC";
- areastring = "/area/science/robotics/lab";
pixel_y = 25
},
/obj/structure/cable/yellow{
@@ -69246,9 +68067,9 @@
},
/obj/item/storage/box/syringes,
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/medical/virology";
dir = 1;
name = "Virology APC";
- areastring = "/area/medical/virology";
pixel_y = 24
},
/obj/structure/cable/yellow{
@@ -69490,7 +68311,6 @@
},
/obj/machinery/door/airlock/grunge{
name = "Morgue";
- opacity = 1;
req_access_txt = "5"
},
/turf/open/floor/plasteel/dark,
@@ -69514,9 +68334,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"cEa" = (
@@ -69555,9 +68373,9 @@
"cEd" = (
/obj/structure/table,
/obj/machinery/power/apc{
+ areastring = "/area/medical/morgue";
dir = 4;
name = "Morgue APC";
- areastring = "/area/medical/morgue";
pixel_x = 26
},
/obj/structure/cable/yellow{
@@ -69626,7 +68444,6 @@
/obj/structure/table/reinforced,
/obj/item/pen,
/obj/machinery/door/window/eastright{
- dir = 4;
name = "Robotics Desk";
req_access_txt = "29"
},
@@ -69746,7 +68563,6 @@
/area/science/mixing)
"cEt" = (
/obj/machinery/sparker/toxmix{
- dir = 2;
pixel_x = 25
},
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxins_mixing_output{
@@ -70054,7 +68870,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/grunge{
name = "Morgue";
- opacity = 1;
req_access_txt = "6"
},
/turf/open/floor/plasteel/dark,
@@ -70184,9 +68999,7 @@
/turf/open/floor/engine,
/area/science/mixing)
"cFp" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{
- dir = 2
- },
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix,
/obj/effect/landmark/blobstart,
/turf/open/floor/engine,
/area/science/mixing)
@@ -70237,9 +69050,7 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"cFw" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating/airless,
/area/science/test_area)
"cFx" = (
@@ -70310,9 +69121,7 @@
/turf/open/floor/plasteel/white,
/area/medical/virology)
"cFB" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/tile/green{
dir = 1
},
@@ -70372,9 +69181,7 @@
/turf/open/floor/plasteel/white,
/area/medical/virology)
"cFG" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plasteel/white,
/area/medical/virology)
"cFH" = (
@@ -70463,7 +69270,6 @@
/area/medical/virology)
"cFO" = (
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/obj/machinery/iv_drip,
@@ -70485,8 +69291,6 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29
},
@@ -70653,7 +69457,6 @@
/area/science/research)
"cGj" = (
/obj/machinery/sparker/toxmix{
- dir = 2;
pixel_x = 25
},
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input{
@@ -70939,8 +69742,8 @@
},
/obj/machinery/doorButtons/airlock_controller{
idExterior = "virology_airlock_exterior";
- idSelf = "virology_airlock_control";
idInterior = "virology_airlock_interior";
+ idSelf = "virology_airlock_control";
name = "Virology Access Console";
pixel_x = 26;
pixel_y = 26;
@@ -71279,9 +70082,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
},
-/obj/effect/turf_decal/tile/blue{
- dir = 2
- },
+/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
/area/science/research)
"cHd" = (
@@ -71301,9 +70102,7 @@
/turf/closed/wall/r_wall,
/area/science/server)
"cHf" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/closed/wall/r_wall,
/area/science/server)
"cHg" = (
@@ -71464,9 +70263,7 @@
/turf/open/floor/plasteel/white,
/area/medical/virology)
"cHu" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
dir = 8
@@ -71520,9 +70317,7 @@
dir = 1;
pixel_y = -24
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/white,
/area/medical/virology)
"cHy" = (
@@ -71691,9 +70486,7 @@
/obj/structure/disposalpipe/segment{
dir = 9
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -71750,18 +70543,14 @@
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"cHR" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"cHS" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"cHT" = (
@@ -71862,14 +70651,13 @@
"cIb" = (
/obj/machinery/camera{
c_tag = "Research Division - Server Room";
- dir = 2;
network = list("ss13","rd");
pixel_x = 22
},
/obj/machinery/power/apc{
+ areastring = "/area/science/server";
dir = 1;
name = "Research Division Server Room APC";
- areastring = "/area/science/server";
pixel_y = 25
},
/obj/structure/cable/yellow{
@@ -72330,8 +71118,6 @@
dir = 9
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29
},
@@ -72746,9 +71532,7 @@
/obj/machinery/door/airlock/public/glass{
name = "Departure Lounge"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 2
- },
+/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"cJH" = (
@@ -72756,8 +71540,6 @@
/obj/item/retractor,
/obj/item/hemostat,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = -29
},
@@ -72836,9 +71618,7 @@
pixel_x = -12;
pixel_y = 2
},
-/obj/effect/turf_decal/tile/purple{
- dir = 2
- },
+/obj/effect/turf_decal/tile/purple,
/turf/open/floor/plasteel/white,
/area/science/research)
"cJP" = (
@@ -72871,8 +71651,6 @@
/area/science/server)
"cJS" = (
/obj/item/radio/intercom{
- broadcasting = 0;
- listening = 1;
name = "Station Intercom (General)";
pixel_y = -28
},
@@ -72918,26 +71696,20 @@
lootcount = 2;
name = "2maintenance loot spawner"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cJZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/reagent_dispensers/watertank,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cKa" = (
/obj/structure/closet,
/obj/item/clothing/glasses/science,
/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cKb" = (
@@ -72951,9 +71723,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cKe" = (
@@ -73058,7 +71828,6 @@
},
/obj/machinery/camera{
c_tag = "Virology - Break Room";
- dir = 2;
network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/green{
@@ -73071,8 +71840,6 @@
/area/medical/virology)
"cKm" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29
},
@@ -73174,9 +71941,9 @@
/area/hallway/secondary/exit/departure_lounge)
"cKy" = (
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/hallway/secondary/exit/departure_lounge";
dir = 1;
name = "Departure Lounge APC";
- areastring = "/area/hallway/secondary/exit/departure_lounge";
pixel_y = 24
},
/obj/structure/cable/yellow{
@@ -73830,9 +72597,9 @@
/area/maintenance/solars/starboard/aft)
"cLM" = (
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/solars/starboard/aft";
dir = 1;
name = "Starboard Quarter Solar APC";
- areastring = "/area/maintenance/solars/starboard/aft";
pixel_y = 24
},
/obj/structure/cable/yellow{
@@ -73972,9 +72739,7 @@
name = "Relic Closet";
req_access_txt = "22"
},
-/turf/open/floor/plasteel/cult{
- dir = 2
- },
+/turf/open/floor/plasteel/cult,
/area/chapel/office)
"cMa" = (
/obj/structure/table/wood,
@@ -73982,7 +72747,6 @@
name = "mysterious old book of "
},
/obj/item/reagent_containers/food/drinks/bottle/holywater{
- name = "flask of holy water";
pixel_x = -2;
pixel_y = 2
},
@@ -73991,9 +72755,7 @@
},
/obj/item/organ/heart,
/obj/item/soulstone/anybody/chaplain,
-/turf/open/floor/plasteel/cult{
- dir = 2
- },
+/turf/open/floor/plasteel/cult,
/area/chapel/office)
"cMb" = (
/obj/machinery/door/airlock/maintenance{
@@ -74012,9 +72774,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"cMe" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"cMf" = (
@@ -74063,9 +72823,8 @@
/area/hallway/secondary/exit/departure_lounge)
"cMk" = (
/obj/machinery/power/apc/highcap/five_k{
- dir = 2;
- name = "Aft Maintenance APC";
areastring = "/area/maintenance/aft";
+ name = "Aft Maintenance APC";
pixel_y = -24
},
/obj/structure/cable/yellow,
@@ -74356,8 +73115,7 @@
pixel_y = 32
},
/obj/machinery/camera{
- c_tag = "Chapel - Fore";
- dir = 2
+ c_tag = "Chapel - Fore"
},
/obj/structure/table/wood,
/obj/effect/turf_decal/tile/neutral{
@@ -74565,7 +73323,6 @@
/obj/structure/table/reinforced,
/obj/machinery/door/window/westleft{
base_state = "right";
- dir = 8;
icon_state = "right";
name = "Outer Window"
},
@@ -74784,8 +73541,7 @@
/obj/machinery/power/solar_control{
dir = 8;
id = "aftstarboard";
- name = "Starboard Quarter Solar Control";
- track = 0
+ name = "Starboard Quarter Solar Control"
},
/obj/structure/cable,
/obj/structure/cable{
@@ -75168,9 +73924,9 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
+ areastring = "/area/chapel/main";
dir = 8;
name = "Chapel APC";
- areastring = "/area/chapel/main";
pixel_x = -25
},
/turf/open/floor/carpet,
@@ -75360,8 +74116,6 @@
pixel_x = 4
},
/obj/item/radio/intercom{
- broadcasting = 0;
- listening = 1;
name = "Station Intercom (General)";
pixel_y = -32
},
@@ -75425,10 +74179,8 @@
/area/chapel/office)
"cOI" = (
/obj/machinery/power/apc{
- dir = 2;
- lighting = 3;
- name = "Chapel Office APC";
areastring = "/area/chapel/office";
+ name = "Chapel Office APC";
pixel_y = -25
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -75510,9 +74262,7 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"cOU" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"cOV" = (
@@ -75967,8 +74717,6 @@
dir = 4
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29
},
@@ -76050,8 +74798,6 @@
/area/chapel/main)
"cQc" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 21
},
@@ -76064,12 +74810,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/dark,
/area/chapel/main)
-"cQd" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
-/turf/open/floor/plasteel/dark,
-/area/chapel/main)
"cQf" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -76102,9 +74842,7 @@
/turf/open/floor/plasteel/chapel,
/area/chapel/main)
"cQj" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plasteel/chapel{
dir = 8
},
@@ -76126,21 +74864,13 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
-"cQn" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit/departure_lounge)
"cQo" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=9.4-Escape-4";
location = "9.3-Escape-3"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"cQp" = (
@@ -76149,9 +74879,7 @@
codes_txt = "patrol;next_patrol=9.3-Escape-3";
location = "9.2-Escape-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
"cQq" = (
@@ -76172,7 +74900,6 @@
},
/obj/machinery/camera{
c_tag = "Research Division Hallway - Xenobiology Lab Access";
- dir = 2;
network = list("ss13","rd")
},
/obj/effect/turf_decal/tile/purple{
@@ -76188,7 +74915,6 @@
dir = 1
},
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/obj/structure/cable/yellow{
@@ -76215,9 +74941,7 @@
/obj/structure/cable/yellow{
icon_state = "1-4"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/landmark/blobstart,
/obj/effect/turf_decal/tile/purple{
dir = 1
@@ -76230,7 +74954,6 @@
"cQv" = (
/obj/machinery/camera{
c_tag = "Toxins - Launch Area";
- dir = 2;
network = list("ss13","rd")
},
/obj/machinery/suit_storage_unit/rd,
@@ -76262,8 +74985,6 @@
dir = 4
},
/obj/item/radio/intercom{
- broadcasting = 0;
- listening = 1;
name = "Station Intercom (General)";
pixel_y = 22
},
@@ -76399,8 +75120,6 @@
/area/science/xenobiology)
"cQS" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29
},
@@ -76562,7 +75281,6 @@
/area/chapel/main)
"cRm" = (
/obj/machinery/mass_driver{
- dir = 2;
id = "chapelgun"
},
/obj/structure/sign/warning/vacuum/external{
@@ -76761,17 +75479,13 @@
/obj/machinery/light/small{
dir = 1
},
-/turf/open/floor/plasteel/cult{
- dir = 2
- },
+/turf/open/floor/plasteel/cult,
/area/chapel/main)
"cRF" = (
/obj/machinery/door/morgue{
name = "Chapel Garden"
},
-/turf/open/floor/plasteel/cult{
- dir = 2
- },
+/turf/open/floor/plasteel/cult,
/area/chapel/main)
"cRG" = (
/obj/machinery/light/small,
@@ -76856,9 +75570,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/dark,
/area/chapel/main)
"cRL" = (
@@ -76871,9 +75583,7 @@
/area/chapel/main)
"cRM" = (
/obj/machinery/processor/slime,
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cRN" = (
@@ -77000,9 +75710,7 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cSc" = (
@@ -77477,7 +76185,6 @@
dir = 8
},
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 26
},
/obj/effect/turf_decal/stripes/line{
@@ -77647,9 +76354,7 @@
pixel_y = 2
},
/obj/structure/table/reinforced,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cTs" = (
@@ -77671,9 +76376,7 @@
name = "Maximum Security Test Chamber";
req_access_txt = "55"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cTw" = (
@@ -77699,9 +76402,7 @@
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/science,
/obj/structure/table,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cTA" = (
@@ -77805,9 +76506,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cVb" = (
@@ -77832,7 +76531,6 @@
},
/obj/item/radio/intercom{
freerange = 1;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = -30
},
@@ -78034,7 +76732,6 @@
/area/construction/mining/aux_base)
"cYJ" = (
/obj/docking_port/stationary{
- dheight = 0;
dir = 2;
dwidth = 9;
height = 25;
@@ -78102,8 +76799,6 @@
/area/science/xenobiology)
"cZc" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29
},
@@ -78182,7 +76877,6 @@
/area/security/main)
"daA" = (
/obj/machinery/door/window/southleft{
- dir = 2;
name = "Maximum Security Test Chamber";
req_access_txt = "55"
},
@@ -78204,9 +76898,7 @@
/turf/closed/wall/r_wall,
/area/science/xenobiology)
"daD" = (
-/obj/structure/disposaloutlet{
- dir = 2
- },
+/obj/structure/disposaloutlet,
/obj/structure/disposalpipe/trunk{
dir = 1
},
@@ -78453,7 +77145,6 @@
"dbr" = (
/obj/machinery/camera{
c_tag = "Morgue";
- dir = 2;
network = list("ss13","medbay")
},
/obj/structure/bodycontainer/morgue{
@@ -78700,7 +77391,6 @@
pixel_y = -8
},
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 24
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
@@ -78714,7 +77404,6 @@
/area/science/xenobiology)
"dca" = (
/obj/machinery/firealarm{
- dir = 2;
pixel_y = 26
},
/obj/effect/turf_decal/tile/purple{
@@ -78731,7 +77420,6 @@
},
/obj/machinery/camera{
c_tag = "Xenobiology Lab - Fore";
- dir = 2;
network = list("ss13","rd")
},
/obj/effect/turf_decal/tile/purple{
@@ -78766,9 +77454,9 @@
},
/obj/item/reagent_containers/dropper,
/obj/machinery/power/apc/highcap/ten_k{
+ areastring = "/area/science/xenobiology";
dir = 1;
name = "Xenobiology APC";
- areastring = "/area/science/xenobiology";
pixel_y = 27
},
/obj/structure/cable/yellow{
@@ -78847,8 +77535,6 @@
dir = 4
},
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = -29
},
@@ -78870,9 +77556,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 2
- },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -79020,9 +77704,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"dcu" = (
@@ -79114,9 +77796,7 @@
/area/science/xenobiology)
"dcG" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"dcH" = (
@@ -79126,9 +77806,7 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"dcI" = (
@@ -79136,9 +77814,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"dcJ" = (
@@ -79164,9 +77840,7 @@
/obj/structure/disposalpipe/trunk{
dir = 8
},
-/obj/effect/turf_decal/tile/purple{
- dir = 2
- },
+/obj/effect/turf_decal/tile/purple,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"dcL" = (
@@ -79474,9 +78148,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"ddm" = (
@@ -79489,18 +78161,14 @@
/obj/structure/cable/yellow{
icon_state = "1-4"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"ddn" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"ddo" = (
@@ -79579,9 +78247,9 @@
"ddw" = (
/obj/structure/cable/yellow,
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/department/science/xenobiology";
dir = 4;
name = "Test Chamber Maintenance APC";
- areastring = "/area/maintenance/department/science/xenobiology";
pixel_x = 26
},
/turf/open/floor/plating,
@@ -79794,7 +78462,6 @@
/area/engine/engineering)
"dek" = (
/obj/machinery/atmospherics/components/binary/pump{
- dir = 2;
name = "Mix to Gas"
},
/obj/structure/cable/white{
@@ -79849,8 +78516,6 @@
/area/engine/engineering)
"deq" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 21
},
@@ -79974,7 +78639,6 @@
"deK" = (
/obj/structure/cable/white,
/obj/machinery/power/emitter/anchored{
- dir = 2;
state = 2
},
/turf/open/floor/plating,
@@ -80631,7 +79295,6 @@
/obj/machinery/atmospherics/pipe/simple/green/visible,
/obj/machinery/door/window/northleft{
dir = 8;
- icon_state = "left";
name = "Inner Pipe Access";
req_access_txt = "24"
},
@@ -80966,9 +79629,8 @@
/obj/structure/table,
/obj/item/analyzer,
/obj/machinery/power/apc{
- dir = 2;
- name = "Tool Storage APC";
areastring = "/area/storage/primary";
+ name = "Tool Storage APC";
pixel_y = -27
},
/obj/structure/cable/yellow,
@@ -80987,8 +79649,6 @@
/area/storage/primary)
"dhM" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 21
},
@@ -81198,8 +79858,6 @@
/obj/item/instrument/violin,
/obj/structure/table/wood,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 29
},
@@ -81764,8 +80422,8 @@
height = 15;
id = "arrivals_stationary";
name = "arrivals";
- width = 7;
- roundstart_template = /datum/map_template/shuttle/arrival/box
+ roundstart_template = /datum/map_template/shuttle/arrival/box;
+ width = 7
},
/turf/open/space/basic,
/area/space)
@@ -81873,9 +80531,9 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
+ areastring = "/area/maintenance/port/fore";
dir = 4;
name = "Port Bow Maintenance APC";
- areastring = "/area/maintenance/port/fore";
pixel_x = 26
},
/turf/open/floor/plating{
@@ -82039,9 +80697,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/port/fore)
"dtE" = (
@@ -82080,9 +80736,8 @@
"dtS" = (
/obj/item/cigbutt,
/obj/machinery/power/apc{
- dir = 2;
- name = "Starboard Bow Maintenance APC";
areastring = "/area/maintenance/starboard/fore";
+ name = "Starboard Bow Maintenance APC";
pixel_y = -28
},
/obj/structure/cable/yellow{
@@ -82304,9 +80959,8 @@
/area/maintenance/starboard/aft)
"dAd" = (
/obj/machinery/power/apc/highcap/five_k{
- dir = 2;
- name = "Starboard Quarter Maintenance APC";
areastring = "/area/maintenance/starboard/aft";
+ name = "Starboard Quarter Maintenance APC";
pixel_y = -24
},
/obj/structure/cable/yellow,
@@ -83225,8 +81879,8 @@
/area/science/circuit)
"eFN" = (
/obj/structure/bodycontainer/crematorium{
- id = "crematoriumChapel";
- dir = 1
+ dir = 1;
+ id = "crematoriumChapel"
},
/turf/open/floor/plasteel/dark,
/area/chapel/office)
@@ -83297,7 +81951,6 @@
/area/science/circuit)
"gqA" = (
/obj/machinery/button/door{
- dir = 2;
id = "abandoned_kitchen";
name = "Shutters Control";
pixel_x = 26;
@@ -83716,8 +82369,7 @@
"mAU" = (
/obj/machinery/cryopod,
/obj/machinery/camera{
- c_tag = "Fitness Room - Fore";
- dir = 2
+ c_tag = "Fitness Room - Fore"
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/cryopod)
@@ -83798,7 +82450,6 @@
/obj/docking_port/stationary{
area_type = /area/construction/mining/aux_base;
dheight = 4;
- dir = 1;
dwidth = 4;
height = 9;
id = "aux_base_zone";
@@ -83853,7 +82504,6 @@
/obj/machinery/requests_console{
department = "Science";
departmentType = 2;
- dir = 2;
name = "Science Requests Console";
pixel_y = 30;
receive_ore_updates = 1
@@ -84057,7 +82707,6 @@
/area/crew_quarters/cryopod)
"ram" = (
/obj/machinery/computer/arcade{
- icon_state = "arcade";
dir = 1
},
/turf/open/floor/plasteel,
@@ -84419,9 +83068,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"wKo" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/closed/wall,
/area/science/circuit)
"wOE" = (
@@ -106323,7 +104970,7 @@ cOg
cOJ
cPl
cPH
-cQd
+djr
cTo
cRm
cRK
@@ -109921,7 +108568,7 @@ cOq
cLm
cLm
cLm
-cQn
+cMf
cQK
cPv
cPv
@@ -110435,7 +109082,7 @@ cOr
cOU
dDG
cPQ
-cQn
+cMf
cQK
cPv
cPv
@@ -110692,7 +109339,7 @@ cMT
cOV
cMT
cPR
-cQn
+cMf
cQK
cPv
aaa
@@ -110949,7 +109596,7 @@ cOs
cOW
cMU
cPS
-cQn
+cMf
cQM
cPv
aaa
@@ -111206,7 +109853,7 @@ cMV
cOX
cMV
cPT
-cQn
+cMf
cQK
cPv
aaa
@@ -111463,7 +110110,7 @@ cLm
cOq
cLm
cPQ
-cQn
+cMf
cQK
cPv
cPv
@@ -111977,7 +110624,7 @@ cOt
cOZ
cPt
cLm
-cQn
+cMf
cQO
cPv
cPv
@@ -124277,9 +122924,9 @@ ced
cfq
cgw
cfs
-ciZ
+cjb
ckD
-ciZ
+cjb
cnd
cgz
cgz
@@ -124465,7 +123112,7 @@ aie
aja
ajY
alp
-amF
+dtE
anN
dnS
doh
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index b9462f214d..84ea2dfca1 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -108,8 +108,6 @@
},
/obj/effect/landmark/start/ai/secondary,
/obj/item/radio/intercom{
- anyai = 1;
- broadcasting = 0;
freerange = 1;
frequency = 1447;
name = "Private Channel";
@@ -129,7 +127,6 @@
},
/obj/machinery/camera/motion{
c_tag = "MiniSat AI Chamber Center";
- dir = 2;
network = list("minisat")
},
/obj/machinery/light/small{
@@ -148,15 +145,13 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
+ areastring = "/area/ai_monitored/turret_protected/ai";
dir = 1;
name = "AI Chamber APC";
- areastring = "/area/ai_monitored/turret_protected/ai";
pixel_y = 24
},
/obj/effect/landmark/start/ai/secondary,
/obj/item/radio/intercom{
- anyai = 1;
- broadcasting = 0;
freerange = 1;
frequency = 1447;
name = "Private Channel";
@@ -279,23 +274,18 @@
"acy" = (
/obj/effect/landmark/start/ai,
/obj/item/radio/intercom{
- broadcasting = 0;
freerange = 1;
- listening = 1;
name = "Common Channel";
pixel_x = -27;
pixel_y = -9
},
/obj/item/radio/intercom{
- anyai = 1;
freerange = 1;
listening = 0;
name = "Custom Channel";
pixel_y = -31
},
/obj/item/radio/intercom{
- anyai = 1;
- broadcasting = 0;
freerange = 1;
frequency = 1447;
name = "Private Channel";
@@ -339,7 +329,6 @@
"acD" = (
/obj/machinery/camera/motion{
c_tag = "MiniSat AI Chamber South";
- dir = 2;
network = list("minisat")
},
/obj/machinery/light{
@@ -576,9 +565,9 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
+ areastring = "/area/ai_monitored/turret_protected/aisat_interior";
dir = 8;
name = "MiniSat Antechamber APC";
- areastring = "/area/ai_monitored/turret_protected/aisat_interior";
pixel_x = -24
},
/obj/machinery/recharger,
@@ -866,7 +855,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/camera/motion{
c_tag = "MiniSat Bridge Port Fore";
- dir = 2;
network = list("minisat")
},
/turf/open/space,
@@ -894,7 +882,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera/motion{
c_tag = "MiniSat Bridge Starboard Fore";
- dir = 2;
network = list("minisat")
},
/turf/open/space,
@@ -1233,9 +1220,9 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
+ areastring = "/area/ai_monitored/turret_protected/AIsatextAP";
dir = 8;
name = "MiniSat Port Maintenance APC";
- areastring = "/area/ai_monitored/turret_protected/AIsatextAP";
pixel_x = -24
},
/turf/open/floor/plating,
@@ -1261,7 +1248,6 @@
},
/obj/machinery/camera{
c_tag = "MiniSat Maintenance Port Aft";
- dir = 2;
network = list("minisat")
},
/turf/open/floor/plating,
@@ -1334,7 +1320,6 @@
},
/obj/machinery/camera/motion{
c_tag = "MiniSat Foyer";
- dir = 2;
network = list("minisat")
},
/obj/effect/turf_decal/tile/blue,
@@ -1386,7 +1371,6 @@
},
/obj/machinery/camera{
c_tag = "MiniSat Maintenance Starboard Aft";
- dir = 2;
network = list("minisat")
},
/turf/open/floor/plating,
@@ -1406,9 +1390,9 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
+ areastring = "/area/ai_monitored/turret_protected/AIsatextAS";
dir = 4;
name = "MiniSat Starboard Maintenance APC";
- areastring = "/area/ai_monitored/turret_protected/AIsatextAS";
pixel_x = 24
},
/turf/open/floor/plating,
@@ -1482,6 +1466,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"afy" = (
@@ -1494,6 +1479,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"afA" = (
@@ -1564,7 +1550,6 @@
/area/security/prison)
"afI" = (
/obj/machinery/computer/arcade{
- icon_state = "arcade";
dir = 8
},
/turf/open/floor/plasteel/dark,
@@ -1607,6 +1592,7 @@
"afP" = (
/obj/machinery/holopad,
/mob/living/simple_animal/bot/secbot/pingsky,
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"afQ" = (
@@ -1665,7 +1651,6 @@
},
/obj/machinery/door/window/westleft{
base_state = "right";
- dir = 8;
icon_state = "right";
name = "Unisex Showers"
},
@@ -1697,6 +1682,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"agh" = (
@@ -1710,8 +1696,7 @@
/area/ai_monitored/turret_protected/aisat_interior)
"agi" = (
/obj/machinery/door/poddoor{
- id = "executionspaceblast";
- name = "blast door"
+ id = "executionspaceblast"
},
/turf/open/floor/plating,
/area/security/execution/transfer)
@@ -1855,8 +1840,7 @@
/area/security/prison)
"agC" = (
/obj/machinery/door/airlock{
- name = "Unisex Restroom";
- req_access_txt = "0"
+ name = "Unisex Restroom"
},
/turf/open/floor/plasteel/freezer,
/area/security/prison)
@@ -1896,7 +1880,6 @@
},
/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
- dir = 2;
name = "Prison Intercom (General)";
pixel_y = 24;
prison_radio = 1
@@ -1916,7 +1899,6 @@
name = "Cell Bolt Control";
normaldoorcontrol = 1;
pixel_y = 25;
- req_access_txt = "0";
specialfunctions = 4
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -1933,7 +1915,6 @@
},
/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
- dir = 2;
name = "Prison Intercom (General)";
pixel_y = 24;
prison_radio = 1
@@ -1962,7 +1943,6 @@
name = "Cell Bolt Control";
normaldoorcontrol = 1;
pixel_y = 25;
- req_access_txt = "0";
specialfunctions = 4
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -2069,7 +2049,6 @@
"ahh" = (
/obj/structure/lattice/catwalk,
/obj/structure/showcase/cyborg/old{
- dir = 2;
pixel_y = 20
},
/turf/open/space,
@@ -2121,8 +2100,6 @@
/area/security/execution/transfer)
"ahl" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = 28
},
@@ -2179,7 +2156,6 @@
/obj/structure/lattice,
/obj/machinery/camera/motion{
c_tag = "MiniSat Entrance";
- dir = 2;
network = list("minisat")
},
/turf/open/space,
@@ -2321,7 +2297,6 @@
network = list("ss13","prison")
},
/obj/machinery/computer/security/telescreen/prison{
- network = list("prison");
pixel_y = 30
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -2596,8 +2571,7 @@
"aik" = (
/obj/structure/closet/secure_closet/lethalshots,
/obj/machinery/camera/motion{
- c_tag = "Armory Motion Sensor";
- dir = 2
+ c_tag = "Armory Motion Sensor"
},
/turf/open/floor/plasteel/dark,
/area/security/armory)
@@ -3630,7 +3604,6 @@
name = "Door Bolt Control";
normaldoorcontrol = 1;
pixel_x = 25;
- req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/plating,
@@ -3729,8 +3702,6 @@
/area/security/brig)
"akD" = (
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_y = 24
},
@@ -4099,9 +4070,7 @@
/area/security/brig)
"alt" = (
/obj/machinery/door/window/westleft{
- base_state = "left";
dir = 4;
- icon_state = "left";
name = "Brig Infirmary"
},
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
@@ -4872,8 +4841,7 @@
dir = 1
},
/obj/machinery/camera{
- c_tag = "Brig Control Room";
- dir = 2
+ c_tag = "Brig Control Room"
},
/obj/item/radio/intercom{
dir = 4;
@@ -4993,8 +4961,7 @@
/area/space/nearstation)
"anm" = (
/obj/machinery/door/airlock/maintenance/abandoned{
- name = "Pete's Speakeasy";
- req_access_txt = "0"
+ name = "Pete's Speakeasy"
},
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
@@ -5325,7 +5292,6 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
- dir = 2;
name = "Head of Security's Office APC";
pixel_y = -24
},
@@ -6320,8 +6286,7 @@
/area/security/brig)
"aqq" = (
/obj/machinery/camera{
- c_tag = "Brig Cells";
- dir = 2
+ c_tag = "Brig Cells"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -6645,7 +6610,6 @@
/area/crew_quarters/dorms)
"aqY" = (
/obj/docking_port/stationary{
- dir = 1;
dwidth = 2;
height = 6;
id = "monastery_shuttle_station";
@@ -6941,8 +6905,7 @@
"arL" = (
/obj/machinery/computer/card,
/obj/machinery/camera{
- c_tag = "Bridge - Central";
- dir = 2
+ c_tag = "Bridge - Central"
},
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -8112,8 +8075,8 @@
"aud" = (
/obj/machinery/camera/motion{
c_tag = "Vault";
- network = list("vault");
- dir = 1
+ dir = 1;
+ network = list("vault")
},
/obj/machinery/light,
/obj/structure/cable{
@@ -8147,8 +8110,6 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
name = "Station Intercom (General)";
pixel_x = -30
},
@@ -8280,7 +8241,6 @@
"aux" = (
/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
- dir = 2;
name = "Prison Intercom (General)";
pixel_x = -25;
pixel_y = -2;
@@ -8649,8 +8609,7 @@
dir = 10
},
/obj/machinery/camera{
- c_tag = "Dormitories Fore";
- dir = 2
+ c_tag = "Dormitories Fore"
},
/obj/machinery/light{
dir = 1
@@ -9308,8 +9267,7 @@
dir = 8
},
/obj/machinery/camera{
- c_tag = "Fitness Room";
- dir = 2
+ c_tag = "Fitness Room"
},
/obj/machinery/computer/security/telescreen/entertainment{
pixel_y = 32
@@ -9335,9 +9293,9 @@
icon_state = "plant-05"
},
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/fitness/recreation";
dir = 1;
name = "Fitness Room APC";
- areastring = "/area/crew_quarters/fitness/recreation";
pixel_y = 24
},
/obj/structure/cable{
@@ -9487,9 +9445,7 @@
name = "Brig Desk";
req_access_txt = "1"
},
-/obj/item/reagent_containers/food/snacks/donut{
- layer = 3
- },
+/obj/item/reagent_containers/food/snacks/donut,
/obj/machinery/door/poddoor/preopen{
id = "Secure Gate";
name = "brig shutters"
@@ -9503,9 +9459,7 @@
/area/security/brig)
"awQ" = (
/obj/structure/table/reinforced,
-/obj/item/pen{
- layer = 3
- },
+/obj/item/pen,
/obj/machinery/door/poddoor/preopen{
id = "Secure Gate";
name = "brig shutters"
@@ -9844,8 +9798,7 @@
dir = 1
},
/obj/machinery/camera{
- c_tag = "Captain's Quarters";
- dir = 2
+ c_tag = "Captain's Quarters"
},
/obj/item/clothing/suit/armor/riot/knight/blue,
/obj/item/clothing/head/helmet/knight/blue,
@@ -10033,8 +9986,7 @@
/obj/machinery/button/door{
id = "Dorm2Shutters";
name = "Privacy Shutters Control";
- pixel_y = 26;
- req_access_txt = "0"
+ pixel_y = 26
},
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/carpet,
@@ -10057,7 +10009,6 @@
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_x = 25;
- req_access_txt = "0";
specialfunctions = 4
},
/obj/structure/closet/secure_closet/personal/cabinet,
@@ -10160,8 +10111,7 @@
/obj/machinery/power/solar_control{
dir = 4;
id = "portsolar";
- name = "Port Solar Control";
- track = 0
+ name = "Port Solar Control"
},
/obj/structure/cable{
icon_state = "0-2"
@@ -10526,9 +10476,9 @@
"azo" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/power/apc/highcap/ten_k{
+ areastring = "/area/bridge";
dir = 4;
name = "Bridge APC";
- areastring = "/area/bridge";
pixel_x = 24
},
/obj/structure/cable{
@@ -11338,9 +11288,9 @@
/area/ai_monitored/turret_protected/ai_upload)
"aBx" = (
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/ai_monitored/turret_protected/ai_upload";
dir = 1;
name = "Upload APC";
- areastring = "/area/ai_monitored/turret_protected/ai_upload";
pixel_y = 24
},
/obj/structure/cable{
@@ -11409,8 +11359,7 @@
dir = 1
},
/obj/machinery/camera{
- c_tag = "Head of Personnel's Office";
- dir = 2
+ c_tag = "Head of Personnel's Office"
},
/obj/machinery/newscaster{
pixel_y = 32
@@ -11490,8 +11439,7 @@
/obj/machinery/button/door{
id = "Dorm1Shutters";
name = "Privacy Shutters Control";
- pixel_y = 26;
- req_access_txt = "0"
+ pixel_y = 26
},
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/plasteel/grimy,
@@ -11514,7 +11462,6 @@
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_x = 25;
- req_access_txt = "0";
specialfunctions = 4
},
/obj/structure/closet/secure_closet/personal/cabinet,
@@ -11755,7 +11702,6 @@
/obj/item/analyzer,
/obj/machinery/requests_console{
department = "Tool Storage";
- departmentType = 0;
pixel_y = 30
},
/obj/effect/turf_decal/tile/neutral{
@@ -12220,7 +12166,6 @@
/area/crew_quarters/dorms)
"aDk" = (
/obj/machinery/vr_sleeper{
- icon_state = "sleeper";
dir = 8
},
/turf/open/floor/plasteel/white/corner{
@@ -12627,8 +12572,7 @@
"aEc" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock{
- name = "Dormitories";
- req_access_txt = "0"
+ name = "Dormitories"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
@@ -12638,8 +12582,7 @@
/area/crew_quarters/toilet/restrooms)
"aEe" = (
/obj/machinery/door/airlock{
- name = "Unisex Restrooms";
- req_access_txt = "0"
+ name = "Unisex Restrooms"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/freezer,
@@ -12915,9 +12858,7 @@
/obj/item/aiModule/supplied/oxygen,
/obj/item/aiModule/zeroth/oneHuman,
/obj/machinery/door/window{
- base_state = "left";
dir = 8;
- icon_state = "left";
name = "High-Risk Modules";
req_access_txt = "20"
},
@@ -13301,7 +13242,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/window/northleft{
dir = 2;
- icon_state = "left";
name = "Reception Window"
},
/obj/machinery/door/poddoor/preopen{
@@ -13377,8 +13317,7 @@
/area/crew_quarters/toilet/restrooms)
"aFK" = (
/obj/machinery/door/airlock{
- name = "Unisex Showers";
- req_access_txt = "0"
+ name = "Unisex Showers"
},
/obj/structure/cable{
icon_state = "4-8"
@@ -13648,7 +13587,6 @@
dir = 8
},
/obj/machinery/computer/arcade{
- icon_state = "arcade";
dir = 1
},
/turf/open/floor/plasteel/dark,
@@ -14057,8 +13995,7 @@
/area/hallway/primary/central)
"aHn" = (
/obj/machinery/door/airlock/abandoned{
- name = "Starboard Emergency Storage";
- req_access_txt = "0"
+ name = "Starboard Emergency Storage"
},
/obj/structure/cable{
icon_state = "1-2"
@@ -14821,8 +14758,7 @@
/area/hallway/primary/central)
"aJn" = (
/obj/machinery/door/airlock{
- name = "Unisex Restrooms";
- req_access_txt = "0"
+ name = "Unisex Restrooms"
},
/obj/structure/cable{
icon_state = "4-8"
@@ -14931,8 +14867,7 @@
dir = 8
},
/obj/machinery/camera{
- c_tag = "Departure Lounge Fore";
- dir = 2
+ c_tag = "Departure Lounge Fore"
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -14954,9 +14889,9 @@
dir = 8
},
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/hallway/secondary/exit/departure_lounge";
dir = 1;
name = "Departure Lounge APC";
- areastring = "/area/hallway/secondary/exit/departure_lounge";
pixel_y = 24
},
/obj/structure/cable{
@@ -15234,8 +15169,7 @@
dir = 1
},
/obj/machinery/camera{
- c_tag = "Dormitory Cyborg Recharging Station";
- dir = 2
+ c_tag = "Dormitory Cyborg Recharging Station"
},
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plasteel/freezer,
@@ -15819,9 +15753,7 @@
pixel_y = -5;
req_access_txt = "17"
},
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/corner,
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel,
/area/teleporter)
@@ -15866,8 +15798,7 @@
dir = 1
},
/obj/machinery/camera{
- c_tag = "Cargo Security Post";
- dir = 2
+ c_tag = "Cargo Security Post"
},
/obj/machinery/airalarm{
pixel_y = 22
@@ -16036,8 +15967,7 @@
dir = 1
},
/obj/machinery/camera{
- c_tag = "Cargo Warehouse";
- dir = 2
+ c_tag = "Cargo Warehouse"
},
/obj/structure/cable{
icon_state = "4-8"
@@ -16059,9 +15989,9 @@
dir = 9
},
/obj/machinery/power/apc{
+ areastring = "/area/quartermaster/warehouse";
dir = 4;
name = "Cargo Warehouse APC";
- areastring = "/area/quartermaster/warehouse";
pixel_x = 26
},
/obj/structure/cable,
@@ -16313,7 +16243,6 @@
"aNa" = (
/obj/structure/cable,
/obj/machinery/power/apc{
- dir = 2;
name = "Cafeteria APC";
pixel_y = -24
},
@@ -16344,7 +16273,6 @@
"aNe" = (
/obj/structure/cable,
/obj/machinery/power/apc/highcap/five_k{
- dir = 2;
name = "Auxiliary Restrooms APC";
pixel_y = -24
},
@@ -17819,8 +17747,7 @@
"aQU" = (
/obj/machinery/vending/coffee,
/obj/machinery/camera{
- c_tag = "Bar Backroom";
- dir = 2
+ c_tag = "Bar Backroom"
},
/turf/open/floor/wood,
/area/crew_quarters/bar)
@@ -17863,7 +17790,6 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
- dir = 2;
name = "EVA Storage APC";
pixel_y = -24
},
@@ -18398,7 +18324,6 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/mining/glass{
name = "Mailroom";
- req_access_txt = "0";
req_one_access_txt = "48;50"
},
/obj/machinery/door/firedoor,
@@ -18603,9 +18528,7 @@
location = "Kitchen"
},
/obj/machinery/door/window/southleft{
- base_state = "left";
dir = 8;
- icon_state = "left";
name = "Kitchen Delivery";
req_access_txt = "28"
},
@@ -19009,7 +18932,6 @@
/area/solar/starboard)
"aTH" = (
/obj/docking_port/stationary{
- dheight = 0;
dir = 8;
dwidth = 4;
height = 15;
@@ -19152,8 +19074,7 @@
/area/crew_quarters/kitchen)
"aTZ" = (
/obj/machinery/camera{
- c_tag = "Kitchen Cold Room";
- dir = 2
+ c_tag = "Kitchen Cold Room"
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
@@ -19270,7 +19191,6 @@
"aUo" = (
/obj/machinery/door/airlock/mining/glass{
name = "Cargo Bay";
- req_access_txt = "0";
req_one_access_txt = "31;48"
},
/obj/structure/disposalpipe/segment{
@@ -19615,9 +19535,6 @@
/area/crew_quarters/kitchen)
"aVc" = (
/obj/machinery/door/window/southleft{
- base_state = "left";
- dir = 2;
- icon_state = "left";
name = "Bar Delivery";
req_access_txt = "25"
},
@@ -19894,7 +19811,6 @@
pixel_y = -8
},
/obj/machinery/button/door{
- dir = 2;
id = "QMLoaddoor";
layer = 4;
name = "Loading Doors";
@@ -20042,7 +19958,6 @@
/area/crew_quarters/kitchen)
"aVX" = (
/obj/machinery/power/apc{
- dir = 2;
name = "Kitchen APC";
pixel_y = -24
},
@@ -20107,8 +20022,7 @@
receive_ore_updates = 1
},
/obj/machinery/camera{
- c_tag = "Bar Access";
- dir = 2
+ c_tag = "Bar Access"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -20535,9 +20449,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
-/obj/machinery/light/small{
- dir = 2
- },
+/obj/machinery/light/small,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/bar)
"aXb" = (
@@ -20553,9 +20465,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/light/small{
- dir = 2
- },
+/obj/machinery/light/small,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/bar)
"aXd" = (
@@ -20623,7 +20533,6 @@
},
/obj/machinery/requests_console{
department = "Theatre";
- departmentType = 0;
name = "theatre RC";
pixel_x = -32;
pixel_y = -32
@@ -21066,7 +20975,6 @@
"aYd" = (
/obj/machinery/door/airlock{
name = "Service Access";
- req_access_txt = "0";
req_one_access_txt = "25; 26; 28; 35"
},
/obj/structure/disposalpipe/segment,
@@ -21544,7 +21452,6 @@
pixel_y = 32
},
/obj/item/reagent_containers/food/condiment/saltshaker{
- layer = 3;
pixel_x = -2;
pixel_y = 2
},
@@ -22270,9 +22177,8 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
- dir = 2;
- name = "Cargo Office APC";
areastring = "/area/quartermaster/office";
+ name = "Cargo Office APC";
pixel_x = 1;
pixel_y = -24
},
@@ -22319,7 +22225,6 @@
dir = 4
},
/obj/machinery/power/apc{
- dir = 2;
name = "Cargo Bay APC";
pixel_y = -24
},
@@ -22430,7 +22335,6 @@
dir = 4
},
/obj/machinery/button/door{
- dir = 2;
id = "papersplease";
name = "Shutters Control Button";
pixel_x = -26;
@@ -22486,7 +22390,6 @@
/area/security/checkpoint/customs)
"baU" = (
/obj/machinery/power/apc{
- dir = 2;
name = "Security Checkpoint APC";
pixel_x = 1;
pixel_y = -24
@@ -22516,7 +22419,6 @@
dir = 8
},
/obj/machinery/button/door{
- dir = 2;
id = "jangarage";
name = "Custodial Closet Shutters Control";
pixel_x = 25;
@@ -22535,7 +22437,6 @@
dir = 8
},
/obj/machinery/button/door{
- dir = 2;
id = "jangarage";
name = "Custodial Closet Shutters Control";
pixel_x = -25;
@@ -22691,9 +22592,7 @@
/area/crew_quarters/bar)
"bbs" = (
/obj/item/cane,
-/obj/item/clothing/head/that{
- throwforce = 1
- },
+/obj/item/clothing/head/that,
/obj/structure/table/wood/fancy,
/turf/open/floor/carpet{
icon_state = "carpetsymbol"
@@ -23304,8 +23203,7 @@
/obj/machinery/power/solar_control{
dir = 8;
id = "starboardsolar";
- name = "Starboard Solar Control";
- track = 0
+ name = "Starboard Solar Control"
},
/obj/structure/cable,
/turf/open/floor/plating,
@@ -23587,9 +23485,9 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
+ areastring = "/area/quartermaster/qm";
dir = 8;
name = "Quartermaster APC";
- areastring = "/area/quartermaster/qm";
pixel_x = -24
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -23653,7 +23551,6 @@
"bdM" = (
/obj/machinery/requests_console{
department = "Mining";
- departmentType = 0;
pixel_x = 32
},
/obj/machinery/computer/security/mining{
@@ -25348,7 +25245,6 @@
dir = 4
},
/obj/machinery/button/door{
- dir = 2;
id = "Skynet_launch";
name = "Mech Bay Door Control";
pixel_x = 25;
@@ -25362,7 +25258,6 @@
dir = 8
},
/obj/machinery/button/door{
- dir = 2;
id = "Skynet_launch";
name = "Mech Bay Door Control";
pixel_x = -25;
@@ -25550,8 +25445,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research{
name = "Mech Bay";
- req_access_txt = "29";
- req_one_access_txt = "0"
+ req_access_txt = "29"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -25691,9 +25585,8 @@
pixel_y = 5
},
/obj/machinery/power/apc{
- dir = 2;
- name = "Lounge APC";
areastring = "/area/crew_quarters/lounge";
+ name = "Lounge APC";
pixel_y = -24
},
/obj/structure/cable,
@@ -25770,9 +25663,7 @@
"biW" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/airlock/maintenance{
- name = "Port Emergency Storage";
- req_access_txt = "0";
- req_one_access_txt = "0"
+ name = "Port Emergency Storage"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
@@ -25788,7 +25679,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/grunge{
name = "Morgue";
- opacity = 1;
req_access_txt = "6"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -26291,8 +26181,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research{
name = "Mech Bay";
- req_access_txt = "29";
- req_one_access_txt = "0"
+ req_access_txt = "29"
},
/turf/open/floor/plasteel,
/area/science/robotics/lab)
@@ -26305,7 +26194,6 @@
"bkz" = (
/obj/machinery/camera{
c_tag = "Experimentation Lab Chamber";
- dir = 2;
network = list("ss13","rd")
},
/turf/open/floor/engine,
@@ -26412,8 +26300,7 @@
},
/obj/machinery/camera{
c_tag = "Genetics Cloning Foyer";
- network = list("ss13","medbay");
- dir = 2
+ network = list("ss13","medbay")
},
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/machinery/power/apc{
@@ -26743,7 +26630,6 @@
"blH" = (
/obj/machinery/camera{
c_tag = "Robotics Lab";
- dir = 2;
network = list("ss13","rd")
},
/obj/structure/sink/kitchen{
@@ -27003,7 +26889,6 @@
},
/obj/machinery/door/airlock/maintenance{
name = "Genetics Maintenance";
- req_access_txt = "0";
req_one_access_txt = "12;45;5;9"
},
/turf/open/floor/plating,
@@ -27086,9 +26971,9 @@
/area/medical/morgue)
"bms" = (
/obj/machinery/power/apc{
+ areastring = "/area/security/checkpoint/medical";
dir = 8;
name = "Medbay Security APC";
- areastring = "/area/security/checkpoint/medical";
pixel_x = -25
},
/obj/structure/cable{
@@ -27096,8 +26981,8 @@
},
/obj/machinery/camera{
c_tag = "Medbay Security Post";
- network = list("ss13","medbay");
- dir = 4
+ dir = 4;
+ network = list("ss13","medbay")
},
/obj/structure/closet/secure_closet/security/med,
/obj/effect/turf_decal/tile/red{
@@ -27489,7 +27374,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass{
name = "Cloning";
- req_access_txt = "0";
req_one_access_txt = "5;9"
},
/obj/structure/cable{
@@ -28028,17 +27912,13 @@
/area/medical/medbay/central)
"boH" = (
/obj/machinery/requests_console{
- announcementConsole = 0;
department = "Medbay";
departmentType = 1;
name = "Medbay RC";
pixel_x = -32
},
/obj/item/radio/intercom{
- broadcasting = 0;
- freerange = 0;
frequency = 1485;
- listening = 1;
name = "Station Intercom (Medbay)";
pixel_y = 26
},
@@ -28093,8 +27973,8 @@
/obj/structure/bed/roller,
/obj/machinery/camera{
c_tag = "Medbay Entrance";
- network = list("ss13","medbay");
- dir = 1
+ dir = 1;
+ network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -28202,7 +28082,6 @@
dir = 4
},
/obj/machinery/button/door{
- dir = 2;
id = "robotics";
name = "Shutters Control Button";
pixel_x = -26;
@@ -28252,7 +28131,6 @@
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/machinery/camera{
c_tag = "Server Room";
- dir = 2;
network = list("ss13","rd");
pixel_x = 22
},
@@ -28334,7 +28212,6 @@
/obj/machinery/requests_console{
department = "Science";
departmentType = 2;
- dir = 2;
name = "Science Requests Console";
pixel_y = 30;
receive_ore_updates = 1
@@ -28346,7 +28223,6 @@
/obj/structure/disposalpipe/trunk,
/obj/machinery/camera{
c_tag = "Experimentation Lab Central";
- dir = 2;
network = list("ss13","rd")
},
/obj/effect/turf_decal/tile/neutral{
@@ -28451,10 +28327,7 @@
"bpy" = (
/obj/machinery/clonepod,
/obj/item/radio/intercom{
- broadcasting = 0;
- freerange = 0;
frequency = 1485;
- listening = 1;
name = "Station Intercom (Medbay)";
pixel_x = -30
},
@@ -28536,7 +28409,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
name = "Morgue";
- opacity = 1;
req_access_txt = "6"
},
/obj/structure/cable{
@@ -28568,7 +28440,6 @@
icon_state = "4-8"
},
/obj/machinery/light{
- dir = 2;
light_color = "#e8eaff"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -28602,7 +28473,6 @@
},
/obj/machinery/door/airlock/grunge{
name = "Morgue";
- opacity = 1;
req_access_txt = "6"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -29056,7 +28926,6 @@
"bqH" = (
/obj/machinery/door/window/northleft{
base_state = "right";
- dir = 1;
icon_state = "right";
name = "Containment Pen #5";
req_access_txt = "55"
@@ -29099,7 +28968,6 @@
"bqK" = (
/obj/machinery/door/window/northleft{
base_state = "right";
- dir = 1;
icon_state = "right";
name = "Containment Pen #6";
req_access_txt = "55"
@@ -29129,7 +28997,6 @@
/area/science/xenobiology)
"bqO" = (
/obj/machinery/door/airlock/maintenance{
- req_access_txt = "0";
req_one_access_txt = "12; 55"
},
/obj/structure/cable{
@@ -29141,9 +29008,9 @@
/area/maintenance/department/cargo)
"bqS" = (
/obj/machinery/power/apc{
+ areastring = "/area/hallway/secondary/entry";
dir = 4;
name = "Arrivals APC";
- areastring = "/area/hallway/secondary/entry";
pixel_x = 24
},
/obj/structure/cable{
@@ -29236,7 +29103,6 @@
/obj/machinery/door/airlock/medical/glass{
id_tag = "GeneticsDoor";
name = "Cloning";
- req_access_txt = "0";
req_one_access_txt = "5;9"
},
/obj/structure/cable{
@@ -29807,7 +29673,6 @@
"bsf" = (
/obj/machinery/camera{
c_tag = "Xenobiology Starboard";
- dir = 2;
network = list("ss13","rd")
},
/obj/structure/sign/departments/xenobio{
@@ -29867,8 +29732,8 @@
/obj/machinery/dna_scannernew,
/obj/machinery/camera{
c_tag = "Genetics Cloning";
- network = list("ss13","medbay");
- dir = 4
+ dir = 4;
+ network = list("ss13","medbay")
},
/obj/machinery/airalarm/unlocked{
dir = 4;
@@ -30017,10 +29882,7 @@
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/obj/item/radio/intercom{
- broadcasting = 0;
- freerange = 0;
frequency = 1485;
- listening = 1;
name = "Station Intercom (Medbay)";
pixel_x = 28
},
@@ -30491,8 +30353,7 @@
dir = 4
},
/obj/machinery/door/airlock/external{
- name = "Port Docking Bay 2";
- req_access_txt = "0"
+ name = "Port Docking Bay 2"
},
/turf/open/floor/plating,
/area/hallway/secondary/entry)
@@ -30501,8 +30362,7 @@
dir = 8
},
/obj/machinery/door/airlock/external{
- name = "Port Docking Bay 2";
- req_access_txt = "0"
+ name = "Port Docking Bay 2"
},
/turf/open/floor/plating,
/area/hallway/secondary/entry)
@@ -30822,8 +30682,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/airlock/research{
name = "Robotics Lab";
- req_access_txt = "29";
- req_one_access_txt = "0"
+ req_access_txt = "29"
},
/obj/effect/turf_decal/delivery,
/obj/machinery/door/firedoor,
@@ -31089,8 +30948,8 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera{
c_tag = "Medbay Port Hallway";
- network = list("ss13","medbay");
- dir = 4
+ dir = 4;
+ network = list("ss13","medbay")
},
/obj/machinery/airalarm{
dir = 4;
@@ -31370,7 +31229,6 @@
/obj/effect/turf_decal/stripes/line,
/obj/machinery/camera{
c_tag = "Science Access Airlock";
- dir = 2;
network = list("ss13","rd")
},
/turf/open/floor/plasteel/white,
@@ -31608,7 +31466,6 @@
/area/maintenance/department/science)
"bwn" = (
/obj/machinery/door/airlock/maintenance{
- req_access_txt = "0";
req_one_access_txt = "12; 55"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -31743,7 +31600,6 @@
/area/medical/genetics)
"bwB" = (
/obj/machinery/requests_console{
- announcementConsole = 0;
department = "Medbay";
departmentType = 1;
name = "Medbay RC";
@@ -32000,7 +31856,6 @@
},
/obj/machinery/door/airlock/research{
name = "R&D Lab";
- req_access_txt = "0";
req_one_access_txt = "7;29;30"
},
/obj/effect/turf_decal/delivery,
@@ -32194,9 +32049,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 2
- },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/plasteel/dark,
/area/science/explab)
"bxw" = (
@@ -32325,7 +32178,6 @@
"bxN" = (
/obj/machinery/door/window/northleft{
base_state = "right";
- dir = 1;
icon_state = "right";
name = "Containment Pen #1";
req_access_txt = "55"
@@ -32362,7 +32214,6 @@
"bxQ" = (
/obj/machinery/door/window/northleft{
base_state = "right";
- dir = 1;
icon_state = "right";
name = "Containment Pen #2";
req_access_txt = "55"
@@ -32395,7 +32246,6 @@
"bxS" = (
/obj/machinery/door/window/northleft{
base_state = "right";
- dir = 1;
icon_state = "right";
name = "Containment Pen #3";
req_access_txt = "55"
@@ -32691,7 +32541,6 @@
},
/obj/machinery/door/airlock/research{
name = "R&D Lab";
- req_access_txt = "0";
req_one_access_txt = "7;29;30"
},
/obj/effect/turf_decal/delivery,
@@ -33568,8 +33417,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/research{
name = "Research Director's Office";
- req_access_txt = "30";
- req_one_access_txt = "0"
+ req_access_txt = "30"
},
/obj/machinery/door/firedoor,
/obj/structure/cable{
@@ -33814,7 +33662,6 @@
},
/obj/machinery/requests_console{
department = "Genetics";
- departmentType = 0;
name = "Genetics Requests Console";
pixel_x = 32
},
@@ -34206,7 +34053,6 @@
"bBF" = (
/obj/machinery/portable_atmospherics/scrubber/huge,
/obj/machinery/airalarm{
- dir = 2;
pixel_y = 22
},
/turf/open/floor/engine,
@@ -34335,7 +34181,6 @@
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/obj/machinery/camera{
c_tag = "Toxins Lab Starboard";
- dir = 2;
network = list("ss13","rd")
},
/obj/machinery/light{
@@ -34494,8 +34339,7 @@
/obj/structure/closet/emcloset,
/obj/machinery/camera{
c_tag = "Virology Airlock";
- network = list("ss13","medbay");
- dir = 2
+ network = list("ss13","medbay")
},
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -35056,9 +34900,7 @@
/turf/open/space,
/area/space/nearstation)
"bDg" = (
-/obj/machinery/atmospherics/components/unary/tank/air{
- dir = 2
- },
+/obj/machinery/atmospherics/components/unary/tank/air,
/turf/open/floor/plating,
/area/maintenance/department/engine)
"bDh" = (
@@ -35214,9 +35056,9 @@
/area/crew_quarters/heads/cmo)
"bDx" = (
/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/heads/cmo";
dir = 4;
name = "CMO's Office APC";
- areastring = "/area/crew_quarters/heads/cmo";
pixel_x = 26
},
/obj/structure/cable,
@@ -36346,7 +36188,6 @@
normaldoorcontrol = 1;
pixel_x = 25;
pixel_y = 4;
- req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/plating,
@@ -36453,7 +36294,6 @@
pixel_y = 2
},
/obj/machinery/requests_console{
- announcementConsole = 0;
department = "Medbay";
departmentType = 1;
name = "Medbay RC";
@@ -36899,9 +36739,7 @@
/turf/open/floor/plating,
/area/chapel/dock)
"bGG" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 2
- },
+/obj/machinery/atmospherics/components/unary/outlet_injector/on,
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 8;
@@ -37022,10 +36860,7 @@
dir = 4
},
/obj/item/radio/intercom{
- broadcasting = 0;
- freerange = 0;
frequency = 1485;
- listening = 1;
name = "Station Intercom (Medbay)";
pixel_x = -28
},
@@ -37385,7 +37220,6 @@
/area/science/mixing)
"bHC" = (
/obj/machinery/atmospherics/components/binary/pump{
- dir = 2;
name = "Incinerator Output Pump"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -37405,12 +37239,8 @@
/area/science/mixing)
"bHE" = (
/obj/structure/window/reinforced,
-/obj/machinery/doppler_array/research/science{
- dir = 2
- },
-/obj/effect/turf_decal/bot{
- dir = 2
- },
+/obj/machinery/doppler_array/research/science,
+/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
@@ -37516,8 +37346,7 @@
"bHY" = (
/obj/machinery/camera{
c_tag = "Virology";
- network = list("ss13","medbay");
- dir = 2
+ network = list("ss13","medbay")
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -37552,10 +37381,7 @@
"bIb" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/obj/item/radio/intercom{
- broadcasting = 0;
- freerange = 0;
frequency = 1485;
- listening = 1;
name = "Station Intercom (Medbay)";
pixel_x = 28
},
@@ -37589,8 +37415,8 @@
/obj/machinery/light,
/obj/machinery/camera{
c_tag = "Medbay Equipment Room";
- network = list("ss13","medbay");
- dir = 1
+ dir = 1;
+ network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -37670,17 +37496,14 @@
"bIm" = (
/obj/machinery/camera{
c_tag = "Medbay Recovery Room";
- network = list("ss13","medbay");
- dir = 8
+ dir = 8;
+ network = list("ss13","medbay")
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/item/radio/intercom{
- broadcasting = 0;
- freerange = 0;
frequency = 1485;
- listening = 1;
name = "Station Intercom (Medbay)";
pixel_x = 28
},
@@ -37733,7 +37556,6 @@
},
/obj/machinery/camera{
c_tag = "Surgery";
- dir = 2;
network = list("ss13","surgery")
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -37938,11 +37760,9 @@
/turf/open/floor/engine,
/area/science/storage)
"bIK" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
- dir = 2
- },
-/turf/closed/wall/r_wall,
-/area/science/mixing)
+/obj/effect/landmark/start/cyborg,
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/turret_protected/aisat_interior)
"bIL" = (
/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior,
/turf/open/floor/engine,
@@ -38019,9 +37839,7 @@
/turf/open/floor/plasteel/dark,
/area/chapel/dock)
"bIX" = (
-/obj/machinery/atmospherics/components/unary/tank/air{
- dir = 2
- },
+/obj/machinery/atmospherics/components/unary/tank/air,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -38200,7 +38018,6 @@
/area/medical/virology)
"bJo" = (
/obj/machinery/requests_console{
- announcementConsole = 0;
department = "Medbay";
departmentType = 1;
name = "Medbay RC";
@@ -38359,9 +38176,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/corner,
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
dir = 8
@@ -38402,9 +38217,7 @@
c_tag = "Research Division Entrance";
dir = 1
},
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
dir = 8
@@ -38494,9 +38307,7 @@
/turf/closed/wall/r_wall,
/area/engine/atmos)
"bJQ" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
- dir = 2
- },
+/obj/machinery/atmospherics/components/binary/pump/on,
/obj/machinery/light/small{
dir = 8
},
@@ -38530,8 +38341,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/external{
- req_access_txt = "8";
- req_one_access_txt = "0"
+ req_access_txt = "8"
},
/turf/open/floor/plating,
/area/science/mixing)
@@ -38739,8 +38549,7 @@
pixel_y = 25
},
/obj/machinery/camera{
- c_tag = "Patient Room";
- dir = 2
+ c_tag = "Patient Room"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -38908,7 +38717,6 @@
dir = 4
},
/obj/machinery/airalarm{
- dir = 2;
pixel_y = 22
},
/obj/structure/cable{
@@ -39092,8 +38900,7 @@
/area/chapel/dock)
"bLq" = (
/obj/machinery/door/airlock/grunge{
- name = "Monastery Transit";
- opacity = 1
+ name = "Monastery Transit"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -39172,8 +38979,7 @@
/obj/structure/table,
/obj/structure/disposalpipe/segment,
/obj/item/stack/sheet/mineral/plasma{
- amount = 2;
- layer = 3
+ amount = 2
},
/obj/item/storage/box/monkeycubes{
layer = 3.1
@@ -39201,9 +39007,7 @@
/area/medical/virology)
"bLF" = (
/obj/structure/table,
-/obj/item/clipboard{
- toppaper = null
- },
+/obj/item/clipboard,
/obj/item/pen{
layer = 3.1
},
@@ -39480,7 +39284,6 @@
"bMh" = (
/obj/machinery/computer/atmos_control/tank{
dir = 8;
- frequency = 1441;
input_tag = "mix_in";
name = "Gas Mix Tank Control";
output_tag = "mix_in";
@@ -39498,7 +39301,6 @@
/area/engine/atmos)
"bMj" = (
/obj/machinery/air_sensor{
- frequency = 1441;
id_tag = "mix_sensor"
},
/turf/open/floor/engine/vacuum,
@@ -39539,8 +39341,7 @@
dir = 1
},
/obj/machinery/door/airlock/external{
- req_access_txt = "8";
- req_one_access_txt = "0"
+ req_access_txt = "8"
},
/turf/open/floor/plating,
/area/science/mixing)
@@ -39849,7 +39650,6 @@
"bMU" = (
/obj/machinery/camera{
c_tag = "Aft Primary Hallway Atmospherics";
- dir = 2;
start_active = 1
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -40833,8 +40633,7 @@
/area/space/nearstation)
"bPn" = (
/obj/machinery/door/airlock/grunge{
- name = "Chapel";
- opacity = 1
+ name = "Chapel"
},
/obj/structure/cable{
icon_state = "1-2"
@@ -40853,8 +40652,7 @@
/area/chapel/dock)
"bPo" = (
/obj/machinery/door/airlock/grunge{
- name = "Chapel";
- opacity = 1
+ name = "Chapel"
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -41088,7 +40886,6 @@
"bPX" = (
/obj/machinery/computer/atmos_control/tank{
dir = 8;
- frequency = 1441;
input_tag = "n2o_in";
name = "Nitrous Oxide Supply Control";
output_tag = "n2o_out";
@@ -41107,7 +40904,6 @@
/area/engine/atmos)
"bPZ" = (
/obj/machinery/air_sensor{
- frequency = 1441;
id_tag = "n2o_sensor"
},
/turf/open/floor/engine/n2o,
@@ -41192,8 +40988,7 @@
/area/engine/gravity_generator)
"bQo" = (
/obj/machinery/camera{
- c_tag = "Gravity Generator";
- dir = 2
+ c_tag = "Gravity Generator"
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
@@ -41290,13 +41085,11 @@
light_color = "#cee5d2"
},
/obj/machinery/camera{
- c_tag = "Tech Storage";
- dir = 2
+ c_tag = "Tech Storage"
},
/obj/item/circuitboard/computer/monastery_shuttle,
/obj/effect/spawner/lootdrop/techstorage/service,
/obj/machinery/airalarm{
- dir = 2;
pixel_y = 22
},
/obj/effect/turf_decal/tile/green{
@@ -41379,8 +41172,8 @@
/area/storage/tech)
"bQB" = (
/obj/machinery/power/apc{
- name = "Aft Hall APC";
dir = 8;
+ name = "Aft Hall APC";
pixel_x = -25;
pixel_y = 1
},
@@ -41415,7 +41208,6 @@
/obj/machinery/door/firedoor/heavy,
/obj/machinery/door/window/northleft{
dir = 4;
- icon_state = "left";
name = "Atmospherics Desk";
req_access_txt = "24"
},
@@ -41469,12 +41261,8 @@
dir = 4
},
/obj/machinery/portable_atmospherics/canister,
-/obj/effect/turf_decal/bot{
- dir = 2
- },
-/turf/open/floor/plasteel{
- dir = 2
- },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
/area/engine/atmos)
"bQL" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible{
@@ -41486,17 +41274,12 @@
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 8
},
-/obj/effect/turf_decal/bot{
- dir = 2
- },
-/turf/open/floor/plasteel{
- dir = 2
- },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
/area/engine/atmos)
"bQN" = (
/obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{
- dir = 1;
- on = 1
+ dir = 1
},
/turf/open/floor/plasteel,
/area/engine/atmos)
@@ -41631,7 +41414,6 @@
dir = 1
},
/obj/machinery/airalarm{
- dir = 2;
pixel_y = 22
},
/obj/effect/turf_decal/stripes/line{
@@ -41642,8 +41424,7 @@
"bRe" = (
/obj/structure/closet/radiation,
/obj/machinery/camera{
- c_tag = "Gravity Generator Foyer";
- dir = 2
+ c_tag = "Gravity Generator Foyer"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -41697,9 +41478,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/corner,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -41778,7 +41557,6 @@
/obj/machinery/door/firedoor/heavy,
/obj/machinery/door/window/northleft{
dir = 4;
- icon_state = "left";
name = "Atmospherics Desk";
req_access_txt = "24"
},
@@ -42506,7 +42284,6 @@
"bSV" = (
/obj/machinery/computer/atmos_control/tank{
dir = 8;
- frequency = 1441;
input_tag = "tox_in";
name = "Plasma Supply Control";
output_tag = "tox_out";
@@ -42520,7 +42297,6 @@
/area/engine/atmos)
"bSW" = (
/obj/machinery/air_sensor{
- frequency = 1441;
id_tag = "tox_sensor"
},
/turf/open/floor/engine/plasma,
@@ -42575,7 +42351,6 @@
/area/maintenance/department/engine)
"bTf" = (
/obj/machinery/atmospherics/components/binary/pump/on{
- dir = 2;
name = "Virology Waste to Space"
},
/turf/open/floor/plating{
@@ -42584,7 +42359,6 @@
/area/maintenance/department/engine)
"bTg" = (
/obj/machinery/atmospherics/components/binary/pump{
- dir = 2;
name = "Virology Waste to Atmospherics"
},
/turf/open/floor/plating,
@@ -42665,9 +42439,7 @@
pixel_y = 1
},
/obj/structure/table,
-/obj/item/paper/guides/jobs/engi/gravity_gen{
- layer = 3
- },
+/obj/item/paper/guides/jobs/engi/gravity_gen,
/obj/item/pen/blue,
/obj/machinery/power/terminal{
dir = 8
@@ -42822,9 +42594,8 @@
/area/storage/tech)
"bTB" = (
/obj/machinery/power/apc{
- dir = 2;
- name = "Tech Storage APC";
areastring = "/area/storage/tech";
+ name = "Tech Storage APC";
pixel_y = -24
},
/obj/structure/cable,
@@ -42912,8 +42683,7 @@
dir = 1
},
/obj/machinery/camera{
- c_tag = "Atmospherics Entrance";
- dir = 2
+ c_tag = "Atmospherics Entrance"
},
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -42988,8 +42758,7 @@
},
/obj/structure/reagent_dispensers/fueltank,
/obj/machinery/camera{
- c_tag = "Atmospherics Mixing";
- dir = 2
+ c_tag = "Atmospherics Mixing"
},
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -43019,8 +42788,7 @@
/area/engine/atmos)
"bTU" = (
/obj/machinery/atmospherics/components/trinary/filter/atmos/plasma{
- dir = 1;
- on = 1
+ dir = 1
},
/turf/open/floor/plasteel,
/area/engine/atmos)
@@ -43346,8 +43114,7 @@
dir = 1
},
/obj/machinery/camera{
- c_tag = "Chief Engineer's Office";
- dir = 2
+ c_tag = "Chief Engineer's Office"
},
/obj/machinery/computer/security/telescreen/ce{
pixel_y = 30
@@ -43362,7 +43129,6 @@
/area/crew_quarters/heads/chief)
"bUK" = (
/obj/machinery/airalarm{
- dir = 2;
pixel_y = 22
},
/obj/machinery/computer/apc_control,
@@ -43437,8 +43203,7 @@
},
/obj/machinery/power/smes/engineering,
/obj/machinery/camera{
- c_tag = "Engineering Power Storage";
- dir = 2
+ c_tag = "Engineering Power Storage"
},
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -43891,9 +43656,9 @@
pixel_y = 4
},
/obj/machinery/power/apc{
+ areastring = "/area/security/checkpoint/engineering";
dir = 8;
name = "Engineering Security APC";
- areastring = "/area/security/checkpoint/engineering";
pixel_x = -24
},
/obj/structure/cable{
@@ -44115,7 +43880,6 @@
dir = 8
},
/obj/machinery/light_switch{
- dir = 2;
pixel_x = 22
},
/obj/effect/turf_decal/tile/yellow,
@@ -44436,8 +44200,7 @@
/area/chapel/main/monastery)
"bWW" = (
/obj/machinery/door/airlock/grunge{
- name = "Chapel";
- opacity = 1
+ name = "Chapel"
},
/obj/structure/cable{
icon_state = "1-2"
@@ -44446,8 +44209,7 @@
/area/chapel/main/monastery)
"bWX" = (
/obj/machinery/door/airlock/grunge{
- name = "Chapel";
- opacity = 1
+ name = "Chapel"
},
/turf/open/floor/plasteel/dark,
/area/chapel/main/monastery)
@@ -44551,9 +44313,9 @@
/obj/item/stack/rods/fifty,
/obj/item/stack/cable_coil,
/obj/machinery/power/apc/highcap/ten_k{
+ areastring = "/area/engine/engine_smes";
dir = 8;
name = "Engine Room APC";
- areastring = "/area/engine/engine_smes";
pixel_x = -26
},
/obj/structure/cable,
@@ -45100,8 +44862,7 @@
dir = 4
},
/obj/machinery/camera{
- c_tag = "Engineering Port Fore";
- dir = 2
+ c_tag = "Engineering Port Fore"
},
/obj/structure/sign/map{
icon_state = "map-pubby";
@@ -45183,7 +44944,6 @@
dir = 4
},
/obj/machinery/airalarm{
- dir = 2;
pixel_y = 22
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -45339,8 +45099,7 @@
dir = 4
},
/obj/machinery/camera{
- c_tag = "Engineering Starboard Fore";
- dir = 2
+ c_tag = "Engineering Starboard Fore"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -45411,7 +45170,6 @@
pixel_x = -24
},
/obj/machinery/airalarm{
- dir = 2;
pixel_y = 22
},
/obj/structure/cable{
@@ -45912,9 +45670,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{
- dir = 2
- },
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos,
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
"caN" = (
@@ -45950,7 +45706,6 @@
},
/obj/machinery/camera{
c_tag = "Turbine Chamber";
- dir = 2;
network = list("turbine")
},
/turf/open/floor/engine,
@@ -46257,8 +46012,7 @@
/area/chapel/main/monastery)
"cbR" = (
/obj/machinery/door/airlock/grunge{
- name = "Chapel Access";
- opacity = 1
+ name = "Chapel Access"
},
/turf/open/floor/plasteel/dark,
/area/chapel/main/monastery)
@@ -46390,7 +46144,6 @@
/area/maintenance/disposal/incinerator)
"ccr" = (
/obj/machinery/atmospherics/components/binary/pump/on{
- dir = 2;
name = "Incinerator Output Pump"
},
/obj/effect/turf_decal/tile/yellow,
@@ -46617,7 +46370,6 @@
},
/obj/machinery/camera{
c_tag = "Chapel Port Access";
- dir = 2;
network = list("ss13","monastery")
},
/turf/open/floor/plasteel/dark,
@@ -46770,7 +46522,6 @@
"ceg" = (
/obj/machinery/door/airlock/centcom{
name = "Chapel Office";
- opacity = 1;
req_access_txt = "22"
},
/obj/structure/cable{
@@ -46790,8 +46541,7 @@
/area/chapel/office)
"cei" = (
/obj/machinery/door/airlock/grunge{
- name = "Chapel";
- opacity = 1
+ name = "Chapel"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -46803,24 +46553,21 @@
/area/chapel/main/monastery)
"cej" = (
/obj/machinery/door/airlock/grunge{
- name = "Chapel";
- opacity = 1
+ name = "Chapel"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/dark,
/area/chapel/main/monastery)
"cek" = (
/obj/machinery/door/airlock/grunge{
- name = "Chapel";
- opacity = 1
+ name = "Chapel"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/chapel/main/monastery)
"cel" = (
/obj/machinery/door/airlock/grunge{
- name = "Chapel Access";
- opacity = 1
+ name = "Chapel Access"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/dark,
@@ -46903,7 +46650,6 @@
},
/obj/machinery/camera{
c_tag = "Chapel Crematorium";
- dir = 2;
network = list("ss13","monastery")
},
/turf/open/floor/plasteel/dark,
@@ -46993,7 +46739,6 @@
},
/obj/machinery/computer/security/telescreen{
desc = "Used for watching telecomms.";
- dir = 2;
layer = 4;
name = "Telecomms Telescreen";
network = list("tcomms");
@@ -47055,8 +46800,7 @@
/area/chapel/office)
"cfl" = (
/obj/machinery/door/airlock/grunge{
- name = "Chapel Access";
- opacity = 1
+ name = "Chapel Access"
},
/obj/structure/cable{
icon_state = "1-2"
@@ -47359,7 +47103,6 @@
/obj/structure/flora/ausbushes/sparsegrass,
/obj/machinery/camera{
c_tag = "Monastery Garden";
- dir = 2;
network = list("ss13","monastery")
},
/turf/open/floor/grass,
@@ -48035,8 +47778,7 @@
/area/chapel/main/monastery)
"cjl" = (
/obj/machinery/door/airlock/grunge{
- name = "Monastery Cemetary";
- opacity = 1
+ name = "Monastery Cemetary"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -48116,8 +47858,7 @@
/area/chapel/main/monastery)
"cjH" = (
/obj/machinery/door/airlock/grunge{
- name = "Chapel Garden";
- opacity = 1
+ name = "Chapel Garden"
},
/turf/open/floor/plasteel/dark,
/area/chapel/main/monastery)
@@ -48832,9 +48573,9 @@
/area/tcommsat/computer)
"cmk" = (
/obj/machinery/power/apc{
+ areastring = "/area/tcommsat/computer";
dir = 1;
name = "Telecomms Monitoring APC";
- areastring = "/area/tcommsat/computer";
pixel_y = 25
},
/obj/structure/cable{
@@ -49239,7 +48980,6 @@
/obj/structure/lattice,
/obj/machinery/camera/motion{
c_tag = "Telecomms External Port Aft";
- dir = 2;
network = list("tcomms")
},
/turf/open/space,
@@ -49248,7 +48988,6 @@
/obj/structure/lattice,
/obj/machinery/camera/motion{
c_tag = "Telecomms External Starboard Aft";
- dir = 2;
network = list("tcomms")
},
/turf/open/space,
@@ -49266,6 +49005,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"cnD" = (
@@ -49292,8 +49032,7 @@
"cnN" = (
/obj/structure/closet/secure_closet/security/sec,
/obj/machinery/camera{
- c_tag = "Brig Equipment Room";
- dir = 2
+ c_tag = "Brig Equipment Room"
},
/obj/item/radio/intercom{
name = "Station Intercom (General)";
@@ -49413,8 +49152,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock{
- name = "Dormitories";
- req_access_txt = "0"
+ name = "Dormitories"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
@@ -49424,8 +49162,7 @@
dir = 8
},
/obj/machinery/door/airlock/external{
- name = "public external airlock";
- req_access_txt = "0"
+ name = "public external airlock"
},
/turf/open/floor/plating,
/area/storage/emergency/starboard)
@@ -49595,8 +49332,7 @@
/obj/machinery/chem_dispenser/drinks,
/obj/structure/table,
/obj/machinery/camera{
- c_tag = "Bar Drinks";
- dir = 2
+ c_tag = "Bar Drinks"
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/bar)
@@ -50046,9 +49782,7 @@
c_tag = "Research Division Hallway";
dir = 1
},
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/effect/turf_decal/tile/purple,
/obj/effect/turf_decal/tile/purple{
dir = 8
@@ -50538,7 +50272,6 @@
"csC" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/bottle/holywater{
- name = "flask of holy water";
pixel_x = -2;
pixel_y = 2
},
@@ -50641,7 +50374,6 @@
},
/obj/machinery/camera{
c_tag = "Chapel Starboard Access";
- dir = 2;
network = list("ss13","monastery")
},
/obj/structure/chair/wood/normal,
@@ -50732,9 +50464,7 @@
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"ctu" = (
-/obj/machinery/light/small{
- dir = 2
- },
+/obj/machinery/light/small,
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
@@ -50814,7 +50544,6 @@
},
/obj/machinery/camera{
c_tag = "Monastery Cloister Fore";
- dir = 2;
network = list("ss13","monastery")
},
/obj/effect/turf_decal/tile/neutral{
@@ -51047,9 +50776,7 @@
/area/hydroponics/garden/monastery)
"cuG" = (
/obj/structure/closet/secure_closet/freezer/fridge,
-/obj/machinery/light/small{
- dir = 2
- },
+/obj/machinery/light/small,
/turf/open/floor/plasteel,
/area/chapel/main/monastery)
"cuH" = (
@@ -51887,9 +51614,7 @@
/turf/open/floor/plasteel/dark,
/area/library/lounge)
"cxD" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/corner,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
},
@@ -52116,7 +51841,6 @@
},
/obj/machinery/camera{
c_tag = "Monastery Archives Fore";
- dir = 2;
network = list("ss13","monastery")
},
/obj/machinery/firealarm{
@@ -52447,9 +52171,7 @@
dir = 4
},
/obj/machinery/door/window/northright{
- base_state = "right";
dir = 2;
- icon_state = "right";
name = "Curator Desk Door";
req_access_txt = "37"
},
@@ -52625,8 +52347,7 @@
/obj/machinery/button/door{
id = "supplybridge";
name = "Space Bridge Control";
- pixel_y = 27;
- req_access_txt = "0"
+ pixel_y = 27
},
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
@@ -52860,9 +52581,7 @@
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cPy" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 2
- },
+/obj/machinery/atmospherics/components/binary/pump,
/obj/structure/sign/warning/nosmoking{
pixel_x = -32;
pixel_y = 32
@@ -52935,7 +52654,6 @@
/obj/effect/turf_decal/delivery,
/obj/machinery/door/window/eastright{
base_state = "left";
- dir = 4;
icon_state = "left";
name = "Research Division Delivery";
req_access_txt = "47"
@@ -52972,7 +52690,6 @@
/area/maintenance/disposal)
"dbi" = (
/obj/machinery/vr_sleeper{
- icon_state = "sleeper";
dir = 8
},
/turf/open/floor/plasteel,
@@ -53090,7 +52807,6 @@
/area/science/xenobiology)
"dnS" = (
/obj/machinery/atmospherics/components/binary/pump{
- dir = 2;
name = "Mix Bypass"
},
/obj/structure/cable/yellow{
@@ -53152,7 +52868,6 @@
/area/quartermaster/qm)
"dqw" = (
/obj/machinery/door/airlock/maintenance{
- req_access_txt = "0";
req_one_access_txt = "12; 55"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -53678,7 +53393,6 @@
/area/medical/sleeper)
"eFG" = (
/obj/machinery/mineral/stacking_unit_console{
- dir = 2;
machinedir = 8;
pixel_x = -32;
pixel_y = 32
@@ -53858,9 +53572,7 @@
/area/hallway/primary/aft)
"fdS" = (
/obj/machinery/door/window/southleft{
- base_state = "left";
dir = 4;
- icon_state = "left";
name = "Engineering Delivery";
req_access_txt = "10"
},
@@ -54249,7 +53961,6 @@
"gam" = (
/obj/machinery/door/airlock/medical/glass{
name = "Service Door";
- req_access_txt = "0";
req_one_access_txt = "35;28"
},
/obj/machinery/door/poddoor/shutters/preopen{
@@ -54595,7 +54306,6 @@
pixel_y = 3
},
/obj/machinery/button/door{
- dir = 2;
id = "research_shutters_2";
name = "Shutters Control Button";
pixel_x = -28;
@@ -55007,7 +54717,6 @@
"hDG" = (
/obj/machinery/door/airlock/engineering{
name = "Auxillary Base Construction";
- req_access_txt = "0";
req_one_access_txt = "32;47;48"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -55433,7 +55142,6 @@
icon_state = "secbot1";
idcheck = 1;
name = "Sergeant-at-Armsky";
- on = 1;
weaponscheck = 1
},
/turf/open/floor/plasteel/dark,
@@ -55477,8 +55185,8 @@
/area/crew_quarters/dorms)
"izF" = (
/turf/open/floor/plating{
- luminosity = 2;
- initial_gas_mix = "o2=0.01;n2=0.01"
+ initial_gas_mix = "o2=0.01;n2=0.01";
+ luminosity = 2
},
/area/maintenance/department/science)
"iAx" = (
@@ -55622,7 +55330,6 @@
/area/science/xenobiology)
"iPH" = (
/obj/machinery/vr_sleeper{
- icon_state = "sleeper";
dir = 8
},
/obj/effect/turf_decal/tile/blue{
@@ -55761,7 +55468,6 @@
dir = 1
},
/obj/machinery/requests_console{
- announcementConsole = 0;
department = "Engineering";
departmentType = 4;
name = "Engineering RC";
@@ -56083,9 +55789,7 @@
/area/science/mixing)
"kfM" = (
/obj/structure/closet,
-/obj/machinery/light/small{
- dir = 2
- },
+/obj/machinery/light/small,
/obj/item/storage/book/bible,
/obj/item/storage/book/bible,
/obj/item/storage/book/bible,
@@ -56236,7 +55940,6 @@
dir = 1
},
/obj/machinery/airalarm{
- dir = 2;
pixel_y = 22
},
/obj/effect/turf_decal/tile/yellow{
@@ -56264,9 +55967,7 @@
/turf/open/floor/plasteel/dark,
/area/hallway/secondary/exit/departure_lounge)
"kDf" = (
-/obj/machinery/light/small{
- dir = 2
- },
+/obj/machinery/light/small,
/turf/open/floor/carpet/black,
/area/chapel/office)
"kDJ" = (
@@ -56405,7 +56106,6 @@
"kNf" = (
/obj/machinery/door/window/northleft{
base_state = "right";
- dir = 1;
icon_state = "right";
name = "Containment Pen #4";
req_access_txt = "55"
@@ -56491,9 +56191,7 @@
/area/engine/engineering)
"kSO" = (
/obj/machinery/door/airlock/maintenance{
- name = "Port Emergency Storage";
- req_access_txt = "0";
- req_one_access_txt = "0"
+ name = "Port Emergency Storage"
},
/turf/open/floor/plating,
/area/storage/emergency/port)
@@ -56800,8 +56498,7 @@
/area/hallway/primary/aft)
"lKL" = (
/obj/machinery/door/airlock/abandoned{
- name = "Starboard Emergency Storage";
- req_access_txt = "0"
+ name = "Starboard Emergency Storage"
},
/obj/structure/cable{
icon_state = "1-2"
@@ -57203,9 +56900,7 @@
/area/bridge)
"mzl" = (
/obj/structure/chair,
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 2
- },
+/obj/machinery/atmospherics/components/unary/outlet_injector/on,
/turf/open/floor/plating,
/area/security/execution/transfer)
"mzU" = (
@@ -57428,7 +57123,6 @@
"nku" = (
/obj/machinery/door/airlock/centcom{
name = "Crematorium";
- opacity = 1;
req_access_txt = "27"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -57485,9 +57179,9 @@
dir = 1
},
/obj/machinery/power/apc{
+ areastring = "/area/construction/mining/aux_base";
dir = 8;
name = "Auxillary Base Construction APC";
- areastring = "/area/construction/mining/aux_base";
pixel_x = -24
},
/obj/structure/cable{
@@ -57559,8 +57253,8 @@
dir = 6
},
/turf/open/floor/plating{
- luminosity = 2;
- initial_gas_mix = "o2=0.01;n2=0.01"
+ initial_gas_mix = "o2=0.01;n2=0.01";
+ luminosity = 2
},
/area/maintenance/department/science)
"nAs" = (
@@ -57698,7 +57392,6 @@
},
/obj/machinery/camera/motion{
c_tag = "Telecomms Monitoring";
- dir = 2;
network = list("tcomms")
},
/obj/structure/cable{
@@ -57829,8 +57522,8 @@
/obj/item/paper_bin,
/obj/item/pen,
/turf/open/floor/plating{
- luminosity = 2;
- initial_gas_mix = "o2=0.01;n2=0.01"
+ initial_gas_mix = "o2=0.01;n2=0.01";
+ luminosity = 2
},
/area/maintenance/department/science)
"odM" = (
@@ -57934,9 +57627,7 @@
/obj/item/paper_bin{
layer = 2.9
},
-/obj/effect/turf_decal/stripes/corner{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/corner,
/obj/structure/window/reinforced,
/turf/open/floor/plasteel,
/area/science/xenobiology)
@@ -57976,8 +57667,7 @@
dir = 4
},
/obj/machinery/camera{
- c_tag = "Arrivals Port Fore";
- dir = 2
+ c_tag = "Arrivals Port Fore"
},
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -58505,7 +58195,6 @@
/area/engine/supermatter)
"psd" = (
/obj/machinery/atmospherics/components/binary/pump{
- dir = 2;
name = "Gas to Filter"
},
/obj/effect/decal/cleanable/dirt,
@@ -58671,7 +58360,6 @@
/obj/structure/closet/firecloset,
/obj/machinery/camera{
c_tag = "Toxins Launch Area";
- dir = 2;
network = list("ss13","rd")
},
/obj/structure/sign/poster/official/random{
@@ -58806,7 +58494,6 @@
/area/maintenance/department/engine)
"qar" = (
/obj/structure/chair/office/light{
- icon_state = "officechair_white";
dir = 4
},
/turf/open/floor/plasteel/white,
@@ -59345,8 +59032,8 @@
dir = 4
},
/turf/open/floor/plating{
- luminosity = 2;
- initial_gas_mix = "o2=0.01;n2=0.01"
+ initial_gas_mix = "o2=0.01;n2=0.01";
+ luminosity = 2
},
/area/maintenance/department/science)
"rrb" = (
@@ -59404,9 +59091,7 @@
location = "Medbay"
},
/obj/machinery/door/window/southleft{
- base_state = "left";
dir = 4;
- icon_state = "left";
name = "Medbay Delivery";
req_access_txt = "28"
},
@@ -59485,7 +59170,6 @@
/obj/docking_port/stationary{
area_type = /area/construction/mining/aux_base;
dheight = 4;
- dir = 1;
dwidth = 4;
height = 9;
id = "aux_base_zone";
@@ -59518,8 +59202,7 @@
/obj/machinery/button/door{
id = "shootshut";
name = "shutters control";
- pixel_x = 28;
- req_access_txt = "0"
+ pixel_x = 28
},
/obj/item/ammo_casing/shotgun/improvised,
/turf/open/floor/plating,
@@ -59577,8 +59260,7 @@
dir = 4
},
/obj/machinery/door/airlock/external{
- name = "public external airlock";
- req_access_txt = "0"
+ name = "public external airlock"
},
/turf/open/floor/plating,
/area/storage/emergency/starboard)
@@ -59937,7 +59619,6 @@
},
/obj/machinery/door/airlock/centcom{
name = "Chapel Office";
- opacity = 1;
req_access_txt = "22"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -60132,7 +59813,6 @@
id = "aux_base_shutters";
name = "Public Shutters Control";
pixel_x = -26;
- req_access_txt = "0";
req_one_access_txt = "32;47;48"
},
/obj/effect/turf_decal/stripes/line,
@@ -60416,7 +60096,6 @@
/area/science/xenobiology)
"ugC" = (
/obj/structure/chair/office/light{
- icon_state = "officechair_white";
dir = 4
},
/obj/effect/turf_decal/tile/purple{
@@ -60493,8 +60172,8 @@
dir = 9
},
/turf/open/floor/plating{
- luminosity = 2;
- initial_gas_mix = "o2=0.01;n2=0.01"
+ initial_gas_mix = "o2=0.01;n2=0.01";
+ luminosity = 2
},
/area/maintenance/department/science)
"uoq" = (
@@ -60673,7 +60352,6 @@
},
/obj/machinery/camera{
c_tag = "Experimentation Lab Mixing Area";
- dir = 2;
network = list("ss13","rd")
},
/turf/open/floor/engine,
@@ -60954,8 +60632,8 @@
"vpz" = (
/obj/structure/girder,
/turf/open/floor/plating{
- luminosity = 2;
- initial_gas_mix = "o2=0.01;n2=0.01"
+ initial_gas_mix = "o2=0.01;n2=0.01";
+ luminosity = 2
},
/area/maintenance/department/science)
"vsk" = (
@@ -60988,7 +60666,6 @@
},
/obj/machinery/door/airlock/maintenance{
name = "Research Lab Maintenance";
- req_access_txt = "0";
req_one_access_txt = "7;29"
},
/turf/open/floor/plating,
@@ -61204,8 +60881,7 @@
dir = 1
},
/obj/machinery/camera{
- c_tag = "Engineering Port Storage";
- dir = 2
+ c_tag = "Engineering Port Storage"
},
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -61265,7 +60941,6 @@
/area/science/xenobiology)
"wbB" = (
/obj/machinery/atmospherics/components/binary/pump{
- dir = 2;
name = "External Gas to Loop"
},
/obj/effect/turf_decal/delivery,
@@ -61962,8 +61637,8 @@
"xsO" = (
/obj/item/ectoplasm,
/turf/open/floor/plating{
- luminosity = 2;
- initial_gas_mix = "o2=0.01;n2=0.01"
+ initial_gas_mix = "o2=0.01;n2=0.01";
+ luminosity = 2
},
/area/maintenance/department/science)
"xuv" = (
@@ -61981,9 +61656,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"xxw" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 2
- },
+/obj/machinery/atmospherics/components/binary/pump,
/turf/open/floor/plasteel/dark,
/area/science/xenobiology)
"xxO" = (
@@ -62066,10 +61739,10 @@
/area/hallway/primary/aft)
"xFl" = (
/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/tcommsat/server";
dir = 1;
layer = 4;
name = "Telecomms Server APC";
- areastring = "/area/tcommsat/server";
pixel_y = 24
},
/obj/structure/cable{
@@ -62134,9 +61807,7 @@
/area/engine/engineering)
"xOC" = (
/obj/machinery/door/airlock/external{
- name = "Construction Zone";
- req_access_txt = "0";
- req_one_access_txt = "0"
+ name = "Construction Zone"
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/plating,
@@ -62156,8 +61827,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/airlock{
- name = "Port Emergency Storage";
- req_access_txt = "0"
+ name = "Port Emergency Storage"
},
/obj/effect/mapping_helpers/airlock/unres,
/turf/open/floor/plasteel/freezer,
@@ -95216,7 +94886,7 @@ aeO
aff
afy
afP
-agf
+bIK
agt
agD
agR
@@ -104551,9 +104221,9 @@ bEb
bFn
bGt
bHz
-bIK
+bIM
bJQ
-bIK
+bIM
bMl
bNp
bOt
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 6129d263fd..9a94fd3f61 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -6418,15 +6418,6 @@
/obj/effect/turf_decal/tile/brown,
/turf/open/floor/plasteel,
/area/centcom/supplypod/loading/two)
-"oV" = (
-/obj/machinery/vr_sleeper{
- dir = 4
- },
-/obj/machinery/light{
- dir = 8
- },
-/turf/open/indestructible/hotelwood,
-/area/centcom/holding)
"oX" = (
/obj/structure/bookcase/random,
/obj/machinery/light{
@@ -12460,12 +12451,6 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/evac)
-"CT" = (
-/obj/machinery/vr_sleeper{
- dir = 4
- },
-/turf/open/indestructible/hotelwood,
-/area/centcom/holding)
"CV" = (
/obj/structure/chair/stool,
/turf/open/indestructible/hotelwood,
@@ -12658,12 +12643,6 @@
"Di" = (
/turf/closed/indestructible/riveted,
/area/ai_multicam_room)
-"Dj" = (
-/obj/machinery/vr_sleeper{
- dir = 8
- },
-/turf/open/indestructible/hotelwood,
-/area/centcom/holding)
"Dk" = (
/obj/structure/table,
/turf/open/floor/plasteel/cafeteria,
@@ -13266,7 +13245,7 @@
/turf/open/floor/engine/cult,
/area/wizard_station)
"ED" = (
-/obj/machinery/vending/boozeomat,
+/obj/machinery/vending/boozeomat/all_access,
/turf/closed/indestructible{
icon = 'icons/turf/walls/wood_wall.dmi';
icon_state = "wood";
@@ -16736,6 +16715,10 @@
smooth = 1
},
/area/centcom/holding)
+"Nf" = (
+/obj/machinery/autoylathe,
+/turf/open/indestructible/hotelwood,
+/area/centcom/holding)
"Ni" = (
/obj/structure/table/reinforced,
/obj/item/clipboard,
@@ -16800,13 +16783,6 @@
/obj/machinery/recharge_station,
/turf/open/floor/plasteel/white,
/area/centcom/holding)
-"Ny" = (
-/obj/machinery/modular_computer/console/preset/research,
-/obj/machinery/light{
- dir = 1
- },
-/turf/open/indestructible/hotelwood,
-/area/centcom/holding)
"Nz" = (
/obj/effect/turf_decal/tile/brown{
dir = 8
@@ -17123,15 +17099,6 @@
"PD" = (
/turf/open/floor/plasteel/cafeteria,
/area/syndicate_mothership)
-"PF" = (
-/obj/machinery/vr_sleeper{
- dir = 8
- },
-/obj/machinery/light{
- dir = 4
- },
-/turf/open/indestructible/hotelwood,
-/area/centcom/holding)
"PG" = (
/obj/structure/table/reinforced,
/obj/item/camera,
@@ -17786,6 +17753,7 @@
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/storage/toolbox/mechanical,
+/obj/item/stack/sheet/plastic/fifty,
/obj/item/multitool,
/turf/open/indestructible/hotelwood,
/area/centcom/holding)
@@ -18166,6 +18134,13 @@
},
/turf/open/indestructible/hotelwood,
/area/centcom/holding)
+"VL" = (
+/obj/machinery/button/crematorium{
+ id = "crematoriumGhostDojo";
+ pixel_x = -25
+ },
+/turf/open/indestructible/hotelwood,
+/area/centcom/holding)
"VO" = (
/turf/closed/indestructible/riveted,
/area/centcom/supplypod)
@@ -18248,7 +18223,8 @@
/area/centcom/holding)
"Ww" = (
/obj/structure/bodycontainer/crematorium{
- dir = 4
+ dir = 4;
+ id = "crematoriumGhostDojo"
},
/turf/open/indestructible/hotelwood,
/area/centcom/holding)
@@ -43137,15 +43113,15 @@ UV
CV
Sd
NT
-CT
-oV
-CT
-CT
-CT
-oV
-CT
-Nd
Sd
+Sd
+Sd
+Sd
+Sd
+Sd
+Sd
+Nd
+VL
Ww
Sd
Nd
@@ -43651,13 +43627,13 @@ UV
CV
Sd
NT
-Dj
-PF
-Dj
Sd
-Dj
-PF
-Dj
+MR
+Sd
+Sd
+Sd
+MR
+Sd
Nd
Sd
Sd
@@ -45169,7 +45145,7 @@ aa
aa
aa
Nd
-Sd
+Nf
Sd
Rh
Mm
@@ -47225,7 +47201,7 @@ aa
aa
aa
Nd
-Ny
+Gs
Sd
Sd
Sd
diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm
index 2d40d91023..7b8c5ff6ae 100644
--- a/code/__DEFINES/combat.dm
+++ b/code/__DEFINES/combat.dm
@@ -159,6 +159,7 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(
#define EXPLODE_DEVASTATE 1
#define EXPLODE_HEAVY 2
#define EXPLODE_LIGHT 3
+#define EXPLODE_GIB_THRESHOLD 50
#define EMP_HEAVY 1
#define EMP_LIGHT 2
diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm
index c394d003d8..c93f1b2435 100644
--- a/code/__DEFINES/construction.dm
+++ b/code/__DEFINES/construction.dm
@@ -110,4 +110,7 @@
#define RCD_DECONSTRUCT 3
#define RCD_WINDOWGRILLE 4
#define RCD_MACHINE 8
-#define RCD_COMPUTER 16
\ No newline at end of file
+#define RCD_COMPUTER 16
+
+#define RCD_UPGRADE_FRAMES 1
+#define RCD_UPGRADE_SIMPLE_CIRCUITS 2
\ No newline at end of file
diff --git a/code/__HELPERS/_cit_helpers.dm b/code/__HELPERS/_cit_helpers.dm
index 8134494306..e874097e88 100644
--- a/code/__HELPERS/_cit_helpers.dm
+++ b/code/__HELPERS/_cit_helpers.dm
@@ -121,6 +121,17 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE)
flavor_text = sanitize(new_flavor)
to_chat(src, "Your flavor text has been updated.")
+//Flavor Text
+/mob/living/carbon/human/verb/set_flavor_2()
+ set name = "Set Temporary Flavor Text"
+ set desc = "Sets a description of your character's current appearance. Use this for emotions, poses etc."
+ set category = "IC"
+
+ var/new_flavor = input(src, "Enter your new temporary flavor text:", "Temporary flavor text", null) as message|null
+ if(!isnull(new_flavor))
+ flavor_text_2 = sanitize(new_flavor)
+ to_chat(src, "Your temporary flavor text has been updated.")
+
//LOOC toggles
/client/verb/listen_looc()
set name = "Show/Hide LOOC"
diff --git a/code/controllers/subsystem/pai.dm b/code/controllers/subsystem/pai.dm
index 18667053d4..5aa109b63a 100644
--- a/code/controllers/subsystem/pai.dm
+++ b/code/controllers/subsystem/pai.dm
@@ -8,7 +8,7 @@ SUBSYSTEM_DEF(pai)
var/spam_delay = 100
var/list/pai_card_list = list()
-/datum/controller/subsystem/pai/Topic(href, href_list[])
+/datum/controller/subsystem/pai/Topic(href, href_list)
if(href_list["download"])
var/datum/paiCandidate/candidate = locate(href_list["candidate"]) in candidates
var/obj/item/paicard/card = locate(href_list["device"]) in pai_card_list
diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm
index db6d80f9bb..ac4473845d 100644
--- a/code/datums/wires/airlock.dm
+++ b/code/datums/wires/airlock.dm
@@ -85,6 +85,8 @@
INVOKE_ASYNC(A, /obj/machinery/door/airlock.proc/open)
else
INVOKE_ASYNC(A, /obj/machinery/door/airlock.proc/close)
+ else
+ holder.visible_message("You hear a a grinding noise coming from the airlock.")
if(WIRE_BOLTS) // Pulse to toggle bolts (but only raise if power is on).
if(!A.locked)
A.bolt()
diff --git a/modular_citadel/code/datums/wires/autoylathe.dm b/code/datums/wires/autoylathe.dm
similarity index 100%
rename from modular_citadel/code/datums/wires/autoylathe.dm
rename to code/datums/wires/autoylathe.dm
diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm
index e01b525e02..9e2efd1d4e 100644
--- a/code/datums/world_topic.dm
+++ b/code/datums/world_topic.dm
@@ -1,183 +1,189 @@
-// SETUP
-
-/proc/TopicHandlers()
- . = list()
- var/list/all_handlers = subtypesof(/datum/world_topic)
- for(var/I in all_handlers)
- var/datum/world_topic/WT = I
- var/keyword = initial(WT.keyword)
- if(!keyword)
- warning("[WT] has no keyword! Ignoring...")
- continue
- var/existing_path = .[keyword]
- if(existing_path)
- warning("[existing_path] and [WT] have the same keyword! Ignoring [WT]...")
- else if(keyword == "key")
- warning("[WT] has keyword 'key'! Ignoring...")
- else
- .[keyword] = WT
-
-// DATUM
-
-/datum/world_topic
- var/keyword
- var/log = TRUE
- var/key_valid
- var/require_comms_key = FALSE
-
-/datum/world_topic/proc/TryRun(list/input, addr)
- key_valid = config && (CONFIG_GET(string/comms_key) == input["key"])
- if(require_comms_key && !key_valid)
- return "Bad Key"
- input -= "key"
- . = Run(input, addr)
- if(islist(.))
- . = list2params(.)
-
-/datum/world_topic/proc/Run(list/input, addr)
- CRASH("Run() not implemented for [type]!")
-
-// TOPICS
-
-/datum/world_topic/ping
- keyword = "ping"
- log = FALSE
-
-/datum/world_topic/ping/Run(list/input, addr)
- . = 0
- for (var/client/C in GLOB.clients)
- ++.
-
-/datum/world_topic/playing
- keyword = "playing"
- log = FALSE
-
-/datum/world_topic/playing/Run(list/input, addr)
- return GLOB.player_list.len
-
-/datum/world_topic/pr_announce
- keyword = "announce"
- require_comms_key = TRUE
- var/static/list/PRcounts = list() //PR id -> number of times announced this round
-
-/datum/world_topic/pr_announce/Run(list/input, addr)
- var/list/payload = json_decode(input["payload"])
- var/id = "[payload["pull_request"]["id"]]"
- if(!PRcounts[id])
- PRcounts[id] = 1
- else
- ++PRcounts[id]
- if(PRcounts[id] > PR_ANNOUNCEMENTS_PER_ROUND)
- return
-
- var/final_composed = "PR: [input[keyword]]"
- for(var/client/C in GLOB.clients)
- C.AnnouncePR(final_composed)
-
-/datum/world_topic/ahelp_relay
- keyword = "Ahelp"
- require_comms_key = TRUE
-
-/datum/world_topic/ahelp_relay/Run(list/input, addr)
- relay_msg_admins("HELP: [input["source"]] [input["message_sender"]]: [input["message"]]")
-
-/datum/world_topic/comms_console
- keyword = "Comms_Console"
- require_comms_key = TRUE
-
-/datum/world_topic/comms_console/Run(list/input, addr)
- minor_announce(input["message"], "Incoming message from [input["message_sender"]]")
- for(var/obj/machinery/computer/communications/CM in GLOB.machines)
- CM.overrideCooldown()
-
-/datum/world_topic/news_report
- keyword = "News_Report"
- require_comms_key = TRUE
-
-/datum/world_topic/news_report/Run(list/input, addr)
- minor_announce(input["message"], "Breaking Update From [input["message_sender"]]")
-
-/datum/world_topic/server_hop
- keyword = "server_hop"
-
-/datum/world_topic/server_hop/Run(list/input, addr)
- var/expected_key = input[keyword]
- for(var/mob/dead/observer/O in GLOB.player_list)
- if(O.key == expected_key)
- if(O.client?.address == addr)
- new /obj/screen/splash(O.client, TRUE)
- break
-
-/datum/world_topic/adminmsg
- keyword = "adminmsg"
- require_comms_key = TRUE
-
-/datum/world_topic/adminmsg/Run(list/input, addr)
- return IrcPm(input[keyword], input["msg"], input["sender"])
-
-/datum/world_topic/namecheck
- keyword = "namecheck"
- require_comms_key = TRUE
-
-/datum/world_topic/namecheck/Run(list/input, addr)
- //Oh this is a hack, someone refactor the functionality out of the chat command PLS
- var/datum/tgs_chat_command/namecheck/NC = new
- var/datum/tgs_chat_user/user = new
- user.friendly_name = input["sender"]
- user.mention = user.friendly_name
- return NC.Run(user, input["namecheck"])
-
-/datum/world_topic/adminwho
- keyword = "adminwho"
- require_comms_key = TRUE
-
-/datum/world_topic/adminwho/Run(list/input, addr)
- return ircadminwho()
-
-/datum/world_topic/status
- keyword = "status"
-
-/datum/world_topic/status/Run(list/input, addr)
- . = list()
- .["version"] = GLOB.game_version
- .["mode"] = "hidden" //CIT CHANGE - hides the gamemode in topic() calls to prevent meta'ing the gamemode
- .["respawn"] = config ? !CONFIG_GET(flag/norespawn) : FALSE
- .["enter"] = GLOB.enter_allowed
- .["vote"] = CONFIG_GET(flag/allow_vote_mode)
- .["ai"] = CONFIG_GET(flag/allow_ai)
- .["host"] = world.host ? world.host : null
- .["round_id"] = GLOB.round_id
- .["players"] = GLOB.clients.len
- .["revision"] = GLOB.revdata.commit
- .["revision_date"] = GLOB.revdata.date
-
- var/list/adm = get_admin_counts()
- var/list/presentmins = adm["present"]
- var/list/afkmins = adm["afk"]
- .["admins"] = presentmins.len + afkmins.len //equivalent to the info gotten from adminwho
- .["gamestate"] = SSticker.current_state
-
- .["map_name"] = SSmapping.config?.map_name || "Loading..."
-
- if(key_valid)
- .["active_players"] = get_active_player_count()
- if(SSticker.HasRoundStarted())
- .["real_mode"] = SSticker.mode.name
- // Key-authed callers may know the truth behind the "secret"
-
- .["security_level"] = get_security_level()
- .["round_duration"] = SSticker ? round((world.time-SSticker.round_start_time)/10) : 0
- // Amount of world's ticks in seconds, useful for calculating round duration
-
- //Time dilation stats.
- .["time_dilation_current"] = SStime_track.time_dilation_current
- .["time_dilation_avg"] = SStime_track.time_dilation_avg
- .["time_dilation_avg_slow"] = SStime_track.time_dilation_avg_slow
- .["time_dilation_avg_fast"] = SStime_track.time_dilation_avg_fast
-
- if(SSshuttle && SSshuttle.emergency)
- .["shuttle_mode"] = SSshuttle.emergency.mode
- // Shuttle status, see /__DEFINES/stat.dm
- .["shuttle_timer"] = SSshuttle.emergency.timeLeft()
- // Shuttle timer, in seconds
-
+// SETUP
+
+/proc/TopicHandlers()
+ . = list()
+ var/list/all_handlers = subtypesof(/datum/world_topic)
+ for(var/I in all_handlers)
+ var/datum/world_topic/WT = I
+ var/keyword = initial(WT.keyword)
+ if(!keyword)
+ warning("[WT] has no keyword! Ignoring...")
+ continue
+ var/existing_path = .[keyword]
+ if(existing_path)
+ warning("[existing_path] and [WT] have the same keyword! Ignoring [WT]...")
+ else if(keyword == "key")
+ warning("[WT] has keyword 'key'! Ignoring...")
+ else
+ .[keyword] = WT
+
+// DATUM
+
+/datum/world_topic
+ var/keyword
+ var/log = TRUE
+ var/key_valid
+ var/require_comms_key = FALSE
+
+/datum/world_topic/proc/TryRun(list/input, addr)
+ key_valid = config && (CONFIG_GET(string/comms_key) == input["key"])
+ if(require_comms_key && !key_valid)
+ return "Bad Key"
+ input -= "key"
+ . = Run(input, addr)
+ if(islist(.))
+ . = list2params(.)
+
+/datum/world_topic/proc/Run(list/input, addr)
+ CRASH("Run() not implemented for [type]!")
+
+// TOPICS
+
+/datum/world_topic/ping
+ keyword = "ping"
+ log = FALSE
+
+/datum/world_topic/ping/Run(list/input, addr)
+ . = 0
+ for (var/client/C in GLOB.clients)
+ ++.
+
+/datum/world_topic/playing
+ keyword = "playing"
+ log = FALSE
+
+/datum/world_topic/playing/Run(list/input, addr)
+ return GLOB.player_list.len
+
+/datum/world_topic/pr_announce
+ keyword = "announce"
+ require_comms_key = TRUE
+ var/static/list/PRcounts = list() //PR id -> number of times announced this round
+
+/datum/world_topic/pr_announce/Run(list/input, addr)
+ var/list/payload = json_decode(input["payload"])
+ var/id = "[payload["pull_request"]["id"]]"
+ if(!PRcounts[id])
+ PRcounts[id] = 1
+ else
+ ++PRcounts[id]
+ if(PRcounts[id] > PR_ANNOUNCEMENTS_PER_ROUND)
+ return
+
+ var/final_composed = "PR: [input[keyword]]"
+ for(var/client/C in GLOB.clients)
+ C.AnnouncePR(final_composed)
+
+/datum/world_topic/ahelp_relay
+ keyword = "Ahelp"
+ require_comms_key = TRUE
+
+/datum/world_topic/ahelp_relay/Run(list/input, addr)
+ relay_msg_admins("HELP: [input["source"]] [input["message_sender"]]: [input["message"]]")
+
+/datum/world_topic/comms_console
+ keyword = "Comms_Console"
+ require_comms_key = TRUE
+
+/datum/world_topic/comms_console/Run(list/input, addr)
+ minor_announce(input["message"], "Incoming message from [input["message_sender"]]")
+ for(var/obj/machinery/computer/communications/CM in GLOB.machines)
+ CM.overrideCooldown()
+
+/datum/world_topic/news_report
+ keyword = "News_Report"
+ require_comms_key = TRUE
+
+/datum/world_topic/news_report/Run(list/input, addr)
+ minor_announce(input["message"], "Breaking Update From [input["message_sender"]]")
+
+/datum/world_topic/server_hop
+ keyword = "server_hop"
+
+/datum/world_topic/server_hop/Run(list/input, addr)
+ var/expected_key = input[keyword]
+ for(var/mob/dead/observer/O in GLOB.player_list)
+ if(O.key == expected_key)
+ if(O.client?.address == addr)
+ new /obj/screen/splash(O.client, TRUE)
+ break
+
+/datum/world_topic/adminmsg
+ keyword = "adminmsg"
+ require_comms_key = TRUE
+
+/datum/world_topic/adminmsg/Run(list/input, addr)
+ return IrcPm(input[keyword], input["msg"], input["sender"])
+
+/datum/world_topic/namecheck
+ keyword = "namecheck"
+ require_comms_key = TRUE
+
+/datum/world_topic/namecheck/Run(list/input, addr)
+ //Oh this is a hack, someone refactor the functionality out of the chat command PLS
+ var/datum/tgs_chat_command/namecheck/NC = new
+ var/datum/tgs_chat_user/user = new
+ user.friendly_name = input["sender"]
+ user.mention = user.friendly_name
+ return NC.Run(user, input["namecheck"])
+
+/datum/world_topic/adminwho
+ keyword = "adminwho"
+ require_comms_key = TRUE
+
+/datum/world_topic/adminwho/Run(list/input, addr)
+ return ircadminwho()
+
+/datum/world_topic/status
+ keyword = "status"
+
+/datum/world_topic/status/Run(list/input, addr)
+ if(!key_valid) //If we have a key, then it's safe to trust that this isn't a malicious packet. Also prevents the extra info from leaking
+ if(GLOB.topic_status_lastcache <= world.time + 5)
+ return GLOB.topic_status_cache
+ GLOB.topic_status_lastcache = world.time
+ . = list()
+ .["version"] = GLOB.game_version
+ .["mode"] = "hidden" //CIT CHANGE - hides the gamemode in topic() calls to prevent meta'ing the gamemode
+ .["respawn"] = config ? !CONFIG_GET(flag/norespawn) : FALSE
+ .["enter"] = GLOB.enter_allowed
+ .["vote"] = CONFIG_GET(flag/allow_vote_mode)
+ .["ai"] = CONFIG_GET(flag/allow_ai)
+ .["host"] = world.host ? world.host : null
+ .["round_id"] = GLOB.round_id
+ .["players"] = GLOB.clients.len
+ .["revision"] = GLOB.revdata.commit
+ .["revision_date"] = GLOB.revdata.date
+
+ var/list/adm = get_admin_counts()
+ var/list/presentmins = adm["present"]
+ var/list/afkmins = adm["afk"]
+ .["admins"] = presentmins.len + afkmins.len //equivalent to the info gotten from adminwho
+ .["gamestate"] = SSticker.current_state
+
+ .["map_name"] = SSmapping.config?.map_name || "Loading..."
+
+ if(key_valid)
+ .["active_players"] = get_active_player_count()
+ if(SSticker.HasRoundStarted())
+ .["real_mode"] = SSticker.mode.name
+ // Key-authed callers may know the truth behind the "secret"
+
+ .["security_level"] = get_security_level()
+ .["round_duration"] = SSticker ? round((world.time-SSticker.round_start_time)/10) : 0
+ // Amount of world's ticks in seconds, useful for calculating round duration
+
+ //Time dilation stats.
+ .["time_dilation_current"] = SStime_track.time_dilation_current
+ .["time_dilation_avg"] = SStime_track.time_dilation_avg
+ .["time_dilation_avg_slow"] = SStime_track.time_dilation_avg_slow
+ .["time_dilation_avg_fast"] = SStime_track.time_dilation_avg_fast
+
+ if(SSshuttle && SSshuttle.emergency)
+ .["shuttle_mode"] = SSshuttle.emergency.mode
+ // Shuttle status, see /__DEFINES/stat.dm
+ .["shuttle_timer"] = SSshuttle.emergency.timeLeft()
+ // Shuttle timer, in seconds
+
+ if(!key_valid)
+ GLOB.topic_status_cache = .
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 4fd4a7929d..88b0e804b7 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -373,7 +373,7 @@
/obj/machinery/sleeper/syndie/Initialize()
. = ..()
component_parts = list()
- component_parts += new /obj/item/circuitboard/machine/sleeper(null)
+ component_parts += new /obj/item/circuitboard/machine/sleeper/syndie(null)
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
component_parts += new /obj/item/stock_parts/manipulator/pico(null)
component_parts += new /obj/item/stack/sheet/glass(null)
@@ -384,7 +384,7 @@
/obj/machinery/sleeper/syndie/fullupgrade/Initialize()
. = ..()
component_parts = list()
- component_parts += new /obj/item/circuitboard/machine/sleeper(null)
+ component_parts += new /obj/item/circuitboard/machine/sleeper/syndie(null)
component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null)
component_parts += new /obj/item/stock_parts/manipulator/femto(null)
component_parts += new /obj/item/stack/sheet/glass(null)
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 03c1bb3bc8..3e88223037 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1408,6 +1408,9 @@
/obj/machinery/door/airlock/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
switch(the_rcd.mode)
if(RCD_DECONSTRUCT)
+ if(security_level != AIRLOCK_SECURITY_NONE && the_rcd.canRturf != TRUE)
+ to_chat(user, "[src]'s reinforcement needs to be removed first.")
+ return FALSE
return list("mode" = RCD_DECONSTRUCT, "delay" = 50, "cost" = 32)
return FALSE
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index dec41b0a59..39b6c8da1d 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -450,6 +450,21 @@
return
return ..()
+/obj/structure/firelock_frame/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
+ if((constructionStep == CONSTRUCTION_NOCIRCUIT) && (the_rcd.upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS))
+ return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 20, "cost" = 1)
+ return FALSE
+
+/obj/structure/firelock_frame/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode)
+ switch(passed_mode)
+ if(RCD_UPGRADE_SIMPLE_CIRCUITS)
+ user.visible_message("[user] fabricates a circuit and places it into [src].", \
+ "You adapt a firelock circuit and slot it into the assembly.")
+ constructionStep = CONSTRUCTION_GUTTED
+ update_icon()
+ return TRUE
+ return FALSE
+
/obj/structure/firelock_frame/heavy
name = "heavy firelock frame"
reinforced = TRUE
diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm
index 8f7fce8e3e..1ef3fc0a74 100644
--- a/code/game/machinery/firealarm.dm
+++ b/code/game/machinery/firealarm.dm
@@ -1,325 +1,340 @@
-#define FIREALARM_COOLDOWN 67 // Chosen fairly arbitrarily, it is the length of the audio in FireAlarm.ogg. The actual track length is 7 seconds 8ms but but the audio stops at 6s 700ms
-
-/obj/item/electronics/firealarm
- name = "fire alarm electronics"
- desc = "A fire alarm circuit. Can handle heat levels up to 40 degrees celsius."
-
-/obj/item/wallframe/firealarm
- name = "fire alarm frame"
- desc = "Used for building fire alarms."
- icon = 'icons/obj/monitors.dmi'
- icon_state = "fire_bitem"
- result_path = /obj/machinery/firealarm
-
-/obj/machinery/firealarm
- name = "fire alarm"
- desc = "\"Pull this in case of emergency\". Thus, keep pulling it forever."
- icon = 'icons/obj/monitors.dmi'
- icon_state = "fire0"
- max_integrity = 250
- integrity_failure = 100
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 30)
- use_power = IDLE_POWER_USE
- idle_power_usage = 2
- active_power_usage = 6
- power_channel = ENVIRON
- resistance_flags = FIRE_PROOF
-
- light_power = 0
- light_range = 7
- light_color = "#ff3232"
-
- var/detecting = 1
- var/buildstage = 2 // 2 = complete, 1 = no wires, 0 = circuit gone
- var/last_alarm = 0
- var/area/myarea = null
-
-/obj/machinery/firealarm/Initialize(mapload, dir, building)
- . = ..()
- if(dir)
- src.setDir(dir)
- if(building)
- buildstage = 0
- panel_open = TRUE
- pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24)
- pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0
- update_icon()
- myarea = get_area(src)
- LAZYADD(myarea.firealarms, src)
-
-/obj/machinery/firealarm/Destroy()
- LAZYREMOVE(myarea.firealarms, src)
- return ..()
-
-/obj/machinery/firealarm/power_change()
- ..()
- update_icon()
-
-/obj/machinery/firealarm/update_icon()
- cut_overlays()
- SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
-
- if(panel_open)
- icon_state = "fire_b[buildstage]"
- return
-
- if(stat & BROKEN)
- icon_state = "firex"
- return
-
- icon_state = "fire0"
-
- if(stat & NOPOWER)
- return
-
- add_overlay("fire_overlay")
-
- if(is_station_level(z))
- add_overlay("fire_[GLOB.security_level]")
- SSvis_overlays.add_vis_overlay(src, icon, "fire_[GLOB.security_level]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
- else
- add_overlay("fire_[SEC_LEVEL_GREEN]")
- SSvis_overlays.add_vis_overlay(src, icon, "fire_[SEC_LEVEL_GREEN]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
-
- var/area/A = src.loc
- A = A.loc
-
- if(!detecting || !A.fire)
- add_overlay("fire_off")
- SSvis_overlays.add_vis_overlay(src, icon, "fire_off", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
- else if(obj_flags & EMAGGED)
- add_overlay("fire_emagged")
- SSvis_overlays.add_vis_overlay(src, icon, "fire_emagged", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
- else
- add_overlay("fire_on")
- SSvis_overlays.add_vis_overlay(src, icon, "fire_on", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
-
-/obj/machinery/firealarm/emp_act(severity)
- . = ..()
-
- if (. & EMP_PROTECT_SELF)
- return
-
- if(prob(50 / severity))
- alarm()
-
-/obj/machinery/firealarm/emag_act(mob/user)
- . = ..()
- if(obj_flags & EMAGGED)
- return
- obj_flags |= EMAGGED
- update_icon()
- if(user)
- user.visible_message("Sparks fly out of [src]!",
- "You emag [src], disabling its thermal sensors.")
- playsound(src, "sparks", 50, 1)
- return TRUE
-
-/obj/machinery/firealarm/temperature_expose(datum/gas_mixture/air, temperature, volume)
- if((temperature > T0C + 200 || temperature < BODYTEMP_COLD_DAMAGE_LIMIT) && (last_alarm+FIREALARM_COOLDOWN < world.time) && !(obj_flags & EMAGGED) && detecting && !stat)
- alarm()
- ..()
-
-/obj/machinery/firealarm/proc/alarm(mob/user)
- if(!is_operational() || (last_alarm+FIREALARM_COOLDOWN > world.time))
- return
- last_alarm = world.time
- var/area/A = get_area(src)
- A.firealert(src)
- playsound(loc, 'goon/sound/machinery/FireAlarm.ogg', 75)
- if(user)
- log_game("[user] triggered a fire alarm at [COORD(src)]")
-
-/obj/machinery/firealarm/proc/reset(mob/user)
- if(!is_operational())
- return
- var/area/A = get_area(src)
- A.firereset(src)
- if(user)
- log_game("[user] reset a fire alarm at [COORD(src)]")
-
-/obj/machinery/firealarm/attack_hand(mob/user)
- if(buildstage != 2)
- return ..()
- add_fingerprint(user)
- var/area/A = get_area(src)
- if(A.fire)
- reset(user)
- else
- alarm(user)
-
-/obj/machinery/firealarm/attack_ai(mob/user)
- return attack_hand(user)
-
-/obj/machinery/firealarm/attack_robot(mob/user)
- return attack_hand(user)
-
-/obj/machinery/firealarm/attackby(obj/item/W, mob/user, params)
- add_fingerprint(user)
-
- if(istype(W, /obj/item/screwdriver) && buildstage == 2)
- W.play_tool_sound(src)
- panel_open = !panel_open
- to_chat(user, "The wires have been [panel_open ? "exposed" : "unexposed"].")
- update_icon()
- return
-
- if(panel_open)
-
- if(istype(W, /obj/item/weldingtool) && user.a_intent == INTENT_HELP)
- if(obj_integrity < max_integrity)
- if(!W.tool_start_check(user, amount=0))
- return
-
- to_chat(user, "You begin repairing [src]...")
- if(W.use_tool(src, user, 40, volume=50))
- obj_integrity = max_integrity
- to_chat(user, "You repair [src].")
- else
- to_chat(user, "[src] is already in good condition!")
- return
-
- switch(buildstage)
- if(2)
- if(istype(W, /obj/item/multitool))
- detecting = !detecting
- if (src.detecting)
- user.visible_message("[user] has reconnected [src]'s detecting unit!", "You reconnect [src]'s detecting unit.")
- else
- user.visible_message("[user] has disconnected [src]'s detecting unit!", "You disconnect [src]'s detecting unit.")
- return
-
- else if (istype(W, /obj/item/wirecutters))
- buildstage = 1
- W.play_tool_sound(src)
- new /obj/item/stack/cable_coil(user.loc, 5)
- to_chat(user, "You cut the wires from \the [src].")
- update_icon()
- return
- else if(W.force) //hit and turn it on
- ..()
- var/area/A = get_area(src)
- if(!A.fire)
- alarm()
- return
- if(1)
- if(istype(W, /obj/item/stack/cable_coil))
- var/obj/item/stack/cable_coil/coil = W
- if(coil.get_amount() < 5)
- to_chat(user, "You need more cable for this!")
- else
- coil.use(5)
- buildstage = 2
- to_chat(user, "You wire \the [src].")
- update_icon()
- return
-
- else if(istype(W, /obj/item/crowbar))
- user.visible_message("[user.name] removes the electronics from [src.name].", \
- "You start prying out the circuit...")
- if(W.use_tool(src, user, 20, volume=50))
- if(buildstage == 1)
- if(stat & BROKEN)
- to_chat(user, "You remove the destroyed circuit.")
- stat &= ~BROKEN
- else
- to_chat(user, "You pry out the circuit.")
- new /obj/item/electronics/firealarm(user.loc)
- buildstage = 0
- update_icon()
- return
- if(0)
- if(istype(W, /obj/item/electronics/firealarm))
- to_chat(user, "You insert the circuit.")
- qdel(W)
- buildstage = 1
- update_icon()
- return
-
- else if(istype(W, /obj/item/electroadaptive_pseudocircuit))
- var/obj/item/electroadaptive_pseudocircuit/P = W
- if(!P.adapt_circuit(user, 15))
- return
- user.visible_message("[user] fabricates a circuit and places it into [src].", \
- "You adapt a fire alarm circuit and slot it into the assembly.")
- buildstage = 1
- update_icon()
- return
-
- else if(istype(W, /obj/item/wrench))
- user.visible_message("[user] removes the fire alarm assembly from the wall.", \
- "You remove the fire alarm assembly from the wall.")
- var/obj/item/wallframe/firealarm/frame = new /obj/item/wallframe/firealarm()
- frame.forceMove(user.drop_location())
- W.play_tool_sound(src)
- qdel(src)
- return
- return ..()
-
-/obj/machinery/firealarm/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
- . = ..()
- if(.) //damage received
- if(obj_integrity > 0 && !(stat & BROKEN) && buildstage != 0)
- if(prob(33))
- alarm()
-
-/obj/machinery/firealarm/singularity_pull(S, current_size)
- if (current_size >= STAGE_FIVE) // If the singulo is strong enough to pull anchored objects, the fire alarm experiences integrity failure
- deconstruct()
- ..()
-
-/obj/machinery/firealarm/obj_break(damage_flag)
- if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1) && buildstage != 0) //can't break the electronics if there isn't any inside.
- LAZYREMOVE(myarea.firealarms, src)
- stat |= BROKEN
- update_icon()
-
-/obj/machinery/firealarm/deconstruct(disassembled = TRUE)
- if(!(flags_1 & NODECONSTRUCT_1))
- new /obj/item/stack/sheet/metal(loc, 1)
- if(!(stat & BROKEN))
- var/obj/item/I = new /obj/item/electronics/firealarm(loc)
- if(!disassembled)
- I.obj_integrity = I.max_integrity * 0.5
- new /obj/item/stack/cable_coil(loc, 3)
- qdel(src)
-
-/obj/machinery/firealarm/proc/update_fire_light(fire)
- if(fire == !!light_power)
- return // do nothing if we're already active
- if(fire)
- set_light(l_power = 0.8)
- else
- set_light(l_power = 0)
-
-/*
- * Return of Party button
- */
-
-/area
- var/party = FALSE
-
-/obj/machinery/firealarm/partyalarm
- name = "\improper PARTY BUTTON"
- desc = "Cuban Pete is in the house!"
- var/static/party_overlay
-
-/obj/machinery/firealarm/partyalarm/reset()
- if (stat & (NOPOWER|BROKEN))
- return
- var/area/A = get_area(src)
- if (!A || !A.party)
- return
- A.party = FALSE
- A.cut_overlay(party_overlay)
-
-/obj/machinery/firealarm/partyalarm/alarm()
- if (stat & (NOPOWER|BROKEN))
- return
- var/area/A = get_area(src)
- if (!A || A.party || A.name == "Space")
- return
- A.party = TRUE
- if (!party_overlay)
- party_overlay = iconstate2appearance('icons/turf/areas.dmi', "party")
- A.add_overlay(party_overlay)
+#define FIREALARM_COOLDOWN 67 // Chosen fairly arbitrarily, it is the length of the audio in FireAlarm.ogg. The actual track length is 7 seconds 8ms but but the audio stops at 6s 700ms
+
+/obj/item/electronics/firealarm
+ name = "fire alarm electronics"
+ desc = "A fire alarm circuit. Can handle heat levels up to 40 degrees celsius."
+
+/obj/item/wallframe/firealarm
+ name = "fire alarm frame"
+ desc = "Used for building fire alarms."
+ icon = 'icons/obj/monitors.dmi'
+ icon_state = "fire_bitem"
+ result_path = /obj/machinery/firealarm
+
+/obj/machinery/firealarm
+ name = "fire alarm"
+ desc = "\"Pull this in case of emergency\". Thus, keep pulling it forever."
+ icon = 'icons/obj/monitors.dmi'
+ icon_state = "fire0"
+ max_integrity = 250
+ integrity_failure = 100
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 30)
+ use_power = IDLE_POWER_USE
+ idle_power_usage = 2
+ active_power_usage = 6
+ power_channel = ENVIRON
+ resistance_flags = FIRE_PROOF
+
+ light_power = 0
+ light_range = 7
+ light_color = "#ff3232"
+
+ var/detecting = 1
+ var/buildstage = 2 // 2 = complete, 1 = no wires, 0 = circuit gone
+ var/last_alarm = 0
+ var/area/myarea = null
+
+/obj/machinery/firealarm/Initialize(mapload, dir, building)
+ . = ..()
+ if(dir)
+ src.setDir(dir)
+ if(building)
+ buildstage = 0
+ panel_open = TRUE
+ pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24)
+ pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0
+ update_icon()
+ myarea = get_area(src)
+ LAZYADD(myarea.firealarms, src)
+
+/obj/machinery/firealarm/Destroy()
+ LAZYREMOVE(myarea.firealarms, src)
+ return ..()
+
+/obj/machinery/firealarm/power_change()
+ ..()
+ update_icon()
+
+/obj/machinery/firealarm/update_icon()
+ cut_overlays()
+ SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
+
+ if(panel_open)
+ icon_state = "fire_b[buildstage]"
+ return
+
+ if(stat & BROKEN)
+ icon_state = "firex"
+ return
+
+ icon_state = "fire0"
+
+ if(stat & NOPOWER)
+ return
+
+ add_overlay("fire_overlay")
+
+ if(is_station_level(z))
+ add_overlay("fire_[GLOB.security_level]")
+ SSvis_overlays.add_vis_overlay(src, icon, "fire_[GLOB.security_level]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
+ else
+ add_overlay("fire_[SEC_LEVEL_GREEN]")
+ SSvis_overlays.add_vis_overlay(src, icon, "fire_[SEC_LEVEL_GREEN]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
+
+ var/area/A = src.loc
+ A = A.loc
+
+ if(!detecting || !A.fire)
+ add_overlay("fire_off")
+ SSvis_overlays.add_vis_overlay(src, icon, "fire_off", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
+ else if(obj_flags & EMAGGED)
+ add_overlay("fire_emagged")
+ SSvis_overlays.add_vis_overlay(src, icon, "fire_emagged", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
+ else
+ add_overlay("fire_on")
+ SSvis_overlays.add_vis_overlay(src, icon, "fire_on", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
+
+/obj/machinery/firealarm/emp_act(severity)
+ . = ..()
+
+ if (. & EMP_PROTECT_SELF)
+ return
+
+ if(prob(50 / severity))
+ alarm()
+
+/obj/machinery/firealarm/emag_act(mob/user)
+ . = ..()
+ if(obj_flags & EMAGGED)
+ return
+ obj_flags |= EMAGGED
+ update_icon()
+ if(user)
+ user.visible_message("Sparks fly out of [src]!",
+ "You emag [src], disabling its thermal sensors.")
+ playsound(src, "sparks", 50, 1)
+ return TRUE
+
+/obj/machinery/firealarm/temperature_expose(datum/gas_mixture/air, temperature, volume)
+ if((temperature > T0C + 200 || temperature < BODYTEMP_COLD_DAMAGE_LIMIT) && (last_alarm+FIREALARM_COOLDOWN < world.time) && !(obj_flags & EMAGGED) && detecting && !stat)
+ alarm()
+ ..()
+
+/obj/machinery/firealarm/proc/alarm(mob/user)
+ if(!is_operational() || (last_alarm+FIREALARM_COOLDOWN > world.time))
+ return
+ last_alarm = world.time
+ var/area/A = get_area(src)
+ A.firealert(src)
+ playsound(loc, 'goon/sound/machinery/FireAlarm.ogg', 75)
+ if(user)
+ log_game("[user] triggered a fire alarm at [COORD(src)]")
+
+/obj/machinery/firealarm/proc/reset(mob/user)
+ if(!is_operational())
+ return
+ var/area/A = get_area(src)
+ A.firereset(src)
+ if(user)
+ log_game("[user] reset a fire alarm at [COORD(src)]")
+
+/obj/machinery/firealarm/attack_hand(mob/user)
+ if(buildstage != 2)
+ return ..()
+ add_fingerprint(user)
+ var/area/A = get_area(src)
+ if(A.fire)
+ reset(user)
+ else
+ alarm(user)
+
+/obj/machinery/firealarm/attack_ai(mob/user)
+ return attack_hand(user)
+
+/obj/machinery/firealarm/attack_robot(mob/user)
+ return attack_hand(user)
+
+/obj/machinery/firealarm/attackby(obj/item/W, mob/user, params)
+ add_fingerprint(user)
+
+ if(istype(W, /obj/item/screwdriver) && buildstage == 2)
+ W.play_tool_sound(src)
+ panel_open = !panel_open
+ to_chat(user, "The wires have been [panel_open ? "exposed" : "unexposed"].")
+ update_icon()
+ return
+
+ if(panel_open)
+
+ if(istype(W, /obj/item/weldingtool) && user.a_intent == INTENT_HELP)
+ if(obj_integrity < max_integrity)
+ if(!W.tool_start_check(user, amount=0))
+ return
+
+ to_chat(user, "You begin repairing [src]...")
+ if(W.use_tool(src, user, 40, volume=50))
+ obj_integrity = max_integrity
+ to_chat(user, "You repair [src].")
+ else
+ to_chat(user, "[src] is already in good condition!")
+ return
+
+ switch(buildstage)
+ if(2)
+ if(istype(W, /obj/item/multitool))
+ detecting = !detecting
+ if (src.detecting)
+ user.visible_message("[user] has reconnected [src]'s detecting unit!", "You reconnect [src]'s detecting unit.")
+ else
+ user.visible_message("[user] has disconnected [src]'s detecting unit!", "You disconnect [src]'s detecting unit.")
+ return
+
+ else if (istype(W, /obj/item/wirecutters))
+ buildstage = 1
+ W.play_tool_sound(src)
+ new /obj/item/stack/cable_coil(user.loc, 5)
+ to_chat(user, "You cut the wires from \the [src].")
+ update_icon()
+ return
+ else if(W.force) //hit and turn it on
+ ..()
+ var/area/A = get_area(src)
+ if(!A.fire)
+ alarm()
+ return
+ if(1)
+ if(istype(W, /obj/item/stack/cable_coil))
+ var/obj/item/stack/cable_coil/coil = W
+ if(coil.get_amount() < 5)
+ to_chat(user, "You need more cable for this!")
+ else
+ coil.use(5)
+ buildstage = 2
+ to_chat(user, "You wire \the [src].")
+ update_icon()
+ return
+
+ else if(istype(W, /obj/item/crowbar))
+ user.visible_message("[user.name] removes the electronics from [src.name].", \
+ "You start prying out the circuit...")
+ if(W.use_tool(src, user, 20, volume=50))
+ if(buildstage == 1)
+ if(stat & BROKEN)
+ to_chat(user, "You remove the destroyed circuit.")
+ stat &= ~BROKEN
+ else
+ to_chat(user, "You pry out the circuit.")
+ new /obj/item/electronics/firealarm(user.loc)
+ buildstage = 0
+ update_icon()
+ return
+ if(0)
+ if(istype(W, /obj/item/electronics/firealarm))
+ to_chat(user, "You insert the circuit.")
+ qdel(W)
+ buildstage = 1
+ update_icon()
+ return
+
+ else if(istype(W, /obj/item/electroadaptive_pseudocircuit))
+ var/obj/item/electroadaptive_pseudocircuit/P = W
+ if(!P.adapt_circuit(user, 15))
+ return
+ user.visible_message("[user] fabricates a circuit and places it into [src].", \
+ "You adapt a fire alarm circuit and slot it into the assembly.")
+ buildstage = 1
+ update_icon()
+ return
+
+ else if(istype(W, /obj/item/wrench))
+ user.visible_message("[user] removes the fire alarm assembly from the wall.", \
+ "You remove the fire alarm assembly from the wall.")
+ var/obj/item/wallframe/firealarm/frame = new /obj/item/wallframe/firealarm()
+ frame.forceMove(user.drop_location())
+ W.play_tool_sound(src)
+ qdel(src)
+ return
+ return ..()
+
+/obj/machinery/firealarm/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
+ if((buildstage == 0) && (the_rcd.upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS))
+ return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 20, "cost" = 1)
+ return FALSE
+
+/obj/machinery/firealarm/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode)
+ switch(passed_mode)
+ if(RCD_UPGRADE_SIMPLE_CIRCUITS)
+ user.visible_message("[user] fabricates a circuit and places it into [src].", \
+ "You adapt a fire alarm circuit and slot it into the assembly.")
+ buildstage = 1
+ update_icon()
+ return TRUE
+ return FALSE
+
+/obj/machinery/firealarm/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
+ . = ..()
+ if(.) //damage received
+ if(obj_integrity > 0 && !(stat & BROKEN) && buildstage != 0)
+ if(prob(33))
+ alarm()
+
+/obj/machinery/firealarm/singularity_pull(S, current_size)
+ if (current_size >= STAGE_FIVE) // If the singulo is strong enough to pull anchored objects, the fire alarm experiences integrity failure
+ deconstruct()
+ ..()
+
+/obj/machinery/firealarm/obj_break(damage_flag)
+ if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1) && buildstage != 0) //can't break the electronics if there isn't any inside.
+ LAZYREMOVE(myarea.firealarms, src)
+ stat |= BROKEN
+ update_icon()
+
+/obj/machinery/firealarm/deconstruct(disassembled = TRUE)
+ if(!(flags_1 & NODECONSTRUCT_1))
+ new /obj/item/stack/sheet/metal(loc, 1)
+ if(!(stat & BROKEN))
+ var/obj/item/I = new /obj/item/electronics/firealarm(loc)
+ if(!disassembled)
+ I.obj_integrity = I.max_integrity * 0.5
+ new /obj/item/stack/cable_coil(loc, 3)
+ qdel(src)
+
+/obj/machinery/firealarm/proc/update_fire_light(fire)
+ if(fire == !!light_power)
+ return // do nothing if we're already active
+ if(fire)
+ set_light(l_power = 0.8)
+ else
+ set_light(l_power = 0)
+
+/*
+ * Return of Party button
+ */
+
+/area
+ var/party = FALSE
+
+/obj/machinery/firealarm/partyalarm
+ name = "\improper PARTY BUTTON"
+ desc = "Cuban Pete is in the house!"
+ var/static/party_overlay
+
+/obj/machinery/firealarm/partyalarm/reset()
+ if (stat & (NOPOWER|BROKEN))
+ return
+ var/area/A = get_area(src)
+ if (!A || !A.party)
+ return
+ A.party = FALSE
+ A.cut_overlay(party_overlay)
+
+/obj/machinery/firealarm/partyalarm/alarm()
+ if (stat & (NOPOWER|BROKEN))
+ return
+ var/area/A = get_area(src)
+ if (!A || A.party || A.name == "Space")
+ return
+ A.party = TRUE
+ if (!party_overlay)
+ party_overlay = iconstate2appearance('icons/turf/areas.dmi', "party")
+ A.add_overlay(party_overlay)
diff --git a/modular_citadel/code/game/machinery/toylathe.dm b/code/game/machinery/toylathe.dm
similarity index 100%
rename from modular_citadel/code/game/machinery/toylathe.dm
rename to code/game/machinery/toylathe.dm
diff --git a/code/game/objects/effects/effect_system/effects_other.dm b/code/game/objects/effects/effect_system/effects_other.dm
index 18c1ff5890..dbc9b35275 100644
--- a/code/game/objects/effects/effect_system/effects_other.dm
+++ b/code/game/objects/effects/effect_system/effects_other.dm
@@ -104,15 +104,4 @@
if(explosion_message)
location.visible_message("The solution violently explodes!", \
"You hear an explosion!")
- if (amount < 1)
- var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
- s.set_up(2, 1, location)
- s.start()
-
- for(var/mob/living/L in viewers(1, location))
- if(prob(50 * amount))
- to_chat(L, "The explosion knocks you down.")
- L.Knockdown(rand(20,100))
- return
- else
- dyn_explosion(location, amount, flashing_factor)
\ No newline at end of file
+ dyn_explosion(location, amount, flashing_factor)
\ No newline at end of file
diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
index 1b85a41f7c..cdf6b77a76 100644
--- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm
+++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
@@ -452,4 +452,45 @@
icon_state = "slugboom"
randomdir = FALSE
duration = 30
- pixel_x = -24
\ No newline at end of file
+ pixel_x = -24
+
+/obj/effect/constructing_effect
+ icon = 'icons/effects/effects_rcd.dmi'
+ icon_state = ""
+ layer = ABOVE_ALL_MOB_LAYER
+ anchored = TRUE
+ var/status = 0
+ var/delay = 0
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+
+/obj/effect/constructing_effect/Initialize(mapload, rcd_delay, rcd_status)
+ . = ..()
+ status = rcd_status
+ delay = rcd_delay
+ if (status == RCD_DECONSTRUCT)
+ addtimer(CALLBACK(src, /atom/.proc/update_icon), 11)
+ delay -= 11
+ icon_state = "rcd_end_reverse"
+ else
+ update_icon()
+
+/obj/effect/constructing_effect/update_icon()
+ icon_state = "rcd"
+ if (delay < 10)
+ icon_state += "_shortest"
+ else if (delay < 20)
+ icon_state += "_shorter"
+ else if (delay < 37)
+ icon_state += "_short"
+ if (status == RCD_DECONSTRUCT)
+ icon_state += "_reverse"
+
+/obj/effect/constructing_effect/proc/end_animation()
+ if (status == RCD_DECONSTRUCT)
+ qdel(src)
+ else
+ icon_state = "rcd_end"
+ addtimer(CALLBACK(src, .proc/end), 15)
+
+/obj/effect/constructing_effect/proc/end()
+ qdel(src)
\ No newline at end of file
diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm
index 24c241aabc..e151450d8a 100644
--- a/code/game/objects/items/RCD.dm
+++ b/code/game/objects/items/RCD.dm
@@ -47,7 +47,11 @@ RLD
/obj/item/construction/examine(mob/user)
. = ..()
- . += "\A [src]. It currently holds [matter]/[max_matter] matter-units."
+ . += "It currently holds [matter]/[max_matter] matter-units."
+ if(upgrade & RCD_UPGRADE_FRAMES)
+ . += "It contains the design for machine frames, computer frames and deconstruction."
+ if(upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS)
+ . += "It contains the design for firelock, air alarm, fire alarm, apc circuits and crap power cells."
/obj/item/construction/Destroy()
QDEL_NULL(spark_system)
@@ -85,9 +89,11 @@ RLD
to_chat(user, "[src] now holds [matter]/[max_matter] matter-units.")
else if(istype(W, /obj/item/rcd_upgrade))
to_chat(user, "You upgrade the RCD with the [W]!")
- upgrade = TRUE
- playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
- qdel(W)
+ var/obj/item/rcd_upgrade/rcd_up = W
+ if(!(upgrade & rcd_up.upgrade))
+ upgrade |= rcd_up.upgrade
+ playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
+ qdel(W)
else
return ..()
update_icon() //ensures that ammo counters (if present) get updated
@@ -116,10 +122,10 @@ RLD
if(matter < amount)
if(user)
to_chat(user, no_ammo_message)
- return 0
+ return FALSE
matter -= amount
update_icon()
- return 1
+ return TRUE
/obj/item/construction/proc/checkResource(amount, mob/user)
. = matter >= amount
@@ -439,18 +445,22 @@ RLD
var/list/rcd_results = A.rcd_vals(user, src)
if(!rcd_results)
return FALSE
+ var/delay = rcd_results["delay"] * delay_mod
+ var/obj/effect/constructing_effect/rcd_effect = new(get_turf(A), delay, src.mode)
var/turf/the_turf = get_turf(A)
var/turf_coords = "[COORD(the_turf)]"
investigate_log("[user] is attempting to use [src] on [A] (loc [turf_coords] at [the_turf]) with cost [rcd_results["cost"]], delay [rcd_results["delay"]], mode [rcd_results["mode"]].", INVESTIGATE_RCD)
- if(do_after(user, rcd_results["delay"] * delay_mod, target = A))
+ if(do_after(user, delay, target = A))
if(checkResource(rcd_results["cost"], user))
var/atom/cached = A
if(A.rcd_act(user, src, rcd_results["mode"]))
+ rcd_effect.end_animation()
useResource(rcd_results["cost"], user)
activate()
investigate_log("[user] used [src] on [cached] (loc [turf_coords] at [the_turf]) with cost [rcd_results["cost"]], delay [rcd_results["delay"]], mode [rcd_results["mode"]].", INVESTIGATE_RCD)
playsound(src, 'sound/machines/click.ogg', 50, 1)
return TRUE
+ qdel(rcd_effect)
/obj/item/construction/rcd/Initialize()
. = ..()
@@ -467,7 +477,7 @@ RLD
"Grilles & Windows" = image(icon = 'icons/mob/radial.dmi', icon_state = "grillewindow"),
"Floors & Walls" = image(icon = 'icons/mob/radial.dmi', icon_state = "wallfloor")
)
- if(upgrade)
+ if(upgrade & RCD_UPGRADE_FRAMES)
choices += list(
"Deconstruct" = image(icon= 'icons/mob/radial.dmi', icon_state = "delete"),
"Machine Frames" = image(icon = 'icons/mob/radial.dmi', icon_state = "machine"),
@@ -593,6 +603,7 @@ RLD
energyfactor = 66
/obj/item/construction/rcd/loaded
+ materials = list(MAT_METAL=48000, MAT_GLASS=32000)
matter = 160
/obj/item/construction/rcd/loaded/upgraded
@@ -825,9 +836,18 @@ RLD
/obj/item/rcd_upgrade
name = "RCD advanced design disk"
- desc = "It contains the design for machine frames, computer frames, and deconstruction."
+ desc = "It seems to be empty."
icon = 'icons/obj/module.dmi'
icon_state = "datadisk3"
+ var/upgrade
+
+/obj/item/rcd_upgrade/frames
+ desc = "It contains the design for machine frames, computer frames and deconstruction."
+ upgrade = RCD_UPGRADE_FRAMES
+
+/obj/item/rcd_upgrade/simple_circuits
+ desc = "It contains the design for firelock, air alarm, fire alarm, apc circuits and crap power cells."
+ upgrade = RCD_UPGRADE_SIMPLE_CIRCUITS
#undef GLOW_MODE
#undef LIGHT_MODE
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index c1833ba44a..3e4a8743da 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -7,6 +7,10 @@
/obj/item/stack/cable_coil = 1,
/obj/item/stack/sheet/glass = 2)
+/obj/item/circuitboard/machine/sleeper/syndie
+ name = "Syndicate Sleeper (Machine Board)"
+ build_path = /obj/machinery/sleeper/syndie
+
/obj/item/circuitboard/machine/vr_sleeper
name = "VR Sleeper (Machine Board)"
build_path = /obj/machinery/vr_sleeper
@@ -1000,3 +1004,16 @@
/obj/item/stock_parts/capacitor = 1,
/obj/item/stack/cable_coil = 5,
/obj/item/reagent_containers/glass/beaker = 6) //So it can hold lots of chems
+
+/obj/item/circuitboard/machine/kinkmate
+ name = "Kinkmate Vendor (Machine Board)"
+ build_path = /obj/machinery/vending/kink
+ req_components = list(/obj/item/vending_refill/kink = 1)
+
+/obj/item/circuitboard/machine/autoylathe
+ name = "Autoylathe (Machine Board)"
+ build_path = /obj/machinery/autoylathe
+ req_components = list(
+ /obj/item/stock_parts/matter_bin = 3,
+ /obj/item/stock_parts/manipulator = 1,
+ /obj/item/stack/sheet/glass = 1)
diff --git a/code/game/objects/items/devices/doorCharge.dm b/code/game/objects/items/devices/doorCharge.dm
index 8def1d5ca3..e9ba9ea4a4 100644
--- a/code/game/objects/items/devices/doorCharge.dm
+++ b/code/game/objects/items/devices/doorCharge.dm
@@ -16,14 +16,14 @@
/obj/item/doorCharge/ex_act(severity, target)
switch(severity)
- if(1)
+ if(EXPLODE_DEVASTATE)
visible_message("[src] detonates!")
explosion(src.loc,0,2,1,flame_range = 4)
qdel(src)
- if(2)
+ if(EXPLODE_HEAVY)
if(prob(50))
ex_act(EXPLODE_DEVASTATE)
- if(3)
+ if(EXPLODE_LIGHT)
if(prob(25))
ex_act(EXPLODE_DEVASTATE)
diff --git a/code/game/objects/items/devices/forcefieldprojector.dm b/code/game/objects/items/devices/forcefieldprojector.dm
index bf9c5daccd..df17a51c1b 100644
--- a/code/game/objects/items/devices/forcefieldprojector.dm
+++ b/code/game/objects/items/devices/forcefieldprojector.dm
@@ -10,7 +10,7 @@
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
materials = list(MAT_METAL=250, MAT_GLASS=500)
- var/max_shield_integrity = 250
+ var/max_shield_integrity = 100
var/shield_integrity = 250
var/max_fields = 3
var/list/current_fields
@@ -87,7 +87,7 @@
mouse_opacity = MOUSE_OPACITY_OPAQUE
resistance_flags = INDESTRUCTIBLE
CanAtmosPass = ATMOS_PASS_DENSITY
- armor = list("melee" = 0, "bullet" = 25, "laser" = 50, "energy" = 50, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
+ armor = list("melee" = 0, "bullet" = 25, "laser" = 25, "energy" = 25, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
var/obj/item/forcefield_projector/generator
/obj/structure/projected_forcefield/Initialize(mapload, obj/item/forcefield_projector/origin)
diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm
index b74b0fa3d4..f468121048 100644
--- a/code/game/objects/items/devices/radio/electropack.dm
+++ b/code/game/objects/items/devices/radio/electropack.dm
@@ -10,22 +10,23 @@
slot_flags = ITEM_SLOT_BACK
w_class = WEIGHT_CLASS_HUGE
materials = list(MAT_METAL=10000, MAT_GLASS=2500)
- var/on = TRUE
+
var/code = 2
var/frequency = FREQ_ELECTROPACK
- var/shock_cooldown = 0
+ var/on = TRUE
+ var/shock_cooldown = FALSE
-/obj/item/electropack/suicide_act(mob/user)
+/obj/item/electropack/suicide_act(mob/living/carbon/user)
user.visible_message("[user] hooks [user.p_them()]self to the electropack and spams the trigger! It looks like [user.p_theyre()] trying to commit suicide!")
return (FIRELOSS)
/obj/item/electropack/Initialize()
. = ..()
- SSradio.add_object(src, frequency, RADIO_SIGNALER)
+ set_frequency(frequency)
/obj/item/electropack/Destroy()
SSradio.remove_object(src, frequency)
- return ..()
+ . = ..()
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/electropack/attack_hand(mob/user)
@@ -36,7 +37,7 @@
return
return ..()
-/obj/item/electropack/attackby(obj/item/W, mob/user, params)
+/obj/item/electropack/attackby(obj/item/W, mob/living/user, params)
if(istype(W, /obj/item/clothing/head/helmet))
var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit(user)
A.icon = 'icons/obj/assemblies.dmi'
@@ -57,43 +58,47 @@
return ..()
/obj/item/electropack/Topic(href, href_list)
- //..()
var/mob/living/carbon/C = usr
if(usr.stat || usr.restrained() || C.back == src)
return
- if((ishuman(usr) && usr.contents.Find(src)) || usr.contents.Find(master) || (in_range(src, usr) && isturf(loc)))
- usr.set_machine(src)
- if(href_list["freq"])
- SSradio.remove_object(src, frequency)
- frequency = sanitize_frequency(frequency + text2num(href_list["freq"]))
- SSradio.add_object(src, frequency, RADIO_SIGNALER)
- else
- if(href_list["code"])
- code += text2num(href_list["code"])
- code = round(code)
- code = min(100, code)
- code = max(1, code)
- else
- if(href_list["power"])
- on = !( on )
- icon_state = "electropack[on]"
- if(!( master ))
- if(ismob(loc))
- attack_self(loc)
- else
- for(var/mob/M in viewers(1, src))
- if(M.client)
- attack_self(M)
- else
- if(ismob(master.loc))
- attack_self(master.loc)
- else
- for(var/mob/M in viewers(1, master))
- if(M.client)
- attack_self(M)
- else
+
+ if(!usr.canUseTopic(src, BE_CLOSE))
usr << browse(null, "window=radio")
+ onclose(usr, "radio")
return
+
+ if(href_list["set"])
+ if(href_list["set"] == "freq")
+ var/new_freq = input(usr, "Input a new receiving frequency", "Electropack Frequency", format_frequency(frequency)) as num|null
+ if(!usr.canUseTopic(src, BE_CLOSE))
+ return
+ new_freq = unformat_frequency(new_freq)
+ new_freq = sanitize_frequency(new_freq, TRUE)
+ set_frequency(new_freq)
+
+ if(href_list["set"] == "code")
+ var/new_code = input(usr, "Input a new receiving code", "Electropack Code", code) as num|null
+ if(!usr.canUseTopic(src, BE_CLOSE))
+ return
+ new_code = round(new_code)
+ new_code = CLAMP(new_code, 1, 100)
+ code = new_code
+
+ if(href_list["set"] == "power")
+ if(!usr.canUseTopic(src, BE_CLOSE))
+ return
+ on = !(on)
+ icon_state = "electropack[on]"
+
+ if(usr)
+ attack_self(usr)
+
+ return
+
+/obj/item/electropack/proc/set_frequency(new_frequency)
+ SSradio.remove_object(src, frequency)
+ frequency = new_frequency
+ SSradio.add_object(src, frequency, RADIO_SIGNALER)
return
/obj/item/electropack/receive_signal(datum/signal/signal)
@@ -101,10 +106,10 @@
return
if(isliving(loc) && on)
- if(shock_cooldown != 0)
+ if(shock_cooldown == TRUE)
return
- shock_cooldown = 1
- addtimer(VARSET_CALLBACK(src, shock_cooldown, 0), 100)
+ shock_cooldown = TRUE
+ addtimer(VARSET_CALLBACK(src, shock_cooldown, FALSE), 100)
var/mob/living/L = loc
step(L, pick(GLOB.cardinals))
@@ -119,25 +124,22 @@
master.receive_signal()
return
-/obj/item/electropack/attack_self(mob/user)
-
+/obj/item/electropack/ui_interact(mob/user)
if(!ishuman(user))
return
+
user.set_machine(src)
- var/dat = {"Turned [on ? "On" : "Off"] -
-Toggle
+ var/dat = {"
+
+Turned [on ? "On" : "Off"] - Toggle
Frequency/Code for electropack:
Frequency:
--
-- [format_frequency(frequency)]
-+
-+
+[format_frequency(src.frequency)]
+Set
Code:
--
-- [code]
-+
-+
+[src.code]
+Set
"}
user << browse(dat, "window=radio")
onclose(user, "radio")
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index ee41307960..069c921914 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -466,17 +466,18 @@ SLIME SCANNER
msg += "Subject is not addicted to any reagents.\n"
var/datum/reagent/impure/fermiTox/F = M.reagents.has_reagent(/datum/reagent/impure/fermiTox)
- switch(F?.volume)
- if(5 to 10)
- msg += "Subject contains a low amount of toxic isomers.\n"
- if(10 to 25)
- msg += "Subject contains toxic isomers.\n"
- if(25 to 50)
- msg += "Subject contains a substantial amount of toxic isomers.\n"
- if(50 to 95)
- msg += "Subject contains a high amount of toxic isomers.\n"
- if(95 to INFINITY)
- msg += "Subject contains a extremely dangerous amount of toxic isomers.\n"
+ if(istype(F))
+ switch(F.volume)
+ if(5 to 10)
+ msg += "Subject contains a low amount of toxic isomers.\n"
+ if(10 to 25)
+ msg += "Subject contains toxic isomers.\n"
+ if(25 to 50)
+ msg += "Subject contains a substantial amount of toxic isomers.\n"
+ if(50 to 95)
+ msg += "Subject contains a high amount of toxic isomers.\n"
+ if(95 to INFINITY)
+ msg += "Subject contains a extremely dangerous amount of toxic isomers.\n"
msg += "*---------*"
to_chat(user, msg)
diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm
index 4585685cde..81317b6eab 100644
--- a/code/game/objects/items/extinguisher.dm
+++ b/code/game/objects/items/extinguisher.dm
@@ -65,7 +65,7 @@
icon_state = "foam_extinguisher0"
//item_state = "foam_extinguisher" needs sprite
dog_fashion = null
- chem = "firefighting_foam"
+ chem = /datum/reagent/firefighting_foam
tanktype = /obj/structure/reagent_dispensers/foamtank
sprite_name = "foam_extinguisher"
precision = TRUE
diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm
index 1956a1f317..75e4e0b477 100644
--- a/code/game/objects/items/grenades/plastic.dm
+++ b/code/game/objects/items/grenades/plastic.dm
@@ -62,7 +62,7 @@
location = get_turf(target)
target.cut_overlay(plastic_overlay, TRUE)
if(!ismob(target) || full_damage_on_mobs)
- target.ex_act(2, target)
+ target.ex_act(EXPLODE_HEAVY, target)
else
location = get_turf(src)
if(location)
diff --git a/code/game/objects/items/holosign_creator.dm b/code/game/objects/items/holosign_creator.dm
index eb58089293..e92c9b2d2e 100644
--- a/code/game/objects/items/holosign_creator.dm
+++ b/code/game/objects/items/holosign_creator.dm
@@ -78,12 +78,20 @@
/obj/item/holosign_creator/atmos
name = "ATMOS holofan projector"
- desc = "A holographic projector that creates holographic barriers that prevent changes in atmosphere conditions."
+ desc = "A holographic projector that creates holographic fans that prevent changes in atmosphere conditions. Somehow."
icon_state = "signmaker_atmos"
holosign_type = /obj/structure/holosign/barrier/atmos
creation_time = 0
max_signs = 3
+/obj/item/holosign_creator/firelock
+ name = "ATMOS holofirelock projector"
+ desc = "A holographic projector that creates holographic barriers that prevent changes in temperature conditions."
+ icon_state = "signmaker_engi"
+ holosign_type = /obj/structure/holosign/barrier/firelock
+ creation_time = 0
+ max_signs = 3
+
/obj/item/holosign_creator/medical
name = "\improper PENLITE barrier projector"
desc = "A holographic projector that creates PENLITE holobarriers. Useful during quarantines since they halt those with malicious diseases."
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index a0d58709c8..efe6bbadaa 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -886,7 +886,7 @@
else
O.anchored = initial(O.anchored)
else
- to_chat(user, "Not enough room in cargo compartment! Maximum of eight objects!")
+ to_chat(user, "Not enough room in cargo compartment! Maximum of [cargo_capacity] objects!")
else
to_chat(user, "[target] is firmly secured!")
@@ -899,6 +899,12 @@
user.visible_message("[user] unloads [chosen_cargo] from its cargo.")
playsound(loc, 'sound/effects/bin_close.ogg', 50, 0)
+/obj/item/cyborg_clamp/Destroy()
+ for(var/atom/movable/target in cargo)
+ target.forceMove(get_turf(src))
+ playsound(loc, 'sound/effects/bin_close.ogg', 50, 0)
+ return ..()
+
/obj/item/card/id/miningborg
name = "mining point card"
desc = "A robotic ID strip used for claiming and transferring mining points. Must be held in an active slot to transfer points."
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index 84f14f50a5..b9862c3423 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -781,6 +781,11 @@
throwforce = 20
throw_speed = 4
attack_verb = list("gored")
+ var/clonechance = 50
+ var/clonedamage = 12
+ var/clonespeed = 0
+ var/clone_replication_chance = 30
+ var/clone_lifespan = 100
/obj/item/twohanded/spear/grey_tide/afterattack(atom/movable/AM, mob/living/user, proximity)
. = ..()
@@ -791,10 +796,11 @@
var/mob/living/L = AM
if(istype (L, /mob/living/simple_animal/hostile/illusion))
return
- if(!L.stat && prob(50))
+ if(!L.stat && prob(clonechance))
var/mob/living/simple_animal/hostile/illusion/M = new(user.loc)
M.faction = user.faction.Copy()
- M.Copy_Parent(user, 100, user.health/2.5, 12, 30)
+ M.set_varspeed(clonespeed)
+ M.Copy_Parent(user, clone_lifespan, user.health/2.5, clonedamage, clone_replication_chance)
M.GiveTarget(L)
/obj/item/twohanded/pitchfork
@@ -1010,4 +1016,4 @@
var/client/C = user.client
C.change_view(CONFIG_GET(string/default_view))
user.client.pixel_x = 0
- user.client.pixel_y = 0
\ No newline at end of file
+ user.client.pixel_y = 0
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
index 579b1444a5..c26dc78e52 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -91,6 +91,7 @@
new /obj/item/tank/internals/emergency_oxygen/engi(src)
new /obj/item/analyzer(src)
new /obj/item/holosign_creator/atmos(src)
+ new /obj/item/holosign_creator/firelock(src)
new /obj/item/watertank/atmos(src)
new /obj/item/clothing/suit/fire/atmos(src)
new /obj/item/clothing/head/hardhat/atmos(src)
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index 705ca9a884..0cce1de41b 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -619,6 +619,24 @@
skip_reentry_check = TRUE
banType = "ghostcafe"
+/datum/action/toggle_dead_chat_mob
+ icon_icon = 'icons/mob/mob.dmi'
+ button_icon_state = "ghost"
+ name = "Toggle deadchat"
+ desc = "Turn off or on your ability to hear ghosts."
+
+/datum/action/toggle_dead_chat_mob/Trigger()
+ if(!..())
+ return 0
+ var/mob/M = target
+ if(HAS_TRAIT_FROM(M,TRAIT_SIXTHSENSE,GHOSTROLE_TRAIT))
+ REMOVE_TRAIT(M,TRAIT_SIXTHSENSE,GHOSTROLE_TRAIT)
+ to_chat(M,"You're no longer hearing deadchat.")
+ else
+ ADD_TRAIT(M,TRAIT_SIXTHSENSE,GHOSTROLE_TRAIT)
+ to_chat(M,"You're once again longer hearing deadchat.")
+
+
/obj/effect/mob_spawn/human/ghostcafe/special(mob/living/carbon/human/new_spawn)
if(new_spawn.client)
new_spawn.client.prefs.copy_to(new_spawn)
@@ -629,10 +647,13 @@
new_spawn.AddElement(/datum/element/ghost_role_eligibility)
ADD_TRAIT(new_spawn, TRAIT_SIXTHSENSE, GHOSTROLE_TRAIT)
ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT)
- to_chat(new_spawn,"You maybe sharing your cafe with some ninja-captured individuals, so make sure to only interact with the ghosts you hear as a ghost!")
+ ADD_TRAIT(new_spawn,TRAIT_PACIFISM,GHOSTROLE_TRAIT)
+ to_chat(new_spawn,"You may be sharing your cafe with some ninja-captured individuals, so make sure to only interact with the ghosts you hear as a ghost!")
to_chat(new_spawn,"You can turn yourself into a ghost and freely reenter your body with the ghost action.")
var/datum/action/ghost/G = new(new_spawn)
G.Grant(new_spawn)
+ var/datum/action/toggle_dead_chat_mob/D = new(new_spawn)
+ D.Grant(new_spawn)
/datum/outfit/ghostcafe
name = "ID, jumpsuit and shoes"
diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm
index 1f007b6993..69ad9f1567 100644
--- a/code/game/objects/structures/holosign.dm
+++ b/code/game/objects/structures/holosign.dm
@@ -69,9 +69,9 @@
rad_insulation = RAD_LIGHT_INSULATION
/obj/structure/holosign/barrier/atmos
- name = "holo firelock"
- desc = "A holographic barrier resembling a firelock. Though it does not prevent solid objects from passing through, gas is kept out."
- icon_state = "holo_firelock"
+ name = "holo fan"
+ desc = "A holographic barrier resembling a tiny fan. Though it does not prevent solid objects from passing through, gas is kept out. Somehow."
+ icon_state = "holo_fan"
density = FALSE
anchored = TRUE
CanAtmosPass = ATMOS_PASS_NO
@@ -81,6 +81,18 @@
. = ..()
air_update_turf(TRUE)
+/obj/structure/holosign/barrier/firelock
+ name = "holo firelock"
+ desc = "A holographic barrier resembling a firelock. Though it does not prevent solid objects or gas from passing through, temperature changes are kept out."
+ icon_state = "holo_firelock"
+ density = FALSE
+ anchored = TRUE
+ alpha = 150
+ resistance_flags = FIRE_PROOF
+
+/obj/structure/holosign/barrier/firelock/blocksTemperature()
+ return TRUE
+
/obj/structure/holosign/barrier/cyborg
name = "Energy Field"
desc = "A fragile energy field that blocks movement. Excels at blocking lethal projectiles."
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 0bb081625b..3c6a277307 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -184,7 +184,7 @@
/obj/structure/table/alt_attack_hand(mob/user)
if(user && Adjacent(user) && !user.incapacitated())
- user.setClickCooldown(CLICK_CD_MELEE)
+ user.setClickCooldown(4)
if(istype(user) && user.a_intent == INTENT_HARM)
user.visible_message("[user] slams [user.p_their()] palms down on [src].", "You slam your palms down on [src].")
playsound(src, 'sound/weapons/sonic_jackhammer.ogg', 50, 1)
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index f9153ff8bf..720490942a 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -263,7 +263,7 @@
A.autoclose = TRUE
return TRUE
if(RCD_DECONSTRUCT)
- if(ScrapeAway(flags = CHANGETURF_INHERIT_AIR) == src)
+ if(!ScrapeAway(flags = CHANGETURF_INHERIT_AIR))
return FALSE
to_chat(user, "You deconstruct [src].")
return TRUE
diff --git a/code/game/world.dm b/code/game/world.dm
index 034ecddfa2..e68372d768 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -2,6 +2,9 @@
GLOBAL_VAR(restart_counter)
+GLOBAL_VAR(topic_status_lastcache)
+GLOBAL_LIST(topic_status_cache)
+
//This happens after the Master subsystem new(s) (it's a global datum)
//So subsystems globals exist, but are not initialised
/world/New()
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index c3ffd10174..8a7269ccad 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -438,6 +438,8 @@ GLOBAL_PROTECT(admin_verbs_hideable)
set category = "Admin"
set name = "Stealth Mode"
if(holder)
+ if(!check_rights(R_STEALTH, 0))
+ return
if(holder.fakekey)
holder.fakekey = null
if(isobserver(mob))
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
index f5075b57b7..d2693a83b6 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
@@ -95,6 +95,10 @@
Don't crash the server, OK?
+ "UPDATE /mob/living/carbon/monkey SET #null = forceMove(usr.loc)"
+
+ Writing "#null" in front of the "=" will call the proc and discard the return value.
+
A quick recommendation: before you run something like a DELETE or another query.. Run it through SELECT
first.
You'd rather not gib every player on accident.
@@ -740,6 +744,9 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
var/datum/temp = d
var/i = 0
for(var/v in sets)
+ if(v == "#null")
+ SDQL_expression(d, set_list[sets])
+ break
if(++i == sets.len)
if(superuser)
if(temp.vars.Find(v))
diff --git a/code/modules/antagonists/bloodsucker/bloodsucker_life.dm b/code/modules/antagonists/bloodsucker/bloodsucker_life.dm
index bbb8aeca30..10728d0664 100644
--- a/code/modules/antagonists/bloodsucker/bloodsucker_life.dm
+++ b/code/modules/antagonists/bloodsucker/bloodsucker_life.dm
@@ -84,7 +84,7 @@
//It is called from your coffin on close (by you only)
if(poweron_masquerade == TRUE || owner.current.AmStaked())
return FALSE
- owner.current.adjustStaminaLoss(-2 + (regenRate * 8) * mult, 0) // Humans lose stamina damage really quickly. Vamps should heal more.
+ owner.current.adjustStaminaLoss(-2 + (regenRate * -8) * mult, 0) // Humans lose stamina damage really quickly. Vamps should heal more.
owner.current.adjustCloneLoss(-0.1 * (regenRate * 2) * mult, 0)
owner.current.adjustOrganLoss(ORGAN_SLOT_BRAIN, -1 * (regenRate * 4) * mult) //adjustBrainLoss(-1 * (regenRate * 4) * mult, 0)
// No Bleeding
diff --git a/code/modules/antagonists/devil/true_devil/_true_devil.dm b/code/modules/antagonists/devil/true_devil/_true_devil.dm
index fc50a0ecf5..5725ac137b 100644
--- a/code/modules/antagonists/devil/true_devil/_true_devil.dm
+++ b/code/modules/antagonists/devil/true_devil/_true_devil.dm
@@ -197,11 +197,11 @@
if(!ascended)
var/b_loss
switch (severity)
- if (1)
+ if (EXPLODE_DEVASTATE)
b_loss = 500
- if (2)
+ if (EXPLODE_HEAVY)
b_loss = 150
- if(3)
+ if(EXPLODE_LIGHT)
b_loss = 30
if(has_bane(BANE_LIGHT))
b_loss *=2
diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
index 196bf70fdc..389f1a69f3 100644
--- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
+++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
@@ -358,6 +358,9 @@
SSair.excited_groups -= src
////////////////////////SUPERCONDUCTIVITY/////////////////////////////
+/atom/movable/proc/blocksTemperature()
+ return FALSE
+
/turf/proc/conductivity_directions()
if(archived_cycle < SSair.times_fired)
archive()
@@ -372,6 +375,9 @@
. |= direction
/turf/proc/neighbor_conduct_with_src(turf/open/other)
+ for (var/atom/movable/G in src)
+ if (G.blocksTemperature())
+ return
if(!other.blocks_air) //Open but neighbor is solid
other.temperature_share_open_to_solid(src)
else //Both tiles are solid
@@ -382,7 +388,9 @@
if(blocks_air)
..()
return
-
+ for (var/atom/movable/G in src)
+ if (G.blocksTemperature())
+ return
if(!other.blocks_air) //Both tiles are open
var/turf/open/T = other
T.air.temperature_share(air, WINDOW_HEAT_TRANSFER_COEFFICIENT)
@@ -401,10 +409,8 @@
if(!neighbor.thermal_conductivity)
continue
-
if(neighbor.archived_cycle < SSair.times_fired)
neighbor.archive()
-
neighbor.neighbor_conduct_with_src(src)
neighbor.consider_superconductivity()
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index cbbfc05f39..e49368016b 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -822,6 +822,21 @@
return ..()
+/obj/machinery/airalarm/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
+ if((buildstage == 0) && (the_rcd.upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS))
+ return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 20, "cost" = 1)
+ return FALSE
+
+/obj/machinery/airalarm/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode)
+ switch(passed_mode)
+ if(RCD_UPGRADE_SIMPLE_CIRCUITS)
+ user.visible_message("[user] fabricates a circuit and places it into [src].", \
+ "You adapt an air alarm circuit and slot it into the assembly.")
+ buildstage = 1
+ update_icon()
+ return TRUE
+ return FALSE
+
/obj/machinery/airalarm/AltClick(mob/user)
. = ..()
if(!user.canUseTopic(src, !issilicon(user)) || !isturf(loc))
diff --git a/code/modules/client/verbs/looc.dm b/code/modules/client/verbs/looc.dm
index b371372dfe..38cfd84b9c 100644
--- a/code/modules/client/verbs/looc.dm
+++ b/code/modules/client/verbs/looc.dm
@@ -10,9 +10,7 @@ GLOBAL_VAR_INIT(normal_looc_colour, "#6699CC")
to_chat(usr, " Speech is currently admin-disabled.")
return
- if(!mob) return
- if(IsGuestKey(key))
- to_chat(src, "Guests may not use OOC.")
+ if(!mob)
return
msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index 8b2a34a089..b67fe2b462 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -220,10 +220,14 @@
var/obj/item/I = target
I.item_state = initial(picked_item.item_state)
I.item_color = initial(picked_item.item_color)
- if(istype(I, /obj/item/clothing) && istype(initial(picked_item), /obj/item/clothing))
- var/obj/item/clothing/CL = I
- var/obj/item/clothing/PCL = picked_item
- CL.flags_cover = initial(PCL.flags_cover)
+ var/obj/item/clothing/CL = target
+ var/obj/item/clothing/PCL = new picked_item
+ if(istype(CL) && istype(PCL))
+ CL.flags_cover = PCL.flags_cover
+ CL.flags_inv = PCL.flags_inv
+ CL.mutantrace_variation = PCL.mutantrace_variation
+ CL.alternate_worn_icon = PCL.alternate_worn_icon
+ qdel(PCL)
target.icon = initial(picked_item.icon)
/datum/action/item_action/chameleon/change/pda/update_item(obj/item/pda/picked_item)
@@ -634,6 +638,7 @@
/obj/item/clothing/neck/cloak/chameleon
name = "black tie"
desc = "A neosilk clip-on tie."
+ icon = 'icons/obj/clothing/neck.dmi'
icon_state = "blacktie"
item_color = "blacktie"
resistance_flags = NONE
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index fffdee5833..4c6a0fa3b6 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -392,3 +392,33 @@
desc = "A green Christmas Hat! How festive!"
icon_state = "christmashatg"
item_state = "christmashatg"
+
+/obj/item/clothing/head/cowboyhat
+ name = "cowboy hat"
+ desc = "A standard brown cowboy hat, yeehaw."
+ icon_state = "cowboyhat"
+ item_state= "cowboyhat"
+
+/obj/item/clothing/head/cowboyhat/black
+ name = "black cowboy hat"
+ desc = "A a black cowboy hat, perfect for any outlaw"
+ icon_state = "cowboyhat_black"
+ item_state= "cowboyhat_black"
+
+/obj/item/clothing/head/cowboyhat/white
+ name = "white cowboy hat"
+ desc = "A white cowboy hat, perfect for your every day rancher"
+ icon_state = "cowboyhat_white"
+ item_state= "cowboyhat_white"
+
+/obj/item/clothing/head/cowboyhat/pink
+ name = "pink cowboy hat"
+ desc = "A pink cowboy? more like cowgirl hat, just don't be a buckle bunny."
+ icon_state = "cowboyhat_pink"
+ item_state= "cowboyhat_pink"
+
+/obj/item/clothing/head/cowboyhat/sec
+ name = "security cowboy hat"
+ desc = "A security cowboy hat, perfect for any true lawman"
+ icon_state = "cowboyhat_sec"
+ item_state= "cowboyhat_sec"
\ No newline at end of file
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index c81584dbcc..c0e566cc0e 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -355,3 +355,13 @@
name = "blue leg wraps"
desc = "Ankle coverings. Hang ten, brother."
icon_state = "bluecuffs"
+
+/obj/item/clothing/shoes/cowboyboots
+ name = "cowboy boots"
+ desc = "A standard pair of brown cowboy boots."
+ icon_state = "cowboyboots"
+
+/obj/item/clothing/shoes/cowboyboots/black
+ name = "black cowboy boots"
+ desc = "A pair of black cowboy boots, pretty easy to scuff up."
+ icon_state = "cowboyboots_black"
diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm
index a85623cabd..0c17814c98 100644
--- a/code/modules/food_and_drinks/food/snacks_other.dm
+++ b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -615,7 +615,7 @@
name = "marshmallow"
desc = "A marshmallow filled with fluffy marshmallow fluff."
icon_state = "marshmallow"
- list_reagents = list("sugar" = 5, "nutriment" = 2)
+ list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/nutriment = 2)
filling_color = "#fafafa"
w_class = WEIGHT_CLASS_TINY
tastes = list("marshmallow" = 2)
diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm
index 86889c5d00..bdca4bb7df 100644
--- a/code/modules/mining/equipment/explorer_gear.dm
+++ b/code/modules/mining/equipment/explorer_gear.dm
@@ -29,6 +29,7 @@
resistance_flags = FIRE_PROOF
/obj/item/clothing/suit/hooded/explorer/standard
+ hoodtype = /obj/item/clothing/head/hooded/explorer/standard
/obj/item/clothing/head/hooded/explorer/standard
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index e5cab4438a..54f8e11b07 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -302,7 +302,7 @@
/obj/item/storage/backpack/duffelbag/mining_cloned
name = "mining replacement kit"
- desc = "A large bag that has advance tools and a spare jumpsuit, boots, and gloves for a newly cloned miner to get back in the field. Even as a new Id!"
+ desc = "A large bag that has advance tools and a spare jumpsuit, boots, and gloves for a newly cloned miner to get back in the field. Even has a new ID!"
/obj/item/storage/backpack/duffelbag/mining_cloned/PopulateContents()
new /obj/item/pickaxe/mini(src)
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm b/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm
index fb40563ccf..58c64dc7d0 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm
@@ -310,4 +310,40 @@
name = "Tube Top"
icon_state = "tubetop"
has_color = TRUE
- gender = FEMALE
\ No newline at end of file
+ gender = FEMALE
+
+/datum/sprite_accessory/underwear/top/cowboyshirt
+ name = "Cowboy Shirt Black"
+ icon_state = "cowboyshirt"
+
+/datum/sprite_accessory/underwear/top/cowboyshirt/s
+ name = "Cowboy Shirt Shortsleeved Black"
+ icon_state = "cowboyshirt_s"
+
+/datum/sprite_accessory/underwear/top/cowboyshirt/white
+ name = "Cowboy Shirt White"
+ icon_state = "cowboyshirt_white"
+
+/datum/sprite_accessory/underwear/top/cowboyshirt/white/s
+ name = "Cowboy Shirt Shortsleeved White"
+ icon_state = "cowboyshirt_whites"
+
+/datum/sprite_accessory/underwear/top/cowboyshirt/navy
+ name = "Cowboy Shirt Navy"
+ icon_state = "cowboyshirt_navy"
+
+/datum/sprite_accessory/underwear/top/cowboyshirt/navy/s
+ name = "Cowboy Shirt Shortsleeved Navy"
+ icon_state = "cowboyshirt_navys"
+
+/datum/sprite_accessory/underwear/top/cowboyshirt/red
+ name = "Cowboy Shirt Red"
+ icon_state = "cowboyshirt_red"
+
+/datum/sprite_accessory/underwear/top/cowboyshirt/red/s
+ name = "Cowboy Shirt Shortsleeved Red"
+ icon_state = "cowboyshirt_reds"
+
+
+
+
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index f1c4316c65..d234aafca6 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -477,6 +477,32 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
pixel_y = 0
animate(src, pixel_y = 2, time = 10, loop = -1)
+/mob/dead/observer/verb/observe()
+ set name = "Observe"
+ set category = "Ghost"
+
+ var/list/creatures = getpois()
+
+ reset_perspective(null)
+
+ var/eye_name = null
+
+ eye_name = input("Please, select a player!", "Observe", null, null) as null|anything in creatures
+
+ if (!eye_name)
+ return
+
+ var/mob/mob_eye = creatures[eye_name]
+ //Istype so we filter out points of interest that are not mobs
+ if(client && mob_eye && istype(mob_eye))
+ client.eye = mob_eye
+ if(mob_eye.hud_used)
+ client.screen = list()
+ LAZYINITLIST(mob_eye.observers)
+ mob_eye.observers |= src
+ mob_eye.hud_used.show_hud(mob_eye.hud_used.hud_version, src)
+ observetarget = mob_eye
+
/mob/dead/observer/verb/jumptomob() //Moves the ghost instead of just changing the ghosts's eye -Nodrak
set category = "Ghost"
set name = "Jump to Mob"
@@ -807,32 +833,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
client.screen = list()
hud_used.show_hud(hud_used.hud_version)
-/mob/dead/observer/verb/observe()
- set name = "Observe"
- set category = "OOC"
-
- var/list/creatures = getpois()
-
- reset_perspective(null)
-
- var/eye_name = null
-
- eye_name = input("Please, select a player!", "Observe", null, null) as null|anything in creatures
-
- if (!eye_name)
- return
-
- var/mob/mob_eye = creatures[eye_name]
- //Istype so we filter out points of interest that are not mobs
- if(client && mob_eye && istype(mob_eye))
- client.eye = mob_eye
- if(mob_eye.hud_used)
- client.screen = list()
- LAZYINITLIST(mob_eye.observers)
- mob_eye.observers |= src
- mob_eye.hud_used.show_hud(mob_eye.hud_used.hud_version, src)
- observetarget = mob_eye
-
/mob/dead/observer/verb/register_pai_candidate()
set category = "Ghost"
set name = "pAI Setup"
diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm
index bdc691ce49..8c74b7408b 100644
--- a/code/modules/mob/living/carbon/alien/alien_defense.dm
+++ b/code/modules/mob/living/carbon/alien/alien_defense.dm
@@ -107,15 +107,15 @@ In all, this is a lot like the monkey code. /N
return
..()
switch (severity)
- if (1)
+ if (EXPLODE_DEVASTATE)
gib()
return
- if (2)
+ if (EXPLODE_HEAVY)
take_overall_damage(60, 60)
adjustEarDamage(30,120)
- if(3)
+ if(EXPLODE_LIGHT)
take_overall_damage(30,0)
if(prob(50))
Unconscious(20)
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index eca3a81c4b..ff356d7001 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -392,6 +392,13 @@
. += "...?"
else
. += "[print_flavor_text()]"
+ if(print_flavor_text_2())
+ if(get_visible_name() == "Unknown") //Are we sure we know who this is? Don't show flavor text unless we can recognize them. Prevents certain metagaming with impersonation.
+ . += "...?"
+ else if(skipface) //Sometimes we're not unknown, but impersonating someone in a hardsuit, let's not reveal our flavor text then either.
+ . += "...?"
+ else
+ . += "[print_flavor_text_2()]"
. += "*---------*"
/mob/living/proc/status_effect_examines(pronoun_replacement) //You can include this in any mob's examine() to show the examine texts of status effects!
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 9cbb5b1a0a..94bc2ea2e3 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -326,38 +326,49 @@
..()
if (!severity)
return
- var/b_loss = 0
- var/f_loss = 0
- var/bomb_armor = max(0,(100-getarmor(null, "bomb"))/100)
+ var/brute_loss = 0
+ var/burn_loss = 0
+ var/bomb_armor = getarmor(null, "bomb")
+
+ //200 max knockdown for EXPLODE_HEAVY
+ //160 max knockdown for EXPLODE_LIGHT
switch (severity)
- if (1)
- if(bomb_armor)
- b_loss = (350*bomb_armor)+150
- var/atom/throw_target = get_edge_target_turf(src, get_dir(src, get_step_away(src, src)))
- throw_at(throw_target, 200, 4)
- damage_clothes(400*bomb_armor, BRUTE, "bomb")
- else
- damage_clothes(400,BRUTE,"bomb")
+ if (EXPLODE_DEVASTATE)
+ if(bomb_armor < EXPLODE_GIB_THRESHOLD) //gibs the mob if their bomb armor is lower than EXPLODE_GIB_THRESHOLD
+ for(var/I in contents)
+ var/atom/A = I
+ A.ex_act(severity)
gib()
return
+ else
+ brute_loss = 500
+ var/atom/throw_target = get_edge_target_turf(src, get_dir(src, get_step_away(src, src)))
+ throw_at(throw_target, 200, 4)
+ damage_clothes(400 - bomb_armor, BRUTE, "bomb")
- if (2)
- b_loss = 60*bomb_armor
- f_loss = 60*bomb_armor
- damage_clothes(200*bomb_armor, BRUTE, "bomb")
+ if (EXPLODE_HEAVY)
+ brute_loss = 60
+ burn_loss = 60
+ if(bomb_armor)
+ brute_loss = 30*(2 - round(bomb_armor*0.01, 0.05))
+ burn_loss = brute_loss //damage gets reduced from 120 to up to 60 combined brute+burn
+ damage_clothes(200 - bomb_armor, BRUTE, "bomb")
if (!istype(ears, /obj/item/clothing/ears/earmuffs))
adjustEarDamage(30, 120)
- Unconscious(200*bomb_armor)
+ Unconscious(20) //short amount of time for follow up attacks against elusive enemies like wizards
+ Knockdown(200 - (bomb_armor * 1.6)) //between ~4 and ~20 seconds of knockdown depending on bomb armor
- if(3)
- b_loss = 30*bomb_armor
+ if(EXPLODE_LIGHT)
+ brute_loss = 30
+ if(bomb_armor)
+ brute_loss = 15*(2 - round(bomb_armor*0.01, 0.05))
damage_clothes(max(50 - bomb_armor, 0), BRUTE, "bomb")
if (!istype(ears, /obj/item/clothing/ears/earmuffs))
adjustEarDamage(15,60)
- Unconscious(100*bomb_armor)
+ Knockdown(160 - (bomb_armor * 1.6)) //100 bomb armor will prevent knockdown altogether
- take_overall_damage(b_loss,f_loss)
+ take_overall_damage(brute_loss,burn_loss)
//attempt to dismember bodyparts
if(severity <= 2 || !bomb_armor)
diff --git a/code/modules/mob/living/carbon/monkey/monkey_defense.dm b/code/modules/mob/living/carbon/monkey/monkey_defense.dm
index 32e3d21ee2..62550f4ccb 100644
--- a/code/modules/mob/living/carbon/monkey/monkey_defense.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey_defense.dm
@@ -189,18 +189,18 @@
..()
switch (severity)
- if (1)
+ if (EXPLODE_DEVASTATE)
gib()
return
- if (2)
+ if (EXPLODE_HEAVY)
take_overall_damage(60, 60)
damage_clothes(200, BRUTE, "bomb")
adjustEarDamage(30, 120)
if(prob(70))
Unconscious(200)
- if(3)
+ if(EXPLODE_LIGHT)
take_overall_damage(30, 0)
damage_clothes(50, BRUTE, "bomb")
adjustEarDamage(15,60)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 48e6f8c288..eab0cc1d66 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -835,7 +835,7 @@
/obj/item/robot_module/miner/be_transformed_to(obj/item/robot_module/old_module)
var/mob/living/silicon/robot/R = loc
- var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Lavaland", "Heavy", "Sleek", "Marina", "Can", "Spider", "Asteroid", "Droid", "Blade")
+ var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Lavaland", "Heavy", "Sleek", "Marina", "Can", "Spider", "Asteroid", "Droid", "Blade", "Vale")
if(!borg_icon)
return FALSE
switch(borg_icon)
@@ -868,6 +868,11 @@
cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
sleeper_overlay = "bladesleeper"
dogborg = TRUE
+ if("Vale")
+ cyborg_base_icon = "valemine"
+ cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
+ sleeper_overlay = "valeminesleeper"
+ dogborg = TRUE
return ..()
/obj/item/robot_module/syndicate
diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm
index 0dfa126e79..ad8dfc4900 100644
--- a/code/modules/mob/living/simple_animal/animal_defense.dm
+++ b/code/modules/mob/living/simple_animal/animal_defense.dm
@@ -122,19 +122,19 @@
..()
var/bomb_armor = getarmor(null, "bomb")
switch (severity)
- if (1)
+ if (EXPLODE_DEVASTATE)
if(prob(bomb_armor))
adjustBruteLoss(500)
else
gib()
return
- if (2)
+ if (EXPLODE_HEAVY)
var/bloss = 60
if(prob(bomb_armor))
bloss = bloss / 1.5
adjustBruteLoss(bloss)
- if(3)
+ if(EXPLODE_LIGHT)
var/bloss = 30
if(prob(bomb_armor))
bloss = bloss / 1.5
diff --git a/code/modules/mob/living/simple_animal/friendly/bumbles.dm b/code/modules/mob/living/simple_animal/friendly/bumbles.dm
new file mode 100644
index 0000000000..63e9fbf852
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/friendly/bumbles.dm
@@ -0,0 +1,48 @@
+/mob/living/simple_animal/pet/bumbles
+ name = "Bumbles"
+ desc = "Bumbles, the very humble bumblebee."
+ icon_state = "bumbles"
+ icon_living = "bumbles"
+ icon_dead = "bumbles_dead"
+ turns_per_move = 1
+ response_help = "shoos"
+ response_disarm = "brushes aside"
+ response_harm = "squashes"
+ speak_emote = list("bzzzs")
+ maxHealth = 100
+ health = 100
+ harm_intent_damage = 1
+ friendly = "bzzs"
+ density = FALSE
+ movement_type = FLYING
+ pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
+ ventcrawler = VENTCRAWLER_ALWAYS
+ mob_size = MOB_SIZE_TINY
+ mob_biotypes = list(MOB_ORGANIC, MOB_BEAST)
+ gold_core_spawnable = FRIENDLY_SPAWN
+ verb_say = "bzzs"
+ verb_ask = "bzzs inquisitively"
+ verb_exclaim = "bzzs intensely"
+ verb_yell = "bzzs intensely"
+
+/mob/living/simple_animal/pet/bumbles/Initialize()
+ . = ..()
+ verbs += /mob/living/proc/lay_down
+
+/mob/living/simple_animal/pet/bumbles/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/wuv, "bzzs!")
+
+/mob/living/simple_animal/pet/bumbles/update_canmove()
+ ..()
+ if(client && stat != DEAD)
+ if (resting)
+ icon_state = "[icon_living]_rest"
+ collar_type = "[initial(collar_type)]_rest"
+ else
+ icon_state = "[icon_living]"
+ collar_type = "[initial(collar_type)]"
+ regenerate_icons()
+
+/mob/living/simple_animal/pet/bumbles/bee_friendly()
+ return TRUE //treaty signed at the Beeneeva convention
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
index c6386540f7..af3014cb18 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
@@ -103,13 +103,13 @@
/mob/living/simple_animal/hostile/megafauna/ex_act(severity, target)
switch (severity)
- if (1)
+ if (EXPLODE_DEVASTATE)
adjustBruteLoss(250)
- if (2)
+ if (EXPLODE_HEAVY)
adjustBruteLoss(100)
- if(3)
+ if(EXPLODE_LIGHT)
adjustBruteLoss(50)
/mob/living/simple_animal/hostile/megafauna/proc/SetRecoveryTime(buffer_time)
diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm
index a7ffd29463..a387dcb1d2 100644
--- a/code/modules/mob/say_vr.dm
+++ b/code/modules/mob/say_vr.dm
@@ -3,6 +3,7 @@
//////////////////////////////////////////////////////
/mob
var/flavor_text = "" //tired of fucking double checking this
+ var/flavor_text_2 = ""
/mob/proc/update_flavor_text()
set src in usr
@@ -16,6 +17,19 @@
flavor_text = msg
+/mob/proc/update_flavor_text_2()
+ set src in usr
+ if(usr != src)
+ to_chat(usr, "No.")
+ var/msg = stripped_multiline_input(usr, "Set the temporary flavor text in your 'examine' verb. This should be used only for things pertaining to the current round!", "Short-Term Flavor Text", html_decode(flavor_text_2), MAX_MESSAGE_LEN*2, TRUE)
+
+ if(!isnull(msg))
+ msg = copytext(msg, 1, MAX_MESSAGE_LEN)
+ msg = html_encode(msg)
+
+ flavor_text_2 = msg
+
+
/mob/proc/warn_flavor_changed()
if(flavor_text && flavor_text != "") // don't spam people that don't use it!
to_chat(src, "OOC Warning:
")
@@ -30,6 +44,16 @@
else
return "[html_encode(copytext(msg, 1, 37))]... More..."
+/mob/proc/print_flavor_text_2()
+ if(flavor_text && flavor_text != "")
+ // We are decoding and then encoding to not only get correct amount of characters, but also to prevent partial escaping characters being shown.
+ var/msg = html_decode(replacetext(flavor_text_2, "\n", " "))
+ if(length(msg) <= 40)
+ return "[html_encode(msg)]"
+ else
+ return "[html_encode(copytext(msg, 1, 37))]... More..."
+
+
/mob/proc/get_top_level_mob()
if(istype(src.loc,/mob)&&src.loc!=src)
var/mob/M=src.loc
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 2652026a11..0ad2983b91 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -701,6 +701,52 @@
else
return ..()
+/obj/machinery/power/apc/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
+ if(the_rcd.upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS)
+ if(!has_electronics)
+ if(stat & BROKEN)
+ to_chat(user, "[src]'s frame is too damaged to support a circuit.")
+ return FALSE
+ return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 20, "cost" = 1)
+ else if(!cell)
+ if(stat & MAINT)
+ to_chat(user, "There's no connector for a power cell.")
+ return FALSE
+ return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 50, "cost" = 10) //16 for a wall
+ else
+ to_chat(user, "[src] has both electronics and a cell.")
+ return FALSE
+ return FALSE
+
+/obj/machinery/power/apc/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode)
+ switch(passed_mode)
+ if(RCD_UPGRADE_SIMPLE_CIRCUITS)
+ if(!has_electronics)
+ if(stat & BROKEN)
+ to_chat(user, "[src]'s frame is too damaged to support a circuit.")
+ return
+ user.visible_message("[user] fabricates a circuit and places it into [src].", \
+ "You adapt a power control board and click it into place in [src]'s guts.")
+ has_electronics = TRUE
+ locked = TRUE
+ return TRUE
+ else if(!cell)
+ if(stat & MAINT)
+ to_chat(user, "There's no connector for a power cell.")
+ return FALSE
+ var/obj/item/stock_parts/cell/crap/empty/C = new(src)
+ C.forceMove(src)
+ cell = C
+ chargecount = 0
+ user.visible_message("[user] fabricates a weak power cell and places it into [src].", \
+ "Your [the_rcd.name] whirrs with strain as you create a weak power cell and place it into [src]!")
+ update_icon()
+ return TRUE
+ else
+ to_chat(user, "[src] has both electronics and a cell.")
+ return FALSE
+ return FALSE
+
/obj/machinery/power/apc/AltClick(mob/user)
. = ..()
if(!user.canUseTopic(src, !issilicon(user)) || !isturf(loc))
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 217c915a9e..424f2bce30 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -92,8 +92,15 @@
/obj/machinery/chem_dispenser/Initialize()
. = ..()
- for(var/list/L in list(dispensable_reagents, emagged_reagents, upgrade_reagents, upgrade_reagents2, upgrade_reagents3))
- L = sortList(L, /proc/cmp_reagents_asc)
+ if(emagged_reagents)
+ emagged_reagents = sortList(emagged_reagents, /proc/cmp_reagents_asc)
+ if(upgrade_reagents)
+ upgrade_reagents = sortList(upgrade_reagents, /proc/cmp_reagents_asc)
+ if(upgrade_reagents2)
+ upgrade_reagents2 = sortList(upgrade_reagents2, /proc/cmp_reagents_asc)
+ if(upgrade_reagents3)
+ upgrade_reagents3 = sortList(upgrade_reagents3, /proc/cmp_reagents_asc)
+ dispensable_reagents = sortList(dispensable_reagents, /proc/cmp_reagents_asc)
update_icon()
/obj/machinery/chem_dispenser/Destroy()
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index d869e086a5..97bc054ecd 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -35,9 +35,10 @@
/obj/item/reagent_containers/examine(mob/user)
. = ..()
- . += "Currently transferring [amount_per_transfer_from_this] units per use."
- if(possible_transfer_amounts && user.Adjacent(src))
- . += "Alt-click it to set its transfer amount."
+ if(length(possible_transfer_amounts) > 1)
+ . += "Currently transferring [amount_per_transfer_from_this] units per use."
+ if(APTFT_altclick && user.Adjacent(src))
+ . += "Alt-click it to set its transfer amount."
/obj/item/reagent_containers/AltClick(mob/user)
. = ..()
diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index 980e823a82..48a5c10e3b 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -31,6 +31,7 @@ Borg Hypospray
var/accepts_reagent_upgrades = TRUE //If upgrades can increase number of reagents dispensed.
var/list/modes = list() //Basically the inverse of reagent_ids. Instead of having numbers as "keys" and strings as values it has strings as keys and numbers as values.
//Used as list for input() in shakers.
+ var/list/reagent_names = list()
/obj/item/reagent_containers/borghypo/Initialize()
. = ..()
@@ -54,7 +55,7 @@ Borg Hypospray
return 1
// Use this to add more chemicals for the borghypo to produce.
-/obj/item/reagent_containers/borghypo/proc/add_reagent(reagent)
+/obj/item/reagent_containers/borghypo/proc/add_reagent(datum/reagent/reagent)
reagent_ids |= reagent
var/datum/reagents/RG = new(30)
RG.my_atom = src
@@ -64,9 +65,11 @@ Borg Hypospray
R.add_reagent(reagent, 30)
modes[reagent] = modes.len + 1
+ reagent_names[initial(reagent.name)] = reagent
-/obj/item/reagent_containers/borghypo/proc/del_reagent(reagent)
+/obj/item/reagent_containers/borghypo/proc/del_reagent(datum/reagent/reagent)
reagent_ids -= reagent
+ reagent_names -= initial(reagent.name)
var/datum/reagents/RG
var/datum/reagents/TRG
for(var/i in 1 to reagent_ids.len)
@@ -112,7 +115,7 @@ Borg Hypospray
log_combat(user, M, "injected", src, "(CHEMICALS: [english_list(injected)])")
/obj/item/reagent_containers/borghypo/attack_self(mob/user)
- var/chosen_reagent = modes[input(user, "What reagent do you want to dispense?") as null|anything in reagent_ids]
+ var/chosen_reagent = modes[reagent_names[input(user, "What reagent do you want to dispense?") as null|anything in reagent_names]]
if(!chosen_reagent)
return
mode = chosen_reagent
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index e9f8053631..1a8c960b2f 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -184,7 +184,7 @@
icon_state = "virus_food"
anchored = TRUE
density = FALSE
- reagent_id = /datum/reagent/toxin/mutagen/mutagenvirusfood
+ reagent_id = /datum/reagent/consumable/virus_food
/obj/structure/reagent_dispensers/cooking_oil
name = "vat of cooking oil"
diff --git a/modular_citadel/code/modules/research/designs/autoylathe_designs.dm b/code/modules/research/designs/autoylathe_designs.dm
similarity index 100%
rename from modular_citadel/code/modules/research/designs/autoylathe_designs.dm
rename to code/modules/research/designs/autoylathe_designs.dm
diff --git a/code/modules/research/designs/machine_desings/machine_designs_medical.dm b/code/modules/research/designs/machine_desings/machine_designs_medical.dm
index 2f95954e01..329fb7bf6e 100644
--- a/code/modules/research/designs/machine_desings/machine_designs_medical.dm
+++ b/code/modules/research/designs/machine_desings/machine_designs_medical.dm
@@ -24,7 +24,15 @@
id = "sleeper"
build_path = /obj/item/circuitboard/machine/sleeper
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_ENGINEERING
- category = list ("Medical Machinery")
+ category = list("Medical Machinery")
+
+/datum/design/board/syndiesleeper
+ name = "Machine Design (Syndicate Sleeper Board)"
+ desc = "The circuit board for a Syndicate sleeper, with controls inside."
+ id = "syndiesleeper"
+ build_path = /obj/item/circuitboard/machine/sleeper/syndie
+ departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_ENGINEERING
+ category = list("Medical Machinery")
/datum/design/board/cryotube
name = "Machine Design (Cryotube Board)"
diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm
index 5f7648b245..b18db566af 100644
--- a/code/modules/research/designs/misc_designs.dm
+++ b/code/modules/research/designs/misc_designs.dm
@@ -364,6 +364,16 @@
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+/datum/design/holosignfirelock
+ name = "ATMOS Holofirelock Projector"
+ desc = "A holographic projector that creates holographic barriers that prevent changes in temperature conditions."
+ id = "holosignfirelock"
+ build_type = PROTOLATHE
+ materials = list(MAT_METAL = 5000, MAT_GLASS = 1000, MAT_GOLD = 1000, MAT_SILVER = 1000)
+ build_path = /obj/item/holosign_creator/firelock
+ category = list("Equipment")
+ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
/datum/design/forcefield_projector
name = "Forcefield Projector"
desc = "A device which can project temporary forcefields to seal off an area."
@@ -379,13 +389,23 @@
////////////Tools//////////////
///////////////////////////////
-/datum/design/rcd_upgrade
- name = "Advanced RCD designs upgrade"
+/datum/design/rcd_upgrade/frames
+ name = "RCD frames designs upgrade"
desc = "Adds the computer frame and machine frame to the RCD."
- id = "rcd_upgrade"
+ id = "rcd_upgrade_frames"
build_type = PROTOLATHE
materials = list(MAT_METAL = 5000, MAT_GLASS = 2500, MAT_SILVER = 1500, MAT_TITANIUM = 2000)
- build_path = /obj/item/rcd_upgrade
+ build_path = /obj/item/rcd_upgrade/frames
+ category = list("Equipment")
+ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/rcd_upgrade/simple_circuits
+ name = "RCD simple circuits designs upgrade"
+ desc = "Adds the simple circuits to the RCD."
+ id = "rcd_upgrade_simple_circuits"
+ build_type = PROTOLATHE
+ materials = list(MAT_METAL = 5000, MAT_GLASS = 2500, MAT_SILVER = 1500, MAT_TITANIUM = 2000)
+ build_path = /obj/item/rcd_upgrade/simple_circuits
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
@@ -419,6 +439,26 @@
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+/datum/design/rcd_loaded
+ name = "Rapid Construction Device"
+ desc = "A tool that can construct and deconstruct walls, airlocks and floors on the fly."
+ id = "rcd_loaded"
+ build_type = PROTOLATHE
+ materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT) // costs more than what it did in the autolathe, this one comes loaded.
+ build_path = /obj/item/construction/rcd/loaded
+ category = list("Equipment")
+ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/rpd
+ name = "Rapid Pipe Dispenser"
+ desc = "A tool that can construct and deconstruct pipes on the fly."
+ id = "rpd"
+ build_type = PROTOLATHE
+ materials = list(MAT_METAL = 75000, MAT_GLASS = 37500)
+ build_path = /obj/item/pipe_dispenser
+ category = list("Equipment")
+ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
/datum/design/alienwrench
name = "Alien Wrench"
desc = "An advanced wrench obtained through Abductor technology."
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index a44495fccb..b6a1105cf4 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -200,7 +200,7 @@
display_name = "Advanced Engineering"
description = "Pushing the boundaries of physics, one chainsaw-fist at a time."
prereq_ids = list("engineering", "emp_basic")
- design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask", "tray_goggles_prescription", "engine_goggles_prescription", "mesons_prescription", "rcd_upgrade")
+ design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask" , "rcd_loaded", "rpd", "tray_goggles_prescription", "engine_goggles_prescription", "mesons_prescription", "rcd_upgrade_frames", "rcd_upgrade_simple_circuits")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 4000)
export_price = 5000
@@ -430,7 +430,7 @@
display_name = "Electromagnetic Theory"
description = "Study into usage of frequencies in the electromagnetic spectrum."
prereq_ids = list("base")
- design_ids = list("holosign", "holosignsec", "holosignengi", "holosignatmos", "inducer", "tray_goggles", "holopad")
+ design_ids = list("holosign", "holosignsec", "holosignengi", "holosignatmos", "holosignfirelock", "inducer", "tray_goggles", "holopad")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
@@ -1081,7 +1081,7 @@
display_name = "Illegal Technology"
description = "Dangerous research used to create dangerous objects."
prereq_ids = list("adv_engi", "adv_weaponry", "explosive_weapons")
- design_ids = list("decloner", "borg_syndicate_module", "suppressor", "largecrossbow", "donksofttoyvendor")
+ design_ids = list("decloner", "borg_syndicate_module", "suppressor", "largecrossbow", "donksofttoyvendor", "syndiesleeper")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10000)
export_price = 5000
hidden = TRUE
diff --git a/code/modules/surgery/limb_augmentation.dm b/code/modules/surgery/limb_augmentation.dm
index b1d8990b48..684996a0f5 100644
--- a/code/modules/surgery/limb_augmentation.dm
+++ b/code/modules/surgery/limb_augmentation.dm
@@ -1,15 +1,5 @@
/////AUGMENTATION SURGERIES//////
//SURGERY STEPS
-/datum/surgery_step/replace
- name = "sever muscles"
- implements = list(TOOL_SCALPEL = 100, TOOL_WIRECUTTER = 55)
- time = 32
-
-
-/datum/surgery_step/replace/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- display_results(user, target, "You begin to sever the muscles on [target]'s [parse_zone(user.zone_selected)]...",
- "[user] begins to sever the muscles on [target]'s [parse_zone(user.zone_selected)].",
- "[user] begins an incision on [target]'s [parse_zone(user.zone_selected)].")
/datum/surgery_step/replace_limb
name = "replace limb"
@@ -37,7 +27,7 @@
//ACTUAL SURGERIES
/datum/surgery/augmentation
name = "Augmentation"
- steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/replace, /datum/surgery_step/saw, /datum/surgery_step/replace_limb)
+ steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/replace_limb)
target_mobtypes = list(/mob/living/carbon/human)
possible_locs = list(BODY_ZONE_R_ARM,BODY_ZONE_L_ARM,BODY_ZONE_R_LEG,BODY_ZONE_L_LEG,BODY_ZONE_CHEST,BODY_ZONE_HEAD)
requires_real_bodypart = TRUE
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index 97fa6041a9..18dc34e34b 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -165,1866 +165,3 @@
//Discounts (dynamically filled above)
/datum/uplink_item/discounts
category = "Discounted Gear"
-
-
-/*
- Uplink Items:
- Unlike categories, uplink item entries are automatically sorted alphabetically on server init in a global list,
- When adding new entries to the file, please keep them sorted by category.
-*/
-
-//All bundles and telecrystals
-
-/datum/uplink_item/bundles_TC/chemical
- name = "Bioterror bundle"
- desc = "For the madman: Contains a handheld Bioterror chem sprayer, a Bioterror foam grenade, a box of lethal chemicals, a dart pistol, \
- box of syringes, Donksoft assault rifle, and some riot darts. Remember: Seal suit and equip internals before use."
- item = /obj/item/storage/backpack/duffelbag/syndie/med/bioterrorbundle
- cost = 30 // normally 42
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/bundles_TC/bulldog
- name = "Bulldog bundle"
- desc = "Lean and mean: Optimized for people that want to get up close and personal. Contains the popular \
- Bulldog shotgun, a 12g buckshot drum, a 12g taser slug drum and a pair of Thermal imaging goggles."
- item = /obj/item/storage/backpack/duffelbag/syndie/bulldogbundle
- cost = 13 // normally 16
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/bundles_TC/c20r
- name = "C-20r bundle"
- desc = "Old Faithful: The classic C-20r, bundled with two magazines, and a (surplus) suppressor at discount price."
- item = /obj/item/storage/backpack/duffelbag/syndie/c20rbundle
- cost = 14 // normally 16
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/bundles_TC/cybernetics_bundle
- name = "Cybernetic Implants Bundle"
- desc = "A random selection of cybernetic implants. Guaranteed 5 high quality implants. Comes with an autosurgeon."
- item = /obj/item/storage/box/cyber_implants
- cost = 40
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/bundles_TC/medical
- name = "Medical bundle"
- desc = "The support specialist: Aid your fellow operatives with this medical bundle. Contains a tactical medkit, \
- a Donksoft LMG, a box of riot darts and a pair of magboots to rescue your friends in no-gravity environments."
- item = /obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle
- cost = 15 // normally 20
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/bundles_TC/modular
- name = "Modular Pistol Kit"
- desc = "A heavy briefcase containing one modular pistol (chambered in 10mm), one supressor, and spare ammunition, including a box of soporific ammo. \
- Includes a suit jacket that is padded with a robust liner."
- item = /obj/item/storage/briefcase/modularbundle
- cost = 12
-
-/datum/uplink_item/bundles_TC/shredder
- name = "Shredder bundle"
- desc = "A truly horrific weapon designed simply to maim its victim, the CX Shredder is banned by several intergalactic treaties. \
- You'll get two of them with this. And spare ammo to boot. And we'll throw in an extra elite hardsuit and chest rig to hold them all!"
- item = /obj/item/storage/backpack/duffelbag/syndie/shredderbundle
- cost = 30 // normally 41
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/bundles_TC/sniper
- name = "Sniper bundle"
- desc = "Elegant and refined: Contains a collapsed sniper rifle in an expensive carrying case, \
- two soporific knockout magazines, a free surplus supressor, and a sharp-looking tactical turtleneck suit. \
- We'll throw in a free red tie if you order NOW."
- item = /obj/item/storage/briefcase/sniperbundle
- cost = 20 // normally 26
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/bundles_TC/firestarter
- name = "Spetsnaz Pyro bundle"
- desc = "For systematic suppression of carbon lifeforms in close quarters: Contains a lethal New Russian backpack spray, Elite hardsuit, \
- Stechkin APS pistol, two magazines, a minibomb and a stimulant syringe. \
- Order NOW and comrade Boris will throw in an extra tracksuit."
- item = /obj/item/storage/backpack/duffelbag/syndie/firestarter
- cost = 30
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/bundles_TC/bundle
- name = "Syndicate Bundle"
- desc = "Syndicate Bundles are specialized groups of items that arrive in a plain box. \
- These items are collectively worth more than 20 telecrystals, but you do not know which specialization \
- you will receive. May contain discontinued and/or exotic items."
- item = /obj/item/storage/box/syndicate
- cost = 20
- exclude_modes = list(/datum/game_mode/nuclear)
- cant_discount = TRUE
-
-/datum/uplink_item/bundles_TC/surplus
- name = "Syndicate Surplus Crate"
- desc = "A dusty crate from the back of the Syndicate warehouse. Rumored to contain a valuable assortment of items, \
- but you never know. Contents are sorted to always be worth 50 TC."
- item = /obj/structure/closet/crate
- cost = 20
- player_minimum = 25
- exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
- cant_discount = TRUE
- var/starting_crate_value = 50
-
-/datum/uplink_item/bundles_TC/surplus/super
- name = "Super Surplus Crate"
- desc = "A dusty SUPER-SIZED from the back of the Syndicate warehouse. Rumored to contain a valuable assortment of items, \
- but you never know. Contents are sorted to always be worth 125 TC."
- cost = 40
- player_minimum = 40
- starting_crate_value = 125
-
-/datum/uplink_item/bundles_TC/surplus/purchase(mob/user, datum/component/uplink/U)
- var/list/uplink_items = get_uplink_items(SSticker && SSticker.mode? SSticker.mode : null, FALSE)
-
- var/crate_value = starting_crate_value
- var/obj/structure/closet/crate/C = spawn_item(/obj/structure/closet/crate, user, U)
- if(U.purchase_log)
- U.purchase_log.LogPurchase(C, src, cost)
- while(crate_value)
- var/category = pick(uplink_items)
- var/item = pick(uplink_items[category])
- var/datum/uplink_item/I = uplink_items[category][item]
-
- if(!I.surplus || prob(100 - I.surplus))
- continue
- if(crate_value < I.cost)
- continue
- crate_value -= I.cost
- var/obj/goods = new I.item(C)
- if(U.purchase_log)
- U.purchase_log.LogPurchase(goods, I, 0)
- return C
-
-/datum/uplink_item/bundles_TC/random
- name = "Random Item"
- desc = "Picking this will purchase a random item. Useful if you have some TC to spare or if you haven't decided on a strategy yet."
- item = /obj/effect/gibspawner/generic // non-tangible item because techwebs use this path to determine illegal tech
- cost = 0
- cant_discount = TRUE
-
-/datum/uplink_item/bundles_TC/random/purchase(mob/user, datum/component/uplink/U)
- var/list/uplink_items = U.uplink_items
- var/list/possible_items = list()
- for(var/category in uplink_items)
- for(var/item in uplink_items[category])
- var/datum/uplink_item/I = uplink_items[category][item]
- if(src == I || !I.item)
- continue
- if(U.telecrystals < I.cost)
- continue
- if(I.limited_stock == 0)
- continue
- possible_items += I
-
- if(possible_items.len)
- var/datum/uplink_item/I = pick(possible_items)
- SSblackbox.record_feedback("tally", "traitor_random_uplink_items_gotten", 1, initial(I.name))
- U.MakePurchase(user, I)
-
-/datum/uplink_item/bundles_TC/telecrystal
- name = "1 Raw Telecrystal"
- desc = "A telecrystal in its rawest and purest form; can be utilized on active uplinks to increase their telecrystal count."
- item = /obj/item/stack/telecrystal
- cost = 1
- surplus = 0
- cant_discount = TRUE
- // Don't add telecrystals to the purchase_log since
- // it's just used to buy more items (including itself!)
- purchase_log_vis = FALSE
-
-/datum/uplink_item/bundles_TC/telecrystal/five
- name = "5 Raw Telecrystals"
- desc = "Five telecrystals in their rawest and purest form; can be utilized on active uplinks to increase their telecrystal count."
- item = /obj/item/stack/telecrystal/five
- cost = 5
-
-/datum/uplink_item/bundles_TC/telecrystal/twenty
- name = "20 Raw Telecrystals"
- desc = "Twenty telecrystals in their rawest and purest form; can be utilized on active uplinks to increase their telecrystal count."
- item = /obj/item/stack/telecrystal/twenty
- cost = 20
-
-// Dangerous Items
-
-/datum/uplink_item/dangerous/pistol
- name = "Stechkin Pistol"
- desc = "A small, easily concealable handgun that uses 10mm auto rounds in 8-round magazines and is compatible \
- with suppressors."
- item = /obj/item/gun/ballistic/automatic/pistol
- cost = 7
- exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/dangerous/revolver
- name = "Syndicate Revolver Kit"
- desc = "A sleek box containing a brutally simple Syndicate revolver that fires .357 Magnum rounds and has 7 chambers, and an extra speedloader."
- item = /obj/item/storage/box/syndie_kit/revolver
- cost = 13
- surplus = 50
- exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/dangerous/rawketlawnchair
- name = "84mm Rocket Propelled Grenade Launcher"
- desc = "A reusable rocket propelled grenade launcher preloaded with a low-yield 84mm HE round. \
- Guaranteed to send your target out with a bang or your money back!"
- item = /obj/item/gun/ballistic/rocketlauncher
- cost = 8
- surplus = 30
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/dangerous/antitank
- name = "Anti Tank Pistol"
- desc = "Essentially amounting to a sniper rifle with no stock and barrel (or indeed, any rifling at all), \
- this extremely dubious pistol is guaranteed to dislocate your wrists and hit the broad side of a barn! \
- Uses sniper ammo. \
- Bullets tend to veer off-course. We are not responsible for any unintentional damage or injury resulting from inaacuracy."
- item = /obj/item/gun/ballistic/automatic/pistol/antitank/syndicate
- cost = 14
- surplus = 25
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/dangerous/pie_cannon
- name = "Banana Cream Pie Cannon"
- desc = "A special pie cannon for a special clown, this gadget can hold up to 20 pies and automatically fabricates one every two seconds!"
- cost = 10
- item = /obj/item/pneumatic_cannon/pie/selfcharge
- surplus = 0
- include_modes = list(/datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/dangerous/bananashield
- name = "Bananium Energy Shield"
- desc = "A clown's most powerful defensive weapon, this personal shield provides near immunity to ranged energy attacks \
- by bouncing them back at the ones who fired them. It can also be thrown to bounce off of people, slipping them, \
- and returning to you even if you miss. WARNING: DO NOT ATTEMPT TO STAND ON SHIELD WHILE DEPLOYED, EVEN IF WEARING ANTI-SLIP SHOES."
- item = /obj/item/shield/energy/bananium
- cost = 16
- surplus = 0
- include_modes = list(/datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/dangerous/clownsword
- name = "Bananium Energy Sword"
- desc = "An energy sword that deals no damage, but will slip anyone it contacts, be it by melee attack, thrown \
- impact, or just stepping on it. Beware friendly fire, as even anti-slip shoes will not protect against it."
- item = /obj/item/melee/transforming/energy/sword/bananium
- cost = 3
- surplus = 0
- include_modes = list(/datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/dangerous/bioterror
- name = "Biohazardous Chemical Sprayer"
- desc = "A handheld chemical sprayer that allows a wide dispersal of selected chemicals. Especially tailored by the Tiger \
- Cooperative, the deadly blend it comes stocked with will disorient, damage, and disable your foes... \
- Use with extreme caution, to prevent exposure to yourself and your fellow operatives."
- item = /obj/item/reagent_containers/spray/chemsprayer/bioterror
- cost = 20
- surplus = 0
- include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/dangerous/throwingweapons
- name = "Box of Throwing Weapons"
- desc = "A box of shurikens and reinforced bolas from ancient Earth martial arts. They are highly effective \
- throwing weapons. The bolas can knock a target down and the shurikens will embed into limbs."
- item = /obj/item/storage/box/syndie_kit/throwing_weapons
- cost = 3
-
-/datum/uplink_item/dangerous/shotgun
- name = "Bulldog Shotgun"
- desc = "A fully-loaded semi-automatic drum-fed shotgun. Compatible with all 12g rounds. Designed for close \
- quarter anti-personnel engagements."
- item = /obj/item/gun/ballistic/automatic/shotgun/bulldog
- cost = 8
- surplus = 40
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/dangerous/smg
- name = "C-20r Submachine Gun"
- desc = "A fully-loaded Scarborough Arms bullpup submachine gun. The C-20r fires .45 rounds with a \
- 24-round magazine and is compatible with suppressors."
- item = /obj/item/gun/ballistic/automatic/c20r
- cost = 10
- surplus = 40
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/dangerous/doublesword
- name = "Double-Bladed Energy Sword"
- desc = "The double-bladed energy sword does slightly more damage than a standard energy sword and will deflect \
- all energy projectiles, but requires two hands to wield."
- item = /obj/item/twohanded/dualsaber
- player_minimum = 25
- cost = 16
- exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/dangerous/doublesword/get_discount()
- return pick(4;0.8,2;0.65,1;0.5)
-
-/datum/uplink_item/dangerous/cxneb
- name = "Dragon's Tooth Non-Eutactic Blade"
- desc = "An illegal modification of a weapon that is functionally identical to the energy sword, \
- the Non-Eutactic Blade (NEB) forges a hardlight blade on-demand, \
- generating an extremely sharp, unbreakable edge that is guaranteed to satisfy your every need. \
- This particular model has a polychromic hardlight generator, allowing you to murder in style! \
- The illegal modifications bring this weapon up to par with the classic energy sword, and also gives it the energy sword's distinctive sounds."
- item = /obj/item/melee/transforming/energy/sword/cx/traitor
- cost = 8
-
-/datum/uplink_item/dangerous/sword
- name = "Energy Sword"
- desc = "The energy sword is an edged weapon with a blade of pure energy. The sword is small enough to be \
- pocketed when inactive. Activating it produces a loud, distinctive noise."
- item = /obj/item/melee/transforming/energy/sword/saber
- cost = 8
- exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/dangerous/shield
- name = "Energy Shield"
- desc = "An incredibly useful personal shield projector, capable of reflecting energy projectiles and defending \
- against other attacks. Pair with an Energy Sword for a killer combination."
- item = /obj/item/shield/energy
- cost = 16
- surplus = 20
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/dangerous/rapier
- name = "Rapier"
- desc = "A fancy rapier with a diamond tip piercing anything that it comes into contack with. \
- The rapier comes with its own sheath, this is rather noticeable as only the captain is known to carry a sheath. \
- The sheath itself can be used to block melee attacks only. Its also jet black colours."
- item = /obj/item/storage/belt/sabre/rapier
- cost = 8
- exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/dangerous/flamethrower
- name = "Flamethrower"
- desc = "A flamethrower, fueled by a portion of highly flammable biotoxins stolen previously from Nanotrasen \
- stations. Make a statement by roasting the filth in their own greed. Use with caution."
- item = /obj/item/flamethrower/full/tank
- cost = 4
- surplus = 40
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/dangerous/flechettegun
- name = "Flechette Launcher"
- desc = "A compact bullpup that fires micro-flechettes.\
- Flechettes have very poor performance idividually, but can be very deadly in numbers. \
- Pre-loaded with armor piercing flechettes that are capable of puncturing most kinds of armor."
- item = /obj/item/gun/ballistic/automatic/flechette
- cost = 12
- surplus = 30
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/dangerous/rapid
- name = "Gloves of the North Star"
- desc = "These gloves let the user punch people very fast. Does not improve weapon attack speed or the meaty fists of a hulk."
- item = /obj/item/clothing/gloves/rapid
- cost = 8
-
-/datum/uplink_item/dangerous/guardian
- name = "Holoparasites"
- desc = "Though capable of near sorcerous feats via use of hardlight holograms and nanomachines, they require an \
- organic host as a home base and source of fuel. Holoparasites come in various types and share damage with their host."
- item = /obj/item/storage/box/syndie_kit/guardian
- cost = 15
- refundable = TRUE
- cant_discount = TRUE
- surplus = 0
- exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
- player_minimum = 25
- restricted = TRUE
- refund_path = /obj/item/guardiancreator/tech/choose/traitor
-
-/datum/uplink_item/dangerous/machinegun
- name = "L6 Squad Automatic Weapon"
- desc = "A fully-loaded Aussec Armoury belt-fed machine gun. \
- This deadly weapon has a massive 50-round magazine of devastating 1.95x129mm ammunition."
- item = /obj/item/gun/ballistic/automatic/l6_saw
- cost = 18
- surplus = 0
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/dangerous/carbine
- name = "M-90gl Carbine"
- desc = "A fully-loaded, specialized three-round burst carbine that fires 5.56mm ammunition from a 30 round magazine \
- with a toggleable 40mm underbarrel grenade launcher."
- item = /obj/item/gun/ballistic/automatic/m90
- cost = 18
- surplus = 50
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/dangerous/powerfist
- name = "Power Fist"
- desc = "The power-fist is a metal gauntlet with a built-in piston-ram powered by an external gas supply.\
- Upon hitting a target, the piston-ram will extend forward to make contact for some serious damage. \
- Using a wrench on the piston valve will allow you to tweak the amount of gas used per punch to \
- deal extra damage and hit targets further. Use a screwdriver to take out any attached tanks."
- item = /obj/item/melee/powerfist
- cost = 8
-
-/datum/uplink_item/dangerous/sniper
- name = "Sniper Rifle"
- desc = "Ranged fury, Syndicate style. Guaranteed to cause shock and awe or your TC back!"
- item = /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate
- cost = 16
- surplus = 25
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/dangerous/bolt_action
- name = "Surplus Rifle"
- desc = "A horribly outdated bolt action weapon. You've got to be desperate to use this."
- item = /obj/item/gun/ballistic/shotgun/boltaction
- cost = 2
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/dangerous/foamsmg
- name = "Toy Submachine Gun"
- desc = "A fully-loaded Donksoft bullpup submachine gun that fires riot grade darts with a 20-round magazine."
- item = /obj/item/gun/ballistic/automatic/c20r/toy
- cost = 5
- surplus = 0
- include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/dangerous/foammachinegun
- name = "Toy Machine Gun"
- desc = "A fully-loaded Donksoft belt-fed machine gun. This weapon has a massive 50-round magazine of devastating \
- riot grade darts, that can briefly incapacitate someone in just one volley."
- item = /obj/item/gun/ballistic/automatic/l6_saw/toy
- cost = 10
- surplus = 0
- include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/dangerous/foampistol
- name = "Toy Pistol with Riot Darts"
- desc = "An innocent-looking toy pistol designed to fire foam darts. Comes loaded with riot-grade \
- darts effective at incapacitating a target."
- item = /obj/item/gun/ballistic/automatic/toy/pistol/riot
- cost = 3
- surplus = 10
-
-// Stealthy Weapons
-
-/datum/uplink_item/stealthy_weapons/combatglovesplus
- name = "Combat Gloves Plus"
- desc = "A pair of gloves that are fireproof and shock resistant, however unlike the regular Combat Gloves this one uses nanotechnology \
- to learn the abilities of krav maga to the wearer."
- item = /obj/item/clothing/gloves/krav_maga/combatglovesplus
- cost = 5
- include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
- surplus = 0
-
-/datum/uplink_item/stealthy_weapons/cqc
- name = "CQC Manual"
- desc = "A manual that teaches a single user tactical Close-Quarters Combat before self-destructing."
- item = /obj/item/book/granter/martial/cqc
- include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
- cost = 13
- surplus = 0
-
-/datum/uplink_item/stealthy_weapons/dart_pistol
- name = "Dart Pistol"
- desc = "A miniaturized version of a normal syringe gun. It is very quiet when fired and can fit into any \
- space a small item can."
- item = /obj/item/gun/syringe/syndicate
- cost = 4
- surplus = 50
-
-/datum/uplink_item/stealthy_weapons/dehy_carp
- name = "Dehydrated Space Carp"
- desc = "Looks like a plush toy carp, but just add water and it becomes a real-life space carp! Activate in \
- your hand before use so it knows not to kill you."
- item = /obj/item/toy/plush/carpplushie/dehy_carp
- cost = 1
-
-/datum/uplink_item/stealthy_weapons/edagger
- name = "Energy Dagger"
- desc = "A dagger made of energy that looks and functions as a pen when off."
- item = /obj/item/pen/edagger
- cost = 2
-
-/datum/uplink_item/stealthy_weapons/martialarts
- name = "Sleeping Carp Scroll"
- desc = "This scroll contains the secrets of an ancient martial arts technique. You will master unarmed combat, \
- deflecting all ranged weapon fire, but you also refuse to use dishonorable ranged weaponry."
- item = /obj/item/book/granter/martial/carp
- cost = 17
- surplus = 0
- exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/stealthy_weapons/martialartstwo
- name = "Rising Bass Scroll"
- desc = "This scroll contains the secrets of an ancient martial arts technique. You will become proficient in fleeing situations, \
- and dodging all ranged weapon fire, but you will refuse to use dishonorable ranged weaponry."
- item = /obj/item/book/granter/martial/bass
- cost = 18
- surplus = 0
- exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/stealthy_weapons/crossbow
- name = "Miniature Energy Crossbow"
- desc = "A short bow mounted across a tiller in miniature. Small enough to \
- fit into a pocket or slip into a bag unnoticed. It will synthesize \
- and fire bolts tipped with a paralyzing toxin that will briefly stun \
- targets and cause them to slur as if inebriated. It can produce an \
- infinite number of bolts, but takes time to automatically recharge \
- after each shot."
- item = /obj/item/gun/energy/kinetic_accelerator/crossbow
- cost = 12
- surplus = 50
- exclude_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/stealthy_weapons/traitor_chem_bottle
- name = "Poison Kit"
- desc = "An assortment of deadly chemicals packed into a compact box. Comes with a syringe for more precise application."
- item = /obj/item/storage/box/syndie_kit/chemical
- cost = 6
- surplus = 50
-
-/datum/uplink_item/stealthy_weapons/romerol_kit
- name = "Romerol"
- desc = "A highly experimental bioterror agent which creates dormant nodules to be etched into the grey matter of the brain. \
- On death, these nodules take control of the dead body, causing limited revivification, \
- along with slurred speech, aggression, and the ability to infect others with this agent."
- item = /obj/item/storage/box/syndie_kit/romerol
- cost = 25
- cant_discount = TRUE
- exclude_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/stealthy_weapons/sleepy_pen
- name = "Sleepy Pen"
- desc = "A syringe disguised as a functional pen, filled with a potent mix of drugs, including a \
- strong anesthetic and a chemical that prevents the target from speaking. \
- The pen holds one dose of the mixture, and can be refilled with any chemicals. Note that before the target \
- falls asleep, they will be able to move and act."
- item = /obj/item/pen/sleepy
- cost = 4
- exclude_modes = list(/datum/game_mode/nuclear)
-
-datum/uplink_item/stealthy_weapons/taeclowndo_shoes
- name = "Tae-clown-do Shoes"
- desc = "A pair of shoes for the most elite agents of the honkmotherland. They grant the mastery of taeclowndo with some honk-fu moves as long as they're worn."
- cost = 12
- item = /obj/item/clothing/shoes/clown_shoes/taeclowndo
- include_modes = list(/datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/stealthy_weapons/suppressor
- name = "Suppressor"
- desc = "This suppressor will silence the shots of the weapon it is attached to for increased stealth and superior ambushing capability. \
- It is compatible with many small ballistic guns including the Stechkin and C-20r, but not revolvers or energy guns."
- item = /obj/item/suppressor
- cost = 1
- surplus = 10
- exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/stealthy_weapons/soap
- name = "Syndicate Soap"
- desc = "A sinister-looking surfactant used to clean blood stains to hide murders and prevent DNA analysis. \
- You can also drop it underfoot to slip people."
- item = /obj/item/soap/syndie
- cost = 1
- surplus = 50
-
-/datum/uplink_item/stealthy_weapons/soap_clusterbang
- name = "Slipocalypse Clusterbang"
- desc = "A traditional clusterbang grenade with a payload consisting entirely of Syndicate soap. Useful in any scenario!"
- item = /obj/item/grenade/clusterbuster/soap
- cost = 6
-
-// Ammunition
-
-/datum/uplink_item/ammo/pistol
- name = "10mm Handgun Magazine"
- desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. These rounds \
- are dirt cheap but are half as effective as .357 rounds."
- item = /obj/item/ammo_box/magazine/m10mm
- cost = 1
- exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/ammo/pistolap
- name = "10mm Armour Piercing Magazine"
- desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. \
- These rounds are less effective at injuring the target but penetrate protective gear."
- item = /obj/item/ammo_box/magazine/m10mm/ap
- cost = 2
- exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/ammo/pistolhp
- name = "10mm Hollow Point Magazine"
- desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. \
- These rounds are more damaging but ineffective against armour."
- item = /obj/item/ammo_box/magazine/m10mm/hp
- cost = 3
- exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/ammo/pistolfire
- name = "10mm Incendiary Magazine"
- desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. \
- Loaded with incendiary rounds which inflict little damage, but ignite the target."
- item = /obj/item/ammo_box/magazine/m10mm/fire
- cost = 2
- exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/ammo/pistolzzz
- name = "10mm Soporific Magazine"
- desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. Loaded with soporific rounds that put the target to sleep. \
- NOTE: Soporific is not instant acting due to the constraints of the round's scale. Will usually require three shots to take effect."
- item = /obj/item/ammo_box/magazine/m10mm/soporific
- cost = 2
-
-/datum/uplink_item/ammo/shotgun
- cost = 2
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/ammo/shotgun/bag
- name = "12g Ammo Duffel Bag"
- desc = "A duffel bag filled with enough 12g ammo to supply an entire team, at a discounted price."
- item = /obj/item/storage/backpack/duffelbag/syndie/ammo/shotgun
- cost = 12
-
-/datum/uplink_item/ammo/shotgun/buck
- name = "12g Buckshot Drum"
- desc = "An additional 8-round buckshot magazine for use with the Bulldog shotgun. Front towards enemy."
- item = /obj/item/ammo_box/magazine/m12g
-
-/datum/uplink_item/ammo/shotgun/dragon
- name = "12g Dragon's Breath Drum"
- desc = "An alternative 8-round dragon's breath magazine for use in the Bulldog shotgun. \
- 'I'm a fire starter, twisted fire starter!'"
- item = /obj/item/ammo_box/magazine/m12g/dragon
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/ammo/shotgun/meteor
- name = "12g Meteorslug Shells"
- desc = "An alternative 8-round meteorslug magazine for use in the Bulldog shotgun. \
- Great for blasting airlocks off their frames and knocking down enemies."
- item = /obj/item/ammo_box/magazine/m12g/meteor
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/ammo/shotgun/scatter
- name = "12g Scatter Laser shot Slugs"
- desc = "An alternative 8-round Scatter Laser Shot magazine for use in the Bulldog shotgun."
- item = /obj/item/ammo_box/magazine/m12g/scatter
- cost = 4 // most armor has less laser protection then bullet
-
-/datum/uplink_item/ammo/shotgun/slug
- name = "12g Slug Drum"
- desc = "An additional 8-round slug magazine for use with the Bulldog shotgun. \
- Now 8 times less likely to shoot your pals."
- cost = 3
- item = /obj/item/ammo_box/magazine/m12g/slug
-
-/datum/uplink_item/ammo/shotgun/stun
- name = "12g Stun Slug Drum"
- desc = "An alternative 8-round stun slug magazine for use with the Bulldog shotgun. \
- Saying that they're completely non-lethal would be lying."
- item = /obj/item/ammo_box/magazine/m12g/stun
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/ammo/revolver
- name = ".357 Speed Loader"
- desc = "A speed loader that contains seven additional .357 Magnum rounds, and can be further reloaded with individual bullets; usable with the Syndicate revolver. \
- For when you really need a lot of things dead."
- item = /obj/item/ammo_box/a357
- cost = 3
- exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/ammo/revolver/ap
- name = ".357 Armor Piercing Speed Loader"
- desc = "A speed loader that contains seven additional .357 AP Magnum rounds; usable with the Syndicate revolver. \
- Cuts through like a hot knife through butter."
- item = /obj/item/ammo_box/a357/ap
-
-/datum/uplink_item/ammo/a40mm
- name = "40mm Grenade"
- desc = "A 40mm HE grenade for use with the M-90gl's under-barrel grenade launcher. \
- Your teammates will ask you to not shoot these down small hallways."
- item = /obj/item/ammo_casing/a40mm
- cost = 2
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/ammo/smg/bag
- name = ".45 Ammo Duffel Bag"
- desc = "A duffel bag filled with enough .45 ammo to supply an entire team, at a discounted price."
- item = /obj/item/storage/backpack/duffelbag/syndie/ammo/smg
- cost = 20 //instead of 27 TC
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/ammo/smg
- name = ".45 SMG Magazine"
- desc = "An additional 24-round .45 magazine suitable for use with the C-20r submachine gun."
- item = /obj/item/ammo_box/magazine/smgm45
- cost = 3
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/ammo/sniper
- cost = 4
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/ammo/sniper/basic
- name = ".50 Magazine"
- desc = "An additional standard 6-round magazine for use with .50 sniper rifles."
- item = /obj/item/ammo_box/magazine/sniper_rounds
-
-/datum/uplink_item/ammo/sniper/penetrator
- name = ".50 Penetrator Magazine"
- desc = "A 5-round magazine of penetrator ammo designed for use with .50 sniper rifles. \
- Can pierce walls and multiple enemies."
- item = /obj/item/ammo_box/magazine/sniper_rounds/penetrator
- cost = 5
-
-/datum/uplink_item/ammo/sniper/soporific
- name = ".50 Soporific Magazine"
- desc = "A 3-round magazine of soporific ammo designed for use with .50 sniper rifles. Put your enemies to sleep today!"
- item = /obj/item/ammo_box/magazine/sniper_rounds/soporific
- cost = 6
-
-/datum/uplink_item/ammo/carbine
- name = "5.56mm Toploader Magazine"
- desc = "An additional 30-round 5.56mm magazine; suitable for use with the M-90gl carbine. \
- These bullets pack less punch than 7.12x82mm rounds, but they still offer more power than .45 ammo."
- item = /obj/item/ammo_box/magazine/m556
- cost = 4
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/ammo/machinegun
- cost = 6
- surplus = 0
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/ammo/machinegun/basic
- name = "1.95x129mm Box Magazine"
- desc = "A 50-round magazine of 1.95x129mm ammunition for use with the L6 SAW. \
- By the time you need to use this, you'll already be standing on a pile of corpses"
- item = /obj/item/ammo_box/magazine/mm195x129
-
-/datum/uplink_item/ammo/machinegun/ap
- name = "1.95x129mm (Armor Penetrating) Box Magazine"
- desc = "A 50-round magazine of 1.95x129mm ammunition for use in the L6 SAW; equipped with special properties \
- to puncture even the most durable armor."
- item = /obj/item/ammo_box/magazine/mm195x129/ap
- cost = 9
-
-/datum/uplink_item/ammo/machinegun/hollow
- name = "1.95x129mm (Hollow-Point) Box Magazine"
- desc = "A 50-round magazine of 1.95x129mm ammunition for use in the L6 SAW; equipped with hollow-point tips to help \
- with the unarmored masses of crew."
- item = /obj/item/ammo_box/magazine/mm195x129/hollow
-
-/datum/uplink_item/ammo/machinegun/incen
- name = "1.95x129mm (Incendiary) Box Magazine"
- desc = "A 50-round magazine of 1.95x129mm ammunition for use in the L6 SAW; tipped with a special flammable \
- mixture that'll ignite anyone struck by the bullet. Some men just want to watch the world burn."
- item = /obj/item/ammo_box/magazine/mm195x129/incen
-
-/datum/uplink_item/ammo/rocket
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/ammo/rocket/basic
- name = "84mm HE Rocket"
- desc = "A low-yield anti-personnel HE rocket. Gonna take you out in style!"
- item = /obj/item/ammo_casing/caseless/rocket
- cost = 4
-
-/datum/uplink_item/ammo/rocket/hedp
- name = "84mm HEDP Rocket"
- desc = "A high-yield HEDP rocket; extremely effective against armored targets, as well as surrounding personnel. \
- Strike fear into the hearts of your enemies."
- item = /obj/item/ammo_casing/caseless/rocket/hedp
- cost = 6
-
-/datum/uplink_item/ammo/pistolaps
- name = "9mm Handgun Magazine"
- desc = "An additional 15-round 9mm magazine, compatible with the Stechkin APS pistol, found in the Spetsnaz Pyro bundle."
- item = /obj/item/ammo_box/magazine/pistolm9mm
- cost = 2
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/ammo/flechetteap
- name = "Armor Piercing Flechette Magazine"
- desc = "An additional 40-round flechette magazine; compatible with the Flechette Launcer. \
- Loaded with armor piercing flechettes that very nearly ignore armor, but are not very effective agaisnt flesh."
- item = /obj/item/ammo_box/magazine/flechette
- cost = 2
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/ammo/flechettes
- name = "Serrated Flechette Magazine"
- desc = "An additional 40-round flechette magazine; compatible with the Flechette Launcer. \
- Loaded with serrated flechettes that shreds flesh, but is stopped dead in its tracks by armor. \
- These flechettes are highly likely to sever arteries, and even limbs."
- item = /obj/item/ammo_box/magazine/flechette/s
- cost = 2
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/ammo/toydarts
- name = "Box of Riot Darts"
- desc = "A box of 40 Donksoft riot darts, for reloading any compatible foam dart magazine. Don't forget to share!"
- item = /obj/item/ammo_box/foambox/riot
- cost = 2
- surplus = 0
- illegal_tech = FALSE
-
-/datum/uplink_item/ammo/bioterror
- name = "Box of Bioterror Syringes"
- desc = "A box full of preloaded syringes, containing various chemicals that seize up the victim's motor \
- and broca systems, making it impossible for them to move or speak for some time."
- item = /obj/item/storage/box/syndie_kit/bioterror
- cost = 6
- include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/ammo/bolt_action
- name = "Surplus Rifle Clip"
- desc = "A stripper clip used to quickly load bolt action rifles. Contains 5 rounds."
- item = /obj/item/ammo_box/a762
- cost = 1
- include_modes = list(/datum/game_mode/nuclear)
-
-//Grenades and Explosives
-
-/datum/uplink_item/explosives/bioterrorfoam
- name = "Bioterror Foam Grenade"
- desc = "A powerful chemical foam grenade which creates a deadly torrent of foam that will mute, blind, confuse, \
- mutate, and irritate carbon lifeforms. Specially brewed by Tiger Cooperative chemical weapons specialists \
- using additional spore toxin. Ensure suit is sealed before use."
- item = /obj/item/grenade/chem_grenade/bioterrorfoam
- cost = 5
- surplus = 35
- include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/explosives/bombanana
- name = "Bombanana"
- desc = "A banana with an explosive taste! discard the peel quickly, as it will explode with the force of a syndicate minibomb \
- a few seconds after the banana is eaten."
- item = /obj/item/reagent_containers/food/snacks/grown/banana/bombanana
- cost = 4 //it is a bit cheaper than a minibomb because you have to take off your helmet to eat it, which is how you arm it
- surplus = 0
- include_modes = list(/datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/explosives/buzzkill
- name = "Buzzkill Grenade Box"
- desc = "A box with three grenades that release a swarm of angry bees upon activation. These bees indiscriminately attack friend or foe \
- with random toxins. Courtesy of the BLF and Tiger Cooperative."
- item = /obj/item/storage/box/syndie_kit/bee_grenades
- cost = 15
- surplus = 35
- include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/explosives/c4
- name = "Composition C-4"
- desc = "C-4 is plastic explosive of the common variety Composition C. You can use it to breach walls, sabotage equipment, or connect \
- an assembly to it in order to alter the way it detonates. It can be attached to almost all objects and has a modifiable timer with a \
- minimum setting of 10 seconds."
- item = /obj/item/grenade/plastic/c4
- cost = 1
-
-/datum/uplink_item/explosives/c4bag
- name = "Bag of C-4 explosives"
- desc = "Because sometimes quantity is quality. Contains 10 C-4 plastic explosives."
- item = /obj/item/storage/backpack/duffelbag/syndie/c4
- cost = 9 //10% discount!
- cant_discount = TRUE
-
-/datum/uplink_item/explosives/x4bag
- name = "Bag of X-4 explosives"
- desc = "Contains 3 X-4 shaped plastic explosives. Similar to C4, but with a stronger blast that is directional instead of circular. \
- X-4 can be placed on a solid surface, such as a wall or window, and it will blast through the wall, injuring anything on the opposite side, while being safer to the user. \
- For when you want a controlled explosion that leaves a wider, deeper, hole."
- item = /obj/item/storage/backpack/duffelbag/syndie/x4
- cost = 4 //
- cant_discount = TRUE
-
-/datum/uplink_item/explosives/clown_bomb_clownops
- name = "Clown Bomb"
- desc = "The Clown bomb is a hilarious device capable of massive pranks. It has an adjustable timer, \
- with a minimum of 60 seconds, and can be bolted to the floor with a wrench to prevent \
- movement. The bomb is bulky and cannot be moved; upon ordering this item, a smaller beacon will be \
- transported to you that will teleport the actual bomb to it upon activation. Note that this bomb can \
- be defused, and some crew may attempt to do so."
- item = /obj/item/sbeacondrop/clownbomb
- cost = 15
- surplus = 0
- include_modes = list(/datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/explosives/detomatix
- name = "Detomatix PDA Cartridge"
- desc = "When inserted into a personal digital assistant, this cartridge gives you four opportunities to \
- detonate PDAs of crewmembers who have their message feature enabled. \
- The concussive effect from the explosion will knock the recipient out for a short period, and deafen them for longer."
- item = /obj/item/cartridge/virus/syndicate
- cost = 5
- restricted = TRUE
-
-/datum/uplink_item/explosives/emp
- name = "EMP Grenades and Implanter Kit"
- desc = "A box that contains five EMP grenades and an EMP implant with three uses. Useful to disrupt communications, \
- security's energy weapons and silicon lifeforms when you're in a tight spot."
- item = /obj/item/storage/box/syndie_kit/emp
- cost = 2
-
-/datum/uplink_item/explosives/virus_grenade
- name = "Fungal Tuberculosis Grenade"
- desc = "A primed bio-grenade packed into a compact box. Comes with five Bio Virus Antidote Kit (BVAK) \
- autoinjectors for rapid application on up to two targets each, a syringe, and a bottle containing \
- the BVAK solution."
- item = /obj/item/storage/box/syndie_kit/tuberculosisgrenade
- cost = 8
- surplus = 35
- include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
- restricted = TRUE
-
-/datum/uplink_item/explosives/grenadier
- name = "Grenadier's belt"
- desc = "A belt containing 26 lethally dangerous and destructive grenades. Comes with an extra multitool and screwdriver."
- item = /obj/item/storage/belt/grenade/full
- include_modes = list(/datum/game_mode/nuclear)
- cost = 22
- surplus = 0
-
-/datum/uplink_item/explosives/pizza_bomb
- name = "Pizza Bomb"
- desc = "A pizza box with a bomb cunningly attached to the lid. The timer needs to be set by opening the box; afterwards, \
- opening the box again will trigger the detonation after the timer has elapsed. Comes with free pizza, for you or your target!"
- item = /obj/item/pizzabox/bomb
- cost = 6
- surplus = 8
-
-/datum/uplink_item/explosives/syndicate_bomb
- name = "Syndicate Bomb"
- desc = "The Syndicate bomb is a fearsome device capable of massive destruction. It has an adjustable timer, \
- with a minimum of 60 seconds, and can be bolted to the floor with a wrench to prevent \
- movement. The bomb is bulky and cannot be moved; upon ordering this item, a smaller beacon will be \
- transported to you that will teleport the actual bomb to it upon activation. Note that this bomb can \
- be defused, and some crew may attempt to do so."
- item = /obj/item/sbeacondrop/bomb
- cost = 11
-
-/datum/uplink_item/explosives/syndicate_detonator
- name = "Syndicate Detonator"
- desc = "The Syndicate detonator is a companion device to the Syndicate bomb. Simply press the included button \
- and an encrypted radio frequency will instruct all live Syndicate bombs to detonate. \
- Useful for when speed matters or you wish to synchronize multiple bomb blasts. Be sure to stand clear of \
- the blast radius before using the detonator."
- item = /obj/item/syndicatedetonator
- cost = 3
- include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/explosives/syndicate_minibomb
- name = "Syndicate Minibomb"
- desc = "The minibomb is a grenade with a five-second fuse. Upon detonation, it will create a small hull breach \
- in addition to dealing high amounts of damage to nearby personnel."
- item = /obj/item/grenade/syndieminibomb
- cost = 6
- exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/explosives/tearstache
- name = "Teachstache Grenade"
- desc = "A teargas grenade that launches sticky moustaches onto the face of anyone not wearing a clown or mime mask. The moustaches will \
- remain attached to the face of all targets for one minute, preventing the use of breath masks and other such devices."
- item = /obj/item/grenade/chem_grenade/teargas/moustache
- cost = 3
- surplus = 0
- include_modes = list(/datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/explosives/viscerators
- name = "Viscerator Delivery Grenade"
- desc = "A unique grenade that deploys a swarm of viscerators upon activation, which will chase down and shred \
- any non-operatives in the area."
- item = /obj/item/grenade/spawnergrenade/manhacks
- cost = 5
- surplus = 35
- include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
-
-
-//Support and Mechs
-
-/datum/uplink_item/support/clown_reinforcement
- name = "Clown Reinforcements"
- desc = "Call in an additional clown to share the fun, equipped with full starting gear, but no telecrystals."
- item = /obj/item/antag_spawner/nuke_ops/clown
- cost = 20
- include_modes = list(/datum/game_mode/nuclear/clown_ops)
- restricted = TRUE
-
-/datum/uplink_item/support/reinforcement
- name = "Reinforcements"
- desc = "Call in an additional team member. They won't come with any gear, so you'll have to save some telecrystals \
- to arm them as well."
- item = /obj/item/antag_spawner/nuke_ops
- cost = 25
- refundable = TRUE
- include_modes = list(/datum/game_mode/nuclear)
- restricted = TRUE
-
-/datum/uplink_item/support/reinforcement/assault_borg
- name = "Syndicate Assault Cyborg"
- desc = "A cyborg designed and programmed for systematic extermination of non-Syndicate personnel. \
- Comes equipped with a self-resupplying LMG, a grenade launcher, energy sword, emag, pinpointer, flash and crowbar."
- item = /obj/item/antag_spawner/nuke_ops/borg_tele/assault
- refundable = TRUE
- cost = 65
- restricted = TRUE
-
-/datum/uplink_item/support/reinforcement/medical_borg
- name = "Syndicate Medical Cyborg"
- desc = "A combat medical cyborg. Has limited offensive potential, but makes more than up for it with its support capabilities. \
- It comes equipped with a nanite hypospray, a medical beamgun, combat defibrillator, full surgical kit including an energy saw, an emag, pinpointer and flash. \
- Thanks to its organ storage bag, it can perform surgery as well as any humanoid."
- item = /obj/item/antag_spawner/nuke_ops/borg_tele/medical
- refundable = TRUE
- cost = 35
- restricted = TRUE
-
-/datum/uplink_item/support/reinforcement/saboteur_borg
- name = "Syndicate Saboteur Cyborg"
- desc = "A streamlined engineering cyborg, equipped with covert modules. Also incapable of leaving the welder in the shuttle. \
- Aside from regular Engineering equipment, it comes with a special destination tagger that lets it traverse disposals networks. \
- Its chameleon projector lets it disguise itself as a Nanotrasen cyborg, on top it has thermal vision and a pinpointer."
- item = /obj/item/antag_spawner/nuke_ops/borg_tele/saboteur
- refundable = TRUE
- cost = 35
- restricted = TRUE
-
-/datum/uplink_item/support/gygax
- name = "Dark Gygax Exosuit"
- desc = "A lightweight exosuit, painted in a dark scheme. Its speed and equipment selection make it excellent \
- for hit-and-run style attacks. Features an incendiary carbine, flash bang launcher, teleporter, ion thrusters and a Tesla energy array."
- item = /obj/mecha/combat/gygax/dark/loaded
- cost = 80
-
-/datum/uplink_item/support/honker
- name = "Dark H.O.N.K."
- desc = "A clown combat mech equipped with bombanana peel and tearstache grenade launchers, as well as the ubiquitous HoNkER BlAsT 5000."
- item = /obj/mecha/combat/honker/dark/loaded
- cost = 80
- include_modes = list(/datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/support/mauler
- name = "Mauler Exosuit"
- desc = "A massive and incredibly deadly military-grade exosuit. Features long-range targeting, thrust vectoring \
- and deployable smoke. Comes equipped with an LMG, scattershot carbine, missile rack, an antiprojectile armor booster and a Tesla energy array."
- item = /obj/mecha/combat/marauder/mauler/loaded
- cost = 140
-
-// Stealth Items
-
-/datum/uplink_item/stealthy_tools/agent_card
- name = "Agent Identification Card"
- desc = "Agent cards prevent artificial intelligences from tracking the wearer, and can copy access \
- from other identification cards. The access is cumulative, so scanning one card does not erase the \
- access gained from another. In addition, they can be forged to display a new assignment and name. \
- This can be done an unlimited amount of times. Some Syndicate areas and devices can only be accessed \
- with these cards."
- item = /obj/item/card/id/syndicate
- cost = 2
-
-/datum/uplink_item/stealthy_tools/ai_detector
- name = "Artificial Intelligence Detector"
- desc = "A functional multitool that turns red when it detects an artificial intelligence watching it, and can be \
- activated to display their exact viewing location and nearby security camera blind spots. Knowing when \
- an artificial intelligence is watching you is useful for knowing when to maintain cover, and finding nearby \
- blind spots can help you identify escape routes."
- item = /obj/item/multitool/ai_detect
- cost = 1
-
-/datum/uplink_item/stealthy_tools/chameleon
- name = "Chameleon Kit"
- desc = "A set of items that contain chameleon technology allowing you to disguise as pretty much anything on the station, and more! \
- Due to budget cuts, the shoes don't provide protection against slipping."
- item = /obj/item/storage/box/syndie_kit/chameleon
- cost = 2
- exclude_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/stealthy_tools/chameleon_proj
- name = "Chameleon Projector"
- desc = "Projects an image across a user, disguising them as an object scanned with it, as long as they don't \
- move the projector from their hand. Disguised users move slowly, and projectiles pass over them."
- item = /obj/item/chameleon
- cost = 7
-
-/datum/uplink_item/stealthy_tools/codespeak_manual
- name = "Codespeak Manual"
- desc = "Syndicate agents can be trained to use a series of codewords to convey complex information, which sounds like random concepts and drinks to anyone listening. \
- This manual teaches you this Codespeak. You can also hit someone else with the manual in order to teach them. This is the deluxe edition, which has unlimited uses."
- item = /obj/item/codespeak_manual/unlimited
- cost = 3
-
-/datum/uplink_item/stealthy_tools/combatbananashoes
- name = "Combat Banana Shoes"
- desc = "While making the wearer immune to most slipping attacks like regular combat clown shoes, these shoes \
- can generate a large number of synthetic banana peels as the wearer walks, slipping up would-be pursuers. They also \
- squeak significantly louder."
- item = /obj/item/clothing/shoes/clown_shoes/banana_shoes/combat
- cost = 6
- surplus = 0
- include_modes = list(/datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/stealthy_tools/emplight
- name = "EMP Flashlight"
- desc = "A small, self-recharging, short-ranged EMP device disguised as a working flashlight. \
- Useful for disrupting headsets, cameras, doors, lockers and borgs during stealth operations. \
- Attacking a target with this flashlight will direct an EM pulse at it and consumes a charge."
- item = /obj/item/flashlight/emp
- cost = 2
- surplus = 30
-
-/datum/uplink_item/stealthy_tools/failsafe
- name = "Failsafe Uplink Code"
- desc = "When entered the uplink will self-destruct immidiately."
- item = /obj/effect/gibspawner/generic
- cost = 1
- surplus = 0
- restricted = TRUE
- exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/stealthy_tools/failsafe/spawn_item(spawn_path, mob/user, datum/component/uplink/U)
- if(!U)
- return
- U.failsafe_code = U.generate_code()
- to_chat(user, "The new failsafe code for this uplink is now : [U.failsafe_code].")
- if(user.mind)
- user.mind.store_memory("Failsafe code for [U.parent] : [U.failsafe_code]")
- return U.parent //For log icon
-
-/datum/uplink_item/stealthy_tools/mulligan
- name = "Mulligan"
- desc = "Screwed up and have security on your tail? This handy syringe will give you a completely new identity \
- and appearance."
- item = /obj/item/reagent_containers/syringe/mulligan
- cost = 3
- surplus = 30
- exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/stealthy_tools/syndigaloshes
- name = "No-Slip Chameleon Shoes"
- desc = "These shoes will allow the wearer to run on wet floors and slippery objects without falling down. \
- They do not work on heavily lubricated surfaces."
- item = /obj/item/clothing/shoes/chameleon/noslip
- cost = 2
- exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
- player_minimum = 20
-
-/datum/uplink_item/stealthy_tools/syndigaloshes/nuke
- item = /obj/item/clothing/shoes/chameleon/noslip
- cost = 4
- exclude_modes = list()
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/stealthy_tools/jammer
- name = "Radio Jammer"
- desc = "This device will disrupt any nearby outgoing radio communication when activated. Does not affect binary chat."
- item = /obj/item/jammer
- cost = 5
-
-/datum/uplink_item/stealthy_tools/smugglersatchel
- name = "Smuggler's Satchel"
- desc = "This satchel is thin enough to be hidden in the gap between plating and tiling; great for stashing \
- your stolen goods. Comes with a crowbar and a floor tile inside. Properly hidden satchels have been \
- known to survive intact even beyond the current shift. "
- item = /obj/item/storage/backpack/satchel/flat
- cost = 2
- surplus = 30
-
-//Space Suits and Hardsuits
-
-/datum/uplink_item/suits/turtlenck
- name = "Tactical Turtleneck"
- desc = "A slightly armored suit that has no sensor on them, if someone sees you in this hope they think its a fake."
- item = /obj/item/clothing/under/syndicate
- cost = 1
- exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) //They already get these
-
-/datum/uplink_item/suits/turtlenck_skirt
- name = "Tactical Skirtleneck"
- desc = "A slightly armored suit that has no sensor on them, if someone sees you in this hope they think its a fake."
- item = /obj/item/clothing/under/syndicate/skirt
- cost = 1
- exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) //They already get these
-
-/datum/uplink_item/suits/padding
- name = "Soft Padding"
- desc = "Padding to add to a jumpsuit to help against melee and bullets."
- item = /obj/item/clothing/accessory/padding
- cost = 2
- exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/suits/kevlar
- name = "Kevlar sheets"
- desc = "Kevlar sheets to add to jumpsuit to help against bullets and melee."
- item = /obj/item/clothing/accessory/kevlar
- cost = 2
- exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/suits/plastic
- name = "Plastic sheet"
- desc = "Plastic body sheet to add to a jumpsuit to help against laser and energy harm."
- item = /obj/item/clothing/accessory/plastics
- cost = 2
- exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/suits/space_suit
- name = "Syndicate Space Suit"
- desc = "This red and black Syndicate space suit is less encumbering than Nanotrasen variants, \
- fits inside bags, and has a weapon slot. Nanotrasen crew members are trained to report red space suit \
- sightings, however."
- item = /obj/item/storage/box/syndie_kit/space
- cost = 4
-
-/datum/uplink_item/suits/hardsuit
- name = "Syndicate Hardsuit"
- desc = "The feared suit of a Syndicate nuclear agent. Features slightly better armoring and a built in jetpack \
- that runs off standard atmospheric tanks. Toggling the suit in and out of \
- combat mode will allow you all the mobility of a loose fitting uniform without sacrificing armoring. \
- Additionally the suit is collapsible, making it small enough to fit within a backpack. \
- Nanotrasen crew who spot these suits are known to panic."
- item = /obj/item/clothing/suit/space/hardsuit/syndi
- cost = 8
- exclude_modes = list(/datum/game_mode/nuclear) //you can't buy it in nuke, because the elite hardsuit costs the same while being better
-
-/datum/uplink_item/suits/hardsuit/elite
- name = "Elite Syndicate Hardsuit"
- desc = "An upgraded, elite version of the Syndicate hardsuit. It features fireproofing, and also \
- provides the user with superior armor and mobility compared to the standard Syndicate hardsuit."
- item = /obj/item/clothing/suit/space/hardsuit/syndi/elite
- cost = 8
- include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
- exclude_modes = list()
-
-/datum/uplink_item/suits/hardsuit/shielded
- name = "Shielded Syndicate Hardsuit"
- desc = "An upgraded version of the standard Syndicate hardsuit. It features a built-in energy shielding system. \
- The shields can handle up to three impacts within a short duration and will rapidly recharge while not under fire."
- item = /obj/item/clothing/suit/space/hardsuit/shielded/syndi
- cost = 30
- include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
- exclude_modes = list()
-
-// Devices and Tools
-
-/datum/uplink_item/device_tools/emag
- name = "Cryptographic Sequencer"
- desc = "The cryptographic sequencer, electromagnetic card, or emag, is a small card that unlocks hidden functions \
- in electronic devices, subverts intended functions, and easily breaks security mechanisms."
- item = /obj/item/card/emag
- cost = 6
-
-/datum/uplink_item/device_tools/emagrecharge
- name = "Electromagnet Charging Device"
- desc = "A small device intended for recharging Cryptographic Sequencers. Using it will add five extra charges to the Cryptographic Sequencer."
- item = /obj/item/emagrecharge
- cost = 2
-
-/datum/uplink_item/device_tools/phantomthief
- name = "Syndicate Mask"
- desc = "A cheap plastic mask fitted with an adrenaline autoinjector, which can be used by simply tensing your muscles"
- item = /obj/item/clothing/glasses/phantomthief/syndicate
- cost = 2
-
-/datum/uplink_item/device_tools/cutouts
- name = "Adaptive Cardboard Cutouts"
- desc = "These cardboard cutouts are coated with a thin material that prevents discoloration and makes the images on them appear more lifelike. \
- This pack contains three as well as a crayon for changing their appearances."
- item = /obj/item/storage/box/syndie_kit/cutouts
- cost = 1
- surplus = 20
-
-/datum/uplink_item/device_tools/assault_pod
- name = "Assault Pod Targeting Device"
- desc = "Use this to select the landing zone of your assault pod."
- item = /obj/item/assault_pod
- cost = 30
- surplus = 0
- include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
- restricted = TRUE
-
-/datum/uplink_item/device_tools/binary
- name = "Binary Translator Key"
- desc = "A key that, when inserted into a radio headset, allows you to listen to and talk with silicon-based lifeforms, \
- such as AI units and cyborgs, over their private binary channel. Caution should \
- be taken while doing this, as unless they are allied with you, they are programmed to report such intrusions."
- item = /obj/item/encryptionkey/binary
- cost = 2
- surplus = 75
- restricted = TRUE
-
-/datum/uplink_item/device_tools/magboots
- name = "Blood-Red Magboots"
- desc = "A pair of magnetic boots with a Syndicate paintjob that assist with freer movement in space or on-station \
- during gravitational generator failures. These reverse-engineered knockoffs of Nanotrasen's \
- 'Advanced Magboots' slow you down in simulated-gravity environments much like the standard issue variety."
- item = /obj/item/clothing/shoes/magboots/syndie
- cost = 2
- include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/device_tools/compressionkit
- name = "Bluespace Compression Kit"
- desc = "A modified version of a BSRPED that can be used to reduce the size of most items while retaining their original functions! \
- Does not work on storage items. \
- Recharge using bluespace crystals. \
- Comes with 5 charges."
- item = /obj/item/compressionkit
- cost = 5
-
-/datum/uplink_item/device_tools/briefcase_launchpad
- name = "Briefcase Launchpad"
- desc = "A briefcase containing a launchpad, a device able to teleport items and people to and from targets up to twenty tiles away from the briefcase. \
- Also includes a remote control, disguised as an ordinary folder. Touch the briefcase with the remote to link it."
- surplus = 0
- item = /obj/item/storage/briefcase/launchpad
- cost = 6
-
-/datum/uplink_item/device_tools/camera_bug
- name = "Camera Bug"
- desc = "Enables you to view all cameras on the main network, set up motion alerts and track a target. \
- Bugging cameras allows you to disable them remotely."
- item = /obj/item/camera_bug
- cost = 1
- surplus = 90
-
-/datum/uplink_item/device_tools/military_belt
- name = "Chest Rig"
- desc = "A robust seven-slot set of webbing that is capable of holding all manner of tactical equipment."
- item = /obj/item/storage/belt/military
- cost = 1
- exclude_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/device_tools/fakenucleardisk
- name = "Decoy Nuclear Authentication Disk"
- desc = "It's just a normal disk. Visually it's identical to the real deal, but it won't hold up under closer scrutiny by the Captain. \
- Don't try to give this to us to complete your objective, we know better!"
- item = /obj/item/disk/nuclear/fake
- cost = 1
- surplus = 1
-
-/datum/uplink_item/device_tools/frame
- name = "F.R.A.M.E. PDA Cartridge"
- desc = "When inserted into a personal digital assistant, this cartridge gives you five PDA viruses which \
- when used cause the targeted PDA to become a new uplink with zero TCs, and immediately become unlocked. \
- You will receive the unlock code upon activating the virus, and the new uplink may be charged with \
- telecrystals normally."
- item = /obj/item/cartridge/virus/frame
- cost = 2
- restricted = TRUE
-
-/datum/uplink_item/device_tools/toolbox
- name = "Full Syndicate Toolbox"
- desc = "The Syndicate toolbox is a suspicious black and red. It comes loaded with a full tool set including a \
- multitool and combat gloves that are resistant to shocks and heat."
- item = /obj/item/storage/toolbox/syndicate
- cost = 1
-
-/datum/uplink_item/device_tools/syndie_glue
- name = "Glue"
- desc = "A cheap bottle of one use syndicate brand super glue. \
- Use on any item to make it undroppable. \
- Be careful not to glue an item you're already holding!"
- exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
- item = /obj/item/syndie_glue
- cost = 2
-
-/datum/uplink_item/device_tools/hacked_module
- name = "Hacked AI Law Upload Module"
- desc = "When used with an upload console, this module allows you to upload priority laws to an artificial intelligence. \
- Be careful with wording, as artificial intelligences may look for loopholes to exploit."
- item = /obj/item/aiModule/syndicate
- cost = 9
-
-/datum/uplink_item/device_tools/medgun
- name = "Medbeam Gun"
- desc = "A wonder of Syndicate engineering, the Medbeam gun, or Medi-Gun enables a medic to keep his fellow \
- operatives in the fight, even while under fire. Don't cross the streams!"
- item = /obj/item/gun/medbeam
- cost = 15
- include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/device_tools/nutcracker
- name = "Nutcracker"
- desc = "An oversized version of what you'd initially expect here. Big enough to crush skulls."
- item = /obj/item/nutcracker
- cost = 1
-
-/datum/uplink_item/device_tools/singularity_beacon
- name = "Power Beacon"
- desc = "When screwed to wiring attached to an electric grid and activated, this large device pulls any \
- active gravitational singularities or tesla balls towards it (provided they are not safely \
- contained), as well as increasing the odds of incoming meteor waves. \
- Because of its size, it cannot be carried. Ordering this sends you a small beacon \
- that will teleport the larger beacon to your location upon activation."
- item = /obj/item/sbeacondrop
- cost = 14
-
-/datum/uplink_item/device_tools/powersink
- name = "Power Sink"
- desc = "When screwed to wiring attached to a power grid and activated, this large device lights up and places excessive \
- load on the grid, causing a station-wide blackout. The sink is large and cannot be stored in most \
- traditional bags and boxes. Caution: Will explode if the powernet contains sufficient amounts of energy."
- item = /obj/item/powersink
- cost = 6
-
-/datum/uplink_item/device_tools/rad_laser
- name = "Radioactive Microlaser"
- desc = "A radioactive microlaser disguised as a standard Nanotrasen health analyzer. When used, it emits a \
- powerful burst of radiation, which, after a short delay, can incapacitate all but the most protected \
- of humanoids. It has two settings: intensity, which controls the power of the radiation, \
- and wavelength, which controls the delay before the effect kicks in."
- item = /obj/item/healthanalyzer/rad_laser
- cost = 3
-
-/datum/uplink_item/device_tools/stimpack
- name = "Stimpack"
- desc = "Stimpacks, the tool of many great heroes, make you nearly immune to stuns and knockdowns for about \
- 5 minutes after injection."
- item = /obj/item/reagent_containers/syringe/stimulants
- cost = 5
- surplus = 90
-
-/datum/uplink_item/device_tools/medkit
- name = "Syndicate Combat Medic Kit"
- desc = "This first aid kit is a suspicious brown and red. Included is a combat stimulant injector \
- for rapid healing, a medical night vision HUD for quick identification of injured personnel, \
- and other supplies helpful for a field medic."
- item = /obj/item/storage/firstaid/tactical/nukeop
- cost = 4
- include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/device_tools/surgerybag
- name = "Syndicate Surgery Duffel Bag"
- desc = "The Syndicate surgery duffel bag is a toolkit containing all surgery tools, surgical drapes, \
- a Syndicate brand MMI, a straitjacket, and a muzzle."
- item = /obj/item/storage/backpack/duffelbag/syndie/surgery
- cost = 3
-
-/datum/uplink_item/device_tools/surgerybag_adv
- name = "Advanced Syndicate Surgery Duffel Bag"
- desc = "The Syndicate surgery duffel bag is a toolkit containing all advanced surgery tools, surgical drapes, \
- a Syndicate brand MMI, a straitjacket, a muzzle, and an outdated, yet still useful Combat Medic Kit."
- item = /obj/item/storage/backpack/duffelbag/syndie/surgery_adv
- cost = 10
-
-/datum/uplink_item/device_tools/brainwash_disk
- name = "Brainwashing Surgery Program"
- desc = "A disk containing the procedure to perform a brainwashing surgery, allowing you to implant an objective onto a target. \
- Insert into an Operating Console to enable the procedure."
- item = /obj/item/disk/surgery/brainwashing
- cost = 3
-
-/datum/uplink_item/device_tools/encryptionkey
- name = "Syndicate Encryption Key"
- desc = "A key that, when inserted into a radio headset, allows you to listen to all station department channels \
- as well as talk on an encrypted Syndicate channel with other agents that have the same key."
- item = /obj/item/encryptionkey/syndicate
- cost = 2
- surplus = 75
- restricted = TRUE
-
-/datum/uplink_item/device_tools/syndietome
- name = "Syndicate Tome"
- desc = "Using rare artifacts acquired at great cost, the Syndicate has reverse engineered \
- the seemingly magical books of a certain cult. Though lacking the esoteric abilities \
- of the originals, these inferior copies are still quite useful, being able to provide \
- both weal and woe on the battlefield, even if they do occasionally bite off a finger."
- item = /obj/item/storage/book/bible/syndicate
- cost = 9
-
-/datum/uplink_item/device_tools/thermal
- name = "Thermal Imaging Glasses"
- desc = "These goggles can be turned to resemble common eyewear found throughout the station. \
- They allow you to see organisms through walls by capturing the upper portion of the infrared light spectrum, \
- emitted as heat and light by objects. Hotter objects, such as warm bodies, cybernetic organisms \
- and artificial intelligence cores emit more of this light than cooler objects like walls and airlocks."
- item = /obj/item/clothing/glasses/thermal/syndi
- cost = 4
-
-/datum/uplink_item/device_tools/potion
- name = "Syndicate Sentience Potion"
- item = /obj/item/slimepotion/slime/sentience/nuclear
- desc = "A potion recovered at great risk by undercover Syndicate operatives and then subsequently modified with Syndicate technology. \
- Using it will make any animal sentient, and bound to serve you, as well as implanting an internal radio for communication and an internal ID card for opening doors."
- cost = 2
- include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
- restricted = TRUE
-
-
-// Implants
-
-/datum/uplink_item/implants/adrenal
- name = "Adrenal Implant"
- desc = "An implant injected into the body, and later activated at the user's will. It will inject a chemical \
- cocktail which removes all incapacitating effects, lets the user run faster and has a mild healing effect."
- item = /obj/item/storage/box/syndie_kit/imp_adrenal
- cost = 8
- player_minimum = 25
-
-/datum/uplink_item/implants/antistun
- name = "CNS Rebooter Implant"
- desc = "This implant will help you get back up on your feet faster after being stunned. Comes with an autosurgeon."
- item = /obj/item/autosurgeon/anti_stun
- cost = 12
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/implants/freedom
- name = "Freedom Implant"
- desc = "An implant injected into the body and later activated at the user's will. It will attempt to free the \
- user from common restraints such as handcuffs."
- item = /obj/item/storage/box/syndie_kit/imp_freedom
- cost = 5
-
-/datum/uplink_item/implants/microbomb
- name = "Microbomb Implant"
- desc = "An implant injected into the body, and later activated either manually or automatically upon death. \
- The more implants inside of you, the higher the explosive power. \
- This will permanently destroy your body, however."
- item = /obj/item/storage/box/syndie_kit/imp_microbomb
- cost = 2
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/implants/macrobomb
- name = "Macrobomb Implant"
- desc = "An implant injected into the body, and later activated either manually or automatically upon death. \
- Upon death, releases a massive explosion that will wipe out everything nearby."
- item = /obj/item/storage/box/syndie_kit/imp_macrobomb
- cost = 20
- include_modes = list(/datum/game_mode/nuclear)
- restricted = TRUE
-
-/datum/uplink_item/implants/radio
- name = "Internal Syndicate Radio Implant"
- desc = "An implant injected into the body, allowing the use of an internal Syndicate radio. \
- Used just like a regular headset, but can be disabled to use external headsets normally and to avoid detection."
- item = /obj/item/storage/box/syndie_kit/imp_radio
- cost = 4
- restricted = TRUE
-
-/datum/uplink_item/implants/reviver
- name = "Reviver Implant"
- desc = "This implant will attempt to revive and heal you if you lose consciousness. Comes with an autosurgeon."
- item = /obj/item/autosurgeon/reviver
- cost = 8
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/implants/stealthimplant
- name = "Stealth Implant"
- desc = "This one-of-a-kind implant will make you almost invisible as long as you don't don't excessively move around. \
- On activation, it will conceal you inside a chameleon cardboard box that is only revealed once someone bumps into it."
- item = /obj/item/implanter/stealth
- cost = 8
-
-/datum/uplink_item/implants/storage
- name = "Storage Implant"
- desc = "An implant injected into the body, and later activated at the user's will. It will open a small bluespace \
- pocket capable of storing two regular-sized items."
- item = /obj/item/storage/box/syndie_kit/imp_storage
- cost = 8
-
-/datum/uplink_item/implants/thermals
- name = "Thermal Eyes"
- desc = "These cybernetic eyes will give you thermal vision. Comes with a free autosurgeon."
- item = /obj/item/autosurgeon/thermal_eyes
- cost = 8
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/implants/uplink
- name = "Uplink Implant"
- desc = "An implant injected into the body, and later activated at the user's will. Has no telecrystals and must be charged by the use of physical telecrystals. \
- Undetectable (except via surgery), and excellent for escaping confinement."
- item = /obj/item/storage/box/syndie_kit/imp_uplink
- cost = 4
- // An empty uplink is kinda useless.
- surplus = 0
- restricted = TRUE
-
-/datum/uplink_item/implants/xray
- name = "X-ray Vision Implant"
- desc = "These cybernetic eyes will give you X-ray vision. Comes with an autosurgeon."
- item = /obj/item/autosurgeon/xray_eyes
- cost = 10
- surplus = 0
- include_modes = list(/datum/game_mode/nuclear)
-
-// Role-specific items
-
-/datum/uplink_item/role_restricted/ancient_jumpsuit
- name = "Ancient Jumpsuit"
- desc = "A tattered old jumpsuit that will provide absolutely no benefit to you. It fills the wearer with a strange compulsion to blurt out 'glorf'."
- item = /obj/item/clothing/under/color/grey/glorf
- cost = 20
- restricted_roles = list("Assistant")
-
-/datum/uplink_item/role_restricted/pie_cannon
- name = "Banana Cream Pie Cannon"
- desc = "A special pie cannon for a special clown, this gadget can hold up to 20 pies and automatically fabricates one every two seconds!"
- cost = 10
- item = /obj/item/pneumatic_cannon/pie/selfcharge
- restricted_roles = list("Clown")
-
-/datum/uplink_item/role_restricted/blastcannon
- name = "Blast Cannon"
- desc = "A highly specialized weapon, the Blast Cannon is actually relatively simple. It contains an attachment for a tank transfer valve mounted to an angled pipe specially constructed \
- withstand extreme pressure and temperatures, and has a mechanical trigger for triggering the transfer valve. Essentially, it turns the explosive force of a bomb into a narrow-angle \
- blast wave \"projectile\". Aspiring scientists may find this highly useful, as forcing the pressure shockwave into a narrow angle seems to be able to bypass whatever quirk of physics \
- disallows explosive ranges above a certain distance, allowing for the device to use the theoretical yield of a transfer valve bomb, instead of the factual yield."
- item = /obj/item/gun/blastcannon
- cost = 14 //High cost because of the potential for extreme damage in the hands of a skilled gas masked scientist.
- restricted_roles = list("Research Director", "Scientist")
-
-/datum/uplink_item/role_restricted/alientech
- name = "Alien Research Disk"
- desc = "A technology disk holding a terabyte of highly confidential abductor technology. \
- Simply insert into research console of choice and import the files from the disk. Because of its foreign nature, it may require multiple uploads to work properly."
- item = /obj/item/disk/tech_disk/abductor
- cost = 12
- restricted_roles = list("Research Director", "Scientist", "Roboticist")
-
-/datum/uplink_item/role_restricted/clown_bomb
- name = "Clown Bomb"
- desc = "The Clown bomb is a hilarious device capable of massive pranks. It has an adjustable timer, \
- with a minimum of 60 seconds, and can be bolted to the floor with a wrench to prevent \
- movement. The bomb is bulky and cannot be moved; upon ordering this item, a smaller beacon will be \
- transported to you that will teleport the actual bomb to it upon activation. Note that this bomb can \
- be defused, and some crew may attempt to do so. \
- The bomb core can be pried out and manually detonated with other explosives."
- item = /obj/item/sbeacondrop/clownbomb
- cost = 15
- restricted_roles = list("Clown")
-
-/*
-/datum/uplink_item/role_restricted/clowncar
- name = "Clown Car"
- desc = "The Clown Car is the ultimate transportation method for any worthy clown! \
- Simply insert your bikehorn and get in, and get ready to have the funniest ride of your life! \
- You can ram any spacemen you come across and stuff them into your car, kidnapping them and locking them inside until \
- someone saves them or they manage to crawl out. Be sure not to ram into any walls or vending machines, as the springloaded seats \
- are very sensetive. Now with our included lube defense mechanism which will protect you against any angry shitcurity!"
- item = /obj/vehicle/sealed/car/clowncar
- cost = 15
- restricted_roles = list("Clown")
-*/
-
-/datum/uplink_item/role_restricted/clumsyDNA
- name = "Clumsy Clown DNA"
- desc = "A DNA injector that has been loaded with the clown gene that makes people clumsy.. \
- Making someone clumsy will allow them to use clown firing pins as well as Reverse Revolvers. For a laugh try using this on the HOS to see how many times they shoot themselves in the foot!"
- cost = 1
- item = /obj/item/dnainjector/clumsymut
- restricted_roles = list("Clown")
-
-/datum/uplink_item/role_restricted/haunted_magic_eightball
- name = "Haunted Magic Eightball"
- desc = "Most magic eightballs are toys with dice inside. Although identical in appearance to the harmless toys, this occult device reaches into the spirit world to find its answers. \
- Be warned, that spirits are often capricious or just little assholes. To use, simply speak your question aloud, then begin shaking."
- item = /obj/item/toy/eightball/haunted
- cost = 2
- restricted_roles = list("Curator")
- limited_stock = 1 //please don't spam deadchat
-
-/datum/uplink_item/role_restricted/his_grace
- name = "His Grace"
- desc = "An incredibly dangerous weapon recovered from a station overcome by the grey tide. Once activated, He will thirst for blood and must be used to kill to sate that thirst. \
- His Grace grants gradual regeneration and complete stun immunity to His wielder, but be wary: if He gets too hungry, He will become impossible to drop and eventually kill you if not fed. \
- However, if left alone for long enough, He will fall back to slumber. \
- To activate His Grace, simply unlatch Him."
- item = /obj/item/his_grace
- cost = 20
- restricted_roles = list("Chaplain")
- surplus = 5 //Very low chance to get it in a surplus crate even without being the chaplain
-
-/datum/uplink_item/role_restricted/explosive_hot_potato
- name = "Exploding Hot Potato"
- desc = "A potato rigged with explosives. On activation, a special mechanism is activated that prevents it from being dropped. \
- The only way to get rid of it if you are holding it is to attack someone else with it, causing it to latch to that person instead."
- item = /obj/item/hot_potato/syndicate
- cost = 4
- restricted_roles = list("Cook", "Botanist", "Clown", "Mime")
-
-/datum/uplink_item/role_restricted/strange_seeds
- name = "Pack of strange seeds"
- desc = "Mysterious seeds as strange as their name implies. Spooky."
- item = /obj/item/seeds/random
- cost = 2
- restricted_roles = list("Botanist")
- illegal_tech = FALSE
-
-/datum/uplink_item/role_restricted/strange_seeds_10pack
- name = "Pack of strange seeds x10"
- desc = "Mysterious seeds as strange as their name implies. Spooky. These come in bulk"
- item = /obj/item/storage/box/strange_seeds_10pack
- cost = 20
- restricted_roles = list("Botanist")
-
-/datum/uplink_item/role_restricted/ez_clean_bundle
- name = "EZ Clean Grenade Bundle"
- desc = "A box with three cleaner grenades using the trademark Waffle Co. formula. Serves as a cleaner and causes acid damage to anyone standing nearby. \
- The acid only affects carbon-based creatures."
- item = /obj/item/storage/box/syndie_kit/ez_clean
- cost = 6
- surplus = 20
- restricted_roles = list("Janitor")
-
-/datum/uplink_item/role_restricted/goldenbox
- name = "Gold Toolbox"
- desc = "A gold planted plastitanium toolbox loaded with tools. Comes with a set of AI detection multi-tool and a pare of combat gloves."
- item = /obj/item/storage/toolbox/gold_real
- cost = 3 // Has syndie tools + gloves + a robust weapon
- restricted_roles = list("Assistant", "Curator") //Curator due to this being made of gold - It fits the theme
-
-/datum/uplink_item/role_restricted/mimery
- name = "Guide to Advanced Mimery Series"
- desc = "The classical two part series on how to further hone your mime skills. Upon studying the series, the user should be able to make 3x1 invisible walls, and shoot bullets out of their fingers. \
- Obviously only works for Mimes."
- cost = 12
- item = /obj/item/storage/box/syndie_kit/mimery
- restricted_roles = list("Mime")
-
-/datum/uplink_item/role_restricted/ultrahonkpins
- name = "Hilarious firing pin"
- desc = "A single firing pin made for Clown agents, this firing pin makes any gun honk when fired if not a true clown! \
- This firing pin also helps you fire the gun correctly. May the HonkMother HONK you agent."
- item = /obj/item/firing_pin/clown/ultra
- cost = 2
- restricted_roles = list("Clown")
-
-/datum/uplink_item/role_restricted/pressure_mod
- name = "Kinetic Accelerator Pressure Mod"
- desc = "A modification kit which allows Kinetic Accelerators to do greatly increased damage while indoors. \
- Occupies 35% mod capacity."
- item = /obj/item/borg/upgrade/modkit/indoors
- cost = 5 //you need two for full damage, so total of 10 for maximum damage
- limited_stock = 2 //you can't use more than two!
- restricted_roles = list("Shaft Miner")
-
-/datum/uplink_item/role_restricted/kitchen_gun
- name = "Kitchen Gun (TM)"
- desc = "A revolutionary .45 caliber cleaning solution! Say goodbye to daily stains and dirty surfaces with Kitchen Gun (TM)! \
- Just five shots from Kitchen Gun (TM), and it'll sparkle like new! Includes two extra ammunition clips!"
- cost = 10
- surplus = 40
- restricted_roles = list("Cook", "Janitor")
- item = /obj/item/storage/box/syndie_kit/kitchen_gun
-
-/datum/uplink_item/role_restricted/kitchen_gun_ammo
- name = "Kitchen Gun (TM) .45 Magazine"
- desc = "An extra eight bullets for an extra eight uses of Kitchen Gun (TM)!"
- cost = 1
- restricted_roles = list("Cook", "Janitor")
- item = /obj/item/ammo_box/magazine/m45/kitchengun
-
-/datum/uplink_item/role_restricted/magillitis_serum
- name = "Magillitis Serum Autoinjector"
- desc = "A single-use autoinjector which contains an experimental serum that causes rapid muscular growth in Hominidae. \
- Side-affects may include hypertrichosis, violent outbursts, and an unending affinity for bananas."
- item = /obj/item/reagent_containers/hypospray/magillitis
- cost = 8
- restricted_roles = list("Geneticist", "Chief Medical Officer")
-
-/datum/uplink_item/role_restricted/modified_syringe_gun
- name = "Modified Syringe Gun"
- desc = "A syringe gun that fires DNA injectors instead of normal syringes."
- item = /obj/item/gun/syringe/dna
- cost = 14
- restricted_roles = list("Geneticist", "Chief Medical Officer")
-
-/datum/uplink_item/role_restricted/chemical_gun
- name = "Reagent Dartgun"
- desc = "A heavily modified syringe gun which is capable of synthesizing its own chemical darts using input reagents. Can hold 100u of reagents."
- item = /obj/item/gun/chem
- cost = 12
- restricted_roles = list("Chemist", "Chief Medical Officer")
-
-/datum/uplink_item/role_restricted/reverse_bear_trap
- name = "Reverse Bear Trap"
- desc = "An ingenious execution device worn on (or forced onto) the head. Arming it starts a 1-minute kitchen timer mounted on the bear trap. When it goes off, the trap's jaws will \
- violently open, instantly killing anyone wearing it by tearing their jaws in half. To arm, attack someone with it while they're not wearing headgear, and you will force it onto their \
- head after three seconds uninterrupted."
- cost = 5
- item = /obj/item/reverse_bear_trap
- restricted_roles = list("Clown")
-
-/datum/uplink_item/role_restricted/reverse_revolver
- name = "Reverse Revolver"
- desc = "A revolver that always fires at its user. \"Accidentally\" drop your weapon, then watch as the greedy corporate pigs blow their own brains all over the wall. \
- The revolver itself is actually real. Only clumsy people, and clowns, can fire it normally. Comes in a box of hugs. Honk."
- cost = 14
- item = /obj/item/storage/box/hug/reverse_revolver
- restricted_roles = list("Clown")
-
-/datum/uplink_item/role_restricted/taeclowndo_shoes
- name = "Tae-clown-do Shoes"
- desc = "A pair of shoes for the most elite agents of the honkmotherland. They grant the mastery of taeclowndo with some honk-fu moves as long as they're worn."
- cost = 14
- item = /obj/item/clothing/shoes/clown_shoes/taeclowndo
- restricted_roles = list("Clown")
-
-/datum/uplink_item/role_restricted/emitter_cannon
- name = "Emitter Cannon"
- desc = "A small emitter fitted into a gun case, do to size constraints and safety it can only shoot about ten times when fully charged."
- cost = 5 //Low ammo, and deals same as 10mm but emp-able
- item = /obj/item/gun/energy/emitter
- restricted_roles = list("Chief Engineer", "Station Engineer", "Atmospheric Technician")
-
-// Pointless (Badassery)
-
-/datum/uplink_item/badass/costumes/obvious_chameleon
- name = "Broken Chameleon Kit"
- desc = "A set of items that contain chameleon technology allowing you to disguise as pretty much anything on the station, and more! \
- Please note that this kit did NOT pass quality control."
- item = /obj/item/storage/box/syndie_kit/chameleon/broken
-
-/datum/uplink_item/badass/costumes
- include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
- cost = 4
- cant_discount = TRUE
-
-/datum/uplink_item/badass/costumes/centcom_official
- name = "CentCom Official Costume"
- desc = "Ask the crew to \"inspect\" their nuclear disk and weapons system, and then when they decline, pull out a fully automatic rifle and gun down the Captain. \
- Radio headset does not include encryption key. No gun included."
- item = /obj/item/storage/box/syndie_kit/centcom_costume
-
-/datum/uplink_item/badass/claymore
- name = "Claymore"
- cost = 8
- player_minimum = 25
- desc = "A claymore. We don't know why you'd do this."
- item = /obj/item/claymore
-
-/datum/uplink_item/badass/costumes/clown
- name = "Clown Costume"
- desc = "Nothing is more terrifying than clowns with fully automatic weaponry."
- item = /obj/item/storage/backpack/duffelbag/clown/syndie
-
-/datum/uplink_item/badass/plastitanium_toolbox
- name = "Plastitanium Toolbox"
- desc = "A very high impact toolbox. Excels at destroying stationary structures."
- item = /obj/item/storage/toolbox/plastitanium
- cost = 2 //18 damage on mobs, 50 on objects, 4.5 stam/hit
-
-/datum/uplink_item/badass/balloon
- name = "Syndicate Balloon"
- desc = "For showing that you are THE BOSS: A useless red balloon with the Syndicate logo on it. \
- Can blow the deepest of covers."
- item = /obj/item/toy/syndicateballoon
- cost = 20
- cant_discount = TRUE
- illegal_tech = FALSE
-
-/datum/uplink_item/badass/syndiecash
- name = "Syndicate Briefcase Full of Cash"
- desc = "A secure briefcase containing 5000 space credits. Useful for bribing personnel, or purchasing goods \
- and services at lucrative prices. The briefcase also feels a little heavier to hold; it has been \
- manufactured to pack a little bit more of a punch if your client needs some convincing."
- item = /obj/item/storage/secure/briefcase/syndie
- cost = 1
-
-/datum/uplink_item/badass/syndiecards
- name = "Syndicate Playing Cards"
- desc = "A special deck of space-grade playing cards with a mono-molecular edge and metal reinforcement, \
- making them slightly more robust than a normal deck of cards. \
- You can also play card games with them or leave them on your victims."
- item = /obj/item/toy/cards/deck/syndicate
- cost = 1
- surplus = 40
- illegal_tech = FALSE
-
-/datum/uplink_item/badass/syndiecigs
- name = "Syndicate Smokes"
- desc = "Strong flavor, dense smoke, infused with omnizine."
- item = /obj/item/storage/fancy/cigarettes/cigpack_syndicate
- cost = 2
- illegal_tech = FALSE
diff --git a/code/modules/uplink/uplink_items/uplink_ammo.dm b/code/modules/uplink/uplink_items/uplink_ammo.dm
new file mode 100644
index 0000000000..0db1bc96f0
--- /dev/null
+++ b/code/modules/uplink/uplink_items/uplink_ammo.dm
@@ -0,0 +1,255 @@
+
+/*
+ Uplink Items:
+ Unlike categories, uplink item entries are automatically sorted alphabetically on server init in a global list,
+ When adding new entries to the file, please keep them sorted by category.
+*/
+
+// Ammunition
+
+/datum/uplink_item/ammo/pistol
+ name = "10mm Handgun Magazine"
+ desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. These rounds \
+ are dirt cheap but are half as effective as .357 rounds."
+ item = /obj/item/ammo_box/magazine/m10mm
+ cost = 1
+ exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/ammo/pistolap
+ name = "10mm Armour Piercing Magazine"
+ desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. \
+ These rounds are less effective at injuring the target but penetrate protective gear."
+ item = /obj/item/ammo_box/magazine/m10mm/ap
+ cost = 2
+ exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/ammo/pistolhp
+ name = "10mm Hollow Point Magazine"
+ desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. \
+ These rounds are more damaging but ineffective against armour."
+ item = /obj/item/ammo_box/magazine/m10mm/hp
+ cost = 3
+ exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/ammo/pistolfire
+ name = "10mm Incendiary Magazine"
+ desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. \
+ Loaded with incendiary rounds which inflict little damage, but ignite the target."
+ item = /obj/item/ammo_box/magazine/m10mm/fire
+ cost = 2
+ exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/ammo/pistolzzz
+ name = "10mm Soporific Magazine"
+ desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. Loaded with soporific rounds that put the target to sleep. \
+ NOTE: Soporific is not instant acting due to the constraints of the round's scale. Will usually require three shots to take effect."
+ item = /obj/item/ammo_box/magazine/m10mm/soporific
+ cost = 2
+
+/datum/uplink_item/ammo/shotgun
+ cost = 2
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/ammo/shotgun/bag
+ name = "12g Ammo Duffel Bag"
+ desc = "A duffel bag filled with enough 12g ammo to supply an entire team, at a discounted price."
+ item = /obj/item/storage/backpack/duffelbag/syndie/ammo/shotgun
+ cost = 12
+
+/datum/uplink_item/ammo/shotgun/buck
+ name = "12g Buckshot Drum"
+ desc = "An additional 8-round buckshot magazine for use with the Bulldog shotgun. Front towards enemy."
+ item = /obj/item/ammo_box/magazine/m12g
+
+/datum/uplink_item/ammo/shotgun/dragon
+ name = "12g Dragon's Breath Drum"
+ desc = "An alternative 8-round dragon's breath magazine for use in the Bulldog shotgun. \
+ 'I'm a fire starter, twisted fire starter!'"
+ item = /obj/item/ammo_box/magazine/m12g/dragon
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/ammo/shotgun/meteor
+ name = "12g Meteorslug Shells"
+ desc = "An alternative 8-round meteorslug magazine for use in the Bulldog shotgun. \
+ Great for blasting airlocks off their frames and knocking down enemies."
+ item = /obj/item/ammo_box/magazine/m12g/meteor
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/ammo/shotgun/scatter
+ name = "12g Scatter Laser shot Slugs"
+ desc = "An alternative 8-round Scatter Laser Shot magazine for use in the Bulldog shotgun."
+ item = /obj/item/ammo_box/magazine/m12g/scatter
+ cost = 4 // most armor has less laser protection then bullet
+
+/datum/uplink_item/ammo/shotgun/slug
+ name = "12g Slug Drum"
+ desc = "An additional 8-round slug magazine for use with the Bulldog shotgun. \
+ Now 8 times less likely to shoot your pals."
+ cost = 3
+ item = /obj/item/ammo_box/magazine/m12g/slug
+
+/datum/uplink_item/ammo/shotgun/stun
+ name = "12g Stun Slug Drum"
+ desc = "An alternative 8-round stun slug magazine for use with the Bulldog shotgun. \
+ Saying that they're completely non-lethal would be lying."
+ item = /obj/item/ammo_box/magazine/m12g/stun
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/ammo/revolver
+ name = ".357 Speed Loader"
+ desc = "A speed loader that contains seven additional .357 Magnum rounds, and can be further reloaded with individual bullets; usable with the Syndicate revolver. \
+ For when you really need a lot of things dead."
+ item = /obj/item/ammo_box/a357
+ cost = 3
+ exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/ammo/revolver/ap
+ name = ".357 Armor Piercing Speed Loader"
+ desc = "A speed loader that contains seven additional .357 AP Magnum rounds; usable with the Syndicate revolver. \
+ Cuts through like a hot knife through butter."
+ item = /obj/item/ammo_box/a357/ap
+
+/datum/uplink_item/ammo/a40mm
+ name = "40mm Grenade"
+ desc = "A 40mm HE grenade for use with the M-90gl's under-barrel grenade launcher. \
+ Your teammates will ask you to not shoot these down small hallways."
+ item = /obj/item/ammo_casing/a40mm
+ cost = 2
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/ammo/smg/bag
+ name = ".45 Ammo Duffel Bag"
+ desc = "A duffel bag filled with enough .45 ammo to supply an entire team, at a discounted price."
+ item = /obj/item/storage/backpack/duffelbag/syndie/ammo/smg
+ cost = 20 //instead of 27 TC
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/ammo/smg
+ name = ".45 SMG Magazine"
+ desc = "An additional 24-round .45 magazine suitable for use with the C-20r submachine gun."
+ item = /obj/item/ammo_box/magazine/smgm45
+ cost = 3
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/ammo/sniper
+ cost = 4
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/ammo/sniper/basic
+ name = ".50 Magazine"
+ desc = "An additional standard 6-round magazine for use with .50 sniper rifles."
+ item = /obj/item/ammo_box/magazine/sniper_rounds
+
+/datum/uplink_item/ammo/sniper/penetrator
+ name = ".50 Penetrator Magazine"
+ desc = "A 5-round magazine of penetrator ammo designed for use with .50 sniper rifles. \
+ Can pierce walls and multiple enemies."
+ item = /obj/item/ammo_box/magazine/sniper_rounds/penetrator
+ cost = 5
+
+/datum/uplink_item/ammo/sniper/soporific
+ name = ".50 Soporific Magazine"
+ desc = "A 3-round magazine of soporific ammo designed for use with .50 sniper rifles. Put your enemies to sleep today!"
+ item = /obj/item/ammo_box/magazine/sniper_rounds/soporific
+ cost = 6
+
+/datum/uplink_item/ammo/carbine
+ name = "5.56mm Toploader Magazine"
+ desc = "An additional 30-round 5.56mm magazine; suitable for use with the M-90gl carbine. \
+ These bullets pack less punch than 7.12x82mm rounds, but they still offer more power than .45 ammo."
+ item = /obj/item/ammo_box/magazine/m556
+ cost = 4
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/ammo/machinegun
+ cost = 6
+ surplus = 0
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/ammo/machinegun/basic
+ name = "1.95x129mm Box Magazine"
+ desc = "A 50-round magazine of 1.95x129mm ammunition for use with the L6 SAW. \
+ By the time you need to use this, you'll already be standing on a pile of corpses"
+ item = /obj/item/ammo_box/magazine/mm195x129
+
+/datum/uplink_item/ammo/machinegun/ap
+ name = "1.95x129mm (Armor Penetrating) Box Magazine"
+ desc = "A 50-round magazine of 1.95x129mm ammunition for use in the L6 SAW; equipped with special properties \
+ to puncture even the most durable armor."
+ item = /obj/item/ammo_box/magazine/mm195x129/ap
+ cost = 9
+
+/datum/uplink_item/ammo/machinegun/hollow
+ name = "1.95x129mm (Hollow-Point) Box Magazine"
+ desc = "A 50-round magazine of 1.95x129mm ammunition for use in the L6 SAW; equipped with hollow-point tips to help \
+ with the unarmored masses of crew."
+ item = /obj/item/ammo_box/magazine/mm195x129/hollow
+
+/datum/uplink_item/ammo/machinegun/incen
+ name = "1.95x129mm (Incendiary) Box Magazine"
+ desc = "A 50-round magazine of 1.95x129mm ammunition for use in the L6 SAW; tipped with a special flammable \
+ mixture that'll ignite anyone struck by the bullet. Some men just want to watch the world burn."
+ item = /obj/item/ammo_box/magazine/mm195x129/incen
+
+/datum/uplink_item/ammo/rocket
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/ammo/rocket/basic
+ name = "84mm HE Rocket"
+ desc = "A low-yield anti-personnel HE rocket. Gonna take you out in style!"
+ item = /obj/item/ammo_casing/caseless/rocket
+ cost = 4
+
+/datum/uplink_item/ammo/rocket/hedp
+ name = "84mm HEDP Rocket"
+ desc = "A high-yield HEDP rocket; extremely effective against armored targets, as well as surrounding personnel. \
+ Strike fear into the hearts of your enemies."
+ item = /obj/item/ammo_casing/caseless/rocket/hedp
+ cost = 6
+
+/datum/uplink_item/ammo/pistolaps
+ name = "9mm Handgun Magazine"
+ desc = "An additional 15-round 9mm magazine, compatible with the Stechkin APS pistol, found in the Spetsnaz Pyro bundle."
+ item = /obj/item/ammo_box/magazine/pistolm9mm
+ cost = 2
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/ammo/flechetteap
+ name = "Armor Piercing Flechette Magazine"
+ desc = "An additional 40-round flechette magazine; compatible with the Flechette Launcer. \
+ Loaded with armor piercing flechettes that very nearly ignore armor, but are not very effective agaisnt flesh."
+ item = /obj/item/ammo_box/magazine/flechette
+ cost = 2
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/ammo/flechettes
+ name = "Serrated Flechette Magazine"
+ desc = "An additional 40-round flechette magazine; compatible with the Flechette Launcer. \
+ Loaded with serrated flechettes that shreds flesh, but is stopped dead in its tracks by armor. \
+ These flechettes are highly likely to sever arteries, and even limbs."
+ item = /obj/item/ammo_box/magazine/flechette/s
+ cost = 2
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/ammo/toydarts
+ name = "Box of Riot Darts"
+ desc = "A box of 40 Donksoft riot darts, for reloading any compatible foam dart magazine. Don't forget to share!"
+ item = /obj/item/ammo_box/foambox/riot
+ cost = 2
+ surplus = 0
+ illegal_tech = FALSE
+
+/datum/uplink_item/ammo/bioterror
+ name = "Box of Bioterror Syringes"
+ desc = "A box full of preloaded syringes, containing various chemicals that seize up the victim's motor \
+ and broca systems, making it impossible for them to move or speak for some time."
+ item = /obj/item/storage/box/syndie_kit/bioterror
+ cost = 6
+ include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/ammo/bolt_action
+ name = "Surplus Rifle Clip"
+ desc = "A stripper clip used to quickly load bolt action rifles. Contains 5 rounds."
+ item = /obj/item/ammo_box/a762
+ cost = 1
+ include_modes = list(/datum/game_mode/nuclear)
diff --git a/code/modules/uplink/uplink_items/uplink_badass.dm b/code/modules/uplink/uplink_items/uplink_badass.dm
new file mode 100644
index 0000000000..8dc5afbadd
--- /dev/null
+++ b/code/modules/uplink/uplink_items/uplink_badass.dm
@@ -0,0 +1,77 @@
+
+/*
+ Uplink Items:
+ Unlike categories, uplink item entries are automatically sorted alphabetically on server init in a global list,
+ When adding new entries to the file, please keep them sorted by category.
+*/
+
+// Pointless (Badassery)
+
+/datum/uplink_item/badass/costumes/obvious_chameleon
+ name = "Broken Chameleon Kit"
+ desc = "A set of items that contain chameleon technology allowing you to disguise as pretty much anything on the station, and more! \
+ Please note that this kit did NOT pass quality control."
+ item = /obj/item/storage/box/syndie_kit/chameleon/broken
+
+/datum/uplink_item/badass/costumes
+ include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+ cost = 4
+ cant_discount = TRUE
+
+/datum/uplink_item/badass/costumes/centcom_official
+ name = "CentCom Official Costume"
+ desc = "Ask the crew to \"inspect\" their nuclear disk and weapons system, and then when they decline, pull out a fully automatic rifle and gun down the Captain. \
+ Radio headset does not include encryption key. No gun included."
+ item = /obj/item/storage/box/syndie_kit/centcom_costume
+
+/datum/uplink_item/badass/claymore
+ name = "Claymore"
+ cost = 8
+ player_minimum = 25
+ desc = "A claymore. We don't know why you'd do this."
+ item = /obj/item/claymore
+
+/datum/uplink_item/badass/costumes/clown
+ name = "Clown Costume"
+ desc = "Nothing is more terrifying than clowns with fully automatic weaponry."
+ item = /obj/item/storage/backpack/duffelbag/clown/syndie
+
+/datum/uplink_item/badass/plastitanium_toolbox
+ name = "Plastitanium Toolbox"
+ desc = "A very high impact toolbox. Excels at destroying stationary structures."
+ item = /obj/item/storage/toolbox/plastitanium
+ cost = 2 //18 damage on mobs, 50 on objects, 4.5 stam/hit
+
+/datum/uplink_item/badass/balloon
+ name = "Syndicate Balloon"
+ desc = "For showing that you are THE BOSS: A useless red balloon with the Syndicate logo on it. \
+ Can blow the deepest of covers."
+ item = /obj/item/toy/syndicateballoon
+ cost = 20
+ cant_discount = TRUE
+ illegal_tech = FALSE
+
+/datum/uplink_item/badass/syndiecash
+ name = "Syndicate Briefcase Full of Cash"
+ desc = "A secure briefcase containing 5000 space credits. Useful for bribing personnel, or purchasing goods \
+ and services at lucrative prices. The briefcase also feels a little heavier to hold; it has been \
+ manufactured to pack a little bit more of a punch if your client needs some convincing."
+ item = /obj/item/storage/secure/briefcase/syndie
+ cost = 1
+
+/datum/uplink_item/badass/syndiecards
+ name = "Syndicate Playing Cards"
+ desc = "A special deck of space-grade playing cards with a mono-molecular edge and metal reinforcement, \
+ making them slightly more robust than a normal deck of cards. \
+ You can also play card games with them or leave them on your victims."
+ item = /obj/item/toy/cards/deck/syndicate
+ cost = 1
+ surplus = 40
+ illegal_tech = FALSE
+
+/datum/uplink_item/badass/syndiecigs
+ name = "Syndicate Smokes"
+ desc = "Strong flavor, dense smoke, infused with omnizine."
+ item = /obj/item/storage/fancy/cigarettes/cigpack_syndicate
+ cost = 2
+ illegal_tech = FALSE
diff --git a/code/modules/uplink/uplink_items/uplink_bundles.dm b/code/modules/uplink/uplink_items/uplink_bundles.dm
new file mode 100644
index 0000000000..23fb23f198
--- /dev/null
+++ b/code/modules/uplink/uplink_items/uplink_bundles.dm
@@ -0,0 +1,179 @@
+
+//All bundles and telecrystals
+
+/*
+ Uplink Items:
+ Unlike categories, uplink item entries are automatically sorted alphabetically on server init in a global list,
+ When adding new entries to the file, please keep them sorted by category.
+*/
+
+/datum/uplink_item/bundles_TC/chemical
+ name = "Bioterror bundle"
+ desc = "For the madman: Contains a handheld Bioterror chem sprayer, a Bioterror foam grenade, a box of lethal chemicals, a dart pistol, \
+ box of syringes, Donksoft assault rifle, and some riot darts. Remember: Seal suit and equip internals before use."
+ item = /obj/item/storage/backpack/duffelbag/syndie/med/bioterrorbundle
+ cost = 30 // normally 42
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/bundles_TC/bulldog
+ name = "Bulldog bundle"
+ desc = "Lean and mean: Optimized for people that want to get up close and personal. Contains the popular \
+ Bulldog shotgun, a 12g buckshot drum, a 12g taser slug drum and a pair of Thermal imaging goggles."
+ item = /obj/item/storage/backpack/duffelbag/syndie/bulldogbundle
+ cost = 13 // normally 16
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/bundles_TC/c20r
+ name = "C-20r bundle"
+ desc = "Old Faithful: The classic C-20r, bundled with two magazines, and a (surplus) suppressor at discount price."
+ item = /obj/item/storage/backpack/duffelbag/syndie/c20rbundle
+ cost = 14 // normally 16
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/bundles_TC/cybernetics_bundle
+ name = "Cybernetic Implants Bundle"
+ desc = "A random selection of cybernetic implants. Guaranteed 5 high quality implants. Comes with an autosurgeon."
+ item = /obj/item/storage/box/cyber_implants
+ cost = 40
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/bundles_TC/medical
+ name = "Medical bundle"
+ desc = "The support specialist: Aid your fellow operatives with this medical bundle. Contains a tactical medkit, \
+ a Donksoft LMG, a box of riot darts and a pair of magboots to rescue your friends in no-gravity environments."
+ item = /obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle
+ cost = 15 // normally 20
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/bundles_TC/modular
+ name = "Modular Pistol Kit"
+ desc = "A heavy briefcase containing one modular pistol (chambered in 10mm), one supressor, and spare ammunition, including a box of soporific ammo. \
+ Includes a suit jacket that is padded with a robust liner."
+ item = /obj/item/storage/briefcase/modularbundle
+ cost = 12
+
+/datum/uplink_item/bundles_TC/shredder
+ name = "Shredder bundle"
+ desc = "A truly horrific weapon designed simply to maim its victim, the CX Shredder is banned by several intergalactic treaties. \
+ You'll get two of them with this. And spare ammo to boot. And we'll throw in an extra elite hardsuit and chest rig to hold them all!"
+ item = /obj/item/storage/backpack/duffelbag/syndie/shredderbundle
+ cost = 30 // normally 41
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/bundles_TC/sniper
+ name = "Sniper bundle"
+ desc = "Elegant and refined: Contains a collapsed sniper rifle in an expensive carrying case, \
+ two soporific knockout magazines, a free surplus supressor, and a sharp-looking tactical turtleneck suit. \
+ We'll throw in a free red tie if you order NOW."
+ item = /obj/item/storage/briefcase/sniperbundle
+ cost = 20 // normally 26
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/bundles_TC/firestarter
+ name = "Spetsnaz Pyro bundle"
+ desc = "For systematic suppression of carbon lifeforms in close quarters: Contains a lethal New Russian backpack spray, Elite hardsuit, \
+ Stechkin APS pistol, two magazines, a minibomb and a stimulant syringe. \
+ Order NOW and comrade Boris will throw in an extra tracksuit."
+ item = /obj/item/storage/backpack/duffelbag/syndie/firestarter
+ cost = 30
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/bundles_TC/bundle
+ name = "Syndicate Bundle"
+ desc = "Syndicate Bundles are specialized groups of items that arrive in a plain box. \
+ These items are collectively worth more than 20 telecrystals, but you do not know which specialization \
+ you will receive. May contain discontinued and/or exotic items."
+ item = /obj/item/storage/box/syndicate
+ cost = 20
+ exclude_modes = list(/datum/game_mode/nuclear)
+ cant_discount = TRUE
+
+/datum/uplink_item/bundles_TC/surplus
+ name = "Syndicate Surplus Crate"
+ desc = "A dusty crate from the back of the Syndicate warehouse. Rumored to contain a valuable assortment of items, \
+ but you never know. Contents are sorted to always be worth 50 TC."
+ item = /obj/structure/closet/crate
+ cost = 20
+ player_minimum = 25
+ exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+ cant_discount = TRUE
+ var/starting_crate_value = 50
+
+/datum/uplink_item/bundles_TC/surplus/super
+ name = "Super Surplus Crate"
+ desc = "A dusty SUPER-SIZED from the back of the Syndicate warehouse. Rumored to contain a valuable assortment of items, \
+ but you never know. Contents are sorted to always be worth 125 TC."
+ cost = 40
+ player_minimum = 40
+ starting_crate_value = 125
+
+/datum/uplink_item/bundles_TC/surplus/purchase(mob/user, datum/component/uplink/U)
+ var/list/uplink_items = get_uplink_items(SSticker && SSticker.mode? SSticker.mode : null, FALSE)
+
+ var/crate_value = starting_crate_value
+ var/obj/structure/closet/crate/C = spawn_item(/obj/structure/closet/crate, user, U)
+ if(U.purchase_log)
+ U.purchase_log.LogPurchase(C, src, cost)
+ while(crate_value)
+ var/category = pick(uplink_items)
+ var/item = pick(uplink_items[category])
+ var/datum/uplink_item/I = uplink_items[category][item]
+
+ if(!I.surplus || prob(100 - I.surplus))
+ continue
+ if(crate_value < I.cost)
+ continue
+ crate_value -= I.cost
+ var/obj/goods = new I.item(C)
+ if(U.purchase_log)
+ U.purchase_log.LogPurchase(goods, I, 0)
+ return C
+
+/datum/uplink_item/bundles_TC/random
+ name = "Random Item"
+ desc = "Picking this will purchase a random item. Useful if you have some TC to spare or if you haven't decided on a strategy yet."
+ item = /obj/effect/gibspawner/generic // non-tangible item because techwebs use this path to determine illegal tech
+ cost = 0
+ cant_discount = TRUE
+
+/datum/uplink_item/bundles_TC/random/purchase(mob/user, datum/component/uplink/U)
+ var/list/uplink_items = U.uplink_items
+ var/list/possible_items = list()
+ for(var/category in uplink_items)
+ for(var/item in uplink_items[category])
+ var/datum/uplink_item/I = uplink_items[category][item]
+ if(src == I || !I.item)
+ continue
+ if(U.telecrystals < I.cost)
+ continue
+ if(I.limited_stock == 0)
+ continue
+ possible_items += I
+
+ if(possible_items.len)
+ var/datum/uplink_item/I = pick(possible_items)
+ SSblackbox.record_feedback("tally", "traitor_random_uplink_items_gotten", 1, initial(I.name))
+ U.MakePurchase(user, I)
+
+/datum/uplink_item/bundles_TC/telecrystal
+ name = "1 Raw Telecrystal"
+ desc = "A telecrystal in its rawest and purest form; can be utilized on active uplinks to increase their telecrystal count."
+ item = /obj/item/stack/telecrystal
+ cost = 1
+ surplus = 0
+ cant_discount = TRUE
+ // Don't add telecrystals to the purchase_log since
+ // it's just used to buy more items (including itself!)
+ purchase_log_vis = FALSE
+
+/datum/uplink_item/bundles_TC/telecrystal/five
+ name = "5 Raw Telecrystals"
+ desc = "Five telecrystals in their rawest and purest form; can be utilized on active uplinks to increase their telecrystal count."
+ item = /obj/item/stack/telecrystal/five
+ cost = 5
+
+/datum/uplink_item/bundles_TC/telecrystal/twenty
+ name = "20 Raw Telecrystals"
+ desc = "Twenty telecrystals in their rawest and purest form; can be utilized on active uplinks to increase their telecrystal count."
+ item = /obj/item/stack/telecrystal/twenty
+ cost = 20
\ No newline at end of file
diff --git a/code/modules/uplink/uplink_items/uplink_clothing.dm b/code/modules/uplink/uplink_items/uplink_clothing.dm
new file mode 100644
index 0000000000..2881aa8dfd
--- /dev/null
+++ b/code/modules/uplink/uplink_items/uplink_clothing.dm
@@ -0,0 +1,80 @@
+
+/*
+ Uplink Items:
+ Unlike categories, uplink item entries are automatically sorted alphabetically on server init in a global list,
+ When adding new entries to the file, please keep them sorted by category.
+*/
+
+//Space Suits and Hardsuits
+
+/datum/uplink_item/suits/turtlenck
+ name = "Tactical Turtleneck"
+ desc = "A slightly armored suit that has no sensor on them, if someone sees you in this hope they think its a fake."
+ item = /obj/item/clothing/under/syndicate
+ cost = 1
+ exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) //They already get these
+
+/datum/uplink_item/suits/turtlenck_skirt
+ name = "Tactical Skirtleneck"
+ desc = "A slightly armored suit that has no sensor on them, if someone sees you in this hope they think its a fake."
+ item = /obj/item/clothing/under/syndicate/skirt
+ cost = 1
+ exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) //They already get these
+
+/datum/uplink_item/suits/padding
+ name = "Soft Padding"
+ desc = "Padding to add to a jumpsuit to help against melee and bullets."
+ item = /obj/item/clothing/accessory/padding
+ cost = 2
+ exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/suits/kevlar
+ name = "Kevlar sheets"
+ desc = "Kevlar sheets to add to jumpsuit to help against bullets and melee."
+ item = /obj/item/clothing/accessory/kevlar
+ cost = 2
+ exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/suits/plastic
+ name = "Plastic sheet"
+ desc = "Plastic body sheet to add to a jumpsuit to help against laser and energy harm."
+ item = /obj/item/clothing/accessory/plastics
+ cost = 2
+ exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/suits/space_suit
+ name = "Syndicate Space Suit"
+ desc = "This red and black Syndicate space suit is less encumbering than Nanotrasen variants, \
+ fits inside bags, and has a weapon slot. Nanotrasen crew members are trained to report red space suit \
+ sightings, however."
+ item = /obj/item/storage/box/syndie_kit/space
+ cost = 4
+
+/datum/uplink_item/suits/hardsuit
+ name = "Syndicate Hardsuit"
+ desc = "The feared suit of a Syndicate nuclear agent. Features slightly better armoring and a built in jetpack \
+ that runs off standard atmospheric tanks. Toggling the suit in and out of \
+ combat mode will allow you all the mobility of a loose fitting uniform without sacrificing armoring. \
+ Additionally the suit is collapsible, making it small enough to fit within a backpack. \
+ Nanotrasen crew who spot these suits are known to panic."
+ item = /obj/item/clothing/suit/space/hardsuit/syndi
+ cost = 8
+ exclude_modes = list(/datum/game_mode/nuclear) //you can't buy it in nuke, because the elite hardsuit costs the same while being better
+
+/datum/uplink_item/suits/hardsuit/elite
+ name = "Elite Syndicate Hardsuit"
+ desc = "An upgraded, elite version of the Syndicate hardsuit. It features fireproofing, and also \
+ provides the user with superior armor and mobility compared to the standard Syndicate hardsuit."
+ item = /obj/item/clothing/suit/space/hardsuit/syndi/elite
+ cost = 8
+ include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+ exclude_modes = list()
+
+/datum/uplink_item/suits/hardsuit/shielded
+ name = "Shielded Syndicate Hardsuit"
+ desc = "An upgraded version of the standard Syndicate hardsuit. It features a built-in energy shielding system. \
+ The shields can handle up to three impacts within a short duration and will rapidly recharge while not under fire."
+ item = /obj/item/clothing/suit/space/hardsuit/shielded/syndi
+ cost = 30
+ include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+ exclude_modes = list()
diff --git a/code/modules/uplink/uplink_items/uplink_dangerous.dm b/code/modules/uplink/uplink_items/uplink_dangerous.dm
new file mode 100644
index 0000000000..a7f644ccbe
--- /dev/null
+++ b/code/modules/uplink/uplink_items/uplink_dangerous.dm
@@ -0,0 +1,260 @@
+
+// Dangerous Items
+
+/*
+ Uplink Items:
+ Unlike categories, uplink item entries are automatically sorted alphabetically on server init in a global list,
+ When adding new entries to the file, please keep them sorted by category.
+*/
+
+/datum/uplink_item/dangerous/pistol
+ name = "Stechkin Pistol"
+ desc = "A small, easily concealable handgun that uses 10mm auto rounds in 8-round magazines and is compatible \
+ with suppressors."
+ item = /obj/item/gun/ballistic/automatic/pistol
+ cost = 7
+ exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/dangerous/revolver
+ name = "Syndicate Revolver Kit"
+ desc = "A sleek box containing a brutally simple Syndicate revolver that fires .357 Magnum rounds and has 7 chambers, and an extra speedloader."
+ item = /obj/item/storage/box/syndie_kit/revolver
+ cost = 13
+ surplus = 50
+ exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/dangerous/rawketlawnchair
+ name = "84mm Rocket Propelled Grenade Launcher"
+ desc = "A reusable rocket propelled grenade launcher preloaded with a low-yield 84mm HE round. \
+ Guaranteed to send your target out with a bang or your money back!"
+ item = /obj/item/gun/ballistic/rocketlauncher
+ cost = 8
+ surplus = 30
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/dangerous/antitank
+ name = "Anti Tank Pistol"
+ desc = "Essentially amounting to a sniper rifle with no stock and barrel (or indeed, any rifling at all), \
+ this extremely dubious pistol is guaranteed to dislocate your wrists and hit the broad side of a barn! \
+ Uses sniper ammo. \
+ Bullets tend to veer off-course. We are not responsible for any unintentional damage or injury resulting from inaacuracy."
+ item = /obj/item/gun/ballistic/automatic/pistol/antitank/syndicate
+ cost = 14
+ surplus = 25
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/dangerous/pie_cannon
+ name = "Banana Cream Pie Cannon"
+ desc = "A special pie cannon for a special clown, this gadget can hold up to 20 pies and automatically fabricates one every two seconds!"
+ cost = 10
+ item = /obj/item/pneumatic_cannon/pie/selfcharge
+ surplus = 0
+ include_modes = list(/datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/dangerous/bananashield
+ name = "Bananium Energy Shield"
+ desc = "A clown's most powerful defensive weapon, this personal shield provides near immunity to ranged energy attacks \
+ by bouncing them back at the ones who fired them. It can also be thrown to bounce off of people, slipping them, \
+ and returning to you even if you miss. WARNING: DO NOT ATTEMPT TO STAND ON SHIELD WHILE DEPLOYED, EVEN IF WEARING ANTI-SLIP SHOES."
+ item = /obj/item/shield/energy/bananium
+ cost = 16
+ surplus = 0
+ include_modes = list(/datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/dangerous/clownsword
+ name = "Bananium Energy Sword"
+ desc = "An energy sword that deals no damage, but will slip anyone it contacts, be it by melee attack, thrown \
+ impact, or just stepping on it. Beware friendly fire, as even anti-slip shoes will not protect against it."
+ item = /obj/item/melee/transforming/energy/sword/bananium
+ cost = 3
+ surplus = 0
+ include_modes = list(/datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/dangerous/bioterror
+ name = "Biohazardous Chemical Sprayer"
+ desc = "A handheld chemical sprayer that allows a wide dispersal of selected chemicals. Especially tailored by the Tiger \
+ Cooperative, the deadly blend it comes stocked with will disorient, damage, and disable your foes... \
+ Use with extreme caution, to prevent exposure to yourself and your fellow operatives."
+ item = /obj/item/reagent_containers/spray/chemsprayer/bioterror
+ cost = 20
+ surplus = 0
+ include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/dangerous/throwingweapons
+ name = "Box of Throwing Weapons"
+ desc = "A box of shurikens and reinforced bolas from ancient Earth martial arts. They are highly effective \
+ throwing weapons. The bolas can knock a target down and the shurikens will embed into limbs."
+ item = /obj/item/storage/box/syndie_kit/throwing_weapons
+ cost = 3
+
+/datum/uplink_item/dangerous/shotgun
+ name = "Bulldog Shotgun"
+ desc = "A fully-loaded semi-automatic drum-fed shotgun. Compatible with all 12g rounds. Designed for close \
+ quarter anti-personnel engagements."
+ item = /obj/item/gun/ballistic/automatic/shotgun/bulldog
+ cost = 8
+ surplus = 40
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/dangerous/smg
+ name = "C-20r Submachine Gun"
+ desc = "A fully-loaded Scarborough Arms bullpup submachine gun. The C-20r fires .45 rounds with a \
+ 24-round magazine and is compatible with suppressors."
+ item = /obj/item/gun/ballistic/automatic/c20r
+ cost = 10
+ surplus = 40
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/dangerous/doublesword
+ name = "Double-Bladed Energy Sword"
+ desc = "The double-bladed energy sword does slightly more damage than a standard energy sword and will deflect \
+ all energy projectiles, but requires two hands to wield."
+ item = /obj/item/twohanded/dualsaber
+ player_minimum = 25
+ cost = 16
+ exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/dangerous/doublesword/get_discount()
+ return pick(4;0.8,2;0.65,1;0.5)
+
+/datum/uplink_item/dangerous/cxneb
+ name = "Dragon's Tooth Non-Eutactic Blade"
+ desc = "An illegal modification of a weapon that is functionally identical to the energy sword, \
+ the Non-Eutactic Blade (NEB) forges a hardlight blade on-demand, \
+ generating an extremely sharp, unbreakable edge that is guaranteed to satisfy your every need. \
+ This particular model has a polychromic hardlight generator, allowing you to murder in style! \
+ The illegal modifications bring this weapon up to par with the classic energy sword, and also gives it the energy sword's distinctive sounds."
+ item = /obj/item/melee/transforming/energy/sword/cx/traitor
+ cost = 8
+
+/datum/uplink_item/dangerous/sword
+ name = "Energy Sword"
+ desc = "The energy sword is an edged weapon with a blade of pure energy. The sword is small enough to be \
+ pocketed when inactive. Activating it produces a loud, distinctive noise."
+ item = /obj/item/melee/transforming/energy/sword/saber
+ cost = 8
+ exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/dangerous/shield
+ name = "Energy Shield"
+ desc = "An incredibly useful personal shield projector, capable of reflecting energy projectiles and defending \
+ against other attacks. Pair with an Energy Sword for a killer combination."
+ item = /obj/item/shield/energy
+ cost = 16
+ surplus = 20
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/dangerous/rapier
+ name = "Rapier"
+ desc = "A fancy rapier with a diamond tip piercing anything that it comes into contack with. \
+ The rapier comes with its own sheath, this is rather noticeable as only the captain is known to carry a sheath. \
+ The sheath itself can be used to block melee attacks only. Its also jet black colours."
+ item = /obj/item/storage/belt/sabre/rapier
+ cost = 8
+ exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/dangerous/flamethrower
+ name = "Flamethrower"
+ desc = "A flamethrower, fueled by a portion of highly flammable biotoxins stolen previously from Nanotrasen \
+ stations. Make a statement by roasting the filth in their own greed. Use with caution."
+ item = /obj/item/flamethrower/full/tank
+ cost = 4
+ surplus = 40
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/dangerous/flechettegun
+ name = "Flechette Launcher"
+ desc = "A compact bullpup that fires micro-flechettes.\
+ Flechettes have very poor performance idividually, but can be very deadly in numbers. \
+ Pre-loaded with armor piercing flechettes that are capable of puncturing most kinds of armor."
+ item = /obj/item/gun/ballistic/automatic/flechette
+ cost = 12
+ surplus = 30
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/dangerous/rapid
+ name = "Gloves of the North Star"
+ desc = "These gloves let the user punch people very fast. Does not improve weapon attack speed or the meaty fists of a hulk."
+ item = /obj/item/clothing/gloves/rapid
+ cost = 8
+
+/datum/uplink_item/dangerous/guardian
+ name = "Holoparasites"
+ desc = "Though capable of near sorcerous feats via use of hardlight holograms and nanomachines, they require an \
+ organic host as a home base and source of fuel. Holoparasites come in various types and share damage with their host."
+ item = /obj/item/storage/box/syndie_kit/guardian
+ cost = 15
+ refundable = TRUE
+ cant_discount = TRUE
+ surplus = 0
+ exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+ player_minimum = 25
+ restricted = TRUE
+ refund_path = /obj/item/guardiancreator/tech/choose/traitor
+
+/datum/uplink_item/dangerous/machinegun
+ name = "L6 Squad Automatic Weapon"
+ desc = "A fully-loaded Aussec Armoury belt-fed machine gun. \
+ This deadly weapon has a massive 50-round magazine of devastating 1.95x129mm ammunition."
+ item = /obj/item/gun/ballistic/automatic/l6_saw
+ cost = 18
+ surplus = 0
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/dangerous/carbine
+ name = "M-90gl Carbine"
+ desc = "A fully-loaded, specialized three-round burst carbine that fires 5.56mm ammunition from a 30 round magazine \
+ with a toggleable 40mm underbarrel grenade launcher."
+ item = /obj/item/gun/ballistic/automatic/m90
+ cost = 18
+ surplus = 50
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/dangerous/powerfist
+ name = "Power Fist"
+ desc = "The power-fist is a metal gauntlet with a built-in piston-ram powered by an external gas supply.\
+ Upon hitting a target, the piston-ram will extend forward to make contact for some serious damage. \
+ Using a wrench on the piston valve will allow you to tweak the amount of gas used per punch to \
+ deal extra damage and hit targets further. Use a screwdriver to take out any attached tanks."
+ item = /obj/item/melee/powerfist
+ cost = 8
+
+/datum/uplink_item/dangerous/sniper
+ name = "Sniper Rifle"
+ desc = "Ranged fury, Syndicate style. Guaranteed to cause shock and awe or your TC back!"
+ item = /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate
+ cost = 16
+ surplus = 25
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/dangerous/bolt_action
+ name = "Surplus Rifle"
+ desc = "A horribly outdated bolt action weapon. You've got to be desperate to use this."
+ item = /obj/item/gun/ballistic/shotgun/boltaction
+ cost = 2
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/dangerous/foamsmg
+ name = "Toy Submachine Gun"
+ desc = "A fully-loaded Donksoft bullpup submachine gun that fires riot grade darts with a 20-round magazine."
+ item = /obj/item/gun/ballistic/automatic/c20r/toy
+ cost = 5
+ surplus = 0
+ include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/dangerous/foammachinegun
+ name = "Toy Machine Gun"
+ desc = "A fully-loaded Donksoft belt-fed machine gun. This weapon has a massive 50-round magazine of devastating \
+ riot grade darts, that can briefly incapacitate someone in just one volley."
+ item = /obj/item/gun/ballistic/automatic/l6_saw/toy
+ cost = 10
+ surplus = 0
+ include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/dangerous/foampistol
+ name = "Toy Pistol with Riot Darts"
+ desc = "An innocent-looking toy pistol designed to fire foam darts. Comes loaded with riot-grade \
+ darts effective at incapacitating a target."
+ item = /obj/item/gun/ballistic/automatic/toy/pistol/riot
+ cost = 3
+ surplus = 10
\ No newline at end of file
diff --git a/code/modules/uplink/uplink_items/uplink_devices.dm b/code/modules/uplink/uplink_items/uplink_devices.dm
new file mode 100644
index 0000000000..70c70a61b9
--- /dev/null
+++ b/code/modules/uplink/uplink_items/uplink_devices.dm
@@ -0,0 +1,251 @@
+
+/*
+ Uplink Items:
+ Unlike categories, uplink item entries are automatically sorted alphabetically on server init in a global list,
+ When adding new entries to the file, please keep them sorted by category.
+*/
+
+// Devices and Tools
+
+/datum/uplink_item/device_tools/emag
+ name = "Cryptographic Sequencer"
+ desc = "The cryptographic sequencer, electromagnetic card, or emag, is a small card that unlocks hidden functions \
+ in electronic devices, subverts intended functions, and easily breaks security mechanisms."
+ item = /obj/item/card/emag
+ cost = 6
+
+/datum/uplink_item/device_tools/emagrecharge
+ name = "Electromagnet Charging Device"
+ desc = "A small device intended for recharging Cryptographic Sequencers. Using it will add five extra charges to the Cryptographic Sequencer."
+ item = /obj/item/emagrecharge
+ cost = 2
+
+/datum/uplink_item/device_tools/phantomthief
+ name = "Syndicate Mask"
+ desc = "A cheap plastic mask fitted with an adrenaline autoinjector, which can be used by simply tensing your muscles"
+ item = /obj/item/clothing/glasses/phantomthief/syndicate
+ cost = 2
+
+/datum/uplink_item/device_tools/cutouts
+ name = "Adaptive Cardboard Cutouts"
+ desc = "These cardboard cutouts are coated with a thin material that prevents discoloration and makes the images on them appear more lifelike. \
+ This pack contains three as well as a crayon for changing their appearances."
+ item = /obj/item/storage/box/syndie_kit/cutouts
+ cost = 1
+ surplus = 20
+
+/datum/uplink_item/device_tools/assault_pod
+ name = "Assault Pod Targeting Device"
+ desc = "Use this to select the landing zone of your assault pod."
+ item = /obj/item/assault_pod
+ cost = 30
+ surplus = 0
+ include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+ restricted = TRUE
+
+/datum/uplink_item/device_tools/binary
+ name = "Binary Translator Key"
+ desc = "A key that, when inserted into a radio headset, allows you to listen to and talk with silicon-based lifeforms, \
+ such as AI units and cyborgs, over their private binary channel. Caution should \
+ be taken while doing this, as unless they are allied with you, they are programmed to report such intrusions."
+ item = /obj/item/encryptionkey/binary
+ cost = 2
+ surplus = 75
+ restricted = TRUE
+
+/datum/uplink_item/device_tools/magboots
+ name = "Blood-Red Magboots"
+ desc = "A pair of magnetic boots with a Syndicate paintjob that assist with freer movement in space or on-station \
+ during gravitational generator failures. These reverse-engineered knockoffs of Nanotrasen's \
+ 'Advanced Magboots' slow you down in simulated-gravity environments much like the standard issue variety."
+ item = /obj/item/clothing/shoes/magboots/syndie
+ cost = 2
+ include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/device_tools/compressionkit
+ name = "Bluespace Compression Kit"
+ desc = "A modified version of a BSRPED that can be used to reduce the size of most items while retaining their original functions! \
+ Does not work on storage items. \
+ Recharge using bluespace crystals. \
+ Comes with 5 charges."
+ item = /obj/item/compressionkit
+ cost = 5
+
+/datum/uplink_item/device_tools/briefcase_launchpad
+ name = "Briefcase Launchpad"
+ desc = "A briefcase containing a launchpad, a device able to teleport items and people to and from targets up to twenty tiles away from the briefcase. \
+ Also includes a remote control, disguised as an ordinary folder. Touch the briefcase with the remote to link it."
+ surplus = 0
+ item = /obj/item/storage/briefcase/launchpad
+ cost = 6
+
+/datum/uplink_item/device_tools/camera_bug
+ name = "Camera Bug"
+ desc = "Enables you to view all cameras on the main network, set up motion alerts and track a target. \
+ Bugging cameras allows you to disable them remotely."
+ item = /obj/item/camera_bug
+ cost = 1
+ surplus = 90
+
+/datum/uplink_item/device_tools/military_belt
+ name = "Chest Rig"
+ desc = "A robust seven-slot set of webbing that is capable of holding all manner of tactical equipment."
+ item = /obj/item/storage/belt/military
+ cost = 1
+ exclude_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/device_tools/fakenucleardisk
+ name = "Decoy Nuclear Authentication Disk"
+ desc = "It's just a normal disk. Visually it's identical to the real deal, but it won't hold up under closer scrutiny by the Captain. \
+ Don't try to give this to us to complete your objective, we know better!"
+ item = /obj/item/disk/nuclear/fake
+ cost = 1
+ surplus = 1
+
+/datum/uplink_item/device_tools/frame
+ name = "F.R.A.M.E. PDA Cartridge"
+ desc = "When inserted into a personal digital assistant, this cartridge gives you five PDA viruses which \
+ when used cause the targeted PDA to become a new uplink with zero TCs, and immediately become unlocked. \
+ You will receive the unlock code upon activating the virus, and the new uplink may be charged with \
+ telecrystals normally."
+ item = /obj/item/cartridge/virus/frame
+ cost = 2
+ restricted = TRUE
+
+/datum/uplink_item/device_tools/toolbox
+ name = "Full Syndicate Toolbox"
+ desc = "The Syndicate toolbox is a suspicious black and red. It comes loaded with a full tool set including a \
+ multitool and combat gloves that are resistant to shocks and heat."
+ item = /obj/item/storage/toolbox/syndicate
+ cost = 1
+
+/datum/uplink_item/device_tools/syndie_glue
+ name = "Glue"
+ desc = "A cheap bottle of one use syndicate brand super glue. \
+ Use on any item to make it undroppable. \
+ Be careful not to glue an item you're already holding!"
+ exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+ item = /obj/item/syndie_glue
+ cost = 2
+
+/datum/uplink_item/device_tools/hacked_module
+ name = "Hacked AI Law Upload Module"
+ desc = "When used with an upload console, this module allows you to upload priority laws to an artificial intelligence. \
+ Be careful with wording, as artificial intelligences may look for loopholes to exploit."
+ item = /obj/item/aiModule/syndicate
+ cost = 9
+
+/datum/uplink_item/device_tools/medgun
+ name = "Medbeam Gun"
+ desc = "A wonder of Syndicate engineering, the Medbeam gun, or Medi-Gun enables a medic to keep his fellow \
+ operatives in the fight, even while under fire. Don't cross the streams!"
+ item = /obj/item/gun/medbeam
+ cost = 15
+ include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/device_tools/nutcracker
+ name = "Nutcracker"
+ desc = "An oversized version of what you'd initially expect here. Big enough to crush skulls."
+ item = /obj/item/nutcracker
+ cost = 1
+
+/datum/uplink_item/device_tools/singularity_beacon
+ name = "Power Beacon"
+ desc = "When screwed to wiring attached to an electric grid and activated, this large device pulls any \
+ active gravitational singularities or tesla balls towards it (provided they are not safely \
+ contained), as well as increasing the odds of incoming meteor waves. \
+ Because of its size, it cannot be carried. Ordering this sends you a small beacon \
+ that will teleport the larger beacon to your location upon activation."
+ item = /obj/item/sbeacondrop
+ cost = 14
+
+/datum/uplink_item/device_tools/powersink
+ name = "Power Sink"
+ desc = "When screwed to wiring attached to a power grid and activated, this large device lights up and places excessive \
+ load on the grid, causing a station-wide blackout. The sink is large and cannot be stored in most \
+ traditional bags and boxes. Caution: Will explode if the powernet contains sufficient amounts of energy."
+ item = /obj/item/powersink
+ cost = 6
+
+/datum/uplink_item/device_tools/rad_laser
+ name = "Radioactive Microlaser"
+ desc = "A radioactive microlaser disguised as a standard Nanotrasen health analyzer. When used, it emits a \
+ powerful burst of radiation, which, after a short delay, can incapacitate all but the most protected \
+ of humanoids. It has two settings: intensity, which controls the power of the radiation, \
+ and wavelength, which controls the delay before the effect kicks in."
+ item = /obj/item/healthanalyzer/rad_laser
+ cost = 3
+
+/datum/uplink_item/device_tools/stimpack
+ name = "Stimpack"
+ desc = "Stimpacks, the tool of many great heroes, make you nearly immune to stuns and knockdowns for about \
+ 5 minutes after injection."
+ item = /obj/item/reagent_containers/syringe/stimulants
+ cost = 5
+ surplus = 90
+
+/datum/uplink_item/device_tools/medkit
+ name = "Syndicate Combat Medic Kit"
+ desc = "This first aid kit is a suspicious brown and red. Included is a combat stimulant injector \
+ for rapid healing, a medical night vision HUD for quick identification of injured personnel, \
+ and other supplies helpful for a field medic."
+ item = /obj/item/storage/firstaid/tactical/nukeop
+ cost = 4
+ include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/device_tools/surgerybag
+ name = "Syndicate Surgery Duffel Bag"
+ desc = "The Syndicate surgery duffel bag is a toolkit containing all surgery tools, surgical drapes, \
+ a Syndicate brand MMI, a straitjacket, and a muzzle."
+ item = /obj/item/storage/backpack/duffelbag/syndie/surgery
+ cost = 3
+
+/datum/uplink_item/device_tools/surgerybag_adv
+ name = "Advanced Syndicate Surgery Duffel Bag"
+ desc = "The Syndicate surgery duffel bag is a toolkit containing all advanced surgery tools, surgical drapes, \
+ a Syndicate brand MMI, a straitjacket, a muzzle, and an outdated, yet still useful Combat Medic Kit."
+ item = /obj/item/storage/backpack/duffelbag/syndie/surgery_adv
+ cost = 10
+
+/datum/uplink_item/device_tools/brainwash_disk
+ name = "Brainwashing Surgery Program"
+ desc = "A disk containing the procedure to perform a brainwashing surgery, allowing you to implant an objective onto a target. \
+ Insert into an Operating Console to enable the procedure."
+ item = /obj/item/disk/surgery/brainwashing
+ cost = 3
+
+/datum/uplink_item/device_tools/encryptionkey
+ name = "Syndicate Encryption Key"
+ desc = "A key that, when inserted into a radio headset, allows you to listen to all station department channels \
+ as well as talk on an encrypted Syndicate channel with other agents that have the same key."
+ item = /obj/item/encryptionkey/syndicate
+ cost = 2
+ surplus = 75
+ restricted = TRUE
+
+/datum/uplink_item/device_tools/syndietome
+ name = "Syndicate Tome"
+ desc = "Using rare artifacts acquired at great cost, the Syndicate has reverse engineered \
+ the seemingly magical books of a certain cult. Though lacking the esoteric abilities \
+ of the originals, these inferior copies are still quite useful, being able to provide \
+ both weal and woe on the battlefield, even if they do occasionally bite off a finger."
+ item = /obj/item/storage/book/bible/syndicate
+ cost = 9
+
+/datum/uplink_item/device_tools/thermal
+ name = "Thermal Imaging Glasses"
+ desc = "These goggles can be turned to resemble common eyewear found throughout the station. \
+ They allow you to see organisms through walls by capturing the upper portion of the infrared light spectrum, \
+ emitted as heat and light by objects. Hotter objects, such as warm bodies, cybernetic organisms \
+ and artificial intelligence cores emit more of this light than cooler objects like walls and airlocks."
+ item = /obj/item/clothing/glasses/thermal/syndi
+ cost = 4
+
+/datum/uplink_item/device_tools/potion
+ name = "Syndicate Sentience Potion"
+ item = /obj/item/slimepotion/slime/sentience/nuclear
+ desc = "A potion recovered at great risk by undercover Syndicate operatives and then subsequently modified with Syndicate technology. \
+ Using it will make any animal sentient, and bound to serve you, as well as implanting an internal radio for communication and an internal ID card for opening doors."
+ cost = 2
+ include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+ restricted = TRUE
diff --git a/code/modules/uplink/uplink_items/uplink_explosives.dm b/code/modules/uplink/uplink_items/uplink_explosives.dm
new file mode 100644
index 0000000000..4db8643a66
--- /dev/null
+++ b/code/modules/uplink/uplink_items/uplink_explosives.dm
@@ -0,0 +1,161 @@
+
+/*
+ Uplink Items:
+ Unlike categories, uplink item entries are automatically sorted alphabetically on server init in a global list,
+ When adding new entries to the file, please keep them sorted by category.
+*/
+
+//Grenades and Explosives
+
+/datum/uplink_item/explosives/bioterrorfoam
+ name = "Bioterror Foam Grenade"
+ desc = "A powerful chemical foam grenade which creates a deadly torrent of foam that will mute, blind, confuse, \
+ mutate, and irritate carbon lifeforms. Specially brewed by Tiger Cooperative chemical weapons specialists \
+ using additional spore toxin. Ensure suit is sealed before use."
+ item = /obj/item/grenade/chem_grenade/bioterrorfoam
+ cost = 5
+ surplus = 35
+ include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/explosives/bombanana
+ name = "Bombanana"
+ desc = "A banana with an explosive taste! discard the peel quickly, as it will explode with the force of a syndicate minibomb \
+ a few seconds after the banana is eaten."
+ item = /obj/item/reagent_containers/food/snacks/grown/banana/bombanana
+ cost = 4 //it is a bit cheaper than a minibomb because you have to take off your helmet to eat it, which is how you arm it
+ surplus = 0
+ include_modes = list(/datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/explosives/buzzkill
+ name = "Buzzkill Grenade Box"
+ desc = "A box with three grenades that release a swarm of angry bees upon activation. These bees indiscriminately attack friend or foe \
+ with random toxins. Courtesy of the BLF and Tiger Cooperative."
+ item = /obj/item/storage/box/syndie_kit/bee_grenades
+ cost = 15
+ surplus = 35
+ include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/explosives/c4
+ name = "Composition C-4"
+ desc = "C-4 is plastic explosive of the common variety Composition C. You can use it to breach walls, sabotage equipment, or connect \
+ an assembly to it in order to alter the way it detonates. It can be attached to almost all objects and has a modifiable timer with a \
+ minimum setting of 10 seconds."
+ item = /obj/item/grenade/plastic/c4
+ cost = 1
+
+/datum/uplink_item/explosives/c4bag
+ name = "Bag of C-4 explosives"
+ desc = "Because sometimes quantity is quality. Contains 10 C-4 plastic explosives."
+ item = /obj/item/storage/backpack/duffelbag/syndie/c4
+ cost = 9 //10% discount!
+ cant_discount = TRUE
+
+/datum/uplink_item/explosives/x4bag
+ name = "Bag of X-4 explosives"
+ desc = "Contains 3 X-4 shaped plastic explosives. Similar to C4, but with a stronger blast that is directional instead of circular. \
+ X-4 can be placed on a solid surface, such as a wall or window, and it will blast through the wall, injuring anything on the opposite side, while being safer to the user. \
+ For when you want a controlled explosion that leaves a wider, deeper, hole."
+ item = /obj/item/storage/backpack/duffelbag/syndie/x4
+ cost = 4 //
+ cant_discount = TRUE
+
+/datum/uplink_item/explosives/clown_bomb_clownops
+ name = "Clown Bomb"
+ desc = "The Clown bomb is a hilarious device capable of massive pranks. It has an adjustable timer, \
+ with a minimum of 60 seconds, and can be bolted to the floor with a wrench to prevent \
+ movement. The bomb is bulky and cannot be moved; upon ordering this item, a smaller beacon will be \
+ transported to you that will teleport the actual bomb to it upon activation. Note that this bomb can \
+ be defused, and some crew may attempt to do so."
+ item = /obj/item/sbeacondrop/clownbomb
+ cost = 15
+ surplus = 0
+ include_modes = list(/datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/explosives/detomatix
+ name = "Detomatix PDA Cartridge"
+ desc = "When inserted into a personal digital assistant, this cartridge gives you four opportunities to \
+ detonate PDAs of crewmembers who have their message feature enabled. \
+ The concussive effect from the explosion will knock the recipient out for a short period, and deafen them for longer."
+ item = /obj/item/cartridge/virus/syndicate
+ cost = 5
+ restricted = TRUE
+
+/datum/uplink_item/explosives/emp
+ name = "EMP Grenades and Implanter Kit"
+ desc = "A box that contains five EMP grenades and an EMP implant with three uses. Useful to disrupt communications, \
+ security's energy weapons and silicon lifeforms when you're in a tight spot."
+ item = /obj/item/storage/box/syndie_kit/emp
+ cost = 2
+
+/datum/uplink_item/explosives/virus_grenade
+ name = "Fungal Tuberculosis Grenade"
+ desc = "A primed bio-grenade packed into a compact box. Comes with five Bio Virus Antidote Kit (BVAK) \
+ autoinjectors for rapid application on up to two targets each, a syringe, and a bottle containing \
+ the BVAK solution."
+ item = /obj/item/storage/box/syndie_kit/tuberculosisgrenade
+ cost = 8
+ surplus = 35
+ include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+ restricted = TRUE
+
+/datum/uplink_item/explosives/grenadier
+ name = "Grenadier's belt"
+ desc = "A belt containing 26 lethally dangerous and destructive grenades. Comes with an extra multitool and screwdriver."
+ item = /obj/item/storage/belt/grenade/full
+ include_modes = list(/datum/game_mode/nuclear)
+ cost = 22
+ surplus = 0
+
+/datum/uplink_item/explosives/pizza_bomb
+ name = "Pizza Bomb"
+ desc = "A pizza box with a bomb cunningly attached to the lid. The timer needs to be set by opening the box; afterwards, \
+ opening the box again will trigger the detonation after the timer has elapsed. Comes with free pizza, for you or your target!"
+ item = /obj/item/pizzabox/bomb
+ cost = 6
+ surplus = 8
+
+/datum/uplink_item/explosives/syndicate_bomb
+ name = "Syndicate Bomb"
+ desc = "The Syndicate bomb is a fearsome device capable of massive destruction. It has an adjustable timer, \
+ with a minimum of 60 seconds, and can be bolted to the floor with a wrench to prevent \
+ movement. The bomb is bulky and cannot be moved; upon ordering this item, a smaller beacon will be \
+ transported to you that will teleport the actual bomb to it upon activation. Note that this bomb can \
+ be defused, and some crew may attempt to do so."
+ item = /obj/item/sbeacondrop/bomb
+ cost = 11
+
+/datum/uplink_item/explosives/syndicate_detonator
+ name = "Syndicate Detonator"
+ desc = "The Syndicate detonator is a companion device to the Syndicate bomb. Simply press the included button \
+ and an encrypted radio frequency will instruct all live Syndicate bombs to detonate. \
+ Useful for when speed matters or you wish to synchronize multiple bomb blasts. Be sure to stand clear of \
+ the blast radius before using the detonator."
+ item = /obj/item/syndicatedetonator
+ cost = 3
+ include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/explosives/syndicate_minibomb
+ name = "Syndicate Minibomb"
+ desc = "The minibomb is a grenade with a five-second fuse. Upon detonation, it will create a small hull breach \
+ in addition to dealing high amounts of damage to nearby personnel."
+ item = /obj/item/grenade/syndieminibomb
+ cost = 6
+ exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/explosives/tearstache
+ name = "Teachstache Grenade"
+ desc = "A teargas grenade that launches sticky moustaches onto the face of anyone not wearing a clown or mime mask. The moustaches will \
+ remain attached to the face of all targets for one minute, preventing the use of breath masks and other such devices."
+ item = /obj/item/grenade/chem_grenade/teargas/moustache
+ cost = 3
+ surplus = 0
+ include_modes = list(/datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/explosives/viscerators
+ name = "Viscerator Delivery Grenade"
+ desc = "A unique grenade that deploys a swarm of viscerators upon activation, which will chase down and shred \
+ any non-operatives in the area."
+ item = /obj/item/grenade/spawnergrenade/manhacks
+ cost = 5
+ surplus = 35
+ include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
diff --git a/code/modules/uplink/uplink_items/uplink_implants.dm b/code/modules/uplink/uplink_items/uplink_implants.dm
new file mode 100644
index 0000000000..3262809cb5
--- /dev/null
+++ b/code/modules/uplink/uplink_items/uplink_implants.dm
@@ -0,0 +1,102 @@
+
+/*
+ Uplink Items:
+ Unlike categories, uplink item entries are automatically sorted alphabetically on server init in a global list,
+ When adding new entries to the file, please keep them sorted by category.
+*/
+
+// Implants
+
+/datum/uplink_item/implants/adrenal
+ name = "Adrenal Implant"
+ desc = "An implant injected into the body, and later activated at the user's will. It will inject a chemical \
+ cocktail which removes all incapacitating effects, lets the user run faster and has a mild healing effect."
+ item = /obj/item/storage/box/syndie_kit/imp_adrenal
+ cost = 8
+ player_minimum = 25
+
+/datum/uplink_item/implants/antistun
+ name = "CNS Rebooter Implant"
+ desc = "This implant will help you get back up on your feet faster after being stunned. Comes with an autosurgeon."
+ item = /obj/item/autosurgeon/anti_stun
+ cost = 12
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/implants/freedom
+ name = "Freedom Implant"
+ desc = "An implant injected into the body and later activated at the user's will. It will attempt to free the \
+ user from common restraints such as handcuffs."
+ item = /obj/item/storage/box/syndie_kit/imp_freedom
+ cost = 5
+
+/datum/uplink_item/implants/microbomb
+ name = "Microbomb Implant"
+ desc = "An implant injected into the body, and later activated either manually or automatically upon death. \
+ The more implants inside of you, the higher the explosive power. \
+ This will permanently destroy your body, however."
+ item = /obj/item/storage/box/syndie_kit/imp_microbomb
+ cost = 2
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/implants/macrobomb
+ name = "Macrobomb Implant"
+ desc = "An implant injected into the body, and later activated either manually or automatically upon death. \
+ Upon death, releases a massive explosion that will wipe out everything nearby."
+ item = /obj/item/storage/box/syndie_kit/imp_macrobomb
+ cost = 20
+ include_modes = list(/datum/game_mode/nuclear)
+ restricted = TRUE
+
+/datum/uplink_item/implants/radio
+ name = "Internal Syndicate Radio Implant"
+ desc = "An implant injected into the body, allowing the use of an internal Syndicate radio. \
+ Used just like a regular headset, but can be disabled to use external headsets normally and to avoid detection."
+ item = /obj/item/storage/box/syndie_kit/imp_radio
+ cost = 4
+ restricted = TRUE
+
+/datum/uplink_item/implants/reviver
+ name = "Reviver Implant"
+ desc = "This implant will attempt to revive and heal you if you lose consciousness. Comes with an autosurgeon."
+ item = /obj/item/autosurgeon/reviver
+ cost = 8
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/implants/stealthimplant
+ name = "Stealth Implant"
+ desc = "This one-of-a-kind implant will make you almost invisible as long as you don't don't excessively move around. \
+ On activation, it will conceal you inside a chameleon cardboard box that is only revealed once someone bumps into it."
+ item = /obj/item/implanter/stealth
+ cost = 8
+
+/datum/uplink_item/implants/storage
+ name = "Storage Implant"
+ desc = "An implant injected into the body, and later activated at the user's will. It will open a small bluespace \
+ pocket capable of storing two regular-sized items."
+ item = /obj/item/storage/box/syndie_kit/imp_storage
+ cost = 8
+
+/datum/uplink_item/implants/thermals
+ name = "Thermal Eyes"
+ desc = "These cybernetic eyes will give you thermal vision. Comes with a free autosurgeon."
+ item = /obj/item/autosurgeon/thermal_eyes
+ cost = 8
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/implants/uplink
+ name = "Uplink Implant"
+ desc = "An implant injected into the body, and later activated at the user's will. Has no telecrystals and must be charged by the use of physical telecrystals. \
+ Undetectable (except via surgery), and excellent for escaping confinement."
+ item = /obj/item/storage/box/syndie_kit/imp_uplink
+ cost = 4
+ // An empty uplink is kinda useless.
+ surplus = 0
+ restricted = TRUE
+
+/datum/uplink_item/implants/xray
+ name = "X-ray Vision Implant"
+ desc = "These cybernetic eyes will give you X-ray vision. Comes with an autosurgeon."
+ item = /obj/item/autosurgeon/xray_eyes
+ cost = 10
+ surplus = 0
+ include_modes = list(/datum/game_mode/nuclear)
diff --git a/code/modules/uplink/uplink_items/uplink_roles.dm b/code/modules/uplink/uplink_items/uplink_roles.dm
new file mode 100644
index 0000000000..89d3c25700
--- /dev/null
+++ b/code/modules/uplink/uplink_items/uplink_roles.dm
@@ -0,0 +1,226 @@
+
+/*
+ Uplink Items:
+ Unlike categories, uplink item entries are automatically sorted alphabetically on server init in a global list,
+ When adding new entries to the file, please keep them sorted by category.
+*/
+
+// Role-specific items
+
+/datum/uplink_item/role_restricted/ancient_jumpsuit
+ name = "Ancient Jumpsuit"
+ desc = "A tattered old jumpsuit that will provide absolutely no benefit to you. It fills the wearer with a strange compulsion to blurt out 'glorf'."
+ item = /obj/item/clothing/under/color/grey/glorf
+ cost = 20
+ restricted_roles = list("Assistant")
+
+/datum/uplink_item/role_restricted/pie_cannon
+ name = "Banana Cream Pie Cannon"
+ desc = "A special pie cannon for a special clown, this gadget can hold up to 20 pies and automatically fabricates one every two seconds!"
+ cost = 10
+ item = /obj/item/pneumatic_cannon/pie/selfcharge
+ restricted_roles = list("Clown")
+
+/datum/uplink_item/role_restricted/blastcannon
+ name = "Blast Cannon"
+ desc = "A highly specialized weapon, the Blast Cannon is actually relatively simple. It contains an attachment for a tank transfer valve mounted to an angled pipe specially constructed \
+ withstand extreme pressure and temperatures, and has a mechanical trigger for triggering the transfer valve. Essentially, it turns the explosive force of a bomb into a narrow-angle \
+ blast wave \"projectile\". Aspiring scientists may find this highly useful, as forcing the pressure shockwave into a narrow angle seems to be able to bypass whatever quirk of physics \
+ disallows explosive ranges above a certain distance, allowing for the device to use the theoretical yield of a transfer valve bomb, instead of the factual yield."
+ item = /obj/item/gun/blastcannon
+ cost = 14 //High cost because of the potential for extreme damage in the hands of a skilled gas masked scientist.
+ restricted_roles = list("Research Director", "Scientist")
+
+/datum/uplink_item/role_restricted/alientech
+ name = "Alien Research Disk"
+ desc = "A technology disk holding a terabyte of highly confidential abductor technology. \
+ Simply insert into research console of choice and import the files from the disk. Because of its foreign nature, it may require multiple uploads to work properly."
+ item = /obj/item/disk/tech_disk/abductor
+ cost = 12
+ restricted_roles = list("Research Director", "Scientist", "Roboticist")
+
+/datum/uplink_item/role_restricted/clown_bomb
+ name = "Clown Bomb"
+ desc = "The Clown bomb is a hilarious device capable of massive pranks. It has an adjustable timer, \
+ with a minimum of 60 seconds, and can be bolted to the floor with a wrench to prevent \
+ movement. The bomb is bulky and cannot be moved; upon ordering this item, a smaller beacon will be \
+ transported to you that will teleport the actual bomb to it upon activation. Note that this bomb can \
+ be defused, and some crew may attempt to do so. \
+ The bomb core can be pried out and manually detonated with other explosives."
+ item = /obj/item/sbeacondrop/clownbomb
+ cost = 15
+ restricted_roles = list("Clown")
+
+/*
+/datum/uplink_item/role_restricted/clowncar
+ name = "Clown Car"
+ desc = "The Clown Car is the ultimate transportation method for any worthy clown! \
+ Simply insert your bikehorn and get in, and get ready to have the funniest ride of your life! \
+ You can ram any spacemen you come across and stuff them into your car, kidnapping them and locking them inside until \
+ someone saves them or they manage to crawl out. Be sure not to ram into any walls or vending machines, as the springloaded seats \
+ are very sensetive. Now with our included lube defense mechanism which will protect you against any angry shitcurity!"
+ item = /obj/vehicle/sealed/car/clowncar
+ cost = 15
+ restricted_roles = list("Clown")
+*/
+
+/datum/uplink_item/role_restricted/clumsyDNA
+ name = "Clumsy Clown DNA"
+ desc = "A DNA injector that has been loaded with the clown gene that makes people clumsy.. \
+ Making someone clumsy will allow them to use clown firing pins as well as Reverse Revolvers. For a laugh try using this on the HOS to see how many times they shoot themselves in the foot!"
+ cost = 1
+ item = /obj/item/dnainjector/clumsymut
+ restricted_roles = list("Clown")
+
+/datum/uplink_item/role_restricted/haunted_magic_eightball
+ name = "Haunted Magic Eightball"
+ desc = "Most magic eightballs are toys with dice inside. Although identical in appearance to the harmless toys, this occult device reaches into the spirit world to find its answers. \
+ Be warned, that spirits are often capricious or just little assholes. To use, simply speak your question aloud, then begin shaking."
+ item = /obj/item/toy/eightball/haunted
+ cost = 2
+ restricted_roles = list("Curator")
+ limited_stock = 1 //please don't spam deadchat
+
+/datum/uplink_item/role_restricted/his_grace
+ name = "His Grace"
+ desc = "An incredibly dangerous weapon recovered from a station overcome by the grey tide. Once activated, He will thirst for blood and must be used to kill to sate that thirst. \
+ His Grace grants gradual regeneration and complete stun immunity to His wielder, but be wary: if He gets too hungry, He will become impossible to drop and eventually kill you if not fed. \
+ However, if left alone for long enough, He will fall back to slumber. \
+ To activate His Grace, simply unlatch Him."
+ item = /obj/item/his_grace
+ cost = 20
+ restricted_roles = list("Chaplain")
+ surplus = 5 //Very low chance to get it in a surplus crate even without being the chaplain
+
+/datum/uplink_item/role_restricted/explosive_hot_potato
+ name = "Exploding Hot Potato"
+ desc = "A potato rigged with explosives. On activation, a special mechanism is activated that prevents it from being dropped. \
+ The only way to get rid of it if you are holding it is to attack someone else with it, causing it to latch to that person instead."
+ item = /obj/item/hot_potato/syndicate
+ cost = 4
+ restricted_roles = list("Cook", "Botanist", "Clown", "Mime")
+
+/datum/uplink_item/role_restricted/strange_seeds
+ name = "Pack of strange seeds"
+ desc = "Mysterious seeds as strange as their name implies. Spooky."
+ item = /obj/item/seeds/random
+ cost = 2
+ restricted_roles = list("Botanist")
+ illegal_tech = FALSE
+
+/datum/uplink_item/role_restricted/strange_seeds_10pack
+ name = "Pack of strange seeds x10"
+ desc = "Mysterious seeds as strange as their name implies. Spooky. These come in bulk"
+ item = /obj/item/storage/box/strange_seeds_10pack
+ cost = 20
+ restricted_roles = list("Botanist")
+
+/datum/uplink_item/role_restricted/ez_clean_bundle
+ name = "EZ Clean Grenade Bundle"
+ desc = "A box with three cleaner grenades using the trademark Waffle Co. formula. Serves as a cleaner and causes acid damage to anyone standing nearby. \
+ The acid only affects carbon-based creatures."
+ item = /obj/item/storage/box/syndie_kit/ez_clean
+ cost = 6
+ surplus = 20
+ restricted_roles = list("Janitor")
+
+/datum/uplink_item/role_restricted/goldenbox
+ name = "Gold Toolbox"
+ desc = "A gold planted plastitanium toolbox loaded with tools. Comes with a set of AI detection multi-tool and a pare of combat gloves."
+ item = /obj/item/storage/toolbox/gold_real
+ cost = 3 // Has syndie tools + gloves + a robust weapon
+ restricted_roles = list("Assistant", "Curator") //Curator due to this being made of gold - It fits the theme
+
+/datum/uplink_item/role_restricted/mimery
+ name = "Guide to Advanced Mimery Series"
+ desc = "The classical two part series on how to further hone your mime skills. Upon studying the series, the user should be able to make 3x1 invisible walls, and shoot bullets out of their fingers. \
+ Obviously only works for Mimes."
+ cost = 12
+ item = /obj/item/storage/box/syndie_kit/mimery
+ restricted_roles = list("Mime")
+
+/datum/uplink_item/role_restricted/ultrahonkpins
+ name = "Hilarious firing pin"
+ desc = "A single firing pin made for Clown agents, this firing pin makes any gun honk when fired if not a true clown! \
+ This firing pin also helps you fire the gun correctly. May the HonkMother HONK you agent."
+ item = /obj/item/firing_pin/clown/ultra
+ cost = 2
+ restricted_roles = list("Clown")
+
+/datum/uplink_item/role_restricted/pressure_mod
+ name = "Kinetic Accelerator Pressure Mod"
+ desc = "A modification kit which allows Kinetic Accelerators to do greatly increased damage while indoors. \
+ Occupies 35% mod capacity."
+ item = /obj/item/borg/upgrade/modkit/indoors
+ cost = 5 //you need two for full damage, so total of 10 for maximum damage
+ limited_stock = 2 //you can't use more than two!
+ restricted_roles = list("Shaft Miner")
+
+/datum/uplink_item/role_restricted/kitchen_gun
+ name = "Kitchen Gun (TM)"
+ desc = "A revolutionary .45 caliber cleaning solution! Say goodbye to daily stains and dirty surfaces with Kitchen Gun (TM)! \
+ Just five shots from Kitchen Gun (TM), and it'll sparkle like new! Includes two extra ammunition clips!"
+ cost = 10
+ surplus = 40
+ restricted_roles = list("Cook", "Janitor")
+ item = /obj/item/storage/box/syndie_kit/kitchen_gun
+
+/datum/uplink_item/role_restricted/kitchen_gun_ammo
+ name = "Kitchen Gun (TM) .45 Magazine"
+ desc = "An extra eight bullets for an extra eight uses of Kitchen Gun (TM)!"
+ cost = 1
+ restricted_roles = list("Cook", "Janitor")
+ item = /obj/item/ammo_box/magazine/m45/kitchengun
+
+/datum/uplink_item/role_restricted/magillitis_serum
+ name = "Magillitis Serum Autoinjector"
+ desc = "A single-use autoinjector which contains an experimental serum that causes rapid muscular growth in Hominidae. \
+ Side-affects may include hypertrichosis, violent outbursts, and an unending affinity for bananas."
+ item = /obj/item/reagent_containers/hypospray/magillitis
+ cost = 8
+ restricted_roles = list("Geneticist", "Chief Medical Officer")
+
+/datum/uplink_item/role_restricted/modified_syringe_gun
+ name = "Modified Syringe Gun"
+ desc = "A syringe gun that fires DNA injectors instead of normal syringes."
+ item = /obj/item/gun/syringe/dna
+ cost = 14
+ restricted_roles = list("Geneticist", "Chief Medical Officer")
+
+/datum/uplink_item/role_restricted/chemical_gun
+ name = "Reagent Dartgun"
+ desc = "A heavily modified syringe gun which is capable of synthesizing its own chemical darts using input reagents. Can hold 100u of reagents."
+ item = /obj/item/gun/chem
+ cost = 12
+ restricted_roles = list("Chemist", "Chief Medical Officer")
+
+/datum/uplink_item/role_restricted/reverse_bear_trap
+ name = "Reverse Bear Trap"
+ desc = "An ingenious execution device worn on (or forced onto) the head. Arming it starts a 1-minute kitchen timer mounted on the bear trap. When it goes off, the trap's jaws will \
+ violently open, instantly killing anyone wearing it by tearing their jaws in half. To arm, attack someone with it while they're not wearing headgear, and you will force it onto their \
+ head after three seconds uninterrupted."
+ cost = 5
+ item = /obj/item/reverse_bear_trap
+ restricted_roles = list("Clown")
+
+/datum/uplink_item/role_restricted/reverse_revolver
+ name = "Reverse Revolver"
+ desc = "A revolver that always fires at its user. \"Accidentally\" drop your weapon, then watch as the greedy corporate pigs blow their own brains all over the wall. \
+ The revolver itself is actually real. Only clumsy people, and clowns, can fire it normally. Comes in a box of hugs. Honk."
+ cost = 14
+ item = /obj/item/storage/box/hug/reverse_revolver
+ restricted_roles = list("Clown")
+
+/datum/uplink_item/role_restricted/taeclowndo_shoes
+ name = "Tae-clown-do Shoes"
+ desc = "A pair of shoes for the most elite agents of the honkmotherland. They grant the mastery of taeclowndo with some honk-fu moves as long as they're worn."
+ cost = 14
+ item = /obj/item/clothing/shoes/clown_shoes/taeclowndo
+ restricted_roles = list("Clown")
+
+/datum/uplink_item/role_restricted/emitter_cannon
+ name = "Emitter Cannon"
+ desc = "A small emitter fitted into a gun case, do to size constraints and safety it can only shoot about ten times when fully charged."
+ cost = 5 //Low ammo, and deals same as 10mm but emp-able
+ item = /obj/item/gun/energy/emitter
+ restricted_roles = list("Chief Engineer", "Station Engineer", "Atmospheric Technician")
diff --git a/code/modules/uplink/uplink_items/uplink_stealth.dm b/code/modules/uplink/uplink_items/uplink_stealth.dm
new file mode 100644
index 0000000000..65a8ad4080
--- /dev/null
+++ b/code/modules/uplink/uplink_items/uplink_stealth.dm
@@ -0,0 +1,134 @@
+
+// Stealthy Weapons
+
+/*
+ Uplink Items:
+ Unlike categories, uplink item entries are automatically sorted alphabetically on server init in a global list,
+ When adding new entries to the file, please keep them sorted by category.
+*/
+
+/datum/uplink_item/stealthy_weapons/combatglovesplus
+ name = "Combat Gloves Plus"
+ desc = "A pair of gloves that are fireproof and shock resistant, however unlike the regular Combat Gloves this one uses nanotechnology \
+ to learn the abilities of krav maga to the wearer."
+ item = /obj/item/clothing/gloves/krav_maga/combatglovesplus
+ cost = 5
+ include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+ surplus = 0
+
+/datum/uplink_item/stealthy_weapons/cqc
+ name = "CQC Manual"
+ desc = "A manual that teaches a single user tactical Close-Quarters Combat before self-destructing."
+ item = /obj/item/book/granter/martial/cqc
+ include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+ cost = 13
+ surplus = 0
+
+/datum/uplink_item/stealthy_weapons/dart_pistol
+ name = "Dart Pistol"
+ desc = "A miniaturized version of a normal syringe gun. It is very quiet when fired and can fit into any \
+ space a small item can."
+ item = /obj/item/gun/syringe/syndicate
+ cost = 4
+ surplus = 50
+
+/datum/uplink_item/stealthy_weapons/dehy_carp
+ name = "Dehydrated Space Carp"
+ desc = "Looks like a plush toy carp, but just add water and it becomes a real-life space carp! Activate in \
+ your hand before use so it knows not to kill you."
+ item = /obj/item/toy/plush/carpplushie/dehy_carp
+ cost = 1
+
+/datum/uplink_item/stealthy_weapons/edagger
+ name = "Energy Dagger"
+ desc = "A dagger made of energy that looks and functions as a pen when off."
+ item = /obj/item/pen/edagger
+ cost = 2
+
+/datum/uplink_item/stealthy_weapons/martialarts
+ name = "Sleeping Carp Scroll"
+ desc = "This scroll contains the secrets of an ancient martial arts technique. You will master unarmed combat, \
+ deflecting all ranged weapon fire, but you also refuse to use dishonorable ranged weaponry."
+ item = /obj/item/book/granter/martial/carp
+ cost = 17
+ surplus = 0
+ exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/stealthy_weapons/martialartstwo
+ name = "Rising Bass Scroll"
+ desc = "This scroll contains the secrets of an ancient martial arts technique. You will become proficient in fleeing situations, \
+ and dodging all ranged weapon fire, but you will refuse to use dishonorable ranged weaponry."
+ item = /obj/item/book/granter/martial/bass
+ cost = 18
+ surplus = 0
+ exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/stealthy_weapons/crossbow
+ name = "Miniature Energy Crossbow"
+ desc = "A short bow mounted across a tiller in miniature. Small enough to \
+ fit into a pocket or slip into a bag unnoticed. It will synthesize \
+ and fire bolts tipped with a paralyzing toxin that will briefly stun \
+ targets and cause them to slur as if inebriated. It can produce an \
+ infinite number of bolts, but takes time to automatically recharge \
+ after each shot."
+ item = /obj/item/gun/energy/kinetic_accelerator/crossbow
+ cost = 12
+ surplus = 50
+ exclude_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/stealthy_weapons/traitor_chem_bottle
+ name = "Poison Kit"
+ desc = "An assortment of deadly chemicals packed into a compact box. Comes with a syringe for more precise application."
+ item = /obj/item/storage/box/syndie_kit/chemical
+ cost = 6
+ surplus = 50
+
+/datum/uplink_item/stealthy_weapons/romerol_kit
+ name = "Romerol"
+ desc = "A highly experimental bioterror agent which creates dormant nodules to be etched into the grey matter of the brain. \
+ On death, these nodules take control of the dead body, causing limited revivification, \
+ along with slurred speech, aggression, and the ability to infect others with this agent."
+ item = /obj/item/storage/box/syndie_kit/romerol
+ cost = 25
+ cant_discount = TRUE
+ exclude_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/stealthy_weapons/sleepy_pen
+ name = "Sleepy Pen"
+ desc = "A syringe disguised as a functional pen, filled with a potent mix of drugs, including a \
+ strong anesthetic and a chemical that prevents the target from speaking. \
+ The pen holds one dose of the mixture, and can be refilled with any chemicals. Note that before the target \
+ falls asleep, they will be able to move and act."
+ item = /obj/item/pen/sleepy
+ cost = 4
+ exclude_modes = list(/datum/game_mode/nuclear)
+
+datum/uplink_item/stealthy_weapons/taeclowndo_shoes
+ name = "Tae-clown-do Shoes"
+ desc = "A pair of shoes for the most elite agents of the honkmotherland. They grant the mastery of taeclowndo with some honk-fu moves as long as they're worn."
+ cost = 12
+ item = /obj/item/clothing/shoes/clown_shoes/taeclowndo
+ include_modes = list(/datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/stealthy_weapons/suppressor
+ name = "Suppressor"
+ desc = "This suppressor will silence the shots of the weapon it is attached to for increased stealth and superior ambushing capability. \
+ It is compatible with many small ballistic guns including the Stechkin and C-20r, but not revolvers or energy guns."
+ item = /obj/item/suppressor
+ cost = 1
+ surplus = 10
+ exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/stealthy_weapons/soap
+ name = "Syndicate Soap"
+ desc = "A sinister-looking surfactant used to clean blood stains to hide murders and prevent DNA analysis. \
+ You can also drop it underfoot to slip people."
+ item = /obj/item/soap/syndie
+ cost = 1
+ surplus = 50
+
+/datum/uplink_item/stealthy_weapons/soap_clusterbang
+ name = "Slipocalypse Clusterbang"
+ desc = "A traditional clusterbang grenade with a payload consisting entirely of Syndicate soap. Useful in any scenario!"
+ item = /obj/item/grenade/clusterbuster/soap
+ cost = 6
diff --git a/code/modules/uplink/uplink_items/uplink_stealthdevices.dm b/code/modules/uplink/uplink_items/uplink_stealthdevices.dm
new file mode 100644
index 0000000000..d98548612e
--- /dev/null
+++ b/code/modules/uplink/uplink_items/uplink_stealthdevices.dm
@@ -0,0 +1,125 @@
+
+/*
+ Uplink Items:
+ Unlike categories, uplink item entries are automatically sorted alphabetically on server init in a global list,
+ When adding new entries to the file, please keep them sorted by category.
+*/
+
+// Stealth Items
+
+/datum/uplink_item/stealthy_tools/agent_card
+ name = "Agent Identification Card"
+ desc = "Agent cards prevent artificial intelligences from tracking the wearer, and can copy access \
+ from other identification cards. The access is cumulative, so scanning one card does not erase the \
+ access gained from another. In addition, they can be forged to display a new assignment and name. \
+ This can be done an unlimited amount of times. Some Syndicate areas and devices can only be accessed \
+ with these cards."
+ item = /obj/item/card/id/syndicate
+ cost = 2
+
+/datum/uplink_item/stealthy_tools/ai_detector
+ name = "Artificial Intelligence Detector"
+ desc = "A functional multitool that turns red when it detects an artificial intelligence watching it, and can be \
+ activated to display their exact viewing location and nearby security camera blind spots. Knowing when \
+ an artificial intelligence is watching you is useful for knowing when to maintain cover, and finding nearby \
+ blind spots can help you identify escape routes."
+ item = /obj/item/multitool/ai_detect
+ cost = 1
+
+/datum/uplink_item/stealthy_tools/chameleon
+ name = "Chameleon Kit"
+ desc = "A set of items that contain chameleon technology allowing you to disguise as pretty much anything on the station, and more! \
+ Due to budget cuts, the shoes don't provide protection against slipping."
+ item = /obj/item/storage/box/syndie_kit/chameleon
+ cost = 2
+ exclude_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/stealthy_tools/chameleon_proj
+ name = "Chameleon Projector"
+ desc = "Projects an image across a user, disguising them as an object scanned with it, as long as they don't \
+ move the projector from their hand. Disguised users move slowly, and projectiles pass over them."
+ item = /obj/item/chameleon
+ cost = 7
+
+/datum/uplink_item/stealthy_tools/codespeak_manual
+ name = "Codespeak Manual"
+ desc = "Syndicate agents can be trained to use a series of codewords to convey complex information, which sounds like random concepts and drinks to anyone listening. \
+ This manual teaches you this Codespeak. You can also hit someone else with the manual in order to teach them. This is the deluxe edition, which has unlimited uses."
+ item = /obj/item/codespeak_manual/unlimited
+ cost = 3
+
+/datum/uplink_item/stealthy_tools/combatbananashoes
+ name = "Combat Banana Shoes"
+ desc = "While making the wearer immune to most slipping attacks like regular combat clown shoes, these shoes \
+ can generate a large number of synthetic banana peels as the wearer walks, slipping up would-be pursuers. They also \
+ squeak significantly louder."
+ item = /obj/item/clothing/shoes/clown_shoes/banana_shoes/combat
+ cost = 6
+ surplus = 0
+ include_modes = list(/datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/stealthy_tools/emplight
+ name = "EMP Flashlight"
+ desc = "A small, self-recharging, short-ranged EMP device disguised as a working flashlight. \
+ Useful for disrupting headsets, cameras, doors, lockers and borgs during stealth operations. \
+ Attacking a target with this flashlight will direct an EM pulse at it and consumes a charge."
+ item = /obj/item/flashlight/emp
+ cost = 2
+ surplus = 30
+
+/datum/uplink_item/stealthy_tools/failsafe
+ name = "Failsafe Uplink Code"
+ desc = "When entered the uplink will self-destruct immidiately."
+ item = /obj/effect/gibspawner/generic
+ cost = 1
+ surplus = 0
+ restricted = TRUE
+ exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/stealthy_tools/failsafe/spawn_item(spawn_path, mob/user, datum/component/uplink/U)
+ if(!U)
+ return
+ U.failsafe_code = U.generate_code()
+ to_chat(user, "The new failsafe code for this uplink is now : [U.failsafe_code].")
+ if(user.mind)
+ user.mind.store_memory("Failsafe code for [U.parent] : [U.failsafe_code]")
+ return U.parent //For log icon
+
+/datum/uplink_item/stealthy_tools/mulligan
+ name = "Mulligan"
+ desc = "Screwed up and have security on your tail? This handy syringe will give you a completely new identity \
+ and appearance."
+ item = /obj/item/reagent_containers/syringe/mulligan
+ cost = 3
+ surplus = 30
+ exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/stealthy_tools/syndigaloshes
+ name = "No-Slip Chameleon Shoes"
+ desc = "These shoes will allow the wearer to run on wet floors and slippery objects without falling down. \
+ They do not work on heavily lubricated surfaces."
+ item = /obj/item/clothing/shoes/chameleon/noslip
+ cost = 2
+ exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+ player_minimum = 20
+
+/datum/uplink_item/stealthy_tools/syndigaloshes/nuke
+ item = /obj/item/clothing/shoes/chameleon/noslip
+ cost = 4
+ exclude_modes = list()
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/stealthy_tools/jammer
+ name = "Radio Jammer"
+ desc = "This device will disrupt any nearby outgoing radio communication when activated. Does not affect binary chat."
+ item = /obj/item/jammer
+ cost = 5
+
+/datum/uplink_item/stealthy_tools/smugglersatchel
+ name = "Smuggler's Satchel"
+ desc = "This satchel is thin enough to be hidden in the gap between plating and tiling; great for stashing \
+ your stolen goods. Comes with a crowbar and a floor tile inside. Properly hidden satchels have been \
+ known to survive intact even beyond the current shift. "
+ item = /obj/item/storage/backpack/satchel/flat
+ cost = 2
+ surplus = 30
diff --git a/code/modules/uplink/uplink_items/uplink_support.dm b/code/modules/uplink/uplink_items/uplink_support.dm
new file mode 100644
index 0000000000..fe1415adc8
--- /dev/null
+++ b/code/modules/uplink/uplink_items/uplink_support.dm
@@ -0,0 +1,76 @@
+
+/*
+ Uplink Items:
+ Unlike categories, uplink item entries are automatically sorted alphabetically on server init in a global list,
+ When adding new entries to the file, please keep them sorted by category.
+*/
+
+//Support and Mechs
+
+/datum/uplink_item/support/clown_reinforcement
+ name = "Clown Reinforcements"
+ desc = "Call in an additional clown to share the fun, equipped with full starting gear, but no telecrystals."
+ item = /obj/item/antag_spawner/nuke_ops/clown
+ cost = 20
+ include_modes = list(/datum/game_mode/nuclear/clown_ops)
+ restricted = TRUE
+
+/datum/uplink_item/support/reinforcement
+ name = "Reinforcements"
+ desc = "Call in an additional team member. They won't come with any gear, so you'll have to save some telecrystals \
+ to arm them as well."
+ item = /obj/item/antag_spawner/nuke_ops
+ cost = 25
+ refundable = TRUE
+ include_modes = list(/datum/game_mode/nuclear)
+ restricted = TRUE
+
+/datum/uplink_item/support/reinforcement/assault_borg
+ name = "Syndicate Assault Cyborg"
+ desc = "A cyborg designed and programmed for systematic extermination of non-Syndicate personnel. \
+ Comes equipped with a self-resupplying LMG, a grenade launcher, energy sword, emag, pinpointer, flash and crowbar."
+ item = /obj/item/antag_spawner/nuke_ops/borg_tele/assault
+ refundable = TRUE
+ cost = 65
+ restricted = TRUE
+
+/datum/uplink_item/support/reinforcement/medical_borg
+ name = "Syndicate Medical Cyborg"
+ desc = "A combat medical cyborg. Has limited offensive potential, but makes more than up for it with its support capabilities. \
+ It comes equipped with a nanite hypospray, a medical beamgun, combat defibrillator, full surgical kit including an energy saw, an emag, pinpointer and flash. \
+ Thanks to its organ storage bag, it can perform surgery as well as any humanoid."
+ item = /obj/item/antag_spawner/nuke_ops/borg_tele/medical
+ refundable = TRUE
+ cost = 35
+ restricted = TRUE
+
+/datum/uplink_item/support/reinforcement/saboteur_borg
+ name = "Syndicate Saboteur Cyborg"
+ desc = "A streamlined engineering cyborg, equipped with covert modules. Also incapable of leaving the welder in the shuttle. \
+ Aside from regular Engineering equipment, it comes with a special destination tagger that lets it traverse disposals networks. \
+ Its chameleon projector lets it disguise itself as a Nanotrasen cyborg, on top it has thermal vision and a pinpointer."
+ item = /obj/item/antag_spawner/nuke_ops/borg_tele/saboteur
+ refundable = TRUE
+ cost = 35
+ restricted = TRUE
+
+/datum/uplink_item/support/gygax
+ name = "Dark Gygax Exosuit"
+ desc = "A lightweight exosuit, painted in a dark scheme. Its speed and equipment selection make it excellent \
+ for hit-and-run style attacks. Features an incendiary carbine, flash bang launcher, teleporter, ion thrusters and a Tesla energy array."
+ item = /obj/mecha/combat/gygax/dark/loaded
+ cost = 80
+
+/datum/uplink_item/support/honker
+ name = "Dark H.O.N.K."
+ desc = "A clown combat mech equipped with bombanana peel and tearstache grenade launchers, as well as the ubiquitous HoNkER BlAsT 5000."
+ item = /obj/mecha/combat/honker/dark/loaded
+ cost = 80
+ include_modes = list(/datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/support/mauler
+ name = "Mauler Exosuit"
+ desc = "A massive and incredibly deadly military-grade exosuit. Features long-range targeting, thrust vectoring \
+ and deployable smoke. Comes equipped with an LMG, scattershot carbine, missile rack, an antiprojectile armor booster and a Tesla energy array."
+ item = /obj/mecha/combat/marauder/mauler/loaded
+ cost = 140
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index 6144f4c57a..6116936880 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -134,7 +134,13 @@
/obj/item/clothing/head/christmashatg = 3,
/obj/item/clothing/shoes/winterboots/christmasbootsr = 3,
/obj/item/clothing/shoes/winterboots/christmasbootsg = 3,
- /obj/item/clothing/shoes/winterboots/santaboots = 3)
+ /obj/item/clothing/shoes/winterboots/santaboots = 3,
+ /obj/item/clothing/head/cowboyhat = 3,
+ /obj/item/clothing/head/cowboyhat/black = 3,
+ /obj/item/clothing/head/cowboyhat/white = 3,
+ /obj/item/clothing/head/cowboyhat/pink = 3,
+ /obj/item/clothing/shoes/cowboyboots = 3,
+ /obj/item/clothing/shoes/cowboyboots/black = 3)
contraband = list(/obj/item/clothing/under/syndicate/tacticool = 3,
/obj/item/clothing/under/syndicate/tacticool/skirt = 3,
/obj/item/clothing/mask/balaclava = 3,
diff --git a/code/modules/vending/kinkmate.dm b/code/modules/vending/kinkmate.dm
new file mode 100644
index 0000000000..f840f391fa
--- /dev/null
+++ b/code/modules/vending/kinkmate.dm
@@ -0,0 +1,48 @@
+/obj/machinery/vending/kink
+ name = "KinkMate"
+ desc = "A vending machine for all your unmentionable desires."
+ icon = 'icons/obj/citvending.dmi'
+ icon_state = "kink"
+ circuit = /obj/item/circuitboard/machine/kinkmate
+ product_slogans = "Kinky!;Sexy!;Check me out, big boy!"
+ vend_reply = "Have fun, you shameless pervert!"
+ products = list(
+ /obj/item/clothing/under/maid = 5,
+ /obj/item/clothing/under/janimaid = 5,
+ /obj/item/clothing/neck/petcollar = 5,
+ /obj/item/clothing/neck/petcollar/choker = 5,
+ /obj/item/clothing/neck/petcollar/leather = 5,
+ /obj/item/restraints/handcuffs/fake/kinky = 5,
+ /obj/item/clothing/glasses/sunglasses/blindfold = 4,
+ /obj/item/clothing/mask/muzzle = 4,
+ /obj/item/clothing/under/stripper_pink = 3,
+ /obj/item/clothing/under/stripper_green = 3,
+ /obj/item/clothing/under/corset = 3,
+ /obj/item/clothing/under/gear_harness = 10,
+ /obj/item/dildo/custom = 5,
+ /obj/item/electropack/shockcollar = 3,
+ /obj/item/assembly/signaler = 3
+ )
+ contraband = list(
+ /obj/item/clothing/neck/petcollar/locked = 2,
+ /obj/item/key/collar = 2,
+ /obj/item/clothing/head/kitty = 3,
+ /obj/item/clothing/head/rabbitears = 3,
+ /obj/item/clothing/under/keyholesweater = 2,
+ /obj/item/clothing/under/mankini = 2,
+ /obj/item/clothing/under/jabroni = 2,
+ /obj/item/dildo/flared/huge = 3,
+ /obj/item/reagent_containers/glass/bottle/crocin = 5,
+ /obj/item/reagent_containers/glass/bottle/camphor = 5
+ )
+ premium = list(
+ /obj/item/clothing/accessory/skullcodpiece/fake = 3,
+ /obj/item/reagent_containers/glass/bottle/hexacrocin = 10,
+ /obj/item/clothing/under/pants/chaps = 5
+ )
+ refill_canister = /obj/item/vending_refill/kink
+
+/obj/item/vending_refill/kink
+ machine_name = "KinkMate"
+ icon = 'modular_citadel/icons/vending_restock.dmi'
+ icon_state = "refill_kink"
diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm
index ac850efc66..d32af7de03 100644
--- a/code/modules/vending/medical.dm
+++ b/code/modules/vending/medical.dm
@@ -24,6 +24,12 @@
/obj/item/reagent_containers/glass/bottle/morphine = 4,
/obj/item/reagent_containers/glass/bottle/toxin = 3,
/obj/item/reagent_containers/syringe/antiviral = 6,
+ /obj/item/storage/hypospraykit/fire = 2,
+ /obj/item/storage/hypospraykit/toxin = 2,
+ /obj/item/storage/hypospraykit/o2 = 2,
+ /obj/item/storage/hypospraykit/brute = 2,
+ /obj/item/storage/hypospraykit/enlarge = 2,
+ /obj/item/reagent_containers/glass/bottle/vial/small = 5,
/obj/item/storage/briefcase/medical = 2)
contraband = list(/obj/item/reagent_containers/pill/tox = 3,
/obj/item/reagent_containers/pill/morphine = 4,
diff --git a/code/modules/vending/sovietvend.dm b/code/modules/vending/sovietvend.dm
new file mode 100644
index 0000000000..086b37e4ee
--- /dev/null
+++ b/code/modules/vending/sovietvend.dm
@@ -0,0 +1,31 @@
+/obj/machinery/vending/sovietvend
+ name = "KomradeVendtink"
+ desc = "Rodina-mat' zovyot!"
+ icon = 'icons/obj/citvending.dmi'
+ icon_state = "soviet"
+ vend_reply = "The fascist and capitalist svin'ya shall fall, komrade!"
+ product_slogans = "Quality worth waiting in line for!; Get Hammer and Sickled!; Sosvietsky soyuz above all!; With capitalist pigsky, you would have paid a fortunetink! ; Craftink in Motherland herself!"
+ products = list(
+ /obj/item/clothing/under/soviet = 20,
+ /obj/item/clothing/head/ushanka = 20,
+ /obj/item/clothing/shoes/jackboots = 20,
+ /obj/item/clothing/head/squatter_hat = 20,
+ /obj/item/clothing/under/squatter_outfit = 20,
+ /obj/item/clothing/under/russobluecamooutfit = 20,
+ /obj/item/clothing/head/russobluecamohat = 20
+ )
+ contraband = list(
+ /obj/item/clothing/under/syndicate/tacticool = 4,
+ /obj/item/clothing/mask/balaclava = 4,
+ /obj/item/clothing/suit/russofurcoat = 4,
+ /obj/item/clothing/head/russofurhat = 4,
+ /obj/item/clothing/suit/space/hardsuit/soviet = 3,
+ /obj/item/gun/energy/laser/LaserAK = 4
+ )
+ premium = list()
+
+ refill_canister = /obj/item/vending_refill/soviet
+
+/obj/item/vending_refill/soviet
+ machine_name = "sovietvend"
+ icon_state = "refill_soviet"
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index 894aecc600..cd643e4220 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -335,6 +335,8 @@
/obj/item/clothing/head/nemes = 1,
/obj/item/clothing/head/pharaoh = 1,
/obj/item/storage/fancy/candle_box = 3)
+ premium = list(/obj/item/toy/plush/plushvar = 1,
+ /obj/item/toy/plush/narplush = 1)
refill_canister = /obj/item/vending_refill/wardrobe/chap_wardrobe
/obj/item/vending_refill/wardrobe/chap_wardrobe
diff --git a/html/changelogs/AutoChangeLog-pr-10247.yml b/html/changelogs/AutoChangeLog-pr-10247.yml
new file mode 100644
index 0000000000..b78e5c415d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10247.yml
@@ -0,0 +1,5 @@
+author: "Seris02"
+delete-after: True
+changes:
+ - rscadd: "added atmos holofirelocks and temperature blocking"
+ - tweak: "tweaked how atmos holofan looks"
diff --git a/html/changelogs/AutoChangeLog-pr-10416.yml b/html/changelogs/AutoChangeLog-pr-10416.yml
new file mode 100644
index 0000000000..13432b283c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10416.yml
@@ -0,0 +1,10 @@
+author: "r4d6"
+delete-after: True
+changes:
+ - rscadd: "Animations for the RCD"
+ - bugfix: "Said animations being pulled by the Singulo"
+ - balance: "Prevent Reinforced Doors from being RCD'ed"
+ - bugfix: "Deconstructing Floors now cost MUs like everything else"
+ - tweak: "changed the RCD's upgrades into flags"
+ - rscadd: "Allow RCDs to print APC, Firelocks and Fire Alarms with the right upgrade"
+ - balance: "Allow Engineers to print RCDs and RPDs from their protolathe without needing to hack one."
diff --git a/html/changelogs/AutoChangeLog-pr-10465.yml b/html/changelogs/AutoChangeLog-pr-10465.yml
new file mode 100644
index 0000000000..26dff901b2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10465.yml
@@ -0,0 +1,8 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - rscadd: "Ghost dojo now has an autoylathe."
+ - rscdel: "Ghost dojo no longer has VR or modular computer access."
+ - tweak: "Ghost dojo mobs are pacifists."
+ - tweak: "Ghost dojo booze-o-mat is now all access."
+ - bugfix: "Ghost dojo crematorium now has a button."
diff --git a/html/changelogs/AutoChangeLog-pr-10480.yml b/html/changelogs/AutoChangeLog-pr-10480.yml
new file mode 100644
index 0000000000..7ecfd7057e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10480.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - rscadd: "Second, temporary flavor text!"
diff --git a/html/changelogs/AutoChangeLog-pr-10482.yml b/html/changelogs/AutoChangeLog-pr-10482.yml
new file mode 100644
index 0000000000..e97c8870d4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10482.yml
@@ -0,0 +1,4 @@
+author: "kappa-sama"
+delete-after: True
+changes:
+ - code_imp: "modular_citadel file movement"
diff --git a/html/changelogs/AutoChangeLog-pr-10485.yml b/html/changelogs/AutoChangeLog-pr-10485.yml
new file mode 100644
index 0000000000..6bf082f8ba
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10485.yml
@@ -0,0 +1,4 @@
+author: "Detective-Google"
+delete-after: True
+changes:
+ - tweak: "replaced the sprites with new ones requested."
diff --git a/html/changelogs/AutoChangeLog-pr-10486.yml b/html/changelogs/AutoChangeLog-pr-10486.yml
new file mode 100644
index 0000000000..448bbc162c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10486.yml
@@ -0,0 +1,4 @@
+author: "Seris02"
+delete-after: True
+changes:
+ - tweak: "changed where the observe verb is."
diff --git a/html/changelogs/AutoChangeLog-pr-10489.yml b/html/changelogs/AutoChangeLog-pr-10489.yml
new file mode 100644
index 0000000000..4e393bd4b1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10489.yml
@@ -0,0 +1,5 @@
+author: "Seris02"
+delete-after: True
+changes:
+ - tweak: "the way chameleon clothes update on change"
+ - bugfix: "chameleon cloak icon"
diff --git a/html/changelogs/AutoChangeLog-pr-10495.yml b/html/changelogs/AutoChangeLog-pr-10495.yml
new file mode 100644
index 0000000000..02ffedf5fc
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10495.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - rscadd: "guests can now looc"
diff --git a/html/changelogs/AutoChangeLog-pr-10497.yml b/html/changelogs/AutoChangeLog-pr-10497.yml
new file mode 100644
index 0000000000..5acb6f8c47
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10497.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes:
+ - code_imp: "Makes more folders and files for uplink."
diff --git a/html/changelogs/AutoChangeLog-pr-10498.yml b/html/changelogs/AutoChangeLog-pr-10498.yml
new file mode 100644
index 0000000000..986abc77c2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10498.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - tweak: "tableslamming has 0.4 second cooldown instead of 0.8"
diff --git a/html/changelogs/AutoChangeLog-pr-10503.yml b/html/changelogs/AutoChangeLog-pr-10503.yml
new file mode 100644
index 0000000000..b067aa6c55
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10503.yml
@@ -0,0 +1,4 @@
+author: "r4d6"
+delete-after: True
+changes:
+ - bugfix: "fixed SM's piping"
diff --git a/html/changelogs/AutoChangeLog-pr-10504.yml b/html/changelogs/AutoChangeLog-pr-10504.yml
new file mode 100644
index 0000000000..7e35ac6e72
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10504.yml
@@ -0,0 +1,5 @@
+author: "Xantholne"
+delete-after: True
+changes:
+ - rscadd: "Botany bee pet, Bumbles"
+ - rscadd: "New bee models that aren't 1 tile big of 0 opacity pixels"
diff --git a/html/changelogs/AutoChangeLog-pr-10505.yml b/html/changelogs/AutoChangeLog-pr-10505.yml
new file mode 100644
index 0000000000..dd0932c50e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10505.yml
@@ -0,0 +1,5 @@
+author: "LetterN"
+delete-after: True
+changes:
+ - tweak: "Shockcolar and electropack uses the new signaler ui"
+ - tweak: "Renaming shockcolar requires a pen"
diff --git a/html/changelogs/AutoChangeLog-pr-10509.yml b/html/changelogs/AutoChangeLog-pr-10509.yml
new file mode 100644
index 0000000000..4e1ede0631
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10509.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Made reagent containers examine text less annoying."
diff --git a/html/changelogs/AutoChangeLog-pr-10511.yml b/html/changelogs/AutoChangeLog-pr-10511.yml
new file mode 100644
index 0000000000..5f3bf739cb
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10511.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - bugfix: "health analyzers now work"
diff --git a/html/changelogs/AutoChangeLog-pr-10513.yml b/html/changelogs/AutoChangeLog-pr-10513.yml
new file mode 100644
index 0000000000..6428c4e281
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10513.yml
@@ -0,0 +1,4 @@
+author: "r4d6"
+delete-after: True
+changes:
+ - rscadd: "Added a message when pulsing the open wire."
diff --git a/html/changelogs/AutoChangeLog-pr-10516.yml b/html/changelogs/AutoChangeLog-pr-10516.yml
new file mode 100644
index 0000000000..39dd05a4db
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10516.yml
@@ -0,0 +1,4 @@
+author: "BonniePandora"
+delete-after: True
+changes:
+ - admin: "Added another SDQL option. Using \"UPDATE selectors SET #null=value\" will now resolve value and discard the return. This is useful if you only care about the side effect of a proc."
diff --git a/html/changelogs/AutoChangeLog-pr-10518.yml b/html/changelogs/AutoChangeLog-pr-10518.yml
new file mode 100644
index 0000000000..29de186e50
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10518.yml
@@ -0,0 +1,6 @@
+author: "Seris02"
+delete-after: True
+changes:
+ - balance: "Explosions now cause knockdown instead of KOs, with the amount of time scaling off bomb armor. Heavy explosions still cause a ~2 second KO for follow up attacks."
+ - balance: "Devastating explosions now no longer gib players with more than 50 bomb armor. This used to be more or less random depending on the amount of bomb armor."
+ - code_imp: "Removed reagent explosion code that would trigger for <1 amount reactions."
diff --git a/html/changelogs/AutoChangeLog-pr-10522.yml b/html/changelogs/AutoChangeLog-pr-10522.yml
new file mode 100644
index 0000000000..b03b990762
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10522.yml
@@ -0,0 +1,4 @@
+author: "Hatterhat"
+delete-after: True
+changes:
+ - rscadd: "Syndicate sleepers (read: the ones that're red and have controls in them) can now be recreated with a sufficient basis in nonstandard (read: illegal) technologies!"
diff --git a/html/changelogs/AutoChangeLog-pr-10523.yml b/html/changelogs/AutoChangeLog-pr-10523.yml
new file mode 100644
index 0000000000..999fc1dd92
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10523.yml
@@ -0,0 +1,4 @@
+author: "Hatterhat"
+delete-after: True
+changes:
+ - bugfix: "Explorer hoods on standard explorer suits can be reinforced with goliath hide plates again."
diff --git a/html/changelogs/AutoChangeLog-pr-10532.yml b/html/changelogs/AutoChangeLog-pr-10532.yml
new file mode 100644
index 0000000000..cf742b47f7
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10532.yml
@@ -0,0 +1,6 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Virus food dispensers dispense virus food again."
+ - bugfix: "Borg hypos inputs do not display typepaths anymore."
+ - bugfix: "Restored chem dispensers alphabetical order."
diff --git a/icons/effects/effects_rcd.dmi b/icons/effects/effects_rcd.dmi
new file mode 100644
index 0000000000..efb13bfb11
Binary files /dev/null and b/icons/effects/effects_rcd.dmi differ
diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi
index a46ad83640..d3ffdb62e4 100644
Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ
diff --git a/icons/mob/bees.dmi b/icons/mob/bees.dmi
index 5d9bfea48b..0a8e25c763 100644
Binary files a/icons/mob/bees.dmi and b/icons/mob/bees.dmi differ
diff --git a/icons/mob/custom_w.dmi b/icons/mob/custom_w.dmi
index a73da3aa0c..7452d63134 100644
Binary files a/icons/mob/custom_w.dmi and b/icons/mob/custom_w.dmi differ
diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi
index e768271757..bebfb7c2e0 100644
Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 3adedcffba..6bba2fc7fb 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/pets.dmi b/icons/mob/pets.dmi
index 10f29f51e4..9751e9d964 100644
Binary files a/icons/mob/pets.dmi and b/icons/mob/pets.dmi differ
diff --git a/icons/mob/underwear.dmi b/icons/mob/underwear.dmi
index e0789a1eeb..f0c2cde93d 100644
Binary files a/icons/mob/underwear.dmi and b/icons/mob/underwear.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 4587d6e7b6..f94106dd55 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index b52c314296..3c8a1332a9 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/modular_citadel/code/datums/components/material_container.dm b/modular_citadel/code/datums/components/material_container.dm
deleted file mode 100644
index a7c50e37c5..0000000000
--- a/modular_citadel/code/datums/components/material_container.dm
+++ /dev/null
@@ -1,4 +0,0 @@
-/datum/material/plastic
- name = "Plastic"
- id = MAT_PLASTIC
- sheet_type = /obj/item/stack/sheet/plastic
\ No newline at end of file
diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm
deleted file mode 100755
index e75ba17801..0000000000
--- a/modular_citadel/code/game/machinery/vending.dm
+++ /dev/null
@@ -1,121 +0,0 @@
-/obj/machinery/vending/medical
- products = list(/obj/item/reagent_containers/syringe = 12,
- /obj/item/reagent_containers/dropper = 3,
- /obj/item/healthanalyzer = 4,
- /obj/item/sensor_device = 2,
- /obj/item/pinpointer/crew = 2,
- /obj/item/reagent_containers/medspray/sterilizine = 1,
- /obj/item/stack/medical/gauze = 8,
- /obj/item/reagent_containers/pill/patch/styptic = 5,
- /obj/item/reagent_containers/medspray/styptic = 2,
- /obj/item/reagent_containers/pill/patch/silver_sulf = 5,
- /obj/item/reagent_containers/medspray/silver_sulf = 2,
- /obj/item/reagent_containers/pill/insulin = 10,
- /obj/item/reagent_containers/pill/salbutamol = 2,
- /obj/item/reagent_containers/glass/bottle/charcoal = 4,
- /obj/item/reagent_containers/glass/bottle/epinephrine = 4,
- /obj/item/reagent_containers/glass/bottle/salglu_solution = 3,
- /obj/item/reagent_containers/glass/bottle/morphine = 4,
- /obj/item/reagent_containers/glass/bottle/toxin = 3,
- /obj/item/reagent_containers/syringe/antiviral = 6,
- /obj/item/storage/hypospraykit/fire = 2,
- /obj/item/storage/hypospraykit/toxin = 2,
- /obj/item/storage/hypospraykit/o2 = 2,
- /obj/item/storage/hypospraykit/brute = 2,
- /obj/item/storage/hypospraykit/enlarge = 2,
- /obj/item/reagent_containers/glass/bottle/vial/small = 5)
-
-/obj/machinery/vending/wardrobe/chap_wardrobe
- premium = list(/obj/item/toy/plush/plushvar = 1,
- /obj/item/toy/plush/narplush = 1)
-
-#define STANDARD_CHARGE 1
-#define CONTRABAND_CHARGE 2
-#define COIN_CHARGE 3
-
-/obj/machinery/vending/kink
- name = "KinkMate"
- desc = "A vending machine for all your unmentionable desires."
- icon = 'icons/obj/citvending.dmi'
- icon_state = "kink"
- circuit = /obj/item/circuitboard/machine/kinkmate
- product_slogans = "Kinky!;Sexy!;Check me out, big boy!"
- vend_reply = "Have fun, you shameless pervert!"
- products = list(
- /obj/item/clothing/under/maid = 5,
- /obj/item/clothing/under/janimaid = 5,
- /obj/item/clothing/neck/petcollar = 5,
- /obj/item/clothing/neck/petcollar/choker = 5,
- /obj/item/clothing/neck/petcollar/leather = 5,
- /obj/item/restraints/handcuffs/fake/kinky = 5,
- /obj/item/clothing/glasses/sunglasses/blindfold = 4,
- /obj/item/clothing/mask/muzzle = 4,
- /obj/item/clothing/under/stripper_pink = 3,
- /obj/item/clothing/under/stripper_green = 3,
- /obj/item/clothing/under/corset = 3,
- /obj/item/clothing/under/gear_harness = 10,
- /obj/item/dildo/custom = 5,
- /obj/item/electropack/shockcollar = 3,
- /obj/item/assembly/signaler = 3
- )
- contraband = list(
- /obj/item/clothing/neck/petcollar/locked = 2,
- /obj/item/key/collar = 2,
- /obj/item/clothing/head/kitty = 3,
- /obj/item/clothing/head/rabbitears = 3,
- /obj/item/clothing/under/keyholesweater = 2,
- /obj/item/clothing/under/mankini = 2,
- /obj/item/clothing/under/jabroni = 2,
- /obj/item/dildo/flared/huge = 3,
- /obj/item/reagent_containers/glass/bottle/crocin = 5,
- /obj/item/reagent_containers/glass/bottle/camphor = 5
- )
- premium = list(
- /obj/item/clothing/accessory/skullcodpiece/fake = 3,
- /obj/item/reagent_containers/glass/bottle/hexacrocin = 10,
- /obj/item/clothing/under/pants/chaps = 5
- )
- refill_canister = /obj/item/vending_refill/kink
-
-/obj/machinery/vending/sovietvend
- name = "KomradeVendtink"
- desc = "Rodina-mat' zovyot!"
- icon = 'icons/obj/citvending.dmi'
- icon_state = "soviet"
- vend_reply = "The fascist and capitalist svin'ya shall fall, komrade!"
- product_slogans = "Quality worth waiting in line for!; Get Hammer and Sickled!; Sosvietsky soyuz above all!; With capitalist pigsky, you would have paid a fortunetink! ; Craftink in Motherland herself!"
- products = list(
- /obj/item/clothing/under/soviet = 20,
- /obj/item/clothing/head/ushanka = 20,
- /obj/item/clothing/shoes/jackboots = 20,
- /obj/item/clothing/head/squatter_hat = 20,
- /obj/item/clothing/under/squatter_outfit = 20,
- /obj/item/clothing/under/russobluecamooutfit = 20,
- /obj/item/clothing/head/russobluecamohat = 20
- )
- contraband = list(
- /obj/item/clothing/under/syndicate/tacticool = 4,
- /obj/item/clothing/mask/balaclava = 4,
- /obj/item/clothing/suit/russofurcoat = 4,
- /obj/item/clothing/head/russofurhat = 4,
- /obj/item/clothing/suit/space/hardsuit/soviet = 3,
- /obj/item/gun/energy/laser/LaserAK = 4
- )
- premium = list()
-
- refill_canister = /obj/item/vending_refill/soviet
-
-
-#undef STANDARD_CHARGE
-#undef CONTRABAND_CHARGE
-#undef COIN_CHARGE
-
-
-/obj/item/vending_refill/kink
- machine_name = "KinkMate"
- icon = 'modular_citadel/icons/vending_restock.dmi'
- icon_state = "refill_kink"
-
-/obj/item/vending_refill/soviet
- machine_name = "sovietvend"
- icon_state = "refill_soviet"
diff --git a/modular_citadel/code/game/objects/items/circuitboards/machine_circuitboards.dm b/modular_citadel/code/game/objects/items/circuitboards/machine_circuitboards.dm
deleted file mode 100644
index e70028f5eb..0000000000
--- a/modular_citadel/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ /dev/null
@@ -1,12 +0,0 @@
-/obj/item/circuitboard/machine/kinkmate
- name = "Kinkmate Vendor (Machine Board)"
- build_path = /obj/machinery/vending/kink
- req_components = list(/obj/item/vending_refill/kink = 3)
-
-/obj/item/circuitboard/machine/autoylathe
- name = "Autoylathe (Machine Board)"
- build_path = /obj/machinery/autoylathe
- req_components = list(
- /obj/item/stock_parts/matter_bin = 3,
- /obj/item/stock_parts/manipulator = 1,
- /obj/item/stack/sheet/glass = 1)
diff --git a/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm b/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm
index 9d0757e26e..94bf1ba30a 100644
--- a/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm
+++ b/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm
@@ -11,6 +11,7 @@
strip_delay = 60
equip_delay_other = 60
materials = list(MAT_METAL=5000, MAT_GLASS=2000)
+
var/tagname = null
/datum/design/electropack/shockcollar
@@ -25,18 +26,17 @@
if(loc == user && user.get_item_by_slot(SLOT_NECK))
to_chat(user, "The collar is fastened tight! You'll need help taking this off!")
return
- ..()
+ return ..()
/obj/item/electropack/shockcollar/receive_signal(datum/signal/signal)
if(!signal || signal.data["code"] != code)
return
if(isliving(loc) && on)
- if(shock_cooldown != 0)
+ if(shock_cooldown == TRUE)
return
- shock_cooldown = 1
- spawn(100)
- shock_cooldown = 0
+ shock_cooldown = TRUE
+ addtimer(VARSET_CALLBACK(src, shock_cooldown, FALSE), 100)
var/mob/living/L = loc
step(L, pick(GLOB.cardinals))
@@ -51,33 +51,27 @@
master.receive_signal()
return
-/obj/item/electropack/shockcollar/attack_self(mob/user) //Turns out can't fully source this from the parent item, spritepath gets confused if power toggled. Will come back to this when I know how to code better and readd powertoggle..
- var/option = "Change Name"
- option = input(user, "What do you want to do?", "[src]", option) as null|anything in list("Change Name", "Change Frequency")
- switch(option)
- if("Change Name")
- var/t = input(user, "Would you like to change the name on the tag?", "Name your new pet", tagname ? tagname : "Spot") as null|text
- if(t)
- tagname = copytext(sanitize(t), 1, MAX_NAME_LEN)
- name = "[initial(name)] - [tagname]"
- if("Change Frequency")
- if(!ishuman(user))
- return
- user.set_machine(src)
- var/dat = {"
- Frequency/Code for shock collar:
- Frequency:
- -
- - [format_frequency(frequency)]
- +
- +
- Code:
- -
- - [code]
- +
- +
- "}
+/obj/item/electropack/shockcollar/attackby(obj/item/W, mob/user, params) //moves it here because on_click is being bad
+ if(istype(W, /obj/item/pen))
+ var/t = input(user, "Would you like to change the name on the tag?", "Name your new pet", tagname ? tagname : "Spot") as null|text
+ if(t)
+ tagname = copytext(sanitize(t), 1, MAX_NAME_LEN)
+ name = "[initial(name)] - [tagname]"
+ else
+ return ..()
- user << browse(dat, "window=radio")
- onclose(user, "radio")
- return
+/obj/item/electropack/shockcollar/ui_interact(mob/user) //on_click calls this
+ var/dat = {"
+
+Frequency/Code for shock collar:
+Frequency:
+[format_frequency(src.frequency)]
+Set
+
+Code:
+[src.code]
+Set
+"}
+ user << browse(dat, "window=radio")
+ onclose(user, "radio")
+ return
diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm
index 3e7eb39823..427a4ac61d 100644
--- a/modular_citadel/code/modules/client/loadout/head.dm
+++ b/modular_citadel/code/modules/client/loadout/head.dm
@@ -101,4 +101,34 @@
/datum/gear/santahatg
name = "Green Santa Hat"
category = SLOT_HEAD
- path = /obj/item/clothing/head/christmashatg
\ No newline at end of file
+ path = /obj/item/clothing/head/christmashatg
+
+/datum/gear/cowboyhat
+ name = "Cowboy Hat, Brown"
+ category = SLOT_HEAD
+ path = /obj/item/clothing/head/cowboyhat
+
+/datum/gear/cowboyhat/black
+ name = "Cowboy Hat, Black"
+ category = SLOT_HEAD
+ path = /obj/item/clothing/head/cowboyhat/black
+
+/datum/gear/cowboyhat/white
+ name = "Cowboy Hat, White"
+ category = SLOT_HEAD
+ path = /obj/item/clothing/head/cowboyhat/white
+
+/datum/gear/cowboyhat/pink
+ name = "Cowboy Hat, Pink"
+ category = SLOT_HEAD
+ path = /obj/item/clothing/head/cowboyhat/pink
+
+/datum/gear/cowboyhat/sec
+ name = "Cowboy Hat, Security"
+ category = SLOT_HEAD
+ path = /obj/item/clothing/head/cowboyhat/sec
+ restricted_desc = "Security"
+ restricted_roles = list("Warden","Detective","Security Officer","Head of Security")
+
+
+
diff --git a/modular_citadel/code/modules/client/loadout/shoes.dm b/modular_citadel/code/modules/client/loadout/shoes.dm
index 7b3bee6638..3531e69cfd 100644
--- a/modular_citadel/code/modules/client/loadout/shoes.dm
+++ b/modular_citadel/code/modules/client/loadout/shoes.dm
@@ -71,4 +71,14 @@
/datum/gear/santaboots
name = "Santa Boots"
category = SLOT_SHOES
- path= /obj/item/clothing/shoes/winterboots/santaboots
\ No newline at end of file
+ path= /obj/item/clothing/shoes/winterboots/santaboots
+
+/datum/gear/cowboyboots
+ name = "Cowboy Boots, Brown"
+ category = SLOT_SHOES
+ path = /obj/item/clothing/shoes/cowboyboots
+
+/datum/gear/cowboyboots/black
+ name = "Cowboy Boots, Black"
+ category = SLOT_SHOES
+ path = /obj/item/clothing/shoes/cowboyboots/black
\ No newline at end of file
diff --git a/modular_citadel/icons/mob/widerobot.dmi b/modular_citadel/icons/mob/widerobot.dmi
index 43a6863ece..a77a109eb9 100644
Binary files a/modular_citadel/icons/mob/widerobot.dmi and b/modular_citadel/icons/mob/widerobot.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index f52892fce3..4372f525b3 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -529,6 +529,7 @@
#include "code\datums\wires\airlock.dm"
#include "code\datums\wires\apc.dm"
#include "code\datums\wires\autolathe.dm"
+#include "code\datums\wires\autoylathe.dm"
#include "code\datums\wires\emitter.dm"
#include "code\datums\wires\explosive.dm"
#include "code\datums\wires\microwave.dm"
@@ -664,6 +665,7 @@
#include "code\game\machinery\syndicatebeacon.dm"
#include "code\game\machinery\syndicatebomb.dm"
#include "code\game\machinery\teleporter.dm"
+#include "code\game\machinery\toylathe.dm"
#include "code\game\machinery\transformer.dm"
#include "code\game\machinery\turnstile.dm"
#include "code\game\machinery\washing_machine.dm"
@@ -2730,6 +2732,7 @@
#include "code\modules\research\stock_parts.dm"
#include "code\modules\research\designs\AI_module_designs.dm"
#include "code\modules\research\designs\autobotter_designs.dm"
+#include "code\modules\research\designs\autoylathe_designs.dm"
#include "code\modules\research\designs\biogenerator_designs.dm"
#include "code\modules\research\designs\bluespace_designs.dm"
#include "code\modules\research\designs\computer_part_designs.dm"
@@ -2994,6 +2997,18 @@
#include "code\modules\uplink\uplink_devices.dm"
#include "code\modules\uplink\uplink_items.dm"
#include "code\modules\uplink\uplink_purchase_log.dm"
+#include "code\modules\uplink\uplink_items\uplink_ammo.dm"
+#include "code\modules\uplink\uplink_items\uplink_badass.dm"
+#include "code\modules\uplink\uplink_items\uplink_bundles.dm"
+#include "code\modules\uplink\uplink_items\uplink_clothing.dm"
+#include "code\modules\uplink\uplink_items\uplink_dangerous.dm"
+#include "code\modules\uplink\uplink_items\uplink_devices.dm"
+#include "code\modules\uplink\uplink_items\uplink_explosives.dm"
+#include "code\modules\uplink\uplink_items\uplink_implants.dm"
+#include "code\modules\uplink\uplink_items\uplink_roles.dm"
+#include "code\modules\uplink\uplink_items\uplink_stealth.dm"
+#include "code\modules\uplink\uplink_items\uplink_stealthdevices.dm"
+#include "code\modules\uplink\uplink_items\uplink_support.dm"
#include "code\modules\vehicles\_vehicle.dm"
#include "code\modules\vehicles\atv.dm"
#include "code\modules\vehicles\bicycle.dm"
@@ -3022,6 +3037,7 @@
#include "code\modules\vending\engineering.dm"
#include "code\modules\vending\engivend.dm"
#include "code\modules\vending\games.dm"
+#include "code\modules\vending\kinkmate.dm"
#include "code\modules\vending\liberation.dm"
#include "code\modules\vending\liberation_toy.dm"
#include "code\modules\vending\magivend.dm"
@@ -3034,6 +3050,7 @@
#include "code\modules\vending\security.dm"
#include "code\modules\vending\snack.dm"
#include "code\modules\vending\sovietsoda.dm"
+#include "code\modules\vending\sovietvend.dm"
#include "code\modules\vending\sustenance.dm"
#include "code\modules\vending\toys.dm"
#include "code\modules\vending\wardrobes.dm"
@@ -3066,13 +3083,9 @@
#include "modular_citadel\code\_onclick\hud\screen_objects.dm"
#include "modular_citadel\code\_onclick\hud\sprint.dm"
#include "modular_citadel\code\_onclick\hud\stamina.dm"
-#include "modular_citadel\code\datums\components\material_container.dm"
#include "modular_citadel\code\datums\components\souldeath.dm"
#include "modular_citadel\code\datums\status_effects\chems.dm"
#include "modular_citadel\code\datums\status_effects\debuffs.dm"
-#include "modular_citadel\code\datums\wires\autoylathe.dm"
-#include "modular_citadel\code\game\machinery\toylathe.dm"
-#include "modular_citadel\code\game\machinery\vending.dm"
#include "modular_citadel\code\game\machinery\wishgranter.dm"
#include "modular_citadel\code\game\objects\cit_screenshake.dm"
#include "modular_citadel\code\game\objects\items.dm"
@@ -3081,7 +3094,6 @@
#include "modular_citadel\code\game\objects\items\balls.dm"
#include "modular_citadel\code\game\objects\items\boombox.dm"
#include "modular_citadel\code\game\objects\items\stunsword.dm"
-#include "modular_citadel\code\game\objects\items\circuitboards\machine_circuitboards.dm"
#include "modular_citadel\code\game\objects\items\devices\radio\encryptionkey.dm"
#include "modular_citadel\code\game\objects\items\devices\radio\headset.dm"
#include "modular_citadel\code\game\objects\items\devices\radio\shockcollar.dm"
@@ -3181,6 +3193,5 @@
#include "modular_citadel\code\modules\reagents\objects\clothes.dm"
#include "modular_citadel\code\modules\reagents\objects\items.dm"
#include "modular_citadel\code\modules\reagents\reagents\cit_reagents.dm"
-#include "modular_citadel\code\modules\research\designs\autoylathe_designs.dm"
#include "modular_citadel\interface\skin.dmf"
// END_INCLUDE