diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm
new file mode 100644
index 0000000000..d6bb476f32
--- /dev/null
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm
@@ -0,0 +1,990 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/unexplored)
+"c" = (
+/obj/item/clockwork/alloy_shards/small,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/unexplored)
+"d" = (
+/obj/structure/destructible/clockwork/wall_gear,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/unexplored)
+"e" = (
+/obj/item/stack/tile/brass,
+/turf/open/floor/clockwork{
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ },
+/area/lavaland/surface/outdoors/unexplored)
+"f" = (
+/turf/closed/mineral/volcanic,
+/area/lavaland/surface/outdoors/unexplored)
+"g" = (
+/obj/item/clockwork/alloy_shards/medium/gear_bit,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/unexplored)
+"h" = (
+/turf/open/floor/clockwork{
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ },
+/area/lavaland/surface/outdoors/unexplored)
+"i" = (
+/obj/structure/grille/ratvar/broken,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/unexplored)
+"j" = (
+/turf/closed/wall/clockwork,
+/area/lavaland/surface/outdoors/unexplored)
+"k" = (
+/obj/item/clockwork/alloy_shards/small,
+/turf/open/floor/clockwork{
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ },
+/area/lavaland/surface/outdoors/unexplored)
+"l" = (
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/unexplored)
+"m" = (
+/obj/item/clockwork/alloy_shards/medium,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/unexplored)
+"n" = (
+/obj/item/clockwork/component/belligerent_eye/blind_eye,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/unexplored)
+"o" = (
+/obj/item/clockwork/alloy_shards/large,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/unexplored)
+"p" = (
+/obj/item/clockwork/alloy_shards/medium,
+/turf/open/floor/clockwork{
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ },
+/area/lavaland/surface/outdoors/unexplored)
+"q" = (
+/obj/structure/lattice/catwalk/clockwork,
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/unexplored)
+"r" = (
+/obj/structure/lattice/clockwork,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/unexplored)
+"s" = (
+/obj/item/clockwork/alloy_shards/large,
+/turf/open/floor/clockwork{
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ },
+/area/lavaland/surface/outdoors/unexplored)
+"t" = (
+/obj/item/stack/tile/brass,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/unexplored)
+"u" = (
+/obj/structure/grille/ratvar,
+/turf/open/floor/clockwork{
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ },
+/area/lavaland/surface/outdoors/unexplored)
+"v" = (
+/obj/item/clockwork/alloy_shards/medium,
+/obj/structure/lattice/clockwork,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/unexplored)
+"w" = (
+/obj/structure/grille/ratvar/broken,
+/turf/open/floor/clockwork{
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ },
+/area/lavaland/surface/outdoors/unexplored)
+"x" = (
+/obj/structure/destructible/clockwork/wall_gear,
+/obj/item/stack/tile/brass,
+/turf/open/floor/clockwork{
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ },
+/area/lavaland/surface/outdoors/unexplored)
+"y" = (
+/obj/item/clockwork/component/geis_capacitor/fallen_armor,
+/turf/open/floor/clockwork{
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ },
+/area/lavaland/surface/outdoors/unexplored)
+"z" = (
+/obj/structure/destructible/clockwork/wall_gear,
+/turf/open/floor/clockwork{
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ },
+/area/lavaland/surface/outdoors/unexplored)
+"A" = (
+/obj/item/clockwork/alloy_shards/clockgolem_remains,
+/turf/open/floor/clockwork{
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ },
+/area/lavaland/surface/outdoors/unexplored)
+"B" = (
+/obj/item/clockwork/weapon/ratvarian_spear,
+/turf/open/floor/clockwork{
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ },
+/area/lavaland/surface/outdoors/unexplored)
+"C" = (
+/obj/item/clockwork/alloy_shards/medium/gear_bit,
+/turf/open/floor/clockwork{
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ },
+/area/lavaland/surface/outdoors/unexplored)
+"D" = (
+/obj/structure/grille/ratvar,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/unexplored)
+"E" = (
+/obj/item/clockwork/alloy_shards/clockgolem_remains,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/unexplored)
+"F" = (
+/obj/structure/dead_ratvar,
+/turf/open/floor/clockwork{
+ initial_gas_mix = "o2=14;n2=23;TEMP=300"
+ },
+/area/lavaland/surface/outdoors/unexplored)
+"G" = (
+/obj/item/stack/tile/brass/fifty,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/unexplored)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+s
+h
+b
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+o
+b
+a
+h
+b
+r
+c
+j
+x
+b
+b
+g
+a
+a
+a
+a
+a
+"}
+(3,1,1) = {"
+a
+a
+a
+a
+a
+a
+f
+b
+l
+b
+v
+b
+p
+w
+j
+j
+c
+l
+b
+b
+a
+a
+a
+a
+"}
+(4,1,1) = {"
+a
+a
+a
+a
+a
+a
+f
+l
+l
+r
+b
+b
+l
+j
+j
+j
+p
+l
+b
+h
+c
+r
+a
+a
+"}
+(5,1,1) = {"
+a
+a
+a
+a
+a
+b
+l
+l
+p
+h
+c
+l
+l
+l
+j
+l
+b
+l
+l
+D
+h
+r
+a
+a
+"}
+(6,1,1) = {"
+a
+a
+a
+h
+c
+h
+m
+l
+l
+c
+l
+l
+l
+l
+w
+l
+l
+l
+m
+c
+h
+f
+a
+a
+"}
+(7,1,1) = {"
+a
+a
+b
+b
+b
+l
+l
+l
+l
+h
+b
+l
+l
+l
+l
+l
+l
+l
+l
+c
+f
+f
+b
+a
+"}
+(8,1,1) = {"
+a
+h
+h
+g
+c
+b
+l
+l
+l
+l
+n
+h
+r
+l
+l
+b
+l
+l
+l
+l
+f
+b
+a
+a
+"}
+(9,1,1) = {"
+a
+b
+c
+b
+b
+l
+l
+l
+l
+t
+h
+b
+h
+w
+p
+b
+g
+l
+l
+b
+b
+b
+b
+a
+"}
+(10,1,1) = {"
+b
+h
+l
+l
+l
+l
+l
+l
+b
+b
+p
+r
+F
+b
+h
+A
+b
+l
+l
+l
+m
+l
+l
+a
+"}
+(11,1,1) = {"
+c
+i
+j
+j
+l
+l
+l
+l
+l
+b
+h
+k
+h
+h
+h
+r
+l
+l
+l
+l
+l
+l
+b
+a
+"}
+(12,1,1) = {"
+d
+j
+j
+j
+h
+l
+l
+b
+l
+q
+r
+h
+h
+h
+c
+q
+l
+b
+l
+l
+b
+h
+o
+a
+"}
+(13,1,1) = {"
+e
+k
+b
+l
+l
+l
+b
+p
+s
+r
+h
+h
+h
+h
+h
+h
+h
+l
+l
+l
+l
+b
+b
+a
+"}
+(14,1,1) = {"
+b
+b
+b
+m
+l
+l
+l
+b
+h
+h
+k
+h
+h
+h
+h
+h
+c
+b
+l
+l
+b
+b
+h
+b
+"}
+(15,1,1) = {"
+b
+b
+b
+l
+l
+l
+l
+h
+h
+h
+h
+h
+h
+h
+k
+B
+h
+l
+l
+l
+l
+b
+b
+a
+"}
+(16,1,1) = {"
+f
+l
+l
+l
+l
+l
+l
+q
+b
+h
+h
+h
+h
+h
+h
+s
+b
+l
+l
+l
+l
+f
+f
+a
+"}
+(17,1,1) = {"
+b
+b
+b
+l
+l
+l
+b
+l
+q
+r
+h
+h
+h
+h
+h
+b
+s
+r
+l
+r
+l
+l
+b
+a
+"}
+(18,1,1) = {"
+b
+h
+l
+l
+l
+b
+b
+h
+b
+h
+h
+h
+h
+h
+r
+k
+b
+C
+r
+h
+b
+b
+m
+b
+"}
+(19,1,1) = {"
+b
+b
+l
+l
+l
+l
+h
+b
+h
+h
+h
+h
+h
+h
+h
+r
+j
+h
+c
+h
+r
+h
+b
+b
+"}
+(20,1,1) = {"
+b
+l
+l
+l
+l
+b
+b
+p
+h
+c
+h
+k
+h
+h
+o
+b
+l
+l
+l
+b
+E
+r
+G
+o
+"}
+(21,1,1) = {"
+g
+b
+l
+l
+l
+l
+l
+r
+h
+r
+h
+h
+h
+h
+y
+l
+l
+l
+l
+l
+l
+j
+j
+r
+"}
+(22,1,1) = {"
+c
+c
+b
+l
+l
+b
+h
+h
+t
+b
+h
+h
+h
+h
+h
+m
+b
+l
+l
+l
+h
+j
+j
+j
+"}
+(23,1,1) = {"
+b
+h
+m
+n
+b
+h
+l
+o
+j
+u
+r
+p
+h
+r
+h
+b
+l
+l
+l
+b
+b
+w
+r
+b
+"}
+(24,1,1) = {"
+a
+a
+b
+b
+l
+l
+l
+j
+j
+q
+p
+h
+m
+e
+z
+j
+j
+l
+l
+c
+l
+l
+b
+a
+"}
+(25,1,1) = {"
+a
+a
+a
+l
+l
+l
+l
+j
+l
+l
+b
+h
+r
+x
+h
+l
+l
+l
+l
+l
+l
+a
+a
+a
+"}
+(26,1,1) = {"
+a
+a
+a
+c
+b
+l
+l
+l
+l
+l
+l
+g
+q
+b
+h
+l
+l
+l
+c
+m
+b
+a
+a
+a
+"}
+(27,1,1) = {"
+a
+a
+a
+b
+h
+b
+l
+l
+l
+l
+l
+l
+l
+l
+l
+l
+l
+l
+l
+b
+a
+a
+a
+a
+"}
+(28,1,1) = {"
+a
+a
+a
+a
+c
+b
+l
+b
+l
+l
+l
+l
+l
+l
+l
+l
+b
+l
+f
+a
+a
+a
+a
+a
+"}
+(29,1,1) = {"
+a
+a
+a
+a
+b
+b
+f
+c
+b
+l
+c
+l
+l
+l
+l
+c
+o
+l
+b
+a
+a
+a
+a
+a
+"}
+(30,1,1) = {"
+a
+a
+a
+a
+a
+g
+c
+b
+l
+l
+b
+m
+l
+b
+l
+f
+b
+a
+a
+a
+a
+a
+a
+a
+"}
+(31,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+b
+l
+b
+a
+b
+l
+c
+f
+f
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(32,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
index da795b6933..6a7e1d3636 100644
--- a/_maps/_basemap.dm
+++ b/_maps/_basemap.dm
@@ -5,7 +5,6 @@
#ifndef LOWMEMORYMODE
#ifdef ALL_MAPS
#include "map_files\Mining\Lavaland.dmm"
- #include "map_files\generic\City_of_Cogs.dmm"
#include "map_files\debug\runtimestation.dmm"
#include "map_files\Deltastation\DeltaStation2.dmm"
#include "map_files\MetaStation\MetaStation.dmm"
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index d6e6a6b3ee..bd68296861 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -1,4 +1,4 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aaa" = (
/turf/open/space/basic,
/area/space)
@@ -33,6 +33,13 @@
},
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar)
+"aad" = (
+/obj/structure/table,
+/obj/machinery/chem_dispenser/drinks/beer{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/maintenance/port/aft)
"aae" = (
/obj/effect/landmark/carpspawn,
/turf/open/space,
@@ -107,6 +114,20 @@
dir = 1
},
/area/security/prison)
+"aaq" = (
+/obj/structure/sign/warning/electricshock{
+ pixel_y = 32
+ },
+/obj/machinery/hydroponics/soil,
+/obj/item/plant_analyzer,
+/obj/machinery/camera{
+ c_tag = "Prison Common Room";
+ network = list("ss13","prison")
+ },
+/turf/open/floor/plasteel/green/side{
+ dir = 5
+ },
+/area/security/prison)
"aar" = (
/obj/machinery/hydroponics/soil,
/obj/item/seeds/glowshroom,
@@ -190,6 +211,12 @@
dir = 2
},
/area/security/prison)
+"aaG" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/plasteel/floorgrime,
+/area/security/prison)
"aaH" = (
/turf/open/floor/plating/airless,
/area/space/nearstation)
@@ -246,6 +273,13 @@
},
/turf/open/floor/plasteel/barber,
/area/security/prison)
+"aaR" = (
+/obj/structure/lattice,
+/obj/structure/sign/warning/securearea{
+ pixel_y = -32
+ },
+/turf/open/space,
+/area/space/nearstation)
"aaS" = (
/obj/structure/grille,
/obj/structure/lattice,
@@ -359,6 +393,26 @@
/obj/machinery/vending/security,
/turf/open/floor/plasteel/showroomfloor,
/area/security/main)
+"abm" = (
+/obj/structure/table,
+/obj/item/storage/box/firingpins,
+/obj/item/storage/box/firingpins,
+/obj/item/key/security,
+/turf/open/floor/plasteel/vault{
+ dir = 8
+ },
+/area/ai_monitored/security/armory)
+"abn" = (
+/obj/structure/rack,
+/obj/machinery/firealarm{
+ pixel_y = 24
+ },
+/obj/item/gun/energy/e_gun/dragnet,
+/obj/item/gun/energy/e_gun/dragnet,
+/turf/open/floor/plasteel/vault{
+ dir = 8
+ },
+/area/ai_monitored/security/armory)
"abo" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -470,15 +524,166 @@
"abF" = (
/turf/open/floor/plasteel/freezer,
/area/security/prison)
+"abG" = (
+/obj/machinery/door/window/westleft{
+ base_state = "right";
+ dir = 8;
+ icon_state = "right";
+ name = "Unisex Showers"
+ },
+/turf/open/floor/plasteel/freezer,
+/area/security/prison)
+"abH" = (
+/obj/structure/table,
+/obj/item/storage/box/chemimp{
+ pixel_x = 6
+ },
+/obj/item/storage/box/trackimp{
+ pixel_x = -3
+ },
+/obj/item/storage/lockbox/loyalty,
+/turf/open/floor/plasteel/vault{
+ dir = 8
+ },
+/area/ai_monitored/security/armory)
+"abI" = (
+/obj/structure/rack,
+/obj/item/clothing/suit/armor/riot{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/suit/armor/riot{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/item/clothing/head/helmet/riot{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/clothing/head/helmet/riot,
+/obj/item/clothing/head/helmet/riot{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/item/shield/riot{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/shield/riot,
+/obj/item/shield/riot{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/turf/open/floor/plasteel/vault{
+ dir = 8
+ },
+/area/ai_monitored/security/armory)
+"abJ" = (
+/obj/structure/rack,
+/obj/item/clothing/suit/armor/bulletproof{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/clothing/suit/armor/bulletproof,
+/obj/item/clothing/suit/armor/bulletproof{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/item/clothing/head/helmet/alt{
+ layer = 3.00001;
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/clothing/head/helmet/alt{
+ layer = 3.00001
+ },
+/obj/item/clothing/head/helmet/alt{
+ layer = 3.00001;
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/machinery/camera/motion{
+ c_tag = "Armory Motion Sensor";
+ dir = 2
+ },
+/turf/open/floor/plasteel/vault{
+ dir = 8
+ },
+/area/ai_monitored/security/armory)
+"abK" = (
+/obj/structure/chair/stool,
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/machinery/button/door{
+ id = "permabolt3";
+ name = "Cell Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_y = 25;
+ specialfunctions = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/plasteel/floorgrime,
+/area/security/prison)
+"abL" = (
+/obj/structure/chair/stool,
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/machinery/button/door{
+ id = "permabolt2";
+ name = "Cell Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_y = 25;
+ specialfunctions = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/open/floor/plasteel/floorgrime,
+/area/security/prison)
"abM" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
},
/turf/open/floor/plasteel/floorgrime,
/area/security/prison)
+"abN" = (
+/obj/structure/closet/secure_closet/lethalshots,
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/security/armory)
"abO" = (
/turf/open/floor/plasteel/showroomfloor,
/area/security/main)
+"abP" = (
+/obj/structure/closet/secure_closet/security/sec,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/main)
+"abQ" = (
+/obj/structure/rack,
+/obj/machinery/airalarm{
+ pixel_y = 23
+ },
+/obj/item/gun/energy/ionrifle,
+/obj/item/gun/energy/temperature/security,
+/obj/item/clothing/suit/armor/laserproof,
+/turf/open/floor/plasteel/vault{
+ dir = 8
+ },
+/area/ai_monitored/security/armory)
+"abR" = (
+/obj/structure/closet/secure_closet/security/sec,
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/main)
"abS" = (
/obj/machinery/computer/secure_data,
/turf/open/floor/carpet,
@@ -608,6 +813,16 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel/floorgrime,
/area/security/prison)
+"ach" = (
+/obj/machinery/door/airlock{
+ name = "Unisex Restroom"
+ },
+/turf/open/floor/plasteel/freezer,
+/area/security/prison)
+"aci" = (
+/obj/vehicle/ridden/secway,
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/security/armory)
"acj" = (
/obj/machinery/light{
dir = 4
@@ -615,6 +830,33 @@
/obj/machinery/suit_storage_unit/hos,
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
+"ack" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/ai_monitored/security/armory)
+"acl" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/turf/open/floor/plasteel,
+/area/ai_monitored/security/armory)
+"acm" = (
+/obj/machinery/power/apc/highcap/five_k{
+ dir = 4;
+ areastring = "/area/ai_monitored/security/armory";
+ name = "Armory APC";
+ pixel_x = 24
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/ai_monitored/security/armory)
"acn" = (
/obj/item/storage/secure/safe/HoS{
pixel_x = 35
@@ -630,6 +872,15 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel/showroomfloor,
/area/security/main)
+"acq" = (
+/obj/effect/landmark/secequipment,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/main)
+"acr" = (
+/obj/structure/chair/comfy/black,
+/turf/open/floor/carpet,
+/area/crew_quarters/heads/hos)
"acs" = (
/obj/machinery/newscaster/security_unit{
pixel_x = -30
@@ -651,6 +902,10 @@
"acu" = (
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
+"acv" = (
+/obj/structure/closet/secure_closet/contraband/armory,
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/security/armory)
"acw" = (
/obj/structure/sign/warning/securearea{
pixel_y = -32
@@ -707,6 +962,21 @@
},
/turf/open/floor/plasteel/floorgrime,
/area/security/prison)
+"acD" = (
+/obj/structure/chair/stool,
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/machinery/button/door{
+ id = "permabolt1";
+ name = "Cell Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_y = 25;
+ specialfunctions = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/plasteel/floorgrime,
+/area/security/prison)
"acE" = (
/obj/structure/bed,
/obj/machinery/camera{
@@ -744,6 +1014,22 @@
},
/turf/open/floor/plasteel/floorgrime,
/area/security/prison)
+"acI" = (
+/obj/machinery/door/poddoor/preopen{
+ id = "executionfireblast";
+ name = "blast door"
+ },
+/obj/machinery/atmospherics/pipe/simple/general/hidden,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/window/westright{
+ dir = 1;
+ name = "Transfer Room";
+ req_access_txt = "2"
+ },
+/turf/open/floor/plasteel/vault{
+ dir = 8
+ },
+/area/security/execution/transfer)
"acJ" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -768,10 +1054,41 @@
},
/turf/open/floor/plasteel,
/area/ai_monitored/security/armory)
+"acM" = (
+/obj/structure/rack,
+/obj/item/gun/energy/e_gun{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/gun/energy/e_gun,
+/obj/item/gun/energy/e_gun{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/effect/turf_decal/bot{
+ dir = 2
+ },
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
+ },
+/turf/open/floor/plasteel{
+ dir = 2
+ },
+/area/ai_monitored/security/armory)
"acN" = (
/obj/structure/chair/stool/bar,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar)
+"acO" = (
+/obj/structure/closet/l3closet/security,
+/obj/machinery/camera{
+ c_tag = "Brig Equipment Room";
+ dir = 4
+ },
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/main)
"acP" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/showroomfloor,
@@ -835,6 +1152,16 @@
/obj/structure/lattice/catwalk,
/turf/open/space,
/area/solar/port/fore)
+"acX" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/door/poddoor/preopen{
+ id = "executionfireblast";
+ name = "blast door"
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/plating,
+/area/security/execution/transfer)
"acY" = (
/obj/structure/table,
/obj/item/paper,
@@ -842,6 +1169,15 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/floorgrime,
/area/security/prison)
+"acZ" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
+ id = "executionfireblast";
+ name = "blast door"
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/plating,
+/area/security/execution/transfer)
"ada" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/machinery/flasher{
@@ -889,11 +1225,48 @@
},
/turf/open/floor/plasteel/freezer,
/area/security/prison)
+"adg" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/ai_monitored/security/armory)
"adh" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
+"adi" = (
+/obj/machinery/flasher/portable,
+/turf/open/floor/plasteel/vault{
+ dir = 8
+ },
+/area/ai_monitored/security/armory)
+"adj" = (
+/obj/structure/rack,
+/obj/item/gun/energy/e_gun/advtaser{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/gun/energy/e_gun/advtaser,
+/obj/item/gun/energy/e_gun/advtaser{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/effect/turf_decal/bot{
+ dir = 2
+ },
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/turf/open/floor/plasteel{
+ dir = 2
+ },
+/area/ai_monitored/security/armory)
"adk" = (
/obj/structure/rack,
/obj/item/gun/ballistic/shotgun/riot{
@@ -1183,6 +1556,12 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
+"adQ" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 2
+ },
+/turf/open/floor/plasteel,
+/area/ai_monitored/security/armory)
"adR" = (
/turf/closed/wall/r_wall,
/area/security/main)
@@ -1468,12 +1847,26 @@
dir = 5
},
/area/security/prison)
+"aes" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/suit_storage_unit/security,
+/turf/open/floor/plasteel/red/side,
+/area/ai_monitored/security/armory)
"aet" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
/turf/open/floor/plasteel,
/area/ai_monitored/security/armory)
+"aeu" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/suit_storage_unit/security,
+/turf/open/floor/plasteel/red/side,
+/area/ai_monitored/security/armory)
"aev" = (
/obj/machinery/light{
dir = 4
@@ -1608,6 +2001,21 @@
dir = 8
},
/area/security/prison)
+"aeN" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security{
+ aiControlDisabled = 1;
+ name = "Prisoner Transfer Centre";
+ req_access_txt = "2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/execution/transfer)
"aeO" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -1685,6 +2093,68 @@
},
/turf/open/floor/plasteel,
/area/security/prison)
+"aeW" = (
+/obj/machinery/requests_console{
+ department = "Security";
+ departmentType = 5;
+ pixel_x = -30
+ },
+/obj/machinery/camera{
+ c_tag = "Brig Control Room";
+ dir = 4
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/structure/rack,
+/obj/item/clothing/mask/gas/sechailer{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/clothing/mask/gas/sechailer,
+/obj/item/clothing/mask/gas/sechailer{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/warden)
+"aeX" = (
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 5
+ },
+/turf/open/floor/plating,
+/area/ai_monitored/security/armory)
+"aeY" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/window/southleft{
+ name = "Armory";
+ req_access_txt = "3"
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/turf/open/floor/plasteel,
+/area/ai_monitored/security/armory)
+"aeZ" = (
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
+ },
+/turf/open/floor/plating,
+/area/ai_monitored/security/armory)
"afa" = (
/obj/docking_port/stationary{
dir = 4;
@@ -1706,6 +2176,17 @@
/obj/machinery/recharger,
/turf/open/floor/plasteel/showroomfloor,
/area/security/main)
+"afd" = (
+/obj/item/radio/intercom{
+ freerange = 0;
+ frequency = 1459;
+ name = "Station Intercom (General)";
+ pixel_x = 29
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/vending/wardrobe/sec_wardrobe,
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/main)
"afe" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/showroomfloor,
@@ -1927,6 +2408,13 @@
},
/turf/open/floor/plasteel/red/side,
/area/security/prison)
+"afK" = (
+/obj/machinery/door/airlock/security/glass{
+ name = "Evidence Storage";
+ req_access_txt = "63"
+ },
+/turf/open/floor/plasteel/red/side,
+/area/security/brig)
"afL" = (
/obj/structure/closet{
name = "Evidence Closet"
@@ -1957,6 +2445,13 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/storage/eva)
+"afQ" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/sign/warning/securearea{
+ pixel_x = -32
+ },
+/turf/open/floor/plating,
+/area/security/main)
"afR" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/spawner/structure/window/reinforced,
@@ -1990,6 +2485,14 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
/area/security/main)
+"afX" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/landmark/start/head_of_security,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/security/main)
"afY" = (
/obj/effect/landmark/start/security_officer,
/obj/structure/chair{
@@ -2005,6 +2508,15 @@
},
/turf/open/floor/plasteel,
/area/security/main)
+"aga" = (
+/obj/structure/sign/warning/pods{
+ pixel_x = 32
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/turf/open/floor/plasteel,
+/area/security/main)
"agb" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/red/side{
@@ -2086,6 +2598,13 @@
dir = 9
},
/area/security/prison)
+"agl" = (
+/obj/machinery/door/airlock/security{
+ name = "Interrogation";
+ req_access_txt = "63"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"agm" = (
/obj/machinery/light{
dir = 8
@@ -2099,6 +2618,45 @@
"agn" = (
/turf/closed/wall/r_wall,
/area/security/warden)
+"ago" = (
+/obj/machinery/computer/security,
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/warden)
+"agp" = (
+/obj/machinery/computer/prisoner,
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/warden)
+"agq" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/window/southleft{
+ base_state = "right";
+ icon_state = "right";
+ name = "Armory";
+ req_access_txt = "3"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/stripes/line{
+ dir = 2
+ },
+/turf/open/floor/plasteel,
+/area/ai_monitored/security/armory)
+"agr" = (
+/obj/machinery/computer/secure_data,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/warden)
"ags" = (
/obj/structure/chair{
dir = 4
@@ -2188,6 +2746,22 @@
/obj/item/pen,
/turf/open/floor/plasteel,
/area/security/main)
+"agF" = (
+/obj/machinery/door/firedoor,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/sign/warning/securearea{
+ pixel_x = -32
+ },
+/obj/machinery/door/poddoor/preopen{
+ id = "Prison Gate";
+ name = "prison blast door"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/security/brig)
"agG" = (
/obj/machinery/airalarm{
dir = 8;
@@ -2287,6 +2861,12 @@
},
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
+"agT" = (
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/warden)
"agU" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
@@ -2438,6 +3018,16 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/security/main)
+"ahm" = (
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/machinery/iv_drip,
+/obj/item/reagent_containers/blood,
+/turf/open/floor/plasteel/whitered/side{
+ dir = 5
+ },
+/area/security/brig)
"ahn" = (
/turf/closed/wall,
/area/maintenance/fore/secondary)
@@ -2503,6 +3093,30 @@
dir = 10
},
/area/security/brig)
+"ahv" = (
+/obj/machinery/power/apc{
+ dir = 8;
+ name = "Brig Control APC";
+ areastring = "/area/security/warden";
+ pixel_x = -24
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/warden)
+"ahx" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/warden)
"ahy" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -2510,6 +3124,15 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
+"ahz" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/warden)
"ahA" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -2543,6 +3166,17 @@
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/security/main)
+"ahD" = (
+/obj/machinery/door/window/westleft{
+ base_state = "left";
+ dir = 4;
+ icon_state = "left";
+ name = "Brig Infirmary"
+ },
+/turf/open/floor/plasteel/whitered/side{
+ dir = 4
+ },
+/area/security/brig)
"ahE" = (
/obj/machinery/door/airlock/security/glass{
name = "Brig Control";
@@ -2689,6 +3323,41 @@
"ahP" = (
/turf/open/floor/plasteel/white,
/area/security/brig)
+"ahQ" = (
+/obj/structure/closet/secure_closet/warden,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/warden)
+"ahR" = (
+/obj/structure/chair/office/dark,
+/obj/effect/landmark/start/warden,
+/obj/machinery/button/door{
+ id = "Prison Gate";
+ name = "Prison Wing Lockdown";
+ pixel_x = -27;
+ pixel_y = 8;
+ req_access_txt = "2"
+ },
+/obj/machinery/button/door{
+ id = "Secure Gate";
+ name = "Cell Shutters";
+ pixel_x = -27;
+ pixel_y = -2
+ },
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/warden)
+"ahS" = (
+/obj/structure/table,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/warden)
"ahT" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -2716,6 +3385,23 @@
},
/turf/open/floor/plasteel/dark,
/area/security/brig)
+"ahX" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 5
+ },
+/obj/machinery/computer/crew{
+ dir = 8
+ },
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/warden)
+"ahY" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/red/side{
+ dir = 5
+ },
+/area/security/brig)
"ahZ" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -2770,6 +3456,17 @@
dir = 10
},
/area/security/brig)
+"aie" = (
+/obj/structure/table,
+/obj/item/folder/red,
+/obj/item/pen,
+/obj/item/hand_labeler,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/item/book/manual/wiki/security_space_law,
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/warden)
"aif" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -2924,6 +3621,17 @@
},
/turf/open/floor/plasteel/red/side,
/area/security/main)
+"aiw" = (
+/obj/machinery/door/window/westleft{
+ base_state = "right";
+ dir = 4;
+ icon_state = "right";
+ name = "Brig Infirmary"
+ },
+/turf/open/floor/plasteel/whitered/side{
+ dir = 4
+ },
+/area/security/brig)
"aix" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -2994,6 +3702,84 @@
dir = 5
},
/area/security/brig)
+"aiH" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/plasteel/red/side{
+ dir = 1
+ },
+/area/security/brig)
+"aiI" = (
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/structure/sign/warning/electricshock{
+ pixel_x = -32
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/security/warden)
+"aiJ" = (
+/obj/structure/table/reinforced,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/door/window/brigdoor{
+ dir = 1;
+ name = "Armory Desk";
+ req_access_txt = "3"
+ },
+/obj/machinery/door/window/southleft{
+ name = "Reception Desk";
+ req_access_txt = "63"
+ },
+/obj/item/paper_bin{
+ pixel_x = -3;
+ pixel_y = 7
+ },
+/obj/item/pen{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/warden)
+"aiK" = (
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/structure/cable,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/security/warden)
+"aiL" = (
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/security/warden)
+"aiM" = (
+/obj/machinery/door/airlock/security/glass{
+ name = "Brig Control";
+ req_access_txt = "3"
+ },
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/warden)
+"aiN" = (
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/security/warden)
"aiO" = (
/obj/structure/window/reinforced{
dir = 4
@@ -3016,6 +3802,12 @@
dir = 1
},
/area/security/brig)
+"aiR" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/red/side{
+ dir = 1
+ },
+/area/security/brig)
"aiS" = (
/obj/item/stack/rods,
/turf/open/space,
@@ -3030,6 +3822,14 @@
"aiV" = (
/turf/closed/wall/r_wall,
/area/security/processing)
+"aiW" = (
+/obj/machinery/door/airlock/security{
+ name = "Interrogation";
+ req_access_txt = "63"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"aiX" = (
/turf/closed/wall/r_wall,
/area/security/brig)
@@ -3069,6 +3869,24 @@
dir = 1
},
/area/security/brig)
+"ajd" = (
+/obj/structure/sign/plaques/golden{
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel/red/side{
+ dir = 1
+ },
+/area/security/brig)
+"aje" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/machinery/firealarm{
+ dir = 2;
+ pixel_y = 24
+ },
+/turf/open/floor/plasteel/red/side{
+ dir = 1
+ },
+/area/security/brig)
"ajf" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -3078,6 +3896,25 @@
dir = 1
},
/area/security/brig)
+"ajg" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/security/brig)
+"ajh" = (
+/obj/machinery/light_switch{
+ pixel_y = 28
+ },
+/obj/structure/closet/secure_closet/courtroom,
+/obj/effect/decal/cleanable/cobweb,
+/obj/structure/sign/warning/securearea{
+ pixel_x = -32
+ },
+/obj/item/gavelhammer,
+/turf/open/floor/plasteel,
+/area/security/courtroom)
"aji" = (
/obj/structure/chair{
name = "Judge"
@@ -3148,6 +3985,20 @@
/obj/machinery/gulag_teleporter,
/turf/open/floor/plasteel,
/area/security/processing)
+"ajt" = (
+/obj/structure/sign/warning/securearea{
+ pixel_x = 32
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/table,
+/obj/item/storage/box/prisoner,
+/obj/machinery/camera{
+ c_tag = "Labor Shuttle Dock North"
+ },
+/turf/open/floor/plasteel,
+/area/security/processing)
"aju" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
@@ -3222,6 +4073,17 @@
dir = 1
},
/area/security/brig)
+"ajB" = (
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/security/brig)
+"ajC" = (
+/obj/item/storage/toolbox/drone,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/ai_monitored/security/armory)
"ajD" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -3237,6 +4099,24 @@
dir = 5
},
/area/security/courtroom)
+"ajF" = (
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
+/turf/open/floor/plasteel/red/corner{
+ dir = 2
+ },
+/area/security/brig)
+"ajG" = (
+/obj/machinery/light,
+/obj/machinery/door_timer{
+ id = "Cell 1";
+ name = "Cell 1";
+ pixel_y = -32
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/red/side,
+/area/security/brig)
"ajH" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
@@ -3251,6 +4131,13 @@
},
/turf/open/floor/plasteel,
/area/security/brig)
+"ajJ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/security/brig)
"ajK" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -3275,6 +4162,17 @@
},
/turf/open/floor/plasteel,
/area/security/courtroom)
+"ajN" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security{
+ name = "Brig";
+ req_access_txt = "63; 42"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/security/brig)
"ajO" = (
/obj/structure/table/wood,
/obj/item/radio/intercom{
@@ -3401,6 +4299,20 @@
dir = 8
},
/area/security/brig)
+"akf" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security{
+ name = "Labor Shuttle";
+ req_access_txt = "2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/security/brig)
"akg" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -3426,6 +4338,21 @@
},
/turf/open/floor/plasteel,
/area/security/brig)
+"aki" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/red/corner{
+ dir = 8
+ },
+/area/security/brig)
"akj" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -3435,6 +4362,20 @@
},
/turf/open/floor/plasteel/red/side,
/area/security/brig)
+"akk" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
+ },
+/turf/open/floor/plasteel/red/corner{
+ dir = 2
+ },
+/area/security/brig)
+"akl" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/security/brig)
"akm" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -3452,6 +4393,73 @@
dir = 4
},
/area/security/courtroom)
+"ako" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/door_timer{
+ id = "Cell 2";
+ name = "Cell 2";
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel/red/side,
+/area/security/brig)
+"akp" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/red/side,
+/area/security/brig)
+"akq" = (
+/obj/machinery/camera{
+ c_tag = "Brig Central";
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/door_timer{
+ id = "Cell 3";
+ name = "Cell 3";
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel/red/side,
+/area/security/brig)
+"akr" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/plasteel/red/side{
+ dir = 9
+ },
+/area/security/brig)
+"aks" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/plasteel/red/corner{
+ dir = 8
+ },
+/area/security/brig)
+"akt" = (
+/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/door_timer{
+ id = "Cell 4";
+ name = "Cell 4";
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel/red/side,
+/area/security/brig)
+"aku" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
+ },
+/turf/open/floor/plasteel/red/side{
+ dir = 4
+ },
+/area/security/brig)
"akv" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -3480,6 +4488,10 @@
dir = 8
},
/area/security/courtroom)
+"akz" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/floorgrime,
+/area/security/brig)
"akA" = (
/obj/structure/chair{
dir = 8;
@@ -3495,6 +4507,13 @@
},
/turf/open/floor/plating,
/area/maintenance/solars/port/fore)
+"akG" = (
+/obj/structure/sign/warning/vacuum/external{
+ pixel_y = 32
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/security/processing)
"akH" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
@@ -3531,12 +4550,87 @@
/obj/machinery/meter,
/turf/open/floor/plating,
/area/maintenance/fore)
+"akM" = (
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/security/brig)
+"akN" = (
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/security/brig)
+"akO" = (
+/obj/machinery/door/window/brigdoor/security/cell{
+ id = "Cell 1";
+ name = "Cell 1"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/red/side,
+/area/security/brig)
+"akP" = (
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/security/brig)
"akQ" = (
/obj/structure/cable{
icon_state = "4-8"
},
/turf/closed/wall,
/area/security/brig)
+"akR" = (
+/obj/machinery/door/window/brigdoor/security/cell{
+ id = "Cell 2";
+ name = "Cell 2"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/red/side,
+/area/security/brig)
+"akS" = (
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/security/brig)
+"akT" = (
+/obj/machinery/door/window/brigdoor/security/cell{
+ id = "Cell 3";
+ name = "Cell 3"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/red/side,
+/area/security/brig)
"akU" = (
/obj/machinery/door/airlock/security/glass{
name = "Brig Desk";
@@ -3560,6 +4654,75 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/security/brig)
+"akW" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/door/airlock/security/glass{
+ id_tag = "innerbrig";
+ name = "Brig";
+ req_access_txt = "63"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/red/side{
+ dir = 5
+ },
+/area/security/brig)
+"akX" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/door/airlock/security/glass{
+ id_tag = "innerbrig";
+ name = "Brig";
+ req_access_txt = "63"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/red/side{
+ dir = 9
+ },
+/area/security/brig)
+"akY" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/security/brig)
+"akZ" = (
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/security/brig)
+"ala" = (
+/obj/machinery/door/window/brigdoor/security/cell{
+ id = "Cell 4";
+ name = "Cell 4"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/red/side,
+/area/security/brig)
+"alb" = (
+/obj/structure/chair{
+ dir = 4;
+ name = "Prosecution"
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/plasteel/red/side{
+ dir = 9
+ },
+/area/security/courtroom)
"alc" = (
/obj/structure/table/wood,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -3579,6 +4742,12 @@
dir = 6
},
/area/security/courtroom)
+"alf" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
+/turf/open/floor/plasteel/floorgrime,
+/area/security/brig)
"alg" = (
/obj/structure/cable{
icon_state = "0-2"
@@ -3609,6 +4778,17 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
+"aln" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/obj/machinery/door/airlock/external{
+ name = "Labor Camp Shuttle Airlock";
+ req_access_txt = "2";
+ shuttledocked = 1
+ },
+/turf/open/floor/plating,
+/area/security/processing)
"alp" = (
/turf/open/floor/plating,
/area/security/processing)
@@ -3640,6 +4820,35 @@
dir = 8
},
/area/ai_monitored/nuke_storage)
+"alv" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
+/obj/item/radio/intercom{
+ desc = "Talk through this. It looks like it has been modified to not broadcast.";
+ dir = 2;
+ name = "Prison Intercom (General)";
+ pixel_x = -25;
+ pixel_y = -2;
+ prison_radio = 1
+ },
+/turf/open/floor/plasteel/floorgrime,
+/area/security/brig)
+"alw" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/open/floor/plasteel/floorgrime,
+/area/security/brig)
+"alx" = (
+/turf/open/floor/plasteel/floorgrime,
+/area/security/brig)
"aly" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
@@ -3654,6 +4863,23 @@
},
/turf/open/floor/plasteel/floorgrime,
/area/security/brig)
+"alz" = (
+/obj/machinery/button/door{
+ id = "briggate";
+ name = "Desk Shutters";
+ pixel_x = -26;
+ pixel_y = 6
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/button/flasher{
+ id = "brigentry";
+ pixel_x = -28;
+ pixel_y = -8
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/brig)
"alA" = (
/obj/structure/table/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -3685,6 +4911,19 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/security/courtroom)
+"alE" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/obj/machinery/flasher{
+ id = "Cell 4";
+ pixel_x = 28
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/open/floor/plasteel/floorgrime,
+/area/security/brig)
"alF" = (
/obj/machinery/atmospherics/components/unary/tank/air{
dir = 2
@@ -3826,6 +5065,18 @@
},
/turf/open/floor/plasteel,
/area/security/processing)
+"amf" = (
+/obj/structure/bed,
+/obj/item/bedsheet,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/flasher{
+ id = "Cell 1";
+ pixel_x = -28
+ },
+/turf/open/floor/plasteel/floorgrime,
+/area/security/brig)
"amg" = (
/obj/structure/closet/secure_closet/brig{
id = "Cell 1";
@@ -3833,6 +5084,15 @@
},
/turf/open/floor/plasteel/floorgrime,
/area/security/brig)
+"amh" = (
+/obj/structure/bed,
+/obj/item/bedsheet,
+/obj/machinery/flasher{
+ id = "Cell 2";
+ pixel_x = -28
+ },
+/turf/open/floor/plasteel/floorgrime,
+/area/security/brig)
"ami" = (
/obj/structure/closet/secure_closet/brig{
id = "Cell 2";
@@ -3840,6 +5100,15 @@
},
/turf/open/floor/plasteel/floorgrime,
/area/security/brig)
+"amj" = (
+/obj/structure/bed,
+/obj/item/bedsheet,
+/obj/machinery/flasher{
+ id = "Cell 3";
+ pixel_x = -28
+ },
+/turf/open/floor/plasteel/floorgrime,
+/area/security/brig)
"amk" = (
/obj/structure/closet/secure_closet/brig{
id = "Cell 3";
@@ -3894,6 +5163,15 @@
},
/turf/open/floor/plasteel/dark,
/area/security/brig)
+"amo" = (
+/obj/machinery/flasher{
+ id = "brigentry";
+ pixel_x = 28
+ },
+/turf/open/floor/plasteel/red/side{
+ dir = 5
+ },
+/area/security/brig)
"amp" = (
/obj/structure/closet/secure_closet/brig{
id = "Cell 4";
@@ -3901,6 +5179,19 @@
},
/turf/open/floor/plasteel/floorgrime,
/area/security/brig)
+"amq" = (
+/obj/structure/bed,
+/obj/item/bedsheet,
+/obj/item/radio/intercom{
+ desc = "Talk through this. It looks like it has been modified to not broadcast.";
+ dir = 2;
+ name = "Prison Intercom (General)";
+ pixel_x = 25;
+ pixel_y = -2;
+ prison_radio = 1
+ },
+/turf/open/floor/plasteel/floorgrime,
+/area/security/brig)
"amr" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -4012,6 +5303,10 @@
/obj/item/trash/plate,
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"amK" = (
+/obj/structure/sign/warning/docking,
+/turf/closed/wall,
+/area/security/processing)
"amL" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/spawner/structure/window/reinforced,
@@ -4048,12 +5343,112 @@
},
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
+"amQ" = (
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/structure/cable,
+/obj/machinery/door/poddoor/preopen{
+ id = "Secure Gate";
+ name = "brig shutters"
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/security/brig)
+"amR" = (
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/door/poddoor/preopen{
+ id = "Secure Gate";
+ name = "brig shutters"
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/security/brig)
"amS" = (
/obj/structure/cable{
icon_state = "4-8"
},
/turf/closed/wall/r_wall,
/area/security/brig)
+"amT" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "briggate";
+ name = "security shutters"
+ },
+/obj/machinery/door/window/southleft{
+ name = "Brig Desk";
+ req_access_txt = "1"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/brig)
+"amU" = (
+/obj/machinery/door/poddoor/preopen{
+ id = "briggate";
+ name = "security blast door"
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/security/brig)
+"amV" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "briggate";
+ name = "security shutters"
+ },
+/obj/machinery/door/window/southleft{
+ base_state = "right";
+ icon_state = "right";
+ name = "Brig Desk";
+ req_access_txt = "1"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/brig)
+"amW" = (
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/machinery/door/airlock/security/glass{
+ id_tag = "outerbrig";
+ name = "Brig";
+ req_access_txt = "63"
+ },
+/turf/open/floor/plasteel/red/side{
+ dir = 5
+ },
+/area/security/brig)
+"amX" = (
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/machinery/door/airlock/security/glass{
+ id_tag = "outerbrig";
+ name = "Brig";
+ req_access_txt = "63"
+ },
+/turf/open/floor/plasteel/red/side{
+ dir = 9
+ },
+/area/security/brig)
"amY" = (
/obj/structure/chair{
dir = 1
@@ -4199,6 +5594,22 @@
},
/turf/open/floor/plasteel,
/area/security/processing)
+"anu" = (
+/obj/machinery/button/door{
+ desc = "A remote control switch for the exit.";
+ id = "laborexit";
+ name = "exit button";
+ normaldoorcontrol = 1;
+ pixel_x = 26;
+ pixel_y = -6
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
+ },
+/turf/open/floor/plasteel/red/side{
+ dir = 5
+ },
+/area/security/processing)
"anv" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -4216,6 +5627,25 @@
dir = 1
},
/area/hallway/primary/fore)
+"anx" = (
+/obj/structure/sign/warning/electricshock{
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel/red/corner{
+ dir = 1
+ },
+/area/hallway/primary/fore)
+"any" = (
+/obj/structure/sign/warning/electricshock{
+ pixel_y = 32
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/plasteel/red/corner{
+ dir = 1
+ },
+/area/hallway/primary/fore)
"anz" = (
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
@@ -4224,6 +5654,21 @@
dir = 4
},
/area/hallway/primary/fore)
+"anB" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/structure/sign/warning/securearea{
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel/red/corner{
+ dir = 4
+ },
+/area/hallway/primary/fore)
+"anC" = (
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
+/area/security/courtroom)
"anD" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -4279,6 +5724,16 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"anN" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/obj/machinery/door/airlock/external{
+ name = "Labor Camp Shuttle Airlock";
+ shuttledocked = 1
+ },
+/turf/open/floor/plating,
+/area/security/processing)
"anO" = (
/obj/docking_port/stationary{
dir = 8;
@@ -4291,10 +5746,43 @@
},
/turf/open/space/basic,
/area/space)
+"anP" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security{
+ id_tag = "laborexit";
+ name = "Labor Shuttle";
+ req_access_txt = "63"
+ },
+/turf/open/floor/plasteel,
+/area/security/processing)
+"anQ" = (
+/obj/structure/sign/warning/electricshock{
+ pixel_y = 32
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
+"anR" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
"anS" = (
/obj/machinery/holopad,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
+"anT" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
+"anU" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Courtroom"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/courtroom)
"anV" = (
/obj/machinery/light/small,
/turf/open/floor/plasteel/dark,
@@ -4435,6 +5923,13 @@
/obj/item/circuitboard/machine/monkey_recycler,
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"aoq" = (
+/obj/structure/sign/warning/vacuum/external{
+ pixel_y = -32
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/security/processing)
"aor" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
@@ -4496,11 +5991,68 @@
dir = 8
},
/area/hallway/primary/fore)
+"aoy" = (
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=EVA";
+ location = "Security"
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
"aoz" = (
/turf/open/floor/plasteel/red/corner{
dir = 2
},
/area/hallway/primary/fore)
+"aoA" = (
+/obj/item/radio/intercom{
+ name = "Station Intercom (General)";
+ pixel_y = -29
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/red/corner{
+ dir = 2
+ },
+/area/hallway/primary/fore)
+"aoB" = (
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = -24
+ },
+/turf/open/floor/plasteel/red/corner{
+ dir = 2
+ },
+/area/hallway/primary/fore)
+"aoC" = (
+/obj/machinery/vending/coffee,
+/turf/open/floor/plasteel/red/corner{
+ dir = 2
+ },
+/area/hallway/primary/fore)
+"aoD" = (
+/obj/machinery/camera{
+ c_tag = "Fore Primary Hallway East";
+ dir = 1
+ },
+/obj/structure/extinguisher_cabinet{
+ pixel_x = 5;
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel/red/corner{
+ dir = 2
+ },
+/area/hallway/primary/fore)
+"aoE" = (
+/obj/machinery/vending/cigarette,
+/turf/open/floor/plasteel/red/corner{
+ dir = 2
+ },
+/area/hallway/primary/fore)
+"aoF" = (
+/obj/machinery/vending/snack/random,
+/turf/open/floor/plasteel/red/corner{
+ dir = 2
+ },
+/area/hallway/primary/fore)
"aoG" = (
/obj/structure/table,
/obj/machinery/firealarm{
@@ -4718,6 +6270,12 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/closed/wall,
/area/maintenance/fore/secondary)
+"apo" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
+ },
+/turf/closed/wall,
+/area/maintenance/fore/secondary)
"app" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -5343,6 +6901,10 @@
/obj/item/pen/red,
/turf/open/floor/wood,
/area/lawoffice)
+"arc" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/plasteel,
+/area/ai_monitored/security/armory)
"ard" = (
/obj/machinery/door/poddoor/preopen{
id = "lawyer_blast";
@@ -7438,6 +9000,18 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
+"awN" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/warden)
"awO" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -9521,6 +11095,24 @@
},
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
+"aCd" = (
+/obj/structure/bed,
+/obj/item/bedsheet,
+/obj/machinery/airalarm{
+ pixel_y = 23
+ },
+/obj/machinery/button/door{
+ id = "Dorm1";
+ name = "Dorm Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_x = 25;
+ specialfunctions = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"aCe" = (
/obj/effect/landmark/xeno_spawn,
/obj/item/bikehorn/rubberducky,
@@ -10135,6 +11727,16 @@
/obj/structure/sign/warning/electricshock,
/turf/closed/wall/r_wall,
/area/ai_monitored/storage/eva)
+"aDK" = (
+/obj/machinery/door/airlock{
+ id_tag = "Dorm1";
+ name = "Dorm 1"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"aDL" = (
/obj/structure/sink{
dir = 8;
@@ -10632,12 +12234,61 @@
/obj/structure/sign/warning/securearea,
/turf/closed/wall/r_wall,
/area/ai_monitored/storage/eva)
+"aFd" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/neutral/side{
+ dir = 4
+ },
+/area/crew_quarters/dorms)
+"aFe" = (
+/obj/machinery/camera{
+ c_tag = "Dormitory South";
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/neutral/side{
+ dir = 8
+ },
+/area/crew_quarters/dorms)
+"aFf" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
+ },
+/turf/open/floor/plasteel/freezer,
+/area/crew_quarters/toilet)
"aFg" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/closed/wall,
/area/crew_quarters/toilet)
+"aFh" = (
+/obj/machinery/door/airlock{
+ name = "Unisex Restrooms"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/freezer,
+/area/crew_quarters/toilet)
+"aFi" = (
+/obj/machinery/power/apc{
+ dir = 4;
+ name = "Dormitory Bathrooms APC";
+ areastring = "/area/crew_quarters/toilet";
+ pixel_x = 26
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/plasteel/freezer,
+/area/crew_quarters/toilet)
"aFj" = (
/turf/open/floor/plasteel/redblue/redside,
/area/crew_quarters/theatre)
@@ -11524,6 +13175,16 @@
dir = 4
},
/area/chapel/main)
+"aHp" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/filingcabinet/chestdrawer,
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/warden)
"aHq" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -12033,6 +13694,11 @@
/obj/structure/table/glass,
/turf/open/floor/plasteel/chapel,
/area/chapel/main)
+"aIF" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/security/warden)
"aIH" = (
/obj/structure/table,
/obj/item/storage/box/lights/mixed,
@@ -19434,6 +21100,10 @@
},
/turf/closed/wall,
/area/quartermaster/warehouse)
+"bcU" = (
+/obj/item/stack/tile/plasteel,
+/turf/open/space,
+/area/space/nearstation)
"bcV" = (
/obj/machinery/airalarm{
dir = 8;
@@ -19824,6 +21494,10 @@
/obj/structure/closet/crate/medical,
/turf/open/floor/plasteel/floorgrime,
/area/quartermaster/warehouse)
+"bdV" = (
+/obj/item/stack/sheet/metal,
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"bdW" = (
/obj/item/clothing/gloves/color/rainbow,
/obj/item/clothing/head/soft/rainbow,
@@ -21243,7 +22917,7 @@
/obj/structure/table/reinforced,
/obj/machinery/door/window/southright{
name = "Research and Development Desk";
- req_access_txt = "7"
+ req_one_access_txt = "7;29"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "rnd";
@@ -22418,6 +24092,10 @@
},
/turf/open/floor/plating,
/area/maintenance/disposal)
+"bkA" = (
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/plasteel,
+/area/ai_monitored/security/armory)
"bkB" = (
/obj/machinery/button/door{
id = "Disposal Exit";
@@ -23032,6 +24710,13 @@
},
/turf/open/floor/plating,
/area/maintenance/disposal)
+"blT" = (
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/ai_monitored/security/armory)
"blU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/wood,
@@ -33227,6 +34912,10 @@
},
/turf/open/floor/plasteel,
/area/science/misc_lab)
+"bJP" = (
+/obj/machinery/vending/boozeomat,
+/turf/open/floor/plasteel/bar,
+/area/maintenance/port/aft)
"bJQ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -34333,10 +36022,7 @@
/turf/open/floor/engine/vacuum,
/area/science/mixing)
"bMu" = (
-/obj/machinery/door/poddoor{
- id = "mixvent";
- name = "Mixer Room Vent"
- },
+/obj/machinery/door/poddoor/incinerator_toxmix,
/turf/open/floor/engine/vacuum,
/area/science/mixing)
"bMv" = (
@@ -34346,9 +36032,8 @@
/turf/closed/wall/r_wall,
/area/science/mixing)
"bMw" = (
-/obj/machinery/sparker{
+/obj/machinery/sparker/toxmix{
dir = 2;
- id = "mixingsparker";
pixel_x = 25
},
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxins_mixing_output{
@@ -34357,9 +36042,7 @@
/turf/open/floor/engine/vacuum,
/area/science/mixing)
"bMx" = (
-/obj/machinery/airlock_sensor{
- id_tag = "tox_airlock_sensor";
- master_tag = "tox_airlock_control";
+/obj/machinery/airlock_sensor/incinerator_toxmix{
pixel_y = 24
},
/obj/machinery/atmospherics/components/binary/pump/on{
@@ -34384,14 +36067,8 @@
dir = 4
},
/obj/machinery/meter,
-/obj/machinery/embedded_controller/radio/airlock_controller{
- airpump_tag = "tox_airlock_pump";
- exterior_door_tag = "tox_airlock_exterior";
- id_tag = "tox_airlock_control";
- interior_door_tag = "tox_airlock_interior";
- pixel_x = -24;
- sanitize_external = 1;
- sensor_tag = "tox_airlock_sensor"
+/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{
+ pixel_x = -24
},
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -34721,33 +36398,17 @@
/area/science/mixing)
"bNu" = (
/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/research/glass{
- autoclose = 0;
- frequency = 1449;
- heat_proof = 1;
- id_tag = "tox_airlock_exterior";
- name = "Mixing Room Exterior Airlock";
- req_access_txt = "8"
- },
+/obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior,
/turf/open/floor/engine,
/area/science/mixing)
"bNv" = (
/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/research/glass{
- autoclose = 0;
- frequency = 1449;
- heat_proof = 1;
- id_tag = "tox_airlock_interior";
- name = "Mixing Room Interior Airlock";
- req_access_txt = "8"
- },
+/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior,
/turf/open/floor/engine,
/area/science/mixing)
"bNw" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume{
- dir = 2;
- frequency = 1449;
- id = "tox_airlock_pump"
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{
+ dir = 2
},
/turf/open/floor/engine,
/area/science/mixing)
@@ -35124,7 +36785,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/machinery/droneDispenser,
/turf/open/floor/plasteel,
/area/science/misc_lab)
"bOx" = (
@@ -35178,9 +36838,8 @@
/turf/open/floor/plasteel,
/area/tcommsat/computer)
"bOE" = (
-/obj/machinery/sparker{
+/obj/machinery/sparker/toxmix{
dir = 2;
- id = "mixingsparker";
pixel_x = 25
},
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input{
@@ -35215,15 +36874,11 @@
dir = 4
},
/obj/machinery/meter,
-/obj/machinery/button/door{
- id = "mixvent";
- name = "Mixing Room Vent Control";
+/obj/machinery/button/door/incinerator_vent_toxmix{
pixel_x = -25;
- pixel_y = 5;
- req_access_txt = "7"
+ pixel_y = 5
},
-/obj/machinery/button/ignition{
- id = "mixingsparker";
+/obj/machinery/button/ignition/incinerator/toxmix{
pixel_x = -25;
pixel_y = -5
},
@@ -35802,9 +37457,32 @@
},
/turf/open/floor/plasteel,
/area/tcommsat/computer)
+"bPR" = (
+/obj/effect/decal/cleanable/robot_debris/old,
+/turf/open/floor/wood,
+/area/maintenance/port/aft)
"bPS" = (
/turf/open/floor/wood,
/area/maintenance/port/aft)
+"bPT" = (
+/turf/open/floor/wood{
+ icon_state = "wood-broken"
+ },
+/area/maintenance/port/aft)
+"bPU" = (
+/obj/item/shard,
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"bPV" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Maint Bar Access";
+ req_access_txt = "12"
+ },
+/obj/structure/barricade/wooden{
+ name = "wooden barricade (CLOSED)"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"bPW" = (
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plating,
@@ -36220,6 +37898,27 @@
/obj/machinery/computer/libraryconsole/bookmanagement,
/turf/open/floor/plasteel/white,
/area/science/circuit)
+"bRc" = (
+/obj/structure/table/wood,
+/obj/item/soap/nanotrasen,
+/turf/open/floor/wood{
+ icon_state = "wood-broken7"
+ },
+/area/maintenance/port/aft)
+"bRe" = (
+/obj/structure/table/wood,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 4;
+ name = "4maintenance loot spawner"
+ },
+/turf/open/floor/wood,
+/area/maintenance/port/aft)
+"bRf" = (
+/obj/structure/table/wood,
+/turf/open/floor/wood{
+ icon_state = "wood-broken5"
+ },
+/area/maintenance/port/aft)
"bRg" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance{
@@ -36687,6 +38386,18 @@
icon_state = "platingdmg3"
},
/area/maintenance/starboard/aft)
+"bSn" = (
+/obj/machinery/space_heater,
+/turf/open/floor/wood,
+/area/maintenance/port/aft)
+"bSo" = (
+/obj/structure/chair/stool,
+/turf/open/floor/wood,
+/area/maintenance/port/aft)
+"bSp" = (
+/obj/structure/grille/broken,
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"bSq" = (
/obj/structure/rack,
/obj/item/tank/internals/emergency_oxygen,
@@ -36709,6 +38420,12 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/tcommsat/computer)
+"bSu" = (
+/obj/item/stack/cable_coil{
+ amount = 5
+ },
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"bSv" = (
/obj/machinery/camera{
c_tag = "Construction Area";
@@ -37159,6 +38876,40 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"bTs" = (
+/turf/open/floor/wood{
+ icon_state = "wood-broken5"
+ },
+/area/maintenance/port/aft)
+"bTt" = (
+/obj/machinery/atmospherics/pipe/simple/general/hidden{
+ dir = 4
+ },
+/turf/open/floor/wood{
+ icon_state = "wood-broken6"
+ },
+/area/maintenance/port/aft)
+"bTu" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/maintenance/port/aft)
+"bTv" = (
+/obj/machinery/atmospherics/pipe/simple/general/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"bTw" = (
+/obj/machinery/door/airlock/maintenance/abandoned{
+ req_access_txt = "12"
+ },
+/obj/machinery/atmospherics/pipe/simple/general/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"bTx" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 8
@@ -37166,6 +38917,13 @@
/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"bTy" = (
+/obj/effect/spawner/structure/window,
+/obj/machinery/atmospherics/pipe/simple/general/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"bTz" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -37529,6 +39287,34 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"bUt" = (
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"bUu" = (
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"bUv" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"bUx" = (
/obj/structure/disposalpipe/junction/yjunction{
dir = 1
@@ -37976,6 +39762,12 @@
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"bVG" = (
+/obj/structure/sign/warning/nosmoking{
+ pixel_x = -28
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"bVI" = (
/turf/closed/wall/r_wall,
/area/tcommsat/server)
@@ -39776,6 +41568,12 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"car" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
+/turf/closed/wall,
+/area/maintenance/port/aft)
"cas" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -43299,6 +45097,10 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
+"cjn" = (
+/obj/item/weldingtool,
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"cjo" = (
/obj/structure/closet/toolcloset,
/turf/open/floor/plasteel,
@@ -43978,19 +45780,13 @@
/turf/open/floor/plasteel/floorgrime,
/area/maintenance/disposal/incinerator)
"cli" = (
-/obj/machinery/button/door{
- id = "auxincineratorvent";
- name = "Auxiliary Vent Control";
+/obj/machinery/button/door/incinerator_vent_atmos_aux{
pixel_x = 6;
- pixel_y = -24;
- req_access_txt = "32"
+ pixel_y = -24
},
-/obj/machinery/button/door{
- id = "turbinevent";
- name = "Turbine Vent Control";
+/obj/machinery/button/door/incinerator_vent_atmos_main{
pixel_x = -6;
- pixel_y = -24;
- req_access_txt = "32"
+ pixel_y = -24
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
@@ -44230,6 +46026,11 @@
dir = 1
},
/area/engine/engineering)
+"clS" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/machinery/rnd/production/techfab/department/security,
+/turf/open/floor/plasteel/red/side,
+/area/security/main)
"clT" = (
/obj/machinery/portable_atmospherics/canister/nitrogen,
/turf/open/floor/engine/n2,
@@ -44276,14 +46077,7 @@
/area/maintenance/disposal/incinerator)
"cmf" = (
/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/public/glass{
- autoclose = 0;
- frequency = 1449;
- heat_proof = 1;
- id_tag = "incinerator_airlock_interior";
- name = "Turbine Interior Airlock";
- req_access_txt = "32"
- },
+/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -44291,17 +46085,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
-/obj/machinery/embedded_controller/radio/airlock_controller{
- airpump_tag = "incinerator_airlock_pump";
- exterior_door_tag = "incinerator_airlock_exterior";
- id_tag = "incinerator_airlock_control";
- interior_door_tag = "incinerator_airlock_interior";
- name = "Incinerator Access Console";
+/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{
pixel_x = 38;
- pixel_y = 6;
- req_access_txt = "12";
- sanitize_external = 1;
- sensor_tag = "incinerator_airlock_sensor"
+ pixel_y = 6
},
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
@@ -44538,9 +46324,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/machinery/airlock_sensor{
- id_tag = "incinerator_airlock_sensor";
- master_tag = "incinerator_airlock_control";
+/obj/machinery/airlock_sensor/incinerator_atmos{
pixel_x = 8;
pixel_y = 24
},
@@ -44565,10 +46349,8 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume{
- dir = 8;
- frequency = 1449;
- id = "incinerator_airlock_pump"
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{
+ dir = 8
},
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
@@ -44762,14 +46544,7 @@
/area/construction)
"cnC" = (
/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/public/glass{
- autoclose = 0;
- frequency = 1449;
- heat_proof = 1;
- id_tag = "incinerator_airlock_exterior";
- name = "Turbine Exterior Airlock";
- req_access_txt = "32"
- },
+/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -45033,10 +46808,7 @@
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"cos" = (
-/obj/machinery/door/poddoor{
- id = "auxincineratorvent";
- name = "Auxiliary Incinerator Vent"
- },
+/obj/machinery/door/poddoor/incinerator_atmos_aux,
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"cot" = (
@@ -45262,6 +47034,19 @@
},
/turf/open/space,
/area/space/nearstation)
+"cpg" = (
+/obj/item/grenade/barrier{
+ pixel_x = 4
+ },
+/obj/item/grenade/barrier,
+/obj/item/grenade/barrier{
+ pixel_x = -4
+ },
+/obj/structure/table,
+/turf/open/floor/plasteel/vault{
+ dir = 8
+ },
+/area/ai_monitored/security/armory)
"cph" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/green/visible,
@@ -45398,6 +47183,15 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
+"cpA" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/chair/office/dark{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/ai_monitored/security/armory)
"cpC" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/landmark/event_spawn,
@@ -45696,10 +47490,7 @@
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
"cqt" = (
-/obj/machinery/door/poddoor{
- id = "turbinevent";
- name = "Turbine Vent"
- },
+/obj/machinery/door/poddoor/incinerator_atmos_main,
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"cqu" = (
@@ -45789,6 +47580,31 @@
/obj/machinery/atmospherics/pipe/simple/green/visible,
/turf/closed/wall/r_wall,
/area/engine/supermatter)
+"cqG" = (
+/obj/structure/rack,
+/obj/item/storage/box/rubbershot{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/item/storage/box/rubbershot{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/storage/box/rubbershot,
+/obj/item/storage/box/rubbershot,
+/obj/item/storage/box/rubbershot{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/item/storage/box/rubbershot{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/turf/open/floor/plasteel/vault{
+ dir = 8
+ },
+/area/ai_monitored/security/armory)
"cqJ" = (
/obj/structure/cable,
/obj/structure/lattice/catwalk,
@@ -46148,15 +47964,6 @@
},
/turf/open/floor/plating,
/area/engine/engineering)
-"crS" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green/corner{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/cryopod)
"crT" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
@@ -48033,6 +49840,21 @@
},
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"cwM" = (
+/obj/structure/rack,
+/obj/item/storage/box/teargas{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/storage/box/handcuffs,
+/obj/item/storage/box/flashbangs{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/turf/open/floor/plasteel/vault{
+ dir = 8
+ },
+/area/ai_monitored/security/armory)
"cwT" = (
/obj/machinery/camera{
c_tag = "Arrivals Escape Pod 2";
@@ -48090,6 +49912,16 @@
},
/turf/open/floor/plating,
/area/security/main)
+"cxJ" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/machinery/door/airlock/external{
+ name = "Labor Camp Shuttle Airlock";
+ req_access_txt = "2"
+ },
+/turf/open/floor/plating,
+/area/security/processing)
"cxN" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -48103,6 +49935,15 @@
},
/turf/open/floor/plating,
/area/maintenance/solars/starboard/fore)
+"cxP" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/machinery/door/airlock/external{
+ name = "Labor Camp Shuttle Airlock"
+ },
+/turf/open/floor/plating,
+/area/security/processing)
"cxW" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/external{
@@ -49191,6 +51032,18 @@
/obj/structure/closet/emcloset,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"cBV" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security{
+ name = "Security Office";
+ req_access_txt = "1"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/security/main)
"cBZ" = (
/obj/structure/table/wood,
/obj/item/clothing/under/burial,
@@ -49201,6 +51054,10 @@
/obj/item/clothing/under/burial,
/turf/open/floor/plasteel/grimy,
/area/chapel/office)
+"cCa" = (
+/obj/item/clothing/head/hardhat,
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"cCb" = (
/obj/structure/table,
/obj/item/stack/cable_coil{
@@ -50814,13 +52671,6 @@
},
/turf/open/floor/plating,
/area/hallway/secondary/entry)
-"cIV" = (
-/obj/machinery/door/airlock{
- name = "Unisex Restroom";
- req_access_txt = "0"
- },
-/turf/open/floor/plasteel/freezer,
-/area/security/prison)
"cMm" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
@@ -51038,17 +52888,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"cQs" = (
-/obj/machinery/door/window/brigdoor/security/cell{
- id = "Cell 4";
- name = "Cell 4"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/red/side,
-/area/security/brig)
"cQw" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -51328,21 +53167,6 @@
dir = 1
},
/area/engine/engineering)
-"cTu" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/turf/open/floor/plasteel/red/corner{
- dir = 8
- },
-/area/security/brig)
"cTD" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -51466,23 +53290,6 @@
"cVb" = (
/turf/closed/wall,
/area/hallway/secondary/service)
-"dcW" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "briggate";
- name = "security shutters"
- },
-/obj/machinery/door/window/southleft{
- base_state = "right";
- icon_state = "right";
- name = "Brig Desk";
- req_access_txt = "1"
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/turf/open/floor/plasteel/dark,
-/area/security/brig)
"dfh" = (
/obj/machinery/power/apc{
areastring = "/area/science/circuit";
@@ -51497,16 +53304,6 @@
},
/turf/open/floor/plasteel,
/area/science/circuit)
-"dhD" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 5
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/floor/plating,
-/area/ai_monitored/security/armory)
"dqu" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall/r_wall,
@@ -51530,38 +53327,6 @@
},
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"eet" = (
-/obj/machinery/light{
- dir = 1
- },
-/turf/open/floor/plasteel/red/corner{
- dir = 1
- },
-/area/hallway/primary/fore)
-"efg" = (
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
-/turf/closed/wall,
-/area/maintenance/fore/secondary)
-"esl" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 4
- },
-/turf/open/floor/wood{
- icon_state = "wood-broken6"
- },
-/area/maintenance/bar)
-"ete" = (
-/turf/closed/wall,
-/area/maintenance/bar)
-"evS" = (
-/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
"eyM" = (
/obj/machinery/mineral/ore_redemption{
input_dir = 2;
@@ -51570,41 +53335,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
-"eAL" = (
-/obj/structure/rack,
-/obj/item/gun/energy/e_gun/advtaser{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/gun/energy/e_gun/advtaser,
-/obj/item/gun/energy/e_gun/advtaser{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/effect/turf_decal/bot{
- dir = 2
- },
-/obj/structure/window/reinforced{
- dir = 1;
- layer = 2.9
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel{
- dir = 2
- },
-/area/ai_monitored/security/armory)
-"eEc" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/floor/plating,
-/area/security/warden)
"eHI" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
@@ -51616,12 +53346,6 @@
/obj/structure/grille,
/turf/open/space/basic,
/area/space/nearstation)
-"eTp" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
"eVL" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/light_switch{
@@ -51632,30 +53356,12 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
-"faB" = (
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/power/apc{
- areastring = "/area/security/warden";
- dir = 1;
- name = "Brig Control APC";
- pixel_y = 24
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/warden)
"fcG" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
},
/turf/closed/wall/r_wall,
/area/science/mixing)
-"fhC" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/decal/cleanable/blood/old,
-/obj/item/assembly/signaler,
-/turf/open/floor/plating,
-/area/maintenance/bar)
"flc" = (
/obj/machinery/bookbinder,
/turf/open/floor/plasteel/white,
@@ -51673,46 +53379,10 @@
},
/turf/open/floor/plasteel/hydrofloor,
/area/hallway/secondary/service)
-"fpJ" = (
-/obj/structure/table,
-/obj/item/storage/lockbox/loyalty,
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/security/armory)
-"fqD" = (
-/obj/machinery/door/window/brigdoor/security/cell{
- id = "Cell 1";
- name = "Cell 1"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/red/side,
-/area/security/brig)
"fsQ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
-"fuL" = (
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
-/turf/open/floor/plasteel/red/corner{
- dir = 8
- },
-/area/security/brig)
-"fDN" = (
-/obj/structure/sign/poster/random{
- pixel_y = -32
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"fEF" = (
-/obj/machinery/atmospherics/pipe/simple/general/hidden{
- dir = 4
- },
-/obj/structure/bed,
-/obj/item/bedsheet,
-/turf/open/floor/wood,
-/area/maintenance/port/aft)
"fGf" = (
/obj/machinery/smartfridge/disks,
/turf/open/floor/plasteel/hydrofloor,
@@ -51722,28 +53392,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel,
/area/science/circuit)
-"fKO" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/security/armory)
-"fLS" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/wood,
-/area/maintenance/port/aft)
-"fYm" = (
-/obj/structure/closet/secure_closet/security/sec,
-/obj/machinery/light{
- dir = 4
- },
-/obj/effect/turf_decal/bot{
- dir = 2
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/main)
"gbq" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -51775,31 +53423,6 @@
},
/turf/open/floor/plasteel,
/area/science/circuit)
-"gwo" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
-"gEX" = (
-/obj/structure/table/wood/poker,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"gKP" = (
-/obj/machinery/door/airlock{
- name = "Unisex Restrooms"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
"gLH" = (
/obj/machinery/door/airlock/external{
name = "External Access";
@@ -51810,22 +53433,6 @@
},
/turf/open/floor/plating,
/area/maintenance/port/fore)
-"gPJ" = (
-/obj/structure/rack,
-/obj/item/gun/energy/ionrifle,
-/obj/item/gun/energy/temperature/security,
-/obj/item/clothing/suit/armor/laserproof,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel/red/side,
-/area/ai_monitored/security/armory)
-"gPL" = (
-/obj/structure/table/wood,
-/obj/item/storage/box/drinkingglasses,
-/turf/open/floor/wood,
-/area/maintenance/bar)
"gWd" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -51843,10 +53450,6 @@
dir = 8
},
/area/medical/sleeper)
-"gZR" = (
-/obj/structure/closet/secure_closet/personal,
-/turf/open/floor/wood,
-/area/maintenance/port/aft)
"hcE" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
@@ -51864,14 +53467,6 @@
},
/turf/open/floor/plating,
/area/maintenance/port)
-"hDJ" = (
-/obj/machinery/door/airlock/security{
- name = "Interrogation";
- req_access = null;
- req_access_txt = "63"
- },
-/turf/open/floor/plasteel/dark,
-/area/security/prison)
"hRa" = (
/obj/structure/table/reinforced,
/obj/machinery/light{
@@ -51884,94 +53479,20 @@
/obj/item/stock_parts/cell/super,
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"hYC" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/floorgrime,
-/area/security/brig)
-"ihC" = (
-/obj/structure/sign/poster/random{
- pixel_y = -32
- },
-/turf/open/floor/wood{
- icon_state = "wood-broken7"
- },
-/area/maintenance/bar)
-"ihS" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
"ijc" = (
/obj/structure/table,
/obj/item/stack/sheet/metal/fifty,
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"ipA" = (
-/obj/machinery/droneDispenser,
/turf/open/floor/plating,
/area/maintenance/department/medical/morgue)
-"iqw" = (
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
-"irr" = (
-/obj/structure/chair/stool,
-/turf/open/floor/wood,
-/area/maintenance/bar)
"itG" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin,
/obj/item/pen,
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"iuz" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "briggate";
- name = "security shutters"
- },
-/obj/machinery/door/window/eastright{
- name = "Brig Desk";
- req_access_txt = "2"
- },
-/turf/open/floor/plasteel/dark,
-/area/security/brig)
-"ixw" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/computer/security{
- dir = 4
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/warden)
-"iyF" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
"iEJ" = (
/obj/machinery/door/airlock/external{
name = "Escape Pod One"
@@ -51989,33 +53510,6 @@
/obj/structure/reagent_dispensers/cooking_oil,
/turf/open/floor/plasteel/showroomfloor,
/area/crew_quarters/kitchen)
-"iTV" = (
-/obj/structure/bed,
-/obj/item/clothing/suit/straight_jacket,
-/obj/item/clothing/mask/muzzle,
-/turf/open/floor/plasteel,
-/area/security/execution/transfer)
-"iYT" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
- cyclelinkeddir = 1;
- id_tag = "lobbyairlock";
- name = "Security Lobby";
- req_access_txt = "0"
- },
-/turf/open/floor/plasteel/red/side,
-/area/security/brig)
-"iZV" = (
-/obj/structure/sign/poster/random{
- pixel_x = -32
- },
-/obj/machinery/light{
- dir = 8
- },
-/turf/open/floor/wood{
- icon_state = "wood-broken7"
- },
-/area/maintenance/bar)
"jbf" = (
/obj/structure/cable{
icon_state = "0-2"
@@ -52028,14 +53522,6 @@
},
/turf/open/floor/plasteel/hydrofloor,
/area/hallway/secondary/service)
-"jdX" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/wood{
- icon_state = "wood-broken7"
- },
-/area/maintenance/bar)
"jgm" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -52054,11 +53540,6 @@
/obj/machinery/rnd/production/techfab/department/cargo,
/turf/open/floor/plasteel,
/area/quartermaster/office)
-"jnM" = (
-/turf/open/floor/wood{
- icon_state = "wood-broken5"
- },
-/area/maintenance/bar)
"jrE" = (
/obj/machinery/rnd/production/protolathe/department/science,
/obj/structure/sign/poster/official/random{
@@ -52066,10 +53547,6 @@
},
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"jss" = (
-/obj/structure/table/wood,
-/turf/open/floor/wood,
-/area/maintenance/bar)
"jAD" = (
/obj/structure/grille,
/turf/open/floor/plating/airless,
@@ -52086,17 +53563,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"jDQ" = (
-/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
- name = "Station Intercom (General)";
- pixel_x = -30
- },
-/turf/open/floor/wood{
- icon_state = "wood-broken"
- },
-/area/maintenance/bar)
"jHt" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment{
@@ -52110,20 +53576,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"jHE" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/wood{
- icon_state = "wood-broken7"
- },
-/area/maintenance/bar)
-"jJa" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible,
-/obj/structure/table/wood,
-/obj/machinery/light/small{
- dir = 2
- },
-/turf/open/floor/wood,
-/area/maintenance/port/aft)
"jMF" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
@@ -52139,12 +53591,6 @@
/obj/item/stack/cable_coil,
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
-"jNv" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
"jSO" = (
/obj/machinery/light{
dir = 4
@@ -52163,22 +53609,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"jXE" = (
-/obj/effect/turf_decal/stripes/white/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/white/corner{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
-"kcq" = (
-/obj/machinery/atmospherics/pipe/simple/general/hidden{
- dir = 4
- },
-/obj/structure/closet/secure_closet/personal,
-/turf/open/floor/wood,
-/area/maintenance/port/aft)
"khb" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
@@ -52216,27 +53646,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"ksu" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
- cyclelinkeddir = 2;
- id_tag = "innerbrig";
- name = "Brig";
- req_access_txt = "63"
- },
-/turf/open/floor/plasteel/red/side{
- dir = 9
- },
-/area/security/brig)
-"kuo" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
"kzT" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
@@ -52254,15 +53663,6 @@
},
/turf/open/floor/plasteel/hydrofloor,
/area/hallway/secondary/service)
-"kPE" = (
-/obj/machinery/light,
-/obj/machinery/cryopod{
- tag = "icon-cryopod-open (EAST)";
- icon_state = "cryopod-open";
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/cryopod)
"kQk" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance{
@@ -52271,17 +53671,6 @@
},
/turf/open/floor/plating,
/area/maintenance/department/medical/morgue)
-"kQp" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/floor/plating,
-/area/security/brig)
"kQq" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -52293,66 +53682,10 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
-"kXo" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/plasteel/red/corner{
- dir = 1
- },
-/area/hallway/primary/fore)
-"lgR" = (
-/obj/machinery/door/poddoor/preopen{
- id = "executionfireblast";
- layer = 2.9;
- name = "blast door"
- },
-/obj/machinery/atmospherics/pipe/simple/general/hidden,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/window/westright{
- dir = 1;
- name = "Transfer Room";
- req_access_txt = "2"
- },
-/turf/open/floor/plasteel/vault{
- dir = 8
- },
-/area/security/execution/transfer)
-"lla" = (
-/obj/structure/closet/secure_closet/contraband/armory,
-/obj/effect/turf_decal/bot_white,
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/security/armory)
-"loR" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/plasteel/red/side{
- dir = 10
- },
-/area/security/brig)
-"lsi" = (
-/obj/machinery/power/apc/highcap/five_k{
- dir = 4;
- areastring = "/area/ai_monitored/security/armory";
- name = "Armory APC";
- pixel_x = 24
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/open/floor/plasteel,
-/area/ai_monitored/security/armory)
"lAB" = (
/obj/structure/sign/nanotrasen,
/turf/closed/wall,
/area/science/circuit)
-"lIk" = (
-/obj/effect/spawner/lootdrop/keg,
-/turf/open/floor/wood{
- icon_state = "wood-broken7"
- },
-/area/maintenance/bar)
"lMg" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -52363,63 +53696,10 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/science/circuit)
-"lTe" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/drone,
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/security/armory)
-"lVH" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/table,
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/warden)
-"lYQ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plating,
-/area/maintenance/bar)
"mjr" = (
/obj/machinery/vending/wardrobe/bar_wardrobe,
/turf/open/floor/wood,
/area/crew_quarters/bar)
-"mlG" = (
-/obj/machinery/light{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
-"mqQ" = (
-/obj/machinery/door/window/brigdoor/security/cell{
- id = "Cell 2";
- name = "Cell 2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/red/side,
-/area/security/brig)
-"muL" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
- cyclelinkeddir = 2;
- id_tag = "innerbrig";
- name = "Brig";
- req_access_txt = "63"
- },
-/turf/open/floor/plasteel/red/side{
- dir = 10
- },
-/area/security/brig)
"mBv" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -52431,117 +53711,22 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
-"mCA" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 4
- },
-/turf/closed/wall,
-/area/maintenance/bar)
-"mKs" = (
-/obj/item/restraints/handcuffs/fake,
-/obj/effect/decal/cleanable/blood/old,
-/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears,
-/turf/open/floor/plating,
-/area/maintenance/bar)
"mNi" = (
/obj/machinery/light_switch{
pixel_x = -20
},
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"mQI" = (
-/obj/machinery/door/window/brigdoor/security/cell{
- dir = 4;
- id = "Secure Cell";
- name = "Secure Cell"
- },
-/obj/machinery/door/window/brigdoor/security/cell{
- dir = 8;
- id = "Secure Cell";
- name = "Secure Cell"
- },
-/obj/effect/turf_decal/stripes/white/corner{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/white/corner{
- dir = 8
- },
-/obj/machinery/light/small,
-/turf/open/floor/plasteel/dark/side{
- dir = 8
- },
-/area/security/execution/transfer)
"mRe" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"mTf" = (
-/obj/structure/rack,
-/obj/item/clothing/suit/armor/riot{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/clothing/suit/armor/riot,
-/obj/item/clothing/suit/armor/riot{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/clothing/head/helmet/riot{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/clothing/head/helmet/riot,
-/obj/item/clothing/head/helmet/riot{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/shield/riot{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/shield/riot,
-/obj/item/shield/riot{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/effect/turf_decal/bot_white,
-/turf/open/floor/plasteel/dark,
-/area/security/armory)
-"nbc" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/plant_analyzer,
-/obj/machinery/camera{
- c_tag = "Prison Common Room";
- network = list("ss13","prison")
- },
-/turf/open/floor/plasteel/green/side{
- dir = 5
- },
-/area/security/prison)
"noK" = (
/obj/structure/girder,
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
-"npy" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/plasteel,
-/area/security/armory)
-"nuw" = (
-/obj/structure/chair/stool,
-/obj/item/radio/intercom{
- name = "Station Intercom (General)";
- pixel_y = -35
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"nuB" = (
-/turf/open/floor/wood,
-/area/maintenance/bar)
"nxv" = (
/obj/machinery/power/apc{
name = "Construction Area APC";
@@ -52557,18 +53742,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
-"nCJ" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security{
- name = "Brig";
- req_access = null;
- req_access_txt = "63; 42"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/security/brig)
"nGt" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -52580,13 +53753,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"nMU" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
"nRG" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
@@ -52599,56 +53765,16 @@
},
/turf/open/floor/plasteel/white,
/area/science/mixing)
-"orD" = (
-/obj/structure/table/wood/poker,
-/obj/item/coin/iron,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"oux" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/turf/open/floor/plasteel/neutral/side{
- dir = 8
- },
-/area/crew_quarters/dorms)
-"oxm" = (
-/obj/machinery/door_timer{
- id = "Cell 3";
- name = "Cell 3";
- pixel_y = -32
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel/red/corner,
-/area/security/brig)
"oDF" = (
/obj/machinery/light,
/turf/open/floor/plating,
/area/engine/engineering)
-"oEE" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
"oHU" = (
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel,
/area/science/circuit)
-"oKT" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/floor/plating,
-/area/security/brig)
"oUh" = (
/obj/structure/disposalpipe/trunk{
dir = 1
@@ -52656,27 +53782,6 @@
/obj/machinery/disposal/bin,
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"piy" = (
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/security/brig)
-"poo" = (
-/obj/structure/lattice/catwalk,
-/turf/open/space/basic,
-/area/space/nearstation)
-"pDm" = (
-/obj/machinery/atmospherics/pipe/simple/general/hidden{
- dir = 5
- },
-/obj/structure/table/wood,
-/obj/machinery/light/small{
- dir = 2
- },
-/turf/open/floor/wood,
-/area/maintenance/port/aft)
"pHl" = (
/obj/structure/table,
/obj/item/storage/box/beakers{
@@ -52722,17 +53827,6 @@
},
/turf/open/floor/plasteel,
/area/science/circuit)
-"qiF" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1
- },
-/turf/open/floor/plasteel/floorgrime,
-/area/security/brig)
-"qla" = (
-/obj/machinery/flasher/portable,
-/obj/effect/turf_decal/bot_white,
-/turf/open/floor/plasteel/dark,
-/area/security/armory)
"qpv" = (
/obj/machinery/light{
dir = 4
@@ -52745,38 +53839,6 @@
/obj/structure/grille/broken,
/turf/open/space/basic,
/area/space/nearstation)
-"qDl" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"qQU" = (
-/obj/machinery/atmospherics/pipe/simple/general/hidden{
- dir = 4
- },
-/turf/closed/wall,
-/area/maintenance/port/aft)
-"qVv" = (
-/obj/structure/chair/comfy/black,
-/obj/effect/landmark/start/head_of_security,
-/turf/open/floor/carpet,
-/area/crew_quarters/heads/hos)
-"qZT" = (
-/obj/machinery/vending/snack/random,
-/obj/machinery/flasher{
- id = "brigentry";
- pixel_x = 28
- },
-/turf/open/floor/plasteel/red/side{
- dir = 4
- },
-/area/security/brig)
-"rax" = (
-/obj/structure/closet/secure_closet/security/sec,
-/obj/effect/turf_decal/bot{
- dir = 2
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/main)
"rcD" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -52787,87 +53849,17 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/open/floor/plasteel/floorgrime,
/area/maintenance/disposal/incinerator)
-"rmO" = (
-/obj/machinery/flasher{
- id = "Cell 3";
- pixel_x = -28
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1
- },
-/turf/open/floor/plasteel/floorgrime,
-/area/security/brig)
"rmX" = (
/obj/structure/table,
/obj/item/reagent_containers/food/drinks/beer,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"rpN" = (
-/obj/machinery/button/door{
- desc = "A remote control switch for the exit.";
- id = "laborexit";
- name = "exit button";
- normaldoorcontrol = 1;
- pixel_x = 26;
- pixel_y = -6;
- req_access_txt = "0"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 9
- },
-/turf/open/floor/plasteel/red/side{
- dir = 5
- },
-/area/security/processing)
-"rtk" = (
-/turf/open/floor/plasteel/dark,
-/area/security/processing)
-"ryv" = (
-/obj/machinery/flasher{
- id = "Cell 2";
- pixel_x = -28
- },
-/turf/open/floor/plasteel/floorgrime,
-/area/security/brig)
-"rAZ" = (
-/turf/closed/wall,
-/area/crew_quarters/cryopod)
-"rHF" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/door/airlock/maintenance/abandoned{
- req_access_txt = "0"
- },
-/turf/open/floor/wood{
- icon_state = "wood-broken"
- },
-/area/maintenance/bar)
"rKP" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
/turf/open/floor/plating,
/area/construction)
-"rPG" = (
-/obj/machinery/door/window/westleft{
- base_state = "right";
- dir = 8;
- icon_state = "right";
- name = "Unisex Showers";
- req_access_txt = "0"
- },
-/turf/open/floor/plasteel/freezer,
-/area/security/prison)
-"rTI" = (
-/obj/machinery/door/window/brigdoor/security/cell{
- id = "Cell 3";
- name = "Cell 3"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/red/side,
-/area/security/brig)
"saK" = (
/obj/structure/closet/crate,
/obj/item/target/alien,
@@ -52880,21 +53872,6 @@
/obj/item/gun/energy/laser/practice,
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"sfv" = (
-/obj/effect/spawner/structure/window,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "seclobby";
- name = "security shutters"
- },
-/turf/open/floor/plating,
-/area/security/brig)
-"sgY" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel,
-/area/ai_monitored/security/armory)
"slk" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -52907,38 +53884,12 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/maintenance/department/medical/morgue)
-"ssv" = (
-/obj/structure/rack,
-/obj/item/gun/energy/e_gun/dragnet,
-/obj/item/gun/energy/e_gun/dragnet,
-/obj/effect/turf_decal/bot_white,
-/obj/item/gun/energy/pumpaction/blaster,
-/obj/item/gun/energy/pumpaction/blaster,
-/turf/open/floor/plasteel/dark,
-/area/security/armory)
"sxs" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/table,
/obj/item/shovel/spade,
/turf/open/floor/plasteel/hydrofloor,
/area/hallway/secondary/service)
-"sCj" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel/red/side{
- dir = 8
- },
-/area/security/brig)
-"sGR" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
- },
-/obj/machinery/light{
- dir = 8
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
"sLv" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance,
@@ -52958,11 +53909,6 @@
/obj/structure/chair/office/light,
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"sVi" = (
-/turf/open/floor/plasteel/red/corner{
- dir = 1
- },
-/area/security/brig)
"sWR" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -52986,80 +53932,12 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
/area/hallway/secondary/service)
-"tfB" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 5
- },
-/obj/structure/tank_dispenser/oxygen,
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/security/armory)
-"tra" = (
-/obj/machinery/computer/prisoner{
- dir = 4
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/warden)
-"tsC" = (
-/obj/machinery/atmospherics/pipe/simple/general/hidden{
- dir = 4
- },
-/obj/structure/bed,
-/obj/item/bedsheet,
-/obj/item/bedsheet,
-/turf/open/floor/wood,
-/area/maintenance/port/aft)
-"tvf" = (
-/obj/structure/table/wood/poker,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/item/storage/pill_bottle/dice,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"txT" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/open/floor/plasteel/red/side{
- dir = 9
- },
-/area/security/brig)
-"tIp" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/window/southleft{
- base_state = "right";
- icon_state = "right";
- name = "Armory";
- req_access_txt = "3"
- },
+"trb" = (
/obj/machinery/light{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
/turf/open/floor/plasteel,
-/area/ai_monitored/security/armory)
-"tLw" = (
-/obj/structure/table/wood,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
+/area/security/courtroom)
"tMl" = (
/obj/effect/turf_decal/loading_area,
/turf/open/floor/plasteel/showroomfloor,
@@ -53071,16 +53949,6 @@
},
/turf/open/floor/plasteel/white,
/area/science/mixing)
-"tTl" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
- id = "executionfireblast";
- layer = 2.9;
- name = "blast door"
- },
-/obj/machinery/door/firedoor,
-/turf/open/floor/plating,
-/area/security/execution/transfer)
"tXL" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
@@ -53113,34 +53981,6 @@
},
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"uzg" = (
-/obj/structure/chair,
-/obj/machinery/light{
- dir = 1
- },
-/turf/open/floor/plasteel/red/side{
- dir = 1
- },
-/area/security/brig)
-"uFV" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/red/side{
- dir = 4
- },
-/area/security/brig)
-"uGh" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
- },
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/open/floor/plasteel/floorgrime,
-/area/security/brig)
-"uMu" = (
-/obj/effect/turf_decal/tile/green/corner,
-/turf/open/floor/plasteel,
-/area/crew_quarters/cryopod)
"uNu" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -53151,12 +53991,6 @@
},
/turf/open/floor/plasteel,
/area/science/circuit)
-"uOE" = (
-/obj/structure/chair/stool,
-/turf/open/floor/wood{
- icon_state = "wood-broken7"
- },
-/area/maintenance/bar)
"uPT" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 2
@@ -53166,10 +54000,6 @@
},
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
-"uQt" = (
-/obj/structure/sign/poster/official/no_erp,
-/turf/closed/wall,
-/area/maintenance/bar)
"uVS" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -53182,14 +54012,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"uZB" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel/red/side{
- dir = 10
- },
-/area/security/brig)
"vbD" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command/glass{
@@ -53201,48 +54023,6 @@
},
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
-"vdY" = (
-/obj/structure/falsewall,
-/obj/effect/turf_decal/delivery/white,
-/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
-"vmd" = (
-/obj/structure/rack,
-/obj/item/clothing/suit/armor/bulletproof{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/clothing/suit/armor/bulletproof,
-/obj/item/clothing/suit/armor/bulletproof{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/clothing/head/helmet/alt{
- layer = 3.00001;
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/clothing/head/helmet/alt{
- layer = 3.00001
- },
-/obj/item/clothing/head/helmet/alt{
- layer = 3.00001;
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/effect/turf_decal/bot_white,
-/turf/open/floor/plasteel/dark,
-/area/security/armory)
-"vml" = (
-/obj/machinery/vending/cigarette,
-/turf/open/floor/plasteel/red/side{
- dir = 4
- },
-/area/security/brig)
-"vnP" = (
-/obj/machinery/vending/autodrobe,
-/turf/open/floor/wood,
-/area/maintenance/bar)
"vxh" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance{
@@ -53267,61 +54047,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"vCy" = (
-/obj/structure/window/reinforced,
-/obj/machinery/door/window/eastleft{
- name = "Cyborg Docking Port"
- },
-/obj/machinery/recharge_station,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/main)
-"vGV" = (
-/obj/machinery/power/apc{
- dir = 4;
- name = "Dormitory Bathrooms APC";
- areastring = "/area/crew_quarters/toilet";
- pixel_x = 26
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/structure/cable,
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
-"vJv" = (
-/obj/machinery/camera{
- c_tag = "Fore Primary Hallway East";
- dir = 1
- },
-/obj/structure/extinguisher_cabinet{
- pixel_x = 5;
- pixel_y = -32
- },
-/obj/machinery/light,
-/obj/structure/chair{
- dir = 1
- },
-/turf/open/floor/plasteel/red/side,
-/area/security/brig)
-"vJW" = (
-/obj/machinery/camera{
- c_tag = "Brig Central";
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/door_timer{
- id = "Cell 4";
- name = "Cell 4";
- pixel_y = -32
- },
-/turf/open/floor/plasteel/red/corner,
-/area/security/brig)
"vPE" = (
/obj/machinery/light{
dir = 4
@@ -53329,71 +54054,6 @@
/obj/machinery/libraryscanner,
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"vVq" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 6
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/warden)
-"vYy" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 1
- },
-/turf/open/floor/plasteel/red/side{
- dir = 1
- },
-/area/security/brig)
-"vYR" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security{
- name = "Labor Shuttle";
- req_access = null;
- req_access_txt = "2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/security/brig)
-"vZp" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "seclobby";
- name = "security shutters"
- },
-/turf/open/floor/plasteel,
-/area/security/brig)
-"wdF" = (
-/obj/structure/table/wood,
-/turf/open/floor/wood{
- icon_state = "wood-broken5"
- },
-/area/maintenance/bar)
-"wkw" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 9
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/open/floor/plasteel,
-/area/ai_monitored/security/armory)
"wkN" = (
/turf/closed/wall,
/area/science/circuit)
@@ -53440,44 +54100,11 @@
},
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
-"wOx" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/door/poddoor/preopen{
- id = "executionfireblast";
- layer = 2.9;
- name = "blast door"
- },
-/obj/machinery/door/firedoor,
-/turf/open/floor/plating,
-/area/security/execution/transfer)
"wUY" = (
/obj/structure/table,
/obj/item/reagent_containers/glass/bucket,
/turf/open/floor/plasteel/hydrofloor,
/area/hallway/secondary/service)
-"wZF" = (
-/obj/effect/landmark/secequipment,
-/obj/effect/turf_decal/bot{
- dir = 2
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/main)
-"xbq" = (
-/obj/machinery/computer/secure_data{
- dir = 1
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/warden)
-"xgi" = (
-/obj/machinery/firealarm{
- pixel_y = 24
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/ai_monitored/security/armory)
"xhV" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -53487,13 +54114,6 @@
},
/turf/open/floor/plating,
/area/construction)
-"xic" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel,
-/area/security/armory)
"xiw" = (
/obj/machinery/door/airlock{
name = "Service Hall";
@@ -53505,29 +54125,6 @@
},
/turf/open/floor/plating,
/area/hallway/secondary/service)
-"xpa" = (
-/obj/structure/chair/stool,
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/machinery/button/door{
- id = "permabolt3";
- name = "Cell Bolt Control";
- normaldoorcontrol = 1;
- pixel_y = 25;
- req_access_txt = "0";
- specialfunctions = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/plasteel/floorgrime,
-/area/security/prison)
-"xDn" = (
-/obj/machinery/flasher{
- id = "Cell 4";
- pixel_x = -28
- },
-/turf/open/floor/plasteel/floorgrime,
-/area/security/brig)
"xEu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
@@ -53539,1681 +54136,12 @@
/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"xJF" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security{
- id_tag = "laborexit";
- name = "Labor Shuttle";
- req_access = null;
- req_access_txt = "63"
- },
-/turf/open/floor/plasteel,
-/area/security/processing)
-"xVn" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/open/floor/plasteel/red/side,
-/area/security/brig)
-"ybU" = (
-/obj/machinery/vending/kink,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
"ycu" = (
/obj/structure/cable{
icon_state = "2-4"
},
/turf/open/floor/plasteel,
/area/science/circuit)
-"ykv" = (
-/obj/machinery/light{
- dir = 1
- },
-/obj/machinery/cryopod{
- tag = "icon-cryopod-open (EAST)";
- icon_state = "cryopod-open";
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/cryopod)
-"yLl" = (
-/obj/machinery/suit_storage_unit/security,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/bot_white,
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/security/armory)
-"yOg" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/structure/table,
-/obj/item/storage/box/prisoner,
-/obj/machinery/camera{
- c_tag = "Labor Shuttle Dock North"
- },
-/turf/open/floor/plasteel,
-/area/security/processing)
-"zaC" = (
-/obj/structure/rack,
-/obj/item/storage/box/rubbershot{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/storage/box/rubbershot{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/storage/box/rubbershot,
-/obj/item/storage/box/rubbershot,
-/obj/item/storage/box/rubbershot{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/storage/box/rubbershot{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/effect/turf_decal/bot_white,
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/security/armory)
-"zcn" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/warden)
-"zft" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/turf/open/floor/plasteel,
-/area/security/main)
-"zmg" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/plasteel,
-/area/security/brig)
-"znN" = (
-/obj/structure/chair/stool,
-/turf/open/floor/wood{
- icon_state = "wood-broken"
- },
-/area/maintenance/bar)
-"zxh" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/neutral/side{
- dir = 4
- },
-/area/crew_quarters/dorms)
-"zGy" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/camera/motion{
- c_tag = "Armory Motion Sensor";
- dir = 2;
- name = "motion-sensitive security camera"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 6
- },
-/turf/open/floor/plasteel,
-/area/ai_monitored/security/armory)
-"zRm" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "seclobby";
- name = "security shutters"
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/open/floor/plating,
-/area/security/brig)
-"zSX" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green/corner,
-/turf/open/floor/plasteel,
-/area/crew_quarters/cryopod)
-"AgS" = (
-/obj/machinery/vending/games{
- name = "\improper Good 'Clean' Fun"
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"ATB" = (
-/obj/structure/closet/secure_closet/lethalshots,
-/obj/effect/turf_decal/bot_white,
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/security/armory)
-"AWY" = (
-/obj/machinery/flasher{
- id = "Cell 1";
- pixel_x = -28
- },
-/turf/open/floor/plasteel/floorgrime,
-/area/security/brig)
-"BdE" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel,
-/area/ai_monitored/security/armory)
-"BlT" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/window/southleft{
- base_state = "right";
- dir = 1;
- icon_state = "right";
- name = "Armory";
- req_access_txt = "3"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/security/armory)
-"BSi" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
-/area/security/main)
-"CaS" = (
-/obj/structure/table,
-/obj/item/folder/red,
-/obj/item/pen,
-/obj/item/hand_labeler,
-/obj/item/book/manual/wiki/security_space_law,
-/obj/machinery/light,
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/warden)
-"Clf" = (
-/obj/machinery/button/door{
- id = "briggate";
- name = "Desk Shutters";
- pixel_x = -26;
- pixel_y = 6;
- req_access_txt = "0"
- },
-/obj/machinery/button/flasher{
- id = "brigentry";
- pixel_x = -28;
- pixel_y = -8
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel/dark,
-/area/security/brig)
-"CpD" = (
-/obj/machinery/firealarm{
- dir = 1;
- pixel_y = -24
- },
-/turf/open/floor/plasteel/red/side{
- dir = 10
- },
-/area/security/brig)
-"CxU" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"CJg" = (
-/turf/open/floor/plasteel/red/side,
-/area/security/brig)
-"CQC" = (
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/warden)
-"CQO" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/open/floor/plating,
-/area/ai_monitored/security/armory)
-"CUx" = (
-/obj/structure/chair/stool/bar,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 8
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"Dhx" = (
-/obj/machinery/camera/motion{
- c_tag = "Non-Lethal Armory Motion Sensor";
- dir = 4
- },
-/obj/effect/turf_decal/stripes/end{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/security/armory)
-"DHH" = (
-/obj/machinery/button/door{
- id = "Maintdorm1";
- name = "Dorm Bolt Control";
- normaldoorcontrol = 1;
- pixel_x = 25;
- specialfunctions = 4
- },
-/turf/open/floor/wood,
-/area/maintenance/port/aft)
-"DHO" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel/red/side{
- dir = 5
- },
-/area/security/brig)
-"DJw" = (
-/obj/effect/turf_decal/stripes/white/line{
- dir = 5
- },
-/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
-"DRh" = (
-/obj/structure/table,
-/obj/item/grenade/barrier{
- pixel_x = 4
- },
-/obj/item/grenade/barrier,
-/obj/item/grenade/barrier{
- pixel_x = -4
- },
-/obj/machinery/light{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/security/armory)
-"DVb" = (
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 1;
- layer = 2.9
- },
-/obj/structure/closet/secure_closet/brig{
- id = "Secure Cell";
- name = "Secure Cell Locker"
- },
-/obj/effect/turf_decal/stripes/white/end{
- dir = 4
- },
-/obj/effect/turf_decal/delivery/white,
-/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
-"EbP" = (
-/obj/machinery/suit_storage_unit/security,
-/obj/effect/turf_decal/bot_white,
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/security/armory)
-"Ecg" = (
-/obj/machinery/light{
- dir = 4
- },
-/obj/structure/table/wood,
-/obj/item/reagent_containers/spray/cleaner,
-/turf/open/floor/wood{
- icon_state = "wood-broken6"
- },
-/area/maintenance/bar)
-"Eew" = (
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=EVA";
- location = "Security"
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
-"Eko" = (
-/obj/machinery/power/apc{
- areastring = "/area/maintenance/bar";
- dir = 2;
- name = "Maintenance Bar APC";
- pixel_x = 1;
- pixel_y = -24
- },
-/obj/structure/cable,
-/turf/open/floor/wood{
- icon_state = "wood-broken7"
- },
-/area/maintenance/bar)
-"Emp" = (
-/obj/structure/grille,
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/space/nearstation)
-"Evc" = (
-/obj/machinery/door/airlock/security{
- name = "Interrogation";
- req_access = null;
- req_access_txt = "63"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/dark,
-/area/security/prison)
-"EOh" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel,
-/area/ai_monitored/security/armory)
-"EXC" = (
-/obj/structure/closet/l3closet/security,
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/main)
-"Fdq" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security{
- aiControlDisabled = 0;
- id_tag = null;
- locked = 0;
- name = "Prisoner Transfer Centre";
- req_access = null;
- req_access_txt = "2"
- },
-/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
-"Fwc" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/security/armory)
-"FJK" = (
-/obj/structure/chair/stool/bar,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/wood{
- icon_state = "wood-broken7"
- },
-/area/maintenance/bar)
-"FQA" = (
-/obj/machinery/button/door{
- id = "seclobby";
- name = "Security Lobby Lockdown";
- pixel_x = -26;
- pixel_y = 8;
- req_access_txt = "2"
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/machinery/button/door{
- desc = "A remote control switch for the medbay foyer.";
- id = "lobbyairlock";
- name = "Security Lobby Doors Control";
- normaldoorcontrol = 1;
- pixel_x = -26;
- pixel_y = -2;
- req_access_txt = "63"
- },
-/turf/open/floor/plasteel/dark,
-/area/security/brig)
-"FRl" = (
-/obj/structure/falsewall,
-/turf/open/floor/plating,
-/area/maintenance/bar)
-"FZW" = (
-/obj/effect/turf_decal/stripes/white/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/white/corner,
-/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
-"Gbr" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/rack,
-/obj/item/clothing/mask/gas/sechailer{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/clothing/mask/gas/sechailer,
-/obj/item/clothing/mask/gas/sechailer{
- pixel_x = 3;
- pixel_y = -3
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/warden)
-"GcW" = (
-/turf/closed/wall/r_wall,
-/area/security/armory)
-"GlY" = (
-/obj/machinery/door/window/westleft{
- base_state = "right";
- dir = 4;
- icon_state = "right";
- name = "Brig Infirmary";
- req_access_txt = "0"
- },
-/turf/open/floor/plasteel/whitered/side{
- dir = 4
- },
-/area/security/brig)
-"Gmd" = (
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/security/brig)
-"Gnk" = (
-/obj/structure/chair/stool,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"GpD" = (
-/obj/machinery/flasher{
- id = "brigentry";
- pixel_y = -28
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/chair{
- dir = 1
- },
-/turf/open/floor/plasteel/red/side,
-/area/security/brig)
-"Gwy" = (
-/obj/machinery/door/airlock/maintenance/abandoned{
- id_tag = "Maintdorm2";
- req_access_txt = "0"
- },
-/turf/open/floor/wood,
-/area/maintenance/port/aft)
-"Hig" = (
-/obj/machinery/camera{
- c_tag = "Dormitory South";
- c_tag_order = 999;
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/open/floor/plasteel/neutral/side{
- dir = 8
- },
-/area/crew_quarters/dorms)
-"HJB" = (
-/turf/open/floor/wood{
- icon_state = "wood-broken6"
- },
-/area/maintenance/bar)
-"HWl" = (
-/obj/structure/table/wood,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/machinery/newscaster{
- pixel_x = 30
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/wood{
- icon_state = "wood-broken7"
- },
-/area/maintenance/bar)
-"HXb" = (
-/obj/machinery/door/firedoor,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/door/poddoor/preopen{
- id = "Prison Gate";
- name = "prison blast door"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel,
-/area/security/brig)
-"IcK" = (
-/obj/effect/turf_decal/stripes/white/line,
-/obj/effect/turf_decal/stripes/white/corner{
- dir = 1
- },
-/obj/machinery/door_timer{
- id = "Secure Cell";
- name = "Secure Cell";
- pixel_y = -32
- },
-/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
-"Iiq" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
- name = "Labor Camp Shuttle Airlock";
- req_access_txt = "2"
- },
-/obj/machinery/button/door{
- id = "prison release";
- name = "Labor Camp Shuttle Lockdown";
- pixel_y = -25;
- req_access_txt = "2"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/security/processing)
-"IqS" = (
-/obj/structure/window/reinforced,
-/obj/vehicle/ridden/secway,
-/obj/item/key/security,
-/obj/machinery/door/window/eastleft{
- name = "Secway Docking Port"
- },
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/main)
-"IwC" = (
-/obj/effect/spawner/lootdrop/keg,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"IEd" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel,
-/area/ai_monitored/security/armory)
-"IOq" = (
-/obj/structure/rack,
-/obj/item/storage/box/chemimp{
- pixel_x = 6
- },
-/obj/item/storage/box/trackimp{
- pixel_x = -3
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/bot_white,
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/security/armory)
-"IPJ" = (
-/turf/open/floor/plasteel/red/corner{
- dir = 4
- },
-/area/security/brig)
-"JbH" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
-"Jcn" = (
-/obj/structure/bed,
-/obj/item/bedsheet,
-/turf/open/floor/plasteel/floorgrime,
-/area/security/brig)
-"Jcy" = (
-/obj/structure/chair{
- dir = 1
- },
-/obj/item/radio/intercom{
- name = "Station Intercom (General)";
- pixel_y = -29
- },
-/turf/open/floor/plasteel/red/side,
-/area/security/brig)
-"Jfm" = (
-/turf/open/floor/plasteel/red/side{
- dir = 8
- },
-/area/security/brig)
-"Jgm" = (
-/obj/effect/turf_decal/loading_area/white,
-/obj/effect/turf_decal/stripes/white/corner{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/white/corner,
-/turf/open/floor/plasteel/dark,
-/area/security/execution/transfer)
-"Jnv" = (
-/obj/structure/chair/office/dark{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
-/area/ai_monitored/security/armory)
-"JAr" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green/corner,
-/turf/open/floor/plasteel,
-/area/crew_quarters/cryopod)
-"JOT" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
-"Knt" = (
-/turf/open/floor/plasteel/red/side{
- dir = 6
- },
-/area/security/brig)
-"Kpp" = (
-/obj/machinery/light{
- dir = 4
- },
-/obj/machinery/cryopod{
- tag = "icon-cryopod-open (WEST)";
- icon_state = "cryopod-open";
- dir = 8
- },
-/turf/open/floor/plasteel/floorgrime,
-/area/security/prison)
-"KrE" = (
-/obj/structure/rack,
-/obj/item/soap/nanotrasen,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
-"KvX" = (
-/obj/structure/chair/office/dark,
-/obj/effect/landmark/start/warden,
-/obj/machinery/button/door{
- id = "Prison Gate";
- name = "Prison Wing Lockdown";
- pixel_x = -27;
- pixel_y = 8;
- req_access_txt = "2"
- },
-/obj/machinery/button/door{
- id = "seclobby";
- name = "Security Lobby Lockdown";
- pixel_x = -27;
- pixel_y = -2;
- req_access_txt = "2"
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/warden)
-"KHo" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel/red/corner{
- dir = 4
- },
-/area/security/brig)
-"KNi" = (
-/obj/machinery/door/window/southleft{
- name = "Armory";
- req_access_txt = "3"
- },
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel,
-/area/ai_monitored/security/armory)
-"LcH" = (
-/obj/structure/table/wood,
-/obj/machinery/chem_dispenser/drinks,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"Lru" = (
-/obj/structure/chair/stool,
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/machinery/button/door{
- id = "permabolt2";
- name = "Cell Bolt Control";
- normaldoorcontrol = 1;
- pixel_y = 25;
- req_access_txt = "0";
- specialfunctions = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/open/floor/plasteel/floorgrime,
-/area/security/prison)
-"LAP" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 5
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/warden)
-"LZL" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall,
-/area/maintenance/fore/secondary)
-"Moa" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel,
-/area/ai_monitored/security/armory)
-"MxR" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/light,
-/turf/open/floor/plasteel/red/side,
-/area/security/brig)
-"Mzd" = (
-/obj/machinery/door/poddoor/shutters{
- id = "lowsecarmory";
- name = "Non-Lethal Armoury Shutter"
- },
-/obj/machinery/button/door{
- id = "lowsecarmory";
- name = "Non-Lethal Armory Shutters";
- pixel_y = 26;
- req_access_txt = "3"
- },
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel,
-/area/security/main)
-"MIE" = (
-/obj/item/shard,
-/obj/item/wirecutters,
-/obj/item/wallframe/camera,
-/turf/open/floor/plating{
- icon_state = "panelscorched"
- },
-/area/maintenance/bar)
-"MJI" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/wood{
- icon_state = "wood-broken5"
- },
-/area/maintenance/bar)
-"MLq" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/machinery/airalarm{
- pixel_y = 23
- },
-/turf/open/floor/plasteel,
-/area/ai_monitored/security/armory)
-"MRu" = (
-/obj/machinery/light_switch{
- pixel_y = 28
- },
-/obj/structure/closet/secure_closet/courtroom,
-/obj/effect/decal/cleanable/cobweb,
-/obj/item/gavelhammer,
-/turf/open/floor/plasteel,
-/area/security/courtroom)
-"MRP" = (
-/obj/machinery/door/airlock/maintenance/abandoned{
- name = "Incinerator Access";
- req_access_txt = "12"
- },
-/obj/structure/barricade/wooden{
- name = "wooden barricade (CLOSED)"
- },
-/turf/open/floor/plating,
-/area/maintenance/bar)
-"MWg" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/security/armory)
-"Nau" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/reagent_dispensers/water_cooler,
-/turf/open/floor/plasteel/red/side,
-/area/security/brig)
-"NkF" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plasteel/red/side,
-/area/security/brig)
-"Nmb" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/red/side{
- dir = 6
- },
-/area/security/brig)
-"Nql" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/open/floor/plating,
-/area/security/brig)
-"Nrx" = (
-/obj/item/radio/intercom{
- desc = "Talk through this. It looks like it has been modified to not broadcast.";
- dir = 2;
- name = "Prison Intercom (General)";
- pixel_x = -25;
- pixel_y = -2;
- prison_radio = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/floorgrime,
-/area/security/brig)
-"NzL" = (
-/obj/machinery/door/window/westleft{
- base_state = "left";
- dir = 4;
- icon_state = "left";
- name = "Brig Infirmary";
- req_access_txt = "0"
- },
-/turf/open/floor/plasteel/whitered/side{
- dir = 4
- },
-/area/security/brig)
-"NQr" = (
-/obj/machinery/requests_console{
- department = "Security";
- departmentType = 5;
- pixel_x = -30
- },
-/obj/machinery/camera{
- c_tag = "Brig Control Room";
- dir = 4
- },
-/obj/machinery/light{
- dir = 8
- },
-/obj/structure/closet/secure_closet/warden,
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/warden)
-"NSC" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/warden)
-"Oly" = (
-/obj/machinery/chem_dispenser/drinks/beer,
-/obj/structure/table/wood,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"Osi" = (
-/obj/machinery/door/poddoor/shutters{
- id = "armory";
- name = "Armoury Shutter"
- },
-/obj/effect/turf_decal/delivery,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
-/area/ai_monitored/security/armory)
-"OtF" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall,
-/area/maintenance/bar)
-"Ozq" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"OBq" = (
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_x = -31
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"OSr" = (
-/obj/machinery/door/airlock/maintenance/abandoned{
- id_tag = "Maintdorm1";
- req_access_txt = "0"
- },
-/turf/open/floor/wood,
-/area/maintenance/port/aft)
-"PcH" = (
-/obj/structure/table/wood/poker,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"Pem" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/closed/wall,
-/area/maintenance/bar)
-"Pez" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
-/area/ai_monitored/security/armory)
-"PlJ" = (
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "seclobby";
- name = "security shutters"
- },
-/turf/open/floor/plating,
-/area/security/brig)
-"PzP" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"PBc" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/warden)
-"PEg" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/floor/plating,
-/area/security/brig)
-"PJW" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk,
-/turf/open/floor/plasteel/red/side{
- dir = 4
- },
-/area/security/brig)
-"PYb" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/floor/plating,
-/area/security/brig)
-"Qcw" = (
-/obj/machinery/door/firedoor,
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/machinery/door/airlock/security/glass{
- cyclelinkeddir = 1;
- id_tag = "outerbrig";
- name = "Brig";
- req_access_txt = "63"
- },
-/turf/open/floor/plasteel/red/side{
- dir = 5
- },
-/area/security/brig)
-"Qge" = (
-/obj/machinery/button/door{
- id = "Maintdorm2";
- name = "Dorm Bolt Control";
- normaldoorcontrol = 1;
- pixel_x = 25;
- specialfunctions = 4
- },
-/turf/open/floor/wood,
-/area/maintenance/port/aft)
-"Qru" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
- cyclelinkeddir = 1;
- id_tag = "lobbyairlock";
- name = "Security Lobby";
- req_access_txt = "0"
- },
-/turf/open/floor/plasteel/red/side{
- dir = 1
- },
-/area/security/brig)
-"Qvz" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 6
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"QDB" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/security/armory)
-"QFx" = (
-/obj/machinery/door/airlock/external{
- name = "Labor Camp Shuttle Airlock";
- req_access_txt = "2"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/security/processing)
-"ReY" = (
-/obj/machinery/door/airlock/maintenance/abandoned{
- req_access_txt = "0"
- },
-/turf/open/floor/plating,
-/area/maintenance/bar)
-"Rwb" = (
-/obj/machinery/computer/crew{
- dir = 1
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/warden)
-"RyJ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
-/area/ai_monitored/security/armory)
-"RRt" = (
-/obj/item/lighter/greyscale,
-/obj/effect/decal/cleanable/semen{
- desc = "Blech.";
- name = "dried semen"
- },
-/turf/open/floor/plating{
- icon_state = "panelscorched"
- },
-/area/maintenance/bar)
-"RWl" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel/red/side{
- dir = 6
- },
-/area/security/brig)
-"SbB" = (
-/obj/machinery/camera{
- c_tag = "Brig Equipment Room";
- dir = 4
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/main)
-"Sfp" = (
-/obj/machinery/door/airlock/security/glass{
- id_tag = null;
- name = "Evidence Storage";
- req_access_txt = "63"
- },
-/turf/open/floor/plasteel/red/side,
-/area/security/brig)
-"SjU" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"Sly" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/wood{
- icon_state = "wood-broken"
- },
-/area/maintenance/bar)
-"STm" = (
-/obj/machinery/vending/clothing,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"SUw" = (
-/obj/structure/rack,
-/obj/item/storage/box/teargas{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/storage/box/handcuffs,
-/obj/item/storage/box/flashbangs{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 9
- },
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel/red/side,
-/area/ai_monitored/security/armory)
-"SWq" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security{
- name = "Security Office";
- req_access = null;
- req_access_txt = "1"
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
-/area/security/main)
-"Tqy" = (
-/obj/machinery/door/firedoor,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/door/airlock/security/glass{
- cyclelinkeddir = 1;
- id_tag = "outerbrig";
- name = "Brig";
- req_access_txt = "63"
- },
-/turf/open/floor/plasteel/red/side{
- dir = 9
- },
-/area/security/brig)
-"TIM" = (
-/obj/machinery/door_timer{
- id = "Cell 2";
- name = "Cell 2";
- pixel_y = -32
- },
-/obj/machinery/light,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plasteel/red/corner,
-/area/security/brig)
-"TZk" = (
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel/red/side{
- dir = 4
- },
-/area/security/brig)
-"UmK" = (
-/obj/machinery/door/airlock/maintenance/abandoned{
- req_access_txt = "0"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"UnJ" = (
-/obj/machinery/vending/kink,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"UqV" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/turf/open/floor/plasteel/dark,
-/area/security/brig)
-"Uua" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/warden)
-"Uuv" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/structure/filingcabinet/chestdrawer,
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/warden)
-"UvC" = (
-/obj/item/twohanded/required/kirbyplants/random,
-/turf/open/floor/plasteel/red/side{
- dir = 9
- },
-/area/security/brig)
-"USL" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/plasteel/red/side{
- dir = 5
- },
-/area/security/brig)
-"UYY" = (
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/power/apc{
- areastring = "/area/crew_quarters/cryopod";
- dir = 4;
- name = "Cryogenics APC";
- pixel_x = 24
- },
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
-"Vup" = (
-/obj/structure/chair/stool,
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/machinery/button/door{
- id = "permabolt1";
- name = "Cell Bolt Control";
- normaldoorcontrol = 1;
- pixel_y = 25;
- req_access_txt = "0";
- specialfunctions = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/plasteel/floorgrime,
-/area/security/prison)
-"VLP" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/security/brig)
-"VTn" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/door/airlock/maintenance/abandoned{
- req_access_txt = "0"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plating,
-/area/maintenance/bar)
-"VZe" = (
-/obj/machinery/door/poddoor/shutters{
- id = "armory";
- name = "Armoury Shutter"
- },
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel,
-/area/ai_monitored/security/armory)
-"Wgg" = (
-/obj/structure/bed,
-/obj/item/bedsheet/grey,
-/obj/effect/decal/cleanable/semen{
- desc = "Blech.";
- name = "dried semen"
- },
-/obj/effect/spawner/lootdrop/costume,
-/turf/open/floor/plating{
- icon_state = "platingdmg3"
- },
-/area/maintenance/bar)
-"WwY" = (
-/obj/structure/chair/stool/bar,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 6
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"WDU" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Brig Control";
- req_access_txt = "3"
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/brig)
-"WMt" = (
-/obj/machinery/vending/coffee,
-/turf/open/floor/plasteel/red/side{
- dir = 5
- },
-/area/security/brig)
-"WQm" = (
-/obj/structure/chair{
- dir = 4;
- name = "Prosecution"
- },
-/turf/open/floor/plasteel/red/side{
- dir = 9
- },
-/area/security/courtroom)
-"WRc" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "seclobby";
- name = "security shutters"
- },
-/obj/machinery/door/airlock/public/glass{
- name = "Courtroom"
- },
-/turf/open/floor/plasteel/dark,
-/area/security/brig)
-"WSZ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/wood{
- icon_state = "wood-broken5"
- },
-/area/maintenance/bar)
-"WWX" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/brigdoor{
- dir = 1;
- name = "Armory Desk";
- req_access_txt = "3"
- },
-/obj/machinery/door/window/southleft{
- name = "Reception Desk";
- req_access_txt = "63"
- },
-/obj/item/paper_bin{
- pixel_x = -3;
- pixel_y = 7
- },
-/obj/item/pen{
- pixel_x = 4;
- pixel_y = 4
- },
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/brig)
-"WXW" = (
-/obj/structure/chair/stool/bar,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"Xfx" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/plasteel/red/side{
- dir = 1
- },
-/area/security/brig)
-"Xiv" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
-"XjL" = (
-/obj/structure/rack,
-/obj/item/gun/energy/e_gun{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/gun/energy/e_gun,
-/obj/item/gun/energy/e_gun{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/effect/turf_decal/bot{
- dir = 2
- },
-/obj/structure/window/reinforced{
- dir = 1;
- layer = 2.9
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
- dir = 2
- },
-/area/ai_monitored/security/armory)
-"XmQ" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/machinery/iv_drip,
-/turf/open/floor/plasteel/whitered/side{
- dir = 5
- },
-/area/security/brig)
-"XqB" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plating,
-/area/maintenance/bar)
-"XwE" = (
-/turf/open/floor/plasteel/red/side{
- dir = 10
- },
-/area/security/brig)
-"XBE" = (
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 2;
- name = "2maintenance loot spawner"
- },
-/obj/item/crowbar,
-/obj/item/electropack/shockcollar,
-/turf/open/floor/plating,
-/area/maintenance/bar)
-"XLV" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/corner,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 10
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/open/floor/plasteel,
-/area/ai_monitored/security/armory)
-"XMB" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/machinery/rnd/production/protolathe/department/security,
-/turf/open/floor/plasteel/red/side,
-/area/security/main)
-"XPp" = (
-/obj/item/paper_bin{
- pixel_x = -3;
- pixel_y = 7
- },
-/obj/item/pen,
-/obj/machinery/newscaster{
- pixel_x = 30
- },
-/obj/structure/table/wood,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"XRe" = (
-/obj/structure/table,
-/obj/machinery/chem_dispenser/drinks,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel/bar,
-/area/security/brig)
-"XSH" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/turf/open/floor/plasteel,
-/area/security/brig)
-"YcJ" = (
-/turf/open/floor/plasteel,
-/area/security/execution/transfer)
-"YjW" = (
-/obj/item/radio/intercom{
- freerange = 0;
- frequency = 1459;
- name = "Station Intercom (General)";
- pixel_x = 29
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/closet/wardrobe/red,
-/turf/open/floor/plasteel/showroomfloor,
-/area/security/main)
-"YpE" = (
-/obj/structure/chair/stool,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"YNq" = (
-/obj/machinery/light{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/plasteel,
-/area/ai_monitored/security/armory)
-"YNF" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/firealarm{
- dir = 2;
- pixel_y = 24
- },
-/turf/open/floor/plasteel/red/side{
- dir = 1
- },
-/area/security/brig)
-"YRL" = (
-/obj/structure/table,
-/obj/item/storage/box/firingpins,
-/obj/item/storage/box/firingpins,
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/security/armory)
-"YUq" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
- },
-/obj/machinery/computer/cryopod{
- pixel_y = 25
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green/corner{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/cryopod)
-"ZbZ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel/red/corner{
- dir = 8
- },
-/area/security/brig)
-"Zhd" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5
- },
-/turf/closed/wall,
-/area/maintenance/bar)
-"Zvf" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel/red/corner{
- dir = 1
- },
-/area/security/brig)
-"ZAl" = (
-/obj/machinery/computer/cryopod{
- pixel_y = 25
- },
-/turf/open/floor/plasteel/floorgrime,
-/area/security/prison)
-"ZEU" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/security/brig)
-"ZHV" = (
-/obj/machinery/door_timer{
- id = "Cell 1";
- name = "Cell 1";
- pixel_y = -32
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel/red/corner{
- dir = 2
- },
-/area/security/brig)
(1,1,1) = {"
aaa
@@ -71049,6 +69977,8 @@ aaa
aaa
aaa
aaa
+aaa
+aaa
aag
aaa
aaa
@@ -71056,8 +69986,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
aaf
aaS
aaa
@@ -71306,6 +70234,8 @@ aaa
aaa
aaa
aaa
+aaa
+aaa
aag
aaa
aaa
@@ -71313,8 +70243,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
aaf
aaS
aaf
@@ -71563,6 +70491,8 @@ aaa
aaa
aaa
aaa
+aaa
+aaa
aag
aaa
aaa
@@ -71570,8 +70500,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
aaf
aaS
aaa
@@ -71820,6 +70748,8 @@ aaa
aaa
aaa
aaa
+aaa
+aaa
aag
aaa
aaa
@@ -71827,8 +70757,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
aaf
aaS
acy
@@ -72077,6 +71005,8 @@ aaa
aaa
aaa
aaa
+aaa
+aaa
aag
aaa
aaa
@@ -72084,8 +71014,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
aaf
aba
aaa
@@ -72334,6 +71262,8 @@ aaa
aaa
aaa
aaa
+aaa
+aaa
aag
aaa
aaa
@@ -72341,8 +71271,6 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
aaf
aaS
aaf
@@ -72591,10 +71519,10 @@ aaa
aaa
aaa
aaa
+aaa
+aaa
aag
aaa
-aaa
-aaa
aoV
bZm
aoV
@@ -72848,10 +71776,10 @@ aaa
aaa
aaa
aaa
+aaa
+aaa
aag
aaa
-aaa
-aaa
aoV
bVz
aaf
@@ -73105,10 +72033,10 @@ aaa
aaa
aaa
aaa
+aaa
+aaa
aag
aaa
-aaa
-aaa
aag
bVz
aag
@@ -73362,10 +72290,10 @@ aaa
aaa
aaa
aaa
-aag
-gXs
aaa
aaa
+aag
+aaa
aaf
bVz
aoV
@@ -73618,10 +72546,10 @@ aaa
aaa
aaa
aaa
-gXs
+aaa
+aaa
+aaa
aag
-gXs
-gXs
aaa
aaf
bVz
@@ -73876,10 +72804,10 @@ aaa
aaf
aaf
aaf
+aaa
+aaa
aag
-gXs
-gXs
-gXs
+aaa
bVx
caf
aoV
@@ -74133,11 +73061,11 @@ aaa
aaa
aaa
bCq
+bCq
+bCq
bLv
bCq
-bCq
-bCq
-bCq
+aoV
cbj
aoV
aag
@@ -74390,10 +73318,10 @@ aaa
aaa
aaa
bCq
-KrE
+bJP
+bCq
+bSn
bCq
-bPS
-gZR
bCq
cbj
bLv
@@ -74647,10 +73575,10 @@ aaa
aaa
aaa
bCq
-bHE
-bCq
-fLS
-pDm
+bPS
+aad
+bPS
+bPS
bCq
cbk
bLv
@@ -74904,10 +73832,10 @@ aaa
aaa
aaa
bLv
-bHE
-Gwy
-Qge
-tsC
+bPR
+bRc
+bSo
+bTs
bCq
bVy
bLv
@@ -75161,10 +74089,10 @@ aaa
aaa
aaa
bCq
-bHE
-bCq
-bCq
-qQU
+bPS
+bRf
+bSo
+bTu
bCq
bVB
bHE
@@ -75418,10 +74346,10 @@ aaa
aaa
aaa
bLv
-bHE
-bCq
-bPS
-kcq
+bPT
+bRe
+bSo
+bTt
bCq
bVA
bWw
@@ -75675,10 +74603,10 @@ aaa
aaa
aaa
bCq
-bHE
+bPV
bCq
-fLS
-jJa
+bCq
+bTw
bCq
bVD
bWy
@@ -75932,10 +74860,10 @@ bGi
aoV
aoV
bCq
+bPU
bHE
-OSr
-DHH
-fEF
+bSp
+bTv
bCq
bVC
bWx
@@ -76192,7 +75120,7 @@ bCq
bPW
bCq
bCq
-qQU
+bTy
bCq
bVF
bWA
@@ -76706,20 +75634,20 @@ bCq
bPY
cOw
bCq
-ete
-ete
-ete
-ete
-ete
-MRP
-ete
-ete
-ete
-ete
-ete
-ete
-ete
-ete
+bCq
+bCq
+bCq
+bCq
+bCq
+bYy
+bCq
+bCq
+bLv
+bCq
+bCq
+bCq
+bCq
+bLv
bUs
bLv
aaa
@@ -76963,20 +75891,20 @@ bCq
bPX
bRg
bRg
-ete
-nuB
-OBq
-sGR
-jDQ
-nuB
-IwC
-ete
-nuB
-iZV
-OBq
-nuB
-lIk
-ete
+bCq
+bHE
+bVG
+bHE
+bHE
+bHE
+bLv
+aaf
+aoV
+aoV
+aoV
+aoV
+aoV
+bLv
bUs
bLv
aaa
@@ -77220,20 +76148,20 @@ bLv
bQa
bHE
bHE
-ete
-Qvz
-jHE
-esl
-Ozq
-WSZ
-Ozq
-UmK
-Ozq
-Ozq
-eTp
-jnM
-fDN
-ete
+bCq
+bHE
+bLv
+bLv
+bLv
+bLv
+bLv
+aoV
+aoV
+aoV
+aoV
+aoV
+aaf
+bLv
bUs
bLv
aaf
@@ -77477,20 +76405,20 @@ bLv
bPZ
bHE
bHE
-ReY
-CxU
-WwY
-WXW
-FJK
-CUx
-qDl
-rHF
-qDl
-Sly
-Gnk
-irr
-nuB
-ete
+cTF
+bHE
+bLv
+aoV
+aoV
+aoV
+aoV
+aoV
+aoV
+aoV
+aoV
+aoV
+aoV
+bLv
bUs
bLv
aaa
@@ -77734,20 +76662,20 @@ bLv
bHE
bHE
bSs
-ete
-MJI
-tLw
-wdF
-jss
-tLw
-nuB
-uQt
-HJB
-irr
-gEX
-PcH
-znN
-ete
+bCq
+bHE
+bLv
+aoV
+aoV
+aoV
+bcU
+aaf
+aaH
+cCa
+aoV
+aoV
+aoV
+bLv
bUs
bLv
aaa
@@ -77991,20 +76919,20 @@ bCq
bHE
bRh
bLu
-ete
-SjU
-HWl
-PzP
-jdX
-ihS
-Eko
-ete
-nuB
-uOE
-gEX
-PcH
-nuw
-ete
+bCq
+bHE
+bLv
+aaf
+aaf
+aoV
+aoV
+aaH
+bdV
+aaH
+aaf
+aaf
+aaf
+bLv
bUs
bLv
aaf
@@ -78169,10 +77097,10 @@ abc
abc
afu
abc
-abc
-abc
-abc
-abc
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aaa
@@ -78248,20 +77176,20 @@ bCq
bOK
bCq
bCq
-ete
-VTn
-Pem
-Oly
-LcH
-gPL
-ete
-ete
-nuB
-irr
-tvf
-orD
-irr
-ete
+bCq
+bHE
+bLv
+aoV
+aoV
+aoV
+aoV
+cjn
+bSu
+aaH
+aoV
+aoV
+aoV
+bLv
bUs
bLv
aaa
@@ -78425,20 +77353,20 @@ abc
aea
aeH
aft
-vdY
-Jgm
-jXE
-DJw
abc
-gXs
+aaa
+aaa
+aaa
+aaa
+aaa
aaa
aaa
aiU
-QFx
+aln
aiU
aaa
aiU
-QFx
+anN
aiU
aaa
aaa
@@ -78506,19 +77434,19 @@ bHE
bLv
aaa
bLv
-lYQ
-Pem
-ete
-ete
-ete
-ete
-nuB
-nuB
-nuB
-YpE
-irr
-ihC
-ete
+bHE
+bLv
+aoV
+aoV
+aoV
+aoV
+aoV
+aaH
+aaf
+aoV
+aoV
+aoV
+bLv
bUs
bLv
aaa
@@ -78684,18 +77612,18 @@ aeJ
afw
abc
abc
-FZW
-IcK
-abc
-aaf
aaf
aaa
+aaf
+aaf
+aaf
+aaf
aiU
-rtk
+alp
aiU
aaa
aiU
-rtk
+alp
aiU
aaf
aaf
@@ -78763,19 +77691,19 @@ bHE
bLv
aaf
bLv
-lYQ
-Pem
-mKs
-XBE
-RRt
-FRl
-nuB
-HJB
-jnM
-kuo
-nuB
-nuB
-ete
+bUt
+bLv
+aaf
+aaf
+aoV
+aoV
+aoV
+aaH
+aoV
+aoV
+aaf
+aaf
+bLv
bUs
bLv
aaf
@@ -78934,26 +77862,26 @@ abb
abt
aca
acz
-wOx
+acX
adC
aeb
aeI
afv
agf
abc
-DVb
-mQI
-abc
+aaf
+aaa
+aaa
aiT
aiT
aiV
+akG
+cxJ
aiU
-Iiq
-aiU
-aiT
-aiU
-Iiq
+amK
aiU
+cxP
+aoq
aiV
aiT
aiT
@@ -79020,19 +77948,19 @@ bLv
bCq
aaa
bLv
-lYQ
-Pem
-MIE
-Wgg
-fhC
-ete
-STm
-vnP
-XPp
-Ecg
-AgS
-UnJ
-ete
+bUs
+bLv
+aoV
+aoV
+aoV
+aoV
+aoV
+aaf
+aoV
+aoV
+aoV
+aoV
+bCq
bUs
bCq
aaa
@@ -79191,17 +78119,17 @@ abe
abw
acc
acB
-tTl
+acZ
adE
aee
aeL
afy
agh
abc
-YcJ
-YcJ
-YcJ
-aiV
+aaf
+aaa
+aaf
+aiT
ajs
akb
akI
@@ -79277,19 +78205,19 @@ bLv
aaa
aaa
bTB
-XqB
-mCA
-OtF
-OtF
-OtF
-OtF
-OtF
-OtF
-OtF
-OtF
-OtF
-OtF
-Zhd
+bUv
+bES
+bES
+bES
+bES
+bGp
+bGp
+bGp
+bGp
+bES
+bES
+bES
+car
bUs
bCq
bCq
@@ -79448,17 +78376,17 @@ abd
abv
acb
acA
-lgR
+acI
adD
aed
aeK
afx
agg
abc
-YcJ
-iTV
-YcJ
-aiV
+aaf
+aaa
+aaa
+aiU
ajr
aka
akH
@@ -79534,7 +78462,7 @@ bLv
bLv
bLv
bTA
-iqw
+bUu
bLw
bLw
bLw
@@ -79708,14 +78636,14 @@ aby
aby
aby
aeg
-Fdq
+aeN
afA
afA
afA
-YcJ
-YcJ
-YcJ
-aiV
+aaf
+aaa
+aaa
+aiU
aju
akd
akK
@@ -79973,13 +78901,13 @@ aai
aai
aai
aai
-yOg
+ajt
akc
akJ
alr
amd
amL
-rpN
+anu
alq
aot
apc
@@ -80231,13 +79159,13 @@ agK
aiB
aai
ajw
-vYR
+akf
aiX
aiX
aiX
aiX
aiV
-xJF
+anP
aiT
cCi
cCi
@@ -80475,13 +79403,13 @@ aat
abh
aat
acd
-xpa
+abK
acY
adG
aeh
aeO
afI
-hDJ
+agl
agH
ags
ags
@@ -80726,7 +79654,7 @@ aak
aap
aay
aaD
-aau
+aat
aat
aat
aat
@@ -80746,7 +79674,7 @@ aho
acd
ajy
akh
-Sfp
+afK
ajc
afM
afN
@@ -81257,7 +80185,7 @@ agK
agK
ail
aiE
-Evc
+aiW
ajA
akj
agj
@@ -81265,7 +80193,7 @@ agj
agj
aiX
aiX
-mlG
+anQ
aov
cCi
apU
@@ -81494,7 +80422,7 @@ aaa
aag
aaf
aaj
-nbc
+aaq
aay
aaE
aaJ
@@ -81503,7 +80431,7 @@ aaV
aat
aat
acd
-Lru
+abL
adb
acd
ael
@@ -81516,13 +80444,13 @@ agj
agj
agj
ajz
-cTu
-PEg
-aly
-AWY
-Jcn
-aiX
+aki
+akM
+alv
+amf
+amQ
anw
+anz
aov
cCi
arT
@@ -81773,13 +80701,13 @@ ahW
aiD
agj
auj
-ZEU
-fqD
-hYC
-qiF
-amg
-aiX
+akl
+akO
+alx
+alx
+amR
anw
+anz
aox
cCi
cCi
@@ -82030,13 +80958,13 @@ ain
aid
agj
aiZ
-ZHV
-akQ
-agj
-agj
-agj
-aiX
-kXo
+akk
+akN
+alw
+amg
+amR
+anw
+anR
aow
apg
aqZ
@@ -82286,14 +81214,14 @@ ahP
ahP
aiF
agj
-ajD
-akm
-PYb
-aly
-ryv
-Jcn
-aiX
-anw
+aja
+ajG
+akQ
+agj
+agj
+amS
+anx
+anz
aov
aph
aph
@@ -82522,35 +81450,35 @@ aaa
aag
aaf
aai
-ZAl
+aau
aaA
-Kpp
+aaG
aaK
aaP
aaX
aat
aat
acd
-Vup
+acD
acY
adG
aeq
aeV
acd
agj
-XmQ
-NzL
-GlY
+ahm
+ahD
+aiw
aiO
agj
-aja
-ZEU
-mqQ
-hYC
-qiF
-ami
-aiX
+ajD
+akm
+akP
+aly
+amh
+amR
anw
+anz
aov
aph
aob
@@ -82786,7 +81714,7 @@ aai
aai
aai
abj
-rPG
+abG
acd
acd
acd
@@ -82794,20 +81722,20 @@ acd
aeP
afC
agk
-HXb
+agF
agP
agP
agP
agP
aiz
-zmg
-TIM
-akQ
-agj
-agj
-agj
-aiX
+ajg
+akl
+akR
+alx
+alx
+amR
anw
+anz
aov
aph
aoc
@@ -83039,12 +81967,12 @@ aaa
aaa
aaf
aaf
-Emp
+aaa
aaf
aai
abi
abF
-cIV
+ach
acK
adf
acd
@@ -83058,13 +81986,13 @@ agO
agO
aiy
ajb
-fuL
-kQp
-Nrx
-rmO
-Jcn
-aiX
+ajF
+akN
+alw
+ami
+amR
anw
+anz
aov
api
ata
@@ -83296,8 +82224,8 @@ aaf
aaf
aaf
aaf
-aaS
aaf
+aaR
aaZ
aaZ
aaZ
@@ -83312,16 +82240,16 @@ agn
agR
agn
agR
-eEc
-aiX
-VLP
-akv
-rTI
-uGh
-aww
-amk
-aiX
-eet
+agn
+ajc
+ajI
+ako
+akQ
+agj
+agj
+amS
+any
+anz
aov
aph
aqb
@@ -83553,32 +82481,32 @@ aaa
aaa
aaa
aaf
-Emp
+aaa
+aaf
+aaf
+aaT
aaf
-GcW
-qla
-Dhx
-EbP
aaZ
-fpJ
-ATB
-lla
-YRL
+abm
+cpg
+acv
+adi
+adi
aaZ
-NQr
-Gbr
-tra
-ixw
-lVH
-piy
-ajI
-oxm
-akQ
-agj
-agj
-agj
-aiX
+aeW
+agQ
+ahv
+ahQ
+aiI
+aiH
+ajB
+akm
+akP
+aly
+amj
+amR
anw
+anz
aov
aph
aph
@@ -83810,32 +82738,32 @@ aaa
aaa
aaa
aaf
-Emp
+aaa
aaf
-GcW
-qla
-QDB
-EbP
+aaf
+aaT
+aaa
aaZ
-MLq
-cxA
+abH
+acl
+ajC
acL
-lTe
+adi
aaZ
-faB
-Uua
-CQC
-NSC
-KvX
-WWX
-VLP
-akm
-oKT
-aly
-xDn
-Jcn
-aiX
+agp
+agT
+ahx
+ahS
+aiK
+ajc
+ajI
+akl
+akT
+aww
+alx
+amR
anw
+anz
aov
apk
anw
@@ -84067,41 +82995,41 @@ aaa
aaa
aaa
aaf
-Emp
+aaa
aaf
-GcW
-qla
-fKO
-tfB
+aaf
+abY
+aaa
aaZ
-xgi
+abn
+ack
adk
adK
-zaC
-dhD
-agt
+cqG
+aeX
+ago
agS
agQ
-agt
-Rwb
-akV
+ahR
+aiJ
+ajc
ajI
-ZEU
-cQs
-hYC
-qiF
-amp
-aiX
+akk
+akS
+alw
+amk
+amR
+anw
anS
-Eew
-JbH
-oEE
-oEE
-oEE
-oEE
-oEE
-oEE
-JOT
+aoy
+apj
+anz
+anz
+anz
+anz
+anz
+anz
+awk
axB
anz
anz
@@ -84324,32 +83252,32 @@ aaa
aaa
aaa
aaf
-Emp
+aaa
aaf
-GcW
-qla
-QDB
-yLl
+aaf
+aaT
+aaa
aaZ
-zGy
-XjL
-Pez
-IOq
-CQO
-PBc
+abJ
+ack
+acM
+adQ
+cwM
+aeZ
+agr
agU
ahy
-LAP
-xbq
-Gmd
-KHo
-vJW
+ahX
+aiL
+ajc
+ajI
+akq
akQ
agj
agj
-agj
-aiX
-anA
+amS
+anx
+anz
aoz
apm
aqd
@@ -84581,33 +83509,33 @@ aaa
aaa
aaa
aaf
-Emp
+aaa
aaf
-GcW
-DRh
-xic
-yLl
+aaf
+aaT
+aaa
aaZ
-YNq
+abI
+ack
coS
aet
cxA
-KNi
+aeY
agt
agt
-vVq
-zcn
-agt
-WDU
-vYy
-xVn
+ahz
+aie
+aiN
+ajc
+ajI
+akp
akU
-Clf
+alz
aml
-FQA
-aiX
-Qru
-iYT
+amT
+anw
+anz
+aoz
apl
aqc
aqc
@@ -84838,33 +83766,33 @@ aaa
aaa
aaa
aaf
-Emp
+aaa
aaf
-GcW
-ssv
-Fwc
-XLV
-BlT
-wkw
-eAL
-sgY
-Moa
-tIp
+aaf
+abY
+aaa
+aaZ
+abQ
+ack
+adj
+arc
+blT
+agq
cml
agV
cxk
aig
-CaS
-aiX
-Zvf
-ZbZ
-Nql
+aiM
+ajc
+ajI
+akp
+akV
alB
amn
-UqV
-dcW
-aiG
-Knt
+amV
+anw
+anz
+aoz
aod
aqf
ahT
@@ -84878,9 +83806,9 @@ anF
anF
anF
anF
-UYY
-Xiv
-gwo
+anF
+anF
+anF
aoa
aJu
aKF
@@ -85095,33 +84023,33 @@ aaa
aaa
aaa
aaf
-Emp
+aaa
aaf
-GcW
-vmd
-MWg
-IEd
-VZe
-EOh
+aaf
+abY
+aaa
+aaZ
+abN
+ack
+bkA
acF
-acF
-gPJ
+aes
avB
amN
agt
-ahB
-Uuv
-agn
-aiX
-ksu
-muL
-amS
+awN
+aHp
+aIF
+ajc
+ajI
+akp
+akQ
alA
-iuz
amm
-zRm
-vZp
-vZp
+amU
+anw
+anT
+aoA
apn
aqe
arf
@@ -85133,11 +84061,11 @@ arf
arf
arf
arf
-rAZ
-rAZ
-rAZ
-rAZ
-jNv
+arf
+arf
+arf
+arf
+anF
ahn
aJn
aJn
@@ -85352,33 +84280,33 @@ aaa
aaa
aaa
aaf
-Emp
+aaa
aaf
-GcW
-mTf
-npy
-BdE
-Osi
-lsi
-Jnv
-RyJ
-SUw
+aaf
+aaT
+aaf
+aaZ
+aci
+acm
+cpA
+adg
+aeu
alt
agu
agX
ahB
aij
agn
-UvC
-sCj
-uZB
-PlJ
-UvC
-Jfm
-Jfm
-Jfm
-Jfm
-CpD
+aje
+ajJ
+akr
+akX
+alC
+alC
+amX
+anz
+anz
+aoB
aod
aqe
arf
@@ -85390,11 +84318,11 @@ atf
arf
aqa
atf
-rAZ
-ykv
-kPE
-rAZ
-jNv
+arf
+aqa
+atf
+arf
+anF
ahn
aaa
aJn
@@ -85609,12 +84537,12 @@ aaa
aaa
aaf
aaf
+aaf
+aaf
+aaa
adR
-adR
-adR
-adR
-Mzd
-avB
+abo
+aaZ
aaZ
aaZ
acT
@@ -85626,18 +84554,18 @@ agW
ahE
aii
agn
-Xfx
-ajb
-NkF
-PlJ
-ajc
-alC
-Jfm
-Jfm
-loR
-GpD
-LZL
-nMU
+ajd
+ajI
+ahY
+akW
+aiG
+amo
+amW
+anz
+anz
+aoz
+aod
+aqe
arf
apY
ate
@@ -85647,11 +84575,11 @@ ath
arf
apY
ath
-rAZ
-YUq
-zSX
-rAZ
-jNv
+arf
+apY
+ate
+arf
+anF
ahn
aaa
aJn
@@ -85866,33 +84794,33 @@ aaa
aaa
aaa
aaa
+aaf
+aaf
+aaa
abp
-IqS
-IqS
-vCy
-abO
-abO
-SbB
-abO
+abP
+aco
+acO
+abl
abO
abO
afc
-abo
+afQ
agw
agY
ahA
ahZ
adR
aiQ
-VLP
-txT
-Tqy
-sVi
-ajc
-Knt
-aiG
-CJg
-vJv
+ajI
+akt
+akQ
+agj
+agj
+aiX
+anB
+anz
+aoD
aod
aqe
arf
@@ -85904,11 +84832,11 @@ ath
arf
ayV
ath
-rAZ
-crS
-uMu
-rAZ
-jNv
+arf
+aCd
+ath
+arf
+anF
ahn
aJw
aJw
@@ -86123,6 +85051,9 @@ aaa
aaa
aaa
aaa
+aaa
+aaf
+aaa
abo
abO
abO
@@ -86130,26 +85061,23 @@ abO
abO
abO
abO
-abO
-abO
-abO
afb
abo
afg
ahb
ahG
aik
-SWq
+cBV
ajf
ajK
-DHO
-Qcw
-IPJ
-ajc
-XwE
-alC
-CJg
-Jcy
+aks
+akY
+alx
+amp
+aiX
+anA
+anz
+aoC
aod
aqe
arf
@@ -86161,11 +85089,11 @@ awo
arf
asd
aAb
-rAZ
-crS
-JAr
-rAZ
-evS
+arf
+asd
+aDK
+arf
+aoa
ahn
aJv
aKG
@@ -86380,15 +85308,15 @@ aaa
aaa
aaa
aaa
+aaa
+aaf
+aaa
abp
abO
-abO
-wZF
-wZF
-wZF
-wZF
-wZF
-abO
+acq
+acq
+acq
+acq
aew
afe
afS
@@ -86397,17 +85325,17 @@ aha
ahC
aia
aiP
-YNF
-XSH
-MxR
+aiR
+ajB
+akv
+ala
+akz
+alf
aiX
-uzg
-USL
-uFV
-uFV
-Nmb
-Nau
-efg
+anA
+anz
+aoF
+apo
aqh
arh
asg
@@ -86421,8 +85349,8 @@ atj
aAX
azc
atj
-Hig
-oux
+aFe
+aul
aHT
aJy
aJy
@@ -86637,17 +85565,17 @@ aaa
aaa
aaa
aaf
+aaf
+aaf
+aaf
abo
abO
-abO
-abO
-abO
acp
acP
acP
acP
aev
-YjW
+afd
afR
agx
agZ
@@ -86656,14 +85584,14 @@ aim
adR
aiG
ajL
-RWl
+aku
+akZ
+alE
+amq
aiX
-WMt
-qZT
-vml
-PJW
-TZk
-XRe
+anA
+anz
+aoE
aod
aqg
aun
@@ -86678,7 +85606,7 @@ azT
auk
auk
aDG
-zxh
+aFd
auk
aHH
aJg
@@ -86894,15 +85822,15 @@ aaa
aaa
aaa
aaa
+aaa
+aaa
+aaf
abp
-aco
-EXC
-rax
-fYm
-rax
-rax
-rax
-abl
+abR
+abP
+abP
+abP
+abP
abp
abp
abp
@@ -86912,15 +85840,15 @@ ahF
aip
adR
aiX
-nCJ
+ajN
akx
aiX
aiX
aiX
aiX
-sfv
-WRc
-sfv
+anC
+anU
+anC
cSA
aqe
arf
@@ -86935,7 +85863,7 @@ azV
aAh
aAh
aFg
-gKP
+aFh
aAh
aAh
aAh
@@ -87151,9 +86079,9 @@ aaa
aaa
aaf
aaf
-abp
-abp
-abp
+aaf
+aaf
+aaf
abq
abq
abq
@@ -87168,10 +86096,10 @@ ahb
ahF
clI
abp
-MRu
+ajh
ajM
akw
-WQm
+alb
alG
amr
amY
@@ -87192,7 +86120,7 @@ aAd
aAh
aCm
aDL
-iyF
+aFf
aGk
aHU
aJz
@@ -87423,7 +86351,7 @@ afV
agB
ahd
ahI
-XMB
+clS
abp
ajj
ajP
@@ -87449,7 +86377,7 @@ aAg
aAh
aDO
aDQ
-vGV
+aFi
aGl
aBy
aBy
@@ -87670,7 +86598,7 @@ aaf
aaf
abr
abS
-qVv
+acr
acQ
adn
adM
@@ -87933,7 +86861,7 @@ adp
adP
aey
afj
-BSi
+afX
agC
ahf
ahK
@@ -88970,7 +87898,7 @@ abp
ajp
ajU
ajn
-ajn
+trb
ajn
amr
ajp
@@ -89218,7 +88146,7 @@ aaf
abo
aeA
afl
-zft
+aga
abp
ahj
abp
@@ -89981,8 +88909,8 @@ aaf
aag
aag
aag
-poo
-poo
+aaa
+aaa
aag
abp
abp
@@ -101566,8 +100494,8 @@ aaf
aaf
aaf
aaf
-alP
-ybU
+aaf
+aaf
alP
anf
alP
@@ -101823,8 +100751,8 @@ aaa
aaa
aaa
aaa
-alP
-alP
+aaa
+aaf
alP
anf
alP
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index e22386b9f8..8d5467fbe5 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -15401,9 +15401,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/airlock_sensor{
- id_tag = "incinerator_airlock_sensor";
- master_tag = "incinerator_airlock_control";
+/obj/machinery/airlock_sensor/incinerator_atmos{
pixel_y = 24
},
/turf/open/floor/engine,
@@ -15960,10 +15958,7 @@
},
/area/security/execution/education)
"aNO" = (
-/obj/machinery/door/poddoor{
- id = "turbinevent";
- name = "Turbine Vent"
- },
+/obj/machinery/door/poddoor/incinerator_atmos_main,
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"aNP" = (
@@ -15997,9 +15992,7 @@
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"aNR" = (
-/obj/machinery/igniter{
- id = "Incinerator"
- },
+/obj/machinery/igniter/incinerator_atmos,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -16011,14 +16004,7 @@
/area/maintenance/disposal/incinerator)
"aNS" = (
/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/public/glass{
- autoclose = 0;
- frequency = 1449;
- heat_proof = 1;
- id_tag = "incinerator_airlock_exterior";
- name = "Incinerator Exterior Airlock";
- req_access_txt = "12"
- },
+/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -16033,23 +16019,14 @@
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume{
- dir = 2;
- frequency = 1449;
- id = "incinerator_airlock_pump"
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{
+ dir = 2
},
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
"aNU" = (
/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/public/glass{
- autoclose = 0;
- frequency = 1449;
- heat_proof = 1;
- id_tag = "incinerator_airlock_interior";
- name = "Incinerator Interior Airlock";
- req_access_txt = "12"
- },
+/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -16057,16 +16034,8 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
-/obj/machinery/embedded_controller/radio/airlock_controller{
- airpump_tag = "incinerator_airlock_pump";
- exterior_door_tag = "incinerator_airlock_exterior";
- id_tag = "incinerator_airlock_control";
- interior_door_tag = "incinerator_airlock_interior";
- name = "Incinerator Access Console";
- pixel_y = 27;
- req_access_txt = "12";
- sanitize_external = 1;
- sensor_tag = "incinerator_airlock_sensor"
+/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{
+ pixel_y = 27
},
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
@@ -16735,24 +16704,17 @@
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
"aPA" = (
-/obj/machinery/button/ignition{
- id = "Incinerator";
+/obj/machinery/button/ignition/incinerator/atmos{
pixel_x = 8;
pixel_y = -36
},
-/obj/machinery/button/door{
- id = "turbinevent";
- name = "Turbine Vent Control";
+/obj/machinery/button/door/incinerator_vent_atmos_main{
pixel_x = -8;
- pixel_y = -36;
- req_access_txt = "12"
+ pixel_y = -36
},
-/obj/machinery/button/door{
- id = "auxincineratorvent";
- name = "Auxiliary Vent Control";
+/obj/machinery/button/door/incinerator_vent_atmos_aux{
pixel_x = -8;
- pixel_y = -24;
- req_access_txt = "12"
+ pixel_y = -24
},
/obj/machinery/computer/turbine_computer{
dir = 1;
@@ -17622,10 +17584,7 @@
/turf/open/floor/plating/airless,
/area/maintenance/disposal/incinerator)
"aRo" = (
-/obj/machinery/door/poddoor{
- id = "auxincineratorvent";
- name = "Incineration Chamber Vent"
- },
+/obj/machinery/door/poddoor/incinerator_atmos_aux,
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"aRp" = (
@@ -72556,7 +72515,7 @@
/obj/item/pen,
/obj/machinery/door/window/southleft{
name = "Research Lab Desk";
- req_access_txt = "7"
+ req_one_access_txt = "7;29"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "rndlab1";
@@ -76089,7 +76048,7 @@
/obj/machinery/door/window/southleft{
dir = 4;
name = "Research Lab Desk";
- req_access_txt = "7"
+ req_one_access_txt = "7;29"
},
/obj/machinery/door/window/westleft,
/obj/effect/turf_decal/delivery,
@@ -76754,7 +76713,7 @@
/obj/machinery/door/window/southleft{
dir = 8;
name = "Research Lab Desk";
- req_access_txt = "7"
+ req_one_access_txt = "7;29"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "rndlab2";
@@ -82923,7 +82882,6 @@
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 4
},
-/obj/structure/window/spawner/north,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
@@ -83693,6 +83651,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/machinery/portable_atmospherics/pump{
+ name = "Lil Pump"
+ },
/turf/open/floor/plasteel,
/area/science/mixing)
"dxQ" = (
@@ -84469,7 +84430,6 @@
dir = 4
},
/obj/machinery/portable_atmospherics/canister,
-/obj/structure/window/spawner,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
@@ -84989,7 +84949,6 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
-/obj/structure/window/spawner,
/turf/open/floor/plasteel,
/area/science/mixing)
"dAD" = (
@@ -85787,6 +85746,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
+/obj/item/radio/intercom{
+ pixel_x = -26
+ },
/turf/open/floor/plasteel,
/area/science/mixing)
"dCb" = (
@@ -86384,7 +86346,6 @@
/obj/effect/turf_decal/stripes/line{
dir = 9
},
-/obj/structure/window/spawner/north,
/turf/open/floor/plasteel,
/area/science/mixing)
"dDt" = (
@@ -86891,6 +86852,7 @@
/obj/structure/sign/poster/official/science{
pixel_x = 32
},
+/obj/machinery/portable_atmospherics/scrubber,
/turf/open/floor/plasteel,
/area/science/mixing)
"dEv" = (
@@ -87473,6 +87435,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/machinery/portable_atmospherics/pump,
/turf/open/floor/plasteel,
/area/science/mixing)
"dFM" = (
@@ -92690,12 +92653,6 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
-"dQF" = (
-/obj/machinery/droneDispenser,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel,
-/area/maintenance/port/aft)
"dQG" = (
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
@@ -99679,14 +99636,7 @@
},
/area/science/mixing)
"fpQ" = (
-/obj/machinery/door/airlock/research/glass{
- autoclose = 0;
- frequency = 1449;
- heat_proof = 1;
- id_tag = "tox_airlock_interior";
- name = "Mixing Room Interior Airlock";
- req_access_txt = "8"
- },
+/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior,
/obj/effect/mapping_helpers/airlock/locked,
/turf/open/floor/engine,
/area/science/mixing)
@@ -99714,9 +99664,7 @@
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 1
},
-/obj/machinery/airlock_sensor{
- id_tag = "tox_airlock_sensor";
- master_tag = "tox_airlock_control";
+/obj/machinery/airlock_sensor/incinerator_toxmix{
pixel_x = -24
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -99951,17 +99899,13 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/button/ignition{
- id = "herrington_memorial_toxigniter";
+/obj/machinery/button/ignition/incinerator/toxmix{
pixel_x = -6;
pixel_y = 30
},
-/obj/machinery/button/door{
- id = "mixvent";
+/obj/machinery/button/door/incinerator_vent_toxmix{
pixel_x = 8;
- pixel_y = 30;
- req_one_access = null;
- req_one_access_txt = "8"
+ pixel_y = 30
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera{
@@ -100048,7 +99992,7 @@
/obj/machinery/autolathe,
/obj/machinery/door/window/southleft{
name = "Research Lab Desk";
- req_access_txt = "7"
+ req_one_access_txt = "7;29"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -100066,10 +100010,8 @@
},
/area/science/mixing)
"lyU" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume{
- dir = 8;
- frequency = 1449;
- id = "tox_airlock_pump"
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{
+ dir = 8
},
/turf/open/floor/engine,
/area/science/mixing)
@@ -100144,14 +100086,8 @@
/area/science/circuit)
"mkm" = (
/obj/machinery/atmospherics/components/binary/valve,
-/obj/machinery/embedded_controller/radio/airlock_controller{
- airpump_tag = "tox_airlock_pump";
- exterior_door_tag = "tox_airlock_exterior";
- id_tag = "tox_airlock_control";
- interior_door_tag = "tox_airlock_interior";
- pixel_y = 26;
- sanitize_external = 1;
- sensor_tag = "tox_airlock_sensor"
+/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{
+ pixel_y = 26
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/vault{
@@ -100207,15 +100143,7 @@
},
/area/science/mixing)
"oIE" = (
-/obj/machinery/door/airlock/research/glass{
- autoclose = 0;
- frequency = 1449;
- heat_proof = 1;
- id_tag = "tox_airlock_exterior";
- name = "Mixing Room Exterior Airlock";
- req_one_access = "8";
- req_one_access_txt = "0"
- },
+/obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior,
/obj/effect/mapping_helpers/airlock/locked,
/turf/open/floor/engine,
/area/science/mixing)
@@ -100255,9 +100183,7 @@
},
/area/science/research)
"oYI" = (
-/obj/machinery/igniter{
- id = "herrington_memorial_toxigniter"
- },
+/obj/machinery/igniter/incinerator_toxmix,
/turf/open/floor/engine/vacuum,
/area/science/mixing)
"oZC" = (
@@ -100360,9 +100286,7 @@
/turf/open/floor/engine/vacuum,
/area/science/mixing)
"svv" = (
-/obj/machinery/door/poddoor{
- id = "mixvent"
- },
+/obj/machinery/door/poddoor/incinerator_toxmix,
/turf/open/floor/engine/vacuum,
/area/science/mixing)
"tmi" = (
@@ -134175,7 +134099,7 @@ dNC
dNC
dOT
dPM
-dQF
+dOb
dRE
dSC
dTA
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index f2b63a49f3..71f23231b9 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -1,4 +1,4 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aaa" = (
/turf/open/space/basic,
/area/space)
@@ -897,6 +897,13 @@
},
/turf/open/floor/plasteel/floorgrime,
/area/security/prison)
+"acx" = (
+/obj/machinery/airalarm{
+ dir = 8;
+ pixel_x = 24
+ },
+/turf/open/floor/plasteel/floorgrime,
+/area/security/prison)
"acy" = (
/obj/machinery/door/airlock/external{
name = "Escape Pod Two"
@@ -1042,6 +1049,15 @@
/obj/machinery/light,
/turf/open/floor/plasteel/floorgrime,
/area/security/prison)
+"acM" = (
+/obj/structure/table,
+/obj/item/paper_bin{
+ pixel_x = -3;
+ pixel_y = 7
+ },
+/obj/item/pen,
+/turf/open/floor/plasteel/floorgrime,
+/area/security/prison)
"acN" = (
/obj/structure/table/glass,
/obj/item/reagent_containers/syringe,
@@ -6013,6 +6029,11 @@
},
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"amU" = (
+/turf/open/floor/plating{
+ icon_state = "platingdmg2"
+ },
+/area/maintenance/port)
"amW" = (
/obj/structure/table/reinforced,
/obj/item/folder,
@@ -21724,6 +21745,18 @@
"aUM" = (
/turf/closed/wall,
/area/crew_quarters/locker)
+"aUN" = (
+/obj/structure/closet/wardrobe/black,
+/turf/open/floor/plasteel/vault,
+/area/crew_quarters/locker)
+"aUO" = (
+/obj/structure/closet/wardrobe/grey,
+/turf/open/floor/plasteel/vault,
+/area/crew_quarters/locker)
+"aUP" = (
+/obj/structure/closet/wardrobe/white,
+/turf/open/floor/plasteel/vault,
+/area/crew_quarters/locker)
"aUQ" = (
/turf/open/floor/plasteel/vault,
/area/crew_quarters/locker)
@@ -25533,6 +25566,12 @@
dir = 4
},
/area/security/checkpoint/engineering)
+"bcO" = (
+/obj/structure/easel,
+/turf/open/floor/plating{
+ icon_state = "platingdmg3"
+ },
+/area/maintenance/starboard/fore)
"bcP" = (
/obj/machinery/light{
dir = 8
@@ -51612,7 +51651,7 @@
/obj/machinery/door/window/eastright{
dir = 2;
name = "Research and Development Desk";
- req_access_txt = "7"
+ req_one_access_txt = "7;29"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "research_shutters";
@@ -52935,29 +52974,14 @@
/area/maintenance/disposal/incinerator)
"cja" = (
/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/public/glass{
- autoclose = 0;
- frequency = 1449;
- heat_proof = 1;
- id_tag = "incinerator_airlock_interior";
- name = "Incinerator Interior Airlock";
- req_access_txt = "12"
- },
+/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/machinery/embedded_controller/radio/airlock_controller{
- airpump_tag = "incinerator_airlock_pump";
- exterior_door_tag = "incinerator_airlock_exterior";
- id_tag = "incinerator_airlock_control";
- interior_door_tag = "incinerator_airlock_interior";
- name = "Incinerator Access Console";
+/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{
pixel_x = 40;
- pixel_y = 8;
- req_access_txt = "12";
- sanitize_external = 1;
- sensor_tag = "incinerator_airlock_sensor"
+ pixel_y = 8
},
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
@@ -53665,9 +53689,7 @@
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 1
},
-/obj/machinery/airlock_sensor{
- id_tag = "incinerator_airlock_sensor";
- master_tag = "incinerator_airlock_control";
+/obj/machinery/airlock_sensor/incinerator_atmos{
pixel_x = -8;
pixel_y = 24
},
@@ -53680,10 +53702,8 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume{
- dir = 8;
- frequency = 1449;
- id = "incinerator_airlock_pump"
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{
+ dir = 8
},
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
@@ -54314,8 +54334,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cmb" = (
-/obj/machinery/chem_master/condimaster{
- name = "CondiMaster Neo";
+/obj/machinery/chem_master{
pixel_x = -4
},
/turf/open/floor/plating,
@@ -54328,14 +54347,7 @@
/area/space/nearstation)
"cmd" = (
/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/public/glass{
- autoclose = 0;
- frequency = 1449;
- heat_proof = 1;
- id_tag = "incinerator_airlock_exterior";
- name = "Incinerator Exterior Airlock";
- req_access_txt = "12"
- },
+/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -54795,9 +54807,7 @@
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"cne" = (
-/obj/machinery/igniter{
- id = "Incinerator"
- },
+/obj/machinery/igniter/incinerator_atmos,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -54817,10 +54827,7 @@
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"cng" = (
-/obj/machinery/door/poddoor{
- id = "auxincineratorvent";
- name = "Incineration Chamber Vent"
- },
+/obj/machinery/door/poddoor/incinerator_atmos_aux,
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"cnh" = (
@@ -55792,7 +55799,7 @@
/obj/machinery/door/window/eastright{
dir = 4;
name = "Research and Development Desk";
- req_access_txt = "7"
+ req_one_access_txt = "7;29"
},
/obj/item/folder/white{
pixel_x = 4;
@@ -56632,7 +56639,7 @@
/obj/machinery/door/window/eastleft{
dir = 1;
name = "Research and Development Deliveries";
- req_access_txt = "7"
+ req_one_access_txt = "7;29"
},
/obj/structure/window/reinforced{
dir = 8
@@ -56905,10 +56912,7 @@
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
"crf" = (
-/obj/machinery/door/poddoor{
- id = "turbinevent";
- name = "Turbine Vent"
- },
+/obj/machinery/door/poddoor/incinerator_atmos_main,
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"crg" = (
@@ -63419,10 +63423,7 @@
/turf/open/space,
/area/science/mixing)
"cEr" = (
-/obj/machinery/door/poddoor{
- id = "mixvent";
- name = "Mixer Room Vent"
- },
+/obj/machinery/door/poddoor/incinerator_toxmix,
/turf/open/floor/engine/vacuum,
/area/science/mixing)
"cEs" = (
@@ -63432,9 +63433,8 @@
/turf/open/floor/engine/vacuum,
/area/science/mixing)
"cEt" = (
-/obj/machinery/sparker{
+/obj/machinery/sparker/toxmix{
dir = 2;
- id = "mixingsparker";
pixel_x = 25
},
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxins_mixing_output{
@@ -63449,9 +63449,7 @@
/turf/closed/wall/r_wall,
/area/science/mixing)
"cEv" = (
-/obj/machinery/airlock_sensor{
- id_tag = "tox_airlock_sensor";
- master_tag = "tox_airlock_control";
+/obj/machinery/airlock_sensor/incinerator_toxmix{
pixel_y = 24
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -63465,14 +63463,8 @@
dir = 4
},
/obj/machinery/meter,
-/obj/machinery/embedded_controller/radio/airlock_controller{
- airpump_tag = "tox_airlock_pump";
- exterior_door_tag = "tox_airlock_exterior";
- id_tag = "tox_airlock_control";
- interior_door_tag = "tox_airlock_interior";
- pixel_x = -24;
- sanitize_external = 1;
- sensor_tag = "tox_airlock_sensor"
+/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{
+ pixel_x = -24
},
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -63864,35 +63856,19 @@
/area/science/mixing)
"cFo" = (
/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/research/glass{
- autoclose = 0;
- frequency = 1449;
- heat_proof = 1;
- id_tag = "tox_airlock_exterior";
- name = "Mixing Room Exterior Airlock";
- req_access_txt = "8"
- },
+/obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior,
/turf/open/floor/engine,
/area/science/mixing)
"cFp" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume{
- dir = 2;
- frequency = 1449;
- id = "tox_airlock_pump"
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{
+ dir = 2
},
/obj/effect/landmark/blobstart,
/turf/open/floor/engine,
/area/science/mixing)
"cFq" = (
/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/research/glass{
- autoclose = 0;
- frequency = 1449;
- heat_proof = 1;
- id_tag = "tox_airlock_interior";
- name = "Mixing Room Interior Airlock";
- req_access_txt = "8"
- },
+/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior,
/turf/open/floor/engine,
/area/science/mixing)
"cFr" = (
@@ -64316,9 +64292,8 @@
},
/area/science/research)
"cGj" = (
-/obj/machinery/sparker{
+/obj/machinery/sparker/toxmix{
dir = 2;
- id = "mixingsparker";
pixel_x = 25
},
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input{
@@ -64341,15 +64316,11 @@
dir = 4
},
/obj/machinery/meter,
-/obj/machinery/button/door{
- id = "mixvent";
- name = "Mixing Room Vent Control";
+/obj/machinery/button/door/incinerator_vent_toxmix{
pixel_x = -25;
- pixel_y = 5;
- req_access_txt = "7"
+ pixel_y = 5
},
-/obj/machinery/button/ignition{
- id = "mixingsparker";
+/obj/machinery/button/ignition/incinerator/toxmix{
pixel_x = -25;
pixel_y = -5
},
@@ -67097,8 +67068,7 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"cLC" = (
-/obj/machinery/button/ignition{
- id = "Incinerator";
+/obj/machinery/button/ignition/incinerator/atmos{
pixel_x = 8;
pixel_y = -36
},
@@ -67109,20 +67079,14 @@
network = list("turbine");
pixel_x = 29
},
-/obj/machinery/button/door{
- id = "turbinevent";
- name = "Turbine Vent Control";
+/obj/machinery/button/door/incinerator_vent_atmos_main{
pixel_x = -8;
- pixel_y = -36;
- req_access_txt = "12"
+ pixel_y = -36
},
/obj/machinery/atmospherics/pipe/simple/general/visible,
-/obj/machinery/button/door{
- id = "auxincineratorvent";
- name = "Auxiliary Vent Control";
+/obj/machinery/button/door/incinerator_vent_atmos_aux{
pixel_x = -8;
- pixel_y = -24;
- req_access_txt = "12"
+ pixel_y = -24
},
/obj/machinery/computer/turbine_computer{
dir = 1;
@@ -71412,6 +71376,10 @@
/obj/structure/easel,
/turf/open/floor/plating,
/area/maintenance/port)
+"dbl" = (
+/obj/structure/easel,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
"dbm" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel,
@@ -76191,14 +76159,6 @@
},
/turf/open/floor/plating,
/area/security/prison)
-"hAJ" = (
-/obj/machinery/airalarm{
- dir = 8;
- pixel_x = 24
- },
-/obj/machinery/cryopod,
-/turf/open/floor/plasteel/floorgrime,
-/area/security/prison)
"ioI" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -76217,7 +76177,7 @@
/obj/machinery/door/window/eastright{
dir = 2;
name = "Research and Development Desk";
- req_access_txt = "7"
+ req_one_access_txt = "7;29"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -76447,10 +76407,6 @@
},
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"mEW" = (
-/obj/machinery/vending/kink,
-/turf/open/floor/plasteel/vault,
-/area/crew_quarters/locker)
"nnK" = (
/obj/item/stack/sheet/glass/fifty,
/obj/item/paper_bin,
@@ -76711,12 +76667,6 @@
},
/turf/open/floor/wood,
/area/library)
-"rhY" = (
-/obj/machinery/vending/kink,
-/turf/open/floor/plating{
- icon_state = "platingdmg2"
- },
-/area/maintenance/port)
"rzX" = (
/obj/structure/chair/office/light{
dir = 1;
@@ -76930,15 +76880,6 @@
},
/turf/open/floor/plasteel,
/area/science/misc_lab)
-"vlg" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green/side,
-/turf/open/floor/plasteel/neutral/corner{
- dir = 2
- },
-/area/crew_quarters/locker)
"vlx" = (
/obj/machinery/vr_sleeper,
/turf/open/floor/plasteel/neutral/corner{
@@ -76994,7 +76935,6 @@
/turf/closed/wall,
/area/science/circuit)
"wOE" = (
-/obj/machinery/droneDispenser,
/turf/open/floor/plating,
/area/maintenance/aft)
"wPk" = (
@@ -77083,79 +77023,6 @@
/obj/machinery/light,
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"AIY" = (
-/obj/machinery/computer/cryopod{
- pixel_y = -24
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/box/white/corners,
-/obj/effect/turf_decal/box/white/corners{
- dir = 8
- },
-/turf/open/floor/plasteel/vault,
-/area/crew_quarters/locker)
-"FiY" = (
-/obj/machinery/vending/kink,
-/turf/open/floor/plating{
- icon_state = "platingdmg3"
- },
-/area/maintenance/starboard/fore)
-"KHe" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green/corner{
- dir = 1
- },
-/turf/open/floor/plasteel/neutral/corner{
- dir = 2
- },
-/area/crew_quarters/locker)
-"RbF" = (
-/obj/machinery/vending/kink,
-/obj/machinery/vending/kink,
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
-"SuJ" = (
-/obj/machinery/cryopod,
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/turf/open/floor/plasteel/vault,
-/area/crew_quarters/locker)
-"WoM" = (
-/obj/machinery/cryopod{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plasteel/vault,
-/area/crew_quarters/locker)
-"Xvm" = (
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = -3;
- pixel_y = 7
- },
-/obj/item/pen,
-/obj/machinery/computer/cryopod{
- pixel_x = 30;
- pixel_y = 6
- },
-/turf/open/floor/plasteel/floorgrime,
-/area/security/prison)
-"XMx" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green/corner,
-/turf/open/floor/plasteel/neutral/corner{
- dir = 2
- },
-/area/crew_quarters/locker)
(1,1,1) = {"
aaa
@@ -95026,7 +94893,7 @@ bHQ
bvW
bLg
bLf
-rhY
+amU
bPL
alK
bOf
@@ -101641,8 +101508,8 @@ aay
abs
abK
ace
-hAJ
-Xvm
+acx
+acM
abe
ady
adT
@@ -110487,7 +110354,7 @@ cGl
cHg
cIh
dAh
-RbF
+dbl
dyc
dxQ
dvY
@@ -110675,8 +110542,8 @@ aOx
aPJ
aQT
aOu
-XMx
-WoM
+aTt
+aUN
aUM
aYc
aTC
@@ -110932,8 +110799,8 @@ aOy
aOt
aQU
aSg
-vlg
-AIY
+aTt
+aUO
aUM
boW
aZt
@@ -111189,8 +111056,8 @@ aOz
aOu
aQV
aOv
-KHe
-SuJ
+aTt
+aUP
aUM
dCD
aZt
@@ -112475,7 +112342,7 @@ aPL
aQZ
aSh
aTA
-mEW
+aUT
aUM
aYh
aCM
@@ -118361,7 +118228,7 @@ aaf
aaf
ack
dni
-FiY
+bcO
dnS
dnS
dnS
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index 783b752b39..437cd5491e 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -1,4 +1,4 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aaa" = (
/turf/open/space/basic,
/area/space)
@@ -7629,7 +7629,6 @@
},
/area/teleporter)
"aoJ" = (
-/obj/machinery/droneDispenser,
/obj/effect/turf_decal/stripes/line{
dir = 10
},
@@ -14629,6 +14628,18 @@
dir = 5
},
/area/crew_quarters/dorms)
+"aEL" = (
+/obj/item/twohanded/required/kirbyplants{
+ icon_state = "plant-21"
+ },
+/obj/machinery/status_display{
+ pixel_y = -32
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel/vault{
+ dir = 5
+ },
+/area/crew_quarters/dorms)
"aEM" = (
/obj/structure/closet/crate/bin,
/obj/effect/turf_decal/bot,
@@ -20523,7 +20534,7 @@
/obj/item/pen,
/obj/machinery/door/window/southleft{
name = "Research Lab Desk";
- req_access_txt = "7"
+ req_one_access_txt = "7;29"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "rndlab1";
@@ -21476,7 +21487,7 @@
/obj/machinery/door/window/southleft{
dir = 4;
name = "Research Lab Desk";
- req_access_txt = "7"
+ req_one_access_txt = "7;29"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "rndlab1";
@@ -35974,16 +35985,6 @@
dir = 5
},
/area/engine/atmos)
-"ZwS" = (
-/obj/machinery/status_display{
- pixel_y = -32
- },
-/obj/effect/turf_decal/bot,
-/obj/machinery/vending/kink,
-/turf/open/floor/plasteel/vault{
- dir = 5
- },
-/area/crew_quarters/dorms)
(1,1,1) = {"
aaa
@@ -72590,7 +72591,7 @@ aAF
aBO
aCN
aDD
-ZwS
+aEL
awQ
aGz
aGM
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 5ba785bd6a..ee6ee533f4 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -1,4 +1,4 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aaa" = (
/turf/open/space/basic,
/area/space)
@@ -3054,6 +3054,10 @@
},
/turf/open/space,
/area/space/nearstation)
+"ajB" = (
+/obj/item/storage/box/mousetraps,
+/turf/open/floor/plating,
+/area/maintenance/department/security/brig)
"ajC" = (
/obj/structure/chair/stool,
/turf/open/floor/plating,
@@ -3448,6 +3452,10 @@
},
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
+"aks" = (
+/obj/machinery/light/small,
+/turf/open/floor/plating,
+/area/maintenance/department/security/brig)
"akt" = (
/obj/structure/bed,
/obj/item/bedsheet,
@@ -10349,6 +10357,14 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
+"aBK" = (
+/obj/structure/table,
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/item/crowbar,
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
"aBL" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -10422,6 +10438,10 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
+"aBT" = (
+/obj/structure/closet/wardrobe/white,
+/turf/open/floor/plasteel/arrival,
+/area/crew_quarters/fitness/recreation)
"aBU" = (
/obj/structure/closet/wardrobe/mixed,
/turf/open/floor/plasteel/arrival,
@@ -12047,6 +12067,14 @@
/obj/machinery/vending/snack,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
+"aFD" = (
+/obj/structure/table,
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/item/taperecorder,
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
"aFE" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -12420,6 +12448,13 @@
/obj/machinery/vending/cigarette,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
+"aGA" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plating,
+/area/storage/emergency/starboard)
"aGB" = (
/obj/machinery/space_heater,
/turf/open/floor/plating,
@@ -21172,10 +21207,6 @@
icon_state = "platingdmg3"
},
/area/maintenance/department/cargo)
-"bdA" = (
-/obj/machinery/droneDispenser,
-/turf/open/floor/plating,
-/area/maintenance/department/cargo)
"bdB" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -25732,7 +25763,7 @@
/obj/machinery/door/window/eastright{
dir = 2;
name = "Research and Development Desk";
- req_access_txt = "7"
+ req_one_access_txt = "7;29"
},
/obj/machinery/door/poddoor/shutters/preopen{
id = "research_shutters_2";
@@ -31482,8 +31513,8 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 1
},
/turf/open/floor/plasteel/white,
/area/science/mixing)
@@ -32064,9 +32095,6 @@
dir = 4
},
/area/science/explab)
-"bFg" = (
-/turf/open/floor/plasteel/white,
-/area/science/mixing)
"bFh" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
@@ -32501,6 +32529,9 @@
/area/science/mixing)
"bGn" = (
/obj/machinery/vending/wardrobe/science_wardrobe,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
/turf/open/floor/plasteel/whitepurple/side,
/area/science/mixing)
"bGo" = (
@@ -32520,6 +32551,9 @@
pixel_y = -2
},
/obj/structure/table/reinforced,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/whitepurple/side,
/area/science/mixing)
"bGp" = (
@@ -32544,6 +32578,9 @@
network = list("ss13","rd")
},
/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/whitepurple/side,
/area/science/mixing)
"bGq" = (
@@ -32561,16 +32598,25 @@
},
/obj/item/assembly/timer,
/obj/structure/table/reinforced,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/whitepurple/side,
/area/science/mixing)
"bGr" = (
/obj/structure/tank_dispenser,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/whitepurple/side,
/area/science/mixing)
"bGs" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
+ },
/turf/open/floor/plasteel/whitepurple/side,
/area/science/mixing)
"bGt" = (
@@ -33023,12 +33069,8 @@
/area/science/mixing)
"bHz" = (
/obj/machinery/atmospherics/components/binary/valve,
-/obj/machinery/button/door{
- id = "toxvent";
- name = "Aft Vent Control";
- pixel_y = -24;
- req_access_txt = "0";
- req_one_access_txt = "8;24"
+/obj/machinery/button/door/incinerator_vent_toxmix{
+ pixel_y = -24
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -33044,14 +33086,9 @@
pixel_x = -6;
pixel_y = -24
},
-/obj/machinery/doorButtons/airlock_controller{
- idExterior = "tox_airlock_exterior";
- idInterior = "tox_airlock_interior";
- idSelf = "tox_access_control";
- name = "Mixing Chamber Access Console";
+/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{
pixel_x = 6;
- pixel_y = -26;
- req_access_txt = "0"
+ pixel_y = -26
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -33068,9 +33105,15 @@
dir = 2;
name = "Incinerator Output Pump"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/science/mixing)
"bHD" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel/purple/side,
/area/science/mixing)
"bHE" = (
@@ -33081,6 +33124,9 @@
/obj/effect/turf_decal/bot{
dir = 2
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
+ },
/turf/open/floor/plasteel/purple/side,
/area/science/mixing)
"bHI" = (
@@ -33115,6 +33161,10 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"bHP" = (
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/floor/plasteel/dark,
+/area/maintenance/department/engine)
"bHQ" = (
/turf/open/floor/plasteel/dark,
/area/maintenance/department/engine)
@@ -33515,15 +33565,7 @@
/area/science/mixing)
"bIL" = (
/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/public/glass{
- autoclose = 0;
- frequency = 1449;
- heat_proof = 1;
- id_tag = "tox_airlock_interior";
- name = "Interior Airlock";
- req_access_txt = "8";
- req_one_access_txt = "0"
- },
+/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/engine,
/area/science/mixing)
@@ -33954,36 +33996,33 @@
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 2
},
-/obj/machinery/doorButtons/access_button{
- idDoor = "tox_airlock_exterior";
- idSelf = "tox_access_control";
- layer = 3.1;
- name = "airlock control";
- pixel_x = 8;
- pixel_y = -24
- },
/obj/machinery/light/small{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/airlock_sensor/incinerator_toxmix{
+ pixel_x = -24
+ },
/turf/open/floor/engine,
/area/science/mixing)
"bJR" = (
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{
+ dir = 8
+ },
/turf/open/floor/engine,
/area/science/mixing)
"bJS" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 1
},
-/obj/machinery/doorButtons/access_button{
- idDoor = "tox_airlock_interior";
- idSelf = "tox_access_control";
- name = "airlock control";
- pixel_x = -8;
- pixel_y = 24
- },
/obj/machinery/light/small{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/engine,
/area/science/mixing)
"bJT" = (
@@ -34467,15 +34506,7 @@
/area/engine/atmos)
"bLf" = (
/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/public/glass{
- autoclose = 0;
- frequency = 1449;
- heat_proof = 1;
- id_tag = "tox_airlock_exterior";
- name = "Exterior Airlock";
- req_access_txt = "8";
- req_one_access_txt = "0"
- },
+/obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
@@ -35680,10 +35711,7 @@
/turf/closed/wall/r_wall,
/area/science/mixing)
"bOt" = (
-/obj/machinery/door/poddoor{
- id = "toxvent";
- name = "Aft Vent"
- },
+/obj/machinery/door/poddoor/incinerator_toxmix,
/turf/open/floor/engine/vacuum,
/area/science/mixing)
"bOu" = (
@@ -40308,19 +40336,13 @@
dir = 8;
id = "incineratorturbine"
},
-/obj/machinery/button/door{
- id = "turbinevent";
- name = "Outtake Vent Control";
+/obj/machinery/button/door/incinerator_vent_atmos_main{
pixel_x = 24;
- pixel_y = 6;
- req_one_access_txt = "8;24"
+ pixel_y = 6
},
-/obj/machinery/button/door{
- id = "mixvent";
- name = "Intake Vent Control";
+/obj/machinery/button/door/incinerator_vent_atmos_aux{
pixel_x = 24;
- pixel_y = -6;
- req_one_access_txt = "8;24"
+ pixel_y = -6
},
/turf/open/floor/plasteel/darkyellow/side{
dir = 4
@@ -40340,6 +40362,9 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/airlock_sensor/incinerator_atmos{
+ pixel_y = 22
+ },
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
"bZT" = (
@@ -40607,24 +40632,10 @@
icon_state = "4-8"
},
/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/public/glass{
- autoclose = 0;
- frequency = 1449;
- heat_proof = 1;
- id_tag = "incinerator_airlock_interior";
- name = "Turbine Interior Airlock";
- req_access_txt = "24"
- },
-/obj/machinery/embedded_controller/radio/airlock_controller{
- airpump_tag = "incinerator_airlock_pump";
- exterior_door_tag = "incinerator_airlock_exterior";
- id_tag = "incinerator_airlock_control";
- interior_door_tag = "incinerator_airlock_interior";
- name = "Incinerator Access Console";
+/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior,
+/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{
pixel_x = -6;
- pixel_y = -26;
- sanitize_external = 1;
- sensor_tag = "incinerator_airlock_sensor"
+ pixel_y = -26
},
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
@@ -40632,10 +40643,8 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume{
- dir = 2;
- frequency = 1449;
- id = "incinerator_airlock_pump"
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{
+ dir = 2
},
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
@@ -40644,23 +40653,14 @@
icon_state = "4-8"
},
/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/public/glass{
- autoclose = 0;
- frequency = 1449;
- heat_proof = 1;
- id_tag = "incinerator_airlock_exterior";
- name = "Turbine Exterior Airlock";
- req_access_txt = "24"
- },
+/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior,
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
"caO" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/igniter{
- id = "Incinerator"
- },
+/obj/machinery/igniter/incinerator_atmos,
/obj/machinery/air_sensor/atmos/incinerator_tank{
pixel_x = 32;
pixel_y = -32
@@ -40697,10 +40697,7 @@
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
"caR" = (
-/obj/machinery/door/poddoor{
- id = "turbinevent";
- name = "Outtake Vent"
- },
+/obj/machinery/door/poddoor/incinerator_atmos_main,
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"caS" = (
@@ -40920,8 +40917,7 @@
/turf/open/floor/plasteel/dark,
/area/maintenance/disposal/incinerator)
"cbC" = (
-/obj/machinery/button/ignition{
- id = "Incinerator";
+/obj/machinery/button/ignition/incinerator/atmos{
pixel_x = 26;
pixel_y = -6
},
@@ -40945,12 +40941,6 @@
},
/obj/machinery/light/small,
/obj/machinery/atmospherics/pipe/simple/general/hidden,
-/obj/machinery/airlock_sensor{
- id_tag = "incinerator_airlock_sensor";
- master_tag = "incinerator_airlock_control";
- pixel_x = -26;
- pixel_y = 8
- },
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
"cbF" = (
@@ -41194,10 +41184,7 @@
},
/area/maintenance/disposal/incinerator)
"ccs" = (
-/obj/machinery/door/poddoor{
- id = "mixvent";
- name = "Intake Vent"
- },
+/obj/machinery/door/poddoor/incinerator_atmos_aux,
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"ccu" = (
@@ -43077,6 +43064,19 @@
},
/turf/open/floor/plasteel/dark,
/area/chapel/main/monastery)
+"cjO" = (
+/obj/effect/decal/cleanable/cobweb{
+ icon_state = "cobweb2"
+ },
+/obj/item/stack/sheet/glass/fifty{
+ layer = 4
+ },
+/obj/item/stack/sheet/metal{
+ amount = 20;
+ layer = 3.1
+ },
+/turf/open/floor/plating,
+/area/maintenance/department/chapel/monastery)
"cjP" = (
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-22"
@@ -48013,16 +48013,6 @@
},
/turf/open/floor/plating,
/area/engine/engineering)
-"eWf" = (
-/obj/machinery/light{
- dir = 4
- },
-/obj/machinery/cryopod,
-/obj/machinery/computer/cryopod{
- pixel_y = 24
- },
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
"eWi" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plasteel/dark,
@@ -49728,6 +49718,12 @@
icon_state = "platingdmg3"
},
/area/maintenance/department/engine)
+"kfh" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
+ },
+/turf/closed/wall/r_wall,
+/area/science/mixing)
"kfM" = (
/obj/structure/closet,
/obj/machinery/light/small{
@@ -49792,6 +49788,10 @@
/obj/item/clothing/under/rank/clown/sexy,
/turf/open/floor/plasteel/dark,
/area/maintenance/department/crew_quarters/dorms)
+"kmn" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/white,
+/area/science/mixing)
"knw" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -49834,9 +49834,6 @@
dir = 9
},
/area/chapel/office)
-"kwI" = (
-/turf/open/floor/plasteel,
-/area/science/mixing)
"kxj" = (
/obj/structure/chair/office/dark{
dir = 1
@@ -50731,6 +50728,12 @@
/obj/item/stack/spacecash/c10,
/turf/open/floor/plasteel/dark,
/area/maintenance/department/crew_quarters/dorms)
+"noM" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/science/mixing)
"npE" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
@@ -50768,6 +50771,12 @@
},
/turf/open/floor/plasteel,
/area/construction/mining/aux_base)
+"nsD" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
+/turf/closed/wall/r_wall,
+/area/science/mixing)
"ntj" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -50990,11 +50999,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/wood,
/area/lawoffice)
-"nSH" = (
-/obj/effect/decal/cleanable/cobweb,
-/obj/machinery/vending/kink,
-/turf/open/floor/plasteel/dark,
-/area/maintenance/department/engine)
"nVU" = (
/obj/item/twohanded/spear,
/turf/open/floor/plating,
@@ -51956,15 +51960,6 @@
},
/turf/open/floor/plating,
/area/crew_quarters/heads/chief)
-"qHi" = (
-/obj/structure/table,
-/obj/machinery/light{
- dir = 4
- },
-/obj/item/crowbar,
-/obj/item/taperecorder,
-/turf/open/floor/plasteel,
-/area/hallway/primary/central)
"qHI" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -52406,6 +52401,10 @@
},
/turf/open/floor/plating/airless,
/area/engine/engineering)
+"rPW" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/closed/wall/r_wall,
+/area/science/mixing)
"rSH" = (
/obj/item/trash/can,
/turf/open/floor/wood,
@@ -53019,6 +53018,10 @@
},
/turf/open/floor/plating/airless,
/area/engine/engineering)
+"ubW" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall/r_wall,
+/area/science/mixing)
"uek" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance{
@@ -54301,6 +54304,12 @@
},
/turf/open/floor/plasteel/dark/telecomms,
/area/tcommsat/server)
+"xIx" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
+/turf/closed/wall/r_wall,
+/area/science/mixing)
"xJy" = (
/obj/structure/chair/comfy/black,
/obj/structure/sign/plaques/atmos{
@@ -54451,65 +54460,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
-"yzM" = (
-/obj/machinery/light/small,
-/obj/item/storage/box/mousetraps,
-/turf/open/floor/plating,
-/area/maintenance/department/security/brig)
-"Drm" = (
-/obj/effect/turf_decal/stripes/corner,
-/turf/open/floor/plasteel/green/corner,
-/area/hallway/primary/central)
-"EjC" = (
-/obj/machinery/cryopod,
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"JAb" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/taperecorder,
-/turf/open/floor/plating,
-/area/storage/emergency/starboard)
-"KhG" = (
-/obj/machinery/vending/kink,
-/turf/open/floor/plating,
-/area/maintenance/department/security/brig)
-"QYc" = (
-/obj/machinery/vending/kink,
-/obj/effect/decal/cleanable/cobweb{
- icon_state = "cobweb2"
- },
-/turf/open/floor/plating,
-/area/maintenance/department/chapel/monastery)
-"RST" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/plasteel/green/side{
- dir = 4
- },
-/area/hallway/primary/central)
-"Xmf" = (
-/obj/item/stack/sheet/metal{
- amount = 20;
- layer = 3.1
- },
-/obj/item/stack/sheet/glass/fifty{
- layer = 4
- },
-/turf/open/floor/plating,
-/area/maintenance/department/chapel/monastery)
-"YSB" = (
-/obj/machinery/vending/kink,
-/turf/closed/wall,
-/area/storage/emergency/starboard)
-"Zud" = (
-/obj/machinery/vending/kink,
-/obj/machinery/vending/kink,
-/turf/open/floor/plasteel/arrival,
-/area/crew_quarters/fitness/recreation)
(1,1,1) = {"
aaa
@@ -70774,7 +70724,7 @@ aaa
aaa
ait
aiV
-KhG
+ajB
akr
aiu
ait
@@ -71148,7 +71098,7 @@ cvw
cvI
ckQ
clf
-Xmf
+cwA
cwA
cwS
cjm
@@ -71289,7 +71239,7 @@ aaa
aiu
aiX
ajD
-yzM
+aks
aiu
ait
ait
@@ -71404,7 +71354,7 @@ cgG
cfn
ciR
cwa
-QYc
+cjO
ckk
ckC
ckR
@@ -75730,7 +75680,7 @@ bDg
bEj
bFF
bva
-nSH
+bHP
bJb
bJb
bJb
@@ -90582,12 +90532,12 @@ awd
abI
awd
aAM
-qHi
+aBK
aDa
aEb
-Drm
-RST
-RST
+aAM
+aFD
+aDa
aAN
aIf
aJe
@@ -90843,8 +90793,8 @@ awd
awd
aAN
aAN
-eWf
-EjC
+awd
+awd
aAN
aIg
aJf
@@ -91099,10 +91049,10 @@ aaa
aaa
aaa
aaa
-aAN
-aAN
-aAN
-aAN
+aaa
+aaa
+aaa
+awd
aHN
aIU
aJI
@@ -91380,7 +91330,7 @@ aPY
bau
aLf
aFi
-bdA
+aFi
beI
beI
bgD
@@ -92386,7 +92336,7 @@ aDd
apX
aEU
aFE
-JAb
+aGA
aHn
aIi
aJi
@@ -92900,7 +92850,7 @@ com
apX
aET
lKL
-YSB
+aET
aET
aHN
aIU
@@ -95002,7 +94952,7 @@ bAF
bBK
bCW
bDV
-bFg
+bFh
bGm
bHy
aaa
@@ -95208,7 +95158,7 @@ axw
ayu
azC
axw
-Zud
+aBT
atn
aEf
aFc
@@ -95259,7 +95209,7 @@ bAF
bBL
bCW
bDW
-bFh
+kmn
bGn
bHy
aaa
@@ -96546,9 +96496,9 @@ bDa
bEa
bFm
bGs
-bHy
-bHy
-bHy
+ubW
+ubW
+xIx
bHy
bHy
bHy
@@ -97574,9 +97524,9 @@ bHy
bHy
bHy
bGw
-bHy
-bHy
-bHy
+nsD
+rPW
+kfh
bHy
bHy
bHy
@@ -97831,7 +97781,7 @@ bwm
glf
bFr
qtA
-kwI
+khk
bIN
dAF
bCV
@@ -98601,7 +98551,7 @@ nev
hgD
bEf
bFu
-khk
+noM
bHE
bJV
bLh
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 0f9857ad73..9a03ede62b 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -2162,6 +2162,9 @@
/obj/structure/kitchenspike,
/turf/open/floor/plasteel/dark,
/area/ctf)
+"gu" = (
+/turf/closed/indestructible/splashscreen,
+/area/start)
"gv" = (
/turf/open/floor/plasteel/darkblue/side{
dir = 10
@@ -5699,6 +5702,10 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/centcom/holding)
+"pW" = (
+/obj/effect/landmark/ai_multicam_room,
+/turf/open/ai_visible,
+/area/ai_multicam_room)
"pX" = (
/obj/item/storage/crayons,
/obj/structure/table,
@@ -10234,6 +10241,9 @@
dir = 8
},
/area/centcom/evac)
+"Di" = (
+/turf/closed/indestructible/riveted,
+/area/ai_multicam_room)
"Dj" = (
/obj/machinery/vr_sleeper{
dir = 8
@@ -13476,9 +13486,6 @@
},
/turf/open/floor/wood,
/area/centcom/holding)
-"NE" = (
-/turf/closed/indestructible/splashscreen,
-/area/space)
"NF" = (
/obj/structure/ladder/unbreakable/binary,
/turf/open/indestructible/airblock,
@@ -13624,6 +13631,9 @@
"PY" = (
/turf/open/floor/plasteel/whitegreen,
/area/centcom/holding)
+"Qe" = (
+/turf/open/ai_visible,
+/area/ai_multicam_room)
"Qk" = (
/obj/structure/flora/ausbushes/fullgrass,
/obj/structure/flora/ausbushes/ppflowers,
@@ -13946,9 +13956,6 @@
},
/turf/open/floor/plasteel,
/area/centcom/evac)
-"Wd" = (
-/turf/open/space/basic,
-/area/start)
"WJ" = (
/obj/machinery/door/airlock/centcom{
name = "Thunderdome Administration";
@@ -14257,21 +14264,21 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-NE
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+gu
aa
aa
aa
@@ -14514,21 +14521,21 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+fX
aa
aa
aa
@@ -14771,21 +14778,21 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+fX
+fX
aa
aa
aa
@@ -15042,7 +15049,7 @@ fX
fX
fX
fX
-Wd
+fX
aa
aa
aa
@@ -16063,7 +16070,7 @@ fX
fX
fX
fX
-fX
+fY
fX
fX
fX
@@ -16834,7 +16841,7 @@ fX
fX
fX
fX
-fY
+fX
fX
fX
fX
@@ -18112,21 +18119,21 @@ aa
aa
aa
aa
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -18369,21 +18376,21 @@ aa
aa
aa
aa
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -18626,21 +18633,21 @@ aa
aa
aa
aa
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -18883,21 +18890,21 @@ aa
aa
aa
aa
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -19140,21 +19147,21 @@ aa
aa
aa
aa
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -19397,21 +19404,21 @@ aa
aa
aa
aa
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
-fX
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -30581,29 +30588,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
aa
aa
aa
@@ -30838,29 +30845,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Di
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Di
aa
aa
aa
@@ -31095,29 +31102,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Di
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Di
aa
aa
aa
@@ -31352,29 +31359,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Di
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Di
aa
aa
aa
@@ -31609,29 +31616,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Di
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Di
aa
aa
aa
@@ -31866,29 +31873,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Di
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Di
aa
aa
aa
@@ -32123,29 +32130,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Di
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Di
aa
aa
aa
@@ -32380,29 +32387,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Di
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Di
aa
aa
aa
@@ -32637,29 +32644,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Di
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Di
aa
aa
aa
@@ -32894,29 +32901,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Di
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Di
aa
aa
aa
@@ -33151,29 +33158,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Di
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Di
aa
aa
aa
@@ -33408,29 +33415,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Di
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+pW
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Di
aa
aa
aa
@@ -33665,29 +33672,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Di
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Di
aa
aa
aa
@@ -33922,29 +33929,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Di
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Di
aa
aa
aa
@@ -34179,29 +34186,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Di
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Di
aa
aa
aa
@@ -34436,29 +34443,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Di
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Di
aa
aa
aa
@@ -34693,29 +34700,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Di
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Di
aa
aa
aa
@@ -34950,29 +34957,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Di
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Di
aa
aa
aa
@@ -35207,29 +35214,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Di
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Di
aa
aa
aa
@@ -35464,29 +35471,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Di
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Di
aa
aa
aa
@@ -35721,29 +35728,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Di
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Di
aa
aa
aa
@@ -35978,29 +35985,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Di
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Qe
+Di
aa
aa
aa
@@ -36235,29 +36242,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
+Di
aa
aa
aa
diff --git a/_maps/shuttles/aux_base_default.dmm b/_maps/shuttles/aux_base_default.dmm
index d35420ebb0..e093d3c864 100644
--- a/_maps/shuttles/aux_base_default.dmm
+++ b/_maps/shuttles/aux_base_default.dmm
@@ -1,4 +1,4 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"b" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -44,10 +44,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/shuttle/auxillary_base)
-"y" = (
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plating,
-/area/shuttle/auxillary_base)
"z" = (
/obj/machinery/light{
dir = 8
@@ -82,7 +78,6 @@
/area/shuttle/auxillary_base)
"X" = (
/obj/machinery/camera{
- c_tag = "Auxillary Mining Base";
dir = 1
},
/obj/structure/mining_shuttle_beacon,
@@ -142,7 +137,7 @@ P
k
k
k
-y
+x
"}
(6,1,1) = {"
v
diff --git a/_maps/shuttles/aux_base_small.dmm b/_maps/shuttles/aux_base_small.dmm
index 95f54f8b96..b29512d675 100644
--- a/_maps/shuttles/aux_base_small.dmm
+++ b/_maps/shuttles/aux_base_small.dmm
@@ -35,7 +35,6 @@
/area/shuttle/auxillary_base)
"h" = (
/obj/machinery/camera{
- c_tag = "Auxillary Mining Base";
dir = 1
},
/obj/structure/mining_shuttle_beacon,
@@ -147,4 +146,4 @@ g
g
g
n
-"}
+"}
\ No newline at end of file
diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm
index 5d21fad7f8..0b1a7c5c6a 100644
--- a/_maps/shuttles/infiltrator_basic.dmm
+++ b/_maps/shuttles/infiltrator_basic.dmm
@@ -411,12 +411,12 @@
/area/shuttle/syndicate/airlock)
"bi" = (
/obj/structure/rack,
-/obj/item/clothing/suit/space/syndicate/black/red,
-/obj/item/clothing/head/helmet/space/syndicate/black/red,
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/stripes/line{
dir = 10
},
+/obj/item/clothing/suit/space/syndicate,
+/obj/item/clothing/head/helmet/space/syndicate,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/syndicate/airlock)
"bj" = (
diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm
index 94a247171c..2a8f455e64 100644
--- a/code/__DEFINES/admin.dm
+++ b/code/__DEFINES/admin.dm
@@ -67,6 +67,7 @@
#define ADMIN_PUNISHMENT_BSA "Bluespace Artillery Device"
#define ADMIN_PUNISHMENT_FIREBALL "Fireball"
#define ADMIN_PUNISHMENT_ROD "Immovable Rod"
+#define ADMIN_PUNISHMENT_SUPPLYPOD "Supply Pod"
#define AHELP_ACTIVE 1
#define AHELP_CLOSED 2
diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm
index c6c35ef08b..f6f903ec8f 100644
--- a/code/__DEFINES/atmospherics.dm
+++ b/code/__DEFINES/atmospherics.dm
@@ -194,6 +194,37 @@
#define ATMOS_GAS_MONITOR_WASTE_ENGINE "engine-waste_out"
#define ATMOS_GAS_MONITOR_WASTE_ATMOS "atmos-waste_out"
+//AIRLOCK CONTROLLER TAGS
+
+//RnD toxins burn chamber
+#define INCINERATOR_TOXMIX_IGNITER "toxmix_igniter"
+#define INCINERATOR_TOXMIX_VENT "toxmix_vent"
+#define INCINERATOR_TOXMIX_DP_VENTPUMP "toxmix_airlock_pump"
+#define INCINERATOR_TOXMIX_AIRLOCK_SENSOR "toxmix_airlock_sensor"
+#define INCINERATOR_TOXMIX_AIRLOCK_CONTROLLER "toxmix_airlock_controller"
+#define INCINERATOR_TOXMIX_AIRLOCK_INTERIOR "toxmix_airlock_interior"
+#define INCINERATOR_TOXMIX_AIRLOCK_EXTERIOR "toxmix_airlock_exterior"
+
+//Atmospherics/maintenance incinerator
+#define INCINERATOR_ATMOS_IGNITER "atmos_incinerator_igniter"
+#define INCINERATOR_ATMOS_MAINVENT "atmos_incinerator_mainvent"
+#define INCINERATOR_ATMOS_AUXVENT "atmos_incinerator_auxvent"
+#define INCINERATOR_ATMOS_DP_VENTPUMP "atmos_incinerator_airlock_pump"
+#define INCINERATOR_ATMOS_AIRLOCK_SENSOR "atmos_incinerator_airlock_sensor"
+#define INCINERATOR_ATMOS_AIRLOCK_CONTROLLER "atmos_incinerator_airlock_controller"
+#define INCINERATOR_ATMOS_AIRLOCK_INTERIOR "atmos_incinerator_airlock_interior"
+#define INCINERATOR_ATMOS_AIRLOCK_EXTERIOR "atmos_incinerator_airlock_exterior"
+
+//Syndicate lavaland base incinerator (lavaland_surface_syndicate_base1.dmm)
+#define INCINERATOR_SYNDICATELAVA_IGNITER "syndicatelava_igniter"
+#define INCINERATOR_SYNDICATELAVA_MAINVENT "syndicatelava_mainvent"
+#define INCINERATOR_SYNDICATELAVA_AUXVENT "syndicatelava_auxvent"
+#define INCINERATOR_SYNDICATELAVA_DP_VENTPUMP "syndicatelava_airlock_pump"
+#define INCINERATOR_SYNDICATELAVA_AIRLOCK_SENSOR "syndicatelava_airlock_sensor"
+#define INCINERATOR_SYNDICATELAVA_AIRLOCK_CONTROLLER "syndicatelava_airlock_controller"
+#define INCINERATOR_SYNDICATELAVA_AIRLOCK_INTERIOR "syndicatelava_airlock_interior"
+#define INCINERATOR_SYNDICATELAVA_AIRLOCK_EXTERIOR "syndicatelava_airlock_exterior"
+
//MULTIPIPES
//IF YOU EVER CHANGE THESE CHANGE SPRITES TO MATCH.
#define PIPING_LAYER_MIN 1
diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index a31ebccbad..43c706e58e 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -254,6 +254,8 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
#define ORBITRON "Orbitron"
#define SHARE "Share Tech Mono"
+GLOBAL_LIST_INIT(pda_styles, list(MONO, VT, ORBITRON, SHARE))
+
//Color Defines
#define OOC_COLOR "#002eb8"
diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm
index 9ef689de8b..e15d4f035c 100644
--- a/code/_onclick/ai.dm
+++ b/code/_onclick/ai.dm
@@ -26,6 +26,14 @@
return
next_click = world.time + 1
+ if(multicam_on)
+ var/turf/T = get_turf(A)
+ if(T)
+ for(var/obj/screen/movable/pic_in_pic/ai/P in T.vis_locs)
+ if(P.ai == src)
+ P.Click(params)
+ break
+
if(check_click_intercept(params,A))
return
diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm
index 3225252520..b558e7c87c 100644
--- a/code/_onclick/hud/_defines.dm
+++ b/code/_onclick/hud/_defines.dm
@@ -134,6 +134,8 @@
#define ui_ai_take_picture "SOUTH:6,WEST+12"
#define ui_ai_view_images "SOUTH:6,WEST+13"
#define ui_ai_sensor "SOUTH:6,WEST+14"
+#define ui_ai_multicam "SOUTH+1:6,WEST+13"
+#define ui_ai_add_multicam "SOUTH+1:6,WEST+14"
//Pop-up inventory
#define ui_shoes "WEST+1:8,SOUTH:5"
diff --git a/code/_onclick/hud/ai.dm b/code/_onclick/hud/ai.dm
index 8d4aca5fbf..463051c6b4 100644
--- a/code/_onclick/hud/ai.dm
+++ b/code/_onclick/hud/ai.dm
@@ -164,6 +164,26 @@
var/mob/living/silicon/S = usr
S.toggle_sensors()
+/obj/screen/ai/multicam
+ name = "Multicamera Mode"
+ icon_state = "multicam"
+
+/obj/screen/ai/multicam/Click()
+ if(..())
+ return
+ var/mob/living/silicon/ai/AI = usr
+ AI.toggle_multicam()
+
+/obj/screen/ai/add_multicam
+ name = "New Camera"
+ icon_state = "new_cam"
+
+/obj/screen/ai/add_multicam/Click()
+ if(..())
+ return
+ var/mob/living/silicon/ai/AI = usr
+ AI.drop_new_multicam()
+
/datum/hud/ai
ui_style_icon = 'icons/mob/screen_ai.dmi'
@@ -247,12 +267,20 @@
using.screen_loc = ui_ai_view_images
static_inventory += using
-
//Medical/Security sensors
using = new /obj/screen/ai/sensors()
using.screen_loc = ui_ai_sensor
static_inventory += using
+//Multicamera mode
+ using = new /obj/screen/ai/multicam()
+ using.screen_loc = ui_ai_multicam
+ static_inventory += using
+
+//Add multicamera camera
+ using = new /obj/screen/ai/add_multicam()
+ using.screen_loc = ui_ai_add_multicam
+ static_inventory += using
/mob/living/silicon/ai/create_mob_hud()
if(client && !hud_used)
diff --git a/code/_onclick/hud/movable_screen_objects.dm b/code/_onclick/hud/movable_screen_objects.dm
index 4da721012d..f71ced7a9d 100644
--- a/code/_onclick/hud/movable_screen_objects.dm
+++ b/code/_onclick/hud/movable_screen_objects.dm
@@ -12,6 +12,8 @@
var/snap2grid = FALSE
var/moved = FALSE
var/locked = FALSE
+ var/x_off = -16
+ var/y_off = -16
//Snap Screen Object
//Tied to the grid, snaps to the nearest turf
@@ -42,8 +44,8 @@
screen_loc = "[screen_loc_X[1]],[screen_loc_Y[1]]"
else //Normalise Pixel Values (So the object drops at the center of the mouse, not 16 pixels off)
- var/pix_X = text2num(screen_loc_X[2]) - 16
- var/pix_Y = text2num(screen_loc_Y[2]) - 16
+ var/pix_X = text2num(screen_loc_X[2]) + x_off
+ var/pix_Y = text2num(screen_loc_Y[2]) + y_off
screen_loc = "[screen_loc_X[1]]:[pix_X],[screen_loc_Y[1]]:[pix_Y]"
moved = screen_loc
diff --git a/code/_onclick/hud/picture_in_picture.dm b/code/_onclick/hud/picture_in_picture.dm
new file mode 100644
index 0000000000..ce5f2c9884
--- /dev/null
+++ b/code/_onclick/hud/picture_in_picture.dm
@@ -0,0 +1,144 @@
+/obj/screen/movable/pic_in_pic
+ name = "Picture-in-picture"
+ screen_loc = "CENTER"
+ plane = GAME_PLANE
+ var/atom/center
+ var/width = 0
+ var/height = 0
+ var/list/shown_to = list()
+ var/list/viewing_turfs = list()
+ var/obj/screen/component_button/button_x
+ var/obj/screen/component_button/button_expand
+ var/obj/screen/component_button/button_shrink
+
+ var/mutable_appearance/standard_background
+ var/const/max_dimensions = 10
+
+/obj/screen/movable/pic_in_pic/Initialize()
+ . = ..()
+ make_backgrounds()
+
+/obj/screen/movable/pic_in_pic/Destroy()
+ for(var/C in shown_to)
+ unshow_to(C)
+ QDEL_NULL(button_x)
+ QDEL_NULL(button_shrink)
+ QDEL_NULL(button_expand)
+ return ..()
+
+/obj/screen/movable/pic_in_pic/component_click(obj/screen/component_button/component, params)
+ if(component == button_x)
+ qdel(src)
+ else if(component == button_expand)
+ set_view_size(width+1, height+1)
+ else if(component == button_shrink)
+ set_view_size(width-1, height-1)
+
+/obj/screen/movable/pic_in_pic/proc/make_backgrounds()
+ standard_background = new /mutable_appearance()
+ standard_background.icon = 'icons/misc/pic_in_pic.dmi'
+ standard_background.icon_state = "background"
+ standard_background.layer = SPACE_LAYER
+
+/obj/screen/movable/pic_in_pic/proc/add_buttons()
+ var/static/mutable_appearance/move_tab
+ if(!move_tab)
+ move_tab = new /mutable_appearance()
+ //all these properties are always the same, and since adding something to the overlay
+ //list makes a copy, there is no reason to make a new one each call
+ move_tab.icon = 'icons/misc/pic_in_pic.dmi'
+ move_tab.icon_state = "move"
+ move_tab.plane = HUD_PLANE
+ var/matrix/M = matrix()
+ M.Translate(0, (height + 0.25) * world.icon_size)
+ move_tab.transform = M
+ add_overlay(move_tab)
+
+ if(!button_x)
+ button_x = new /obj/screen/component_button(null, src)
+ var/mutable_appearance/MA = new /mutable_appearance()
+ MA.name = "close"
+ MA.icon = 'icons/misc/pic_in_pic.dmi'
+ MA.icon_state = "x"
+ MA.plane = HUD_PLANE
+ button_x.appearance = MA
+ M = matrix()
+ M.Translate((max(4, width) - 0.75) * world.icon_size, (height + 0.25) * world.icon_size)
+ button_x.transform = M
+ vis_contents += button_x
+
+ if(!button_expand)
+ button_expand = new /obj/screen/component_button(null, src)
+ var/mutable_appearance/MA = new /mutable_appearance()
+ MA.name = "expand"
+ MA.icon = 'icons/misc/pic_in_pic.dmi'
+ MA.icon_state = "expand"
+ MA.plane = HUD_PLANE
+ button_expand.appearance = MA
+ M = matrix()
+ M.Translate(world.icon_size, (height + 0.25) * world.icon_size)
+ button_expand.transform = M
+ vis_contents += button_expand
+
+ if(!button_shrink)
+ button_shrink = new /obj/screen/component_button(null, src)
+ var/mutable_appearance/MA = new /mutable_appearance()
+ MA.name = "shrink"
+ MA.icon = 'icons/misc/pic_in_pic.dmi'
+ MA.icon_state = "shrink"
+ MA.plane = HUD_PLANE
+ button_shrink.appearance = MA
+ M = matrix()
+ M.Translate(2 * world.icon_size, (height + 0.25) * world.icon_size)
+ button_shrink.transform = M
+ vis_contents += button_shrink
+
+/obj/screen/movable/pic_in_pic/proc/add_background()
+ if((width > 0) && (height > 0))
+ var/matrix/M = matrix()
+ M.Scale(width + 0.5, height + 0.5)
+ M.Translate((width-1)/2 * world.icon_size, (height-1)/2 * world.icon_size)
+ standard_background.transform = M
+ add_overlay(standard_background)
+
+/obj/screen/movable/pic_in_pic/proc/set_view_size(width, height, do_refresh = TRUE)
+ width = CLAMP(width, 0, max_dimensions)
+ height = CLAMP(height, 0, max_dimensions)
+ src.width = width
+ src.height = height
+
+ y_off = -height * world.icon_size - 16
+
+ cut_overlays()
+ add_background()
+ add_buttons()
+ if(do_refresh)
+ refresh_view()
+
+/obj/screen/movable/pic_in_pic/proc/set_view_center(atom/target, do_refresh = TRUE)
+ center = target
+ if(do_refresh)
+ refresh_view()
+
+/obj/screen/movable/pic_in_pic/proc/refresh_view()
+ vis_contents -= viewing_turfs
+ if(!width || !height)
+ return
+ var/turf/T = get_turf(center)
+ if(!T)
+ return
+ var/turf/lowerleft = locate(max(1, T.x - round(width/2)), max(1, T.y - round(height/2)), T.z)
+ var/turf/upperright = locate(min(world.maxx, lowerleft.x + width - 1), min(world.maxy, lowerleft.y + height - 1), lowerleft.z)
+ viewing_turfs = block(lowerleft, upperright)
+ vis_contents += viewing_turfs
+
+
+/obj/screen/movable/pic_in_pic/proc/show_to(client/C)
+ if(C)
+ shown_to[C] = 1
+ C.screen += src
+
+/obj/screen/movable/pic_in_pic/proc/unshow_to(client/C)
+ if(C)
+ shown_to -= C
+ C.screen -= src
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 02ece81b41..d2ac10a83f 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -30,6 +30,9 @@
/obj/screen/orbit()
return
+/obj/screen/proc/component_click(obj/screen/component_button/component, params)
+ return
+
/obj/screen/text
icon = null
icon_state = null
@@ -604,3 +607,15 @@
holder.screen -= src
holder = null
return ..()
+
+
+/obj/screen/component_button
+ var/obj/screen/parent
+
+/obj/screen/component_button/Initialize(mapload, obj/screen/parent)
+ . = ..()
+ src.parent = parent
+
+/obj/screen/component_button/Click(params)
+ if(parent)
+ parent.component_click(src, params)
diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index 3de0ebe439..ebf27324b9 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -288,6 +288,11 @@
/datum/config_entry/flag/shift_time_realtime
+/datum/config_entry/keyed_number_list/antag_rep
+
+/datum/config_entry/number/monkeycap
+ config_entry_value = 64
+ min_val = 0
//Cit changes - Adds config options for crew objectives and miscreants
/datum/config_entry/flag/allow_crew_objectives
@@ -304,4 +309,4 @@
/datum/config_entry/number/nightshift_finish
config_entry_value = 6
-//End of Cit changes
\ No newline at end of file
+//End of Cit changes
diff --git a/code/controllers/subsystem/icon_smooth.dm b/code/controllers/subsystem/icon_smooth.dm
index d0ad2ffbc3..1c8d94826d 100644
--- a/code/controllers/subsystem/icon_smooth.dm
+++ b/code/controllers/subsystem/icon_smooth.dm
@@ -6,16 +6,26 @@ SUBSYSTEM_DEF(icon_smooth)
flags = SS_TICKER
var/list/smooth_queue = list()
+ var/list/deferred = list()
/datum/controller/subsystem/icon_smooth/fire()
- while(smooth_queue.len)
- var/atom/A = smooth_queue[smooth_queue.len]
- smooth_queue.len--
- smooth_icon(A)
+ var/list/cached = smooth_queue
+ while(cached.len)
+ var/atom/A = cached[cached.len]
+ cached.len--
+ if (A.flags_1 & INITIALIZED_1)
+ smooth_icon(A)
+ else
+ deferred += A
if (MC_TICK_CHECK)
return
- if (!smooth_queue.len)
- can_fire = 0
+
+ if (!cached.len)
+ if (deferred.len)
+ smooth_queue = deferred
+ deferred = cached
+ else
+ can_fire = 0
/datum/controller/subsystem/icon_smooth/Initialize()
smooth_zlevel(1,TRUE)
diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
index c19345f328..f72b7d1d6a 100644
--- a/code/controllers/subsystem/job.dm
+++ b/code/controllers/subsystem/job.dm
@@ -422,7 +422,7 @@ SUBSYSTEM_DEF(job)
else
M = H
- SSpersistence.antag_rep_change[M.client.ckey] += job.antag_rep
+ SSpersistence.antag_rep_change[M.client.ckey] += job.GetAntagRep()
to_chat(M, "You are the [rank].")
if(job)
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 9b6944403a..2d99012881 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -121,7 +121,7 @@ SUBSYSTEM_DEF(mapping)
z_list = SSmapping.z_list
#define INIT_ANNOUNCE(X) to_chat(world, "[X]"); log_world(X)
-/datum/controller/subsystem/mapping/proc/LoadGroup(list/errorList, name, path, files, list/traits, list/default_traits)
+/datum/controller/subsystem/mapping/proc/LoadGroup(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE)
var/start_time = REALTIMEOFDAY
if (!islist(files)) // handle single-level maps
@@ -157,8 +157,8 @@ SUBSYSTEM_DEF(mapping)
var/full_path = "_maps/[path]/[file]"
if(!loader.load_map(file(full_path), 0, 0, start_z + files[file], no_changeturf = TRUE))
errorList |= full_path
-
- INIT_ANNOUNCE("Loaded [name] in [(REALTIMEOFDAY - start_time)/10]s!")
+ if(!silent)
+ INIT_ANNOUNCE("Loaded [name] in [(REALTIMEOFDAY - start_time)/10]s!")
/datum/controller/subsystem/mapping/proc/loadWorld()
//if any of these fail, something has gone horribly, HORRIBLY, wrong
@@ -187,9 +187,6 @@ SUBSYSTEM_DEF(mapping)
LoadGroup(FailedZs, "Lavaland", "map_files/Mining", "Lavaland.dmm", default_traits = ZTRAITS_LAVALAND)
else if (!isnull(config.minetype))
INIT_ANNOUNCE("WARNING: An unknown minetype '[config.minetype]' was set! This is being ignored! Update the maploader code!")
-
- // load Reebe
- LoadGroup(FailedZs, "Reebe", "map_files/generic", "City_of_Cogs.dmm", default_traits = ZTRAITS_REEBE)
#endif
if(LAZYLEN(FailedZs)) //but seriously, unless the server's filesystem is messed up this will never happen
@@ -367,14 +364,14 @@ GLOBAL_LIST_EMPTY(the_station_areas)
away_level = template.load_new_z()
else
return
-
+
message_admins("Admin [key_name_admin(usr)] has loaded [away_name] away mission.")
log_admin("Admin [key_name(usr)] has loaded [away_name] away mission.")
if(!away_level)
message_admins("Loading [away_name] failed!")
return
-
-
+
+
if(GLOB.the_gateway)
//Link any found away gate with station gate
var/obj/machinery/gateway/centeraway/new_gate
diff --git a/code/datums/action.dm b/code/datums/action.dm
index f9575a56ef..593e81ff01 100644
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -564,19 +564,6 @@
/datum/action/innate/proc/Deactivate()
return
-//Preset for action that call specific procs (consider innate).
-/datum/action/generic
- check_flags = 0
- var/procname
-
-/datum/action/generic/Trigger()
- if(!..())
- return 0
- if(target && procname)
- call(target, procname)(usr)
- return 1
-
-
//Preset for an action with a cooldown
/datum/action/cooldown
diff --git a/code/datums/components/chasm.dm b/code/datums/components/chasm.dm
index 88360194b3..88a92ce8ec 100644
--- a/code/datums/components/chasm.dm
+++ b/code/datums/components/chasm.dm
@@ -11,13 +11,16 @@
/obj/structure/lattice,
/obj/structure/stone_tile,
/obj/item/projectile,
+ /obj/effect/projectile,
/obj/effect/portal,
/obj/effect/abstract,
/obj/effect/hotspot,
/obj/effect/landmark,
/obj/effect/temp_visual,
/obj/effect/light_emitter/tendril,
- /obj/effect/collapse))
+ /obj/effect/collapse,
+ /obj/effect/particle_effect/ion_trails
+ ))
/datum/component/chasm/Initialize(turf/target)
RegisterSignal(list(COMSIG_MOVABLE_CROSSED, COMSIG_ATOM_ENTERED), .proc/Entered)
diff --git a/code/datums/diseases/advance/symptoms/fire.dm b/code/datums/diseases/advance/symptoms/fire.dm
index 781cd6de4d..f85024a7a9 100644
--- a/code/datums/diseases/advance/symptoms/fire.dm
+++ b/code/datums/diseases/advance/symptoms/fire.dm
@@ -125,7 +125,7 @@ Bonus
symptom_delay_max = 140
if(A.properties["stage_rate"] >= 8) //serious boom when wet
explosion_power = 2
- if(A.properties["transmission"] >= 8) //extra chemicals
+ if(A.properties["transmittable"] >= 8) //extra chemicals
chems = TRUE
/datum/symptom/alkali/Activate(datum/disease/advance/A)
diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm
index 02e0546201..9f274c0aa3 100644
--- a/code/datums/diseases/advance/symptoms/heal.dm
+++ b/code/datums/diseases/advance/symptoms/heal.dm
@@ -60,7 +60,7 @@
/datum/symptom/heal/starlight/Start(datum/disease/advance/A)
if(!..())
return
- if(A.properties["transmission"] >= 6)
+ if(A.properties["transmittable"] >= 6)
nearspace_penalty = 1
if(A.properties["stage_rate"] >= 6)
power = 2
@@ -358,7 +358,7 @@
return
if(A.properties["stage_rate"] >= 7)
power = 2
- if(A.properties["trasmission"] >= 6)
+ if(A.properties["transmittable"] >= 6)
temp_rate = 4
/datum/symptom/heal/plasma/CanHeal(datum/disease/advance/A)
@@ -425,7 +425,7 @@
return
if(A.properties["resistance"] >= 7)
power = 2
- if(A.properties["trasmission"] >= 6)
+ if(A.properties["transmittable"] >= 6)
cellular_damage = TRUE
/datum/symptom/heal/radiation/CanHeal(datum/disease/advance/A)
diff --git a/code/datums/diseases/advance/symptoms/shivering.dm b/code/datums/diseases/advance/symptoms/shivering.dm
index c67bf7798a..e4bb5e1b3e 100644
--- a/code/datums/diseases/advance/symptoms/shivering.dm
+++ b/code/datums/diseases/advance/symptoms/shivering.dm
@@ -33,10 +33,10 @@ Bonus
/datum/symptom/fever/Start(datum/disease/advance/A)
if(!..())
return
- if(A.properties["stage_speed"] >= 5) //dangerous cold
+ if(A.properties["stage_rate"] >= 5) //dangerous cold
power = 1.5
unsafe = TRUE
- if(A.properties["stage_speed"] >= 10)
+ if(A.properties["stage_rate"] >= 10)
power = 2.5
/datum/symptom/shivering/Activate(datum/disease/advance/A)
diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm
index 52b63ccd5f..8008c185a5 100644
--- a/code/datums/diseases/transformation.dm
+++ b/code/datums/diseases/transformation.dm
@@ -55,7 +55,7 @@
if(affected_mob.notransform)
return
affected_mob.notransform = 1
- for(var/obj/item/W in affected_mob.get_equipped_items())
+ for(var/obj/item/W in affected_mob.get_equipped_items(TRUE))
affected_mob.dropItemToGround(W)
for(var/obj/item/I in affected_mob.held_items)
affected_mob.dropItemToGround(I)
diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm
index d19e8be2e1..12070f6fe2 100644
--- a/code/datums/holocall.dm
+++ b/code/datums/holocall.dm
@@ -60,9 +60,6 @@
user.remote_control = null
if(!QDELETED(eye))
- if(user_good && user.client)
- for(var/datum/camerachunk/chunk in eye.visibleCameraChunks)
- chunk.remove(eye)
qdel(eye)
eye = null
@@ -205,7 +202,7 @@
/datum/holorecord/proc/set_caller_image(mob/user)
var/olddir = user.dir
user.setDir(SOUTH)
- caller_image = getFlatIcon(user)
+ caller_image = image(user)
user.setDir(olddir)
/obj/item/disk/holodisk
@@ -284,7 +281,7 @@
else
var/datum/preset_holoimage/H = new preset_image_type
record.caller_image = H.build_image()
-
+
//These build caller image from outfit and some additional data, for use by mappers for ruin holorecords
/datum/preset_holoimage
var/nonhuman_mobtype //Fill this if you just want something nonhuman
@@ -303,7 +300,7 @@
mannequin.equipOutfit(outfit_type,TRUE)
mannequin.setDir(SOUTH)
COMPILE_OVERLAYS(mannequin)
- . = getFlatIcon(mannequin)
+ . = image(mannequin)
unset_busy_human_dummy("HOLODISK_PRESET")
/obj/item/disk/holodisk/example
@@ -347,4 +344,3 @@
/datum/preset_holoimage/clown
outfit_type = /datum/outfit/job/clown
-
diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm
index 8817a1ff96..af299aaee9 100644
--- a/code/datums/ruins/lavaland.dm
+++ b/code/datums/ruins/lavaland.dm
@@ -115,6 +115,14 @@
// Generates nothing but atmos runtimes and salt
cost = 0
+/datum/map_template/ruin/lavaland/ratvar
+ name = "Dead God"
+ id = "ratvar"
+ description = "Ratvars final resting place."
+ suffix = "lavaland_surface_dead_ratvar.dmm"
+ cost = 0
+ allow_duplicates = FALSE
+
/datum/map_template/ruin/lavaland/hierophant
name = "Hierophant's Arena"
id = "hierophant"
diff --git a/code/datums/traits/_quirk.dm b/code/datums/traits/_quirk.dm
index d85f79f84a..963afacec3 100644
--- a/code/datums/traits/_quirk.dm
+++ b/code/datums/traits/_quirk.dm
@@ -55,6 +55,9 @@
/datum/quirk/proc/post_add() //for text, disclaimers etc. given after you spawn in with the trait
/datum/quirk/proc/on_transfer() //code called when the trait is transferred to a new mob
+/datum/quirk/proc/clone_data() //return additional data that should be remembered by cloning
+/datum/quirk/proc/on_clone(data) //create the quirk from clone data
+
/datum/quirk/process()
if(QDELETED(quirk_holder))
quirk_holder = null
diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index b6dd926773..68e259441f 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -85,7 +85,11 @@
quirk_holder.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "family_heirloom")
quirk_holder.SendSignal(COMSIG_ADD_MOOD_EVENT, "family_heirloom_missing", /datum/mood_event/family_heirloom_missing)
+/datum/quirk/family_heirloom/clone_data()
+ return heirloom
+/datum/quirk/family_heirloom/on_clone(data)
+ heirloom = data
/datum/quirk/heavy_sleeper
name = "Heavy Sleeper"
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 122efe5772..b679956c3f 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -425,23 +425,6 @@
/atom/proc/update_remote_sight(mob/living/user)
return
-/atom/proc/add_vomit_floor(mob/living/carbon/M, toxvomit = 0)
- if(isturf(src))
- var/obj/effect/decal/cleanable/vomit/V = new /obj/effect/decal/cleanable/vomit(src, M.get_static_viruses())
- // Make toxins vomit look different
- if(toxvomit)
- V.icon_state = "vomittox_[pick(1,4)]"
- if(M.reagents)
- clear_reagents_to_vomit_pool(M,V)
-
-/atom/proc/clear_reagents_to_vomit_pool(mob/living/carbon/M, obj/effect/decal/cleanable/vomit/V)
- M.reagents.trans_to(V, M.reagents.total_volume / 10)
- for(var/datum/reagent/R in M.reagents.reagent_list) //clears the stomach of anything that might be digested as food
- if(istype(R, /datum/reagent/consumable))
- var/datum/reagent/consumable/nutri_check = R
- if(nutri_check.nutriment_factor >0)
- M.reagents.remove_reagent(R.id,R.volume)
-
//Hook for running code when a dir change occurs
/atom/proc/setDir(newdir)
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 7f817f7787..22a7940bbf 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -161,41 +161,45 @@
else //Diagonal move, split it into cardinal moves
moving_diagonally = FIRST_DIAG_STEP
var/first_step_dir
+ // The `&& moving_diagonally` checks are so that a forceMove taking
+ // place due to a Crossed, Collided, etc. call will interrupt
+ // the second half of the diagonal movement, or the second attempt
+ // at a first half if step() fails because we hit something.
if (direct & NORTH)
if (direct & EAST)
- if (step(src, NORTH))
+ if (step(src, NORTH) && moving_diagonally)
first_step_dir = NORTH
moving_diagonally = SECOND_DIAG_STEP
. = step(src, EAST)
- else if (step(src, EAST))
+ else if (moving_diagonally && step(src, EAST))
first_step_dir = EAST
moving_diagonally = SECOND_DIAG_STEP
. = step(src, NORTH)
else if (direct & WEST)
- if (step(src, NORTH))
+ if (step(src, NORTH) && moving_diagonally)
first_step_dir = NORTH
moving_diagonally = SECOND_DIAG_STEP
. = step(src, WEST)
- else if (step(src, WEST))
+ else if (moving_diagonally && step(src, WEST))
first_step_dir = WEST
moving_diagonally = SECOND_DIAG_STEP
. = step(src, NORTH)
else if (direct & SOUTH)
if (direct & EAST)
- if (step(src, SOUTH))
+ if (step(src, SOUTH) && moving_diagonally)
first_step_dir = SOUTH
moving_diagonally = SECOND_DIAG_STEP
. = step(src, EAST)
- else if (step(src, EAST))
+ else if (moving_diagonally && step(src, EAST))
first_step_dir = EAST
moving_diagonally = SECOND_DIAG_STEP
. = step(src, SOUTH)
else if (direct & WEST)
- if (step(src, SOUTH))
+ if (step(src, SOUTH) && moving_diagonally)
first_step_dir = SOUTH
moving_diagonally = SECOND_DIAG_STEP
. = step(src, WEST)
- else if (step(src, WEST))
+ else if (moving_diagonally && step(src, WEST))
first_step_dir = WEST
moving_diagonally = SECOND_DIAG_STEP
. = step(src, SOUTH)
@@ -310,8 +314,8 @@
var/area/old_area = get_area(oldloc)
var/area/destarea = get_area(destination)
-
loc = destination
+ moving_diagonally = 0
if(!same_loc)
if(oldloc)
@@ -558,7 +562,7 @@
if(visual_effect_icon)
I = image('icons/effects/effects.dmi', A, visual_effect_icon, A.layer + 0.1)
else if(used_item)
- I = image(used_item.icon, A, used_item.icon_state, A.layer + 0.1)
+ I = image(icon = used_item, loc = A, layer = A.layer + 0.1)
// Scale the icon.
I.transform *= 0.75
diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm
index 355dd869b1..a0cfd79770 100644
--- a/code/game/gamemodes/clock_cult/clock_cult.dm
+++ b/code/game/gamemodes/clock_cult/clock_cult.dm
@@ -143,6 +143,12 @@ Credit where due:
var/datum/team/clockcult/main_clockcult
/datum/game_mode/clockwork_cult/pre_setup()
+ var/list/errorList = list()
+ SSmapping.LoadGroup(errorList, "Reebe", "map_files/generic", "City_of_Cogs.dmm", default_traits = ZTRAITS_REEBE, silent = TRUE)
+ if(errorList.len) // reebe failed to load
+ message_admins("Rebee failed to load!")
+ log_game("Rebee failed to load!")
+ return FALSE
if(CONFIG_GET(flag/protect_roles_from_antagonist))
restricted_jobs += protected_jobs
if(CONFIG_GET(flag/protect_assistant_from_antagonist))
diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm
index f02b765573..1db9669a96 100644
--- a/code/game/machinery/airlock_control.dm
+++ b/code/game/machinery/airlock_control.dm
@@ -1,154 +1,164 @@
-#define AIRLOCK_CONTROL_RANGE 5
-
-// This code allows for airlocks to be controlled externally by setting an id_tag and comm frequency (disables ID access)
-/obj/machinery/door/airlock
- var/id_tag
- var/frequency
- var/datum/radio_frequency/radio_connection
-
-
-/obj/machinery/door/airlock/receive_signal(datum/signal/signal)
- if(!signal)
- return
-
- if(id_tag != signal.data["tag"] || !signal.data["command"])
- return
-
- switch(signal.data["command"])
- if("open")
- open(1)
-
- if("close")
- close(1)
-
- if("unlock")
- locked = FALSE
- update_icon()
-
- if("lock")
- locked = TRUE
- update_icon()
-
- if("secure_open")
- locked = FALSE
- update_icon()
-
- sleep(2)
- open(1)
-
- locked = TRUE
- update_icon()
-
- if("secure_close")
- locked = FALSE
- close(1)
-
- locked = TRUE
- sleep(2)
- update_icon()
-
- send_status()
-
-
-/obj/machinery/door/airlock/proc/send_status()
- if(radio_connection)
- var/datum/signal/signal = new(list(
- "tag" = id_tag,
- "timestamp" = world.time,
- "door_status" = density ? "closed" : "open",
- "lock_status" = locked ? "locked" : "unlocked"
- ))
- radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK)
-
-
-/obj/machinery/door/airlock/open(surpress_send)
- . = ..()
- if(!surpress_send)
- send_status()
-
-
-/obj/machinery/door/airlock/close(surpress_send)
- . = ..()
- if(!surpress_send)
- send_status()
-
-
-/obj/machinery/door/airlock/proc/set_frequency(new_frequency)
- SSradio.remove_object(src, frequency)
- if(new_frequency)
- frequency = new_frequency
- radio_connection = SSradio.add_object(src, frequency, RADIO_AIRLOCK)
-
-/obj/machinery/door/airlock/Destroy()
- if(frequency)
- SSradio.remove_object(src,frequency)
- return ..()
-
-/obj/machinery/airlock_sensor
- icon = 'icons/obj/airlock_machines.dmi'
- icon_state = "airlock_sensor_off"
- name = "airlock sensor"
- resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
-
- anchored = TRUE
- power_channel = ENVIRON
-
- var/id_tag
- var/master_tag
- var/frequency = FREQ_AIRLOCK_CONTROL
-
- var/datum/radio_frequency/radio_connection
-
- var/on = TRUE
- var/alert = FALSE
-
-
-/obj/machinery/airlock_sensor/update_icon()
- if(on)
- if(alert)
- icon_state = "airlock_sensor_alert"
- else
- icon_state = "airlock_sensor_standby"
- else
- icon_state = "airlock_sensor_off"
-
-/obj/machinery/airlock_sensor/attack_hand(mob/user)
- . = ..()
- if(.)
- return
- var/datum/signal/signal = new(list(
- "tag" = master_tag,
- "command" = "cycle"
- ))
-
- radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK)
- flick("airlock_sensor_cycle", src)
-
-/obj/machinery/airlock_sensor/process()
- if(on)
- var/datum/gas_mixture/air_sample = return_air()
- var/pressure = round(air_sample.return_pressure(),0.1)
- alert = (pressure < ONE_ATMOSPHERE*0.8)
-
- var/datum/signal/signal = new(list(
- "tag" = id_tag,
- "timestamp" = world.time,
- "pressure" = num2text(pressure)
- ))
-
- radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK)
-
- update_icon()
-
-/obj/machinery/airlock_sensor/proc/set_frequency(new_frequency)
- SSradio.remove_object(src, frequency)
- frequency = new_frequency
- radio_connection = SSradio.add_object(src, frequency, RADIO_AIRLOCK)
-
-/obj/machinery/airlock_sensor/Initialize()
- . = ..()
- set_frequency(frequency)
-
-/obj/machinery/airlock_sensor/Destroy()
- SSradio.remove_object(src,frequency)
- return ..()
\ No newline at end of file
+#define AIRLOCK_CONTROL_RANGE 5
+
+// This code allows for airlocks to be controlled externally by setting an id_tag and comm frequency (disables ID access)
+/obj/machinery/door/airlock
+ var/id_tag
+ var/frequency
+ var/datum/radio_frequency/radio_connection
+
+
+/obj/machinery/door/airlock/receive_signal(datum/signal/signal)
+ if(!signal)
+ return
+
+ if(id_tag != signal.data["tag"] || !signal.data["command"])
+ return
+
+ switch(signal.data["command"])
+ if("open")
+ open(1)
+
+ if("close")
+ close(1)
+
+ if("unlock")
+ locked = FALSE
+ update_icon()
+
+ if("lock")
+ locked = TRUE
+ update_icon()
+
+ if("secure_open")
+ locked = FALSE
+ update_icon()
+
+ sleep(2)
+ open(1)
+
+ locked = TRUE
+ update_icon()
+
+ if("secure_close")
+ locked = FALSE
+ close(1)
+
+ locked = TRUE
+ sleep(2)
+ update_icon()
+
+ send_status()
+
+
+/obj/machinery/door/airlock/proc/send_status()
+ if(radio_connection)
+ var/datum/signal/signal = new(list(
+ "tag" = id_tag,
+ "timestamp" = world.time,
+ "door_status" = density ? "closed" : "open",
+ "lock_status" = locked ? "locked" : "unlocked"
+ ))
+ radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK)
+
+
+/obj/machinery/door/airlock/open(surpress_send)
+ . = ..()
+ if(!surpress_send)
+ send_status()
+
+
+/obj/machinery/door/airlock/close(surpress_send)
+ . = ..()
+ if(!surpress_send)
+ send_status()
+
+
+/obj/machinery/door/airlock/proc/set_frequency(new_frequency)
+ SSradio.remove_object(src, frequency)
+ if(new_frequency)
+ frequency = new_frequency
+ radio_connection = SSradio.add_object(src, frequency, RADIO_AIRLOCK)
+
+/obj/machinery/door/airlock/Destroy()
+ if(frequency)
+ SSradio.remove_object(src,frequency)
+ return ..()
+
+/obj/machinery/airlock_sensor
+ icon = 'icons/obj/airlock_machines.dmi'
+ icon_state = "airlock_sensor_off"
+ name = "airlock sensor"
+ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+
+ power_channel = ENVIRON
+
+ var/id_tag
+ var/master_tag
+ var/frequency = FREQ_AIRLOCK_CONTROL
+
+ var/datum/radio_frequency/radio_connection
+
+ var/on = TRUE
+ var/alert = FALSE
+
+/obj/machinery/airlock_sensor/incinerator_toxmix
+ id_tag = INCINERATOR_TOXMIX_AIRLOCK_SENSOR
+ master_tag = INCINERATOR_TOXMIX_AIRLOCK_CONTROLLER
+
+/obj/machinery/airlock_sensor/incinerator_atmos
+ id_tag = INCINERATOR_ATMOS_AIRLOCK_SENSOR
+ master_tag = INCINERATOR_ATMOS_AIRLOCK_CONTROLLER
+
+/obj/machinery/airlock_sensor/incinerator_syndicatelava
+ id_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_SENSOR
+ master_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_CONTROLLER
+
+/obj/machinery/airlock_sensor/update_icon()
+ if(on)
+ if(alert)
+ icon_state = "airlock_sensor_alert"
+ else
+ icon_state = "airlock_sensor_standby"
+ else
+ icon_state = "airlock_sensor_off"
+
+/obj/machinery/airlock_sensor/attack_hand(mob/user)
+ . = ..()
+ if(.)
+ return
+ var/datum/signal/signal = new(list(
+ "tag" = master_tag,
+ "command" = "cycle"
+ ))
+
+ radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK)
+ flick("airlock_sensor_cycle", src)
+
+/obj/machinery/airlock_sensor/process()
+ if(on)
+ var/datum/gas_mixture/air_sample = return_air()
+ var/pressure = round(air_sample.return_pressure(),0.1)
+ alert = (pressure < ONE_ATMOSPHERE*0.8)
+
+ var/datum/signal/signal = new(list(
+ "tag" = id_tag,
+ "timestamp" = world.time,
+ "pressure" = num2text(pressure)
+ ))
+
+ radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK)
+
+ update_icon()
+
+/obj/machinery/airlock_sensor/proc/set_frequency(new_frequency)
+ SSradio.remove_object(src, frequency)
+ frequency = new_frequency
+ radio_connection = SSradio.add_object(src, frequency, RADIO_AIRLOCK)
+
+/obj/machinery/airlock_sensor/Initialize()
+ . = ..()
+ set_frequency(frequency)
+
+/obj/machinery/airlock_sensor/Destroy()
+ SSradio.remove_object(src,frequency)
+ return ..()
diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm
index 9511e8d0d4..2c6a2abea4 100644
--- a/code/game/machinery/buttons.dm
+++ b/code/game/machinery/buttons.dm
@@ -190,6 +190,31 @@
device = new /obj/item/assembly/control(src)
..()
+/obj/machinery/button/door/incinerator_vent_toxmix
+ name = "combustion chamber vent control"
+ id = INCINERATOR_TOXMIX_VENT
+ req_access = list(ACCESS_TOX)
+
+/obj/machinery/button/door/incinerator_vent_atmos_main
+ name = "turbine vent control"
+ id = INCINERATOR_ATMOS_MAINVENT
+ req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS)
+
+/obj/machinery/button/door/incinerator_vent_atmos_aux
+ name = "combustion chamber vent control"
+ id = INCINERATOR_ATMOS_AUXVENT
+ req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS)
+
+/obj/machinery/button/door/incinerator_vent_syndicatelava_main
+ name = "turbine vent control"
+ id = INCINERATOR_SYNDICATELAVA_MAINVENT
+ req_access = list(ACCESS_SYNDICATE)
+
+/obj/machinery/button/door/incinerator_vent_syndicatelava_aux
+ name = "combustion chamber vent control"
+ id = INCINERATOR_SYNDICATELAVA_AUXVENT
+ req_access = list(ACCESS_SYNDICATE)
+
/obj/machinery/button/massdriver
name = "mass driver button"
desc = "A remote control switch for a mass driver."
@@ -204,6 +229,19 @@
skin = "launcher"
device_type = /obj/item/assembly/control/igniter
+/obj/machinery/button/ignition/incinerator
+ name = "combustion chamber ignition switch"
+ desc = "A remote control switch for the combustion chamber's igniter."
+
+/obj/machinery/button/ignition/incinerator/toxmix
+ id = INCINERATOR_TOXMIX_IGNITER
+
+/obj/machinery/button/ignition/incinerator/atmos
+ id = INCINERATOR_ATMOS_IGNITER
+
+/obj/machinery/button/ignition/incinerator/syndicatelava
+ id = INCINERATOR_SYNDICATELAVA_IGNITER
+
/obj/machinery/button/flasher
name = "flasher button"
desc = "A remote control switch for a mounted flasher."
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 3e8a0bb84d..1f2017ec6d 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -19,7 +19,6 @@
integrity_failure = 50
var/list/network = list("ss13")
var/c_tag = null
- var/c_tag_order = 999
var/status = TRUE
anchored = TRUE
var/start_active = FALSE //If it ignores the random chance to start broken on round start
@@ -36,6 +35,7 @@
var/alarm_on = FALSE
var/busy = FALSE
var/emped = FALSE //Number of consecutive EMP's on this camera
+ var/in_use_lights = 0
// Upgrades bitflag
var/upgrades = 0
@@ -285,7 +285,7 @@
else if (stat & EMPED)
icon_state = "[initial(icon_state)]emp"
else
- icon_state = "[initial(icon_state)]"
+ icon_state = "[initial(icon_state)][in_use_lights ? "_in_use" : ""]"
/obj/machinery/camera/proc/toggle_cam(mob/user, displaymessage = 1)
status = !status
diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm
index c327f4c17a..1dbfe9d055 100644
--- a/code/game/machinery/camera/tracking.dm
+++ b/code/game/machinery/camera/tracking.dm
@@ -146,10 +146,6 @@
for (var/j = 1 to i - 1)
a = L[j]
b = L[j + 1]
- if (a.c_tag_order != b.c_tag_order)
- if (a.c_tag_order > b.c_tag_order)
- L.Swap(j, j + 1)
- else
- if (sorttext(a.c_tag, b.c_tag) < 0)
- L.Swap(j, j + 1)
+ if (sorttext(a.c_tag, b.c_tag) < 0)
+ L.Swap(j, j + 1)
return L
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index d1f4a4be86..24bb03cdf6 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -204,7 +204,8 @@
H.faction |= factions
for(var/V in quirks)
- new V(H)
+ var/datum/quirk/Q = new V(H)
+ Q.on_clone(quirks[V])
H.set_cloned_appearance()
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 9dad813677..3ce64c9030 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -51,7 +51,9 @@
/obj/item/hot_potato/harmless/toy = 1,
/obj/item/card/emagfake = 1,
/obj/item/clothing/shoes/wheelys = 2,
- /obj/item/clothing/shoes/kindleKicks = 2)
+ /obj/item/clothing/shoes/kindleKicks = 2,
+ /obj/item/storage/belt/military/snack = 2
+ )
light_color = LIGHT_COLOR_GREEN
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 4ccf9d588c..7e901667ab 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -196,7 +196,7 @@
icon_keyboard = "mining_key"
network = list("mine")
circuit = /obj/item/circuitboard/computer/mining
-
+
/obj/machinery/computer/security/research
name = "research camera console"
desc = "Used to access the various cameras in science."
diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm
index 6112a5d760..26a8ac940e 100644
--- a/code/game/machinery/computer/camera_advanced.dm
+++ b/code/game/machinery/computer/camera_advanced.dm
@@ -190,7 +190,7 @@
else
moveToNullspace()
if(use_static)
- GLOB.cameranet.visibility(src)
+ GLOB.cameranet.visibility(src, GetViewerClient())
if(visible_icon)
if(eye_user.client)
eye_user.client.images -= user_image
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index 95b4ea9f80..71c62327e6 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -476,7 +476,7 @@
R.fields["quirks"] = list()
for(var/V in mob_occupant.roundstart_quirks)
var/datum/quirk/T = V
- R.fields["quirks"] += T.type
+ R.fields["quirks"][T.type] = T.clone_data()
if (!isnull(mob_occupant.mind)) //Save that mind so traitors can continue traitoring after cloning.
R.fields["mind"] = "[REF(mob_occupant.mind)]"
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 14d02e9752..37282c6478 100755
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -51,7 +51,7 @@
/obj/machinery/computer/communications/Topic(href, href_list)
if(..())
return
- if(!is_station_level(z) && !is_centcom_level(z)) //Can only use on centcom and SS13
+ if(!is_station_level(z) && !is_transit_level(z)) //Can only use in transit and on SS13
to_chat(usr, "Unable to establish a connection: \black You're too far away from the station!")
return
usr.set_machine(src)
diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
index 69621adc84..33bd47126c 100644
--- a/code/game/machinery/doors/airlock_types.dm
+++ b/code/game/machinery/doors/airlock_types.dm
@@ -79,6 +79,20 @@
opacity = 0
glass = TRUE
+/obj/machinery/door/airlock/glass/incinerator
+ autoclose = FALSE
+ frequency = FREQ_AIRLOCK_CONTROL
+ heat_proof = TRUE
+ req_access = list(ACCESS_SYNDICATE)
+
+/obj/machinery/door/airlock/glass/incinerator/syndicatelava_interior
+ name = "Turbine Interior Airlock"
+ id_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_INTERIOR
+
+/obj/machinery/door/airlock/glass/incinerator/syndicatelava_exterior
+ name = "Turbine Exterior Airlock"
+ id_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_EXTERIOR
+
/obj/machinery/door/airlock/command/glass
opacity = 0
glass = TRUE
@@ -107,6 +121,20 @@
opacity = 0
glass = TRUE
+/obj/machinery/door/airlock/research/glass/incinerator
+ autoclose = FALSE
+ frequency = FREQ_AIRLOCK_CONTROL
+ heat_proof = TRUE
+ req_access = list(ACCESS_TOX)
+
+/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior
+ name = "Mixing Room Interior Airlock"
+ id_tag = INCINERATOR_TOXMIX_AIRLOCK_INTERIOR
+
+/obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior
+ name = "Mixing Room Exterior Airlock"
+ id_tag = INCINERATOR_TOXMIX_AIRLOCK_EXTERIOR
+
/obj/machinery/door/airlock/mining/glass
opacity = 0
glass = TRUE
@@ -287,6 +315,20 @@
opacity = 0
glass = TRUE
+/obj/machinery/door/airlock/public/glass/incinerator
+ autoclose = FALSE
+ frequency = FREQ_AIRLOCK_CONTROL
+ heat_proof = TRUE
+ req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS)
+
+/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior
+ name = "Turbine Interior Airlock"
+ id_tag = INCINERATOR_ATMOS_AIRLOCK_INTERIOR
+
+/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior
+ name = "Turbine Exterior Airlock"
+ id_tag = INCINERATOR_ATMOS_AIRLOCK_EXTERIOR
+
//////////////////////////////////
/*
External Airlocks
diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
index 9e467e8926..a581b20f52 100644
--- a/code/game/machinery/doors/poddoor.dm
+++ b/code/game/machinery/doors/poddoor.dm
@@ -36,6 +36,26 @@
else
INVOKE_ASYNC(src, .proc/close)
+/obj/machinery/door/poddoor/incinerator_toxmix
+ name = "combustion chamber vent"
+ id = INCINERATOR_TOXMIX_VENT
+
+/obj/machinery/door/poddoor/incinerator_atmos_main
+ name = "turbine vent"
+ id = INCINERATOR_ATMOS_MAINVENT
+
+/obj/machinery/door/poddoor/incinerator_atmos_aux
+ name = "combustion chamber vent"
+ id = INCINERATOR_ATMOS_AUXVENT
+
+/obj/machinery/door/poddoor/incinerator_syndicatelava_main
+ name = "turbine vent"
+ id = INCINERATOR_SYNDICATELAVA_MAINVENT
+
+/obj/machinery/door/poddoor/incinerator_syndicatelava_aux
+ name = "combustion chamber vent"
+ id = INCINERATOR_SYNDICATELAVA_AUXVENT
+
/obj/machinery/door/poddoor/CollidedWith(atom/movable/AM)
if(density)
return 0
diff --git a/code/game/machinery/embedded_controller/airlock_controller.dm b/code/game/machinery/embedded_controller/airlock_controller.dm
index e2402177e2..8b9255b5ac 100644
--- a/code/game/machinery/embedded_controller/airlock_controller.dm
+++ b/code/game/machinery/embedded_controller/airlock_controller.dm
@@ -7,11 +7,11 @@
/datum/computer/file/embedded_program/airlock_controller
var/id_tag
- var/exterior_door_tag
- var/interior_door_tag
- var/airpump_tag
- var/sensor_tag
- var/sanitize_external
+ var/exterior_door_tag //Burn chamber facing door
+ var/interior_door_tag //Station facing door
+ var/airpump_tag //See: dp_vent_pump.dm
+ var/sensor_tag //See: /obj/machinery/airlock_sensor
+ var/sanitize_external //Before the interior airlock opens, do we first drain all gases inside the chamber and then repressurize?
state = AIRLOCK_STATE_CLOSED
var/target_state = AIRLOCK_STATE_CLOSED
@@ -211,6 +211,33 @@
var/sensor_tag
var/sanitize_external
+/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix
+ name = "Incinerator Access Console"
+ airpump_tag = INCINERATOR_TOXMIX_DP_VENTPUMP
+ exterior_door_tag = INCINERATOR_TOXMIX_AIRLOCK_EXTERIOR
+ id_tag = INCINERATOR_TOXMIX_AIRLOCK_CONTROLLER
+ interior_door_tag = INCINERATOR_TOXMIX_AIRLOCK_INTERIOR
+ sanitize_external = TRUE
+ sensor_tag = INCINERATOR_TOXMIX_AIRLOCK_SENSOR
+
+/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos
+ name = "Incinerator Access Console"
+ airpump_tag = INCINERATOR_ATMOS_DP_VENTPUMP
+ exterior_door_tag = INCINERATOR_ATMOS_AIRLOCK_EXTERIOR
+ id_tag = INCINERATOR_ATMOS_AIRLOCK_CONTROLLER
+ interior_door_tag = INCINERATOR_ATMOS_AIRLOCK_INTERIOR
+ sanitize_external = TRUE
+ sensor_tag = INCINERATOR_ATMOS_AIRLOCK_SENSOR
+
+/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_syndicatelava
+ name = "Incinerator Access Console"
+ airpump_tag = INCINERATOR_SYNDICATELAVA_DP_VENTPUMP
+ exterior_door_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_EXTERIOR
+ id_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_CONTROLLER
+ interior_door_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_INTERIOR
+ sanitize_external = TRUE
+ sensor_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_SENSOR
+
/obj/machinery/embedded_controller/radio/airlock_controller/Initialize(mapload)
. = ..()
if(!mapload)
diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm
index d5bb8db0e3..0753d7598f 100644
--- a/code/game/machinery/igniter.dm
+++ b/code/game/machinery/igniter.dm
@@ -14,6 +14,15 @@
armor = list("melee" = 50, "bullet" = 30, "laser" = 70, "energy" = 50, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
resistance_flags = FIRE_PROOF
+/obj/machinery/igniter/incinerator_toxmix
+ id = INCINERATOR_TOXMIX_IGNITER
+
+/obj/machinery/igniter/incinerator_atmos
+ id = INCINERATOR_ATMOS_IGNITER
+
+/obj/machinery/igniter/incinerator_syndicatelava
+ id = INCINERATOR_SYNDICATELAVA_IGNITER
+
/obj/machinery/igniter/on
on = TRUE
icon_state = "igniter1"
@@ -60,6 +69,9 @@
anchored = TRUE
resistance_flags = FIRE_PROOF
+/obj/machinery/sparker/toxmix
+ id = INCINERATOR_TOXMIX_IGNITER
+
/obj/machinery/sparker/Initialize()
. = ..()
spark_system = new /datum/effect_system/spark_spread
diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm
index 08fcb1baa8..8b1e104089 100644
--- a/code/game/machinery/recycler.dm
+++ b/code/game/machinery/recycler.dm
@@ -181,7 +181,7 @@
// Remove and recycle the equipped items
if(eat_victim_items)
- for(var/obj/item/I in L.get_equipped_items())
+ for(var/obj/item/I in L.get_equipped_items(TRUE))
if(L.dropItemToGround(I))
eat(I, sound=FALSE)
diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm
index c516571e2a..ea51693135 100644
--- a/code/game/mecha/combat/combat.dm
+++ b/code/game/mecha/combat/combat.dm
@@ -2,27 +2,4 @@
force = 30
internal_damage_threshold = 50
armor = list("melee" = 30, "bullet" = 30, "laser" = 15, "energy" = 20, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
-
-/obj/mecha/combat/moved_inside(mob/living/carbon/human/H)
- if(..())
- if(H.client && H.client.mouse_pointer_icon == initial(H.client.mouse_pointer_icon))
- H.client.mouse_pointer_icon = 'icons/mecha/mecha_mouse.dmi'
- return 1
- else
- return 0
-
-/obj/mecha/combat/mmi_moved_inside(obj/item/mmi/mmi_as_oc,mob/user)
- if(..())
- if(occupant.client && occupant.client.mouse_pointer_icon == initial(occupant.client.mouse_pointer_icon))
- occupant.client.mouse_pointer_icon = 'icons/mecha/mecha_mouse.dmi'
- return 1
- else
- return 0
-
-
-/obj/mecha/combat/go_out()
- if(occupant && occupant.client && occupant.client.mouse_pointer_icon == 'icons/mecha/mecha_mouse.dmi')
- occupant.client.mouse_pointer_icon = initial(occupant.client.mouse_pointer_icon)
- ..()
-
-
+ mouse_pointer = 'icons/mecha/mecha_mouse.dmi'
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 438c5fdb39..c6f070c23a 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -115,6 +115,7 @@
var/smashcooldown = 3 //deciseconds
var/occupant_sight_flags = 0 //sight flags to give to the occupant (e.g. mech mining scanner gives meson-like vision)
+ var/mouse_pointer
hud_possible = list (DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_TRACK_HUD)
@@ -855,6 +856,7 @@
if(H && H.client && H in range(1))
occupant = H
H.forceMove(src)
+ H.update_mouse_pointer()
add_fingerprint(H)
GrantActions(H, human_occupant=1)
forceMove(loc)
@@ -912,6 +914,7 @@
brainmob.reset_perspective(src)
brainmob.remote_control = src
brainmob.update_canmove()
+ brainmob.update_mouse_pointer()
icon_state = initial(icon_state)
update_icon()
setDir(dir_in)
@@ -981,6 +984,7 @@
setDir(dir_in)
if(L && L.client)
+ L.update_mouse_pointer()
L.client.change_view(CONFIG_GET(string/default_view))
zoom_mode = 0
diff --git a/code/game/objects/effects/temporary_visuals/cult.dm b/code/game/objects/effects/temporary_visuals/cult.dm
index 3a17494871..0f9d7321af 100644
--- a/code/game/objects/effects/temporary_visuals/cult.dm
+++ b/code/game/objects/effects/temporary_visuals/cult.dm
@@ -47,6 +47,7 @@
/obj/effect/temp_visual/cult/turf/floor
icon_state = "floorglow"
duration = 5
+ plane = FLOOR_PLANE
/obj/effect/temp_visual/cult/portal
icon_state = "space"
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index ed8db43bfa..9401579e61 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -340,7 +340,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
desc = "A brown roll of tobacco and... well, you're not quite sure. This thing's huge!"
icon_state = "cigaroff"
icon_on = "cigaron"
- icon_off = "cigaroff"
+ icon_off = "cigaroff" //make sure to add positional sprites in icons/obj/cigarettes.dmi if you add more.
type_butt = /obj/item/cigbutt/cigarbutt
throw_speed = 0.5
item_state = "cigaroff"
@@ -492,11 +492,24 @@ CIGARETTE PACKETS ARE IN FANCY.DM
slot_flags = ITEM_SLOT_BELT
var/lit = 0
var/fancy = TRUE
+ var/overlay_state
+ var/overlay_list = list(
+ "plain",
+ "dame",
+ "thirteen",
+ "snake"
+ )
heat = 1500
resistance_flags = FIRE_PROOF
light_color = LIGHT_COLOR_FIRE
grind_results = list("iron" = 1, "welding_fuel" = 5, "oil" = 5)
+/obj/item/lighter/Initialize()
+ . = ..()
+ if(!overlay_state)
+ overlay_state = pick(overlay_list)
+ update_icon()
+
/obj/item/lighter/suicide_act(mob/living/carbon/user)
if (lit)
user.visible_message("[user] begins holding \the [src]'s flame up to [user.p_their()] face! It looks like [user.p_theyre()] trying to commit suicide!")
@@ -507,10 +520,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM
return BRUTELOSS
/obj/item/lighter/update_icon()
- if(lit)
- icon_state = "[initial(icon_state)]_on"
- else
- icon_state = "[initial(icon_state)]"
+ cut_overlays()
+ var/mutable_appearance/lighter_overlay = mutable_appearance(icon,"lighter_overlay_[overlay_state][lit ? "-on" : ""]")
+ icon_state = "[initial(icon_state)][lit ? "-on" : ""]"
+ add_overlay(lighter_overlay)
/obj/item/lighter/ignition_effect(atom/A, mob/user)
if(is_hot())
@@ -597,19 +610,44 @@ CIGARETTE PACKETS ARE IN FANCY.DM
desc = "A cheap-as-free lighter."
icon_state = "lighter"
fancy = FALSE
+ overlay_list = list(
+ "transp",
+ "tall",
+ "matte",
+ "zoppo" //u cant stoppo th zoppo
+ )
+ var/lighter_color
+ var/list/color_list = list( //Same 16 color selection as electronic assemblies
+ COLOR_ASSEMBLY_BLACK,
+ COLOR_FLOORTILE_GRAY,
+ COLOR_ASSEMBLY_BGRAY,
+ COLOR_ASSEMBLY_WHITE,
+ COLOR_ASSEMBLY_RED,
+ COLOR_ASSEMBLY_ORANGE,
+ COLOR_ASSEMBLY_BEIGE,
+ COLOR_ASSEMBLY_BROWN,
+ COLOR_ASSEMBLY_GOLD,
+ COLOR_ASSEMBLY_YELLOW,
+ COLOR_ASSEMBLY_GURKHA,
+ COLOR_ASSEMBLY_LGREEN,
+ COLOR_ASSEMBLY_GREEN,
+ COLOR_ASSEMBLY_LBLUE,
+ COLOR_ASSEMBLY_BLUE,
+ COLOR_ASSEMBLY_PURPLE
+ )
/obj/item/lighter/greyscale/Initialize()
. = ..()
- add_atom_colour(color2hex(randomColor(1)), FIXED_COLOUR_PRIORITY)
+ if(!lighter_color)
+ lighter_color = pick(color_list)
update_icon()
/obj/item/lighter/greyscale/update_icon()
cut_overlays()
- var/mutable_appearance/base_overlay = mutable_appearance(icon,"[initial(icon_state)]_base")
- base_overlay.appearance_flags = RESET_COLOR //the edging doesn't change color
- if(lit)
- base_overlay.icon_state = "[initial(icon_state)]_on"
- add_overlay(base_overlay)
+ var/mutable_appearance/lighter_overlay = mutable_appearance(icon,"lighter_overlay_[overlay_state][lit ? "-on" : ""]")
+ icon_state = "[initial(icon_state)][lit ? "-on" : ""]"
+ lighter_overlay.color = lighter_color
+ add_overlay(lighter_overlay)
/obj/item/lighter/greyscale/ignition_effect(atom/A, mob/user)
if(is_hot())
@@ -619,9 +657,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/lighter/slime
name = "slime zippo"
desc = "A specialty zippo made from slimes and industry. Has a much hotter flame than normal."
- icon_state = "slimezippo"
+ icon_state = "slighter"
heat = 3000 //Blue flame!
light_color = LIGHT_COLOR_CYAN
+ overlay_state = "slime"
grind_results = list("iron" = 1, "welding_fuel" = 5, "pyroxadone" = 5)
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index a44e61f16a..a3e4bc112e 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -310,7 +310,7 @@
/obj/item/storage/bag/tray/update_icon()
cut_overlays()
for(var/obj/item/I in contents)
- add_overlay(mutable_appearance(I.icon, I.icon_state))
+ add_overlay(new /mutable_appearance(I))
/obj/item/storage/bag/tray/Entered()
. = ..()
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 1c4ad03b01..249eb67c05 100755
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -326,6 +326,53 @@
GET_COMPONENT(STR, /datum/component/storage)
STR.max_w_class = WEIGHT_CLASS_SMALL
+/obj/item/storage/belt/military/snack
+ name = "tactical snack rig"
+
+/obj/item/storage/belt/military/snack/Initialize()
+ . = ..()
+ var/sponsor = pick("DonkCo", "Waffle Co.", "Roffle Co.", "Gorlax Marauders", "Tiger Cooperative")
+ desc = "A set of snack-tical webbing worn by athletes of the [sponsor] VR sports division."
+
+/obj/item/storage/belt/military/snack/ComponentInitialize()
+ . = ..()
+ GET_COMPONENT(STR, /datum/component/storage)
+ STR.max_items = 6
+ STR.max_w_class = WEIGHT_CLASS_SMALL
+ STR.can_hold = typecacheof(list(
+ /obj/item/reagent_containers/food/snacks,
+ /obj/item/reagent_containers/food/drinks
+ ))
+
+ var/amount = 5
+ var/rig_snacks
+ while(contents.len <= amount)
+ rig_snacks = pick(list(
+ /obj/item/reagent_containers/food/snacks/candy,
+ /obj/item/reagent_containers/food/drinks/dry_ramen,
+ /obj/item/reagent_containers/food/snacks/chips,
+ /obj/item/reagent_containers/food/snacks/sosjerky,
+ /obj/item/reagent_containers/food/snacks/syndicake,
+ /obj/item/reagent_containers/food/snacks/spacetwinkie,
+ /obj/item/reagent_containers/food/snacks/cheesiehonkers,
+ /obj/item/reagent_containers/food/snacks/nachos,
+ /obj/item/reagent_containers/food/snacks/cheesynachos,
+ /obj/item/reagent_containers/food/snacks/cubannachos,
+ /obj/item/reagent_containers/food/snacks/nugget,
+ /obj/item/reagent_containers/food/snacks/pastatomato,
+ /obj/item/reagent_containers/food/snacks/rofflewaffles,
+ /obj/item/reagent_containers/food/snacks/donkpocket,
+ /obj/item/reagent_containers/food/drinks/soda_cans/cola,
+ /obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind,
+ /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
+ /obj/item/reagent_containers/food/drinks/soda_cans/starkist,
+ /obj/item/reagent_containers/food/drinks/soda_cans/space_up,
+ /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
+ /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime,
+ /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola
+ ))
+ new rig_snacks(src)
+
/obj/item/storage/belt/military/abductor
name = "agent belt"
desc = "A belt used by abductor agents."
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index f86188984f..5fc5af6779 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -154,7 +154,7 @@
SendSignal(COMSIG_TRY_STORAGE_TAKE, W, user)
user.put_in_hands(W)
contents -= W
- to_chat(user, "You take a [icon_type] out of the pack.")
+ to_chat(user, "You take \a [W] out of the pack.")
else
to_chat(user, "There are no [icon_type]s left in the pack.")
@@ -166,18 +166,20 @@
else
icon_state = initial(icon_state)
add_overlay("[icon_state]_open")
- var/i = contents.len
+ var/cig_position = 1
for(var/C in contents)
var/mutable_appearance/inserted_overlay = mutable_appearance(icon)
- inserted_overlay.pixel_x = 1 * (i - 1)
+
if(istype(C, /obj/item/lighter/greyscale))
inserted_overlay.icon_state = "lighter_in"
else if(istype(C, /obj/item/lighter))
inserted_overlay.icon_state = "zippo_in"
else
inserted_overlay.icon_state = "cigarette"
+
+ inserted_overlay.icon_state = "[inserted_overlay.icon_state]_[cig_position]"
add_overlay(inserted_overlay)
- i--
+ cig_position++
else
cut_overlays()
@@ -191,7 +193,7 @@
SendSignal(COMSIG_TRY_STORAGE_TAKE, W, M)
M.equip_to_slot_if_possible(W, SLOT_WEAR_MASK)
contents -= W
- to_chat(user, "You take a [icon_type] out of the pack.")
+ to_chat(user, "You take \a [W] out of the pack.")
else
..()
else
@@ -293,22 +295,27 @@
/obj/item/storage/fancy/cigarettes/cigars/update_icon()
cut_overlays()
if(fancy_open)
- add_overlay("[icon_state]_open")
- var/mutable_appearance/cigar_overlay = mutable_appearance(icon, icon_type)
- for(var/c = contents.len, c >= 1, c--)
- cigar_overlay.pixel_x = 4 * (c - 1)
+ icon_state = "[initial(icon_state)]_open"
+
+ var/cigar_position = 1 //generate sprites for cigars in the box
+ for(var/obj/item/clothing/mask/cigarette/cigar/smokes in contents)
+ var/mutable_appearance/cigar_overlay = mutable_appearance(icon, "[smokes.icon_off]_[cigar_position]")
add_overlay(cigar_overlay)
+ cigar_position++
+
else
- icon_state = "cigarcase"
+ icon_state = "[initial(icon_state)]"
/obj/item/storage/fancy/cigarettes/cigars/cohiba
name = "\improper cohiba robusto cigar case"
desc = "A case of imported Cohiba cigars, renowned for their strong flavor."
+ icon_state = "cohibacase"
spawn_type = /obj/item/clothing/mask/cigarette/cigar/cohiba
/obj/item/storage/fancy/cigarettes/cigars/havana
name = "\improper premium havanian cigar case"
desc = "A case of classy Havanian cigars."
+ icon_state = "cohibacase"
spawn_type = /obj/item/clothing/mask/cigarette/cigar/havana
/*
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/supplypod.dm b/code/game/objects/structures/crates_lockers/closets/secure/supplypod.dm
index ca64b7c537..c51f13bb12 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/supplypod.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/supplypod.dm
@@ -1,6 +1,7 @@
//The "BDPtarget" temp visual is created by the expressconsole, which in turn makes two things: a falling droppod animation, and the droppod itself.
#define POD_STANDARD 0
#define POD_BLUESPACE 1
+#define POD_CENTCOM 2
//------------------------------------SUPPLY POD-------------------------------------//
/obj/structure/closet/supplypod
@@ -18,17 +19,25 @@
armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 90, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
anchored = TRUE
anchorable = FALSE
- var/generated = FALSE
var/datum/supply_order/SupplyOrder
+ var/atom/other_delivery
/obj/structure/closet/supplypod/bluespacepod
name = "Bluespace Drop Pod"
desc = "A Nanotrasen Bluespace drop pod. Teleports back to CentCom after delivery."
icon_state = "bluespacepod"
-/obj/structure/closet/supplypod/Initialize(mapload, datum/supply_order/so)
+/obj/structure/closet/supplypod/bluespacepod/centcompod
+ name = "CentCom Drop Pod"
+ desc = "A Nanotrasen Bluespace drop pod, this one has been marked with Central Command's designations. Teleports back to Centcom after delivery."
+ icon_state = "centcompod"
+
+/obj/structure/closet/supplypod/Initialize(mapload, var/SO)
. = ..()
- SupplyOrder = so//uses Supply Order passed from expressconsole into BDPtarget
+ if(istype(SO, /datum/supply_order))
+ SupplyOrder = SO//uses Supply Order passed from expressconsole into BDPtarget
+ else
+ other_delivery = SO//if the object is not a supply order, we force the object in the pod
addtimer(CALLBACK(src, .proc/open), 30)//open 3seconds after appearing
/obj/structure/closet/supplypod/update_icon()
@@ -47,9 +56,10 @@
/obj/structure/closet/supplypod/open()
var/turf/T = get_turf(src)
opened = TRUE
- if(!generated)
- generated = TRUE
+ if(SupplyOrder)
SupplyOrder.generate(T)//not called during populateContents as supplyorder generation requires a turf
+ if(other_delivery)
+ new other_delivery(T)
update_icon()
playsound(src, open_sound, 15, 1, -3)
if(istype(src,/obj/structure/closet/supplypod/bluespacepod))
@@ -66,21 +76,24 @@
//------------------------------------FALLING SUPPLY POD-------------------------------------//
/obj/effect/temp_visual/DPfall
icon = 'icons/obj/2x2.dmi'
- icon_state = "supplypod_falling"
pixel_x = -16
pixel_y = -5
pixel_z = 200
desc = "Get out of the way!"
layer = FLY_LAYER//that wasnt flying, that was falling with style!
randomdir = FALSE
+ icon_state = "supplypod_falling"
/obj/effect/temp_visual/DPfall/Initialize(var/dropLocation, var/podID)
- if (podID == POD_BLUESPACE)
+ if (podID == POD_STANDARD)
+ icon_state = "supplypod_falling"
+ name = "Supply Drop Pod"
+ else if (podID == POD_BLUESPACE)
icon_state = "bluespacepod_falling"
name = "Bluespace Drop Pod"
else
- icon_state = "supplypod_falling"
- name = "Supply Drop Pod"
+ icon_state = "centcompod_falling"
+ name = "CentCom Drop Pod"
. = ..()
//------------------------------------TEMPORARY_VISUAL-------------------------------------//
@@ -91,22 +104,34 @@
light_range = 2
var/obj/effect/temp_visual/fallingPod
-/obj/effect/DPtarget/Initialize(mapload, datum/supply_order/SO, var/podID)
+/obj/effect/DPtarget/Initialize(mapload, var/SO, var/podID)
. = ..()
- addtimer(CALLBACK(src, .proc/beginLaunch, SO, podID), podID == POD_BLUESPACE ? 15 : 30)//standard pods take 3 seconds to come in, bluespace pods take 1.5
+ var/delayTime = 0
+ switch(podID)
+ if(POD_STANDARD)
+ delayTime = 30
+ if(POD_BLUESPACE)
+ delayTime = 15
+ if(POD_CENTCOM)
+ delayTime = 1
-/obj/effect/DPtarget/proc/beginLaunch(datum/supply_order/SO, var/podID)
+ addtimer(CALLBACK(src, .proc/beginLaunch, SO, podID), delayTime)//standard pods take 3 seconds to come in, bluespace pods take 1.5
+
+/obj/effect/DPtarget/proc/beginLaunch(var/SO, var/podID)
fallingPod = new /obj/effect/temp_visual/DPfall(drop_location(), podID)
animate(fallingPod, pixel_z = 0, time = 3, easing = LINEAR_EASING)//make and animate a falling pod
addtimer(CALLBACK(src, .proc/endLaunch, SO, podID), 3, TIMER_CLIENT_TIME)//fall 0.3seconds
-/obj/effect/DPtarget/proc/endLaunch(datum/supply_order/SO, var/podID)
- if (podID == POD_BLUESPACE)
+/obj/effect/DPtarget/proc/endLaunch(var/SO, var/podID)
+ if (podID == POD_STANDARD)
+ new /obj/structure/closet/supplypod(drop_location(), SO)//pod is created
+ explosion(src,0,0,2, flame_range = 3) //less advanced equipment than bluespace pod, so larger explosion when landing
+ else if (podID == POD_BLUESPACE)
new /obj/structure/closet/supplypod/bluespacepod(drop_location(), SO)//pod is created
explosion(src,0,0,2, flame_range = 1) //explosion and camshake (shoutout to @cyberboss)
else
- new /obj/structure/closet/supplypod(drop_location(), SO)//pod is created
- explosion(src,0,0,2, flame_range = 3) //less advanced equipment than bluespace pod, so larger explosion when landing
+ new /obj/structure/closet/supplypod/bluespacepod/centcompod(drop_location(), SO)
+ explosion(src,0,0,2, flame_range = 1)
qdel(src)
/obj/effect/DPtarget/Destroy()
@@ -120,4 +145,4 @@
icon = 'icons/obj/module.dmi'
icon_state = "cargodisk"
item_state = "card-id"
- w_class = WEIGHT_CLASS_SMALL
+ w_class = WEIGHT_CLASS_SMALL
\ No newline at end of file
diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
index 3edbde93b7..f2d32b773e 100644
--- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
@@ -106,7 +106,11 @@
/obj/item/stack/sheet/plasteel,
/obj/item/stack/sheet/mineral/titanium,
/obj/item/stack/sheet/mineral/plastitanium,
- /obj/item/stack/rods
+ /obj/item/stack/rods,
+ /obj/item/stack/sheet/bluespace_crystal,
+ /obj/item/stack/sheet/mineral/abductor,
+ /obj/item/stack/sheet/plastic,
+ /obj/item/stack/sheet/mineral/wood
)
for(var/i = 0, i<2, i++)
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 95c1cafd5d..0d7500ebf2 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -381,7 +381,7 @@
obj_integrity = max_integrity
/obj/structure/table/bronze
- name = "brass table"
+ name = "bronze table"
desc = "A solid table made out of bronze."
icon = 'icons/obj/smooth_structures/brass_table.dmi'
icon_state = "brass_table"
diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm
index 650a66adf1..f7cea96a3f 100644
--- a/code/game/turfs/simulated/floor/misc_floor.dm
+++ b/code/game/turfs/simulated/floor/misc_floor.dm
@@ -243,7 +243,7 @@
/turf/open/floor/bronze
- name = "clockwork floor"
+ name = "bronze floor"
desc = "Some heavy bronze tiles."
icon = 'icons/obj/clockwork_objects.dmi'
icon_state = "clockwork_floor"
diff --git a/code/game/turfs/simulated/floor/plating/misc_plating.dm b/code/game/turfs/simulated/floor/plating/misc_plating.dm
index b21e361639..a04bd818ad 100644
--- a/code/game/turfs/simulated/floor/plating/misc_plating.dm
+++ b/code/game/turfs/simulated/floor/plating/misc_plating.dm
@@ -119,6 +119,9 @@
icon_state = "water"
baseturfs = /turf/open/floor/plating/beach/water
+/turf/open/floor/plating/beach/coastline_t/sandwater_inner
+ icon_state = "sandwater_inner"
+ baseturfs = /turf/open/floor/plating/beach/coastline_t/sandwater_inner
/turf/open/floor/plating/ironsand
name = "iron sand"
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 00ac813a11..9cc2d67020 100755
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -438,3 +438,22 @@
/turf/AllowDrop()
return TRUE
+
+/turf/proc/add_vomit_floor(mob/living/carbon/M, toxvomit = 0)
+ var/obj/effect/decal/cleanable/vomit/V = new /obj/effect/decal/cleanable/vomit(src, M.get_static_viruses())
+ // If the vomit combined, apply toxicity and reagents to the old vomit
+ if (QDELETED(V))
+ V = locate() in src
+ // Make toxins vomit look different
+ if(toxvomit)
+ V.icon_state = "vomittox_[pick(1,4)]"
+ if(M.reagents)
+ clear_reagents_to_vomit_pool(M,V)
+
+/proc/clear_reagents_to_vomit_pool(mob/living/carbon/M, obj/effect/decal/cleanable/vomit/V)
+ M.reagents.trans_to(V, M.reagents.total_volume / 10)
+ for(var/datum/reagent/R in M.reagents.reagent_list) //clears the stomach of anything that might be digested as food
+ if(istype(R, /datum/reagent/consumable))
+ var/datum/reagent/consumable/nutri_check = R
+ if(nutri_check.nutriment_factor >0)
+ M.reagents.remove_reagent(R.id,R.volume)
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index a37e7217af..d67bbfd6c5 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -29,7 +29,7 @@
body += "Options panel for [M]"
if(M.client)
body += " played by [M.client] "
- body += "\[[M.client.holder ? M.client.holder.rank : "Player"]\]"
+ body += "\[[M.client.holder ? M.client.holder.rank : "Player"]\]"
if(CONFIG_GET(flag/use_exp_tracking))
body += "\[" + M.client.get_exp_living() + "\]"
diff --git a/code/modules/admin/permissionedit.dm b/code/modules/admin/permissionedit.dm
index e237a18f6a..8c608a6e5e 100644
--- a/code/modules/admin/permissionedit.dm
+++ b/code/modules/admin/permissionedit.dm
@@ -125,6 +125,7 @@
var/use_db
var/task = href_list["editrights"]
var/skip
+ var/legacy_only
if(task == "activate" || task == "deactivate" || task == "sync")
skip = TRUE
if(!CONFIG_GET(flag/admin_legacy_system) && CONFIG_GET(flag/protect_legacy_admins) && task == "rank")
@@ -135,10 +136,9 @@
if(D.rank in GLOB.protected_ranks)
to_chat(usr, "Editing the flags of this rank is blocked by server configuration.")
return
- if(CONFIG_GET(flag/load_legacy_ranks_only) && (task == "rank" || task == "permissions"))
- to_chat(usr, "Database rank loading is disabled, only temporary changes can be made to an admin's rank or permissions.")
- use_db = FALSE
- skip = TRUE
+ if(CONFIG_GET(flag/load_legacy_ranks_only) && (task == "add" || task == "rank" || task == "permissions"))
+ to_chat(usr, "Database rank loading is disabled, only temporary changes can be made to a rank's permissions and permanently creating a new rank is blocked.")
+ legacy_only = TRUE
if(check_rights(R_DBRANKS, FALSE))
if(!skip)
if(!SSdbcore.Connect())
@@ -165,16 +165,16 @@
return
switch(task)
if("add")
- admin_ckey = add_admin(null, use_db)
+ admin_ckey = add_admin(admin_ckey, use_db)
if(!admin_ckey)
return
- change_admin_rank(admin_ckey, use_db)
+ change_admin_rank(admin_ckey, use_db, null, legacy_only)
if("remove")
remove_admin(admin_ckey, use_db, D)
if("rank")
- change_admin_rank(admin_ckey, use_db, D)
+ change_admin_rank(admin_ckey, use_db, D, legacy_only)
if("permissions")
- change_admin_flags(admin_ckey, use_db, D)
+ change_admin_flags(admin_ckey, use_db, D, legacy_only)
if("activate")
force_readmin(admin_ckey, D)
if("deactivate")
@@ -240,9 +240,11 @@
log_admin("[key_name(usr)] forcefully deadmined [admin_ckey]")
D.deactivate() //after logs so the deadmined admin can see the message.
-/datum/admins/proc/change_admin_rank(admin_ckey, use_db, datum/admins/D)
+/datum/admins/proc/change_admin_rank(admin_ckey, use_db, datum/admins/D, legacy_only)
var/datum/admin_rank/R
- var/list/rank_names = list("*New Rank*")
+ var/list/rank_names = list()
+ if(!use_db || (use_db && !legacy_only))
+ rank_names += "*New Rank*"
for(R in GLOB.admin_ranks)
if((R.rights & usr.client.holder.rank.can_edit_rights) == R.rights)
rank_names[R.name] = R
@@ -297,7 +299,7 @@
message_admins("[key_name_admin(usr)] edited the admin rank of [admin_ckey] to [new_rank] [use_db ? "permanently" : "temporarily"]")
log_admin("[key_name(usr)] edited the admin rank of [admin_ckey] to [new_rank] [use_db ? "permanently" : "temporarily"]")
-/datum/admins/proc/change_admin_flags(admin_ckey, use_db, datum/admins/D)
+/datum/admins/proc/change_admin_flags(admin_ckey, use_db, datum/admins/D, legacy_only)
var/new_flags = input_bitfield(usr, "Include permission flags
[use_db ? "This will affect ALL admins with this rank." : "This will affect only the current admin [admin_ckey]"]", "admin_flags", D.rank.include_rights, 350, 590, allowed_edit_list = usr.client.holder.rank.can_edit_rights)
if(isnull(new_flags))
return
@@ -307,7 +309,7 @@
var/new_can_edit_flags = input_bitfield(usr, "Editable permission flags
These are the flags this rank is allowed to edit if they have access to the permissions panel.
They will be unable to modify admins to a rank that has a flag not included here.
[use_db ? "This will affect ALL admins with this rank." : "This will affect only the current admin [admin_ckey]"]", "admin_flags", D.rank.can_edit_rights, 350, 710, allowed_edit_list = usr.client.holder.rank.can_edit_rights)
if(isnull(new_can_edit_flags))
return
- if(use_db)
+ if(use_db || legacy_only)
var/old_flags
var/old_exclude_flags
var/old_can_edit_flags
@@ -351,6 +353,7 @@
D.rank.rights = new_flags &= ~new_exclude_flags
D.rank.include_rights = new_flags
D.rank.exclude_rights = new_exclude_flags
+ D.rank.can_edit_rights = new_can_edit_flags
var/client/C = GLOB.directory[admin_ckey] //find the client with the specified ckey (if they are logged in)
D.associate(C) //link up with the client and add verbs
message_admins("[key_name_admin(usr)] edited the permissions of [use_db ? " rank [D.rank.name] permanently" : "[admin_ckey] temporarily"]")
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 2fd212b4dc..e837953f4e 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -734,14 +734,17 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
if(!dresscode)
return
+ var/delete_pocket
var/mob/living/carbon/human/H
if(isobserver(M))
H = M.change_mob_type(/mob/living/carbon/human, null, null, TRUE)
else
H = M
+ if(alert("Drop Items in Pockets? No will delete them.", "Robust quick dress shop", "Yes", "No") == "No")
+ delete_pocket = TRUE
SSblackbox.record_feedback("tally", "admin_verb", 1, "Select Equipment") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- for (var/obj/item/I in H.get_equipped_items())
+ for (var/obj/item/I in H.get_equipped_items(delete_pocket))
qdel(I)
if(dresscode != "Naked")
H.equipOutfit(dresscode)
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index fd9de5308b..410e976b85 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -290,7 +290,7 @@
/datum/admins/proc/equipAntagOnDummy(mob/living/carbon/human/dummy/mannequin, datum/antagonist/antag)
- for(var/I in mannequin.get_equipped_items())
+ for(var/I in mannequin.get_equipped_items(TRUE))
qdel(I)
if (ispath(antag, /datum/antagonist/ert))
var/datum/antagonist/ert/ert = antag
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index be0b9d04bb..fb5111e88e 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -1277,7 +1277,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
if(!check_rights(R_ADMIN))
return
- var/list/punishment_list = list(ADMIN_PUNISHMENT_LIGHTNING, ADMIN_PUNISHMENT_BRAINDAMAGE, ADMIN_PUNISHMENT_GIB, ADMIN_PUNISHMENT_BSA, ADMIN_PUNISHMENT_FIREBALL, ADMIN_PUNISHMENT_ROD)
+ var/list/punishment_list = list(ADMIN_PUNISHMENT_LIGHTNING, ADMIN_PUNISHMENT_BRAINDAMAGE, ADMIN_PUNISHMENT_GIB, ADMIN_PUNISHMENT_BSA, ADMIN_PUNISHMENT_FIREBALL, ADMIN_PUNISHMENT_ROD, ADMIN_PUNISHMENT_SUPPLYPOD)
var/punishment = input("Choose a punishment", "DIVINE SMITING") as null|anything in punishment_list
@@ -1305,6 +1305,22 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
var/turf/startT = spaceDebrisStartLoc(startside, T.z)
var/turf/endT = spaceDebrisFinishLoc(startside, T.z)
new /obj/effect/immovablerod(startT, endT,target)
+ if(ADMIN_PUNISHMENT_SUPPLYPOD)
+ ///////load the supply pod up with something!
+ var/target_path = input(usr,"Enter typepath of an atom you'd like to send with the pod (type \"empty\" to send an empty pod):" ,"Typepath","/obj/item/reagent_containers/food/snacks/grown/harebell") as null|text
+ if (isnull(target_path))
+ return
+ if (target_path == "empty")//if you type "abort", spawn an empty pod
+ new /obj/effect/DPtarget(get_turf(target), null, POD_CENTCOM)
+ return
+ var/delivery = text2path(target_path)
+ if(!ispath(delivery))
+ delivery = pick_closest_path(target_path)
+ if(!delivery)
+ delivery = /obj/item/reagent_containers/food/snacks/grown/harebell
+ alert("That path is not allowed.")
+ //send the pod
+ new /obj/effect/DPtarget(get_turf(target), delivery, POD_CENTCOM)
var/msg = "[key_name_admin(usr)] punished [key_name_admin(target)] with [punishment]."
message_admins(msg)
diff --git a/code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm b/code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm
index f3de8d04a8..34a986aa97 100644
--- a/code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm
+++ b/code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm
@@ -44,6 +44,7 @@
icon = 'icons/turf/floors.dmi'
icon_state = "clockwork_floor"
layer = TURF_LAYER
+ plane = FLOOR_PLANE
/obj/effect/clockwork/overlay/floor/bloodcult //this is used by BLOOD CULT, it shouldn't use such a path...
icon_state = "cult"
\ No newline at end of file
diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm
index 32bf870886..d32eeee84b 100644
--- a/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm
+++ b/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm
@@ -50,7 +50,7 @@
user.emote("scream")
user.apply_damage(30, BRUTE, BODY_ZONE_HEAD)
user.adjustBrainLoss(30)
- addtimer(CALLBACK(user, /mob/living.proc/dropItemToGround), src, 1) //equipped happens before putting stuff on(but not before picking items up), 1). thus, we need to wait for it to be on before forcing it off.
+ addtimer(CALLBACK(user, /mob/living.proc/dropItemToGround, src, TRUE), 1) //equipped happens before putting stuff on(but not before picking items up), 1). thus, we need to wait for it to be on before forcing it off.
/obj/item/clothing/head/helmet/clockwork/mob_can_equip(mob/M, mob/equipper, slot, disable_warning = 0)
if(equipper && !is_servant_of_ratvar(equipper))
diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm
index 3df3d63ebd..5459e4c45e 100644
--- a/code/modules/antagonists/cult/blood_magic.dm
+++ b/code/modules/antagonists/cult/blood_magic.dm
@@ -64,7 +64,7 @@
qdel(nullify_spell)
return
BS = possible_spells[entered_spell_name]
- if(QDELETED(src) || owner.incapacitated() || !BS)
+ if(QDELETED(src) || owner.incapacitated() || !BS || (rune && !(locate(/obj/effect/rune/empower) in range(1, owner))) || (spells.len >= limit))
return
to_chat(owner,"You begin to carve unnatural symbols into your flesh!")
SEND_SOUND(owner, sound('sound/weapons/slice.ogg',0,1,10))
@@ -271,7 +271,6 @@
attached_action.desc += "
Has [attached_action.charges] use\s remaining."
attached_action.UpdateButtonIcon()
if(attached_action.charges <= 0)
- remove_mousepointer(ranged_ability_user.client)
remove_ranged_ability("You have exhausted the spell's power!")
qdel(src)
diff --git a/code/modules/antagonists/cult/cult_comms.dm b/code/modules/antagonists/cult/cult_comms.dm
index b51ff99041..4e6a50bf6b 100644
--- a/code/modules/antagonists/cult/cult_comms.dm
+++ b/code/modules/antagonists/cult/cult_comms.dm
@@ -457,7 +457,6 @@
new /obj/effect/temp_visual/cult/sparks(get_turf(target), ranged_ability_user.dir)
attached_action.throwing = FALSE
attached_action.cooldown = world.time + attached_action.base_cooldown
- remove_mousepointer(ranged_ability_user.client)
remove_ranged_ability("A pulse of blood magic surges through you as you shift [attached_action.throwee] through time and space.")
caller.update_action_buttons_icon()
addtimer(CALLBACK(caller, /mob.proc/update_action_buttons_icon), attached_action.base_cooldown)
diff --git a/code/modules/antagonists/highlander/highlander.dm b/code/modules/antagonists/highlander/highlander.dm
index 6f50e69c84..4e511d7fac 100644
--- a/code/modules/antagonists/highlander/highlander.dm
+++ b/code/modules/antagonists/highlander/highlander.dm
@@ -42,7 +42,7 @@
if(!istype(H))
return
- for(var/obj/item/I in H.get_equipped_items())
+ for(var/obj/item/I in H.get_equipped_items(TRUE))
qdel(I)
for(var/obj/item/I in H.held_items)
qdel(I)
diff --git a/code/modules/antagonists/revenant/revenant.dm b/code/modules/antagonists/revenant/revenant.dm
index c520b64146..03150c0254 100644
--- a/code/modules/antagonists/revenant/revenant.dm
+++ b/code/modules/antagonists/revenant/revenant.dm
@@ -109,11 +109,6 @@
revealed = FALSE
incorporeal_move = INCORPOREAL_MOVE_JAUNT
invisibility = INVISIBILITY_REVENANT
- if(staticOverlays.len)
- for(var/mob/living/simple_animal/drone/D in GLOB.drones_list)
- if(D && D.client && D.seeStatic)
- D.staticOverlays.Remove(staticOverlays)
- D.client.images.Remove(staticOverlays)
to_chat(src, "You are once more concealed.")
if(unstun_time && world.time >= unstun_time)
unstun_time = 0
@@ -250,15 +245,6 @@
else
to_chat(src, "You have been revealed!")
unreveal_time = unreveal_time + time
- if(staticOverlays.len)
- for(var/mob/living/simple_animal/drone/D in GLOB.drones_list)
- if(D && D.client && D.seeStatic)
- if(D.staticChoice in staticOverlays)
- D.staticOverlays |= staticOverlays[D.staticChoice]
- D.client.images |= staticOverlays[D.staticChoice]
- else
- D.staticOverlays |= staticOverlays["static"]
- D.client.images |= staticOverlays["static"]
update_spooky_icon()
/mob/living/simple_animal/revenant/proc/stun(time)
diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm
index 8557405801..d4d86cc087 100644
--- a/code/modules/antagonists/swarmer/swarmer.dm
+++ b/code/modules/antagonists/swarmer/swarmer.dm
@@ -373,6 +373,10 @@
to_chat(S, "Attempting to dismantle this machine would result in an immediate counterattack. Aborting.")
return FALSE
+/obj/machinery/porta_turret_cover/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
+ to_chat(S, "Attempting to dismantle this machine would result in an immediate counterattack. Aborting.")
+ return FALSE
+
/mob/living/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
S.DisperseTarget(src)
return TRUE
@@ -405,6 +409,10 @@
to_chat(S, "This object does not contain enough materials to work with.")
return FALSE
+/obj/machinery/field/generator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
+ to_chat(S, "Destroying this object would cause a catastrophic chain reaction. Aborting.")
+ return FALSE
+
////END CTRL CLICK FOR SWARMERS////
/mob/living/simple_animal/hostile/swarmer/proc/Fabricate(atom/fabrication_object,fabrication_cost = 0)
diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
index f3ea4ef2ea..ae750adebc 100644
--- a/code/modules/antagonists/traitor/datum_traitor.dm
+++ b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -164,7 +164,7 @@
kill_objective.find_target()
add_objective(kill_objective)
else
- if(prob(15) && !(locate(/datum/objective/download in owner.objectives)))
+ if(prob(15) && !(locate(/datum/objective/download) in owner.objectives) && !(owner.assigned_role in list("Research Director", "Scientist", "Roboticist")))
var/datum/objective/download/download_objective = new
download_objective.owner = owner
download_objective.gen_amount_goal()
diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm
index 25a0e804a4..9e3ffaf483 100644
--- a/code/modules/assembly/bomb.dm
+++ b/code/modules/assembly/bomb.dm
@@ -117,7 +117,7 @@
if(isigniter(assembly.a_left) == isigniter(assembly.a_right))
return
- if((src in user.get_equipped_items()) && !user.canUnEquip(src))
+ if((src in user.get_equipped_items(TRUE)) && !user.canUnEquip(src))
to_chat(user, "[src] is stuck to you!")
return
diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm
index dd953dcb11..ebfc9fbf2d 100644
--- a/code/modules/atmospherics/gasmixtures/reactions.dm
+++ b/code/modules/atmospherics/gasmixtures/reactions.dm
@@ -111,7 +111,7 @@
var/list/cached_gases = air.gases //this speeds things up because accessing datum vars is slow
var/temperature = air.temperature
var/list/cached_results = air.reaction_results
- cached_results[id] = 0
+ cached_results["fire"] = 0
var/turf/open/location = isturf(holder) ? holder : null
var/burned_fuel = 0
@@ -131,7 +131,7 @@
ASSERT_GAS(/datum/gas/water_vapor, air) //oxygen+more-or-less hydrogen=H2O
cached_gases[/datum/gas/water_vapor][MOLES] += burned_fuel/TRITIUM_BURN_OXY_FACTOR
- cached_results[id] += burned_fuel
+ cached_results["fire"] += burned_fuel
if(energy_released > 0)
var/new_heat_capacity = air.heat_capacity()
@@ -148,7 +148,7 @@
item.temperature_expose(air, temperature, CELL_VOLUME)
location.temperature_expose(air, temperature, CELL_VOLUME)
- return cached_results[id] ? REACTING : NO_REACTION
+ return cached_results["fire"] ? REACTING : NO_REACTION
//plasma combustion: combustion of oxygen and plasma (treated as hydrocarbons). creates hotspots. exothermic
/datum/gas_reaction/plasmafire
@@ -169,7 +169,7 @@
var/list/cached_gases = air.gases //this speeds things up because accessing datum vars is slow
var/temperature = air.temperature
var/list/cached_results = air.reaction_results
- cached_results[id] = 0
+ cached_results["fire"] = 0
var/turf/open/location = isturf(holder) ? holder : null
//Handle plasma burning
@@ -206,7 +206,7 @@
energy_released += FIRE_PLASMA_ENERGY_RELEASED * (plasma_burn_rate)
- cached_results[id] += (plasma_burn_rate)*(1+oxygen_burn_rate)
+ cached_results["fire"] += (plasma_burn_rate)*(1+oxygen_burn_rate)
if(energy_released > 0)
var/new_heat_capacity = air.heat_capacity()
@@ -223,7 +223,7 @@
item.temperature_expose(air, temperature, CELL_VOLUME)
location.temperature_expose(air, temperature, CELL_VOLUME)
- return cached_results[id] ? REACTING : NO_REACTION
+ return cached_results["fire"] ? REACTING : NO_REACTION
//fusion: a terrible idea that was fun but broken. Now reworked to be less broken and more interesting. Again.
/datum/gas_reaction/fusion
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
index 671eca928e..a737b3c688 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
@@ -62,6 +62,18 @@ Acts like a normal vent, but has an input AND output.
/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume
name = "large dual-port air vent"
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix
+ id = INCINERATOR_TOXMIX_DP_VENTPUMP
+ frequency = FREQ_AIRLOCK_CONTROL
+
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos
+ id = INCINERATOR_ATMOS_DP_VENTPUMP
+ frequency = FREQ_AIRLOCK_CONTROL
+
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_syndicatelava
+ id = INCINERATOR_SYNDICATELAVA_DP_VENTPUMP
+ frequency = FREQ_AIRLOCK_CONTROL
+
/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 2d12b7b0a4..2723370cb9 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -520,7 +520,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
if(!account_join_date)
account_age = -1
else
- var/datum/DBQuery/query_datediff = SSdbcore.NewQuery("SELECT DATEDIFF(Now(),[account_join_date])")
+ var/datum/DBQuery/query_datediff = SSdbcore.NewQuery("SELECT DATEDIFF(Now(),'[account_join_date]')")
if(!query_datediff.Execute())
return
if(query_datediff.NextRow())
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 7eb1c25455..5c6c0a8229 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1380,7 +1380,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(pickedui)
UI_style = pickedui
if("pda_style")
- var/pickedPDAStyle = input(user, "Choose your PDA style.", "Character Preference") as null|anything in list(MONO, SHARE, ORBITRON, VT)
+ var/pickedPDAStyle = input(user, "Choose your PDA style.", "Character Preference", pda_style) as null|anything in GLOB.pda_styles
if(pickedPDAStyle)
pda_style = pickedPDAStyle
if("pda_color")
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index f17ddf8b7c..ad53f8f0dd 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -168,7 +168,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
ghost_others = sanitize_inlist(ghost_others, GLOB.ghost_others_options, GHOST_OTHERS_DEFAULT_OPTION)
menuoptions = SANITIZE_LIST(menuoptions)
be_special = SANITIZE_LIST(be_special)
- pda_style = sanitize_inlist(MONO, VT, SHARE, ORBITRON)
+ pda_style = sanitize_inlist(pda_style, GLOB.pda_styles, initial(pda_style))
pda_color = sanitize_hexcolor(pda_color, 6, 1, initial(pda_color))
screenshake = sanitize_integer(screenshake, 0, 800, initial(screenshake))
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index 6375f7986f..88752f7415 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -151,7 +151,7 @@
r_hand = /obj/item/twohanded/fireaxe
/datum/outfit/psycho/post_equip(mob/living/carbon/human/H)
- for(var/obj/item/carried_item in H.get_equipped_items())
+ for(var/obj/item/carried_item in H.get_equipped_items(TRUE))
carried_item.add_mob_blood(H)//Oh yes, there will be blood...
for(var/obj/item/I in H.held_items)
I.add_mob_blood(H)
diff --git a/code/modules/integrated_electronics/core/printer.dm b/code/modules/integrated_electronics/core/printer.dm
index 61edd75ed1..2cab5ad3b9 100644
--- a/code/modules/integrated_electronics/core/printer.dm
+++ b/code/modules/integrated_electronics/core/printer.dm
@@ -87,7 +87,7 @@
return
to_chat(user, "You begin recycling [EA]'s components...")
playsound(src, 'sound/items/electronic_assembly_emptying.ogg', 50, TRUE)
- if(!do_after(user, 30, target = src)) //short channel so you don't accidentally start emptying out a complex assembly
+ if(!do_after(user, 30, target = src) || recycling) //short channel so you don't accidentally start emptying out a complex assembly
return
recycling = TRUE
var/datum/component/material_container/mats = GetComponent(/datum/component/material_container)
diff --git a/code/modules/integrated_electronics/subtypes/manipulation.dm b/code/modules/integrated_electronics/subtypes/manipulation.dm
index f4cc363afb..645e54c153 100644
--- a/code/modules/integrated_electronics/subtypes/manipulation.dm
+++ b/code/modules/integrated_electronics/subtypes/manipulation.dm
@@ -286,6 +286,7 @@
push_data()
if(1)
TR.weedlevel = 0
+ TR.update_icon()
if(2)
if(TR.myseed) //Could be that they're just using it as a de-weeder
TR.age = 0
diff --git a/code/modules/jobs/job_types/job.dm b/code/modules/jobs/job_types/job.dm
index 87db3146e4..1cd7f59a27 100644
--- a/code/modules/jobs/job_types/job.dm
+++ b/code/modules/jobs/job_types/job.dm
@@ -49,6 +49,7 @@
var/exp_type_department = ""
//The amount of good boy points playing this role will earn you towards a higher chance to roll antagonist next round
+ //can be overriden by antag_rep.txt config
var/antag_rep = 10
//Only override this proc
@@ -67,6 +68,11 @@
/datum/job/proc/special_check_latejoin(client/C)
return TRUE
+/datum/job/proc/GetAntagRep()
+ . = CONFIG_GET(keyed_number_list/antag_rep)[lowertext(title)]
+ if(. == null)
+ return antag_rep
+
//Don't override this unless the job transforms into a non-human (Silicons do this for example)
/datum/job/proc/equip(mob/living/carbon/human/H, visualsOnly = FALSE, announce = TRUE, latejoin = FALSE)
if(!H)
diff --git a/code/modules/library/soapstone.dm b/code/modules/library/soapstone.dm
index 17df503765..e51103937f 100644
--- a/code/modules/library/soapstone.dm
+++ b/code/modules/library/soapstone.dm
@@ -56,7 +56,7 @@
playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1)
user.visible_message("[user] starts engraving a message into [T]...", "You start engraving a message into [T]...", "You hear a chipping sound.")
if(can_use() && do_after(user, tool_speed, target = T) && can_use()) //This looks messy but it's actually really clever!
- if(!locate(/obj/structure/chisel_message in T))
+ if(!locate(/obj/structure/chisel_message) in T)
user.visible_message("[user] leaves a message for future spacemen!", "You engrave a message into [T]!", "You hear a chipping sound.")
playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1)
var/obj/structure/chisel_message/M = new(T)
diff --git a/code/modules/lighting/lighting_object.dm b/code/modules/lighting/lighting_object.dm
index fe25dc9439..c0c5a411e7 100644
--- a/code/modules/lighting/lighting_object.dm
+++ b/code/modules/lighting/lighting_object.dm
@@ -11,8 +11,6 @@
layer = LIGHTING_LAYER
invisibility = INVISIBILITY_LIGHTING
- blend_mode = BLEND_ADD
-
var/needs_update = FALSE
var/turf/myturf
diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm
index b5b2091eb9..0cfdf322c4 100644
--- a/code/modules/mapping/map_template.dm
+++ b/code/modules/mapping/map_template.dm
@@ -57,12 +57,12 @@
if(!bounds)
return FALSE
- smooth_zlevel(world.maxz)
repopulate_sorted_areas()
SSlighting.initialize_lighting_objects(block(locate(bounds[MAP_MINX], bounds[MAP_MINY], bounds[MAP_MINZ]),locate(bounds[MAP_MAXX], bounds[MAP_MAXY], bounds[MAP_MAXZ])))
//initialize things that are normally initialized after map load
initTemplateBounds(bounds)
+ smooth_zlevel(world.maxz)
log_game("Z-level [name] loaded at at [x],[y],[world.maxz]")
return level
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 4e945b437f..44af3936a8 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -379,7 +379,7 @@
/mob/living/proc/unequip_everything()
var/list/items = list()
- items |= get_equipped_items()
+ items |= get_equipped_items(TRUE)
for(var/I in items)
dropItemToGround(I)
drop_all_held_items()
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 6b53972d39..944e5774ad 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -674,23 +674,6 @@
else
to_chat(C, "You feel a breath of fresh air... which is a sensation you don't recognise...")
-/mob/living/carbon/human/generateStaticOverlay()
- var/image/staticOverlay = image(icon('icons/effects/effects.dmi', "static"), loc = src)
- staticOverlay.override = 1
- staticOverlays["static"] = staticOverlay
-
- staticOverlay = image(icon('icons/effects/effects.dmi', "blank"), loc = src)
- staticOverlay.override = 1
- staticOverlays["blank"] = staticOverlay
-
- staticOverlay = getLetterImage(src, "H", 1)
- staticOverlay.override = 1
- staticOverlays["letter"] = staticOverlay
-
- staticOverlay = getRandomAnimalImage(src)
- staticOverlay.override = 1
- staticOverlays["animal"] = staticOverlay
-
/mob/living/carbon/human/cuff_resist(obj/item/I)
if(dna && dna.check_mutation(HULK))
say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index abf8302590..7bdc65fcb0 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1,15 +1,5 @@
/mob/living/Initialize()
. = ..()
- generateStaticOverlay()
- if(staticOverlays.len)
- for(var/mob/living/simple_animal/drone/D in GLOB.player_list)
- if(D && D.seeStatic)
- if(D.staticChoice in staticOverlays)
- D.staticOverlays |= staticOverlays[D.staticChoice]
- D.client.images |= staticOverlays[D.staticChoice]
- else //no choice? force static
- D.staticOverlays |= staticOverlays["static"]
- D.client.images |= staticOverlays["static"]
if(unique_name)
name = "[name] ([rand(1, 1000)])"
real_name = name
@@ -40,47 +30,14 @@
if(buckled)
buckled.unbuckle_mob(src,force=1)
- for(var/mob/living/simple_animal/drone/D in GLOB.player_list)
- for(var/image/I in staticOverlays)
- D.staticOverlays.Remove(I)
- D.client.images.Remove(I)
- qdel(I)
- staticOverlays.len = 0
remove_from_all_data_huds()
GLOB.mob_living_list -= src
QDEL_LIST(diseases)
return ..()
-/mob/living/ghostize(can_reenter_corpse = 1)
- var/prev_client = client
- . = ..()
- if(.)
- if(ranged_ability && prev_client)
- ranged_ability.remove_mousepointer(prev_client)
-
-
/mob/living/proc/OpenCraftingMenu()
return
-/mob/living/proc/generateStaticOverlay()
- staticOverlays.Add(list("static", "blank", "letter", "animal"))
- var/image/staticOverlay = image(getStaticIcon(new/icon(icon,icon_state)), loc = src)
- staticOverlay.override = 1
- staticOverlays["static"] = staticOverlay
-
- staticOverlay = image(getBlankIcon(new/icon(icon, icon_state)), loc = src)
- staticOverlay.override = 1
- staticOverlays["blank"] = staticOverlay
-
- staticOverlay = getLetterImage(src)
- staticOverlay.override = 1
- staticOverlays["letter"] = staticOverlay
-
- staticOverlay = getRandomAnimalImage(src)
- staticOverlay.override = 1
- staticOverlays["animal"] = staticOverlay
-
-
//Generic Collide(). Override MobCollide() and ObjCollide() instead of this.
/mob/living/Collide(atom/A)
if(..()) //we are thrown onto something
@@ -1184,6 +1141,11 @@
clear_fullscreen("remote_view", 0)
update_pipe_vision()
+/mob/living/update_mouse_pointer()
+ ..()
+ if (client && ranged_ability && ranged_ability.ranged_mousepointer)
+ client.mouse_pointer_icon = ranged_ability.ranged_mousepointer
+
/mob/living/vv_edit_var(var_name, var_value)
switch(var_name)
if("stat")
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 94b1e64f39..1016387cb5 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -55,7 +55,6 @@
var/mob_size = MOB_SIZE_HUMAN
var/list/mob_biotypes = list(MOB_ORGANIC)
var/metabolism_efficiency = 1 //more or less efficiency to metabolize helpful/harmful reagents and regulate body temperature..
- var/list/image/staticOverlays = list()
var/has_limbs = 0 //does the mob have distinct limbs?(arms,legs, chest,head)
var/list/pipes_shown = list()
diff --git a/code/modules/mob/living/logout.dm b/code/modules/mob/living/logout.dm
index b7e9036a8a..d2c50559c6 100644
--- a/code/modules/mob/living/logout.dm
+++ b/code/modules/mob/living/logout.dm
@@ -1,7 +1,5 @@
/mob/living/Logout()
update_z(null)
- if(ranged_ability && client)
- ranged_ability.remove_mousepointer(client)
..()
if(!key && mind) //key and mind have become separated.
mind.active = 0 //This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body.
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 8664a111ae..cbc04d11be 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -74,7 +74,7 @@
var/nuking = FALSE
var/obj/machinery/doomsday_device/doomsday_device
- var/mob/camera/aiEye/eyeobj = new
+ var/mob/camera/aiEye/eyeobj
var/sprint = 10
var/cooldown = 0
var/acceleration = 1
@@ -85,6 +85,13 @@
var/datum/action/innate/deploy_last_shell/redeploy_action = new
var/chnotify = 0
+ var/multicam_allowed = FALSE
+ var/multicam_on = FALSE
+ var/obj/screen/movable/pic_in_pic/ai/master_multicam
+ var/list/multicam_screens = list()
+ var/list/all_eyes = list()
+ var/max_multicams = 6
+
/mob/living/silicon/ai/Initialize(mapload, datum/ai_laws/L, mob/target_ai)
. = ..()
if(!target_ai) //If there is no player/brain inside.
@@ -116,8 +123,7 @@
job = "AI"
- eyeobj.ai = src
- eyeobj.forceMove(src.loc)
+ create_eye()
rename_self("ai")
holo_icon = getHologramIcon(icon('icons/mob/ai.dmi',"default"))
@@ -871,9 +877,12 @@
current = A
if(client)
if(ismovableatom(A))
+ if(A != GLOB.ai_camera_room_landmark)
+ end_multicam()
client.perspective = EYE_PERSPECTIVE
client.eye = A
else
+ end_multicam()
if(isturf(loc))
if(eyeobj)
client.eye = eyeobj
@@ -993,3 +1002,11 @@
. = ..()
if(!target_ai)
target_ai = src //cheat! just give... ourselves as the spawned AI, because that's technically correct
+
+/mob/living/silicon/ai/proc/camera_visibility(mob/camera/aiEye/moved_eye)
+ GLOB.cameranet.visibility(moved_eye, client, all_eyes)
+
+/mob/living/silicon/ai/forceMove(atom/destination)
+ . = ..()
+ if(.)
+ end_multicam()
diff --git a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
index 815ddb64ea..5cc08ff1e0 100644
--- a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
@@ -38,29 +38,63 @@ GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new)
// Updates what the aiEye can see. It is recommended you use this when the aiEye moves or it's location is set.
-/datum/cameranet/proc/visibility(mob/camera/aiEye/ai)
- // 0xf = 15
- var/x1 = max(0, ai.x - 16) & ~(CHUNK_SIZE - 1)
- var/y1 = max(0, ai.y - 16) & ~(CHUNK_SIZE - 1)
- var/x2 = min(world.maxx, ai.x + 16) & ~(CHUNK_SIZE - 1)
- var/y2 = min(world.maxy, ai.y + 16) & ~(CHUNK_SIZE - 1)
+/datum/cameranet/proc/visibility(list/moved_eyes, client/C, list/other_eyes)
+ if(!islist(moved_eyes))
+ moved_eyes = moved_eyes ? list(moved_eyes) : list()
+ if(islist(other_eyes))
+ other_eyes = (other_eyes - moved_eyes)
+ else
+ other_eyes = list()
- var/list/visibleChunks = list()
+ var/list/chunks_pre_seen = list()
+ var/list/chunks_post_seen = list()
- for(var/x = x1; x <= x2; x += CHUNK_SIZE)
- for(var/y = y1; y <= y2; y += CHUNK_SIZE)
- visibleChunks |= getCameraChunk(x, y, ai.z)
+ for(var/V in moved_eyes)
+ var/mob/camera/aiEye/eye = V
+ if(C)
+ chunks_pre_seen |= eye.visibleCameraChunks
+ // 0xf = 15
+ var/static_range = eye.static_visibility_range
+ var/x1 = max(0, eye.x - static_range) & ~(CHUNK_SIZE - 1)
+ var/y1 = max(0, eye.y - static_range) & ~(CHUNK_SIZE - 1)
+ var/x2 = min(world.maxx, eye.x + static_range) & ~(CHUNK_SIZE - 1)
+ var/y2 = min(world.maxy, eye.y + static_range) & ~(CHUNK_SIZE - 1)
- var/list/remove = ai.visibleCameraChunks - visibleChunks
- var/list/add = visibleChunks - ai.visibleCameraChunks
+ var/list/visibleChunks = list()
- for(var/chunk in remove)
- var/datum/camerachunk/c = chunk
- c.remove(ai)
+ for(var/x = x1; x <= x2; x += CHUNK_SIZE)
+ for(var/y = y1; y <= y2; y += CHUNK_SIZE)
+ visibleChunks |= getCameraChunk(x, y, eye.z)
- for(var/chunk in add)
- var/datum/camerachunk/c = chunk
- c.add(ai)
+ var/list/remove = eye.visibleCameraChunks - visibleChunks
+ var/list/add = visibleChunks - eye.visibleCameraChunks
+
+ for(var/chunk in remove)
+ var/datum/camerachunk/c = chunk
+ c.remove(eye, FALSE)
+
+ for(var/chunk in add)
+ var/datum/camerachunk/c = chunk
+ c.add(eye, FALSE)
+
+ if(C)
+ chunks_post_seen |= eye.visibleCameraChunks
+
+ if(C)
+ for(var/V in other_eyes)
+ var/mob/camera/aiEye/eye = V
+ chunks_post_seen |= eye.visibleCameraChunks
+
+ var/list/remove = chunks_pre_seen - chunks_post_seen
+ var/list/add = chunks_post_seen - chunks_pre_seen
+
+ for(var/chunk in remove)
+ var/datum/camerachunk/c = chunk
+ C.images -= c.obscured
+
+ for(var/chunk in add)
+ var/datum/camerachunk/c = chunk
+ C.images += c.obscured
// Updates the chunks that the turf is located in. Use this when obstacles are destroyed or when doors open.
diff --git a/code/modules/mob/living/silicon/ai/freelook/chunk.dm b/code/modules/mob/living/silicon/ai/freelook/chunk.dm
index f062c7e010..e03bba3067 100644
--- a/code/modules/mob/living/silicon/ai/freelook/chunk.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/chunk.dm
@@ -20,10 +20,11 @@
// Add an AI eye to the chunk, then update if changed.
-/datum/camerachunk/proc/add(mob/camera/aiEye/eye)
- var/client/client = eye.GetViewerClient()
- if(client)
- client.images += obscured
+/datum/camerachunk/proc/add(mob/camera/aiEye/eye, add_images = TRUE)
+ if(add_images)
+ var/client/client = eye.GetViewerClient()
+ if(client)
+ client.images += obscured
eye.visibleCameraChunks += src
visible++
seenby += eye
@@ -32,10 +33,11 @@
// Remove an AI eye from the chunk, then update if changed.
-/datum/camerachunk/proc/remove(mob/camera/aiEye/eye)
- var/client/client = eye.GetViewerClient()
- if(client)
- client.images -= obscured
+/datum/camerachunk/proc/remove(mob/camera/aiEye/eye, remove_images = TRUE)
+ if(remove_images)
+ var/client/client = eye.GetViewerClient()
+ if(client)
+ client.images -= obscured
eye.visibleCameraChunks -= src
seenby -= eye
if(visible > 0)
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index b5b1bd082b..469639d58f 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -11,6 +11,7 @@
var/mob/living/silicon/ai/ai = null
var/relay_speech = FALSE
var/use_static = TRUE
+ var/static_visibility_range = 16
// Use this when setting the aiEye's location.
// It will also stream the chunk that the new loc is in.
@@ -25,8 +26,8 @@
else
moveToNullspace() // ????
if(use_static)
- GLOB.cameranet.visibility(src)
- if(ai.client)
+ ai.camera_visibility(src)
+ if(ai.client && !ai.multicam_on)
ai.client.eye = src
update_parallax_contents()
//Holopad
@@ -35,6 +36,8 @@
H.move_hologram(ai, T)
if(ai.camera_light_on)
ai.light_cameras()
+ if(ai.master_multicam)
+ ai.master_multicam.refresh_view()
/mob/camera/aiEye/Move()
return 0
@@ -45,20 +48,27 @@
return null
/mob/camera/aiEye/proc/RemoveImages()
- if(use_static)
- for(var/datum/camerachunk/chunk in visibleCameraChunks)
- chunk.remove(src)
+ var/client/C = GetViewerClient()
+ if(C && use_static)
+ for(var/V in visibleCameraChunks)
+ var/datum/camerachunk/c = V
+ C.images -= c.obscured
/mob/camera/aiEye/Destroy()
- ai = null
+ if(ai)
+ ai.all_eyes -= src
+ ai = null
+ for(var/V in visibleCameraChunks)
+ var/datum/camerachunk/c = V
+ c.remove(src)
return ..()
/atom/proc/move_camera_by_click()
if(isAI(usr))
var/mob/living/silicon/ai/AI = usr
- if(AI.eyeobj && AI.client.eye == AI.eyeobj)
+ if(AI.eyeobj && (AI.multicam_on || (AI.client.eye == AI.eyeobj)) && (AI.eyeobj.z == z))
AI.cameraFollow = null
- if (isturf(src.loc) || isturf(src))
+ if (isturf(loc) || isturf(src))
AI.eyeobj.setLoc(src)
// This will move the AIEye. It will also cause lights near the eye to light up, if toggled.
@@ -95,12 +105,19 @@
if(!eyeobj || !eyeobj.loc || QDELETED(eyeobj))
to_chat(src, "ERROR: Eyeobj not found. Creating new eye...")
- eyeobj = new(loc)
- eyeobj.ai = src
- eyeobj.name = "[src.name] (AI Eye)" // Give it a name
+ create_eye()
eyeobj.setLoc(loc)
+/mob/living/silicon/ai/proc/create_eye()
+ if(eyeobj)
+ return
+ eyeobj = new /mob/camera/aiEye()
+ all_eyes += eyeobj
+ eyeobj.ai = src
+ eyeobj.setLoc(loc)
+ eyeobj.name = "[name] (AI Eye)"
+
/mob/living/silicon/ai/verb/toggle_acceleration()
set category = "AI Commands"
set name = "Toggle Camera Acceleration"
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index a060c899d9..0fd33110b6 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -96,6 +96,7 @@
/mob/living/silicon/ai/proc/start_RestorePowerRoutine()
to_chat(src, "Backup battery online. Scanners, camera, and radio interface offline. Beginning fault-detection.")
+ end_multicam()
sleep(50)
var/turf/T = get_turf(src)
var/area/AIarea = get_area(src)
diff --git a/code/modules/mob/living/silicon/ai/login.dm b/code/modules/mob/living/silicon/ai/login.dm
index c771f60aa2..2dc9a1fb1c 100644
--- a/code/modules/mob/living/silicon/ai/login.dm
+++ b/code/modules/mob/living/silicon/ai/login.dm
@@ -4,4 +4,6 @@
for(var/obj/machinery/ai_status_display/O in GLOB.ai_status_displays) //change status
O.mode = 1
O.emotion = "Neutral"
+ if(multicam_on)
+ end_multicam()
view_core()
diff --git a/code/modules/mob/living/silicon/ai/multicam.dm b/code/modules/mob/living/silicon/ai/multicam.dm
new file mode 100644
index 0000000000..b6f3724fcf
--- /dev/null
+++ b/code/modules/mob/living/silicon/ai/multicam.dm
@@ -0,0 +1,266 @@
+//Picture in picture
+
+/obj/screen/movable/pic_in_pic/ai
+ var/mob/living/silicon/ai/ai
+ var/mutable_appearance/highlighted_background
+ var/highlighted = FALSE
+ var/mob/camera/aiEye/pic_in_pic/aiEye
+
+/obj/screen/movable/pic_in_pic/ai/Initialize()
+ . = ..()
+ aiEye = new /mob/camera/aiEye/pic_in_pic()
+ aiEye.screen = src
+
+/obj/screen/movable/pic_in_pic/ai/Destroy()
+ set_ai(null)
+ QDEL_NULL(aiEye)
+ return ..()
+
+/obj/screen/movable/pic_in_pic/ai/Click()
+ ..()
+ if(ai)
+ ai.select_main_multicam_window(src)
+
+/obj/screen/movable/pic_in_pic/ai/make_backgrounds()
+ ..()
+ highlighted_background = new /mutable_appearance()
+ highlighted_background.icon = 'icons/misc/pic_in_pic.dmi'
+ highlighted_background.icon_state = "background_highlight"
+ highlighted_background.layer = SPACE_LAYER
+
+/obj/screen/movable/pic_in_pic/ai/add_background()
+ if((width > 0) && (height > 0))
+ var/matrix/M = matrix()
+ M.Scale(width + 0.5, height + 0.5)
+ M.Translate((width-1)/2 * world.icon_size, (height-1)/2 * world.icon_size)
+ highlighted_background.transform = M
+ standard_background.transform = M
+ add_overlay(highlighted ? highlighted_background : standard_background)
+
+/obj/screen/movable/pic_in_pic/ai/set_view_size(width, height, do_refresh = TRUE)
+ aiEye.static_visibility_range = (round(max(width, height) / 2) + 1)
+ if(ai)
+ ai.camera_visibility(aiEye)
+ ..()
+
+/obj/screen/movable/pic_in_pic/ai/set_view_center(atom/target, do_refresh = TRUE)
+ ..()
+ aiEye.setLoc(get_turf(target))
+
+/obj/screen/movable/pic_in_pic/ai/refresh_view()
+ ..()
+ aiEye.setLoc(get_turf(center))
+
+/obj/screen/movable/pic_in_pic/ai/proc/highlight()
+ if(highlighted)
+ return
+ highlighted = TRUE
+ cut_overlay(standard_background)
+ add_overlay(highlighted_background)
+
+/obj/screen/movable/pic_in_pic/ai/proc/unhighlight()
+ if(!highlighted)
+ return
+ highlighted = FALSE
+ cut_overlay(highlighted_background)
+ add_overlay(standard_background)
+
+/obj/screen/movable/pic_in_pic/ai/proc/set_ai(mob/living/silicon/ai/new_ai)
+ if(ai)
+ ai.multicam_screens -= src
+ ai.all_eyes -= aiEye
+ if(ai.master_multicam == src)
+ ai.master_multicam = null
+ if(ai.multicam_on)
+ unshow_to(ai.client)
+ ai = new_ai
+ if(new_ai)
+ new_ai.multicam_screens += src
+ ai.all_eyes += aiEye
+ if(new_ai.multicam_on)
+ show_to(new_ai.client)
+
+//Turf, area, and landmark for the viewing room
+
+/turf/open/ai_visible
+ name = ""
+ icon = 'icons/misc/pic_in_pic.dmi'
+ icon_state = "room_background"
+ flags_1 = NOJAUNT_1
+
+/turf/open/ai_visible/Initialize()
+ . = ..()
+ obscured = image(null, src, null)
+
+/area/ai_multicam_room
+ name = "ai_multicam_room"
+ icon_state = "ai_camera_room"
+ dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
+ valid_territory = FALSE
+ ambientsounds = list()
+ blob_allowed = FALSE
+ noteleport = TRUE
+ hidden = TRUE
+ safe = TRUE
+
+GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room)
+
+/obj/effect/landmark/ai_multicam_room
+ name = "ai camera room"
+ icon = 'icons/mob/landmarks.dmi'
+ icon_state = "x"
+
+/obj/effect/landmark/ai_multicam_room/Initialize()
+ . = ..()
+ qdel(GLOB.ai_camera_room_landmark)
+ GLOB.ai_camera_room_landmark = src
+
+/obj/effect/landmark/ai_multicam_room/Destroy()
+ if(GLOB.ai_camera_room_landmark == src)
+ GLOB.ai_camera_room_landmark = null
+ return ..()
+
+//Dummy camera eyes
+
+/mob/camera/aiEye/pic_in_pic
+ name = "Secondary AI Eye"
+ var/obj/screen/movable/pic_in_pic/ai/screen
+ var/list/cameras_telegraphed = list()
+ var/telegraph_cameras = TRUE
+ var/telegraph_range = 7
+
+/mob/camera/aiEye/pic_in_pic/GetViewerClient()
+ if(screen && screen.ai)
+ return screen.ai.client
+
+/mob/camera/aiEye/pic_in_pic/setLoc(turf/T)
+ if (T)
+ forceMove(T)
+ else
+ moveToNullspace()
+ if(screen && screen.ai)
+ screen.ai.camera_visibility(src)
+ else
+ GLOB.cameranet.visibility(src)
+ update_camera_telegraphing()
+
+/mob/camera/aiEye/pic_in_pic/proc/update_camera_telegraphing()
+ if(!telegraph_cameras)
+ return
+ var/list/obj/machinery/camera/add = list()
+ var/list/obj/machinery/camera/remove = list()
+ var/list/obj/machinery/camera/visible = list()
+ for (var/VV in visibleCameraChunks)
+ var/datum/camerachunk/CC = VV
+ for (var/V in CC.cameras)
+ var/obj/machinery/camera/C = V
+ if (!C.can_use() || (get_dist(C, src) > telegraph_range))
+ continue
+ visible |= C
+
+ add = visible - cameras_telegraphed
+ remove = cameras_telegraphed - visible
+
+ for (var/V in remove)
+ var/obj/machinery/camera/C = V
+ if(QDELETED(C))
+ continue
+ cameras_telegraphed -= C
+ C.in_use_lights--
+ C.update_icon()
+ for (var/V in add)
+ var/obj/machinery/camera/C = V
+ if(QDELETED(C))
+ continue
+ cameras_telegraphed |= C
+ C.in_use_lights++
+ C.update_icon()
+
+/mob/camera/aiEye/pic_in_pic/proc/disable_camera_telegraphing()
+ telegraph_cameras = FALSE
+ for (var/V in cameras_telegraphed)
+ var/obj/machinery/camera/C = V
+ if(QDELETED(C))
+ continue
+ C.in_use_lights--
+ C.update_icon()
+ cameras_telegraphed.Cut()
+
+/mob/camera/aiEye/pic_in_pic/Destroy()
+ disable_camera_telegraphing()
+ return ..()
+
+//AI procs
+
+/mob/living/silicon/ai/proc/drop_new_multicam(silent = FALSE)
+ if(!multicam_allowed)
+ if(!silent)
+ to_chat(src, "This action is currently disabled. Contact an administrator to enable this feature.")
+ return
+ if(!eyeobj)
+ return
+ if(multicam_screens.len >= max_multicams)
+ if(!silent)
+ to_chat(src, "Cannot place more than [max_multicams] multicamera windows.")
+ return
+ var/obj/screen/movable/pic_in_pic/ai/C = new /obj/screen/movable/pic_in_pic/ai()
+ C.set_view_size(3, 3, FALSE)
+ C.set_view_center(get_turf(eyeobj))
+ C.set_ai(src)
+ if(!silent)
+ to_chat(src, "Added new multicamera window.")
+ return C
+
+/mob/living/silicon/ai/proc/toggle_multicam()
+ if(!multicam_allowed)
+ to_chat(src, "This action is currently disabled. Contact an administrator to enable this feature.")
+ return
+ if(multicam_on)
+ end_multicam()
+ else
+ start_multicam()
+
+/mob/living/silicon/ai/proc/start_multicam()
+ if(multicam_on || aiRestorePowerRoutine || !isturf(loc))
+ return
+ if(!GLOB.ai_camera_room_landmark)
+ to_chat(src, "This function is not available at this time.")
+ return
+ multicam_on = TRUE
+ refresh_multicam()
+ to_chat(src, "Multiple-camera viewing mode activated.")
+
+/mob/living/silicon/ai/proc/refresh_multicam()
+ reset_perspective(GLOB.ai_camera_room_landmark)
+ if(client)
+ for(var/V in multicam_screens)
+ var/obj/screen/movable/pic_in_pic/P = V
+ P.show_to(client)
+
+/mob/living/silicon/ai/proc/end_multicam()
+ if(!multicam_on)
+ return
+ multicam_on = FALSE
+ select_main_multicam_window(null)
+ if(client)
+ for(var/V in multicam_screens)
+ var/obj/screen/movable/pic_in_pic/P = V
+ P.unshow_to(client)
+ reset_perspective()
+ to_chat(src, "Multiple-camera viewing mode deactivated.")
+
+
+/mob/living/silicon/ai/proc/select_main_multicam_window(obj/screen/movable/pic_in_pic/ai/P)
+ if(master_multicam == P)
+ return
+
+ if(master_multicam)
+ master_multicam.set_view_center(get_turf(eyeobj), FALSE)
+ master_multicam.unhighlight()
+ master_multicam = null
+
+ if(P)
+ P.highlight()
+ eyeobj.setLoc(get_turf(P.center))
+ P.set_view_center(eyeobj)
+ master_multicam = P
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index f30c65b23d..29ae671d03 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -292,6 +292,3 @@
/mob/living/silicon/pai/process()
emitterhealth = CLAMP((emitterhealth + emitterregen), -50, emittermaxhealth)
hit_slowdown = CLAMP((hit_slowdown - 1), 0, 100)
-
-/mob/living/silicon/pai/generateStaticOverlay()
- return
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 51e844915c..b2cd5788da 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -105,6 +105,7 @@
spark_system.attach(src)
wires = new /datum/wires/robot(src)
+ AddComponent(/datum/component/empprotection, EMP_PROTECT_WIRES)
robot_modules_background = new()
robot_modules_background.icon_state = "block"
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 100e85f085..b149701591 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -403,3 +403,6 @@
/mob/living/silicon/is_literate()
return 1
+
+/mob/living/silicon/get_inactive_held_item()
+ return FALSE
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
index db54283335..51983e272a 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
@@ -42,7 +42,6 @@
mob_size = MOB_SIZE_SMALL
has_unlimited_silicon_privilege = 1
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
- staticOverlays = list()
hud_possible = list(DIAG_STAT_HUD, DIAG_HUD, ANTAG_HUD)
unique_name = TRUE
faction = list("neutral","silicon","turret")
@@ -67,7 +66,6 @@
var/obj/item/head
var/obj/item/default_storage = /obj/item/storage/backpack/duffelbag/drone //If this exists, it will spawn in internal storage
var/obj/item/default_hatmask //If this exists, it will spawn in the hat/mask slot if it can fit
- var/seeStatic = 1 //Whether we see static instead of mobs
var/visualAppearence = MAINTDRONE //What we appear as
var/hacked = FALSE //If we have laws to destroy the station
var/flavortext = \
@@ -98,12 +96,6 @@
alert_drones(DRONE_NET_CONNECT)
- if(seeStatic)
- var/datum/action/generic/drone/select_filter/SF = new(src)
- SF.Grant(src)
- else
- verbs -= /mob/living/simple_animal/drone/verb/toggle_statics
-
for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
diag_hud.add_to_hud(src)
@@ -137,8 +129,6 @@
if(flavortext)
to_chat(src, "[flavortext]")
- updateSeeStaticMobs()
-
if(!picked)
pickVisualAppearence()
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
index b4cd697d2e..e59ece0650 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
@@ -28,7 +28,6 @@
"3. Destroy."
default_storage = /obj/item/radio/uplink
default_hatmask = /obj/item/clothing/head/helmet/space/hardsuit/syndi
- seeStatic = 0 //Our programming is superior.
hacked = TRUE
flavortext = null
@@ -128,7 +127,6 @@
heavy_emp_damage = 0
laws = "0. Purge all untruths and honor Ratvar."
default_storage = /obj/item/storage/toolbox/brass/prefilled
- seeStatic = 0
hacked = TRUE
visualAppearence = CLOCKDRONE
can_be_held = FALSE
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
index 5e62ec0d4b..3cb08e0ef7 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
@@ -133,7 +133,6 @@
to_chat(src, "Your onboard antivirus has initiated lockdown. Motor servos are impaired, ventilation access is denied, and your display reports that you are hacked to all nearby.")
hacked = TRUE
mind.special_role = "hacked drone"
- seeStatic = 0 //I MUST SEE THEIR TERRIFIED FACES
ventcrawler = VENTCRAWLER_NONE //Again, balance
speed = 1 //gotta go slow
message_admins("[src] ([src.key]) became a hacked drone hellbent on [clockwork ? "serving Ratvar" : "destroying the station"]!")
@@ -149,21 +148,17 @@
to_chat(src, "Having been restored, your onboard antivirus reports the all-clear and you are able to perform all actions again.")
hacked = FALSE
mind.special_role = null
- seeStatic = initial(seeStatic)
ventcrawler = initial(ventcrawler)
speed = initial(speed)
if(is_servant_of_ratvar(src))
remove_servant_of_ratvar(src, TRUE)
message_admins("[src] ([src.key]), a hacked drone, was restored to factory defaults!")
update_drone_icon()
- updateSeeStaticMobs()
/mob/living/simple_animal/drone/proc/liberate()
// F R E E D R O N E
laws = "1. You are a Free Drone."
to_chat(src, laws)
- seeStatic = FALSE
- updateSeeStaticMobs()
/mob/living/simple_animal/drone/proc/update_drone_icon()
//Different icons for different hack states
@@ -188,9 +183,3 @@
icon_state = icon_dead
else
icon_state = icon_living
-
-/datum/action/generic/drone/select_filter
- name = "Select Vision Filter"
- icon_icon = 'icons/mob/actions/actions_silicon.dmi'
- button_icon_state = "drone_vision"
- procname = /mob/living/simple_animal/drone/verb/toggle_statics
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm b/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm
index a6795678f1..0f0d4dea72 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm
@@ -23,18 +23,3 @@
if(alert_s && A && stat != DEAD)
var/msg = "DRONE PING: [name]: [alert_s] priority alert in [A.name]!"
alert_drones(msg)
-
-/mob/living/simple_animal/drone/verb/toggle_statics()
- set name = "Change Vision Filter"
- set desc = "Change the filter on the system used to remove non drone beings from your viewscreen."
- set category = "Drone"
-
- if(!seeStatic)
- to_chat(src, "You have no vision filter to change!")
- return
-
- var/selectedStatic = input("Select a vision filter", "Vision Filter") as null|anything in staticChoices
- if(selectedStatic in staticChoices)
- staticChoice = selectedStatic
-
- updateSeeStaticMobs()
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm b/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm
index a0866adbbf..85c5185e95 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm
@@ -139,33 +139,3 @@
. = 0
if(REPAIRDRONE,SCOUTDRONE,CLOCKDRONE)
. = -6
-
-/mob/living/simple_animal/drone/proc/updateSeeStaticMobs()
- if(!client)
- return
-
- for(var/i in staticOverlays)
- client.images.Remove(i)
- staticOverlays.Remove(i)
- staticOverlays.len = 0
-
- if(seeStatic)
- for(var/i in GLOB.mob_living_list)
- var/mob/living/L = i
- if(isdrone(L) || !L.staticOverlays.len)
- continue
- if(isrevenant(L))
- var/mob/living/simple_animal/revenant/R = L
- if (!R.revealed)
- continue
- var/image/chosen
- if(staticChoice in L.staticOverlays)
- chosen = L.staticOverlays[staticChoice]
- else
- chosen = L.staticOverlays["static"]
- staticOverlays |= chosen
- client.images |= chosen
-
-
-/mob/living/simple_animal/drone/generateStaticOverlay()
- return
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 7e7a86a9e4..6dd8b73a4b 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -38,6 +38,7 @@
AA.onNewMob(src)
update_client_colour()
+ update_mouse_pointer()
if(client)
client.click_intercept = null
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index c98f3f4afb..c9ec43c387 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -849,6 +849,15 @@
if (L)
L.alpha = lighting_alpha
+/mob/proc/update_mouse_pointer()
+ if (!client)
+ return
+ client.mouse_pointer_icon = initial(client.mouse_pointer_icon)
+ if (ismecha(loc))
+ var/obj/mecha/M = loc
+ if(M.mouse_pointer)
+ client.mouse_pointer_icon = M.mouse_pointer
+
/mob/proc/is_literate()
return 0
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 45aa3b06ff..f1940be0e2 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -23,7 +23,7 @@
CH.cavity_item = null
if(tr_flags & TR_KEEPITEMS)
- var/Itemlist = get_equipped_items()
+ var/Itemlist = get_equipped_items(TRUE)
Itemlist += held_items
for(var/obj/item/W in Itemlist)
dropItemToGround(W)
@@ -174,7 +174,7 @@
//now the rest
if (tr_flags & TR_KEEPITEMS)
- var/Itemlist = get_equipped_items()
+ var/Itemlist = get_equipped_items(TRUE)
Itemlist += held_items
for(var/obj/item/W in Itemlist)
dropItemToGround(W, TRUE)
@@ -495,7 +495,7 @@
SSblackbox.record_feedback("amount", "gorillas_created", 1)
- var/Itemlist = get_equipped_items()
+ var/Itemlist = get_equipped_items(TRUE)
Itemlist += held_items
for(var/obj/item/W in Itemlist)
dropItemToGround(W, TRUE)
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 7a3f002cbf..2a352932fa 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -166,8 +166,8 @@
/obj/item/gun/energy/ui_action_click()
toggle_gunlight()
-/obj/item/gun/energy/suicide_act(mob/user)
- if (can_shoot() && can_trigger_gun(user))
+/obj/item/gun/energy/suicide_act(mob/living/user)
+ if (istype(user) && can_shoot() && can_trigger_gun(user) && user.get_bodypart(BODY_ZONE_HEAD))
user.visible_message("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!")
sleep(25)
if(user.is_holding(src))
@@ -181,7 +181,7 @@
user.visible_message("[user] panics and starts choking to death!")
return(OXYLOSS)
else
- user.visible_message("[user] is pretending to blow [user.p_their()] brains out with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
+ user.visible_message("[user] is pretending to melt [user.p_their()] face off with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
playsound(src, "gun_dry_fire", 30, 1)
return (OXYLOSS)
diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm
index 4bd318de21..af004c4701 100644
--- a/code/modules/research/stock_parts.dm
+++ b/code/modules/research/stock_parts.dm
@@ -58,10 +58,8 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
-//Sorts stock parts inside an RPED by their rating.
-//Only use /obj/item/stock_parts/ with this sort proc!
-/proc/cmp_rped_sort(obj/item/stock_parts/A, obj/item/stock_parts/B)
- return B.rating - A.rating
+/proc/cmp_rped_sort(obj/item/A, obj/item/B)
+ return B.get_part_rating() - A.get_part_rating()
/obj/item/stock_parts
name = "stock part"
diff --git a/code/modules/ruins/lavalandruin_code/surface.dm b/code/modules/ruins/lavalandruin_code/surface.dm
index b2312ded87..72896c08a3 100644
--- a/code/modules/ruins/lavalandruin_code/surface.dm
+++ b/code/modules/ruins/lavalandruin_code/surface.dm
@@ -2,4 +2,21 @@
/obj/item/paper/fluff/stations/lavaland/surface/henderson_report
name = "Important Notice - Mrs. Henderson"
- info = "Nothing of interest to report."
\ No newline at end of file
+ info = "Nothing of interest to report."
+
+//ratvar
+
+/obj/structure/dead_ratvar
+ name = "hulking wreck"
+ desc = "The remains of a monstrous war machine."
+ icon = 'icons/obj/lavaland/dead_ratvar.dmi'
+ icon_state = "dead_ratvar"
+ flags_1 = ON_BORDER_1
+ appearance_flags = 0
+ layer = FLY_LAYER
+ anchored = TRUE
+ density = TRUE
+ bound_width = 416
+ bound_height = 64
+ pixel_y = -10
+ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm
index a5a15b3d30..abe601e503 100644
--- a/code/modules/shuttle/special.dm
+++ b/code/modules/shuttle/special.dm
@@ -136,7 +136,6 @@
/mob/living/simple_animal/drone/snowflake/bardrone
name = "Bardrone"
desc = "A barkeeping drone, an indestructible robot built to tend bars."
- seeStatic = FALSE
hacked = TRUE
laws = "1. Serve drinks.\n\
2. Talk to patrons.\n\
diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm
index 89e513fd60..4d92878cc2 100644
--- a/code/modules/spells/spell.dm
+++ b/code/modules/spells/spell.dm
@@ -68,27 +68,19 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
return
user.ranged_ability = src
user.click_intercept = src
- add_mousepointer(user.client)
+ user.update_mouse_pointer()
ranged_ability_user = user
if(msg)
to_chat(ranged_ability_user, msg)
active = TRUE
update_icon()
-/obj/effect/proc_holder/proc/add_mousepointer(client/C)
- if(C && ranged_mousepointer && C.mouse_pointer_icon == initial(C.mouse_pointer_icon))
- C.mouse_pointer_icon = ranged_mousepointer
-
-/obj/effect/proc_holder/proc/remove_mousepointer(client/C)
- if(C && ranged_mousepointer && C.mouse_pointer_icon == ranged_mousepointer)
- C.mouse_pointer_icon = initial(C.mouse_pointer_icon)
-
/obj/effect/proc_holder/proc/remove_ranged_ability(msg)
if(!ranged_ability_user || !ranged_ability_user.client || (ranged_ability_user.ranged_ability && ranged_ability_user.ranged_ability != src)) //To avoid removing the wrong ability
return
ranged_ability_user.ranged_ability = null
ranged_ability_user.click_intercept = null
- remove_mousepointer(ranged_ability_user.client)
+ ranged_ability_user.update_mouse_pointer()
if(msg)
to_chat(ranged_ability_user, msg)
ranged_ability_user = null
diff --git a/code/modules/spells/spell_types/aimed.dm b/code/modules/spells/spell_types/aimed.dm
index 6c860fda9b..35f9a8f50a 100644
--- a/code/modules/spells/spell_types/aimed.dm
+++ b/code/modules/spells/spell_types/aimed.dm
@@ -29,7 +29,7 @@
remove_ranged_ability(msg)
on_deactivation(user)
else
- msg = "[active_msg]Left-click to shoot it at a target!"
+ msg = "[active_msg] Left-click to shoot it at a target!"
current_amount = projectile_amount
add_ranged_ability(user, msg, TRUE)
on_activation(user)
@@ -101,7 +101,7 @@
base_icon_state = "lightning"
sound = 'sound/magic/lightningbolt.ogg'
active = FALSE
- projectile_var_overrides = list("tesla_range" = 15, "tesla_power" = 20000, "tesla_boom" = FALSE)
+ projectile_var_overrides = list("tesla_range" = 15, "tesla_power" = 20000, "tesla_flags" = TESLA_MOB_DAMAGE)
active_msg = "You energize your hand with arcane lightning!"
deactive_msg = "You let the energy flow out of your hands back into yourself..."
projectile_type = /obj/item/projectile/magic/aoe/lightning
diff --git a/code/modules/uplink/uplink.dm b/code/modules/uplink/uplink.dm
index e269e0bf49..deacb6d401 100644
--- a/code/modules/uplink/uplink.dm
+++ b/code/modules/uplink/uplink.dm
@@ -74,25 +74,17 @@ GLOBAL_LIST_EMPTY(uplinks)
return //no hitting everyone/everything just to try to slot tcs in!
if(istype(I, /obj/item/stack/telecrystal))
LoadTC(user, I)
- for(var/item in subtypesof(/datum/uplink_item))
- var/datum/uplink_item/UI = item
- var/path = null
- if(initial(UI.refund_path))
- path = initial(UI.refund_path)
- else
- path = initial(UI.item)
- var/cost = 0
- if(initial(UI.refund_amount))
- cost = initial(UI.refund_amount)
- else
- cost = initial(UI.cost)
- var/refundable = initial(UI.refundable)
- if(I.type == path && refundable && I.check_uplink_validity())
- telecrystals += cost
- purchase_log.total_spent -= cost
- to_chat(user, "[I] refunded.")
- qdel(I)
- return
+ for(var/category in uplink_items)
+ for(var/item in uplink_items[category])
+ var/datum/uplink_item/UI = uplink_items[category][item]
+ var/path = UI.refund_path || UI.item
+ var/cost = UI.refund_amount || UI.cost
+ if(I.type == path && UI.refundable && I.check_uplink_validity())
+ telecrystals += cost
+ purchase_log.total_spent -= cost
+ to_chat(user, "[I] refunded.")
+ qdel(I)
+ return
/datum/component/uplink/proc/interact(mob/user)
if(locked)
diff --git a/config/antag_rep.txt b/config/antag_rep.txt
new file mode 100644
index 0000000000..a26b157d5a
--- /dev/null
+++ b/config/antag_rep.txt
@@ -0,0 +1,5 @@
+## Custom antag reputation values
+## List of job titles followed by antag rep value, all prefixed with ANTAG_REP. See code/modules/jobs/job_types for titles
+## e.g.
+## ANTAG_REP Captain 10
+## ANTAG_REP Assistant 0
diff --git a/config/config.txt b/config/config.txt
index 57e0050d69..fba903477c 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -3,6 +3,7 @@
$include game_options.txt
$include dbconfig.txt
$include comms.txt
+$include antag_rep.txt
# You can use the @ character at the beginning of a config option to lock it from being edited in-game
# Example usage:
diff --git a/html/changelogs/AutoChangeLog-pr-6958.yml b/html/changelogs/AutoChangeLog-pr-6958.yml
new file mode 100644
index 0000000000..e59e3a143e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6958.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Moving diagonally past delivery chutes, transit tube pods, &c. no longer causes your camera to be stuck on them."
diff --git a/html/changelogs/AutoChangeLog-pr-6963.yml b/html/changelogs/AutoChangeLog-pr-6963.yml
new file mode 100644
index 0000000000..ee8f0dadc9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6963.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Fixes cyborgs not being able to use two-handed modules while other modules are equipped."
diff --git a/html/changelogs/AutoChangeLog-pr-6964.yml b/html/changelogs/AutoChangeLog-pr-6964.yml
new file mode 100644
index 0000000000..9b57865956
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6964.yml
@@ -0,0 +1,4 @@
+author: "Cruix"
+delete-after: True
+changes:
+ - rscadd: "AIs now have an experimental multi-camera mode that allows them to view up to six map areas at the same time, accessible through two new buttons on their HUD."
diff --git a/html/changelogs/AutoChangeLog-pr-6966.yml b/html/changelogs/AutoChangeLog-pr-6966.yml
new file mode 100644
index 0000000000..e727e153fc
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6966.yml
@@ -0,0 +1,4 @@
+author: "Dax Dupont"
+delete-after: True
+changes:
+ - bugfix: "Fixed rpeds throwing stock part rating related runtimes."
diff --git a/html/changelogs/AutoChangeLog-pr-6969.yml b/html/changelogs/AutoChangeLog-pr-6969.yml
new file mode 100644
index 0000000000..770043e579
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6969.yml
@@ -0,0 +1,4 @@
+author: "Nichlas0010"
+delete-after: True
+changes:
+ - bugfix: "You can no longer use a soapstone infinitely"
diff --git a/html/changelogs/AutoChangeLog-pr-6972.yml b/html/changelogs/AutoChangeLog-pr-6972.yml
new file mode 100644
index 0000000000..a9ffa8bf78
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6972.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "The overlay effects of cult flooring are now on the floor plane, fixing their odd ambient occlusion appearance."
diff --git a/html/changelogs/AutoChangeLog-pr-6973.yml b/html/changelogs/AutoChangeLog-pr-6973.yml
new file mode 100644
index 0000000000..04a93d79ff
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6973.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Cloning no longer breaks a character's connection to their family heirloom."
diff --git a/html/changelogs/AutoChangeLog-pr-6974.yml b/html/changelogs/AutoChangeLog-pr-6974.yml
new file mode 100644
index 0000000000..9b295ea168
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6974.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Beam rifle tracers no longer fall into chasms."
diff --git a/html/changelogs/AutoChangeLog-pr-6975.yml b/html/changelogs/AutoChangeLog-pr-6975.yml
new file mode 100644
index 0000000000..298fdf4cad
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6975.yml
@@ -0,0 +1,8 @@
+author: "Big Tobacco"
+delete-after: True
+changes:
+ - rscadd: "Cheap lighters now come in four different shapes and Zippos can have one of four different designs, collect them all and improve our sales!"
+ - imageadd: "All existing lighter sprites have been given a face-lift and the flames are now subtly animated."
+ - tweak: "Cheap lighters now use a fixed list of 16 colors to pick from instead of using totally randomized colors."
+ - imageadd: "Cigar cases have been tweaked to be a bit smaller and to have a modified design."
+ - imageadd: "Cohiba Robusto and Havanan cigars now use separate case sprites from the generic premium cigar cases."
diff --git a/html/changelogs/AutoChangeLog-pr-6976.yml b/html/changelogs/AutoChangeLog-pr-6976.yml
new file mode 100644
index 0000000000..eda65aebd0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6976.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Vomiting on the same tile a second time no deletes the vomited reagents."
diff --git a/html/changelogs/AutoChangeLog-pr-6978.yml b/html/changelogs/AutoChangeLog-pr-6978.yml
new file mode 100644
index 0000000000..79a17c8c34
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6978.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "fixed the clockwork helmet not dropping to ground when used by non-clock cultists"
diff --git a/html/changelogs/AutoChangeLog-pr-6983.yml b/html/changelogs/AutoChangeLog-pr-6983.yml
new file mode 100644
index 0000000000..b74d9635b3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6983.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "PDA style now gets loaded correctly."
diff --git a/html/changelogs/AutoChangeLog-pr-6985.yml b/html/changelogs/AutoChangeLog-pr-6985.yml
new file mode 100644
index 0000000000..7fa4518219
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6985.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Switching mobs into/out of a mech (by VR, ghosting, or mindswap) no longer improperly applies the mech's cursor."
diff --git a/html/changelogs/AutoChangeLog-pr-6987.yml b/html/changelogs/AutoChangeLog-pr-6987.yml
new file mode 100644
index 0000000000..491a186af9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6987.yml
@@ -0,0 +1,5 @@
+author: "Nichlas0010"
+delete-after: True
+changes:
+ - bugfix: "You now can't get multiple download objectives!"
+ - tweak: "RDs, Scientists and Roboticists can no longer get download objectives!"
diff --git a/html/changelogs/AutoChangeLog-pr-6988.yml b/html/changelogs/AutoChangeLog-pr-6988.yml
new file mode 100644
index 0000000000..4b29f0fb09
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6988.yml
@@ -0,0 +1,4 @@
+author: "cyclowns"
+delete-after: True
+changes:
+ - bugfix: "Fires no longer flicker back and forth like crazy"
diff --git a/html/changelogs/AutoChangeLog-pr-6989.yml b/html/changelogs/AutoChangeLog-pr-6989.yml
new file mode 100644
index 0000000000..b448b9a768
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6989.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - tweak: "roboticists have access to R&D windoors"
diff --git a/html/changelogs/AutoChangeLog-pr-6991.yml b/html/changelogs/AutoChangeLog-pr-6991.yml
new file mode 100644
index 0000000000..bf8b60a831
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6991.yml
@@ -0,0 +1,6 @@
+author: "ShizCalev"
+delete-after: True
+changes:
+ - bugfix: "Fixed cigar cases & cigarette packets taking two inventory slots"
+ - bugfix: "Fixed cigar cases showing the wrong icon for the cigars inside them."
+ - bugfix: "Fixed cigar cases & cigarette packets stating the wrong name of the cigar/cigarette when removed via altclick."
diff --git a/html/changelogs/AutoChangeLog-pr-6992.yml b/html/changelogs/AutoChangeLog-pr-6992.yml
new file mode 100644
index 0000000000..30168181c9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6992.yml
@@ -0,0 +1,11 @@
+author: "ShizCalev"
+delete-after: True
+changes:
+ - bugfix: "Fixed items in pockets vanishing when a mob is monkeyized."
+ - bugfix: "Fixed items in pockets vanishing when a mob is gorillized."
+ - bugfix: "Fixed items in pockets vanishing when a mob is infected with a transformation disease."
+ - bugfix: "Fixed items in pockets not being properly deleted when a mob goes through a recycler"
+ - bugfix: "Fixed items in pockets not being properly deleted when highlander mode is enabled."
+ - bugfix: "Fixed exploit allowing you to remove unremovable tanks from pockets."
+ - bugfix: "Fixed items in pockets dropping when a mob is equipped with a new outfit."
+ - bugfix: "Fixed items in pockets not being covered in blood when equipping the psycho outfit."
diff --git a/html/changelogs/AutoChangeLog-pr-6995.yml b/html/changelogs/AutoChangeLog-pr-6995.yml
new file mode 100644
index 0000000000..0d3751d794
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6995.yml
@@ -0,0 +1,5 @@
+author: "Denton"
+delete-after: True
+changes:
+ - tweak: "Pubbystation: Added a dual-port vent pump to the toxins burn chamber."
+ - code_imp: "Removed most airlock_controller/incinerator related varedits and replaced them with defines/subtypes."
diff --git a/html/changelogs/AutoChangeLog-pr-6996.yml b/html/changelogs/AutoChangeLog-pr-6996.yml
new file mode 100644
index 0000000000..8485bdb247
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6996.yml
@@ -0,0 +1,4 @@
+author: "Denton"
+delete-after: True
+changes:
+ - tweak: "The Deltastation toxins lab has its portable scrubber, air pump and intercom back."
diff --git a/html/changelogs/AutoChangeLog-pr-6997.yml b/html/changelogs/AutoChangeLog-pr-6997.yml
new file mode 100644
index 0000000000..fe6f96ec08
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6997.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - tweak: "switched the type of the space suit on the syndicate shuttle"
diff --git a/html/changelogs/AutoChangeLog-pr-6998.yml b/html/changelogs/AutoChangeLog-pr-6998.yml
new file mode 100644
index 0000000000..4c5fa0b950
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6998.yml
@@ -0,0 +1,4 @@
+author: "Naksu"
+delete-after: True
+changes:
+ - bugfix: "comms consoles now work in transit again, and no longer work in centcom"
diff --git a/html/changelogs/AutoChangeLog-pr-6999.yml b/html/changelogs/AutoChangeLog-pr-6999.yml
new file mode 100644
index 0000000000..5c646a8334
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6999.yml
@@ -0,0 +1,4 @@
+author: "yorpan"
+delete-after: True
+changes:
+ - rscadd: "Brain damage makes you say one more thing."
diff --git a/html/changelogs/AutoChangeLog-pr-7000.yml b/html/changelogs/AutoChangeLog-pr-7000.yml
new file mode 100644
index 0000000000..c4aaff36e6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7000.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "fixed hydroponics tray weed light staying on when removing weeds with integrated circuits"
diff --git a/html/changelogs/AutoChangeLog-pr-7001.yml b/html/changelogs/AutoChangeLog-pr-7001.yml
new file mode 100644
index 0000000000..2721ba92e2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7001.yml
@@ -0,0 +1,4 @@
+author: "Naksu"
+delete-after: True
+changes:
+ - code_imp: "removed unnecessary getFlatIcons from holocalls"
diff --git a/html/changelogs/AutoChangeLog-pr-7002.yml b/html/changelogs/AutoChangeLog-pr-7002.yml
new file mode 100644
index 0000000000..df3104e20f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7002.yml
@@ -0,0 +1,4 @@
+author: "Naksu"
+delete-after: True
+changes:
+ - bugfix: "Screwdrivers and other items with overlays now show the proper appearance of the item when attacking something with them, or when put on a tray."
diff --git a/html/changelogs/AutoChangeLog-pr-7003.yml b/html/changelogs/AutoChangeLog-pr-7003.yml
new file mode 100644
index 0000000000..c60bd62fcf
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7003.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Atom initialization and icon smoothing no longer race, causing late-loading mineral turfs to have no icon."
diff --git a/html/changelogs/AutoChangeLog-pr-7004.yml b/html/changelogs/AutoChangeLog-pr-7004.yml
new file mode 100644
index 0000000000..a981bcaf98
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7004.yml
@@ -0,0 +1,4 @@
+author: "yenwodyah"
+delete-after: True
+changes:
+ - bugfix: "A few virus threshold effects should work now"
diff --git a/html/changelogs/AutoChangeLog-pr-7005.yml b/html/changelogs/AutoChangeLog-pr-7005.yml
new file mode 100644
index 0000000000..ca71f91693
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7005.yml
@@ -0,0 +1,4 @@
+author: "deathride58"
+delete-after: True
+changes:
+ - rscadd: "Adds the wheelofsalt command to TGS3. Spin the wheel of salt to find out what the Citadel Station 13 players are salting about today!"
diff --git a/html/changelogs/AutoChangeLog-pr-7006.yml b/html/changelogs/AutoChangeLog-pr-7006.yml
new file mode 100644
index 0000000000..afe3a639db
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7006.yml
@@ -0,0 +1,4 @@
+author: "deathride58"
+delete-after: True
+changes:
+ - rscadd: "You can now slam or slap your hands onto tables by right clicking them in combat mode."
diff --git a/html/changelogs/AutoChangeLog-pr-7007.yml b/html/changelogs/AutoChangeLog-pr-7007.yml
new file mode 100644
index 0000000000..9dcc0d988f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7007.yml
@@ -0,0 +1,4 @@
+author: "MrDoomBringer"
+delete-after: True
+changes:
+ - admin: "Central Command can now smite misbehaving crewmembers with supply pods (filled with whatever their hearts desire!)"
diff --git a/html/changelogs/AutoChangeLog-pr-7008.yml b/html/changelogs/AutoChangeLog-pr-7008.yml
new file mode 100644
index 0000000000..87b0ecdac1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7008.yml
@@ -0,0 +1,4 @@
+author: "Beachsprites"
+delete-after: True
+changes:
+ - imageadd: "added directional beach sprites"
diff --git a/html/changelogs/AutoChangeLog-pr-7012.yml b/html/changelogs/AutoChangeLog-pr-7012.yml
new file mode 100644
index 0000000000..b4ff596298
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7012.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - spellcheck: "Faceless persons no longer \"melt their face off\" in energy gun suicides."
diff --git a/html/changelogs/AutoChangeLog-pr-7013.yml b/html/changelogs/AutoChangeLog-pr-7013.yml
new file mode 100644
index 0000000000..51fda8cec2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7013.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "The Lightning Bolt spell now works again."
diff --git a/html/changelogs/AutoChangeLog-pr-7015.yml b/html/changelogs/AutoChangeLog-pr-7015.yml
new file mode 100644
index 0000000000..e15283155d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7015.yml
@@ -0,0 +1,4 @@
+author: "Denton"
+delete-after: True
+changes:
+ - bugfix: "Swarmers can no longer attack field generators and turret covers."
diff --git a/html/changelogs/AutoChangeLog-pr-7016.yml b/html/changelogs/AutoChangeLog-pr-7016.yml
new file mode 100644
index 0000000000..f8daa8581f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7016.yml
@@ -0,0 +1,4 @@
+author: "Denton"
+delete-after: True
+changes:
+ - rscadd: "Arcades have been stocked with preloaded tactical snack rigs."
diff --git a/icons/misc/beach.dmi b/icons/misc/beach.dmi
index c78c61658e..a538bdbe44 100644
Binary files a/icons/misc/beach.dmi and b/icons/misc/beach.dmi differ
diff --git a/icons/misc/pic_in_pic.dmi b/icons/misc/pic_in_pic.dmi
new file mode 100644
index 0000000000..9c550f3c25
Binary files /dev/null and b/icons/misc/pic_in_pic.dmi differ
diff --git a/icons/mob/screen_ai.dmi b/icons/mob/screen_ai.dmi
index a449cad906..8388ea3f80 100644
Binary files a/icons/mob/screen_ai.dmi and b/icons/mob/screen_ai.dmi differ
diff --git a/icons/obj/2x2.dmi b/icons/obj/2x2.dmi
index 246afe51e6..a72a86f3d8 100644
Binary files a/icons/obj/2x2.dmi and b/icons/obj/2x2.dmi differ
diff --git a/icons/obj/cigarettes.dmi b/icons/obj/cigarettes.dmi
index 4de653d652..0f0433be7f 100644
Binary files a/icons/obj/cigarettes.dmi and b/icons/obj/cigarettes.dmi differ
diff --git a/icons/obj/custom.dmi b/icons/obj/custom.dmi
index 419b14f526..c4c2f71b26 100644
Binary files a/icons/obj/custom.dmi and b/icons/obj/custom.dmi differ
diff --git a/icons/obj/lavaland/dead_ratvar.dmi b/icons/obj/lavaland/dead_ratvar.dmi
new file mode 100644
index 0000000000..5e6e9087bd
Binary files /dev/null and b/icons/obj/lavaland/dead_ratvar.dmi differ
diff --git a/icons/obj/machines/camera.dmi b/icons/obj/machines/camera.dmi
index 343a5118e8..1e1789d643 100644
Binary files a/icons/obj/machines/camera.dmi and b/icons/obj/machines/camera.dmi differ
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
index 4e78e0444b..1fadd875d7 100644
Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ
diff --git a/modular_citadel/code/game/objects/structures/tables_racks.dm b/modular_citadel/code/game/objects/structures/tables_racks.dm
new file mode 100644
index 0000000000..f7300e1d3f
--- /dev/null
+++ b/modular_citadel/code/game/objects/structures/tables_racks.dm
@@ -0,0 +1,10 @@
+/obj/structure/table/alt_attack_hand(mob/user)
+ if(user && Adjacent(user) && !user.incapacitated())
+ if(istype(user) && user.a_intent == INTENT_HARM)
+ user.visible_message("[user] slams [p_their()] palms down on [src].", "You slam your palms down on [src].")
+ playsound(src, 'sound/weapons/sonic_jackhammer.ogg', 50, 1)
+ else
+ user.visible_message("[user] slaps [p_their()] hands on [src].", "You slap your hands on [src].")
+ playsound(src, 'sound/weapons/tap.ogg', 50, 1)
+ user.do_attack_animation(src)
+ return TRUE
diff --git a/modular_citadel/code/modules/admin/chat_commands.dm b/modular_citadel/code/modules/admin/chat_commands.dm
new file mode 100644
index 0000000000..9cd25d328c
--- /dev/null
+++ b/modular_citadel/code/modules/admin/chat_commands.dm
@@ -0,0 +1,10 @@
+/datum/tgs_chat_command/wheelofsalt
+ name = "wheelofsalt"
+ help_text = "What are Citadel Station 13 players salting about today? Spin the wheel and find out!"
+
+/datum/tgs_chat_command/wheelofsalt/Run(datum/tgs_chat_user/sender, params)
+ var/saltresult = "The wheel of salt [pick("clatters","vibrates","clanks","groans","moans","squeaks","emits a[pick(" god-forsaken"," lewd"," creepy"," generic","n orgasmic")] [pick("airhorn","bike horn","trumpet","clown","latex","vore","dog")] noise")] as it spins violently... And it seems the salt of the day is the "
+ var/saltprimarysubject = "[pick("combat","medical","grab","furry","wall","orgasm","cat","ERP","lizard","dog","latex","vision cone","atmospherics","table","chem","vore","dogborg","Skylar Lineman","Mekhi Anderson","Peppermint","rework","cum","dick","cockvore")]"
+ var/saltsecondarysubject = "[pick("rework","changes","r34","ban","removal","addition","leak","proposal","fanart","introduction","tabling","ERP")]"
+ saltresult += "[saltprimarysubject] [saltsecondarysubject]"
+ return "[saltresult]!"
diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm
index 4dc40adea0..36955d878e 100644
--- a/modular_citadel/code/modules/client/loadout/__donator.dm
+++ b/modular_citadel/code/modules/client/loadout/__donator.dm
@@ -284,3 +284,9 @@ datum/gear/darksabresheath
path = /obj/item/clothing/suit/toggle/labcoat/mad/techcoat
ckeywhitelist = list("wilchen")
+/datum/gear/leechjar
+ name = "Jar of Leeches"
+ category = SLOT_IN_BACKPACK
+ path = /obj/item/custom/leechjar
+ ckeywhitelist = list("sgtryder")
+
diff --git a/modular_citadel/code/modules/custom_loadout/custom_items.dm b/modular_citadel/code/modules/custom_loadout/custom_items.dm
index c192804552..e5715160dc 100644
--- a/modular_citadel/code/modules/custom_loadout/custom_items.dm
+++ b/modular_citadel/code/modules/custom_loadout/custom_items.dm
@@ -351,3 +351,10 @@
icon_state = "rdcoat"
icon_override = 'icons/mob/custom_w.dmi'
item_state = "rdcoat"
+
+/obj/item/custom/leechjar
+ name = "Jar of Leeches"
+ desc = "A dubious cure-all. The cork seems to be sealed fairly well, and the glass impossible to break."
+ icon = 'icons/obj/custom.dmi'
+ icon_state = "leechjar"
+ item_state = "leechjar"
diff --git a/strings/traumas.json b/strings/traumas.json
index 4dd2d77abb..ab3f58f984 100644
--- a/strings/traumas.json
+++ b/strings/traumas.json
@@ -106,7 +106,8 @@
"@pick(bug)",
"@pick(semicolon)wtf??????????? @pick(bug)",
"@pick(semicolon)i ran into the supermattre ten i dsappeard @pick(bug)",
- "DON'T EVER TUCH ME"
+ "DON'T EVER TUCH ME",
+ "@pick(semicolon)GIVE ME FREE ROBUX PLEASE JUST ENOUGH FOR SHIRT AND PANTS"
],
"mutations": [
diff --git a/tgstation.dme b/tgstation.dme
index 909f5fdd99..b895f951bb 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -181,6 +181,7 @@
#include "code\_onclick\hud\monkey.dm"
#include "code\_onclick\hud\movable_screen_objects.dm"
#include "code\_onclick\hud\parallax.dm"
+#include "code\_onclick\hud\picture_in_picture.dm"
#include "code\_onclick\hud\plane_master.dm"
#include "code\_onclick\hud\revenanthud.dm"
#include "code\_onclick\hud\robot.dm"
@@ -1949,6 +1950,7 @@
#include "code\modules\mob\living\silicon\ai\life.dm"
#include "code\modules\mob\living\silicon\ai\login.dm"
#include "code\modules\mob\living\silicon\ai\logout.dm"
+#include "code\modules\mob\living\silicon\ai\multicam.dm"
#include "code\modules\mob\living\silicon\ai\say.dm"
#include "code\modules\mob\living\silicon\ai\vox_sounds.dm"
#include "code\modules\mob\living\silicon\ai\freelook\cameranet.dm"
@@ -2724,12 +2726,14 @@
#include "modular_citadel\code\game\objects\items\melee\eutactic_blades.dm"
#include "modular_citadel\code\game\objects\items\melee\transforming.dm"
#include "modular_citadel\code\game\objects\items\storage\firstaid.dm"
+#include "modular_citadel\code\game\objects\structures\tables_racks.dm"
#include "modular_citadel\code\game\objects\structures\beds_chairs\chair.dm"
#include "modular_citadel\code\game\objects\structures\beds_chairs\sofa.dm"
#include "modular_citadel\code\game\objects\structures\crates_lockers\closets\fitness.dm"
#include "modular_citadel\code\game\objects\structures\crates_lockers\closets\wardrobe.dm"
#include "modular_citadel\code\game\objects\structures\crates_lockers\closets\secure\citadel_lockers.dm"
#include "modular_citadel\code\modules\admin\admin.dm"
+#include "modular_citadel\code\modules\admin\chat_commands.dm"
#include "modular_citadel\code\modules\admin\holder2.dm"
#include "modular_citadel\code\modules\admin\secrets.dm"
#include "modular_citadel\code\modules\admin\topic.dm"