diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
index afd69a7b5dd..df9c798059c 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
@@ -1,4 +1,78 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ pixel_y = 0;
+ tag = ""
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4;
+ level = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/fans/tiny,
+/obj/machinery/door/poddoor{
+ id_tag = "SSBtestchamber";
+ name = "Syndicate Test Lab Blast Door"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/ruin/unpowered/syndicate_space_base/testlab)
+"ab" = (
+/obj/machinery/door_control{
+ id = "SSBtestchamber";
+ name = "Blast Door Control"
+ },
+/turf/simulated/wall/mineral/plastitanium/nodiagonal,
+/area/ruin/unpowered/syndicate_space_base/testlab)
+"ac" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/fans/tiny,
+/obj/machinery/door/poddoor{
+ id_tag = "SSBtestchamber";
+ name = "Syndicate Test Lab Blast Door"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/ruin/unpowered/syndicate_space_base/testlab)
+"ad" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/camera/emp_proof{
+ c_tag = "Test Lab West";
+ dir = 4;
+ network = list("SyndicateTestLab")
+ },
+/turf/simulated/floor/engine,
+/area/ruin/unpowered/syndicate_space_base/testlab)
+"ae" = (
+/obj/machinery/camera/emp_proof{
+ c_tag = "Test Lab East";
+ dir = 9;
+ network = list("SyndicateTestLab")
+ },
+/turf/simulated/floor/engine,
+/area/ruin/unpowered/syndicate_space_base/testlab)
"aj" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plasteel{
@@ -1191,18 +1265,6 @@
icon_state = "dark"
},
/area/ruin/unpowered/syndicate_space_base/telecomms)
-"mE" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/structure/fans/tiny,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/ruin/unpowered/syndicate_space_base/testlab)
"mP" = (
/obj/machinery/power/generator,
/obj/structure/cable/yellow,
@@ -1404,14 +1466,6 @@
icon_state = "brown"
},
/area/ruin/unpowered/syndicate_space_base/cargo)
-"ol" = (
-/obj/machinery/light{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/engine,
-/area/ruin/unpowered/syndicate_space_base/testlab)
"ow" = (
/obj/structure/closet/crate/medical,
/obj/item/storage/firstaid/fire{
@@ -1861,32 +1915,6 @@
icon_state = "dark"
},
/area/ruin/unpowered/syndicate_space_base/main)
-"un" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- pixel_y = 0;
- tag = ""
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4;
- level = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/fans/tiny,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/ruin/unpowered/syndicate_space_base/testlab)
"uq" = (
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
@@ -4926,6 +4954,13 @@
icon_state = "dark"
},
/area/ruin/unpowered/syndicate_space_base/main)
+"ZG" = (
+/obj/machinery/computer/security/telescreen{
+ name = "Test Lab Monitor";
+ network = list("SyndicateTestLab")
+ },
+/turf/simulated/wall/mineral/plastitanium/nodiagonal,
+/area/ruin/unpowered/syndicate_space_base/testlab)
"ZR" = (
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -6837,8 +6872,8 @@ TD
TD
rr
CM
-TD
-TD
+ZG
+ab
TD
CM
ZR
@@ -6897,13 +6932,13 @@ ia
ia
ia
TD
-un
+aa
TD
ia
ia
ia
TD
-mE
+ac
TD
AV
AV
@@ -7022,7 +7057,7 @@ fH
fH
RC
uN
-ol
+ad
RF
RF
dH
@@ -7952,7 +7987,7 @@ qv
Vl
Vl
Vl
-Vl
+ae
Vl
Vl
Vl
diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm
index c03b3cdd09c..9bb63d73f29 100644
--- a/_maps/map_files/generic/centcomm.dmm
+++ b/_maps/map_files/generic/centcomm.dmm
@@ -25,8 +25,7 @@
/area/syndicate_mothership)
"ai" = (
/obj/item/radio/intercom/syndicate{
- pixel_x = 32;
- pixel_y = 0
+ pixel_x = 32
},
/turf/simulated/floor/plasteel/dark,
/area/syndicate_mothership)
@@ -35,7 +34,6 @@
/obj/item/clothing/under/dress/dress_saloon,
/obj/item/clothing/head/hairflower,
/turf/simulated/floor/holofloor{
- dir = 2;
icon_state = "cult";
tag = "icon-cult"
},
@@ -50,7 +48,6 @@
/obj/effect/landmark/costume/random,
/obj/structure/rack/holorack,
/turf/simulated/floor/holofloor{
- dir = 2;
icon_state = "cult";
tag = "icon-cult"
},
@@ -68,7 +65,6 @@
/obj/structure/chair/stool/holostool,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/holofloor{
- dir = 2;
icon_state = "asteroid";
tag = "icon-asteroid"
},
@@ -85,7 +81,6 @@
/area/space)
"ar" = (
/turf/simulated/floor/holofloor{
- dir = 2;
icon = 'icons/turf/floors/plating.dmi';
icon_state = "asteroid";
tag = "icon-asteroid"
@@ -109,7 +104,6 @@
/obj/structure/table/holotable/wood,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/holofloor{
- dir = 2;
icon_state = "asteroid";
tag = "icon-asteroid"
},
@@ -191,7 +185,6 @@
"aL" = (
/obj/structure/flora/ausbushes/fullgrass,
/turf/simulated/floor/holofloor{
- dir = 2;
icon = 'icons/turf/floors/plating.dmi';
icon_state = "asteroid";
tag = "icon-asteroid"
@@ -210,7 +203,6 @@
/area/space)
"aO" = (
/turf/simulated/floor/holofloor{
- dir = 2;
icon_state = "cult";
tag = "icon-cult"
},
@@ -268,7 +260,6 @@
"aX" = (
/obj/structure/flora/ausbushes/sparsegrass,
/turf/simulated/floor/holofloor{
- dir = 2;
icon = 'icons/turf/floors/plating.dmi';
icon_state = "asteroid";
tag = "icon-asteroid"
@@ -277,7 +268,6 @@
"aY" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/holofloor{
- dir = 2;
icon_state = "asteroid";
tag = "icon-asteroid"
},
@@ -301,7 +291,6 @@
"bb" = (
/obj/structure/table/holotable/wood,
/turf/simulated/floor/holofloor{
- dir = 2;
icon_state = "grimy";
tag = "icon-grimy"
},
@@ -316,7 +305,6 @@
/area/holodeck/source_meetinghall)
"bd" = (
/turf/simulated/floor/holofloor{
- dir = 2;
icon = 'icons/turf/floors/plating.dmi';
icon_state = "asteroid7";
tag = "icon-asteroid7"
@@ -516,7 +504,6 @@
/area/space)
"bX" = (
/turf/simulated/floor/holofloor{
- dir = 2;
icon_state = "green"
},
/area/holodeck/source_emptycourt)
@@ -570,7 +557,6 @@
/area/holodeck/source_snowfield)
"cm" = (
/turf/simulated/floor/holofloor{
- dir = 2;
icon_state = "grimy";
tag = "icon-grimy"
},
@@ -704,8 +690,7 @@
/area/centcom/evac)
"cI" = (
/obj/structure/shuttle/engine/propulsion{
- dir = 8;
- icon_state = "propulsion"
+ dir = 8
},
/turf/simulated/floor/plating/airless,
/area/shuttle/specops)
@@ -763,7 +748,6 @@
"cW" = (
/obj/machinery/light/spot{
dir = 1;
- icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
/turf/simulated/floor/plasteel/dark,
@@ -773,7 +757,6 @@
/obj/machinery/kitchen_machine/microwave/upgraded,
/obj/machinery/light/spot{
dir = 1;
- icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
/turf/simulated/floor/plasteel/freezer,
@@ -833,7 +816,6 @@
/obj/item/camera,
/obj/machinery/light/spot{
dir = 1;
- icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
/turf/simulated/floor/plasteel{
@@ -855,7 +837,6 @@
"di" = (
/obj/machinery/light/spot{
dir = 1;
- icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
/turf/simulated/floor/beach/away/sand,
@@ -880,14 +861,12 @@
id_tag = "vox_southeast_lock";
locked = 1;
req_access_txt = "152";
- req_one_access = null;
- req_one_access_txt = "0"
+ req_one_access = null
},
/turf/simulated/floor/plating/nitrogen,
/area/shuttle/vox)
"dp" = (
/turf/simulated/floor/holofloor{
- dir = 2;
icon_state = "red"
},
/area/holodeck/source_basketball)
@@ -1027,16 +1006,13 @@
"dQ" = (
/obj/machinery/light/spot{
dir = 1;
- icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
/turf/simulated/floor/plasteel/grimy,
/area/ninja/outpost)
"dR" = (
/obj/structure/table,
-/obj/machinery/recharger{
- pixel_y = 0
- },
+/obj/machinery/recharger,
/turf/simulated/floor/plasteel/freezer,
/area/ninja/holding)
"dS" = (
@@ -1131,7 +1107,6 @@
/area/syndicate_mothership)
"el" = (
/turf/simulated/floor/holofloor{
- dir = 2;
icon_state = "green"
},
/area/holodeck/source_basketball)
@@ -1166,15 +1141,6 @@
icon_state = "cafeteria"
},
/area/ninja/holding)
-"eq" = (
-/obj/machinery/light{
- dir = 4;
- icon_state = "tube1"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "bar"
- },
-/area/syndicate_mothership)
"eu" = (
/obj/structure/chair/stool,
/obj/machinery/computer/security/telescreen{
@@ -1237,8 +1203,7 @@
req_access_txt = "150"
},
/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 5;
- icon_state = "intact"
+ dir = 5
},
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
@@ -1252,14 +1217,12 @@
"eG" = (
/obj/structure/shuttle/engine/propulsion{
dir = 1;
- icon_state = "propulsion";
tag = "icon-propulsion (NORTH)"
},
/turf/simulated/floor/plating/airless,
/area/shuttle/syndicate_elite)
"eH" = (
/turf/simulated/floor/holofloor{
- dir = 2;
icon_state = "green"
},
/area/holodeck/source_boxingcourt)
@@ -1333,7 +1296,6 @@
"eT" = (
/obj/machinery/light/spot{
dir = 1;
- icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
/obj/machinery/computer/syndicate_depot/teleporter,
@@ -1369,7 +1331,6 @@
/obj/machinery/door_control{
id = "syndicate_sit_1";
name = "Blast Doors";
- pixel_x = 0;
pixel_y = -23;
req_access_txt = "150"
},
@@ -1409,7 +1370,6 @@
},
/obj/machinery/light/spot{
dir = 8;
- icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
/turf/simulated/floor/engine,
@@ -1454,7 +1414,7 @@
/turf/simulated/floor/wood,
/area/syndicate_mothership)
"fe" = (
-/obj/machinery/cryopod/right,
+/obj/machinery/cryopod/offstation/right,
/turf/simulated/floor/plasteel/dark,
/area/centcom/specops)
"ff" = (
@@ -1490,7 +1450,7 @@
/turf/simulated/floor/engine/cult,
/area/wizard_station)
"fl" = (
-/obj/machinery/cryopod,
+/obj/machinery/cryopod/offstation,
/turf/simulated/floor/plasteel/dark,
/area/centcom/specops)
"fm" = (
@@ -1512,7 +1472,6 @@
/obj/machinery/vending/magivend,
/obj/machinery/light/spot{
dir = 1;
- icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
/turf/simulated/floor/engine/cult,
@@ -1566,8 +1525,7 @@
width = 9
},
/obj/machinery/door/airlock/titanium/glass{
- id_tag = "s_docking_airlock";
- req_one_access_txt = "0"
+ id_tag = "s_docking_airlock"
},
/obj/docking_port/stationary{
dir = 8;
@@ -1640,8 +1598,6 @@
/area/ninja/holding)
"fL" = (
/obj/machinery/computer/cryopod{
- density = 0;
- pixel_x = 0;
pixel_y = 32
},
/turf/simulated/floor/plasteel,
@@ -1696,14 +1652,11 @@
/area/holodeck/source_thunderdomecourt)
"fU" = (
/obj/structure/table/wood,
-/obj/machinery/recharger{
- pixel_y = 0
- },
+/obj/machinery/recharger,
/turf/simulated/floor/engine/cult,
/area/wizard_station)
"fV" = (
/obj/machinery/power/apc{
- dir = 2;
name = "Gamma Armory APC";
pixel_y = -24
},
@@ -1712,15 +1665,13 @@
icon_state = "0-4"
},
/obj/structure/sign/securearea{
- pixel_x = -32;
- pixel_y = 0
+ pixel_x = -32
},
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/gamma/space)
"fW" = (
/obj/machinery/light/spot{
dir = 8;
- icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
/turf/simulated/floor/engine/cult,
@@ -1742,7 +1693,6 @@
"ga" = (
/obj/machinery/light/spot{
dir = 8;
- icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
/turf/simulated/floor/plasteel/dark,
@@ -1750,7 +1700,6 @@
"gb" = (
/obj/machinery/light/spot{
dir = 4;
- icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
/turf/simulated/floor/plasteel/dark,
@@ -1777,7 +1726,6 @@
"gg" = (
/obj/machinery/light/spot{
dir = 1;
- icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
/turf/simulated/floor/plasteel/dark,
@@ -2003,7 +1951,6 @@
/area/space)
"hd" = (
/obj/docking_port/stationary/transit{
- dir = 1;
dwidth = 1;
height = 4;
id = "pod1_transit";
@@ -2028,7 +1975,6 @@
/area/syndicate_mothership)
"hh" = (
/obj/docking_port/stationary/transit{
- dir = 1;
dwidth = 1;
height = 4;
id = "pod2_transit";
@@ -2040,7 +1986,6 @@
"hi" = (
/obj/docking_port/stationary{
area_type = /area/syndicate_mothership;
- dir = 1;
dwidth = 11;
height = 18;
id = "emergency_syndicate";
@@ -2173,8 +2118,7 @@
/area/shuttle/syndicate)
"ic" = (
/obj/structure/closet/fireaxecabinet{
- pixel_x = 32;
- pixel_y = 0
+ pixel_x = 32
},
/obj/machinery/light{
dir = 1;
@@ -2188,7 +2132,6 @@
/area/shuttle/escape)
"id" = (
/turf/simulated/floor/plasteel{
- dir = 2;
icon_state = "browncorner"
},
/area/shuttle/escape)
@@ -2216,7 +2159,6 @@
/area/syndicate_mothership)
"ij" = (
/obj/item/radio/intercom/syndicate{
- pixel_x = 0;
pixel_y = 25
},
/obj/item/twohanded/required/kirbyplants,
@@ -2315,16 +2257,13 @@
},
/obj/structure/sink{
dir = 4;
- icon_state = "sink";
- pixel_x = 11;
- pixel_y = 0
+ pixel_x = 11
},
/turf/simulated/floor/plasteel/freezer,
/area/syndicate_mothership)
"iB" = (
/obj/machinery/light{
- dir = 8;
- icon_state = "tube1"
+ dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "bar"
@@ -2562,7 +2501,6 @@
"jq" = (
/obj/machinery/light/spot{
dir = 4;
- icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
/obj/structure/closet/syndicate/sst,
@@ -2585,7 +2523,6 @@
"jt" = (
/obj/machinery/light/small{
dir = 4;
- icon_state = "bulb1";
tag = "icon-bulb1 (EAST)"
},
/obj/structure/chair/comfy/shuttle{
@@ -2604,7 +2541,6 @@
"jw" = (
/obj/machinery/light/small{
dir = 8;
- icon_state = "bulb1";
tag = "icon-bulb1 (WEST)"
},
/obj/structure/chair/comfy/shuttle{
@@ -2701,13 +2637,11 @@
/area/syndicate_mothership)
"jH" = (
/obj/machinery/door/window{
- dir = 4;
name = "Infirmary";
req_access_txt = "150"
},
/obj/machinery/light/spot{
dir = 1;
- icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
/turf/simulated/floor/mineral/plastitanium/red,
@@ -2726,7 +2660,6 @@
/area/syndicate_mothership)
"jM" = (
/obj/machinery/door/window{
- dir = 4;
name = "Uplink Management Control";
req_access_txt = "151"
},
@@ -2858,20 +2791,17 @@
/area/shuttle/assault_pod)
"kn" = (
/obj/machinery/sleeper/syndie{
- dir = 2;
- icon_state = "sleeper_s-open"
+ dir = 2
},
/turf/simulated/floor/plasteel/dark,
/area/syndicate_mothership)
"kp" = (
/obj/machinery/light/spot{
dir = 1;
- icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
/obj/machinery/sleeper/syndie{
- dir = 2;
- icon_state = "sleeper_s-open"
+ dir = 2
},
/turf/simulated/floor/plasteel/dark,
/area/syndicate_mothership)
@@ -2880,8 +2810,7 @@
/area/syndicate_mothership)
"ks" = (
/obj/machinery/light{
- dir = 8;
- icon_state = "tube1"
+ dir = 8
},
/turf/simulated/floor/plasteel/dark,
/area/syndicate_mothership)
@@ -2964,14 +2893,13 @@
/obj/item/storage/fancy/crayons,
/obj/machinery/light/spot{
dir = 1;
- icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
/turf/simulated/floor/plasteel/dark,
/area/syndicate_mothership)
"kL" = (
/obj/structure/table,
-/obj/item/gun/energy/ionrifle,
+/obj/item/gun/energy/ionrifle/carbine,
/turf/simulated/floor/plasteel/dark,
/area/syndicate_mothership)
"kM" = (
@@ -3040,7 +2968,6 @@
/obj/structure/closet/secure_closet/personal,
/obj/machinery/light/spot{
dir = 4;
- icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
/turf/simulated/floor/carpet,
@@ -3165,7 +3092,6 @@
/obj/structure/reagent_dispensers/beerkeg,
/obj/machinery/light/spot{
dir = 1;
- icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
/turf/simulated/floor/plasteel{
@@ -3187,7 +3113,6 @@
"lv" = (
/obj/machinery/light/spot{
dir = 1;
- icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
/turf/simulated/floor/plasteel/freezer,
@@ -3247,7 +3172,6 @@
/obj/structure/chair/stool,
/obj/machinery/light/spot{
dir = 4;
- icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
/turf/simulated/floor/plasteel{
@@ -3381,7 +3305,6 @@
"me" = (
/obj/structure/table,
/obj/machinery/processor{
- pixel_x = 0;
pixel_y = 10
},
/turf/simulated/floor/plasteel{
@@ -3391,7 +3314,6 @@
"mf" = (
/obj/machinery/camera{
c_tag = "CentComm Special Ops. Mass Drivers";
- dir = 2;
network = list("ERT","CentComm")
},
/turf/simulated/floor/plasteel/dark{
@@ -3424,7 +3346,6 @@
"mj" = (
/obj/machinery/camera{
c_tag = "CentComm Special Ops. Assault Armor Storage";
- dir = 2;
network = list("ERT","CentComm")
},
/turf/simulated/floor/plasteel/dark{
@@ -3447,7 +3368,6 @@
/obj/structure/table,
/obj/machinery/light/spot{
dir = 4;
- icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
/turf/simulated/floor/plasteel{
@@ -3464,7 +3384,6 @@
"mn" = (
/obj/machinery/mass_driver{
dir = 8;
- drive_range = 50;
id_tag = "ASSAULT3";
name = "gravpult"
},
@@ -3552,7 +3471,6 @@
"mB" = (
/obj/machinery/mass_driver{
dir = 8;
- drive_range = 50;
id_tag = "ASSAULT2";
name = "gravpult"
},
@@ -3655,7 +3573,6 @@
/obj/machinery/sleeper/upgraded,
/obj/machinery/light/spot{
dir = 4;
- icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
/turf/simulated/floor/carpet,
@@ -3746,7 +3663,6 @@
"nl" = (
/obj/machinery/mass_driver{
dir = 8;
- drive_range = 50;
id_tag = "ASSAULT1";
name = "gravpult"
},
@@ -3765,8 +3681,7 @@
/area/syndicate_mothership)
"nr" = (
/obj/item/radio/intercom/syndicate{
- pixel_x = -32;
- pixel_y = 0
+ pixel_x = -32
},
/turf/simulated/floor/plasteel/dark,
/area/syndicate_mothership)
@@ -3795,7 +3710,6 @@
/obj/item/card/id/centcom,
/obj/machinery/light/spot{
dir = 4;
- icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
/obj/item/door_remote/centcomm,
@@ -3950,7 +3864,6 @@
"nN" = (
/obj/machinery/mass_driver{
dir = 8;
- drive_range = 50;
id_tag = "ASSAULT0";
name = "gravpult"
},
@@ -3968,8 +3881,7 @@
/area/centcom/specops)
"nP" = (
/obj/machinery/mech_bay_recharge_port/upgraded/unsimulated{
- dir = 8;
- icon_state = "recharge_port"
+ dir = 8
},
/turf/simulated/floor/plasteel/dark,
/area/syndicate_mothership)
@@ -4043,7 +3955,6 @@
"ol" = (
/obj/machinery/camera{
c_tag = "CentComm Special Ops. Bathroom";
- dir = 2;
network = list("ERT","CentComm")
},
/obj/structure/table/reinforced,
@@ -4088,7 +3999,6 @@
ailock = 1;
check_synth = 1;
name = "Gamma Turret Control Panel";
- pixel_x = 0;
req_access = list(114)
},
/turf/simulated/floor/plasteel{
@@ -4111,7 +4021,6 @@
/obj/item/storage/box/cups,
/obj/machinery/camera{
c_tag = "CentComm Special Ops. Ready Room North";
- dir = 2;
network = list("ERT","CentComm")
},
/turf/simulated/floor/plasteel/dark,
@@ -4137,7 +4046,6 @@
},
/obj/machinery/camera{
c_tag = "CentComm Special Ops. Starting Room";
- dir = 2;
network = list("ERT","CentComm")
},
/turf/simulated/floor/plasteel/dark{
@@ -4171,14 +4079,11 @@
/obj/item/gun/projectile/shotgun/automatic/combat,
/obj/item/gun/projectile/shotgun/automatic/combat,
/obj/machinery/status_display{
- density = 0;
layer = 4;
- pixel_x = 0;
pixel_y = 32
},
/obj/machinery/light/spot{
dir = 8;
- icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
/turf/simulated/floor/mineral/plastitanium/red,
@@ -4190,7 +4095,6 @@
/obj/item/gun/energy/sniperrifle,
/obj/machinery/light/spot{
dir = 4;
- icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
/obj/machinery/ai_status_display{
@@ -4360,8 +4264,7 @@
/area/shuttle/escape)
"pa" = (
/obj/structure/sign/securearea{
- pixel_x = 32;
- pixel_y = 0
+ pixel_x = 32
},
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/gamma/space)
@@ -4468,8 +4371,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- pixel_x = 0
+ icon_state = "4-8"
},
/obj/machinery/mech_bay_recharge_port/upgraded,
/turf/simulated/floor/mineral/plastitanium/red,
@@ -4482,12 +4384,6 @@
/obj/machinery/computer/mech_bay_power_console,
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/gamma/space)
-"pt" = (
-/obj/machinery/door/airlock/titanium{
- req_access_txt = "0"
- },
-/turf/simulated/floor/plating,
-/area/shuttle/gamma/space)
"pu" = (
/obj/mecha/combat/durand/loaded{
operation_req_access = list(1)
@@ -4495,8 +4391,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- pixel_x = 0
+ icon_state = "4-8"
},
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/gamma/space)
@@ -4554,7 +4449,6 @@
"pK" = (
/obj/machinery/camera{
c_tag = "CentComm Special Ops. Bathroom";
- dir = 2;
network = list("ERT","CentComm")
},
/turf/simulated/floor/plasteel/freezer,
@@ -4562,15 +4456,13 @@
"pL" = (
/obj/machinery/door/airlock/centcom{
name = "Bathroom";
- opacity = 1;
- req_access_txt = "0"
+ opacity = 1
},
/turf/simulated/floor/plasteel/dark,
/area/centcom/specops)
"pN" = (
/obj/machinery/door_control{
desc = "A remote control switch to block view of the singularity.";
- icon_state = "doorctrl0";
id = "GRAVPULTS";
name = "Gravity Catapults";
pixel_x = -6;
@@ -4579,7 +4471,6 @@
},
/obj/machinery/door_control{
desc = "A remote control switch to block view of the singularity.";
- icon_state = "doorctrl0";
id = "ASSAULT";
name = "Mech Storage";
pixel_x = 6;
@@ -4588,7 +4479,6 @@
},
/obj/machinery/door_control{
desc = "A remote control switch to block view of the singularity.";
- icon_state = "doorctrl0";
id = "CCTELE";
name = "Teleporter Access";
pixel_x = -6;
@@ -4619,8 +4509,7 @@
"pR" = (
/obj/machinery/computer/station_alert,
/obj/structure/sign/poster/official/nanotrasen_logo{
- pixel_x = 32;
- pixel_y = 0
+ pixel_x = 32
},
/turf/simulated/floor/plasteel{
dir = 5;
@@ -4646,7 +4535,6 @@
"pW" = (
/obj/machinery/newscaster{
layer = 3.3;
- pixel_x = 0;
pixel_y = -27
},
/turf/simulated/floor/plasteel/dark,
@@ -4654,7 +4542,6 @@
"pX" = (
/obj/machinery/door_control{
desc = "A remote control switch to connect the ready room to the rest of Centcom.";
- icon_state = "doorctrl0";
id = "SPECOPS";
name = "Ready Room";
pixel_x = -6;
@@ -4663,7 +4550,6 @@
},
/obj/machinery/door_control{
desc = "A remote control switch to block view of the singularity.";
- icon_state = "doorctrl0";
id = "specopsoffice";
name = "Privacy Shutters";
pixel_x = 6;
@@ -4672,7 +4558,6 @@
},
/obj/machinery/door_control{
desc = "A remote control switch to block view of the singularity.";
- icon_state = "doorctrl0";
id = "CCGAMMA";
name = "Gamma Lockdown";
pixel_x = -6;
@@ -4694,14 +4579,11 @@
"qb" = (
/obj/structure/sink{
dir = 4;
- icon_state = "sink";
- pixel_x = 11;
- pixel_y = 0
+ pixel_x = 11
},
/obj/structure/mirror{
dir = 4;
- pixel_x = 32;
- pixel_y = 0
+ pixel_x = 32
},
/turf/simulated/floor/plasteel/freezer,
/area/centcom/specops)
@@ -4779,8 +4661,7 @@
"qu" = (
/obj/machinery/door/airlock/centcom{
name = "Bathroom";
- opacity = 1;
- req_access_txt = "0"
+ opacity = 1
},
/turf/simulated/floor/plasteel/freezer,
/area/centcom/specops)
@@ -4809,8 +4690,7 @@
"qy" = (
/obj/machinery/door/airlock/centcom{
name = "Unit 4";
- opacity = 1;
- req_access_txt = "0"
+ opacity = 1
},
/turf/simulated/floor/plasteel/freezer,
/area/centcom/bathroom)
@@ -4841,7 +4721,6 @@
"qC" = (
/obj/machinery/shower{
dir = 4;
- icon_state = "shower";
pixel_x = 5;
tag = "icon-shower (EAST)"
},
@@ -4851,7 +4730,6 @@
"qD" = (
/obj/machinery/shower{
dir = 8;
- icon_state = "shower";
pixel_x = -5;
tag = "icon-shower (WEST)"
},
@@ -4960,7 +4838,6 @@
/obj/structure/table,
/obj/machinery/door_control{
desc = "A remote control switch for port-side blast doors.";
- icon_state = "doorctrl0";
id = "CentComPort";
name = "Security Doors";
pixel_y = -4;
@@ -5015,8 +4892,7 @@
"re" = (
/obj/machinery/door/airlock/centcom{
name = "Unit 3";
- opacity = 1;
- req_access_txt = "0"
+ opacity = 1
},
/turf/simulated/floor/plasteel/freezer,
/area/centcom/bathroom)
@@ -5051,9 +4927,7 @@
"rl" = (
/obj/structure/sink{
dir = 4;
- icon_state = "sink";
- pixel_x = 11;
- pixel_y = 0
+ pixel_x = 11
},
/obj/structure/mirror{
pixel_x = 32
@@ -5080,8 +4954,7 @@
"ro" = (
/obj/machinery/door/airlock/centcom{
name = "Unit 2";
- opacity = 1;
- req_access_txt = "0"
+ opacity = 1
},
/turf/simulated/floor/plasteel/freezer,
/area/centcom/bathroom)
@@ -5130,8 +5003,7 @@
"rx" = (
/obj/machinery/door/airlock/centcom{
name = "Bathroom";
- opacity = 1;
- req_access_txt = "0"
+ opacity = 1
},
/turf/simulated/floor/plasteel/freezer,
/area/centcom/evac)
@@ -5160,8 +5032,7 @@
"rD" = (
/obj/machinery/door/airlock/centcom{
name = "Unit 1";
- opacity = 1;
- req_access_txt = "0"
+ opacity = 1
},
/turf/simulated/floor/plasteel/freezer,
/area/centcom/bathroom)
@@ -5180,8 +5051,7 @@
icon_state = "door_locked";
id_tag = "emergency_away";
name = "Arrival Airlock";
- req_access = null;
- req_access_txt = "0"
+ req_access = null
},
/turf/simulated/floor/plating,
/area/centcom/evac)
@@ -5195,7 +5065,6 @@
"rJ" = (
/obj/structure/shuttle/engine/propulsion{
dir = 1;
- icon_state = "propulsion";
tag = "icon-propulsion (NORTH)"
},
/turf/simulated/floor/plating/airless,
@@ -5221,7 +5090,6 @@
/area/centcom/evac)
"rO" = (
/obj/docking_port/stationary{
- dir = 1;
dwidth = 1;
height = 4;
id = "pod1_away";
@@ -5232,7 +5100,6 @@
/area/space)
"rP" = (
/obj/docking_port/stationary{
- dir = 1;
dwidth = 1;
height = 4;
id = "pod2_away";
@@ -5245,7 +5112,6 @@
/obj/structure/window/reinforced,
/obj/structure/shuttle/engine/heater{
dir = 1;
- icon_state = "heater";
tag = "icon-heater (NORTH)"
},
/turf/simulated/floor/plating/airless,
@@ -5258,14 +5124,12 @@
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
icon_state = "space";
layer = 4;
- name = "EXTERNAL AIRLOCK";
- pixel_x = 0
+ name = "EXTERNAL AIRLOCK"
},
/turf/simulated/wall/indestructible/riveted,
/area/centcom/evac)
"rW" = (
/obj/docking_port/mobile/emergency{
- dir = 4;
dwidth = 11;
height = 18;
width = 29
@@ -5310,8 +5174,7 @@
"sc" = (
/obj/structure/table,
/obj/item/storage/firstaid/regular{
- pixel_x = 2;
- pixel_y = 0
+ pixel_x = 2
},
/obj/item/storage/firstaid/regular{
pixel_x = -2;
@@ -5331,18 +5194,14 @@
"sg" = (
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
- pixel_x = -30;
- pixel_y = 0;
- req_access_txt = "0"
+ pixel_x = -30
},
/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
"si" = (
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
- pixel_x = 30;
- pixel_y = 0;
- req_access_txt = "0"
+ pixel_x = 30
},
/turf/simulated/floor/mineral/titanium/blue,
/area/centcom/evac)
@@ -5383,8 +5242,7 @@
/area/centcom/evac)
"st" = (
/obj/structure/closet/secure_closet/bar{
- req_access = null;
- req_access_txt = "0"
+ req_access = null
},
/turf/simulated/floor/wood,
/area/centcom/evac)
@@ -5400,8 +5258,7 @@
"sx" = (
/obj/machinery/door/airlock/centcom{
name = "Rest Area";
- opacity = 1;
- req_access_txt = "0"
+ opacity = 1
},
/turf/simulated/floor/wood,
/area/centcom/evac)
@@ -5409,7 +5266,6 @@
/obj/machinery/computer/secure_data,
/obj/machinery/light/spot{
dir = 8;
- icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
/turf/simulated/floor/mineral/plastitanium/red,
@@ -5431,9 +5287,7 @@
/area/centcom/evac)
"sC" = (
/obj/machinery/door/window/northright{
- base_state = "right";
dir = 4;
- icon_state = "right";
name = "Security Desk";
req_access_txt = "104"
},
@@ -5491,8 +5345,7 @@
/area/centcom/evac)
"sL" = (
/obj/machinery/door/airlock/hatch{
- name = "Infirmary";
- req_access_txt = "0"
+ name = "Infirmary"
},
/turf/simulated/floor/mineral/titanium/yellow,
/area/centcom/evac)
@@ -5522,25 +5375,21 @@
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
icon_state = "space";
layer = 4;
- name = "EXTERNAL AIRLOCK";
- pixel_x = 0
+ name = "EXTERNAL AIRLOCK"
},
/turf/simulated/wall/indestructible/fakeglass,
/area/centcom/ferry)
"sR" = (
/obj/machinery/door/airlock/centcom{
name = "Medical Treatment Post";
- opacity = 1;
- req_access_txt = "0"
+ opacity = 1
},
/turf/simulated/floor/plasteel,
/area/centcom/evac)
"sS" = (
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
- pixel_x = -30;
- pixel_y = 0;
- req_access_txt = "0"
+ pixel_x = -30
},
/turf/simulated/floor/mineral/titanium,
/area/centcom/evac)
@@ -5552,7 +5401,6 @@
/area/tdome/tdomeobserve)
"sU" = (
/obj/structure/table{
- dir = 2;
icon_state = "tabledir"
},
/obj/item/reagent_containers/food/drinks/cans/cola,
@@ -5631,8 +5479,7 @@
"td" = (
/obj/machinery/door/airlock/external{
id_tag = "ferry_away";
- name = "Ferry Airlock";
- req_access_txt = "0"
+ name = "Ferry Airlock"
},
/turf/simulated/floor/plating,
/area/centcom/ferry)
@@ -5678,9 +5525,7 @@
"tk" = (
/obj/machinery/vending/wallmed{
name = "Emergency NanoMed";
- pixel_x = 30;
- pixel_y = 0;
- req_access_txt = "0"
+ pixel_x = 30
},
/obj/machinery/vending/snack,
/turf/simulated/floor/mineral/titanium/blue,
@@ -5712,8 +5557,7 @@
/area/centcom/evac)
"tp" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 9;
- icon_state = "intact"
+ dir = 9
},
/turf/simulated/floor/plasteel/white,
/area/centcom/evac)
@@ -5787,16 +5631,9 @@
/area/centcom/evac)
"tx" = (
/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
- pixel_x = 0;
- pixel_y = 0
- },
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
- pixel_x = 0;
- pixel_y = 0
- },
+/obj/item/reagent_containers/glass/beaker/cryoxadone,
+/obj/item/reagent_containers/glass/beaker/cryoxadone,
/turf/simulated/floor/plasteel{
- dir = 2;
icon_state = "whiteblue";
tag = "icon-whitehall (WEST)"
},
@@ -5810,7 +5647,6 @@
name = "Canister: \[O2] (CRYO)"
},
/turf/simulated/floor/plasteel{
- dir = 2;
icon_state = "whiteblue";
tag = "icon-whitehall (WEST)"
},
@@ -5833,7 +5669,6 @@
/obj/item/storage/firstaid/adv,
/obj/item/storage/firstaid/brute,
/turf/simulated/floor/plasteel{
- dir = 2;
icon_state = "whiteblue";
tag = "icon-whitehall (WEST)"
},
@@ -6051,11 +5886,9 @@
/obj/structure/table,
/obj/machinery/door_control{
desc = "A remote control switch for port-side blast doors.";
- icon_state = "doorctrl0";
id = "thunderdome";
name = "Main Blast Doors";
pixel_x = -3;
- pixel_y = 0;
req_access_txt = "104"
},
/turf/simulated/floor/plasteel{
@@ -6072,7 +5905,6 @@
/area/tdome/tdomeadmin)
"uc" = (
/turf/simulated/floor/plasteel{
- dir = 2;
icon_state = "greencorner"
},
/area/centcom/control)
@@ -6112,10 +5944,8 @@
/obj/structure/table,
/obj/machinery/door_control{
desc = "A remote control switch for port-side blast doors.";
- icon_state = "doorctrl0";
id = "thunderdomehea";
name = "Ranged Gear";
- pixel_x = 0;
pixel_y = 5;
req_access_txt = "104"
},
@@ -6128,10 +5958,8 @@
/obj/structure/table,
/obj/machinery/door_control{
desc = "A remote control switch for port-side blast doors.";
- icon_state = "doorctrl0";
id = "thunderdomeaxe";
name = "Specialist Supply";
- pixel_x = 0;
pixel_y = 5;
req_access_txt = "104"
},
@@ -6141,10 +5969,8 @@
/obj/structure/table,
/obj/machinery/door_control{
desc = "A remote control switch for port-side blast doors.";
- icon_state = "doorctrl0";
id = "thunderdomegen";
name = "General Equiptment";
- pixel_x = 0;
pixel_y = 5;
req_access_txt = "104"
},
@@ -6186,7 +6012,6 @@
"uq" = (
/obj/machinery/camera{
c_tag = "CentComm Special Ops. Bathroom";
- dir = 2;
network = list("ERT","CentComm")
},
/turf/simulated/floor/plasteel/dark,
@@ -6729,15 +6554,13 @@
/area/admin)
"vN" = (
/obj/machinery/door/airlock/hatch{
- name = "Clothing Storage";
- req_access_txt = "0"
+ name = "Clothing Storage"
},
/turf/simulated/floor/plasteel,
/area/admin)
"vO" = (
/obj/machinery/door/airlock/hatch{
- name = "Mecha Room";
- req_access_txt = "0"
+ name = "Mecha Room"
},
/turf/simulated/floor/plasteel,
/area/admin)
@@ -6787,8 +6610,7 @@
/area/admin)
"wc" = (
/obj/machinery/door/airlock/hatch{
- name = "External Airlock";
- req_access_txt = "0"
+ name = "External Airlock"
},
/turf/simulated/floor/plasteel,
/area/admin)
@@ -6828,8 +6650,7 @@
/area/space)
"wl" = (
/obj/machinery/door/airlock/hatch{
- name = "Armory";
- req_access_txt = "0"
+ name = "Armory"
},
/turf/simulated/floor/plasteel,
/area/admin)
@@ -7037,8 +6858,7 @@
opacity = 0
},
/obj/machinery/door/airlock/hatch{
- name = "Chem Lab";
- req_access_txt = "0"
+ name = "Chem Lab"
},
/turf/simulated/floor/plasteel/freezer,
/area/admin)
@@ -7089,7 +6909,6 @@
"wM" = (
/obj/structure/mirror{
dir = 4;
- pixel_x = 0;
pixel_y = -32
},
/turf/simulated/floor/plasteel,
@@ -7117,11 +6936,9 @@
/obj/item/gun/energy/pulse/pistol,
/obj/machinery/door_control{
desc = "A remote control switch to lock down the admin lab.";
- icon_state = "doorctrl0";
id = "ADMINCHEMLOCKDOWN";
name = "Lockdown";
- pixel_y = 24;
- req_access_txt = "0"
+ pixel_y = 24
},
/turf/simulated/floor/carpet,
/area/admin)
@@ -7248,8 +7065,7 @@
"xl" = (
/obj/structure/table,
/obj/machinery/door/window/southleft{
- name = "security checkpoint";
- req_access_txt = "0"
+ name = "security checkpoint"
},
/turf/simulated/floor/carpet,
/area/admin)
@@ -7301,8 +7117,7 @@
/area/admin)
"xr" = (
/obj/machinery/door/airlock/hatch{
- name = "Tool Storage";
- req_access_txt = "0"
+ name = "Tool Storage"
},
/turf/simulated/floor/plasteel/dark,
/area/admin)
@@ -7371,8 +7186,7 @@
/obj/structure/table,
/obj/item/grenade/syndieminibomb{
pixel_x = 4;
- pixel_y = 2;
- pixel_z = 0
+ pixel_y = 2
},
/obj/item/grenade/syndieminibomb{
pixel_x = -1
@@ -7381,9 +7195,7 @@
/area/admin)
"xE" = (
/obj/structure/table,
-/obj/machinery/recharger{
- pixel_y = 0
- },
+/obj/machinery/recharger,
/obj/item/toy/cards/deck/syndicate/black,
/turf/simulated/floor/plasteel/dark,
/area/admin)
@@ -7409,8 +7221,7 @@
},
/obj/machinery/door/airlock/hatch{
desc = "Uh oh.";
- name = "Operating Theater";
- req_access_txt = "0"
+ name = "Operating Theater"
},
/turf/simulated/floor/plasteel/freezer,
/area/admin)
@@ -7426,8 +7237,7 @@
"xO" = (
/obj/machinery/door/airlock/hatch{
desc = "You've heard rumors of the horrors that go on within this lab.";
- name = "Laboratory (DANGER!)";
- req_access_txt = "0"
+ name = "Laboratory (DANGER!)"
},
/turf/simulated/floor/plasteel,
/area/admin)
@@ -7485,10 +7295,7 @@
pixel_x = -3;
pixel_y = -3
},
-/obj/item/card/id{
- pixel_x = 0;
- pixel_y = 0
- },
+/obj/item/card/id,
/obj/item/card/id/admin{
pixel_x = 3;
pixel_y = 3
@@ -7531,8 +7338,7 @@
/area/admin)
"yl" = (
/obj/machinery/door/airlock/public/glass{
- name = "Computer Hub";
- req_access_txt = "0"
+ name = "Computer Hub"
},
/obj/machinery/door/poddoor{
density = 0;
@@ -7553,8 +7359,7 @@
"yn" = (
/obj/machinery/door/airlock/hatch{
desc = "For all your shady business needs";
- name = "Gambling Den";
- req_access_txt = "0"
+ name = "Gambling Den"
},
/turf/simulated/floor/wood,
/area/admin)
@@ -7585,8 +7390,7 @@
/area/centcom/evac)
"yw" = (
/obj/machinery/light{
- dir = 4;
- icon_state = "tube1"
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/trader_station/sol)
@@ -7701,11 +7505,8 @@
/obj/structure/table,
/obj/machinery/door_control{
desc = "A remote control switch to lock down external access to the admin room.";
- icon_state = "doorctrl0";
id = "ADMINLOCKDOWN";
- name = "Lockdown";
- pixel_y = 0;
- req_access_txt = "0"
+ name = "Lockdown"
},
/turf/simulated/floor/plasteel,
/area/admin)
@@ -7716,9 +7517,7 @@
/area/centcom/evac)
"yX" = (
/obj/structure/table/reinforced,
-/obj/machinery/recharger{
- pixel_y = 0
- },
+/obj/machinery/recharger,
/turf/simulated/floor/mineral/plastitanium/red,
/area/centcom/evac)
"yY" = (
@@ -7750,15 +7549,13 @@
"zd" = (
/obj/machinery/door/airlock/hatch{
desc = "Danger: May contain robustness";
- name = "Dojo";
- req_access_txt = "0"
+ name = "Dojo"
},
/turf/simulated/floor/plasteel/dark,
/area/admin)
"ze" = (
/obj/machinery/door/airlock/public/glass{
- name = "Shuttle Bay";
- req_access_txt = "0"
+ name = "Shuttle Bay"
},
/turf/simulated/floor/plasteel,
/area/admin)
@@ -7902,8 +7699,7 @@
id_tag = "vox_northwest_lock";
locked = 1;
req_access_txt = "152";
- req_one_access = null;
- req_one_access_txt = "0"
+ req_one_access = null
},
/turf/simulated/floor/plating/nitrogen,
/area/shuttle/vox)
@@ -7933,14 +7729,12 @@
"zM" = (
/obj/machinery/door/window{
dir = 1;
- name = "Suit Storage";
- req_access_txt = "0"
+ name = "Suit Storage"
},
/turf/simulated/floor/engine,
/area/admin)
"zN" = (
/obj/machinery/door/poddoor/shutters{
- dir = 4;
id_tag = "commandcenter";
name = "Privacy Shutters"
},
@@ -7952,8 +7746,7 @@
/area/centcom/evac)
"zP" = (
/obj/machinery/door/airlock{
- name = "Toilet";
- req_access_txt = "0"
+ name = "Toilet"
},
/turf/simulated/floor/plasteel,
/area/trader_station/sol)
@@ -7978,8 +7771,7 @@
id_tag = "vox_northeast_lock";
locked = 1;
req_access_txt = "152";
- req_one_access = null;
- req_one_access_txt = "0"
+ req_one_access = null
},
/obj/docking_port/mobile{
dir = 2;
@@ -8073,9 +7865,7 @@
},
/obj/structure/sink{
dir = 4;
- icon_state = "sink";
- pixel_x = 11;
- pixel_y = 0
+ pixel_x = 11
},
/turf/simulated/floor/plasteel/freezer,
/area/trader_station/sol)
@@ -8106,8 +7896,7 @@
/obj/machinery/door/window{
dir = 8;
name = "Toilet";
- opacity = 1;
- req_access_txt = "0"
+ opacity = 1
},
/turf/simulated/floor/plasteel/freezer,
/area/trader_station/sol)
@@ -8118,7 +7907,6 @@
/obj/structure/window/reinforced,
/obj/structure/shuttle/engine/heater{
dir = 1;
- icon_state = "heater";
tag = "icon-heater (NORTH)"
},
/turf/simulated/floor/plating/airless,
@@ -8180,8 +7968,7 @@
/area/admin)
"AI" = (
/obj/machinery/door/airlock/hatch{
- name = "Teleporter Access";
- req_access_txt = "0"
+ name = "Teleporter Access"
},
/obj/machinery/door/poddoor{
density = 0;
@@ -8284,7 +8071,6 @@
"AY" = (
/obj/machinery/light/spot{
dir = 8;
- icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
/obj/machinery/pdapainter,
@@ -8294,7 +8080,6 @@
/obj/structure/table,
/obj/machinery/light/spot{
dir = 4;
- icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
/obj/item/storage/backpack/satchel,
@@ -8304,7 +8089,6 @@
"Ba" = (
/obj/machinery/light/spot{
dir = 8;
- icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
/obj/machinery/vending/tool,
@@ -8394,8 +8178,7 @@
/area/syndicate_mothership)
"Bt" = (
/obj/structure/chair/comfy/red{
- dir = 1;
- icon_state = "comfychair"
+ dir = 1
},
/obj/effect/landmark{
name = "Syndicate Officer"
@@ -8635,7 +8418,6 @@
frequency = 1331;
icon_state = "door_locked";
id_tag = "synd_outer";
- locked = 0;
name = "Ship External Access";
req_access = null;
req_access_txt = "150"
@@ -8747,7 +8529,6 @@
"CO" = (
/obj/machinery/door/window{
base_state = "right";
- dir = 4;
icon_state = "right";
name = "Equipment Room";
req_access_txt = "150"
@@ -8770,7 +8551,6 @@
/obj/item/clothing/gloves/color/latex/nitrile,
/obj/item/clothing/mask/breath,
/turf/simulated/floor/plasteel{
- dir = 2;
icon_state = "cmo"
},
/area/shuttle/escape)
@@ -8781,8 +8561,7 @@
id_tag = "vox_southwest_lock";
locked = 1;
req_access_txt = "152";
- req_one_access = null;
- req_one_access_txt = "0"
+ req_one_access = null
},
/turf/simulated/floor/plating/nitrogen,
/area/shuttle/vox)
@@ -8835,8 +8614,7 @@
req_access_txt = "101"
},
/obj/machinery/light{
- dir = 8;
- icon_state = "tube1"
+ dir = 8
},
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
@@ -8894,7 +8672,6 @@
frequency = 1441;
id_tag = "syndicate_jail_airlock_control";
name = "Syndicate Jail Access Controller";
- pixel_x = 0;
pixel_y = 24;
req_access_txt = "150";
tag_exterior_door = "syndicate_jail_airlock_external";
@@ -8907,7 +8684,6 @@
dir = 4
},
/turf/simulated/floor/plasteel{
- dir = 2;
icon_state = "cmo"
},
/area/shuttle/escape)
@@ -8929,7 +8705,6 @@
"DP" = (
/obj/machinery/light/spot{
dir = 1;
- icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
/obj/effect/spawner/lootdrop/trade_sol/donksoft,
@@ -8990,7 +8765,6 @@
dir = 1
},
/turf/simulated/floor/holofloor{
- dir = 2;
icon_state = "green"
},
/area/holodeck/source_basketball)
@@ -9085,7 +8859,6 @@
"EM" = (
/obj/item/radio/intercom{
dir = 8;
- name = "station intercom (General)";
pixel_x = -28
},
/obj/machinery/recharge_station,
@@ -9182,7 +8955,6 @@
/area/shuttle/administration)
"Fc" = (
/obj/machinery/door/window{
- dir = 4;
name = "Equipment Room";
req_access_txt = "150"
},
@@ -9271,9 +9043,7 @@
dir = 1
},
/obj/structure/table,
-/obj/machinery/recharger{
- pixel_y = 0
- },
+/obj/machinery/recharger,
/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/shuttle/vox)
"Fr" = (
@@ -9309,7 +9079,6 @@
/obj/item/stock_parts/cell/high,
/obj/machinery/light/small{
dir = 8;
- icon_state = "bulb1";
tag = "icon-bulb1 (WEST)"
},
/turf/simulated/floor/plasteel{
@@ -9331,7 +9100,6 @@
"FG" = (
/obj/machinery/light/spot{
dir = 1;
- icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
/turf/simulated/floor/mineral/titanium/blue,
@@ -9428,8 +9196,7 @@
master_tag = "synd_airlock";
name = "interior access button";
pixel_x = 25;
- pixel_y = 25;
- req_access_txt = "0"
+ pixel_y = 25
},
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
@@ -9469,12 +9236,10 @@
"GL" = (
/obj/structure/table/reinforced,
/obj/machinery/light{
- dir = 8;
- icon_state = "tube1"
+ dir = 8
},
/obj/item/reagent_containers/food/drinks/mug/med,
/turf/simulated/floor/plasteel{
- dir = 2;
icon_state = "cmo"
},
/area/shuttle/escape)
@@ -9530,8 +9295,7 @@
dir = 8
},
/obj/machinery/light{
- dir = 4;
- icon_state = "tube1"
+ dir = 4
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -9569,7 +9333,6 @@
/area/shuttle/syndicate)
"Hp" = (
/turf/simulated/floor/holofloor{
- dir = 2;
icon_state = "rampbottom";
tag = "icon-rampbottom"
},
@@ -9644,7 +9407,6 @@
"HN" = (
/obj/machinery/light/spot{
dir = 1;
- icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
/turf/simulated/floor/plasteel/dark,
@@ -9687,8 +9449,7 @@
/area/tdome)
"Ic" = (
/obj/machinery/light{
- dir = 8;
- icon_state = "tube1"
+ dir = 8
},
/obj/structure/chair/comfy/shuttle{
dir = 4
@@ -9715,8 +9476,7 @@
"Ij" = (
/obj/item/twohanded/required/kirbyplants,
/obj/machinery/light{
- dir = 4;
- icon_state = "tube1"
+ dir = 4
},
/turf/simulated/floor/plasteel,
/area/shuttle/escape)
@@ -9765,7 +9525,6 @@
name = "Bolt Cell Doors";
normaldoorcontrol = 1;
pixel_x = 6;
- pixel_y = 0;
req_access_txt = "150";
specialfunctions = 4
},
@@ -9774,7 +9533,6 @@
name = "Bolt Jail Door";
normaldoorcontrol = 1;
pixel_x = -5;
- pixel_y = 0;
req_access_txt = "150";
specialfunctions = 4
},
@@ -9785,7 +9543,6 @@
dir = 1
},
/turf/simulated/floor/holofloor{
- dir = 2;
icon_state = "asteroid7";
tag = "icon-asteroid7"
},
@@ -9828,7 +9585,6 @@
/obj/item/clothing/under/color/green,
/obj/item/holo/esword/green,
/turf/simulated/floor/holofloor{
- dir = 2;
icon_state = "green"
},
/area/holodeck/source_thunderdomecourt)
@@ -9836,8 +9592,7 @@
/obj/structure/table,
/obj/item/grenade/syndieminibomb{
pixel_x = 4;
- pixel_y = 2;
- pixel_z = 0
+ pixel_y = 2
},
/obj/item/grenade/syndieminibomb{
pixel_x = -1
@@ -9850,9 +9605,7 @@
},
/obj/structure/sink{
dir = 4;
- icon_state = "sink";
- pixel_x = 11;
- pixel_y = 0
+ pixel_x = 11
},
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
@@ -9923,7 +9676,6 @@
"Jn" = (
/obj/machinery/light/spot{
dir = 8;
- icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
/turf/simulated/floor/mineral/plastitanium/red,
@@ -9955,7 +9707,6 @@
/area/shuttle/escape)
"Jx" = (
/turf/simulated/floor/plasteel{
- dir = 2;
icon_state = "cmo"
},
/area/shuttle/escape)
@@ -10057,9 +9808,7 @@
/area/vox_station)
"Kw" = (
/obj/structure/table,
-/obj/machinery/recharger{
- pixel_y = 0
- },
+/obj/machinery/recharger,
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"Kx" = (
@@ -10069,7 +9818,6 @@
"Ky" = (
/obj/machinery/door/poddoor/shutters{
density = 0;
- dir = 4;
icon_state = "open";
id_tag = "adminshuttleshutters";
name = "Blast Shutters";
@@ -10102,7 +9850,6 @@
"KF" = (
/obj/item/radio/intercom{
dir = 8;
- name = "station intercom (General)";
pixel_x = -28
},
/obj/structure/chair/comfy/shuttle{
@@ -10132,7 +9879,6 @@
"KM" = (
/obj/machinery/light/spot{
dir = 8;
- icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
/obj/structure/chair/comfy/shuttle{
@@ -10147,7 +9893,6 @@
},
/obj/machinery/light/spot{
dir = 1;
- icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
/obj/structure/chair/comfy/shuttle,
@@ -10228,7 +9973,6 @@
"Li" = (
/obj/machinery/light/spot{
dir = 4;
- icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
/turf/simulated/floor/mineral/plastitanium/red,
@@ -10236,7 +9980,6 @@
"Lj" = (
/obj/machinery/light/spot{
dir = 8;
- icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
/turf/simulated/floor/mineral/plastitanium/red,
@@ -10250,7 +9993,6 @@
"Lm" = (
/obj/machinery/door/poddoor/shutters{
density = 0;
- dir = 4;
icon_state = "open";
id_tag = "voxshutters";
name = "Blast Shutters";
@@ -10303,7 +10045,6 @@
/obj/item/storage/box/handcuffs,
/obj/machinery/light/spot{
dir = 8;
- icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
/turf/simulated/floor/mineral/plastitanium/red,
@@ -10331,7 +10072,6 @@
/obj/item/storage/backpack/medic,
/obj/item/storage/belt/medical,
/turf/simulated/floor/plasteel{
- dir = 2;
icon_state = "cmo"
},
/area/shuttle/escape)
@@ -10406,7 +10146,6 @@
id = "syndicate_elite";
name = "Blast Doors";
pixel_x = -25;
- pixel_y = 0;
req_access_txt = "150"
},
/obj/machinery/door/poddoor{
@@ -10461,7 +10200,6 @@
"MB" = (
/obj/machinery/light/spot{
dir = 1;
- icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
/turf/simulated/floor/mineral/titanium/blue,
@@ -10492,8 +10230,7 @@
"MI" = (
/obj/item/twohanded/required/kirbyplants,
/obj/machinery/light{
- dir = 8;
- icon_state = "tube1"
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/shuttle/escape)
@@ -10546,7 +10283,6 @@
"Nb" = (
/obj/machinery/light/spot{
dir = 8;
- icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
/turf/simulated/floor/mineral/plastitanium/red,
@@ -10565,7 +10301,6 @@
/obj/machinery/clonepod/upgraded,
/obj/machinery/light/spot{
dir = 1;
- icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
/turf/simulated/floor/mineral/titanium,
@@ -10592,7 +10327,6 @@
"Nv" = (
/obj/machinery/light/spot{
dir = 4;
- icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
/turf/simulated/floor/plasteel/dark,
@@ -10621,8 +10355,7 @@
/area/shuttle/escape)
"NB" = (
/obj/machinery/light{
- dir = 4;
- icon_state = "tube1"
+ dir = 4
},
/turf/simulated/floor/plating/nitrogen,
/area/shuttle/vox)
@@ -10695,8 +10428,7 @@
dir = 4
},
/obj/structure/shuttle/engine/heater{
- dir = 8;
- icon_state = "heater"
+ dir = 8
},
/turf/simulated/floor/plating/airless,
/area/shuttle/specops)
@@ -10706,7 +10438,6 @@
"NY" = (
/obj/machinery/light/spot{
dir = 1;
- icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
/obj/structure/chair/comfy/shuttle{
@@ -10799,16 +10530,14 @@
"Oy" = (
/obj/machinery/door/airlock/medical/glass{
id_tag = null;
- name = "Escape Shuttle Infirmary";
- req_access_txt = "0"
+ name = "Escape Shuttle Infirmary"
},
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
/area/shuttle/escape)
"Oz" = (
/obj/machinery/light{
- dir = 8;
- icon_state = "tube1"
+ dir = 8
},
/turf/simulated/floor/plasteel,
/area/shuttle/escape)
@@ -10902,7 +10631,6 @@
"Pl" = (
/obj/machinery/light/spot{
dir = 8;
- icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
/obj/machinery/suit_storage_unit/syndicate/secure,
@@ -10938,8 +10666,7 @@
/area/shuttle/administration)
"PD" = (
/obj/structure/shuttle/engine/propulsion{
- dir = 8;
- icon_state = "propulsion"
+ dir = 8
},
/turf/simulated/floor/plating/airless,
/area/shuttle/trade/sol)
@@ -10961,7 +10688,6 @@
/obj/item/tank/internals/nitrogen,
/obj/machinery/light/spot{
dir = 4;
- icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
@@ -11039,7 +10765,6 @@
},
/obj/structure/bed/roller,
/turf/simulated/floor/plasteel{
- dir = 2;
icon_state = "cmo"
},
/area/shuttle/escape)
@@ -11127,8 +10852,7 @@
"QD" = (
/obj/machinery/door/airlock/medical/glass{
id_tag = null;
- name = "Escape Shuttle Infirmary";
- req_access_txt = "0"
+ name = "Escape Shuttle Infirmary"
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -11150,8 +10874,7 @@
/area/shuttle/escape)
"QH" = (
/obj/structure/reagent_dispensers/fueltank/chem{
- pixel_x = -32;
- pixel_y = 0
+ pixel_x = -32
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -11165,7 +10888,6 @@
"QK" = (
/obj/machinery/light/spot{
dir = 8;
- icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
/obj/structure/chair/comfy/shuttle{
@@ -11184,7 +10906,6 @@
/area/syndicate_mothership/jail)
"QQ" = (
/turf/simulated/floor/holofloor{
- dir = 2;
icon = 'icons/turf/floors/plating.dmi';
icon_state = "asteroid6";
tag = "icon-asteroid6"
@@ -11192,7 +10913,6 @@
/area/holodeck/source_desert)
"QR" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
- dir = 2;
frequency = 1331;
id_tag = "synd_pump"
},
@@ -11237,7 +10957,6 @@
"Re" = (
/obj/machinery/light/spot{
dir = 8;
- icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
/obj/machinery/sleeper/syndie{
@@ -11255,7 +10974,6 @@
/obj/structure/window/reinforced,
/obj/structure/shuttle/engine/heater{
dir = 1;
- icon_state = "heater";
tag = "icon-heater (NORTH)"
},
/turf/simulated/floor/plating/airless,
@@ -11281,7 +10999,6 @@
"Rn" = (
/obj/machinery/light/spot{
dir = 4;
- icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
/obj/machinery/door_control{
@@ -11289,16 +11006,14 @@
layer = 3;
name = "Loading Doors";
pixel_x = 24;
- pixel_y = 8;
- req_access_txt = "0"
+ pixel_y = 8
},
/obj/machinery/door_control{
id = "QMLoaddoor";
layer = 3;
name = "Loading Doors";
pixel_x = 24;
- pixel_y = -8;
- req_access_txt = "0"
+ pixel_y = -8
},
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/supply)
@@ -11351,7 +11066,6 @@
"RF" = (
/obj/structure/shuttle/engine/propulsion{
dir = 1;
- icon_state = "propulsion";
tag = "icon-propulsion (NORTH)"
},
/turf/simulated/floor/plating/airless,
@@ -11438,8 +11152,7 @@
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
icon_state = "space";
layer = 4;
- name = "EXTERNAL AIRLOCK";
- pixel_x = 0
+ name = "EXTERNAL AIRLOCK"
},
/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/syndicate)
@@ -11449,7 +11162,6 @@
"Sp" = (
/obj/item/flag/med,
/turf/simulated/floor/plasteel{
- dir = 2;
icon_state = "cmo"
},
/area/shuttle/escape)
@@ -11472,9 +11184,7 @@
/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"Sv" = (
-/obj/machinery/atmospherics/unary/tank/air{
- dir = 2
- },
+/obj/machinery/atmospherics/unary/tank/air,
/turf/simulated/wall/mineral/plastitanium,
/area/shuttle/syndicate)
"Sy" = (
@@ -11500,7 +11210,6 @@
"SH" = (
/obj/machinery/light/spot{
dir = 8;
- icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
/turf/simulated/floor/mineral/titanium/blue,
@@ -11542,7 +11251,6 @@
/obj/item/clothing/head/helmet/riot/knight/blue,
/obj/item/holo/claymore/blue,
/turf/simulated/floor/holofloor{
- dir = 2;
icon_state = "blue"
},
/area/holodeck/source_knightarena)
@@ -11620,8 +11328,7 @@
network = list("SS13","Research Outpost","Mining Outpost","Telecomms")
},
/obj/structure/sign/poster/official/nanotrasen_logo{
- pixel_x = -32;
- pixel_y = 0
+ pixel_x = -32
},
/turf/simulated/floor/plasteel{
dir = 9;
@@ -11655,7 +11362,6 @@
"TQ" = (
/obj/structure/holowindow,
/turf/simulated/floor/holofloor{
- dir = 2;
icon_state = "asteroid7";
tag = "icon-asteroid7"
},
@@ -11743,7 +11449,6 @@
/area/shuttle/syndicate)
"Uv" = (
/turf/simulated/floor/holofloor{
- dir = 2;
icon = 'icons/turf/floors/plating.dmi';
icon_state = "asteroid5";
tag = "icon-asteroid5"
@@ -11755,9 +11460,7 @@
/area/shuttle/syndicate)
"Uy" = (
/obj/structure/table/holotable,
-/obj/machinery/readybutton{
- pixel_y = 0
- },
+/obj/machinery/readybutton,
/turf/simulated/floor/holofloor{
dir = 6;
icon_state = "green"
@@ -11778,7 +11481,6 @@
"UC" = (
/obj/machinery/light/spot{
dir = 8;
- icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
/obj/structure/window/reinforced,
@@ -11790,7 +11492,6 @@
"UD" = (
/obj/machinery/door/window{
base_state = "right";
- dir = 4;
icon_state = "right";
name = "Infirmary";
req_access_txt = "150"
@@ -11855,7 +11556,6 @@
"Va" = (
/obj/machinery/camera{
c_tag = "CentComm Special Ops. Shuttle";
- dir = 2;
network = list("ERT","CentComm")
},
/obj/structure/chair/comfy/shuttle,
@@ -11882,7 +11582,6 @@
},
/obj/machinery/light/spot{
dir = 1;
- icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
/turf/simulated/floor/mineral/plastitanium/red,
@@ -12027,7 +11726,6 @@
/area/shuttle/syndicate)
"VZ" = (
/turf/simulated/floor/holofloor{
- dir = 2;
icon_state = "asteroid7";
tag = "icon-asteroid7"
},
@@ -12068,7 +11766,6 @@
"Wh" = (
/obj/machinery/door/airlock/command/glass{
name = "Escape Shuttle Cockpit";
- req_access_txt = "0";
req_one_access_txt = "2;19"
},
/turf/simulated/floor/plasteel{
@@ -12109,7 +11806,6 @@
"Wp" = (
/obj/machinery/light/spot{
dir = 1;
- icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
/obj/structure/chair/comfy/shuttle,
@@ -12150,7 +11846,6 @@
"WL" = (
/obj/machinery/light/spot{
dir = 4;
- icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
/obj/structure/chair/comfy/shuttle{
@@ -12197,7 +11892,6 @@
"Xi" = (
/obj/machinery/light/spot{
dir = 1;
- icon_state = "tube1";
tag = "icon-tube1 (NORTH)"
},
/obj/machinery/door_control{
@@ -12205,16 +11899,14 @@
name = "Blast door control";
pixel_x = -5;
pixel_y = 35;
- req_access = list(101);
- req_access_txt = "0"
+ req_access = list(101)
},
/obj/machinery/door_control{
id = "adminshuttleshutters";
name = "Shutter control";
pixel_x = 5;
pixel_y = 35;
- req_access = list(101);
- req_access_txt = "0"
+ req_access = list(101)
},
/obj/structure/chair/comfy/shuttle{
dir = 4
@@ -12273,7 +11965,6 @@
id = "syndicate_sit_1";
name = "Blast Doors";
pixel_x = -25;
- pixel_y = 0;
req_access_txt = "150"
},
/obj/structure/fans/tiny,
@@ -12314,7 +12005,6 @@
"XC" = (
/obj/machinery/light/spot{
dir = 4;
- icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
/turf/simulated/floor/mineral/titanium,
@@ -12322,7 +12012,6 @@
"XG" = (
/obj/structure/bed/roller,
/turf/simulated/floor/plasteel{
- dir = 2;
icon_state = "cmo"
},
/area/shuttle/escape)
@@ -12332,7 +12021,6 @@
"XJ" = (
/obj/machinery/light/spot{
dir = 8;
- icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
/obj/machinery/access_button{
@@ -12386,7 +12074,6 @@
/area/shuttle/vox)
"Ya" = (
/obj/machinery/atm{
- pixel_x = 0;
pixel_y = 32
},
/obj/structure/chair/comfy/shuttle{
@@ -12396,9 +12083,7 @@
/area/shuttle/trade/sol)
"Yc" = (
/obj/structure/table/holotable,
-/obj/machinery/readybutton{
- pixel_y = 0
- },
+/obj/machinery/readybutton,
/turf/simulated/floor/holofloor{
dir = 9;
icon_state = "red"
@@ -12438,7 +12123,6 @@
"Yl" = (
/obj/machinery/light/spot{
dir = 4;
- icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
/turf/simulated/floor/mineral/plastitanium/red,
@@ -12544,7 +12228,6 @@
"Za" = (
/obj/structure/shuttle/engine/heater{
dir = 8;
- icon_state = "heater";
tag = "icon-heater (WEST)"
},
/obj/structure/window/plasmareinforced{
@@ -12575,7 +12258,6 @@
"Zi" = (
/obj/machinery/sleeper,
/turf/simulated/floor/plasteel{
- dir = 2;
icon_state = "cmo"
},
/area/shuttle/escape)
@@ -12605,7 +12287,6 @@
},
/obj/machinery/light/spot{
dir = 8;
- icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
/turf/simulated/floor/plating/nitrogen,
@@ -12644,7 +12325,6 @@
},
/obj/machinery/light/spot{
dir = 4;
- icon_state = "tube1";
tag = "icon-tube1 (EAST)"
},
/turf/simulated/floor/plating/nitrogen,
@@ -12661,7 +12341,6 @@
"ZK" = (
/obj/machinery/light/spot{
dir = 8;
- icon_state = "tube1";
tag = "icon-tube1 (WEST)"
},
/turf/simulated/floor/mineral/plastitanium/red,
@@ -26968,7 +26647,7 @@ fm
of
of
of
-pt
+pn
of
of
of
@@ -56466,7 +56145,7 @@ aN
Yi
ik
hn
-eq
+hD
iL
ex
hn
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 5f95d44efc4..8478d8c0c91 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -31,19 +31,20 @@
return 1
-/proc/Get_Angle(atom/movable/start,atom/movable/end)//For beams.
- if(!start || !end) return 0
+/proc/get_angle(atom/movable/start, atom/movable/end)//For beams.
+ if(!start || !end)
+ return 0
var/dy
var/dx
- dy=(32*end.y+end.pixel_y)-(32*start.y+start.pixel_y)
- dx=(32*end.x+end.pixel_x)-(32*start.x+start.pixel_x)
+ dy = (32 * end.y + end.pixel_y) - (32 * start.y + start.pixel_y)
+ dx = (32 * end.x + end.pixel_x) - (32 * start.x + start.pixel_x)
if(!dy)
- return (dx>=0)?90:270
- .=arctan(dx/dy)
- if(dy<0)
- .+=180
- else if(dx<0)
- .+=360
+ return (dx >= 0) ? 90 : 270
+ . = arctan(dx / dy)
+ if(dy < 0)
+ . += 180
+ else if(dx < 0)
+ . += 360
//Returns location. Returns null if no location was found.
/proc/get_teleport_loc(turf/location,mob/target,distance = 1, density = 0, errorx = 0, errory = 0, eoffsetx = 0, eoffsety = 0)
@@ -1246,10 +1247,6 @@ GLOBAL_LIST_INIT(wall_items, typecacheof(list(/obj/machinery/power/apc, /obj/mac
return 1
return 0
-
-/proc/get_angle(atom/a, atom/b)
- return atan2(b.y - a.y, b.x - a.x)
-
/proc/atan2(x, y)
if(!x && !y) return 0
return y >= 0 ? arccos(x / sqrt(x * x + y * y)) : -arccos(x / sqrt(x * x + y * y))
diff --git a/code/_globalvars/lists/reagents.dm b/code/_globalvars/lists/reagents.dm
index 833da2a9879..0684be758cd 100644
--- a/code/_globalvars/lists/reagents.dm
+++ b/code/_globalvars/lists/reagents.dm
@@ -40,7 +40,7 @@ GLOBAL_LIST_INIT(drinks, list("beer2","hot_coco","orangejuice","tomatojuice","li
"booger","bloodymary","gargleblaster","bravebull","tequilasunrise","toxinsspecial",
"beepskysmash","salglu_solution","irishcream","manlydorf","longislandicedtea",
"moonshine","b52","irishcoffee","margarita","blackrussian","manhattan",
- "manhattan_proj","whiskeysoda","antifreeze","barefoot","snowwhite","demonsblood",
+ "manhattan_proj","whiskeysoda","adminfreeze","antifreeze","barefoot","snowwhite","demonsblood",
"vodkatonic","ginfizz","bahama_mama","singulo","sbiten","devilskiss","red_mead",
"mead","iced_beer","grog","aloe","andalusia","alliescocktail","soy_latte",
"cafe_latte","acidspit","amasec","neurotoxin","hippiesdelight","bananahonk",
diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm
index 342af86c0b6..7b9dc898399 100644
--- a/code/_onclick/telekinesis.dm
+++ b/code/_onclick/telekinesis.dm
@@ -139,6 +139,12 @@
else
+ if(focus.buckled_mobs)
+ to_chat(user, "This object is too heavy to move with something buckled to it!")
+ return
+ if(length(focus.client_mobs_in_contents))
+ to_chat(user, "This object is too heavy to move with something inside of it!")
+ return
apply_focus_overlay()
focus.throw_at(target, 10, 1, user)
last_throw = world.time
diff --git a/code/controllers/subsystem/chat_pings.dm b/code/controllers/subsystem/chat_pings.dm
new file mode 100644
index 00000000000..ad013cab3d6
--- /dev/null
+++ b/code/controllers/subsystem/chat_pings.dm
@@ -0,0 +1,16 @@
+SUBSYSTEM_DEF(chat_pings)
+ name = "Chat Pings"
+ flags = SS_NO_INIT
+ runlevels = RUNLEVEL_INIT | RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME // ALL OF THEM
+ wait = 30 SECONDS // Chat pings every 30 seconds
+ /// List of all held chat datums
+ var/list/datum/chatOutput/chat_datums = list() // Do NOT put this in Initialize(). You will cause issues.
+
+/datum/controller/subsystem/chat_pings/fire(resumed)
+ for(var/datum/chatOutput/CO as anything in chat_datums)
+ CO.updatePing()
+ if(MC_TICK_CHECK)
+ return
+
+/datum/controller/subsystem/chat_pings/stat_entry()
+ ..("P: [length(chat_datums)]")
diff --git a/code/datums/beam.dm b/code/datums/beam.dm
index 3b5c9d2f5fb..23388c3f61b 100644
--- a/code/datums/beam.dm
+++ b/code/datums/beam.dm
@@ -58,7 +58,7 @@
return ..()
/datum/beam/proc/Draw()
- var/Angle = round(Get_Angle(origin,target))
+ var/Angle = round(get_angle(origin, target))
var/matrix/rot_matrix = matrix()
rot_matrix.Turn(Angle)
diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm
index fdfafa89314..4098e15e2af 100644
--- a/code/datums/diseases/transformation.dm
+++ b/code/datums/diseases/transformation.dm
@@ -15,6 +15,7 @@
var/list/stage3 = list("You feel utterly plain.")
var/list/stage4 = list("You feel white bread.")
var/list/stage5 = list("Oh the humanity!")
+ var/transformation_text = null
var/new_form = /mob/living/carbon/human
/datum/disease/transformation/stage_act()
@@ -44,6 +45,8 @@
return
if(affected_mob.notransform)
return
+ if(transformation_text)
+ to_chat(affected_mob, transformation_text)
affected_mob.notransform = 1
affected_mob.canmove = 0
affected_mob.icon = null
@@ -243,4 +246,5 @@
stage3 = list("Your appendages are melting away.", "Your limbs begin to lose their shape.")
stage4 = list("You're ravenous.")
stage5 = list("You have become a morph.")
+ transformation_text = "This transformation does NOT make you an antagonist if you were not one already. If you were not an antagonist, you should not eat any steal objectives or the contents of the armory."
new_form = /mob/living/simple_animal/hostile/morph
diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm
index 16383b05352..fb8d4d99720 100644
--- a/code/datums/outfits/outfit_admin.dm
+++ b/code/datums/outfits/outfit_admin.dm
@@ -84,7 +84,7 @@
shoes = /obj/item/clothing/shoes/magboots/syndie
r_pocket = /obj/item/radio/uplink/nuclear
l_pocket = /obj/item/pinpointer/advpinpointer
- l_hand = /obj/item/tank/jetpack/oxygen/harness
+ l_hand = /obj/item/tank/internals/oxygen/red
backpack_contents = list(
/obj/item/storage/box/survival_syndi = 1,
diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index 9b00eee1553..10ee68c1104 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -1017,6 +1017,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
cost = 11
surplus = 0
cant_discount = TRUE
+ hijack_only = TRUE
/datum/uplink_item/explosives/emp_bomb
name = "EMP bomb"
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index d9cc6ab55c0..fc5e1d8eb5f 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -1072,7 +1072,7 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons)
Returning TRUE here will override the above proc's result.
*/
/atom/proc/CanAStarPassTo(ID, dir, obj/destination)
- return TRUE
+ return FALSE
/** Call this when you want to present a renaming prompt to the user.
@@ -1139,3 +1139,11 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons)
else
name = "[prefix][t]"
return t
+
+/atom/proc/set_angle(degrees)
+ var/matrix/M = matrix()
+ M.Turn(degrees)
+ // If we aint 0, make it NN transform
+ if(degrees)
+ appearance_flags |= PIXEL_SCALE
+ transform = M
diff --git a/code/game/gamemodes/changeling/powers/digitalcamo.dm b/code/game/gamemodes/changeling/powers/digitalcamo.dm
index 29385d33636..ddb6a6c03c4 100644
--- a/code/game/gamemodes/changeling/powers/digitalcamo.dm
+++ b/code/game/gamemodes/changeling/powers/digitalcamo.dm
@@ -1,11 +1,11 @@
/datum/action/changeling/digitalcamo
name = "Digital Camouflage"
desc = "By evolving the ability to distort our form and proprotions, we defeat common altgorithms used to detect lifeforms on cameras."
- helptext = "We cannot be tracked by camera while using this skill. However, humans looking at us will find us... uncanny."
+ helptext = "We cannot be tracked by camera while using this skill."
button_icon_state = "digital_camo"
dna_cost = 1
-//Prevents AIs tracking you but makes you easily detectable to the human-eye.
+//Prevents AIs tracking you.
/datum/action/changeling/digitalcamo/sting_action(mob/user)
if(user.digitalcamo)
diff --git a/code/game/gamemodes/cult/blood_magic.dm b/code/game/gamemodes/cult/blood_magic.dm
index 9e302b291a0..f9d4edb105c 100644
--- a/code/game/gamemodes/cult/blood_magic.dm
+++ b/code/game/gamemodes/cult/blood_magic.dm
@@ -872,8 +872,12 @@
/obj/item/melee/blood_magic/manipulator/attack_self(mob/living/user)
if(user.holy_check())
return
- var/list/options = list("Blood Orb (50)", "Blood Recharge (75)", "Blood Spear (150)", "Blood Bolt Barrage (300)")
- var/choice = input(user, "Choose a greater blood rite...", "Greater Blood Rites") as null|anything in options
+ var/list/options = list("Blood Orb (50)" = image(icon = 'icons/obj/cult.dmi', icon_state = "summoning_orb"),
+ "Blood Recharge (75)" = image(icon = 'icons/mob/actions/actions_cult.dmi', icon_state = "blood_charge"),
+ "Blood Spear (150)" = image(icon = 'icons/mob/actions/actions_cult.dmi', icon_state = "bloodspear"),
+ "Blood Bolt Barrage (300)" = image(icon = 'icons/mob/actions/actions_cult.dmi', icon_state = "blood_barrage"))
+ var/choice = show_radial_menu(user, src, options)
+
switch(choice)
if("Blood Orb (50)")
if(uses < BLOOD_ORB_COST)
diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm
index 6d93e452d73..67ad3a2ebae 100644
--- a/code/game/gamemodes/wizard/spellbook.dm
+++ b/code/game/gamemodes/wizard/spellbook.dm
@@ -446,7 +446,7 @@
/datum/spellbook_entry/item/warp_cubes
name = "Warp Cubes"
- desc = "Two magic cubes, that when they are twisted in hand, teleports the user to the location of the other cube instantly. Great for silently teleporting to a fixed location, or teleporting you to an appretnance, or vice versa. Do not leave on the wizard den, it will not work."
+ desc = "Two magic cubes, that when they are twisted in hand, teleports the user to the location of the other cube instantly. Great for silently teleporting to a fixed location, or teleporting you to an apprentice, or vice versa. Do not leave on the wizard den, it will not work."
item_path = /obj/item/warp_cube/red
log_name = "WC"
cost = 1
@@ -479,7 +479,7 @@
/datum/spellbook_entry/item/singularity_hammer
name = "Singularity Hammer"
- desc = "A hammer that creates an intensely powerful field of gravity where it strikes, pulling everthing nearby to the point of impact."
+ desc = "A hammer that creates an intensely powerful field of gravity where it strikes, pulling everything nearby to the point of impact."
item_path = /obj/item/twohanded/singularityhammer
log_name = "SI"
category = "Weapons and Armors"
diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm
index fd3e1a0442b..8f313c185dc 100644
--- a/code/game/jobs/job/job.dm
+++ b/code/game/jobs/job/job.dm
@@ -225,7 +225,7 @@
to_chat(H, "Failed to locate a storage object on your mob, either you spawned with no hands free and no backpack or this is a bug.")
qdel(G)
- qdel(gear_leftovers)
+ gear_leftovers.Cut()
return 1
diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm
index bc1bfe6135b..7a1dbdf91d9 100644
--- a/code/game/machinery/computer/camera_advanced.dm
+++ b/code/game/machinery/computer/camera_advanced.dm
@@ -75,7 +75,7 @@
for(var/obj/machinery/camera/C in GLOB.cameranet.cameras)
if(!C.can_use())
continue
- if(C.network&networks)
+ if(length(C.network & networks))
camera_location = get_turf(C)
break
if(camera_location)
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 23f217bf32b..48e224c3d38 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -720,6 +720,10 @@
// Won't announce when used for cryoing.
silent = TRUE
+/obj/machinery/cryopod/offstation/right
+ orient_right = TRUE
+ icon_state = "body_scanner_0-r"
+
/obj/machinery/computer/cryopod/robot
name = "robotic storage console"
desc = "An interface between crew and the robotic storage systems"
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index 4f22d1c2bb2..a9be1649ff1 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -657,6 +657,7 @@ GLOBAL_LIST_EMPTY(turret_icons)
qdel(flick_holder)
set_raised_raising(FALSE, FALSE)
+ set_angle(0)
update_icon()
/obj/machinery/porta_turret/on_assess_perp(mob/living/carbon/human/perp)
@@ -678,7 +679,8 @@ GLOBAL_LIST_EMPTY(turret_icons)
last_target = target
if(has_cover)
popUp() //pop the turret up if it's not already up.
- setDir(get_dir(src, target)) //even if you can't shoot, follow the target
+ // Set angle
+ set_angle(get_angle(src, target))
shootAt(target)
return TRUE
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index e3d58ed6aa5..8ab3dd0b966 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -161,7 +161,7 @@
name = "syndicate suit storage unit"
suit_type = /obj/item/clothing/suit/space/hardsuit/syndi
mask_type = /obj/item/clothing/mask/gas/syndicate
- storage_type = /obj/item/tank/jetpack/oxygen/harness
+ storage_type = /obj/item/tank/internals/oxygen/red
req_access = list(ACCESS_SYNDICATE)
safeties = FALSE //in a syndicate base, everything can be used as a murder weapon at a moment's notice.
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index 3665934aced..9ae9abe6249 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -313,7 +313,7 @@
name = "teleporter hub"
desc = "It's the hub of a teleporting machine."
icon_state = "tele0"
- var/accurate = FALSE
+ var/accurate = 0
use_power = IDLE_POWER_USE
idle_power_usage = 10
active_power_usage = 2000
@@ -353,6 +353,8 @@
for(var/obj/item/stock_parts/matter_bin/M in component_parts)
A += M.rating
accurate = A
+ if(accurate >= 3)
+ calibrated = TRUE
/obj/machinery/teleport/hub/proc/link_power_station()
if(power_station)
@@ -401,12 +403,13 @@
if(!calibrated && com.cc_beacon)
visible_message("Cannot lock on target. Please calibrate the teleporter before attempting long range teleportation.")
else if(!calibrated && prob(25 - ((accurate) * 10)) && !com.cc_beacon) //oh dear a problem
- var/list/target_z = levels_by_trait(REACHABLE)
+ var/list/target_z = levels_by_trait(SPAWN_RUINS)
target_z -= M.z //Where to sir? Anywhere but here.
. = do_teleport(M, locate(rand((2*TRANSITIONEDGE), world.maxx - (2*TRANSITIONEDGE)), rand((2*TRANSITIONEDGE), world.maxy - (2*TRANSITIONEDGE)), pick(target_z)), 2, bypass_area_flag = com.area_bypass)
else
. = do_teleport(M, com.target, bypass_area_flag = com.area_bypass)
- calibrated = FALSE
+ if(accurate < 3)
+ calibrated = FALSE
/obj/machinery/teleport/hub/update_icon()
if(panel_open)
diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm
index be1f5783552..98d3a2a2f13 100644
--- a/code/game/mecha/equipment/tools/medical_tools.dm
+++ b/code/game/mecha/equipment/tools/medical_tools.dm
@@ -483,7 +483,7 @@
if(R.can_synth && add_known_reagent(R.id, R.name))
occupant_message("Reagent analyzed, identified as [R.name] and added to database.")
send_byjax(chassis.occupant,"msyringegun.browser","reagents_form",get_reagents_form())
- occupant_message("Analyzis complete.")
+ occupant_message("Analysis complete.")
return 1
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/add_known_reagent(r_id,r_name)
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 2c9682702f6..f60da7b879a 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -1200,7 +1200,8 @@
/obj/mecha/Exited(atom/movable/M, atom/newloc)
if(occupant && occupant == M) // The occupant exited the mech without calling go_out()
- go_out(1, newloc)
+ if(!isAI(occupant)) //This causes carded AIS to gib, so we do not want this to be called during carding.
+ go_out(1, newloc)
/obj/mecha/proc/go_out(forced, atom/newloc = loc)
if(!occupant)
diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm
index a2b084463a4..5bf804105a0 100644
--- a/code/game/objects/effects/portals.dm
+++ b/code/game/objects/effects/portals.dm
@@ -14,6 +14,7 @@
var/precision = TRUE // how close to the portal you will teleport. FALSE = on the portal, TRUE = adjacent
var/can_multitool_to_remove = FALSE
var/ignore_tele_proof_area_setting = FALSE
+ var/one_use = FALSE // Does this portal go away after one teleport?
/obj/effect/portal/New(loc, turf/target, creator = null, lifespan = 300)
..()
@@ -101,14 +102,17 @@
if(prob(failchance))
icon_state = fail_icon
- if(!do_teleport(M, locate(rand(5, world.maxx - 5), rand(5, world.maxy -5), 3), 0, bypass_area_flag = ignore_tele_proof_area_setting)) // Try to send them to deep space.
+ var/list/target_z = levels_by_trait(SPAWN_RUINS)
+ target_z -= M.z
+ if(!do_teleport(M, locate(rand(5, world.maxx - 5), rand(5, world.maxy -5), pick(target_z)), 0, bypass_area_flag = ignore_tele_proof_area_setting)) // Try to send them to deep space.
invalid_teleport()
return FALSE
else
if(!do_teleport(M, target, precision, bypass_area_flag = ignore_tele_proof_area_setting)) // Try to send them to a turf adjacent to target.
invalid_teleport()
return FALSE
-
+ if(one_use)
+ qdel(src)
return TRUE
/obj/effect/portal/proc/invalid_teleport()
diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm
index 675e67aa1a6..87f402939dc 100644
--- a/code/game/objects/items/devices/radio/beacon.dm
+++ b/code/game/objects/items/devices/radio/beacon.dm
@@ -50,6 +50,10 @@
/obj/item/radio/beacon/bacon/proc/digest_delay()
QDEL_IN(src, 600)
+/obj/item/radio/beacon/emagged
+ syndicate = TRUE
+ emagged = TRUE
+
// SINGULO BEACON SPAWNER
/obj/item/radio/beacon/syndicate
name = "suspicious beacon"
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index 820f95ee092..ca9de14fe7c 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -273,20 +273,20 @@ effective or pretty fucking useless.
/obj/item/teleporter/proc/dir_correction(mob/user) //Direction movement, screws with teleport distance and saving throw, and thus must be removed first
var/temp_direction = user.dir
switch(temp_direction)
- if(NORTHEAST || SOUTHEAST)
+ if(NORTHEAST, SOUTHEAST)
user.dir = EAST
- if(NORTHWEST || SOUTHWEST)
+ if(NORTHWEST, SOUTHWEST)
user.dir = WEST
/obj/item/teleporter/proc/panic_teleport(mob/user, turf/destination, direction = NORTH)
var/saving_throw
switch(direction)
- if(NORTH || SOUTH)
+ if(NORTH, SOUTH)
if(prob(50))
saving_throw = EAST
else
saving_throw = WEST
- if(EAST || WEST)
+ if(EAST, WEST)
if(prob(50))
saving_throw = NORTH
else
diff --git a/code/game/objects/items/mountable_frames/apc_frame.dm b/code/game/objects/items/mountable_frames/apc_frame.dm
index 548b77b85fe..8cabb9c6921 100644
--- a/code/game/objects/items/mountable_frames/apc_frame.dm
+++ b/code/game/objects/items/mountable_frames/apc_frame.dm
@@ -28,5 +28,5 @@
return TRUE
/obj/item/mounted/frame/apc_frame/do_build(turf/on_wall, mob/user)
- new /obj/machinery/power/apc(get_turf(src), get_dir(user, on_wall), 1)
+ new /obj/machinery/power/apc(get_turf(src), get_dir(user, on_wall), TRUE)
qdel(src)
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index 9ed97abb045..26af8fd9ac2 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -19,7 +19,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
new/datum/stack_recipe/window("fulltile window", /obj/structure/window/full/basic, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("fishbowl", /obj/machinery/fishtank/bowl, 1, time = 10), \
new/datum/stack_recipe("fish tank", /obj/machinery/fishtank/tank, 3, time = 20, on_floor = TRUE), \
- new/datum/stack_recipe("wall aquariam", /obj/machinery/fishtank/wall, 4, time = 40, on_floor = TRUE) \
+ new/datum/stack_recipe("wall aquarium", /obj/machinery/fishtank/wall, 4, time = 40, on_floor = TRUE) \
))
/obj/item/stack/sheet/glass
diff --git a/code/game/objects/items/weapons/stock_parts.dm b/code/game/objects/items/weapons/stock_parts.dm
index ea01683133a..cc063f84fc7 100644
--- a/code/game/objects/items/weapons/stock_parts.dm
+++ b/code/game/objects/items/weapons/stock_parts.dm
@@ -104,7 +104,7 @@
/obj/item/stock_parts/matter_bin
name = "matter bin"
- desc = "A container for hold compressed matter awaiting re-construction."
+ desc = "A container used to hold compressed matter awaiting re-construction."
icon_state = "matter_bin"
origin_tech = "materials=1"
materials = list(MAT_METAL=80)
@@ -145,7 +145,7 @@
/obj/item/stock_parts/matter_bin/adv
name = "advanced matter bin"
- desc = "A container for hold compressed matter awaiting re-construction."
+ desc = "A container used to hold compressed matter awaiting re-construction."
icon_state = "advanced_matter_bin"
origin_tech = "materials=3"
rating = 2
@@ -187,7 +187,7 @@
/obj/item/stock_parts/matter_bin/super
name = "super matter bin"
- desc = "A container for hold compressed matter awaiting re-construction."
+ desc = "A container used to hold compressed matter awaiting re-construction."
icon_state = "super_matter_bin"
origin_tech = "materials=4;engineering=4"
rating = 3
@@ -229,7 +229,7 @@
/obj/item/stock_parts/matter_bin/bluespace
name = "bluespace matter bin"
- desc = "A container for hold compressed matter awaiting re-construction."
+ desc = "A container used to hold compressed matter awaiting re-construction."
icon_state = "bluespace_matter_bin"
origin_tech = "materials=6;programming=4;engineering=4"
rating = 4
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index d1548eb2305..61b3cdfedd7 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -163,7 +163,7 @@
/obj/item/storage/proc/show_to(mob/user)
if(!user.client)
return
- if(user.s_active != src) // Switching from another container
+ if(user.s_active != src && !isobserver(user))
for(var/obj/item/I in src)
if(I.on_found(user)) // For mouse traps and such
return // If something triggered, don't open the UI
diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
index ccc27c18589..b33b9fa24e4 100644
--- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
@@ -23,7 +23,7 @@
/obj/structure/closet/syndicate/suits/populate_contents()
new /obj/item/clothing/mask/gas/syndicate(src)
new /obj/item/clothing/suit/space/hardsuit/syndi(src)
- new /obj/item/tank/jetpack/oxygen/harness(src)
+ new /obj/item/tank/internals/oxygen/red(src)
/obj/structure/closet/syndicate/nuclear
desc = "It's a storage unit for a Syndicate boarding party."
@@ -37,6 +37,7 @@
new /obj/item/storage/box/teargas(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/storage/backpack/duffel/syndie/med(src)
+ new /obj/item/tank/jetpack/oxygen/harness(src)
new /obj/item/gun/projectile/automatic/shotgun/bulldog(src)
new /obj/item/gun/projectile/automatic/shotgun/bulldog(src)
new /obj/item/gun/projectile/automatic/shotgun/bulldog(src)
@@ -50,7 +51,7 @@
/obj/structure/closet/syndicate/sst/populate_contents()
new /obj/item/ammo_box/magazine/mm556x45(src)
new /obj/item/gun/projectile/automatic/l6_saw(src)
- new /obj/item/tank/jetpack/oxygen/harness(src)
+ new /obj/item/tank/internals/oxygen/red(src)
new /obj/item/storage/belt/military/sst(src)
new /obj/item/clothing/glasses/thermal(src)
new /obj/item/clothing/shoes/magboots/syndie/advance(src)
diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm
index 3910a6e0b28..0c359e532b6 100644
--- a/code/modules/admin/verbs/striketeam_syndicate.dm
+++ b/code/modules/admin/verbs/striketeam_syndicate.dm
@@ -153,7 +153,7 @@ GLOBAL_VAR_INIT(sent_syndicate_strike_team, 0)
equip_to_slot_or_del(new /obj/item/clothing/suit/space/hardsuit/syndi/elite/sst(src), slot_wear_suit)
equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(src), slot_glasses)
equip_to_slot_or_del(new /obj/item/storage/belt/military/sst(src), slot_belt)
- equip_to_slot_or_del(new /obj/item/tank/jetpack/oxygen/harness(src), slot_s_store)
+ equip_to_slot_or_del(new /obj/item/tank/internals/oxygen/red(src), slot_s_store)
equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/syndie/advance(src), slot_shoes)
equip_to_slot_or_del(new /obj/item/gun/projectile/automatic/l6_saw(src), slot_r_hand)
equip_to_slot_or_del(new /obj/item/ammo_box/magazine/mm556x45(src), slot_in_backpack)
diff --git a/code/modules/antagonists/traitor/contractor/datums/contractor_hub.dm b/code/modules/antagonists/traitor/contractor/datums/contractor_hub.dm
index aefe73f6258..913225a6f1e 100644
--- a/code/modules/antagonists/traitor/contractor/datums/contractor_hub.dm
+++ b/code/modules/antagonists/traitor/contractor/datums/contractor_hub.dm
@@ -28,6 +28,7 @@
/datum/rep_purchase/item/pinpointer,
/datum/rep_purchase/item/baton,
/datum/rep_purchase/item/fulton,
+ /datum/rep_purchase/item/flare,
/datum/rep_purchase/blackout,
/datum/rep_purchase/item/zippo,
/datum/rep_purchase/item/balloon,
diff --git a/code/modules/antagonists/traitor/contractor/datums/rep_purchases/flare.dm b/code/modules/antagonists/traitor/contractor/datums/rep_purchases/flare.dm
new file mode 100644
index 00000000000..005a6f60c34
--- /dev/null
+++ b/code/modules/antagonists/traitor/contractor/datums/rep_purchases/flare.dm
@@ -0,0 +1,9 @@
+/**
+ * # Rep Purchase - Emergency escape flare
+ */
+/datum/rep_purchase/item/flare
+ name = "Emergency extraction kit"
+ description = "A kit that comes with an emergency escape flare, which will allow you to teleport to any beacon after a short activation delay. Also comes with a Syndicate teleporter beacon that only these flares and emagged teleporters can target."
+ cost = 2
+ stock = 3
+ item_type = /obj/item/storage/box/syndie_kit/escape_flare
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 455d7a38aff..801bc69f383 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -421,6 +421,7 @@
GLOB.admins -= src
GLOB.directory -= ckey
GLOB.clients -= src
+ QDEL_NULL(chatOutput)
if(movingmob)
movingmob.client_mobs_in_contents -= mob
UNSETEMPTY(movingmob.client_mobs_in_contents)
diff --git a/code/modules/client/preference/loadout/loadout_donor.dm b/code/modules/client/preference/loadout/loadout_donor.dm
index 7d43bd6b86a..cc84053806b 100644
--- a/code/modules/client/preference/loadout/loadout_donor.dm
+++ b/code/modules/client/preference/loadout/loadout_donor.dm
@@ -63,10 +63,6 @@
display_name = "Fur Cap"
path = /obj/item/clothing/head/furcap
-/datum/gear/donor/mouse
- display_name = "Mouse Headband"
- path = /obj/item/clothing/head/kitty/mouse
-
/datum/gear/donor/fawkes
display_name = "Guy Fawkes mask"
path = /obj/item/clothing/mask/fawkes
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index c34e17943cb..5e872075da7 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -509,8 +509,8 @@
chameleon_action.emp_randomise(INFINITY)
/obj/item/storage/belt/chameleon
- name = "toolbelt"
- desc = "Holds tools."
+ name = "tool-belt"
+ desc = "Can hold various tools."
var/datum/action/item_action/chameleon/change/chameleon_action
/obj/item/storage/belt/chameleon/Initialize(mapload)
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index 5e286ccb7e5..ea0a76b4427 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -7,7 +7,7 @@
suit_adjusted = 1
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
- allowed = list(/obj/item/analyzer,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray,/obj/item/reagent_containers/applicator,/obj/item/healthanalyzer,/obj/item/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/food/pill,/obj/item/storage/pill_bottle,/obj/item/paper,/obj/item/rad_laser)
+ allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/food/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/rad_laser, /obj/item/robotanalyzer)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
species_exception = list(/datum/species/golem)
sprite_sheets = list(
diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm
index dc9f7236fab..a5b76b3ebfe 100644
--- a/code/modules/economy/EFTPOS.dm
+++ b/code/modules/economy/EFTPOS.dm
@@ -38,7 +38,11 @@
R.stamped += /obj/item/stamp
R.overlays += stampoverlay
R.stamps += "
This paper has been stamped by the EFTPOS device."
- var/obj/item/smallDelivery/D = new(R.loc)
+ var/obj/item/smallDelivery/D = new(get_turf(loc))
+ if(istype(loc, /mob/living/carbon/human))
+ var/mob/living/carbon/human/H = loc
+ if(H.back)
+ D.forceMove(H.back)
R.forceMove(D)
D.wrapped = R
D.name = "small parcel - 'EFTPOS access code'"
diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm
index 98c5669fd72..dc2d9273a95 100644
--- a/code/modules/mining/equipment/wormhole_jaunter.dm
+++ b/code/modules/mining/equipment/wormhole_jaunter.dm
@@ -89,3 +89,87 @@
if(ishuman(L))
shake_camera(L, 20, 1)
addtimer(CALLBACK(L, /mob/living/carbon.proc/vomit), 20)
+
+/obj/item/wormhole_jaunter/contractor
+ name = "emergency extraction flare"
+ icon = 'icons/obj/lighting.dmi'
+ desc = "A single-use extraction flare that will let you create a portal to any beacon on the station. You must choose the destination beforehand, else it will target a random beacon. The portal is generated 5 seconds after activation, and has 1 use."
+ icon_state = "flare-contractor"
+ item_state = "flare"
+ var/destination
+
+/obj/item/wormhole_jaunter/contractor/verb/set_destination()
+ set category = "Object"
+ set name = "Change Portal Destination"
+ set src in usr
+
+ var/list/L = list()
+ var/list/areaindex = list()
+
+ for(var/obj/item/radio/beacon/R in GLOB.beacons)
+ var/turf/T = get_turf(R)
+ if(!T)
+ continue
+ if(!is_teleport_allowed(T.z))
+ continue
+ var/tmpname = T.loc.name
+ if(areaindex[tmpname])
+ tmpname = "[tmpname] ([++areaindex[tmpname]])"
+ else
+ areaindex[tmpname] = 1
+ L[tmpname] = R
+
+ var/desc = input("Please select a location to target.", "Flare Target Interface") in L
+ destination = L[desc]
+ return
+
+/obj/item/wormhole_jaunter/contractor/attack_self(mob/user) // message is later down
+ activate(user, TRUE)
+
+/obj/item/wormhole_jaunter/contractor/activate(mob/user)
+ if(!turf_check(user))
+ return
+ if(!destination)
+ var/list/L = get_destinations(user)
+ if(!length(L))
+ to_chat(user, "[src] found no beacons in the sector to target.")
+ return
+ destination = pick(L)
+ var/obj/effect/temp_visual/getaway_flare/F = new(get_turf(src))
+ user.visible_message("[user] pulls out a black and gold flare and lights it.",\
+ "You light an emergency extraction flare, initiating the extraction process.")
+ user.drop_item()
+ forceMove(F)
+ addtimer(CALLBACK(src, .proc/create_portal, destination), 5 SECONDS)
+
+/obj/item/wormhole_jaunter/contractor/proc/create_portal(turf/destination)
+ new /obj/effect/decal/cleanable/ash(get_turf(src))
+ new /obj/effect/portal/redspace/getaway(get_turf(src), get_turf(destination), src, 100)
+ qdel(src)
+
+/obj/item/wormhole_jaunter/contractor/emag_act(mob/user)
+ to_chat(user, "Emagging [src] has no effect.")
+
+/obj/item/wormhole_jaunter/contractor/chasm_react(mob/user)
+ return //This is not an instant getaway portal like the jaunter
+
+/obj/item/storage/box/syndie_kit/escape_flare
+ name = "emergency extraction kit"
+
+/obj/item/storage/box/syndie_kit/escape_flare/populate_contents()
+ new /obj/item/wormhole_jaunter/contractor(src)
+ new /obj/item/radio/beacon/emagged(src)
+
+/obj/effect/portal/redspace/getaway
+ one_use = TRUE
+
+/obj/effect/temp_visual/getaway_flare // Because the original contractor flare is not a temp visual, for some reason.
+ name = "contractor extraction flare"
+ icon = 'icons/obj/lighting.dmi'
+ icon_state = "flare-contractor-on"
+ duration = 5.1 SECONDS // Needs to be slightly longer then the callback to make the portal
+
+/obj/effect/temp_visual/getaway_flare/Initialize()
+ . = ..()
+ playsound(loc, 'sound/goonstation/misc/matchstick_light.ogg', 50, TRUE)
+ set_light(8, l_color = "#FFD165")
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 059fd4a4c2a..92ee3c2195d 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -332,9 +332,6 @@
else if(!client)
msg += "[p_they(TRUE)] [p_have()] suddenly fallen asleep, suffering from Space Sleep Disorder. [p_they(TRUE)] may wake up soon.\n"
- if(digitalcamo)
- msg += "[p_they(TRUE)] [p_are()] moving [p_their()] body in an unnatural and blatantly inhuman manner.\n"
-
if(!(skipface || ( wear_mask && ( wear_mask.flags_inv & HIDEFACE || wear_mask.flags_cover & MASKCOVERSMOUTH) ) ) && is_thrall(src) && in_range(user,src))
msg += "Their features seem unnaturally tight and drawn.\n"
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 9e944853a0f..4cda181ee4f 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -551,7 +551,7 @@
/obj/item/robot_module/miner/handle_custom_removal(component_id, mob/living/user, obj/item/W)
if(component_id == "KA modkits")
for(var/obj/item/gun/energy/kinetic_accelerator/cyborg/D in src)
- D.attackby(W, user)
+ D.crowbar_act(user, W)
return TRUE
return ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index dd0316f4177..6324e8bb7a6 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -189,7 +189,7 @@ Difficulty: Very Hard
var/turf/target_turf = get_turf(target)
playsound(src, 'sound/magic/clockwork/invoke_general.ogg', 200, TRUE, 2)
newtonian_move(get_dir(target_turf, src))
- var/angle_to_target = Get_Angle(src, target_turf)
+ var/angle_to_target = get_angle(src, target_turf)
if(isnum(set_angle))
angle_to_target = set_angle
var/static/list/colossus_shotgun_shot_angles = list(12.5, 7.5, 2.5, -2.5, -7.5, -12.5)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index d192cb037eb..09d49a3330a 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -105,6 +105,8 @@
var/global/list/status_overlays_environ
var/indestructible = 0 // If set, prevents aliens from destroying it
var/keep_preset_name = 0
+ /// Was this APC built instead of already existing? Used for malfhack to keep borgs from building apcs in space
+ var/constructed = FALSE
var/report_power_alarm = TRUE
@@ -171,14 +173,13 @@
operating = 0
name = "[area.name] APC"
stat |= MAINT
+ constructed = TRUE
update_icon()
addtimer(CALLBACK(src, .proc/update), 5)
/obj/machinery/power/apc/Destroy()
SStgui.close_uis(wires)
GLOB.apcs -= src
- if(malfai && operating)
- malfai.malf_picker.processing_time = clamp(malfai.malf_picker.processing_time - 10,0,1000)
area.power_light = 0
area.power_equip = 0
area.power_environ = 0
@@ -973,6 +974,9 @@
if(malf.malfhacking)
to_chat(malf, "You are already hacking an APC.")
return
+ if(constructed)
+ to_chat(malf, "This APC was only recently constructed, and is not fully linked to station systems. Hacking it would be pointless.")
+ return
to_chat(malf, "Beginning override of APC systems. This takes some time, and you cannot perform other actions during the process.")
malf.malfhack = src
malf.malfhacking = addtimer(CALLBACK(malf, /mob/living/silicon/ai/.proc/malfhacked, src), 600, TIMER_STOPPABLE)
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 9dcd6eaf6dc..6c3ac951b12 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -101,7 +101,7 @@
overlays += image('icons/obj/power.dmi', icon_state = "solar_panel-b", layer = FLY_LAYER)
else
overlays += image('icons/obj/power.dmi', icon_state = "solar_panel", layer = FLY_LAYER)
- src.dir = angle2dir(adir)
+ set_angle(adir)
return
//calculates the fraction of the sunlight that the panel recieves
@@ -298,7 +298,7 @@
if(autostart)
search_for_connected()
if(connected_tracker && track == TRACKER_AUTO)
- connected_tracker.set_angle(SSsun.angle)
+ connected_tracker.modify_angle(SSsun.angle)
set_panels(cdir)
/obj/machinery/power/solar_control/Destroy()
@@ -338,7 +338,7 @@
return
if(track == TRACKER_AUTO && connected_tracker) // auto-tracking
- connected_tracker.set_angle(SSsun.angle)
+ connected_tracker.modify_angle(SSsun.angle)
set_panels(cdir)
updateDialog()
@@ -410,7 +410,7 @@
track = text2num(params["track"])
if(track == TRACKER_AUTO)
if(connected_tracker)
- connected_tracker.set_angle(SSsun.angle)
+ connected_tracker.modify_angle(SSsun.angle)
set_panels(cdir)
else if(track == TRACKER_TIMED)
targetdir = cdir
@@ -420,7 +420,7 @@
if("refresh")
search_for_connected()
if(connected_tracker && track == TRACKER_AUTO)
- connected_tracker.set_angle(SSsun.angle)
+ connected_tracker.modify_angle(SSsun.angle)
set_panels(cdir)
/obj/machinery/power/solar_control/attackby(obj/item/I, mob/user, params)
diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm
index 621c5f02747..b85659112d9 100644
--- a/code/modules/power/tracker.dm
+++ b/code/modules/power/tracker.dm
@@ -50,7 +50,7 @@
update_icon()
//updates the tracker icon and the facing angle for the control computer
-/obj/machinery/power/tracker/proc/set_angle(angle)
+/obj/machinery/power/tracker/proc/modify_angle(angle)
sun_angle = angle
//set icon dir to show sun illumination
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index c5bf8a131bb..8a30d27517a 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -275,7 +275,7 @@
return ..()
/obj/item/borg/upgrade/modkit/action(mob/living/silicon/robot/R)
- if(..())
+ if(!..())
return
for(var/obj/item/gun/energy/kinetic_accelerator/cyborg/H in R.module.modules)
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index f727638b475..64b0241279f 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -239,7 +239,7 @@
if((!current || loc == current))
current = locate(clamp(x + xo, 1, world.maxx), clamp(y + yo, 1, world.maxy), z)
if(isnull(Angle))
- Angle = round(Get_Angle(src, current))
+ Angle = round(get_angle(src, current))
if(spread)
Angle += (rand() - 0.5) * spread
var/matrix/M = new
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index 1c6981ff0b5..52a54e47a3b 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -246,7 +246,7 @@
if(!operating)
for (var/obj/item/O in holdingitems)
- processing_chamber += "\A [O.name]
"
+ processing_chamber += "\A [html_encode(O.name)]
"
if (!processing_chamber)
is_chamber_empty = 1
diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm
index ad15e19856b..94172e14f0e 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol.dm
@@ -688,6 +688,25 @@
M.bodytemperature = min(330, M.bodytemperature + (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
return ..()
+/datum/reagent/consumable/ethanol/adminfreeze
+ name = "Admin Freeze"
+ id = "adminfreeze"
+ description = "Ultimate Punishment."
+ reagent_state = LIQUID
+ color = "#30F0FF" // rgb: 048, 240, 255
+ dizzy_adj = 4
+ alcohol_perc = 1.5 // oof
+ drink_icon = "adminfreeze"
+ drink_name = "Admin Freeze"
+ drink_desc = "The ultimate punishment."
+ taste_description = "a series of bad decisions"
+
+/datum/reagent/consumable/ethanol/adminfreeze/reaction_mob(mob/living/M, method = REAGENT_INGEST, volume)
+ ..()
+ if(method == REAGENT_INGEST)
+ M.apply_status_effect(/datum/status_effect/freon/watcher)
+ M.adjust_bodytemperature(-110)
+
/datum/reagent/consumable/ethanol/barefoot
name = "Barefoot"
id = "barefoot"
diff --git a/code/modules/reagents/chemistry/recipes/drinks.dm b/code/modules/reagents/chemistry/recipes/drinks.dm
index 34ea484d712..1bdb91f1ab6 100644
--- a/code/modules/reagents/chemistry/recipes/drinks.dm
+++ b/code/modules/reagents/chemistry/recipes/drinks.dm
@@ -443,6 +443,15 @@
result_amount = 4
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+/datum/chemical_reaction/adminfreeze
+ name = "Admin Freeze"
+ id = "adminfreeze"
+ result = "adminfreeze"
+ required_reagents = list("neurotoxin" = 1, "toxinsspecial" = 1, "fernet" = 1, "moonshine" = 1, "morphine" = 1)
+ min_temp = T0C + 100
+ result_amount = 5
+ mix_sound = 'sound/effects/adminhelp.ogg'
+
/datum/chemical_reaction/barefoot
name = "Barefoot"
id = "barefoot"
diff --git a/goon/code/datums/browserOutput.dm b/goon/code/datums/browserOutput.dm
index 786b09e2da2..4b4a0d054c2 100644
--- a/goon/code/datums/browserOutput.dm
+++ b/goon/code/datums/browserOutput.dm
@@ -37,6 +37,7 @@ var/list/chatResources = list(
. = ..()
owner = C
+ SSchat_pings.chat_datums += src
/datum/chatOutput/proc/start()
if(!owner)
@@ -126,14 +127,14 @@ var/list/chatResources = list(
if(owner.tos_consent)
sendClientData()
- pingLoop()
+ updatePing()
-/datum/chatOutput/proc/pingLoop()
- set waitfor = FALSE
-
- while (owner)
- ehjax_send(data = owner.is_afk(29 SECONDS) ? "softPang" : "pang") // SoftPang isn't handled anywhere but it'll always reset the opts.lastPang.
- sleep(30 SECONDS)
+// PARADISE EDIT: This just updates the ping and is called from SSchat_pings
+/datum/chatOutput/proc/updatePing()
+ if(!owner)
+ qdel(src)
+ return
+ ehjax_send(data = owner.is_afk(29 SECONDS) ? "softPang" : "pang") // SoftPang isn't handled anywhere but it'll always reset the opts.lastPang.
/datum/chatOutput/proc/ehjax_send(client/C = owner, window = "browseroutput", data)
if(islist(data))
@@ -221,6 +222,11 @@ var/list/chatResources = list(
/datum/chatOutput/proc/clear_syndicate_codes()
owner << output(null, "browseroutput:codewordsClear")
+/datum/chatOutput/Destroy(force)
+ SSchat_pings.chat_datums -= src
+ return ..()
+
+
/client/verb/debug_chat()
set hidden = 1
chatOutput.ehjax_send(data = list("firebug" = 1))
diff --git a/icons/mecha/mecha.dmi b/icons/mecha/mecha.dmi
index af6edf692a3..d5b4ecb0e66 100644
Binary files a/icons/mecha/mecha.dmi and b/icons/mecha/mecha.dmi differ
diff --git a/icons/mob/actions/actions_cult.dmi b/icons/mob/actions/actions_cult.dmi
index 0e5320a54ed..2ccef9755b1 100644
Binary files a/icons/mob/actions/actions_cult.dmi and b/icons/mob/actions/actions_cult.dmi differ
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index 6d30e966c31..fb7c28c3f6d 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi
index 60ffb6462f9..4886978ff48 100644
Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ
diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi
index 7eb6484038c..d4e21d7e6c8 100644
Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ
diff --git a/icons/obj/turrets.dmi b/icons/obj/turrets.dmi
index 237133e1bc2..3612cccd515 100644
Binary files a/icons/obj/turrets.dmi and b/icons/obj/turrets.dmi differ
diff --git a/paradise.dme b/paradise.dme
index 70dbf764e66..a6b2a53c467 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -194,6 +194,7 @@
#include "code\controllers\subsystem\atoms.dm"
#include "code\controllers\subsystem\blackbox.dm"
#include "code\controllers\subsystem\changelog.dm"
+#include "code\controllers\subsystem\chat_pings.dm"
#include "code\controllers\subsystem\cleanup.dm"
#include "code\controllers\subsystem\dbcore.dm"
#include "code\controllers\subsystem\discord.dm"
@@ -1224,6 +1225,7 @@
#include "code\modules\antagonists\traitor\contractor\datums\rep_purchases\balloon.dm"
#include "code\modules\antagonists\traitor\contractor\datums\rep_purchases\baton.dm"
#include "code\modules\antagonists\traitor\contractor\datums\rep_purchases\blackout.dm"
+#include "code\modules\antagonists\traitor\contractor\datums\rep_purchases\flare.dm"
#include "code\modules\antagonists\traitor\contractor\datums\rep_purchases\fulton.dm"
#include "code\modules\antagonists\traitor\contractor\datums\rep_purchases\pinpointer.dm"
#include "code\modules\antagonists\traitor\contractor\datums\rep_purchases\reroll.dm"