diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
index 256555eca0c..366005b95a6 100644
--- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
@@ -234,7 +234,6 @@
anchored = 1
},
/obj/machinery/door/window/brigdoor{
- dir = 2;
req_access = list("syndicate");
name = "Self Destruct Option"
},
@@ -305,9 +304,6 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/listeningstation)
"rr" = (
-/obj/machinery/door/airlock{
- name = "Emergency Backup"
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -392,7 +388,6 @@
/area/ruin/space/has_grav/listeningstation)
"xh" = (
/obj/machinery/computer/records/medical/syndie{
- dir = 2;
req_access = list("syndicate")
},
/obj/machinery/light/small/directional/north,
@@ -813,6 +808,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/mapping_helpers/broken_floor,
+/obj/machinery/door/airlock{
+ name = "Emergency Backup"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
/turf/open/floor/plating,
/area/ruin/space/has_grav/listeningstation)
"RK" = (
diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/wreckedhomestead.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/wreckedhomestead.dmm
index 98172e42bc5..afa164d0b27 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/wreckedhomestead.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/wreckedhomestead.dmm
@@ -84,11 +84,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/iron/airless,
/area/ruin/unpowered)
-"oa" = (
-/obj/machinery/rnd/bepis,
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/iron/airless,
-/area/ruin/unpowered)
"on" = (
/obj/structure/closet/secure_closet/brig,
/obj/structure/window/reinforced/spawner/directional/west,
@@ -133,6 +128,11 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/dark/airless,
/area/ruin/unpowered)
+"tP" = (
+/obj/machinery/cryo_cell,
+/obj/effect/mapping_helpers/burnt_floor,
+/turf/open/floor/plating/airless,
+/area/ruin/unpowered)
"ve" = (
/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
dir = 1
@@ -160,11 +160,6 @@
},
/turf/open/floor/plating/airless,
/area/ruin/unpowered)
-"Az" = (
-/obj/machinery/cryo_cell,
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating/airless,
-/area/ruin/unpowered)
"Bf" = (
/turf/closed/wall/mineral/titanium,
/area/ruin/unpowered)
@@ -1209,7 +1204,7 @@ wY
Bf
Wp
Bf
-Az
+tP
Dh
ve
mP
@@ -1276,7 +1271,7 @@ Wv
kN
dL
Bf
-oa
+kN
Bf
Bf
Bf
diff --git a/_maps/RandomZLevels/blackmesa.dmm b/_maps/RandomZLevels/blackmesa.dmm
index a4aafb74536..892d7d76815 100644
--- a/_maps/RandomZLevels/blackmesa.dmm
+++ b/_maps/RandomZLevels/blackmesa.dmm
@@ -5008,7 +5008,7 @@
/turf/open/floor/iron/smooth_large,
/area/awaymission/black_mesa/entrance_internal_hall)
"cPC" = (
-/mob/living/simple_animal/hostile/blob/blobspore/independent,
+/mob/living/basic/blob_minion/spore,
/obj/structure/blob/normal,
/turf/open/floor/engine,
/area/awaymission/black_mesa/hecu_zone_test_chambers)
@@ -9388,7 +9388,7 @@
/turf/open/floor/iron/white,
/area/awaymission/black_mesa/hecu_zone_camp)
"ldC" = (
-/mob/living/simple_animal/hostile/blob/blobbernaut/independent,
+/mob/living/basic/blob_minion/blobbernaut,
/obj/structure/blob/normal,
/turf/open/floor/engine,
/area/awaymission/black_mesa/hecu_zone_test_chambers)
diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm
index 78590312a61..cf218b898be 100644
--- a/_maps/map_files/Birdshot/birdshot.dmm
+++ b/_maps/map_files/Birdshot/birdshot.dmm
@@ -46,6 +46,10 @@
},
/turf/open/floor/iron,
/area/station/security/tram)
+"ach" = (
+/obj/machinery/netpod,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/bitrunning/den)
"acl" = (
/obj/effect/turf_decal/sand/plating,
/obj/effect/decal/cleanable/dirt,
@@ -872,12 +876,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/engineering/atmos/project)
-"arU" = (
-/obj/effect/turf_decal/bot_white,
-/obj/structure/rack,
-/obj/item/electronics/apc,
-/turf/open/floor/iron/smooth_large,
-/area/station/cargo/warehouse)
"asb" = (
/obj/effect/turf_decal/siding/white,
/turf/open/floor/iron/dark/small,
@@ -2576,11 +2574,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
-"bbP" = (
-/obj/structure/rack,
-/obj/effect/spawner/random/maintenance/two,
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"bbU" = (
/obj/effect/landmark/generic_maintenance_landmark,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -3125,14 +3118,6 @@
/mob/living/simple_animal/bot/medbot/autopatrol,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
-"bmL" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable,
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"bmM" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -3951,6 +3936,30 @@
},
/turf/open/floor/iron,
/area/station/security/processing)
+"bCh" = (
+/obj/effect/turf_decal/stripes{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes{
+ dir = 8
+ },
+/obj/machinery/door/airlock/mining{
+ name = "Bitrunning Den"
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
+/turf/open/floor/iron/dark/smooth_half{
+ dir = 1
+ },
+/area/station/bitrunning/den)
"bCi" = (
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/obj/machinery/atmospherics/components/binary/crystallizer{
@@ -6131,6 +6140,27 @@
"cvJ" = (
/turf/open/floor/plating,
/area/station/maintenance/department/engine/atmos)
+"cvP" = (
+/obj/effect/turf_decal/stripes{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/machinery/holopad,
+/turf/open/floor/iron/dark/smooth_half{
+ dir = 1
+ },
+/area/station/bitrunning/den)
"cvZ" = (
/obj/structure/closet/secure_closet/evidence,
/obj/effect/decal/cleanable/dirt,
@@ -10991,6 +11021,10 @@
/obj/structure/frame/computer,
/turf/open/floor/eighties/red,
/area/station/service/abandoned_gambling_den/gaming)
+"ejq" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/bitrunning/den)
"ejt" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -14390,6 +14424,18 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/stone,
/area/station/command/heads_quarters/hos)
+"fts" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/computer/order_console/bitrunning{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/end{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"ftv" = (
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
/obj/structure/table/reinforced,
@@ -21473,6 +21519,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"hNv" = (
+/obj/machinery/netpod,
+/obj/machinery/light_switch/directional/north,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/bitrunning/den)
"hNA" = (
/obj/effect/turf_decal/tile/brown/opposingcorners,
/turf/open/floor/iron,
@@ -27515,6 +27567,16 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/security/courtroom)
+"jWA" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/start/bitrunner,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"jWO" = (
/obj/effect/turf_decal/tile/blue,
/obj/machinery/camera/autoname/directional/south,
@@ -29797,10 +29859,6 @@
dir = 1
},
/area/station/medical/treatment_center)
-"kLT" = (
-/obj/machinery/rnd/bepis,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"kMm" = (
/obj/structure/chair/sofa/right/brown{
dir = 1
@@ -30463,6 +30521,15 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/showroomfloor,
/area/station/medical/surgery/theatre)
+"kZB" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/machinery/light/cold/directional/north,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"kZF" = (
/obj/structure/closet/crate/secure{
desc = "A secure crate containing various materials for building a customised test-site.";
@@ -30530,6 +30597,19 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/wood,
/area/station/service/abandoned_gambling_den)
+"lbF" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes,
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/obj/machinery/light/small/directional/east,
+/obj/effect/landmark/start/bitrunner,
+/turf/open/floor/iron/dark/smooth_half,
+/area/station/bitrunning/den)
"lbM" = (
/obj/structure/chair/sofa/bench/right{
dir = 1
@@ -32683,6 +32763,20 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
+"lKH" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/effect/turf_decal/stripes,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/landmark/start/bitrunner,
+/turf/open/floor/iron/dark/smooth_half,
+/area/station/bitrunning/den)
"lKK" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -32698,6 +32792,18 @@
/obj/effect/mapping_helpers/airlock/access/any/security/general,
/turf/open/floor/iron,
/area/station/security/checkpoint/escape)
+"lLq" = (
+/obj/effect/turf_decal/box/corners{
+ dir = 1
+ },
+/obj/effect/turf_decal/box/corners{
+ dir = 4
+ },
+/obj/machinery/firealarm/directional/east,
+/obj/effect/decal/cleanable/oil,
+/obj/effect/landmark/bitrunning/station_reward_spawn,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/bitrunning/den)
"lLr" = (
/obj/machinery/porta_turret/ai{
dir = 4
@@ -37601,6 +37707,16 @@
},
/turf/open/floor/circuit/telecomms/mainframe,
/area/station/science/xenobiology)
+"nyf" = (
+/obj/effect/turf_decal/box/corners{
+ dir = 8
+ },
+/obj/effect/turf_decal/box/corners,
+/obj/machinery/camera/autoname/directional/east,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/bitrunning/station_reward_spawn,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/bitrunning/den)
"nyi" = (
/turf/closed/wall/rust,
/area/station/maintenance/hallway/abandoned_command)
@@ -37951,6 +38067,22 @@
/obj/structure/falsewall,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
+"nEl" = (
+/obj/machinery/computer/quantum_console{
+ dir = 4
+ },
+/obj/machinery/computer/quantum_console{
+ dir = 4
+ },
+/obj/machinery/computer/quantum_console{
+ dir = 4
+ },
+/obj/machinery/computer/quantum_console{
+ dir = 4
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"nEo" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -38012,6 +38144,9 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth,
/area/station/cargo/drone_bay)
+"nFo" = (
+/turf/closed/wall,
+/area/station/bitrunning/den)
"nFp" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -38587,6 +38722,10 @@
},
/turf/open/floor/iron/white,
/area/station/commons/dorms)
+"nPX" = (
+/obj/structure/cable,
+/turf/open/floor/iron/smooth_large,
+/area/station/cargo/warehouse)
"nQa" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
@@ -39751,13 +39890,6 @@
/obj/item/radio/intercom/directional/east,
/turf/open/floor/iron/dark/small,
/area/station/medical/chemistry)
-"onI" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Maintenance"
- },
-/obj/effect/mapping_helpers/airlock/access/all/supply/general,
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"onP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/door/firedoor,
@@ -40541,6 +40673,9 @@
/obj/machinery/camera/autoname/directional/east,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"oCG" = (
+/turf/closed/wall/rust,
+/area/station/bitrunning/den)
"oCM" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/broken_flooring/pile/directional/east,
@@ -41556,16 +41691,6 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
/turf/open/floor/iron/dark/small,
/area/station/tcommsat/server)
-"oXa" = (
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"oXe" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/machinery/duct,
@@ -46387,13 +46512,6 @@
},
/turf/open/floor/iron/solarpanel/airless,
/area/station/solars/port)
-"qxf" = (
-/obj/machinery/cryo_cell,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/iron/small,
-/area/station/medical/cryo)
"qxh" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -49355,6 +49473,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/science/lower)
+"ruC" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/effect/turf_decal/tile/green/anticorner/contrasted,
+/obj/structure/table/glass,
+/obj/effect/mapping_helpers/broken_floor,
+/obj/item/radio/intercom/directional/south,
+/obj/machinery/reagentgrinder,
+/turf/open/floor/iron/white,
+/area/station/medical/virology)
"ruD" = (
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
@@ -49521,6 +49648,10 @@
"rxu" = (
/obj/structure/table,
/obj/machinery/airalarm/directional/south,
+/obj/item/storage/box/bandages{
+ pixel_y = 6;
+ pixel_x = -6
+ },
/obj/item/clipboard{
pixel_x = 4;
pixel_y = 4
@@ -50689,6 +50820,26 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer1,
/turf/open/floor/catwalk_floor/iron_white,
/area/station/engineering/atmos)
+"rPx" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/trimline/brown/corner,
+/obj/effect/turf_decal/trimline/brown/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 1
+ },
+/area/station/bitrunning/den)
"rPz" = (
/obj/structure/table/glass,
/obj/item/flashlight/lamp/green{
@@ -51161,6 +51312,26 @@
/obj/structure/broken_flooring/singular/directional/east,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"rWP" = (
+/obj/effect/turf_decal/stripes{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/smooth_half{
+ dir = 1
+ },
+/area/station/bitrunning/den)
"rWW" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -51189,10 +51360,6 @@
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
-"rXy" = (
-/obj/effect/spawner/random/structure/closet_maintenance,
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"rXW" = (
/obj/structure/flora/bush/flowers_yw,
/obj/machinery/door/window/left/directional/west{
@@ -53141,10 +53308,6 @@
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron,
/area/station/hallway/secondary/spacebridge)
-"sEi" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"sEn" = (
/obj/item/clothing/head/cone,
/obj/item/clothing/head/cone{
@@ -54770,6 +54933,13 @@
/obj/structure/sign/poster/official/random/directional/north,
/turf/open/floor/wood/tile,
/area/station/command/heads_quarters/hop)
+"tgJ" = (
+/obj/machinery/cryo_cell,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/iron/small,
+/area/station/medical/cryo)
"tgR" = (
/obj/structure/disposalpipe/junction/flip{
dir = 1
@@ -55514,6 +55684,15 @@
},
/turf/open/misc/sandy_dirt,
/area/station/security/tram)
+"tvN" = (
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"tvP" = (
/obj/machinery/suit_storage_unit/captain,
/obj/machinery/light/small/directional/south,
@@ -56297,11 +56476,6 @@
/obj/effect/turf_decal/tile/green/diagonal_centre,
/turf/open/floor/iron/diagonal,
/area/station/hallway/primary/central/aft)
-"tIQ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/structure/crate,
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"tJe" = (
/obj/effect/turf_decal/tile/dark_red/half/contrasted{
dir = 1
@@ -56723,6 +56897,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/hallway/primary/starboard)
+"tPZ" = (
+/obj/machinery/netpod,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/bitrunning/den)
"tQx" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/reagent_dispensers/fueltank,
@@ -59517,6 +59697,13 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/hallway/secondary/service)
+"uMl" = (
+/obj/machinery/cryo_cell,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/iron/small,
+/area/station/medical/cryo)
"uMu" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -64271,13 +64458,6 @@
/obj/effect/spawner/structure/window/reinforced/tinted,
/turf/open/floor/plating,
/area/station/hallway/secondary/recreation)
-"wkZ" = (
-/obj/machinery/cryo_cell,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/iron/small,
-/area/station/medical/cryo)
"wla" = (
/turf/open/floor/iron/chapel,
/area/station/maintenance/starboard/greater)
@@ -65717,14 +65897,6 @@
/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/space/basic,
/area/space/nearstation)
-"wIG" = (
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/effect/turf_decal/tile/green/anticorner/contrasted,
-/obj/structure/table/glass,
-/obj/effect/mapping_helpers/broken_floor,
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/iron/white,
-/area/station/medical/virology)
"wII" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer1,
/turf/open/floor/iron/dark,
@@ -66421,16 +66593,17 @@
dir = 8
},
/obj/structure/table,
-/obj/item/stack/medical/gauze{
- pixel_x = -2;
- pixel_y = 7
+/obj/item/radio/intercom/directional/south,
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/item/storage/box/bandages{
+ pixel_y = 6;
+ pixel_x = 4
},
/obj/item/stack/medical/gauze{
- pixel_x = 2;
- pixel_y = 1
+ pixel_x = -2;
+ pixel_y = 8
},
-/obj/item/radio/intercom/directional/south,
-/obj/structure/extinguisher_cabinet/directional/west,
+/obj/item/stack/medical/gauze,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
"wSH" = (
@@ -67578,13 +67751,6 @@
"xia" = (
/turf/closed/wall,
/area/station/science/cubicle)
-"xic" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sink/directional/south,
-/obj/item/reagent_containers/cup/bucket,
-/obj/item/mop,
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"xif" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -68840,15 +69006,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
-"xyz" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/light/cold/directional/north,
-/obj/structure/sign/poster/official/random/directional/north,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"xyJ" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
@@ -71745,6 +71902,12 @@
"ylD" = (
/turf/closed/wall,
/area/station/maintenance/starboard/greater)
+"ylH" = (
+/obj/machinery/quantum_server,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/light/cold/directional/west,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"ylJ" = (
/obj/effect/spawner/structure/window/reinforced/tinted,
/turf/open/floor/plating,
@@ -83191,7 +83354,7 @@ uzJ
mQh
nJU
ppk
-kLT
+uzJ
ovQ
oRr
poM
@@ -83436,12 +83599,12 @@ slY
ueX
slY
ueX
-slY
-ueX
-slY
-slY
-slY
-slY
+nFo
+oCG
+nFo
+nFo
+nFo
+nFo
lxy
hzm
jTA
@@ -83691,15 +83854,15 @@ slY
gOK
slY
hfc
-slY
-xic
jBb
-kPW
-kwY
-sEi
-rXy
-slY
-oXa
+iNE
+nFo
+ach
+lKH
+ylH
+nEl
+ejq
+tvN
lRc
moz
kee
@@ -83948,15 +84111,15 @@ slY
gPN
gZk
iNE
-ueX
-bbP
kwY
-slY
-slY
-kwY
-slY
-slY
-xyz
+kPW
+nFo
+tPZ
+rPx
+cvP
+rWP
+bCh
+jWA
lTv
oem
oem
@@ -84205,14 +84368,14 @@ slY
gPN
slY
hff
-jCo
-hff
-jCo
-slY
-tIQ
-sEi
kPW
-onI
+hfc
+nFo
+hNv
+lbF
+lLq
+nyf
+ejq
jkS
lTN
mRD
@@ -84464,13 +84627,13 @@ slY
jCo
slY
slY
-jCi
-slY
-slY
-slY
-slY
-slY
-bmL
+nFo
+nFo
+nFo
+nFo
+nFo
+nFo
+kZB
lUz
ohj
ohj
@@ -84719,8 +84882,8 @@ sjq
sNz
hyO
roi
-slY
-arU
+jCi
+nPX
hAN
jMb
kzI
@@ -84730,7 +84893,7 @@ iUN
jlv
sRR
odX
-odX
+fts
nyE
uzJ
axj
@@ -99417,7 +99580,7 @@ qtl
dDB
dDB
qIf
-qxf
+uMl
aQr
wCa
ulb
@@ -99931,7 +100094,7 @@ qtl
dDB
dDB
qIf
-wkZ
+tgJ
nQU
bDj
onP
@@ -103570,7 +103733,7 @@ gLb
bXH
vTY
nqV
-wIG
+ruC
wgL
oiA
kWs
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 41f0a245642..809f1335d24 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -1692,14 +1692,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
-"atk" = (
-/obj/item/kirbyplants/random,
-/obj/structure/sign/poster/official/random/directional/west,
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"atl" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/binary/valve/digital{
@@ -3037,12 +3029,6 @@
/obj/structure/sign/warning/electric_shock/directional/west,
/turf/open/space/basic,
/area/space)
-"aLg" = (
-/obj/structure/filingcabinet/chestdrawer,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"aLv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -3427,6 +3413,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/science/robotics/lab)
+"aPD" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"aPO" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
/obj/effect/turf_decal/tile/yellow{
@@ -3567,16 +3562,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/security/courtroom)
-"aSj" = (
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
-/obj/machinery/disposal/bin,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/delivery,
-/obj/structure/sign/poster/official/random/directional/south,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"aSl" = (
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
@@ -3818,16 +3803,6 @@
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
-"aWe" = (
-/obj/structure/table/reinforced,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/flashlight/lamp,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"aWk" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -5004,6 +4979,13 @@
},
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/hos)
+"bkr" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/conveyor{
+ id = "cargodisposals"
+ },
+/turf/open/floor/plating,
+/area/station/cargo/sorting)
"bkD" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -7307,6 +7289,28 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/department/science)
+"bLN" = (
+/obj/structure/rack,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/storage/toolbox/emergency{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/storage/toolbox/emergency,
+/obj/item/shovel,
+/obj/item/shovel,
+/obj/item/pickaxe,
+/obj/item/pickaxe,
+/obj/effect/turf_decal/bot,
+/obj/machinery/light/small/directional/south,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/machinery/light_switch/directional/west{
+ pixel_x = -38
+ },
+/obj/machinery/airalarm/directional/south,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"bLP" = (
/obj/machinery/camera/directional/east{
c_tag = "Permabrig - Kitchen Entrance";
@@ -7420,16 +7424,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/science/robotics/mechbay)
-"bNi" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"bNr" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -9991,22 +9985,6 @@
/obj/machinery/status_display/evac/directional/north,
/turf/open/floor/iron,
/area/station/ai_monitored/command/storage/eva)
-"ctR" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/clipboard,
-/obj/item/toy/figure/miner,
-/obj/machinery/light/directional/north,
-/obj/machinery/light_switch/directional/west{
- pixel_x = -42
- },
-/obj/effect/turf_decal/bot,
-/obj/machinery/firealarm/directional/west,
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"ctU" = (
/obj/structure/chair/office{
dir = 1
@@ -10166,6 +10144,15 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/hop)
+"cwd" = (
+/obj/effect/turf_decal/box/corners,
+/obj/effect/turf_decal/box/corners{
+ dir = 4
+ },
+/obj/machinery/light/directional/south,
+/obj/effect/landmark/bitrunning/station_reward_spawn,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/bitrunning/den)
"cwe" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -10217,6 +10204,22 @@
/obj/structure/sign/warning/radiation/directional/south,
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
+"cwK" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 4
+ },
+/obj/effect/turf_decal/delivery,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/iron,
+/area/station/maintenance/starboard/fore)
"cwV" = (
/obj/effect/landmark/start/hangover,
/obj/structure/disposalpipe/segment{
@@ -10326,6 +10329,11 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/medical/treatment_center)
+"cyc" = (
+/obj/machinery/netpod,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/bitrunning/den)
"cyq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -10401,13 +10409,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"cze" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"czf" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood/large,
@@ -11087,6 +11088,9 @@
/obj/item/radio/intercom/directional/north,
/turf/open/floor/iron/grimy,
/area/station/tcommsat/computer)
+"cGV" = (
+/turf/closed/wall,
+/area/station/bitrunning/den)
"cHb" = (
/obj/machinery/door/firedoor/heavy,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -11803,10 +11807,6 @@
},
/turf/open/floor/iron/large,
/area/station/science/xenobiology)
-"cQO" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"cQT" = (
/obj/structure/table/reinforced,
/obj/machinery/computer/security/telescreen{
@@ -12689,12 +12689,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/medical/morgue)
-"dcA" = (
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/plating,
-/area/station/maintenance/starboard/fore)
"dcG" = (
/obj/effect/turf_decal/trimline/red/filled/line,
/obj/effect/landmark/start/depsec/science,
@@ -13098,10 +13092,6 @@
/obj/effect/turf_decal/siding/wood/corner,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/service)
-"dih" = (
-/obj/effect/decal/cleanable/oil,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"din" = (
/obj/structure/table/wood,
/obj/item/paper_bin,
@@ -13715,19 +13705,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/department/chapel)
-"dri" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/maintenance/starboard/fore)
"drj" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -13846,15 +13823,6 @@
/obj/machinery/rnd/server,
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/station/science/server)
-"dsq" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"dsy" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -13972,13 +13940,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/detectives_office/private_investigators_office)
-"dtp" = (
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"dtJ" = (
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
@@ -14048,6 +14009,18 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
+"dux" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/brown/half{
+ dir = 4
+ },
+/obj/item/clipboard,
+/obj/item/toy/figure/miner,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/half{
+ dir = 1
+ },
+/area/station/cargo/miningoffice)
"duA" = (
/turf/closed/wall/r_wall,
/area/station/command/corporate_showroom)
@@ -15070,13 +15043,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/cryo)
-"dIz" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"dIE" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -15710,6 +15676,12 @@
},
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
+"dPC" = (
+/obj/structure/closet/secure_closet/miner,
+/obj/effect/turf_decal/delivery,
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"dPD" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -15829,13 +15801,6 @@
dir = 8
},
/area/station/hallway/primary/fore)
-"dRf" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"dRh" = (
/obj/machinery/telecomms/bus/preset_four,
/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
@@ -16261,6 +16226,14 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/maintenance/port)
+"dXs" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 4
+ },
+/obj/structure/table/reinforced,
+/obj/item/flashlight/lamp,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"dXw" = (
/obj/structure/sign/painting/large/library_private{
dir = 1;
@@ -17196,26 +17169,6 @@
},
/turf/open/floor/iron/dark/textured_large,
/area/station/engineering/atmos/hfr_room)
-"eld" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/requests_console/directional/south{
- department = "Mining";
- name = "Mining Requests Console"
- },
-/obj/machinery/requests_console/directional/south{
- department = "Mining";
- name = "Mining Requests Console"
- },
-/obj/machinery/camera/directional/south{
- c_tag = "Cargo - Mining Dock";
- name = "cargo camera"
- },
-/obj/effect/turf_decal/tile/brown/half/contrasted,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"eln" = (
/obj/effect/turf_decal/stripes/end{
dir = 4
@@ -17278,6 +17231,12 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/gateway)
+"elO" = (
+/obj/effect/landmark/event_spawn,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"elP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/yellow/fourcorners,
@@ -18760,6 +18719,18 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"eFU" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/fore)
"eGb" = (
/obj/effect/spawner/random/trash/mess,
/turf/open/floor/wood,
@@ -19030,14 +19001,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
/turf/open/floor/plating,
/area/station/maintenance/department/science/xenobiology)
-"eIA" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"eIQ" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -19199,11 +19162,6 @@
/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
-"eKS" = (
-/obj/machinery/rnd/bepis,
-/obj/effect/turf_decal/box/white,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"eKU" = (
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 1
@@ -20339,6 +20297,15 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/range)
+"eYt" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/computer/order_console/mining,
+/obj/item/radio/intercom/directional/west,
+/obj/machinery/firealarm/directional/west{
+ pixel_y = -9
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"eYy" = (
/obj/structure/cable,
/obj/structure/closet/secure_closet/atmospherics,
@@ -20528,6 +20495,10 @@
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/iron/smooth,
/area/station/maintenance/department/science/xenobiology)
+"fbu" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/bitrunning/den)
"fbA" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -21567,23 +21538,6 @@
/obj/structure/chair/office,
/turf/open/floor/iron/grimy,
/area/station/tcommsat/computer)
-"fnN" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/airlock/mining{
- name = "Mining Dock"
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"foh" = (
/obj/machinery/atmospherics/components/binary/volume_pump{
name = "Ports to Distro"
@@ -21837,19 +21791,6 @@
},
/turf/open/floor/iron,
/area/station/commons/locker)
-"fsg" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/airlock/mining{
- name = "Mining Dock"
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"fsl" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -22031,6 +21972,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/grimy,
/area/station/service/library)
+"ftS" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/herringbone,
+/area/station/cargo/miningoffice)
"ftU" = (
/obj/structure/cable,
/obj/effect/turf_decal/siding/yellow,
@@ -22206,11 +22154,6 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
-"fwD" = (
-/obj/structure/table,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"fwK" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -22472,6 +22415,16 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/engineering/storage)
+"fAj" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/herringbone,
+/area/station/cargo/miningoffice)
"fAn" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/bot,
@@ -22624,12 +22577,6 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/entry)
-"fCb" = (
-/obj/effect/turf_decal/loading_area{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"fCf" = (
/obj/machinery/door/poddoor/preopen{
id = "atmoslock";
@@ -23154,11 +23101,6 @@
},
/turf/open/floor/iron/large,
/area/station/security/checkpoint/escape)
-"fJm" = (
-/obj/effect/landmark/start/shaft_miner,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"fJq" = (
/turf/closed/wall,
/area/station/security/brig)
@@ -23932,13 +23874,6 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/iron/grimy,
/area/station/service/abandoned_gambling_den)
-"fUl" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/conveyor{
- id = "cargodisposals"
- },
-/turf/open/floor/plating,
-/area/station/cargo/sorting)
"fUq" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
@@ -23962,6 +23897,12 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"fUr" = (
+/obj/machinery/cryo_cell{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/medical/cryo)
"fUF" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced/spawner/directional/east,
@@ -24403,14 +24344,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/atmos/project)
-"fZz" = (
-/obj/effect/landmark/start/shaft_miner,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"fZG" = (
/obj/effect/turf_decal/stripes/corner,
/obj/effect/turf_decal/stripes/corner{
@@ -24656,6 +24589,16 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics)
+"gco" = (
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"gcr" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
@@ -24790,11 +24733,6 @@
/obj/machinery/light/small/dim/directional/north,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
-"gdD" = (
-/obj/structure/closet/secure_closet/miner,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"gdE" = (
/obj/structure/chair/office,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -26019,11 +25957,6 @@
},
/turf/open/floor/iron/dark/corner,
/area/station/engineering/atmos/pumproom)
-"grT" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/brown/half/contrasted,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"grV" = (
/obj/effect/turf_decal/arrows/red{
dir = 4;
@@ -26206,6 +26139,14 @@
},
/turf/open/floor/iron,
/area/station/commons/storage/primary)
+"guj" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/obj/machinery/disposal/bin,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"gum" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -26994,9 +26935,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/cafeteria,
/area/station/security/prison/mess)
-"gDE" = (
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"gDP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -27248,12 +27186,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/aisat/exterior)
-"gGM" = (
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"gGT" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/toilet{
@@ -28246,13 +28178,6 @@
},
/turf/open/floor/iron,
/area/station/service/abandoned_gambling_den/gaming)
-"gUe" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/maintenance/starboard/fore)
"gUi" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 10
@@ -29429,6 +29354,13 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/medbay)
+"hkn" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"hkt" = (
/obj/effect/spawner/random/engineering/tank,
/turf/open/floor/plating,
@@ -29815,6 +29747,22 @@
/obj/item/pen,
/turf/open/floor/iron/grimy,
/area/station/tcommsat/computer)
+"hpB" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/obj/item/storage/box/bandages{
+ pixel_y = 6;
+ pixel_x = 4
+ },
+/obj/item/storage/toolbox/mechanical,
+/obj/item/storage/belt/utility,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"hpC" = (
/obj/effect/landmark/generic_maintenance_landmark,
/obj/structure/cable,
@@ -30445,6 +30393,10 @@
},
/turf/open/floor/glass/reinforced,
/area/station/maintenance/department/science/xenobiology)
+"hzs" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"hzx" = (
/obj/machinery/firealarm/directional/west,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -33005,16 +32957,6 @@
/obj/item/stack/rods/fifty,
/turf/open/floor/plating,
/area/station/maintenance/department/eva/abandoned)
-"ihc" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/effect/turf_decal/tile/brown/half/contrasted,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"iho" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -33076,6 +33018,16 @@
},
/turf/open/floor/plating,
/area/station/medical/virology)
+"iio" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"iiy" = (
/obj/structure/easel,
/turf/open/floor/iron,
@@ -34326,6 +34278,14 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/entry)
+"izj" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/herringbone,
+/area/station/cargo/miningoffice)
"izo" = (
/obj/structure/table/wood,
/obj/item/gavelblock,
@@ -36018,13 +35978,6 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
-"iWJ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/loading_area{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"iWR" = (
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 8
@@ -36059,6 +36012,15 @@
},
/turf/open/floor/iron,
/area/station/engineering/lobby)
+"iXd" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/shaft_miner,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"iXj" = (
/obj/effect/landmark/start/hangover,
/obj/effect/turf_decal/bot,
@@ -36881,6 +36843,13 @@
/obj/structure/sign/warning/secure_area/directional/west,
/turf/open/floor/plating,
/area/station/engineering/atmos/mix)
+"jfO" = (
+/obj/structure/closet/wardrobe/miner,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/storage/backpack/satchel/explorer,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"jfP" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -37181,21 +37150,6 @@
dir = 8
},
/area/station/hallway/primary/port)
-"jjK" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/structure/sign/nanotrasen{
- pixel_y = 32
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"jjU" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
@@ -38053,19 +38007,6 @@
"jtC" = (
/turf/open/floor/plating,
/area/station/service/abandoned_gambling_den)
-"jtE" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/machinery/firealarm/directional/east,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central/fore)
"jtV" = (
/obj/structure/sign/warning/electric_shock,
/turf/closed/wall/r_wall,
@@ -38614,6 +38555,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/science/lobby)
+"jBM" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"jCb" = (
/obj/machinery/computer/records/security{
dir = 8
@@ -38697,6 +38643,13 @@
/obj/item/pen,
/turf/open/floor/wood,
/area/station/service/library/abandoned)
+"jCu" = (
+/obj/structure/closet/secure_closet/miner,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"jCv" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/hydroponics/constructable,
@@ -38739,17 +38692,6 @@
/obj/effect/mapping_helpers/airlock/access/all/service/lawyer,
/turf/open/floor/iron,
/area/station/service/lawoffice)
-"jCR" = (
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/conveyor{
- id = "cargodisposals"
- },
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
-/area/station/cargo/sorting)
"jCS" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -39355,6 +39297,18 @@
/obj/effect/turf_decal/tile/blue/opposingcorners,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/cmo)
+"jKY" = (
+/obj/effect/turf_decal/box/corners{
+ dir = 8
+ },
+/obj/effect/turf_decal/box/corners{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/oil/streak,
+/obj/machinery/camera/directional/south,
+/obj/effect/landmark/bitrunning/station_reward_spawn,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/bitrunning/den)
"jLa" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/railing{
@@ -39937,6 +39891,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/medical/medbay)
+"jRc" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/fore)
"jRg" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
@@ -40171,23 +40138,6 @@
"jUx" = (
/turf/open/floor/plating,
/area/station/maintenance/department/science)
-"jUy" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/door/airlock/mining/glass{
- name = "Delivery Office"
- },
-/obj/effect/mapping_helpers/airlock/access/any/supply/shipping,
-/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
-/turf/open/floor/iron,
-/area/station/cargo/sorting)
"jUC" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -41555,6 +41505,19 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
+"klh" = (
+/obj/structure/table/glass,
+/obj/machinery/status_display/ai/directional/west,
+/obj/machinery/newscaster/directional/north,
+/obj/effect/turf_decal/siding/dark_red,
+/obj/item/storage/box/bandages{
+ pixel_y = 6;
+ pixel_x = -6
+ },
+/obj/item/reagent_containers/cup/bottle/morphine,
+/obj/item/reagent_containers/syringe,
+/turf/open/floor/iron/dark,
+/area/station/security/execution/transfer)
"klm" = (
/obj/structure/sign/plaques/kiddie/badger{
pixel_y = 32
@@ -42043,11 +42006,6 @@
"ksK" = (
/turf/closed/wall/r_wall,
/area/station/command/gateway)
-"ksL" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"ksP" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
dir = 4
@@ -42525,13 +42483,6 @@
/obj/effect/turf_decal/tile/neutral/full,
/turf/open/floor/iron/large,
/area/station/ai_monitored/command/storage/eva)
-"kzi" = (
-/obj/structure/closet/secure_closet/miner,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/status_display/evac/directional/north,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"kzm" = (
/obj/structure/disposalpipe/sorting/mail/flip{
dir = 4;
@@ -43261,6 +43212,15 @@
/obj/structure/sign/warning/pods,
/turf/closed/wall,
/area/station/hallway/secondary/entry)
+"kKx" = (
+/obj/effect/turf_decal/tile/brown/half{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/half{
+ dir = 1
+ },
+/area/station/cargo/miningoffice)
"kKy" = (
/obj/machinery/airalarm/directional/east,
/obj/machinery/rnd/production/techfab/department/medical,
@@ -43887,6 +43847,18 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/engineering/main)
+"kTs" = (
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
+ dir = 1
+ },
+/obj/effect/landmark/start/shaft_miner,
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"kTy" = (
/obj/structure/chair/office{
dir = 8
@@ -44799,18 +44771,6 @@
/mob/living/carbon/human/species/monkey,
/turf/open/floor/engine,
/area/station/science/genetics)
-"lfC" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/table/reinforced,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/storage/belt/utility,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"lfD" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/siding/dark_red{
@@ -45186,6 +45146,15 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/open/floor/iron,
/area/station/maintenance/solars/starboard/fore)
+"ljQ" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/loading_area{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"ljS" = (
/obj/structure/cable,
/obj/effect/spawner/structure/window/reinforced,
@@ -45325,6 +45294,16 @@
/obj/machinery/light/directional/west,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"llj" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/herringbone,
+/area/station/cargo/miningoffice)
"llm" = (
/obj/structure/chair/office/tactical{
dir = 8
@@ -45902,16 +45881,6 @@
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron,
/area/station/medical/treatment_center)
-"ltB" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/purple{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"ltD" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible,
@@ -46583,22 +46552,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/engineering/storage)
-"lBB" = (
-/obj/structure/rack,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/toolbox/emergency{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/storage/toolbox/emergency,
-/obj/item/shovel,
-/obj/item/shovel,
-/obj/item/pickaxe,
-/obj/item/pickaxe,
-/obj/effect/turf_decal/bot,
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"lBG" = (
/obj/structure/cable,
/obj/effect/spawner/structure/window/reinforced,
@@ -48613,16 +48566,6 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/carpet/orange,
/area/station/commons/dorms)
-"mcK" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"mcV" = (
/obj/machinery/door/airlock/engineering/glass{
name = "Supermatter Engine Room"
@@ -49224,6 +49167,11 @@
"mlE" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/command/storage/eva)
+"mlF" = (
+/obj/machinery/computer/quantum_console,
+/obj/structure/extinguisher_cabinet/directional/west,
+/turf/open/floor/iron/dark/smooth_corner,
+/area/station/bitrunning/den)
"mlM" = (
/obj/structure/table/wood,
/obj/machinery/computer/records/medical/laptop,
@@ -49770,6 +49718,11 @@
/obj/effect/turf_decal/tile/yellow/fourcorners,
/turf/open/floor/iron,
/area/station/engineering/storage)
+"mtL" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/status_display/evac/directional/north,
+/turf/open/floor/plating,
+/area/station/cargo/miningoffice)
"mtO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/yellow{
@@ -50523,6 +50476,13 @@
/obj/structure/cable,
/turf/open/floor/engine,
/area/station/maintenance/disposal/incinerator)
+"mDm" = (
+/obj/machinery/quantum_server,
+/obj/effect/turf_decal/bot/left,
+/turf/open/floor/iron/dark/smooth_corner{
+ dir = 4
+ },
+/area/station/bitrunning/den)
"mDo" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -52755,6 +52715,17 @@
/obj/effect/spawner/random/trash/hobo_squat,
/turf/open/floor/plating,
/area/station/maintenance/department/chapel)
+"nhj" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/table,
+/obj/machinery/microwave{
+ desc = "Cooks and boils stuff, somehow.";
+ pixel_x = -3;
+ pixel_y = 5
+ },
+/obj/structure/sign/poster/official/random/directional/west,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"nhm" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/starboard/lesser)
@@ -53281,11 +53252,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
-"nos" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/starboard/fore)
"not" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -53498,11 +53464,6 @@
},
/turf/open/floor/iron,
/area/station/security/warden)
-"nro" = (
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/starboard/fore)
"nry" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -53583,16 +53544,6 @@
},
/turf/open/floor/iron/dark,
/area/station/maintenance/port)
-"nsI" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"nsV" = (
/obj/structure/table/reinforced,
/obj/structure/reagent_dispensers/wall/peppertank/directional/west,
@@ -54495,6 +54446,12 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/maintenance/port)
+"nEE" = (
+/obj/machinery/netpod,
+/obj/structure/sign/poster/random/directional/north,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/bitrunning/den)
"nEJ" = (
/obj/structure/cable,
/obj/effect/turf_decal/trimline/yellow/line,
@@ -55604,12 +55561,6 @@
/obj/item/storage/medkit/regular,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
-"nTw" = (
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/purple/half/contrasted,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"nTz" = (
/obj/item/stack/sheet/plasteel/twenty,
/obj/item/stack/sheet/rglass{
@@ -55819,22 +55770,6 @@
/obj/effect/turf_decal/tile/red/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/lockers)
-"nXf" = (
-/obj/machinery/door/firedoor,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/airlock/mining/glass{
- name = "Delivery Office"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
-/obj/effect/mapping_helpers/airlock/access/any/supply/shipping,
-/turf/open/floor/iron,
-/area/station/cargo/sorting)
"nXj" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -56373,14 +56308,6 @@
/obj/structure/closet,
/turf/open/floor/plating,
/area/station/maintenance/fore)
-"oea" = (
-/obj/structure/closet/wardrobe/miner,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/backpack/satchel/explorer,
-/obj/effect/turf_decal/bot,
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"oec" = (
/obj/effect/spawner/structure/window/reinforced/tinted,
/turf/open/floor/plating/airless,
@@ -56500,12 +56427,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/mix)
-"ofM" = (
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"ofN" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/conveyor{
@@ -56657,14 +56578,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
-"ohR" = (
-/obj/structure/cable,
-/obj/structure/extinguisher_cabinet/directional/west,
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"ohZ" = (
/obj/structure/rack,
/obj/effect/spawner/random/techstorage/service_all,
@@ -56905,6 +56818,24 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/security/prison/garden)
+"okN" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/generic,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/landmark/start/bitrunner,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"okV" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/reagent_dispensers/plumbed{
@@ -57058,10 +56989,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"oml" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"omv" = (
/obj/structure/table,
/obj/item/flashlight/lamp,
@@ -57768,6 +57695,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/maintenance/port)
+"owZ" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/table,
+/obj/item/storage/medkit/regular,
+/obj/machinery/light/directional/west,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"oxb" = (
/obj/machinery/duct,
/obj/effect/turf_decal/siding/white,
@@ -58011,6 +57945,28 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/captain/private)
+"oAV" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/brown/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/brown/corner{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"oAW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -59562,9 +59518,6 @@
/obj/machinery/newscaster/directional/east,
/turf/open/floor/wood,
/area/station/hallway/secondary/service)
-"oWV" = (
-/turf/closed/wall,
-/area/station/cargo/miningoffice)
"oXi" = (
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral{
@@ -61577,6 +61530,21 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit/departure_lounge)
+"pxS" = (
+/obj/structure/chair{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown/half{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/landmark/start/bitrunner,
+/turf/open/floor/iron/half{
+ dir = 1
+ },
+/area/station/cargo/miningoffice)
"pxT" = (
/obj/effect/spawner/random/structure/crate,
/turf/open/floor/plating,
@@ -62042,6 +62010,13 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
+"pDy" = (
+/obj/machinery/cryo_cell{
+ dir = 8
+ },
+/obj/machinery/status_display/ai/directional/south,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/medical/cryo)
"pDE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -63636,6 +63611,17 @@
},
/turf/open/floor/iron/dark/corner,
/area/station/engineering/atmos/pumproom)
+"pUs" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
+/obj/machinery/door/airlock/mining/glass{
+ name = "Bitrunning Den"
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"pUw" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/bot,
@@ -64855,6 +64841,18 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"qko" = (
+/obj/item/kirbyplants/random,
+/obj/effect/turf_decal/tile/brown/half{
+ dir = 8
+ },
+/obj/machinery/light/directional/west,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/sign/poster/official/random/directional/west,
+/turf/open/floor/iron/half{
+ dir = 1
+ },
+/area/station/cargo/miningoffice)
"qkv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -65011,6 +65009,21 @@
},
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
+"qmT" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/maintenance/starboard/fore)
"qnc" = (
/obj/machinery/firealarm/directional/south,
/obj/effect/turf_decal/tile/blue{
@@ -65438,6 +65451,22 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/science/xenobiology)
+"qsF" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 1
+ },
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"qsN" = (
/obj/structure/chair{
dir = 4
@@ -65865,13 +65894,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/execution/transfer)
-"qyO" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"qyX" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -68363,6 +68385,13 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
+"rgC" = (
+/obj/structure/table/reinforced,
+/obj/item/folder/yellow,
+/obj/item/gps/mining,
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"rgG" = (
/obj/structure/closet/secure_closet/engineering_personal,
/obj/effect/decal/cleanable/dirt,
@@ -68995,6 +69024,19 @@
/obj/machinery/light/dim/directional/east,
/turf/open/floor/iron/dark,
/area/station/tcommsat/computer)
+"rmH" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"rmI" = (
/obj/structure/table/reinforced,
/obj/item/electronics/apc,
@@ -69973,6 +70015,16 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/cargo/storage)
+"rAl" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/machinery/conveyor{
+ id = "cargodisposals"
+ },
+/turf/open/floor/plating,
+/area/station/cargo/sorting)
"rAm" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/yellow/half/contrasted{
@@ -70677,15 +70729,6 @@
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible,
/turf/open/floor/plating,
/area/station/engineering/atmos/mix)
-"rKu" = (
-/obj/structure/cable,
-/obj/structure/table/reinforced,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/folder/yellow,
-/obj/item/gps/mining,
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"rKA" = (
/obj/machinery/firealarm/directional/east,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -71280,6 +71323,11 @@
/obj/structure/mirror/directional/west,
/turf/open/floor/wood,
/area/station/maintenance/port/aft)
+"rQF" = (
+/obj/machinery/netpod,
+/obj/effect/decal/cleanable/robot_debris,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/bitrunning/den)
"rQI" = (
/obj/machinery/airlock_sensor/incinerator_atmos{
pixel_x = 24
@@ -71581,6 +71629,14 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
+"rUi" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/loading_area{
+ dir = 1
+ },
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"rUj" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
@@ -72578,6 +72634,15 @@
},
/turf/open/space/basic,
/area/space)
+"sgK" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"sgZ" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -73055,13 +73120,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/research)
-"snh" = (
-/obj/machinery/computer/order_console/mining,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"snj" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/decal/cleanable/dirt,
@@ -73462,6 +73520,10 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/medical/pharmacy)
+"stf" = (
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/herringbone,
+/area/station/cargo/miningoffice)
"stp" = (
/obj/machinery/airalarm/directional/west,
/obj/effect/turf_decal/trimline/brown/filled/line{
@@ -73840,14 +73902,6 @@
/obj/item/papercutter,
/turf/open/floor/iron/grimy,
/area/station/command/bridge)
-"sxu" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/obj/effect/turf_decal/tile/purple/half/contrasted,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"sxD" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -74278,6 +74332,23 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/half,
/area/station/service/hydroponics)
+"sCW" = (
+/obj/machinery/door/firedoor,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/airlock/mining/glass{
+ name = "Delivery Office"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
+/obj/effect/mapping_helpers/airlock/access/any/supply/shipping,
+/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
+/turf/open/floor/iron,
+/area/station/cargo/sorting)
"sCY" = (
/obj/structure/cable,
/obj/machinery/power/tracker,
@@ -74961,6 +75032,9 @@
/obj/structure/sign/poster/official/build/directional/north,
/turf/open/floor/iron,
/area/station/science/robotics/mechbay)
+"sLg" = (
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"sLx" = (
/obj/effect/decal/cleanable/generic,
/turf/open/floor/iron/grimy,
@@ -76094,12 +76168,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/service/chapel)
-"taR" = (
-/obj/machinery/cryo_cell{
- dir = 8
- },
-/turf/open/floor/iron/dark/textured_large,
-/area/station/medical/cryo)
"tbd" = (
/obj/item/radio/intercom/directional/west,
/obj/effect/turf_decal/tile/yellow/half/contrasted{
@@ -76231,6 +76299,14 @@
/obj/machinery/light/directional/south,
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
+"tcB" = (
+/obj/machinery/door/airlock/mining{
+ name = "Mining Dock"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"tcG" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -76931,6 +77007,13 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
+"toy" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/herringbone,
+/area/station/cargo/miningoffice)
"toB" = (
/obj/machinery/light/directional/west,
/obj/effect/turf_decal/stripes/line{
@@ -78985,6 +79068,16 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/server)
+"tNn" = (
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"tNq" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -79299,17 +79392,6 @@
dir = 1
},
/area/station/service/bar)
-"tQr" = (
-/obj/structure/table,
-/obj/machinery/microwave{
- desc = "Cooks and boils stuff, somehow.";
- pixel_x = -3;
- pixel_y = 5
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"tQt" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -81497,6 +81579,13 @@
},
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
+"usJ" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/loading_area{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"usZ" = (
/obj/item/flashlight/lamp,
/obj/machinery/airalarm/directional/east,
@@ -82128,15 +82217,6 @@
/obj/effect/turf_decal/tile/red,
/turf/open/floor/iron,
/area/station/security/execution/transfer)
-"uAH" = (
-/obj/structure/cable,
-/obj/structure/chair/office{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/purple/half/contrasted,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"uAI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/landmark/start/depsec/engineering,
@@ -82181,6 +82261,21 @@
dir = 1
},
/area/station/medical/morgue)
+"uBd" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/sign/nanotrasen{
+ pixel_y = 32
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"uBf" = (
/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{
dir = 4
@@ -83170,6 +83265,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
+"uND" = (
+/obj/effect/turf_decal/tile/brown/half{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/obj/machinery/computer/order_console/bitrunning,
+/obj/effect/turf_decal/stripes/end,
+/turf/open/floor/iron/half{
+ dir = 1
+ },
+/area/station/cargo/miningoffice)
"uNE" = (
/obj/machinery/atmospherics/components/unary/passive_vent{
dir = 4
@@ -83216,6 +83324,15 @@
},
/turf/open/floor/iron/white,
/area/station/science/ordnance/office)
+"uOk" = (
+/obj/structure/chair/office{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown/half/contrasted,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/shaft_miner,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"uOn" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -85036,15 +85153,6 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/service/cafeteria)
-"vmo" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/cup/bottle/morphine,
-/obj/item/reagent_containers/syringe,
-/obj/machinery/status_display/ai/directional/west,
-/obj/machinery/newscaster/directional/north,
-/obj/effect/turf_decal/siding/dark_red,
-/turf/open/floor/iron/dark,
-/area/station/security/execution/transfer)
"vmr" = (
/obj/machinery/airalarm/directional/west,
/obj/machinery/disposal/bin,
@@ -86026,13 +86134,6 @@
},
/turf/open/floor/wood,
/area/station/service/library/abandoned)
-"vyF" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start/shaft_miner,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"vyG" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -86109,18 +86210,6 @@
/obj/structure/sign/warning/secure_area/directional/north,
/turf/open/space,
/area/space/nearstation)
-"vzy" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
-/area/station/maintenance/starboard/fore)
"vzA" = (
/obj/effect/turf_decal/trimline/purple/filled/line,
/turf/open/floor/iron/white,
@@ -86454,6 +86543,25 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
/area/station/command/heads_quarters/hos)
+"vDj" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = -8;
+ pixel_y = 17
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/holopad,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"vDm" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -86838,6 +86946,23 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
+"vId" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 8
+ },
+/obj/item/radio/intercom/directional/south,
+/obj/effect/decal/cleanable/oil,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"vIq" = (
/obj/structure/cable,
/obj/structure/disposalpipe/junction{
@@ -87175,6 +87300,22 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/engineering)
+"vNV" = (
+/obj/structure/chair{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown/half{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/landmark/start/bitrunner,
+/turf/open/floor/iron/half{
+ dir = 1
+ },
+/area/station/cargo/miningoffice)
"vOh" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -87408,12 +87549,6 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/dark,
/area/station/service/bar)
-"vQT" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"vRn" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/structure/railing/corner,
@@ -88521,6 +88656,24 @@
/obj/effect/landmark/start/depsec/medical,
/turf/open/floor/iron/large,
/area/station/security/checkpoint/medical/medsci)
+"whb" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/door/airlock/mining/glass{
+ name = "Delivery Office"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/supply/shipping,
+/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
+/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
+/turf/open/floor/iron,
+/area/station/cargo/sorting)
"whc" = (
/obj/structure/sign/poster/official/fruit_bowl/directional/west,
/obj/effect/turf_decal/stripes/line{
@@ -88926,13 +89079,6 @@
},
/turf/open/floor/glass,
/area/station/maintenance/space_hut/observatory)
-"wml" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"wmn" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
@@ -89178,14 +89324,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"woJ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"woK" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -89559,13 +89697,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"wsJ" = (
-/obj/machinery/cryo_cell{
- dir = 8
- },
-/obj/machinery/status_display/ai/directional/south,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/medical/cryo)
"wsN" = (
/obj/machinery/door/airlock/command{
name = "Research Division Server Room"
@@ -89736,6 +89867,19 @@
},
/turf/open/floor/iron/white,
/area/station/science/ordnance/storage)
+"wuU" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/firealarm/directional/east,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/light/small/directional/east,
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
"wuV" = (
/obj/structure/fireaxecabinet/directional/south,
/obj/effect/turf_decal/tile/blue/half/contrasted,
@@ -89964,11 +90108,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
-"wxL" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"wyh" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -90346,14 +90485,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/department/engine/atmos)
-"wCA" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"wCB" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
/obj/effect/turf_decal/stripes/line{
@@ -91932,14 +92063,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/lockers)
-"xaN" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/bot,
-/obj/structure/table,
-/obj/item/storage/medkit/regular,
-/obj/machinery/power/apc/auto_name/directional/west,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"xaP" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -95071,6 +95194,13 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai)
+"xMZ" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/cargo/sorting)
"xNe" = (
/obj/structure/lattice,
/obj/structure/grille/broken,
@@ -95626,6 +95756,13 @@
/obj/structure/barricade/wooden,
/turf/open/floor/plating,
/area/station/service/abandoned_gambling_den)
+"xVv" = (
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"xVI" = (
/obj/structure/rack,
/obj/item/analyzer,
@@ -96173,15 +96310,6 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron,
/area/station/science/robotics/mechbay)
-"ydr" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"ydE" = (
/obj/structure/chair/stool/directional/south,
/obj/effect/decal/cleanable/dirt,
@@ -96571,14 +96699,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/lab)
-"yiG" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/tile/purple/half/contrasted,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"yiK" = (
/obj/item/kirbyplants/organic/plant21,
/obj/effect/turf_decal/delivery,
@@ -138788,7 +138908,7 @@ hoC
yfI
bGf
kGo
-nXf
+sCW
xhW
ygL
xhW
@@ -139541,7 +139661,7 @@ kRn
kjl
lDi
lDi
-eKS
+sLg
bqv
hDZ
bfT
@@ -139629,9 +139749,9 @@ cwe
ltS
cwe
oDE
-taR
+fUr
bcj
-wsJ
+pDy
oDE
ajY
tJh
@@ -139805,13 +139925,13 @@ oSv
ueU
cNf
wqo
-lfC
+hpB
oSv
mOe
yhh
liD
mZU
-jUy
+whb
uBZ
pso
sqW
@@ -140328,8 +140448,8 @@ gLz
xhW
axz
fOz
-fUl
-jCR
+rAl
+bkr
yfo
qLp
pcx
@@ -140585,14 +140705,14 @@ ohH
xhW
xhW
nPo
-kGo
-nPo
-xhW
-xhW
-xhW
-xhW
-jjK
-jtE
+xMZ
+cGV
+cGV
+cGV
+cGV
+cGV
+uBd
+wuU
vPp
tJT
qzY
@@ -140840,14 +140960,14 @@ uSp
oSv
cFz
rWo
-ctR
-ydr
-gDE
-dsq
-atk
-ohR
-xaN
-tpZ
+qko
+vNV
+pxS
+fbu
+mlF
+qsF
+jKY
+cGV
lDY
tpZ
kOj
@@ -141096,16 +141216,16 @@ qaF
tQW
hQj
uzM
-fsg
-eIA
-dtp
-cQO
-wml
-cQO
-nTw
-lBB
-tpZ
-dri
+aPD
+stf
+llj
+ftS
+fbu
+mDm
+vDj
+cwd
+cGV
+qmT
tpZ
aaa
aad
@@ -141353,16 +141473,16 @@ rbV
qLg
uTu
tQP
-fnN
-mcK
-ltB
-wCA
-nsI
-cze
-ihc
-bNi
-qyX
-vzy
+rmH
+toy
+izj
+fAj
+pUs
+okN
+oAV
+vId
+cGV
+eFU
tpZ
aaa
lhY
@@ -141611,15 +141731,15 @@ fya
cSK
pok
rWo
-llJ
-fCb
-vyF
-dih
-vQT
-yiG
-oea
-tpZ
-nos
+uND
+kKx
+dux
+cGV
+nEE
+cyc
+rQF
+cGV
+eFU
tpZ
aad
lhY
@@ -141868,15 +141988,15 @@ fKA
krp
krp
aJE
-kzi
-fCb
-fZz
-oml
-qyO
-eld
-oWV
-tpZ
-nro
+mtL
+tcB
+rWo
+cGV
+cGV
+cGV
+cGV
+cGV
+jRc
tpZ
aaa
lhY
@@ -142125,15 +142245,15 @@ jmp
iWR
gkP
krp
-gdD
-iWJ
-fJm
-oml
-ksL
-sxu
-aSj
+llJ
+ljQ
+guj
+eYt
+nhj
+owZ
+bLN
tpZ
-gUe
+eFU
tpZ
aaa
lhY
@@ -142382,15 +142502,15 @@ xPf
xZC
aiF
aJE
-snh
-dIz
-cQO
-wxL
-cQO
-grT
-aLg
-tpZ
-dcA
+jCu
+rUi
+kTs
+sgK
+iio
+gco
+hkn
+qyX
+cwK
tpZ
aaa
lhY
@@ -142639,12 +142759,12 @@ osw
qZD
qrG
aJE
-tQr
-gGM
-ksL
-cQO
-cQO
-uAH
+dPC
+usJ
+iXd
+elO
+hzs
+uOk
bhJ
tpZ
tpZ
@@ -142896,12 +143016,12 @@ uQZ
xhJ
vMd
tgX
-fwD
-dRf
-ofM
-woJ
-aWe
-rKu
+jfO
+jBM
+tNn
+xVv
+dXs
+rgC
tDD
rWo
aad
@@ -146744,7 +146864,7 @@ mSe
mSe
mSe
mSe
-vmo
+klh
lQj
xBD
mXg
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index 5ae6d741a2a..47fcdebb2c1 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -2960,6 +2960,13 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"aVE" = (
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
+ dir = 4
+ },
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/cargo/miningdock)
"aVF" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/turf_decal/tile/red{
@@ -4450,6 +4457,9 @@
},
/turf/open/floor/iron/dark,
/area/mine/storage)
+"bsx" = (
+/turf/closed/wall,
+/area/station/bitrunning/den)
"bsG" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/research/glass{
@@ -5212,20 +5222,6 @@
/obj/item/storage/box/monkeycubes,
/turf/open/floor/iron,
/area/station/science/xenobiology)
-"bCM" = (
-/obj/machinery/requests_console/directional/north{
- department = "Cargo Bay";
- name = "Cargo Bay Requests Console"
- },
-/obj/effect/mapping_helpers/requests_console/supplies,
-/obj/structure/table,
-/obj/item/hand_labeler,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/item/folder/yellow,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"bCQ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
@@ -7184,12 +7180,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"cfR" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"cfS" = (
/obj/item/clothing/suit/costume/snowman{
name = "Man of Snow"
@@ -9403,16 +9393,6 @@
/obj/effect/mapping_helpers/airlock/access/all/security/brig,
/turf/open/floor/iron/dark/textured,
/area/station/security/lockers)
-"cLI" = (
-/obj/structure/rack,
-/obj/item/shovel{
- pixel_x = -5
- },
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"cLJ" = (
/obj/structure/table/wood,
/obj/item/paper{
@@ -10044,6 +10024,19 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/mine/laborcamp)
+"cWa" = (
+/obj/machinery/light_switch/directional/west,
+/obj/effect/turf_decal/box/corners{
+ dir = 1
+ },
+/obj/effect/turf_decal/box/corners{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/landmark/bitrunning/station_reward_spawn,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/bitrunning/den)
"cWq" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/turf_decal/tile/green/half/contrasted{
@@ -10051,11 +10044,6 @@
},
/turf/open/floor/iron,
/area/station/security/prison/garden)
-"cWr" = (
-/obj/effect/landmark/start/shaft_miner,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"cWG" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -10720,6 +10708,12 @@
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/underground/explored)
+"dgf" = (
+/obj/machinery/firealarm/directional/north,
+/obj/structure/chair,
+/obj/effect/landmark/start/bitrunner,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"dgl" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
@@ -12020,6 +12014,13 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/engineering/lobby)
+"dAt" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/light_switch/directional/west,
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"dAx" = (
/obj/machinery/hydroponics/soil{
pixel_y = 8
@@ -12280,11 +12281,6 @@
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron,
/area/station/command/bridge)
-"dEJ" = (
-/obj/machinery/light_switch/directional/north,
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"dEQ" = (
/obj/machinery/camera/directional/east{
c_tag = "Public Mining Ladder"
@@ -12914,6 +12910,16 @@
/obj/effect/turf_decal/tile/dark_blue/diagonal_edge,
/turf/open/floor/iron/dark/diagonal,
/area/station/engineering/atmos/storage)
+"dPn" = (
+/obj/structure/rack,
+/obj/item/pickaxe{
+ pixel_x = 5
+ },
+/obj/item/shovel{
+ pixel_x = -5
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"dPy" = (
/obj/machinery/camera/directional/west{
c_tag = "Xenobiology Kill Chamber";
@@ -12936,6 +12942,20 @@
/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"dPW" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/obj/effect/landmark/start/bitrunner,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"dPX" = (
/obj/structure/sign/warning/docking/directional/east,
/obj/effect/turf_decal/weather/snow/corner{
@@ -13191,6 +13211,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/freezer,
/area/mine/laborcamp)
+"dUK" = (
+/obj/machinery/netpod,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/bitrunning/den)
"dUL" = (
/obj/machinery/door/poddoor/preopen{
id = "maint1"
@@ -13219,6 +13244,15 @@
/obj/structure/sign/poster/random/directional/east,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"dVs" = (
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/quantum_server,
+/obj/effect/decal/cleanable/oil/streak,
+/turf/open/floor/iron/dark/smooth_corner{
+ dir = 4
+ },
+/area/station/bitrunning/den)
"dVt" = (
/obj/structure/chair/stool/directional/west,
/turf/open/floor/iron/checker,
@@ -14879,6 +14913,12 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/maintenance/department/medical/central)
+"ewq" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"ewz" = (
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/window/reinforced/spawner/directional/north,
@@ -15078,6 +15118,10 @@
/obj/item/toy/sword,
/turf/open/floor/iron/checker,
/area/station/maintenance/port/fore)
+"eAe" = (
+/obj/structure/chair,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"eAg" = (
/obj/effect/spawner/structure/window/reinforced/tinted,
/turf/closed/wall,
@@ -15926,13 +15970,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/research)
-"eNM" = (
-/obj/machinery/cryo_cell,
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/turf/open/floor/iron/dark/textured,
-/area/station/medical/cryo)
"eNQ" = (
/obj/structure/sign/warning/vacuum/directional/south,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -16864,6 +16901,11 @@
/obj/item/seeds/apple,
/turf/open/floor/iron,
/area/mine/laborcamp)
+"feB" = (
+/obj/machinery/airalarm/directional/east,
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"feJ" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/security/armory/upper)
@@ -17576,6 +17618,10 @@
dir = 8
},
/area/station/medical/chem_storage)
+"fqY" = (
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"frd" = (
/obj/structure/railing/corner{
dir = 1
@@ -17662,6 +17708,19 @@
},
/turf/open/floor/iron/dark/textured,
/area/station/security/range)
+"fss" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"fsv" = (
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
@@ -18952,6 +19011,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"fNx" = (
+/obj/structure/cable,
+/obj/machinery/computer/quantum_console,
+/turf/open/floor/iron/dark/smooth_corner,
+/area/station/bitrunning/den)
"fNy" = (
/obj/structure/rack,
/obj/item/clothing/suit/hooded/wintercoat{
@@ -19964,6 +20028,13 @@
/obj/effect/turf_decal/siding/yellow,
/turf/open/floor/iron,
/area/station/engineering/storage)
+"gfu" = (
+/obj/machinery/light/small/directional/east,
+/obj/machinery/computer/order_console/bitrunning{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"gfw" = (
/obj/machinery/light/small/directional/west,
/obj/structure/table,
@@ -20945,13 +21016,6 @@
/obj/structure/window/reinforced/spawner/directional/south,
/turf/open/floor/iron,
/area/station/science/xenobiology)
-"gvZ" = (
-/obj/machinery/rnd/bepis,
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"gwm" = (
/obj/machinery/door/firedoor/heavy,
/turf/open/floor/iron/white/side{
@@ -20992,17 +21056,6 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/commons/dorms/laundry)
-"gwB" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/mining{
- name = "Mining Dock"
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"gwJ" = (
/obj/effect/turf_decal/stripes/asteroid/line{
dir = 5
@@ -21989,6 +22042,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/station/maintenance/aft/greater)
+"gMV" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/bitrunning/den)
"gMZ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -24204,13 +24261,6 @@
/obj/effect/turf_decal/tile/blue/full,
/turf/open/floor/iron/large,
/area/station/medical/treatment_center)
-"hxC" = (
-/obj/structure/rack,
-/obj/item/pickaxe{
- pixel_x = 5
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"hxE" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -28368,15 +28418,6 @@
dir = 1
},
/area/station/service/hydroponics)
-"iNu" = (
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = 1;
- pixel_y = 9
- },
-/obj/machinery/mining_weather_monitor/directional/west,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"iNy" = (
/obj/structure/chair{
dir = 4
@@ -29620,12 +29661,6 @@
/obj/structure/tank_holder/extinguisher,
/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
-"jiK" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"jjk" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing{
@@ -33571,6 +33606,13 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"krx" = (
+/obj/machinery/cryo_cell,
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/medical/cryo)
"kry" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -34168,14 +34210,6 @@
/obj/effect/spawner/random/structure/grille,
/turf/open/floor/plating,
/area/station/maintenance/department/chapel)
-"kAq" = (
-/obj/machinery/cryo_cell,
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron/dark/textured,
-/area/station/medical/cryo)
"kAC" = (
/obj/structure/reagent_dispensers/watertank,
/obj/effect/decal/cleanable/cobweb/cobweb2,
@@ -34800,10 +34834,6 @@
/obj/structure/sign/poster/official/random/directional/north,
/turf/open/floor/iron/smooth,
/area/mine/laborcamp/security)
-"kJz" = (
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"kJI" = (
/obj/structure/transit_tube/station/reverse,
/turf/open/floor/plating,
@@ -35260,6 +35290,12 @@
/obj/structure/sign/warning/bodysposal/directional/south,
/turf/open/floor/iron/white,
/area/station/medical/surgery/aft)
+"kQL" = (
+/obj/structure/cable,
+/obj/structure/chair,
+/obj/effect/landmark/start/shaft_miner,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"kQM" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 5
@@ -36920,13 +36956,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
-"lqt" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"lqz" = (
/obj/structure/cable,
/turf/closed/wall,
@@ -37058,6 +37087,18 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat/service)
+"lti" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/requests_console/directional/west{
+ department = "Mining";
+ name = "Mining Requests Console"
+ },
+/obj/effect/mapping_helpers/requests_console/supplies,
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"ltk" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
@@ -37066,6 +37107,13 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"ltl" = (
+/obj/machinery/airalarm/directional/west,
+/obj/effect/landmark/start/bitrunner,
+/obj/machinery/light/small/directional/south,
+/obj/effect/decal/cleanable/robot_debris,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"lts" = (
/obj/structure/extinguisher_cabinet/directional/south,
/obj/effect/turf_decal/tile/blue,
@@ -40354,11 +40402,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"mwF" = (
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"mwQ" = (
/obj/structure/tank_holder/extinguisher,
/turf/open/floor/plating,
@@ -41524,6 +41567,16 @@
/obj/effect/turf_decal/tile/yellow/anticorner/contrasted,
/turf/open/floor/iron,
/area/station/commons/storage/tools)
+"mTi" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/brown/half/contrasted,
+/obj/item/storage/box/bandages{
+ pixel_y = 6;
+ pixel_x = -6
+ },
+/obj/item/food/cheesiehonkers,
+/turf/open/floor/iron,
+/area/station/cargo/office)
"mTm" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/air_input{
dir = 1
@@ -41981,15 +42034,6 @@
/obj/machinery/light/built/directional/east,
/turf/open/floor/iron/white,
/area/station/maintenance/port/fore)
-"mZt" = (
-/obj/structure/closet/crate,
-/obj/item/radio/intercom/directional/east,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"mZu" = (
/obj/structure/table/glass,
/obj/item/cultivator,
@@ -42077,6 +42121,15 @@
/obj/machinery/light/directional/north,
/turf/open/floor/iron,
/area/station/engineering/storage)
+"naO" = (
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
+ dir = 8
+ },
+/obj/machinery/computer/security/mining{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"naP" = (
/obj/structure/chair/comfy/black{
dir = 4
@@ -43795,6 +43848,18 @@
},
/turf/closed/wall/r_wall,
/area/station/engineering/transit_tube)
+"nyB" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 1
+ },
+/obj/machinery/holopad,
+/obj/effect/decal/cleanable/oil,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"nyC" = (
/turf/open/floor/iron/dark/smooth_half,
/area/station/service/chapel)
@@ -44825,6 +44890,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/science/research)
+"nMB" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/mining{
+ name = "Mining Dock"
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/mapping_helpers/airlock/access/all/supply/general,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"nME" = (
/obj/item/clothing/head/utility/hardhat,
/turf/open/floor/plating/snowed/icemoon,
@@ -48153,14 +48229,6 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron/dark,
/area/station/engineering/supermatter/room)
-"oOa" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 8
- },
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"oOb" = (
/obj/structure/sign/warning/fire/directional/north,
/turf/open/floor/glass/reinforced,
@@ -48265,12 +48333,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/lobby)
-"oQa" = (
-/obj/structure/table,
-/obj/item/food/cheesiehonkers,
-/obj/effect/turf_decal/tile/brown/half/contrasted,
-/turf/open/floor/iron,
-/area/station/cargo/office)
"oQn" = (
/obj/structure/chair/sofa/corp/left{
dir = 8
@@ -48611,6 +48673,17 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/freezer,
/area/station/commons/toilet)
+"oVf" = (
+/obj/machinery/door/airlock/mining/glass{
+ id_tag = "innercargo";
+ name = "Bitrunning Den"
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
+/turf/open/floor/iron,
+/area/station/bitrunning/den)
"oVt" = (
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
@@ -49557,6 +49630,13 @@
},
/turf/open/floor/iron/smooth_large,
/area/station/cargo/warehouse)
+"piX" = (
+/obj/machinery/camera/directional/north{
+ c_tag = "Cargo Bay North"
+ },
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"pja" = (
/obj/structure/rack,
/obj/item/pickaxe,
@@ -49782,13 +49862,6 @@
/obj/structure/flora/grass/brown/style_random,
/turf/open/misc/asteroid/snow/standard_air,
/area/station/science/research)
-"pnr" = (
-/obj/structure/chair/office{
- dir = 8
- },
-/obj/effect/landmark/start/shaft_miner,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"pnz" = (
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron,
@@ -51962,6 +52035,17 @@
},
/turf/open/floor/iron,
/area/station/tcommsat/computer)
+"pVC" = (
+/obj/machinery/requests_console/directional/north{
+ department = "Cargo Bay";
+ name = "Cargo Bay Requests Console"
+ },
+/obj/effect/mapping_helpers/requests_console/supplies,
+/obj/structure/table,
+/obj/item/hand_labeler,
+/obj/item/folder/yellow,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"pVH" = (
/turf/closed/wall/mineral/wood,
/area/station/maintenance/aft/lesser)
@@ -53414,6 +53498,21 @@
/obj/machinery/light/directional/north,
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/underground/explored)
+"qtT" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/effect/turf_decal/trimline/brown/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"que" = (
/obj/machinery/camera/directional/south{
c_tag = "Chapel South"
@@ -54412,6 +54511,17 @@
/obj/item/cigbutt,
/turf/open/floor/wood/large,
/area/mine/eva/lower)
+"qJJ" = (
+/obj/machinery/firealarm/directional/east,
+/obj/structure/table,
+/obj/item/paper_bin{
+ pixel_x = 1;
+ pixel_y = 9
+ },
+/obj/item/folder/yellow,
+/obj/item/pen,
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"qJT" = (
/obj/machinery/light/small/directional/south,
/turf/open/floor/plating/snowed/icemoon,
@@ -54881,12 +54991,6 @@
"qPL" = (
/turf/closed/wall/r_wall,
/area/station/hallway/secondary/exit/departure_lounge)
-"qPR" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"qPX" = (
/obj/structure/sink/directional/west,
/obj/structure/mirror/directional/east,
@@ -55402,6 +55506,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/fore/lesser)
+"qYc" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"qYh" = (
/obj/structure/chair/pew{
dir = 1
@@ -55519,12 +55630,6 @@
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/textured,
/area/mine/mechbay)
-"qZY" = (
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/cargo/miningdock)
"rab" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
@@ -57193,14 +57298,6 @@
/obj/item/stack/license_plates/empty/fifty,
/turf/open/floor/iron/dark/smooth_half,
/area/station/security/prison/work)
-"rBz" = (
-/obj/machinery/door/airlock/mining/glass{
- name = "Mining Dock"
- },
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"rBL" = (
/obj/machinery/light/directional/west,
/turf/open/openspace,
@@ -59416,6 +59513,14 @@
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/project)
+"slK" = (
+/obj/machinery/cryo_cell,
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/iron/dark/textured,
+/area/station/medical/cryo)
"slX" = (
/obj/structure/fans/tiny,
/obj/effect/turf_decal/stripes/red/box,
@@ -61675,6 +61780,16 @@
},
/turf/open/floor/iron/smooth,
/area/mine/eva)
+"sUI" = (
+/obj/structure/rack,
+/obj/machinery/light/cold/directional/north,
+/obj/item/storage/box/bandages{
+ pixel_y = 6;
+ pixel_x = -6
+ },
+/obj/item/healthanalyzer,
+/turf/open/floor/iron/white/textured,
+/area/station/security/medical)
"sUN" = (
/obj/machinery/power/solar{
id = "starboardsolar";
@@ -61732,6 +61847,14 @@
/obj/item/screwdriver,
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/underground/explored)
+"sVW" = (
+/obj/effect/turf_decal/box/corners{
+ dir = 8
+ },
+/obj/effect/turf_decal/box/corners,
+/obj/effect/landmark/bitrunning/station_reward_spawn,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/bitrunning/den)
"sWl" = (
/obj/machinery/door/airlock/command{
name = "Chief Medical Officer"
@@ -62882,6 +63005,11 @@
/obj/item/key/janitor,
/turf/open/floor/iron,
/area/station/service/janitor)
+"tqC" = (
+/obj/machinery/netpod,
+/obj/machinery/camera/directional/south,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/bitrunning/den)
"tqQ" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -63401,6 +63529,17 @@
/obj/structure/chair/office,
/turf/open/floor/wood,
/area/station/service/library)
+"tyH" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/airlock/mining{
+ name = "Mining Dock"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"tyK" = (
/obj/item/mop,
/obj/item/reagent_containers/cup/bucket,
@@ -64455,10 +64594,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/mix)
-"tOz" = (
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"tOF" = (
/obj/structure/chair/comfy/black{
dir = 8
@@ -64834,13 +64969,6 @@
/obj/structure/table,
/turf/open/floor/plating/snowed/coldroom,
/area/station/service/kitchen/coldroom)
-"tWF" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"tWK" = (
/obj/structure/cable,
/turf/open/floor/plating/snowed/icemoon,
@@ -66113,17 +66241,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
/area/station/science/research)
-"use" = (
-/obj/structure/table,
-/obj/item/folder/yellow,
-/obj/item/pen,
-/obj/machinery/requests_console/directional/west{
- department = "Mining";
- name = "Mining Requests Console"
- },
-/obj/effect/mapping_helpers/requests_console/supplies,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"uso" = (
/obj/structure/closet/crate/trashcart,
/obj/effect/spawner/random/contraband/prison,
@@ -68310,6 +68427,10 @@
},
/turf/open/floor/iron/grimy,
/area/station/security/prison/work)
+"veh" = (
+/obj/machinery/vending/wardrobe/cargo_wardrobe,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"vek" = (
/obj/effect/turf_decal/weather/snow/corner,
/obj/machinery/light/small/directional/north,
@@ -68464,6 +68585,11 @@
/obj/effect/turf_decal/trimline/blue/filled/line,
/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
+"vgC" = (
+/obj/machinery/netpod,
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/bitrunning/den)
"vgD" = (
/obj/structure/rack,
/obj/item/stack/sheet/iron/fifty,
@@ -68497,10 +68623,6 @@
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron/dark,
/area/station/service/chapel)
-"vhn" = (
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"vhr" = (
/mob/living/simple_animal/hostile/retaliate/goat{
atmos_requirements = list("min_oxy"=1,"max_oxy"=0,"min_plas"=0,"max_plas"=1,"min_co2"=0,"max_co2"=5,"min_n2"=0,"max_n2"=0);
@@ -68700,10 +68822,6 @@
/obj/structure/sign/poster/random/directional/west,
/turf/open/floor/iron/large,
/area/station/service/kitchen/diner)
-"vlu" = (
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"vlI" = (
/obj/effect/turf_decal/siding/white{
dir = 4
@@ -70961,6 +71079,13 @@
/obj/item/book/bible,
/turf/open/floor/iron/chapel,
/area/station/service/chapel)
+"vWV" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/power/apc/auto_name/directional/west,
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"vWW" = (
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron,
@@ -72702,14 +72827,6 @@
/obj/effect/mapping_helpers/airlock/access/all/service/lawyer,
/turf/open/floor/wood,
/area/station/service/lawoffice)
-"wxd" = (
-/obj/machinery/camera/directional/north{
- c_tag = "Cargo Bay North"
- },
-/obj/machinery/vending/wardrobe/cargo_wardrobe,
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"wxg" = (
/turf/open/floor/iron/freezer,
/area/mine/laborcamp)
@@ -72792,13 +72909,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
-"wyv" = (
-/obj/machinery/camera/directional/west{
- c_tag = "Mining Dock"
- },
-/obj/machinery/computer/security/mining,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"wyB" = (
/obj/machinery/conveyor{
dir = 1;
@@ -72873,12 +72983,6 @@
},
/turf/open/floor/iron,
/area/mine/laborcamp)
-"wzz" = (
-/obj/structure/rack,
-/obj/item/healthanalyzer,
-/obj/machinery/light/cold/directional/north,
-/turf/open/floor/iron/white/textured,
-/area/station/security/medical)
"wAq" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -75929,12 +76033,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"xuh" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"xun" = (
/obj/machinery/door/poddoor/massdriver_chapel,
/obj/structure/fans/tiny,
@@ -229061,8 +229159,8 @@ xqX
bCQ
wBb
tKI
-gvZ
-jiK
+veh
+ajw
ajw
ajw
mmi
@@ -229318,8 +229416,8 @@ sIM
yjn
wBb
tKI
-bCM
-qPR
+pVC
+ajw
kXs
ajw
mmi
@@ -229832,7 +229930,7 @@ nAr
nAr
wNR
tKI
-wxd
+piX
ajw
ajw
ajw
@@ -230359,11 +230457,11 @@ irD
irD
pzX
gdN
-pYT
+gfu
maT
bln
qjQ
-qZY
+aVE
qxb
nrm
hoD
@@ -230616,11 +230714,11 @@ iaF
ajw
ajw
ajw
-kXr
-kXr
-bln
-qjQ
-qjQ
+bsx
+bsx
+gMV
+bsx
+bsx
ojk
bVJ
dSO
@@ -230873,12 +230971,12 @@ qqJ
gjP
ajw
ajw
-maT
-bln
-bln
-bln
-qjQ
-mZt
+gMV
+cWa
+sVW
+ltl
+bsx
+qYc
hxE
xtr
qjQ
@@ -231128,13 +231226,13 @@ kXr
kXr
kXr
kXr
-vhn
-ajw
-kXr
-bln
-bln
-qjQ
-qjQ
+dgf
+eMa
+oVf
+fss
+qtT
+tqC
+bsx
qjQ
rVe
qjQ
@@ -231384,17 +231482,17 @@ mAN
vra
lZQ
wXR
-qjQ
-aOd
-rBz
-aOd
-qjQ
-qjQ
-qjQ
-lqt
-oOa
+kXr
+eAe
+eMa
+bsx
+fNx
+dPW
+vgC
+bsx
+lti
jBf
-cLI
+naO
qjQ
sEB
sEB
@@ -231640,18 +231738,18 @@ kXA
kXA
oDt
kRU
-oQa
-qjQ
-mwF
-tOz
-hoD
-iNu
-use
-wyv
-hoD
-hoD
+mTi
+kXr
+kQL
+ewq
+bsx
+dVs
+nyB
+dUK
+bsx
+fqY
hxE
-hxC
+dPn
aOd
bln
bln
@@ -231898,14 +231996,14 @@ cXl
uxl
oRy
aHC
-qjQ
-dEJ
-cWr
-hoD
-hoD
-pnr
-cfR
-hoD
+kXr
+ghl
+ewq
+bsx
+gMV
+gMV
+bsx
+bsx
iVA
hxE
aCh
@@ -232155,14 +232253,14 @@ mOA
cHb
psW
psW
-gwB
-hxE
-hxE
-tWF
-hxE
-hxE
+nMB
+ewq
+ewq
+tyH
hxE
hxE
+vWV
+dAt
hxE
hxE
wBV
@@ -232412,13 +232510,13 @@ ljl
kXA
rLu
nRq
+maT
+ajw
+eMa
aOd
-hoD
-xuh
-hoD
-kJz
+qJJ
hxE
-hoD
+iVA
hoD
hoD
abz
@@ -232672,10 +232770,10 @@ uuP
tue
nZh
lNG
-nZh
tue
+qjQ
hxE
-vlu
+feB
lis
aud
lis
@@ -239546,7 +239644,7 @@ bUx
jOQ
bxQ
bUx
-wzz
+sUI
vxc
aKt
tDk
@@ -250147,7 +250245,7 @@ oyy
amE
wyj
klc
-eNM
+krx
ufN
vCz
ufN
@@ -250661,7 +250759,7 @@ qhN
amE
lei
klc
-kAq
+slK
hXU
oRu
hIe
diff --git a/_maps/map_files/KiloStation2/KiloStation2.dmm b/_maps/map_files/KiloStation2/KiloStation2.dmm
index aefa21efb19..b02882b427f 100644
--- a/_maps/map_files/KiloStation2/KiloStation2.dmm
+++ b/_maps/map_files/KiloStation2/KiloStation2.dmm
@@ -762,6 +762,7 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/cargo/drone_bay)
"akH" = (
@@ -4436,10 +4437,14 @@
/area/station/maintenance/fore)
"byb" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/girder,
-/obj/structure/grille,
-/turf/open/floor/plating,
-/area/station/maintenance/department/cargo)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/camera/directional/west{
+ c_tag = "Engineering West"
+ },
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor,
+/area/station/bitrunning/den)
"bys" = (
/obj/effect/turf_decal/siding/blue{
dir = 5
@@ -4606,6 +4611,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/cargo/drone_bay)
"bAX" = (
@@ -4852,14 +4860,11 @@
/turf/open/floor/iron/white,
/area/station/security/prison/mess)
"bFm" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/north,
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/plating,
-/area/station/maintenance/department/cargo)
+/obj/structure/cable,
+/obj/effect/decal/cleanable/oil,
+/turf/open/floor/catwalk_floor,
+/area/station/bitrunning/den)
"bFu" = (
/obj/structure/cable,
/turf/closed/wall/rust,
@@ -8249,15 +8254,16 @@
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/ce)
"cLG" = (
-/obj/structure/chair{
- dir = 4
- },
/obj/effect/turf_decal/tile/red{
dir = 1
},
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
},
+/obj/item/radio/intercom/directional/north,
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
"cLL" = (
@@ -8452,7 +8458,7 @@
/area/station/maintenance/starboard)
"cQR" = (
/turf/closed/wall,
-/area/station/maintenance/department/cargo)
+/area/station/bitrunning/den)
"cQV" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment{
@@ -10089,7 +10095,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/cable,
/obj/machinery/status_display/evac/directional/north,
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -11527,6 +11532,9 @@
dir = 4
},
/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
"dNL" = (
@@ -12329,11 +12337,14 @@
/area/station/science/xenobiology)
"ecl" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/emcloset,
-/obj/effect/spawner/random/maintenance,
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/plating,
-/area/station/maintenance/department/cargo)
+/obj/machinery/netpod,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/obj/machinery/light/directional/south,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"ecE" = (
/turf/closed/wall/rust,
/area/station/service/chapel/storage)
@@ -12459,6 +12470,11 @@
"eft" = (
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
+"efB" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/catwalk_floor,
+/area/station/bitrunning/den)
"efG" = (
/turf/closed/wall,
/area/station/maintenance/fore)
@@ -14363,7 +14379,7 @@
"eMo" = (
/obj/structure/sign/departments/evac,
/turf/closed/wall,
-/area/station/maintenance/department/cargo)
+/area/station/bitrunning/den)
"eMr" = (
/obj/effect/turf_decal/tile/purple/half/contrasted,
/turf/open/floor/iron/showroomfloor,
@@ -14833,7 +14849,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/cable,
/obj/machinery/camera/directional/north{
c_tag = "Starboad Hallway Custodial Bay";
name = "starboard camera"
@@ -16449,6 +16464,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"fuB" = (
@@ -16898,17 +16914,18 @@
},
/area/station/service/chapel)
"fBh" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Departure Lounge"
},
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/unres{
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "departures-entrance"
+ },
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/turf/open/floor/plating,
-/area/station/maintenance/department/cargo)
+/turf/open/floor/iron/dark,
+/area/station/hallway/secondary/exit/departure_lounge)
"fBm" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/window/reinforced/spawner/directional/west,
@@ -18778,6 +18795,9 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"gev" = (
@@ -20072,6 +20092,14 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/lesser)
+"gzi" = (
+/obj/machinery/computer/quantum_console,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 10
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"gzv" = (
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 1
@@ -20908,13 +20936,9 @@
/turf/open/space/basic,
/area/space/nearstation)
"gMA" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/plating,
-/area/station/maintenance/department/cargo)
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark,
+/area/station/bitrunning/den)
"gMC" = (
/obj/machinery/suit_storage_unit/engine,
/obj/effect/turf_decal/delivery,
@@ -23433,12 +23457,12 @@
/turf/open/floor/iron/dark,
/area/station/science/ordnance/office)
"hDa" = (
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/department/cargo)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/landmark/start/bitrunner,
+/turf/open/floor/catwalk_floor,
+/area/station/bitrunning/den)
"hDy" = (
/obj/structure/grille/broken,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -23559,17 +23583,11 @@
/area/station/maintenance/aft)
"hEH" = (
/obj/effect/turf_decal/bot,
-/obj/machinery/disposal/bin,
-/obj/machinery/light/directional/east,
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/turf/open/floor/iron/dark,
-/area/station/hallway/secondary/exit/departure_lounge)
+/turf/closed/wall,
+/area/station/bitrunning/den)
"hEI" = (
/obj/machinery/pdapainter/medbay,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -23676,7 +23694,6 @@
/area/station/hallway/primary/fore)
"hGC" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/rnd/bepis,
/obj/effect/turf_decal/box/white,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
@@ -23945,7 +23962,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/cable,
/obj/effect/spawner/random/vending/snackvend,
/obj/effect/turf_decal/bot,
/obj/machinery/airalarm/directional/north,
@@ -28881,16 +28897,16 @@
/turf/open/floor/iron/dark,
/area/station/maintenance/department/bridge)
"jgI" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/closet/crate,
-/obj/item/clothing/shoes/jackboots{
- pixel_x = 4;
- pixel_y = 4
+/obj/effect/landmark/bitrunning/station_reward_spawn,
+/obj/effect/turf_decal/box/corners{
+ dir = 1
},
-/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/shoes/cowboy/black,
-/turf/open/floor/plating,
-/area/station/maintenance/department/cargo)
+/obj/effect/turf_decal/box/corners{
+ dir = 4
+ },
+/obj/machinery/light/directional/east,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"jgN" = (
/turf/open/floor/iron/dark,
/area/station/service/chapel/funeral)
@@ -29704,6 +29720,9 @@
/obj/effect/turf_decal/tile/red{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
"jwu" = (
@@ -30442,7 +30461,6 @@
/turf/open/floor/iron,
/area/station/security/courtroom)
"jJB" = (
-/obj/structure/cable,
/obj/effect/landmark/start/hangover,
/obj/structure/disposalpipe/sorting/mail/flip{
dir = 8;
@@ -34131,7 +34149,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/cable,
/obj/item/kirbyplants/organic/plant21,
/obj/structure/extinguisher_cabinet/directional/north,
/obj/effect/turf_decal/tile/red{
@@ -34752,14 +34769,9 @@
/turf/open/floor/iron/dark,
/area/station/maintenance/port/greater)
"lfu" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
-/area/station/maintenance/department/cargo)
+/obj/machinery/computer/order_console/bitrunning,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"lfz" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
@@ -35052,7 +35064,6 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
-/obj/structure/cable,
/obj/effect/spawner/random/vending/colavend,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/neutral/half/contrasted,
@@ -36364,6 +36375,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
"lFC" = (
@@ -41451,7 +41465,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/disposalpipe/segment,
-/obj/structure/cable,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
@@ -41896,10 +41909,6 @@
"nwf" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/obj/structure/cable,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
@@ -43142,13 +43151,14 @@
/turf/open/floor/iron/dark,
/area/station/service/chapel/funeral)
"nTd" = (
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment{
+/obj/machinery/quantum_server,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 6
},
-/turf/open/floor/plating,
-/area/station/maintenance/department/cargo)
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"nTo" = (
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating/airless,
@@ -44835,12 +44845,12 @@
/area/station/cargo/warehouse)
"ozz" = (
/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/plating,
-/area/station/maintenance/department/cargo)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/catwalk_floor,
+/area/station/bitrunning/den)
"ozO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
@@ -45688,6 +45698,14 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
+"oQt" = (
+/obj/effect/landmark/bitrunning/station_reward_spawn,
+/obj/effect/turf_decal/box/corners{
+ dir = 8
+ },
+/obj/effect/turf_decal/box/corners,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"oQv" = (
/obj/structure/bookcase/random,
/obj/structure/cable,
@@ -45868,15 +45886,15 @@
/turf/open/floor/iron/dark,
/area/station/command/bridge)
"oSX" = (
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = -4;
- pixel_y = 4
- },
-/obj/item/pen,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/effect/turf_decal/box,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit/departure_lounge)
"oTd" = (
@@ -46539,14 +46557,14 @@
/area/station/medical/medbay/central)
"pdZ" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/trash/caution_sign,
/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
-/area/station/maintenance/department/cargo)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/landmark/start/bitrunner,
+/obj/effect/decal/cleanable/oil/streak,
+/turf/open/floor/catwalk_floor,
+/area/station/bitrunning/den)
"pem" = (
/obj/structure/transit_tube/curved/flipped{
dir = 4
@@ -49997,15 +50015,17 @@
/turf/open/floor/plating,
/area/station/hallway/primary/port)
"qih" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 1
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/machinery/newscaster/directional/south,
+/obj/structure/chair{
+ pixel_y = -2
+ },
+/obj/effect/landmark/start/bitrunner,
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
-/area/station/maintenance/department/cargo)
+/area/station/bitrunning/den)
"qij" = (
/obj/effect/turf_decal/box/corners,
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
@@ -51862,7 +51882,6 @@
"qRh" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
/obj/structure/disposalpipe/junction/flip,
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -53435,7 +53454,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/cable,
/obj/effect/turf_decal/tile/red{
dir = 1
},
@@ -54371,6 +54389,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
"rDi" = (
@@ -56262,6 +56283,9 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/cargo/drone_bay)
"shZ" = (
@@ -58228,6 +58252,8 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
+/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"sNe" = (
@@ -61405,10 +61431,14 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard)
"tNa" = (
-/obj/structure/closet/firecloset,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/station/maintenance/department/cargo)
+/obj/machinery/netpod,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 5
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"tNe" = (
/obj/structure/disposalpipe/junction,
/obj/structure/cable,
@@ -61460,13 +61490,9 @@
/turf/open/floor/iron/showroomfloor,
/area/station/science/ordnance)
"tNQ" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/turf/open/floor/iron/dark,
-/area/station/hallway/secondary/exit/departure_lounge)
+/turf/closed/wall,
+/area/station/bitrunning/den)
"tNW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -62356,7 +62382,6 @@
/turf/open/floor/iron/dark/telecomms,
/area/station/science/server)
"ucm" = (
-/obj/structure/cable,
/obj/structure/disposalpipe/segment{
dir = 9
},
@@ -63829,13 +63854,14 @@
/area/station/hallway/secondary/entry)
"uAc" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/rack,
-/obj/item/stack/sheet/iron/twenty,
-/obj/item/stack/sheet/glass{
- amount = 20
+/obj/machinery/netpod,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
},
-/turf/open/floor/plating,
-/area/station/maintenance/department/cargo)
+/obj/item/radio/intercom/directional/south,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"uAe" = (
/obj/structure/chair{
dir = 8
@@ -68421,12 +68447,13 @@
/turf/closed/wall/rust,
/area/station/maintenance/fore)
"vUp" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Drone Bay Maintenance"
- },
-/obj/effect/mapping_helpers/airlock/access/all/supply/general,
+/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
+/obj/machinery/door/airlock/mining/glass,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
/turf/open/floor/plating,
-/area/station/maintenance/department/cargo)
+/area/station/bitrunning/den)
"vUr" = (
/obj/structure/table/glass,
/obj/item/crowbar{
@@ -69826,12 +69853,10 @@
/turf/open/floor/iron/showroomfloor,
/area/station/security/brig)
"wpn" = (
-/obj/item/kirbyplants/organic/plant21,
-/obj/item/radio/intercom/directional/north,
/obj/machinery/status_display/ai/directional/west,
/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/turf/open/floor/iron/dark,
-/area/station/hallway/secondary/exit/departure_lounge)
+/turf/closed/wall,
+/area/station/bitrunning/den)
"wpu" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -70526,6 +70551,11 @@
/obj/machinery/telecomms/broadcaster/preset_left,
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/station/tcommsat/server)
+"wAZ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor,
+/area/station/bitrunning/den)
"wBf" = (
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
@@ -71094,7 +71124,7 @@
/area/station/maintenance/fore)
"wJn" = (
/turf/closed/wall/rust,
-/area/station/maintenance/department/cargo)
+/area/station/bitrunning/den)
"wJo" = (
/turf/open/floor/plating,
/area/station/maintenance/department/security)
@@ -115103,10 +115133,10 @@ jnp
tOy
wJn
wJn
-fBh
cQR
cQR
-pIl
+cQR
+fBh
pIl
mbE
eHY
@@ -115616,7 +115646,7 @@ pHE
bmX
dwh
cQR
-wJn
+gzi
pdZ
ecl
wJn
@@ -116131,10 +116161,10 @@ bHR
xTH
wJn
lfu
-cQR
+wAZ
cQR
eMo
-pIl
+fBh
pIl
mbE
iSw
@@ -116388,7 +116418,7 @@ yaF
jAl
cQR
bFm
-wJn
+efB
wpn
cLG
jwn
@@ -116902,7 +116932,7 @@ kVD
cQb
cQR
jgI
-cQR
+oQt
hEH
oSX
kdO
@@ -117160,7 +117190,7 @@ tOy
cQR
cQR
cQR
-vOW
+cQR
wJe
sMh
iCW
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index ebcfba29362..af7f222ea55 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -3334,6 +3334,19 @@
/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"bje" = (
+/obj/effect/turf_decal/box/corners{
+ dir = 8
+ },
+/obj/effect/turf_decal/box/corners{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/oil/streak,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/effect/landmark/bitrunning/station_reward_spawn,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/bitrunning/den)
"bjl" = (
/obj/machinery/rnd/production/techfab/department/service,
/obj/effect/turf_decal/trimline/brown/warning{
@@ -4516,6 +4529,11 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/fore)
+"bDS" = (
+/obj/structure/chair/office/light,
+/obj/structure/cable,
+/turf/open/floor/iron/white,
+/area/station/command/heads_quarters/cmo)
"bDW" = (
/turf/closed/wall,
/area/station/maintenance/department/engine)
@@ -4661,6 +4679,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
+"bGM" = (
+/obj/machinery/door/airlock/mining{
+ name = "Mining Office"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
+/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"bHb" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -4672,6 +4701,10 @@
/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
dir = 1
},
+/obj/item/storage/box/bandages{
+ pixel_y = 6;
+ pixel_x = 4
+ },
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
"bHr" = (
@@ -6060,6 +6093,15 @@
"clq" = (
/turf/open/floor/carpet,
/area/station/security/detectives_office)
+"cly" = (
+/obj/machinery/computer/quantum_console,
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/effect/decal/cleanable/cobweb,
+/obj/machinery/camera/directional/north{
+ c_tag = "Mining Dock"
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"clA" = (
/obj/structure/sign/departments/cargo,
/turf/closed/wall,
@@ -7167,6 +7209,15 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/security/brig)
+"cGL" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"cGV" = (
/obj/machinery/air_sensor/plasma_tank,
/turf/open/floor/engine/plasma,
@@ -8233,7 +8284,7 @@
/obj/item/bedsheet/red,
/obj/machinery/airalarm/directional/east,
/obj/machinery/flasher/directional/north{
- id = "IsolationCell"
+ id = "IsolationFlash"
},
/obj/effect/turf_decal/tile/red/fourcorners,
/turf/open/floor/iron/white,
@@ -8828,6 +8879,13 @@
/obj/structure/window/spawner/directional/south,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"dob" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 4
+ },
+/obj/machinery/computer/order_console/bitrunning,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"dox" = (
/obj/structure/rack,
/obj/item/screwdriver{
@@ -9260,6 +9318,15 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/engineering/atmos)
+"dwA" = (
+/obj/effect/spawner/random/maintenance,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
"dwJ" = (
/obj/structure/lattice,
/obj/effect/spawner/random/structure/grille,
@@ -9352,6 +9419,16 @@
},
/turf/open/floor/plating,
/area/station/science/lab)
+"dzh" = (
+/obj/machinery/quantum_server,
+/obj/effect/turf_decal/bot/left,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 6
+ },
+/obj/machinery/light/directional/north,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"dzw" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -9516,13 +9593,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating/airless,
/area/station/solars/starboard/fore)
-"dDR" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"dDZ" = (
/obj/machinery/door/airlock/external{
name = "Common Mining Dock"
@@ -10931,6 +11001,17 @@
/obj/docking_port/stationary/escape_pod,
/turf/open/space/basic,
/area/space)
+"edo" = (
+/obj/structure/table/glass,
+/obj/item/paper_bin,
+/obj/item/clipboard,
+/obj/item/toy/figure/cmo,
+/obj/structure/cable,
+/obj/item/stamp/head/cmo{
+ pixel_x = -9
+ },
+/turf/open/floor/iron/white,
+/area/station/command/heads_quarters/cmo)
"edq" = (
/obj/machinery/light/small/directional/west,
/obj/structure/cable,
@@ -10987,6 +11068,17 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/cargo/sorting)
+"edP" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
"edQ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -11896,6 +11988,7 @@
/turf/open/floor/iron,
/area/station/maintenance/starboard/greater)
"esK" = (
+/obj/machinery/firealarm/directional/east,
/obj/structure/cable,
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/dark,
@@ -12186,13 +12279,6 @@
/obj/structure/cable,
/turf/open/floor/iron/freezer,
/area/station/security/prison/shower)
-"exq" = (
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 4
- },
-/obj/effect/spawner/random/structure/grille,
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"exr" = (
/obj/structure/table/wood,
/obj/item/paper_bin{
@@ -12418,6 +12504,22 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
+"eEb" = (
+/obj/effect/turf_decal/trimline/brown/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/brown/corner{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/airlock/mining{
+ name = "Bitrunning Den"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
+/turf/open/floor/iron/dark/textured_half,
+/area/station/bitrunning/den)
"eEf" = (
/obj/machinery/camera/directional/north{
c_tag = "Bar - Backroom"
@@ -14930,6 +15032,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
+"fBl" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/bitrunning/den)
"fBo" = (
/obj/machinery/door/window/left/directional/north{
dir = 8;
@@ -15572,6 +15678,15 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/white,
/area/station/science/explab)
+"fNH" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Mining Dock Maintenance"
+ },
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
+/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
"fNI" = (
/obj/structure/sign/poster/contraband/random/directional/east,
/turf/open/floor/wood,
@@ -16081,9 +16196,6 @@
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"fYC" = (
@@ -16477,6 +16589,12 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"ghJ" = (
+/obj/machinery/netpod,
+/obj/machinery/light/directional/west,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/bitrunning/den)
"ghK" = (
/obj/structure/rack,
/obj/item/tank/internals/oxygen,
@@ -16593,11 +16711,6 @@
/obj/machinery/vending/wardrobe/jani_wardrobe,
/turf/open/floor/iron,
/area/station/service/janitor)
-"gjY" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/structure/sign/poster/contraband/random/directional/north,
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"gjZ" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
@@ -17266,6 +17379,10 @@
"guX" = (
/turf/closed/wall,
/area/station/commons/storage/primary)
+"guZ" = (
+/obj/machinery/netpod,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/bitrunning/den)
"gva" = (
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
@@ -18154,14 +18271,18 @@
/area/station/medical/abandoned)
"gMg" = (
/obj/structure/table,
-/obj/item/storage/medkit/regular,
-/obj/item/reagent_containers/cup/bottle/epinephrine,
-/obj/item/reagent_containers/cup/bottle/multiver,
-/obj/item/reagent_containers/syringe,
/obj/structure/extinguisher_cabinet/directional/west,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
},
+/obj/item/storage/box/bandages{
+ pixel_y = 6;
+ pixel_x = -6
+ },
+/obj/item/storage/medkit/regular,
+/obj/item/reagent_containers/cup/bottle/multiver,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
+/obj/item/reagent_containers/syringe,
/turf/open/floor/iron/white,
/area/station/security/medical)
"gMt" = (
@@ -18376,6 +18497,14 @@
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible,
/turf/open/space/basic,
/area/space/nearstation)
+"gQv" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
"gQw" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/white/line,
@@ -19945,7 +20074,6 @@
},
/obj/item/mod/module/plasma_stabilizer,
/obj/item/mod/module/thermal_regulator,
-/obj/item/mod/module/signlang_radio,
/turf/open/floor/iron/dark,
/area/station/medical/storage)
"hwg" = (
@@ -20389,6 +20517,23 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"hDd" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
+ dir = 8
+ },
+/obj/machinery/firealarm/directional/south,
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/textured_half,
+/area/station/bitrunning/den)
"hDe" = (
/obj/machinery/portable_atmospherics/canister/plasma,
/turf/open/floor/engine/plasma,
@@ -20911,11 +21056,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/station/maintenance/aft/lesser)
-"hNS" = (
-/obj/structure/cable,
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"hOh" = (
/obj/effect/turf_decal/trimline/red/filled/line,
/obj/effect/turf_decal/trimline/brown/filled/warning,
@@ -21606,13 +21746,6 @@
/obj/machinery/seed_extractor,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
-"iaA" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"iaK" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted,
/obj/machinery/light/directional/south,
@@ -23109,12 +23242,6 @@
/obj/effect/spawner/random/techstorage/medical_all,
/turf/open/floor/iron/dark,
/area/station/engineering/storage/tech)
-"izi" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"izl" = (
/obj/machinery/duct,
/obj/structure/disposalpipe/segment{
@@ -23289,14 +23416,6 @@
/obj/machinery/holopad,
/turf/open/floor/wood,
/area/station/service/cafeteria)
-"iBx" = (
-/obj/machinery/vending/wardrobe/cargo_wardrobe,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 8
- },
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"iBL" = (
/obj/structure/table/wood,
/turf/open/floor/wood,
@@ -24137,10 +24256,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/brig)
-"iPY" = (
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"iQd" = (
/obj/machinery/door/poddoor/shutters{
id = "supplybridge"
@@ -24475,6 +24590,21 @@
/obj/machinery/duct,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
+"iUV" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/start/bitrunner,
+/obj/machinery/holopad,
+/turf/open/floor/iron/dark/textured_half,
+/area/station/bitrunning/den)
"iVi" = (
/obj/machinery/door/airlock{
id_tag = "Cabin6";
@@ -25867,6 +25997,13 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/engineering/storage/tech)
+"jty" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"jtA" = (
/obj/structure/table/glass,
/obj/effect/turf_decal/siding/white{
@@ -26835,14 +26972,14 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"jJp" = (
+/obj/machinery/button/flasher{
+ id = "IsolationFlash";
+ pixel_x = -23;
+ pixel_y = 8
+ },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/status_display/door_timer{
- id = "IsolationCell";
- name = "Isolation Cell";
- pixel_x = -32
- },
/turf/open/floor/iron,
/area/station/security/execution/transfer)
"jJC" = (
@@ -28257,13 +28394,6 @@
/obj/effect/mapping_helpers/airlock/access/all/service/crematorium,
/turf/open/floor/plating,
/area/station/maintenance/aft/greater)
-"khX" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"khZ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -29579,6 +29709,17 @@
/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/floor/engine,
/area/station/science/explab)
+"kHU" = (
+/obj/effect/turf_decal/box/corners,
+/obj/effect/turf_decal/box/corners{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light_switch/directional/north,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/landmark/bitrunning/station_reward_spawn,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/bitrunning/den)
"kIG" = (
/obj/structure/rack,
/obj/effect/spawner/random/maintenance/two,
@@ -32750,6 +32891,14 @@
/obj/vehicle/sealed/mecha/ripley/cargo,
/turf/open/floor/plating,
/area/station/cargo/warehouse)
+"lUe" = (
+/obj/structure/reagent_dispensers/fueltank,
+/obj/structure/sign/poster/contraband/random/directional/north,
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
"lUj" = (
/obj/structure/table,
/obj/item/book/manual/wiki/security_space_law{
@@ -33488,14 +33637,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/storage)
-"mhx" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 1
- },
-/obj/effect/mapping_helpers/mail_sorting/supply/disposals,
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"mhA" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/west,
@@ -34517,6 +34658,15 @@
/obj/structure/window/spawner/directional/south,
/turf/open/floor/iron/white,
/area/station/security/prison/mess)
+"mzs" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/mapping_helpers/broken_floor,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
"mzu" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -34572,6 +34722,12 @@
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/port)
+"mAy" = (
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"mAJ" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -37958,15 +38114,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/commons/locker)
-"nFq" = (
-/obj/machinery/door/airlock/mining{
- name = "Mining Office"
- },
-/obj/structure/cable,
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"nFL" = (
/obj/machinery/camera/directional/north{
c_tag = "MiniSat Exterior - Fore";
@@ -38162,7 +38309,6 @@
dir = 4
},
/obj/structure/sign/poster/official/random/directional/north,
-/obj/item/mod/module/signlang_radio,
/turf/open/floor/iron/dark/corner{
dir = 1
},
@@ -38270,18 +38416,6 @@
/obj/structure/flora/bush/flowers_br/style_random,
/turf/open/floor/grass,
/area/station/maintenance/starboard/aft)
-"nMk" = (
-/obj/machinery/door/airlock/mining{
- name = "Mining Office"
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
-/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
-/obj/effect/landmark/navigate_destination,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"nMz" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
@@ -38297,6 +38431,16 @@
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron,
/area/station/commons/vacant_room/commissary)
+"nME" = (
+/obj/structure/rack,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/item/storage/toolbox/emergency,
+/obj/effect/spawner/random/maintenance,
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
"nMF" = (
/obj/machinery/light/small/directional/east,
/obj/machinery/firealarm/directional/east,
@@ -39457,6 +39601,14 @@
/obj/item/toy/cattoy,
/turf/open/floor/plating,
/area/station/medical/abandoned)
+"oif" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
"oip" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
@@ -39961,11 +40113,6 @@
"otu" = (
/turf/closed/wall,
/area/station/service/chapel)
-"oty" = (
-/obj/structure/chair/office/light,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/command/heads_quarters/cmo)
"otG" = (
/obj/item/radio/intercom/directional/east,
/obj/structure/window/spawner/directional/north,
@@ -40967,15 +41114,6 @@
"oKU" = (
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/station/tcommsat/server)
-"oLc" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"oLD" = (
/obj/structure/chair/comfy/beige,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -41073,11 +41211,6 @@
/obj/effect/turf_decal/tile/yellow/full,
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/chemistry)
-"oNz" = (
-/obj/structure/cable,
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"oNP" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -41890,7 +42023,6 @@
/obj/effect/mapping_helpers/airlock/access/all/medical/coroner,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
"pdX" = (
@@ -43358,14 +43490,6 @@
/obj/machinery/light/cold/directional/north,
/turf/open/floor/plating,
/area/station/security/prison/work)
-"pEZ" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Mining Dock Maintenance"
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"pFd" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -45107,6 +45231,12 @@
},
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"qlr" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"qlG" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -46139,6 +46269,21 @@
/obj/structure/sign/warning/docking,
/turf/closed/wall,
/area/station/hallway/secondary/entry)
+"qHC" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/start/bitrunner,
+/turf/open/floor/iron/dark/textured_half,
+/area/station/bitrunning/den)
"qHK" = (
/obj/effect/spawner/random/structure/grille,
/turf/open/floor/plating,
@@ -46710,13 +46855,6 @@
/obj/structure/marker_beacon/indigo,
/turf/open/space/basic,
/area/space/nearstation)
-"qPt" = (
-/obj/effect/spawner/random/structure/crate,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"qPC" = (
/obj/structure/cable,
/obj/machinery/door/airlock/virology/glass{
@@ -46938,13 +47076,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
-"qSD" = (
-/obj/machinery/rnd/bepis,
-/obj/effect/turf_decal/stripes/end{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"qSP" = (
/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{
dir = 1
@@ -47436,6 +47567,13 @@
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/storage)
+"raL" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 4
+ },
+/obj/machinery/computer/order_console/mining,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"raT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -48048,13 +48186,6 @@
/obj/effect/turf_decal/tile/purple/opposingcorners,
/turf/open/floor/iron,
/area/station/science/research)
-"rnM" = (
-/obj/item/clothing/gloves/color/rainbow,
-/obj/item/clothing/shoes/sneakers/rainbow,
-/obj/item/clothing/under/color/rainbow,
-/obj/item/clothing/head/soft/rainbow,
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"rnX" = (
/obj/machinery/suit_storage_unit/standard_unit,
/obj/machinery/firealarm/directional/east,
@@ -49533,6 +49664,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"rNV" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Mining Dock Maintenance"
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment,
+/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
+/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
"rOz" = (
/obj/effect/spawner/random/structure/crate,
/turf/open/floor/plating,
@@ -49768,6 +49910,9 @@
},
/turf/open/floor/plating,
/area/station/service/chapel)
+"rSa" = (
+/turf/closed/wall,
+/area/station/bitrunning/den)
"rSi" = (
/obj/effect/landmark/start/chief_engineer,
/obj/structure/chair/office/light{
@@ -53076,6 +53221,24 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/port)
+"taq" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/effect/landmark/start/bitrunner,
+/turf/open/floor/iron/dark/textured_half,
+/area/station/bitrunning/den)
"tar" = (
/obj/machinery/medical_kiosk,
/obj/effect/turf_decal/tile/blue/half/contrasted,
@@ -54060,6 +54223,11 @@
/obj/structure/cable,
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
+"ttG" = (
+/obj/machinery/netpod,
+/obj/effect/decal/cleanable/robot_debris,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/bitrunning/den)
"ttM" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -54883,9 +55051,6 @@
/obj/item/mod/module/plasma_stabilizer{
pixel_x = 16
},
-/obj/item/mod/module/signlang_radio{
- pixel_x = 16
- },
/obj/item/mod/module/thermal_regulator{
pixel_x = 16
},
@@ -55661,6 +55826,16 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/port)
+"tWj" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"tWq" = (
/obj/effect/spawner/random/trash/janitor_supplies,
/obj/effect/mapping_helpers/broken_floor,
@@ -56789,7 +56964,6 @@
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 1
},
-/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
"urs" = (
@@ -57247,6 +57421,13 @@
/obj/effect/turf_decal/tile/red/half/contrasted,
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
+"uyj" = (
+/obj/machinery/vending/wardrobe/cargo_wardrobe,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"uyr" = (
/obj/item/radio/intercom/directional/east,
/obj/structure/disposalpipe/segment,
@@ -57540,9 +57721,7 @@
dir = 4;
id = "garbage"
},
-/obj/machinery/recycler{
- dir = 8
- },
+/obj/machinery/recycler,
/turf/open/floor/plating,
/area/station/maintenance/disposal)
"uEO" = (
@@ -58617,17 +58796,6 @@
/obj/effect/turf_decal/bot/left,
/turf/open/floor/engine,
/area/station/engineering/atmospherics_engine)
-"uWy" = (
-/obj/structure/table/glass,
-/obj/item/paper_bin,
-/obj/item/clipboard,
-/obj/item/toy/figure/cmo,
-/obj/structure/cable,
-/obj/item/stamp/head/cmo{
- pixel_x = -9
- },
-/turf/open/floor/iron/white,
-/area/station/command/heads_quarters/cmo)
"uWA" = (
/obj/structure/table/wood/fancy/royalblue,
/obj/machinery/door/window{
@@ -59745,6 +59913,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"vpU" = (
+/obj/effect/spawner/random/structure/crate,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
"vpX" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -60495,13 +60670,6 @@
/obj/item/tail_pin,
/turf/open/space/basic,
/area/space/nearstation)
-"vDq" = (
-/obj/structure/closet/emcloset,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"vDt" = (
/obj/machinery/door/airlock/maintenance{
name = "Research Maintenance"
@@ -62243,13 +62411,6 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/supply)
-"wfY" = (
-/obj/structure/rack,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/item/storage/toolbox/emergency,
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"wfZ" = (
/obj/machinery/airalarm/directional/east,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -64848,6 +65009,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white/side,
/area/station/science/lobby)
+"xdY" = (
+/obj/machinery/door/airlock/mining{
+ name = "Mining Office"
+ },
+/obj/structure/cable,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
+/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"xel" = (
/obj/structure/closet/firecloset,
/turf/open/floor/plating,
@@ -65393,6 +65564,16 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/genetics)
+"xoc" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"xor" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
@@ -65607,12 +65788,6 @@
},
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
-"xsQ" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"xsV" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -66513,12 +66688,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/aft/greater)
-"xHQ" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"xIp" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/event_spawn,
@@ -66728,16 +66897,6 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/station/service/cafeteria)
-"xMP" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Mining Dock Maintenance"
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment,
-/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
"xMX" = (
/obj/effect/turf_decal/stripes/corner,
/obj/structure/cable,
@@ -66848,13 +67007,6 @@
},
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
-"xOL" = (
-/obj/machinery/computer/order_console/mining,
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"xOO" = (
/obj/machinery/status_display/evac/directional/east,
/obj/structure/cable,
@@ -84441,10 +84593,10 @@ nmg
vEV
jPp
jXu
-aaa
-aaa
-aaa
-pnI
+rSa
+rSa
+rSa
+hKg
bUm
kRe
qRa
@@ -84698,9 +84850,9 @@ jXu
kXA
ufv
jXu
-aaa
-aaa
-aaa
+cly
+taq
+ghJ
hKg
hKg
fQW
@@ -84955,10 +85107,10 @@ jXu
jXu
hWS
jXu
-jXu
-jXu
-jXu
-jXu
+dzh
+iUV
+guZ
+fBl
qvY
kRe
wxh
@@ -84977,8 +85129,8 @@ hxo
hxo
hxo
cbz
-qSD
-iBx
+uyj
+jty
jLb
tTa
kQP
@@ -85210,12 +85362,12 @@ gYE
lBm
qKy
ybN
-oLc
-iPY
-vDq
-jXu
-rnM
+edP
jXu
+bje
+qHC
+ttG
+fBl
pPh
aFd
nVG
@@ -85467,12 +85619,12 @@ iPE
vfv
cTQ
xte
-izi
-sHu
-khX
-jXu
-jXu
+mzs
jXu
+kHU
+hDd
+rSa
+rSa
jpG
kRe
nVG
@@ -85724,18 +85876,18 @@ gYE
uEC
wgw
twr
-uuD
-oNz
-iaA
-hNS
+bSm
jXu
+fBl
+eEb
+rSa
ouc
dSG
cLj
xYl
cLj
mUz
-nFq
+xdY
rgN
mmR
mmR
@@ -85980,19 +86132,19 @@ wvR
pQu
vEH
jXu
-gjY
-uuD
-dDR
-mhx
-xsQ
-xMP
-xyz
+lUe
+gQv
+rNV
+cGL
+xoc
+xoc
+tWj
xyz
kdC
btt
aqx
shx
-nMk
+bGM
fiC
dAk
rhn
@@ -86237,13 +86389,13 @@ vhU
eNU
aQE
jXu
-wfY
-iUE
-xHQ
-jXu
-jXu
+nME
+dwA
jXu
-xOL
+dob
+qlr
+raL
+mAy
cLj
kRe
aFd
@@ -86495,10 +86647,10 @@ jXu
jXu
jXu
jXu
-uuD
-xHQ
+bSm
+jXu
+jXu
jXu
-fhn
jXu
lJo
xJV
@@ -86752,13 +86904,13 @@ mVS
xxp
twr
sxn
-uuD
-qPt
+oif
+vpU
twr
-exq
+fhn
jXu
jXu
-pEZ
+fNH
jXu
jXu
jXu
@@ -92219,8 +92371,8 @@ jhk
cOR
vgZ
ijZ
-oty
-uWy
+bDS
+edo
pXM
iNc
bqX
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index 5f7a19198bb..e26ac494a0f 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -1508,6 +1508,13 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
/turf/open/floor/plating,
/area/mine/maintenance/public/north)
+"jk" = (
+/obj/structure/table,
+/obj/item/storage/box/bandages{
+ pixel_y = 6
+ },
+/turf/open/floor/iron/white,
+/area/mine/laborcamp/production)
"jm" = (
/obj/machinery/door/airlock/public/glass{
name = "Showers"
@@ -1932,6 +1939,17 @@
},
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors)
+"lA" = (
+/obj/machinery/recycler{
+ dir = 8
+ },
+/obj/machinery/conveyor{
+ dir = 4;
+ id = "mining_disposals"
+ },
+/obj/effect/turf_decal/sand/plating/volcanic,
+/turf/open/floor/plating/lavaland_atmos,
+/area/mine/maintenance/service/disposals)
"lC" = (
/obj/structure/stone_tile/block/cracked{
dir = 1
@@ -2170,19 +2188,6 @@
},
/turf/open/indestructible/boss,
/area/lavaland/surface/outdoors)
-"mu" = (
-/obj/structure/table,
-/obj/item/storage/pill_bottle/epinephrine{
- pixel_x = -2;
- pixel_y = 4
- },
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 10
- },
-/turf/open/floor/iron/white/smooth_corner{
- dir = 8
- },
-/area/mine/medical)
"mv" = (
/obj/structure/stone_tile{
dir = 4
@@ -5391,10 +5396,6 @@
},
/turf/open/floor/iron/dark,
/area/mine/laborcamp/security)
-"HE" = (
-/obj/structure/table,
-/turf/open/floor/iron/white,
-/area/mine/laborcamp/production)
"HF" = (
/obj/structure/stone_tile{
dir = 1
@@ -5809,6 +5810,23 @@
dir = 1
},
/area/mine/living_quarters)
+"JQ" = (
+/obj/structure/table,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 10
+ },
+/obj/item/storage/box/bandages{
+ pixel_y = 6;
+ pixel_x = 4
+ },
+/obj/item/storage/pill_bottle/epinephrine{
+ pixel_x = -6;
+ pixel_y = 4
+ },
+/turf/open/floor/iron/white/smooth_corner{
+ dir = 8
+ },
+/area/mine/medical)
"JR" = (
/obj/structure/stone_tile,
/obj/structure/stone_tile{
@@ -6772,17 +6790,6 @@
},
/turf/open/floor/plating,
/area/mine/production)
-"PL" = (
-/obj/machinery/recycler{
- dir = 8
- },
-/obj/machinery/conveyor{
- dir = 4;
- id = "mining_disposals"
- },
-/obj/effect/turf_decal/sand/plating/volcanic,
-/turf/open/floor/plating/lavaland_atmos,
-/area/mine/maintenance/service/disposals)
"PR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/carpet/executive,
@@ -23744,7 +23751,7 @@ aj
aj
eR
Kw
-HE
+jk
ff
mU
Fv
@@ -36321,7 +36328,7 @@ pU
mA
su
xG
-PL
+lA
Sd
pU
aj
@@ -39439,7 +39446,7 @@ yp
yp
Dz
LG
-mu
+JQ
It
Xp
Ss
diff --git a/_maps/map_files/NSSJourney/NSSJourney.dmm b/_maps/map_files/NSSJourney/NSSJourney.dmm
index bbe26804454..eac9b009558 100644
--- a/_maps/map_files/NSSJourney/NSSJourney.dmm
+++ b/_maps/map_files/NSSJourney/NSSJourney.dmm
@@ -5108,7 +5108,6 @@
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"azV" = (
-/obj/machinery/rnd/bepis,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
@@ -16386,6 +16385,10 @@
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = -2;
+ pixel_y = -1
+ },
/turf/open/floor/iron,
/area/station/cargo/miningdock)
"bmv" = (
@@ -18317,11 +18320,7 @@
/turf/open/floor/iron,
/area/station/cargo/miningdock)
"bsc" = (
-/obj/structure/rack,
-/obj/item/storage/toolbox/mechanical{
- pixel_x = -2;
- pixel_y = -1
- },
+/obj/machinery/computer/order_console/bitrunning,
/turf/open/floor/iron,
/area/station/cargo/miningdock)
"bsd" = (
@@ -20316,7 +20315,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 1
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/airless,
/area/station/science/ordnance/freezerchamber)
"byb" = (
/obj/effect/decal/cleanable/dirt,
@@ -21113,12 +21112,14 @@
/turf/open/floor/plating,
/area/station/engineering/atmos)
"bBG" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
},
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/quantum_server,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"bBK" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
@@ -21658,6 +21659,10 @@
/area/station/science/ordnance/storage)
"bDo" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable,
/turf/open/floor/iron,
/area/station/cargo/miningdock)
"bDq" = (
@@ -24287,7 +24292,7 @@
dir = 8
},
/obj/machinery/light/directional/south,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/airless,
/area/station/science/ordnance/freezerchamber)
"bMu" = (
/obj/machinery/door/poddoor/incinerator_ordmix,
@@ -24308,7 +24313,7 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
dir = 9
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/airless,
/area/station/science/ordnance/freezerchamber)
"bMx" = (
/obj/effect/decal/cleanable/dirt,
@@ -25129,10 +25134,19 @@
/turf/open/floor/iron/smooth_large,
/area/station/engineering/gravity_generator)
"bPZ" = (
-/obj/structure/table,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/bitrunning/station_reward_spawn,
+/obj/structure/sign/poster/random/directional/south,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/station/maintenance/port/aft)
+/obj/machinery/light/small/directional/south,
+/obj/effect/turf_decal/box/corners{
+ dir = 1
+ },
+/obj/effect/turf_decal/box/corners{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"bQa" = (
/obj/effect/spawner/random/maintenance,
/obj/structure/trash_pile,
@@ -25372,6 +25386,9 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
+/obj/structure/chair{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"bRi" = (
@@ -29978,7 +29995,7 @@
/area/station/maintenance/solars/starboard/aft)
"cnt" = (
/obj/machinery/camera/directional/west{
- c_tag = "Engineering West"
+ c_tag = "Bitrunners Den"
},
/obj/effect/landmark/start/station_engineer,
/obj/effect/turf_decal/tile/yellow{
@@ -36416,12 +36433,12 @@
/turf/open/floor/iron/dark,
/area/station/engineering/main)
"eIG" = (
-/obj/structure/chair{
- dir = 8
- },
+/obj/machinery/airalarm/directional/north,
+/obj/machinery/netpod,
+/obj/effect/turf_decal/stripes/line,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/station/maintenance/port/aft)
+/turf/open/floor/plating,
+/area/station/bitrunning/den)
"eIN" = (
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 8
@@ -36454,6 +36471,12 @@
/obj/structure/chair/stool/directional/south,
/turf/open/floor/iron,
/area/station/security/prison/visit)
+"eJH" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/item/radio/intercom/directional/east,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark,
+/area/station/bitrunning/den)
"eJI" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/door/window{
@@ -36600,6 +36623,10 @@
/obj/structure/sink/directional/east,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
+"eRu" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/bitrunning/den)
"eRD" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -38420,6 +38447,14 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/service/janitor)
+"gqG" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"grP" = (
/obj/machinery/camera/directional/north{
c_tag = "Server Room";
@@ -42212,7 +42247,7 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
dir = 5
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/airless,
/area/station/science/ordnance/freezerchamber)
"jLV" = (
/obj/structure/table,
@@ -42355,12 +42390,10 @@
/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
"jQI" = (
-/obj/structure/chair{
- dir = 4
- },
+/obj/effect/landmark/start/bitrunner,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
-/area/station/maintenance/port/aft)
+/area/station/bitrunning/den)
"jQY" = (
/obj/effect/landmark/event_spawn,
/obj/structure/cable,
@@ -42760,6 +42793,10 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"kdO" = (
+/obj/effect/landmark/start/bitrunner,
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"kdP" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -43000,6 +43037,14 @@
/obj/machinery/air_sensor/carbon_tank,
/turf/open/floor/engine/co2,
/area/station/engineering/atmos)
+"kqn" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"kqq" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 4
@@ -43449,9 +43494,8 @@
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"kDy" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/maintenance/abandon_arcade)
+/turf/closed/wall,
+/area/station/bitrunning/den)
"kES" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -43955,6 +43999,16 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden/abandoned)
+"lbU" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark,
+/area/station/bitrunning/den)
"lcd" = (
/obj/structure/chair/stool/bar/directional/east,
/turf/open/floor/wood,
@@ -45146,10 +45200,18 @@
/turf/open/floor/iron/white,
/area/station/science/ordnance)
"meR" = (
-/obj/item/kirbyplants/random/dead,
+/obj/machinery/netpod,
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/station/maintenance/port/aft)
+/obj/machinery/light/small/directional/north,
+/obj/machinery/firealarm/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/bitrunning/den)
"mfT" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -46845,6 +46907,10 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/station/maintenance/abandon_cafeteria)
+"nJh" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark,
+/area/station/bitrunning/den)
"nJL" = (
/obj/structure/toilet{
pixel_y = 16
@@ -47327,6 +47393,16 @@
},
/turf/open/floor/iron/dark,
/area/station/maintenance/port/aft)
+"ofd" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/bitrunning/station_reward_spawn,
+/obj/effect/turf_decal/box/corners,
+/obj/effect/turf_decal/box/corners{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"ofM" = (
/obj/structure/cable,
/turf/open/floor/iron/white,
@@ -51032,6 +51108,15 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"rqS" = (
+/obj/machinery/netpod,
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/camera/directional/west{
+ c_tag = "Engineering West"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/station/bitrunning/den)
"rqU" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -52258,6 +52343,18 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"svv" = (
+/obj/machinery/door/airlock/mining{
+ name = "Bitrunning Den"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/bitrunning/den)
"swA" = (
/obj/machinery/door/firedoor,
/obj/structure/cable,
@@ -54530,6 +54627,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/brig)
+"uwG" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/item/kirbyplants/random/dead,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"uwN" = (
/obj/structure/closet/l3closet/virology,
/obj/effect/turf_decal/stripes/line{
@@ -55165,7 +55270,7 @@
dir = 8
},
/obj/machinery/air_sensor/ordnance_freezer_chamber,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/airless,
/area/station/science/ordnance/freezerchamber)
"uZR" = (
/obj/effect/turf_decal/trimline/green/filled/line,
@@ -55713,6 +55818,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible,
/turf/open/floor/iron,
/area/station/science/ordnance)
+"vzv" = (
+/obj/machinery/computer/quantum_console{
+ dir = 1
+ },
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"vzN" = (
/obj/structure/filingcabinet/security,
/obj/machinery/light/directional/west,
@@ -58649,7 +58762,7 @@
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_freezer_chamber_input{
dir = 1
},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/dark/airless,
/area/station/science/ordnance/freezerchamber)
"xQe" = (
/obj/effect/turf_decal/stripes/line{
@@ -58976,6 +59089,9 @@
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 1
},
+/obj/structure/chair{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"ydi" = (
@@ -80743,13 +80859,13 @@ bxy
bxy
bJd
bKm
-bxy
-xzh
-xzh
+kDy
+kDy
+eRu
+kDy
bCq
bLv
bLv
-bLv
bCq
bCq
bCq
@@ -81000,12 +81116,12 @@ bjy
bmu
nXT
bsa
-bxy
-sUX
-sUX
+kDy
+rqS
+nJh
+vzv
bCq
-meR
-bRg
+uwG
cdb
bCq
vLX
@@ -81249,19 +81365,19 @@ jHP
bxy
oYv
bwW
-byE
+bKp
bCo
bDk
agv
byE
byE
-byE
+kdO
bsb
-bGi
-xzh
-xzh
-bLv
+kDy
+eIG
jQI
+bBG
+bCq
ydd
vLX
bCq
@@ -81514,12 +81630,12 @@ byE
bEQ
byE
bsc
-bGi
-xzh
-xzh
-bLv
+kDy
+meR
+jQI
bPZ
-bRg
+bCq
+kqn
vLX
cTF
vLX
@@ -81766,16 +81882,16 @@ bwX
byG
byG
bAm
-bBG
bDo
bDo
bDo
-bKp
-bGi
-xzh
-xzh
-bLv
-eIG
+bDo
+gqG
+svv
+lbU
+eJH
+ofd
+bCq
bRg
bHE
bCq
@@ -82028,10 +82144,10 @@ mdj
rrm
axk
bxy
-bxy
kDy
kDy
-ghE
+kDy
+kDy
ghE
imJ
vLX
diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm
index 53e9e0a8d54..85c22ea665f 100644
--- a/_maps/map_files/NorthStar/north_star.dmm
+++ b/_maps/map_files/NorthStar/north_star.dmm
@@ -318,12 +318,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/catwalk_floor/iron_dark,
/area/station/maintenance/floor2/port)
-"ads" = (
-/obj/effect/turf_decal/stripes{
- dir = 9
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/starboard/fore)
"adB" = (
/obj/structure/closet/crate/bin{
name = "biowaste bin"
@@ -1736,22 +1730,6 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/wood,
/area/station/medical/psychology)
-"avu" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 4
- },
-/obj/machinery/door/airlock/hatch{
- name = "Maintenance Access"
- },
-/obj/effect/mapping_helpers/airlock/access/any/supply/general,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor1/starboard/fore)
"avH" = (
/obj/structure/table/glass,
/obj/item/experi_scanner,
@@ -1988,6 +1966,17 @@
},
/turf/open/floor/catwalk_floor,
/area/station/maintenance/floor3/port/fore)
+"azj" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/arrows{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/disposalpipe/trunk/multiz,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"azu" = (
/obj/structure/table/wood,
/obj/item/gun/ballistic/shotgun/doublebarrel,
@@ -2997,13 +2986,6 @@
},
/turf/open/floor/iron/dark/textured,
/area/station/commons/fitness)
-"aOv" = (
-/obj/effect/turf_decal/stripes{
- dir = 10
- },
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/starboard/fore)
"aOx" = (
/obj/machinery/griddle,
/obj/machinery/airalarm/directional/west,
@@ -3492,11 +3474,6 @@
/obj/effect/mapping_helpers/airlock/access/any/medical/psychology,
/turf/open/floor/catwalk_floor,
/area/station/hallway/floor2/fore)
-"aUn" = (
-/obj/effect/spawner/random/structure/table_or_rack,
-/obj/effect/spawner/random/trash/soap,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard/fore)
"aUG" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/structure/table_or_rack,
@@ -3750,12 +3727,6 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/carpet/purple,
/area/station/maintenance/floor1/port/aft)
-"aXl" = (
-/obj/machinery/cryo_cell{
- dir = 4
- },
-/turf/open/floor/iron/dark/textured,
-/area/station/medical/cryo)
"aXq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -5438,18 +5409,6 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/white,
/area/station/science/xenobiology/hallway)
-"bqm" = (
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor1/starboard/fore)
"bqn" = (
/obj/structure/closet/crate,
/obj/item/reagent_containers/cup/bowl,
@@ -5596,6 +5555,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/science/robotics/lab)
+"brL" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/extinguisher_cabinet/directional/west,
+/turf/open/floor/iron/stairs{
+ dir = 1
+ },
+/area/station/bitrunning/den)
"brN" = (
/obj/effect/spawner/structure/window/hollow/reinforced/directional,
/obj/structure/disposalpipe/segment,
@@ -5616,6 +5582,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/medical/abandoned)
+"bsq" = (
+/obj/machinery/computer/order_console/bitrunning{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/end{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"bsu" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -6387,6 +6362,11 @@
dir = 4
},
/area/station/hallway/floor3/aft)
+"bAh" = (
+/obj/effect/spawner/random/structure/table_or_rack,
+/obj/effect/spawner/random/trash/soap,
+/turf/open/floor/plating,
+/area/station/maintenance/floor1/starboard/fore)
"bAj" = (
/obj/machinery/conveyor{
dir = 9;
@@ -8942,14 +8922,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/smooth,
/area/station/construction)
-"cjz" = (
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/firealarm/directional/east,
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard/fore)
"cjB" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/decal/cleanable/dirt,
@@ -10003,17 +9975,6 @@
},
/turf/open/floor/engine,
/area/station/engineering/atmos/hfr_room)
-"cxp" = (
-/obj/machinery/exoscanner,
-/obj/effect/turf_decal/stripes{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/iron/corner,
-/area/station/cargo/drone_bay)
"cxx" = (
/obj/effect/turf_decal/tile/green/half{
dir = 4
@@ -10256,6 +10217,21 @@
},
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/freezerchamber)
+"cBT" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/arrows{
+ dir = 4
+ },
+/obj/structure/railing{
+ layer = 3.1
+ },
+/obj/effect/decal/cleanable/robot_debris,
+/obj/structure/disposalpipe/segment,
+/obj/effect/landmark/start/bitrunner,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"cBU" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/flora/bush/sunny/style_random,
@@ -10364,6 +10340,12 @@
/obj/machinery/chem_master,
/turf/open/floor/iron/dark/textured,
/area/station/medical/pharmacy)
+"cDe" = (
+/obj/machinery/computer/quantum_console{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/smooth_corner,
+/area/station/bitrunning/den)
"cDh" = (
/obj/item/broken_bottle,
/turf/open/floor/carpet/neon/simple/pink/nodots,
@@ -14681,15 +14663,6 @@
/obj/effect/landmark/start/captain,
/turf/open/floor/wood/tile,
/area/station/command/heads_quarters/captain/private)
-"dNf" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor1/starboard/fore)
"dNm" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
@@ -15309,12 +15282,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/storage/eva)
-"dVq" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/security/medical)
"dVt" = (
/obj/structure/railing{
dir = 4
@@ -15544,10 +15511,6 @@
dir = 4
},
/area/station/hallway/floor2/fore)
-"dXP" = (
-/obj/machinery/computer/exodrone_control_console,
-/turf/open/floor/iron/dark,
-/area/station/cargo/drone_bay)
"dXX" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/machinery/rnd/production/techfab/department/security,
@@ -15583,19 +15546,6 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron,
/area/station/engineering/atmos/project)
-"dYm" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/effect/turf_decal/stripes{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"dYq" = (
/obj/structure/reagent_dispensers/watertank,
/obj/effect/turf_decal/stripes{
@@ -16845,6 +16795,22 @@
/obj/machinery/duct,
/turf/open/floor/iron/showroomfloor,
/area/station/commons/toilet)
+"eoo" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/structure/railing/corner/end{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"eop" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -17018,6 +16984,20 @@
/obj/structure/cable,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/floor1/starboard)
+"erV" = (
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/effect/turf_decal/stripes,
+/obj/effect/turf_decal/trimline/brown/line,
+/turf/open/floor/iron/dark/smooth_half,
+/area/station/bitrunning/den)
"erY" = (
/obj/machinery/vending/wardrobe/bar_wardrobe,
/turf/open/floor/wood,
@@ -17148,6 +17128,24 @@
},
/turf/open/floor/pod/dark,
/area/station/maintenance/floor3/starboard)
+"eul" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = -2;
+ pixel_y = 8
+ },
+/obj/item/cigbutt/cigarbutt{
+ pixel_x = 7
+ },
+/obj/effect/turf_decal/stripes{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/iron/dark/smooth_half,
+/area/station/bitrunning/den)
"euu" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
@@ -18557,10 +18555,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/wood/tile,
/area/station/service/library)
-"ePI" = (
-/obj/effect/turf_decal/stripes,
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/starboard/fore)
"ePJ" = (
/obj/effect/turf_decal/trimline/red/line{
dir = 1
@@ -18784,11 +18778,6 @@
/obj/machinery/newscaster/directional/west,
/turf/open/floor/wood,
/area/station/hallway/secondary/entry)
-"eTD" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/sign/poster/random/directional/north,
-/turf/open/floor/iron/smooth,
-/area/station/cargo/warehouse)
"eTH" = (
/obj/structure/flora/bush/sparsegrass/style_random,
/mob/living/carbon/human/species/monkey,
@@ -20969,12 +20958,6 @@
dir = 1
},
/area/station/command/bridge)
-"fBB" = (
-/obj/effect/turf_decal/stripes{
- dir = 5
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/starboard/fore)
"fBM" = (
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
@@ -21014,6 +20997,14 @@
"fCp" = (
/turf/open/floor/plating/airless,
/area/space)
+"fCw" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 8
+ },
+/obj/machinery/holopad,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"fCx" = (
/obj/structure/rack,
/turf/open/floor/pod/dark,
@@ -23141,11 +23132,6 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/wood/tile,
/area/station/service/library)
-"gex" = (
-/obj/structure/rack,
-/obj/effect/spawner/random/maintenance/two,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard/fore)
"geA" = (
/obj/effect/turf_decal/tile/blue/opposingcorners,
/obj/item/kirbyplants/random,
@@ -24121,6 +24107,19 @@
/obj/structure/chair/stool/bar/directional/east,
/turf/open/floor/iron/white,
/area/station/science/circuits)
+"gso" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"gsp" = (
/obj/machinery/door/airlock/medical{
id_tag = "asylum_airlock_exterior";
@@ -24343,10 +24342,6 @@
},
/turf/open/floor/iron/dark/textured,
/area/station/medical/medbay/lobby)
-"gvu" = (
-/obj/effect/spawner/random/structure/crate,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard/fore)
"gvx" = (
/obj/effect/turf_decal/trimline/blue/filled/corner,
/turf/open/floor/iron/white,
@@ -24892,12 +24887,6 @@
/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
-"gCn" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/broken/directional/north,
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/catwalk_floor/iron_smooth,
-/area/station/cargo/warehouse)
"gCv" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -25138,6 +25127,11 @@
/obj/machinery/door/firedoor/border_only,
/turf/open/floor/pod/dark,
/area/station/maintenance/floor2/starboard/aft)
+"gFU" = (
+/obj/machinery/computer/exodrone_control_console,
+/obj/structure/extinguisher_cabinet/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/cargo/drone_bay)
"gGe" = (
/obj/machinery/telecomms/bus/preset_one,
/turf/open/floor/circuit/telecomms,
@@ -28092,6 +28086,13 @@
},
/turf/open/floor/pod/dark,
/area/station/maintenance/floor2/port/fore)
+"htK" = (
+/obj/machinery/netpod,
+/obj/structure/railing{
+ layer = 3.1
+ },
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/bitrunning/den)
"htW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/catwalk_floor/iron,
@@ -28687,6 +28688,10 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/pod/light,
/area/station/maintenance/floor2/port/aft)
+"hBR" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/station/cargo/warehouse)
"hBT" = (
/obj/structure/table,
/obj/structure/bedsheetbin,
@@ -30504,6 +30509,16 @@
},
/turf/open/floor/iron/dark,
/area/station/commons/dorms/room4)
+"iaJ" = (
+/obj/machinery/netpod,
+/obj/effect/decal/cleanable/vomit/old{
+ pixel_x = -12;
+ pixel_y = -13
+ },
+/obj/item/radio/intercom/directional/north,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/bitrunning/den)
"iaO" = (
/obj/structure/rack,
/obj/structure/sign/nanotrasen{
@@ -30596,10 +30611,6 @@
dir = 4
},
/area/station/commons/storage/primary)
-"icf" = (
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard/fore)
"ick" = (
/obj/effect/turf_decal/trimline/brown/warning{
dir = 8
@@ -31484,6 +31495,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
+"ioi" = (
+/obj/machinery/quantum_server,
+/obj/effect/turf_decal/bot/left,
+/turf/open/floor/iron/dark/smooth_corner{
+ dir = 4
+ },
+/area/station/bitrunning/den)
"iom" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -32678,6 +32696,11 @@
/obj/machinery/firealarm/directional/east,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/floor3/starboard/fore)
+"iDJ" = (
+/obj/structure/rack,
+/obj/item/stack/sheet/leather,
+/turf/open/floor/plating,
+/area/station/maintenance/floor1/starboard/fore)
"iDP" = (
/obj/structure/cable/multilayer/multiz,
/turf/open/floor/plating,
@@ -33362,12 +33385,6 @@
/obj/effect/mapping_helpers/mail_sorting/service/bar,
/turf/open/floor/iron/dark/side,
/area/station/hallway/floor3/fore)
-"iOl" = (
-/obj/machinery/modular_computer/preset/civilian,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/cargo/drone_bay)
"iOp" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -34801,6 +34818,15 @@
/obj/structure/cable,
/turf/open/floor/pod/light,
/area/station/maintenance/floor1/starboard/fore)
+"jhP" = (
+/obj/effect/turf_decal/box/corners,
+/obj/effect/turf_decal/box/corners{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/landmark/bitrunning/station_reward_spawn,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/bitrunning/den)
"jhU" = (
/turf/open/floor/iron/white,
/area/station/science/robotics/lab)
@@ -36150,6 +36176,29 @@
},
/turf/open/floor/carpet/royalblack,
/area/station/service/kitchen/diner)
+"jAr" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
+/obj/machinery/door/airlock/mining/glass{
+ name = "Bitrunning Den"
+ },
+/turf/open/floor/pod/dark,
+/area/station/bitrunning/den)
+"jAv" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/item/reagent_containers/syringe,
+/turf/open/floor/iron/white,
+/area/station/security/medical)
"jAB" = (
/obj/machinery/light/floor,
/turf/open/floor/iron/dark/side{
@@ -37739,6 +37788,13 @@
/obj/effect/turf_decal/trimline/purple/warning,
/turf/open/floor/iron/dark,
/area/station/hallway/floor2/fore)
+"jWJ" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"jWR" = (
/obj/structure/railing/corner,
/obj/effect/turf_decal/siding/wood/corner{
@@ -41268,19 +41324,6 @@
/obj/effect/spawner/random/engineering/flashlight,
/turf/open/floor/pod/light,
/area/station/maintenance/floor2/port/aft)
-"kQL" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/effect/turf_decal/stripes{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"kQN" = (
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -41912,13 +41955,6 @@
/obj/structure/rack,
/turf/open/floor/pod/light,
/area/station/maintenance/floor2/port/fore)
-"kYs" = (
-/obj/effect/turf_decal/stripes{
- dir = 4
- },
-/obj/structure/disposalpipe/trunk/multiz,
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/starboard/fore)
"kYt" = (
/obj/structure/chair/comfy/carp,
/turf/open/floor/carpet/neon/simple/pink/nodots,
@@ -42578,6 +42614,15 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"lgs" = (
+/obj/structure/sign/poster/random/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/effect/decal/cleanable/oil,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"lgv" = (
/obj/structure/rack,
/obj/item/book/manual/nuclear,
@@ -42877,11 +42922,6 @@
dir = 1
},
/area/station/medical/chemistry)
-"lkI" = (
-/obj/structure/table,
-/obj/item/storage/box/donkpockets,
-/turf/open/floor/catwalk_floor/iron,
-/area/station/cargo/storage)
"lkP" = (
/obj/effect/turf_decal/siding/wood{
dir = 4
@@ -43948,13 +43988,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/checker,
/area/station/cargo/miningdock)
-"lAv" = (
-/obj/machinery/cryo_cell{
- dir = 8
- },
-/obj/structure/sign/poster/official/random/directional/east,
-/turf/open/floor/iron/dark/textured,
-/area/station/medical/cryo)
"lAD" = (
/obj/effect/turf_decal/trimline/green/filled/arrow_cw{
dir = 10
@@ -44593,12 +44626,6 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/pod/light,
/area/station/maintenance/floor1/port)
-"lJl" = (
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard/fore)
"lJn" = (
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron/dark/side{
@@ -46378,6 +46405,13 @@
/obj/structure/flora/bush/flowers_br/style_random,
/turf/open/floor/grass,
/area/station/security/courtroom)
+"meE" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/item/storage/medkit/regular,
+/turf/open/floor/iron/white,
+/area/station/security/medical)
"meH" = (
/obj/machinery/door/airlock/medical{
name = "CMO Quarters"
@@ -48412,18 +48446,6 @@
/obj/effect/landmark/start/assistant,
/turf/open/floor/carpet/red,
/area/station/commons/dorms/apartment1)
-"mFK" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes{
- dir = 4
- },
-/obj/structure/railing{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"mFP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -50154,17 +50176,6 @@
},
/turf/open/floor/iron/white/herringbone,
/area/station/medical/patients_rooms)
-"ncf" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/effect/turf_decal/stripes{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"ncl" = (
/obj/structure/dresser,
/turf/open/floor/carpet/red,
@@ -50928,6 +50939,28 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/dark,
/area/station/hallway/floor3/aft)
+"nkT" = (
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/landmark/start/bitrunner,
+/turf/open/floor/iron/dark/smooth_corner{
+ dir = 8
+ },
+/area/station/bitrunning/den)
"nla" = (
/obj/structure/table/wood,
/obj/effect/turf_decal/siding/wood{
@@ -55568,6 +55601,22 @@
},
/turf/open/floor/iron/dark/side,
/area/station/security/checkpoint)
+"owk" = (
+/obj/effect/turf_decal/trimline/brown/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes,
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/iron/dark/smooth_half,
+/area/station/bitrunning/den)
"owo" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -55752,6 +55801,9 @@
/obj/structure/sign/warning/biohazard/directional/west,
/turf/open/floor/iron/white,
/area/station/hallway/floor2/aft)
+"oyT" = (
+/turf/closed/wall,
+/area/station/bitrunning/den)
"oyW" = (
/obj/structure/chair{
dir = 8
@@ -55844,15 +55896,6 @@
/obj/effect/spawner/random/structure/closet_maintenance,
/turf/open/floor/pod/dark,
/area/station/maintenance/floor3/port/aft)
-"ozY" = (
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor1/starboard/fore)
"oAc" = (
/obj/effect/turf_decal/trimline/purple/line,
/obj/machinery/door/firedoor/border_only{
@@ -58894,6 +58937,19 @@
/obj/effect/decal/cleanable/blood/drip,
/turf/open/misc/dirt/jungle,
/area/station/service/hydroponics/garden/abandoned)
+"prm" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"pro" = (
/obj/effect/turf_decal/stripes,
/obj/effect/decal/cleanable/dirt,
@@ -59638,6 +59694,14 @@
/obj/effect/spawner/random/structure/crate,
/turf/open/floor/pod/light,
/area/station/maintenance/floor1/port/aft)
+"pBA" = (
+/obj/machinery/netpod,
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/bitrunning/den)
"pBJ" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=1-7";
@@ -59756,6 +59820,11 @@
/obj/effect/turf_decal/trimline/green/filled/line,
/turf/open/floor/iron/dark,
/area/station/medical/virology)
+"pCW" = (
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/station/cargo/warehouse)
"pDd" = (
/obj/structure/table/reinforced/plasmarglass,
/obj/item/reagent_containers/pill/epinephrine{
@@ -62550,6 +62619,17 @@
dir = 6
},
/area/station/commons/storage/primary)
+"qsz" = (
+/obj/structure/table,
+/obj/item/storage/box/bandages{
+ pixel_y = 6;
+ pixel_x = -6
+ },
+/obj/item/storage/box/donkpockets{
+ pixel_x = 6
+ },
+/turf/open/floor/catwalk_floor/iron,
+/area/station/cargo/storage)
"qsD" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -64296,6 +64376,19 @@
/obj/machinery/light_switch/directional/east,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"qOr" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"qOs" = (
/obj/structure/table/wood/fancy/red,
/obj/item/paper_bin,
@@ -66018,6 +66111,12 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/psychology)
+"rku" = (
+/obj/machinery/cryo_cell{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/medical/cryo)
"rkE" = (
/obj/structure/disposalpipe/trunk/multiz{
dir = 1
@@ -66473,6 +66572,21 @@
/obj/machinery/duct,
/turf/open/floor/iron/dark/textured,
/area/station/medical/cryo)
+"rqB" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"rqK" = (
/obj/effect/turf_decal/stripes/full,
/obj/structure/window/reinforced/spawner/directional/west,
@@ -67491,6 +67605,11 @@
},
/turf/open/floor/plating,
/area/station/medical/abandoned)
+"rGF" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/light/broken/directional/north,
+/turf/open/floor/iron/smooth,
+/area/station/cargo/warehouse)
"rGI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -69877,6 +69996,16 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/hallway/floor4/aft)
+"sqK" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"srz" = (
/obj/machinery/door/airlock/atmos{
name = "Atmospherics"
@@ -71432,6 +71561,17 @@
/obj/structure/sign/warning/xeno_mining/directional/north,
/turf/open/floor/iron/white,
/area/station/science/xenobiology/hallway)
+"sLq" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/arrows{
+ dir = 4
+ },
+/obj/machinery/light/directional/north,
+/obj/effect/landmark/start/bitrunner,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"sLE" = (
/obj/machinery/door/airlock/security/glass{
name = "Security Entrance"
@@ -75440,13 +75580,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/textured_large,
/area/station/engineering/lobby)
-"tNh" = (
-/obj/effect/turf_decal/stripes{
- dir = 6
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/starboard/fore)
"tNi" = (
/obj/structure/table/wood,
/obj/effect/spawner/random/entertainment/cigar,
@@ -76081,15 +76214,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/service/chapel/funeral)
-"tWc" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/effect/turf_decal/stripes{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"tWn" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/effect/turf_decal/bot,
@@ -78112,12 +78236,6 @@
/obj/structure/closet,
/turf/open/floor/pod/light,
/area/station/maintenance/floor2/port/fore)
-"uzr" = (
-/obj/effect/turf_decal/stripes{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/starboard/fore)
"uzB" = (
/obj/structure/table/reinforced,
/obj/item/screwdriver,
@@ -78354,6 +78472,19 @@
},
/turf/open/floor/iron,
/area/station/hallway/floor2/aft)
+"uDm" = (
+/obj/effect/turf_decal/box/corners{
+ dir = 8
+ },
+/obj/effect/turf_decal/box/corners{
+ dir = 1
+ },
+/obj/machinery/firealarm/directional/south,
+/obj/machinery/light/directional/south,
+/obj/effect/decal/cleanable/oil/streak,
+/obj/effect/landmark/bitrunning/station_reward_spawn,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/bitrunning/den)
"uDr" = (
/obj/machinery/light/small/directional/north,
/obj/effect/decal/cleanable/dirt,
@@ -79830,12 +79961,6 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/dark/smooth_large,
/area/station/science/robotics/lab)
-"uVb" = (
-/obj/effect/turf_decal/stripes{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/starboard/fore)
"uVh" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -81979,13 +82104,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/science/explab)
-"vxL" = (
-/obj/structure/table/glass,
-/obj/item/storage/medkit/regular,
-/obj/item/reagent_containers/syringe,
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/iron/white,
-/area/station/security/medical)
"vxT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -82143,10 +82261,6 @@
/obj/effect/turf_decal/trimline/brown/arrow_ccw,
/turf/open/floor/iron/dark/side,
/area/station/cargo/lobby)
-"vzo" = (
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"vzu" = (
/obj/effect/landmark/start/psychologist,
/obj/structure/sign/poster/official/random/directional/south,
@@ -83289,17 +83403,6 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2,
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/freezerchamber)
-"vPU" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/effect/turf_decal/stripes{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"vQb" = (
/obj/effect/turf_decal/siding/wood{
dir = 6
@@ -84077,6 +84180,13 @@
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron,
/area/station/hallway/floor2/aft)
+"waA" = (
+/obj/machinery/cryo_cell{
+ dir = 8
+ },
+/obj/structure/sign/poster/official/random/directional/east,
+/turf/open/floor/iron/dark/textured,
+/area/station/medical/cryo)
"waI" = (
/obj/effect/turf_decal/stripes,
/obj/machinery/atmospherics/components/binary/pump/off{
@@ -84646,6 +84756,10 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/hallway/floor4/aft)
+"whN" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/bitrunning/den)
"whR" = (
/turf/closed/wall,
/area/station/service/bar)
@@ -85707,21 +85821,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
-"wuE" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/obj/structure/railing/corner/end{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"wuJ" = (
/obj/effect/turf_decal/tile/dark_red/fourcorners,
/turf/open/floor/iron,
@@ -86737,12 +86836,6 @@
},
/turf/open/floor/iron/dark/side,
/area/station/security/prison)
-"wHC" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/security/medical)
"wHP" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 4
@@ -89199,6 +89292,16 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/hallway/floor4/aft)
+"xoA" = (
+/obj/structure/table/glass,
+/obj/item/radio/intercom/directional/south,
+/obj/item/storage/box/bandages{
+ pixel_y = 6;
+ pixel_x = -6
+ },
+/obj/item/storage/medkit/regular,
+/turf/open/floor/iron/white,
+/area/station/security/medical)
"xoF" = (
/obj/effect/turf_decal/trimline/purple/line,
/obj/effect/turf_decal/trimline/purple/filled/corner{
@@ -89286,12 +89389,6 @@
"xpI" = (
/turf/closed/wall,
/area/station/maintenance/solars/starboard/fore)
-"xpK" = (
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/machinery/rnd/bepis,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/cargo/warehouse)
"xpL" = (
/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior{
name = "Burn Chamber Exterior Airlock"
@@ -91158,6 +91255,16 @@
/obj/structure/cable,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/floor2/starboard/fore)
+"xOd" = (
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/siding/thinplating_new{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/shieldgen,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/iron/smooth,
+/area/station/cargo/warehouse)
"xOe" = (
/obj/machinery/light/cold/no_nightlight/directional/north,
/turf/open/floor/engine,
@@ -115256,13 +115363,13 @@ owI
owI
owI
owI
-oic
-oic
-ads
-uVb
-aOv
-ozY
-oic
+oyT
+oyT
+oyT
+oyT
+oyT
+bAh
+iDJ
oic
oic
oic
@@ -115513,14 +115620,14 @@ owI
owI
owI
owI
-oic
-oic
-uzr
-oic
-ePI
-ozY
-icf
-oic
+oyT
+oyT
+cDe
+ioi
+oyT
+oyT
+oyT
+oyT
gUS
nOj
dzo
@@ -115770,15 +115877,15 @@ owI
owI
owI
owI
-oic
-oic
-fBB
-kYs
-tNh
-bqm
-aUn
-oic
-eTD
+oyT
+oyT
+lgs
+fCw
+brL
+erV
+uDm
+oyT
+rGF
yiZ
yiZ
bUC
@@ -116027,15 +116134,15 @@ owI
owI
owI
owI
-oic
-oic
-lJl
-lJl
-cjz
-dNf
-gvu
-oic
-gCn
+oyT
+oyT
+sLq
+azj
+cBT
+owk
+jhP
+whN
+hBR
qWJ
qWJ
imO
@@ -116284,14 +116391,14 @@ owI
owI
owI
owI
-oic
-oic
-gex
-oic
-oic
-avu
-oic
-oic
+oyT
+oyT
+iaJ
+pBA
+htK
+nkT
+eul
+whN
rYA
eEB
lUY
@@ -116541,15 +116648,15 @@ owI
owI
owI
owI
-oic
-oic
-oic
-oic
-iOl
-xxQ
-cxp
-aQK
-fve
+oyT
+oyT
+oyT
+oyT
+oyT
+jAr
+whN
+oyT
+xOd
fve
aSL
iCn
@@ -116802,7 +116909,7 @@ uYl
pFb
gHw
yef
-dXP
+gFU
kHQ
hIj
aQK
@@ -117063,7 +117170,7 @@ wZu
vTt
hai
aQK
-xpK
+pCW
rhs
eaW
lSJ
@@ -117578,8 +117685,8 @@ fuJ
aQK
aQK
cfO
-vzo
-mnR
+jWJ
+bsq
mnk
mnR
aHb
@@ -117830,13 +117937,13 @@ cUL
cUL
oKT
xsL
-tWc
-dYm
-ncf
-kQL
-vPU
-mFK
-wuE
+sqK
+rqB
+prm
+gso
+gso
+qOr
+eoo
myW
myW
myW
@@ -118353,7 +118460,7 @@ oCK
fgr
cJt
jfa
-lkI
+qsz
cMA
mnR
bvf
@@ -194971,7 +195078,7 @@ gHO
yba
lfW
wdd
-aXl
+rku
nqM
qQM
dHR
@@ -196513,7 +196620,7 @@ dXy
bND
aHK
wdd
-lAv
+waA
wat
mVm
tfX
@@ -322959,7 +323066,7 @@ eoL
hSJ
dBo
mXY
-vxL
+xoA
qFI
wIn
hyR
@@ -323215,7 +323322,7 @@ eUU
dDR
iTd
oPA
-wHC
+jAv
hfd
qFI
iPH
@@ -323472,7 +323579,7 @@ rIa
bsI
oOi
dOD
-dVq
+meE
bBg
qFI
omP
diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm
index a68a80d0d40..1cdd6f23178 100644
--- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm
+++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm
@@ -1531,6 +1531,10 @@
/obj/structure/trash_pile,
/turf/open/floor/iron/smooth,
/area/station/maintenance/department/engine)
+"awG" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/iron/smooth_large,
+/area/station/cargo/miningdock)
"awP" = (
/obj/machinery/mech_bay_recharge_port,
/obj/effect/turf_decal/bot,
@@ -3260,6 +3264,9 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
},
+/obj/item/storage/box/bandages{
+ pixel_y = 8
+ },
/turf/open/floor/iron/dark/smooth_edge{
dir = 8
},
@@ -3689,16 +3696,6 @@
},
/turf/open/floor/iron/smooth_large,
/area/station/hallway/primary/aft)
-"baW" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 4
- },
-/obj/structure/closet/secure_closet/miner,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron/smooth_edge{
- dir = 8
- },
-/area/station/cargo/miningdock)
"bbh" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -8461,6 +8458,9 @@
dir = 1
},
/area/station/science/explab)
+"cBk" = (
+/turf/closed/wall,
+/area/station/bitrunning/den)
"cBU" = (
/obj/structure/chair/comfy/beige{
dir = 1
@@ -8731,8 +8731,8 @@
pixel_y = 5
},
/obj/machinery/light_switch/directional/east{
- pixel_y = 6;
- pixel_x = 23
+ pixel_x = 23;
+ pixel_y = 6
},
/obj/effect/turf_decal/trimline/blue/filled/warning{
dir = 5
@@ -9780,8 +9780,8 @@
/area/station/hallway/primary/fore)
"cWB" = (
/obj/machinery/digital_clock{
- pixel_y = 7;
- pixel_x = -1
+ pixel_x = -1;
+ pixel_y = 7
},
/turf/closed/wall/r_wall,
/area/station/engineering/supermatter/room)
@@ -10031,6 +10031,10 @@
/obj/item/multitool,
/obj/machinery/airalarm/directional/south,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
+/obj/item/storage/box/bandages{
+ pixel_x = 4;
+ pixel_y = 5
+ },
/turf/open/floor/engine,
/area/station/tcommsat/computer)
"day" = (
@@ -10348,6 +10352,12 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/atmos/pumproom)
+"deu" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"dex" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/carpet,
@@ -11103,6 +11113,14 @@
},
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/freezerchamber)
+"dpw" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/obj/structure/closet/secure_closet/miner,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/iron/smooth_edge,
+/area/station/cargo/miningdock)
"dpx" = (
/obj/structure/table/wood,
/obj/item/storage/crayons,
@@ -11908,6 +11926,14 @@
},
/turf/open/floor/plating,
/area/station/science/genetics)
+"dAV" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/start/bitrunner,
+/turf/open/floor/iron/dark/textured,
+/area/station/bitrunning/den)
"dAX" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -14573,12 +14599,6 @@
dir = 8
},
/area/station/cargo/lobby)
-"ejt" = (
-/obj/machinery/cryo_cell,
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/tile/dark_blue/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/medical/medbay/central)
"eju" = (
/obj/structure/rack,
/obj/effect/spawner/random/clothing/costume,
@@ -18708,6 +18728,16 @@
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
/turf/open/floor/iron/smooth,
/area/station/maintenance/disposal/incinerator)
+"fth" = (
+/obj/effect/landmark/bitrunning/station_reward_spawn,
+/obj/effect/turf_decal/box/corners{
+ dir = 8
+ },
+/obj/effect/turf_decal/box/corners{
+ dir = 1
+ },
+/turf/open/floor/engine,
+/area/station/bitrunning/den)
"ftr" = (
/obj/machinery/power/shuttle_engine/heater,
/obj/effect/turf_decal/stripes/line{
@@ -18923,12 +18953,6 @@
/obj/structure/table/glass,
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/medbay/central)
-"fxJ" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/turf/open/floor/iron/smooth_large,
-/area/station/cargo/miningdock)
"fxO" = (
/obj/structure/displaycase/trophy,
/obj/effect/turf_decal/siding/wood{
@@ -19689,6 +19713,12 @@
},
/turf/open/floor/iron/large,
/area/station/commons/fitness/recreation/entertainment)
+"fKN" = (
+/obj/machinery/cryo_cell,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/dark_blue/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/medical/medbay/central)
"fKU" = (
/obj/effect/turf_decal/trimline/brown/filled/warning{
dir = 4
@@ -20501,13 +20531,6 @@
"fXP" = (
/turf/closed/wall/r_wall,
/area/station/engineering/atmos/storage/gas)
-"fXS" = (
-/obj/machinery/cryo_cell,
-/obj/effect/turf_decal/bot,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/dark_blue/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/medical/medbay/central)
"fXZ" = (
/obj/effect/turf_decal/siding/red{
dir = 1
@@ -21691,6 +21714,17 @@
/obj/structure/sign/poster/official/wtf_is_co2,
/turf/closed/wall,
/area/station/engineering/atmos)
+"goP" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/smooth_edge{
+ dir = 4
+ },
+/area/station/bitrunning/den)
"goS" = (
/turf/open/floor/iron/freezer,
/area/station/medical/chemistry)
@@ -24092,6 +24126,13 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/freezer,
/area/station/medical/chemistry)
+"gWT" = (
+/obj/machinery/computer/quantum_console{
+ dir = 8
+ },
+/obj/machinery/light/small/red/directional/east,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/bitrunning/den)
"gWV" = (
/obj/effect/turf_decal/trimline/yellow/filled/warning{
dir = 4
@@ -24976,6 +25017,17 @@
/obj/structure/window/spawner/directional/east,
/turf/open/misc/beach/sand,
/area/station/science/research)
+"hjg" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/table,
+/obj/item/plate,
+/obj/effect/spawner/random/trash/food_packaging,
+/obj/machinery/camera/directional/north{
+ c_tag = "Mining Dock"
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/smooth_edge,
+/area/station/bitrunning/den)
"hji" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
@@ -25092,6 +25144,9 @@
/obj/item/storage/medkit/regular,
/obj/item/storage/backpack/satchel/explorer,
/obj/machinery/light/directional/south,
+/obj/item/storage/box/bandages{
+ pixel_y = 8
+ },
/turf/open/floor/iron/smooth_edge{
dir = 1
},
@@ -26702,6 +26757,15 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/pod/dark,
/area/station/service/chapel)
+"hJg" = (
+/obj/structure/table,
+/obj/item/modular_computer/laptop/preset/civilian{
+ pixel_y = 5;
+ pixel_x = 2
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/smooth_large,
+/area/station/bitrunning/den)
"hJx" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input{
dir = 4
@@ -26772,6 +26836,18 @@
dir = 8
},
/area/station/engineering/atmos)
+"hKK" = (
+/obj/structure/chair/plastic{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 5
+ },
+/obj/machinery/computer/security/telescreen/entertainment/directional/east,
+/obj/structure/sign/poster/contraband/random/directional/north,
+/obj/effect/landmark/start/bitrunner,
+/turf/open/floor/iron/smooth,
+/area/station/bitrunning/den)
"hKP" = (
/obj/item/reagent_containers/cup/bucket,
/obj/effect/decal/cleanable/cobweb/cobweb2,
@@ -26864,14 +26940,14 @@
"hMN" = (
/obj/structure/table/glass,
/obj/effect/turf_decal/bot,
-/obj/item/storage/box{
- pixel_x = 3;
- pixel_y = 3
- },
/obj/item/radio/headset/headset_eng{
pixel_x = -4;
pixel_y = 3
},
+/obj/item/storage/box/bandages{
+ pixel_x = 4;
+ pixel_y = 5
+ },
/turf/open/floor/iron/smooth_large,
/area/station/engineering/lobby)
"hMQ" = (
@@ -27225,6 +27301,13 @@
},
/turf/open/floor/iron/white,
/area/station/hallway/primary/fore)
+"hSf" = (
+/obj/effect/landmark/start/shaft_miner,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/smooth_large,
+/area/station/cargo/miningdock)
"hSn" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -27570,22 +27653,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/smooth_large,
/area/station/maintenance/department/engine/atmos/lesser)
-"hWA" = (
-/obj/machinery/door/airlock/mining{
- name = "Mining Dock"
- },
-/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/smooth,
-/area/station/cargo/miningdock)
"hWF" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 1
@@ -28114,6 +28181,13 @@
"ifq" = (
/turf/closed/wall/r_wall,
/area/station/medical/pharmacy)
+"ifS" = (
+/obj/machinery/cryo_cell,
+/obj/effect/turf_decal/bot,
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/tile/dark_blue/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/medical/medbay/central)
"igd" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
@@ -28158,13 +28232,6 @@
dir = 4
},
/area/station/commons/fitness/recreation/entertainment)
-"ihv" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 9
- },
-/obj/machinery/rnd/bepis,
-/turf/open/floor/iron/smooth,
-/area/station/cargo/warehouse)
"ihy" = (
/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible,
/obj/structure/window/reinforced/plasma/spawner/directional/west,
@@ -30164,6 +30231,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/item/storage/box/bandages{
+ pixel_y = 8
+ },
/turf/open/floor/iron/freezer,
/area/station/medical/treatment_center)
"iHi" = (
@@ -30398,6 +30468,13 @@
dir = 8
},
/area/station/engineering/atmos/hfr_room)
+"iLb" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/textured_edge,
+/area/station/bitrunning/den)
"iLH" = (
/obj/effect/turf_decal/trimline/purple/filled/warning{
dir = 4
@@ -32973,6 +33050,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/edge,
/area/station/hallway/primary/central)
+"jvw" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/obj/effect/landmark/start/bitrunner,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 8
+ },
+/area/station/bitrunning/den)
"jvx" = (
/obj/structure/table/wood,
/obj/item/food/breadslice/plain,
@@ -35349,6 +35435,14 @@
},
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/warden)
+"kdS" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 10
+ },
+/obj/machinery/light_switch/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/smooth,
+/area/station/bitrunning/den)
"kek" = (
/obj/effect/turf_decal/trimline/neutral/filled/warning{
dir = 1
@@ -35856,6 +35950,15 @@
},
/turf/open/floor/pod/dark,
/area/station/service/chapel/funeral)
+"kkC" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/structure/closet/secure_closet/miner,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/iron/smooth_edge,
+/area/station/cargo/miningdock)
"kkI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -36252,6 +36355,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/smooth_large,
/area/station/hallway/secondary/construction)
+"krz" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/smooth_large,
+/area/station/cargo/miningdock)
"krA" = (
/obj/effect/turf_decal/trimline/brown/filled/corner{
dir = 1
@@ -36284,6 +36396,15 @@
/obj/effect/spawner/random/trash/mess,
/turf/open/floor/iron/smooth,
/area/station/maintenance/department/science/xenobiology)
+"ksB" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 8
+ },
+/obj/effect/landmark/start/bitrunner,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 4
+ },
+/area/station/bitrunning/den)
"ksD" = (
/obj/effect/turf_decal/trimline/brown/filled/warning{
dir = 6
@@ -37411,6 +37532,15 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"kFL" = (
+/obj/effect/spawner/random/trash/grime,
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/smooth_corner{
+ dir = 4
+ },
+/area/station/bitrunning/den)
"kFS" = (
/obj/effect/mapping_helpers/airlock/access/all/science/rd,
/obj/machinery/door/airlock/rd/glass{
@@ -39184,6 +39314,11 @@
},
/turf/open/floor/iron/smooth_large,
/area/station/engineering/power_room)
+"ldU" = (
+/obj/machinery/netpod,
+/obj/machinery/light/small/blacklight/directional/west,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/bitrunning/den)
"leb" = (
/obj/structure/cable,
/turf/open/floor/iron/smooth_large,
@@ -39206,6 +39341,11 @@
},
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/maintenance/department/crew_quarters/bar)
+"leF" = (
+/obj/machinery/quantum_server,
+/obj/structure/extinguisher_cabinet/directional/east,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/bitrunning/den)
"leI" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 5
@@ -39674,6 +39814,9 @@
dir = 10
},
/obj/machinery/firealarm/directional/south,
+/obj/item/storage/box/bandages{
+ pixel_y = 8
+ },
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
"llF" = (
@@ -40734,6 +40877,10 @@
},
/obj/effect/turf_decal/bot,
/obj/item/clothing/glasses/meson/engine,
+/obj/item/storage/box/bandages{
+ pixel_x = 4;
+ pixel_y = 5
+ },
/turf/open/floor/iron/dark/smooth_large,
/area/station/engineering/main)
"lAS" = (
@@ -45708,6 +45855,12 @@
/obj/effect/turf_decal/box,
/turf/open/floor/plating/airless,
/area/space/nearstation)
+"mTY" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 5
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/bitrunning/den)
"mUp" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/trash/mess,
@@ -47279,6 +47432,15 @@
},
/turf/open/floor/wood/large,
/area/station/hallway/primary/fore)
+"nqU" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/brown/filled/warning{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/smooth_large,
+/area/station/cargo/miningdock)
"nrb" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -47341,13 +47503,6 @@
},
/turf/open/floor/wood/large,
/area/station/commons/fitness/recreation/entertainment)
-"nsm" = (
-/obj/effect/turf_decal/loading_area{
- dir = 4
- },
-/obj/effect/landmark/start/shaft_miner,
-/turf/open/floor/iron/smooth_large,
-/area/station/cargo/miningdock)
"nsp" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 1
@@ -48010,6 +48165,12 @@
dir = 4
},
/area/station/engineering/power_room)
+"nAD" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 9
+ },
+/turf/open/floor/iron/smooth,
+/area/station/cargo/warehouse)
"nAH" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/turret_protected/aisat/atmos)
@@ -48040,6 +48201,17 @@
},
/turf/closed/wall/r_wall,
/area/station/science/ordnance/burnchamber)
+"nBO" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/smooth_edge{
+ dir = 8
+ },
+/area/station/cargo/miningdock)
"nCl" = (
/obj/structure/chair/office/light{
dir = 4
@@ -48315,6 +48487,19 @@
/obj/effect/spawner/random/trash/grille_or_waste,
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/science/research/abandoned)
+"nGR" = (
+/obj/structure/chair/sofa/corp/right{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 8
+ },
+/obj/machinery/light/small/directional/west,
+/obj/effect/landmark/start/bitrunner,
+/turf/open/floor/iron/smooth_edge{
+ dir = 4
+ },
+/area/station/bitrunning/den)
"nGX" = (
/obj/structure/chair/sofa/right/brown{
dir = 8
@@ -50463,6 +50648,13 @@
/obj/machinery/status_display/ai/directional/south,
/turf/open/floor/carpet/black,
/area/station/service/chapel/office)
+"oky" = (
+/obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/machinery/computer/order_console/bitrunning,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/bitrunning/den)
"okG" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -51379,6 +51571,13 @@
dir = 4
},
/area/station/hallway/secondary/command)
+"oxn" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 10
+ },
+/obj/effect/landmark/start/bitrunner,
+/turf/open/floor/iron/dark/textured,
+/area/station/bitrunning/den)
"oxv" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/disposalpipe/segment{
@@ -52052,6 +52251,16 @@
/obj/machinery/light/cold/directional/west,
/turf/open/floor/iron/dark/small,
/area/station/security/prison/garden)
+"oGX" = (
+/obj/structure/table,
+/obj/machinery/microwave,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 5
+ },
+/obj/machinery/light/small/directional/east,
+/obj/structure/sign/poster/contraband/random/directional/east,
+/turf/open/floor/iron/smooth,
+/area/station/bitrunning/den)
"oHc" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -52912,6 +53121,11 @@
/obj/machinery/firealarm/directional/east,
/turf/open/floor/circuit/green,
/area/station/ai_monitored/command/nuke_storage)
+"oUb" = (
+/obj/machinery/firealarm/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/stairs,
+/area/station/bitrunning/den)
"oUl" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -54690,6 +54904,19 @@
"pqh" = (
/turf/closed/wall,
/area/station/cargo/warehouse)
+"pqk" = (
+/obj/structure/chair/sofa/corp/left{
+ desc = "Looks like someone threw it out. Covered in donut crumbs.";
+ dir = 4;
+ name = "couch"
+ },
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 9
+ },
+/obj/structure/sign/poster/contraband/random/directional/west,
+/obj/effect/landmark/start/bitrunner,
+/turf/open/floor/iron/smooth,
+/area/station/bitrunning/den)
"pql" = (
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable,
@@ -55002,6 +55229,9 @@
id = "paramed_dispatch_desk";
name = "Desk Shutters"
},
+/obj/item/storage/box/bandages{
+ pixel_y = 15
+ },
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/medbay/lobby)
"puQ" = (
@@ -55081,6 +55311,13 @@
/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden,
/turf/closed/wall/r_wall,
/area/station/maintenance/disposal/incinerator)
+"pws" = (
+/obj/effect/landmark/start/shaft_miner,
+/obj/effect/turf_decal/loading_area{
+ dir = 1
+ },
+/turf/open/floor/iron/smooth_large,
+/area/station/cargo/miningdock)
"pwB" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/item/radio{
@@ -55698,6 +55935,15 @@
/obj/machinery/light_switch/directional/east,
/turf/open/floor/iron/smooth,
/area/station/engineering/atmos/storage/gas)
+"pFJ" = (
+/obj/item/storage/cans/sixsoda,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 6
+ },
+/obj/structure/railing,
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/iron/smooth,
+/area/station/bitrunning/den)
"pGh" = (
/turf/open/floor/iron/white/smooth_large,
/area/station/hallway/primary/fore)
@@ -56454,17 +56700,6 @@
/obj/structure/cable,
/turf/open/floor/iron/smooth,
/area/station/maintenance/department/electrical)
-"pRu" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 4
- },
-/obj/structure/closet/secure_closet/miner,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/light/directional/east,
-/turf/open/floor/iron/smooth_edge{
- dir = 8
- },
-/area/station/cargo/miningdock)
"pRv" = (
/obj/effect/spawner/random/trash/moisture_trap,
/turf/open/floor/iron/smooth,
@@ -57824,6 +58059,13 @@
"qgT" = (
/turf/open/floor/iron/white,
/area/station/hallway/primary/fore)
+"qgY" = (
+/obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/structure/railing,
+/turf/open/floor/iron/smooth_edge{
+ dir = 1
+ },
+/area/station/bitrunning/den)
"qha" = (
/obj/machinery/chem_heater/withbuffer,
/obj/effect/turf_decal/trimline/yellow/filled/line,
@@ -57928,6 +58170,14 @@
},
/turf/open/floor/catwalk_floor,
/area/station/hallway/secondary/exit/departure_lounge)
+"qhU" = (
+/obj/effect/landmark/bitrunning/station_reward_spawn,
+/obj/effect/turf_decal/box/corners,
+/obj/effect/turf_decal/box/corners{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/station/bitrunning/den)
"qhX" = (
/obj/effect/landmark/start/medical_doctor,
/obj/structure/curtain,
@@ -58508,6 +58758,12 @@
},
/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
+"qpX" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/smooth_large,
+/area/station/cargo/miningdock)
"qqa" = (
/obj/effect/spawner/random/structure/barricade,
/turf/open/floor/iron/smooth,
@@ -58808,17 +59064,6 @@
/obj/item/seeds/watermelon/holy,
/turf/open/floor/grass,
/area/station/service/chapel)
-"quF" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 1
- },
-/obj/effect/turf_decal/loading_area{
- dir = 4
- },
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/effect/landmark/start/shaft_miner,
-/turf/open/floor/iron/smooth_edge,
-/area/station/cargo/miningdock)
"quG" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -59213,6 +59458,23 @@
},
/turf/open/floor/carpet/blue,
/area/station/command/bridge)
+"qBe" = (
+/obj/machinery/door/airlock/mining{
+ name = "Mining Dock"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment,
+/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
+/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
+/turf/open/floor/iron/smooth,
+/area/station/cargo/miningdock)
"qBh" = (
/obj/effect/spawner/random/trash/mopbucket,
/obj/effect/decal/cleanable/dirt,
@@ -59229,6 +59491,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark/smooth_large,
/area/station/command/gateway)
+"qBt" = (
+/obj/machinery/netpod,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/bitrunning/den)
"qBA" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -61796,6 +62062,18 @@
},
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/prison)
+"rnb" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 6
+ },
+/obj/structure/trash_pile,
+/obj/item/clothing/suit/costume/wellworn_shirt/messy/graphic{
+ pixel_x = -5;
+ pixel_y = 5
+ },
+/obj/structure/sign/poster/contraband/random/directional/east,
+/turf/open/floor/iron/dark/textured,
+/area/station/bitrunning/den)
"rne" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/north,
@@ -63094,10 +63372,6 @@
dir = 8
},
/area/station/service/hydroponics)
-"rGR" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/smooth_large,
-/area/station/cargo/miningdock)
"rHc" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
@@ -65419,6 +65693,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/maintenance/department/engine/atmos)
+"sqL" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/loading_area{
+ dir = 1
+ },
+/turf/open/floor/iron/smooth_edge{
+ dir = 8
+ },
+/area/station/cargo/miningdock)
"sqQ" = (
/obj/machinery/power/solar{
id = "aftport";
@@ -70497,6 +70783,25 @@
},
/turf/open/floor/iron/smooth_edge,
/area/station/cargo/storage)
+"tEI" = (
+/obj/structure/table,
+/obj/item/food/ready_donk/mac_n_cheese{
+ pixel_y = 3;
+ pixel_x = 2
+ },
+/obj/item/food/ready_donk/nachos_grandes{
+ pixel_y = 7
+ },
+/obj/item/food/ready_donk/donkhiladas{
+ pixel_y = 11;
+ pixel_x = 1
+ },
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 6
+ },
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/iron/smooth,
+/area/station/bitrunning/den)
"tEK" = (
/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{
dir = 10
@@ -71107,6 +71412,15 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/white/diagonal,
/area/station/medical/medbay/central)
+"tOa" = (
+/obj/structure/chair/plastic,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/obj/effect/landmark/start/bitrunner,
+/obj/structure/cable,
+/turf/open/floor/iron/smooth_large,
+/area/station/bitrunning/den)
"tOr" = (
/obj/effect/spawner/liquids_spawner,
/obj/machinery/light/cold/directional/south,
@@ -72023,6 +72337,12 @@
},
/turf/open/floor/iron/smooth_large,
/area/station/engineering/atmos)
+"ucK" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/smooth_large,
+/area/station/cargo/miningdock)
"ucR" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -72323,6 +72643,10 @@
/obj/effect/turf_decal/siding/wood{
dir = 9
},
+/obj/item/storage/box/bandages{
+ pixel_y = 16;
+ pixel_x = -6
+ },
/turf/open/floor/iron/dark/smooth_large,
/area/station/cargo/storage)
"uhv" = (
@@ -75333,6 +75657,10 @@
},
/turf/open/floor/catwalk_floor,
/area/station/hallway/primary/aft)
+"uVw" = (
+/obj/structure/trash_pile,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/bitrunning/den)
"uVG" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -76285,13 +76613,6 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/pod/dark,
/area/station/service/chapel)
-"vkO" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/brown/filled/corner{
- dir = 1
- },
-/turf/open/floor/iron/smooth_large,
-/area/station/cargo/miningdock)
"vkT" = (
/obj/structure/table/glass,
/obj/effect/turf_decal/tile/blue/full,
@@ -76347,10 +76668,10 @@
},
/obj/machinery/requests_console/directional/south{
department = "Engineering";
- name = "Engineering Requests Console";
dir = 4;
- pixel_y = 0;
- pixel_x = 30
+ name = "Engineering Requests Console";
+ pixel_x = 30;
+ pixel_y = 0
},
/obj/effect/mapping_helpers/requests_console/supplies,
/obj/effect/mapping_helpers/requests_console/assistance,
@@ -76818,6 +77139,22 @@
dir = 8
},
/area/station/hallway/primary/fore)
+"vte" = (
+/obj/machinery/door/airlock/mining{
+ name = "Bitrunning Den"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/smooth,
+/area/station/cargo/miningdock)
"vti" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
@@ -77197,6 +77534,11 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/aft/greater)
+"vxf" = (
+/obj/machinery/holopad,
+/obj/effect/turf_decal/trimline/brown/filled/corner,
+/turf/open/floor/iron/smooth_corner,
+/area/station/bitrunning/den)
"vxv" = (
/mob/living/basic/butterfly,
/turf/closed/wall/mineral/iron,
@@ -79820,13 +80162,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/smooth,
/area/station/science/robotics/mechbay)
-"wjo" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/brown/filled/warning{
- dir = 1
- },
-/turf/open/floor/iron/smooth_large,
-/area/station/cargo/miningdock)
"wjq" = (
/obj/machinery/camera/directional/east{
c_tag = "Security - Detective's Office"
@@ -80873,8 +81208,8 @@
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
dir = 1;
- name = "Exam Room Shutters";
- id = "medexamshutter"
+ id = "medexamshutter";
+ name = "Exam Room Shutters"
},
/turf/open/floor/plating,
/area/station/medical/exam_room)
@@ -82700,6 +83035,11 @@
/obj/machinery/light/cold/directional/west,
/turf/open/floor/iron/freezer,
/area/station/medical/chemistry)
+"wYd" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/curtain/bounty/start_closed,
+/turf/open/floor/plating,
+/area/station/bitrunning/den)
"wYo" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -86243,6 +86583,14 @@
dir = 8
},
/obj/effect/turf_decal/delivery,
+/obj/item/storage/box/flashbangs{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/obj/item/storage/box/teargas{
+ pixel_x = 6;
+ pixel_y = -6
+ },
/turf/open/floor/engine,
/area/station/ai_monitored/security/armory)
"ybE" = (
@@ -113302,7 +113650,7 @@ ePK
kUZ
dYR
lxm
-fXS
+ifS
eux
iAl
wjR
@@ -113816,7 +114164,7 @@ qiD
kUZ
dYR
uYT
-ejt
+fKN
pEQ
bKZ
cUH
@@ -125902,7 +126250,7 @@ onP
onP
onP
onP
-ihv
+nAD
vwJ
wKg
fdP
@@ -128980,7 +129328,7 @@ fNX
iNa
bkF
hQq
-hWA
+qBe
odX
ipj
ekQ
@@ -129235,7 +129583,7 @@ xMq
oXI
ihS
cvp
-wjo
+nqU
bcW
njG
xCF
@@ -129492,7 +129840,7 @@ xMq
oXI
iFV
lmY
-vkO
+krz
lon
cbP
szk
@@ -129749,7 +130097,7 @@ xMq
oXI
oCm
jAS
-rGR
+qpX
pmM
oXI
pjT
@@ -130006,7 +130354,7 @@ cbP
cbP
qtr
jAS
-rGR
+qpX
lFU
oXI
jBq
@@ -130262,8 +130610,8 @@ ruV
jBM
ruV
aUO
-jAS
-fxJ
+awG
+ucK
hkN
oXI
mXQ
@@ -130518,9 +130866,9 @@ ttw
cbP
cbP
cbP
-qtr
-jAS
-jAS
+dpw
+pws
+ucK
hwL
oXI
hwR
@@ -130775,9 +131123,9 @@ ttw
odJ
xMq
oXI
-quF
-nsm
-nsm
+kkC
+pws
+hSf
llf
oXI
emO
@@ -131033,8 +131381,8 @@ odJ
xMq
oXI
xqM
-pRu
-baW
+sqL
+nBO
afo
oXI
pjT
@@ -131291,13 +131639,13 @@ xMq
oXI
oXI
oXI
+vte
oXI
oXI
-oXI
-ttw
-ttw
-ttw
-ttw
+qBt
+ldU
+qBt
+cBk
ttw
ttw
xMq
@@ -131545,18 +131893,18 @@ xMq
xMq
xMq
xMq
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
+cBk
+pqk
+nGR
+goP
+kdS
+oUb
+dAV
+ksB
+oxn
+wYd
+xMq
+xMq
xMq
odJ
ttw
@@ -131801,17 +132149,17 @@ ttw
ttw
ttw
ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
+xMq
+cBk
+hjg
+hJg
+tOa
+qgY
+fth
+iLb
+deu
+oky
+wYd
ttw
ttw
xMq
@@ -132056,19 +132404,19 @@ ttw
ttw
ttw
ttw
+kUb
ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
+xMq
+cBk
+hKK
+kFL
+vxf
+pFJ
+qhU
+mTY
+jvw
+rnb
+wYd
ttw
ttw
xMq
@@ -132313,21 +132661,21 @@ ttw
ttw
ttw
ttw
+kUb
ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
+xMq
+cBk
+cBk
+oGX
+tEI
+cBk
+uVw
+leF
+gWT
+cBk
+cBk
+xMq
+xMq
xMq
odJ
ttw
@@ -132568,21 +132916,21 @@ ttw
ttw
ttw
ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
+smE
+xMq
+kUb
+xMq
+xMq
+xMq
+cBk
+cBk
+cBk
+cBk
+cBk
+cBk
+cBk
+cBk
+xMq
ttw
ttw
xMq
@@ -132827,21 +133175,21 @@ ttw
ttw
ttw
ttw
+kUb
ttw
ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
+xMq
+xMq
+xMq
+xMq
+xMq
+xMq
+xMq
+xMq
+xMq
+xMq
+xMq
+xMq
xMq
odJ
ttw
@@ -133084,19 +133432,19 @@ ttw
ttw
ttw
ttw
+kUb
+kUb
ttw
+xMq
ttw
ttw
+xMq
ttw
ttw
+xMq
ttw
ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
+xMq
ttw
ttw
xMq
@@ -133342,19 +133690,19 @@ ttw
ttw
ttw
ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
-ttw
+kUb
+kUb
+kUb
+kUb
+kUb
+kUb
+kUb
+kUb
+kUb
+kUb
+kUb
+kUb
+kUb
ttw
xMq
xqO
@@ -133601,16 +133949,16 @@ ttw
ttw
ttw
ttw
+xMq
ttw
ttw
+xMq
ttw
ttw
+xMq
ttw
ttw
-ttw
-ttw
-ttw
-ttw
+xMq
ttw
ttw
xMq
@@ -133858,16 +134206,16 @@ ttw
ttw
ttw
ttw
+smE
ttw
ttw
+smE
ttw
ttw
+smE
ttw
ttw
-ttw
-ttw
-ttw
-ttw
+smE
ttw
ttw
ttw
diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm
index a475bd64013..c1740dd6338 100644
--- a/_maps/map_files/debug/runtimestation.dmm
+++ b/_maps/map_files/debug/runtimestation.dmm
@@ -1763,6 +1763,10 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/science)
+"js" = (
+/obj/machinery/quantum_server,
+/turf/open/floor/iron,
+/area/station/bitrunning/den)
"jE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 8
@@ -2008,6 +2012,10 @@
"wU" = (
/turf/closed/wall/r_wall,
/area/station/science/explab)
+"yn" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/bitrunning/den)
"yA" = (
/obj/docking_port/stationary/laborcamp_home{
dir = 8
@@ -2036,12 +2044,21 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron,
/area/station/science)
+"Ai" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"AP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 8
},
/turf/open/floor/iron,
/area/station/science)
+"AR" = (
+/turf/open/floor/circuit/green,
+/area/station/bitrunning/den)
"BD" = (
/obj/structure/closet/secure_closet/chief_medical{
locked = 0
@@ -2058,6 +2075,12 @@
"Ce" = (
/turf/open/floor/iron,
/area/station/medical/chemistry)
+"Cq" = (
+/obj/machinery/door/airlock,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
+/turf/open/floor/iron,
+/area/station/bitrunning/den)
"Ct" = (
/obj/structure/closet/syndicate/resources/everything,
/turf/open/floor/iron,
@@ -2155,6 +2178,10 @@
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/command/bridge)
+"Fk" = (
+/obj/machinery/netpod,
+/turf/open/floor/iron,
+/area/station/bitrunning/den)
"HW" = (
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/unlocked,
@@ -2235,6 +2262,9 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"Ma" = (
+/turf/open/floor/iron,
+/area/station/bitrunning/den)
"Mh" = (
/obj/structure/cable,
/turf/open/floor/iron,
@@ -2262,11 +2292,23 @@
/obj/machinery/chem_recipe_debug,
/turf/open/floor/iron,
/area/station/medical/chemistry)
+"Nk" = (
+/obj/structure/table/reinforced,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron,
+/area/station/bitrunning/den)
"Ns" = (
/obj/machinery/door/airlock/public/glass,
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/medical/medbay)
+"NQ" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/item/storage/part_replacer/bluespace/tier4,
+/turf/open/floor/iron,
+/area/station/bitrunning/den)
"NZ" = (
/obj/machinery/rnd/production/protolathe/department,
/turf/open/floor/iron,
@@ -2320,6 +2362,10 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"Qs" = (
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/bitrunning/den)
"Qt" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
@@ -2350,6 +2396,11 @@
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron,
/area/station/command/bridge)
+"RS" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
+/turf/open/floor/iron,
+/area/station/bitrunning/den)
"Sg" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/effect/turf_decal/stripes/corner,
@@ -2391,6 +2442,10 @@
/obj/item/healthanalyzer/advanced,
/turf/open/floor/iron,
/area/station/medical/medbay)
+"UM" = (
+/obj/effect/landmark/bitrunning/station_reward_spawn,
+/turf/open/floor/circuit/green,
+/area/station/bitrunning/den)
"Va" = (
/obj/machinery/power/smes{
charge = 5e+006
@@ -2425,6 +2480,11 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/main)
+"VX" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"We" = (
/obj/machinery/newscaster/directional/west,
/turf/open/floor/iron,
@@ -2517,6 +2577,9 @@
},
/turf/open/floor/iron/dark,
/area/station/science/explab)
+"Yn" = (
+/turf/closed/wall/r_wall,
+/area/station/bitrunning/den)
"Yy" = (
/obj/machinery/light/directional/north,
/obj/machinery/rnd/production/circuit_imprinter/department,
@@ -2536,6 +2599,13 @@
/obj/effect/mapping_helpers/airalarm/unlocked,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
+"Zp" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/computer/quantum_console,
+/turf/open/floor/iron,
+/area/station/bitrunning/den)
"Zz" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/effect/turf_decal/stripes/line,
@@ -3033,12 +3103,12 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
+Yn
+Yn
+Yn
+Yn
+Yn
+Yn
aa
aa
aa
@@ -3125,12 +3195,12 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
+Yn
+UM
+AR
+Ma
+Fk
+Yn
aa
aa
aa
@@ -3217,12 +3287,12 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
+Yn
+UM
+AR
+Ma
+Fk
+Yn
aa
aa
aa
@@ -3309,12 +3379,12 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
+Yn
+js
+Ma
+NQ
+Fk
+Yn
aa
aa
aa
@@ -3401,12 +3471,12 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
+Yn
+Zp
+Qs
+RS
+Nk
+Yn
aa
aa
aa
@@ -3493,12 +3563,12 @@ em
em
em
em
-em
-em
-em
-dY
-en
-dY
+Yn
+Yn
+Yn
+Cq
+yn
+Yn
Tj
Tj
Tj
@@ -3588,7 +3658,7 @@ rK
rK
vy
em
-eh
+VX
eh
LW
lc
@@ -3680,7 +3750,7 @@ qQ
qQ
ME
em
-eh
+VX
eh
LW
lc
@@ -3772,7 +3842,7 @@ qQ
qQ
ME
em
-eh
+VX
eh
LW
lc
@@ -3864,7 +3934,7 @@ qQ
qQ
CQ
em
-eh
+Ai
eh
LW
lc
@@ -3956,7 +4026,7 @@ qQ
qQ
ME
em
-eh
+VX
eh
LW
lc
@@ -4048,7 +4118,7 @@ qQ
qQ
YL
em
-eh
+VX
eh
LW
lc
@@ -4140,7 +4210,7 @@ II
gl
gD
kj
-wM
+VX
wM
LW
lc
diff --git a/_maps/map_files/tramstation/maintenance_modules/barcargoupper_1.dmm b/_maps/map_files/tramstation/maintenance_modules/barcargoupper_1.dmm
index a34ab0e6fcf..eab9280b8fa 100644
--- a/_maps/map_files/tramstation/maintenance_modules/barcargoupper_1.dmm
+++ b/_maps/map_files/tramstation/maintenance_modules/barcargoupper_1.dmm
@@ -1845,10 +1845,10 @@ gb
gb
gb
gb
-gb
-gb
-gb
-gb
+eJ
+eJ
+eJ
+eJ
eJ
eJ
eJ
@@ -1882,10 +1882,10 @@ gb
gb
gb
gb
-gb
-gb
-gb
-gb
+eJ
+eJ
+eJ
+eJ
eJ
eJ
eJ
@@ -1918,7 +1918,7 @@ eJ
gb
gb
gb
-eJ
+gb
eJ
eJ
eJ
diff --git a/_maps/map_files/tramstation/maintenance_modules/barcargoupper_2.dmm b/_maps/map_files/tramstation/maintenance_modules/barcargoupper_2.dmm
index f20109536f8..0901318e301 100644
--- a/_maps/map_files/tramstation/maintenance_modules/barcargoupper_2.dmm
+++ b/_maps/map_files/tramstation/maintenance_modules/barcargoupper_2.dmm
@@ -2000,10 +2000,10 @@ se
se
se
se
-se
-se
-se
-se
+dx
+dx
+dx
+dx
dx
dx
dx
@@ -2037,10 +2037,10 @@ se
se
se
se
-se
-se
-se
-se
+dx
+dx
+dx
+dx
dx
dx
dx
@@ -2073,7 +2073,7 @@ dx
se
se
se
-dx
+se
dx
dx
dx
diff --git a/_maps/map_files/tramstation/maintenance_modules/barcargoupper_3.dmm b/_maps/map_files/tramstation/maintenance_modules/barcargoupper_3.dmm
index 63b18a69e75..775e31e6b9d 100644
--- a/_maps/map_files/tramstation/maintenance_modules/barcargoupper_3.dmm
+++ b/_maps/map_files/tramstation/maintenance_modules/barcargoupper_3.dmm
@@ -1918,10 +1918,10 @@ cK
cK
cK
cK
-cK
-cK
-cK
-cK
+Hu
+Hu
+Hu
+Hu
Hu
Hu
Hu
@@ -1955,10 +1955,10 @@ cK
cK
cK
cK
-cK
-cK
-cK
-cK
+Hu
+Hu
+Hu
+Hu
Hu
Hu
Hu
@@ -1991,7 +1991,7 @@ Hu
cK
cK
cK
-Hu
+cK
Hu
Hu
Hu
diff --git a/_maps/map_files/tramstation/maintenance_modules/barcargoupper_cave_1.dmm b/_maps/map_files/tramstation/maintenance_modules/barcargoupper_cave_1.dmm
index 202e850684a..ae78ae6731f 100644
--- a/_maps/map_files/tramstation/maintenance_modules/barcargoupper_cave_1.dmm
+++ b/_maps/map_files/tramstation/maintenance_modules/barcargoupper_cave_1.dmm
@@ -1079,10 +1079,10 @@ V
V
V
V
-V
-V
-V
-V
+l
+l
+l
+l
l
l
l
@@ -1105,10 +1105,10 @@ V
V
V
V
-V
-V
-V
-V
+l
+l
+l
+l
l
l
l
diff --git a/_maps/map_files/tramstation/maintenance_modules/barcargoupper_cave_2.dmm b/_maps/map_files/tramstation/maintenance_modules/barcargoupper_cave_2.dmm
index 939d8bb0aaf..0e8deac0a59 100644
--- a/_maps/map_files/tramstation/maintenance_modules/barcargoupper_cave_2.dmm
+++ b/_maps/map_files/tramstation/maintenance_modules/barcargoupper_cave_2.dmm
@@ -1013,10 +1013,10 @@ V
V
l
V
-V
-V
-V
-V
+b
+b
+b
+b
b
b
b
@@ -1039,10 +1039,10 @@ V
V
V
V
-V
-V
-V
-V
+b
+b
+b
+b
b
b
b
diff --git a/_maps/map_files/tramstation/maintenance_modules/barcargoupper_cave_3.dmm b/_maps/map_files/tramstation/maintenance_modules/barcargoupper_cave_3.dmm
index 5831bc047d3..fb637e9194f 100644
--- a/_maps/map_files/tramstation/maintenance_modules/barcargoupper_cave_3.dmm
+++ b/_maps/map_files/tramstation/maintenance_modules/barcargoupper_cave_3.dmm
@@ -113,10 +113,6 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating,
/area/station/maintenance/department/cargo)
-"y" = (
-/obj/item/gps/mining,
-/turf/open/misc/asteroid,
-/area/station/asteroid)
"z" = (
/obj/item/storage/bag/ore{
pixel_x = 6;
@@ -129,6 +125,10 @@
/obj/item/assembly/signaler,
/turf/open/misc/asteroid,
/area/station/asteroid)
+"C" = (
+/obj/item/gps/mining,
+/turf/open/misc/asteroid/dug,
+/area/station/asteroid)
"D" = (
/obj/item/relic,
/turf/open/misc/asteroid/dug,
@@ -1048,7 +1048,7 @@ b
i
i
I
-I
+C
Y
i
Y
@@ -1100,10 +1100,10 @@ B
I
I
P
-y
-i
-i
-i
+Q
+Q
+Q
+Q
Q
Q
Q
@@ -1126,10 +1126,10 @@ Y
Y
I
Y
-i
-i
-i
-i
+Q
+Q
+Q
+Q
Q
Q
Q
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
index ac5d9ba0e1d..7c561db5a62 100644
--- a/_maps/map_files/tramstation/tramstation.dmm
+++ b/_maps/map_files/tramstation/tramstation.dmm
@@ -451,6 +451,17 @@
"abM" = (
/turf/open/misc/asteroid,
/area/station/asteroid)
+"abN" = (
+/obj/machinery/firealarm/directional/south,
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/effect/turf_decal/stripes,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"abO" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -3848,6 +3859,16 @@
/obj/effect/turf_decal/trimline/neutral/warning,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
+"axF" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 8
+ },
+/obj/effect/landmark/start/bitrunner,
+/obj/structure/chair{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"axG" = (
/obj/effect/turf_decal/bot,
/obj/effect/spawner/random/structure/crate_empty,
@@ -6194,13 +6215,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/tram/mid)
-"aVM" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/brown/filled/line,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"aVT" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -6238,24 +6252,6 @@
/obj/machinery/suit_storage_unit/industrial/loader,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
-"aWQ" = (
-/obj/effect/turf_decal/trimline/brown/filled/corner{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/brown/filled/corner{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating{
- dir = 1
- },
-/obj/effect/turf_decal/loading_area{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"aWY" = (
/obj/structure/stairs/west,
/turf/open/floor/iron/stairs/right{
@@ -6362,11 +6358,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"aZT" = (
-/obj/effect/landmark/event_spawn,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"aZX" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 1
@@ -9523,6 +9514,18 @@
/obj/effect/turf_decal/tile/brown/fourcorners,
/turf/open/floor/iron,
/area/station/cargo/sorting)
+"cfC" = (
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/effect/turf_decal/stripes,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"cga" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 8
@@ -10102,6 +10105,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/cafeteria,
/area/station/command/heads_quarters/rd)
+"csn" = (
+/obj/machinery/elevator_control_panel{
+ layer = 3.1;
+ linked_elevator_id = "tram_xeno_lift";
+ pixel_y = 2;
+ preset_destination_names = list("2"="Lower Deck","3"="Upper Deck")
+ },
+/turf/closed/wall,
+/area/station/science/xenobiology)
"csA" = (
/turf/closed/wall,
/area/station/solars/starboard/fore)
@@ -10724,6 +10736,12 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"cEy" = (
+/obj/machinery/cryo_cell{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/medical/treatment_center)
"cEA" = (
/obj/effect/turf_decal/trimline/purple/filled/line,
/obj/machinery/firealarm/directional/south,
@@ -13462,12 +13480,6 @@
/obj/machinery/light/directional/south,
/turf/open/floor/iron,
/area/station/security/prison)
-"dCY" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"dDi" = (
/obj/effect/turf_decal/trimline/yellow/filled/corner{
dir = 4
@@ -14005,23 +14017,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"dMQ" = (
-/obj/effect/turf_decal/siding/thinplating{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/dark_red/warning{
- dir = 4
- },
-/obj/structure/railing{
- dir = 4
- },
-/obj/structure/industrial_lift/public,
-/obj/machinery/elevator_control_panel/directional/east{
- linked_elevator_id = "tram_lower_center_lift";
- preset_destination_names = list("2"="Lower Deck","3"="Upper Deck")
- },
-/turf/open/floor/plating/elevatorshaft,
-/area/station/maintenance/tram/mid)
"dNa" = (
/obj/machinery/bookbinder,
/obj/machinery/newscaster/directional/north,
@@ -15476,14 +15471,6 @@
},
/turf/open/floor/iron/grimy,
/area/station/service/chapel/office)
-"epQ" = (
-/obj/machinery/computer/atmos_control/oxygen_tank{
- atmos_chambers = list("o2ordance"="Oxygen Supply")
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/storage)
"eqi" = (
/obj/effect/landmark/navigate_destination/tcomms,
/turf/open/floor/iron,
@@ -15593,6 +15580,11 @@
/mob/living/simple_animal/bot/cleanbot,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"esr" = (
+/obj/machinery/netpod,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/bitrunning/den)
"esA" = (
/obj/machinery/iv_drip,
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -15709,6 +15701,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood,
/area/station/service/theater)
+"euR" = (
+/turf/closed/wall,
+/area/station/bitrunning/den)
"euS" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -16325,6 +16320,15 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
+"eGU" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/navbeacon{
+ codes_txt = "delivery;dir=1";
+ location = "QM #4"
+ },
+/obj/effect/turf_decal/tile/brown/fourcorners,
+/turf/open/floor/iron,
+/area/station/cargo/warehouse)
"eHj" = (
/obj/machinery/vending/tool,
/obj/machinery/airalarm/directional/east,
@@ -17641,15 +17645,6 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/science/lower)
-"fiy" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/navbeacon{
- codes_txt = "delivery;dir=1";
- location = "QM #5"
- },
-/obj/effect/turf_decal/tile/brown/fourcorners,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"fiP" = (
/obj/structure/table,
/obj/item/storage/toolbox/electrical{
@@ -18026,6 +18021,21 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/science/ordnance)
+"foU" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
+"foV" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/navbeacon{
+ codes_txt = "delivery;dir=1";
+ location = "QM #5"
+ },
+/obj/effect/turf_decal/tile/brown/fourcorners,
+/turf/open/floor/iron,
+/area/station/cargo/warehouse)
"foY" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -18662,6 +18672,15 @@
/obj/machinery/light/warm/directional/west,
/turf/open/floor/iron,
/area/station/cargo/miningdock/cafeteria)
+"fDd" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 8
+ },
+/obj/structure/chair{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"fDg" = (
/obj/structure/table,
/obj/item/clothing/gloves/boxing,
@@ -19295,6 +19314,19 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/freezer,
/area/station/commons/toilet)
+"fNG" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/navbeacon{
+ codes_txt = "delivery;dir=2";
+ location = "QM #1"
+ },
+/obj/effect/turf_decal/tile/brown/fourcorners,
+/mob/living/simple_animal/bot/mulebot{
+ home_destination = "QM #1";
+ suffix = "#1"
+ },
+/turf/open/floor/iron,
+/area/station/cargo/warehouse)
"fNR" = (
/obj/structure/closet/lasertag/blue,
/obj/effect/landmark/start/hangover/closet,
@@ -19695,6 +19727,14 @@
},
/turf/open/floor/iron/dark,
/area/station/security/processing)
+"fWK" = (
+/obj/machinery/computer/atmos_control/oxygen_tank{
+ atmos_chambers = list("o2ordance"="Oxygen Supply")
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/storage)
"fWM" = (
/obj/effect/turf_decal/trimline/red/filled/line,
/obj/item/kirbyplants/random,
@@ -20253,6 +20293,20 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/tram/right)
+"giW" = (
+/obj/effect/turf_decal/trimline/dark_red/warning{
+ dir = 9
+ },
+/obj/structure/industrial_lift/public,
+/obj/structure/railing{
+ dir = 9
+ },
+/obj/machinery/elevator_control_panel/directional/west{
+ linked_elevator_id = "tram_sci_lift";
+ preset_destination_names = list("2"="Lower Deck","3"="Upper Deck")
+ },
+/turf/open/floor/plating/elevatorshaft,
+/area/station/science/lower)
"giZ" = (
/obj/structure/bed,
/obj/effect/spawner/random/contraband/prison,
@@ -20878,19 +20932,6 @@
/obj/effect/turf_decal/trimline/red/filled/corner,
/turf/open/floor/iron,
/area/station/security/courtroom)
-"gtA" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/navbeacon{
- codes_txt = "delivery;dir=2";
- location = "QM #1"
- },
-/obj/effect/turf_decal/tile/brown/fourcorners,
-/mob/living/simple_animal/bot/mulebot{
- home_destination = "QM #1";
- suffix = "#1"
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"gtH" = (
/obj/structure/table/glass,
/obj/effect/turf_decal/trimline/red/filled/line{
@@ -21974,15 +22015,6 @@
/obj/item/papercutter,
/turf/open/floor/plating,
/area/station/security/warden)
-"gNM" = (
-/obj/machinery/elevator_control_panel{
- layer = 3.1;
- linked_elevator_id = "tram_xeno_lift";
- pixel_y = 2;
- preset_destination_names = list("2"="Lower Deck","3"="Upper Deck")
- },
-/turf/closed/wall/r_wall,
-/area/station/science/xenobiology)
"gNN" = (
/obj/machinery/vending/wardrobe/coroner_wardrobe,
/obj/structure/window/reinforced/spawner/directional/west,
@@ -22364,6 +22396,13 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/break_room)
+"gUL" = (
+/obj/effect/landmark/event_spawn,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"gUO" = (
/obj/effect/turf_decal/trimline/neutral/filled/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -22610,6 +22649,15 @@
},
/turf/open/floor/iron,
/area/station/command/teleporter)
+"haq" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"hay" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -23948,6 +23996,12 @@
},
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
+"hDU" = (
+/obj/effect/turf_decal/siding/thinplating/corner{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"hDZ" = (
/obj/effect/turf_decal/sand/plating,
/obj/effect/turf_decal/box,
@@ -24720,13 +24774,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
-"hSy" = (
-/obj/effect/turf_decal/siding/thinplating/corner{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"hSH" = (
/obj/structure/chair{
dir = 1
@@ -24739,6 +24786,19 @@
/obj/machinery/telecomms/server/presets/command,
/turf/open/floor/iron/dark/telecomms,
/area/station/tcommsat/server)
+"hSM" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/navbeacon{
+ codes_txt = "delivery;dir=1";
+ location = "QM #6"
+ },
+/obj/effect/turf_decal/tile/brown/fourcorners,
+/mob/living/simple_animal/bot/mulebot{
+ home_destination = "QM #6";
+ suffix = "#6"
+ },
+/turf/open/floor/iron,
+/area/station/cargo/warehouse)
"hTa" = (
/obj/effect/turf_decal/trimline/neutral/filled/line,
/turf/open/floor/iron,
@@ -25097,20 +25157,6 @@
},
/turf/open/floor/iron,
/area/station/tcommsat/computer)
-"hZM" = (
-/obj/effect/turf_decal/trimline/dark_red/warning{
- dir = 9
- },
-/obj/structure/industrial_lift/public,
-/obj/structure/railing{
- dir = 9
- },
-/obj/machinery/elevator_control_panel/directional/west{
- linked_elevator_id = "tram_sci_lift";
- preset_destination_names = list("2"="Lower Deck","3"="Upper Deck")
- },
-/turf/open/floor/plating/elevatorshaft,
-/area/station/science/lower)
"hZP" = (
/obj/structure/railing/corner{
dir = 8
@@ -28116,16 +28162,6 @@
/obj/structure/cable,
/turf/closed/wall/r_wall,
/area/station/ai_monitored/turret_protected/aisat/hallway)
-"jfE" = (
-/obj/effect/turf_decal/trimline/dark_red/warning,
-/obj/structure/industrial_lift/public,
-/obj/machinery/elevator_control_panel/directional/south{
- linked_elevator_id = "tram_dorm_lift";
- preset_destination_names = list("2"="Lower Deck","3"="Upper Deck")
- },
-/obj/structure/railing,
-/turf/open/floor/plating/elevatorshaft,
-/area/station/maintenance/tram/left)
"jfH" = (
/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 1
@@ -28622,6 +28658,14 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/supply)
+"jnL" = (
+/obj/structure/railing{
+ layer = 3.1;
+ dir = 4
+ },
+/obj/machinery/netpod,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/bitrunning/den)
"jnR" = (
/obj/structure/bed{
dir = 8
@@ -28836,20 +28880,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
-"jrl" = (
-/obj/effect/turf_decal/caution/stand_clear/red{
- dir = 1
- },
-/obj/structure/industrial_lift/public,
-/obj/structure/railing{
- dir = 8
- },
-/obj/machinery/elevator_control_panel/directional/west{
- linked_elevator_id = "tram_perma_lift";
- preset_destination_names = list("2"="Lower Deck","3"="Upper Deck")
- },
-/turf/open/floor/plating/elevatorshaft,
-/area/station/security/execution/transfer)
"jrI" = (
/obj/structure/disposalpipe/trunk/multiz{
dir = 4
@@ -29125,6 +29155,27 @@
/obj/machinery/light/directional/north,
/turf/open/floor/iron/showroomfloor,
/area/station/security/lockers)
+"jwP" = (
+/obj/effect/landmark/lift_id{
+ specific_lift_id = "tram_cargo_lift"
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/dark_red/warning{
+ dir = 8
+ },
+/obj/structure/industrial_lift/public,
+/obj/machinery/elevator_control_panel/directional/west{
+ linked_elevator_id = "tram_cargo_lift";
+ preset_destination_names = list("2"="Lower Deck","3"="Upper Deck");
+ req_access = list("mining")
+ },
+/obj/effect/abstract/elevator_music_zone{
+ linked_elevator_id = "tram_cargo_lift"
+ },
+/turf/open/floor/plating/elevatorshaft,
+/area/station/cargo/miningdock)
"jwT" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -30365,6 +30416,14 @@
},
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
+"jTQ" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/start/bitrunner,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"jUa" = (
/obj/effect/turf_decal/trimline/purple/filled/corner{
dir = 4
@@ -32125,6 +32184,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office)
+"kyw" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/navbeacon{
+ codes_txt = "delivery;dir=2";
+ location = "QM #3"
+ },
+/obj/effect/turf_decal/tile/brown/fourcorners,
+/mob/living/simple_animal/bot/mulebot{
+ home_destination = "QM #3";
+ suffix = "#3"
+ },
+/turf/open/floor/iron,
+/area/station/cargo/warehouse)
"kyF" = (
/obj/structure/table,
/obj/item/storage/backpack/duffelbag/sec{
@@ -33524,14 +33596,6 @@
/obj/effect/turf_decal/trimline/neutral/filled/corner,
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
-"kVQ" = (
-/obj/structure/table/glass,
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 1
- },
-/obj/machinery/light/cold/directional/north,
-/turf/open/floor/iron/white,
-/area/station/security/medical)
"kVV" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -34960,6 +35024,20 @@
/obj/effect/turf_decal/tile/red/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/office)
+"lvz" = (
+/obj/effect/turf_decal/caution/stand_clear/red{
+ dir = 1
+ },
+/obj/structure/industrial_lift/public,
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/machinery/elevator_control_panel/directional/west{
+ linked_elevator_id = "tram_perma_lift";
+ preset_destination_names = list("2"="Lower Deck","3"="Upper Deck")
+ },
+/turf/open/floor/plating/elevatorshaft,
+/area/station/security/execution/transfer)
"lvH" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
@@ -36305,6 +36383,27 @@
},
/turf/open/floor/iron,
/area/station/security/prison/safe)
+"lTM" = (
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/brown/filled/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 1
+ },
+/obj/effect/turf_decal/loading_area{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"lTP" = (
/obj/structure/stairs/south,
/turf/open/floor/iron/stairs/medium{
@@ -37427,6 +37526,15 @@
/obj/machinery/meter,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"mmX" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/machinery/light/dim/directional/north,
+/turf/open/floor/iron,
+/area/station/cargo/warehouse)
"mng" = (
/obj/structure/window/reinforced/plasma/spawner/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
@@ -37623,6 +37731,27 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/storage)
+"mrg" = (
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/effect/turf_decal/stripes,
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/cup/glass/mug/coco{
+ pixel_x = -7;
+ pixel_y = 7
+ },
+/obj/item/reagent_containers/cup/glass/mug/coco{
+ pixel_x = -6;
+ pixel_y = -1
+ },
+/obj/item/folder/yellow{
+ pixel_x = 5;
+ pixel_y = 3
+ },
+/obj/item/pen{
+ pixel_x = 6
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"mrr" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/trimline/neutral/filled/line,
@@ -38454,6 +38583,15 @@
/obj/effect/decal/cleanable/blood/old,
/turf/open/misc/asteroid/airless,
/area/station/asteroid)
+"mHT" = (
+/obj/structure/table/glass,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 1
+ },
+/obj/machinery/light/cold/directional/north,
+/obj/item/storage/box/bandages,
+/turf/open/floor/iron/white,
+/area/station/security/medical)
"mHX" = (
/obj/effect/turf_decal/trimline/dark_blue/arrow_cw{
dir = 10
@@ -38993,6 +39131,20 @@
/obj/item/storage/secure/safe/directional/north,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/hop)
+"mUc" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/machinery/elevator_control_panel/directional/north{
+ linked_elevator_id = "tram_upper_center_lift";
+ preset_destination_names = list("2"="Lower Deck","3"="Upper Deck")
+ },
+/obj/effect/turf_decal/trimline/dark_red/warning{
+ dir = 1
+ },
+/obj/structure/industrial_lift/public,
+/turf/open/floor/plating/elevatorshaft,
+/area/station/maintenance/tram/mid)
"mUd" = (
/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output{
dir = 1
@@ -39339,6 +39491,24 @@
/obj/effect/turf_decal/trimline/tram/filled/warning,
/turf/open/floor/iron,
/area/station/hallway/primary/tram/right)
+"nbB" = (
+/obj/structure/table,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 10
+ },
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/obj/item/storage/box/bandages{
+ pixel_y = 6;
+ pixel_x = -6
+ },
+/obj/item/storage/box/bodybags{
+ pixel_x = 3;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/syringe,
+/turf/open/floor/iron/white,
+/area/station/medical/medbay/lobby)
"nbF" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
@@ -39564,6 +39734,16 @@
},
/turf/open/floor/iron,
/area/station/maintenance/tram/right)
+"nfZ" = (
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/effect/turf_decal/stripes,
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"ngg" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
/obj/effect/spawner/structure/window/reinforced,
@@ -40524,6 +40704,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/tram/left)
+"nvF" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/bitrunning/den)
"nvH" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 4
@@ -40620,27 +40804,6 @@
},
/turf/open/openspace,
/area/station/hallway/primary/tram/center)
-"nxj" = (
-/obj/effect/landmark/lift_id{
- specific_lift_id = "tram_cargo_lift"
- },
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/dark_red/warning{
- dir = 8
- },
-/obj/structure/industrial_lift/public,
-/obj/machinery/elevator_control_panel/directional/west{
- linked_elevator_id = "tram_cargo_lift";
- preset_destination_names = list("2"="Lower Deck","3"="Upper Deck");
- req_access = list("mining")
- },
-/obj/effect/abstract/elevator_music_zone{
- linked_elevator_id = "tram_cargo_lift"
- },
-/turf/open/floor/plating/elevatorshaft,
-/area/station/cargo/miningdock)
"nxq" = (
/obj/structure/table/wood,
/obj/structure/cable,
@@ -41231,20 +41394,6 @@
/obj/structure/chair,
/turf/open/floor/iron,
/area/station/security/checkpoint/supply)
-"nJb" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/machinery/elevator_control_panel/directional/north{
- linked_elevator_id = "tram_upper_center_lift";
- preset_destination_names = list("2"="Lower Deck","3"="Upper Deck")
- },
-/obj/effect/turf_decal/trimline/dark_red/warning{
- dir = 1
- },
-/obj/structure/industrial_lift/public,
-/turf/open/floor/plating/elevatorshaft,
-/area/station/maintenance/tram/mid)
"nJd" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 5
@@ -41897,6 +42046,17 @@
/obj/effect/turf_decal/trimline/purple/filled/line,
/turf/open/floor/iron/white,
/area/station/science/lobby)
+"nUF" = (
+/obj/effect/turf_decal/box/corners,
+/obj/effect/turf_decal/box/corners{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/effect/landmark/bitrunning/station_reward_spawn,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/bitrunning/den)
"nUM" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -42047,6 +42207,12 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
+"nXk" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"nXn" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -42959,6 +43125,13 @@
},
/turf/open/floor/engine,
/area/station/engineering/supermatter)
+"ooe" = (
+/obj/machinery/computer/quantum_console{
+ dir = 1
+ },
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/dark/smooth_corner,
+/area/station/bitrunning/den)
"oog" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -43516,6 +43689,19 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/catwalk_floor,
/area/station/solars/starboard/fore)
+"oAi" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 8
+ },
+/obj/machinery/door/airlock/mining/glass{
+ name = "MULE Storage"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/supply/general,
+/turf/open/floor/iron,
+/area/station/cargo/warehouse)
"oAn" = (
/obj/machinery/airlock_sensor/incinerator_ordmix{
pixel_x = 23;
@@ -43900,6 +44086,15 @@
/obj/structure/grille,
/turf/open/space/openspace,
/area/space/nearstation)
+"oKn" = (
+/obj/machinery/elevator_control_panel{
+ layer = 3.1;
+ linked_elevator_id = "tram_xeno_lift";
+ pixel_y = 2;
+ preset_destination_names = list("2"="Lower Deck","3"="Upper Deck")
+ },
+/turf/closed/wall/r_wall,
+/area/station/science/xenobiology)
"oKZ" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -44050,6 +44245,15 @@
},
/turf/open/space/openspace,
/area/station/solars/port)
+"oOP" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/cargo/warehouse)
"oOT" = (
/obj/structure/table/wood,
/obj/item/food/grown/poppy{
@@ -44722,6 +44926,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
+"pcI" = (
+/obj/machinery/quantum_server,
+/obj/effect/turf_decal/bot/left,
+/turf/open/floor/iron/dark/smooth_corner{
+ dir = 4
+ },
+/area/station/bitrunning/den)
"pcO" = (
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -45211,6 +45422,20 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/commons/vacant_room)
+"plH" = (
+/obj/effect/turf_decal/box/corners{
+ dir = 8
+ },
+/obj/effect/turf_decal/box/corners{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/oil/streak,
+/obj/structure/sign/poster/random/directional/north,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/obj/effect/landmark/bitrunning/station_reward_spawn,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/bitrunning/den)
"plQ" = (
/obj/effect/turf_decal/trimline/red/filled/corner,
/obj/structure/disposalpipe/segment{
@@ -45763,6 +45988,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/courtroom/holding)
+"puo" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 8
+ },
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/iron,
+/area/station/cargo/warehouse)
"pur" = (
/obj/effect/turf_decal/trimline/white/line{
dir = 9
@@ -46126,19 +46361,6 @@
/obj/effect/turf_decal/tile/bar/opposingcorners,
/turf/open/floor/iron,
/area/station/cargo/miningdock/cafeteria)
-"pzi" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/navbeacon{
- codes_txt = "delivery;dir=1";
- location = "QM #6"
- },
-/obj/effect/turf_decal/tile/brown/fourcorners,
-/mob/living/simple_animal/bot/mulebot{
- home_destination = "QM #6";
- suffix = "#6"
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"pzv" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
@@ -47051,6 +47273,13 @@
/obj/structure/railing,
/turf/open/floor/plating/elevatorshaft,
/area/station/maintenance/tram/left)
+"pOL" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/station/cargo/warehouse)
"pOQ" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 4
@@ -47788,14 +48017,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation/entertainment)
-"qey" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/brown/filled/line,
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"qez" = (
/obj/machinery/computer/slot_machine{
pixel_y = 2
@@ -49706,15 +49927,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/dorms)
-"qPL" = (
-/obj/machinery/elevator_control_panel{
- layer = 3.1;
- linked_elevator_id = "tram_xeno_lift";
- pixel_y = 2;
- preset_destination_names = list("2"="Lower Deck","3"="Upper Deck")
- },
-/turf/closed/wall,
-/area/station/science/xenobiology)
"qPV" = (
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
@@ -51381,10 +51593,6 @@
/obj/effect/turf_decal/stripes/white/line,
/turf/open/floor/iron,
/area/station/hallway/primary/tram/center)
-"rqH" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"rre" = (
/obj/effect/turf_decal/trimline/neutral/filled/line,
/obj/effect/landmark/start/hangover,
@@ -51607,6 +51815,18 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating/airless,
/area/station/asteroid)
+"rwo" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 8
+ },
+/obj/machinery/computer/order_console/bitrunning{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"rws" = (
/obj/structure/table/glass,
/obj/item/storage/box/monkeycubes{
@@ -51996,6 +52216,19 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron/dark,
/area/station/engineering/supermatter/room)
+"rEX" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/navbeacon{
+ codes_txt = "delivery;dir=2";
+ location = "QM #2"
+ },
+/obj/effect/turf_decal/tile/brown/fourcorners,
+/mob/living/simple_animal/bot/mulebot{
+ home_destination = "QM #2";
+ suffix = "#2"
+ },
+/turf/open/floor/iron,
+/area/station/cargo/warehouse)
"rFW" = (
/obj/effect/turf_decal/delivery/white,
/obj/structure/holosign/barrier/atmos/tram,
@@ -57006,6 +57239,12 @@
/obj/structure/cable,
/turf/open/floor/iron/freezer,
/area/station/security/prison/shower)
+"tte" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"tth" = (
/obj/effect/landmark/event_spawn,
/obj/structure/cable,
@@ -57225,20 +57464,6 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/science/breakroom)
-"twW" = (
-/obj/structure/table,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 10
- },
-/obj/item/storage/box/bodybags{
- pixel_x = 3;
- pixel_y = 2
- },
-/obj/item/reagent_containers/syringe,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/lobby)
"txh" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -58098,19 +58323,6 @@
/obj/effect/landmark/start/chemist,
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
-"tMq" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/navbeacon{
- codes_txt = "delivery;dir=2";
- location = "QM #3"
- },
-/obj/effect/turf_decal/tile/brown/fourcorners,
-/mob/living/simple_animal/bot/mulebot{
- home_destination = "QM #3";
- suffix = "#3"
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"tMw" = (
/obj/effect/turf_decal/trimline/purple/filled/corner{
dir = 1
@@ -59752,15 +59964,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/maintenance/tram/mid)
-"uoG" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/navbeacon{
- codes_txt = "delivery;dir=1";
- location = "QM #4"
- },
-/obj/effect/turf_decal/tile/brown/fourcorners,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"uoJ" = (
/obj/structure/closet/secure_closet/security/science,
/obj/item/clothing/mask/whistle,
@@ -60074,6 +60277,23 @@
/obj/effect/spawner/random/maintenance/five,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
+"uud" = (
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/dark_red/warning{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/industrial_lift/public,
+/obj/machinery/elevator_control_panel/directional/east{
+ linked_elevator_id = "tram_lower_center_lift";
+ preset_destination_names = list("2"="Lower Deck","3"="Upper Deck")
+ },
+/turf/open/floor/plating/elevatorshaft,
+/area/station/maintenance/tram/mid)
"uue" = (
/obj/machinery/power/turbine/turbine_outlet{
dir = 4
@@ -60140,12 +60360,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/commons/fitness)
-"uvt" = (
-/obj/machinery/cryo_cell{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/medical/treatment_center)
"uvu" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
@@ -61603,6 +61817,16 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/checkpoint/arrivals)
+"uSl" = (
+/obj/effect/turf_decal/trimline/dark_red/warning,
+/obj/structure/industrial_lift/public,
+/obj/machinery/elevator_control_panel/directional/south{
+ linked_elevator_id = "tram_dorm_lift";
+ preset_destination_names = list("2"="Lower Deck","3"="Upper Deck")
+ },
+/obj/structure/railing,
+/turf/open/floor/plating/elevatorshaft,
+/area/station/maintenance/tram/left)
"uSL" = (
/obj/effect/turf_decal/delivery/white,
/obj/structure/fluff/tram_rail/floor,
@@ -64051,15 +64275,6 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/science/ordnance)
-"vJS" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"vKd" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -64257,17 +64472,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/checkpoint/supply)
-"vNx" = (
-/obj/machinery/door/airlock/mining/glass{
- name = "MULE Storage"
- },
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/brown/filled/line,
-/obj/effect/mapping_helpers/airlock/access/all/supply/general,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"vNB" = (
/obj/effect/turf_decal/box,
/obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -65049,15 +65253,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
-"wcZ" = (
-/obj/effect/turf_decal/trimline/neutral/filled/line{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/machinery/light/dim/directional/north,
-/turf/open/floor/iron,
-/area/station/cargo/warehouse)
"wda" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 8
@@ -65089,6 +65284,16 @@
/obj/structure/sign/calendar/directional/east,
/turf/open/floor/iron/cafeteria,
/area/station/science/breakroom)
+"wdw" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"wdC" = (
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating,
@@ -65595,10 +65800,6 @@
},
/turf/open/floor/iron/dark,
/area/station/service/chapel/monastery)
-"wod" = (
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"wop" = (
/obj/structure/industrial_lift/public,
/obj/effect/turf_decal/caution/stand_clear/red,
@@ -67138,19 +67339,6 @@
/obj/structure/sink/directional/south,
/turf/open/floor/iron/white,
/area/station/medical/virology)
-"wTp" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/navbeacon{
- codes_txt = "delivery;dir=2";
- location = "QM #2"
- },
-/obj/effect/turf_decal/tile/brown/fourcorners,
-/mob/living/simple_animal/bot/mulebot{
- home_destination = "QM #2";
- suffix = "#2"
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"wTy" = (
/obj/machinery/button/crematorium{
id = "crematoriumChapel";
@@ -67185,6 +67373,11 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/atmos/pumproom)
+"wUA" = (
+/obj/machinery/netpod,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/bitrunning/den)
"wUL" = (
/obj/machinery/status_display/evac/directional/north,
/obj/machinery/fax{
@@ -67757,13 +67950,6 @@
/obj/item/papercutter,
/turf/open/floor/iron,
/area/station/command/bridge)
-"xhg" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/neutral/filled/line{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/warehouse)
"xhk" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 4
@@ -68407,13 +68593,6 @@
},
/turf/open/floor/iron,
/area/station/security/brig)
-"xup" = (
-/obj/effect/turf_decal/siding/thinplating{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"xuq" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
@@ -68874,6 +69053,20 @@
"xDQ" = (
/turf/closed/wall,
/area/station/security/processing)
+"xDW" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/airlock/mining/glass{
+ name = "Bitrunning Den"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den,
+/turf/open/floor/iron,
+/area/station/bitrunning/den)
"xDY" = (
/obj/structure/railing{
dir = 8
@@ -69428,6 +69621,17 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/supply)
+"xPI" = (
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/effect/turf_decal/stripes,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/effect/decal/cleanable/oil/streak,
+/obj/effect/landmark/start/bitrunner,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/bitrunning/den)
"xPN" = (
/obj/structure/closet/lasertag/blue,
/obj/effect/turf_decal/tile/blue/full,
@@ -86188,7 +86392,7 @@ jWs
lDo
ucA
wox
-jrl
+lvz
gTv
jWs
aaa
@@ -92395,7 +92599,7 @@ ncF
ncF
dFS
tuU
-jfE
+uSl
elr
elr
elr
@@ -99830,7 +100034,7 @@ uTz
hJM
nAa
ekB
-nJb
+mUc
jSV
uuD
qjU
@@ -104474,7 +104678,7 @@ qjU
aaa
qjU
fok
-dMQ
+uud
sNq
ceb
pcx
@@ -113438,7 +113642,7 @@ aaa
aaa
uGW
jdU
-nxj
+jwP
rff
uGW
aaa
@@ -113736,7 +113940,7 @@ abM
abM
abM
iix
-hZM
+giW
boW
iix
abM
@@ -116330,7 +116534,7 @@ hDT
keT
iEF
fof
-qPL
+csn
sXX
akC
hFP
@@ -120937,7 +121141,7 @@ kkK
jXE
lwF
dfz
-epQ
+fWK
qCP
urA
ygC
@@ -150948,7 +151152,7 @@ aBK
dkO
dta
mjM
-kVQ
+mHT
vRy
gbr
kMR
@@ -167442,7 +167646,7 @@ kiN
xJA
gHh
cen
-twW
+nbB
iZh
dyI
tDP
@@ -167456,9 +167660,9 @@ pIk
oIU
aMG
xdx
-uvt
+cEy
uVW
-uvt
+cEy
jtr
dSZ
aOO
@@ -178711,10 +178915,10 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
+euR
+euR
+euR
+euR
cTU
cTU
cTU
@@ -178968,10 +179172,10 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-aaa
+euR
+wUA
+xPI
+ooe
cTU
vSI
vSI
@@ -179224,11 +179428,11 @@ aac
aaa
aaa
aaa
-cTU
-cTU
-cTU
-cTU
-cTU
+aaa
+euR
+esr
+cfC
+pcI
cTU
vSI
vSI
@@ -179481,10 +179685,10 @@ aaa
aaa
aaa
aaa
-cTU
-tMq
-qey
-pzi
+euR
+euR
+jnL
+abN
cTU
cTU
ohS
@@ -179738,10 +179942,10 @@ aac
aaa
aaa
aaa
-cTU
-wTp
-aVM
-fiy
+euR
+plH
+wdw
+nfZ
cTU
exr
pZA
@@ -179995,10 +180199,10 @@ aac
aac
aaa
aaa
-cTU
-gtA
-aVM
-uoG
+euR
+nUF
+jTQ
+mrg
cTU
lan
pZA
@@ -180252,10 +180456,10 @@ aac
aaa
aaa
cTU
-cTU
-ohS
-vNx
-ohS
+euR
+nvF
+xDW
+nvF
cTU
nnb
pZA
@@ -180511,10 +180715,10 @@ aaa
cTU
blx
tAJ
-aWQ
-dCY
-dCY
-vJS
+lTM
+axF
+fDd
+rwo
dij
uax
uax
@@ -180768,13 +180972,13 @@ aaa
akr
tjS
hFV
-gDr
-uax
-uax
-uax
-uax
-aZT
-wod
+haq
+dzw
+dzw
+dzw
+dzw
+gUL
+foU
dzw
msn
qza
@@ -181029,9 +181233,9 @@ uax
uax
uax
uax
-rqH
-xup
-hSy
+tte
+nXk
+hDU
dzw
sxR
skb
@@ -181612,7 +181816,7 @@ eJQ
bNx
aSt
aSt
-gNM
+oKn
aaa
aaa
aaa
@@ -183335,12 +183539,12 @@ aac
aac
aac
aac
-cTU
-cTU
-cTU
-cTU
udQ
-xhg
+udQ
+udQ
+udQ
+udQ
+mmX
pxD
ayd
ayt
@@ -183592,10 +183796,10 @@ aac
aac
aac
aac
-aac
-aac
-aaa
-aaa
+udQ
+hSM
+foV
+eGU
udQ
fBJ
pxD
@@ -183849,12 +184053,12 @@ aac
aac
aac
aac
-aac
-aaa
-aaa
-aaa
udQ
-wcZ
+puo
+oOP
+oOP
+oAi
+pOL
kXr
aye
rgg
@@ -184106,10 +184310,10 @@ aac
aac
aac
aac
-aaa
-aaa
-aaa
-aaa
+udQ
+rEX
+kyw
+fNG
udQ
kSa
cDP
@@ -184363,10 +184567,10 @@ aac
aac
aac
aac
-aac
-aaa
-aaa
-aaa
+udQ
+udQ
+udQ
+udQ
udQ
aWL
tft
diff --git a/_maps/safehouses/README.md b/_maps/safehouses/README.md
new file mode 100644
index 00000000000..8027ea38e21
--- /dev/null
+++ b/_maps/safehouses/README.md
@@ -0,0 +1,17 @@
+# Safe House
+
+## Creating a new safe house
+
+1. Create a new map inside the `_maps\safe_houses` folder using the TGM format.
+2. Create a new dm file inside `modules\bitrunning\virtual_domain\safe_houses` folder..
+4. Place exit and goal landmarks (obj/effect/landmark/bitrunning/..). Generally, 3 exits and 2 goals are ok.
+5. Ideally, leave 3 spaces for gear. This has usually been xy [1x1] [1x2] [1x3]
+
+## Notes
+
+- Safe houses are intended to be 7x6 in size. You're not technically limited to this, but consider maps other maps might be using this size if you want it to be modular.
+- Consider that avatars are not invincible and still require air. If you're making a safe house, it should start with an area that accommodates for this.
+- For compatibility, your safe house should have a route open from the top center xy [3x0] of the map.
+- If you want a custom safehouse for a custom map with no modularity, no problem. Make whatever sizes you want, just ensure there are exit and goal effects placed.
+- Some maps can alter what is spawned into the safehouse by placing objects in the safehouse area. I'm using the left corner, starting from the top, for things like space gear.
+
diff --git a/_maps/safehouses/TEMPLATES/TEMPLATE.dmm b/_maps/safehouses/TEMPLATES/TEMPLATE.dmm
new file mode 100644
index 00000000000..c8e5059f0d0
--- /dev/null
+++ b/_maps/safehouses/TEMPLATES/TEMPLATE.dmm
@@ -0,0 +1,82 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"c" = (
+/obj/effect/mapping_helpers/airlock/access/all,
+/obj/machinery/door/airlock/external/glass,
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"p" = (
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"v" = (
+/obj/effect/bitrunning/exit_spawn,
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"N" = (
+/obj/effect/bitrunning/goal_turf,
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"R" = (
+/turf/closed/wall,
+/area/virtual_domain/safehouse)
+
+(1,1,1) = {"
+R
+R
+a
+a
+R
+R
+"}
+(2,1,1) = {"
+a
+p
+p
+p
+p
+R
+"}
+(3,1,1) = {"
+R
+p
+p
+p
+v
+a
+"}
+(4,1,1) = {"
+c
+p
+p
+p
+v
+R
+"}
+(5,1,1) = {"
+R
+p
+p
+p
+v
+a
+"}
+(6,1,1) = {"
+a
+p
+N
+N
+p
+R
+"}
+(7,1,1) = {"
+R
+R
+a
+a
+R
+R
+"}
diff --git a/_maps/safehouses/den.dmm b/_maps/safehouses/den.dmm
new file mode 100644
index 00000000000..235d786d6e9
--- /dev/null
+++ b/_maps/safehouses/den.dmm
@@ -0,0 +1,224 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/structure/chair/office{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/pod,
+/area/virtual_domain/safehouse)
+"c" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/small/directional/east,
+/obj/effect/landmark/bitrunning/cache_goal_turf,
+/obj/effect/turf_decal/loading_area{
+ dir = 4
+ },
+/turf/open/floor/bitrunning_transport,
+/area/virtual_domain/safehouse)
+"e" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/effect/spawner/random/food_or_drink/snack{
+ pixel_x = 4;
+ pixel_y = 2
+ },
+/turf/open/floor/pod/dark,
+/area/virtual_domain/safehouse)
+"i" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 1;
+ id = "safehouseshutter"
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"l" = (
+/obj/structure/railing/corner/end{
+ dir = 4
+ },
+/turf/open/floor/pod/dark,
+/area/virtual_domain/safehouse)
+"p" = (
+/turf/open/floor/pod,
+/area/virtual_domain/safehouse)
+"r" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 9
+ },
+/turf/open/floor/pod/dark,
+/area/virtual_domain/safehouse)
+"u" = (
+/obj/structure/railing,
+/obj/effect/turf_decal/siding/dark,
+/obj/structure/sign/poster/contraband/hacking_guide/directional/east,
+/obj/effect/landmark/bitrunning/cache_goal_turf,
+/obj/effect/turf_decal/loading_area{
+ dir = 4
+ },
+/turf/open/floor/bitrunning_transport,
+/area/virtual_domain/safehouse)
+"z" = (
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 4
+ },
+/obj/effect/landmark/bitrunning/hololadder_spawn,
+/turf/open/floor/pod/light,
+/area/virtual_domain/safehouse)
+"C" = (
+/turf/closed/wall,
+/area/virtual_domain/safehouse)
+"D" = (
+/obj/effect/decal/cleanable/generic,
+/obj/effect/turf_decal/trimline/yellow/warning{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 1
+ },
+/turf/open/floor/pod,
+/area/virtual_domain/safehouse)
+"E" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/generic,
+/obj/effect/landmark/bitrunning/hololadder_spawn,
+/turf/open/floor/pod/light,
+/area/virtual_domain/safehouse)
+"G" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 4;
+ id = "safehouseshutter"
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"I" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 5
+ },
+/obj/effect/landmark/bitrunning/hololadder_spawn,
+/turf/open/floor/pod/light,
+/area/virtual_domain/safehouse)
+"J" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 8;
+ id = "safehouseshutter"
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"K" = (
+/obj/effect/spawner/random/vending/colavend,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/pod,
+/area/virtual_domain/safehouse)
+"M" = (
+/turf/open/floor/pod/dark,
+/area/virtual_domain/safehouse)
+"O" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 8
+ },
+/turf/open/floor/pod/dark,
+/area/virtual_domain/safehouse)
+"R" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 4
+ },
+/turf/open/floor/pod/dark,
+/area/virtual_domain/safehouse)
+"U" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/sign/departments/cargo/directional/west,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/pod,
+/area/virtual_domain/safehouse)
+"W" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "safehouseshutter"
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"X" = (
+/obj/machinery/door/airlock/grunge,
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"Y" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/machinery/button/door{
+ pixel_x = 4;
+ pixel_y = 4;
+ id = "safehouseshutter"
+ },
+/obj/effect/spawner/random/food_or_drink/refreshing_beverage{
+ pixel_y = 6;
+ pixel_x = -10
+ },
+/turf/open/floor/pod/dark,
+/area/virtual_domain/safehouse)
+"Z" = (
+/obj/effect/turf_decal/trimline/yellow/warning{
+ dir = 4
+ },
+/turf/open/floor/pod/dark,
+/area/virtual_domain/safehouse)
+
+(1,1,1) = {"
+C
+C
+C
+G
+G
+C
+"}
+(2,1,1) = {"
+W
+U
+p
+M
+K
+C
+"}
+(3,1,1) = {"
+C
+r
+O
+O
+E
+i
+"}
+(4,1,1) = {"
+X
+D
+Z
+R
+z
+i
+"}
+(5,1,1) = {"
+C
+M
+l
+e
+I
+i
+"}
+(6,1,1) = {"
+W
+c
+u
+Y
+a
+C
+"}
+(7,1,1) = {"
+C
+C
+C
+J
+J
+C
+"}
diff --git a/_maps/safehouses/dig.dmm b/_maps/safehouses/dig.dmm
new file mode 100644
index 00000000000..7fbbd3e5549
--- /dev/null
+++ b/_maps/safehouses/dig.dmm
@@ -0,0 +1,165 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/effect/turf_decal/sand/plating,
+/obj/effect/turf_decal/siding/yellow/corner,
+/obj/effect/turf_decal/sand/plating,
+/obj/item/flashlight/glowstick{
+ on = 1
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"c" = (
+/obj/effect/turf_decal/siding/yellow/corner{
+ dir = 8
+ },
+/turf/open/misc/asteroid,
+/area/virtual_domain/safehouse)
+"h" = (
+/obj/effect/turf_decal/loading_area,
+/obj/effect/turf_decal/box/corners{
+ dir = 8
+ },
+/obj/effect/landmark/bitrunning/cache_goal_turf,
+/turf/open/floor/bitrunning_transport,
+/area/virtual_domain/safehouse)
+"i" = (
+/obj/effect/turf_decal/siding/yellow{
+ dir = 8
+ },
+/obj/effect/decal/remains/xeno/larva,
+/turf/open/misc/asteroid,
+/area/virtual_domain/safehouse)
+"l" = (
+/obj/structure/table,
+/obj/item/coin/gold{
+ pixel_x = -6;
+ pixel_y = 2
+ },
+/obj/item/flashlight/lantern{
+ pixel_y = 8;
+ pixel_x = 4;
+ on = 1
+ },
+/turf/open/misc/asteroid,
+/area/virtual_domain/safehouse)
+"o" = (
+/obj/effect/turf_decal/siding/yellow{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/misc/asteroid,
+/area/virtual_domain/safehouse)
+"u" = (
+/obj/effect/turf_decal/siding/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/yellow,
+/obj/effect/decal/cleanable/oil/streak,
+/turf/open/misc/asteroid,
+/area/virtual_domain/safehouse)
+"x" = (
+/obj/effect/turf_decal/sand/plating,
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"A" = (
+/turf/closed/wall/rock,
+/area/virtual_domain/safehouse)
+"B" = (
+/turf/open/misc/asteroid,
+/area/virtual_domain/safehouse)
+"H" = (
+/turf/closed/mineral/asteroid,
+/area/virtual_domain/safehouse)
+"I" = (
+/obj/machinery/door/airlock/maintenance/glass,
+/obj/structure/fans/tiny,
+/obj/effect/turf_decal/sand/plating,
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"M" = (
+/obj/effect/turf_decal/siding/yellow,
+/obj/effect/decal/remains/xeno,
+/turf/open/misc/asteroid,
+/area/virtual_domain/safehouse)
+"N" = (
+/obj/effect/turf_decal/sand/plating,
+/obj/effect/turf_decal/sand/plating,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"S" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/effect/turf_decal/loading_area,
+/obj/effect/turf_decal/box/corners,
+/obj/effect/landmark/bitrunning/cache_goal_turf,
+/turf/open/floor/bitrunning_transport,
+/area/virtual_domain/safehouse)
+"T" = (
+/obj/effect/landmark/bitrunning/hololadder_spawn,
+/turf/open/misc/asteroid,
+/area/virtual_domain/safehouse)
+"U" = (
+/obj/effect/turf_decal/siding/yellow{
+ dir = 8
+ },
+/turf/open/misc/asteroid,
+/area/virtual_domain/safehouse)
+
+(1,1,1) = {"
+H
+H
+A
+A
+H
+H
+"}
+(2,1,1) = {"
+A
+N
+x
+a
+H
+A
+"}
+(3,1,1) = {"
+A
+i
+U
+u
+h
+A
+"}
+(4,1,1) = {"
+I
+B
+B
+M
+S
+A
+"}
+(5,1,1) = {"
+A
+l
+B
+c
+o
+H
+"}
+(6,1,1) = {"
+A
+A
+T
+T
+T
+A
+"}
+(7,1,1) = {"
+H
+A
+H
+H
+A
+A
+"}
diff --git a/_maps/safehouses/ice.dmm b/_maps/safehouses/ice.dmm
new file mode 100644
index 00000000000..a8293f9502a
--- /dev/null
+++ b/_maps/safehouses/ice.dmm
@@ -0,0 +1,254 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/effect/spawner/structure/window/ice,
+/turf/open/floor/plating/snowed,
+/area/virtual_domain/safehouse)
+"c" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 6
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/small/directional/east,
+/obj/structure/chair/wood{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"f" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating/snowed,
+/area/virtual_domain/safehouse)
+"g" = (
+/obj/effect/spawner/structure/window/ice,
+/obj/structure/barricade/wooden/crude/snow,
+/turf/open/floor/plating/snowed,
+/area/virtual_domain/safehouse)
+"i" = (
+/turf/closed/wall/ice,
+/area/virtual_domain/safehouse)
+"m" = (
+/obj/effect/turf_decal/weather/snow/corner,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ dir = 1
+ },
+/obj/effect/landmark/bitrunning/hololadder_spawn,
+/turf/open/floor/pod,
+/area/virtual_domain/safehouse)
+"n" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/rack,
+/obj/item/grown/log,
+/obj/item/grown/log,
+/obj/item/grown/log,
+/obj/item/hatchet/wooden,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"o" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/landmark/bitrunning/cache_goal_turf,
+/obj/effect/turf_decal/loading_area{
+ dir = 4
+ },
+/turf/open/floor/bitrunning_transport,
+/area/virtual_domain/safehouse)
+"p" = (
+/obj/structure/railing,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/landmark/bitrunning/cache_goal_turf,
+/obj/effect/turf_decal/loading_area{
+ dir = 4
+ },
+/turf/open/floor/bitrunning_transport,
+/area/virtual_domain/safehouse)
+"u" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"v" = (
+/obj/effect/turf_decal/weather/snow/corner,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ dir = 5
+ },
+/obj/effect/landmark/bitrunning/hololadder_spawn,
+/turf/open/floor/pod,
+/area/virtual_domain/safehouse)
+"x" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/vending/coffee,
+/turf/open/floor/plating/snowed,
+/area/virtual_domain/safehouse)
+"z" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor/plating/snowed,
+/area/virtual_domain/safehouse)
+"A" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 4
+ },
+/obj/structure/railing/corner/end{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating/snowed,
+/area/virtual_domain/safehouse)
+"B" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating/snowed,
+/area/virtual_domain/safehouse)
+"C" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 1
+ },
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/coffee{
+ pixel_x = 7;
+ pixel_y = 13
+ },
+/obj/item/reagent_containers/cup/glass/coffee/no_lid{
+ pixel_x = -4;
+ pixel_y = 14
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"D" = (
+/obj/effect/turf_decal/weather/snow/corner,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/generic,
+/obj/effect/turf_decal/trimline/dark_blue/line{
+ dir = 9
+ },
+/obj/effect/landmark/bitrunning/hololadder_spawn,
+/turf/open/floor/pod,
+/area/virtual_domain/safehouse)
+"I" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"L" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 9
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/small/directional/west,
+/obj/machinery/smartfridge/drying_rack,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"O" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/door/airlock/freezer,
+/obj/structure/fans/tiny,
+/turf/open/floor/plating/snowed,
+/area/virtual_domain/safehouse)
+"S" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 5
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/table/wood,
+/obj/item/trash/chips{
+ pixel_x = 8;
+ pixel_y = 15
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"W" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/closet/crate/internals,
+/obj/item/tank/internals/oxygen,
+/obj/item/tank/internals/oxygen,
+/obj/item/tank/internals/oxygen,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/suit/hooded/wintercoat,
+/obj/item/clothing/suit/hooded/wintercoat,
+/obj/item/clothing/suit/hooded/wintercoat,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"Z" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 10
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+
+(1,1,1) = {"
+i
+i
+g
+a
+i
+i
+"}
+(2,1,1) = {"
+i
+L
+n
+W
+Z
+i
+"}
+(3,1,1) = {"
+a
+x
+u
+I
+D
+i
+"}
+(4,1,1) = {"
+O
+z
+B
+I
+m
+i
+"}
+(5,1,1) = {"
+a
+f
+A
+C
+v
+i
+"}
+(6,1,1) = {"
+i
+o
+p
+S
+c
+i
+"}
+(7,1,1) = {"
+i
+i
+g
+g
+i
+i
+"}
diff --git a/_maps/safehouses/lavaland_boss.dmm b/_maps/safehouses/lavaland_boss.dmm
new file mode 100644
index 00000000000..7482846e61f
--- /dev/null
+++ b/_maps/safehouses/lavaland_boss.dmm
@@ -0,0 +1,243 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/effect/landmark/bitrunning/hololadder_spawn,
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 1
+ },
+/area/virtual_domain/safehouse)
+"f" = (
+/turf/closed/wall,
+/area/virtual_domain/safehouse)
+"p" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 5
+ },
+/obj/structure/tank_dispenser/oxygen,
+/turf/open/floor/iron/dark,
+/area/virtual_domain/safehouse)
+"v" = (
+/obj/structure/table,
+/obj/item/borg/upgrade/modkit/damage{
+ pixel_x = 8;
+ pixel_y = 8
+ },
+/obj/item/borg/upgrade/modkit/damage{
+ pixel_y = 4;
+ pixel_x = 8
+ },
+/obj/item/borg/upgrade/modkit/damage{
+ pixel_x = 8
+ },
+/obj/item/borg/upgrade/modkit/range{
+ pixel_y = 8
+ },
+/obj/item/borg/upgrade/modkit/range{
+ pixel_y = 4
+ },
+/obj/item/borg/upgrade/modkit/range,
+/obj/item/borg/upgrade/modkit/cooldown{
+ pixel_x = -8;
+ pixel_y = 8
+ },
+/obj/item/borg/upgrade/modkit/cooldown{
+ pixel_x = -8;
+ pixel_y = 4
+ },
+/obj/item/borg/upgrade/modkit/cooldown{
+ pixel_x = -8
+ },
+/obj/item/reagent_containers/hypospray/medipen/survival/luxury{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/hypospray/medipen/survival/luxury{
+ pixel_x = 6
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/virtual_domain/safehouse)
+"w" = (
+/obj/effect/turf_decal/loading_area{
+ dir = 4
+ },
+/obj/machinery/light/directional/east,
+/obj/structure/railing,
+/obj/effect/landmark/bitrunning/cache_goal_turf,
+/turf/open/floor/bitrunning_transport,
+/area/virtual_domain/safehouse)
+"A" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/iron/dark/smooth_edge,
+/area/virtual_domain/safehouse)
+"B" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 10
+ },
+/obj/structure/table,
+/obj/item/flashlight/lantern{
+ pixel_x = 8;
+ pixel_y = null
+ },
+/obj/item/flashlight/lantern{
+ pixel_y = 4
+ },
+/obj/item/flashlight/lantern{
+ pixel_x = -8;
+ pixel_y = 8
+ },
+/obj/item/clothing/glasses/meson/night,
+/obj/item/clothing/glasses/meson/night,
+/obj/item/clothing/glasses/meson/night,
+/turf/open/floor/iron/dark,
+/area/virtual_domain/safehouse)
+"C" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 4
+ },
+/obj/structure/closet,
+/obj/item/gun/ballistic/rocketlauncher/unrestricted,
+/obj/item/ammo_casing/rocket,
+/obj/item/ammo_casing/rocket,
+/obj/item/ammo_casing/rocket,
+/obj/item/energy_katana,
+/obj/item/ammo_box/magazine/m7mm,
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 8
+ },
+/area/virtual_domain/safehouse)
+"H" = (
+/obj/machinery/door/airlock/external/glass{
+ name = "Mining External Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/access/all,
+/obj/structure/fans/tiny,
+/turf/open/floor/iron/dark/textured_large,
+/area/virtual_domain/safehouse)
+"K" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_edge,
+/area/virtual_domain/safehouse)
+"O" = (
+/obj/item/gun/energy/recharge/kinetic_accelerator{
+ pixel_x = -6;
+ pixel_y = 6
+ },
+/obj/item/gun/energy/recharge/kinetic_accelerator{
+ pixel_x = -1;
+ pixel_y = 1
+ },
+/obj/item/gun/energy/recharge/kinetic_accelerator{
+ pixel_x = 4;
+ pixel_y = -4
+ },
+/obj/structure/closet,
+/obj/item/kinetic_crusher,
+/obj/item/kinetic_crusher,
+/turf/open/floor/iron/dark/textured_large,
+/area/virtual_domain/safehouse)
+"P" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"S" = (
+/turf/open/floor/iron/dark/textured_large,
+/area/virtual_domain/safehouse)
+"T" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 6
+ },
+/obj/structure/sign/departments/cargo/directional/south,
+/obj/structure/closet,
+/obj/item/gun/ballistic/automatic/l6_saw/unrestricted,
+/obj/item/ammo_box/magazine/sniper_rounds,
+/obj/item/gun/ballistic/rifle/sniper_rifle,
+/turf/open/floor/iron/dark,
+/area/virtual_domain/safehouse)
+"X" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 8
+ },
+/obj/machinery/suit_storage_unit/mining,
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 4
+ },
+/area/virtual_domain/safehouse)
+"Y" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 8
+ },
+/obj/machinery/suit_storage_unit/mining,
+/obj/machinery/light/directional/west,
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 4
+ },
+/area/virtual_domain/safehouse)
+"Z" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 9
+ },
+/obj/machinery/suit_storage_unit/mining,
+/turf/open/floor/iron/dark,
+/area/virtual_domain/safehouse)
+
+(1,1,1) = {"
+f
+f
+f
+P
+P
+f
+"}
+(2,1,1) = {"
+P
+Z
+Y
+X
+B
+f
+"}
+(3,1,1) = {"
+f
+A
+S
+S
+a
+P
+"}
+(4,1,1) = {"
+H
+K
+O
+v
+a
+P
+"}
+(5,1,1) = {"
+f
+A
+S
+S
+a
+P
+"}
+(6,1,1) = {"
+P
+p
+w
+C
+T
+f
+"}
+(7,1,1) = {"
+f
+f
+f
+P
+P
+f
+"}
diff --git a/_maps/safehouses/mine.dmm b/_maps/safehouses/mine.dmm
new file mode 100644
index 00000000000..551e2ca0c00
--- /dev/null
+++ b/_maps/safehouses/mine.dmm
@@ -0,0 +1,164 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/effect/landmark/bitrunning/hololadder_spawn,
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 1
+ },
+/area/virtual_domain/safehouse)
+"f" = (
+/turf/closed/wall,
+/area/virtual_domain/safehouse)
+"p" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 5
+ },
+/obj/structure/tank_dispenser/oxygen,
+/turf/open/floor/iron/dark,
+/area/virtual_domain/safehouse)
+"w" = (
+/obj/effect/turf_decal/loading_area{
+ dir = 4
+ },
+/obj/machinery/light/directional/east,
+/obj/effect/landmark/bitrunning/cache_goal_turf,
+/turf/open/floor/bitrunning_transport,
+/area/virtual_domain/safehouse)
+"B" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 10
+ },
+/obj/structure/table,
+/obj/item/flashlight/lantern{
+ pixel_x = 8;
+ pixel_y = null
+ },
+/obj/item/flashlight/lantern{
+ pixel_y = 4
+ },
+/obj/item/flashlight/lantern{
+ pixel_x = -8;
+ pixel_y = 8
+ },
+/turf/open/floor/iron/dark,
+/area/virtual_domain/safehouse)
+"C" = (
+/obj/effect/turf_decal/loading_area{
+ dir = 4
+ },
+/obj/structure/railing,
+/obj/effect/landmark/bitrunning/cache_goal_turf,
+/turf/open/floor/bitrunning_transport,
+/area/virtual_domain/safehouse)
+"H" = (
+/obj/machinery/door/airlock/external/glass{
+ name = "Mining External Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/access/all,
+/obj/structure/fans/tiny,
+/turf/open/floor/iron/dark/textured_large,
+/area/virtual_domain/safehouse)
+"K" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_edge,
+/area/virtual_domain/safehouse)
+"P" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"S" = (
+/turf/open/floor/iron/dark/textured_large,
+/area/virtual_domain/safehouse)
+"T" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 6
+ },
+/obj/item/kirbyplants/random,
+/obj/structure/sign/departments/cargo/directional/south,
+/turf/open/floor/iron/dark,
+/area/virtual_domain/safehouse)
+"X" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 8
+ },
+/obj/machinery/suit_storage_unit/mining,
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 4
+ },
+/area/virtual_domain/safehouse)
+"Y" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 8
+ },
+/obj/machinery/suit_storage_unit/mining,
+/obj/machinery/light/directional/west,
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 4
+ },
+/area/virtual_domain/safehouse)
+"Z" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 9
+ },
+/obj/machinery/suit_storage_unit/mining,
+/turf/open/floor/iron/dark,
+/area/virtual_domain/safehouse)
+
+(1,1,1) = {"
+f
+f
+f
+P
+P
+f
+"}
+(2,1,1) = {"
+P
+Z
+Y
+X
+B
+f
+"}
+(3,1,1) = {"
+f
+K
+S
+S
+a
+P
+"}
+(4,1,1) = {"
+H
+K
+S
+S
+a
+P
+"}
+(5,1,1) = {"
+f
+K
+S
+S
+a
+P
+"}
+(6,1,1) = {"
+P
+p
+w
+C
+T
+f
+"}
+(7,1,1) = {"
+f
+f
+f
+P
+P
+f
+"}
diff --git a/_maps/safehouses/shuttle.dmm b/_maps/safehouses/shuttle.dmm
new file mode 100644
index 00000000000..92228c95bd3
--- /dev/null
+++ b/_maps/safehouses/shuttle.dmm
@@ -0,0 +1,228 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/titanium,
+/area/virtual_domain/safehouse)
+"e" = (
+/obj/effect/spawner/structure/window/reinforced/shuttle,
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"f" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"g" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/bitrunning/cache_goal_turf,
+/obj/effect/turf_decal/loading_area,
+/turf/open/floor/bitrunning_transport,
+/area/virtual_domain/safehouse)
+"i" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"k" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/obj/structure/table/reinforced,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/storage/toolbox/emergency,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"l" = (
+/obj/machinery/light/small/directional/south,
+/obj/effect/landmark/bitrunning/cache_goal_turf,
+/obj/effect/turf_decal/loading_area,
+/turf/open/floor/bitrunning_transport,
+/area/virtual_domain/safehouse)
+"q" = (
+/obj/effect/turf_decal/stripes/end,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"r" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"t" = (
+/obj/machinery/power/shuttle_engine/propulsion/burst{
+ dir = 8
+ },
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/plating/airless,
+/area/virtual_domain/safehouse)
+"u" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"x" = (
+/obj/effect/turf_decal/tile/neutral/half/contrasted,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/light/small/directional/north,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"y" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/door/airlock/shuttle/glass,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/sand/volcanic,
+/obj/structure/fans/tiny,
+/turf/open/floor/iron/white,
+/area/virtual_domain/safehouse)
+"A" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/computer{
+ dir = 8;
+ name = "shuttle console";
+ icon_screen = "shuttle"
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"E" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/effect/decal/cleanable/generic,
+/obj/effect/landmark/bitrunning/hololadder_spawn,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"G" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/machinery/light/small/directional/south,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/bitrunning/hololadder_spawn,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"H" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"I" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/structure/table/reinforced,
+/obj/item/tank/internals/emergency_oxygen{
+ pixel_x = 3
+ },
+/obj/item/clothing/mask/gas,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"L" = (
+/obj/effect/turf_decal/stripes/end{
+ dir = 1
+ },
+/obj/effect/turf_decal/sand/volcanic,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"M" = (
+/obj/effect/turf_decal/tile/neutral/half/contrasted,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/light/small/directional/north,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"T" = (
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/landmark/bitrunning/hololadder_spawn,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"X" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/chair/comfy/shuttle{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+
+(1,1,1) = {"
+a
+t
+e
+e
+t
+a
+"}
+(2,1,1) = {"
+e
+L
+i
+q
+l
+a
+"}
+(3,1,1) = {"
+a
+x
+r
+u
+g
+e
+"}
+(4,1,1) = {"
+y
+f
+r
+H
+E
+a
+"}
+(5,1,1) = {"
+a
+M
+X
+H
+T
+e
+"}
+(6,1,1) = {"
+e
+k
+A
+I
+G
+a
+"}
+(7,1,1) = {"
+a
+a
+e
+e
+a
+a
+"}
diff --git a/_maps/safehouses/shuttle_space.dmm b/_maps/safehouses/shuttle_space.dmm
new file mode 100644
index 00000000000..a5afaa475c6
--- /dev/null
+++ b/_maps/safehouses/shuttle_space.dmm
@@ -0,0 +1,231 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/effect/spawner/structure/window/reinforced/shuttle,
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"b" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"c" = (
+/obj/effect/turf_decal/tile/neutral/half/contrasted,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/light/small/directional/north,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"i" = (
+/turf/closed/wall/mineral/titanium/overspace,
+/area/virtual_domain/safehouse)
+"l" = (
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/landmark/bitrunning/hololadder_spawn,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"n" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/computer{
+ dir = 8;
+ name = "shuttle console";
+ icon_screen = "shuttle"
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"o" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"q" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/obj/structure/table/reinforced,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/storage/toolbox/emergency,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"r" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/bitrunning/cache_goal_turf,
+/obj/effect/turf_decal/loading_area,
+/turf/open/floor/bitrunning_transport,
+/area/virtual_domain/safehouse)
+"z" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"A" = (
+/obj/effect/turf_decal/stripes/end{
+ dir = 1
+ },
+/obj/effect/turf_decal/sand/volcanic,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"B" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/machinery/light/small/directional/south,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/bitrunning/hololadder_spawn,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"D" = (
+/obj/machinery/light/small/directional/south,
+/obj/effect/landmark/bitrunning/cache_goal_turf,
+/obj/effect/turf_decal/loading_area,
+/turf/open/floor/bitrunning_transport,
+/area/virtual_domain/safehouse)
+"E" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/door/airlock/shuttle/glass,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/sand/volcanic,
+/obj/structure/fans/tiny,
+/turf/open/floor/iron/white,
+/area/virtual_domain/safehouse)
+"G" = (
+/turf/closed/wall/mineral/titanium,
+/area/virtual_domain/safehouse)
+"H" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"I" = (
+/obj/effect/turf_decal/tile/neutral/half/contrasted,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/light/small/directional/north,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"L" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/structure/table/reinforced,
+/obj/item/tank/internals/emergency_oxygen{
+ pixel_x = 3
+ },
+/obj/item/clothing/mask/gas,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"N" = (
+/obj/machinery/power/shuttle_engine/propulsion/burst{
+ dir = 8
+ },
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/plating/airless,
+/area/virtual_domain/safehouse)
+"O" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/chair/comfy/shuttle{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"U" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"W" = (
+/obj/effect/turf_decal/stripes/end,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+"Y" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/effect/decal/cleanable/generic,
+/obj/effect/landmark/bitrunning/hololadder_spawn,
+/turf/open/floor/iron,
+/area/virtual_domain/safehouse)
+
+(1,1,1) = {"
+i
+N
+a
+a
+N
+i
+"}
+(2,1,1) = {"
+a
+A
+o
+W
+D
+G
+"}
+(3,1,1) = {"
+G
+I
+H
+U
+r
+a
+"}
+(4,1,1) = {"
+E
+z
+H
+b
+Y
+G
+"}
+(5,1,1) = {"
+G
+c
+O
+b
+l
+a
+"}
+(6,1,1) = {"
+a
+q
+n
+L
+B
+G
+"}
+(7,1,1) = {"
+i
+G
+a
+a
+G
+i
+"}
diff --git a/_maps/safehouses/test_only_safehouse.dmm b/_maps/safehouses/test_only_safehouse.dmm
new file mode 100644
index 00000000000..c23f8c4a22b
--- /dev/null
+++ b/_maps/safehouses/test_only_safehouse.dmm
@@ -0,0 +1,29 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/effect/landmark/bitrunning/cache_goal_turf,
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"d" = (
+/obj/effect/landmark/bitrunning/hololadder_spawn,
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"u" = (
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+
+(1,1,1) = {"
+u
+d
+"}
+(2,1,1) = {"
+u
+d
+"}
+(3,1,1) = {"
+u
+d
+"}
+(4,1,1) = {"
+u
+a
+"}
diff --git a/_maps/safehouses/wood.dmm b/_maps/safehouses/wood.dmm
new file mode 100644
index 00000000000..0bb6b273fce
--- /dev/null
+++ b/_maps/safehouses/wood.dmm
@@ -0,0 +1,120 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/open/indestructible/hotelwood,
+/area/virtual_domain/safehouse)
+"i" = (
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"o" = (
+/turf/open/floor/carpet/green,
+/area/virtual_domain/safehouse)
+"p" = (
+/obj/item/kirbyplants/random/fullysynthetic,
+/turf/open/indestructible/hotelwood,
+/area/virtual_domain/safehouse)
+"s" = (
+/obj/machinery/light/small/directional/east,
+/obj/effect/landmark/bitrunning/cache_goal_turf,
+/obj/effect/turf_decal/loading_area{
+ dir = 4
+ },
+/turf/open/floor/bitrunning_transport,
+/area/virtual_domain/safehouse)
+"v" = (
+/obj/machinery/light/small/directional/east,
+/obj/structure/table/wood,
+/obj/item/newspaper,
+/turf/open/indestructible/hotelwood,
+/area/virtual_domain/safehouse)
+"x" = (
+/obj/structure/railing/corner/end{
+ dir = 4
+ },
+/turf/open/floor/carpet/green,
+/area/virtual_domain/safehouse)
+"z" = (
+/obj/structure/sign/poster/random/directional/east,
+/turf/open/indestructible/hotelwood,
+/area/virtual_domain/safehouse)
+"G" = (
+/turf/closed/wall/mineral/wood,
+/area/virtual_domain/safehouse)
+"J" = (
+/obj/structure/railing,
+/obj/effect/landmark/bitrunning/cache_goal_turf,
+/obj/effect/turf_decal/loading_area{
+ dir = 4
+ },
+/turf/open/floor/bitrunning_transport,
+/area/virtual_domain/safehouse)
+"T" = (
+/obj/effect/landmark/bitrunning/hololadder_spawn,
+/turf/open/indestructible/hotelwood,
+/area/virtual_domain/safehouse)
+"X" = (
+/obj/machinery/door/airlock/wood/glass,
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/virtual_domain/safehouse)
+"Z" = (
+/obj/machinery/light/small/directional/west,
+/turf/open/indestructible/hotelwood,
+/area/virtual_domain/safehouse)
+
+(1,1,1) = {"
+G
+G
+i
+G
+G
+G
+"}
+(2,1,1) = {"
+i
+Z
+a
+a
+Z
+i
+"}
+(3,1,1) = {"
+G
+p
+o
+o
+T
+G
+"}
+(4,1,1) = {"
+X
+a
+o
+o
+T
+G
+"}
+(5,1,1) = {"
+G
+a
+x
+o
+T
+G
+"}
+(6,1,1) = {"
+i
+s
+J
+z
+v
+i
+"}
+(7,1,1) = {"
+G
+G
+i
+G
+G
+G
+"}
diff --git a/_maps/virtual_domains/README.md b/_maps/virtual_domains/README.md
new file mode 100644
index 00000000000..a02d43e1575
--- /dev/null
+++ b/_maps/virtual_domains/README.md
@@ -0,0 +1,32 @@
+# Making new virtual domains
+
+## From scratch
+
+1. Create a new map using TGM format. It can be any size, but please, consider limiting to 75x75 max.
+2. Ensure that the map has ONE tile marked with the safehouse bottom left landmark. If you're using modular safehouses, it will need to be a 7x6 area.
+4. Provide a way for players to enter your new map via the north door, which is 4th tile over.
+5. Enclose your area with a single wall binary closed wall.
+
+## From an existing map
+
+1. Create a new map using the existing map's size - give yourself enough room to enclose it with a binary wall. There's no need for any space outside of it, so ensure that it fits and is enclosed, nothing outside of this.
+2. Copy and paste the existing map into it.
+3. Find an accessible area for a safehouse, 7x6 - or with a custom, just ensure the necessary landmarks are placed.
+4. Place a bottom left safehouse landmark somewhere on the map to load the safehouse.
+
+## BOTH.
+1. You need to have one (1) way that the encrypted cache can spawn. This can be from a mob drop, a landmark (place a few, it'll pick one), or a signable landmark if you have a points system.
+2. Make note of the size of the map. Make sure this is in the dm file.
+3. Create the dm file that defines the map qualities. Examples are in the bitrunning file.
+
+### Notes
+
+You shouldn't need to fully enclose your map in 15 tiles of binary filler. Using one solid wall should do the trick.
+
+Adding some open tile padding around the safehouse is a good touch. About 7 tiles West/East for the visual effect of a larger map.
+
+If you want to add prep gear, you can do so within the safehouse's area as long you don't overlap with goal turfs or exit spawners. The top left corner is a good spot for this, with respect for the walls, therefore [1, 1], [1, 2], [1, 3]
+
+You can also create safehouses if you find yourself needing the same gear over and over again. There is a readme for that as well.
+
+Boss zones should give players pretty ample space, I've been using a 23x23 minimum area.
diff --git a/_maps/virtual_domains/ash_drake.dmm b/_maps/virtual_domains/ash_drake.dmm
new file mode 100644
index 00000000000..50fbac8696a
--- /dev/null
+++ b/_maps/virtual_domains/ash_drake.dmm
@@ -0,0 +1,1750 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"c" = (
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"e" = (
+/obj/structure/marker_beacon/cerulean,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"f" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"g" = (
+/obj/structure/marker_beacon/lime,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"h" = (
+/obj/machinery/light/small/blacklight/directional/south,
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/virtual_domain/powered)
+"i" = (
+/obj/structure/marker_beacon/jade,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"j" = (
+/obj/structure/marker_beacon/teal,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"l" = (
+/obj/structure/marker_beacon/bronze,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"q" = (
+/mob/living/simple_animal/hostile/megafauna/dragon/virtual_domain,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"s" = (
+/turf/closed/mineral/volcanic/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"u" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/indestructible/binary,
+/area/lavaland/surface/outdoors/virtual_domain)
+"v" = (
+/turf/closed/indestructible/binary,
+/area/lavaland/surface/outdoors/virtual_domain)
+"G" = (
+/obj/structure/marker_beacon/purple,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"J" = (
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"L" = (
+/obj/effect/landmark/bitrunning/safehouse_spawn,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"P" = (
+/obj/structure/marker_beacon/fuchsia,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Z" = (
+/obj/effect/mob_spawn/corpse/human/miner,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+
+(1,1,1) = {"
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+u
+"}
+(2,1,1) = {"
+v
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+v
+"}
+(3,1,1) = {"
+v
+s
+s
+s
+s
+J
+J
+s
+s
+J
+J
+s
+s
+J
+J
+J
+J
+s
+s
+s
+J
+J
+J
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+J
+J
+s
+s
+s
+J
+J
+s
+s
+J
+J
+s
+v
+"}
+(4,1,1) = {"
+v
+s
+s
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+a
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+s
+v
+"}
+(5,1,1) = {"
+v
+s
+s
+J
+a
+J
+J
+J
+J
+a
+J
+J
+J
+J
+a
+a
+J
+J
+J
+J
+J
+a
+a
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+s
+s
+v
+"}
+(6,1,1) = {"
+v
+s
+s
+J
+a
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+a
+a
+a
+a
+a
+J
+J
+J
+a
+a
+J
+J
+J
+a
+a
+J
+a
+J
+a
+a
+J
+J
+J
+s
+s
+v
+"}
+(7,1,1) = {"
+v
+s
+s
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+J
+s
+v
+"}
+(8,1,1) = {"
+v
+s
+s
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+s
+s
+v
+"}
+(9,1,1) = {"
+v
+s
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+i
+a
+a
+a
+a
+a
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+s
+v
+"}
+(10,1,1) = {"
+v
+s
+J
+J
+J
+a
+a
+a
+a
+a
+a
+G
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+s
+v
+"}
+(11,1,1) = {"
+v
+s
+s
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+s
+v
+"}
+(12,1,1) = {"
+v
+s
+s
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+J
+s
+v
+"}
+(13,1,1) = {"
+v
+s
+s
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+g
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+s
+v
+"}
+(14,1,1) = {"
+v
+s
+s
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+s
+v
+"}
+(15,1,1) = {"
+v
+s
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+h
+c
+c
+c
+c
+c
+L
+a
+a
+J
+J
+s
+v
+"}
+(16,1,1) = {"
+v
+s
+J
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+c
+c
+c
+c
+c
+c
+a
+a
+J
+J
+s
+v
+"}
+(17,1,1) = {"
+v
+s
+s
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+l
+a
+a
+c
+c
+c
+c
+c
+c
+a
+a
+J
+J
+s
+v
+"}
+(18,1,1) = {"
+v
+s
+s
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+q
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+c
+c
+c
+c
+c
+c
+a
+J
+J
+s
+s
+v
+"}
+(19,1,1) = {"
+v
+s
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+c
+c
+c
+c
+c
+c
+a
+a
+J
+J
+s
+v
+"}
+(20,1,1) = {"
+v
+s
+J
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+c
+c
+c
+c
+c
+c
+a
+a
+J
+J
+s
+v
+"}
+(21,1,1) = {"
+v
+s
+s
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+e
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+h
+c
+c
+c
+c
+c
+f
+a
+a
+J
+s
+s
+v
+"}
+(22,1,1) = {"
+v
+s
+s
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+s
+s
+v
+"}
+(23,1,1) = {"
+v
+s
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+s
+s
+v
+"}
+(24,1,1) = {"
+v
+s
+J
+J
+a
+a
+a
+a
+j
+a
+a
+a
+a
+a
+P
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+s
+v
+"}
+(25,1,1) = {"
+v
+s
+s
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+J
+s
+v
+"}
+(26,1,1) = {"
+v
+s
+s
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+s
+v
+"}
+(27,1,1) = {"
+v
+s
+s
+J
+J
+J
+a
+a
+a
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+j
+a
+a
+a
+a
+a
+a
+a
+J
+J
+s
+v
+"}
+(28,1,1) = {"
+v
+s
+J
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+J
+s
+v
+"}
+(29,1,1) = {"
+v
+s
+J
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+s
+s
+v
+"}
+(30,1,1) = {"
+v
+s
+s
+J
+J
+J
+J
+a
+a
+J
+J
+J
+a
+a
+a
+a
+J
+J
+J
+a
+a
+a
+J
+J
+J
+a
+a
+a
+J
+J
+a
+a
+a
+a
+a
+a
+J
+J
+a
+a
+a
+J
+J
+s
+s
+v
+"}
+(31,1,1) = {"
+v
+s
+s
+a
+J
+J
+J
+J
+J
+J
+J
+J
+J
+a
+a
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+a
+a
+a
+J
+J
+J
+J
+J
+J
+J
+J
+J
+s
+v
+"}
+(32,1,1) = {"
+v
+s
+s
+a
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+a
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+s
+v
+"}
+(33,1,1) = {"
+v
+s
+s
+s
+s
+s
+J
+J
+s
+s
+s
+s
+J
+J
+s
+s
+s
+s
+s
+s
+J
+J
+s
+s
+s
+s
+J
+J
+s
+s
+s
+s
+J
+J
+J
+s
+s
+s
+s
+s
+s
+J
+J
+J
+s
+v
+"}
+(34,1,1) = {"
+v
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+v
+"}
+(35,1,1) = {"
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+"}
diff --git a/_maps/virtual_domains/beach_bar.dmm b/_maps/virtual_domains/beach_bar.dmm
new file mode 100644
index 00000000000..408d3c0cda1
--- /dev/null
+++ b/_maps/virtual_domains/beach_bar.dmm
@@ -0,0 +1,2932 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ab" = (
+/obj/machinery/vending/cigarette/beach,
+/obj/effect/turf_decal/sand,
+/obj/structure/sign/poster/contraband/have_a_puff/directional/west,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"ag" = (
+/turf/open/floor/carpet/red,
+/area/virtual_domain/powered)
+"as" = (
+/obj/structure/closet/crate/bin,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/trash/candy,
+/obj/item/toy/talking/owl,
+/obj/effect/turf_decal/sand,
+/obj/machinery/light/directional/west,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"aw" = (
+/obj/machinery/grill,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"aE" = (
+/turf/open/floor/pod/light,
+/area/virtual_domain/powered)
+"aZ" = (
+/obj/machinery/light/small/directional/east,
+/obj/structure/closet/crate{
+ name = "fuel crate"
+ },
+/obj/item/stack/sheet/mineral/coal/ten,
+/obj/item/stack/sheet/mineral/coal/ten,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"bf" = (
+/mob/living/basic/crab{
+ name = "Jonny"
+ },
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"bC" = (
+/obj/effect/turf_decal/sand,
+/mob/living/basic/crab{
+ name = "James"
+ },
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"bM" = (
+/mob/living/basic/crab{
+ name = "Jon"
+ },
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"bQ" = (
+/obj/structure/fluff/beach_umbrella/cap,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"bS" = (
+/obj/machinery/chem_master/condimaster{
+ name = "CondiMaster Neo";
+ pixel_x = -4
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"cb" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/pill/lsd,
+/obj/item/reagent_containers/pill/lsd,
+/obj/item/reagent_containers/pill/lsd,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"cv" = (
+/turf/open/floor/carpet/royalblue,
+/area/virtual_domain/powered)
+"cz" = (
+/obj/effect/turf_decal/sand,
+/obj/machinery/jukebox,
+/obj/item/coin/gold,
+/turf/open/floor/sepia,
+/area/virtual_domain/powered)
+"cG" = (
+/obj/structure/flora/bush/sparsegrass/style_random,
+/turf/open/water/beach,
+/area/virtual_domain/powered)
+"db" = (
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/vending_refill/cigarette,
+/obj/item/vending_refill/boozeomat,
+/obj/structure/closet/secure_closet{
+ icon_state = "cabinet";
+ name = "booze storage";
+ req_access = list("bar")
+ },
+/obj/item/storage/backpack/duffelbag,
+/obj/item/etherealballdeployer,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/colocup,
+/obj/item/reagent_containers/cup/glass/colocup,
+/obj/item/reagent_containers/cup/glass/colocup,
+/obj/item/reagent_containers/cup/glass/colocup,
+/obj/item/reagent_containers/cup/glass/colocup,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"di" = (
+/obj/machinery/vending/boozeomat,
+/obj/effect/mapping_helpers/atom_injector/obj_flag{
+ inject_flags = 1;
+ target_type = /obj/machinery/vending/boozeomat
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"dj" = (
+/turf/open/misc/beach/coast{
+ dir = 1
+ },
+/area/virtual_domain/powered)
+"dx" = (
+/obj/effect/turf_decal/sand,
+/obj/effect/turf_decal/stripes/asteroid/line{
+ dir = 8
+ },
+/turf/open/floor/sepia,
+/area/virtual_domain/powered)
+"dI" = (
+/obj/machinery/light/directional/south,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"dZ" = (
+/obj/structure/bookcase/random/reference,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"ed" = (
+/obj/machinery/atmospherics/components/tank/air{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"er" = (
+/obj/structure/noticeboard/staff,
+/turf/closed/wall/mineral/wood/nonmetal,
+/area/virtual_domain/powered)
+"fc" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/pill/happy,
+/obj/item/toy/figure/bartender{
+ pixel_x = -8;
+ pixel_y = -1
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/virtual_domain{
+ pixel_y = 8;
+ pixel_x = 5
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"fr" = (
+/obj/item/melee/skateboard/hoverboard,
+/obj/machinery/light/directional/west,
+/turf/open/floor/pod/light,
+/area/virtual_domain/powered)
+"gh" = (
+/obj/structure/flora/bush/stalky/style_random,
+/obj/structure/flora/bush/sparsegrass/style_random,
+/turf/open/water/beach,
+/area/virtual_domain/powered)
+"gl" = (
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"gJ" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/open/misc/beach/coast{
+ dir = 4
+ },
+/area/virtual_domain/powered)
+"hk" = (
+/obj/structure/reagent_dispensers/watertank,
+/turf/open/floor/pod/light,
+/area/virtual_domain/powered)
+"hE" = (
+/obj/structure/sign/departments/restroom/directional/east,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"hG" = (
+/obj/machinery/door/airlock/sandstone{
+ name = "Surfer Shack 1"
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"iz" = (
+/turf/closed/indestructible/binary,
+/area/lavaland/surface/outdoors/virtual_domain)
+"iR" = (
+/obj/structure/table,
+/obj/item/book/manual/wiki/barman_recipes,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/item/reagent_containers/cup/rag,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"jc" = (
+/turf/open/floor/iron/stairs/right,
+/area/virtual_domain/powered)
+"jg" = (
+/obj/machinery/vending/hydronutrients,
+/turf/open/floor/iron/grimy,
+/area/virtual_domain/powered)
+"jl" = (
+/obj/structure/flora/rock/pile/jungle/style_random,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"jy" = (
+/obj/effect/turf_decal/sand{
+ density = 1
+ },
+/obj/effect/decal/fakelattice,
+/turf/open/floor/pod/light{
+ density = 1
+ },
+/area/virtual_domain/powered)
+"ke" = (
+/obj/structure/marker_beacon/bronze,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"kn" = (
+/obj/effect/turf_decal/sand,
+/obj/effect/turf_decal/stripes/asteroid/line{
+ dir = 8
+ },
+/obj/structure/chair/stool/bar/directional/west,
+/turf/open/floor/sepia,
+/area/virtual_domain/powered)
+"kv" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/indestructible/binary,
+/area/lavaland/surface/outdoors/virtual_domain)
+"kG" = (
+/obj/structure/table,
+/obj/machinery/reagentgrinder,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"kK" = (
+/obj/structure/mirror/directional/west,
+/obj/structure/sink/kitchen/directional/south,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"kT" = (
+/obj/structure/chair/stool/bar/directional/south,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"lq" = (
+/obj/item/melee/skateboard/hoverboard,
+/turf/open/floor/pod/light,
+/area/virtual_domain/powered)
+"lB" = (
+/obj/item/toy/seashell,
+/obj/effect/turf_decal/sand,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"lS" = (
+/turf/open/floor/light/colour_cycle/dancefloor_a,
+/area/virtual_domain/powered)
+"ml" = (
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"mq" = (
+/obj/structure/closet/secure_closet/freezer/kitchen/all_access,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"mG" = (
+/obj/structure/easel,
+/obj/item/canvas/twentythree_twentythree,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"mP" = (
+/turf/open/misc/beach/coast/corner{
+ dir = 1
+ },
+/area/virtual_domain/powered)
+"mX" = (
+/obj/structure/closet/secure_closet/freezer/meat/all_access,
+/obj/item/food/meat/rawbacon,
+/obj/item/food/meat/rawbacon,
+/obj/item/food/meat/rawcutlet,
+/obj/item/food/meat/rawcutlet,
+/obj/item/food/meat/slab/rawcrab,
+/obj/item/food/meat/slab/rawcrab,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"nP" = (
+/obj/item/stack/sheet/iron/fifty,
+/obj/effect/mapping_helpers/burnt_floor,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"oE" = (
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/obj/machinery/light/directional/south,
+/turf/open/misc/beach/coast/corner{
+ dir = 8
+ },
+/area/virtual_domain/powered)
+"oP" = (
+/obj/structure/table/wood,
+/obj/machinery/reagentgrinder,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"pr" = (
+/turf/template_noop,
+/area/template_noop)
+"pC" = (
+/obj/machinery/computer/arcade/battle,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"pT" = (
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"pZ" = (
+/obj/machinery/light/directional/south,
+/turf/open/misc/beach/coast{
+ dir = 1
+ },
+/area/virtual_domain/powered)
+"qc" = (
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"qg" = (
+/obj/structure/sign/poster/contraband/space_up/directional/west,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"qR" = (
+/obj/effect/spawner/structure/window,
+/obj/structure/curtain,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"qW" = (
+/obj/item/melee/skateboard/hoverboard,
+/mob/living/basic/chicken{
+ name = "Chicken Joe"
+ },
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"rc" = (
+/obj/machinery/light/directional/east,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"ri" = (
+/obj/structure/sign/poster/official/fruit_bowl,
+/turf/closed/wall/mineral/wood/nonmetal,
+/area/virtual_domain/powered)
+"rm" = (
+/obj/item/storage/crayons,
+/obj/structure/closet/crate/wooden,
+/obj/item/canvas/twentythree_twentythree,
+/obj/item/canvas/twentythree_twentythree,
+/obj/item/canvas/twentythree_twentythree,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"rT" = (
+/obj/item/toy/seashell,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"sT" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"tE" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Resort Casino"
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"tF" = (
+/obj/structure/extinguisher_cabinet/directional/east,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"tZ" = (
+/obj/structure/toilet,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"uc" = (
+/obj/machinery/light/small/directional/east,
+/obj/machinery/light/small/directional/east,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/virtual_domain/powered)
+"ug" = (
+/obj/structure/closet/secure_closet{
+ icon_state = "cabinet";
+ name = "bartender's closet";
+ req_access = list("bar")
+ },
+/obj/item/clothing/shoes/sandal{
+ desc = "A very fashionable pair of flip-flops.";
+ name = "flip-flops"
+ },
+/obj/item/clothing/neck/beads,
+/obj/item/clothing/glasses/sunglasses/reagent,
+/obj/item/clothing/suit/costume/hawaiian,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"uk" = (
+/obj/structure/closet/crate/hydroponics,
+/obj/item/shovel/spade,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/cultivator,
+/turf/open/floor/iron/grimy,
+/area/virtual_domain/powered)
+"uq" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/drinkingglass/virtual_domain,
+/obj/item/reagent_containers/cup/glass/drinkingglass/virtual_domain{
+ pixel_x = -4;
+ pixel_y = 8
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"uU" = (
+/obj/effect/turf_decal/sand,
+/turf/open/floor/sepia,
+/area/virtual_domain/powered)
+"uV" = (
+/obj/structure/flora/coconuts,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"ve" = (
+/obj/item/toy/dodgeball,
+/obj/item/toy/dodgeball,
+/obj/item/toy/dodgeball,
+/obj/item/toy/dodgeball,
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"vp" = (
+/obj/machinery/light/directional/east,
+/obj/structure/chair/stool/bar/directional/south,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"vq" = (
+/obj/machinery/oven/range,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"vv" = (
+/obj/structure/chair/stool/directional/south,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"vN" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/pill/morphine,
+/obj/item/reagent_containers/pill/morphine,
+/obj/item/reagent_containers/pill/morphine,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"vT" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/open/misc/beach/coast/corner,
+/area/virtual_domain/powered)
+"wb" = (
+/obj/structure/closet/crate/freezer{
+ name = "Cooler"
+ },
+/obj/item/reagent_containers/cup/glass/ice,
+/obj/item/reagent_containers/cup/glass/colocup,
+/obj/item/reagent_containers/cup/glass/colocup,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ desc = "Beer advertised to be the best in space.";
+ name = "Masterbrand Beer"
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ desc = "Beer advertised to be the best in space.";
+ name = "Masterbrand Beer"
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer{
+ desc = "Beer advertised to be the best in space.";
+ name = "Masterbrand Beer"
+ },
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"wD" = (
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"xb" = (
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"xk" = (
+/obj/structure/table/wood/poker,
+/obj/item/storage/dice,
+/obj/item/stack/spacecash/c1000,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"xq" = (
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/item/megaphone,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"xw" = (
+/turf/open/floor/pod/dark,
+/area/virtual_domain/powered)
+"xJ" = (
+/obj/structure/closet/cabinet,
+/obj/item/storage/backpack/duffelbag,
+/obj/item/clothing/under/shorts/blue,
+/obj/item/clothing/shoes/sandal{
+ desc = "A very fashionable pair of flip-flops.";
+ name = "flip-flops"
+ },
+/obj/item/clothing/glasses/sunglasses,
+/obj/item/clothing/neck/beads,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"xR" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/north{
+ layer = 2.9
+ },
+/obj/structure/chair/stool/directional/south,
+/obj/item/storage/backpack/duffelbag,
+/obj/item/clothing/under/shorts/red,
+/obj/item/clothing/glasses/sunglasses,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"xW" = (
+/turf/open/space/basic,
+/area/space)
+"ya" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/pill/zoom,
+/obj/item/reagent_containers/pill/zoom,
+/obj/item/reagent_containers/pill/zoom,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"yi" = (
+/obj/structure/sink/kitchen/directional/west{
+ desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
+ name = "old sink"
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"yl" = (
+/obj/item/reagent_containers/cup/glass/colocup{
+ pixel_x = -7;
+ pixel_y = -2
+ },
+/obj/item/reagent_containers/cup/glass/colocup{
+ pixel_x = 5;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/cup/glass/bottle/rum{
+ pixel_x = 4;
+ pixel_y = -3
+ },
+/turf/open/floor/carpet/red,
+/area/virtual_domain/powered)
+"ys" = (
+/obj/effect/turf_decal/sand,
+/obj/machinery/light/directional/east,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"yv" = (
+/obj/effect/turf_decal/sand,
+/obj/machinery/food_cart,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"yB" = (
+/obj/item/instrument/guitar,
+/turf/open/floor/carpet/blue,
+/area/virtual_domain/powered)
+"yU" = (
+/obj/structure/sign/warning/gas_mask/directional/north,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"yX" = (
+/obj/structure/chair/stool/bar/directional/south,
+/turf/open/floor/carpet/red,
+/area/virtual_domain/powered)
+"zn" = (
+/obj/machinery/light/directional/east,
+/turf/open/misc/beach/coast{
+ dir = 8
+ },
+/area/virtual_domain/powered)
+"zw" = (
+/obj/structure/punching_bag,
+/turf/open/floor/pod/dark,
+/area/virtual_domain/powered)
+"zI" = (
+/obj/structure/marker_beacon/indigo,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"zU" = (
+/obj/structure/flora/rock/pile/style_random,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"Aa" = (
+/obj/effect/turf_decal/sand,
+/obj/effect/turf_decal/stripes/asteroid/line{
+ dir = 8
+ },
+/obj/machinery/light/directional/west,
+/turf/open/floor/sepia,
+/area/virtual_domain/powered)
+"Ae" = (
+/obj/structure/chair,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"Al" = (
+/turf/closed/mineral/random/volcanic,
+/area/lavaland/surface/outdoors/virtual_domain)
+"An" = (
+/obj/structure/marker_beacon/yellow,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Au" = (
+/obj/structure/fluff/beach_umbrella/science,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"AI" = (
+/obj/structure/table/reinforced,
+/obj/machinery/reagentgrinder,
+/turf/open/floor/pod/light,
+/area/virtual_domain/powered)
+"AP" = (
+/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{
+ dir = 1
+ },
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Br" = (
+/obj/structure/table/wood/poker,
+/obj/item/toy/cards/deck/cas{
+ pixel_x = -6
+ },
+/obj/item/toy/cards/deck/cas/black{
+ pixel_x = -6;
+ pixel_y = 2
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Bu" = (
+/turf/open/misc/beach/coast{
+ dir = 8
+ },
+/area/virtual_domain/powered)
+"Bw" = (
+/obj/structure/flora/bush/sparsegrass/style_random,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"BD" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/condiment/saltshaker,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"BJ" = (
+/obj/structure/table/wood/poker,
+/obj/item/toy/cards/deck,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"BM" = (
+/turf/closed/wall/mineral/wood/nonmetal,
+/area/virtual_domain/powered)
+"BQ" = (
+/obj/machinery/seed_extractor,
+/turf/open/floor/pod/light,
+/area/virtual_domain/powered)
+"Cb" = (
+/obj/machinery/light/directional/north,
+/mob/living/basic/crab{
+ name = "Eddie"
+ },
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"Cv" = (
+/obj/machinery/hydroponics/constructable,
+/turf/open/floor/iron/grimy,
+/area/virtual_domain/powered)
+"CA" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/effect/mob_spawn/ghost_role/human/beach/lifeguard,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"CO" = (
+/obj/machinery/vending/dinnerware,
+/obj/machinery/light/directional/east,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Db" = (
+/obj/machinery/barsign/all_access,
+/turf/closed/wall/mineral/wood/nonmetal,
+/area/virtual_domain/powered)
+"Ds" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Resort Lobby"
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Dt" = (
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/sand,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"DL" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/wall/mineral/sandstone,
+/area/virtual_domain/powered)
+"Em" = (
+/obj/item/reagent_containers/condiment/enzyme{
+ layer = 5
+ },
+/obj/item/reagent_containers/cup/beaker{
+ pixel_x = 5
+ },
+/obj/structure/table,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Et" = (
+/obj/machinery/light/small/directional/east,
+/obj/effect/mapping_helpers/burnt_floor,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Ev" = (
+/obj/structure/reagent_dispensers/beerkeg,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"EC" = (
+/obj/structure/sign/warning/gas_mask/directional/west,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"EP" = (
+/obj/machinery/light/directional/north,
+/obj/machinery/washing_machine,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Fn" = (
+/turf/closed/wall/mineral/sandstone,
+/area/virtual_domain/powered)
+"FM" = (
+/obj/effect/landmark/bitrunning/safehouse_spawn,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"FQ" = (
+/obj/structure/table/reinforced,
+/obj/item/secateurs,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
+/turf/open/floor/pod/light,
+/area/virtual_domain/powered)
+"FS" = (
+/obj/effect/turf_decal/sand,
+/obj/structure/sign/warning/no_smoking/circle/directional/east,
+/obj/machinery/light/directional/east,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"FY" = (
+/obj/structure/mineral_door/wood,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Gh" = (
+/obj/effect/turf_decal/sand,
+/obj/structure/sign/poster/contraband/starkist/directional/north,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"Gz" = (
+/obj/structure/flora/tree/palm,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"GA" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/item/bikehorn/airhorn,
+/obj/structure/table/wood,
+/obj/item/storage/medkit/regular,
+/obj/item/storage/medkit/brute,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Hs" = (
+/obj/machinery/shower/directional/west,
+/turf/open/floor/iron/white,
+/area/virtual_domain/powered)
+"HF" = (
+/obj/machinery/deepfryer,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Ia" = (
+/obj/structure/urinal/directional/north,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Ii" = (
+/obj/machinery/light/directional/west,
+/turf/open/floor/iron/stairs/left,
+/area/virtual_domain/powered)
+"Ir" = (
+/obj/machinery/vending/cola,
+/obj/effect/turf_decal/sand,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Iv" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/condiment/peppermill,
+/obj/item/reagent_containers/condiment/soysauce,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"IH" = (
+/obj/item/toy/beach_ball,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"IM" = (
+/obj/machinery/hydroponics/constructable,
+/obj/machinery/light/directional/east,
+/turf/open/floor/iron/grimy,
+/area/virtual_domain/powered)
+"IP" = (
+/obj/machinery/vending/snack,
+/obj/effect/turf_decal/sand,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Jt" = (
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"JC" = (
+/obj/structure/fluff/beach_umbrella/engine,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"JE" = (
+/obj/structure/closet/secure_closet/freezer/kitchen/all_access,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/mayonnaise,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"JY" = (
+/obj/structure/flora/rock/style_random,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"Kd" = (
+/obj/structure/sign/warning/secure_area,
+/turf/closed/wall/mineral/sandstone,
+/area/virtual_domain/powered)
+"KH" = (
+/obj/structure/mineral_door/wood{
+ name = "Croupier's Booth"
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"KZ" = (
+/obj/structure/flora/bush/stalky/style_random,
+/turf/open/water/beach,
+/area/virtual_domain/powered)
+"LD" = (
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"LW" = (
+/obj/item/storage/cans/sixbeer,
+/turf/open/floor/carpet/orange,
+/area/virtual_domain/powered)
+"Mp" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/drinkingglass/virtual_domain{
+ pixel_y = 7;
+ pixel_x = 4
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/virtual_domain,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Mw" = (
+/obj/structure/chair/sofa/right/brown,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Mz" = (
+/obj/structure/chair/sofa/left/brown,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Nr" = (
+/obj/machinery/light/directional/north,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"Nw" = (
+/obj/item/bedsheet/dorms{
+ dir = 4
+ },
+/obj/structure/bed{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"NM" = (
+/obj/structure/closet/crate/hydroponics,
+/obj/item/food/grown/ambrosia/vulgaris,
+/obj/item/food/grown/ambrosia/vulgaris,
+/obj/item/food/grown/ambrosia/vulgaris,
+/obj/item/food/grown/ambrosia/vulgaris,
+/obj/item/food/grown/ambrosia/vulgaris,
+/obj/item/food/grown/ambrosia/vulgaris,
+/obj/item/food/grown/ambrosia/vulgaris,
+/obj/item/food/grown/ambrosia/vulgaris,
+/obj/item/food/grown/ambrosia/vulgaris,
+/obj/item/food/grown/ambrosia/vulgaris,
+/turf/open/floor/iron/grimy,
+/area/virtual_domain/powered)
+"NX" = (
+/obj/effect/landmark/bitrunning/loot_signal,
+/turf/open/floor/light/colour_cycle/dancefloor_a,
+/area/virtual_domain/powered)
+"OE" = (
+/obj/effect/mob_spawn/ghost_role/human/beach{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"OK" = (
+/obj/structure/sign/warning/gas_mask/directional/north,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"OR" = (
+/obj/machinery/light/directional/south,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"OW" = (
+/obj/structure/sink/kitchen/directional/east{
+ desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
+ name = "old sink"
+ },
+/turf/open/floor/pod/light,
+/area/virtual_domain/powered)
+"OZ" = (
+/obj/structure/marker_beacon/teal,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Pc" = (
+/obj/structure/chair/wood,
+/obj/machinery/light/directional/west,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"Pg" = (
+/obj/structure/sign/poster/official/high_class_martini/directional/west,
+/obj/effect/mob_spawn/ghost_role/human/bartender{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"PM" = (
+/obj/machinery/door/airlock/external/ruin,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Qb" = (
+/obj/machinery/griddle,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Qu" = (
+/obj/structure/curtain,
+/turf/open/floor/iron/white,
+/area/virtual_domain/powered)
+"QP" = (
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"QX" = (
+/obj/machinery/chem_dispenser/drinks/fullupgrade{
+ dir = 1
+ },
+/obj/structure/table/wood,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Rx" = (
+/turf/open/floor/iron/stairs/medium,
+/area/virtual_domain/powered)
+"RL" = (
+/obj/structure/closet/cabinet,
+/obj/item/storage/backpack/duffelbag,
+/obj/item/clothing/under/shorts/purple,
+/obj/item/clothing/shoes/cookflops{
+ desc = "A very fashionable pair of flip flops.";
+ name = "flip-flops"
+ },
+/obj/item/clothing/glasses/sunglasses/big,
+/obj/item/clothing/neck/beads,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Sg" = (
+/obj/structure/flora/coconuts,
+/obj/machinery/light/directional/north,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"SB" = (
+/obj/machinery/door/airlock/sandstone{
+ name = "Resort Bathroom"
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"SD" = (
+/obj/machinery/door/airlock/sandstone{
+ name = "Bar Access"
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"SY" = (
+/obj/machinery/door/airlock/sandstone{
+ name = "Surfer Shack 2"
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"TG" = (
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"TJ" = (
+/obj/structure/fluff/beach_umbrella/security,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"TX" = (
+/obj/structure/sign/poster/contraband/ambrosia_vulgaris/directional/north,
+/turf/open/floor/iron/grimy,
+/area/virtual_domain/powered)
+"Ud" = (
+/obj/effect/turf_decal/sand,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"Uh" = (
+/turf/open/floor/iron/stairs/old,
+/area/virtual_domain/powered)
+"Uq" = (
+/obj/structure/weightmachine/weightlifter,
+/turf/open/floor/pod/dark,
+/area/virtual_domain/powered)
+"UU" = (
+/obj/structure/flora/bush/large/style_random,
+/obj/structure/flora/bush/jungle/a/style_random,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"Ve" = (
+/obj/machinery/processor,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"VA" = (
+/obj/machinery/computer/slot_machine,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"VH" = (
+/obj/machinery/light/directional/west,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"VX" = (
+/obj/structure/flora/bush/large/style_random,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"We" = (
+/obj/structure/table/wood,
+/obj/item/book/manual/wiki/cooking_to_serve_man,
+/obj/item/clothing/suit/apron/chef,
+/obj/item/clothing/head/utility/chefhat,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Wg" = (
+/obj/structure/dresser,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Ww" = (
+/turf/open/water/beach,
+/area/virtual_domain/powered)
+"WL" = (
+/obj/machinery/light/directional/north,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"WO" = (
+/obj/structure/flora/bush/jungle/a/style_random,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"WW" = (
+/obj/effect/turf_decal/sand,
+/obj/machinery/icecream_vat,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"WX" = (
+/obj/item/toy/plush/lizard_plushie/green{
+ name = "Soaks-The-Rays"
+ },
+/turf/open/floor/carpet/orange,
+/area/virtual_domain/powered)
+"Xt" = (
+/turf/open/misc/beach/coast/corner{
+ dir = 4
+ },
+/area/virtual_domain/powered)
+"Xv" = (
+/obj/structure/table/wood,
+/obj/structure/bedsheetbin,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"XL" = (
+/obj/machinery/light/directional/east,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"XM" = (
+/turf/open/misc/beach/coast,
+/area/virtual_domain/powered)
+"XP" = (
+/turf/open/floor/carpet/blue,
+/area/virtual_domain/powered)
+"XT" = (
+/obj/effect/turf_decal/sand,
+/obj/structure/sign/departments/botany/directional/south,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"Yi" = (
+/obj/structure/flora/bush/sparsegrass/style_random,
+/obj/item/toy/seashell,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"Yq" = (
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"YI" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Supply Room"
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"YJ" = (
+/turf/open/floor/carpet/purple,
+/area/virtual_domain/powered)
+"YN" = (
+/obj/effect/turf_decal/sand,
+/obj/machinery/light/directional/west,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"Zb" = (
+/obj/structure/sign/poster/official/cohiba_robusto_ad/directional/west,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Zd" = (
+/obj/structure/sign/poster/contraband/space_cola/directional/north,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"Zg" = (
+/obj/structure/table,
+/obj/machinery/microwave,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Zt" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/pill/morphine,
+/obj/item/storage/fancy/donut_box,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+
+(1,1,1) = {"
+pr
+pr
+pr
+pr
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+kv
+"}
+(2,1,1) = {"
+pr
+pr
+pr
+pr
+iz
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+iz
+"}
+(3,1,1) = {"
+pr
+pr
+pr
+pr
+iz
+Al
+gl
+gl
+gl
+gl
+gl
+Al
+Al
+gl
+gl
+gl
+gl
+gl
+Al
+Al
+gl
+gl
+gl
+Al
+gl
+gl
+gl
+gl
+Al
+Al
+gl
+gl
+gl
+Al
+Al
+gl
+gl
+gl
+gl
+Al
+iz
+"}
+(4,1,1) = {"
+pr
+pr
+pr
+pr
+iz
+Al
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+Al
+iz
+"}
+(5,1,1) = {"
+pr
+pr
+pr
+pr
+iz
+Al
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+zI
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+Al
+iz
+"}
+(6,1,1) = {"
+pr
+pr
+pr
+pr
+iz
+Al
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+OZ
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+Al
+iz
+"}
+(7,1,1) = {"
+pr
+pr
+pr
+pr
+iz
+Al
+gl
+gl
+gl
+An
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+ke
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+ml
+ml
+ml
+ml
+ml
+FM
+gl
+Al
+iz
+"}
+(8,1,1) = {"
+pr
+pr
+pr
+pr
+iz
+Al
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+ml
+ml
+ml
+ml
+ml
+ml
+gl
+Al
+iz
+"}
+(9,1,1) = {"
+pr
+pr
+pr
+pr
+iz
+Al
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+gl
+gl
+ml
+ml
+ml
+ml
+ml
+ml
+gl
+Al
+iz
+"}
+(10,1,1) = {"
+pr
+pr
+pr
+pr
+iz
+Al
+Al
+Al
+Al
+xb
+xb
+uc
+Al
+Al
+gl
+gl
+gl
+Al
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Al
+gl
+gl
+ml
+ml
+ml
+ml
+ml
+ml
+gl
+Al
+iz
+"}
+(11,1,1) = {"
+iz
+iz
+iz
+iz
+iz
+Al
+Al
+Al
+Fn
+PM
+PM
+Fn
+Fn
+Al
+Al
+Al
+Fn
+Fn
+Fn
+Pc
+bf
+Bw
+Fn
+Ev
+Pg
+iR
+kG
+di
+Fn
+DL
+Al
+gl
+ml
+ml
+ml
+ml
+ml
+ml
+gl
+Al
+iz
+"}
+(12,1,1) = {"
+iz
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Fn
+pT
+LD
+LD
+Fn
+Fn
+Kd
+Fn
+Fn
+bQ
+cv
+wD
+Bw
+JY
+Fn
+db
+TG
+TG
+TG
+TG
+AP
+Fn
+Al
+gl
+ml
+ml
+ml
+ml
+ml
+ml
+gl
+Al
+iz
+"}
+(13,1,1) = {"
+iz
+Al
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+LD
+pT
+LD
+EC
+LD
+pT
+PM
+wD
+wD
+cv
+wD
+wD
+OR
+Fn
+ug
+TG
+TG
+TG
+TG
+QX
+Fn
+Al
+gl
+ml
+ml
+ml
+ml
+ml
+sT
+gl
+Al
+iz
+"}
+(14,1,1) = {"
+iz
+Al
+Fn
+VA
+kT
+Zb
+TG
+Fn
+Fn
+Fn
+yU
+LD
+Et
+LD
+LD
+PM
+wD
+wD
+wD
+wD
+wD
+qc
+Fn
+Fn
+SD
+Mp
+uq
+fc
+Fn
+Fn
+Al
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+Al
+iz
+"}
+(15,1,1) = {"
+iz
+Al
+Fn
+VA
+yX
+ag
+kT
+Br
+TG
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Gz
+wD
+Bw
+rm
+wD
+wD
+wD
+Ii
+dx
+kn
+kn
+kn
+Aa
+Fn
+Al
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+Al
+iz
+"}
+(16,1,1) = {"
+iz
+Al
+Fn
+pC
+yX
+ag
+kT
+BJ
+kT
+Fn
+as
+ab
+Ir
+IP
+YN
+uV
+wD
+wD
+wD
+mG
+vv
+Bw
+wD
+Rx
+uU
+lS
+lS
+lS
+uU
+Fn
+Al
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+Al
+iz
+"}
+(17,1,1) = {"
+iz
+Al
+Fn
+Mw
+ag
+ag
+vp
+xk
+TG
+Fn
+Ud
+Ud
+bC
+Ud
+Ud
+wD
+IH
+wD
+wD
+Bw
+wD
+wD
+wD
+Rx
+uU
+lS
+NX
+lS
+cz
+Fn
+Al
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+Al
+iz
+"}
+(18,1,1) = {"
+iz
+Al
+Fn
+Mz
+TG
+TG
+Fn
+Fn
+KH
+Fn
+Zd
+wD
+wD
+Bw
+wD
+VX
+wD
+UU
+wD
+wD
+wD
+wD
+wD
+Rx
+uU
+lS
+lS
+lS
+uU
+Fn
+Al
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+Al
+iz
+"}
+(19,1,1) = {"
+iz
+Al
+Fn
+Fn
+tE
+tE
+Fn
+uV
+wD
+wD
+wD
+wD
+wD
+wD
+wD
+wD
+wD
+wD
+wD
+wD
+wD
+wD
+wD
+jc
+uU
+uU
+uU
+uU
+uU
+Fn
+Fn
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+gl
+Al
+iz
+"}
+(20,1,1) = {"
+iz
+Al
+Fn
+zU
+wD
+wD
+wD
+wD
+Dt
+Ud
+Ud
+Ud
+Ud
+Ud
+Ud
+Ud
+ys
+wD
+wD
+TJ
+wb
+wD
+wD
+vT
+gJ
+gJ
+gJ
+gJ
+gJ
+oE
+Fn
+gl
+gl
+Al
+Al
+gl
+gl
+Al
+gl
+Al
+iz
+"}
+(21,1,1) = {"
+iz
+Al
+Fn
+wD
+wD
+Bw
+wD
+wD
+BM
+BM
+BM
+We
+Zt
+BD
+Iv
+BM
+Db
+Nr
+wD
+yl
+ag
+wD
+wD
+XM
+KZ
+Ww
+Ww
+Ww
+cG
+dj
+Fn
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+iz
+"}
+(22,1,1) = {"
+iz
+Al
+Fn
+Fn
+wD
+wD
+wD
+wD
+BM
+Zg
+VH
+TG
+TG
+TG
+TG
+mX
+BM
+wD
+wD
+Au
+wD
+rT
+wD
+XM
+Ww
+Ww
+Ww
+Ww
+Ww
+dj
+Fn
+Al
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+"}
+(23,1,1) = {"
+iz
+Al
+xb
+Fn
+Cb
+wD
+JC
+wD
+BM
+HF
+TG
+JE
+BM
+aw
+TG
+TG
+ya
+wD
+wD
+YJ
+YJ
+wD
+wD
+XM
+Ww
+Ww
+Ww
+Ww
+Ww
+dj
+Fn
+Al
+iz
+pr
+pr
+pr
+pr
+pr
+pr
+pr
+xW
+"}
+(24,1,1) = {"
+iz
+Al
+xb
+Fn
+wD
+Gz
+WX
+wD
+BM
+Em
+TG
+mq
+ri
+Qb
+TG
+TG
+cb
+wD
+wD
+bQ
+wD
+wD
+wD
+XM
+Ww
+Ww
+KZ
+KZ
+Ww
+pZ
+Fn
+Al
+iz
+pr
+pr
+pr
+pr
+pr
+pr
+pr
+xW
+"}
+(25,1,1) = {"
+iz
+Al
+xb
+Fn
+OK
+Gz
+LW
+wD
+BM
+bS
+TG
+oP
+BM
+vq
+TG
+TG
+vN
+wD
+wD
+XP
+yB
+wD
+wD
+XM
+KZ
+Ww
+KZ
+gh
+Ww
+dj
+Fn
+Al
+iz
+pr
+pr
+pr
+pr
+pr
+pr
+pr
+xW
+"}
+(26,1,1) = {"
+iz
+Al
+xb
+Fn
+Sg
+wD
+wD
+wD
+BM
+Ve
+rc
+yi
+TG
+TG
+TG
+CO
+BM
+wD
+Yi
+XL
+wD
+wD
+wD
+XM
+Ww
+Ww
+Ww
+Ww
+Ww
+dj
+Fn
+Al
+iz
+pr
+pr
+pr
+pr
+pr
+pr
+pr
+xW
+"}
+(27,1,1) = {"
+iz
+Al
+Fn
+Fn
+Bw
+wD
+wD
+wD
+BM
+BM
+BM
+BM
+FY
+BM
+BM
+BM
+er
+wD
+GA
+xq
+jy
+wD
+wD
+XM
+Ww
+cG
+Ww
+Ww
+KZ
+dj
+Fn
+Al
+iz
+pr
+pr
+pr
+pr
+pr
+pr
+pr
+xW
+"}
+(28,1,1) = {"
+iz
+Al
+Fn
+Nr
+wD
+wD
+Bw
+wD
+YN
+Ud
+WW
+yv
+Ud
+Ud
+Ud
+Ud
+YN
+wD
+xR
+CA
+Uh
+wD
+qW
+XM
+Ww
+Ww
+Ww
+Ww
+Ww
+pZ
+Fn
+Al
+iz
+pr
+pr
+pr
+pr
+pr
+pr
+pr
+xW
+"}
+(29,1,1) = {"
+iz
+Al
+Fn
+wD
+wD
+wD
+wD
+wD
+wD
+wD
+wD
+wD
+wD
+wD
+wD
+wD
+wD
+wD
+wD
+wD
+wD
+Jt
+wD
+mP
+zn
+Bu
+Bu
+Bu
+Bu
+Xt
+Fn
+Al
+iz
+pr
+pr
+pr
+pr
+pr
+pr
+pr
+xW
+"}
+(30,1,1) = {"
+iz
+Al
+Fn
+Ds
+Ds
+Fn
+VX
+wD
+wD
+wD
+wD
+wD
+XL
+wD
+wD
+wD
+wD
+wD
+wD
+wD
+wD
+XT
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Al
+iz
+pr
+pr
+pr
+pr
+pr
+pr
+pr
+xW
+"}
+(31,1,1) = {"
+iz
+Al
+Fn
+TG
+TG
+Fn
+Fn
+jl
+Fn
+Fn
+qR
+Fn
+Fn
+WO
+wD
+Bw
+wD
+wD
+wD
+wD
+bM
+Ud
+aE
+aE
+aE
+lq
+fr
+hk
+Fn
+Al
+Al
+Al
+iz
+pr
+pr
+pr
+pr
+pr
+pr
+pr
+xW
+"}
+(32,1,1) = {"
+iz
+Al
+Fn
+TG
+TG
+TG
+Fn
+Fn
+Fn
+dZ
+OE
+Nw
+Fn
+Fn
+qR
+Fn
+Fn
+wD
+wD
+wD
+Ae
+Ud
+zw
+xw
+Uq
+aE
+aE
+aE
+Fn
+Fn
+Al
+Al
+iz
+pr
+pr
+pr
+pr
+pr
+pr
+pr
+xW
+"}
+(33,1,1) = {"
+iz
+Al
+Fn
+EP
+TG
+TG
+TG
+TG
+hG
+TG
+TG
+TG
+Fn
+dZ
+OE
+Nw
+Fn
+Gz
+uV
+wD
+wD
+Ud
+xw
+xw
+xw
+aE
+aE
+aE
+OW
+Fn
+Fn
+Al
+iz
+pr
+pr
+pr
+pr
+pr
+pr
+pr
+xW
+"}
+(34,1,1) = {"
+iz
+Al
+Fn
+Xv
+TG
+hE
+TG
+TG
+Fn
+Wg
+rc
+xJ
+Fn
+TG
+TG
+dI
+Fn
+wD
+wD
+Bw
+wD
+lB
+zw
+xw
+Uq
+aE
+FQ
+aE
+aE
+jg
+Fn
+Al
+iz
+pr
+pr
+pr
+pr
+pr
+pr
+pr
+xW
+"}
+(35,1,1) = {"
+iz
+Al
+Fn
+Fn
+SB
+Fn
+WL
+TG
+Fn
+Fn
+Fn
+Fn
+Fn
+Wg
+TG
+RL
+Fn
+Gh
+Ud
+Ud
+Ud
+FS
+aE
+aE
+aE
+aE
+AI
+BQ
+aE
+NM
+Fn
+Al
+iz
+pr
+pr
+pr
+pr
+pr
+pr
+pr
+xW
+"}
+(36,1,1) = {"
+iz
+Al
+Fn
+kK
+TG
+Fn
+TG
+TG
+TG
+TG
+qg
+TG
+Fn
+Fn
+SY
+Fn
+Fn
+Ds
+Ds
+Fn
+YI
+Fn
+Fn
+Fn
+TX
+aE
+aE
+aE
+aE
+uk
+Fn
+Al
+iz
+pr
+pr
+pr
+pr
+pr
+pr
+pr
+xW
+"}
+(37,1,1) = {"
+iz
+Al
+Fn
+Ia
+dI
+Fn
+Fn
+Fn
+QP
+TG
+TG
+TG
+TG
+TG
+TG
+TG
+TG
+TG
+TG
+Fn
+ve
+nP
+ed
+Fn
+Cv
+Cv
+IM
+Cv
+Cv
+Fn
+Fn
+Al
+iz
+pr
+pr
+pr
+pr
+pr
+pr
+pr
+xW
+"}
+(38,1,1) = {"
+iz
+Al
+Fn
+tZ
+TG
+Qu
+Hs
+Fn
+Fn
+Fn
+TG
+rc
+TG
+TG
+TG
+tF
+rc
+TG
+TG
+Fn
+Yq
+aZ
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Al
+Al
+iz
+pr
+pr
+pr
+pr
+pr
+pr
+pr
+xW
+"}
+(39,1,1) = {"
+iz
+Al
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Al
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Fn
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+iz
+pr
+pr
+pr
+pr
+pr
+pr
+pr
+xW
+"}
+(40,1,1) = {"
+iz
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+Al
+iz
+pr
+pr
+pr
+pr
+pr
+pr
+pr
+xW
+"}
+(41,1,1) = {"
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+iz
+pr
+pr
+pr
+pr
+pr
+pr
+pr
+xW
+"}
diff --git a/_maps/virtual_domains/blood_drunk_miner.dmm b/_maps/virtual_domains/blood_drunk_miner.dmm
new file mode 100644
index 00000000000..c3369a1c822
--- /dev/null
+++ b/_maps/virtual_domains/blood_drunk_miner.dmm
@@ -0,0 +1,1887 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"b" = (
+/obj/structure/stone_tile,
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"c" = (
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"d" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/indestructible/binary,
+/area/lavaland/surface/outdoors/virtual_domain)
+"f" = (
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile/block/cracked,
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"h" = (
+/obj/machinery/light/small/blacklight/directional/south,
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/virtual_domain/powered)
+"i" = (
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile/cracked,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"j" = (
+/obj/structure/marker_beacon/jade,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"k" = (
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"l" = (
+/obj/structure/stone_tile/block,
+/obj/structure/stone_tile/cracked{
+ dir = 4
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"m" = (
+/obj/structure/marker_beacon/olive,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"n" = (
+/obj/structure/marker_beacon/cerulean,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"o" = (
+/obj/structure/marker_beacon/yellow,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"q" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"r" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"s" = (
+/turf/closed/mineral/volcanic/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"t" = (
+/obj/structure/marker_beacon/indigo,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"u" = (
+/obj/structure/stone_tile/cracked,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"v" = (
+/turf/closed/indestructible/binary,
+/area/lavaland/surface/outdoors/virtual_domain)
+"w" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 4
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"x" = (
+/obj/structure/stone_tile,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"y" = (
+/obj/structure/marker_beacon/violet,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"z" = (
+/obj/structure/stone_tile/block,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"A" = (
+/obj/structure/stone_tile,
+/obj/structure/stone_tile/block/cracked{
+ dir = 8
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"C" = (
+/obj/effect/mob_spawn/corpse/human/miner,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"G" = (
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"H" = (
+/obj/structure/stone_tile/cracked{
+ dir = 8
+ },
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"I" = (
+/obj/structure/stone_tile/block{
+ dir = 4
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"J" = (
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"K" = (
+/obj/structure/marker_beacon/teal,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"L" = (
+/obj/effect/landmark/bitrunning/safehouse_spawn,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"O" = (
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/obj/structure/stone_tile/block{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"P" = (
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"S" = (
+/obj/structure/stone_tile/surrounding/cracked{
+ dir = 6
+ },
+/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/virtual_domain,
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"T" = (
+/obj/structure/stone_tile/block{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"W" = (
+/obj/structure/stone_tile/cracked{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"X" = (
+/obj/structure/stone_tile/cracked{
+ dir = 4
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Y" = (
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Z" = (
+/obj/structure/stone_tile/block{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+
+(1,1,1) = {"
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+d
+"}
+(2,1,1) = {"
+v
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+v
+"}
+(3,1,1) = {"
+v
+s
+s
+s
+s
+J
+J
+s
+s
+J
+J
+s
+s
+J
+J
+J
+J
+s
+s
+s
+J
+J
+J
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+J
+J
+s
+s
+s
+J
+J
+s
+s
+J
+J
+s
+v
+"}
+(4,1,1) = {"
+v
+s
+s
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+a
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+s
+v
+"}
+(5,1,1) = {"
+v
+s
+s
+J
+a
+J
+J
+J
+J
+a
+J
+J
+J
+J
+a
+a
+J
+J
+J
+J
+J
+a
+a
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+s
+s
+v
+"}
+(6,1,1) = {"
+v
+s
+s
+J
+a
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+a
+a
+a
+a
+a
+J
+J
+J
+a
+a
+J
+J
+J
+a
+a
+J
+a
+J
+a
+a
+J
+J
+J
+s
+s
+v
+"}
+(7,1,1) = {"
+v
+s
+s
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+J
+s
+v
+"}
+(8,1,1) = {"
+v
+s
+s
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+s
+s
+v
+"}
+(9,1,1) = {"
+v
+s
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+j
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+s
+v
+"}
+(10,1,1) = {"
+v
+s
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+t
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+s
+v
+"}
+(11,1,1) = {"
+v
+s
+s
+J
+J
+J
+a
+a
+a
+y
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+s
+v
+"}
+(12,1,1) = {"
+v
+s
+s
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+C
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+J
+s
+v
+"}
+(13,1,1) = {"
+v
+s
+s
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+s
+v
+"}
+(14,1,1) = {"
+v
+s
+s
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+T
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+s
+v
+"}
+(15,1,1) = {"
+v
+s
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+X
+z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+h
+c
+c
+c
+c
+c
+L
+a
+a
+J
+J
+s
+v
+"}
+(16,1,1) = {"
+v
+s
+J
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+T
+W
+a
+r
+a
+i
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+c
+c
+c
+c
+c
+c
+a
+a
+J
+J
+s
+v
+"}
+(17,1,1) = {"
+v
+s
+s
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+I
+b
+k
+l
+x
+a
+T
+k
+a
+a
+a
+m
+a
+a
+a
+a
+a
+o
+a
+a
+c
+c
+c
+c
+c
+c
+a
+a
+J
+J
+s
+v
+"}
+(18,1,1) = {"
+v
+s
+s
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+P
+S
+A
+O
+u
+r
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+c
+c
+c
+c
+c
+c
+a
+J
+J
+s
+s
+v
+"}
+(19,1,1) = {"
+v
+s
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+k
+G
+H
+x
+f
+k
+a
+Y
+T
+u
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+c
+c
+c
+c
+c
+c
+a
+a
+J
+J
+s
+v
+"}
+(20,1,1) = {"
+v
+s
+J
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+Y
+x
+a
+Z
+a
+z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+c
+c
+c
+c
+c
+c
+a
+a
+J
+J
+s
+v
+"}
+(21,1,1) = {"
+v
+s
+s
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+h
+c
+c
+c
+c
+c
+q
+a
+a
+J
+s
+s
+v
+"}
+(22,1,1) = {"
+v
+s
+s
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+w
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+s
+s
+v
+"}
+(23,1,1) = {"
+v
+s
+J
+J
+a
+a
+a
+a
+a
+a
+n
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+s
+s
+v
+"}
+(24,1,1) = {"
+v
+s
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+C
+a
+a
+a
+a
+a
+J
+J
+s
+v
+"}
+(25,1,1) = {"
+v
+s
+s
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+J
+s
+v
+"}
+(26,1,1) = {"
+v
+s
+s
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+K
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+s
+v
+"}
+(27,1,1) = {"
+v
+s
+s
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+j
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+s
+v
+"}
+(28,1,1) = {"
+v
+s
+J
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+J
+s
+v
+"}
+(29,1,1) = {"
+v
+s
+J
+J
+J
+J
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+J
+J
+s
+s
+v
+"}
+(30,1,1) = {"
+v
+s
+s
+J
+J
+J
+J
+a
+a
+J
+J
+J
+a
+a
+a
+a
+J
+J
+J
+a
+a
+a
+J
+J
+J
+a
+a
+a
+J
+J
+a
+a
+a
+a
+a
+a
+J
+J
+a
+a
+a
+J
+J
+s
+s
+v
+"}
+(31,1,1) = {"
+v
+s
+s
+a
+J
+J
+J
+J
+J
+J
+J
+J
+J
+a
+a
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+a
+a
+a
+J
+J
+J
+J
+J
+J
+J
+J
+J
+s
+v
+"}
+(32,1,1) = {"
+v
+s
+s
+a
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+a
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+s
+v
+"}
+(33,1,1) = {"
+v
+s
+s
+s
+s
+s
+J
+J
+s
+s
+s
+s
+J
+J
+s
+s
+s
+s
+s
+s
+J
+J
+s
+s
+s
+s
+J
+J
+s
+s
+s
+s
+J
+J
+J
+s
+s
+s
+s
+s
+s
+J
+J
+J
+s
+v
+"}
+(34,1,1) = {"
+v
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+s
+v
+"}
+(35,1,1) = {"
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+"}
diff --git a/_maps/virtual_domains/bubblegum.dmm b/_maps/virtual_domains/bubblegum.dmm
new file mode 100644
index 00000000000..3381b173539
--- /dev/null
+++ b/_maps/virtual_domains/bubblegum.dmm
@@ -0,0 +1,2250 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"c" = (
+/obj/effect/mob_spawn/corpse/human/miner,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"d" = (
+/obj/structure/marker_beacon/jade,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"f" = (
+/obj/structure/marker_beacon/burgundy,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"g" = (
+/obj/structure/marker_beacon/teal,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"p" = (
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"r" = (
+/obj/structure/marker_beacon/fuchsia,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"w" = (
+/obj/machinery/light/small/blacklight/directional/south,
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/virtual_domain/powered)
+"x" = (
+/obj/structure/marker_beacon/olive,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"z" = (
+/obj/structure/marker_beacon/purple,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"A" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"C" = (
+/mob/living/simple_animal/hostile/megafauna/bubblegum/virtual_domain,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"F" = (
+/turf/open/indestructible/binary,
+/area/lavaland/surface/outdoors/virtual_domain)
+"G" = (
+/obj/structure/marker_beacon/violet,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"I" = (
+/obj/structure/marker_beacon/bronze,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"M" = (
+/obj/structure/marker_beacon/indigo,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"R" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/open/indestructible/binary,
+/area/lavaland/surface/outdoors/virtual_domain)
+"S" = (
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"T" = (
+/obj/effect/landmark/bitrunning/safehouse_spawn,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"W" = (
+/obj/structure/marker_beacon/cerulean,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"X" = (
+/obj/structure/marker_beacon/lime,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Y" = (
+/obj/structure/marker_beacon/yellow,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Z" = (
+/turf/closed/mineral/volcanic/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+
+(1,1,1) = {"
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+R
+"}
+(2,1,1) = {"
+F
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+F
+"}
+(3,1,1) = {"
+F
+Z
+a
+a
+Z
+Z
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+Z
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+Z
+a
+a
+a
+a
+a
+a
+Z
+Z
+Z
+F
+"}
+(4,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+F
+"}
+(5,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+p
+Z
+F
+"}
+(6,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+G
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+p
+p
+Z
+F
+"}
+(7,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+x
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+a
+a
+a
+a
+p
+Z
+F
+"}
+(8,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+Z
+a
+a
+a
+Z
+Z
+F
+"}
+(9,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+p
+p
+p
+p
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+Z
+F
+"}
+(10,1,1) = {"
+F
+Z
+Z
+a
+a
+a
+a
+a
+Z
+Z
+Z
+p
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+Z
+F
+"}
+(11,1,1) = {"
+F
+Z
+Z
+a
+a
+a
+a
+a
+Z
+Z
+Z
+p
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+p
+p
+a
+a
+a
+a
+a
+Z
+F
+"}
+(12,1,1) = {"
+F
+Z
+Z
+a
+a
+a
+a
+a
+p
+Z
+p
+p
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+Z
+a
+a
+a
+a
+a
+a
+a
+p
+a
+a
+a
+a
+a
+Z
+F
+"}
+(13,1,1) = {"
+F
+Z
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+Z
+Z
+a
+a
+a
+a
+a
+M
+a
+a
+a
+a
+a
+a
+a
+Z
+F
+"}
+(14,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+Z
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+F
+"}
+(15,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+c
+a
+a
+a
+a
+a
+a
+Z
+F
+"}
+(16,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+I
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+F
+"}
+(17,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+W
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+F
+"}
+(18,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+F
+"}
+(19,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+F
+"}
+(20,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+F
+"}
+(21,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+w
+S
+S
+S
+S
+S
+T
+a
+Z
+F
+"}
+(22,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+S
+S
+S
+S
+S
+S
+a
+Z
+F
+"}
+(23,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+C
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+S
+S
+S
+S
+S
+S
+a
+Z
+F
+"}
+(24,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+X
+a
+a
+S
+S
+S
+S
+S
+S
+a
+Z
+F
+"}
+(25,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+S
+S
+S
+S
+S
+S
+a
+Z
+F
+"}
+(26,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+S
+S
+S
+S
+S
+S
+a
+Z
+F
+"}
+(27,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+w
+S
+S
+S
+S
+S
+A
+a
+Z
+F
+"}
+(28,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+f
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+F
+"}
+(29,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+F
+"}
+(30,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+Z
+Z
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+F
+"}
+(31,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+Z
+Z
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+F
+"}
+(32,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+a
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+F
+"}
+(33,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+a
+a
+a
+a
+a
+a
+a
+Z
+F
+"}
+(34,1,1) = {"
+F
+Z
+Z
+a
+a
+a
+a
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+F
+"}
+(35,1,1) = {"
+F
+Z
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+X
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+Z
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+F
+"}
+(36,1,1) = {"
+F
+Z
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+Z
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+F
+"}
+(37,1,1) = {"
+F
+Z
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+Z
+F
+"}
+(38,1,1) = {"
+F
+Z
+a
+a
+a
+p
+p
+a
+a
+a
+a
+a
+g
+a
+a
+a
+a
+Z
+a
+a
+a
+a
+a
+a
+p
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+Z
+F
+"}
+(39,1,1) = {"
+F
+Z
+a
+a
+a
+p
+p
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+Z
+Z
+a
+a
+a
+a
+a
+p
+p
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+F
+"}
+(40,1,1) = {"
+F
+Z
+a
+c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+F
+"}
+(41,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Y
+a
+a
+a
+a
+a
+a
+a
+Z
+F
+"}
+(42,1,1) = {"
+F
+Z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+Z
+F
+"}
+(43,1,1) = {"
+F
+Z
+a
+Z
+Z
+Z
+Z
+a
+a
+a
+a
+a
+Z
+Z
+Z
+Z
+a
+a
+a
+Z
+Z
+Z
+Z
+Z
+a
+a
+a
+a
+a
+a
+Z
+Z
+Z
+Z
+a
+a
+a
+a
+a
+a
+Z
+Z
+a
+a
+Z
+F
+"}
+(44,1,1) = {"
+F
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+F
+"}
+(45,1,1) = {"
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+F
+"}
diff --git a/_maps/virtual_domains/clown_planet.dmm b/_maps/virtual_domains/clown_planet.dmm
new file mode 100644
index 00000000000..01d7b88a5ef
--- /dev/null
+++ b/_maps/virtual_domains/clown_planet.dmm
@@ -0,0 +1,2323 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ai" = (
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/west,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"aI" = (
+/obj/item/bikehorn/airhorn,
+/turf/open/floor/carpet,
+/area/virtual_domain/powered)
+"aM" = (
+/obj/item/bikehorn,
+/turf/open/indestructible/honk,
+/area/virtual_domain/powered)
+"aP" = (
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/obj/effect/decal/cleanable/food/pie_smudge,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"ba" = (
+/obj/structure/mecha_wreckage/honker,
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ invisibility = 101
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"bi" = (
+/obj/item/bikehorn,
+/obj/structure/disposalpipe/segment{
+ invisibility = 101
+ },
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"bp" = (
+/turf/open/indestructible/light,
+/area/virtual_domain/powered)
+"bq" = (
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/indestructible/white,
+/area/virtual_domain/powered)
+"by" = (
+/turf/closed/wall/r_wall,
+/area/lavaland/surface/outdoors/virtual_domain)
+"bQ" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ invisibility = 101
+ },
+/obj/effect/turf_decal/tile/red/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"bR" = (
+/obj/item/paper/crumpled/bloody/ruins/lavaland/clown_planet/hope,
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/mapping_helpers/no_lava,
+/turf/open/floor/noslip,
+/area/virtual_domain/powered)
+"bU" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"cw" = (
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"cM" = (
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/obj/structure/disposaloutlet{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"cW" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
+ invisibility = 101
+ },
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"ed" = (
+/obj/structure/disposalpipe/segment{
+ invisibility = 101
+ },
+/obj/machinery/light/small/directional/west,
+/turf/open/indestructible/white,
+/area/virtual_domain/powered)
+"eE" = (
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/disposalpipe/segment{
+ invisibility = 101
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"fh" = (
+/obj/effect/mob_spawn/corpse/human/damaged,
+/obj/effect/decal/cleanable/blood/old,
+/obj/structure/disposalpipe/segment{
+ invisibility = 101
+ },
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"gr" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"gy" = (
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"gH" = (
+/obj/item/bikehorn,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/indestructible/honk,
+/area/virtual_domain/powered)
+"gK" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/indestructible/white,
+/area/virtual_domain/powered)
+"hK" = (
+/obj/item/clothing/head/cone,
+/obj/effect/mapping_helpers/no_lava,
+/turf/open/floor/noslip,
+/area/virtual_domain/powered)
+"hY" = (
+/turf/template_noop,
+/area/template_noop)
+"ij" = (
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/obj/machinery/disposal/delivery_chute{
+ dir = 4
+ },
+/turf/open/floor/noslip,
+/area/virtual_domain/powered)
+"ik" = (
+/turf/open/lava/smooth,
+/area/virtual_domain/powered)
+"iR" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ invisibility = 101
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"ki" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ invisibility = 101
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"kn" = (
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"lj" = (
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/obj/machinery/disposal/delivery_chute{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"lm" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/machinery/light/small/directional/east,
+/turf/open/indestructible/white,
+/area/virtual_domain/powered)
+"lr" = (
+/obj/item/bikehorn,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
+ invisibility = 101
+ },
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"lx" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"ly" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/closed/indestructible/binary,
+/area/lavaland/surface/outdoors/virtual_domain)
+"lP" = (
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"mD" = (
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"mE" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"mF" = (
+/turf/open/floor/carpet,
+/area/virtual_domain/powered)
+"nE" = (
+/obj/effect/mapping_helpers/no_lava,
+/turf/closed/wall/r_wall,
+/area/virtual_domain/powered)
+"oA" = (
+/obj/effect/turf_decal/tile/red/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"oI" = (
+/obj/structure/table/glass,
+/obj/item/grown/bananapeel/bluespace,
+/turf/open/floor/carpet,
+/area/virtual_domain/powered)
+"pl" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"ps" = (
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/effect/turf_decal/tile/red/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"qM" = (
+/obj/structure/disposalpipe/segment{
+ invisibility = 101
+ },
+/obj/machinery/light/small/directional/north,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"rg" = (
+/obj/item/coin/bananium,
+/obj/item/coin/bananium,
+/obj/item/coin/bananium,
+/obj/item/coin/bananium,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/carpet,
+/area/virtual_domain/powered)
+"rh" = (
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/indestructible/white,
+/area/virtual_domain/powered)
+"rr" = (
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/closed/indestructible/binary,
+/area/lavaland/surface/outdoors/virtual_domain)
+"rH" = (
+/obj/structure/disposalpipe/junction/yjunction{
+ dir = 1;
+ invisibility = 101
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"rT" = (
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/closed/indestructible/binary,
+/area/lavaland/surface/outdoors/virtual_domain)
+"sq" = (
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/tile/red/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"sT" = (
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/mail_sorting/supply/qm_office,
+/turf/closed/wall/r_wall,
+/area/virtual_domain/powered)
+"tq" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"tt" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ invisibility = 101
+ },
+/turf/open/indestructible/light,
+/area/virtual_domain/powered)
+"tv" = (
+/obj/effect/mob_spawn/corpse/human/damaged,
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"tF" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/indestructible/binary,
+/area/lavaland/surface/outdoors/virtual_domain)
+"tI" = (
+/obj/item/coin/bananium,
+/obj/item/coin/bananium,
+/obj/item/coin/bananium,
+/obj/item/coin/bananium,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/carpet,
+/area/virtual_domain/powered)
+"uX" = (
+/obj/effect/mapping_helpers/no_lava,
+/mob/living/basic/clown,
+/turf/open/floor/noslip,
+/area/virtual_domain/powered)
+"uY" = (
+/turf/closed/mineral/bananium,
+/area/virtual_domain/powered)
+"uZ" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ invisibility = 101
+ },
+/obj/structure/table,
+/obj/item/paper/crumpled/bloody/ruins/lavaland/clown_planet/escape,
+/obj/item/pen/fourcolor,
+/turf/open/indestructible/white,
+/area/virtual_domain/powered)
+"wz" = (
+/obj/machinery/light/small/directional/south,
+/obj/effect/mapping_helpers/no_lava,
+/mob/living/basic/clown,
+/turf/open/floor/noslip,
+/area/virtual_domain/powered)
+"xt" = (
+/obj/effect/landmark/bitrunning/safehouse_spawn,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"yd" = (
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"yz" = (
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/closed/wall/r_wall,
+/area/virtual_domain/powered)
+"yS" = (
+/obj/structure/marker_beacon/yellow,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"yZ" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"zm" = (
+/obj/effect/decal/cleanable/cobweb,
+/obj/effect/turf_decal/tile/red/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"zA" = (
+/obj/structure/statue/bananium/clown,
+/turf/open/floor/carpet,
+/area/virtual_domain/powered)
+"zF" = (
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/obj/structure/disposaloutlet{
+ dir = 8
+ },
+/turf/open/floor/noslip,
+/area/virtual_domain/powered)
+"Aa" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/effect/turf_decal/tile/red/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"Bi" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ invisibility = 101
+ },
+/obj/effect/decal/cleanable/cobweb,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"Cp" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ invisibility = 101
+ },
+/obj/machinery/light/small/directional/west,
+/turf/open/indestructible/white,
+/area/virtual_domain/powered)
+"Cs" = (
+/obj/item/bikehorn,
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ invisibility = 101
+ },
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"Dh" = (
+/turf/closed/wall/r_wall,
+/area/virtual_domain/powered)
+"Do" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ invisibility = 101
+ },
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"DL" = (
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/item/bikehorn,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"Ex" = (
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"FI" = (
+/obj/item/reagent_containers/cup/glass/trophy/gold_cup,
+/obj/structure/table/glass,
+/turf/open/floor/carpet,
+/area/virtual_domain/powered)
+"Gg" = (
+/obj/structure/table/glass,
+/obj/item/gun/magic/staff/honk,
+/turf/open/floor/carpet,
+/area/virtual_domain/powered)
+"Hq" = (
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Hr" = (
+/obj/structure/table/glass,
+/obj/item/clothing/shoes/clown_shoes/banana_shoes,
+/turf/open/floor/carpet,
+/area/virtual_domain/powered)
+"HQ" = (
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/obj/machinery/light/small/directional/east,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"Ie" = (
+/turf/closed/indestructible/binary,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Iz" = (
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"IN" = (
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/closed/wall/r_wall,
+/area/virtual_domain/powered)
+"IY" = (
+/turf/open/indestructible/honk,
+/area/virtual_domain/powered)
+"Jv" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/indestructible/honk,
+/area/virtual_domain/powered)
+"JB" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ invisibility = 101
+ },
+/obj/machinery/light/small/directional/north,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"Ka" = (
+/obj/effect/decal/cleanable/food/pie_smudge,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"Kh" = (
+/obj/effect/mob_spawn/corpse/human/damaged,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/indestructible/honk,
+/area/virtual_domain/powered)
+"KG" = (
+/obj/item/pickaxe,
+/turf/open/indestructible/white,
+/area/virtual_domain/powered)
+"KI" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ invisibility = 101
+ },
+/turf/closed/wall/r_wall,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Lv" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ invisibility = 101
+ },
+/obj/machinery/light/small/directional/east,
+/turf/open/indestructible/white,
+/area/virtual_domain/powered)
+"Nv" = (
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/indestructible/honk,
+/area/virtual_domain/powered)
+"NB" = (
+/obj/machinery/disposal/delivery_chute,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/turf/open/floor/carpet,
+/area/virtual_domain/powered)
+"NL" = (
+/obj/machinery/disposal/delivery_chute{
+ desc = "The following is engraved upon the chute: A FATE WORSE THAN DEATH LIES WITHIN";
+ dir = 1;
+ name = "THE TRIAL OF HONKITUDE"
+ },
+/obj/structure/disposalpipe/trunk,
+/obj/effect/mapping_helpers/no_lava,
+/turf/open/floor/noslip,
+/area/virtual_domain/powered)
+"NW" = (
+/obj/structure/table/glass,
+/obj/item/reagent_containers/spray/waterflower/superlube,
+/turf/open/floor/carpet,
+/area/virtual_domain/powered)
+"Ok" = (
+/obj/item/bikehorn,
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"Ov" = (
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"PJ" = (
+/obj/structure/disposalpipe/trunk,
+/obj/structure/disposaloutlet{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/no_lava,
+/turf/open/floor/noslip,
+/area/virtual_domain/powered)
+"PM" = (
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"PQ" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ invisibility = 101
+ },
+/obj/item/pickaxe,
+/turf/open/indestructible/white,
+/area/virtual_domain/powered)
+"QP" = (
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"QX" = (
+/obj/structure/closet/crate/secure/bitrunning/encrypted,
+/turf/open/floor/carpet,
+/area/virtual_domain/powered)
+"Rh" = (
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/indestructible/white,
+/area/virtual_domain/powered)
+"Rx" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ invisibility = 101
+ },
+/obj/structure/table,
+/obj/item/flashlight/lamp/bananalamp,
+/turf/open/indestructible/white,
+/area/virtual_domain/powered)
+"RU" = (
+/obj/structure/disposalpipe/segment{
+ invisibility = 101
+ },
+/turf/closed/indestructible/binary,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Sg" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ invisibility = 101
+ },
+/obj/effect/decal/cleanable/food/pie_smudge,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"Sm" = (
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/closed/wall/r_wall,
+/area/virtual_domain/powered)
+"Tm" = (
+/obj/effect/decal/cleanable/food/pie_smudge,
+/obj/structure/disposalpipe/segment{
+ invisibility = 101
+ },
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"Tx" = (
+/obj/structure/disposalpipe/segment{
+ invisibility = 101
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"TH" = (
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/obj/structure/disposaloutlet{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"TK" = (
+/obj/structure/disposalpipe/segment{
+ invisibility = 101
+ },
+/turf/closed/wall/r_wall,
+/area/virtual_domain/powered)
+"Ug" = (
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/carpet,
+/area/virtual_domain/powered)
+"UL" = (
+/obj/effect/decal/cleanable/oil,
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"UN" = (
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"UQ" = (
+/obj/structure/disposalpipe/segment{
+ invisibility = 101
+ },
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"UY" = (
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"Vv" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ invisibility = 101
+ },
+/turf/closed/wall/r_wall,
+/area/virtual_domain/powered)
+"Vx" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ invisibility = 101
+ },
+/turf/closed/indestructible/binary,
+/area/lavaland/surface/outdoors/virtual_domain)
+"VI" = (
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/closed/indestructible/binary,
+/area/lavaland/surface/outdoors/virtual_domain)
+"VQ" = (
+/turf/open/floor/noslip,
+/area/virtual_domain/powered)
+"Ww" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ invisibility = 101
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/turf/open/indestructible/permalube,
+/area/virtual_domain/powered)
+"WB" = (
+/obj/machinery/disposal/delivery_chute{
+ dir = 1
+ },
+/obj/structure/disposalpipe/trunk,
+/turf/open/indestructible/white,
+/area/virtual_domain/powered)
+"WT" = (
+/obj/machinery/door/airlock/bananium,
+/turf/open/indestructible/honk,
+/area/virtual_domain/powered)
+"WX" = (
+/turf/open/indestructible/white,
+/area/virtual_domain/powered)
+"Xp" = (
+/obj/machinery/light/directional/south,
+/turf/open/indestructible/honk,
+/area/virtual_domain/powered)
+"XB" = (
+/obj/machinery/light/directional/north,
+/turf/open/indestructible/honk,
+/area/virtual_domain/powered)
+"Yb" = (
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/indestructible/honk,
+/area/virtual_domain/powered)
+"YP" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ invisibility = 101
+ },
+/turf/open/indestructible/white,
+/area/virtual_domain/powered)
+"ZR" = (
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/obj/structure/disposaloutlet{
+ dir = 4
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+
+(1,1,1) = {"
+Ie
+Ie
+rT
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+rr
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+"}
+(2,1,1) = {"
+Ie
+Ie
+Vx
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Vx
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+"}
+(3,1,1) = {"
+Ie
+Ie
+Vx
+Ie
+Ie
+Ie
+Ie
+Ie
+Dh
+Dh
+Dh
+Dh
+Dh
+Dh
+Dh
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Dh
+Dh
+Dh
+Dh
+Dh
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Vx
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+"}
+(4,1,1) = {"
+Ie
+Ie
+Vx
+Ie
+Ie
+Ie
+Dh
+Dh
+Dh
+ik
+ik
+ik
+ik
+ik
+Dh
+Dh
+Ie
+Ie
+Ie
+Ie
+Ie
+Dh
+Dh
+ik
+ik
+ik
+Dh
+Dh
+Dh
+Ie
+Ie
+Ie
+Ie
+Vx
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+"}
+(5,1,1) = {"
+Ie
+Ie
+Vx
+Ie
+Ie
+Dh
+Dh
+ik
+ik
+ik
+Hq
+Sm
+Hq
+Sm
+ik
+Dh
+Dh
+Ie
+Ie
+Ie
+Dh
+Dh
+ik
+ik
+tq
+mD
+ik
+ik
+Dh
+Dh
+Ie
+Ie
+Ie
+Vx
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+"}
+(6,1,1) = {"
+Ie
+Ie
+Vx
+Ie
+Dh
+Dh
+ik
+ik
+IN
+Tx
+bU
+ai
+yZ
+aP
+Sm
+ik
+Dh
+Dh
+Dh
+Dh
+Dh
+Nv
+IY
+tq
+ik
+ik
+ik
+ik
+ik
+Dh
+Dh
+Ie
+Ie
+Vx
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+"}
+(7,1,1) = {"
+Ie
+Ie
+Vx
+Ie
+Dh
+ik
+ik
+Dh
+Bi
+cw
+UQ
+lr
+UQ
+UY
+Vv
+ik
+Dh
+IY
+Jv
+IY
+Dh
+IY
+Jv
+Kh
+IY
+tq
+ik
+tq
+ik
+ik
+Dh
+Ie
+Ie
+Vx
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+"}
+(8,1,1) = {"
+Ie
+Ie
+Vx
+Dh
+Dh
+ik
+IN
+Tm
+lx
+Ww
+cw
+UQ
+Sm
+Vv
+Vv
+Dh
+zm
+oA
+IY
+Jv
+Jv
+IY
+Jv
+IY
+IY
+IY
+Dh
+ik
+mD
+ik
+Dh
+Dh
+Ie
+Vx
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+"}
+(9,1,1) = {"
+Ie
+Ie
+Vx
+Dh
+ik
+ik
+UN
+UQ
+UY
+Ww
+Vv
+TH
+Vv
+YP
+Cp
+uY
+Dh
+sq
+oA
+IY
+Dh
+Dh
+Jv
+Dh
+IY
+IY
+IY
+tq
+ik
+ik
+ik
+Dh
+Ie
+Vx
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+tF
+"}
+(10,1,1) = {"
+Ie
+Ie
+Vx
+Dh
+ik
+IN
+UQ
+UQ
+yZ
+Do
+Do
+Vv
+YP
+YP
+YP
+KG
+uY
+Dh
+Dh
+oA
+IY
+IY
+Jv
+IY
+IY
+gH
+Jv
+Xp
+Dh
+ik
+ik
+Dh
+by
+KI
+by
+by
+by
+by
+by
+by
+by
+by
+by
+Ie
+"}
+(11,1,1) = {"
+Ie
+Ie
+Vx
+Dh
+ik
+yz
+fh
+UQ
+UY
+Vv
+Ww
+Vv
+YP
+YP
+tt
+bp
+WX
+oA
+oA
+oA
+IY
+Dh
+IY
+IY
+Jv
+Jv
+IY
+IY
+ik
+tq
+ik
+Dh
+by
+iR
+PM
+PM
+PM
+PM
+PM
+PM
+PM
+PM
+by
+Ie
+"}
+(12,1,1) = {"
+Ie
+Ie
+Vx
+Dh
+ik
+Hq
+TK
+qM
+yZ
+Ww
+Ww
+Vv
+YP
+PQ
+tt
+bp
+uY
+Dh
+oA
+oA
+IY
+IY
+Dh
+IY
+IY
+IY
+IY
+Jv
+ik
+tq
+ik
+ik
+by
+iR
+yS
+PM
+PM
+PM
+PM
+PM
+yS
+PM
+by
+Ie
+"}
+(13,1,1) = {"
+Ie
+Ie
+Vx
+Dh
+ik
+UN
+UQ
+UQ
+DL
+Ww
+yz
+lx
+Vv
+YP
+Lv
+WX
+Dh
+Dh
+oA
+IY
+IY
+Dh
+Dh
+IY
+IY
+Dh
+IY
+Jv
+ik
+mD
+tq
+ik
+by
+iR
+PM
+PM
+PM
+PM
+PM
+PM
+PM
+PM
+by
+Ie
+"}
+(14,1,1) = {"
+Ie
+Dh
+Vv
+nE
+nE
+mD
+cw
+UQ
+lx
+Ex
+Tm
+UQ
+lx
+Vv
+Vv
+ps
+TK
+Sm
+Dh
+Dh
+Dh
+zA
+rg
+Dh
+XB
+IY
+Jv
+gH
+IY
+ik
+tq
+ik
+by
+iR
+PM
+QP
+QP
+QP
+QP
+QP
+xt
+PM
+by
+Ie
+"}
+(15,1,1) = {"
+Ie
+Dh
+ij
+hK
+nE
+Dh
+yz
+UQ
+UQ
+UQ
+UQ
+bi
+UQ
+yZ
+Do
+Iz
+kn
+Ww
+Dh
+Dh
+FI
+mF
+mF
+mF
+Dh
+IY
+Jv
+Jv
+IY
+ik
+tq
+ik
+by
+ZR
+PM
+QP
+QP
+QP
+QP
+QP
+QP
+PM
+by
+Ie
+"}
+(16,1,1) = {"
+Ie
+Dh
+VQ
+uX
+NL
+TK
+Tx
+UQ
+TK
+UQ
+cW
+TK
+Tm
+UQ
+yZ
+pl
+Do
+Ex
+UY
+Dh
+Ug
+oI
+NW
+mF
+Dh
+Dh
+Jv
+IY
+IY
+ik
+tq
+ik
+by
+PM
+PM
+QP
+QP
+QP
+QP
+QP
+QP
+PM
+by
+Ie
+"}
+(17,1,1) = {"
+Ie
+Dh
+VQ
+bR
+wz
+Dh
+Hq
+UQ
+Sm
+cw
+UY
+cw
+UQ
+UQ
+Tx
+gy
+Ex
+UY
+Iz
+TK
+NB
+mF
+aI
+mF
+WT
+IY
+Jv
+IY
+Dh
+ik
+tq
+ik
+by
+PM
+PM
+QP
+QP
+QP
+QP
+QP
+QP
+PM
+by
+Ie
+"}
+(18,1,1) = {"
+Ie
+Dh
+VQ
+uX
+PJ
+TK
+sT
+kn
+Do
+Do
+Vv
+Do
+Ov
+UQ
+UY
+Ok
+mE
+rH
+pl
+Dh
+mF
+Hr
+Gg
+mF
+Dh
+IY
+IY
+IY
+IY
+ik
+tq
+ik
+by
+PM
+PM
+QP
+QP
+QP
+QP
+QP
+QP
+PM
+by
+Ie
+"}
+(19,1,1) = {"
+Ie
+Dh
+zF
+uX
+nE
+Dh
+Dh
+Ww
+Ww
+Ww
+Do
+Do
+Do
+lP
+Ex
+UY
+Ka
+Vv
+tv
+Dh
+FI
+mF
+mF
+QX
+Dh
+IY
+IY
+IY
+IY
+ik
+tq
+ik
+by
+lj
+PM
+QP
+QP
+QP
+QP
+QP
+QP
+PM
+by
+Ie
+"}
+(20,1,1) = {"
+Ie
+Dh
+Vv
+nE
+nE
+ik
+Dh
+Ww
+Ww
+Cs
+Do
+Do
+Vv
+Dh
+Dh
+bQ
+Dh
+ba
+Dh
+IY
+Dh
+zA
+tI
+Dh
+XB
+IY
+Jv
+Jv
+IY
+ik
+tq
+ik
+by
+iR
+PM
+QP
+QP
+QP
+QP
+QP
+gr
+PM
+by
+Ie
+"}
+(21,1,1) = {"
+Ie
+Ie
+Vx
+Dh
+ik
+Dh
+Dh
+Do
+Do
+Do
+Ww
+Do
+Vv
+rh
+ed
+gK
+Dh
+UL
+Sm
+IY
+IY
+Dh
+Dh
+Kh
+IY
+IY
+Jv
+IY
+ik
+tq
+mD
+ik
+by
+iR
+PM
+PM
+PM
+PM
+PM
+PM
+PM
+PM
+by
+Ie
+"}
+(22,1,1) = {"
+Ie
+Ie
+Vx
+Dh
+ik
+Dh
+Dh
+JB
+Sg
+Vv
+Ww
+Vv
+uZ
+YP
+bp
+bp
+uY
+Dh
+bQ
+oA
+IY
+IY
+Dh
+IY
+Jv
+IY
+IY
+IY
+ik
+tq
+ik
+ik
+by
+iR
+PM
+PM
+yS
+PM
+PM
+PM
+PM
+PM
+by
+Ie
+"}
+(23,1,1) = {"
+Ie
+Ie
+Vx
+Dh
+ik
+cM
+eE
+lx
+Vv
+ki
+Ww
+Vv
+Rx
+YP
+bp
+bp
+WB
+TK
+Aa
+Dh
+IY
+IY
+Jv
+Jv
+Jv
+IY
+aM
+Xp
+Dh
+tq
+ik
+Dh
+by
+iR
+PM
+PM
+PM
+PM
+PM
+PM
+PM
+PM
+by
+Ie
+"}
+(24,1,1) = {"
+Ie
+Ie
+Vx
+Dh
+ik
+Dh
+Dh
+lP
+Do
+Do
+Cs
+bQ
+YP
+bq
+Rh
+WX
+uY
+Dh
+oA
+oA
+IY
+IY
+Jv
+Jv
+IY
+IY
+Dh
+Dh
+ik
+mD
+ik
+Dh
+by
+KI
+by
+by
+by
+by
+by
+by
+by
+by
+by
+Ie
+"}
+(25,1,1) = {"
+Ie
+Ie
+Vx
+Dh
+ik
+Dh
+Dh
+pl
+Do
+Vv
+Do
+Vv
+Vv
+rh
+lm
+uY
+Dh
+sq
+oA
+IY
+IY
+IY
+IY
+IY
+Dh
+IY
+IY
+ik
+mD
+ik
+ik
+Dh
+Ie
+Vx
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+"}
+(26,1,1) = {"
+Ie
+Ie
+Vx
+Dh
+ik
+ik
+Dh
+yd
+Do
+Do
+Do
+Ex
+lx
+Vv
+Dh
+Dh
+oA
+oA
+IY
+IY
+IY
+Jv
+aM
+IY
+IY
+IY
+Dh
+ik
+tq
+ik
+Dh
+Dh
+Ie
+Vx
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+"}
+(27,1,1) = {"
+Ie
+Ie
+Vx
+Dh
+Dh
+ik
+Dh
+Dh
+Ex
+lx
+HQ
+UQ
+UQ
+bU
+Dh
+ik
+Dh
+Yb
+IY
+IY
+Dh
+IY
+IY
+Dh
+IY
+IY
+ik
+mD
+ik
+ik
+Dh
+Ie
+Ie
+Vx
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+"}
+(28,1,1) = {"
+Ie
+Ie
+Vx
+Ie
+Dh
+Dh
+ik
+ik
+Dh
+mD
+Dh
+Ka
+lP
+mD
+Dh
+ik
+Dh
+Dh
+Dh
+Dh
+Dh
+IY
+IY
+IY
+ik
+ik
+ik
+ik
+ik
+Dh
+Dh
+Ie
+Ie
+Vx
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+"}
+(29,1,1) = {"
+Ie
+Ie
+Vx
+Ie
+Ie
+Dh
+Dh
+ik
+ik
+ik
+tq
+tq
+tq
+Dh
+ik
+Dh
+Dh
+Ie
+Ie
+Ie
+Dh
+Dh
+ik
+ik
+mD
+tq
+ik
+ik
+Dh
+Dh
+Ie
+Ie
+Ie
+Vx
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+"}
+(30,1,1) = {"
+Ie
+Ie
+Vx
+Ie
+Ie
+Ie
+Dh
+Dh
+Dh
+ik
+ik
+ik
+ik
+ik
+Dh
+Dh
+Ie
+Ie
+Ie
+Ie
+Ie
+Dh
+Dh
+ik
+ik
+ik
+Dh
+Dh
+Dh
+Ie
+Ie
+Ie
+Ie
+Vx
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+"}
+(31,1,1) = {"
+Ie
+Ie
+Vx
+Ie
+Ie
+Ie
+Ie
+Ie
+Dh
+Dh
+Dh
+Dh
+Dh
+Dh
+Dh
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Dh
+Dh
+Dh
+Dh
+Dh
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Vx
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+"}
+(32,1,1) = {"
+Ie
+Ie
+VI
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+RU
+ly
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+"}
+(33,1,1) = {"
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+Ie
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+"}
diff --git a/_maps/virtual_domains/colossus.dmm b/_maps/virtual_domains/colossus.dmm
new file mode 100644
index 00000000000..a9c3c6e6d79
--- /dev/null
+++ b/_maps/virtual_domains/colossus.dmm
@@ -0,0 +1,2250 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"c" = (
+/obj/structure/marker_beacon/olive,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"e" = (
+/obj/structure/marker_beacon/bronze,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"j" = (
+/obj/structure/marker_beacon/cerulean,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"k" = (
+/turf/closed/mineral/volcanic/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"l" = (
+/obj/structure/marker_beacon/lime,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"m" = (
+/obj/structure/marker_beacon/violet,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"o" = (
+/obj/effect/mob_spawn/corpse/human/miner,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"p" = (
+/mob/living/simple_animal/hostile/megafauna/colossus/virtual_domain,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"q" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/open/indestructible/binary,
+/area/lavaland/surface/outdoors/virtual_domain)
+"r" = (
+/obj/machinery/light/small/blacklight/directional/south,
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/virtual_domain/powered)
+"s" = (
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"u" = (
+/obj/structure/marker_beacon/indigo,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"v" = (
+/turf/open/indestructible/binary,
+/area/lavaland/surface/outdoors/virtual_domain)
+"x" = (
+/obj/structure/marker_beacon/purple,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"z" = (
+/obj/structure/marker_beacon/jade,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"B" = (
+/obj/structure/marker_beacon/teal,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"D" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"L" = (
+/obj/structure/marker_beacon/yellow,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"N" = (
+/obj/effect/landmark/bitrunning/safehouse_spawn,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"T" = (
+/obj/structure/marker_beacon/burgundy,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"U" = (
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"W" = (
+/obj/structure/marker_beacon/fuchsia,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+
+(1,1,1) = {"
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+q
+"}
+(2,1,1) = {"
+v
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+v
+"}
+(3,1,1) = {"
+v
+k
+a
+a
+k
+k
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+k
+k
+a
+a
+a
+a
+a
+a
+a
+a
+k
+k
+a
+a
+a
+a
+a
+a
+k
+k
+k
+v
+"}
+(4,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+v
+"}
+(5,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+s
+k
+v
+"}
+(6,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+m
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+s
+s
+k
+v
+"}
+(7,1,1) = {"
+v
+k
+a
+a
+a
+a
+o
+a
+a
+a
+a
+a
+a
+a
+a
+a
+c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+a
+a
+a
+a
+s
+k
+v
+"}
+(8,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+k
+a
+a
+a
+k
+k
+v
+"}
+(9,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+s
+s
+s
+s
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+k
+v
+"}
+(10,1,1) = {"
+v
+k
+k
+a
+a
+a
+a
+a
+k
+k
+k
+s
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+k
+v
+"}
+(11,1,1) = {"
+v
+k
+k
+a
+a
+a
+a
+a
+k
+k
+k
+s
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+k
+a
+a
+a
+a
+a
+a
+a
+a
+s
+s
+a
+a
+a
+a
+a
+k
+v
+"}
+(12,1,1) = {"
+v
+k
+k
+a
+a
+a
+a
+a
+s
+k
+s
+s
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+k
+a
+a
+a
+a
+a
+a
+a
+s
+a
+a
+a
+a
+a
+k
+v
+"}
+(13,1,1) = {"
+v
+k
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+k
+k
+a
+a
+a
+a
+a
+u
+a
+a
+a
+a
+a
+a
+a
+k
+v
+"}
+(14,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+k
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+v
+"}
+(15,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+v
+"}
+(16,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+e
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+v
+"}
+(17,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+j
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+v
+"}
+(18,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+v
+"}
+(19,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+v
+"}
+(20,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+x
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+v
+"}
+(21,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+r
+U
+U
+U
+U
+U
+N
+a
+k
+v
+"}
+(22,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+U
+U
+U
+U
+U
+U
+a
+k
+v
+"}
+(23,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+p
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+U
+U
+U
+U
+U
+U
+a
+k
+v
+"}
+(24,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+l
+a
+a
+U
+U
+U
+U
+U
+U
+a
+k
+v
+"}
+(25,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+U
+U
+U
+U
+U
+U
+a
+k
+v
+"}
+(26,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+U
+U
+U
+U
+U
+U
+a
+k
+v
+"}
+(27,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+o
+a
+r
+U
+U
+U
+U
+U
+D
+a
+k
+v
+"}
+(28,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+T
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+v
+"}
+(29,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+W
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+v
+"}
+(30,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+k
+k
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+v
+"}
+(31,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+k
+k
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+v
+"}
+(32,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+a
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+v
+"}
+(33,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+z
+a
+a
+a
+a
+a
+a
+a
+k
+v
+"}
+(34,1,1) = {"
+v
+k
+k
+a
+a
+a
+a
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+v
+"}
+(35,1,1) = {"
+v
+k
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+l
+a
+a
+a
+a
+a
+a
+a
+a
+k
+k
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+v
+"}
+(36,1,1) = {"
+v
+k
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+k
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+v
+"}
+(37,1,1) = {"
+v
+k
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+k
+v
+"}
+(38,1,1) = {"
+v
+k
+a
+a
+a
+s
+s
+a
+a
+a
+a
+a
+B
+a
+a
+a
+a
+k
+a
+a
+a
+a
+a
+a
+s
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+k
+v
+"}
+(39,1,1) = {"
+v
+k
+a
+a
+a
+s
+s
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+k
+k
+a
+a
+a
+a
+a
+s
+s
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+v
+"}
+(40,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+v
+"}
+(41,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+L
+a
+a
+a
+a
+a
+a
+a
+k
+v
+"}
+(42,1,1) = {"
+v
+k
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+k
+v
+"}
+(43,1,1) = {"
+v
+k
+a
+k
+k
+k
+k
+a
+a
+a
+a
+a
+k
+k
+k
+k
+a
+a
+a
+k
+k
+k
+k
+k
+a
+a
+a
+a
+a
+a
+k
+k
+k
+k
+a
+a
+a
+a
+a
+a
+k
+k
+a
+a
+k
+v
+"}
+(44,1,1) = {"
+v
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+k
+v
+"}
+(45,1,1) = {"
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+"}
diff --git a/_maps/virtual_domains/gondola_asteroid.dmm b/_maps/virtual_domains/gondola_asteroid.dmm
new file mode 100644
index 00000000000..d6377a4a4c1
--- /dev/null
+++ b/_maps/virtual_domains/gondola_asteroid.dmm
@@ -0,0 +1,1784 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/indestructible/binary,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"c" = (
+/turf/open/space/basic,
+/area/space)
+"e" = (
+/turf/open/misc/asteroid/airless,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"g" = (
+/obj/structure/marker_beacon{
+ light_color = "#FFE8AA";
+ light_range = 20
+ },
+/turf/open/floor/grass,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"h" = (
+/turf/closed/mineral/random,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"m" = (
+/obj/structure/closet/crate/secure/bitrunning/encrypted/gondola,
+/turf/open/floor/grass,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"n" = (
+/obj/structure/flora/bush/fullgrass/style_random,
+/turf/open/floor/grass,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"o" = (
+/turf/template_noop,
+/area/template_noop)
+"q" = (
+/obj/structure/flora/tree/palm,
+/turf/open/floor/grass,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"r" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"s" = (
+/obj/structure/flora/bush/sparsegrass/style_random,
+/turf/open/floor/grass,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"t" = (
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"w" = (
+/obj/structure/water_source/puddle,
+/turf/open/floor/grass,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"y" = (
+/obj/structure/flora/bush/stalky/style_random,
+/turf/open/floor/grass,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"z" = (
+/mob/living/simple_animal/pet/gondola/virtual_domain,
+/turf/open/floor/grass,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"A" = (
+/obj/structure/chair/wood{
+ dir = 8
+ },
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"C" = (
+/turf/open/floor/grass,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"D" = (
+/obj/structure/flora/bush/flowers_br/style_random,
+/turf/open/floor/grass,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"F" = (
+/obj/structure/flora/bush/grassy/style_random,
+/turf/open/floor/grass,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"I" = (
+/obj/structure/flora/bush/reed/style_random,
+/turf/open/floor/grass,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"J" = (
+/obj/structure/flora/bush/flowers_yw/style_random,
+/turf/open/floor/grass,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"K" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/indestructible/binary,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"M" = (
+/obj/structure/table/wood,
+/obj/item/storage/bag/tray,
+/obj/item/kitchen/fork,
+/obj/item/knife/kitchen,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"N" = (
+/obj/structure/flora/bush/large/style_random,
+/turf/open/floor/grass,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"O" = (
+/obj/effect/landmark/bitrunning/safehouse_spawn,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"Q" = (
+/obj/structure/flora/bush/lavendergrass/style_random,
+/turf/open/floor/grass,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"T" = (
+/obj/structure/flora/bush/sunny/style_random,
+/turf/open/floor/grass,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"V" = (
+/obj/structure/flora/coconuts,
+/turf/open/floor/grass,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"W" = (
+/obj/structure/flora/bush/ferny/style_random,
+/turf/open/floor/grass,
+/area/ruin/space/has_grav/powered/virtual_domain)
+
+(1,1,1) = {"
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+a
+a
+a
+a
+a
+a
+a
+a
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+"}
+(2,1,1) = {"
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+a
+a
+a
+h
+h
+h
+h
+h
+h
+a
+a
+o
+o
+o
+o
+o
+o
+o
+o
+o
+"}
+(3,1,1) = {"
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+a
+a
+a
+a
+a
+h
+h
+h
+h
+h
+h
+h
+h
+h
+a
+a
+K
+o
+o
+o
+o
+o
+o
+o
+"}
+(4,1,1) = {"
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+a
+a
+a
+a
+a
+a
+a
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+e
+a
+o
+o
+o
+o
+o
+o
+o
+"}
+(5,1,1) = {"
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+a
+a
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+C
+h
+h
+h
+h
+h
+a
+o
+o
+o
+o
+o
+o
+o
+"}
+(6,1,1) = {"
+o
+o
+o
+o
+o
+o
+o
+o
+a
+a
+a
+a
+a
+a
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+C
+C
+C
+C
+C
+C
+C
+h
+h
+h
+a
+o
+o
+o
+o
+o
+o
+o
+"}
+(7,1,1) = {"
+o
+o
+o
+o
+o
+o
+o
+a
+a
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+C
+C
+C
+C
+J
+C
+C
+C
+z
+C
+h
+h
+a
+o
+o
+o
+o
+o
+o
+o
+"}
+(8,1,1) = {"
+o
+o
+o
+o
+o
+a
+a
+a
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+C
+C
+C
+C
+Q
+C
+q
+C
+h
+h
+h
+h
+h
+e
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(9,1,1) = {"
+o
+o
+o
+o
+a
+a
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+C
+h
+C
+C
+C
+C
+C
+C
+C
+C
+V
+C
+C
+C
+C
+h
+h
+h
+e
+c
+c
+c
+c
+c
+c
+c
+a
+"}
+(10,1,1) = {"
+o
+o
+a
+a
+a
+h
+h
+h
+h
+h
+h
+h
+h
+C
+q
+C
+C
+W
+C
+C
+V
+C
+C
+q
+C
+C
+C
+C
+F
+C
+C
+h
+h
+h
+e
+c
+c
+c
+c
+c
+c
+c
+a
+"}
+(11,1,1) = {"
+o
+a
+a
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+C
+C
+C
+C
+C
+N
+C
+C
+C
+C
+C
+C
+s
+C
+C
+C
+h
+h
+h
+e
+c
+c
+c
+c
+c
+c
+c
+a
+"}
+(12,1,1) = {"
+o
+a
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+C
+s
+I
+J
+C
+C
+g
+C
+C
+V
+C
+z
+C
+y
+C
+g
+C
+h
+h
+h
+e
+c
+c
+c
+c
+c
+c
+c
+a
+"}
+(13,1,1) = {"
+a
+a
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+C
+C
+C
+C
+Q
+Q
+C
+z
+C
+C
+C
+C
+C
+C
+C
+s
+Q
+C
+C
+h
+h
+h
+e
+c
+c
+c
+c
+c
+c
+c
+a
+"}
+(14,1,1) = {"
+a
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+C
+C
+w
+C
+s
+C
+W
+C
+C
+C
+C
+C
+C
+N
+C
+C
+C
+C
+h
+h
+h
+h
+e
+c
+c
+c
+c
+c
+c
+c
+a
+"}
+(15,1,1) = {"
+a
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+z
+C
+C
+C
+C
+y
+C
+C
+C
+F
+s
+C
+C
+C
+C
+C
+w
+C
+h
+h
+h
+h
+h
+e
+c
+c
+c
+c
+c
+c
+c
+a
+"}
+(16,1,1) = {"
+a
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+C
+C
+C
+C
+C
+s
+Q
+C
+C
+C
+C
+C
+C
+C
+C
+h
+h
+h
+h
+e
+c
+c
+c
+c
+c
+c
+c
+a
+"}
+(17,1,1) = {"
+a
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+C
+C
+C
+Q
+D
+C
+C
+C
+C
+q
+C
+C
+C
+C
+h
+h
+h
+h
+t
+t
+t
+t
+t
+O
+c
+a
+"}
+(18,1,1) = {"
+a
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+C
+n
+I
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+h
+h
+h
+t
+t
+M
+M
+t
+t
+c
+a
+"}
+(19,1,1) = {"
+a
+h
+h
+h
+h
+h
+h
+h
+h
+h
+C
+n
+C
+h
+h
+h
+h
+h
+C
+C
+C
+C
+C
+C
+s
+T
+C
+C
+C
+s
+C
+C
+h
+C
+C
+t
+t
+A
+A
+t
+t
+c
+a
+"}
+(20,1,1) = {"
+a
+h
+h
+h
+h
+h
+h
+h
+h
+C
+C
+C
+C
+C
+C
+h
+h
+h
+C
+C
+q
+V
+C
+C
+C
+J
+C
+C
+C
+C
+C
+C
+C
+C
+C
+t
+t
+t
+t
+t
+t
+c
+a
+"}
+(21,1,1) = {"
+a
+e
+h
+h
+h
+h
+h
+h
+h
+z
+C
+C
+g
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+t
+t
+t
+t
+t
+t
+c
+a
+"}
+(22,1,1) = {"
+a
+e
+e
+h
+h
+h
+h
+h
+h
+C
+C
+C
+q
+C
+s
+s
+C
+C
+W
+C
+m
+C
+C
+C
+g
+C
+z
+C
+C
+C
+C
+C
+h
+h
+h
+t
+t
+t
+t
+t
+t
+c
+a
+"}
+(23,1,1) = {"
+a
+e
+e
+h
+h
+h
+h
+h
+h
+C
+C
+C
+C
+C
+C
+y
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+q
+C
+C
+h
+h
+h
+t
+t
+t
+t
+t
+r
+c
+a
+"}
+(24,1,1) = {"
+a
+e
+e
+h
+h
+h
+h
+h
+h
+C
+C
+V
+C
+C
+C
+C
+C
+C
+C
+w
+C
+z
+N
+C
+C
+C
+N
+C
+C
+C
+C
+C
+h
+h
+h
+c
+c
+c
+c
+c
+c
+c
+a
+"}
+(25,1,1) = {"
+a
+a
+e
+e
+h
+h
+h
+h
+n
+C
+C
+C
+C
+C
+z
+C
+C
+C
+C
+C
+C
+C
+C
+C
+F
+C
+C
+C
+C
+C
+C
+C
+h
+h
+h
+c
+c
+c
+c
+c
+c
+c
+a
+"}
+(26,1,1) = {"
+o
+a
+e
+e
+h
+h
+h
+C
+C
+C
+C
+C
+C
+C
+C
+C
+s
+y
+C
+C
+C
+C
+C
+C
+I
+F
+C
+C
+C
+C
+C
+h
+h
+h
+c
+c
+c
+c
+c
+c
+c
+c
+a
+"}
+(27,1,1) = {"
+o
+a
+e
+e
+h
+h
+h
+C
+C
+C
+w
+C
+C
+C
+C
+F
+D
+s
+C
+J
+C
+C
+C
+C
+C
+C
+q
+C
+C
+V
+C
+h
+h
+h
+c
+c
+c
+c
+c
+c
+c
+c
+a
+"}
+(28,1,1) = {"
+o
+a
+e
+e
+h
+h
+h
+h
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+g
+F
+s
+C
+C
+C
+C
+C
+C
+C
+C
+h
+h
+h
+c
+c
+c
+c
+c
+c
+c
+c
+c
+a
+"}
+(29,1,1) = {"
+o
+a
+a
+e
+e
+h
+h
+h
+C
+C
+C
+C
+C
+n
+C
+C
+C
+C
+C
+C
+s
+y
+D
+C
+C
+C
+C
+w
+C
+h
+h
+h
+h
+c
+c
+c
+c
+c
+c
+c
+c
+c
+a
+"}
+(30,1,1) = {"
+o
+o
+a
+e
+e
+h
+h
+C
+C
+C
+n
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+s
+C
+C
+C
+h
+h
+h
+e
+e
+c
+c
+c
+c
+c
+c
+c
+c
+a
+"}
+(31,1,1) = {"
+o
+o
+a
+e
+h
+h
+C
+g
+J
+C
+s
+C
+C
+C
+h
+C
+C
+C
+C
+C
+V
+C
+C
+C
+C
+C
+C
+C
+h
+h
+h
+e
+e
+e
+c
+c
+c
+c
+c
+c
+c
+c
+a
+"}
+(32,1,1) = {"
+o
+o
+a
+h
+h
+h
+h
+C
+C
+C
+C
+C
+C
+h
+h
+h
+C
+C
+C
+q
+C
+C
+C
+C
+C
+C
+h
+h
+h
+h
+e
+e
+e
+h
+h
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(33,1,1) = {"
+o
+o
+a
+h
+h
+h
+C
+C
+C
+C
+C
+C
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+e
+e
+h
+h
+h
+a
+o
+o
+o
+o
+o
+o
+o
+"}
+(34,1,1) = {"
+o
+o
+a
+h
+h
+C
+C
+C
+C
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+a
+a
+h
+h
+h
+a
+a
+o
+o
+o
+o
+o
+o
+o
+"}
+(35,1,1) = {"
+o
+o
+a
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+h
+e
+e
+e
+e
+e
+h
+h
+h
+h
+h
+a
+a
+a
+a
+a
+a
+a
+h
+h
+h
+a
+a
+o
+o
+o
+o
+o
+o
+o
+"}
+(36,1,1) = {"
+o
+o
+a
+a
+h
+h
+h
+h
+h
+h
+h
+h
+h
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+o
+o
+o
+o
+o
+a
+a
+a
+a
+a
+o
+o
+o
+o
+o
+o
+o
+o
+"}
+(37,1,1) = {"
+o
+o
+o
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+"}
diff --git a/_maps/virtual_domains/hierophant.dmm b/_maps/virtual_domains/hierophant.dmm
new file mode 100644
index 00000000000..02b11ad4e1e
--- /dev/null
+++ b/_maps/virtual_domains/hierophant.dmm
@@ -0,0 +1,1066 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/open/indestructible/hierophant,
+/area/lavaland/surface/outdoors/virtual_domain)
+"c" = (
+/obj/effect/light_emitter{
+ set_cap = 3;
+ set_luminosity = 5
+ },
+/turf/open/indestructible/hierophant/two,
+/area/lavaland/surface/outdoors/virtual_domain)
+"h" = (
+/obj/effect/light_emitter{
+ set_cap = 3;
+ set_luminosity = 5
+ },
+/turf/open/indestructible/hierophant,
+/area/lavaland/surface/outdoors/virtual_domain)
+"n" = (
+/obj/structure/marker_beacon/indigo,
+/turf/open/indestructible/hierophant,
+/area/lavaland/surface/outdoors/virtual_domain)
+"o" = (
+/turf/template_noop,
+/area/template_noop)
+"r" = (
+/turf/closed/indestructible/riveted/hierophant,
+/area/lavaland/surface/outdoors/virtual_domain)
+"u" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"w" = (
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"y" = (
+/turf/closed/indestructible/binary,
+/area/lavaland/surface/outdoors/virtual_domain)
+"E" = (
+/mob/living/simple_animal/hostile/megafauna/hierophant/virtual_domain,
+/turf/open/indestructible/hierophant/two,
+/area/lavaland/surface/outdoors/virtual_domain)
+"H" = (
+/obj/effect/landmark/bitrunning/safehouse_spawn,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"K" = (
+/turf/open/indestructible/hierophant/two,
+/area/lavaland/surface/outdoors/virtual_domain)
+"N" = (
+/obj/machinery/light/small/blacklight/directional/south,
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/open/indestructible/hierophant,
+/area/virtual_domain/powered)
+"S" = (
+/obj/effect/mob_spawn/corpse/human/miner,
+/turf/open/indestructible/hierophant,
+/area/lavaland/surface/outdoors/virtual_domain)
+"W" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/indestructible/binary,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Y" = (
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+
+(1,1,1) = {"
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+o
+o
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+W
+"}
+(2,1,1) = {"
+y
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+y
+o
+o
+y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+y
+"}
+(3,1,1) = {"
+y
+r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+h
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+r
+y
+o
+o
+y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+y
+"}
+(4,1,1) = {"
+y
+r
+a
+a
+a
+h
+h
+a
+a
+a
+r
+a
+a
+a
+r
+a
+a
+a
+h
+h
+a
+a
+a
+r
+y
+y
+y
+y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+y
+"}
+(5,1,1) = {"
+y
+r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+r
+r
+y
+y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+y
+"}
+(6,1,1) = {"
+y
+r
+a
+h
+a
+r
+r
+a
+h
+n
+a
+a
+h
+a
+a
+a
+h
+a
+r
+r
+a
+h
+a
+a
+a
+a
+r
+y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+y
+"}
+(7,1,1) = {"
+y
+r
+a
+h
+a
+r
+r
+a
+h
+a
+a
+a
+h
+a
+a
+a
+h
+a
+r
+r
+a
+h
+a
+a
+a
+a
+a
+r
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+y
+"}
+(8,1,1) = {"
+y
+r
+a
+a
+a
+a
+a
+K
+K
+K
+K
+K
+K
+K
+K
+K
+K
+K
+a
+a
+a
+n
+a
+a
+r
+a
+a
+a
+r
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+y
+"}
+(9,1,1) = {"
+y
+r
+a
+a
+a
+h
+h
+K
+K
+K
+r
+K
+K
+K
+r
+K
+K
+K
+h
+h
+a
+a
+a
+r
+y
+r
+S
+a
+a
+r
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+y
+"}
+(10,1,1) = {"
+y
+r
+a
+a
+a
+a
+a
+K
+K
+K
+K
+K
+c
+K
+K
+K
+K
+K
+a
+a
+a
+a
+a
+r
+y
+y
+r
+a
+a
+N
+w
+w
+w
+w
+w
+H
+Y
+y
+"}
+(11,1,1) = {"
+y
+r
+a
+r
+a
+a
+a
+K
+r
+K
+K
+K
+K
+K
+K
+K
+r
+K
+a
+a
+a
+r
+a
+r
+y
+y
+y
+r
+a
+a
+w
+w
+w
+w
+w
+w
+Y
+y
+"}
+(12,1,1) = {"
+y
+r
+a
+a
+a
+a
+a
+K
+K
+K
+K
+K
+K
+K
+K
+K
+K
+K
+a
+a
+a
+a
+a
+r
+y
+y
+y
+r
+a
+a
+w
+w
+w
+w
+w
+w
+Y
+y
+"}
+(13,1,1) = {"
+y
+r
+h
+a
+a
+h
+h
+K
+K
+c
+K
+K
+E
+K
+K
+c
+K
+K
+h
+h
+a
+a
+h
+r
+y
+y
+y
+r
+a
+a
+w
+w
+w
+w
+w
+w
+Y
+y
+"}
+(14,1,1) = {"
+y
+r
+a
+a
+a
+a
+a
+K
+K
+K
+K
+K
+K
+K
+K
+K
+K
+K
+a
+a
+a
+a
+a
+r
+y
+y
+y
+r
+a
+a
+w
+w
+w
+w
+w
+w
+Y
+y
+"}
+(15,1,1) = {"
+y
+r
+a
+r
+a
+a
+a
+K
+r
+K
+K
+K
+K
+K
+K
+K
+r
+K
+a
+a
+a
+r
+a
+r
+y
+y
+y
+r
+a
+a
+w
+w
+w
+w
+w
+w
+Y
+y
+"}
+(16,1,1) = {"
+y
+r
+a
+a
+a
+a
+a
+K
+K
+K
+K
+K
+c
+K
+K
+K
+K
+K
+a
+a
+a
+a
+a
+r
+y
+y
+r
+a
+a
+N
+w
+w
+w
+w
+w
+u
+Y
+y
+"}
+(17,1,1) = {"
+y
+r
+a
+a
+a
+h
+h
+K
+K
+K
+r
+K
+K
+K
+r
+K
+K
+K
+h
+h
+a
+a
+a
+r
+y
+r
+a
+a
+a
+r
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+y
+"}
+(18,1,1) = {"
+y
+r
+a
+a
+a
+a
+a
+K
+K
+K
+K
+K
+K
+K
+K
+K
+K
+K
+a
+a
+a
+a
+a
+a
+r
+a
+a
+a
+r
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+y
+"}
+(19,1,1) = {"
+y
+r
+a
+h
+a
+r
+r
+a
+h
+a
+a
+a
+h
+a
+a
+a
+h
+a
+r
+r
+a
+h
+a
+a
+a
+a
+a
+r
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+y
+"}
+(20,1,1) = {"
+y
+r
+a
+h
+a
+r
+r
+S
+h
+a
+a
+a
+h
+a
+n
+a
+h
+a
+r
+r
+a
+h
+a
+a
+a
+a
+r
+y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+y
+"}
+(21,1,1) = {"
+y
+r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+r
+r
+y
+y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+y
+"}
+(22,1,1) = {"
+y
+r
+a
+a
+a
+h
+h
+a
+a
+a
+r
+a
+a
+a
+r
+a
+a
+a
+h
+h
+a
+a
+a
+r
+y
+y
+y
+y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+y
+"}
+(23,1,1) = {"
+y
+r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+h
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+r
+y
+o
+o
+y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+y
+"}
+(24,1,1) = {"
+y
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+y
+o
+o
+y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+Y
+y
+"}
+(25,1,1) = {"
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+o
+o
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+"}
diff --git a/_maps/virtual_domains/legion.dmm b/_maps/virtual_domains/legion.dmm
new file mode 100644
index 00000000000..55843177ad0
--- /dev/null
+++ b/_maps/virtual_domains/legion.dmm
@@ -0,0 +1,6370 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ah" = (
+/obj/structure/stone_tile/cracked{
+ dir = 8
+ },
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/obj/structure/stone_tile,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"ak" = (
+/obj/structure/stone_tile/cracked{
+ dir = 4
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"aI" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 8
+ },
+/obj/structure/stone_tile/cracked,
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"aR" = (
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile/cracked{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"bd" = (
+/obj/structure/stone_tile/block,
+/obj/structure/stone_tile/block{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"be" = (
+/obj/structure/stone_tile/block{
+ dir = 4
+ },
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"bt" = (
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/blood/footprints{
+ dir = 1
+ },
+/turf/open/floor/pod/dark,
+/area/lavaland/surface/outdoors/virtual_domain)
+"bu" = (
+/obj/structure/marker_beacon/bronze,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"ca" = (
+/obj/effect/mob_spawn/corpse/human/legioninfested,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"cf" = (
+/obj/structure/stone_tile/block{
+ dir = 1
+ },
+/obj/structure/stone_tile,
+/obj/structure/stone_tile/cracked{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"cp" = (
+/turf/template_noop,
+/area/template_noop)
+"dm" = (
+/obj/structure/stone_tile/block{
+ dir = 1
+ },
+/obj/structure/stone_tile,
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"dn" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 8
+ },
+/obj/structure/stone_tile/cracked,
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/obj/effect/mob_spawn/corpse/human/legioninfested,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"dr" = (
+/obj/structure/stone_tile/block{
+ dir = 1
+ },
+/obj/structure/stone_tile/block/cracked,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"dx" = (
+/obj/effect/decal/cleanable/blood/footprints{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"dL" = (
+/obj/structure/stone_tile/block{
+ dir = 4
+ },
+/obj/structure/stone_tile/block/cracked{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"dQ" = (
+/turf/closed/wall/mineral/titanium/survival/pod,
+/area/lavaland/surface/outdoors/virtual_domain)
+"et" = (
+/obj/structure/stone_tile/block/cracked,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"ew" = (
+/obj/structure/stone_tile/cracked{
+ dir = 8
+ },
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"eJ" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 4
+ },
+/obj/structure/stone_tile/block/cracked{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"fA" = (
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"fG" = (
+/obj/structure/marker_beacon/violet,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"gh" = (
+/obj/structure/stone_tile/cracked,
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/obj/structure/stone_tile/cracked{
+ dir = 4
+ },
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"gk" = (
+/obj/structure/necropolis_gate/locked,
+/obj/structure/stone_tile/slab,
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"gK" = (
+/obj/effect/decal/cleanable/blood/footprints,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"gQ" = (
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/obj/structure/stone_tile,
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"hc" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 4
+ },
+/obj/structure/stone_tile/block/cracked{
+ dir = 8
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"hw" = (
+/obj/structure/stone_tile,
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/obj/structure/stone_tile/block/cracked{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"hx" = (
+/obj/structure/stone_tile,
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"hU" = (
+/obj/structure/stone_tile/block{
+ dir = 4
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"ib" = (
+/turf/closed/mineral/volcanic/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"ie" = (
+/obj/structure/stone_tile/cracked,
+/obj/structure/stone_tile/block{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"iP" = (
+/obj/structure/fluff/drake_statue/falling,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"iR" = (
+/obj/structure/stone_tile/block{
+ dir = 1
+ },
+/obj/structure/stone_tile,
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"iV" = (
+/obj/structure/stone_tile/block{
+ dir = 8
+ },
+/obj/structure/stone_tile,
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"jk" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 8
+ },
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"jt" = (
+/obj/structure/stone_tile/slab/cracked,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"jw" = (
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile,
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"jN" = (
+/obj/machinery/sleeper/survival_pod,
+/turf/open/floor/pod/dark,
+/area/lavaland/surface/outdoors/virtual_domain)
+"ka" = (
+/obj/structure/stone_tile/cracked{
+ dir = 8
+ },
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile,
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"kg" = (
+/turf/closed/indestructible/riveted/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"kT" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"kZ" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 4
+ },
+/obj/structure/stone_tile/cracked{
+ dir = 4
+ },
+/obj/structure/stone_tile/cracked{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"ll" = (
+/obj/structure/stone_tile/cracked,
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"lz" = (
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile,
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"lC" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 4
+ },
+/obj/structure/stone_tile/cracked{
+ dir = 4
+ },
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"lO" = (
+/obj/structure/stone_tile/cracked,
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"lT" = (
+/obj/structure/stone_tile/cracked{
+ dir = 4
+ },
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile,
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"mz" = (
+/obj/structure/stone_tile/cracked{
+ dir = 8
+ },
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"mG" = (
+/obj/structure/stone_tile/cracked{
+ dir = 4
+ },
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile,
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"nm" = (
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"nu" = (
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"nv" = (
+/obj/structure/stone_tile/block{
+ dir = 8
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"ny" = (
+/obj/structure/stone_tile,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"nI" = (
+/obj/structure/stone_tile/block,
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"nO" = (
+/obj/structure/stone_tile/surrounding_tile,
+/obj/structure/stone_tile/surrounding_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile/center,
+/obj/structure/stone_tile/surrounding_tile/cracked{
+ dir = 8
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"ob" = (
+/obj/structure/necropolis_gate/legion_gate,
+/obj/structure/necropolis_arch,
+/obj/structure/stone_tile/slab,
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"og" = (
+/obj/effect/landmark/bitrunning/safehouse_spawn,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"oo" = (
+/obj/structure/stone_tile,
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/obj/structure/stone_tile/block/cracked{
+ dir = 1
+ },
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"ox" = (
+/turf/closed/indestructible/binary,
+/area/lavaland/surface/outdoors/virtual_domain)
+"oS" = (
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"pP" = (
+/obj/structure/stone_tile/block{
+ dir = 4
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"qo" = (
+/obj/structure/stone_tile/slab/cracked,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"qs" = (
+/obj/structure/stone_tile/cracked{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"qW" = (
+/obj/effect/decal/cleanable/blood/footprints{
+ dir = 1
+ },
+/obj/machinery/door/airlock/survival_pod/glass,
+/turf/open/floor/pod/dark,
+/area/lavaland/surface/outdoors/virtual_domain)
+"rt" = (
+/obj/effect/mob_spawn/corpse/human/miner,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"rU" = (
+/obj/structure/stone_tile/block{
+ dir = 1
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"sd" = (
+/obj/structure/stone_tile/cracked{
+ dir = 8
+ },
+/obj/structure/stone_tile/block{
+ dir = 4
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"sk" = (
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/obj/structure/stone_tile/cracked{
+ dir = 4
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"sz" = (
+/obj/structure/stone_tile/center,
+/obj/structure/stone_tile/surrounding_tile,
+/obj/structure/stone_tile/surrounding_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile/surrounding_tile/cracked{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"sA" = (
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile/cracked{
+ dir = 4
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"tk" = (
+/obj/structure/stone_tile/cracked{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"tF" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 4
+ },
+/obj/structure/stone_tile/block{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"uK" = (
+/obj/structure/stone_tile/block{
+ dir = 8
+ },
+/obj/structure/stone_tile/block{
+ dir = 4
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"vf" = (
+/obj/structure/stone_tile/cracked{
+ dir = 4
+ },
+/obj/structure/stone_tile/cracked,
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"wq" = (
+/obj/structure/marker_beacon/teal,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"wy" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 4
+ },
+/obj/structure/stone_tile/cracked{
+ dir = 8
+ },
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"xd" = (
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile,
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"xm" = (
+/obj/structure/stone_tile,
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"xw" = (
+/obj/structure/stone_tile,
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"xD" = (
+/obj/structure/stone_tile/cracked,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"yu" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 1
+ },
+/obj/structure/stone_tile/block,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"yZ" = (
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"zg" = (
+/obj/machinery/light/small/directional/south,
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/virtual_domain/powered)
+"zo" = (
+/obj/effect/turf_decal/mining/survival,
+/turf/closed/wall/mineral/titanium/survival/pod,
+/area/lavaland/surface/outdoors/virtual_domain)
+"zW" = (
+/obj/structure/stone_tile/surrounding_tile{
+ dir = 8
+ },
+/obj/structure/stone_tile/surrounding_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile/surrounding_tile,
+/obj/structure/stone_tile/center/cracked,
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Ah" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/indestructible/binary,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Aj" = (
+/obj/structure/marker_beacon/burgundy,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Ak" = (
+/obj/structure/stone_tile/surrounding_tile{
+ dir = 8
+ },
+/obj/structure/stone_tile/surrounding_tile,
+/obj/structure/stone_tile/center/cracked,
+/obj/structure/stone_tile/surrounding_tile/cracked{
+ dir = 4
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"As" = (
+/obj/structure/marker_beacon/cerulean,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"AY" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 4
+ },
+/obj/structure/stone_tile/cracked{
+ dir = 4
+ },
+/obj/structure/stone_tile/cracked{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Bo" = (
+/obj/structure/marker_beacon/indigo,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"BO" = (
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"CX" = (
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/blood/footprints{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Dm" = (
+/turf/closed/mineral/random/volcanic,
+/area/lavaland/surface/outdoors/virtual_domain)
+"DP" = (
+/obj/structure/stone_tile/surrounding_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile/surrounding_tile{
+ dir = 8
+ },
+/obj/structure/stone_tile/surrounding_tile/cracked{
+ dir = 1
+ },
+/obj/structure/stone_tile/center,
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Ek" = (
+/obj/structure/stone_tile/block,
+/obj/structure/stone_tile/block/cracked{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Ep" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 8
+ },
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile,
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Ez" = (
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/obj/structure/stone_tile/cracked,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"EC" = (
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Fg" = (
+/obj/structure/stone_tile/surrounding/cracked{
+ dir = 6
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Fp" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"Fq" = (
+/obj/structure/marker_beacon/fuchsia,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"FV" = (
+/obj/structure/stone_tile/block,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Gj" = (
+/obj/structure/stone_tile,
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Gn" = (
+/turf/closed/indestructible/riveted/boss/see_through,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Go" = (
+/obj/structure/stone_tile/block{
+ dir = 8
+ },
+/obj/structure/stone_tile,
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"GH" = (
+/obj/structure/fans,
+/turf/open/floor/pod/dark,
+/area/lavaland/surface/outdoors/virtual_domain)
+"GM" = (
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Hi" = (
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Hu" = (
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile,
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Hw" = (
+/obj/structure/stone_tile/surrounding_tile,
+/obj/structure/stone_tile/surrounding_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile/center/cracked,
+/obj/structure/stone_tile/surrounding_tile/cracked{
+ dir = 8
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"HK" = (
+/obj/structure/stone_tile/cracked,
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/obj/structure/stone_tile/cracked{
+ dir = 4
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"HQ" = (
+/obj/structure/stone_tile/block/cracked,
+/obj/structure/stone_tile/block{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"HZ" = (
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Ii" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 8
+ },
+/obj/structure/stone_tile/cracked,
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Io" = (
+/obj/structure/marker_beacon/jade,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Ip" = (
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile,
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"IB" = (
+/obj/structure/stone_tile,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"IG" = (
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"IL" = (
+/obj/structure/stone_tile/surrounding,
+/obj/structure/stone_tile/center/cracked,
+/mob/living/simple_animal/hostile/megafauna/legion/virtual_domain,
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"IQ" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 4
+ },
+/obj/structure/stone_tile/cracked{
+ dir = 4
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Jc" = (
+/obj/structure/stone_tile/slab,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Jp" = (
+/obj/structure/stone_tile/block/cracked,
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Jt" = (
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/obj/structure/stone_tile,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Jw" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 8
+ },
+/obj/structure/stone_tile/cracked,
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"JD" = (
+/obj/structure/fluff/drake_statue,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"KG" = (
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile,
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Le" = (
+/obj/structure/stone_tile,
+/obj/structure/stone_tile/cracked{
+ dir = 8
+ },
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Lx" = (
+/obj/effect/decal/cleanable/blood/footprints{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"LH" = (
+/obj/structure/stone_tile/cracked,
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/obj/structure/stone_tile/block{
+ dir = 8
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Ml" = (
+/obj/structure/stone_tile/cracked{
+ dir = 4
+ },
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Mm" = (
+/obj/structure/stone_tile/surrounding_tile,
+/obj/structure/stone_tile/surrounding_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile/center/cracked,
+/obj/structure/stone_tile/surrounding_tile/cracked{
+ dir = 1
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Mo" = (
+/obj/structure/stone_tile/block/cracked,
+/obj/structure/stone_tile/block/cracked{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"MH" = (
+/obj/structure/stone_tile/cracked,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"MP" = (
+/obj/structure/stone_tile/block{
+ dir = 8
+ },
+/obj/structure/stone_tile/block/cracked{
+ dir = 4
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"MW" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 8
+ },
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Nl" = (
+/obj/structure/stone_tile/surrounding_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile/surrounding_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile/surrounding_tile{
+ dir = 8
+ },
+/obj/structure/stone_tile/center,
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Ot" = (
+/obj/structure/stone_tile/surrounding_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile/surrounding_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile/surrounding_tile{
+ dir = 8
+ },
+/obj/structure/stone_tile/center,
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Pv" = (
+/obj/effect/turf_decal/mining/survival{
+ dir = 4
+ },
+/turf/closed/wall/mineral/titanium/survival/pod,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Px" = (
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"PO" = (
+/obj/structure/stone_tile/block{
+ dir = 8
+ },
+/obj/structure/stone_tile/block{
+ dir = 4
+ },
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Qi" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 8
+ },
+/obj/structure/stone_tile/cracked,
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Qx" = (
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/obj/structure/marker_beacon/burgundy,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"QD" = (
+/obj/item/pickaxe,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/pod/dark,
+/area/lavaland/surface/outdoors/virtual_domain)
+"RC" = (
+/obj/effect/turf_decal/mining/survival{
+ dir = 1
+ },
+/turf/closed/wall/mineral/titanium/survival/pod,
+/area/lavaland/surface/outdoors/virtual_domain)
+"RV" = (
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"So" = (
+/obj/structure/stone_tile/cracked,
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Sw" = (
+/obj/structure/stone_tile/cracked{
+ dir = 4
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"SI" = (
+/obj/effect/turf_decal/mining,
+/turf/closed/wall/mineral/titanium/survival/pod,
+/area/lavaland/surface/outdoors/virtual_domain)
+"SJ" = (
+/obj/structure/stone_tile/slab/cracked,
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"SX" = (
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Ti" = (
+/turf/closed/mineral/random/high_chance/volcanic,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Tm" = (
+/obj/structure/bed/pod,
+/obj/item/bedsheet/black,
+/obj/structure/tubes,
+/obj/machinery/light/small/broken/directional/east,
+/turf/open/floor/pod/dark,
+/area/lavaland/surface/outdoors/virtual_domain)
+"TC" = (
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"TJ" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 4
+ },
+/obj/structure/stone_tile/cracked{
+ dir = 4
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Ud" = (
+/obj/machinery/light/small/directional/north,
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/virtual_domain/powered)
+"UD" = (
+/obj/structure/stone_tile/surrounding_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile/surrounding_tile,
+/obj/structure/stone_tile/surrounding_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile/center/cracked,
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"UM" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 4
+ },
+/obj/structure/stone_tile/cracked{
+ dir = 4
+ },
+/obj/structure/stone_tile/cracked{
+ dir = 8
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Vc" = (
+/obj/structure/tubes,
+/obj/item/crowbar,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor/pod/dark,
+/area/lavaland/surface/outdoors/virtual_domain)
+"VI" = (
+/obj/structure/stone_tile/surrounding_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile/surrounding_tile/cracked{
+ dir = 4
+ },
+/obj/structure/stone_tile/surrounding_tile,
+/obj/structure/stone_tile/center,
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Wa" = (
+/obj/structure/stone_tile/surrounding_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile/surrounding_tile/cracked{
+ dir = 1
+ },
+/obj/structure/stone_tile/surrounding_tile{
+ dir = 8
+ },
+/obj/structure/stone_tile/center/cracked,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Wm" = (
+/obj/structure/stone_tile/cracked{
+ dir = 8
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"WM" = (
+/obj/structure/stone_tile/block,
+/obj/structure/stone_tile/cracked{
+ dir = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"WR" = (
+/obj/structure/stone_tile/block,
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"WS" = (
+/obj/item/gps/computer,
+/obj/structure/tubes,
+/turf/open/floor/pod/dark,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Xb" = (
+/obj/structure/marker_beacon/yellow,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Xn" = (
+/obj/structure/stone_tile,
+/obj/structure/stone_tile/cracked{
+ dir = 8
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Xo" = (
+/obj/structure/stone_tile/block,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Xv" = (
+/obj/structure/stone_tile{
+ dir = 1
+ },
+/obj/structure/stone_tile/cracked,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"XO" = (
+/obj/effect/turf_decal/mining/survival{
+ dir = 8
+ },
+/turf/closed/wall/mineral/titanium/survival/pod,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Yu" = (
+/obj/structure/stone_tile/block{
+ dir = 4
+ },
+/obj/structure/stone_tile/block{
+ dir = 8
+ },
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"YN" = (
+/obj/structure/stone_tile/block/cracked,
+/obj/structure/stone_tile/block/cracked{
+ dir = 1
+ },
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"YV" = (
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Zc" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 4
+ },
+/obj/structure/stone_tile/block{
+ dir = 8
+ },
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Zh" = (
+/obj/structure/marker_beacon/purple,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Zj" = (
+/obj/structure/stone_tile/block/cracked{
+ dir = 8
+ },
+/obj/structure/stone_tile/block{
+ dir = 4
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Zq" = (
+/obj/structure/stone_tile/block{
+ dir = 4
+ },
+/obj/structure/stone_tile{
+ dir = 4
+ },
+/obj/structure/stone_tile{
+ dir = 8
+ },
+/turf/open/indestructible/boss,
+/area/lavaland/surface/outdoors/virtual_domain)
+"Zu" = (
+/obj/machinery/smartfridge/survival_pod{
+ desc = "A heated storage unit. This one's seen better days.";
+ name = "dusty survival pod storage"
+ },
+/turf/open/floor/pod/dark,
+/area/lavaland/surface/outdoors/virtual_domain)
+"ZM" = (
+/obj/structure/stone_tile/cracked{
+ dir = 4
+ },
+/obj/structure/stone_tile,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
+"ZN" = (
+/obj/structure/table/survival_pod,
+/obj/item/knife/combat/survival,
+/turf/open/floor/pod/dark,
+/area/lavaland/surface/outdoors/virtual_domain)
+
+(1,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+Ah
+"}
+(2,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ox
+"}
+(3,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+ib
+nu
+nu
+ib
+ib
+ib
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+nu
+nu
+ib
+ox
+"}
+(4,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(5,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(6,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+wq
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(7,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+ox
+"}
+(8,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+ib
+nu
+nu
+nu
+nu
+nu
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+rt
+nu
+nu
+ib
+ib
+ox
+"}
+(9,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+ib
+nu
+nu
+nu
+nu
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+ox
+"}
+(10,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+ib
+ib
+ib
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+ox
+"}
+(11,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+ib
+ib
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(12,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+ib
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(13,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+ib
+nu
+fG
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(14,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ib
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+fA
+fA
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(15,1,1) = {"
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+ib
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(16,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+nu
+nu
+nu
+nu
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(17,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+Ti
+Ti
+Ti
+Ti
+GM
+nu
+nu
+nu
+nu
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+Io
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+Xb
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(18,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+et
+Ti
+GM
+GM
+GM
+nu
+nu
+nu
+nu
+GM
+GM
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(19,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+GM
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+GM
+GM
+GM
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+wq
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(20,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+Ti
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+GM
+GM
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(21,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+Ti
+nu
+nu
+nu
+nu
+GM
+Ti
+GM
+GM
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+Zh
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(22,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+FV
+nu
+nu
+nu
+nu
+Ti
+Dm
+Dm
+GM
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(23,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+Ti
+GM
+GM
+GM
+Ti
+Ti
+Dm
+Dm
+Ti
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(24,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+FV
+Ml
+Ti
+Dm
+Dm
+Ti
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+ox
+"}
+(25,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+GM
+GM
+Ti
+Dm
+Dm
+IB
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+GM
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+ox
+"}
+(26,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+GM
+GM
+GM
+GM
+GM
+GM
+fA
+fA
+fA
+fA
+RV
+fA
+fA
+fA
+fA
+fA
+fA
+Xn
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+As
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+ox
+"}
+(27,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+Ek
+Le
+be
+be
+kT
+GM
+GM
+GM
+GM
+fA
+fA
+xm
+fA
+fA
+fA
+GM
+ZM
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(28,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+dr
+KG
+mz
+KG
+KG
+jt
+GM
+GM
+GM
+GM
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+nu
+HZ
+nu
+bu
+nu
+nu
+nu
+MH
+nu
+nu
+lz
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+nu
+nu
+ib
+ox
+"}
+(29,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+bd
+mG
+Hw
+hU
+Mm
+lO
+et
+GM
+tk
+fA
+fA
+fA
+fA
+ak
+fA
+fA
+fA
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+YV
+nu
+nu
+So
+nu
+nu
+nu
+nu
+nu
+nu
+bu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+nu
+nu
+ib
+ox
+"}
+(30,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+Ez
+WR
+JD
+rU
+KG
+dm
+GM
+GM
+fA
+Hi
+fA
+fA
+fA
+ll
+fA
+fA
+Wm
+fA
+fA
+YV
+qs
+MH
+nu
+nu
+nu
+ny
+ca
+oS
+nu
+nu
+Qx
+nu
+nu
+hx
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+nu
+nu
+ib
+ox
+"}
+(31,1,1) = {"
+ox
+kg
+kg
+kg
+Hu
+Zq
+wy
+Zq
+lT
+kg
+kg
+Gn
+Gn
+KG
+Ak
+nv
+Ot
+mG
+hw
+kg
+kg
+Wm
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+ak
+nu
+nu
+qs
+nu
+nu
+TC
+nu
+YV
+nu
+ny
+nu
+oS
+nu
+nu
+nu
+SX
+nu
+nu
+nu
+zg
+BO
+BO
+BO
+BO
+BO
+og
+Ud
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+nu
+nu
+ib
+ox
+"}
+(32,1,1) = {"
+ox
+kg
+kg
+Gn
+VI
+xw
+gQ
+ka
+iR
+kg
+kg
+Gn
+Gn
+sz
+KG
+KG
+KG
+KG
+mz
+kg
+kZ
+kZ
+sd
+kZ
+lC
+kZ
+TJ
+UM
+kZ
+IQ
+UM
+UM
+AY
+nu
+nI
+nu
+nu
+nu
+nu
+oS
+nu
+nu
+nu
+nu
+nu
+qs
+nu
+nu
+nu
+nu
+nu
+nu
+BO
+BO
+BO
+BO
+BO
+BO
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+nu
+nu
+ib
+ox
+"}
+(33,1,1) = {"
+ox
+PO
+PO
+gk
+PO
+Zc
+IL
+Yu
+SJ
+Yu
+Yu
+Yu
+ob
+dL
+uK
+MP
+uK
+uK
+dL
+Jc
+Mo
+eJ
+Mo
+hc
+yu
+eJ
+Fg
+eJ
+YN
+tF
+Mo
+Zj
+HQ
+qo
+Jp
+nu
+aR
+nu
+TC
+nu
+YV
+nu
+nu
+oS
+nu
+nu
+ny
+Sw
+nu
+nu
+nu
+nu
+BO
+BO
+BO
+BO
+BO
+BO
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+Io
+ib
+ib
+nu
+nu
+ib
+ox
+"}
+(34,1,1) = {"
+ox
+kg
+kg
+Gn
+Nl
+gh
+jw
+lT
+oo
+kg
+kg
+Gn
+Gn
+Wa
+KG
+xd
+Ez
+mz
+HK
+kg
+ie
+Jw
+Jw
+jk
+Jw
+jk
+dn
+Jw
+Jw
+LH
+Ii
+Qi
+aI
+nu
+Xo
+nu
+nu
+YV
+Sw
+nu
+nu
+nu
+sA
+nu
+Gj
+nu
+nu
+HZ
+nu
+YV
+nu
+nu
+BO
+BO
+BO
+BO
+BO
+BO
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+nu
+nu
+ib
+ox
+"}
+(35,1,1) = {"
+ox
+kg
+kg
+kg
+Hu
+Ep
+iV
+Go
+Ip
+kg
+kg
+Gn
+Gn
+lO
+nO
+hU
+UD
+KG
+dm
+kg
+kg
+ll
+fA
+fA
+fA
+ak
+fA
+fA
+fA
+fA
+ll
+fA
+nu
+nu
+ny
+nu
+nu
+Aj
+HZ
+nu
+ew
+nu
+nu
+bu
+nu
+nu
+nu
+nu
+nu
+Aj
+nu
+nu
+BO
+BO
+BO
+BO
+BO
+BO
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+nu
+nu
+ib
+ox
+"}
+(36,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+KG
+WR
+iP
+rU
+Ez
+cf
+GM
+GM
+fA
+fA
+yZ
+vf
+ll
+fA
+fA
+fA
+ak
+fA
+fA
+oS
+ny
+qs
+YV
+qs
+nu
+nu
+nu
+nu
+nu
+nu
+Sw
+nu
+qs
+oS
+nu
+nu
+Sw
+nu
+nu
+BO
+BO
+BO
+BO
+BO
+BO
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+nu
+nu
+ib
+ox
+"}
+(37,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+bd
+xd
+zW
+nv
+DP
+KG
+FV
+GM
+GM
+fA
+fA
+fA
+GM
+Px
+fA
+IG
+GM
+Hi
+fA
+fA
+nu
+nu
+nu
+nu
+TC
+nu
+ah
+nu
+nu
+nm
+nu
+nu
+nu
+nu
+nu
+nu
+sk
+nu
+nu
+zg
+BO
+BO
+BO
+BO
+BO
+Fp
+Ud
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+nu
+nu
+ib
+ox
+"}
+(38,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+bd
+KG
+KG
+KG
+lO
+Jc
+GM
+GM
+GM
+fA
+fA
+fA
+fA
+fA
+fA
+GM
+Jt
+fA
+fA
+fA
+nu
+TC
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(39,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+Ek
+KG
+lO
+MW
+pP
+GM
+GM
+GM
+GM
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+xD
+fA
+fA
+fA
+oS
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(40,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+IB
+nu
+nu
+nu
+nu
+GM
+RV
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(41,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+GM
+nu
+nu
+Sw
+Xv
+GM
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+GM
+GM
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(42,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+GM
+nu
+nu
+nu
+ny
+GM
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+EC
+GM
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+Bo
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+ox
+"}
+(43,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+WM
+GM
+Px
+ny
+nu
+nu
+nu
+nu
+nu
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+ox
+"}
+(44,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+GM
+GM
+GM
+nu
+nu
+nu
+nu
+nu
+nu
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(45,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+GM
+GM
+GM
+nu
+nu
+nu
+nu
+nu
+nu
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(46,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+Ti
+GM
+GM
+nu
+nu
+nu
+nu
+nu
+nu
+fA
+fA
+ak
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+wq
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+fA
+ib
+ox
+"}
+(47,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+Ti
+GM
+nu
+nu
+nu
+nu
+nu
+nu
+fA
+fA
+fA
+xD
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+fA
+fA
+ib
+ox
+"}
+(48,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+Ti
+GM
+nu
+nu
+nu
+nu
+nu
+nu
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+fA
+fA
+ib
+ox
+"}
+(49,1,1) = {"
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+Ti
+GM
+nu
+nu
+nu
+nu
+nu
+nu
+fA
+fA
+fA
+GM
+fA
+fA
+fA
+fA
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+Fq
+nu
+ib
+ib
+ib
+ib
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+fA
+ib
+ox
+"}
+(50,1,1) = {"
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+kg
+ib
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+rt
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(51,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ib
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+dQ
+dQ
+XO
+dQ
+dQ
+GM
+nu
+nu
+nu
+ib
+ox
+"}
+(52,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+Fq
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+dQ
+GH
+jN
+ZN
+zo
+GM
+nu
+nu
+nu
+ib
+ox
+"}
+(53,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+RC
+Zu
+QD
+bt
+qW
+CX
+nu
+nu
+nu
+ib
+ox
+"}
+(54,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+dQ
+WS
+Tm
+Vc
+SI
+Lx
+nu
+nu
+nu
+ib
+ox
+"}
+(55,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+nu
+nu
+nu
+nu
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+dQ
+dQ
+Pv
+dQ
+dQ
+Lx
+nu
+nu
+nu
+ib
+ox
+"}
+(56,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+ib
+nu
+nu
+nu
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+GM
+GM
+GM
+GM
+dx
+gK
+nu
+nu
+nu
+ib
+ox
+"}
+(57,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+Io
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(58,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+ox
+"}
+(59,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+ox
+"}
+(60,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+fA
+fA
+fA
+fA
+nu
+nu
+nu
+nu
+nu
+nu
+Xb
+nu
+nu
+nu
+ib
+ox
+"}
+(61,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+nu
+nu
+ib
+ox
+"}
+(62,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ox
+"}
+(63,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+ib
+nu
+nu
+nu
+ib
+ib
+ib
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+nu
+nu
+nu
+nu
+ib
+ib
+ib
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+ib
+ib
+nu
+nu
+nu
+nu
+ib
+ib
+ox
+"}
+(64,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ib
+ox
+"}
+(65,1,1) = {"
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+ox
+"}
diff --git a/_maps/virtual_domains/pipedream.dmm b/_maps/virtual_domains/pipedream.dmm
new file mode 100644
index 00000000000..44bd845477a
--- /dev/null
+++ b/_maps/virtual_domains/pipedream.dmm
@@ -0,0 +1,3713 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"af" = (
+/obj/structure/chair/plastic{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"aw" = (
+/obj/structure/disposalpipe/sorting/mail/flip{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"ax" = (
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/obj/structure/frame/computer{
+ anchored = 1;
+ dir = 4
+ },
+/obj/item/shard{
+ icon_state = "medium"
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"aK" = (
+/turf/open/space/basic,
+/area/space)
+"aL" = (
+/obj/effect/turf_decal/tile/yellow/half/contrasted,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"bq" = (
+/obj/machinery/light/small/red/dim{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"bs" = (
+/turf/open/floor/carpet/orange,
+/area/virtual_domain/powered)
+"bw" = (
+/obj/structure/disposalpipe/broken{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/closet/crate/preopen,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"bx" = (
+/obj/structure/frame/computer,
+/obj/item/shard,
+/turf/open/floor/carpet/royalblue{
+ icon_state = "carpet_royalblue-12"
+ },
+/area/virtual_domain/powered)
+"bA" = (
+/obj/structure/chair/plastic,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"bG" = (
+/obj/structure/lattice/catwalk{
+ name = "industrial lift"
+ },
+/obj/structure/closet/crate/preopen,
+/obj/structure/railing,
+/turf/open/chasm,
+/area/virtual_domain/powered)
+"bS" = (
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
+ dir = 1
+ },
+/obj/structure/table/reinforced,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/item/folder/yellow,
+/obj/item/folder/blue{
+ pixel_x = 2;
+ pixel_y = -2
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"cw" = (
+/obj/effect/turf_decal/trimline/yellow/warning{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"cB" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"cF" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 9
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"dx" = (
+/obj/effect/turf_decal/trimline/yellow/line,
+/obj/item/shard,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"dz" = (
+/obj/machinery/light/broken,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/trimline/yellow/corner,
+/obj/effect/turf_decal/trimline/yellow/warning{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"dA" = (
+/obj/machinery/light/dim{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"dP" = (
+/obj/effect/turf_decal/tile/yellow/half/contrasted,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"eg" = (
+/turf/closed/wall,
+/area/virtual_domain/powered)
+"ei" = (
+/obj/machinery/conveyor/auto{
+ dir = 6;
+ icon_state = "conveyor_map_inverted";
+ inverted = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"ev" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"eJ" = (
+/obj/structure/disposalpipe/sorting{
+ dir = 2
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"eN" = (
+/obj/effect/turf_decal/trimline/yellow/arrow_cw{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/broken{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"eY" = (
+/turf/closed/wall/r_wall,
+/area/virtual_domain/powered)
+"fe" = (
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
+ dir = 8
+ },
+/obj/structure/table/reinforced,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"fg" = (
+/turf/open/floor/iron/stairs/left{
+ dir = 8
+ },
+/area/virtual_domain/powered)
+"fj" = (
+/obj/structure/closet/crate/preopen,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"fl" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"fw" = (
+/obj/structure/door_assembly/door_assembly_eng,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"fK" = (
+/obj/structure/chair/stool/bar/directional/west,
+/turf/open/floor/iron/cafeteria,
+/area/virtual_domain/powered)
+"fR" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 5
+ },
+/obj/structure/sign/poster/official/random/directional/west,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"fZ" = (
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/obj/structure/chair/office{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"gc" = (
+/obj/structure/disposalpipe/broken,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"gj" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"gs" = (
+/obj/machinery/door/airlock/external/glass/ruin,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"gN" = (
+/obj/structure/disposalpipe/sorting{
+ dir = 8
+ },
+/turf/open/floor/catwalk_floor/iron,
+/area/virtual_domain/powered)
+"gV" = (
+/obj/effect/turf_decal/trimline/yellow/warning{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"hg" = (
+/obj/effect/turf_decal/caution{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"hi" = (
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"hk" = (
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/broken{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"ho" = (
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"iw" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"iz" = (
+/obj/structure/broken_flooring/corner,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"iI" = (
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/corner,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"jv" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 8
+ },
+/obj/machinery/light/small/red/dim{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"jw" = (
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"jH" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/catwalk_floor/iron,
+/area/virtual_domain/powered)
+"jQ" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/light/small/red/dim{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"jS" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"jW" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"kh" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"ki" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/bitrunning/cache_spawn,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"kn" = (
+/obj/machinery/light/small/red/dim{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"kJ" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/door/poddoor/shutters/indestructible{
+ dir = 4;
+ id = "factorylockdown"
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"kU" = (
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"lp" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/locked,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"lt" = (
+/obj/structure/disposalpipe/sorting{
+ dir = 8
+ },
+/mob/living/basic/hivebot/range,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"lx" = (
+/obj/machinery/door/poddoor/shutters/indestructible{
+ dir = 4;
+ id = "factorylockdown"
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"lB" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 5
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"lC" = (
+/obj/machinery/door/airlock/glass,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"lI" = (
+/obj/effect/mapping_helpers/burnt_floor,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"lN" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"lW" = (
+/obj/structure/disposalpipe/sorting{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"mh" = (
+/obj/structure/broken_flooring/pile{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"mu" = (
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"mE" = (
+/obj/machinery/door/airlock/maintenance,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"mY" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 1
+ },
+/obj/machinery/light/small/red/dim{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"nc" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/sign/poster/official/safety_internals/directional/south,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"nz" = (
+/obj/structure/broken_flooring/side/directional/north,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"nD" = (
+/obj/structure/disposalpipe/trunk/multiz,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"nL" = (
+/obj/effect/turf_decal/tile/dark/half,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"nS" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"op" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/dim{
+ dir = 1
+ },
+/obj/structure/sign/warning/doors/directional/north,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"oN" = (
+/obj/machinery/conveyor/auto,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/east,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"oX" = (
+/obj/structure/broken_flooring/corner/directional/north,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"pa" = (
+/obj/machinery/light/small/red/dim{
+ dir = 1
+ },
+/turf/open/floor/carpet/orange,
+/area/virtual_domain/powered)
+"pb" = (
+/obj/structure/broken_flooring/corner{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"pf" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/effect/mapping_helpers/damaged_window,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"pi" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"po" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/maint,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"pv" = (
+/obj/structure/broken_flooring/side{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"pI" = (
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/obj/machinery/light/small/red/dim{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"pJ" = (
+/obj/structure/broken_flooring/pile{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"qc" = (
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
+ dir = 8
+ },
+/obj/structure/table/reinforced,
+/obj/effect/spawner/random/bureaucracy/briefcase,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"qk" = (
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"qK" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/sign/warning/secure_area/directional/north,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"qN" = (
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/obj/effect/mob_spawn/corpse/human/factory,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"qT" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/light/small/red/dim{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"qV" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"qW" = (
+/obj/machinery/light/dim{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"rc" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/sign/poster/contraband/random/directional/north,
+/obj/effect/landmark/bitrunning/cache_spawn,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"rz" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 1
+ },
+/obj/machinery/light/small/red/dim,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"rG" = (
+/obj/machinery/light/dim,
+/obj/effect/turf_decal/trimline/yellow/line,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"rJ" = (
+/obj/structure/railing,
+/obj/effect/decal/cleanable/oil,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"rM" = (
+/obj/structure/disposalpipe/broken{
+ dir = 1
+ },
+/mob/living/basic/hivebot/strong,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"rO" = (
+/turf/closed/mineral,
+/area/space)
+"sn" = (
+/turf/open/floor/carpet/royalblue{
+ icon_state = "carpet_royalblue-38"
+ },
+/area/virtual_domain/powered)
+"sB" = (
+/obj/machinery/light/broken{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"sW" = (
+/obj/effect/decal/cleanable/oil/streak,
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"tl" = (
+/obj/machinery/door/poddoor/shutters/indestructible{
+ id = "factorylockdown"
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"tr" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"tE" = (
+/obj/structure/disposalpipe/segment,
+/mob/living/basic/hivebot/range,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"ud" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor/carpet/royalblue{
+ icon_state = "carpet_royalblue-110"
+ },
+/area/virtual_domain/powered)
+"uk" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/effect/decal/cleanable/blood/splatter/over_window,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"um" = (
+/obj/machinery/light/dim{
+ dir = 1
+ },
+/turf/open/floor/iron/cafeteria,
+/area/virtual_domain/powered)
+"uv" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/broken_flooring/pile{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"uz" = (
+/obj/effect/spawner/random/trash/mess,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"uC" = (
+/obj/structure/falsewall,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"uF" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"uP" = (
+/turf/open/floor/carpet/royalblue{
+ icon_state = "carpet_royalblue-55"
+ },
+/area/virtual_domain/powered)
+"uU" = (
+/obj/structure/broken_flooring/side,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"vb" = (
+/obj/effect/turf_decal/trimline/yellow/line,
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 5
+ },
+/obj/machinery/light/broken,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"ve" = (
+/obj/machinery/mass_driver/trash{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"vA" = (
+/obj/structure/closet/crate/maint,
+/obj/effect/turf_decal/stripes{
+ dir = 9
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"vL" = (
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"vQ" = (
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"vU" = (
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"wg" = (
+/obj/machinery/light/small/red/dim{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/preopen,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"wh" = (
+/obj/structure/table/wood,
+/turf/open/floor/carpet/royalblue{
+ icon_state = "carpet_royalblue-207"
+ },
+/area/virtual_domain/powered)
+"wl" = (
+/obj/item/shard,
+/turf/open/space/basic,
+/area/space)
+"wm" = (
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
+ dir = 1
+ },
+/obj/structure/sign/clock/directional/north,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"wq" = (
+/obj/structure/table/wood,
+/obj/machinery/button/door{
+ name = "Cargo Bay Lockdown";
+ id = "factorylockdown"
+ },
+/turf/open/floor/carpet/royalblue{
+ icon_state = "carpet_royalblue-63"
+ },
+/area/virtual_domain/powered)
+"ws" = (
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"ww" = (
+/obj/effect/turf_decal/stripes{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/mob/living/basic/hivebot,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"wU" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"wW" = (
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"xa" = (
+/obj/machinery/door/poddoor/shutters/indestructible{
+ dir = 8;
+ id = "factorylockdown"
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"xj" = (
+/obj/structure/railing/corner/end{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"xk" = (
+/obj/machinery/light/dim{
+ dir = 4
+ },
+/obj/effect/landmark/bitrunning/cache_spawn,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"xl" = (
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"xA" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"xE" = (
+/obj/effect/turf_decal/trimline/yellow/line,
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 9
+ },
+/obj/machinery/light/broken,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"xF" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/indestructible/binary,
+/area/virtual_domain/powered)
+"xM" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/bed/dogbed{
+ name = "cat bed"
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"xT" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"yB" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/welded,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"yM" = (
+/turf/closed/indestructible/fakedoor{
+ name = "Stairwell Access"
+ },
+/area/virtual_domain/powered)
+"yQ" = (
+/turf/template_noop,
+/area/template_noop)
+"yX" = (
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"zp" = (
+/obj/structure/chair/sofa/corp/right{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/broken,
+/turf/open/floor/carpet/orange,
+/area/virtual_domain/powered)
+"zB" = (
+/obj/structure/closet/crate/bin,
+/obj/item/trash/tray,
+/obj/effect/spawner/random/trash/garbage,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"zE" = (
+/obj/structure/disposalpipe/broken{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"zO" = (
+/obj/effect/turf_decal/siding/white{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/broken,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Av" = (
+/obj/item/stack/rods/two,
+/turf/open/space/basic,
+/area/space)
+"Aw" = (
+/obj/structure/lattice/catwalk{
+ name = "industrial lift"
+ },
+/mob/living/basic/hivebot/rapid,
+/turf/open/chasm,
+/area/virtual_domain/powered)
+"AJ" = (
+/obj/effect/decal/cleanable/generic,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"AP" = (
+/obj/structure/railing,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"AU" = (
+/turf/open/misc/asteroid/airless,
+/area/space)
+"Bd" = (
+/obj/structure/closet/secure_closet/tac{
+ req_access = null
+ },
+/obj/item/ammo_casing/shotgun/buckshot,
+/obj/item/ammo_casing/shotgun/buckshot,
+/obj/item/ammo_casing/shotgun/buckshot,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Bh" = (
+/obj/structure/broken_flooring/corner/directional/east,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Bx" = (
+/obj/structure/table/reinforced,
+/obj/machinery/microwave{
+ broken = 1;
+ desc = "No longer cooks and boils stuff."
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"BA" = (
+/obj/structure/broken_flooring/corner/directional/south,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"BI" = (
+/obj/machinery/door/airlock/command/glass{
+ name = "Quartermaster's Office"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/away/command,
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"BN" = (
+/obj/structure/flora/rock/pile/style_random,
+/turf/open/misc/asteroid/airless,
+/area/space)
+"BW" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/trimline/yellow/warning{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"BX" = (
+/obj/effect/decal/cleanable/robot_debris/old,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Ci" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Ct" = (
+/obj/machinery/conveyor/auto{
+ dir = 6
+ },
+/obj/machinery/light/broken{
+ dir = 1
+ },
+/obj/structure/sign/warning/vacuum/directional/north,
+/obj/structure/window/reinforced/spawner/directional/east,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Cv" = (
+/obj/structure/chair/office{
+ dir = 8
+ },
+/turf/open/floor/carpet/royalblue{
+ icon_state = "carpet_royalblue-157"
+ },
+/area/virtual_domain/powered)
+"CA" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/broken_flooring/side{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"CQ" = (
+/obj/effect/spawner/random/trash/botanical_waste,
+/obj/item/trash/chips,
+/obj/structure/closet/secure_closet/freezer/empty/open,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"CR" = (
+/obj/structure/flora/rock/pile/style_random,
+/turf/open/misc/asteroid/airless,
+/area/virtual_domain/powered)
+"CX" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Dr" = (
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/machinery/light/dim{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"DA" = (
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/catwalk_floor/iron,
+/area/virtual_domain/powered)
+"DE" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"DP" = (
+/obj/structure/table/reinforced,
+/obj/effect/spawner/random/food_or_drink/snack,
+/turf/open/floor/iron/cafeteria,
+/area/virtual_domain/powered)
+"Ex" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/carpet/royalblue{
+ icon_state = "carpet_royalblue-137"
+ },
+/area/virtual_domain/powered)
+"Ez" = (
+/obj/structure/flora/rock/style_random,
+/turf/open/misc/asteroid/airless,
+/area/space)
+"EI" = (
+/obj/effect/turf_decal/stripes{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/oil,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"EJ" = (
+/obj/machinery/recycler/deathtrap{
+ dir = 8
+ },
+/obj/machinery/conveyor/auto{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Fa" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/closet/crate/maint,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Ff" = (
+/obj/structure/disposalpipe/trunk/multiz{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Fo" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/cafeteria,
+/area/virtual_domain/powered)
+"Fr" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/closet/crate/preopen,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Fw" = (
+/obj/structure/flora/bush/fullgrass/style_random,
+/obj/structure/flora/rock/pile/style_random,
+/obj/structure/flora/bush/flowers_yw/style_random,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/window/reinforced/spawner/directional/west,
+/turf/open/floor/grass,
+/area/virtual_domain/powered)
+"FK" = (
+/obj/effect/mapping_helpers/burnt_floor,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"FO" = (
+/turf/open/misc/asteroid/airless,
+/area/virtual_domain/powered)
+"FP" = (
+/turf/open/floor/carpet/royalblue{
+ icon_state = "carpet_royalblue-110"
+ },
+/area/virtual_domain/powered)
+"Gb" = (
+/obj/effect/turf_decal/stripes{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Ge" = (
+/turf/open/floor/carpet/royalblue{
+ icon_state = "carpet_royalblue-21"
+ },
+/area/virtual_domain/powered)
+"Gh" = (
+/obj/machinery/door/airlock/maintenance,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Gi" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/yellow/corner,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Gs" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 1
+ },
+/obj/machinery/light/broken{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Gy" = (
+/obj/machinery/conveyor/auto{
+ dir = 9;
+ inverted = 1;
+ icon_state = "conveyor_map_inverted"
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/window/reinforced/spawner/directional/west,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"GI" = (
+/obj/effect/turf_decal/trimline/yellow/arrow_ccw,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"GV" = (
+/obj/machinery/light/small/red/dim{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes{
+ dir = 9
+ },
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Hn" = (
+/turf/open/floor/iron/cafeteria,
+/area/virtual_domain/powered)
+"HI" = (
+/obj/structure/broken_flooring/pile/directional/north,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Ib" = (
+/obj/structure/chair/sofa/corp/left{
+ dir = 1
+ },
+/turf/open/floor/carpet/orange,
+/area/virtual_domain/powered)
+"Ip" = (
+/obj/machinery/door/airlock/engineering/glass,
+/obj/effect/mapping_helpers/airlock/access/any/away/supply,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Is" = (
+/obj/machinery/door/airlock/engineering/glass,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"IF" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"IK" = (
+/obj/effect/turf_decal/trimline/yellow/line,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"IZ" = (
+/obj/structure/lattice/catwalk{
+ name = "industrial lift"
+ },
+/obj/structure/closet/crate,
+/turf/open/chasm,
+/area/virtual_domain/powered)
+"Jl" = (
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Jm" = (
+/obj/structure/broken_flooring/pile/directional/north,
+/obj/machinery/light/dim,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Jn" = (
+/obj/effect/turf_decal/stripes{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/obj/structure/railing/corner/end/flip{
+ dir = 8
+ },
+/obj/structure/sign/warning/doors/directional/east,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Jq" = (
+/obj/structure/broken_flooring/pile{
+ dir = 1
+ },
+/obj/structure/sign/poster/contraband/random/directional/west,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"JE" = (
+/obj/machinery/light/small/red/dim{
+ dir = 1
+ },
+/obj/structure/sign/warning/chem_diamond/directional/west,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"JR" = (
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"JT" = (
+/obj/structure/lattice/catwalk{
+ name = "industrial lift"
+ },
+/obj/effect/spawner/random/trash/grime,
+/turf/open/chasm,
+/area/virtual_domain/powered)
+"Kb" = (
+/obj/effect/mob_spawn/corpse/human/factory/guard,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Kt" = (
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"KO" = (
+/obj/structure/broken_flooring/side/directional/north,
+/obj/machinery/light/small/red/dim,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"KX" = (
+/obj/structure/lattice/catwalk{
+ name = "industrial lift"
+ },
+/turf/open/chasm,
+/area/virtual_domain/powered)
+"Ln" = (
+/obj/structure/disposalpipe/broken{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Lp" = (
+/obj/effect/turf_decal/trimline/yellow/line,
+/obj/machinery/light/broken,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"LN" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 10
+ },
+/obj/machinery/light/dim{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"LU" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Mc" = (
+/obj/effect/turf_decal/trimline/yellow/warning,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Mh" = (
+/obj/machinery/conveyor/auto{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Mi" = (
+/obj/effect/mob_spawn/corpse/human/factory,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Mj" = (
+/turf/closed/mineral,
+/area/virtual_domain/powered)
+"Mu" = (
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Mx" = (
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
+ dir = 1
+ },
+/obj/structure/filingcabinet,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"My" = (
+/obj/machinery/conveyor/auto{
+ dir = 1
+ },
+/obj/machinery/light/small/red/dim{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"MI" = (
+/turf/open/floor/carpet/royalblue{
+ icon_state = "carpet_royalblue-74"
+ },
+/area/virtual_domain/powered)
+"MN" = (
+/obj/effect/turf_decal/tile/dark,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Nc" = (
+/obj/structure/chair/plastic{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Nu" = (
+/obj/effect/turf_decal/trimline/yellow/line,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"NW" = (
+/obj/effect/decal/cleanable/dirt,
+/mob/living/basic/hivebot/strong,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Ok" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"On" = (
+/obj/structure/broken_flooring/side{
+ dir = 4
+ },
+/obj/machinery/light/broken{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"OJ" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/stripes{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"OL" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"OQ" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/sign/poster/ripped/directional/west,
+/turf/open/floor/carpet/orange,
+/area/virtual_domain/powered)
+"OR" = (
+/obj/machinery/light/broken,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Po" = (
+/obj/machinery/light/small/red/dim{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/obj/structure/broken_flooring/corner,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Pr" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 8
+ },
+/obj/structure/sign/poster/official/random/directional/east,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"PH" = (
+/obj/structure/railing/corner/end/flip{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Qd" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 6
+ },
+/obj/machinery/light/dim{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Qh" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/light/broken{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Qj" = (
+/obj/machinery/light/dim{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Qo" = (
+/obj/effect/landmark/bitrunning/safehouse_spawn,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"Qr" = (
+/turf/closed/indestructible/fakedoor/maintenance{
+ name = "maintenance access"
+ },
+/area/virtual_domain/powered)
+"Qv" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 9
+ },
+/obj/machinery/light/small/red/dim{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Qy" = (
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/obj/structure/disposaloutlet{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"QI" = (
+/obj/structure/sign/calendar/directional/north,
+/obj/effect/spawner/random/trash/garbage,
+/turf/open/floor/iron/cafeteria,
+/area/virtual_domain/powered)
+"QK" = (
+/obj/structure/table,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"QN" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"QP" = (
+/obj/structure/sign/poster/contraband/random/directional/east,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"QW" = (
+/obj/machinery/conveyor/auto{
+ dir = 5
+ },
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Ru" = (
+/obj/machinery/door/airlock/external/glass/ruin,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Ry" = (
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
+ dir = 4
+ },
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/obj/machinery/disposal/bin,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"RJ" = (
+/turf/closed/indestructible/binary,
+/area/virtual_domain/powered)
+"RK" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"RZ" = (
+/obj/effect/turf_decal/tile/yellow/half/contrasted{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Sg" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Sl" = (
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/yellow/warning{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"SC" = (
+/mob/living/basic/hivebot/strong,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"SR" = (
+/obj/effect/turf_decal/trimline/yellow/line,
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"SS" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/closed/mineral,
+/area/virtual_domain/powered)
+"SU" = (
+/obj/effect/spawner/structure/window,
+/obj/item/stack/rods/two,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"SZ" = (
+/obj/structure/table/reinforced,
+/obj/effect/spawner/random/food_or_drink/booze,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Te" = (
+/obj/effect/decal/cleanable/blood/tracks{
+ dir = 5
+ },
+/obj/effect/mob_spawn/corpse/human/factory/qm,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Tn" = (
+/obj/structure/broken_flooring/corner{
+ dir = 4
+ },
+/mob/living/basic/hivebot,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Tp" = (
+/obj/machinery/door/poddoor/shutters/indestructible{
+ dir = 4;
+ id = "factorylockdown"
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Tt" = (
+/obj/machinery/conveyor/auto{
+ dir = 9
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"TH" = (
+/obj/structure/broken_flooring/corner/directional/south,
+/obj/item/ammo_casing/shotgun/buckshot/spent,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Ue" = (
+/obj/structure/table/reinforced,
+/obj/machinery/light/small/red/dim{
+ dir = 8
+ },
+/obj/structure/sign/poster/official/cleanliness/directional/west,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Uw" = (
+/obj/machinery/light/dim{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"UO" = (
+/obj/structure/broken_flooring/side/directional/north,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"UV" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 6
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"UX" = (
+/obj/effect/turf_decal/trimline/yellow/line,
+/obj/machinery/light/small/red/dim,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"UY" = (
+/obj/effect/decal/cleanable/blood/tracks{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Vb" = (
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/light/broken,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Vg" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/machinery/light/small/red/dim,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Vh" = (
+/obj/structure/table/reinforced,
+/turf/open/floor/iron/cafeteria,
+/area/virtual_domain/powered)
+"Vy" = (
+/obj/structure/broken_flooring/singular{
+ dir = 4
+ },
+/obj/effect/mob_spawn/corpse/human/factory/guard,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"VA" = (
+/obj/machinery/light/small/red/dim{
+ dir = 1
+ },
+/obj/structure/table,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"VJ" = (
+/obj/structure/broken_flooring/corner{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"VL" = (
+/obj/structure/sign/warning/secure_area/directional/south,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"VO" = (
+/obj/machinery/light/broken{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Wd" = (
+/obj/structure/lattice/catwalk{
+ name = "industrial lift"
+ },
+/obj/structure/railing,
+/turf/open/chasm,
+/area/virtual_domain/powered)
+"Wp" = (
+/obj/effect/turf_decal/trimline/yellow/warning{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"WT" = (
+/obj/effect/turf_decal/stripes{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"WV" = (
+/obj/machinery/conveyor/auto{
+ dir = 10;
+ inverted = 1;
+ icon_state = "conveyor_map_inverted"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Xb" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/closed/wall,
+/area/virtual_domain/powered)
+"Xc" = (
+/obj/effect/turf_decal/trimline/yellow/line,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Xm" = (
+/obj/item/gun/ballistic/shotgun/lethal,
+/obj/machinery/light/broken{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Xo" = (
+/obj/machinery/conveyor/auto{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Xw" = (
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/yellow/line{
+ dir = 10
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"XL" = (
+/obj/effect/turf_decal/trimline/yellow/warning{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 4
+ },
+/obj/structure/sign/warning/vacuum/external/directional/south,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"XN" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"XO" = (
+/obj/effect/turf_decal/delivery,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"XP" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/railing/corner/end{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"XQ" = (
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
+ dir = 4
+ },
+/obj/machinery/light/dim{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"XR" = (
+/obj/effect/turf_decal/trimline/yellow/warning{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Yc" = (
+/obj/item/gun/ballistic/revolver,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Yl" = (
+/obj/structure/broken_flooring/corner/directional/west,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Ym" = (
+/mob/living/simple_animal/pet/cat/space,
+/obj/structure/bed/dogbed{
+ name = "cat bed"
+ },
+/obj/item/toy/plush/moth{
+ pixel_x = 3;
+ pixel_y = 4
+ },
+/obj/machinery/light/small/dim/directional/south,
+/obj/structure/sign/poster/official/moth_hardhat/directional/west,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Yt" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Yz" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/poddoor/shutters/indestructible{
+ id = "factorylockdown"
+ },
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"YF" = (
+/obj/machinery/light/small/red/dim,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"YL" = (
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"YP" = (
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 1
+ },
+/obj/machinery/light/dim,
+/turf/open/floor/iron,
+/area/virtual_domain/powered)
+"Zb" = (
+/obj/effect/decal/cleanable/oil,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"Zg" = (
+/turf/open/floor/carpet/royalblue{
+ icon_state = "carpet_royalblue-157"
+ },
+/area/virtual_domain/powered)
+"Zy" = (
+/obj/structure/table,
+/obj/item/flashlight/lantern,
+/turf/open/floor/plating,
+/area/virtual_domain/powered)
+"ZI" = (
+/turf/open/floor/carpet/royalblue{
+ icon_state = "carpet_royalblue-203"
+ },
+/area/virtual_domain/powered)
+"ZP" = (
+/obj/structure/railing,
+/turf/open/floor/iron/stairs/right{
+ dir = 8
+ },
+/area/virtual_domain/powered)
+
+(1,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+"}
+(2,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+RJ
+Mj
+Mj
+eg
+eg
+SS
+eg
+eg
+eg
+Xb
+Mj
+Mj
+RJ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+"}
+(3,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+RJ
+Mj
+Bx
+SZ
+Ue
+CQ
+zB
+eg
+OQ
+bs
+Ib
+Mj
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+yQ
+yQ
+"}
+(4,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+eg
+ho
+ho
+qN
+ho
+zO
+eg
+pa
+bs
+zp
+eY
+RJ
+RJ
+Mj
+RJ
+RJ
+rO
+rO
+RJ
+RJ
+xF
+"}
+(5,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+RJ
+eg
+eg
+eg
+eg
+eg
+eg
+eg
+RJ
+eg
+um
+DP
+Vh
+Vh
+Hn
+tr
+fg
+ZP
+Fw
+eY
+Mj
+Mj
+Mj
+AU
+AU
+AU
+rO
+rO
+rO
+RJ
+"}
+(6,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+RJ
+eg
+vA
+Dr
+bw
+Jq
+gc
+eg
+RJ
+eg
+Hn
+fK
+fK
+fK
+Hn
+lC
+hi
+FK
+eY
+eY
+Mj
+Ez
+AU
+aK
+aK
+AU
+AU
+BN
+rO
+RJ
+"}
+(7,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+RJ
+eg
+jQ
+lt
+kU
+vU
+lN
+eg
+RJ
+eg
+QI
+Fo
+Hn
+Hn
+Hn
+tr
+hi
+Ln
+eY
+Mj
+Mj
+AU
+AU
+BN
+aK
+aK
+aK
+AU
+rO
+RJ
+"}
+(8,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+RJ
+eg
+uU
+gj
+kU
+Tn
+OR
+eg
+RJ
+eg
+eg
+uk
+pf
+pf
+eg
+eg
+qV
+Vb
+eY
+aK
+aK
+aK
+aK
+aK
+aK
+aK
+aK
+aK
+aK
+RJ
+"}
+(9,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+RJ
+eg
+ki
+gj
+kU
+kU
+kU
+eg
+RJ
+eg
+kU
+kU
+nD
+nS
+kU
+Qj
+FK
+nc
+eY
+aK
+aK
+aK
+aK
+aK
+aK
+AU
+aK
+aK
+aK
+RJ
+"}
+(10,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+eg
+eg
+kJ
+lx
+lx
+lp
+eg
+RJ
+eg
+mu
+AJ
+mu
+eJ
+MN
+BW
+hi
+Sg
+eY
+aK
+aK
+aK
+aK
+aK
+aK
+aK
+aK
+aK
+aK
+RJ
+"}
+(11,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+eg
+eg
+eg
+Qr
+eg
+eg
+JE
+gj
+pi
+kU
+VL
+eg
+eg
+eg
+VO
+kU
+Fr
+jw
+qk
+XR
+vQ
+Vg
+eY
+aK
+aK
+aK
+JR
+JR
+JR
+JR
+JR
+Qo
+aK
+RJ
+"}
+(12,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+RJ
+RJ
+RJ
+eg
+eg
+eg
+eg
+eg
+eg
+yM
+eg
+GV
+WT
+xj
+qk
+Qh
+XP
+lW
+ww
+EI
+Kt
+Qh
+mu
+Yz
+xl
+HI
+kU
+Bh
+Kb
+kU
+hi
+CX
+eY
+eY
+aK
+aK
+JR
+JR
+JR
+JR
+JR
+JR
+aK
+RJ
+"}
+(13,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+RJ
+RJ
+RJ
+eg
+VA
+bA
+eg
+kU
+sB
+WT
+mh
+kU
+pv
+AP
+IZ
+KX
+Wd
+uv
+DE
+Mi
+gj
+xT
+hi
+tl
+IF
+kU
+hi
+Yc
+kU
+kU
+vU
+lB
+XL
+eg
+tr
+eY
+JR
+JR
+JR
+JR
+JR
+JR
+aK
+RJ
+"}
+(14,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+RJ
+RJ
+kU
+kU
+Zy
+kU
+Gh
+Kt
+mu
+mu
+mu
+uF
+xl
+AP
+KX
+JT
+bG
+qk
+DA
+DA
+zE
+gc
+mu
+Yz
+lW
+pi
+kU
+kU
+nL
+BW
+hi
+hg
+Wp
+Ru
+hi
+gs
+JR
+JR
+JR
+JR
+JR
+JR
+aK
+RJ
+"}
+(15,1,1) = {"
+yQ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+kU
+QP
+kU
+eg
+qT
+Gb
+Uw
+iz
+jS
+gj
+rJ
+KX
+Aw
+Wd
+Ff
+lN
+XO
+gj
+DE
+SC
+tl
+qk
+mu
+mu
+xl
+kU
+oX
+hi
+cF
+cw
+eY
+tr
+eY
+JR
+JR
+JR
+JR
+JR
+JR
+aK
+RJ
+"}
+(16,1,1) = {"
+yQ
+RJ
+Mj
+Mj
+Mj
+Mj
+RJ
+eg
+eg
+eg
+eg
+Xb
+yB
+eg
+eg
+kU
+qk
+PH
+dA
+Po
+Jn
+aw
+OJ
+CA
+QN
+kU
+Uw
+tl
+kU
+Mc
+kU
+kh
+fj
+kU
+FK
+CX
+eY
+eY
+aK
+aK
+JR
+JR
+JR
+JR
+JR
+JR
+aK
+RJ
+"}
+(17,1,1) = {"
+yQ
+RJ
+Mj
+BN
+AU
+Mj
+Mj
+Mj
+eg
+QW
+My
+Qy
+kU
+po
+eg
+tr
+Is
+tr
+eg
+eg
+eg
+kU
+pi
+kU
+lI
+YF
+eg
+eg
+op
+kU
+BA
+iw
+kU
+kU
+FK
+rz
+eY
+aK
+aK
+aK
+JR
+JR
+JR
+JR
+JR
+ev
+aK
+RJ
+"}
+(18,1,1) = {"
+yQ
+RJ
+aK
+AU
+AU
+AU
+aK
+aK
+eg
+Ct
+oN
+Gy
+jW
+xT
+eg
+Tp
+Tp
+Tp
+eg
+Ym
+eg
+eg
+xa
+xa
+xa
+eg
+eg
+eg
+kU
+Zb
+kU
+Yt
+kU
+UO
+hi
+CX
+eY
+aK
+aK
+aK
+aK
+aK
+aK
+aK
+aK
+aK
+aK
+RJ
+"}
+(19,1,1) = {"
+RJ
+RJ
+aK
+aK
+aK
+aK
+wl
+aK
+yX
+ve
+Tt
+Xo
+DE
+oX
+eg
+Sl
+gV
+dz
+eg
+uC
+eg
+qK
+mh
+kU
+kU
+Qj
+VJ
+eg
+kU
+kU
+kU
+gj
+kU
+kU
+hi
+Ok
+eY
+aK
+aK
+aK
+aK
+aK
+aK
+aK
+aK
+aK
+aK
+RJ
+"}
+(20,1,1) = {"
+RJ
+aK
+aK
+aK
+aK
+aK
+aK
+aK
+tr
+uz
+Mh
+EJ
+kU
+kU
+mE
+Mu
+Yl
+pJ
+eg
+kn
+pb
+kU
+kU
+kU
+Fa
+kU
+YF
+eg
+eg
+pf
+tr
+XN
+eg
+eg
+Ci
+YP
+eY
+eY
+aK
+aK
+aK
+aK
+aK
+aK
+aK
+aK
+aK
+RJ
+"}
+(21,1,1) = {"
+RJ
+aK
+aK
+aK
+aK
+aK
+Av
+CR
+tr
+kU
+ei
+WV
+pi
+Jm
+eg
+eN
+gN
+GI
+eg
+rc
+mu
+rM
+gc
+vQ
+tE
+mu
+mu
+eg
+Mx
+qc
+ax
+bS
+fe
+pf
+hi
+hi
+af
+eY
+aK
+aK
+aK
+aK
+aK
+aK
+aK
+aK
+aK
+RJ
+"}
+(22,1,1) = {"
+RJ
+aK
+aK
+aK
+aK
+aK
+aK
+FO
+eg
+eg
+wg
+uU
+lN
+uz
+eg
+mY
+jH
+rG
+eg
+xT
+Uw
+kU
+kU
+On
+pi
+kU
+Mj
+eg
+wm
+xA
+fZ
+OL
+aL
+Ip
+hi
+lN
+QK
+eY
+aK
+aK
+aK
+aK
+BN
+aK
+aK
+aK
+aK
+RJ
+"}
+(23,1,1) = {"
+RJ
+aK
+aK
+aK
+aK
+aK
+AU
+FO
+Mj
+eg
+eg
+Mj
+Mj
+eY
+eY
+UO
+jH
+Nu
+eg
+eg
+eg
+eg
+eg
+Mj
+Mj
+Mj
+Mj
+eg
+RZ
+vQ
+wW
+wU
+dP
+tr
+hi
+hi
+Nc
+eY
+aK
+BN
+AU
+aK
+aK
+aK
+aK
+aK
+aK
+RJ
+"}
+(24,1,1) = {"
+RJ
+RJ
+aK
+aK
+aK
+AU
+Ez
+Mj
+Mj
+RJ
+Mj
+Mj
+Vy
+hi
+eY
+CX
+jH
+Nu
+eg
+Gi
+Qd
+jv
+fR
+cB
+Mj
+RJ
+RJ
+eg
+Ry
+hk
+pI
+XQ
+YL
+eg
+bq
+hi
+Mj
+eY
+Mj
+Mj
+AU
+AU
+aK
+aK
+aK
+aK
+rO
+RJ
+"}
+(25,1,1) = {"
+yQ
+RJ
+aK
+AU
+BN
+AU
+Mj
+Mj
+RJ
+RJ
+eY
+Xm
+TH
+fw
+eY
+qW
+hi
+dx
+pf
+UV
+sn
+uP
+Ge
+vb
+eg
+RJ
+RJ
+eg
+Mj
+Mj
+eg
+eg
+eg
+eg
+eg
+Mj
+Mj
+RJ
+RJ
+Mj
+Mj
+Mj
+RJ
+RJ
+Mj
+Mj
+Mj
+RJ
+"}
+(26,1,1) = {"
+yQ
+RJ
+RJ
+RJ
+RJ
+rO
+Mj
+RJ
+RJ
+RJ
+eY
+Bd
+vL
+hi
+vU
+sW
+hi
+SR
+SU
+CX
+FP
+wh
+Zg
+Nu
+eg
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+"}
+(27,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+RJ
+RJ
+RJ
+RJ
+yQ
+RJ
+eY
+Jl
+RK
+BX
+eY
+CX
+RK
+iI
+BI
+ws
+ud
+bx
+Cv
+Nu
+eg
+RJ
+RJ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+"}
+(28,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+RJ
+eY
+NW
+UY
+KO
+eY
+fl
+jH
+Nu
+uk
+CX
+FP
+wq
+Zg
+Nu
+eg
+RJ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+"}
+(29,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+RJ
+eY
+xk
+Te
+xT
+eY
+CX
+jH
+Nu
+pf
+Xw
+MI
+ZI
+Ex
+xE
+eg
+RJ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+"}
+(30,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+RJ
+eY
+eY
+eY
+eY
+eY
+CX
+jH
+Xc
+eg
+Pr
+LN
+xM
+Qv
+LU
+Mj
+RJ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+"}
+(31,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+RJ
+RJ
+RJ
+RJ
+RJ
+eg
+Gs
+jH
+UX
+eg
+eg
+eg
+eg
+Mj
+Mj
+Mj
+RJ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+"}
+(32,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+RJ
+eg
+Ok
+nz
+IK
+eg
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+RJ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+"}
+(33,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+RJ
+Mj
+CX
+hi
+Nu
+RJ
+RJ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+"}
+(34,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+RJ
+Mj
+CX
+RJ
+Lp
+eg
+RJ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+"}
+(35,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+RJ
+RJ
+fl
+RJ
+RJ
+RJ
+RJ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+"}
+(36,1,1) = {"
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+RJ
+RJ
+RJ
+RJ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+"}
diff --git a/_maps/virtual_domains/pirates.dmm b/_maps/virtual_domains/pirates.dmm
new file mode 100644
index 00000000000..9c970f78c37
--- /dev/null
+++ b/_maps/virtual_domains/pirates.dmm
@@ -0,0 +1,2601 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ag" = (
+/obj/effect/mapping_helpers/burnt_floor,
+/obj/effect/decal/cleanable/garbage,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"by" = (
+/obj/effect/turf_decal/weather/sand{
+ dir = 5
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"bz" = (
+/obj/structure/flora/bush/grassy{
+ pixel_y = 8
+ },
+/obj/structure/flora/bush/lavendergrass{
+ pixel_y = -10
+ },
+/turf/open/misc/grass,
+/area/virtual_domain/powered)
+"bP" = (
+/obj/structure/flora/bush/flowers_br/style_random,
+/turf/open/misc/grass,
+/area/virtual_domain/powered)
+"cl" = (
+/obj/structure/flora/rock/style_3,
+/turf/open/water/beach,
+/area/virtual_domain/powered)
+"ct" = (
+/obj/structure/closet/cabinet,
+/obj/item/clothing/head/costume/pirate/armored,
+/obj/item/clothing/suit/costume/pirate/captain/armored,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood/parquet,
+/area/virtual_domain/powered)
+"cx" = (
+/turf/closed/indestructible/binary,
+/area/virtual_domain/powered)
+"cJ" = (
+/obj/item/stack/cannonball/shellball{
+ pixel_x = 13;
+ pixel_y = 11
+ },
+/obj/item/stack/cannonball{
+ pixel_x = 9;
+ pixel_y = 9
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"cQ" = (
+/obj/structure/flora/grass/jungle/b{
+ pixel_x = -15;
+ pixel_y = 9
+ },
+/obj/structure/flora/rock/pile/jungle/large/style_2{
+ pixel_x = -3;
+ pixel_y = -1
+ },
+/turf/open/misc/dirt/jungle,
+/area/virtual_domain/powered)
+"dp" = (
+/turf/closed/wall/mineral/wood/nonmetal,
+/area/virtual_domain/powered)
+"dA" = (
+/obj/structure/bonfire/prelit,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"dQ" = (
+/obj/structure/flora/rock/style_4,
+/turf/open/water/beach,
+/area/virtual_domain/powered)
+"eb" = (
+/obj/structure/flora/bush/sparsegrass,
+/turf/open/misc/grass,
+/area/virtual_domain/powered)
+"eD" = (
+/obj/structure/flora/coconuts{
+ pixel_x = 9;
+ pixel_y = -14
+ },
+/obj/structure/flora/tree/palm/style_2,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"eQ" = (
+/turf/open/floor/carpet/blue,
+/area/virtual_domain/powered)
+"eW" = (
+/obj/effect/turf_decal/weather/sand{
+ dir = 6
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"fx" = (
+/obj/structure/fluff/beach_umbrella{
+ pixel_x = -7;
+ pixel_y = -10
+ },
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"gk" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/landmark/bitrunning/cache_spawn,
+/turf/open/floor/carpet/blue,
+/area/virtual_domain/powered)
+"gw" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood{
+ icon_state = "wood_large"
+ },
+/area/virtual_domain/powered)
+"ht" = (
+/obj/structure/bookcase/random/fiction,
+/turf/open/floor/wood/parquet,
+/area/virtual_domain/powered)
+"hH" = (
+/obj/item/clothing/suit/armor/militia{
+ pixel_x = -5;
+ pixel_y = 12
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/item/clothing/suit/armor/militia{
+ pixel_x = -5;
+ pixel_y = 6
+ },
+/obj/item/clothing/suit/armor/militia{
+ pixel_x = -5;
+ pixel_y = -3
+ },
+/obj/item/clothing/head/costume/fancy{
+ pixel_x = 6;
+ pixel_y = 12
+ },
+/obj/item/clothing/head/costume/fancy{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/obj/item/clothing/head/hats/coordinator{
+ pixel_x = 8;
+ pixel_y = -5
+ },
+/obj/structure/closet/cabinet,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"hM" = (
+/obj/structure/closet/crate/goldcrate,
+/turf/open/misc/dirt/jungle,
+/area/virtual_domain/powered)
+"hW" = (
+/obj/structure/chair/comfy/carp{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/carpet/blue,
+/area/virtual_domain/powered)
+"iM" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/mob/living/simple_animal/hostile/pirate/ranged/space,
+/turf/open/floor/carpet/blue,
+/area/virtual_domain/powered)
+"iO" = (
+/obj/effect/turf_decal/weather/sand{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"jl" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/structure/table/wood,
+/obj/item/flashlight/flare/torch{
+ pixel_y = 10;
+ pixel_x = 7
+ },
+/obj/item/reagent_containers/cup/bucket/wooden{
+ pixel_y = -16;
+ pixel_x = 12
+ },
+/obj/machinery/recharger{
+ pixel_y = 6;
+ pixel_x = -5
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"jz" = (
+/obj/effect/mapping_helpers/burnt_floor,
+/turf/open/floor/wood{
+ icon_state = "wood_large"
+ },
+/area/virtual_domain/powered)
+"jB" = (
+/obj/effect/turf_decal/weather/sand{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/machinery/jukebox,
+/turf/open/floor/wood{
+ icon_state = "wood_large"
+ },
+/area/virtual_domain/powered)
+"jC" = (
+/obj/structure/table/wood,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/item/reagent_containers/cup/glass/bottle/rum{
+ desc = "Rum with ghostly properties that can help the drinker enter the spirit realm. It has fermented under the sea of space for ages.";
+ name = "Ghost Pirate Rum";
+ pixel_x = -4;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = -7;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
+ pixel_x = 3;
+ pixel_y = 7
+ },
+/turf/open/floor/carpet/blue,
+/area/virtual_domain/powered)
+"jQ" = (
+/obj/item/gun/energy/laser/hellgun{
+ pixel_y = 10
+ },
+/turf/open/misc/dirt/jungle,
+/area/virtual_domain/powered)
+"kg" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"kl" = (
+/obj/structure/cannon,
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/decal/cleanable/ash/large{
+ pixel_y = -5;
+ pixel_x = 8
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"lC" = (
+/obj/item/stack/cannonball{
+ pixel_x = 7;
+ pixel_y = 8
+ },
+/obj/item/stack/cannonball{
+ pixel_x = 11;
+ pixel_y = -4
+ },
+/obj/effect/turf_decal/weather/sand{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/oil/streak,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"me" = (
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"mw" = (
+/obj/structure/flora/grass/jungle/b/style_random{
+ pixel_x = -13;
+ pixel_y = 18
+ },
+/turf/open/misc/dirt/jungle,
+/area/virtual_domain/powered)
+"mP" = (
+/obj/structure/flora/bush/fullgrass,
+/turf/open/misc/grass,
+/area/virtual_domain/powered)
+"nz" = (
+/obj/effect/mob_spawn/corpse/human/pirate,
+/turf/open/misc/beach/coast{
+ dir = 8
+ },
+/area/virtual_domain/powered)
+"nQ" = (
+/obj/machinery/loot_locator,
+/turf/open/floor/carpet/blue,
+/area/virtual_domain/powered)
+"nS" = (
+/obj/structure/flora/rock/pile/jungle/large,
+/turf/open/misc/dirt/jungle,
+/area/virtual_domain/powered)
+"nX" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/mob/living/simple_animal/hostile/pirate/melee/space,
+/turf/open/floor/wood/parquet,
+/area/virtual_domain/powered)
+"oo" = (
+/obj/machinery/smartfridge/drying_rack,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"oU" = (
+/turf/open/misc/beach/coast{
+ dir = 10
+ },
+/area/virtual_domain/powered)
+"pq" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"px" = (
+/obj/structure/headpike/bone{
+ pixel_y = 24
+ },
+/turf/open/misc/beach/coast,
+/area/virtual_domain/powered)
+"pP" = (
+/turf/open/misc/beach/coast,
+/area/virtual_domain/powered)
+"pU" = (
+/obj/effect/mob_spawn/corpse/human/pirate,
+/turf/open/misc/dirt/jungle,
+/area/virtual_domain/powered)
+"qj" = (
+/obj/structure/barricade/wooden,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"qm" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/item/melee/sabre{
+ pixel_y = 12;
+ pixel_x = -10
+ },
+/obj/item/gun/energy/laser/retro,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"qx" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/mapping_helpers/burnt_floor,
+/obj/effect/decal/cleanable/dirt/dust,
+/mob/living/simple_animal/hostile/pirate/ranged,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"qN" = (
+/obj/structure/flora/bush/sunny/style_3{
+ pixel_y = 22
+ },
+/turf/open/misc/dirt/jungle,
+/area/virtual_domain/powered)
+"qX" = (
+/obj/effect/turf_decal/weather/sand{
+ dir = 9
+ },
+/obj/structure/fermenting_barrel{
+ pixel_x = 6;
+ pixel_y = 11
+ },
+/obj/effect/mob_spawn/ghost_role/human/pirate/skeleton,
+/turf/open/floor/wood{
+ icon_state = "wood_large"
+ },
+/area/virtual_domain/powered)
+"sn" = (
+/obj/structure/table/wood,
+/obj/item/book/manual/wiki/ordnance,
+/turf/open/floor/carpet/blue,
+/area/virtual_domain/powered)
+"so" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/carpet/blue,
+/area/virtual_domain/powered)
+"th" = (
+/obj/effect/turf_decal/weather/sand,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"tk" = (
+/obj/structure/flora/bush/flowers_pp,
+/turf/open/misc/grass,
+/area/virtual_domain/powered)
+"to" = (
+/mob/living/simple_animal/hostile/pirate/melee,
+/turf/open/misc/grass,
+/area/virtual_domain/powered)
+"ub" = (
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"uw" = (
+/obj/structure/barricade/sandbags,
+/obj/effect/turf_decal/weather/sand{
+ dir = 4
+ },
+/turf/open/floor/wood{
+ icon_state = "wood_large"
+ },
+/area/virtual_domain/powered)
+"uM" = (
+/obj/structure/flora/bush/stalky{
+ pixel_y = 13;
+ pixel_x = -8
+ },
+/turf/open/water/beach,
+/area/virtual_domain/powered)
+"uT" = (
+/obj/structure/closet/crate/grave,
+/obj/structure/flora/grass/jungle/b,
+/turf/open/misc/dirt/jungle,
+/area/virtual_domain/powered)
+"wb" = (
+/obj/structure/flora/rock,
+/turf/open/water/beach,
+/area/virtual_domain/powered)
+"we" = (
+/obj/effect/mine/explosive/light,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"xc" = (
+/turf/open/misc/beach/coast{
+ dir = 4
+ },
+/area/virtual_domain/powered)
+"xg" = (
+/turf/template_noop,
+/area/template_noop)
+"xm" = (
+/obj/structure/barricade/wooden/crude,
+/turf/closed/wall/mineral/wood/nonmetal,
+/area/virtual_domain/powered)
+"xB" = (
+/obj/structure/fermenting_barrel/gunpowder{
+ pixel_x = -4;
+ pixel_y = 17
+ },
+/obj/structure/fermenting_barrel/gunpowder{
+ pixel_x = 4
+ },
+/obj/item/stack/cannonball/four{
+ pixel_x = -9;
+ pixel_y = -10
+ },
+/obj/item/stack/cannonball{
+ pixel_x = 3;
+ pixel_y = 8
+ },
+/obj/item/reagent_containers/cup/bucket/wooden{
+ pixel_y = -10
+ },
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"xC" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/obj/effect/turf_decal/weather/dirt,
+/turf/open/water/beach,
+/area/virtual_domain/powered)
+"xI" = (
+/obj/structure/flora/rock/pile/style_2,
+/turf/open/water/beach,
+/area/virtual_domain/powered)
+"yc" = (
+/obj/effect/turf_decal/weather/dirt,
+/turf/open/water/beach,
+/area/virtual_domain/powered)
+"ye" = (
+/turf/open/misc/dirt/jungle,
+/area/virtual_domain/powered)
+"yi" = (
+/mob/living/simple_animal/hostile/pirate/melee,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"yq" = (
+/obj/structure/barricade/sandbags,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"yw" = (
+/obj/effect/mapping_helpers/burnt_floor,
+/mob/living/simple_animal/hostile/pirate/ranged,
+/obj/structure/chair/wood,
+/turf/open/floor/wood{
+ icon_state = "wood_large"
+ },
+/area/virtual_domain/powered)
+"yA" = (
+/obj/item/bedsheet/rainbow/double,
+/obj/structure/bed/double,
+/turf/open/floor/carpet/blue,
+/area/virtual_domain/powered)
+"zf" = (
+/obj/structure/flora/bush/flowers_br/style_random,
+/obj/structure/flora/bush/ferny,
+/turf/open/misc/grass,
+/area/virtual_domain/powered)
+"zg" = (
+/obj/structure/flora/rock/pile/style_3,
+/turf/open/misc/dirt/jungle,
+/area/virtual_domain/powered)
+"zR" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"Ax" = (
+/obj/effect/turf_decal/weather/dirt,
+/obj/effect/turf_decal/weather/dirt,
+/turf/open/water/beach,
+/area/virtual_domain/powered)
+"AU" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 1
+ },
+/turf/open/water/beach,
+/area/virtual_domain/powered)
+"BC" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"BO" = (
+/obj/structure/bookcase/random/adult,
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/floor/wood/parquet,
+/area/virtual_domain/powered)
+"Cc" = (
+/obj/structure/flora/tree/palm,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"Ct" = (
+/turf/open/misc/beach/coast/corner,
+/area/virtual_domain/powered)
+"Dm" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/table/wood,
+/obj/item/flashlight/flare/torch{
+ pixel_y = 10
+ },
+/obj/item/flashlight/flare/torch{
+ pixel_x = 8;
+ pixel_y = 6
+ },
+/turf/open/floor/wood{
+ icon_state = "wood_large"
+ },
+/area/virtual_domain/powered)
+"DJ" = (
+/obj/effect/mapping_helpers/burnt_floor,
+/obj/structure/bed/maint{
+ pixel_x = -10;
+ pixel_y = 9
+ },
+/obj/effect/decal/cleanable/wrapping,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"DL" = (
+/obj/structure/flora/bush/sunny,
+/turf/open/misc/grass,
+/area/virtual_domain/powered)
+"ED" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/weather/sand{
+ dir = 10
+ },
+/obj/effect/turf_decal/weather/sand{
+ dir = 9
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"EZ" = (
+/obj/effect/turf_decal/weather/sand{
+ dir = 9
+ },
+/turf/open/floor/wood{
+ icon_state = "wood_large"
+ },
+/area/virtual_domain/powered)
+"FG" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/claymore/cutlass,
+/obj/item/clothing/head/costume/pirate/bandana/armored{
+ pixel_x = -9;
+ pixel_y = 7
+ },
+/obj/structure/table/wood,
+/obj/item/gun/energy/laser{
+ pixel_y = -3
+ },
+/turf/open/floor/wood{
+ icon_state = "wood_large"
+ },
+/area/virtual_domain/powered)
+"FT" = (
+/turf/closed/mineral/random/jungle,
+/area/virtual_domain/powered)
+"GF" = (
+/obj/effect/turf_decal/weather/dirt,
+/obj/structure/flora/rock/pile,
+/turf/open/water/beach,
+/area/virtual_domain/powered)
+"GG" = (
+/obj/structure/barricade/sandbags,
+/obj/effect/turf_decal/weather/sand{
+ dir = 6
+ },
+/obj/item/binoculars{
+ pixel_x = -1;
+ pixel_y = 1
+ },
+/turf/open/floor/wood{
+ icon_state = "wood_large"
+ },
+/area/virtual_domain/powered)
+"Hp" = (
+/obj/effect/turf_decal/siding/wood,
+/mob/living/simple_animal/hostile/pirate/ranged,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"HY" = (
+/turf/open/misc/beach/coast{
+ dir = 6
+ },
+/area/virtual_domain/powered)
+"It" = (
+/obj/structure/flora/bush/sparsegrass,
+/obj/structure/flora/bush/lavendergrass,
+/turf/open/misc/grass,
+/area/virtual_domain/powered)
+"Iz" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/bed/maint,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"IF" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 4
+ },
+/turf/open/water/beach,
+/area/virtual_domain/powered)
+"IG" = (
+/obj/effect/mob_spawn/corpse/human/pirate,
+/obj/effect/decal/cleanable/blood/gibs/old,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"IM" = (
+/obj/effect/turf_decal/weather/sand{
+ dir = 10
+ },
+/turf/open/floor/wood{
+ icon_state = "wood_large"
+ },
+/area/virtual_domain/powered)
+"Jo" = (
+/obj/effect/landmark/bitrunning/cache_spawn,
+/turf/open/misc/dirt/jungle,
+/area/virtual_domain/powered)
+"Jr" = (
+/obj/structure/headpike/bone,
+/turf/open/misc/beach/coast,
+/area/virtual_domain/powered)
+"Jv" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"JT" = (
+/obj/effect/decal/cleanable/ants,
+/turf/open/misc/grass,
+/area/virtual_domain/powered)
+"Kb" = (
+/obj/structure/railing{
+ color = "#4C3117";
+ name = "wooden railing"
+ },
+/obj/effect/decal/cleanable/vomit/old,
+/obj/effect/turf_decal/weather/sand{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Kl" = (
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"Kw" = (
+/obj/machinery/door/airlock/vault{
+ color = "#825427";
+ name = "Ye Olde Strong Door"
+ },
+/turf/open/floor/wood/parquet,
+/area/virtual_domain/powered)
+"KC" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 5
+ },
+/turf/open/water/beach,
+/area/virtual_domain/powered)
+"KG" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/structure/table/wood,
+/obj/item/gun/energy/laser/musket{
+ pixel_y = 7
+ },
+/obj/item/gun/energy/laser/musket{
+ pixel_y = 2
+ },
+/obj/item/gun/energy/laser/musket{
+ pixel_y = -3
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"KQ" = (
+/obj/structure/flora/rock/style_2,
+/turf/open/water/beach,
+/area/virtual_domain/powered)
+"Ld" = (
+/obj/structure/flora/rock/pile,
+/turf/open/water/beach,
+/area/virtual_domain/powered)
+"Ma" = (
+/obj/structure/flora/bush/sparsegrass/style_random,
+/turf/open/misc/grass,
+/area/virtual_domain/powered)
+"Mi" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/oil,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"MW" = (
+/obj/effect/turf_decal/weather/sand{
+ dir = 5
+ },
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Nh" = (
+/obj/structure/flora/rock/pile/jungle/style_3{
+ pixel_x = -15;
+ pixel_y = -4
+ },
+/turf/open/misc/dirt/jungle,
+/area/virtual_domain/powered)
+"Nk" = (
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Nz" = (
+/obj/structure/flora/bush/jungle,
+/turf/open/misc/grass,
+/area/virtual_domain/powered)
+"NI" = (
+/obj/structure/railing{
+ color = "#4C3117";
+ name = "wooden railing"
+ },
+/obj/effect/turf_decal/weather/sand{
+ dir = 9
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"ON" = (
+/obj/item/kirbyplants/organic/plant21{
+ pixel_x = -8
+ },
+/obj/structure/filingcabinet{
+ pixel_x = 11
+ },
+/turf/open/floor/wood/parquet,
+/area/virtual_domain/powered)
+"OP" = (
+/obj/structure/flora/bush/stalky,
+/turf/open/misc/beach/coast,
+/area/virtual_domain/powered)
+"Pq" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/effect/mapping_helpers/burnt_floor,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/bed/maint{
+ pixel_x = 2;
+ pixel_y = 13
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Pz" = (
+/obj/structure/table/wood,
+/mob/living/simple_animal/parrot{
+ name = "pepper"
+ },
+/turf/open/floor/carpet/blue,
+/area/virtual_domain/powered)
+"PQ" = (
+/obj/structure/flora/grass/jungle/b,
+/turf/open/misc/dirt/jungle,
+/area/virtual_domain/powered)
+"Qb" = (
+/obj/structure/flora/rock{
+ pixel_x = 7
+ },
+/turf/open/water/beach,
+/area/virtual_domain/powered)
+"Rr" = (
+/obj/structure/bed/maint{
+ pixel_x = -5;
+ pixel_y = 9
+ },
+/obj/effect/turf_decal/weather/sand{
+ dir = 6
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"RR" = (
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/wood{
+ icon_state = "wood_large"
+ },
+/area/virtual_domain/powered)
+"Sm" = (
+/obj/structure/flora/tree/jungle,
+/obj/structure/flora/bush/fullgrass/style_random,
+/turf/open/misc/grass,
+/area/virtual_domain/powered)
+"St" = (
+/obj/structure/table/wood,
+/obj/item/melee/energy/sword/pirate{
+ pixel_y = 10
+ },
+/obj/item/clothing/mask/cigarette/cigar{
+ pixel_x = 4
+ },
+/obj/item/lighter{
+ pixel_x = 10;
+ pixel_y = -8
+ },
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/carpet/blue,
+/area/virtual_domain/powered)
+"Tp" = (
+/turf/open/misc/beach/coast/corner{
+ dir = 1
+ },
+/area/virtual_domain/powered)
+"Tt" = (
+/obj/structure/cannon{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"TO" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/machinery/light/small/directional/south,
+/obj/effect/landmark/bitrunning/cache_spawn,
+/turf/open/floor/carpet/blue,
+/area/virtual_domain/powered)
+"TP" = (
+/obj/effect/turf_decal/weather/dirt{
+ dir = 4
+ },
+/turf/open/misc/beach/coast{
+ dir = 6
+ },
+/area/virtual_domain/powered)
+"TQ" = (
+/obj/effect/mapping_helpers/broken_floor,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/bed/maint{
+ pixel_x = 2;
+ pixel_y = 1
+ },
+/obj/effect/decal/cleanable/cobweb,
+/obj/item/toy/plush/beeplushie,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Uy" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/indestructible/binary,
+/area/virtual_domain/powered)
+"UE" = (
+/obj/structure/barricade/sandbags,
+/obj/effect/turf_decal/weather/sand{
+ dir = 10
+ },
+/turf/open/floor/wood{
+ icon_state = "wood_large"
+ },
+/area/virtual_domain/powered)
+"Vg" = (
+/obj/effect/mob_spawn/corpse/human/pirate/melee,
+/turf/open/water/beach,
+/area/virtual_domain/powered)
+"Vk" = (
+/obj/structure/barricade/sandbags,
+/obj/effect/turf_decal/weather/sand,
+/turf/open/floor/wood{
+ icon_state = "wood_large"
+ },
+/area/virtual_domain/powered)
+"VC" = (
+/obj/effect/mob_spawn/corpse/human/damaged,
+/turf/open/water/beach,
+/area/virtual_domain/powered)
+"VF" = (
+/turf/open/water/beach,
+/area/virtual_domain/powered)
+"VX" = (
+/obj/effect/mapping_helpers/burnt_floor,
+/obj/structure/rack{
+ icon = 'icons/obj/fluff/general.dmi';
+ icon_state = "minibar";
+ name = "skeletal minibar"
+ },
+/obj/item/storage/bag/money/dutchmen{
+ pixel_y = 13
+ },
+/turf/open/floor/wood/parquet,
+/area/virtual_domain/powered)
+"WM" = (
+/obj/structure/flora/rock/pile/jungle/style_2,
+/turf/open/misc/dirt/jungle,
+/area/virtual_domain/powered)
+"WP" = (
+/turf/open/floor/wood/parquet,
+/area/virtual_domain/powered)
+"Xn" = (
+/obj/effect/landmark/bitrunning/safehouse_spawn,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"XG" = (
+/obj/structure/fermenting_barrel/gunpowder{
+ pixel_x = -4;
+ pixel_y = 17
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Yj" = (
+/obj/effect/landmark/bitrunning/cache_spawn,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"Yk" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood/parquet,
+/area/virtual_domain/powered)
+"Yq" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 10
+ },
+/turf/open/floor/wood,
+/area/virtual_domain/powered)
+"Zk" = (
+/obj/structure/flora/coconuts{
+ pixel_x = 12
+ },
+/obj/structure/flora/tree/palm,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/powered)
+"ZZ" = (
+/obj/structure/flora/grass/jungle,
+/turf/open/misc/dirt/jungle,
+/area/virtual_domain/powered)
+
+(1,1,1) = {"
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+"}
+(2,1,1) = {"
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+cx
+cx
+FT
+FT
+FT
+FT
+FT
+FT
+cx
+cx
+cx
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+"}
+(3,1,1) = {"
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+cx
+cx
+cx
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+cx
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+"}
+(4,1,1) = {"
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+cx
+cx
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+cx
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+"}
+(5,1,1) = {"
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+cx
+FT
+FT
+FT
+FT
+FT
+FT
+zf
+eb
+we
+FT
+FT
+FT
+cx
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+"}
+(6,1,1) = {"
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+cx
+cx
+cx
+FT
+FT
+FT
+Sm
+Ma
+bz
+JT
+Kl
+Kl
+Kl
+FT
+FT
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+"}
+(7,1,1) = {"
+xg
+xg
+xg
+xg
+xg
+cx
+cx
+cx
+cx
+FT
+FT
+FT
+FT
+It
+tk
+DL
+Kl
+Kl
+Kl
+Cc
+Kl
+IG
+FT
+cx
+cx
+FT
+FT
+FT
+FT
+cx
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+"}
+(8,1,1) = {"
+xg
+xg
+xg
+xg
+cx
+cx
+FT
+FT
+FT
+FT
+FT
+Nz
+bP
+mP
+to
+Kl
+Kl
+we
+Kl
+Kl
+Kl
+Kl
+we
+cx
+cx
+FT
+FT
+FT
+FT
+cx
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+"}
+(9,1,1) = {"
+xg
+xg
+xg
+cx
+cx
+FT
+dp
+dp
+dp
+dp
+xB
+yq
+yq
+Kl
+Kl
+Ct
+xc
+xc
+xc
+xc
+xc
+xc
+xc
+HY
+VF
+VF
+VF
+VF
+VF
+cx
+cx
+cx
+cx
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+"}
+(10,1,1) = {"
+xg
+xg
+xg
+cx
+FT
+dp
+dp
+Pq
+qx
+Mi
+th
+Kl
+yq
+Kl
+IG
+OP
+uM
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VC
+VF
+VF
+VF
+VF
+VF
+dp
+cx
+cx
+cx
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+"}
+(11,1,1) = {"
+xg
+xg
+cx
+cx
+FT
+dp
+TQ
+Iz
+DJ
+ag
+eW
+Kl
+Kl
+ED
+Kl
+Jr
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+KQ
+VF
+VF
+VF
+VF
+VF
+dp
+KG
+pq
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+Uy
+"}
+(12,1,1) = {"
+xg
+xg
+cx
+FT
+FT
+dp
+Yj
+MW
+iO
+Rr
+qj
+Kl
+NI
+xm
+Ct
+HY
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+wb
+dp
+jl
+pq
+BC
+ub
+ub
+ub
+ub
+ub
+Xn
+cx
+"}
+(13,1,1) = {"
+cx
+cx
+cx
+FT
+FT
+FT
+qj
+Kl
+Kl
+Kl
+Kl
+Kl
+lC
+kl
+pP
+VF
+VF
+VF
+VF
+VF
+VF
+Vg
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+cl
+dp
+hH
+Nk
+qm
+ub
+ub
+ub
+ub
+ub
+ub
+cx
+"}
+(14,1,1) = {"
+cx
+dp
+dp
+dp
+dp
+dp
+dp
+oo
+Kl
+Kl
+Kl
+Kl
+Kb
+dp
+px
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+dp
+dp
+Nk
+Jv
+ub
+ub
+ub
+ub
+ub
+ub
+cx
+"}
+(15,1,1) = {"
+cx
+dp
+BO
+ht
+VX
+ct
+dp
+yi
+Kl
+dA
+Kl
+Kl
+by
+Hp
+pP
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+me
+ub
+ub
+ub
+ub
+ub
+ub
+cx
+"}
+(16,1,1) = {"
+cx
+dp
+ON
+WP
+nX
+Yk
+Kw
+Kl
+Kl
+Kl
+Kl
+Kl
+Kl
+dp
+px
+VF
+VF
+VF
+VF
+Qb
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+ub
+ub
+ub
+ub
+ub
+ub
+cx
+"}
+(17,1,1) = {"
+cx
+dp
+jC
+iM
+so
+TO
+dp
+Kl
+Kl
+EZ
+IM
+Kl
+Kl
+Kl
+pP
+VF
+VF
+VF
+VF
+cl
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+ub
+ub
+ub
+ub
+ub
+ub
+cx
+"}
+(18,1,1) = {"
+cx
+dp
+sn
+hW
+eQ
+gk
+dp
+dp
+qX
+gw
+jz
+UE
+Kl
+Zk
+pP
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+me
+VF
+ub
+ub
+ub
+ub
+ub
+zR
+cx
+"}
+(19,1,1) = {"
+cx
+dp
+St
+Pz
+nQ
+yA
+dp
+dp
+Dm
+jz
+jz
+Vk
+Kl
+Kl
+pP
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+dp
+BC
+VF
+VF
+VF
+VF
+VF
+VF
+cx
+cx
+"}
+(20,1,1) = {"
+cx
+dp
+dp
+dp
+dp
+dp
+dp
+xm
+FG
+RR
+yw
+Vk
+Kl
+Kl
+pP
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+Tt
+cJ
+Yq
+VF
+VF
+VF
+VF
+VF
+cx
+xg
+"}
+(21,1,1) = {"
+cx
+cx
+cx
+FT
+FT
+Kl
+Kl
+dp
+dp
+jB
+uw
+GG
+Kl
+Kl
+pP
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+xI
+dp
+XG
+BC
+VF
+VF
+VF
+VF
+VF
+cx
+xg
+"}
+(22,1,1) = {"
+xg
+xg
+cx
+FT
+FT
+fx
+Kl
+Kl
+dp
+dp
+Kl
+Kl
+Kl
+Kl
+pP
+VF
+VF
+VF
+VF
+VF
+VF
+dQ
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+kg
+pq
+Ld
+VF
+VF
+VF
+VF
+VF
+cx
+xg
+"}
+(23,1,1) = {"
+xg
+xg
+cx
+FT
+FT
+FT
+Kl
+Kl
+Kl
+Kl
+Kl
+Kl
+Kl
+Kl
+Tp
+oU
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+FT
+FT
+cx
+xg
+"}
+(24,1,1) = {"
+xg
+xg
+cx
+FT
+FT
+FT
+FT
+dp
+Kl
+eD
+Kl
+Kl
+Kl
+Kl
+Kl
+Tp
+nz
+oU
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+FT
+FT
+cx
+xg
+"}
+(25,1,1) = {"
+xg
+xg
+cx
+cx
+FT
+FT
+FT
+FT
+Kl
+Kl
+Kl
+Kl
+Kl
+Kl
+yi
+Kl
+Kl
+pP
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+FT
+FT
+FT
+cx
+xg
+"}
+(26,1,1) = {"
+xg
+xg
+xg
+cx
+cx
+cx
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+TP
+VF
+FT
+FT
+cx
+cx
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+cx
+FT
+FT
+FT
+FT
+cx
+xg
+"}
+(27,1,1) = {"
+xg
+xg
+xg
+xg
+xg
+cx
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+PQ
+AU
+FT
+FT
+FT
+cx
+cx
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+VF
+cx
+cx
+FT
+FT
+FT
+cx
+cx
+xg
+"}
+(28,1,1) = {"
+xg
+xg
+xg
+xg
+xg
+cx
+cx
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+Nh
+AU
+FT
+FT
+FT
+FT
+cx
+cx
+cx
+cx
+VF
+VF
+VF
+VF
+VF
+VF
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+xg
+xg
+"}
+(29,1,1) = {"
+xg
+xg
+xg
+xg
+xg
+xg
+cx
+cx
+cx
+cx
+cx
+cx
+FT
+FT
+FT
+FT
+FT
+ye
+KC
+VF
+FT
+FT
+FT
+FT
+FT
+FT
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+"}
+(30,1,1) = {"
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+cx
+cx
+FT
+FT
+FT
+FT
+FT
+zg
+ye
+KC
+IF
+VF
+FT
+FT
+FT
+FT
+FT
+cx
+cx
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+"}
+(31,1,1) = {"
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+cx
+cx
+FT
+FT
+FT
+FT
+FT
+ye
+ye
+pU
+AU
+VF
+GF
+WM
+FT
+FT
+FT
+cx
+cx
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+"}
+(32,1,1) = {"
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+cx
+cx
+FT
+FT
+FT
+FT
+FT
+ye
+nS
+KC
+VF
+Ax
+ye
+hM
+FT
+FT
+FT
+cx
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+"}
+(33,1,1) = {"
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+cx
+cx
+FT
+FT
+FT
+FT
+ZZ
+ye
+cQ
+KC
+yc
+qN
+ye
+hM
+FT
+FT
+cx
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+"}
+(34,1,1) = {"
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+cx
+cx
+FT
+FT
+FT
+FT
+ye
+ye
+mw
+xC
+uT
+jQ
+Jo
+FT
+FT
+cx
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+"}
+(35,1,1) = {"
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+cx
+cx
+cx
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+cx
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+"}
+(36,1,1) = {"
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+cx
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+FT
+cx
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+"}
+(37,1,1) = {"
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+cx
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+xg
+"}
diff --git a/_maps/virtual_domains/stairs_and_cliffs.dmm b/_maps/virtual_domains/stairs_and_cliffs.dmm
new file mode 100644
index 00000000000..82e15fcc090
--- /dev/null
+++ b/_maps/virtual_domains/stairs_and_cliffs.dmm
@@ -0,0 +1,6056 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"be" = (
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/open/cliff/snowrock/virtual_domain,
+/area/icemoon/underground/explored/virtual_domain)
+"cu" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 4
+ },
+/obj/structure/railing,
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/icemoon/underground/explored/virtual_domain)
+"cJ" = (
+/obj/structure/chair/sofa/bench,
+/turf/open/floor/plating/snowed/smoothed,
+/area/icemoon/underground/explored/virtual_domain)
+"dR" = (
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"en" = (
+/obj/item/clothing/under/color/grey,
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"eB" = (
+/obj/structure/flora/rock/icy/style_random,
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"gB" = (
+/obj/structure/railing/corner,
+/turf/open/cliff/snowrock/virtual_domain,
+/area/icemoon/underground/explored/virtual_domain)
+"hc" = (
+/obj/structure/railing/corner/end{
+ dir = 8
+ },
+/obj/structure/railing/corner/end/flip{
+ dir = 8
+ },
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"hE" = (
+/turf/open/floor/wood,
+/area/icemoon/underground/explored/virtual_domain)
+"jK" = (
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/turf/open/cliff/snowrock/virtual_domain,
+/area/icemoon/underground/explored/virtual_domain)
+"kc" = (
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"km" = (
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/decal/cleanable/ash/large,
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"kK" = (
+/obj/structure/flora/tree/pine/style_random,
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"mx" = (
+/obj/structure/railing,
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/icemoon/underground/explored/virtual_domain)
+"nj" = (
+/obj/structure/chair/sofa/bench/left,
+/turf/open/floor/plating/snowed/smoothed,
+/area/icemoon/underground/explored/virtual_domain)
+"no" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 8
+ },
+/obj/structure/railing,
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/icemoon/underground/explored/virtual_domain)
+"pl" = (
+/obj/structure/bonfire/prelit,
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"pL" = (
+/turf/open/lava/plasma/virtual_domain,
+/area/icemoon/underground/explored/virtual_domain)
+"qc" = (
+/turf/open/misc/ice,
+/area/icemoon/underground/explored/virtual_domain)
+"sa" = (
+/obj/structure/flora/grass/green/style_random,
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"sw" = (
+/obj/structure/flora/rock/pile/icy/style_random,
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"sM" = (
+/turf/open/cliff/snowrock/virtual_domain,
+/area/icemoon/underground/explored/virtual_domain)
+"uJ" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"vz" = (
+/obj/effect/landmark/bitrunning/safehouse_spawn,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"xB" = (
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/icemoon/underground/explored/virtual_domain)
+"yo" = (
+/turf/open/floor/plating/snowed/smoothed,
+/area/icemoon/underground/explored/virtual_domain)
+"yJ" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 8
+ },
+/obj/structure/railing,
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/icemoon/underground/explored/virtual_domain)
+"yL" = (
+/obj/structure/chair/sofa/bench/right,
+/turf/open/floor/plating/snowed/smoothed,
+/area/icemoon/underground/explored/virtual_domain)
+"zn" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/icemoon/underground/explored/virtual_domain)
+"Am" = (
+/turf/closed/indestructible/binary,
+/area/icemoon/underground/explored/virtual_domain)
+"AI" = (
+/obj/structure/flora/grass/green/style_random,
+/turf/open/floor/plating/snowed/smoothed,
+/area/icemoon/underground/explored/virtual_domain)
+"BV" = (
+/obj/effect/decal/remains/plasma,
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"Dz" = (
+/obj/structure/railing/corner/end{
+ dir = 4
+ },
+/obj/structure/railing/corner/end/flip{
+ dir = 4
+ },
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"DB" = (
+/obj/structure/flora/rock/icy/style_random,
+/obj/structure/flora/rock/pile/icy/style_random,
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"DY" = (
+/obj/structure/flora/rock/icy/style_random,
+/obj/structure/flora/grass/green/style_random,
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"Eh" = (
+/obj/structure/railing/corner{
+ dir = 4
+ },
+/turf/open/cliff/snowrock/virtual_domain,
+/area/icemoon/underground/explored/virtual_domain)
+"Gn" = (
+/obj/structure/flora/rock/pile/icy/style_random,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"GX" = (
+/obj/effect/decal/cleanable/ash/large,
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"HU" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/icemoon/underground/explored/virtual_domain)
+"Kl" = (
+/obj/effect/decal/remains/plasma,
+/obj/effect/decal/cleanable/ash/large,
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"KA" = (
+/obj/structure/statue/snow/snowman{
+ name = "Norm";
+ desc = "Norm has seen many a man roll down these cliffs, some more stubborn than others. Its usually the stubborn ones who stop getting back up."
+ },
+/obj/item/pickaxe/mini,
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"Lw" = (
+/obj/structure/flora/rock/pile/icy/style_random,
+/obj/structure/flora/grass/green/style_random,
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"MP" = (
+/obj/structure/railing/corner/end/flip{
+ dir = 4
+ },
+/obj/structure/railing/corner/end{
+ dir = 4
+ },
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"MT" = (
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/icemoon/underground/explored/virtual_domain)
+"Nv" = (
+/turf/open/floor/iron/stairs,
+/area/icemoon/underground/explored/virtual_domain)
+"NM" = (
+/obj/structure/railing/corner/end/flip{
+ dir = 8
+ },
+/obj/structure/railing/corner/end{
+ dir = 8
+ },
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"Pl" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/railing/corner,
+/turf/open/floor/wood,
+/area/icemoon/underground/explored/virtual_domain)
+"Qv" = (
+/turf/closed/indestructible/rock/snow/ice,
+/area/icemoon/underground/explored/virtual_domain)
+"RD" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/indestructible/binary,
+/area/icemoon/underground/explored/virtual_domain)
+"Tz" = (
+/obj/item/pickaxe/mini,
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"Ug" = (
+/obj/structure/flora/rock/icy/style_random,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"VW" = (
+/obj/structure/closet/crate/secure/bitrunning/encrypted,
+/turf/open/floor/plating/snowed/smoothed,
+/area/icemoon/underground/explored/virtual_domain)
+"YR" = (
+/obj/structure/flora/tree/pine/style_random,
+/obj/structure/flora/grass/green/style_random,
+/turf/open/misc/asteroid/snow,
+/area/icemoon/underground/explored/virtual_domain)
+"YT" = (
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+
+(1,1,1) = {"
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+RD
+"}
+(2,1,1) = {"
+Am
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(3,1,1) = {"
+Am
+Qv
+Qv
+Qv
+Qv
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(4,1,1) = {"
+Am
+Qv
+Qv
+Qv
+dR
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(5,1,1) = {"
+Am
+Qv
+Qv
+dR
+dR
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(6,1,1) = {"
+Am
+Qv
+Qv
+kK
+sw
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(7,1,1) = {"
+Am
+Qv
+Qv
+dR
+dR
+sa
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(8,1,1) = {"
+Am
+Qv
+Qv
+eB
+sw
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+Qv
+Qv
+Qv
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(9,1,1) = {"
+Am
+Qv
+Qv
+dR
+eB
+dR
+sw
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(10,1,1) = {"
+Am
+Qv
+dR
+sw
+eB
+eB
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(11,1,1) = {"
+Am
+Qv
+dR
+eB
+sw
+sa
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pl
+dR
+sw
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(12,1,1) = {"
+Am
+Qv
+dR
+dR
+sw
+sa
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sw
+dR
+Nv
+Nv
+Nv
+sM
+sM
+Nv
+Nv
+Nv
+Nv
+Nv
+Nv
+sM
+sM
+sM
+sM
+Nv
+Nv
+Nv
+Nv
+dR
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(13,1,1) = {"
+Am
+Qv
+dR
+sa
+sw
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sw
+dR
+dR
+sM
+Nv
+Nv
+Nv
+Nv
+sM
+sM
+sM
+sM
+Nv
+Nv
+Nv
+Nv
+Nv
+Nv
+Nv
+Nv
+Nv
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(14,1,1) = {"
+Am
+Qv
+dR
+dR
+dR
+dR
+kK
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sw
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sa
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(15,1,1) = {"
+Am
+Qv
+sw
+sa
+dR
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(16,1,1) = {"
+Am
+Qv
+dR
+sa
+sa
+sa
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+pl
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+GX
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(17,1,1) = {"
+Am
+Qv
+dR
+sa
+sa
+dR
+yo
+Nv
+Nv
+Nv
+Nv
+sM
+sM
+Nv
+Nv
+Nv
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+dR
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+sw
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+dR
+dR
+pL
+pL
+pL
+Qv
+Qv
+Qv
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(18,1,1) = {"
+Am
+Qv
+Qv
+dR
+dR
+yo
+yo
+sM
+sM
+sM
+Nv
+Nv
+Nv
+Nv
+sM
+sM
+sa
+qc
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+dR
+sa
+pL
+pL
+sM
+sM
+sM
+sM
+sM
+sM
+sw
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+dR
+en
+dR
+dR
+pL
+pL
+Qv
+Qv
+Qv
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(19,1,1) = {"
+Am
+Qv
+Qv
+kK
+sa
+yo
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sw
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+sw
+BV
+pL
+sM
+sM
+sM
+sM
+sM
+sM
+eB
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+GX
+sw
+dR
+dR
+pL
+pL
+pL
+pL
+Qv
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(20,1,1) = {"
+Am
+Qv
+Qv
+dR
+dR
+yo
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+qc
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+kK
+GX
+pL
+pL
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+qc
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+dR
+dR
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(21,1,1) = {"
+Am
+Qv
+Qv
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+pL
+pL
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+dR
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(22,1,1) = {"
+Am
+Qv
+Qv
+dR
+sa
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sw
+dR
+dR
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(23,1,1) = {"
+Am
+Qv
+Qv
+Qv
+sa
+qc
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+DB
+kc
+dR
+dR
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(24,1,1) = {"
+Am
+Qv
+Qv
+sw
+eB
+qc
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+qc
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sa
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+Ug
+eB
+dR
+dR
+dR
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(25,1,1) = {"
+Am
+Qv
+Qv
+dR
+dR
+sa
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+dR
+Nv
+Nv
+Nv
+Nv
+Nv
+Nv
+Nv
+Nv
+Nv
+Nv
+Nv
+Nv
+sM
+Nv
+Nv
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+Ug
+sw
+dR
+dR
+dR
+dR
+dR
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(26,1,1) = {"
+Am
+Qv
+Qv
+dR
+yo
+dR
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+qc
+dR
+sM
+sM
+sM
+sM
+sM
+dR
+Nv
+Nv
+Nv
+Nv
+Nv
+sM
+sM
+sM
+sM
+Nv
+Nv
+Nv
+Nv
+Nv
+Nv
+qc
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+Ug
+sw
+dR
+dR
+dR
+sa
+dR
+dR
+dR
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Am
+"}
+(27,1,1) = {"
+Am
+Qv
+Qv
+dR
+yo
+sa
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sa
+dR
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+eB
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+dR
+dR
+kK
+dR
+dR
+dR
+sw
+dR
+dR
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Am
+"}
+(28,1,1) = {"
+Am
+Qv
+Qv
+sa
+yo
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sa
+dR
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+dR
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+kK
+sa
+dR
+qc
+qc
+sa
+sa
+dR
+kK
+dR
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Am
+"}
+(29,1,1) = {"
+Am
+Qv
+Qv
+sa
+yo
+yo
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+MP
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+dR
+qc
+qc
+qc
+sa
+sa
+dR
+dR
+dR
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Am
+"}
+(30,1,1) = {"
+Am
+Qv
+Qv
+qc
+dR
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+no
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+yL
+dR
+dR
+dR
+kK
+dR
+dR
+dR
+dR
+dR
+dR
+dR
+dR
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Am
+"}
+(31,1,1) = {"
+Am
+Qv
+pl
+qc
+dR
+yo
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+Nv
+Nv
+Nv
+Nv
+qc
+sM
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+mx
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+cJ
+yo
+dR
+dR
+dR
+dR
+dR
+kK
+sa
+sa
+dR
+dR
+dR
+dR
+dR
+dR
+dR
+dR
+Qv
+Am
+"}
+(32,1,1) = {"
+Am
+Qv
+sM
+sM
+zn
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sw
+dR
+sM
+sM
+sM
+cu
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+nj
+yo
+dR
+kK
+dR
+dR
+dR
+kK
+sa
+sa
+dR
+dR
+dR
+dR
+kK
+dR
+dR
+Qv
+Qv
+Am
+"}
+(33,1,1) = {"
+Am
+Qv
+sM
+sM
+hE
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+NM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+qc
+dR
+Nv
+Nv
+Nv
+Nv
+Nv
+dR
+dR
+sw
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+yo
+yo
+dR
+dR
+sa
+dR
+sw
+dR
+dR
+dR
+dR
+sa
+sa
+dR
+dR
+dR
+dR
+Qv
+Qv
+Am
+"}
+(34,1,1) = {"
+Am
+Qv
+sM
+sM
+hE
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sa
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+qc
+sM
+sM
+sM
+dR
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+qc
+yo
+Nv
+Nv
+Nv
+Nv
+Nv
+yo
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+yo
+dR
+dR
+sa
+dR
+dR
+dR
+dR
+kK
+qc
+dR
+dR
+dR
+dR
+dR
+dR
+dR
+Qv
+Am
+"}
+(35,1,1) = {"
+Am
+Qv
+sM
+sM
+hE
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+qc
+sM
+sM
+sM
+qc
+sa
+sM
+sM
+sM
+sM
+sM
+sM
+qc
+dR
+sM
+sM
+sM
+sM
+sM
+eB
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+yo
+yo
+dR
+dR
+dR
+qc
+qc
+qc
+qc
+qc
+dR
+YT
+YT
+YT
+YT
+YT
+vz
+Qv
+Am
+"}
+(36,1,1) = {"
+Am
+Qv
+dR
+sM
+HU
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+qc
+sM
+sM
+sw
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+qc
+dR
+sM
+sM
+sM
+sM
+sM
+kK
+dR
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pl
+dR
+yo
+dR
+dR
+dR
+dR
+dR
+qc
+qc
+qc
+dR
+YT
+YT
+YT
+YT
+YT
+YT
+Qv
+Am
+"}
+(37,1,1) = {"
+Am
+Qv
+Qv
+dR
+dR
+dR
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+sM
+eB
+dR
+sa
+sM
+sM
+sM
+sM
+sM
+sM
+sa
+yo
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+yo
+dR
+yo
+dR
+dR
+dR
+dR
+sw
+qc
+qc
+dR
+dR
+YT
+YT
+YT
+YT
+YT
+YT
+Qv
+Am
+"}
+(38,1,1) = {"
+Am
+Qv
+Qv
+dR
+yo
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+sM
+dR
+dR
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+yo
+AI
+Nv
+Nv
+Nv
+Nv
+Nv
+Nv
+Nv
+yo
+yo
+yo
+yo
+yo
+yo
+dR
+dR
+yo
+dR
+yo
+yo
+YT
+YT
+YT
+YT
+YT
+YT
+Qv
+Am
+"}
+(39,1,1) = {"
+Am
+Qv
+Qv
+dR
+dR
+dR
+kK
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+qc
+sM
+sM
+sM
+pl
+dR
+dR
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+yo
+AI
+Nv
+Nv
+Nv
+Nv
+Nv
+Nv
+Nv
+yo
+yo
+yo
+yo
+dR
+yo
+yo
+yo
+yo
+yo
+yo
+yo
+YT
+YT
+YT
+YT
+YT
+YT
+Qv
+Am
+"}
+(40,1,1) = {"
+Am
+Qv
+Qv
+dR
+yo
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+sM
+dR
+dR
+Nv
+Nv
+Nv
+dR
+kK
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sw
+dR
+Nv
+Nv
+Nv
+Nv
+Nv
+Nv
+Nv
+yo
+yo
+dR
+dR
+dR
+yo
+dR
+yo
+yo
+yo
+dR
+yo
+YT
+YT
+YT
+YT
+YT
+YT
+Qv
+Am
+"}
+(41,1,1) = {"
+Am
+Qv
+dR
+sa
+yo
+dR
+sa
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+qc
+sM
+sM
+sM
+qc
+Tz
+Nv
+Nv
+Nv
+qc
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+dR
+sw
+dR
+dR
+dR
+dR
+dR
+dR
+dR
+dR
+YT
+YT
+YT
+YT
+YT
+uJ
+Qv
+Am
+"}
+(42,1,1) = {"
+Am
+Qv
+dR
+AI
+yo
+yo
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pl
+KA
+dR
+dR
+dR
+sa
+sa
+dR
+qc
+qc
+qc
+dR
+dR
+dR
+dR
+dR
+dR
+dR
+Qv
+Am
+"}
+(43,1,1) = {"
+Am
+Qv
+yo
+yo
+VW
+yo
+yo
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sa
+dR
+dR
+kK
+sa
+sa
+dR
+dR
+qc
+qc
+qc
+dR
+sa
+sa
+dR
+dR
+dR
+Qv
+Am
+"}
+(44,1,1) = {"
+Am
+Qv
+dR
+yo
+yo
+yo
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sa
+dR
+sa
+dR
+dR
+dR
+dR
+kK
+qc
+qc
+qc
+dR
+sa
+sa
+dR
+dR
+dR
+Qv
+Am
+"}
+(45,1,1) = {"
+Am
+Qv
+dR
+dR
+yo
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+dR
+dR
+dR
+dR
+kK
+dR
+dR
+dR
+dR
+Qv
+dR
+Qv
+dR
+kK
+dR
+Qv
+Qv
+Am
+"}
+(46,1,1) = {"
+Am
+Qv
+Qv
+sa
+dR
+dR
+sa
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+qc
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+kK
+dR
+dR
+dR
+dR
+dR
+dR
+dR
+dR
+dR
+dR
+Qv
+Qv
+Qv
+dR
+dR
+dR
+Qv
+Qv
+Am
+"}
+(47,1,1) = {"
+Am
+Qv
+Qv
+dR
+dR
+YR
+sa
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+qc
+Nv
+Nv
+Nv
+sM
+sM
+sM
+sM
+Nv
+Nv
+Nv
+Nv
+sM
+sM
+sM
+Nv
+Nv
+Nv
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+dR
+pL
+dR
+dR
+dR
+dR
+dR
+dR
+Qv
+Qv
+Qv
+Qv
+Qv
+dR
+dR
+dR
+Qv
+Qv
+Am
+"}
+(48,1,1) = {"
+Am
+Qv
+Qv
+dR
+kK
+sa
+YR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+dR
+sw
+sM
+Nv
+Nv
+Nv
+Nv
+Nv
+Nv
+sM
+sM
+Nv
+Nv
+Nv
+Nv
+Nv
+sM
+Nv
+Nv
+Nv
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+pL
+dR
+dR
+dR
+dR
+Qv
+Qv
+Qv
+Qv
+dR
+sw
+dR
+dR
+dR
+Qv
+Am
+"}
+(49,1,1) = {"
+Am
+Qv
+Qv
+dR
+dR
+YR
+sa
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+qc
+sM
+sM
+sM
+sM
+sM
+eB
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+dR
+dR
+dR
+dR
+dR
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+dR
+sw
+dR
+dR
+Qv
+Am
+"}
+(50,1,1) = {"
+Am
+Qv
+Qv
+sa
+dR
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sa
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+pl
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+pL
+pL
+dR
+dR
+sa
+dR
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+sw
+eB
+dR
+dR
+Qv
+Am
+"}
+(51,1,1) = {"
+Am
+Qv
+Qv
+Qv
+dR
+sa
+kK
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sa
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sa
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+pL
+dR
+dR
+kK
+dR
+dR
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+dR
+dR
+sa
+Qv
+Am
+"}
+(52,1,1) = {"
+Am
+Qv
+Qv
+Qv
+dR
+sa
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+pL
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sa
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+pL
+dR
+dR
+dR
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+dR
+dR
+dR
+Qv
+Am
+"}
+(53,1,1) = {"
+Am
+Qv
+Qv
+Qv
+dR
+YR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sw
+Dz
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+dR
+sa
+dR
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+dR
+dR
+Qv
+Am
+"}
+(54,1,1) = {"
+Am
+Qv
+Qv
+Qv
+dR
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+jK
+yJ
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+sM
+sM
+GX
+dR
+dR
+pL
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sa
+dR
+sw
+sa
+dR
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+dR
+Qv
+Qv
+Am
+"}
+(55,1,1) = {"
+Am
+Qv
+Qv
+dR
+dR
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+MT
+be
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+dR
+kK
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+qc
+sM
+sM
+sM
+sM
+sM
+dR
+sw
+eB
+dR
+dR
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+dR
+dR
+dR
+Qv
+Am
+"}
+(56,1,1) = {"
+Am
+Qv
+Qv
+dR
+eB
+sw
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+gB
+xB
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+pL
+pL
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+qc
+sM
+sM
+sM
+sM
+sM
+km
+sw
+eB
+eB
+sw
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+dR
+dR
+dR
+Qv
+Am
+"}
+(57,1,1) = {"
+Am
+Qv
+Qv
+dR
+Lw
+sa
+sa
+kK
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+Pl
+Eh
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+dR
+sw
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sa
+eB
+sM
+sM
+sM
+sM
+sM
+pL
+dR
+eB
+eB
+dR
+dR
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+dR
+dR
+dR
+Qv
+Am
+"}
+(58,1,1) = {"
+Am
+Qv
+Qv
+dR
+sa
+sa
+YR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+hc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+Gn
+eB
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sw
+sM
+sM
+sM
+sM
+sM
+pL
+GX
+dR
+pL
+dR
+dR
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+dR
+sa
+dR
+dR
+Qv
+Am
+"}
+(59,1,1) = {"
+Am
+Qv
+Qv
+sa
+YR
+sa
+sa
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+qc
+sM
+sM
+sM
+dR
+sM
+sM
+Nv
+Nv
+Nv
+dR
+sM
+sM
+sM
+sM
+sM
+kK
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+pL
+dR
+dR
+pL
+dR
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+dR
+dR
+dR
+Qv
+Qv
+Qv
+Am
+"}
+(60,1,1) = {"
+Am
+Qv
+Qv
+dR
+dR
+sw
+kK
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+dR
+dR
+Nv
+Nv
+Nv
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+kK
+dR
+qc
+sM
+sM
+sM
+sM
+sM
+pL
+GX
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+dR
+dR
+dR
+Qv
+Qv
+Qv
+Am
+"}
+(61,1,1) = {"
+Am
+Qv
+dR
+kK
+sw
+eB
+eB
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+dR
+sa
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+dR
+dR
+dR
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(62,1,1) = {"
+Am
+Qv
+dR
+sa
+DY
+eB
+eB
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+sM
+sa
+dR
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sa
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+dR
+dR
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(63,1,1) = {"
+Am
+Qv
+dR
+Lw
+Lw
+dR
+sa
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+eB
+dR
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sa
+dR
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+dR
+Qv
+Qv
+dR
+dR
+dR
+dR
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(64,1,1) = {"
+Am
+Qv
+dR
+sa
+sa
+sw
+kK
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sw
+dR
+sM
+sM
+sM
+sM
+sM
+qc
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+eB
+dR
+dR
+dR
+sa
+dR
+sw
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(65,1,1) = {"
+Am
+Qv
+dR
+dR
+kK
+dR
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+qc
+sM
+sM
+sM
+sM
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+Nv
+Nv
+Nv
+Nv
+Nv
+Nv
+dR
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+sw
+sa
+sa
+dR
+sw
+sw
+eB
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(66,1,1) = {"
+Am
+Qv
+dR
+kK
+sa
+sa
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+sa
+dR
+sM
+sM
+sM
+sM
+qc
+sM
+sM
+sM
+sM
+sa
+dR
+sM
+sM
+sM
+sM
+sM
+sw
+dR
+Nv
+Nv
+Nv
+Nv
+Nv
+sM
+sM
+sM
+Nv
+Nv
+dR
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+dR
+sa
+sa
+dR
+dR
+dR
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(67,1,1) = {"
+Am
+Qv
+dR
+dR
+YR
+DY
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sa
+dR
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+dR
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+sa
+dR
+dR
+dR
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(68,1,1) = {"
+Am
+Qv
+dR
+dR
+Lw
+sa
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+sa
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+dR
+dR
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(69,1,1) = {"
+Am
+Qv
+Qv
+dR
+eB
+sw
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+dR
+Nv
+Nv
+Nv
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+dR
+sM
+sM
+sM
+sM
+sM
+dR
+qc
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(70,1,1) = {"
+Am
+Qv
+Qv
+Qv
+dR
+eB
+sw
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+kK
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+Nv
+dR
+dR
+dR
+dR
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(71,1,1) = {"
+Am
+Qv
+Qv
+dR
+sa
+sa
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+dR
+qc
+dR
+pl
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+Kl
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(72,1,1) = {"
+Am
+Qv
+Qv
+sa
+sa
+Lw
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(73,1,1) = {"
+Am
+Qv
+Qv
+Qv
+dR
+sw
+dR
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+sM
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(74,1,1) = {"
+Am
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Qv
+Am
+"}
+(75,1,1) = {"
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+Am
+"}
diff --git a/_maps/virtual_domains/syndicate_assault.dmm b/_maps/virtual_domains/syndicate_assault.dmm
new file mode 100644
index 00000000000..770f0967404
--- /dev/null
+++ b/_maps/virtual_domains/syndicate_assault.dmm
@@ -0,0 +1,4265 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aq" = (
+/obj/item/storage/backpack/duffelbag/syndie/surgery,
+/obj/structure/table/reinforced,
+/turf/open/floor/plastic,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"aw" = (
+/obj/structure/table/reinforced,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"aN" = (
+/obj/structure/closet/crate/secure/gear{
+ req_access = list("syndicate")
+ },
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/sheet/plasteel/twenty,
+/obj/item/stack/sheet/mineral/plastitanium{
+ amount = 50
+ },
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/stack/rods/fifty,
+/turf/open/floor/pod/dark,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"aO" = (
+/obj/machinery/recharge_station,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"aZ" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 4
+ },
+/mob/living/basic/syndicate/ranged/shotgun/space/stormtrooper,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"bh" = (
+/turf/open/floor/carpet/royalblack,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"bo" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"bD" = (
+/obj/structure/table/reinforced,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"bG" = (
+/turf/open/floor/pod/dark,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"cc" = (
+/obj/structure/closet/crate/secure/gear{
+ req_access = list("syndicate")
+ },
+/obj/effect/spawner/random/clothing/costume,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"cj" = (
+/obj/structure/transit_tube/crossing,
+/turf/closed/wall/r_wall/syndicate,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"ct" = (
+/obj/structure/closet/syndicate{
+ anchored = 1;
+ desc = "A basic closet for all your villainous needs.";
+ locked = 1;
+ name = "Closet";
+ req_access = list("syndicate");
+ secure = 1
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"cw" = (
+/obj/structure/closet/syndicate{
+ anchored = 1;
+ desc = "A basic closet for all your villainous needs.";
+ locked = 1;
+ name = "Closet";
+ req_access = list("syndicate");
+ secure = 1
+ },
+/obj/item/clothing/under/syndicate/combat,
+/obj/item/clothing/gloves/combat,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/mask/gas/syndicate,
+/obj/item/clothing/under/syndicate/skirt,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"cy" = (
+/obj/machinery/door/airlock/grunge{
+ name = "Syndicate Ship Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"cB" = (
+/obj/machinery/camera/xray{
+ c_tag = "Medbay";
+ dir = 6;
+ network = list("fsci");
+ screen_loc = ""
+ },
+/turf/open/floor/plastic,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"cR" = (
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/carpet/royalblack,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"cZ" = (
+/obj/structure/table/reinforced,
+/obj/item/gun/ballistic/automatic/l6_saw/unrestricted,
+/obj/item/ammo_box/magazine/m7mm,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"da" = (
+/obj/machinery/stasis,
+/turf/open/floor/plastic,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"dd" = (
+/obj/structure/sign/warning/vacuum/external,
+/turf/closed/wall/r_wall/syndicate,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"di" = (
+/obj/machinery/power/terminal{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/item/paper/fluff/ruins/forgottenship/powerissues,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"dw" = (
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"dz" = (
+/obj/effect/landmark/bitrunning/cache_spawn,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"dU" = (
+/obj/structure/cable,
+/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/external/ruin{
+ name = "Syndicate Ship Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"eB" = (
+/obj/machinery/camera/xray{
+ c_tag = "Cargo pod";
+ dir = 9;
+ network = list("fsci");
+ screen_loc = ""
+ },
+/obj/structure/closet,
+/obj/item/clothing/under/syndicate/tacticool,
+/obj/item/clothing/under/syndicate/tacticool,
+/obj/item/clothing/under/syndicate/tacticool,
+/obj/item/card/id/advanced/black/syndicate_command/crew_id,
+/obj/item/card/id/advanced/black/syndicate_command/crew_id,
+/obj/item/card/id/advanced/black/syndicate_command/crew_id,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"fd" = (
+/obj/structure/transit_tube/crossing,
+/turf/open/space/basic,
+/area/space)
+"fG" = (
+/obj/structure/toilet{
+ dir = 1
+ },
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"fJ" = (
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"fM" = (
+/obj/machinery/computer/crew/syndie{
+ dir = 8
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"fV" = (
+/obj/machinery/atmospherics/components/unary/vent_pump,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"gD" = (
+/obj/effect/mob_spawn/ghost_role/human/syndicatespace,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"hg" = (
+/obj/structure/window/reinforced/plasma/plastitanium,
+/obj/machinery/door/poddoor{
+ id = "fslockdown";
+ name = "Ship Blast Door";
+ state_open = 1
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"hy" = (
+/obj/structure/table/reinforced,
+/obj/item/paper/fluff/ruins/forgottenship/missionobj,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"hA" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/wall/r_wall/syndicate,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"hD" = (
+/obj/structure/table/reinforced,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"ip" = (
+/mob/living/basic/syndicate/melee/sword/space/stormtrooper,
+/turf/open/floor/plastic,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"iB" = (
+/obj/machinery/light/directional/north,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"iL" = (
+/obj/structure/sign/departments/cargo,
+/turf/closed/wall/r_wall/syndicate,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"iU" = (
+/obj/structure/closet/crate/secure/gear{
+ req_access = list("syndicate")
+ },
+/obj/item/melee/energy/sword/saber/red,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/pod/dark,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"iW" = (
+/obj/structure/table/reinforced,
+/obj/machinery/button/door{
+ id = "fslockdown";
+ name = "Window shutters";
+ req_access = list("syndicate")
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"iX" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 4
+ },
+/mob/living/basic/syndicate/ranged/smg/space/stormtrooper,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"ja" = (
+/obj/machinery/door/window{
+ dir = 1;
+ name = "Spare Equipment";
+ req_access = list("syndicate")
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"jl" = (
+/obj/structure/bodycontainer/crematorium{
+ id = "fscremate"
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"jA" = (
+/obj/structure/cable,
+/mob/living/basic/syndicate/melee/space/stormtrooper,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"jJ" = (
+/obj/machinery/door/airlock/grunge{
+ name = "Syndicate Ship Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
+/area/ruin/space/has_grav/powered/virtual_domain)
+"kh" = (
+/obj/machinery/door/airlock/grunge{
+ name = "Syndicate Ship Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"ki" = (
+/obj/structure/table/reinforced,
+/obj/machinery/computer/security/telescreen/interrogation{
+ name = "Cameras monitor";
+ network = list("fsci");
+ req_access = list("syndicate");
+ screen_loc = ""
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"kI" = (
+/obj/machinery/computer/atmos_alert{
+ dir = 8
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"kJ" = (
+/obj/effect/landmark/bitrunning/safehouse_spawn,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"li" = (
+/obj/structure/transit_tube/station/dispenser/reverse{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"ln" = (
+/obj/machinery/turretid{
+ control_area = "/area/ruin/space/has_grav/syndicate_forgotten_ship";
+ enabled = 0;
+ icon_state = "control_kill";
+ lethal = 1;
+ name = "Ship turret control panel";
+ pixel_y = 32;
+ req_access = list("syndicate")
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"lo" = (
+/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/external/ruin{
+ name = "Syndicate Ship Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"lN" = (
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"mo" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
+ dir = 8
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"mD" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 10
+ },
+/obj/item/wrench,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"nk" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/effect/mapping_helpers/apc/syndicate_access,
+/obj/structure/cable,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"nB" = (
+/turf/closed/mineral/random,
+/area/space)
+"nG" = (
+/obj/machinery/light/directional/south,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"nO" = (
+/obj/machinery/mineral/ore_redemption{
+ name = "Syndicate ore redemption machine";
+ ore_multiplier = 4;
+ req_access = list("syndicate")
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"nU" = (
+/obj/structure/sign/poster/contraband/syndicate_pistol,
+/turf/closed/wall/r_wall/syndicate,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"oM" = (
+/obj/structure/cable,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"oZ" = (
+/mob/living/basic/syndicate/melee/sword/space/stormtrooper,
+/turf/open/floor/carpet/royalblack,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"pl" = (
+/obj/machinery/atmospherics/components/tank/air{
+ dir = 8
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"pz" = (
+/obj/machinery/computer/security{
+ desc = "Used to access interrogation room camera.";
+ dir = 8;
+ name = "Ship cameras console";
+ network = list("fsc","fsci");
+ screen_loc = ""
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"pH" = (
+/obj/structure/table/reinforced,
+/obj/item/toy/plush/nukeplushie,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"pM" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"pS" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 6
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"pU" = (
+/obj/machinery/shower/directional/north,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"qf" = (
+/obj/structure/table/optable,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plastic,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"qx" = (
+/turf/open/space/basic,
+/area/space)
+"qU" = (
+/obj/structure/sign/poster/contraband/c20r,
+/turf/closed/wall/r_wall/syndicate,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"qY" = (
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/iron/dark,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"rm" = (
+/obj/machinery/button/crematorium{
+ id = "fscremate";
+ pixel_x = -32
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"ru" = (
+/turf/closed/wall/r_wall/syndicate,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"rH" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"rM" = (
+/obj/structure/closet/syndicate{
+ anchored = 1;
+ desc = "A basic closet for all your villainous needs.";
+ locked = 1;
+ name = "Closet";
+ req_access = list("syndicate");
+ secure = 1
+ },
+/obj/effect/spawner/random/contraband/armory,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"rP" = (
+/obj/effect/mob_spawn/ghost_role/human/syndicatespace,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"sg" = (
+/obj/machinery/ore_silo,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"sq" = (
+/obj/machinery/door/window{
+ name = "Control Room";
+ req_access = list("syndicate")
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"sz" = (
+/obj/machinery/atmospherics/components/unary/vent_pump{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"sH" = (
+/obj/structure/displaycase{
+ req_access = list("syndicate");
+ start_showpiece_type = /obj/item/gun/ballistic/automatic/pistol/deagle/camo
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"sK" = (
+/obj/structure/closet/crate/secure/gear{
+ req_access = list("syndicate")
+ },
+/obj/item/stack/sheet/mineral/titanium{
+ amount = 40
+ },
+/obj/item/stack/sheet/mineral/uranium{
+ amount = 15
+ },
+/turf/open/floor/pod/dark,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"sL" = (
+/obj/structure/chair/comfy,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"sM" = (
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"tv" = (
+/obj/structure/table/reinforced,
+/obj/machinery/button/door{
+ id = "fscaproom";
+ name = "Room shutters control";
+ req_access = list("syndicate")
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"tI" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"uP" = (
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"vp" = (
+/obj/structure/table/reinforced,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"vD" = (
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"vK" = (
+/obj/machinery/door/airlock/grunge{
+ name = "Syndicate Ship Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"vU" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"wb" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2,
+/obj/machinery/portable_atmospherics/scrubber{
+ anchored = 1
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"we" = (
+/turf/closed/mineral/random/high_chance,
+/area/space)
+"wK" = (
+/obj/machinery/door/airlock/grunge{
+ name = "Syndicate Ship Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/iron/dark,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"wL" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/medkit/regular,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"xJ" = (
+/obj/structure/closet/syndicate{
+ anchored = 1;
+ desc = "A basic closet for all your villainous needs.";
+ locked = 1;
+ name = "Closet";
+ req_access = list("syndicate");
+ secure = 1
+ },
+/obj/item/ammo_box/c9mm,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"xZ" = (
+/obj/machinery/computer/camera_advanced/syndie{
+ dir = 8
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"yl" = (
+/obj/machinery/door/airlock/grunge{
+ name = "Captain's Room"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/obj/machinery/door/poddoor{
+ id = "fscaproom";
+ name = "Captain's Blast Door";
+ state_open = 1
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"yD" = (
+/mob/living/basic/syndicate/ranged/smg/space/stormtrooper,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"yJ" = (
+/obj/structure/table/reinforced,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"yR" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"yT" = (
+/obj/item/ai_module/core/full/cybersun,
+/obj/structure/table/reinforced,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"yV" = (
+/obj/structure/table/reinforced,
+/obj/item/assembly/prox_sensor,
+/obj/item/assembly/prox_sensor,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"yZ" = (
+/turf/closed/mineral,
+/area/space)
+"zi" = (
+/obj/machinery/vending/cigarette/syndicate,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"zt" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Aa" = (
+/obj/structure/chair/comfy/shuttle,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"AN" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 4
+ },
+/mob/living/basic/syndicate/ranged/smg/space/stormtrooper,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Bm" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/indestructible/syndicate,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"BK" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable,
+/turf/open/space/basic,
+/area/space)
+"BN" = (
+/obj/structure/transit_tube/crossing,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"Cf" = (
+/obj/machinery/light/directional/south,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Ci" = (
+/obj/structure/closet/syndicate{
+ anchored = 1;
+ desc = "A basic closet for all your villainous needs.";
+ locked = 1;
+ name = "Closet";
+ req_access = list("syndicate");
+ secure = 1
+ },
+/obj/item/crowbar/red,
+/obj/item/ammo_box/magazine/m9mm_aps,
+/obj/item/ammo_box/magazine/m9mm_aps,
+/turf/open/floor/carpet/royalblack,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Cn" = (
+/obj/machinery/camera/xray/directional/east{
+ c_tag = "Conference room";
+ network = list("fsc");
+ screen_loc = ""
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"CK" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 4
+ },
+/mob/living/basic/syndicate/ranged/smg/pilot,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"CR" = (
+/obj/structure/closet/syndicate{
+ anchored = 1;
+ desc = "A basic closet for all your villainous needs.";
+ locked = 1;
+ name = "Closet";
+ req_access = list("syndicate");
+ secure = 1
+ },
+/obj/item/coin/antagtoken,
+/obj/item/dnainjector/thermal,
+/obj/item/storage/box/firingpins/syndicate,
+/obj/item/storage/box/firingpins/syndicate,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"De" = (
+/obj/machinery/door/airlock/grunge{
+ name = "Syndicate Ship Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Dj" = (
+/obj/structure/table/reinforced,
+/obj/item/ammo_box/magazine/smgm45,
+/obj/item/ammo_box/magazine/smgm45,
+/obj/item/ammo_box/magazine/smgm45,
+/obj/item/gun/ballistic/automatic/c20r/unrestricted,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"DA" = (
+/obj/structure/closet/crate/secure/gear{
+ req_access = list("syndicate")
+ },
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"EB" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"EX" = (
+/mob/living/basic/syndicate/ranged/shotgun/space/stormtrooper,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Fp" = (
+/obj/structure/tank_dispenser/oxygen,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"FN" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Gn" = (
+/obj/structure/chair/comfy{
+ dir = 1
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Gs" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"GB" = (
+/obj/structure/cable,
+/obj/machinery/door/airlock/external/ruin{
+ name = "Syndicate Ship Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"GZ" = (
+/obj/machinery/door/airlock/external/ruin{
+ name = "Syndicate Ship Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Hq" = (
+/turf/closed/indestructible/binary,
+/area/space)
+"HU" = (
+/obj/machinery/door/airlock/grunge{
+ name = "Bridge"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Ia" = (
+/obj/effect/mob_spawn/ghost_role/human/syndicatespace/captain,
+/turf/open/floor/carpet/royalblack,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Id" = (
+/obj/machinery/power/shuttle_engine/huge{
+ dir = 8
+ },
+/turf/open/space/basic,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"If" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 9
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Ig" = (
+/obj/machinery/porta_turret/syndicate/energy{
+ dir = 4;
+ name = "Syndicate Ship Turret";
+ on = 0;
+ shot_delay = 10
+ },
+/turf/closed/wall/r_wall/syndicate/nodiagonal,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Im" = (
+/obj/structure/table/reinforced,
+/obj/item/ammo_box/c9mm,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Io" = (
+/obj/effect/landmark/bitrunning/cache_spawn,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"IC" = (
+/obj/structure/table/reinforced,
+/obj/item/paper,
+/obj/item/pen,
+/turf/open/floor/carpet/royalblack,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"IH" = (
+/obj/machinery/door/airlock/external/ruin{
+ name = "Syndicate Ship Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/obj/structure/cable,
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"IV" = (
+/obj/machinery/door/airlock/grunge{
+ name = "Syndicate Ship Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Jg" = (
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Jz" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 5
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"JA" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"JN" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 5
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"JP" = (
+/obj/structure/sink/directional/south,
+/turf/open/floor/iron/dark,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Kz" = (
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Lk" = (
+/obj/structure/transit_tube/crossing,
+/turf/closed/mineral/random,
+/area/space)
+"Lo" = (
+/obj/structure/filingcabinet,
+/obj/machinery/door/window{
+ dir = 8;
+ name = "Syndicate Interior Door";
+ req_access = list("syndicate")
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Mc" = (
+/obj/structure/closet/syndicate{
+ anchored = 1;
+ desc = "A basic closet for all your villainous needs.";
+ locked = 1;
+ name = "Closet";
+ req_access = list("syndicate");
+ secure = 1
+ },
+/obj/item/crowbar/red,
+/obj/item/ammo_box/magazine/m9mm,
+/obj/item/ammo_box/magazine/m9mm,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Mm" = (
+/obj/structure/closet/syndicate{
+ anchored = 1;
+ desc = "A basic closet for all your villainous needs.";
+ locked = 1;
+ name = "Closet";
+ req_access = list("syndicate");
+ secure = 1
+ },
+/obj/item/clothing/head/hats/hos/beret/syndicate,
+/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
+/obj/item/clothing/mask/gas/syndicate,
+/obj/item/clothing/under/syndicate,
+/obj/item/clothing/under/syndicate/skirt,
+/obj/item/clothing/gloves/combat,
+/obj/item/clothing/shoes/combat,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"MR" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Nm" = (
+/obj/structure/closet/crate/secure/gear{
+ req_access = list("syndicate")
+ },
+/turf/open/floor/pod/dark,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Nr" = (
+/obj/structure/closet/crate/secure/gear{
+ req_access = list("syndicate")
+ },
+/obj/item/stack/sheet/mineral/gold{
+ amount = 30
+ },
+/obj/item/stack/sheet/mineral/silver{
+ amount = 30
+ },
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/pod/dark,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Nt" = (
+/obj/structure/table/reinforced,
+/obj/machinery/atmospherics/components/unary/vent_pump,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Of" = (
+/obj/structure/closet/crate/secure/gear{
+ req_access = list("syndicate")
+ },
+/obj/item/disk/surgery/forgottenship,
+/turf/open/floor/pod/dark,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Ox" = (
+/obj/machinery/atmospherics/components/unary/vent_pump,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"OH" = (
+/obj/structure/cable,
+/obj/structure/table/reinforced,
+/obj/item/storage/toolbox/syndicate,
+/obj/item/storage/toolbox/syndicate,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"OI" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/obj/structure/cable,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"PR" = (
+/obj/machinery/door/password/voice/sfc{
+ password = null
+ },
+/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/grunge{
+ desc = "Vault airlock preventing air from going out.";
+ name = "Syndicate Vault Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/pod/dark,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Qg" = (
+/obj/machinery/suit_storage_unit/syndicate{
+ helmet_type = /obj/item/clothing/head/helmet/space/syndicate/black;
+ suit_type = /obj/item/clothing/suit/space/syndicate/black
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Qi" = (
+/obj/item/stack/sheet/mineral/uranium{
+ amount = 15
+ },
+/obj/structure/cable,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"QF" = (
+/obj/structure/table/reinforced,
+/obj/item/dualsaber/green,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"QG" = (
+/obj/structure/tank_dispenser/oxygen,
+/turf/closed/mineral/random,
+/area/space)
+"QX" = (
+/mob/living/basic/syndicate/ranged/space/stormtrooper,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Ra" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"RQ" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"RU" = (
+/obj/machinery/suit_storage_unit/syndicate,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Sc" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Sd" = (
+/obj/structure/closet/syndicate{
+ anchored = 1;
+ desc = "A basic closet for all your villainous needs.";
+ locked = 1;
+ name = "Closet";
+ req_access = list("syndicate");
+ secure = 1
+ },
+/obj/item/crowbar/red,
+/obj/item/ammo_box/magazine/m9mm,
+/obj/item/ammo_box/magazine/m9mm,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Sq" = (
+/obj/machinery/power/smes,
+/obj/structure/cable,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Sv" = (
+/obj/structure/closet/crate/secure/gear{
+ req_access = list("syndicate")
+ },
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Sz" = (
+/turf/open/floor/iron/dark,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"SX" = (
+/obj/machinery/vending/medical/syndicate_access/cybersun,
+/turf/open/floor/plastic,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"TB" = (
+/turf/closed/indestructible/syndicate,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"UQ" = (
+/obj/structure/sign/poster/contraband/syndicate_recruitment,
+/turf/closed/wall/r_wall/syndicate,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Vk" = (
+/obj/machinery/porta_turret/syndicate/energy{
+ dir = 4;
+ name = "Syndicate Ship Turret";
+ on = 0;
+ shot_delay = 10
+ },
+/turf/closed/wall/r_wall/syndicate,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Vq" = (
+/obj/structure/transit_tube/station/dispenser/reverse{
+ dir = 8
+ },
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"Wd" = (
+/obj/structure/sign/poster/contraband/tools,
+/turf/closed/wall/r_wall/syndicate,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Wy" = (
+/obj/structure/closet/crate/secure/gear{
+ req_access = list("syndicate")
+ },
+/obj/item/stack/ore/plasma{
+ amount = 19
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"WR" = (
+/obj/machinery/power/port_gen/pacman/super{
+ anchored = 1
+ },
+/obj/structure/cable,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Xp" = (
+/turf/open/space/basic,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"XS" = (
+/obj/machinery/light/directional/north,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Yb" = (
+/obj/structure/closet/crate/secure/gear{
+ req_access = list("syndicate")
+ },
+/obj/item/clothing/head/helmet/space/syndicate/black/engie,
+/obj/item/clothing/suit/space/syndicate/black/engie,
+/turf/open/floor/pod/dark,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Yi" = (
+/obj/effect/landmark/bitrunning/cache_spawn,
+/turf/open/floor/plastic,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Yj" = (
+/obj/structure/closet/crate/secure/gear{
+ req_access = list("syndicate")
+ },
+/obj/item/stack/ore/diamond{
+ amount = 3
+ },
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Yk" = (
+/obj/machinery/door/airlock/grunge{
+ name = "Captain's Room"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/obj/machinery/door/poddoor{
+ id = "fscaproom";
+ name = "Captain's Blast Door";
+ state_open = 1
+ },
+/turf/open/floor/carpet/royalblack,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Yr" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"Yu" = (
+/obj/structure/chair/comfy/black,
+/turf/open/floor/carpet/royalblack,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"YV" = (
+/obj/structure/sink/directional/south,
+/obj/structure/mirror/directional/west,
+/turf/open/floor/iron/dark,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Za" = (
+/obj/machinery/computer/operating,
+/turf/open/floor/plastic,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Zb" = (
+/turf/open/floor/plastic,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"ZA" = (
+/obj/machinery/power/shuttle_engine/propulsion{
+ dir = 8
+ },
+/turf/open/space/basic,
+/area/ruin/space/has_grav/powered/virtual_domain)
+
+(1,1,1) = {"
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+"}
+(2,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(3,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(4,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(5,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(6,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(7,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+we
+we
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(8,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+we
+we
+we
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(9,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+we
+we
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(10,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Xp
+Xp
+Id
+qx
+qx
+Xp
+Xp
+Id
+qx
+qx
+Xp
+Xp
+Id
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(11,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Xp
+Xp
+Xp
+qx
+qx
+Xp
+Xp
+Xp
+qx
+qx
+Xp
+Xp
+Xp
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(12,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+ZA
+Xp
+Xp
+Xp
+ZA
+ZA
+Xp
+Xp
+Xp
+ZA
+ZA
+Xp
+Xp
+Xp
+ZA
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+we
+we
+we
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(13,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+ru
+ru
+ru
+ru
+ru
+ru
+ru
+ru
+ru
+ru
+ru
+ru
+ru
+ru
+ru
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+we
+we
+we
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(14,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Vk
+ru
+Sv
+vD
+uP
+uP
+Yj
+vD
+uP
+Wy
+DA
+uP
+QX
+vD
+cc
+ru
+Vk
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(15,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+ru
+Io
+uP
+uP
+QX
+lN
+uP
+uP
+uP
+uP
+uP
+lN
+uP
+uP
+uP
+uP
+hA
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(16,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+ru
+ru
+ru
+ru
+ru
+ru
+ru
+ru
+IV
+ru
+ru
+ru
+IV
+ru
+ru
+ru
+ru
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(17,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+ru
+ru
+vp
+ru
+Ia
+Ci
+ru
+Sq
+di
+WR
+ru
+yV
+Gn
+uP
+Mc
+uP
+ru
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+nB
+we
+nB
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(18,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+ru
+vp
+Jg
+ru
+bh
+cR
+ru
+Qi
+sz
+Kz
+ru
+Mc
+gD
+yD
+uP
+rP
+ru
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+nB
+nB
+nB
+nB
+nB
+nB
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(19,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+ru
+sH
+Kz
+yl
+oZ
+bh
+Yk
+pS
+RQ
+Jz
+vK
+uP
+uP
+uP
+sL
+hy
+ru
+qx
+qx
+qx
+qx
+qx
+qx
+nB
+nB
+TB
+TB
+TB
+TB
+nB
+nB
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(20,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+ru
+CR
+Kz
+ru
+bh
+bh
+Yk
+pM
+zt
+pM
+vK
+uP
+uP
+EX
+sL
+Im
+ru
+qx
+qx
+qx
+qx
+qx
+nB
+nB
+TB
+TB
+Yb
+Yb
+TB
+Bm
+nB
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(21,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+ru
+yT
+Kz
+ru
+Yu
+IC
+ru
+mD
+JN
+MR
+ru
+Sd
+gD
+uP
+uP
+gD
+ru
+qx
+qx
+qx
+qx
+nB
+QG
+nB
+TB
+aN
+bG
+bG
+sK
+TB
+nB
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(22,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Ig
+ru
+Lo
+ru
+tv
+ki
+nU
+wb
+EB
+pl
+ru
+hD
+Gn
+uP
+Mc
+ru
+Ig
+qx
+qx
+qx
+qx
+nB
+we
+nB
+TB
+iU
+bG
+bG
+Nr
+TB
+nB
+we
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(23,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+ru
+ru
+ru
+ru
+ru
+ru
+ru
+cy
+ru
+ru
+ru
+ru
+ru
+ru
+ru
+qx
+qx
+qx
+qx
+qx
+qx
+nB
+nB
+TB
+Nm
+bG
+bG
+Of
+TB
+nB
+nB
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+sM
+sM
+sM
+sM
+sM
+kJ
+qx
+Hq
+"}
+(24,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+ru
+Za
+Yi
+Zb
+SX
+ru
+uP
+yR
+uP
+ru
+YV
+Sz
+jJ
+fG
+ru
+qx
+qx
+qx
+qx
+qx
+nB
+nB
+nB
+TB
+TB
+PR
+TB
+TB
+TB
+nB
+nB
+nB
+qx
+qx
+qx
+qx
+qx
+qx
+sM
+sM
+sM
+sM
+sM
+sM
+qx
+Hq
+"}
+(25,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+ru
+qf
+Zb
+ip
+da
+ru
+Ra
+Sc
+uP
+ru
+JP
+qY
+ru
+ru
+ru
+qx
+qx
+qx
+qx
+qx
+nB
+nB
+we
+ru
+ru
+uP
+sg
+ru
+ru
+nB
+nB
+nB
+nB
+qx
+qx
+qx
+qx
+qx
+sM
+sM
+sM
+sM
+sM
+sM
+qx
+Hq
+"}
+(26,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+ru
+aq
+cB
+Zb
+Zb
+De
+Ox
+Gs
+uP
+wK
+Sz
+Sz
+jJ
+pU
+ru
+qx
+qx
+qx
+qx
+qx
+qx
+nB
+nB
+qU
+Fp
+uP
+uP
+li
+cj
+Lk
+Lk
+fd
+fd
+fd
+fd
+fd
+fd
+fd
+BN
+Vq
+sM
+sM
+sM
+sM
+qx
+Hq
+"}
+(27,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Vk
+ru
+ru
+ru
+ru
+ru
+ru
+ru
+kh
+ru
+ru
+ru
+ru
+ru
+ru
+ru
+Vk
+qx
+qx
+qx
+qx
+qx
+nB
+nB
+ru
+eB
+uP
+nO
+uP
+ru
+nB
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+sM
+sM
+sM
+sM
+sM
+sM
+qx
+Hq
+"}
+(28,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+ru
+jl
+rm
+ru
+nk
+oM
+oM
+oM
+yR
+oM
+oM
+oM
+uP
+ru
+uP
+Qg
+ru
+qx
+qx
+qx
+qx
+qx
+qx
+nB
+ru
+wL
+oM
+uP
+dw
+ru
+yZ
+nB
+nB
+nB
+qx
+qx
+qx
+qx
+qx
+sM
+sM
+sM
+sM
+sM
+sM
+qx
+Hq
+"}
+(29,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+ru
+uP
+dw
+ru
+rH
+uP
+AN
+JA
+iX
+JA
+JA
+oM
+uP
+ru
+fJ
+Qg
+ru
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Wd
+OH
+oM
+uP
+RU
+ru
+we
+nB
+nB
+qx
+qx
+qx
+qx
+qx
+qx
+sM
+sM
+sM
+sM
+sM
+Yr
+qx
+Hq
+"}
+(30,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+lo
+uP
+uP
+GZ
+uP
+Aa
+hD
+yJ
+bD
+hD
+hD
+OI
+oM
+GB
+jA
+oM
+dU
+BK
+BK
+BK
+BK
+BK
+BK
+BK
+IH
+oM
+oM
+uP
+RU
+ru
+nB
+nB
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(31,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+ru
+uP
+uP
+dd
+uP
+Aa
+hD
+Nt
+aw
+hD
+hD
+bo
+uP
+dd
+uP
+Qg
+ru
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+iL
+cZ
+uP
+uP
+RU
+ru
+nB
+nB
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(32,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+ru
+aO
+uP
+ru
+XS
+uP
+uP
+hD
+aZ
+hD
+uP
+uP
+Cf
+ru
+uP
+Fp
+ru
+qx
+qx
+qx
+qx
+qx
+qx
+nB
+ru
+ru
+Dj
+QF
+ru
+ru
+nB
+nB
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(33,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Ig
+ru
+hD
+ru
+zi
+uP
+uP
+uP
+FN
+Cn
+uP
+uP
+uP
+ru
+hD
+ru
+Ig
+qx
+qx
+qx
+qx
+qx
+nB
+nB
+nB
+ru
+ru
+ru
+ru
+nB
+nB
+we
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(34,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+ru
+ru
+ru
+ru
+ru
+ru
+ru
+HU
+ru
+ru
+ru
+ru
+ru
+ru
+ru
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+nB
+nB
+nB
+nB
+we
+nB
+nB
+nB
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(35,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+UQ
+rM
+xJ
+Kz
+Kz
+tI
+Kz
+Kz
+ct
+xJ
+ru
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+we
+nB
+nB
+nB
+nB
+nB
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(36,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+ru
+ru
+ru
+ru
+Kz
+Kz
+Kz
+Kz
+tI
+Kz
+Kz
+Kz
+Kz
+ru
+ru
+ru
+ru
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(37,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+ru
+ln
+Kz
+ru
+iB
+Kz
+Kz
+fV
+If
+Kz
+Kz
+Kz
+nG
+ru
+cw
+cw
+ru
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(38,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+ru
+Kz
+dz
+sq
+Kz
+CK
+Kz
+vU
+mo
+vU
+Kz
+CK
+Kz
+ja
+Kz
+Jg
+ru
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(39,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Ig
+ru
+Kz
+ru
+Kz
+pz
+Kz
+xZ
+Kz
+fM
+Kz
+kI
+Kz
+ru
+Mm
+ru
+Ig
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(40,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+ru
+ru
+ru
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+Kz
+ru
+ru
+ru
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(41,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+ru
+ru
+vp
+vp
+pH
+vp
+iW
+vp
+vp
+vp
+vp
+ru
+ru
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+we
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(42,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Ig
+hg
+hg
+hg
+hg
+hg
+hg
+hg
+hg
+hg
+Ig
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+we
+we
+we
+we
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(43,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+we
+we
+we
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(44,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+we
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(45,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+we
+we
+we
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(46,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+we
+we
+we
+we
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(47,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+we
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(48,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(49,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(50,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(51,1,1) = {"
+Hq
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+qx
+Hq
+"}
+(52,1,1) = {"
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+Hq
+"}
diff --git a/_maps/virtual_domains/test_only.dmm b/_maps/virtual_domains/test_only.dmm
new file mode 100644
index 00000000000..22b647188b6
--- /dev/null
+++ b/_maps/virtual_domains/test_only.dmm
@@ -0,0 +1,52 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/open/floor,
+/area/virtual_domain/powered)
+"D" = (
+/obj/effect/mob_spawn/corpse/human/miner,
+/turf/open/floor,
+/area/virtual_domain/powered)
+"I" = (
+/mob/living/basic/pet/dog/corgi,
+/turf/open/floor,
+/area/virtual_domain/powered)
+"U" = (
+/obj/effect/landmark/bitrunning/safehouse_spawn,
+/turf/open/floor,
+/area/virtual_domain/safehouse)
+
+(1,1,1) = {"
+I
+a
+a
+a
+U
+"}
+(2,1,1) = {"
+D
+a
+a
+a
+a
+"}
+(3,1,1) = {"
+a
+a
+a
+a
+a
+"}
+(4,1,1) = {"
+a
+a
+a
+a
+a
+"}
+(5,1,1) = {"
+a
+a
+a
+a
+a
+"}
diff --git a/_maps/virtual_domains/vaporwave.dmm b/_maps/virtual_domains/vaporwave.dmm
new file mode 100644
index 00000000000..984bbbe2914
--- /dev/null
+++ b/_maps/virtual_domains/vaporwave.dmm
@@ -0,0 +1,1017 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aA" = (
+/obj/machinery/light/small/directional/north,
+/obj/effect/turf_decal/sand/plating,
+/turf/open/floor/plating{
+ initial_gas_mix = "TEMP=2.7"
+ },
+/area/ruin/space/has_grav/powered/virtual_domain)
+"bs" = (
+/obj/effect/turf_decal/sand,
+/turf/open/floor/iron/airless,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"bF" = (
+/obj/effect/turf_decal/sand/plating,
+/turf/open/floor/plating{
+ initial_gas_mix = "TEMP=2.7"
+ },
+/area/ruin/space/has_grav/powered/virtual_domain)
+"cz" = (
+/turf/open/misc/asteroid/airless,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"cL" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/cup/glass/drinkingglass{
+ pixel_x = 6;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/cup/glass/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass{
+ pixel_x = -6;
+ pixel_y = 8
+ },
+/turf/open/floor/iron/vaporwave,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"df" = (
+/obj/effect/turf_decal/sand,
+/turf/open/floor/iron/airless{
+ icon_state = "stairs-l"
+ },
+/area/ruin/space/has_grav/powered/virtual_domain)
+"eF" = (
+/turf/closed/indestructible/binary,
+/area/space)
+"fx" = (
+/obj/item/statuebust,
+/turf/open/floor/iron/vaporwave,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"fQ" = (
+/obj/structure/flora/tree/palm,
+/turf/open/floor/holofloor/beach,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"gM" = (
+/obj/structure/table/reinforced,
+/obj/item/clothing/glasses/sunglasses/big{
+ name = "aesthetic sunglasses"
+ },
+/turf/open/floor/iron/vaporwave,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"hN" = (
+/turf/open/floor/holofloor/beach,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"il" = (
+/obj/effect/turf_decal/sand,
+/obj/effect/turf_decal/sand,
+/turf/open/floor/iron/airless,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"iP" = (
+/obj/machinery/suit_storage_unit/standard_unit,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"kj" = (
+/obj/structure/window/spawner/directional/east,
+/obj/structure/closet/crate/secure/bitrunning/encrypted,
+/turf/open/floor/iron/vaporwave,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"ku" = (
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"kF" = (
+/obj/effect/turf_decal/sand,
+/turf/open/floor/iron/airless{
+ icon_state = "stairs-r"
+ },
+/area/ruin/space/has_grav/powered/virtual_domain)
+"ll" = (
+/obj/structure/sign/poster/contraband/clown/directional/north,
+/turf/open/floor/iron/vaporwave,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"lu" = (
+/turf/closed/wall/rust,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"lB" = (
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/tank/internals/emergency_oxygen,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"lI" = (
+/obj/structure/table/reinforced,
+/obj/machinery/chem_dispenser/drinks/beer/fullupgrade,
+/turf/open/floor/iron/vaporwave,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"qm" = (
+/obj/structure/flora/tree/palm,
+/obj/machinery/light/directional/west,
+/turf/open/floor/holofloor/beach,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"qu" = (
+/turf/open/floor/holofloor/beach/water,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"rn" = (
+/obj/structure/statue/sandstone/venus{
+ anchored = 1;
+ dir = 4
+ },
+/obj/effect/turf_decal/sand/plating,
+/turf/open/floor/plating{
+ initial_gas_mix = "TEMP=2.7"
+ },
+/area/ruin/space/has_grav/powered/virtual_domain)
+"xb" = (
+/obj/structure/chair/stool/directional/west,
+/turf/open/floor/iron/vaporwave,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"xp" = (
+/obj/structure/table/reinforced,
+/turf/open/floor/iron/vaporwave,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"xK" = (
+/turf/closed/wall,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"ym" = (
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space)
+"AX" = (
+/obj/effect/turf_decal/stripes/asteroid/line,
+/obj/effect/turf_decal/sand/plating,
+/turf/open/floor/plating{
+ initial_gas_mix = "TEMP=2.7"
+ },
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Cq" = (
+/obj/item/instrument/eguitar,
+/turf/open/floor/holofloor/beach,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"CR" = (
+/turf/open/floor/iron/vaporwave,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Dk" = (
+/obj/structure/window/spawner/directional/east,
+/turf/open/floor/iron/vaporwave,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Es" = (
+/obj/structure/chair/comfy/black{
+ dir = 4
+ },
+/turf/open/floor/iron/vaporwave,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Fd" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/wall/rust,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Hf" = (
+/obj/effect/turf_decal/sand,
+/turf/open/floor/iron/airless{
+ icon_state = "recharge_floor_asteroid"
+ },
+/area/ruin/space/has_grav/powered/virtual_domain)
+"HA" = (
+/turf/open/floor/holofloor/beach/coast,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"HV" = (
+/obj/structure/chair/comfy/black{
+ dir = 4
+ },
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/iron/vaporwave,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Jr" = (
+/obj/structure/window/spawner/directional/west,
+/turf/open/floor/iron/vaporwave,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"KO" = (
+/obj/structure/chair/comfy/black{
+ dir = 8
+ },
+/turf/open/floor/iron/vaporwave,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"KY" = (
+/obj/effect/turf_decal/sand,
+/turf/open/floor/iron/airless{
+ icon_state = "stairs-m"
+ },
+/area/ruin/space/has_grav/powered/virtual_domain)
+"LG" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"LJ" = (
+/obj/structure/lattice,
+/turf/open/misc/asteroid/airless,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"LP" = (
+/obj/structure/flora/tree/palm,
+/obj/machinery/light/directional/east,
+/turf/open/floor/holofloor/beach,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Nz" = (
+/obj/structure/window/spawner/directional/east,
+/obj/structure/table/reinforced,
+/obj/item/storage/fancy/cigarettes/cigars/havana,
+/obj/effect/spawner/random/entertainment/lighter,
+/turf/open/floor/iron/vaporwave,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"NT" = (
+/turf/open/space/basic,
+/area/space)
+"Qh" = (
+/obj/structure/closet/crate/bin,
+/turf/open/misc/asteroid/airless,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Uy" = (
+/obj/effect/landmark/bitrunning/safehouse_spawn,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"UE" = (
+/obj/effect/turf_decal/sand,
+/obj/effect/turf_decal/sand/plating,
+/turf/open/floor/plating{
+ initial_gas_mix = "TEMP=2.7"
+ },
+/area/ruin/space/has_grav/powered/virtual_domain)
+"UV" = (
+/obj/structure/lattice,
+/turf/open/floor/plating/airless,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Vc" = (
+/obj/structure/flora/tree/palm,
+/turf/open/misc/asteroid/airless,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"XJ" = (
+/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/hatch,
+/turf/open/floor/pod/dark,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Yo" = (
+/obj/structure/statue/sandstone/venus{
+ anchored = 1;
+ desc = "Ugh, this is merely an ugly amateurish replica of the other statue! The letters RIPGOAT are scribbled onto the base.";
+ dir = 8
+ },
+/obj/effect/turf_decal/sand/plating,
+/turf/open/floor/plating{
+ initial_gas_mix = "TEMP=2.7"
+ },
+/area/ruin/space/has_grav/powered/virtual_domain)
+"YE" = (
+/mob/living/basic/butterfly,
+/turf/open/floor/iron/vaporwave,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"ZI" = (
+/obj/effect/spawner/random/structure/musician/piano/random_piano,
+/obj/structure/window/spawner/directional/west,
+/turf/open/floor/iron/vaporwave,
+/area/ruin/space/has_grav/powered/virtual_domain)
+
+(1,1,1) = {"
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+"}
+(2,1,1) = {"
+eF
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+eF
+"}
+(3,1,1) = {"
+eF
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+eF
+"}
+(4,1,1) = {"
+eF
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+eF
+"}
+(5,1,1) = {"
+eF
+NT
+NT
+NT
+NT
+NT
+NT
+cz
+LJ
+cz
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+eF
+"}
+(6,1,1) = {"
+eF
+NT
+NT
+NT
+NT
+NT
+cz
+cz
+LJ
+cz
+cz
+LJ
+cz
+cz
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+eF
+"}
+(7,1,1) = {"
+eF
+NT
+NT
+NT
+NT
+cz
+cz
+cz
+UV
+LJ
+cz
+UV
+cz
+cz
+cz
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+eF
+"}
+(8,1,1) = {"
+eF
+NT
+NT
+NT
+NT
+cz
+xK
+xK
+lu
+lu
+lu
+xK
+lu
+UE
+cz
+cz
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+eF
+"}
+(9,1,1) = {"
+eF
+NT
+NT
+NT
+LJ
+Qh
+xK
+fQ
+hN
+qm
+HA
+qu
+xK
+aA
+cz
+cz
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+eF
+"}
+(10,1,1) = {"
+eF
+NT
+NT
+NT
+LJ
+UV
+lu
+ZI
+Jr
+Jr
+Jr
+Jr
+xK
+bF
+Vc
+cz
+cz
+NT
+NT
+NT
+ku
+ku
+ku
+ku
+ku
+Uy
+NT
+eF
+"}
+(11,1,1) = {"
+eF
+NT
+NT
+NT
+cz
+cz
+xK
+xb
+CR
+CR
+fx
+CR
+xK
+Yo
+il
+UE
+cz
+NT
+NT
+NT
+ku
+iP
+iP
+iP
+ku
+ku
+NT
+eF
+"}
+(12,1,1) = {"
+eF
+NT
+NT
+NT
+cz
+cz
+xK
+ll
+CR
+CR
+CR
+CR
+xK
+Hf
+df
+il
+cz
+NT
+NT
+NT
+ku
+ku
+ku
+ku
+ku
+ku
+NT
+eF
+"}
+(13,1,1) = {"
+eF
+NT
+NT
+NT
+cz
+LJ
+xK
+HV
+Es
+CR
+CR
+CR
+XJ
+bs
+KY
+bs
+il
+NT
+NT
+NT
+ku
+ku
+ku
+ku
+ku
+ku
+NT
+eF
+"}
+(14,1,1) = {"
+eF
+NT
+NT
+NT
+cz
+LJ
+lu
+xp
+gM
+CR
+CR
+cL
+xK
+Hf
+kF
+bs
+il
+NT
+NT
+NT
+ku
+ku
+ku
+ku
+ku
+ku
+NT
+eF
+"}
+(15,1,1) = {"
+eF
+NT
+NT
+NT
+cz
+LJ
+lu
+KO
+KO
+CR
+YE
+lI
+lu
+rn
+il
+UE
+UE
+NT
+NT
+NT
+ku
+ku
+ku
+ku
+lB
+ku
+NT
+eF
+"}
+(16,1,1) = {"
+eF
+NT
+NT
+NT
+LJ
+UV
+xK
+kj
+Dk
+Dk
+Dk
+Nz
+xK
+AX
+Vc
+cz
+cz
+NT
+NT
+NT
+ku
+ku
+ku
+ku
+ku
+LG
+NT
+eF
+"}
+(17,1,1) = {"
+eF
+NT
+NT
+NT
+cz
+cz
+lu
+fQ
+Cq
+LP
+HA
+qu
+lu
+aA
+cz
+cz
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+eF
+"}
+(18,1,1) = {"
+eF
+NT
+NT
+NT
+cz
+cz
+xK
+xK
+lu
+xK
+lu
+lu
+Fd
+UE
+cz
+cz
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+eF
+"}
+(19,1,1) = {"
+eF
+NT
+NT
+NT
+NT
+cz
+cz
+cz
+UV
+LJ
+Qh
+UV
+cz
+cz
+cz
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+eF
+"}
+(20,1,1) = {"
+eF
+NT
+NT
+NT
+NT
+NT
+NT
+cz
+LJ
+cz
+cz
+LJ
+cz
+cz
+cz
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+eF
+"}
+(21,1,1) = {"
+eF
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+ym
+cz
+cz
+cz
+cz
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+eF
+"}
+(22,1,1) = {"
+eF
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+eF
+"}
+(23,1,1) = {"
+eF
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+eF
+"}
+(24,1,1) = {"
+eF
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+eF
+"}
+(25,1,1) = {"
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+"}
diff --git a/_maps/virtual_domains/wendigo.dmm b/_maps/virtual_domains/wendigo.dmm
new file mode 100644
index 00000000000..17bcb48d688
--- /dev/null
+++ b/_maps/virtual_domains/wendigo.dmm
@@ -0,0 +1,1373 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/open/indestructible/necropolis{
+ initial_gas_mix = "ICEMOON_ATMOS"
+ },
+/area/icemoon/underground/explored/virtual_domain)
+"b" = (
+/turf/closed/indestructible/rock/snow/ice/ore,
+/area/icemoon/underground/explored/virtual_domain)
+"e" = (
+/turf/open/misc/asteroid/snow/ice/icemoon,
+/area/icemoon/underground/explored/virtual_domain)
+"f" = (
+/obj/structure/marker_beacon/olive,
+/turf/open/indestructible/necropolis{
+ initial_gas_mix = "ICEMOON_ATMOS"
+ },
+/area/icemoon/underground/explored/virtual_domain)
+"i" = (
+/turf/closed/indestructible/binary,
+/area/icemoon/underground/explored/virtual_domain)
+"o" = (
+/obj/structure/marker_beacon/indigo,
+/turf/open/indestructible/necropolis{
+ initial_gas_mix = "ICEMOON_ATMOS"
+ },
+/area/icemoon/underground/explored/virtual_domain)
+"p" = (
+/obj/structure/marker_beacon/bronze,
+/turf/open/indestructible/necropolis{
+ initial_gas_mix = "ICEMOON_ATMOS"
+ },
+/area/icemoon/underground/explored/virtual_domain)
+"q" = (
+/obj/structure/marker_beacon/yellow,
+/turf/open/indestructible/necropolis{
+ initial_gas_mix = "ICEMOON_ATMOS"
+ },
+/area/icemoon/underground/explored/virtual_domain)
+"t" = (
+/obj/structure/marker_beacon/teal,
+/turf/open/indestructible/necropolis{
+ initial_gas_mix = "ICEMOON_ATMOS"
+ },
+/area/icemoon/underground/explored/virtual_domain)
+"x" = (
+/obj/structure/marker_beacon/burgundy,
+/turf/open/indestructible/necropolis{
+ initial_gas_mix = "ICEMOON_ATMOS"
+ },
+/area/icemoon/underground/explored/virtual_domain)
+"A" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"E" = (
+/obj/effect/mob_spawn/corpse/human/miner,
+/turf/open/misc/asteroid/snow/ice/icemoon,
+/area/icemoon/underground/explored/virtual_domain)
+"H" = (
+/mob/living/simple_animal/hostile/megafauna/wendigo/virtual_domain,
+/turf/open/indestructible/necropolis{
+ initial_gas_mix = "ICEMOON_ATMOS"
+ },
+/area/icemoon/underground/explored/virtual_domain)
+"L" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/indestructible/binary,
+/area/icemoon/underground/explored/virtual_domain)
+"R" = (
+/obj/item/paper/crumpled/bloody{
+ default_raw_text = "for your own sake, do not enter"
+ },
+/turf/open/misc/asteroid/snow/ice/icemoon,
+/area/icemoon/underground/explored/virtual_domain)
+"S" = (
+/turf/template_noop,
+/area/template_noop)
+"V" = (
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"Z" = (
+/obj/effect/landmark/bitrunning/safehouse_spawn,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+
+(1,1,1) = {"
+S
+S
+S
+S
+S
+S
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+"}
+(2,1,1) = {"
+S
+S
+S
+S
+S
+i
+i
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+i
+i
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+"}
+(3,1,1) = {"
+S
+S
+S
+S
+i
+i
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+i
+i
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+"}
+(4,1,1) = {"
+S
+S
+S
+i
+i
+e
+e
+e
+b
+b
+b
+b
+b
+e
+e
+e
+b
+b
+b
+b
+b
+e
+e
+e
+i
+i
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+"}
+(5,1,1) = {"
+S
+S
+i
+i
+e
+e
+e
+b
+b
+b
+b
+b
+b
+b
+e
+b
+b
+b
+b
+b
+b
+b
+e
+e
+e
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+L
+"}
+(6,1,1) = {"
+S
+i
+i
+e
+e
+e
+b
+b
+b
+b
+b
+b
+b
+b
+e
+b
+b
+b
+b
+b
+b
+b
+b
+e
+e
+e
+i
+i
+e
+e
+e
+e
+e
+e
+e
+e
+i
+"}
+(7,1,1) = {"
+i
+i
+e
+e
+e
+b
+b
+b
+b
+b
+b
+b
+b
+b
+e
+b
+b
+b
+b
+b
+b
+b
+b
+b
+e
+e
+e
+i
+e
+e
+e
+e
+e
+e
+e
+e
+i
+"}
+(8,1,1) = {"
+i
+e
+e
+e
+b
+b
+b
+b
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+b
+b
+b
+b
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+i
+"}
+(9,1,1) = {"
+i
+e
+e
+b
+b
+b
+b
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+b
+b
+b
+b
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+i
+"}
+(10,1,1) = {"
+i
+e
+e
+b
+b
+b
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+b
+b
+b
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+i
+"}
+(11,1,1) = {"
+i
+e
+E
+b
+b
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+o
+a
+a
+b
+b
+b
+b
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+i
+"}
+(12,1,1) = {"
+i
+e
+e
+b
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+b
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+i
+"}
+(13,1,1) = {"
+i
+e
+e
+b
+b
+b
+a
+a
+a
+a
+q
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+b
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+i
+"}
+(14,1,1) = {"
+i
+e
+e
+b
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+b
+e
+e
+e
+V
+V
+V
+V
+V
+Z
+e
+i
+"}
+(15,1,1) = {"
+i
+e
+e
+b
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+b
+E
+e
+e
+V
+V
+V
+V
+V
+V
+e
+i
+"}
+(16,1,1) = {"
+i
+e
+e
+e
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+e
+e
+e
+e
+V
+V
+V
+V
+V
+V
+e
+i
+"}
+(17,1,1) = {"
+i
+e
+e
+e
+e
+e
+a
+a
+a
+a
+a
+a
+a
+a
+H
+a
+a
+a
+a
+x
+a
+a
+a
+e
+e
+e
+e
+R
+e
+V
+V
+V
+V
+V
+V
+e
+i
+"}
+(18,1,1) = {"
+i
+e
+e
+e
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+e
+e
+e
+e
+V
+V
+V
+V
+V
+V
+e
+i
+"}
+(19,1,1) = {"
+i
+e
+e
+b
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+b
+e
+e
+e
+V
+V
+V
+V
+V
+V
+e
+i
+"}
+(20,1,1) = {"
+i
+e
+e
+b
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+p
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+b
+e
+e
+e
+V
+V
+V
+V
+V
+A
+e
+i
+"}
+(21,1,1) = {"
+i
+e
+e
+b
+b
+b
+a
+a
+a
+a
+f
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+b
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+i
+"}
+(22,1,1) = {"
+i
+e
+e
+b
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+b
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+i
+"}
+(23,1,1) = {"
+i
+e
+e
+b
+b
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+t
+a
+b
+b
+b
+b
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+i
+"}
+(24,1,1) = {"
+i
+e
+e
+b
+b
+b
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+b
+b
+b
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+i
+"}
+(25,1,1) = {"
+i
+e
+e
+b
+b
+b
+b
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+b
+b
+b
+b
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+i
+"}
+(26,1,1) = {"
+i
+e
+e
+e
+b
+b
+b
+b
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+b
+b
+b
+b
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+i
+"}
+(27,1,1) = {"
+i
+i
+e
+e
+e
+b
+b
+b
+b
+b
+b
+b
+b
+b
+e
+b
+b
+b
+b
+b
+b
+b
+b
+b
+e
+e
+e
+i
+e
+e
+e
+e
+e
+e
+e
+e
+i
+"}
+(28,1,1) = {"
+S
+i
+i
+e
+e
+e
+b
+b
+b
+b
+b
+b
+b
+b
+e
+b
+b
+b
+b
+b
+b
+b
+b
+e
+e
+e
+i
+i
+e
+e
+e
+e
+e
+e
+e
+e
+i
+"}
+(29,1,1) = {"
+S
+S
+i
+i
+e
+e
+e
+b
+b
+b
+b
+b
+b
+b
+e
+b
+b
+b
+b
+b
+b
+b
+e
+e
+e
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+"}
+(30,1,1) = {"
+S
+S
+S
+i
+i
+e
+e
+e
+b
+b
+b
+b
+b
+e
+e
+e
+b
+b
+b
+b
+b
+e
+e
+e
+i
+i
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+"}
+(31,1,1) = {"
+S
+S
+S
+S
+i
+i
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+i
+i
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+"}
+(32,1,1) = {"
+S
+S
+S
+S
+S
+i
+i
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+e
+i
+i
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+"}
+(33,1,1) = {"
+S
+S
+S
+S
+S
+S
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+"}
diff --git a/_maps/virtual_domains/xeno_nest.dmm b/_maps/virtual_domains/xeno_nest.dmm
new file mode 100644
index 00000000000..fcbd7cc116c
--- /dev/null
+++ b/_maps/virtual_domains/xeno_nest.dmm
@@ -0,0 +1,2071 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"c" = (
+/obj/structure/alien/weeds,
+/obj/structure/alien/resin/wall,
+/obj/structure/alien/resin/wall,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"d" = (
+/obj/structure/alien/resin/wall,
+/turf/closed/indestructible/binary,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"e" = (
+/obj/structure/alien/weeds,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"f" = (
+/obj/structure/alien/weeds,
+/obj/structure/alien/egg/burst,
+/obj/effect/decal/cleanable/blood,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"h" = (
+/obj/structure/alien/weeds,
+/mob/living/simple_animal/hostile/alien/sentinel,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"i" = (
+/obj/structure/alien/weeds,
+/obj/structure/bed/nest,
+/obj/effect/decal/cleanable/blood/gibs,
+/obj/effect/decal/cleanable/blood,
+/obj/item/clothing/under/syndicate,
+/obj/item/clothing/glasses/night,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"j" = (
+/obj/machinery/suit_storage_unit/spaceruin,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"k" = (
+/obj/structure/alien/weeds/node,
+/obj/structure/alien/resin/wall,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"l" = (
+/obj/structure/alien/weeds,
+/obj/structure/alien/resin/wall,
+/turf/closed/indestructible/binary,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"m" = (
+/obj/structure/alien/weeds,
+/obj/structure/bed/nest,
+/obj/structure/alien/resin/wall,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"n" = (
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"o" = (
+/obj/structure/alien/weeds,
+/obj/effect/decal/cleanable/blood/gibs,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"p" = (
+/obj/structure/alien/weeds,
+/mob/living/simple_animal/hostile/alien/drone{
+ plants_off = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"q" = (
+/obj/structure/alien/resin/wall,
+/turf/open/space/basic,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"r" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"s" = (
+/obj/structure/alien/weeds/node,
+/mob/living/simple_animal/hostile/alien/drone{
+ plants_off = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"t" = (
+/obj/structure/alien/weeds,
+/obj/structure/alien/weeds,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"u" = (
+/obj/structure/alien/weeds/node,
+/obj/effect/decal/cleanable/blood,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"v" = (
+/obj/effect/landmark/bitrunning/safehouse_spawn,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"x" = (
+/obj/structure/alien/weeds,
+/obj/structure/bed/nest,
+/obj/effect/landmark/bitrunning/cache_spawn,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"z" = (
+/obj/structure/alien/weeds,
+/obj/structure/alien/resin/wall,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"A" = (
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"B" = (
+/obj/structure/alien/weeds,
+/obj/effect/decal/cleanable/blood,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"C" = (
+/obj/structure/alien/weeds,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"D" = (
+/obj/structure/alien/weeds,
+/obj/structure/alien/weeds,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"E" = (
+/turf/closed/indestructible/binary,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"F" = (
+/obj/structure/table/greyscale,
+/obj/item/gun/energy/beam_rifle,
+/obj/item/gun/energy/laser{
+ pixel_x = 4;
+ pixel_y = -6
+ },
+/obj/item/gun/energy/laser{
+ pixel_x = -8;
+ pixel_y = 6
+ },
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"G" = (
+/obj/structure/alien/resin/wall,
+/obj/structure/alien/weeds,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"H" = (
+/obj/structure/table/greyscale,
+/obj/machinery/recharger{
+ pixel_x = 8;
+ pixel_y = 4
+ },
+/obj/machinery/recharger{
+ pixel_x = -8;
+ pixel_y = 4
+ },
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"I" = (
+/obj/structure/alien/weeds,
+/obj/structure/bed/nest,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"J" = (
+/obj/structure/alien/weeds,
+/mob/living/simple_animal/hostile/alien/queen/large{
+ desc = "A gigantic alien who is in charge of the hive and all of its loyal servants.";
+ name = "alien queen";
+ pixel_x = -16;
+ plants_off = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"K" = (
+/obj/structure/alien/weeds,
+/obj/effect/landmark/bitrunning/cache_spawn,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"L" = (
+/obj/item/storage/medkit/regular,
+/obj/item/storage/medkit/regular,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
+"M" = (
+/obj/structure/alien/weeds,
+/obj/structure/alien/resin/wall{
+ move_force = 1000;
+ move_resist = 3000;
+ pull_force = 1000
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"N" = (
+/obj/structure/alien/weeds,
+/obj/structure/bed/nest,
+/obj/effect/decal/cleanable/blood/gibs,
+/obj/item/clothing/under/rank/security/officer,
+/obj/item/clothing/suit/armor/vest,
+/obj/item/melee/baton/security/loaded,
+/obj/item/clothing/head/helmet,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"O" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/indestructible/binary,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"P" = (
+/obj/structure/alien/weeds/node,
+/mob/living/simple_animal/hostile/alien,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Q" = (
+/obj/structure/alien/resin/wall,
+/obj/structure/alien/resin/wall,
+/turf/closed/indestructible/binary,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"S" = (
+/obj/structure/alien/weeds,
+/mob/living/simple_animal/hostile/alien,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"T" = (
+/obj/structure/alien/weeds,
+/obj/structure/alien/egg/burst,
+/obj/effect/decal/cleanable/blood/gibs,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"U" = (
+/obj/structure/alien/weeds,
+/obj/structure/bed/nest,
+/obj/effect/decal/cleanable/blood/gibs,
+/obj/item/gun/ballistic/automatic/pistol,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"V" = (
+/obj/structure/alien/weeds/node,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"W" = (
+/obj/structure/alien/weeds,
+/obj/structure/alien/egg/burst,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Y" = (
+/obj/structure/alien/weeds,
+/obj/effect/decal/cleanable/blood,
+/mob/living/simple_animal/hostile/alien/drone{
+ plants_off = 1
+ },
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+"Z" = (
+/obj/structure/alien/weeds,
+/obj/structure/bed/nest,
+/obj/effect/decal/cleanable/blood/gibs,
+/obj/item/tank/internals/oxygen,
+/obj/item/clothing/suit/space/syndicate/orange,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/head/helmet/space/syndicate/orange,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/space/has_grav/powered/virtual_domain)
+
+(1,1,1) = {"
+a
+a
+a
+E
+E
+E
+E
+E
+E
+E
+E
+E
+E
+E
+E
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+a
+a
+E
+E
+z
+z
+z
+z
+z
+z
+z
+z
+E
+E
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(3,1,1) = {"
+a
+a
+a
+E
+E
+z
+e
+W
+W
+z
+e
+e
+z
+M
+E
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(4,1,1) = {"
+a
+a
+a
+E
+z
+z
+e
+e
+e
+e
+p
+e
+W
+z
+E
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(5,1,1) = {"
+a
+a
+a
+E
+z
+e
+e
+k
+z
+z
+z
+k
+z
+z
+E
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(6,1,1) = {"
+a
+a
+a
+E
+z
+e
+e
+m
+K
+J
+o
+i
+z
+z
+E
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(7,1,1) = {"
+a
+a
+a
+E
+z
+W
+h
+e
+e
+e
+B
+o
+e
+z
+E
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(8,1,1) = {"
+a
+a
+a
+E
+z
+I
+o
+z
+e
+V
+e
+h
+W
+z
+E
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(9,1,1) = {"
+a
+a
+a
+E
+z
+U
+u
+e
+z
+e
+e
+W
+z
+z
+E
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(10,1,1) = {"
+a
+a
+a
+E
+z
+e
+o
+z
+e
+e
+e
+k
+W
+z
+E
+a
+a
+a
+a
+a
+a
+a
+E
+E
+E
+E
+E
+E
+E
+E
+E
+E
+a
+a
+a
+a
+a
+a
+a
+"}
+(11,1,1) = {"
+a
+a
+a
+E
+z
+z
+e
+h
+e
+e
+h
+e
+e
+z
+E
+a
+a
+a
+a
+a
+a
+a
+E
+E
+E
+E
+z
+z
+z
+z
+E
+E
+a
+a
+a
+a
+a
+a
+a
+"}
+(12,1,1) = {"
+a
+a
+a
+E
+E
+z
+W
+e
+e
+e
+e
+e
+e
+z
+E
+a
+a
+a
+a
+a
+a
+a
+E
+E
+E
+z
+z
+Z
+I
+z
+z
+E
+a
+a
+a
+a
+a
+a
+a
+"}
+(13,1,1) = {"
+a
+a
+a
+E
+E
+z
+z
+e
+e
+V
+e
+e
+z
+z
+E
+a
+a
+a
+a
+a
+a
+a
+E
+E
+z
+z
+W
+o
+Y
+e
+z
+E
+a
+a
+a
+a
+a
+a
+a
+"}
+(14,1,1) = {"
+a
+a
+a
+E
+E
+E
+z
+z
+e
+e
+e
+z
+z
+E
+E
+a
+a
+a
+a
+E
+E
+E
+E
+E
+z
+I
+e
+V
+e
+W
+z
+E
+a
+a
+a
+a
+a
+a
+a
+"}
+(15,1,1) = {"
+a
+a
+a
+a
+a
+E
+E
+z
+z
+z
+z
+z
+E
+E
+E
+E
+E
+E
+E
+E
+E
+E
+z
+z
+z
+e
+e
+e
+I
+z
+z
+E
+a
+a
+a
+a
+a
+a
+a
+"}
+(16,1,1) = {"
+a
+a
+a
+a
+a
+a
+E
+z
+V
+V
+z
+E
+E
+E
+E
+E
+E
+E
+E
+E
+E
+z
+z
+e
+S
+e
+W
+z
+z
+z
+E
+E
+a
+a
+a
+a
+a
+a
+a
+"}
+(17,1,1) = {"
+a
+a
+a
+a
+a
+a
+E
+z
+p
+e
+z
+z
+E
+z
+z
+z
+z
+z
+z
+z
+z
+z
+e
+e
+z
+z
+z
+z
+E
+E
+E
+E
+a
+a
+a
+a
+a
+a
+a
+"}
+(18,1,1) = {"
+a
+a
+a
+a
+a
+a
+E
+z
+e
+e
+p
+z
+z
+z
+e
+e
+e
+e
+e
+e
+z
+z
+e
+z
+z
+E
+E
+E
+E
+E
+E
+E
+E
+E
+E
+E
+E
+E
+O
+"}
+(19,1,1) = {"
+E
+E
+E
+E
+E
+E
+E
+z
+z
+e
+e
+e
+z
+e
+e
+e
+e
+e
+e
+V
+e
+e
+e
+z
+E
+E
+E
+E
+E
+E
+Q
+d
+q
+q
+q
+q
+q
+q
+E
+"}
+(20,1,1) = {"
+E
+z
+z
+z
+z
+E
+E
+E
+z
+z
+e
+V
+e
+e
+e
+z
+z
+z
+z
+e
+e
+t
+z
+z
+E
+E
+a
+a
+a
+E
+q
+A
+A
+A
+A
+A
+A
+A
+E
+"}
+(21,1,1) = {"
+E
+z
+W
+I
+z
+z
+z
+z
+z
+z
+e
+e
+e
+e
+z
+z
+E
+E
+z
+z
+e
+e
+z
+E
+E
+E
+a
+a
+a
+E
+q
+A
+A
+A
+A
+A
+A
+A
+E
+"}
+(22,1,1) = {"
+E
+G
+t
+S
+e
+z
+z
+e
+e
+e
+e
+e
+e
+z
+z
+E
+E
+E
+z
+e
+e
+e
+z
+E
+E
+E
+a
+a
+a
+E
+q
+A
+C
+A
+A
+A
+A
+A
+E
+"}
+(23,1,1) = {"
+E
+G
+K
+W
+V
+e
+e
+e
+z
+z
+e
+z
+z
+z
+E
+E
+E
+E
+z
+e
+e
+z
+z
+E
+E
+a
+a
+a
+a
+E
+q
+C
+C
+C
+A
+A
+A
+A
+E
+"}
+(24,1,1) = {"
+E
+z
+z
+I
+I
+z
+z
+z
+z
+z
+e
+z
+E
+E
+E
+E
+E
+E
+z
+e
+e
+z
+E
+E
+E
+E
+E
+E
+E
+E
+d
+C
+C
+A
+A
+C
+A
+A
+E
+"}
+(25,1,1) = {"
+E
+E
+z
+z
+z
+z
+E
+E
+E
+z
+p
+z
+z
+E
+E
+E
+E
+E
+z
+e
+s
+z
+z
+z
+E
+E
+E
+E
+E
+E
+z
+C
+C
+C
+A
+C
+C
+A
+E
+"}
+(26,1,1) = {"
+a
+E
+E
+E
+E
+E
+E
+E
+E
+z
+e
+e
+z
+E
+E
+E
+E
+E
+z
+e
+e
+e
+e
+z
+z
+z
+E
+E
+E
+z
+z
+n
+n
+n
+n
+n
+v
+A
+E
+"}
+(27,1,1) = {"
+a
+a
+a
+a
+a
+E
+E
+z
+z
+z
+e
+e
+z
+z
+E
+E
+E
+E
+z
+z
+e
+e
+e
+e
+e
+z
+z
+z
+z
+k
+e
+n
+j
+j
+j
+n
+n
+A
+E
+"}
+(28,1,1) = {"
+a
+a
+a
+a
+a
+E
+z
+z
+T
+e
+e
+V
+W
+z
+E
+E
+E
+z
+z
+e
+e
+z
+z
+e
+e
+e
+z
+V
+e
+e
+e
+n
+n
+n
+n
+n
+n
+A
+E
+"}
+(29,1,1) = {"
+a
+a
+a
+a
+a
+E
+z
+N
+f
+S
+e
+W
+I
+z
+E
+E
+E
+z
+e
+e
+z
+z
+z
+z
+e
+V
+z
+V
+t
+e
+e
+n
+n
+F
+H
+n
+n
+A
+E
+"}
+(30,1,1) = {"
+a
+a
+a
+a
+a
+E
+z
+x
+o
+e
+I
+I
+z
+z
+E
+E
+E
+z
+e
+z
+z
+E
+E
+z
+z
+z
+z
+z
+k
+e
+e
+n
+n
+n
+n
+n
+n
+A
+E
+"}
+(31,1,1) = {"
+a
+a
+a
+a
+a
+E
+z
+z
+z
+e
+z
+z
+z
+E
+E
+E
+E
+z
+e
+z
+z
+E
+E
+E
+E
+E
+E
+E
+z
+e
+e
+n
+L
+n
+n
+n
+n
+A
+E
+"}
+(32,1,1) = {"
+a
+a
+a
+a
+a
+E
+E
+E
+z
+e
+z
+E
+E
+E
+E
+E
+E
+z
+e
+e
+z
+E
+a
+a
+a
+a
+E
+E
+z
+e
+e
+n
+n
+n
+n
+n
+r
+A
+E
+"}
+(33,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+E
+z
+e
+z
+E
+E
+a
+a
+a
+E
+l
+z
+V
+z
+E
+a
+a
+a
+a
+E
+z
+z
+z
+q
+C
+A
+A
+C
+A
+A
+A
+E
+"}
+(34,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+E
+z
+V
+z
+E
+E
+a
+a
+a
+E
+E
+z
+e
+z
+E
+a
+a
+a
+a
+E
+z
+E
+d
+q
+C
+C
+C
+A
+A
+A
+A
+E
+"}
+(35,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+E
+z
+e
+z
+E
+E
+a
+a
+a
+E
+E
+z
+e
+z
+E
+a
+a
+a
+a
+E
+E
+E
+d
+q
+A
+A
+A
+A
+A
+A
+A
+E
+"}
+(36,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+E
+z
+e
+z
+E
+E
+E
+E
+E
+E
+z
+z
+e
+z
+E
+a
+a
+a
+a
+a
+a
+E
+d
+q
+A
+C
+D
+A
+A
+A
+A
+E
+"}
+(37,1,1) = {"
+a
+a
+a
+a
+E
+E
+E
+E
+z
+e
+z
+E
+E
+E
+E
+E
+z
+z
+e
+e
+z
+E
+a
+a
+a
+a
+a
+a
+E
+d
+q
+A
+A
+A
+A
+A
+A
+A
+E
+"}
+(38,1,1) = {"
+a
+a
+a
+a
+E
+E
+E
+z
+z
+e
+z
+z
+z
+z
+z
+z
+z
+e
+e
+z
+z
+E
+a
+a
+a
+a
+a
+a
+E
+d
+q
+A
+A
+A
+A
+A
+A
+A
+E
+"}
+(39,1,1) = {"
+a
+a
+a
+a
+E
+E
+z
+z
+e
+e
+W
+z
+z
+e
+e
+P
+e
+e
+z
+z
+E
+E
+a
+a
+a
+a
+a
+a
+E
+Q
+q
+q
+q
+q
+q
+q
+q
+q
+E
+"}
+(40,1,1) = {"
+a
+a
+a
+a
+E
+E
+z
+I
+p
+e
+e
+e
+e
+e
+z
+z
+z
+z
+z
+E
+E
+a
+a
+a
+a
+a
+a
+a
+E
+E
+E
+E
+E
+E
+E
+E
+E
+E
+E
+"}
+(41,1,1) = {"
+a
+a
+a
+a
+E
+z
+z
+W
+e
+V
+e
+W
+z
+z
+z
+E
+E
+E
+E
+E
+E
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(42,1,1) = {"
+a
+a
+a
+a
+E
+z
+W
+K
+e
+I
+I
+z
+z
+E
+E
+E
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(43,1,1) = {"
+a
+a
+a
+a
+E
+c
+z
+z
+z
+z
+z
+z
+E
+E
+E
+E
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(44,1,1) = {"
+a
+a
+a
+a
+E
+E
+E
+E
+E
+E
+E
+E
+E
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm
index 41a26faffdc..7a1e91cd408 100644
--- a/code/__DEFINES/access.dm
+++ b/code/__DEFINES/access.dm
@@ -104,6 +104,8 @@
#define ACCESS_VAULT "vault"
/// Access for the Quartermaster's personal quarters in mapping, as well as some other QM-related things.
#define ACCESS_QM "qm"
+/// Access for the bitrunning den
+#define ACCESS_BIT_DEN "bit_den"
/// General access for Science, allows for entry to the general hallways of Science, as well as the main lathe room.
#define ACCESS_SCIENCE "science"
@@ -281,6 +283,7 @@
ACCESS_ATMOSPHERICS, \
ACCESS_AUX_BASE, \
ACCESS_BAR, \
+ ACCESS_BIT_DEN, \
ACCESS_BRIG, \
ACCESS_BRIG_ENTRANCE, \
ACCESS_CARGO, \
@@ -492,6 +495,7 @@
#define REGION_SUPPLY "Supply"
/// Used to seed the accesses_by_region list in SSid_access. A list of all cargo regional accesses that are overseen by the HoP.
#define REGION_ACCESS_SUPPLY list( \
+ ACCESS_BIT_DEN, \
ACCESS_CARGO, \
ACCESS_MECH_MINING, \
ACCESS_MINERAL_STOREROOM, \
@@ -550,6 +554,7 @@
/obj/item/modular_computer/pda/heads/rd = list(REGION_COMMAND), \
/obj/item/modular_computer/pda/heads/captain = list(REGION_COMMAND), \
/obj/item/modular_computer/pda/cargo = list(REGION_SUPPLY), \
+ /obj/item/modular_computer/pda/bitrunner = list(REGION_SUPPLY), \
/obj/item/modular_computer/pda/shaftminer = list(REGION_SUPPLY), \
/obj/item/modular_computer/pda/chaplain = list(REGION_GENERAL), \
/obj/item/modular_computer/pda/lawyer = list(REGION_GENERAL), \
diff --git a/code/__DEFINES/ai/ai_blackboard.dm b/code/__DEFINES/ai/ai_blackboard.dm
index e23a5a12dba..24ecf0a19f6 100644
--- a/code/__DEFINES/ai/ai_blackboard.dm
+++ b/code/__DEFINES/ai/ai_blackboard.dm
@@ -11,6 +11,9 @@
///How close a mob must be for us to select it as a target, if that is less than how far we can maintain it as a target
#define BB_AGGRO_RANGE "BB_aggro_range"
+///Turf we want a mob to move to
+#define BB_TRAVEL_DESTINATION "BB_travel_destination"
+
///song instrument blackboard, set by instrument subtrees
#define BB_SONG_INSTRUMENT "BB_SONG_INSTRUMENT"
///song lines blackboard, set by default on controllers
diff --git a/code/__DEFINES/alerts.dm b/code/__DEFINES/alerts.dm
index 43ec8199d0f..6f25e61e7c5 100644
--- a/code/__DEFINES/alerts.dm
+++ b/code/__DEFINES/alerts.dm
@@ -61,3 +61,12 @@
#define ALERT_TEMPERATURE "temp"
#define ALERT_TEMPERATURE_HOT "temphot"
#define ALERT_TEMPERATURE_COLD "tempcold"
+
+/** Bitrunning */
+#define ALERT_BITRUNNER_CROWBAR "bitrunning_crowbar"
+#define ALERT_BITRUNNER_COMPLETED "bitrunning_complete"
+#define ALERT_BITRUNNER_INTEGRITY "bitrunning_integrity"
+#define ALERT_BITRUNNER_SHUTDOWN "bitrunning_shutdown"
+#define ALERT_BITRUNNER_RESET "bitrunning_reset"
+#define ALERT_BITRUNNER_SPAWN_CYBERCOP "bitrunning_spawn_cybercop"
+#define ALERT_BITRUNNER_THREAT "bitrunning_threat"
diff --git a/code/__DEFINES/antagonists.dm b/code/__DEFINES/antagonists.dm
index 123c60abad2..8ac421f8b0a 100644
--- a/code/__DEFINES/antagonists.dm
+++ b/code/__DEFINES/antagonists.dm
@@ -317,6 +317,7 @@ GLOBAL_LIST_INIT(human_invader_antagonists, list(
#define ANTAG_GROUP_ASHWALKERS "Ash Walkers"
#define ANTAG_GROUP_BIOHAZARDS "Biohazards"
#define ANTAG_GROUP_CLOWNOPS "Clown Operatives"
+#define ANTAG_GROUP_CYBERAUTH "Cyber Authority"
#define ANTAG_GROUP_ERT "Emergency Response Team"
#define ANTAG_GROUP_HORRORS "Eldritch Horrors"
#define ANTAG_GROUP_LEVIATHANS "Spaceborne Leviathans"
diff --git a/code/__DEFINES/aquarium.dm b/code/__DEFINES/aquarium.dm
deleted file mode 100644
index 6e0a39f5040..00000000000
--- a/code/__DEFINES/aquarium.dm
+++ /dev/null
@@ -1,44 +0,0 @@
-#define AQUARIUM_ANIMATION_FISH_SWIM "fish"
-#define AQUARIUM_ANIMATION_FISH_DEAD "dead"
-
-#define AQUARIUM_PROPERTIES_PX_MIN "px_min"
-#define AQUARIUM_PROPERTIES_PX_MAX "px_max"
-#define AQUARIUM_PROPERTIES_PY_MIN "py_min"
-#define AQUARIUM_PROPERTIES_PY_MAX "py_max"
-
-#define AQUARIUM_LAYER_MODE_BOTTOM "bottom"
-#define AQUARIUM_LAYER_MODE_TOP "top"
-#define AQUARIUM_LAYER_MODE_AUTO "auto"
-
-#define FISH_ALIVE "alive"
-#define FISH_DEAD "dead"
-
-#define FISH_SIZE_TINY_MAX 30
-#define FISH_SIZE_SMALL_MAX 50
-#define FISH_SIZE_NORMAL_MAX 90
-#define FISH_SIZE_BULKY_MAX 130
-
-#define FISH_GRIND_RESULTS_WEIGHT_DIVISOR 500
-#define FISH_FILLET_NUMBER_SIZE_DIVISOR 30
-
-#define NEW_FISH_BREEDING_TIMEOUT_MULT 2
-#define NEW_FISH_LAST_FEEDING_MULT 0.5
-
-#define MIN_AQUARIUM_TEMP T0C
-#define MAX_AQUARIUM_TEMP (T0C + 100)
-#define DEFAULT_AQUARIUM_TEMP (T0C + 24)
-
-#define FISH_RARITY_BASIC 1000
-#define FISH_RARITY_RARE 400
-#define FISH_RARITY_VERY_RARE 200
-#define FISH_RARITY_GOOD_LUCK_FINDING_THIS 1
-#define FISH_RARITY_NOPE 0
-
-#define AQUARIUM_FLUID_FRESHWATER "Freshwater"
-#define AQUARIUM_FLUID_SALTWATER "Saltwater"
-#define AQUARIUM_FLUID_SULPHWATEVER "Sulfuric Water"
-#define AQUARIUM_FLUID_AIR "Air"
-#define AQUARIUM_FLUID_ANADROMOUS "Adaptive to both Freshwater and Saltwater"
-#define AQUARIUM_FLUID_ANY_WATER "Adaptive to all kind of water"
-
-#define AQUARIUM_COMPANY "Aquatech Ltd."
diff --git a/code/__DEFINES/atom_hud.dm b/code/__DEFINES/atom_hud.dm
index b2623ecd988..b1ca16dc23c 100644
--- a/code/__DEFINES/atom_hud.dm
+++ b/code/__DEFINES/atom_hud.dm
@@ -92,6 +92,7 @@
#define SECHUD_ASSISTANT "hudassistant"
#define SECHUD_ATMOSPHERIC_TECHNICIAN "hudatmospherictechnician"
#define SECHUD_BARTENDER "hudbartender"
+#define SECHUD_BITRUNNER "hudbitrunner"
#define SECHUD_BOTANIST "hudbotanist"
#define SECHUD_CAPTAIN "hudcaptain"
#define SECHUD_CARGO_TECHNICIAN "hudcargotechnician"
diff --git a/code/__DEFINES/bitrunning.dm b/code/__DEFINES/bitrunning.dm
new file mode 100644
index 00000000000..343801c477e
--- /dev/null
+++ b/code/__DEFINES/bitrunning.dm
@@ -0,0 +1,20 @@
+#define BITRUNNER_COST_NONE 0
+#define BITRUNNER_COST_LOW 1
+#define BITRUNNER_COST_MEDIUM 2
+#define BITRUNNER_COST_HIGH 3
+#define BITRUNNER_COST_EXTREME 20
+
+#define BITRUNNER_REWARD_MIN 1
+#define BITRUNNER_REWARD_LOW 3
+#define BITRUNNER_REWARD_MEDIUM 4
+#define BITRUNNER_REWARD_HIGH 5
+#define BITRUNNER_REWARD_EXTREME 6
+
+/// Blue in ui
+#define BITRUNNER_DIFFICULTY_NONE 0
+/// Yellow
+#define BITRUNNER_DIFFICULTY_LOW 1
+/// Orange
+#define BITRUNNER_DIFFICULTY_MEDIUM 2
+/// Red with skull
+#define BITRUNNER_DIFFICULTY_HIGH 3
diff --git a/code/__DEFINES/cargo.dm b/code/__DEFINES/cargo.dm
index 747e48559f7..56d3896f0dc 100644
--- a/code/__DEFINES/cargo.dm
+++ b/code/__DEFINES/cargo.dm
@@ -40,6 +40,12 @@
/// The baseline unit for cargo crates. Adjusting this will change the cost of all in-game shuttles, crate export values, bounty rewards, and all supply pack import values, as they use this as their unit of measurement.
#define CARGO_CRATE_VALUE 200
+/// The highest amount of orders you can have of one thing at any one time
+#define CARGO_MAX_ORDER 50
+
+/// Returned by /obj/docking_port/mobile/supply/proc/get_order_count to signify us going over the order limit
+#define OVER_ORDER_LIMIT "GO AWAY"
+
/// Universal Scanner mode for export scanning.
#define SCAN_EXPORTS 1
/// Universal Scanner mode for using the sales tagger.
diff --git a/code/__DEFINES/computers.dm b/code/__DEFINES/computers.dm
index 1349913c183..ba3294ae683 100644
--- a/code/__DEFINES/computers.dm
+++ b/code/__DEFINES/computers.dm
@@ -8,3 +8,6 @@
#define CATEGORY_CONSUMABLES "Consumables"
#define CATEGORY_TOYS_DRONE "Toys & Drones"
#define CATEGORY_PKA "PKAs"
+#define CATEGORY_BEPIS "Bepis Tech"
+#define CATEGORY_BITRUNNING_FLAIR "Misc"
+#define CATEGORY_BITRUNNING_TECH "Tech"
diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movement.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movement.dm
index d7063b0df5f..0c9523b9c20 100644
--- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movement.dm
+++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movement.dm
@@ -17,6 +17,9 @@
#define COMSIG_ATOM_AFTER_SHUTTLE_MOVE "movable_after_shuttle_move"
///called on a movable (NOT living) when it starts pulling (atom/movable/pulled, state, force)
#define COMSIG_ATOM_START_PULL "movable_start_pull"
+/// called on /atom when something attempts to pass through it (atom/movable/source, atom/movable/passing, dir)
+#define COMSIG_ATOM_TRIED_PASS "atom_tried_pass"
+ #define COMSIG_COMPONENT_PERMIT_PASSAGE (1 << 0)
///called on /living when someone starts pulling (atom/movable/pulled, state, force)
#define COMSIG_LIVING_START_PULL "living_start_pull"
///called on /living when someone is pulled (mob/living/puller)
diff --git a/code/__DEFINES/dcs/signals/signals_bitrunning.dm b/code/__DEFINES/dcs/signals/signals_bitrunning.dm
new file mode 100644
index 00000000000..3d008449ee7
--- /dev/null
+++ b/code/__DEFINES/dcs/signals/signals_bitrunning.dm
@@ -0,0 +1,31 @@
+/// from /obj/machinery/netpod/default_pry_open() : (mob/living/intruder)
+#define COMSIG_BITRUNNER_CROWBAR_ALERT "bitrunner_crowbar"
+
+/// from /obj/effect/bitrunning/loot_signal: (points)
+#define COMSIG_BITRUNNER_GOAL_POINT "bitrunner_goal_point"
+
+/// from /obj/machinery/quantum_server/on_goal_turf_entered(): (atom/entered, reward_points)
+#define COMSIG_BITRUNNER_DOMAIN_COMPLETE "bitrunner_complete"
+
+/// from /obj/machinery/netpod/on_take_damage()
+#define COMSIG_BITRUNNER_NETPOD_INTEGRITY "bitrunner_netpod_damage"
+
+/// from /obj/structure/hololadder and complete alert
+#define COMSIG_BITRUNNER_SAFE_DISCONNECT "bitrunner_disconnect"
+
+/// from /obj/machinery/netpod/open_machine(), /obj/machinery/quantum_server, etc (obj/machinery/netpod)
+#define COMSIG_BITRUNNER_SEVER_AVATAR "bitrunner_sever"
+
+/// from /obj/machinery/quantum_server/shutdown() : (mob/living)
+#define COMSIG_BITRUNNER_SHUTDOWN_ALERT "bitrunner_shutdown"
+
+// Notifies the bitrunners
+/// from /datum/antagonist/cyber_police/proc/notify() :
+#define COMSIG_BITRUNNER_THREAT_CREATED "bitrunner_threat"
+
+// Informs the server to up the threat count
+/// from event spawns: (mob/living)
+#define COMSIG_BITRUNNER_SPAWN_GLITCH "bitrunner_spawn_glitch"
+
+/// from /obj/machinery/quantum_server/refreshParts(): (servo rating)
+#define COMSIG_BITRUNNER_SERVER_UPGRADED "bitrunner_server_upgraded"
diff --git a/code/__DEFINES/dcs/signals/signals_blob.dm b/code/__DEFINES/dcs/signals/signals_blob.dm
new file mode 100644
index 00000000000..afd4737bdd9
--- /dev/null
+++ b/code/__DEFINES/dcs/signals/signals_blob.dm
@@ -0,0 +1,4 @@
+/// Signal sent when a blob overmind picked a new strain (/mob/camera/blob/overmind, /datum/blobstrain/new_strain)
+#define COMSIG_BLOB_SELECTED_STRAIN "blob_selected_strain"
+/// Signal sent by a blob spore when it creates a zombie (/mob/living/basic/blob_minion/spore/spore, //mob/living/basic/blob_minion/zombie/zombie)
+#define COMSIG_BLOB_ZOMBIFIED "blob_zombified"
diff --git a/code/__DEFINES/dcs/signals/signals_fish.dm b/code/__DEFINES/dcs/signals/signals_fish.dm
index 281c73adb52..90e580e9166 100644
--- a/code/__DEFINES/dcs/signals/signals_fish.dm
+++ b/code/__DEFINES/dcs/signals/signals_fish.dm
@@ -24,8 +24,10 @@
#define COMSIG_FISHING_ROD_CAST "fishing_rod_cast"
#define FISHING_ROD_CAST_HANDLED (1 << 0)
-/// Sent when fishing line is snapped
-#define COMSIG_FISHING_LINE_SNAPPED "fishing_line_interrupted"
+/// From /datum/fish_source/proc/dispense_reward(), not set if the reward is a dud: (reward, user)
+#define COMSIG_FISHING_ROD_CAUGHT_FISH "fishing_rod_caught_fish"
+/// From /obj/item/fishing_rod/proc/hook_item(): (reward, user)
+#define COMSIG_FISHING_ROD_HOOKED_ITEM "fishing_rod_hooked_item"
/// Sent when the challenge is to be interrupted: (reason)
#define COMSIG_FISHING_SOURCE_INTERRUPT_CHALLENGE "fishing_spot_interrupt_challenge"
diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm
index 677a65a7be1..c96d21b7163 100644
--- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm
+++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm
@@ -36,8 +36,10 @@
#define COMSIG_BODYPART_ATTACHED "bodypart_removed"
///from base of /obj/item/bodypart/proc/try_attach_limb(): (new_limb, special)
#define COMSIG_CARBON_POST_ATTACH_LIMB "carbon_post_attach_limb"
-#define COMSIG_BODYPART_GAUZED "bodypart_gauzed" // from /obj/item/bodypart/proc/apply_gauze(/obj/item/stack/gauze)
-#define COMSIG_BODYPART_GAUZE_DESTROYED "bodypart_degauzed" // from [/obj/item/bodypart/proc/seep_gauze] when it runs out of absorption
+/// from /obj/item/bodypart/proc/apply_gauze(/obj/item/stack/gauze): (/obj/item/stack/medical/gauze/applied_gauze, /obj/item/stack/medical/gauze/stack_used)
+#define COMSIG_BODYPART_GAUZED "bodypart_gauzed"
+/// from /obj/item/stack/medical/gauze/Destroy(): (/obj/item/stack/medical/gauze/removed_gauze)
+#define COMSIG_BODYPART_UNGAUZED "bodypart_ungauzed"
/// Called from bodypart changing owner, which could be on attach or detachment. Either argument can be null. (mob/living/carbon/new_owner, mob/living/carbon/old_owner)
#define COMSIG_BODYPART_CHANGED_OWNER "bodypart_changed_owner"
diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm
index d4c3c659c68..7dffe24331a 100644
--- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm
+++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm
@@ -7,6 +7,8 @@
#define COMSIG_MOB_LOGIN "mob_login"
///from base of /mob/Logout(): ()
#define COMSIG_MOB_LOGOUT "mob_logout"
+///from base of /mob/mind_initialize
+#define COMSIG_MOB_MIND_INITIALIZED "mob_mind_inited"
///from base of mob/set_stat(): (new_stat, old_stat)
#define COMSIG_MOB_STATCHANGE "mob_statchange"
///from base of mob/reagent_check(): (datum/reagent/chem, seconds_per_tick, times_fired)
diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_spawner.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_spawner.dm
index a5f66788b86..6ff8b1e8d61 100644
--- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_spawner.dm
+++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_spawner.dm
@@ -1,3 +1,6 @@
// signals for use by mob spawners
/// called when a spawner spawns a mob
#define COMSIG_SPAWNER_SPAWNED "spawner_spawned"
+
+/// called when a ghost clicks a spawner role: (mob/living)
+#define COMSIG_GHOSTROLE_SPAWNED "ghostrole_spawned"
diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm
index 7e12f3904b6..9d6841b56fd 100644
--- a/code/__DEFINES/economy.dm
+++ b/code/__DEFINES/economy.dm
@@ -73,3 +73,30 @@
#define PAYMENT_CLINICAL "clinical"
#define PAYMENT_FRIENDLY "friendly"
#define PAYMENT_ANGRY "angry"
+
+#define MARKET_TREND_UPWARD 1
+#define MARKET_TREND_DOWNWARD -1
+#define MARKET_TREND_STABLE 0
+
+#define MARKET_EVENT_PROBABILITY 1 //Probability of a market event firing, in percent. Fires once per material, every 20 seconds.
+
+#define MARKET_PROFIT_MODIFIER 0.8 //We don't make every sale a 1-1 of the actual buy price value, like with real life taxes and to encourage more smart trades
+
+/// Create quantity subtypes for stock market datums.
+#define MARKET_QUANTITY_HELPERS(path) ##path/one {\
+ amount = 1; \
+} \
+##path/five {\
+ amount = 5; \
+} \
+##path/ten {\
+ amount = 10; \
+} \
+##path/twenty_five {\
+ amount = 25; \
+} \
+##path/fifty {\
+ amount = 50; \
+}
+
+
diff --git a/code/__DEFINES/experisci.dm b/code/__DEFINES/experisci.dm
index 9130e0ae565..c74290ff5f7 100644
--- a/code/__DEFINES/experisci.dm
+++ b/code/__DEFINES/experisci.dm
@@ -26,6 +26,8 @@
/// Destructive experiments which will destroy the sample
#define EXPERIMENT_TRAIT_DESTRUCTIVE (1 << 0)
+/// Used by scanning experiments: instead of storing refs or be a number, the list for scanned atoms is used as typecache
+#define EXPERIMENT_TRAIT_TYPECACHE (1 << 1)
/// Will always attempt to action every experiment eligible with a single input,
/// no experiment selection required
@@ -33,3 +35,7 @@
/// Experiment handlers with this flag will not automatically connect to the first techweb they find
/// on initialization
#define EXPERIMENT_CONFIG_NO_AUTOCONNECT (1 << 1)
+/// Experiment handlers with this flag won't pester the user of objects not pertinent to the test or if no experiment is selected
+#define EXPERIMENT_CONFIG_SILENT_FAIL (1 << 2)
+/// Experiment handlers with this flag will bypass any delay when trying to scan something
+#define EXPERIMENT_CONFIG_IMMEDIATE_ACTION (1 << 3)
diff --git a/code/__DEFINES/fish.dm b/code/__DEFINES/fish.dm
new file mode 100644
index 00000000000..89b7963d91d
--- /dev/null
+++ b/code/__DEFINES/fish.dm
@@ -0,0 +1,136 @@
+/// Use in fish tables to denote miss chance.
+#define FISHING_DUD "dud"
+
+// Baseline fishing difficulty levels
+#define FISHING_DEFAULT_DIFFICULTY 15
+
+/// Difficulty modifier when bait is fish's favorite
+#define FAV_BAIT_DIFFICULTY_MOD -5
+/// Difficulty modifier when bait is fish's disliked
+#define DISLIKED_BAIT_DIFFICULTY_MOD 15
+/// Difficulty modifier when our fisherman has the trait TRAIT_SETTLER
+#define SETTLER_DIFFICULTY_MOD -5
+
+#define FISH_TRAIT_MINOR_DIFFICULTY_BOOST 5
+
+// These define how the fish will behave in the minigame
+#define FISH_AI_DUMB "dumb"
+#define FISH_AI_ZIPPY "zippy"
+#define FISH_AI_SLOW "slow"
+
+#define ADDITIVE_FISHING_MOD "additive"
+#define MULTIPLICATIVE_FISHING_MOD "multiplicative"
+
+// These defines are intended for use to interact with fishing hooks when going
+// through the fishing rod, and not the hook itself. They could probably be
+// handled differently, but for now that's how they work. It's grounds for
+// a future refactor, however.
+/// Fishing hook trait that signifies that it's shiny. Useful for fishes
+/// that care about shiner hooks more.
+#define FISHING_HOOK_SHINY (1 << 0)
+/// Fishing hook trait that lessens the bounce from hitting the edges of the minigame bar.
+#define FISHING_HOOK_WEIGHTED (1 << 1)
+///See FISHING_MINIGAME_RULE_BIDIRECTIONAL
+#define FISHING_HOOK_BIDIRECTIONAL (1 << 2)
+///Prevents the user from losing the game by letting the fish get away.
+#define FISHING_HOOK_NO_ESCAPE (1 << 3)
+///Limits the completion loss of the minigame when the fsh is not on the bait area.
+#define FISHING_HOOK_ENSNARE (1 << 4)
+///Automatically kills the fish after a while, at the cost of killing it.
+#define FISHING_HOOK_KILL (1 << 5)
+
+///Reduces the difficulty of the minigame
+#define FISHING_LINE_CLOAKED (1 << 0)
+///Required to cast a line on lava.
+#define FISHING_LINE_REINFORCED (1 << 1)
+/// Much like FISHING_HOOK_ENSNARE but for the fishing line.
+#define FISHING_LINE_BOUNCY (1 << 2)
+
+///Keeps the bait from falling from gravity, instead allowing the player to move the bait down with right click.
+#define FISHING_MINIGAME_RULE_BIDIRECTIONAL (1 << 2)
+///Prevents the player from losing the minigame when the completion reaches 0
+#define FISHING_MINIGAME_RULE_NO_ESCAPE (1 << 3)
+///Automatically kills the fish after a while, at the cost of killing it
+#define FISHING_MINIGAME_RULE_KILL (1 << 4)
+///Prevents the fishing skill from having an effect on the minigame and experience from being awarded
+#define FISHING_MINIGAME_RULE_NO_EXP (1 << 5)
+///If enabled, the minigame will occasionally screw around and invert the velocity of the bait
+#define FISHING_MINIGAME_RULE_ANTIGRAV (1 << 6)
+///Will filp the minigame hud for the duration of the effect
+#define FISHING_MINIGAME_RULE_FLIP (1 << 7)
+
+///all the effects that are active and will last for a few seconds before triggering a cooldown
+#define FISHING_MINIGAME_ACTIVE_EFFECTS (FISHING_MINIGAME_RULE_ANTIGRAV|FISHING_MINIGAME_RULE_FLIP)
+
+/// The default additive value for fishing hook catch weight modifiers.
+#define FISHING_DEFAULT_HOOK_BONUS_ADDITIVE 0
+/// The default multiplicative value for fishing hook catch weight modifiers.
+#define FISHING_DEFAULT_HOOK_BONUS_MULTIPLICATIVE 1
+
+//Fish icon defines, used by fishing minigame
+#define FISH_ICON_DEF "fish"
+#define FISH_ICON_HOSTILE "hostile"
+#define FISH_ICON_STAR "star"
+#define FISH_ICON_CHUNKY "chunky"
+#define FISH_ICON_SLIME "slime"
+#define FISH_ICON_COIN "coin"
+#define FISH_ICON_GEM "gem"
+#define FISH_ICON_CRAB "crab"
+#define FISH_ICON_JELLYFISH "jellyfish"
+#define FISH_ICON_BONE "bone"
+
+#define AQUARIUM_ANIMATION_FISH_SWIM "fish"
+#define AQUARIUM_ANIMATION_FISH_DEAD "dead"
+
+#define AQUARIUM_PROPERTIES_PX_MIN "px_min"
+#define AQUARIUM_PROPERTIES_PX_MAX "px_max"
+#define AQUARIUM_PROPERTIES_PY_MIN "py_min"
+#define AQUARIUM_PROPERTIES_PY_MAX "py_max"
+
+#define AQUARIUM_LAYER_MODE_BOTTOM "bottom"
+#define AQUARIUM_LAYER_MODE_TOP "top"
+#define AQUARIUM_LAYER_MODE_AUTO "auto"
+
+#define FISH_ALIVE "alive"
+#define FISH_DEAD "dead"
+
+///Fish size thresholds for w_class.
+#define FISH_SIZE_TINY_MAX 30
+#define FISH_SIZE_SMALL_MAX 50
+#define FISH_SIZE_NORMAL_MAX 90
+#define FISH_SIZE_BULKY_MAX 130
+
+///The coefficient for maximum weight/size divergence relative to the averages.
+#define MAX_FISH_DEVIATION_COEFF 2.5
+
+///The volume of the grind results is multiplied by the fish' weight and divided by this.
+#define FISH_GRIND_RESULTS_WEIGHT_DIVISOR 500
+///The number of fillets is multiplied by the fish' size and divided by this.
+#define FISH_FILLET_NUMBER_SIZE_DIVISOR 30
+
+///The breeding timeout for newly instantiated fish is multiplied by this.
+#define NEW_FISH_BREEDING_TIMEOUT_MULT 2
+///The last feeding timestamp of newly instantiated fish is multiplied by this: ergo, they spawn 50% hungry.
+#define NEW_FISH_LAST_FEEDING_MULT 0.5
+
+#define MIN_AQUARIUM_TEMP T0C
+#define MAX_AQUARIUM_TEMP (T0C + 100)
+#define DEFAULT_AQUARIUM_TEMP (T0C + 24)
+
+///How likely one's to find a given fish from random fish cases.
+#define FISH_RARITY_BASIC 1000
+#define FISH_RARITY_RARE 400
+#define FISH_RARITY_VERY_RARE 200
+#define FISH_RARITY_GOOD_LUCK_FINDING_THIS 5
+#define FISH_RARITY_NOPE 0
+
+///Aquarium fluid variables. The fish' required fluid has to match this, or it'll slowly die.
+#define AQUARIUM_FLUID_FRESHWATER "Freshwater"
+#define AQUARIUM_FLUID_SALTWATER "Saltwater"
+#define AQUARIUM_FLUID_SULPHWATEVER "Sulfuric Water"
+#define AQUARIUM_FLUID_AIR "Air"
+#define AQUARIUM_FLUID_ANADROMOUS "Adaptive to both Freshwater and Saltwater"
+#define AQUARIUM_FLUID_ANY_WATER "Adaptive to all kind of water"
+
+///Fluff. The name of the aquarium company shown in the fish catalog
+#define AQUARIUM_COMPANY "Aquatech Ltd."
diff --git a/code/__DEFINES/fishing.dm b/code/__DEFINES/fishing.dm
deleted file mode 100644
index dc73623f27c..00000000000
--- a/code/__DEFINES/fishing.dm
+++ /dev/null
@@ -1,62 +0,0 @@
-/// Use in fish tables to denote miss chance.
-#define FISHING_DUD "dud"
-
-// Baseline fishing difficulty levels
-#define FISHING_DEFAULT_DIFFICULTY 15
-
-/// Difficulty modifier when bait is fish's favorite
-#define FAV_BAIT_DIFFICULTY_MOD -5
-/// Difficulty modifier when bait is fish's disliked
-#define DISLIKED_BAIT_DIFFICULTY_MOD 15
-/// Difficulty modifier when our fisherman has the trait TRAIT_SETTLER
-#define SETTLER_DIFFICULTY_MOD -5
-
-
-#define FISH_TRAIT_MINOR_DIFFICULTY_BOOST 5
-
-// These define how the fish will behave in the minigame
-#define FISH_AI_DUMB "dumb"
-#define FISH_AI_ZIPPY "zippy"
-#define FISH_AI_SLOW "slow"
-
-#define ADDITIVE_FISHING_MOD "additive"
-#define MULTIPLICATIVE_FISHING_MOD "multiplicative"
-
-// These defines are intended for use to interact with fishing hooks when going
-// through the fishing rod, and not the hook itself. They could probably be
-// handled differently, but for now that's how they work. It's grounds for
-// a future refactor, however.
-/// Fishing hook trait that signifies that it's shiny. Useful for fishes
-/// that care about shiner hooks more.
-#define FISHING_HOOK_SHINY (1 << 0)
-/// Fishing hook trait that's used to make the bait more weighted, for the
-/// fishing minigame itself.
-#define FISHING_HOOK_WEIGHTED (1 << 1)
-/**
- * During the fishing minigame, it stops the bait from being pulled down by gravity,
- * while also allowing the player to move it down with right-click.
- */
-#define FISHING_HOOK_BIDIRECTIONAL (1 << 2)
-///Prevents the user from losing the game by letting the fish get away.
-#define FISHING_HOOK_NO_ESCAPE (1 << 3)
-///Limits the completion loss of the minigame when the fsh is not on the bait area.
-#define FISHING_HOOK_ENSNARE (1 << 4)
-///Slowly damages the fish, until it dies, then it's victory.
-#define FISHING_HOOK_KILL (1 << 5)
-
-///Reduces the difficulty of the minigame
-#define FISHING_LINE_CLOAKED (1 << 0)
-///Required to cast a line on lava.
-#define FISHING_LINE_REINFORCED (1 << 1)
-/// Much like FISHING_HOOK_ENSNARE but for the reel.
-#define FISHING_LINE_BOUNCY (1 << 2)
-
-#define FISHING_MINIGAME_RULE_BIDIRECTIONAL (1 << 2)
-#define FISHING_MINIGAME_RULE_NO_ESCAPE (1 << 3)
-#define FISHING_MINIGAME_RULE_KILL (1 << 4)
-#define FISHING_MINIGAME_RULE_NO_EXP (1 << 5)
-
-/// The default additive value for fishing hook catch weight modifiers.
-#define FISHING_DEFAULT_HOOK_BONUS_ADDITIVE 0
-/// The default multiplicative value for fishing hook catch weight modifiers.
-#define FISHING_DEFAULT_HOOK_BONUS_MULTIPLICATIVE 1
diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm
index bc3c2011ae2..830daef563d 100644
--- a/code/__DEFINES/icon_smoothing.dm
+++ b/code/__DEFINES/icon_smoothing.dm
@@ -27,6 +27,27 @@ DEFINE_BITFIELD(smoothing_flags, list(
"SMOOTH_BORDER_OBJECT" = SMOOTH_BORDER_OBJECT,
))
+/// Components of a smoothing junction
+/// Redefinitions of the diagonal directions so they can be stored in one var without conflicts
+#define NORTH_JUNCTION NORTH //(1<<0)
+#define SOUTH_JUNCTION SOUTH //(1<<1)
+#define EAST_JUNCTION EAST //(1<<2)
+#define WEST_JUNCTION WEST //(1<<3)
+#define NORTHEAST_JUNCTION (1<<4)
+#define SOUTHEAST_JUNCTION (1<<5)
+#define SOUTHWEST_JUNCTION (1<<6)
+#define NORTHWEST_JUNCTION (1<<7)
+
+DEFINE_BITFIELD(smoothing_junction, list(
+ "NORTH_JUNCTION" = NORTH_JUNCTION,
+ "SOUTH_JUNCTION" = SOUTH_JUNCTION,
+ "EAST_JUNCTION" = EAST_JUNCTION,
+ "WEST_JUNCTION" = WEST_JUNCTION,
+ "NORTHEAST_JUNCTION" = NORTHEAST_JUNCTION,
+ "SOUTHEAST_JUNCTION" = SOUTHEAST_JUNCTION,
+ "SOUTHWEST_JUNCTION" = SOUTHWEST_JUNCTION,
+ "NORTHWEST_JUNCTION" = NORTHWEST_JUNCTION,
+))
/*smoothing macros*/
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index a52d2d809e6..e909c23bb90 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -278,8 +278,6 @@ GLOBAL_LIST_INIT(glass_sheet_types, typecacheof(list(
#define isholoeffect(O) (istype(O, /obj/effect/holodeck_effect))
-#define isblobmonster(O) (istype(O, /mob/living/simple_animal/hostile/blob))
-
#define isshuttleturf(T) (!isnull(T.depth_to_find_baseturf(/turf/baseturf_skipover/shuttle)))
#define isProbablyWallMounted(O) (O.pixel_x > 20 || O.pixel_x < -20 || O.pixel_y > 20 || O.pixel_y < -20)
diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm
index 44e67226604..7feca0782dc 100644
--- a/code/__DEFINES/jobs.dm
+++ b/code/__DEFINES/jobs.dm
@@ -81,6 +81,7 @@
#define JOB_QUARTERMASTER "Quartermaster"
#define JOB_CARGO_TECHNICIAN "Cargo Technician"
#define JOB_SHAFT_MINER "Shaft Miner"
+#define JOB_BITRUNNER "Bitrunner"
#define JOB_CUSTOMS_AGENT "Customs Agent" // SKYRAT EDIT ADDITION
//Service
#define JOB_BARTENDER "Bartender"
@@ -162,23 +163,23 @@
#define JOB_DISPLAY_ORDER_QUARTERMASTER 19
#define JOB_DISPLAY_ORDER_CARGO_TECHNICIAN 20
#define JOB_DISPLAY_ORDER_SHAFT_MINER 21
-#define JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER 22
-#define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 23
-#define JOB_DISPLAY_ORDER_PARAMEDIC 24
-#define JOB_DISPLAY_ORDER_CHEMIST 25
-#define JOB_DISPLAY_ORDER_VIROLOGIST 26
-#define JOB_DISPLAY_ORDER_CORONER 27
-#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 28
-#define JOB_DISPLAY_ORDER_SCIENTIST 29
-#define JOB_DISPLAY_ORDER_ROBOTICIST 30
-#define JOB_DISPLAY_ORDER_GENETICIST 31
-#define JOB_DISPLAY_ORDER_EXP_CORPS 32 //SKYRAT EDIT ADDITON
+#define JOB_DISPLAY_ORDER_BITRUNNER 22
+#define JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER 23
+#define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 24
+#define JOB_DISPLAY_ORDER_PARAMEDIC 25
+#define JOB_DISPLAY_ORDER_CHEMIST 26
+#define JOB_DISPLAY_ORDER_VIROLOGIST 27
+#define JOB_DISPLAY_ORDER_CORONER 28
+#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 29
+#define JOB_DISPLAY_ORDER_SCIENTIST 30
+#define JOB_DISPLAY_ORDER_ROBOTICIST 31
+#define JOB_DISPLAY_ORDER_GENETICIST 32
#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 33
#define JOB_DISPLAY_ORDER_WARDEN 34
#define JOB_DISPLAY_ORDER_DETECTIVE 35
#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 36
-#define JOB_DISPLAY_ORDER_SECURITY_MEDIC 37 //SKYRAT EDIT ADDITON
-#define JOB_DISPLAY_ORDER_PRISONER 38
+#define JOB_DISPLAY_ORDER_PRISONER 37
+#define JOB_DISPLAY_ORDER_SECURITY_MEDIC 38 //SKYRAT EDIT ADDITON
#define JOB_DISPLAY_ORDER_CORRECTIONS_OFFICER 39 //SKYRAT EDIT ADDITON
#define JOB_DISPLAY_ORDER_NANOTRASEN_CONSULTANT 40 //SKYRAT EDIT ADDITON
#define JOB_DISPLAY_ORDER_BLUESHIELD 41 //SKYRAT EDIT ADDITON
@@ -187,6 +188,7 @@
#define JOB_DISPLAY_ORDER_BOUNCER 44 //SKYRAT EDIT ADDITION
#define JOB_DISPLAY_ORDER_ENGINEER_GUARD 45 //SKYRAT EDIT ADDITION
#define JOB_DISPLAY_ORDER_CUSTOMS_AGENT 46 //SKYRAT EDIT ADDITION
+#define JOB_DISPLAY_ORDER_EXP_CORPS 47 //SKYRAT EDIT ADDITON
#define DEPARTMENT_UNASSIGNED "No Department"
diff --git a/code/__DEFINES/materials.dm b/code/__DEFINES/materials.dm
index 08b88324826..5fc5cc08ea2 100644
--- a/code/__DEFINES/materials.dm
+++ b/code/__DEFINES/materials.dm
@@ -75,3 +75,13 @@
#define MATERIAL_SLOWDOWN_PLASTEEL (0.05)
/// The slowdown value of one [SHEET_MATERIAL_AMOUNT] of alien alloy.
#define MATERIAL_SLOWDOWN_ALIEN_ALLOY (0.1)
+
+//Stock market stock values.
+/// How much quantity of a material stock exists for common materials like iron & glass.
+#define MATERIAL_QUANTITY_COMMON 25000
+/// How much quantity of a material stock exists for uncommon materials like silver & titanium.
+#define MATERIAL_QUANTITY_UNCOMMON 10000
+/// How much quantity of a material stock exists for rare materials like gold, uranium, & diamond.
+#define MATERIAL_QUANTITY_RARE 2500
+/// How much quantity of a material stock exists for exotic materials like diamond & bluespace crystals.
+#define MATERIAL_QUANTITY_EXOTIC 500
diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm
index 32a5e3b8fda..cd76af78f6c 100644
--- a/code/__DEFINES/role_preferences.dm
+++ b/code/__DEFINES/role_preferences.dm
@@ -27,6 +27,7 @@
#define ROLE_BLOB "Blob"
#define ROLE_BLOB_INFECTION "Blob Infection"
#define ROLE_CHANGELING_MIDROUND "Changeling (Midround)"
+#define ROLE_CYBER_POLICE "Cyber Police"
#define ROLE_FUGITIVE "Fugitive"
#define ROLE_LONE_OPERATIVE "Lone Operative"
#define ROLE_MALF_MIDROUND "Malf AI (Midround)"
@@ -52,69 +53,69 @@
// Latejoin roles
#define ROLE_HERETIC_SMUGGLER "Heretic Smuggler"
#define ROLE_PROVOCATEUR "Provocateur"
-#define ROLE_SYNDICATE_INFILTRATOR "Syndicate Infiltrator"
#define ROLE_STOWAWAY_CHANGELING "Stowaway Changeling"
+#define ROLE_SYNDICATE_INFILTRATOR "Syndicate Infiltrator"
// Other roles
-#define ROLE_SYNDICATE "Syndicate"
-#define ROLE_REV "Revolutionary"
-#define ROLE_PAI "pAI"
-#define ROLE_MONKEY_HELMET "Monkey Mind Magnification Helmet"
-#define ROLE_REVENANT "Revenant"
-#define ROLE_BRAINWASHED "Brainwashed Victim"
-#define ROLE_HYPNOTIZED "Hypnotized Victim"
-#define ROLE_OVERTHROW "Syndicate Mutineer" //Role removed, left here for safety.
-#define ROLE_HIVE "Hivemind Host" //Role removed, left here for safety.
-#define ROLE_SENTIENCE "Sentience Potion Spawn"
-#define ROLE_PYROCLASTIC_SLIME "Pyroclastic Anomaly Slime"
#define ROLE_ANOMALY_GHOST "Ectoplasmic Anomaly Ghost"
-#define ROLE_MIND_TRANSFER "Mind Transfer Potion"
-#define ROLE_LAZARUS_GOOD "Friendly Revived Mob"
-#define ROLE_LAZARUS_BAD "Slaved Revived Mob"
-#define ROLE_POSIBRAIN "Posibrain"
+#define ROLE_BRAINWASHED "Brainwashed Victim"
+#define ROLE_DEATHSQUAD "Deathsquad"
#define ROLE_DRONE "Drone"
#define ROLE_EMAGGED_BOT "Malfunctioning Bot"
-#define ROLE_DEATHSQUAD "Deathsquad"
+#define ROLE_HIVE "Hivemind Host" //Role removed, left here for safety.
+#define ROLE_HYPNOTIZED "Hypnotized Victim"
#define ROLE_LAVALAND "Lavaland"
+#define ROLE_LAZARUS_BAD "Slaved Revived Mob"
+#define ROLE_LAZARUS_GOOD "Friendly Revived Mob"
+#define ROLE_MIND_TRANSFER "Mind Transfer Potion"
+#define ROLE_MONKEY_HELMET "Monkey Mind Magnification Helmet"
+#define ROLE_OVERTHROW "Syndicate Mutineer" //Role removed, left here for safety.
+#define ROLE_PAI "pAI"
+#define ROLE_POSIBRAIN "Posibrain"
+#define ROLE_PYROCLASTIC_SLIME "Pyroclastic Anomaly Slime"
+#define ROLE_REV "Revolutionary"
+#define ROLE_REVENANT "Revenant"
+#define ROLE_SENTIENCE "Sentience Potion Spawn"
+#define ROLE_SYNDICATE "Syndicate"
-#define ROLE_POSITRONIC_BRAIN "Positronic Brain"
-#define ROLE_FREE_GOLEM "Free Golem"
-#define ROLE_SERVANT_GOLEM "Servant Golem"
-#define ROLE_NUCLEAR_OPERATIVE "Nuclear Operative"
#define ROLE_CLOWN_OPERATIVE "Clown Operative"
-#define ROLE_WIZARD_APPRENTICE "apprentice"
-#define ROLE_SLAUGHTER_DEMON "Slaughter Demon"
+#define ROLE_FREE_GOLEM "Free Golem"
#define ROLE_MORPH "Morph"
+#define ROLE_NUCLEAR_OPERATIVE "Nuclear Operative"
+#define ROLE_POSITRONIC_BRAIN "Positronic Brain"
#define ROLE_SANTA "Santa"
+#define ROLE_SERVANT_GOLEM "Servant Golem"
+#define ROLE_SLAUGHTER_DEMON "Slaughter Demon"
+#define ROLE_WIZARD_APPRENTICE "apprentice"
//Spawner roles
-#define ROLE_GHOST_ROLE "Ghost Role"
+#define ROLE_ANCIENT_CREW "Ancient Crew"
+#define ROLE_ASHWALKER "Ash Walker"
+#define ROLE_BATTLECRUISER_CAPTAIN "Battlecruiser Captain"
+#define ROLE_BATTLECRUISER_CREW "Battlecruiser Crew"
+#define ROLE_BEACH_BUM "Beach Bum"
+#define ROLE_BOT "Bot"
+#define ROLE_DERELICT_DRONE "Derelict Drone"
+#define ROLE_ESCAPED_PRISONER "Escaped Prisoner"
#define ROLE_EXILE "Exile"
#define ROLE_FUGITIVE_HUNTER "Fugitive Hunter"
-#define ROLE_ESCAPED_PRISONER "Escaped Prisoner"
-#define ROLE_LIFEBRINGER "Lifebringer"
-#define ROLE_ASHWALKER "Ash Walker"
-#define ROLE_LAVALAND_SYNDICATE "Lavaland Syndicate"
+#define ROLE_GHOST_ROLE "Ghost Role"
#define ROLE_HERMIT "Hermit"
-#define ROLE_BEACH_BUM "Beach Bum"
#define ROLE_HOTEL_STAFF "Hotel Staff"
+#define ROLE_LAVALAND_SYNDICATE "Lavaland Syndicate"
+#define ROLE_LIFEBRINGER "Lifebringer"
+#define ROLE_MAINTENANCE_DRONE "Maintenance Drone"
+#define ROLE_SKELETON "Skeleton"
+#define ROLE_SPACE_BAR_PATRON "Space Bar Patron"
+#define ROLE_SPACE_BARTENDER "Space Bartender"
+#define ROLE_SPACE_DOCTOR "Space Doctor"
+#define ROLE_SPACE_PIRATE "Space Pirate"
#define ROLE_SPACE_SYNDICATE "Space Syndicate"
#define ROLE_SYNDICATE_CYBERSUN "Cybersun Space Syndicate" //Ghost role syndi from Forgottenship ruin
#define ROLE_SYNDICATE_CYBERSUN_CAPTAIN "Cybersun Space Syndicate Captain" //Forgottenship captain syndie
-#define ROLE_SPACE_PIRATE "Space Pirate"
-#define ROLE_ANCIENT_CREW "Ancient Crew"
-#define ROLE_SPACE_DOCTOR "Space Doctor"
-#define ROLE_SPACE_BARTENDER "Space Bartender"
-#define ROLE_SPACE_BAR_PATRON "Space Bar Patron"
-#define ROLE_SKELETON "Skeleton"
-#define ROLE_ZOMBIE "Zombie"
-#define ROLE_MAINTENANCE_DRONE "Maintenance Drone"
-#define ROLE_DERELICT_DRONE "Derelict Drone"
#define ROLE_SYNDICATE_DRONE "Syndicate Drone"
-#define ROLE_BATTLECRUISER_CREW "Battlecruiser Crew"
-#define ROLE_BATTLECRUISER_CAPTAIN "Battlecruiser Captain"
#define ROLE_VENUSHUMANTRAP "Venus Human Trap"
-#define ROLE_BOT "Bot"
+#define ROLE_ZOMBIE "Zombie"
//SKYRAT EDIT START
#define ROLE_BLACK_MARKET_DEALER "Black Market Dealer"
#define ROLE_DS2 "DS2 Syndicate"
@@ -123,7 +124,6 @@
#define ROLE_PORT_TARKON "Port Tarkon Survivor"
//SKYRAT EDIT END
-
/// This defines the antagonists you can operate with in the settings.
/// Keys are the antagonist, values are the number of days since the player's
/// first connection in order to play.
@@ -149,6 +149,7 @@ GLOBAL_LIST_INIT(special_roles, list(
ROLE_BLOB = 0,
ROLE_BLOB_INFECTION = 0,
ROLE_CHANGELING_MIDROUND = 0,
+ ROLE_CYBER_POLICE = 0,
ROLE_FUGITIVE = 0,
ROLE_LONE_OPERATIVE = 14,
ROLE_MALF_MIDROUND = 0,
diff --git a/code/__DEFINES/span.dm b/code/__DEFINES/span.dm
index 22cf26e19a5..7b23869988b 100644
--- a/code/__DEFINES/span.dm
+++ b/code/__DEFINES/span.dm
@@ -17,6 +17,7 @@
#define span_bigicon(str) ("" + str + "")
#define span_binarysay(str) ("" + str + "")
#define span_blob(str) ("" + str + "")
+#define span_blobannounce(str) ("" + str + "")
#define span_blue(str) ("" + str + "")
#define span_blueteamradio(str) ("" + str + "")
#define span_bold(str) ("" + str + "")
diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm
index ea182b4088f..03a3bf49ebb 100644
--- a/code/__DEFINES/status_effects.dm
+++ b/code/__DEFINES/status_effects.dm
@@ -39,6 +39,8 @@
#define STASIS_ADMIN "stasis_admin"
#define STASIS_LEGION_EATEN "stasis_eaten"
+#define STASIS_NETPOD_EFFECT "stasis_netpod"
+
/// Causes the mob to become blind via the passed source
#define become_blind(source) apply_status_effect(/datum/status_effect/grouped/blindness, source)
/// Cures the mob's blindness from the passed source, removing blindness wholesale if no sources are left
@@ -154,3 +156,8 @@
#define adjust_temp_blindness_up_to(duration, up_to) adjust_timed_status_effect(duration, /datum/status_effect/temporary_blindness, up_to)
#define set_temp_blindness(duration) set_timed_status_effect(duration, /datum/status_effect/temporary_blindness)
#define set_temp_blindness_if_lower(duration) set_timed_status_effect(duration, /datum/status_effect/temporary_blindness, TRUE)
+
+#define adjust_static_vision(duration) adjust_timed_status_effect(duration, /datum/status_effect/static_vision)
+#define adjust_static_vision_up_to(duration, up_to) adjust_timed_status_effect(duration, /datum/status_effect/static_vision, up_to)
+#define set_static_vision(duration) set_timed_status_effect(duration, /datum/status_effect/static_vision)
+#define set_static_vision_if_lower(duration) set_timed_status_effect(duration, /datum/status_effect/static_vision, TRUE)
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index a416a081cb8..2d05f29a012 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -318,6 +318,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_BLOOD_DEFICIENCY "blood_deficiency"
#define TRAIT_JOLLY "jolly"
#define TRAIT_NOCRITDAMAGE "no_crit"
+///Added to mob or mind, changes the icons of the fish shown in the minigame UI depending on the possible reward.
+#define TRAIT_REVEAL_FISH "reveal_fish"
/// Stops the mob from slipping on water, or banana peels, or pretty much anything that doesn't have [GALOSHES_DONT_HELP] set
#define TRAIT_NO_SLIP_WATER "noslip_water"
@@ -889,9 +891,15 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
/// For clarity, this trait should always be associated/tied to a reference to the mob that suicided- not anything else.
#define TRAIT_SUICIDED "committed_suicide"
+/// Trait given to a living mob to prevent wizards from making it immortal
+#define TRAIT_PERMANENTLY_MORTAL "permanently_mortal"
+
///Trait given to a mob with a ckey currently in a temporary body, allowing people to know someone will re-enter the round later.
#define TRAIT_MIND_TEMPORARILY_GONE "temporarily_gone"
+/// Similar trait given to temporary bodies inhabited by players
+#define TRAIT_TEMPORARY_BODY "temporary_body"
+
/// Trait given to mechs that can have orebox functionality on movement
#define TRAIT_OREBOX_FUNCTIONAL "orebox_functional"
@@ -905,6 +913,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_FISH_AMPHIBIOUS "fish_amphibious"
///Trait needed for the lubefish evolution
#define TRAIT_FISH_FED_LUBE "fish_fed_lube"
+#define TRAIT_FISH_NO_HUNGER "fish_no_hunger"
// common trait sources
#define TRAIT_GENERIC "generic"
@@ -986,6 +995,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define MOTOR_LACK_TRAIT "motor-lack"
/// Trait associated with mafia
#define MAFIA_TRAIT "mafia"
+/// Trait associated with ctf
+#define CTF_TRAIT "ctf"
/// Trait associated with highlander
#define HIGHLANDER_TRAIT "highlander"
/// Trait given from playing pretend with baguettes
@@ -1078,6 +1089,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
/// sticky nodrop sounds like a bad soundcloud rapper's name
#define STICKY_NODROP "sticky-nodrop"
#define SKILLCHIP_TRAIT "skillchip"
+#define SKILL_TRAIT "skill"
#define BUSY_FLOORBOT_TRAIT "busy-floorbot"
#define PULLED_WHILE_SOFTCRIT_TRAIT "pulled-while-softcrit"
#define LOCKED_BORG_TRAIT "locked-borg"
@@ -1141,6 +1153,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define AUTOPSY_TRAIT "autopsy_trait"
/// Trait given by [/datum/status_effect/blessing_of_insanity]
#define MAD_WIZARD_TRAIT "mad_wizard_trait"
+/// Isn't attacked harmfully by blob structures
+#define TRAIT_BLOB_ALLY "blob_ally"
/**
* Trait granted by [/mob/living/carbon/Initialize] and
diff --git a/code/__DEFINES/visual_helpers.dm b/code/__DEFINES/visual_helpers.dm
index 204cc8ba03a..bb54c5d6b0b 100644
--- a/code/__DEFINES/visual_helpers.dm
+++ b/code/__DEFINES/visual_helpers.dm
@@ -11,5 +11,15 @@
base_pixel_x = x; \
base_pixel_y = y;
+#define SET_BASE_VISUAL_PIXEL(w, z) \
+ pixel_w = w; \
+ base_pixel_w = w; \
+ pixel_z = z; \
+ base_pixel_z = z;
+
+#define _SET_BASE_PIXEL_VISUAL_NO_OFFSET(w, z) \
+ base_pixel_z = w; \
+ base_pixel_z = z;
+
/// Much like [SET_BASE_PIXEL], except it will not effect pixel offsets in mapping programs
#define SET_BASE_PIXEL_NOMAP(x, y) MAP_SWITCH(SET_BASE_PIXEL(x, y), _SET_BASE_PIXEL_NO_OFFSET(x, y))
diff --git a/code/__DEFINES/~skyrat_defines/traits.dm b/code/__DEFINES/~skyrat_defines/traits.dm
index 920b58a082f..49f025e4ab0 100644
--- a/code/__DEFINES/~skyrat_defines/traits.dm
+++ b/code/__DEFINES/~skyrat_defines/traits.dm
@@ -90,3 +90,6 @@
/// Trait given to a piece of eyewear that allows the user to use NIFSoft HUDs
#define TRAIT_NIFSOFT_HUD_GRANTER "nifsoft_hud_granter"
+
+/// Trait given to a brain that is able to accept souls from a RSD
+#define TRAIT_RSD_COMPATIBLE "rsd_compatible"
diff --git a/code/__HELPERS/chat.dm b/code/__HELPERS/chat.dm
index e853547ec73..31f9ad271d3 100644
--- a/code/__HELPERS/chat.dm
+++ b/code/__HELPERS/chat.dm
@@ -81,3 +81,19 @@ it will be sent to all connected chats.
/// Handles text formatting for item use hints in examine text
#define EXAMINE_HINT(text) ("" + text + "")
+
+/// Sends a message to all dead and observing players, if a source is provided a follow link will be attached.
+/proc/send_to_observers(message, source)
+ var/list/all_observers = GLOB.dead_player_list + GLOB.current_observers_list
+ for(var/mob/observer as anything in all_observers)
+ if (isnull(source))
+ to_chat(observer, "[message]")
+ continue
+ var/link = FOLLOW_LINK(observer, source)
+ to_chat(observer, "[link] [message]")
+
+/// Sends a message to everyone with blob telepathy, and all observers
+/proc/blob_telepathy(message, source)
+ for(var/mob/creature as anything in GLOB.blob_telepathy_mobs)
+ to_chat(creature, message)
+ send_to_observers(message, source)
diff --git a/code/__HELPERS/icon_smoothing.dm b/code/__HELPERS/icon_smoothing.dm
index 5f92c67a6fc..6a1cfd6191a 100644
--- a/code/__HELPERS/icon_smoothing.dm
+++ b/code/__HELPERS/icon_smoothing.dm
@@ -24,27 +24,6 @@
To see an example of a diagonal wall, see '/turf/closed/wall/mineral/titanium' and its subtypes.
*/
-//Redefinitions of the diagonal directions so they can be stored in one var without conflicts
-#define NORTH_JUNCTION NORTH //(1<<0)
-#define SOUTH_JUNCTION SOUTH //(1<<1)
-#define EAST_JUNCTION EAST //(1<<2)
-#define WEST_JUNCTION WEST //(1<<3)
-#define NORTHEAST_JUNCTION (1<<4)
-#define SOUTHEAST_JUNCTION (1<<5)
-#define SOUTHWEST_JUNCTION (1<<6)
-#define NORTHWEST_JUNCTION (1<<7)
-
-DEFINE_BITFIELD(smoothing_junction, list(
- "NORTH_JUNCTION" = NORTH_JUNCTION,
- "SOUTH_JUNCTION" = SOUTH_JUNCTION,
- "EAST_JUNCTION" = EAST_JUNCTION,
- "WEST_JUNCTION" = WEST_JUNCTION,
- "NORTHEAST_JUNCTION" = NORTHEAST_JUNCTION,
- "SOUTHEAST_JUNCTION" = SOUTHEAST_JUNCTION,
- "SOUTHWEST_JUNCTION" = SOUTHWEST_JUNCTION,
- "NORTHWEST_JUNCTION" = NORTHWEST_JUNCTION,
-))
-
#define NO_ADJ_FOUND 0
#define ADJ_FOUND 1
#define NULLTURF_BORDER 2
@@ -55,13 +34,13 @@ GLOBAL_LIST_INIT(adjacent_direction_lookup, generate_adjacent_directions())
* Each 3x3 grid is a tile, with each X representing a direction a border object could be in IN said grid
* Directions marked with A are acceptable smoothing targets, M is the example direction
* The example given here is of a northfacing border object
-xxx xxx xxx
xxx AxA xxx
-xxx xAx xxx
+xxx AxA xxx
+xxx AxA xxx
-xAx xMx xAx
+AAA MMM AAA
+xxx AxA xxx
xxx AxA xxx
-xxx xxx xxx
xxx xxx xxx
xxx xxx xxx
@@ -96,21 +75,20 @@ xxx xxx xxx
// We'll do the two dirs to our left and right
// They connect.. "below" us and on their side
if(connectable_dir == NONE)
- smoothable_dirs[left] = opposite | left
- smoothable_dirs[right] = opposite | right
+ smoothable_dirs[left] = dir_to_junction(opposite | left)
+ smoothable_dirs[right] = dir_to_junction(opposite | right)
// If it's to our right or left we'll include just the dir matching ours
// Left edge touches only our left side, and so on
else if (connectable_dir == left)
smoothable_dirs[dir] = left
else if (connectable_dir == right)
smoothable_dirs[dir] = right
- // If it's straight on we'll include all cardinals but us, since all 3 bits would touch us
- // Turf opposite gets just our dir as the connection, the other two get our dir + theirs
- // Since they touch the edges
+ // If it's straight on we'll include our direction as a link
+ // Then include the two edges on the other side as diagonals
else if(connectable_dir == dir)
smoothable_dirs[opposite] = dir
- smoothable_dirs[left] = dir | left
- smoothable_dirs[right] = dir | right
+ smoothable_dirs[left] = dir_to_junction(dir | left)
+ smoothable_dirs[right] = dir_to_junction(dir | right)
// otherwise, go HOME, I don't want to encode anything for you
else
continue
@@ -594,6 +572,39 @@ xxx xxx xxx
add_overlay(new_overlays)
+/// Takes a direction, turns it into all the junctions that contain it
+/proc/dir_to_all_junctions(dir)
+ var/handback = NONE
+ if(dir & NORTH)
+ handback |= NORTH_JUNCTION | NORTHEAST_JUNCTION | NORTHWEST_JUNCTION
+ if(dir & SOUTH)
+ handback |= SOUTH_JUNCTION | SOUTHEAST_JUNCTION | SOUTHWEST_JUNCTION
+ if(dir & EAST)
+ handback |= EAST_JUNCTION | SOUTHEAST_JUNCTION | NORTHEAST_JUNCTION
+ if(dir & WEST)
+ handback |= WEST_JUNCTION | NORTHWEST_JUNCTION | SOUTHWEST_JUNCTION
+ return handback
+
+/proc/dir_to_junction(dir)
+ switch(dir)
+ if(NORTH)
+ return NORTH_JUNCTION
+ if(SOUTH)
+ return SOUTH_JUNCTION
+ if(WEST)
+ return WEST_JUNCTION
+ if(EAST)
+ return EAST_JUNCTION
+ if(NORTHWEST)
+ return NORTHWEST_JUNCTION
+ if(NORTHEAST)
+ return NORTHEAST_JUNCTION
+ if(SOUTHEAST)
+ return SOUTHEAST_JUNCTION
+ if(SOUTHWEST)
+ return SOUTHWEST_JUNCTION
+ else
+ return NONE
/proc/reverse_ndir(ndir)
switch(ndir)
diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index de9ed493b62..aa161690ceb 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -589,7 +589,7 @@ GLOBAL_LIST_EMPTY(species_list)
#define ISADVANCEDTOOLUSER(mob) (HAS_TRAIT(mob, TRAIT_ADVANCEDTOOLUSER) && !HAS_TRAIT(mob, TRAIT_DISCOORDINATED_TOOL_USER))
-#define IS_IN_STASIS(mob) (mob.has_status_effect(/datum/status_effect/grouped/stasis))
+#define IS_IN_STASIS(mob) (mob.has_status_effect(/datum/status_effect/grouped/stasis) || mob.has_status_effect(/datum/status_effect/embryonic))
/// Gets the client of the mob, allowing for mocking of the client.
/// You only need to use this if you know you're going to be mocking clients somewhere else.
diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
index aa84927af03..50575d24b5b 100644
--- a/code/_globalvars/lists/maintenance_loot.dm
+++ b/code/_globalvars/lists/maintenance_loot.dm
@@ -216,6 +216,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
/obj/item/stack/medical/gauze = 1,
/obj/item/stack/medical/mesh = 1,
/obj/item/stack/medical/suture = 1,
+ /obj/item/stack/medical/bandage = 1,
) = 1,
list(//medical chems
/obj/item/reagent_containers/cup/bottle/multiver = 1,
@@ -333,6 +334,7 @@ GLOBAL_LIST_INIT(rarity_loot, list(//rare: really good items
/obj/item/storage/box/hug/medical = 1,
/obj/item/storage/medkit/emergency = 1,
/obj/item/storage/medkit/regular = 1,
+ /obj/item/storage/box/bandages = 1,
) = 1,
list(//medical chems
/obj/item/reagent_containers/hypospray/medipen/oxandrolone = 1,
diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm
index f87896e4521..5fc93a2494e 100644
--- a/code/_globalvars/lists/mobs.dm
+++ b/code/_globalvars/lists/mobs.dm
@@ -52,6 +52,9 @@ GLOBAL_LIST_EMPTY(current_living_antags)
/// All observers with clients that joined as observers.
GLOBAL_LIST_EMPTY(current_observers_list)
+/// All living mobs which can hear blob telepathy
+GLOBAL_LIST_EMPTY(blob_telepathy_mobs)
+
///underages who have been reported to security for trying to buy things they shouldn't, so they can't spam
GLOBAL_LIST_EMPTY(narcd_underages)
diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm
index 018164e2c78..01e6f3b59dc 100644
--- a/code/_globalvars/lists/names.dm
+++ b/code/_globalvars/lists/names.dm
@@ -23,6 +23,7 @@ GLOBAL_LIST_INIT(posibrain_names, world.file2list("strings/names/posibrain.txt")
GLOBAL_LIST_INIT(nightmare_names, world.file2list("strings/names/nightmare.txt"))
GLOBAL_LIST_INIT(megacarp_first_names, world.file2list("strings/names/megacarp1.txt"))
GLOBAL_LIST_INIT(megacarp_last_names, world.file2list("strings/names/megacarp2.txt"))
+GLOBAL_LIST_INIT(cyberauth_names, world.file2list("strings/names/cyberauth.txt"))
GLOBAL_LIST_INIT(verbs, world.file2list("strings/names/verbs.txt"))
GLOBAL_LIST_INIT(ing_verbs, world.file2list("strings/names/ing_verbs.txt"))
diff --git a/code/_globalvars/lists/poll_ignore.dm b/code/_globalvars/lists/poll_ignore.dm
index 4d4f10ddc8a..1a56a44f5e5 100644
--- a/code/_globalvars/lists/poll_ignore.dm
+++ b/code/_globalvars/lists/poll_ignore.dm
@@ -5,6 +5,7 @@
#define POLL_IGNORE_ALIEN_LARVA "alien_larva"
#define POLL_IGNORE_ASH_SPIRIT "ash_spirit"
#define POLL_IGNORE_ASHWALKER "ashwalker"
+#define POLL_IGNORE_BLOB "blob"
#define POLL_IGNORE_BOTS "bots"
#define POLL_IGNORE_CARGORILLA "cargorilla"
#define POLL_IGNORE_CONTRACTOR_SUPPORT "contractor_support"
@@ -43,6 +44,7 @@ GLOBAL_LIST_INIT(poll_ignore_desc, list(
POLL_IGNORE_ALIEN_LARVA = "Xenomorph larva",
POLL_IGNORE_ASH_SPIRIT = "Ash Spirit",
POLL_IGNORE_ASHWALKER = "Ashwalker eggs",
+ POLL_IGNORE_BLOB = "Blob spores",
POLL_IGNORE_BOTS = "Bots",
POLL_IGNORE_CARGORILLA = "Cargorilla",
POLL_IGNORE_CONTRACTOR_SUPPORT = "Contractor Support Unit",
diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
index d35c97ef68a..a4a79763865 100644
--- a/code/_globalvars/traits.dm
+++ b/code/_globalvars/traits.dm
@@ -272,6 +272,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_FISH_TOXIN_IMMUNE" = TRAIT_FISH_TOXIN_IMMUNE,
"TRAIT_FISH_CROSSBREEDER" = TRAIT_FISH_CROSSBREEDER,
"TRAIT_FISH_FED_LUBE" = TRAIT_FISH_FED_LUBE,
+ "TRAIT_FISH_NO_HUNGER" = TRAIT_FISH_NO_HUNGER,
),
))
diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm
index afedfa5befe..ef184e18b1d 100644
--- a/code/_onclick/hud/fullscreen.dm
+++ b/code/_onclick/hud/fullscreen.dm
@@ -216,3 +216,10 @@
layer = LIGHTING_ABOVE_ALL
blend_mode = BLEND_ADD
show_when_dead = TRUE
+
+/atom/movable/screen/fullscreen/static_vision
+ icon = 'icons/hud/screen_gen.dmi'
+ screen_loc = "WEST,SOUTH to EAST,NORTH"
+ icon_state = "noise"
+ color = "#04a8d1"
+ alpha = 80
diff --git a/code/controllers/subsystem/economy.dm b/code/controllers/subsystem/economy.dm
index e396bcb8445..511a438bf9a 100644
--- a/code/controllers/subsystem/economy.dm
+++ b/code/controllers/subsystem/economy.dm
@@ -123,6 +123,8 @@ SUBSYSTEM_DEF(economy)
var/effective_mailcount = round(living_player_count()/(inflation_value - 0.5)) //More mail at low inflation, and vis versa.
mail_waiting += clamp(effective_mailcount, 1, MAX_MAIL_PER_MINUTE * seconds_per_tick)
+ SSstock_market.news_string = ""
+
/**
* Handy proc for obtaining a department's bank account, given the department ID, AKA the define assigned for what department they're under.
*/
@@ -173,7 +175,7 @@ SUBSYSTEM_DEF(economy)
fluff_string = ", but company countermeasures protect YOU from being affected!"
else
fluff_string = ", and company countermeasures are failing to protect YOU from being affected. We're all doomed!"
- earning_report = "Sector Economic Report
Sector vendor prices is currently at [SSeconomy.inflation_value()*100]%[fluff_string]
The station spending power is currently [station_total] Credits, and the crew's targeted allowance is at [station_target] Credits.
That's all from the Nanotrasen Economist Division."
+ earning_report = "Sector Economic Report
Sector vendor prices is currently at [SSeconomy.inflation_value()*100]%[fluff_string]
The station spending power is currently [station_total] Credits, and the crew's targeted allowance is at [station_target] Credits.
[SSstock_market.news_string] That's all from the Nanotrasen Economist Division."
GLOB.news_network.submit_article(earning_report, "Station Earnings Report", "Station Announcements", null, update_alert = FALSE)
return TRUE
diff --git a/code/controllers/subsystem/id_access.dm b/code/controllers/subsystem/id_access.dm
index 963957741f2..86f2e124a8f 100644
--- a/code/controllers/subsystem/id_access.dm
+++ b/code/controllers/subsystem/id_access.dm
@@ -329,6 +329,7 @@ SUBSYSTEM_DEF(id_access)
desc_by_access["[ACCESS_CENT_SPECOPS]"] = "Code Black"
desc_by_access["[ACCESS_CENT_CAPTAIN]"] = "Code Gold"
desc_by_access["[ACCESS_CENT_BAR]"] = "Code Scotch"
+ desc_by_access["[ACCESS_BIT_DEN]"] = "Bitrunner Den"
desc_by_access["[ACCESS_BARBER]"] = "Barber" // SKYRAT EDIT ADD - BARBER UPDATE
/**
diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
index 976b4bab249..8376059e910 100644
--- a/code/controllers/subsystem/job.dm
+++ b/code/controllers/subsystem/job.dm
@@ -1,5 +1,3 @@
-#define VERY_LATE_ARRIVAL_TOAST_PROB 20
-
SUBSYSTEM_DEF(job)
name = "Jobs"
init_order = INIT_ORDER_JOBS
@@ -546,21 +544,16 @@ SUBSYSTEM_DEF(job)
/datum/controller/subsystem/job/proc/EquipRank(mob/living/equipping, datum/job/job, client/player_client)
// SKYRAT EDIT ADDITION BEGIN - ALTERNATIVE_JOB_TITLES
// The alt job title, if user picked one, or the default
- var/chosen_title = player_client?.prefs.alt_job_titles[job.title] || job.title
- var/default_title = job.title
- // SKYRAT EDIT ADDITION END - job.title
+ var/alt_title = player_client?.prefs.alt_job_titles[job.title]
+ // SKYRAT EDIT ADDITION END
equipping.job = job.title
SEND_SIGNAL(equipping, COMSIG_JOB_RECEIVED, job)
- equipping.mind?.set_assigned_role_with_greeting(job, player_client)
- if(player_client)
- to_chat(player_client, span_infoplain("You are the [chosen_title].")) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - Original: to_chat(player_client, span_infoplain("You are the [job.title]."))
-
- equipping.on_job_equipping(job, player_client?.prefs) //SKYRAT EDIT CHANGE
-
- job.announce_job(equipping, chosen_title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - Original: job.announce_job(equipping)
+ equipping.mind?.set_assigned_role_with_greeting(job, player_client, alt_title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: equipping.mind?.set_assigned_role_with_greeting(job, player_client)
+ equipping.on_job_equipping(job, player_client?.prefs, player_client) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: equipping.on_job_equipping(job)
+ job.announce_job(equipping, alt_title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: job.announce_job(equipping)
if(player_client?.holder)
if(CONFIG_GET(flag/auto_deadmin_players) || (player_client.prefs?.toggles & DEADMIN_ALWAYS))
@@ -568,46 +561,7 @@ SUBSYSTEM_DEF(job)
else
handle_auto_deadmin_roles(player_client, job.title)
-
- if(player_client)
- to_chat(player_client, span_infoplain("As the [chosen_title == job.title ? chosen_title : "[chosen_title] ([job.title])"] you answer directly to [job.supervisors]. Special circumstances may change this.")) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - Original: to_chat(player_client, span_infoplain("As the [job.title] you answer directly to [job.supervisors]. Special circumstances may change this."))
-
- job.radio_help_message(equipping)
-
- if(player_client)
- if(job.req_admin_notify)
- to_chat(player_client, span_infoplain("You are playing a job that is important for Game Progression. \
- If you have to disconnect, please notify the admins via adminhelp."))
- if(CONFIG_GET(number/minimal_access_threshold))
- to_chat(player_client, span_boldnotice("As this station was initially staffed with a \
- [CONFIG_GET(flag/jobs_have_minimal_access) ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] \
- have been added to your ID card."))
- //SKYRAT EDIT START - ALTERNATIVE_JOB_TITLES
- if(chosen_title != default_title)
- to_chat(player_client, span_infoplain(span_warning("Remember that alternate titles are purely for flavor and roleplay.")))
- to_chat(player_client, span_infoplain(span_doyourjobidiot("Do not use your \"[chosen_title]\" alt title as an excuse to forego your duties as a [job.title].")))
- //SKYRAT EDIT END
- var/related_policy = get_policy(job.title)
- if(related_policy)
- to_chat(player_client, related_policy)
- to_chat(player_client, span_boldnotice("As this station was initially staffed with a \
- [CONFIG_GET(flag/jobs_have_minimal_access) ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] \
- have been added to your ID card."))
-
- if(ishuman(equipping))
- var/mob/living/carbon/human/wageslave = equipping
- wageslave.add_mob_memory(/datum/memory/key/account, remembered_id = wageslave.account_id)
-
- setup_alt_job_items(wageslave, job, player_client) // SKYRAT EDIT ADDITION - ALTERNATIVE_JOB_TITLES
-
- if(EMERGENCY_PAST_POINT_OF_NO_RETURN && prob(VERY_LATE_ARRIVAL_TOAST_PROB))
- // SKYRAT EDIT CHANGE START - Lizards
- if(islizard(equipping))
- equipping.equip_to_slot_or_del(new /obj/item/food/breadslice/root(equipping), ITEM_SLOT_MASK)
- else
- equipping.equip_to_slot_or_del(new /obj/item/food/griddle_toast(equipping), ITEM_SLOT_MASK)
- // SKYRAT EDIT CHANGE END - Lizards
-
+ setup_alt_job_items(equipping, job, player_client) // SKYRAT EDIT ADDITION - ALTERNATIVE_JOB_TITLES
job.after_spawn(equipping, player_client)
/datum/controller/subsystem/job/proc/handle_auto_deadmin_roles(client/C, rank)
@@ -1010,5 +964,3 @@ SUBSYSTEM_DEF(job)
return TRUE
return FALSE
-
-#undef VERY_LATE_ARRIVAL_TOAST_PROB
diff --git a/code/controllers/subsystem/movement/movement_types.dm b/code/controllers/subsystem/movement/movement_types.dm
index 7067b3abbfc..6ff9d39d531 100644
--- a/code/controllers/subsystem/movement/movement_types.dm
+++ b/code/controllers/subsystem/movement/movement_types.dm
@@ -384,7 +384,7 @@
src.simulated_only = simulated_only
src.avoid = avoid
src.skip_first = skip_first
- movement_path = initial_path.Copy()
+ movement_path = initial_path?.Copy()
if(isidcard(id))
RegisterSignal(id, COMSIG_QDELETING, PROC_REF(handle_no_id)) //I prefer erroring to harddels. If this breaks anything consider making id info into a datum or something
diff --git a/code/controllers/subsystem/stock_market.dm b/code/controllers/subsystem/stock_market.dm
new file mode 100644
index 00000000000..7c2cb71dc49
--- /dev/null
+++ b/code/controllers/subsystem/stock_market.dm
@@ -0,0 +1,154 @@
+
+SUBSYSTEM_DEF(stock_market)
+ name = "Stock Market"
+ wait = 20 SECONDS
+ init_order = INIT_ORDER_DEFAULT
+ runlevels = RUNLEVEL_GAME
+
+ /// Associated list of materials and their prices at the given time.
+ var/list/materials_prices = list()
+ /// Associated list of materials alongside their market trends. 1 is up, 0 is stable, -1 is down.
+ var/list/materials_trends = list()
+ /// Associated list of materials alongside the life of it's current trend. After it's life is up, it will change to a new trend.
+ var/list/materials_trend_life = list()
+ /// Associated list of materials alongside their available quantity. This is used to determine how much of a material is available to buy, and how much buying and selling affects the price.
+ var/list/materials_quantity = list()
+ /// HTML string that is used to display the market events to the player.
+ var/news_string = ""
+
+/datum/controller/subsystem/stock_market/Initialize()
+ for(var/datum/material/possible_market as anything in subtypesof(/datum/material)) // I need to make this work like this, but lets hardcode it for now
+ if(initial(possible_market.tradable))
+ materials_prices += possible_market
+ materials_prices[possible_market] = initial(possible_market.value_per_unit) * SHEET_MATERIAL_AMOUNT
+
+ materials_trends += possible_market
+ materials_trends[possible_market] = rand(MARKET_TREND_DOWNWARD,MARKET_TREND_UPWARD) //aka -1 to 1
+
+ materials_trend_life += possible_market
+ materials_trend_life[possible_market] = rand(1,10)
+
+ materials_quantity += possible_market
+ materials_quantity[possible_market] = initial(possible_market.tradable_base_quantity) + (rand(-initial(possible_market.tradable_base_quantity) * 0.5, initial(possible_market.tradable_base_quantity) * 0.5))
+ return SS_INIT_SUCCESS
+/datum/controller/subsystem/stock_market/fire(resumed)
+ for(var/datum/material/market as anything in materials_prices)
+ handle_trends_and_price(market)
+
+/**
+ * Handles shifts in the cost of materials, and in what direction the material is most likely to move.
+ */
+/datum/controller/subsystem/stock_market/proc/handle_trends_and_price(datum/material/mat)
+ if(prob(MARKET_EVENT_PROBABILITY))
+ handle_market_event(mat)
+ return
+ var/trend = materials_trends[mat]
+ var/trend_life = materials_trend_life[mat]
+
+ var/price_units = materials_prices[mat]
+ var/price_minimum = round(initial(mat.value_per_unit) * SHEET_MATERIAL_AMOUNT * 0.5)
+ if(!isnull(initial(mat.minimum_value_override)))
+ price_minimum = round(initial(mat.minimum_value_override) * SHEET_MATERIAL_AMOUNT)
+ var/price_maximum = round(initial(mat.value_per_unit) * SHEET_MATERIAL_AMOUNT * 3)
+ var/price_baseline = initial(mat.value_per_unit) * SHEET_MATERIAL_AMOUNT
+
+ var/stock_quantity = materials_quantity[mat]
+
+ if(HAS_TRAIT(SSeconomy, TRAIT_MARKET_CRASHING)) //We hardset to the worst possible price and lowest possible impact if sold
+ materials_prices[mat] = price_minimum
+ materials_quantity[mat] = stock_quantity * 2
+ materials_trends[mat] = MARKET_TREND_DOWNWARD
+ trend_life = materials_trend_life[mat] = 1
+ return
+
+ if(trend_life == 0)
+ ///We want to scale our trend so that if we're closer to our minimum or maximum price, we're more likely to trend the other way.
+ if((price_units < price_baseline))
+ var/chance_swap = 100 - ((clamp((price_units - price_minimum), 1, 1000) / (price_baseline - price_minimum))*100)
+ if(prob(chance_swap))
+ materials_trends[mat] = MARKET_TREND_UPWARD
+ else
+ materials_trends[mat] = MARKET_TREND_STABLE
+ else if((price_units > price_baseline))
+ var/chance_swap = 100 - ((clamp((price_units - price_maximum), 1, 1000) / (price_maximum - price_baseline))*100)
+ if(prob(chance_swap))
+ materials_trends[mat] = MARKET_TREND_DOWNWARD
+ else
+ materials_trends[mat] = MARKET_TREND_STABLE
+ materials_trend_life[mat] = rand(3,10) // Change our trend life for x number of cycles
+ else
+ materials_trend_life[mat] -= 1
+
+ var/price_change = 0
+ var/quantity_change = 0
+ switch(trend)
+ if(MARKET_TREND_UPWARD)
+ price_change = ROUND_UP(gaussian(price_units * 0.1, price_baseline * 0.05)) //If we don't ceil, small numbers will get trapped at low values
+ quantity_change = -round(gaussian(stock_quantity * 0.1, stock_quantity * 0.05))
+ if(MARKET_TREND_STABLE)
+ price_change = round(gaussian(0, price_baseline * 0.01))
+ quantity_change = round(gaussian(0, stock_quantity * 0.01))
+ if(MARKET_TREND_DOWNWARD)
+ price_change = -ROUND_UP(gaussian(price_units * 0.1, price_baseline * 0.05))
+ quantity_change = round(gaussian(stock_quantity * 0.1, stock_quantity * 0.05))
+ materials_prices[mat] = round(clamp(price_units + price_change, price_minimum, price_maximum))
+ materials_quantity[mat] = round(clamp(stock_quantity + quantity_change, 0, initial(mat.tradable_base_quantity) * 2))
+
+/**
+ * Market events are a way to spice up the market and make it more interesting.
+ * Randomly one will occur to a random material, and it will change the price of that material more drastically, or reset it to a stable price.
+ * Events are also broadcast to the newscaster as a fun little fluff piece. Good way to tell some lore as well, or just make a joke.
+ */
+/datum/controller/subsystem/stock_market/proc/handle_market_event(datum/material/mat)
+
+ var/company_name = list( // Pick a random company name from the list, I let copilot make a few up for me which is why some suck
+ "Nakamura Engineering",
+ "Robust Industries, LLC",
+ "MODular Solutions",
+ "SolGov",
+ "Australicus Industrial Mining",
+ "Vey-Medical",
+ "Aussec Armory",
+ "Dreamland Robotics"
+ )
+ var/circumstance
+ var/event = rand(1,3)
+
+ var/price_units = materials_prices[mat]
+ var/price_minimum = round(initial(mat.value_per_unit) * SHEET_MATERIAL_AMOUNT * 0.5)
+ if(!isnull(initial(mat.minimum_value_override)))
+ price_minimum = round(initial(mat.minimum_value_override) * SHEET_MATERIAL_AMOUNT)
+ var/price_maximum = round(initial(mat.value_per_unit) * SHEET_MATERIAL_AMOUNT * 3)
+ var/price_baseline = initial(mat.value_per_unit) * SHEET_MATERIAL_AMOUNT
+
+ switch(event)
+ if(1) //Reset to stable
+ materials_prices[mat] = price_baseline
+ materials_trends[mat] = MARKET_TREND_STABLE
+ materials_trend_life[mat] = 1
+ circumstance = pick(list(
+ "[pick(company_name)] has been bought out by a private investment firm. As a result, [initial(mat.name)] is now stable at [materials_prices[mat]] cr.",
+ "Due to a corporate restructuring, the largest supplier of [initial(mat.name)] has had the price changed to [materials_prices[mat]] cr.",
+ "[initial(mat.name)] is now under a monopoly by [pick(company_name)]. The price has been changed to [materials_prices[mat]] cr accordingly."
+ ))
+ if(2) //Big boost
+ materials_prices[mat] += round(gaussian(price_units * 0.5, price_units * 0.1))
+ materials_prices[mat] = clamp(materials_prices[mat], price_minimum, price_maximum)
+ materials_trends[mat] = MARKET_TREND_UPWARD
+ materials_trend_life[mat] = rand(1,5)
+ circumstance = pick(list(
+ "[pick(company_name)] has just released a new product that uses [initial(mat.name)]! As a result, the price has been raised to [materials_prices[mat]] cr.",
+ "Due to [pick(company_name)] finding a new property of [initial(mat.name)], its price has been raised to [materials_prices[mat]] cr.",
+ "A study has found that [initial(mat.name)] may run out within the next 100 years. The price has raised to [materials_prices[mat]] cr due to panic."
+ ))
+ if(3) //Big drop
+ materials_prices[mat] -= round(gaussian(price_units * 1.5, price_units * 0.1))
+ materials_prices[mat] = clamp(materials_prices[mat], price_minimum, price_maximum)
+ materials_trends[mat] = MARKET_TREND_DOWNWARD
+ materials_trend_life[mat] = rand(1,5)
+ circumstance = pick(list(
+ "[pick(company_name)]'s latest product has seen major controversy, and as a result, the price of [initial(mat.name)] has dropped to [materials_prices[mat]] cr.",
+ "Due to a new competitor, the price of [initial(mat.name)] has dropped to [materials_prices[mat]] cr.",
+ "[initial(mat.name)] has been found to be a carcinogen. The price has dropped to [materials_prices[mat]] cr due to panic."
+ ))
+ news_string += circumstance + "
" // Add the event to the news_string, formatted for newscasters.
diff --git a/code/datums/actions/action.dm b/code/datums/actions/action.dm
index 843998ff50e..d81c72cc920 100644
--- a/code/datums/actions/action.dm
+++ b/code/datums/actions/action.dm
@@ -117,7 +117,7 @@
if(!hud.mymob)
continue
HideFrom(hud.mymob)
- LAZYREMOVE(remove_from.actions, src) // We aren't always properly inserted into the viewers list, gotta make sure that action's cleared
+ LAZYREMOVE(remove_from?.actions, src) // We aren't always properly inserted into the viewers list, gotta make sure that action's cleared
viewers = list()
if(owner)
diff --git a/code/datums/actions/mobs/lava_swoop.dm b/code/datums/actions/mobs/lava_swoop.dm
index 9c305ceb13b..7532ccfda08 100644
--- a/code/datums/actions/mobs/lava_swoop.dm
+++ b/code/datums/actions/mobs/lava_swoop.dm
@@ -147,7 +147,7 @@
if(isindestructiblefloor(T))
continue
if(!isindestructiblewall(T))
- T.ChangeTurf(/turf/open/misc/asteroid/basalt/lava_land_surface, flags = CHANGETURF_INHERIT_AIR)
+ T.TerraformTurf(/turf/open/misc/asteroid/basalt/lava_land_surface, flags = CHANGETURF_INHERIT_AIR)
else
indestructible_turfs += T
SLEEP_CHECK_DEATH(1 SECONDS, owner) // give them a bit of time to realize what attack is actually happening
diff --git a/code/datums/ai/basic_mobs/basic_ai_behaviors/travel_towards.dm b/code/datums/ai/basic_mobs/basic_ai_behaviors/travel_towards.dm
index bbc1a43e322..55f6ef4c4c0 100644
--- a/code/datums/ai/basic_mobs/basic_ai_behaviors/travel_towards.dm
+++ b/code/datums/ai/basic_mobs/basic_ai_behaviors/travel_towards.dm
@@ -6,6 +6,8 @@
/datum/ai_behavior/travel_towards
required_distance = 0
behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_CAN_PLAN_DURING_EXECUTION
+ /// If true we will get rid of our target on completion
+ var/clear_target = FALSE
/datum/ai_behavior/travel_towards/setup(datum/ai_controller/controller, target_key)
. = ..()
@@ -16,7 +18,15 @@
/datum/ai_behavior/travel_towards/perform(seconds_per_tick, datum/ai_controller/controller, target_key)
. = ..()
- finish_action(controller, TRUE)
+ finish_action(controller, TRUE, target_key)
+
+/datum/ai_behavior/travel_towards/finish_action(datum/ai_controller/controller, succeeded, target_key)
+ . = ..()
+ if (clear_target)
+ controller.clear_blackboard_key(target_key)
+
+/datum/ai_behavior/travel_towards/stop_on_arrival
+ clear_target = TRUE
/**
* # Travel Towards Atom
diff --git a/code/datums/ai/basic_mobs/basic_subtrees/travel_to_point.dm b/code/datums/ai/basic_mobs/basic_subtrees/travel_to_point.dm
new file mode 100644
index 00000000000..9ce7cc95c07
--- /dev/null
+++ b/code/datums/ai/basic_mobs/basic_subtrees/travel_to_point.dm
@@ -0,0 +1,18 @@
+/// Simply walk to a location
+/datum/ai_planning_subtree/travel_to_point
+ /// Blackboard key where we travel a place we walk to
+ var/location_key = BB_TRAVEL_DESTINATION
+ /// What do we do in order to travel
+ var/travel_behaviour = /datum/ai_behavior/travel_towards
+
+/datum/ai_planning_subtree/travel_to_point/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
+ . = ..()
+ var/atom/target = controller.blackboard[location_key]
+ if (QDELETED(target))
+ return
+ controller.queue_behavior(travel_behaviour, location_key)
+ return SUBTREE_RETURN_FINISH_PLANNING
+
+
+/datum/ai_planning_subtree/travel_to_point/and_clear_target
+ travel_behaviour = /datum/ai_behavior/travel_towards/stop_on_arrival
diff --git a/code/datums/ai/hunting_behavior/hunting_behaviors.dm b/code/datums/ai/hunting_behavior/hunting_behaviors.dm
index 036176dc85e..ba7c7f2ffba 100644
--- a/code/datums/ai/hunting_behavior/hunting_behaviors.dm
+++ b/code/datums/ai/hunting_behavior/hunting_behaviors.dm
@@ -93,7 +93,7 @@
var/mob/living/hunter = controller.pawn
var/atom/hunted = controller.blackboard[hunting_target_key]
- if(isnull(hunted))
+ if(QDELETED(hunted))
//Target is gone for some reason. forget about this task!
controller[hunting_target_key] = null
finish_action(controller, FALSE, hunting_target_key)
diff --git a/code/datums/ai/hunting_behavior/hunting_corpses.dm b/code/datums/ai/hunting_behavior/hunting_corpses.dm
new file mode 100644
index 00000000000..e720e4da947
--- /dev/null
+++ b/code/datums/ai/hunting_behavior/hunting_corpses.dm
@@ -0,0 +1,17 @@
+/// Find and attack corpses
+/datum/ai_planning_subtree/find_and_hunt_target/corpses
+ finding_behavior = /datum/ai_behavior/find_hunt_target/corpses
+ hunting_behavior = /datum/ai_behavior/hunt_target/unarmed_attack_target
+ hunt_targets = list(/mob/living)
+
+/// Find nearby dead mobs
+/datum/ai_behavior/find_hunt_target/corpses
+
+/datum/ai_behavior/find_hunt_target/corpses/valid_dinner(mob/living/source, mob/living/dinner, radius)
+ if (!isliving(dinner) || dinner.stat != DEAD)
+ return FALSE
+ return can_see(source, dinner, radius)
+
+/// Find and attack specifically human corpses
+/datum/ai_planning_subtree/find_and_hunt_target/corpses/human
+ hunt_targets = list(/mob/living/carbon/human)
diff --git a/code/datums/ai/movement/ai_movement_jps.dm b/code/datums/ai/movement/ai_movement_jps.dm
index 3523da7ecec..da46735ec36 100644
--- a/code/datums/ai/movement/ai_movement_jps.dm
+++ b/code/datums/ai/movement/ai_movement_jps.dm
@@ -2,7 +2,7 @@
* This movement datum represents smart-pathing
*/
/datum/ai_movement/jps
- max_pathing_attempts = 4
+ max_pathing_attempts = 20
/datum/ai_movement/jps/start_moving_towards(datum/ai_controller/controller, atom/current_movement_target, min_distance)
. = ..()
@@ -12,13 +12,13 @@
var/datum/move_loop/loop = SSmove_manager.jps_move(moving,
current_movement_target,
delay,
- repath_delay = 2 SECONDS,
+ repath_delay = 0.5 SECONDS,
max_path_length = AI_MAX_PATH_LENGTH,
minimum_distance = controller.get_minimum_distance(),
id = controller.get_access(),
subsystem = SSai_movement,
extra_info = controller,
- initial_path = controller.blackboard[BB_PATH_TO_USE])
+ )
RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(pre_move))
RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(post_move))
diff --git a/code/datums/components/bakeable.dm b/code/datums/components/bakeable.dm
index 5aa60cd89a7..537ae62ddbe 100644
--- a/code/datums/components/bakeable.dm
+++ b/code/datums/components/bakeable.dm
@@ -67,8 +67,9 @@
var/atom/original_object = parent
var/obj/item/plate/oven_tray/used_tray = original_object.loc
var/atom/baked_result = new bake_result(used_tray)
- baked_result.reagents.clear_reagents()
- original_object.reagents?.trans_to(baked_result, original_object.reagents.total_volume)
+ if(baked_result.reagents) //make space and tranfer reagents if it has any
+ baked_result.reagents.clear_reagents()
+ original_object.reagents.trans_to(baked_result, original_object.reagents.total_volume)
if(who_baked_us)
ADD_TRAIT(baked_result, TRAIT_FOOD_CHEF_MADE, who_baked_us)
diff --git a/code/datums/components/blob_minion.dm b/code/datums/components/blob_minion.dm
new file mode 100644
index 00000000000..41f58231e2d
--- /dev/null
+++ b/code/datums/components/blob_minion.dm
@@ -0,0 +1,154 @@
+/**
+ * Common behaviour shared by things which are minions to a blob
+ */
+/datum/component/blob_minion
+ dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
+ /// Overmind who is our boss
+ var/mob/camera/blob/overmind
+ /// Callback to run if overmind strain changes
+ var/datum/callback/on_strain_changed
+
+/datum/component/blob_minion/Initialize(mob/camera/blob/overmind, datum/callback/on_strain_changed)
+ . = ..()
+ if (!isliving(parent))
+ return COMPONENT_INCOMPATIBLE
+ src.on_strain_changed = on_strain_changed
+ register_overlord(overmind)
+
+/datum/component/blob_minion/InheritComponent(datum/component/new_comp, i_am_original, mob/camera/blob/overmind, datum/callback/on_strain_changed)
+ if (!isnull(on_strain_changed))
+ src.on_strain_changed = on_strain_changed
+ register_overlord(overmind)
+
+/datum/component/blob_minion/proc/register_overlord(mob/camera/blob/overmind)
+ if (isnull(overmind))
+ return
+ src.overmind = overmind
+ overmind.register_new_minion(parent)
+ RegisterSignal(overmind, COMSIG_QDELETING, PROC_REF(overmind_deleted))
+ RegisterSignal(overmind, COMSIG_BLOB_SELECTED_STRAIN, PROC_REF(overmind_properties_changed))
+ overmind_properties_changed(overmind, overmind.blobstrain)
+
+/// Our overmind is gone, uh oh!
+/datum/component/blob_minion/proc/overmind_deleted()
+ SIGNAL_HANDLER
+ overmind = null
+ overmind_properties_changed()
+
+/// Our overmind has changed colour and properties
+/datum/component/blob_minion/proc/overmind_properties_changed(mob/camera/blob/overmind, datum/blobstrain/new_strain)
+ SIGNAL_HANDLER
+ var/mob/living/living_parent = parent
+ living_parent.update_appearance(UPDATE_ICON)
+ on_strain_changed?.Invoke(overmind, new_strain)
+
+/datum/component/blob_minion/RegisterWithParent()
+ var/mob/living/living_parent = parent
+ living_parent.pass_flags |= PASSBLOB
+ living_parent.faction |= ROLE_BLOB
+ ADD_TRAIT(parent, TRAIT_BLOB_ALLY, REF(src))
+ remove_verb(parent, /mob/living/verb/pulled) // No dragging people into the blob
+ RegisterSignal(parent, COMSIG_MOB_MIND_INITIALIZED, PROC_REF(on_mind_init))
+ RegisterSignal(parent, COMSIG_ATOM_UPDATE_ICON, PROC_REF(on_update_appearance))
+ RegisterSignal(parent, COMSIG_MOB_GET_STATUS_TAB_ITEMS, PROC_REF(on_update_status_tab))
+ RegisterSignal(parent, COMSIG_ATOM_BLOB_ACT, PROC_REF(on_blob_touched))
+ RegisterSignal(parent, COMSIG_ATOM_FIRE_ACT, PROC_REF(on_burned))
+ RegisterSignal(parent, COMSIG_ATOM_TRIED_PASS, PROC_REF(on_attempted_pass))
+ RegisterSignal(parent, COMSIG_MOVABLE_SPACEMOVE, PROC_REF(on_space_move))
+ RegisterSignal(parent, COMSIG_LIVING_TRY_SPEECH, PROC_REF(on_try_speech))
+ RegisterSignal(parent, COMSIG_MOB_CHANGED_TYPE, PROC_REF(on_transformed))
+ living_parent.update_appearance(UPDATE_ICON)
+ GLOB.blob_telepathy_mobs |= parent
+
+/datum/component/blob_minion/UnregisterFromParent()
+ if (!isnull(overmind))
+ overmind.blob_mobs -= parent
+ var/mob/living/living_parent = parent
+ living_parent.pass_flags &= ~PASSBLOB
+ living_parent.faction -= ROLE_BLOB
+ REMOVE_TRAIT(parent, TRAIT_BLOB_ALLY, REF(src))
+ add_verb(parent, /mob/living/verb/pulled)
+ UnregisterSignal(parent, list(
+ COMSIG_ATOM_BLOB_ACT,
+ COMSIG_ATOM_FIRE_ACT,
+ COMSIG_ATOM_TRIED_PASS,
+ COMSIG_ATOM_UPDATE_ICON,
+ COMSIG_LIVING_TRY_SPEECH,
+ COMSIG_MOB_CHANGED_TYPE,
+ COMSIG_MOB_GET_STATUS_TAB_ITEMS,
+ COMSIG_MOB_MIND_INITIALIZED,
+ COMSIG_MOVABLE_SPACEMOVE,
+ ))
+ GLOB.blob_telepathy_mobs -= parent
+
+/// Become blobpilled when we gain a mind
+/datum/component/blob_minion/proc/on_mind_init(mob/living/minion, datum/mind/new_mind)
+ SIGNAL_HANDLER
+ if (isnull(overmind))
+ return
+ var/datum/antagonist/blob_minion/minion_motive = new(overmind)
+ new_mind.add_antag_datum(minion_motive)
+
+/// When our icon is updated, update our colour too
+/datum/component/blob_minion/proc/on_update_appearance(mob/living/minion)
+ SIGNAL_HANDLER
+ if(isnull(overmind))
+ minion.remove_atom_colour(FIXED_COLOUR_PRIORITY)
+ return
+ minion.add_atom_colour(overmind.blobstrain.color, FIXED_COLOUR_PRIORITY)
+
+/// When our icon is updated, update our colour too
+/datum/component/blob_minion/proc/on_update_status_tab(mob/living/minion, list/status_items)
+ SIGNAL_HANDLER
+ if (isnull(overmind))
+ return
+ status_items += "Blobs to Win: [length(overmind.blobs_legit)]/[overmind.blobwincount]"
+
+/// If we feel the gentle caress of a blob, we feel better
+/datum/component/blob_minion/proc/on_blob_touched(mob/living/minion)
+ SIGNAL_HANDLER
+ if(minion.stat == DEAD || minion.health >= minion.maxHealth)
+ return COMPONENT_CANCEL_BLOB_ACT // Don't hurt us in order to heal us
+ for(var/i in 1 to 2)
+ var/obj/effect/temp_visual/heal/heal_effect = new /obj/effect/temp_visual/heal(get_turf(parent)) // hello yes you are being healed
+ heal_effect.color = isnull(overmind) ? COLOR_BLACK : overmind.blobstrain.complementary_color
+ minion.heal_overall_damage(minion.maxHealth * BLOBMOB_HEALING_MULTIPLIER)
+ return COMPONENT_CANCEL_BLOB_ACT
+
+/// If we feel the fearsome bite of open flame, we feel worse
+/datum/component/blob_minion/proc/on_burned(mob/living/minion, exposed_temperature, exposed_volume)
+ SIGNAL_HANDLER
+ if(isnull(exposed_temperature))
+ minion.adjustFireLoss(5)
+ return
+ minion.adjustFireLoss(clamp(0.01 * exposed_temperature, 1, 5))
+
+/// Someone is attempting to move through us, allow it if it is a blob tile
+/datum/component/blob_minion/proc/on_attempted_pass(mob/living/minion, atom/movable/incoming)
+ SIGNAL_HANDLER
+ if(istype(incoming, /obj/structure/blob))
+ return COMSIG_COMPONENT_PERMIT_PASSAGE
+
+/// If we're near a blob, stop drifting
+/datum/component/blob_minion/proc/on_space_move(mob/living/minion)
+ SIGNAL_HANDLER
+ var/obj/structure/blob/blob_handhold = locate() in range(1, parent)
+ if (!isnull(blob_handhold))
+ return COMSIG_MOVABLE_STOP_SPACEMOVE
+
+/// We only speak telepathically to blobs
+/datum/component/blob_minion/proc/on_try_speech(mob/living/minion, message, ignore_spam, forced)
+ SIGNAL_HANDLER
+ var/spanned_message = minion.say_quote(message)
+ var/rendered = span_blob("\[Blob Telepathy\] [minion.real_name] [spanned_message]")
+ blob_telepathy(rendered, minion)
+ return COMPONENT_CANNOT_SPEAK
+
+/// Called when a blob minion is transformed into something else, hopefully a spore into a zombie
+/datum/component/blob_minion/proc/on_transformed(mob/living/minion, mob/living/replacement)
+ SIGNAL_HANDLER
+ overmind?.assume_direct_control(replacement)
+
+/datum/component/blob_minion/PostTransfer()
+ if(!isliving(parent))
+ return COMPONENT_INCOMPATIBLE
diff --git a/code/datums/components/chasm.dm b/code/datums/components/chasm.dm
index fc93123921c..18420016c54 100644
--- a/code/datums/components/chasm.dm
+++ b/code/datums/components/chasm.dm
@@ -8,28 +8,29 @@
/// List of refs to falling objects -> how many levels deep we've fallen
var/static/list/falling_atoms = list()
var/static/list/forbidden_types = typecacheof(list(
- /obj/singularity,
- /obj/energy_ball,
- /obj/narsie,
/obj/docking_port,
- /obj/structure/lattice,
- /obj/structure/stone_tile,
- /obj/projectile,
- /obj/effect/projectile,
- /obj/effect/portal,
/obj/effect/abstract,
+ /obj/effect/collapse,
+ /obj/effect/constructing_effect,
+ /obj/effect/dummy/phased_mob,
+ /obj/effect/ebeam,
+ /obj/effect/fishing_lure,
/obj/effect/hotspot,
/obj/effect/landmark,
- /obj/effect/temp_visual,
/obj/effect/light_emitter/tendril,
- /obj/effect/collapse,
- /obj/effect/particle_effect/ion_trails,
- /obj/effect/dummy/phased_mob,
/obj/effect/mapping_helpers,
+ /obj/effect/particle_effect/ion_trails,
+ /obj/effect/portal,
+ /obj/effect/projectile,
+ /obj/effect/spectre_of_resurrection,
+ /obj/effect/temp_visual,
/obj/effect/wisp,
- /obj/effect/ebeam,
- /obj/effect/fishing_lure,
- /obj/effect/constructing_effect,
+ /obj/energy_ball,
+ /obj/narsie,
+ /obj/projectile,
+ /obj/singularity,
+ /obj/structure/lattice,
+ /obj/structure/stone_tile,
))
/datum/component/chasm/Initialize(turf/target, mapload)
diff --git a/code/datums/components/crafting/tools.dm b/code/datums/components/crafting/tools.dm
index cc2d510bd25..f126bdff538 100644
--- a/code/datums/components/crafting/tools.dm
+++ b/code/datums/components/crafting/tools.dm
@@ -46,3 +46,12 @@
)
result = /obj/item/pickaxe/improvised
category = CAT_TOOLS
+
+/datum/crafting_recipe/bandage
+ name = "Makeshift Bandage"
+ reqs = list(
+ /obj/item/stack/sheet/cloth = 3,
+ /datum/reagent/medicine/c2/libital = 10,
+ )
+ result = /obj/item/stack/medical/bandage/makeshift
+ category = CAT_TOOLS
diff --git a/code/datums/components/fishing_spot.dm b/code/datums/components/fishing_spot.dm
index 3f230b8754d..f88c27a7135 100644
--- a/code/datums/components/fishing_spot.dm
+++ b/code/datums/components/fishing_spot.dm
@@ -12,6 +12,7 @@
fish_source = configuration
else
return COMPONENT_INCOMPATIBLE
+ fish_source.on_fishing_spot_init()
RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(handle_attackby))
RegisterSignal(parent, COMSIG_FISHING_ROD_CAST, PROC_REF(handle_cast))
diff --git a/code/datums/id_trim/jobs.dm b/code/datums/id_trim/jobs.dm
index 2a62d19452d..d2939529dc6 100644
--- a/code/datums/id_trim/jobs.dm
+++ b/code/datums/id_trim/jobs.dm
@@ -155,6 +155,30 @@
)
job = /datum/job/bartender
+/datum/id_trim/job/bitrunner
+ assignment = "Bitrunner"
+ trim_state = "trim_bitrunner"
+ department_color = COLOR_CARGO_BROWN
+ subdepartment_color = COLOR_CARGO_BROWN
+ sechud_icon_state = SECHUD_BITRUNNER
+ minimal_access = list(
+ ACCESS_BIT_DEN,
+ ACCESS_CARGO,
+ ACCESS_MAINT_TUNNELS,
+ ACCESS_MECH_MINING,
+ ACCESS_MINERAL_STOREROOM,
+ )
+ extra_access = list(
+ ACCESS_MINING,
+ ACCESS_MINING_STATION,
+ )
+ template_access = list(
+ ACCESS_CAPTAIN,
+ ACCESS_CHANGE_IDS,
+ ACCESS_QM,
+ )
+ job = /datum/job/bitrunner
+
/datum/id_trim/job/botanist
assignment = "Botanist"
trim_state = "trim_botanist"
@@ -215,6 +239,7 @@
ACCESS_SHIPPING,
)
extra_access = list(
+ ACCESS_BIT_DEN,
ACCESS_MINING,
ACCESS_MINING_STATION,
)
@@ -576,6 +601,7 @@
ACCESS_ALL_PERSONAL_LOCKERS,
ACCESS_ARMORY,
ACCESS_AUX_BASE,
+ ACCESS_BIT_DEN,
ACCESS_BRIG,
ACCESS_BRIG_ENTRANCE,
ACCESS_CARGO,
@@ -712,6 +738,7 @@
subdepartment_color = COLOR_MEDICAL_BLUE
sechud_icon_state = SECHUD_PARAMEDIC
minimal_access = list(
+ ACCESS_BIT_DEN,
ACCESS_CARGO,
ACCESS_CONSTRUCTION,
ACCESS_HYDROPONICS,
@@ -810,6 +837,7 @@
sechud_icon_state = SECHUD_QUARTERMASTER
minimal_access = list(
ACCESS_AUX_BASE,
+ ACCESS_BIT_DEN,
ACCESS_CARGO,
ACCESS_MAINT_TUNNELS,
ACCESS_MECH_MINING,
@@ -1008,6 +1036,7 @@
assignment = "Security Officer (Cargo)"
subdepartment_color = COLOR_CARGO_BROWN
department_access = list(
+ ACCESS_BIT_DEN,
ACCESS_CARGO,
ACCESS_MINING,
ACCESS_SHIPPING,
@@ -1076,6 +1105,7 @@
ACCESS_MINING_STATION,
)
extra_access = list(
+ ACCESS_BIT_DEN,
ACCESS_MAINT_TUNNELS,
)
template_access = list(
diff --git a/code/datums/id_trim/outfits.dm b/code/datums/id_trim/outfits.dm
index f62e451340f..2a06434ecdb 100644
--- a/code/datums/id_trim/outfits.dm
+++ b/code/datums/id_trim/outfits.dm
@@ -55,3 +55,22 @@
subdepartment_color = COLOR_PRISONER_BLACK
access = list(ACCESS_HUNTER)
+
+/// Trim for player controlled avatars in the Virtual Domain.
+/datum/id_trim/bit_avatar
+ assignment = "Bit Avatar"
+ trim_state = "trim_bitavatar"
+ department_color = COLOR_BLACK
+ subdepartment_color = COLOR_GREEN
+
+/// Trim for cyber police in the Virtual Domain.
+/datum/id_trim/cyber_police
+ assignment = "Cyber Police"
+ trim_state = "trim_deathcommando"
+ department_color = COLOR_BLACK
+ subdepartment_color = COLOR_GREEN
+
+/datum/id_trim/cyber_police/New()
+ . = ..()
+
+ access |= SSid_access.get_region_access_list(list(REGION_ALL_GLOBAL))
diff --git a/code/datums/lazy_template.dm b/code/datums/lazy_template.dm
index 0b8b2999f69..a5ae9e413f3 100644
--- a/code/datums/lazy_template.dm
+++ b/code/datums/lazy_template.dm
@@ -7,8 +7,11 @@
/// If this is true each load will increment an index keyed to the type and it will load [map_name]_[index]
var/list/datum/turf_reservation/reservations = list()
var/uses_multiple_allocations = FALSE
+ /// Key to identify this template - used in caching
var/key
+ /// Directory of maps to prefix to the filename
var/map_dir = "_maps/templates/lazy_templates"
+ /// The filename (without extension) of the map to load
var/map_name
/datum/lazy_template/New()
diff --git a/code/datums/materials/_material.dm b/code/datums/materials/_material.dm
index d91884d972e..06d26f31ea3 100644
--- a/code/datums/materials/_material.dm
+++ b/code/datums/materials/_material.dm
@@ -33,8 +33,16 @@ Simple datum which is instanced once per type and is used for every object of sa
var/strength_modifier = 1
///This is a modifier for integrity, and resembles the strength of the material
var/integrity_modifier = 1
+
///This is the amount of value per 1 unit of the material
var/value_per_unit = 0
+ ///This is the minimum value of the material, used in the stock market for any mat that isn't set to null
+ var/minimum_value_override = null
+ ///Is this material traded on the stock market?
+ var/tradable = FALSE
+ ///If this material is tradable, what is the base quantity of the material on the stock market?
+ var/tradable_base_quantity = 0
+
///Armor modifiers, multiplies an items normal armor vars by these amounts.
var/armor_modifiers = list(MELEE = 1, BULLET = 1, LASER = 1, ENERGY = 1, BOMB = 1, BIO = 1, FIRE = 1, ACID = 1)
///How beautiful is this material per unit.
diff --git a/code/datums/materials/basemats.dm b/code/datums/materials/basemats.dm
index fcef1b5d3d8..f79b9f7e422 100644
--- a/code/datums/materials/basemats.dm
+++ b/code/datums/materials/basemats.dm
@@ -7,6 +7,9 @@
categories = list(MAT_CATEGORY_ORE = TRUE, MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE, MAT_CATEGORY_ITEM_MATERIAL=TRUE)
sheet_type = /obj/item/stack/sheet/iron
value_per_unit = 5 / SHEET_MATERIAL_AMOUNT
+ minimum_value_override = 0
+ tradable = TRUE
+ tradable_base_quantity = MATERIAL_QUANTITY_COMMON
/datum/material/iron/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
victim.apply_damage(10, BRUTE, BODY_ZONE_HEAD, wound_bonus = 5)
@@ -25,6 +28,9 @@
shard_type = /obj/item/shard
debris_type = /obj/effect/decal/cleanable/glass
value_per_unit = 5 / SHEET_MATERIAL_AMOUNT
+ minimum_value_override = 0
+ tradable = TRUE
+ tradable_base_quantity = MATERIAL_QUANTITY_COMMON
beauty_modifier = 0.05
armor_modifiers = list(MELEE = 0.2, BULLET = 0.2, ENERGY = 1, BIO = 0.2, FIRE = 1, ACID = 0.2)
@@ -56,6 +62,8 @@ Unless you know what you're doing, only use the first three numbers. They're in
categories = list(MAT_CATEGORY_ORE = TRUE, MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE, MAT_CATEGORY_ITEM_MATERIAL=TRUE)
sheet_type = /obj/item/stack/sheet/mineral/silver
value_per_unit = 50 / SHEET_MATERIAL_AMOUNT
+ tradable = TRUE
+ tradable_base_quantity = MATERIAL_QUANTITY_UNCOMMON
beauty_modifier = 0.075
/datum/material/silver/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
@@ -72,6 +80,8 @@ Unless you know what you're doing, only use the first three numbers. They're in
categories = list(MAT_CATEGORY_ORE = TRUE, MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE, MAT_CATEGORY_ITEM_MATERIAL=TRUE)
sheet_type = /obj/item/stack/sheet/mineral/gold
value_per_unit = 125 / SHEET_MATERIAL_AMOUNT
+ tradable = TRUE
+ tradable_base_quantity = MATERIAL_QUANTITY_RARE
beauty_modifier = 0.15
armor_modifiers = list(MELEE = 1.1, BULLET = 1.1, LASER = 1.15, ENERGY = 1.15, BOMB = 1, BIO = 1, FIRE = 0.7, ACID = 1.1)
@@ -90,6 +100,8 @@ Unless you know what you're doing, only use the first three numbers. They're in
alpha = 132
starlight_color = COLOR_BLUE_LIGHT
value_per_unit = 500 / SHEET_MATERIAL_AMOUNT
+ tradable = TRUE
+ tradable_base_quantity = MATERIAL_QUANTITY_EXOTIC
beauty_modifier = 0.3
armor_modifiers = list(MELEE = 1.3, BULLET = 1.3, LASER = 0.6, ENERGY = 1, BOMB = 1.2, BIO = 1, FIRE = 1, ACID = 1)
@@ -106,6 +118,8 @@ Unless you know what you're doing, only use the first three numbers. They're in
categories = list(MAT_CATEGORY_ORE = TRUE, MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE, MAT_CATEGORY_ITEM_MATERIAL=TRUE)
sheet_type = /obj/item/stack/sheet/mineral/uranium
value_per_unit = 100 / SHEET_MATERIAL_AMOUNT
+ tradable = TRUE
+ tradable_base_quantity = MATERIAL_QUANTITY_RARE
beauty_modifier = 0.3 //It shines so beautiful
armor_modifiers = list(MELEE = 1.5, BULLET = 1.4, LASER = 0.5, ENERGY = 0.5, FIRE = 1, ACID = 1)
@@ -173,6 +187,8 @@ Unless you know what you're doing, only use the first three numbers. They're in
beauty_modifier = 0.5
sheet_type = /obj/item/stack/sheet/bluespace_crystal
value_per_unit = 300 / SHEET_MATERIAL_AMOUNT
+ tradable = TRUE
+ tradable_base_quantity = MATERIAL_QUANTITY_EXOTIC
/datum/material/bluespace/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
victim.reagents.add_reagent(/datum/reagent/bluespace, rand(5, 8))
@@ -216,6 +232,8 @@ Unless you know what you're doing, only use the first three numbers. They're in
categories = list(MAT_CATEGORY_ORE = TRUE, MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE, MAT_CATEGORY_ITEM_MATERIAL=TRUE)
sheet_type = /obj/item/stack/sheet/mineral/titanium
value_per_unit = 125 / SHEET_MATERIAL_AMOUNT
+ tradable = TRUE
+ tradable_base_quantity = MATERIAL_QUANTITY_UNCOMMON
beauty_modifier = 0.05
armor_modifiers = list(MELEE = 1.35, BULLET = 1.3, LASER = 1.3, ENERGY = 1.25, BOMB = 1.25, BIO = 1, FIRE = 0.7, ACID = 1)
diff --git a/code/datums/memory/_memory.dm b/code/datums/memory/_memory.dm
index 35d1a6683f3..66871aac2ec 100644
--- a/code/datums/memory/_memory.dm
+++ b/code/datums/memory/_memory.dm
@@ -246,6 +246,7 @@
var/static/list/something_pool = list(
/mob/living/basic/bat,
/mob/living/basic/bear,
+ /mob/living/basic/blob_minion/blobbernaut,
/mob/living/basic/butterfly,
/mob/living/basic/carp,
/mob/living/basic/carp/magic,
@@ -272,7 +273,6 @@
/mob/living/basic/statue,
/mob/living/basic/stickman,
/mob/living/basic/stickman/dog,
- /mob/living/simple_animal/hostile/blob/blobbernaut/independent,
/mob/living/simple_animal/hostile/gorilla,
/mob/living/simple_animal/hostile/megafauna/dragon/lesser,
/mob/living/simple_animal/hostile/retaliate/goat,
diff --git a/code/datums/mind/_mind.dm b/code/datums/mind/_mind.dm
index fa9114a5284..deb55e92ecb 100644
--- a/code/datums/mind/_mind.dm
+++ b/code/datums/mind/_mind.dm
@@ -569,16 +569,14 @@
/// Sets us to the passed job datum, then greets them to their new job.
/// Use this one for when you're assigning this mind to a new job for the first time,
/// or for when someone's recieving a job they'd really want to be greeted to.
-/datum/mind/proc/set_assigned_role_with_greeting(datum/job/new_role, client/incoming_client)
+/datum/mind/proc/set_assigned_role_with_greeting(datum/job/new_role, client/incoming_client, alt_title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: /datum/mind/proc/set_assigned_role_with_greeting(datum/job/new_role, client/incoming_client)
. = set_assigned_role(new_role)
if(assigned_role != new_role)
return
- to_chat(incoming_client || src, span_infoplain("You are the [new_role.title]."))
-
- var/related_policy = get_policy(new_role.title)
- if(related_policy)
- to_chat(incoming_client || src, related_policy)
+ var/intro_message = new_role.get_spawn_message(alt_title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: var/intro_message = new_role.get_spawn_message()
+ if(incoming_client && intro_message)
+ to_chat(incoming_client, intro_message)
/mob/proc/sync_mind()
mind_initialize() //updates the mind (or creates and initializes one if one doesn't exist)
diff --git a/code/datums/mind/initialization.dm b/code/datums/mind/initialization.dm
index 12a5dddb229..eb622cc5af5 100644
--- a/code/datums/mind/initialization.dm
+++ b/code/datums/mind/initialization.dm
@@ -11,6 +11,7 @@
mind.set_current(src)
// There's nowhere else to set this up, mind code makes me depressed
mind.antag_hud = add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/antagonist_hud, "combo_hud", mind)
+ SEND_SIGNAL(src, COMSIG_MOB_MIND_INITIALIZED, mind)
/mob/living/carbon/mind_initialize()
..()
diff --git a/code/datums/mind/skills.dm b/code/datums/mind/skills.dm
index 5847236435b..474291d5ae0 100644
--- a/code/datums/mind/skills.dm
+++ b/code/datums/mind/skills.dm
@@ -18,12 +18,10 @@
experience_multiplier += experience_multiplier_reasons[key]
known_skills[skill][SKILL_EXP] = max(0, known_skills[skill][SKILL_EXP] + amt*experience_multiplier) //Update exp. Prevent going below 0
known_skills[skill][SKILL_LVL] = update_skill_level(skill)//Check what the current skill level is based on that skill's exp
- if(silent)
- return
if(known_skills[skill][SKILL_LVL] > old_level)
- S.level_gained(src, known_skills[skill][SKILL_LVL], old_level)
+ S.level_gained(src, known_skills[skill][SKILL_LVL], old_level, silent)
else if(known_skills[skill][SKILL_LVL] < old_level)
- S.level_lost(src, known_skills[skill][SKILL_LVL], old_level)
+ S.level_lost(src, known_skills[skill][SKILL_LVL], old_level, silent)
///Set experience of a specific skill to a number
/datum/mind/proc/set_experience(skill, amt, silent = FALSE)
diff --git a/code/datums/skills/_skill.dm b/code/datums/skills/_skill.dm
index ec52ebd9e96..b8438c67927 100644
--- a/code/datums/skills/_skill.dm
+++ b/code/datums/skills/_skill.dm
@@ -27,8 +27,7 @@ GLOBAL_LIST_INIT(skill_types, subtypesof(/datum/skill))
span_nicegreen("I'm getting a little better at [name]!"),
span_nicegreen("I'm getting much better at [name]!"),
span_nicegreen("I feel like I've become quite proficient at [name]!"),
- "After lots of practice, I've begun to truly understand the intricacies \
- and surprising depth behind [name]. I now consider myself a master [title].",
+ span_nicegreen("After lots of practice, I've begun to truly understand the intricacies and surprising depth behind [name]. I now consider myself a master [title]."),
span_nicegreen("Through incredible determination and effort, I've reached the peak of my [name] abiltities. I'm finally able to consider myself a legendary [title]!") )
levelDownMessages = list(span_nicegreen("I have somehow completely lost all understanding of [name]. Please tell an admin if you see this."),
span_nicegreen("I'm starting to forget what [name] really even is. I need more practice..."),
@@ -46,13 +45,18 @@ GLOBAL_LIST_INIT(skill_types, subtypesof(/datum/skill))
* * mind - The mind that you'll want to send messages
* * new_level - The newly gained level. Can check the actual level to give different messages at different levels, see defines in skills.dm
* * old_level - Similar to the above, but the level you had before levelling up.
+ * * silent - Silences the announcement if TRUE
*/
-/datum/skill/proc/level_gained(datum/mind/mind, new_level, old_level)//just for announcements (doesn't go off if the xp gain is silent)
+/datum/skill/proc/level_gained(datum/mind/mind, new_level, old_level, silent)
+ if(silent)
+ return
to_chat(mind.current, levelUpMessages[new_level]) //new_level will be a value from 1 to 6, so we get appropriate message from the 6-element levelUpMessages list
/**
* level_lost: See level_gained, same idea but fires on skill level-down
*/
-/datum/skill/proc/level_lost(datum/mind/mind, new_level, old_level)
+/datum/skill/proc/level_lost(datum/mind/mind, new_level, old_level, silent)
+ if(silent)
+ return
to_chat(mind.current, levelDownMessages[old_level]) //old_level will be a value from 1 to 6, so we get appropriate message from the 6-element levelUpMessages list
/**
diff --git a/code/datums/skills/fishing.dm b/code/datums/skills/fishing.dm
index d5ecff3c8f5..ddf90e1a0a3 100644
--- a/code/datums/skills/fishing.dm
+++ b/code/datums/skills/fishing.dm
@@ -8,3 +8,17 @@
desc = "How empty and alone you are on this barren Earth."
modifiers = list(SKILL_VALUE_MODIFIER = list(1, 1, 0, -1, -2, -4, -6))
skill_item_path = /obj/item/clothing/head/soft/fishing_hat
+
+/datum/skill/fishing/New()
+ . = ..()
+ levelUpMessages[SKILL_LEVEL_MASTER] = span_nicegreen("After lots of practice, I've begun to truly understand the surprising depth behind [name]. As a master [title], I can take an easier guess of what I'm trying to catch now.")
+
+/datum/skill/fishing/level_gained(datum/mind/mind, new_level, old_level, silent)
+ . = ..()
+ if(new_level >= SKILL_LEVEL_MASTER && old_level < SKILL_LEVEL_MASTER)
+ ADD_TRAIT(mind, TRAIT_REVEAL_FISH, SKILL_TRAIT)
+
+/datum/skill/fishing/level_lost(datum/mind/mind, new_level, old_level, silent)
+ . = ..()
+ if(old_level >= SKILL_LEVEL_MASTER && new_level < SKILL_LEVEL_MASTER)
+ REMOVE_TRAIT(mind, TRAIT_REVEAL_FISH, SKILL_TRAIT)
diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm
index 165cc4c2ad4..7c36ed24db9 100644
--- a/code/datums/station_traits/positive_traits.dm
+++ b/code/datums/station_traits/positive_traits.dm
@@ -283,6 +283,7 @@
/datum/job/assistant = /obj/item/organ/internal/heart/cybernetic, //real cardiac
/datum/job/atmospheric_technician = /obj/item/organ/internal/cyberimp/mouth/breathing_tube,
/datum/job/bartender = /obj/item/organ/internal/liver/cybernetic/tier3,
+ /datum/job/bitrunner = /obj/item/organ/internal/eyes/robotic/thermals,
/datum/job/botanist = /obj/item/organ/internal/cyberimp/chest/nutriment,
/datum/job/captain = /obj/item/organ/internal/heart/cybernetic/tier3,
/datum/job/cargo_technician = /obj/item/organ/internal/stomach/cybernetic/tier2,
diff --git a/code/datums/status_effects/debuffs/static_vision.dm b/code/datums/status_effects/debuffs/static_vision.dm
new file mode 100644
index 00000000000..7132c189b9d
--- /dev/null
+++ b/code/datums/status_effects/debuffs/static_vision.dm
@@ -0,0 +1,29 @@
+/datum/status_effect/static_vision
+ id = "static_vision"
+ status_type = STATUS_EFFECT_REPLACE
+ alert_type = null
+
+/datum/status_effect/static_vision/on_creation(mob/living/new_owner, duration = 3 SECONDS)
+ src.duration = duration
+ return ..()
+
+/datum/status_effect/static_vision/on_apply()
+ RegisterSignal(owner, COMSIG_LIVING_DEATH, PROC_REF(remove_static_vision))
+
+ owner.overlay_fullscreen(id, /atom/movable/screen/fullscreen/static_vision)
+ owner.sound_environment_override = SOUND_ENVIRONMENT_UNDERWATER
+
+ return TRUE
+
+/datum/status_effect/static_vision/on_remove()
+ UnregisterSignal(owner, COMSIG_LIVING_DEATH)
+
+ owner.clear_fullscreen(id)
+ if(owner.sound_environment_override == SOUND_ENVIRONMENT_UNDERWATER)
+ owner.sound_environment_override = SOUND_ENVIRONMENT_NONE
+
+/// Handles clearing on death
+/datum/status_effect/static_vision/proc/remove_static_vision(datum/source, admin_revive)
+ SIGNAL_HANDLER
+
+ qdel(src)
diff --git a/code/datums/wires/explosive.dm b/code/datums/wires/explosive.dm
index 925c9481831..800b5b88444 100644
--- a/code/datums/wires/explosive.dm
+++ b/code/datums/wires/explosive.dm
@@ -151,4 +151,4 @@
/datum/wires/explosive/gibtonite/explode()
var/obj/item/gibtonite/P = holder
- P.GibtoniteReaction(null, 2)
+ P.GibtoniteReaction(null, "A wire signal has primed a")
diff --git a/code/datums/wounds/_wounds.dm b/code/datums/wounds/_wounds.dm
index faf1ef87057..89b7ba5762b 100644
--- a/code/datums/wounds/_wounds.dm
+++ b/code/datums/wounds/_wounds.dm
@@ -290,7 +290,7 @@
. = limb
if(limb) // if we're nulling limb, we're basically detaching from it, so we should remove ourselves in that case
UnregisterSignal(limb, COMSIG_QDELETING)
- UnregisterSignal(limb, list(COMSIG_BODYPART_GAUZED, COMSIG_BODYPART_GAUZE_DESTROYED))
+ UnregisterSignal(limb, list(COMSIG_BODYPART_GAUZED, COMSIG_BODYPART_UNGAUZED))
LAZYREMOVE(limb.wounds, src)
limb.update_wounds(replaced)
if (disabling)
@@ -302,7 +302,7 @@
if (limb)
RegisterSignal(limb, COMSIG_QDELETING, PROC_REF(source_died))
- RegisterSignals(limb, list(COMSIG_BODYPART_GAUZED, COMSIG_BODYPART_GAUZE_DESTROYED), PROC_REF(gauze_state_changed))
+ RegisterSignals(limb, list(COMSIG_BODYPART_GAUZED, COMSIG_BODYPART_UNGAUZED), PROC_REF(gauze_state_changed))
if (disabling)
limb.add_traits(list(TRAIT_PARALYSIS, TRAIT_DISABLED_BY_WOUND), REF(src))
@@ -442,7 +442,7 @@
set_interaction_efficiency_penalty(initial(interaction_efficiency_penalty))
if(initial(disabling))
- set_disabling(!limb.current_gauze)
+ set_disabling(isnull(limb.current_gauze))
limb.update_wounds(replaced_or_replacing)
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 4912a69f7b8..c2c67edf097 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -129,6 +129,11 @@
var/base_pixel_x = 0
///Default pixel y shifting for the atom's icon.
var/base_pixel_y = 0
+ // Use SET_BASE_VISUAL_PIXEL(x, y) to set these in typepath definitions, it'll handle pixel_w and z for you
+ ///Default pixel w shifting for the atom's icon.
+ var/base_pixel_w = 0
+ ///Default pixel z shifting for the atom's icon.
+ var/base_pixel_z = 0
///Used for changing icon states for different base sprites.
var/base_icon_state
@@ -318,6 +323,8 @@
/atom/proc/CanPass(atom/movable/mover, border_dir)
SHOULD_CALL_PARENT(TRUE)
SHOULD_BE_PURE(TRUE)
+ if(SEND_SIGNAL(src, COMSIG_ATOM_TRIED_PASS, mover, border_dir) & COMSIG_COMPONENT_PERMIT_PASSAGE)
+ return TRUE
if(mover.movement_type & PHASING)
return TRUE
. = CanAllowThrough(mover, border_dir)
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets.dm b/code/game/gamemodes/dynamic/dynamic_rulesets.dm
index a1c4c9232e2..1fe34273fb9 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets.dm
@@ -33,6 +33,7 @@
JOB_DETECTIVE,
JOB_HEAD_OF_SECURITY,
JOB_SECURITY_OFFICER,
+ JOB_WARDEN,
)
/// If enemy_roles was set, this is the amount of enemy job workers needed per threat_level range (0-10,10-20,etc) IMPORTANT: DOES NOT WORK ON ROUNDSTART RULESETS.
var/required_enemies = list(1,1,0,0,0,0,0,0,0,0)
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
index 91f82f29f1c..0634c44a4f2 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
@@ -52,42 +52,50 @@
dead_players = trim_list(GLOB.dead_player_list)
list_observers = trim_list(GLOB.current_observers_list)
-/datum/dynamic_ruleset/midround/proc/trim_list(list/L = list())
- var/list/trimmed_list = L.Copy()
- for(var/mob/M in trimmed_list)
- if (!istype(M, required_type))
- trimmed_list.Remove(M)
+/datum/dynamic_ruleset/midround/proc/trim_list(list/to_trim = list())
+ var/list/trimmed_list = to_trim.Copy()
+ for(var/mob/creature in trimmed_list)
+ if (!istype(creature, required_type))
+ trimmed_list.Remove(creature)
continue
- if (!M.client) // Are they connected?
- trimmed_list.Remove(M)
+ if (isnull(creature.client)) // Are they connected?
+ trimmed_list.Remove(creature)
+ continue
+ if (isnull(creature.mind))
+ trimmed_list.Remove(creature)
continue
//SKYRAT EDIT ADDITION
- if(is_banned_from(M.client.ckey, BAN_ANTAGONIST))
- trimmed_list.Remove(M)
+ if(is_banned_from(creature.client.ckey, BAN_ANTAGONIST))
+ trimmed_list.Remove(creature)
continue
- if(!M.client?.prefs?.read_preference(/datum/preference/toggle/be_antag))
- trimmed_list.Remove(M)
+ if(!creature.client?.prefs?.read_preference(/datum/preference/toggle/be_antag))
+ trimmed_list.Remove(creature)
continue
//SKYRAT EDIT END
- if(M.client.get_remaining_days(minimum_required_age) > 0)
- trimmed_list.Remove(M)
+ if(creature.client.get_remaining_days(minimum_required_age) > 0)
+ trimmed_list.Remove(creature)
continue
- if (!((antag_preference || antag_flag) in M.client.prefs.be_special))
- trimmed_list.Remove(M)
+ if (!((antag_preference || antag_flag) in creature.client.prefs.be_special))
+ trimmed_list.Remove(creature)
continue
- if (is_banned_from(M.ckey, list(antag_flag_override || antag_flag, ROLE_SYNDICATE)))
- trimmed_list.Remove(M)
+ if (is_banned_from(creature.ckey, list(antag_flag_override || antag_flag, ROLE_SYNDICATE)))
+ trimmed_list.Remove(creature)
+ continue
+ if (restrict_ghost_roles && (creature.mind.assigned_role.title in GLOB.exp_specialmap[EXP_TYPE_SPECIAL])) // Are they playing a ghost role?
+ trimmed_list.Remove(creature)
+ continue
+ if (creature.mind.assigned_role.title in restricted_roles) // Does their job allow it?
+ trimmed_list.Remove(creature)
+ continue
+ if (length(exclusive_roles) && !(creature.mind.assigned_role.title in exclusive_roles)) // Is the rule exclusive to their job?
+ trimmed_list.Remove(creature)
+ continue
+ if(HAS_TRAIT(creature, TRAIT_MIND_TEMPORARILY_GONE)) // are they out of body?
+ trimmed_list.Remove(creature)
+ continue
+ if(HAS_TRAIT(creature, TRAIT_TEMPORARY_BODY)) // are they an avatar?
+ trimmed_list.Remove(creature)
continue
- if (M.mind)
- if (restrict_ghost_roles && (M.mind.assigned_role.title in GLOB.exp_specialmap[EXP_TYPE_SPECIAL])) // Are they playing a ghost role?
- trimmed_list.Remove(M)
- continue
- if (M.mind.assigned_role.title in restricted_roles) // Does their job allow it?
- trimmed_list.Remove(M)
- continue
- if ((exclusive_roles.len > 0) && !(M.mind.assigned_role.title in exclusive_roles)) // Is the rule exclusive to their job?
- trimmed_list.Remove(M)
- continue
return trimmed_list
// You can then for example prompt dead players in execute() to join as strike teams or whatever
@@ -366,6 +374,7 @@
JOB_DETECTIVE,
JOB_HEAD_OF_SECURITY,
JOB_SECURITY_OFFICER,
+ JOB_WARDEN,
)
required_enemies = list(3,3,3,3,3,2,1,1,0,0)
required_candidates = 5
@@ -873,6 +882,7 @@
JOB_DETECTIVE,
JOB_HEAD_OF_SECURITY,
JOB_SECURITY_OFFICER,
+ JOB_WARDEN,
)
required_enemies = list(2, 2, 1, 1, 1, 1, 1, 0, 0, 0)
required_candidates = 1
diff --git a/code/game/machinery/computer/operating_computer.dm b/code/game/machinery/computer/operating_computer.dm
index f7b0ef24ffd..3b639a9ce57 100644
--- a/code/game/machinery/computer/operating_computer.dm
+++ b/code/game/machinery/computer/operating_computer.dm
@@ -25,11 +25,15 @@
if(!CONFIG_GET(flag/no_default_techweb_link) && !linked_techweb)
CONNECT_TO_RND_SERVER_ROUNDSTART(linked_techweb, src)
- experiment_handler = AddComponent( \
+ var/list/operating_signals = list(
+ COMSIG_OPERATING_COMPUTER_AUTOPSY_COMPLETE = TYPE_PROC_REF(/datum/component/experiment_handler, try_run_autopsy_experiment),
+ )
+ experiment_handler = AddComponent(
/datum/component/experiment_handler, \
allowed_experiments = list(/datum/experiment/autopsy), \
config_flags = EXPERIMENT_CONFIG_ALWAYS_ACTIVE, \
config_mode = EXPERIMENT_CONFIG_ALTCLICK, \
+ experiment_signals = operating_signals, \
)
/obj/machinery/computer/operating/Destroy()
diff --git a/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm b/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm
index dae527c3e6b..2d524e19042 100644
--- a/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm
+++ b/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm
@@ -394,6 +394,15 @@
reagents.expose(smoker, INGEST, fraction)
return TRUE
+/// Helper to quickly create a cloud of reagent smoke
+/proc/do_chem_smoke(range = 0, amount = DIAMOND_AREA(range), atom/holder = null, location = null, reagent_type = /datum/reagent/water, reagent_volume = 10, log = FALSE)
+ var/datum/reagents/smoke_reagents = new/datum/reagents(reagent_volume)
+ smoke_reagents.add_reagent(reagent_type, reagent_volume)
+
+ var/datum/effect_system/fluid_spread/smoke/chem/smoke = new
+ smoke.attach(location)
+ smoke.set_up(amount = amount, holder = holder, location = location, carry = smoke_reagents, silent = TRUE)
+ smoke.start(log = log)
/// A factory which produces clouds of chemical bearing smoke.
/datum/effect_system/fluid_spread/smoke/chem
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 2c4a594b806..4e5b36bf5e8 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -84,6 +84,10 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
name = "Cargo Technician"
icon_state = "Cargo Technician"
+/obj/effect/landmark/start/bitrunner
+ name = "Bitrunner"
+ icon_state = "x3"
+
/obj/effect/landmark/start/bartender
name = "Bartender"
icon_state = "Bartender"
diff --git a/code/game/objects/effects/spawners/random/entertainment.dm b/code/game/objects/effects/spawners/random/entertainment.dm
index 18876dfc927..1c635f07a5a 100644
--- a/code/game/objects/effects/spawners/random/entertainment.dm
+++ b/code/game/objects/effects/spawners/random/entertainment.dm
@@ -271,7 +271,6 @@
/obj/item/toy/plush/carpplushie = 3,
/obj/item/toy/plush/lizard_plushie/green = 3,
/obj/item/toy/plush/lizard_plushie/space/green = 3,
- /obj/item/toy/plush/awakenedplushie = 3,
/obj/item/toy/plush/goatplushie = 3,
/obj/item/toy/plush/rouny = 3,
/obj/item/toy/plush/abductor = 3,
diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm
index f04c6e0058f..0338da6b4fa 100644
--- a/code/game/objects/items/circuitboards/computer_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm
@@ -540,6 +540,10 @@
name = "Golem Ship Equipment Vendor Console"
build_path = /obj/machinery/computer/order_console/mining/golem
+/obj/item/circuitboard/computer/order_console/bitrunning
+ name = "Bitrunning Vendor Console"
+ build_path = /obj/machinery/computer/order_console/bitrunning
+
/obj/item/circuitboard/computer/ferry
name = "Transport Ferry"
greyscale_colors = CIRCUIT_COLOR_SUPPLY
@@ -601,3 +605,8 @@
name = "Medical Order"
greyscale_colors = CIRCUIT_COLOR_SUPPLY
build_path = /obj/machinery/computer/department_orders/medical
+
+/obj/item/circuitboard/computer/quantum_console
+ name = "Quantum Server Console"
+ greyscale_colors = CIRCUIT_COLOR_SUPPLY
+ build_path = /obj/machinery/computer/quantum_console
diff --git a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
index dae27c175b4..9ece80f0940 100644
--- a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
@@ -1309,6 +1309,15 @@
req_components = list(
/datum/stock_part/card_reader = 1)
+/obj/item/circuitboard/machine/fishing_portal_generator
+ name = "Fishing Portal Generator"
+ greyscale_colors = CIRCUIT_COLOR_SERVICE
+ build_path = /obj/machinery/fishing_portal_generator
+ req_components = list(
+ /datum/stock_part/matter_bin = 2,
+ /datum/stock_part/capacitor = 1)
+ needs_anchored = FALSE
+
//Supply
/obj/item/circuitboard/machine/ore_redemption
name = "Ore Redemption"
@@ -1357,16 +1366,14 @@
greyscale_colors = CIRCUIT_COLOR_SUPPLY
build_path = /obj/machinery/rnd/production/techfab/department/cargo
-/obj/item/circuitboard/machine/bepis
- name = "BEPIS Chamber"
+/obj/item/circuitboard/machine/materials_market
+ name = "Galactic Materials Market"
greyscale_colors = CIRCUIT_COLOR_SUPPLY
- build_path = /obj/machinery/rnd/bepis
+ build_path = /obj/machinery/materials_market
req_components = list(
/obj/item/stack/cable_coil = 5,
- /datum/stock_part/capacitor = 1,
- /datum/stock_part/servo = 1,
- /datum/stock_part/micro_laser = 1,
- /datum/stock_part/scanning_module = 1)
+ /datum/stock_part/scanning_module = 1,
+ /datum/stock_part/card_reader = 1)
//Misc
/obj/item/circuitboard/machine/sheetifier
@@ -1527,3 +1534,22 @@
/obj/item/mod/module/rad_protection = 1,
/obj/item/stack/sheet/plasteel = 2,
)
+
+/obj/item/circuitboard/machine/quantum_server
+ name = "Quantum Server"
+ greyscale_colors = CIRCUIT_COLOR_SUPPLY
+ build_path = /obj/machinery/quantum_server
+ req_components = list(
+ /datum/stock_part/servo = 2,
+ /datum/stock_part/scanning_module = 1,
+ /datum/stock_part/capacitor = 1,
+ )
+
+/obj/item/circuitboard/machine/netpod
+ name = "Netpod"
+ greyscale_colors = CIRCUIT_COLOR_SUPPLY
+ build_path = /obj/machinery/netpod
+ req_components = list(
+ /datum/stock_part/servo = 1,
+ /datum/stock_part/matter_bin = 2,
+ )
diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index 77b76d85224..eab3f34d343 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -584,6 +584,7 @@
squeak_override = list('sound/effects/blobattack.ogg' = 1)
gender = FEMALE //given all the jokes and drawings, I'm not sure the xenobiologists would make a slimeboy
+// This is supposed to be only in the bus ruin, don't spawn it elsewhere
/obj/item/toy/plush/awakenedplushie
name = "awakened plushie"
desc = "An ancient plushie that has grown enlightened to the true nature of reality."
diff --git a/code/game/objects/items/stacks/golem_food/golem_hand_actions.dm b/code/game/objects/items/stacks/golem_food/golem_hand_actions.dm
index fc87d094477..39c17d2346c 100644
--- a/code/game/objects/items/stacks/golem_food/golem_hand_actions.dm
+++ b/code/game/objects/items/stacks/golem_food/golem_hand_actions.dm
@@ -35,7 +35,7 @@
playsound(src, 'sound/weapons/sonic_jackhammer.ogg', 50, TRUE)
held_gibtonite.forceMove(get_turf(src))
held_gibtonite.det_time = 2 SECONDS
- held_gibtonite.GibtoniteReaction(user)
+ held_gibtonite.GibtoniteReaction(user, "A [src] has targeted [target] with a thrown and primed")
held_gibtonite.throw_at(target, range = 10, speed = 3, thrower = user)
held_gibtonite = null
qdel(src)
@@ -44,7 +44,7 @@
/// Called when you can't hold it in any longer and just drop it on the ground
/obj/item/gibtonite_hand/proc/release_gibtonite()
held_gibtonite.forceMove(get_turf(src))
- held_gibtonite.GibtoniteReaction(isliving(loc) ? loc : null)
+ held_gibtonite.GibtoniteReaction(isliving(loc) ? loc : null, "A [src] has dropped and primed a")
held_gibtonite = null
qdel(src)
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 081ab5d78e0..f4a61f2d7ca 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -159,6 +159,15 @@
splint_factor = 0.7
burn_cleanliness_bonus = 0.35
merge_type = /obj/item/stack/medical/gauze
+ var/obj/item/bodypart/gauzed_bodypart
+
+/obj/item/stack/medical/gauze/Destroy(force)
+ . = ..()
+
+ if (gauzed_bodypart)
+ gauzed_bodypart.current_gauze = null
+ SEND_SIGNAL(gauzed_bodypart, COMSIG_BODYPART_UNGAUZED, src)
+ gauzed_bodypart = null
// gauze is only relevant for wounds, which are handled in the wounds themselves
/obj/item/stack/medical/gauze/try_heal(mob/living/patient, mob/user, silent)
@@ -474,3 +483,27 @@
/obj/item/stack/medical/poultice/post_heal_effects(amount_healed, mob/living/carbon/healed_mob, mob/user)
. = ..()
healed_mob.adjustOxyLoss(amount_healed)
+
+/obj/item/stack/medical/bandage
+ name = "first aid bandage"
+ desc = "A DeForest brand bandage designed for basic first aid on blunt-force trauma."
+ icon_state = "bandage"
+ inhand_icon_state = "bandage"
+ novariants = TRUE
+ amount = 1
+ max_amount = 1
+ lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+ heal_brute = 25
+ stop_bleeding = 0.2
+ self_delay = 3 SECONDS
+ other_delay = 1 SECONDS
+ grind_results = list(/datum/reagent/medicine/c2/libital = 2)
+
+/obj/item/stack/medical/bandage/makeshift
+ name = "makeshift bandage"
+ desc = "A hastily constructed bandage designed for basic first aid on blunt-force trauma."
+ icon_state = "bandage_makeshift"
+ icon_state_preview = "bandage_makeshift"
+ inhand_icon_state = "bandage"
+ novariants = TRUE
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 381cdd7a296..1ad86868212 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -609,7 +609,8 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
new /datum/stack_recipe("light bulbs box", /obj/item/storage/box/lights/bulbs, check_density = FALSE, category = CAT_CONTAINERS), \
new /datum/stack_recipe("mixed lights box", /obj/item/storage/box/lights/mixed, check_density = FALSE, category = CAT_CONTAINERS), \
new /datum/stack_recipe("mouse traps box", /obj/item/storage/box/mousetraps, check_density = FALSE, category = CAT_CONTAINERS), \
- new /datum/stack_recipe("candle box", /obj/item/storage/fancy/candle_box, check_density = FALSE, category = CAT_CONTAINERS)
+ new /datum/stack_recipe("candle box", /obj/item/storage/fancy/candle_box, check_density = FALSE, category = CAT_CONTAINERS), \
+ new /datum/stack_recipe("bandage box", /obj/item/storage/box/bandages, check_density = FALSE, category = CAT_CONTAINERS)
)),
null, \
diff --git a/code/game/objects/items/storage/boxes/medical_boxes.dm b/code/game/objects/items/storage/boxes/medical_boxes.dm
index ad0fd9b37f5..ff4b232454c 100644
--- a/code/game/objects/items/storage/boxes/medical_boxes.dm
+++ b/code/game/objects/items/storage/boxes/medical_boxes.dm
@@ -129,3 +129,43 @@
/obj/item/reagent_containers/cup/beaker/meta/rezadone = 1,
)
generate_items_inside(items_inside, src)
+
+/obj/item/storage/box/bandages
+ name = "box of bandages"
+ desc = "A box of DeForest brand gel bandages designed to treat blunt-force trauma."
+ icon = 'icons/obj/storage/box.dmi' // SKYRAT EDIT CHANGE
+ icon_state = "brutebox"
+ base_icon_state = "brutebox"
+ inhand_icon_state = "brutebox"
+ lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+ drop_sound = 'sound/items/handling/matchbox_drop.ogg'
+ pickup_sound = 'sound/items/handling/matchbox_pickup.ogg'
+ illustration = null
+ w_class = WEIGHT_CLASS_SMALL
+ custom_price = PAYCHECK_CREW * 1.75
+
+/obj/item/storage/box/bandages/Initialize(mapload)
+ . = ..()
+ atom_storage.max_slots = 6
+ atom_storage.set_holdable(list(
+ /obj/item/stack/medical/bandage,
+ /obj/item/reagent_containers/pill,
+ /obj/item/reagent_containers/pill/patch,
+ ))
+
+/obj/item/storage/box/bandages/PopulateContents()
+ for(var/i in 1 to 5)
+ new /obj/item/stack/medical/bandage(src)
+
+/obj/item/storage/box/bandages/update_icon_state()
+ . = ..()
+ switch(length(contents))
+ if(5)
+ icon_state = "[base_icon_state]_f"
+ if(3 to 4)
+ icon_state = "[base_icon_state]_almostfull"
+ if(1 to 2)
+ icon_state = "[base_icon_state]_almostempty"
+ if(0)
+ icon_state = base_icon_state
diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm
index d47c4ceaff1..25eeb558040 100644
--- a/code/game/objects/items/storage/holsters.dm
+++ b/code/game/objects/items/storage/holsters.dm
@@ -36,6 +36,8 @@
/obj/item/food/grown/banana,
/obj/item/gun/energy/laser/thermal,
/obj/item/gun/ballistic/rifle/boltaction, //fits if you make it an obrez
+ /obj/item/gun/energy/laser/captain,
+ /obj/item/gun/energy/e_gun/hos,
))
/obj/item/storage/belt/holster/energy
@@ -53,6 +55,8 @@
/obj/item/food/grown/banana,
/obj/item/gun/energy/laser/thermal,
/obj/item/gun/energy/recharge/ebow,
+ /obj/item/gun/energy/laser/captain,
+ /obj/item/gun/energy/e_gun/hos,
))
/obj/item/storage/belt/holster/energy/thermal
@@ -106,6 +110,8 @@
/obj/item/gun/energy/disabler,
/obj/item/gun/energy/dueling,
/obj/item/gun/energy/laser/thermal,
+ /obj/item/gun/energy/laser/captain,
+ /obj/item/gun/energy/e_gun/hos,
/obj/item/gun/ballistic/rifle/boltaction, //fits if you make it an obrez
))
@@ -156,7 +162,9 @@
/obj/item/gun/energy/recharge/ebow,
/obj/item/gun/energy/e_gun/mini,
/obj/item/gun/energy/disabler,
- /obj/item/gun/energy/dueling
+ /obj/item/gun/energy/dueling,
+ /obj/item/gun/energy/laser/captain,
+ /obj/item/gun/energy/e_gun/hos,
))
atom_storage.silent = TRUE
diff --git a/code/game/objects/items/storage/medkit.dm b/code/game/objects/items/storage/medkit.dm
index 6ca84e415e0..4b08d1551a3 100644
--- a/code/game/objects/items/storage/medkit.dm
+++ b/code/game/objects/items/storage/medkit.dm
@@ -34,6 +34,7 @@
/obj/item/reagent_containers/medigel,
/obj/item/reagent_containers/spray,
/obj/item/lighter,
+ /obj/item/storage/box/bandages,
/obj/item/storage/fancy/cigarettes,
/obj/item/storage/pill_bottle,
/obj/item/stack/medical,
@@ -288,18 +289,19 @@
if(empty)
return
var/static/list/items_inside = list(
+ /obj/item/cautery = 1,
+ /obj/item/scalpel = 1,
+ /obj/item/healthanalyzer/advanced = 1,
+ /obj/item/hemostat = 1,
+ /obj/item/reagent_containers/medigel/sterilizine = 1,
+ /obj/item/storage/box/bandages = 1,
+ /obj/item/surgical_drapes = 1,
+ /obj/item/reagent_containers/hypospray/medipen/atropine = 2,
+ /obj/item/stack/medical/gauze = 2,
/obj/item/stack/medical/suture/medicated = 2,
/obj/item/stack/medical/mesh/advanced = 2,
/obj/item/reagent_containers/pill/patch/libital = 4,
/obj/item/reagent_containers/pill/patch/aiuri = 4,
- /obj/item/healthanalyzer/advanced = 1,
- /obj/item/stack/medical/gauze = 2,
- /obj/item/reagent_containers/hypospray/medipen/atropine = 2,
- /obj/item/reagent_containers/medigel/sterilizine = 1,
- /obj/item/surgical_drapes = 1,
- /obj/item/scalpel = 1,
- /obj/item/hemostat = 1,
- /obj/item/cautery = 1,
)
generate_items_inside(items_inside,src)
@@ -332,6 +334,7 @@
/obj/item/mod/module/health_analyzer = 1,
/obj/item/autosurgeon/syndicate/emaggedsurgerytoolset = 1,
/obj/item/reagent_containers/hypospray/combat/empty = 1,
+ /obj/item/storage/box/bandages = 1,
/obj/item/storage/box/evilmeds = 1,
/obj/item/reagent_containers/medigel/sterilizine = 1,
/obj/item/clothing/glasses/hud/health/night/science = 1,
diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm
index 7f9dab59a46..f88ba15ecc5 100644
--- a/code/game/objects/structures/railings.dm
+++ b/code/game/objects/structures/railings.dm
@@ -8,6 +8,8 @@
density = TRUE
anchored = TRUE
pass_flags_self = LETPASSTHROW|PASSSTRUCTURE
+ layer = ABOVE_MOB_LAYER
+ plane = GAME_PLANE_UPPER
/// armor is a little bit less than a grille. max_integrity about half that of a grille.
armor_type = /datum/armor/structure_railing
max_integrity = 25
diff --git a/code/modules/antagonists/blob/blob_minion.dm b/code/modules/antagonists/blob/blob_minion.dm
index 9ba8e7089b9..9bf37e961d5 100644
--- a/code/modules/antagonists/blob/blob_minion.dm
+++ b/code/modules/antagonists/blob/blob_minion.dm
@@ -34,9 +34,3 @@
objective.owner = owner
objective.overmind = overmind
objectives += objective
-
-/datum/antagonist/blob_minion/blobbernaut
- name = "\improper Blobbernaut"
-
-/datum/antagonist/blob_minion/blob_zombie
- name = "\improper Blob Zombie"
diff --git a/code/modules/antagonists/blob/blobstrains/_blobstrain.dm b/code/modules/antagonists/blob/blobstrains/_blobstrain.dm
index 6225eec9da9..6f01eb67aa7 100644
--- a/code/modules/antagonists/blob/blobstrains/_blobstrain.dm
+++ b/code/modules/antagonists/blob/blobstrains/_blobstrain.dm
@@ -96,12 +96,12 @@ GLOBAL_LIST_INIT(valid_blobstrains, subtypesof(/datum/blobstrain) - list(/datum/
B.modify_max_integrity(B.max_integrity * max_structure_health_multiplier)
B.update_appearance()
- for(var/mob/living/simple_animal/hostile/blob/BM as anything in overmind.blob_mobs)
- BM.maxHealth *= max_mob_health_multiplier
- BM.health *= max_mob_health_multiplier
- BM.update_icons() //If it's getting a new strain, tell it what it does!
- to_chat(BM, "Your overmind's blob strain is now: [name]!")
- to_chat(BM, "The [name] strain [shortdesc ? "[shortdesc]" : "[description]"]")
+ for(var/mob/living/blob_mob as anything in overmind.blob_mobs)
+ blob_mob.maxHealth *= max_mob_health_multiplier
+ blob_mob.health *= max_mob_health_multiplier
+ blob_mob.update_icons() //If it's getting a new strain, tell it what it does!
+ to_chat(blob_mob, "Your overmind's blob strain is now: [name]!")
+ to_chat(blob_mob, "The [name] strain [shortdesc ? "[shortdesc]" : "[description]"]")
/datum/blobstrain/proc/on_lose()
if(overmind.blob_core)
@@ -122,9 +122,9 @@ GLOBAL_LIST_INIT(valid_blobstrains, subtypesof(/datum/blobstrain) - list(/datum/
for(var/obj/structure/blob/B as anything in overmind.all_blobs)
B.modify_max_integrity(B.max_integrity / max_structure_health_multiplier)
- for(var/mob/living/simple_animal/hostile/blob/BM as anything in overmind.blob_mobs)
- BM.maxHealth /= max_mob_health_multiplier
- BM.health /= max_mob_health_multiplier
+ for(var/mob/living/blob_mob as anything in overmind.blob_mobs)
+ blob_mob.maxHealth /= max_mob_health_multiplier
+ blob_mob.health /= max_mob_health_multiplier
/datum/blobstrain/proc/on_sporedeath(mob/living/spore)
diff --git a/code/modules/antagonists/blob/blobstrains/_reagent.dm b/code/modules/antagonists/blob/blobstrains/_reagent.dm
index aefd6c02f3c..05bc73f95c8 100644
--- a/code/modules/antagonists/blob/blobstrains/_reagent.dm
+++ b/code/modules/antagonists/blob/blobstrains/_reagent.dm
@@ -15,8 +15,9 @@
var/mob_protection = L.getarmor(null, BIO) * 0.01
reagent.expose_mob(L, VAPOR, BLOBMOB_BLOBBERNAUT_REAGENTATK_VOL+blobbernaut_reagentatk_bonus, FALSE, mob_protection, overmind)//this will do between 10 and 20 damage(reduced by mob protection), depending on chemical, plus 4 from base brute damage.
-/datum/blobstrain/reagent/on_sporedeath(mob/living/spore)
- spore.reagents.add_reagent(reagent.type, 10)
+/datum/blobstrain/reagent/on_sporedeath(mob/living/basic/spore)
+ var/burst_range = (spore.type == /mob/living/basic/blob_minion/spore) ? 1 : 0
+ do_chem_smoke(range = burst_range, holder = spore, location = get_turf(spore), reagent_type = reagent.type)
// These can only be applied by blobs. They are what (reagent) blobs are made out of.
/datum/reagent/blob
@@ -29,7 +30,7 @@
/// Used by blob reagents to calculate the reaction volume they should use when exposing mobs.
/datum/reagent/blob/proc/return_mob_expose_reac_volume(mob/living/exposed_mob, methods=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/overmind)
- if(exposed_mob.stat == DEAD || isblobmonster(exposed_mob))
+ if(exposed_mob.stat == DEAD || HAS_TRAIT(exposed_mob, TRAIT_BLOB_ALLY))
return 0 //the dead, and blob mobs, don't cause reactions
return round(reac_volume * min(1.5 - touch_protection, 1), 0.1) //full touch protection means 50% volume, any prot below 0.5 means 100% volume.
diff --git a/code/modules/antagonists/blob/blobstrains/distributed_neurons.dm b/code/modules/antagonists/blob/blobstrains/distributed_neurons.dm
index f97599948a1..ea2bf54d769 100644
--- a/code/modules/antagonists/blob/blobstrains/distributed_neurons.dm
+++ b/code/modules/antagonists/blob/blobstrains/distributed_neurons.dm
@@ -11,18 +11,16 @@
message_living = ", and you feel tired"
reagent = /datum/reagent/blob/distributed_neurons
-/datum/blobstrain/reagent/distributed_neurons/damage_reaction(obj/structure/blob/B, damage, damage_type, damage_flag)
- if((damage_flag == MELEE || damage_flag == BULLET || damage_flag == LASER) && damage <= 20 && B.get_integrity() - damage <= 0 && prob(15)) //if the cause isn't fire or a bomb, the damage is less than 21, we're going to die from that damage, 15% chance of a shitty spore.
- B.visible_message(span_warning("A spore floats free of the blob!"))
- var/mob/living/simple_animal/hostile/blob/blobspore/weak/BS = new/mob/living/simple_animal/hostile/blob/blobspore/weak(B.loc)
- BS.overmind = B.overmind
- BS.update_icons()
- B.overmind.blob_mobs.Add(BS)
+/datum/blobstrain/reagent/distributed_neurons/damage_reaction(obj/structure/blob/blob_tile, damage, damage_type, damage_flag)
+ if((damage_flag == MELEE || damage_flag == BULLET || damage_flag == LASER) && damage <= 20 && blob_tile.get_integrity() - damage <= 0 && prob(15)) //if the cause isn't fire or a bomb, the damage is less than 21, we're going to die from that damage, 15% chance of a shitty spore.
+ blob_tile.visible_message(span_boldwarning("A spore floats free of the blob!"))
+ blob_tile.overmind.create_spore(blob_tile.loc, /mob/living/basic/blob_minion/spore/minion/weak)
return ..()
/datum/reagent/blob/distributed_neurons
name = "Distributed Neurons"
color = "#E88D5D"
+ taste_description = "fizzing"
/datum/reagent/blob/distributed_neurons/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/overmind)
. = ..()
@@ -33,10 +31,7 @@
exposed_mob.investigate_log("has been killed by distributed neurons (blob).", INVESTIGATE_DEATHS)
exposed_mob.death() //sleeping in a fight? bad plan.
if(exposed_mob.stat == DEAD && overmind.can_buy(5))
- var/mob/living/simple_animal/hostile/blob/blobspore/spore = new/mob/living/simple_animal/hostile/blob/blobspore(get_turf(exposed_mob))
- spore.overmind = overmind
- spore.update_icons()
- overmind.blob_mobs.Add(spore)
+ var/mob/living/basic/blob_minion/spore/minion/spore = overmind.create_spore(get_turf(exposed_mob))
spore.zombify(exposed_mob)
overmind.add_points(-5)
to_chat(overmind, span_notice("Spent 5 resources for the zombification of [exposed_mob]."))
diff --git a/code/modules/antagonists/blob/blobstrains/reactive_spines.dm b/code/modules/antagonists/blob/blobstrains/reactive_spines.dm
index 53f336ca419..1c8cb893df8 100644
--- a/code/modules/antagonists/blob/blobstrains/reactive_spines.dm
+++ b/code/modules/antagonists/blob/blobstrains/reactive_spines.dm
@@ -16,15 +16,15 @@
if(damage && ((damage_type == BRUTE) || (damage_type == BURN)) && B.get_integrity() - damage > 0 && COOLDOWN_FINISHED(src, retaliate_cooldown)) // Is there any damage, is it burn or brute, will we be alive, and has the cooldown finished?
COOLDOWN_START(src, retaliate_cooldown, 2.5 SECONDS) // 2.5 seconds before auto-retaliate can whack everything within 1 tile again
B.visible_message(span_boldwarning("The blob retaliates, lashing out!"))
- for(var/atom/A in range(1, B))
- if(!A.can_blob_attack())
+ for(var/atom/thing in range(1, B))
+ if(!thing.can_blob_attack())
continue
- var/attacked_turf = get_turf(A)
- if(isliving(A) && !isblobmonster(A)) // Make sure to inject strain-reagents with automatic attacks when needed.
+ var/attacked_turf = get_turf(thing)
+ if(isliving(thing) && !HAS_TRAIT(thing, TRAIT_BLOB_ALLY)) // Make sure to inject strain-reagents with automatic attacks when needed.
B.blob_attack_animation(attacked_turf, overmind)
- attack_living(A)
+ attack_living(thing)
- else if(A.blob_act(B)) // After checking for mobs, whack everything else with the standard attack
+ else if(thing.blob_act(B)) // After checking for mobs, whack everything else with the standard attack
B.blob_attack_animation(attacked_turf, overmind) // Only play the animation if the attack did something meaningful
return ..()
@@ -35,7 +35,7 @@
color = "#9ACD32"
/datum/reagent/blob/reactive_spines/return_mob_expose_reac_volume(mob/living/exposed_mob, methods=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/overmind)
- if(exposed_mob.stat == DEAD || isblobmonster(exposed_mob))
+ if(exposed_mob.stat == DEAD || HAS_TRAIT(exposed_mob, TRAIT_BLOB_ALLY))
return 0 //the dead, and blob mobs, don't cause reactions
return reac_volume
diff --git a/code/modules/antagonists/blob/overmind.dm b/code/modules/antagonists/blob/overmind.dm
index 70a1e69e1e3..38e88817de2 100644
--- a/code/modules/antagonists/blob/overmind.dm
+++ b/code/modules/antagonists/blob/overmind.dm
@@ -54,6 +54,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
var/list/strain_choices
/mob/camera/blob/Initialize(mapload, starting_points = OVERMIND_STARTING_POINTS)
+ ADD_TRAIT(src, TRAIT_BLOB_ALLY, INNATE_TRAIT)
validate_location()
blob_points = starting_points
manualplace_min_time += world.time
@@ -71,6 +72,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
SSshuttle.registerHostileEnvironment(src)
. = ..()
START_PROCESSING(SSobj, src)
+ GLOB.blob_telepathy_mobs |= src
/mob/camera/blob/proc/validate_location()
var/turf/T = get_turf(src)
@@ -112,6 +114,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
to_chat(src, span_notice("The [blobstrain.name] strain [blobstrain.description]"))
if(blobstrain.effectdesc)
to_chat(src, span_notice("The [blobstrain.name] strain [blobstrain.effectdesc]"))
+ SEND_SIGNAL(src, COMSIG_BLOB_SELECTED_STRAIN, blobstrain)
/mob/camera/blob/can_z_move(direction, turf/start, turf/destination, z_move_flags = NONE, mob/living/rider)
if(placed) // The blob can't expand vertically (yet)
@@ -162,50 +165,70 @@ GLOBAL_LIST_EMPTY(blob_nodes)
priority_announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", ANNOUNCER_OUTBREAK5)
has_announced = TRUE
+/// Create a blob spore and link it to us
+/mob/camera/blob/proc/create_spore(turf/spore_turf, spore_type = /mob/living/basic/blob_minion/spore/minion)
+ var/mob/living/basic/blob_minion/spore/spore = new spore_type(spore_turf)
+ assume_direct_control(spore)
+ return spore
+
+/// Give our new minion the properties of a minion
+/mob/camera/blob/proc/assume_direct_control(mob/living/minion)
+ minion.AddComponent(/datum/component/blob_minion, src)
+
+/// Add something to our list of mobs and wait for it to die
+/mob/camera/blob/proc/register_new_minion(mob/living/minion)
+ blob_mobs |= minion
+ if (!istype(minion, /mob/living/basic/blob_minion/blobbernaut))
+ RegisterSignal(minion, COMSIG_LIVING_DEATH, PROC_REF(on_minion_death))
+
+/// When a spore (or zombie) dies then we do this
+/mob/camera/blob/proc/on_minion_death(mob/living/spore)
+ SIGNAL_HANDLER
+ blobstrain.on_sporedeath(spore)
+
/mob/camera/blob/proc/victory()
sound_to_playing_players('sound/machines/alarm.ogg')
sleep(10 SECONDS)
- for(var/i in GLOB.mob_living_list)
- var/mob/living/L = i
- var/turf/T = get_turf(L)
- if(!T || !is_station_level(T.z))
+ for(var/mob/living/live_guy as anything in GLOB.mob_living_list)
+ var/turf/guy_turf = get_turf(live_guy)
+ if(isnull(guy_turf) || !is_station_level(guy_turf.z))
continue
- if(L in GLOB.overminds || (L.pass_flags & PASSBLOB))
+ if(live_guy in GLOB.overminds || (live_guy.pass_flags & PASSBLOB))
continue
- var/area/Ablob = get_area(T)
-
- if(!(Ablob.area_flags & BLOBS_ALLOWED))
+ var/area/blob_area = get_area(guy_turf)
+ if(!(blob_area.area_flags & BLOBS_ALLOWED))
continue
- if(!(ROLE_BLOB in L.faction))
- playsound(L, 'sound/effects/splat.ogg', 50, TRUE)
- if(L.stat != DEAD)
- L.investigate_log("has died from blob takeover.", INVESTIGATE_DEATHS)
- L.death()
- new/mob/living/simple_animal/hostile/blob/blobspore(T)
+ if(!(ROLE_BLOB in live_guy.faction))
+ playsound(live_guy, 'sound/effects/splat.ogg', 50, TRUE)
+ if(live_guy.stat != DEAD)
+ live_guy.investigate_log("has died from blob takeover.", INVESTIGATE_DEATHS)
+ live_guy.death()
+ create_spore(guy_turf)
else
- L.fully_heal()
+ live_guy.fully_heal()
- for(var/area/A in GLOB.areas)
- if(!(A.type in GLOB.the_station_areas))
+ for(var/area/check_area in GLOB.areas)
+ if(!is_type_in_list(check_area, GLOB.the_station_areas))
continue
- if(!(A.area_flags & BLOBS_ALLOWED))
+ if(!(check_area.area_flags & BLOBS_ALLOWED))
continue
- A.color = blobstrain.color
- A.name = "blob"
- A.icon = 'icons/mob/nonhuman-player/blob.dmi'
- A.icon_state = "blob_shield"
- A.layer = BELOW_MOB_LAYER
- A.invisibility = 0
- A.blend_mode = 0
+ check_area.color = blobstrain.color
+ check_area.name = "blob"
+ check_area.icon = 'icons/mob/nonhuman-player/blob.dmi'
+ check_area.icon_state = "blob_shield"
+ check_area.layer = BELOW_MOB_LAYER
+ check_area.invisibility = 0
+ check_area.blend_mode = 0
+
var/datum/antagonist/blob/B = mind.has_antag_datum(/datum/antagonist/blob)
if(B)
var/datum/objective/blob_takeover/main_objective = locate() in B.objectives
if(main_objective)
main_objective.completed = TRUE
- to_chat(world, span_blob("[real_name] consumed the station in an unstoppable tide!"))
+ to_chat(world, span_blobannounce("[real_name] consumed the station in an unstoppable tide!"))
SSticker.news_report = BLOB_WIN
SSticker.force_ending = FORCE_END_ROUND
@@ -216,11 +239,6 @@ GLOBAL_LIST_EMPTY(blob_nodes)
if(B && B.overmind == src)
B.overmind = null
B.update_appearance() //reset anything that was ours
- for(var/BLO in blob_mobs)
- var/mob/living/simple_animal/hostile/blob/BM = BLO
- if(BM)
- BM.overmind = null
- BM.update_icons()
for(var/obj/structure/blob/blob_structure as anything in all_blobs)
blob_structure.overmind = null
all_blobs = null
@@ -233,6 +251,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
SSshuttle.clearHostileEnvironment(src)
STOP_PROCESSING(SSobj, src)
+ GLOB.blob_telepathy_mobs -= src
return ..()
@@ -240,7 +259,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
. = ..()
if(!. || !client)
return FALSE
- to_chat(src, span_blob("You are the overmind!"))
+ to_chat(src, span_blobannounce("You are the overmind!"))
if(!placed && autoplace_max_time <= world.time)
to_chat(src, span_boldannounce("You will automatically place your blob core in [DisplayTimeText(autoplace_max_time - world.time)]."))
to_chat(src, span_boldannounce("You [manualplace_min_time ? "will be able to":"can"] manually place your blob core by pressing the Place Blob Core button in the bottom right corner of the screen."))
@@ -257,9 +276,11 @@ GLOBAL_LIST_EMPTY(blob_nodes)
return FALSE
var/current_health = round((blob_core.get_integrity() / blob_core.max_integrity) * 100)
hud_used.healths.maptext = MAPTEXT("[current_health]%
")
- for(var/mob/living/simple_animal/hostile/blob/blobbernaut/blobbernaut in blob_mobs)
- if(blobbernaut.hud_used && blobbernaut.hud_used.blobpwrdisplay)
- blobbernaut.hud_used.blobpwrdisplay.maptext = MAPTEXT("[current_health]%
")
+ for(var/mob/living/basic/blob_minion/blobbernaut/blobbernaut in blob_mobs)
+ var/datum/hud/using_hud = blobbernaut.hud_used
+ if(!using_hud?.blobpwrdisplay)
+ continue
+ using_hud.blobpwrdisplay.maptext = MAPTEXT("[current_health]%
")
/mob/camera/blob/proc/add_points(points)
blob_points = clamp(blob_points + points, 0, max_blob_points)
@@ -291,14 +312,8 @@ GLOBAL_LIST_EMPTY(blob_nodes)
src.log_talk(message, LOG_SAY)
var/message_a = say_quote(message)
- var/rendered = span_big("\[Blob Telepathy\] [name]([blobstrain.name]) [message_a]")
-
- for(var/mob/M in GLOB.mob_list)
- if(isovermind(M) || isblobmonster(M))
- to_chat(M, rendered)
- if(isobserver(M))
- var/link = FOLLOW_LINK(M, src)
- to_chat(M, "[link] [rendered]")
+ var/rendered = span_big(span_blob("\[Blob Telepathy\] [name]([blobstrain.name]) [message_a]"))
+ blob_telepathy(rendered, src)
/mob/camera/blob/blob_act(obj/structure/blob/B)
return
@@ -324,8 +339,8 @@ GLOBAL_LIST_EMPTY(blob_nodes)
else
return FALSE
else
- var/area/A = get_area(NewLoc)
- if(isgroundlessturf(NewLoc) || istype(A, /area/shuttle)) //if unplaced, can't go on shuttles or goundless tiles
+ var/area/check_area = get_area(NewLoc)
+ if(isgroundlessturf(NewLoc) || istype(check_area, /area/shuttle)) //if unplaced, can't go on shuttles or groundless tiles
return FALSE
forceMove(NewLoc)
return TRUE
diff --git a/code/modules/antagonists/blob/powers.dm b/code/modules/antagonists/blob/powers.dm
index c75a41a48ff..04054f6df85 100644
--- a/code/modules/antagonists/blob/powers.dm
+++ b/code/modules/antagonists/blob/powers.dm
@@ -196,38 +196,25 @@
var/list/mob/dead/observer/candidates = poll_ghost_candidates("Do you want to play as a [blobstrain.name] blobbernaut?", ROLE_BLOB, ROLE_BLOB, 50)
- factory.is_creating_blobbernaut = FALSE
-
if(!length(candidates))
to_chat(src, span_warning("You could not conjure a sentience for your blobbernaut. Your points have been refunded. Try again later."))
add_points(BLOBMOB_BLOBBERNAUT_RESOURCE_COST)
- factory.blobbernaut = null //players must answer rapidly
+ factory.assign_blobbernaut(null)
return FALSE
- factory.modify_max_integrity(initial(factory.max_integrity) * 0.25) //factories that produced a blobbernaut have much lower health
- factory.update_appearance()
- factory.visible_message(span_warning("The blobbernaut [pick("rips", "tears", "shreds")] its way out of the factory blob!"))
- playsound(factory.loc, 'sound/effects/splat.ogg', 50, TRUE)
-
- var/mob/living/simple_animal/hostile/blob/blobbernaut/blobber = new /mob/living/simple_animal/hostile/blob/blobbernaut(get_turf(factory))
- flick("blobbernaut_produce", blobber)
-
- factory.blobbernaut = blobber
- blobber.factory = factory
- blobber.overmind = src
- blobber.update_icons()
- blobber.adjustHealth(blobber.maxHealth * 0.5)
- blob_mobs += blobber
-
+ var/mob/living/basic/blob_minion/blobbernaut/minion/blobber = new(get_turf(factory))
+ assume_direct_control(blobber)
+ factory.assign_blobbernaut(blobber)
var/mob/dead/observer/player = pick(candidates)
- blobber.key = player.key
+ blobber.assign_key(player.key, blobstrain)
+ RegisterSignal(blobber, COMSIG_HOSTILE_POST_ATTACKINGTARGET, PROC_REF(on_blobbernaut_attacked))
- SEND_SOUND(blobber, sound('sound/effects/blobattack.ogg'))
- SEND_SOUND(blobber, sound('sound/effects/attackblob.ogg'))
- to_chat(blobber, span_infoplain("You are powerful, hard to kill, and slowly regenerate near nodes and cores, [span_cultlarge("but will slowly die if not near the blob")] or if the factory that made you is killed."))
- to_chat(blobber, span_infoplain("You can communicate with other blobbernauts and overminds telepathically by attempting to speak normally"))
- to_chat(blobber, span_infoplain("Your overmind's blob reagent is: [blobstrain.name]!"))
- to_chat(blobber, span_infoplain("The [blobstrain.name] reagent [blobstrain.shortdesc ? "[blobstrain.shortdesc]" : "[blobstrain.description]"]"))
+/// When one of our boys attacked something, we sometimes want to perform extra effects
+/mob/camera/blob/proc/on_blobbernaut_attacked(mob/living/basic/blobbynaut, atom/target, success)
+ SIGNAL_HANDLER
+ if (!success)
+ return
+ blobstrain.blobbernaut_attack(target, blobbynaut)
/** Moves the core */
/mob/camera/blob/proc/relocate_core()
@@ -358,10 +345,11 @@
var/list/surrounding_turfs = TURF_NEIGHBORS(tile)
if(!length(surrounding_turfs))
return FALSE
- for(var/mob/living/simple_animal/hostile/blob/blobspore/spore as anything in blob_mobs)
- if(isturf(spore.loc) && get_dist(spore, tile) <= 35 && !spore.key)
- spore.LoseTarget()
- spore.Goto(pick(surrounding_turfs), spore.move_to_delay)
+ for(var/mob/living/basic/blob_mob as anything in blob_mobs)
+ if(!isturf(blob_mob.loc) || get_dist(blob_mob, tile) > 35 || blob_mob.key)
+ continue
+ blob_mob.ai_controller.clear_blackboard_key(BB_BASIC_MOB_CURRENT_TARGET)
+ blob_mob.ai_controller.set_blackboard_key(BB_TRAVEL_DESTINATION, pick(surrounding_turfs))
/** Opens the reroll menu to change strains */
/mob/camera/blob/proc/strain_reroll()
diff --git a/code/modules/antagonists/blob/structures/_blob.dm b/code/modules/antagonists/blob/structures/_blob.dm
index 543da00d2f5..e206d97c26b 100644
--- a/code/modules/antagonists/blob/structures/_blob.dm
+++ b/code/modules/antagonists/blob/structures/_blob.dm
@@ -129,13 +129,13 @@
return FALSE //oh no we failed
/obj/structure/blob/proc/ConsumeTile()
- for(var/atom/A in loc)
- if(!A.can_blob_attack())
+ for(var/atom/thing in loc)
+ if(!thing.can_blob_attack())
continue
- if(isliving(A) && overmind && !isblobmonster(A)) // Make sure to inject strain-reagents with automatic attacks when needed.
- overmind.blobstrain.attack_living(A)
+ if(isliving(thing) && overmind && !HAS_TRAIT(thing, TRAIT_BLOB_ALLY)) // Make sure to inject strain-reagents with automatic attacks when needed.
+ overmind.blobstrain.attack_living(thing)
continue // Don't smack them twice though
- A.blob_act(src)
+ thing.blob_act(src)
if(iswallturf(loc))
loc.blob_act(src) //don't ask how a wall got on top of the core, just eat it
diff --git a/code/modules/antagonists/blob/structures/factory.dm b/code/modules/antagonists/blob/structures/factory.dm
index 7f28dcce224..cee7e9a0ac5 100644
--- a/code/modules/antagonists/blob/structures/factory.dm
+++ b/code/modules/antagonists/blob/structures/factory.dm
@@ -10,12 +10,12 @@
armor_type = /datum/armor/structure_blob/factory
///How many spores this factory can have.
var/max_spores = BLOB_FACTORY_MAX_SPORES
- ///The list of spores
- var/list/spores = list()
+ ///The list of spores and zombies
+ var/list/spores_and_zombies = list()
COOLDOWN_DECLARE(spore_delay)
var/spore_cooldown = BLOBMOB_SPORE_SPAWN_COOLDOWN
///Its Blobbernaut, if it has spawned any.
- var/mob/living/simple_animal/hostile/blob/blobbernaut/blobbernaut
+ var/mob/living/basic/blob_minion/blobbernaut/minion/blobbernaut
///Used in blob/powers.dm, checks if it's already trying to spawn a blobbernaut to prevent issues.
var/is_creating_blobbernaut = FALSE
@@ -32,15 +32,8 @@
overmind.factory_blobs += src
/obj/structure/blob/special/factory/Destroy()
- for(var/mob/living/simple_animal/hostile/blob/blobspore/spore in spores)
- to_chat(spore, span_userdanger("Your factory was destroyed! You can no longer sustain yourself."))
- spore.death()
- spores = null
- if(blobbernaut)
- blobbernaut.factory = null
- to_chat(blobbernaut, span_userdanger("Your factory was destroyed! You feel yourself dying!"))
- blobbernaut.throw_alert("nofactory", /atom/movable/screen/alert/nofactory)
- blobbernaut = null
+ spores_and_zombies = null
+ blobbernaut = null
if(overmind)
overmind.factory_blobs -= src
return ..()
@@ -49,13 +42,57 @@
. = ..()
if(blobbernaut)
return
- if(spores.len >= max_spores)
+ if(length(spores_and_zombies) >= max_spores)
return
if(!COOLDOWN_FINISHED(src, spore_delay))
return
COOLDOWN_START(src, spore_delay, spore_cooldown)
- var/mob/living/simple_animal/hostile/blob/blobspore/BS = new (loc, src)
- if(overmind) //if we don't have an overmind, we don't need to do anything but make a spore
- BS.overmind = overmind
- BS.update_icons()
- overmind.blob_mobs.Add(BS)
+ var/mob/living/basic/blob_minion/created_spore = (overmind) ? overmind.create_spore(loc) : new(loc)
+ register_mob(created_spore)
+ RegisterSignal(created_spore, COMSIG_BLOB_ZOMBIFIED, PROC_REF(on_zombie_created))
+
+/// Tracks the existence of a mob in our mobs list
+/obj/structure/blob/special/factory/proc/register_mob(mob/living/basic/blob_minion/blob_mob)
+ spores_and_zombies |= blob_mob
+ blob_mob.link_to_factory(src)
+ RegisterSignal(blob_mob, COMSIG_LIVING_DEATH, PROC_REF(on_spore_died))
+ RegisterSignal(blob_mob, COMSIG_QDELETING, PROC_REF(on_spore_lost))
+
+/// When a spore or zombie dies reset our spawn cooldown so we don't instantly replace it
+/obj/structure/blob/special/factory/proc/on_spore_died(mob/living/dead_spore)
+ SIGNAL_HANDLER
+ COOLDOWN_START(src, spore_delay, spore_cooldown)
+
+/// When a spore is deleted remove it from our list
+/obj/structure/blob/special/factory/proc/on_spore_lost(mob/living/dead_spore)
+ SIGNAL_HANDLER
+ spores_and_zombies -= dead_spore
+
+/// When a spore makes a zombie add it to our mobs list
+/obj/structure/blob/special/factory/proc/on_zombie_created(mob/living/spore, mob/living/zombie)
+ SIGNAL_HANDLER
+ register_mob(zombie)
+
+/// Produce a blobbernaut
+/obj/structure/blob/special/factory/proc/assign_blobbernaut(mob/living/new_naut)
+ is_creating_blobbernaut = FALSE
+ if (isnull(new_naut))
+ return
+
+ modify_max_integrity(initial(max_integrity) * 0.25) //factories that produced a blobbernaut have much lower health
+ visible_message(span_boldwarning("The blobbernaut [pick("rips", "tears", "shreds")] its way out of the factory blob!"))
+ playsound(loc, 'sound/effects/splat.ogg', 50, TRUE)
+
+ blobbernaut = new_naut
+ blobbernaut.link_to_factory(src)
+ RegisterSignals(new_naut, list(COMSIG_QDELETING, COMSIG_LIVING_DEATH), PROC_REF(on_blobbernaut_death))
+ update_appearance(UPDATE_ICON)
+
+/// When our brave soldier dies, reset our max integrity
+/obj/structure/blob/special/factory/proc/on_blobbernaut_death(mob/living/death_naut)
+ SIGNAL_HANDLER
+ if (isnull(blobbernaut) || blobbernaut != death_naut)
+ return
+ blobbernaut = null
+ max_integrity = initial(max_integrity)
+ update_appearance(UPDATE_ICON)
diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm
index 3b2a13c2cb5..062412f70e9 100644
--- a/code/modules/antagonists/cult/runes.dm
+++ b/code/modules/antagonists/cult/runes.dm
@@ -886,7 +886,7 @@ structure_check() searches for nearby cultist structures required for the invoca
new_human.equipOutfit(/datum/outfit/ghost_cultist) //give them armor
new_human.apply_status_effect(/datum/status_effect/cultghost) //ghosts can't summon more ghosts
new_human.set_invis_see(SEE_INVISIBLE_OBSERVER)
- ADD_TRAIT(new_human, TRAIT_NOBREATH, INNATE_TRAIT)
+ new_human.add_traits(list(TRAIT_NOBREATH, TRAIT_PERMANENTLY_MORTAL), INNATE_TRAIT) // permanently mortal can be removed once this is a bespoke kind of mob
ghosts++
playsound(src, 'sound/magic/exit_blood.ogg', 50, TRUE)
visible_message(span_warning("A cloud of red mist forms above [src], and from within steps... a [new_human.gender == FEMALE ? "wo":""]man."))
diff --git a/code/modules/antagonists/heretic/heretic_antag.dm b/code/modules/antagonists/heretic/heretic_antag.dm
index a0f0d86d33f..ccc7fce6ecf 100644
--- a/code/modules/antagonists/heretic/heretic_antag.dm
+++ b/code/modules/antagonists/heretic/heretic_antag.dm
@@ -34,6 +34,8 @@
var/heretic_path = PATH_START
/// A sum of how many knowledge points this heretic CURRENTLY has. Used to research.
var/knowledge_points = 2 //SKYRAT EDIT - ORIGINAL 1
+ /// How many side path points the heretic has. He gains one of these per main path that splits into two sidepaths. These can be used in place of knowledge points for side paths only.
+ var/side_path_points = 0
/// The time between gaining influence passively. The heretic gain +1 knowledge points every this duration of time.
var/passive_gain_timer = 20 MINUTES
/// Assoc list of [typepath] = [knowledge instance]. A list of all knowledge this heretic's reserached.
@@ -85,6 +87,7 @@
var/list/data = list()
data["charges"] = knowledge_points
+ data["side_charges"] = side_path_points
data["total_sacrifices"] = total_sacrifices
data["ascended"] = ascended
@@ -98,7 +101,10 @@
knowledge_data["desc"] = initial(knowledge.desc)
knowledge_data["gainFlavor"] = initial(knowledge.gain_text)
knowledge_data["cost"] = initial(knowledge.cost)
- knowledge_data["disabled"] = (initial(knowledge.cost) > knowledge_points)
+ if(initial(knowledge.route) == PATH_SIDE)
+ knowledge_data["disabled"] = (initial(knowledge.cost) > knowledge_points + side_path_points)
+ else
+ knowledge_data["disabled"] = (initial(knowledge.cost) > knowledge_points)
// Final knowledge can't be learned until all objectives are complete.
if(ispath(knowledge, /datum/heretic_knowledge/ultimate))
@@ -142,13 +148,22 @@
if(!ispath(researched_path))
CRASH("Heretic attempted to learn non-heretic_knowledge path! (Got: [researched_path])")
- if(initial(researched_path.cost) > knowledge_points)
- return TRUE
+ // If side path and has path points, buy!
+ var/coupon = FALSE
+ if((initial(researched_path.route) == PATH_SIDE) && side_path_points)
+ coupon = TRUE
+ // else try normal purchase
+ else if(initial(researched_path.cost) > knowledge_points)
+ return
+
if(!gain_knowledge(researched_path))
return TRUE
- log_heretic_knowledge("[key_name(owner)] gained knowledge: [initial(researched_path.name)]")
- knowledge_points -= initial(researched_path.cost)
+ log_heretic_knowledge("[key_name(owner)] gained knowledge: [initial(researched_path.name)][coupon ? "(via free side-path point)" : ""]")
+ if(coupon)
+ side_path_points -= initial(researched_path.cost)
+ else
+ knowledge_points -= initial(researched_path.cost)
return TRUE
/datum/antagonist/heretic/submit_player_objective(retain_existing = FALSE, retain_escape = TRUE, force = FALSE)
@@ -305,14 +320,14 @@
* * drawing_time - how long the do_after takes to make the rune
* * additional checks - optional callbacks to be ran while drawing the rune
*/
-/datum/antagonist/heretic/proc/try_draw_rune(mob/living/user, turf/target_turf, drawing_time = 30 SECONDS, additional_checks)
+/datum/antagonist/heretic/proc/try_draw_rune(mob/living/user, turf/target_turf, drawing_time = 20 SECONDS, additional_checks)
for(var/turf/nearby_turf as anything in RANGE_TURFS(1, target_turf))
if(!isopenturf(nearby_turf) || is_type_in_typecache(nearby_turf, blacklisted_rune_turfs))
target_turf.balloon_alert(user, "invalid placement for rune!")
return
if(locate(/obj/effect/heretic_rune) in range(3, target_turf))
- target_turf.balloon_alert(user, "to close to another rune!")
+ target_turf.balloon_alert(user, "too close to another rune!")
return
if(drawing_rune)
@@ -330,16 +345,16 @@
* * drawing_time - how long the do_after takes to make the rune
* * additional checks - optional callbacks to be ran while drawing the rune
*/
-/datum/antagonist/heretic/proc/draw_rune(mob/living/user, turf/target_turf, drawing_time = 30 SECONDS, additional_checks)
+/datum/antagonist/heretic/proc/draw_rune(mob/living/user, turf/target_turf, drawing_time = 20 SECONDS, additional_checks)
drawing_rune = TRUE
var/rune_colour = path_to_rune_color[heretic_path]
target_turf.balloon_alert(user, "drawing rune...")
var/obj/effect/temp_visual/drawing_heretic_rune/drawing_effect
- if (drawing_time >= (30 SECONDS))
- drawing_effect = new(target_turf, rune_colour)
- else
+ if (drawing_time < (10 SECONDS))
drawing_effect = new /obj/effect/temp_visual/drawing_heretic_rune/fast(target_turf, rune_colour)
+ else
+ drawing_effect = new(target_turf, rune_colour)
if(!do_after(user, drawing_time, target_turf, extra_checks = additional_checks))
target_turf.balloon_alert(user, "interrupted!")
@@ -602,7 +617,7 @@
if(!admin.client?.holder)
to_chat(admin, span_warning("You shouldn't be using this!"))
return
-
+
var/mob/living/pawn = owner.current
pawn.equip_to_slot_if_possible(new /obj/item/clothing/neck/heretic_focus(get_turf(pawn)), ITEM_SLOT_NECK, TRUE, TRUE)
to_chat(pawn, span_hypnophrase("The Mansus has manifested you a focus."))
@@ -774,8 +789,8 @@
target_amount = main_path_length
// Add in the base research we spawn with, otherwise it'd be too easy.
target_amount += length(GLOB.heretic_start_knowledge)
- // And add in some buffer, to require some sidepathing.
- target_amount += rand(2, 4)
+ // And add in some buffer, to require some sidepathing, especially since heretics get some free side paths.
+ target_amount += rand(5, 7)
update_explanation_text()
/datum/objective/heretic_research/update_explanation_text()
diff --git a/code/modules/antagonists/heretic/heretic_focus.dm b/code/modules/antagonists/heretic/heretic_focus.dm
index b7c79b6d6ca..45bbf743b8c 100644
--- a/code/modules/antagonists/heretic/heretic_focus.dm
+++ b/code/modules/antagonists/heretic/heretic_focus.dm
@@ -46,7 +46,7 @@
if(!IS_HERETIC(user))
return
- if(!(source.slot_flags & slot))
+ if(source.slot_flags && !(source.slot_flags & slot))
return
ADD_TRAIT(user, TRAIT_ALLOW_HERETIC_CASTING, ELEMENT_TRAIT(source))
diff --git a/code/modules/antagonists/heretic/heretic_knowledge.dm b/code/modules/antagonists/heretic/heretic_knowledge.dm
index b51c2a5dcb8..ea22955d83e 100644
--- a/code/modules/antagonists/heretic/heretic_knowledge.dm
+++ b/code/modules/antagonists/heretic/heretic_knowledge.dm
@@ -25,11 +25,16 @@
var/list/banned_knowledge = list()
/// Assoc list of [typepaths we need] to [amount needed].
/// If set, this knowledge allows the heretic to do a ritual on a transmutation rune with the components set.
+ /// If one of the items in the list is a list, it's treated as 'any of these items will work'
var/list/required_atoms
/// Paired with above. If set, the resulting spawned atoms upon ritual completion.
var/list/result_atoms = list()
+ /// If set, required_atoms checks for these *exact* types and doesn't allow them to be ingredients.
+ var/list/banned_atom_types = list()
/// Cost of knowledge in knowledge points
var/cost = 0
+ /// If true, adds side path points according to value. Only main branch powers that split into sidepaths should have this.
+ var/adds_sidepath_points = 0
/// The priority of the knowledge. Higher priority knowledge appear higher in the ritual list.
/// Number itself is completely arbitrary. Does not need to be set for non-ritual knowledge.
var/priority = 0
@@ -58,6 +63,8 @@
if(gain_text)
to_chat(user, span_warning("[gain_text]"))
+ // Usually zero
+ our_heretic.side_path_points += adds_sidepath_points
on_gain(user, our_heretic)
/**
@@ -112,6 +119,18 @@
/datum/heretic_knowledge/proc/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc)
return TRUE
+/**
+ * Parses specific items into a more reaadble form.
+ * Can be overriden by knoweldge subtypes.
+ */
+/datum/heretic_knowledge/proc/parse_required_item(atom/item_path, number_of_things)
+ // If we need a human, there is a high likelihood we actually need a (dead) body
+ if(ispath(item_path, /mob/living/carbon/human))
+ return "bod[number_of_things > 1 ? "ies" : "y"]"
+ if(ispath(item_path, /mob/living))
+ return "carcass[number_of_things > 1 ? "es" : ""] of any kind"
+ return "[initial(item_path.name)]\s"
+
/**
* Called whenever the knowledge's associated ritual is completed successfully.
*
@@ -158,9 +177,12 @@
var/obj/item/stack/sac_stack = sacrificed
var/how_much_to_use = 0
for(var/requirement in required_atoms)
- if(istype(sacrificed, requirement))
- how_much_to_use = min(required_atoms[requirement], sac_stack.amount)
- break
+ if(islist(requirement) && !is_type_in_list(sacrificed, requirement))
+ continue
+ if(!istype(sacrificed, requirement))
+ continue
+ how_much_to_use = min(required_atoms[requirement], sac_stack.amount)
+ break
sac_stack.use(how_much_to_use)
continue
@@ -264,7 +286,7 @@
/datum/heretic_knowledge/mark
abstract_parent_type = /datum/heretic_knowledge/mark
mutually_exclusive = TRUE
- cost = 2
+ cost = 1
/// The status effect typepath we apply on people on mansus grasp.
var/datum/status_effect/eldritch/mark_type
diff --git a/code/modules/antagonists/heretic/influences.dm b/code/modules/antagonists/heretic/influences.dm
index 503e066d0e3..67a3bbc16b4 100644
--- a/code/modules/antagonists/heretic/influences.dm
+++ b/code/modules/antagonists/heretic/influences.dm
@@ -260,7 +260,8 @@
// Using a codex will give you two knowledge points for draining.
if(!being_drained && istype(weapon, /obj/item/codex_cicatrix))
var/obj/item/codex_cicatrix/codex = weapon
- codex.open_animation()
+ if(!codex.book_open)
+ codex.attack_self(user) // open booke
INVOKE_ASYNC(src, PROC_REF(drain_influence), user, 2)
return TRUE
diff --git a/code/modules/antagonists/heretic/items/forbidden_book.dm b/code/modules/antagonists/heretic/items/forbidden_book.dm
index 80721c97592..ff570801c5f 100644
--- a/code/modules/antagonists/heretic/items/forbidden_book.dm
+++ b/code/modules/antagonists/heretic/items/forbidden_book.dm
@@ -9,8 +9,6 @@
w_class = WEIGHT_CLASS_SMALL
/// Helps determine the icon state of this item when it's used on self.
var/book_open = FALSE
- /// id for timer
- var/timer_id
/obj/item/codex_cicatrix/Initialize(mapload)
. = ..()
@@ -31,6 +29,7 @@
. += span_notice("Can be used to tap influences for additional knowledge points.")
. += span_notice("Can also be used to draw or remove transmutation runes with ease.")
+ . += span_notice("Additionally, it can work as a focus for your spells in a pinch, though a more specialized relic is recommended, as this may get dropped in combat.")
/obj/item/codex_cicatrix/attack_self(mob/user, modifiers)
. = ..()
@@ -39,8 +38,12 @@
if(book_open)
close_animation()
+ RemoveElement(/datum/element/heretic_focus)
+ w_class = WEIGHT_CLASS_SMALL
else
open_animation()
+ AddElement(/datum/element/heretic_focus)
+ w_class = WEIGHT_CLASS_NORMAL
/obj/item/codex_cicatrix/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
. = ..()
@@ -52,7 +55,7 @@
return
if(isopenturf(target))
- heretic_datum.try_draw_rune(user, target, drawing_time = 12 SECONDS)
+ heretic_datum.try_draw_rune(user, target, drawing_time = 8 SECONDS)
return TRUE
/// Plays a little animation that shows the book opening and closing.
@@ -61,12 +64,8 @@
flick("[base_icon_state]_opening", src)
book_open = TRUE
- timer_id = addtimer(CALLBACK(src, PROC_REF(close_animation)), 5 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE)
-
/// Plays a closing animation and resets the icon state.
/obj/item/codex_cicatrix/proc/close_animation()
icon_state = base_icon_state
flick("[base_icon_state]_closing", src)
book_open = FALSE
-
- deltimer(timer_id)
diff --git a/code/modules/antagonists/heretic/knowledge/ash_lore.dm b/code/modules/antagonists/heretic/knowledge/ash_lore.dm
index df29ba9efa0..52e25f6a8b1 100644
--- a/code/modules/antagonists/heretic/knowledge/ash_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/ash_lore.dm
@@ -72,9 +72,9 @@
name = "Ashen Passage"
desc = "Grants you Ashen Passage, a silent but short range jaunt."
gain_text = "He knew how to walk between the planes."
+ adds_sidepath_points = 1
next_knowledge = list(
/datum/heretic_knowledge/mark/ash_mark,
- /datum/heretic_knowledge/codex_cicatrix,
/datum/heretic_knowledge/summon/fire_shark,
/datum/heretic_knowledge/medallion,
)
@@ -127,6 +127,7 @@
The mask instills fear into heathens who witness it, causing stamina damage, hallucinations, and insanity. \
It can also be forced onto a heathen, to make them unable to take it off..."
gain_text = "The Nightwatcher was lost. That's what the Watch believed. Yet he walked the world, unnoticed by the masses."
+ adds_sidepath_points = 1
next_knowledge = list(
/datum/heretic_knowledge/blade_upgrade/ash,
/datum/heretic_knowledge/reroll_targets,
@@ -165,6 +166,7 @@
If any victims afflicted are in critical condition, they will also instantly die."
gain_text = "The fire was inescapable, and yet, life remained in his charred body. \
The Nightwatcher was a particular man, always watching."
+ adds_sidepath_points = 1
next_knowledge = list(
/datum/heretic_knowledge/ultimate/ash_final,
/datum/heretic_knowledge/summon/ashy,
diff --git a/code/modules/antagonists/heretic/knowledge/blade_lore.dm b/code/modules/antagonists/heretic/knowledge/blade_lore.dm
index 01358807fce..84e266c8374 100644
--- a/code/modules/antagonists/heretic/knowledge/blade_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/blade_lore.dm
@@ -101,10 +101,10 @@
towards your attacker. This effect can only trigger once every 20 seconds."
gain_text = "The footsoldier was known to be a fearsome duelist. \
Their general quickly appointed them as their personal Champion."
+ adds_sidepath_points = 1
next_knowledge = list(
/datum/heretic_knowledge/limited_amount/risen_corpse,
/datum/heretic_knowledge/mark/blade_mark,
- /datum/heretic_knowledge/codex_cicatrix,
/datum/heretic_knowledge/armor,
)
cost = 1
@@ -243,6 +243,7 @@
you gain increased resistance to gaining wounds and resistance to batons."
gain_text = "In time, it was he who stood alone among the bodies of his former comrades, awash in blood, none of it his own. \
He was without rival, equal, or purpose."
+ adds_sidepath_points = 1
next_knowledge = list(
/datum/heretic_knowledge/blade_upgrade/blade,
/datum/heretic_knowledge/reroll_targets,
@@ -372,6 +373,7 @@
at a target, dealing damage and causing bleeding."
gain_text = "Without thinking, I took the knife of a fallen soldier and threw with all my might. My aim was true! \
The Torn Champion smiled at their first taste of agony, and with a nod, their blades became my own."
+ adds_sidepath_points = 1
next_knowledge = list(
/datum/heretic_knowledge/summon/maid_in_mirror,
/datum/heretic_knowledge/ultimate/blade_final,
diff --git a/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm b/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm
index 4a4e9045185..75ee0cd5916 100644
--- a/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm
@@ -70,9 +70,9 @@
However, people with a star mark will get transported along with another person using the rune."
gain_text = "The distant stars crept into my dreams, roaring and screaming without reason. \
I spoke, and heard my own words echoed back."
+ adds_sidepath_points = 1
next_knowledge = list(
/datum/heretic_knowledge/mark/cosmic_mark,
- /datum/heretic_knowledge/codex_cicatrix,
/datum/heretic_knowledge/essence,
/datum/heretic_knowledge/summon/fire_shark,
)
@@ -114,6 +114,7 @@
desc = "Fires a projectile that moves very slowly and creates cosmic fields on impact. \
Anyone hit by the projectile will recieve burn damage, a knockdown, and give people in a three tile range a star mark."
gain_text = "The Beast was behind me now at all times, with each sacrifice words of affirmation coursed through me."
+ adds_sidepath_points = 1
next_knowledge = list(
/datum/heretic_knowledge/blade_upgrade/cosmic,
/datum/heretic_knowledge/reroll_targets,
@@ -208,6 +209,7 @@
desc = "Grants you Cosmic Expansion, a spell that creates a 3x3 area of cosmic fields around you. \
Nearby beings will also receive a star mark."
gain_text = "The ground now shook beneath me. The Beast inhabited me, and their voice was intoxicating."
+ adds_sidepath_points = 1
next_knowledge = list(
/datum/heretic_knowledge/ultimate/cosmic_final,
/datum/heretic_knowledge/eldritch_coin,
diff --git a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm
index 07fa2718185..915165ad768 100644
--- a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm
@@ -126,9 +126,9 @@
Voiceless Dead are mute ghouls and only have 50 health, but can use Bloody Blades effectively. \
You can only create two at a time."
gain_text = "I found notes of a dark ritual, unfinished... yet still, I pushed forward."
+ adds_sidepath_points = 1
next_knowledge = list(
/datum/heretic_knowledge/mark/flesh_mark,
- /datum/heretic_knowledge/codex_cicatrix,
/datum/heretic_knowledge/void_cloak,
/datum/heretic_knowledge/medallion,
)
@@ -239,6 +239,7 @@
the ability to link minds to communicate with ease, but are very fragile and weak in combat."
gain_text = "I could not continue alone. I was able to summon The Uncanny Man to help me see more. \
The screams... once constant, now silenced by their wretched appearance. Nothing was out of reach."
+ adds_sidepath_points = 1
next_knowledge = list(
/datum/heretic_knowledge/blade_upgrade/flesh,
/datum/heretic_knowledge/reroll_targets,
@@ -280,6 +281,7 @@
Stalkers can jaunt, release EMPs, shapeshift into animals or automatons, and are strong in combat."
gain_text = "I was able to combine my greed and desires to summon an eldritch beast I had never seen before. \
An ever shapeshifting mass of flesh, it knew well my goals. The Marshal approved."
+ adds_sidepath_points = 1
next_knowledge = list(
/datum/heretic_knowledge/ultimate/flesh_final,
/datum/heretic_knowledge/summon/ashy,
diff --git a/code/modules/antagonists/heretic/knowledge/general_side.dm b/code/modules/antagonists/heretic/knowledge/general_side.dm
index 9c3fbe9d447..2dc2719227b 100644
--- a/code/modules/antagonists/heretic/knowledge/general_side.dm
+++ b/code/modules/antagonists/heretic/knowledge/general_side.dm
@@ -39,19 +39,3 @@
return FALSE
return TRUE
-
-/datum/heretic_knowledge/codex_cicatrix
- name = "Codex Cicatrix"
- desc = "Allows you to transmute a bible, a fountain pen, and hide from an animal (or human) to create a Codex Cicatrix. \
- The Codex Cicatrix can be used when draining influences to gain additional knowledge, but comes at greater risk of being noticed. \
- It can also be used to draw and remove transmutation runes easier."
- gain_text = "The occult leaves fragments of knowledge and power anywhere and everywhere. The Codex Cicatrix is one such example. \
- Within the leather-bound faces and age old pages, a path into the Mansus is revealed."
- required_atoms = list(
- /obj/item/book/bible = 1,
- /obj/item/pen/fountain = 1,
- /obj/item/stack/sheet/animalhide = 1,
- )
- result_atoms = list(/obj/item/codex_cicatrix)
- cost = 1
- route = PATH_SIDE
diff --git a/code/modules/antagonists/heretic/knowledge/knock_lore.dm b/code/modules/antagonists/heretic/knowledge/knock_lore.dm
index fcb2c6ceb4c..6879f527b6b 100644
--- a/code/modules/antagonists/heretic/knowledge/knock_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/knock_lore.dm
@@ -70,7 +70,7 @@
/datum/heretic_knowledge/knock_grasp/proc/on_secondary_mansus_grasp(mob/living/source, atom/target)
SIGNAL_HANDLER
-
+
if(ismecha(target))
var/obj/vehicle/sealed/mecha/mecha = target
mecha.dna_lock = null
@@ -89,7 +89,7 @@
var/turf/target_turf = get_turf(target)
SEND_SIGNAL(target_turf, COMSIG_ATOM_MAGICALLY_UNLOCKED, src, source)
playsound(target, 'sound/magic/hereticknock.ogg', 100, TRUE, -1)
-
+
return COMPONENT_USE_HAND
/datum/heretic_knowledge/key_ring
@@ -99,6 +99,7 @@
You can use it in-hand to change its form to a card you fused. \
Does not preserve the card used in the ritual."
gain_text = "Gateways shall open before me, my very will ensnaring reality."
+ adds_sidepath_points = 1
required_atoms = list(
/obj/item/storage/wallet = 1,
/obj/item/stack/rods = 1,
@@ -143,6 +144,7 @@
desc = "Grants you Burglar's Finesse, a single-target spell \
that puts a random item from the victims backpack into your hand."
gain_text = "Their trinkets will be mine, as will their lives in due time."
+ adds_sidepath_points = 1
next_knowledge = list(
/datum/heretic_knowledge/spell/apetra_vulnera,
/datum/heretic_knowledge/spell/opening_blast,
@@ -171,6 +173,7 @@
While in refuge, you cannot use your hands or spells, and you are immune to slowdown. \
You are invincible but unable to harm anything. Cancelled by being hit with an anti-magic item."
gain_text = "Then I saw my my own reflection cascaded mind-numbingly enough times that I was but a haze."
+ adds_sidepath_points = 1
next_knowledge = list(/datum/heretic_knowledge/ultimate/knock_final)
route = PATH_KNOCK
spell_to_add = /datum/action/cooldown/spell/caretaker
diff --git a/code/modules/antagonists/heretic/knowledge/rust_lore.dm b/code/modules/antagonists/heretic/knowledge/rust_lore.dm
index bbb98f84bd6..1eeaab69bdb 100644
--- a/code/modules/antagonists/heretic/knowledge/rust_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/rust_lore.dm
@@ -80,9 +80,9 @@
name = "Leeching Walk"
desc = "Grants you passive healing and resistance to batons while standing over rust."
gain_text = "The speed was unparalleled, the strength unnatural. The Blacksmith was smiling."
+ adds_sidepath_points = 1
next_knowledge = list(
/datum/heretic_knowledge/mark/rust_mark,
- /datum/heretic_knowledge/codex_cicatrix,
/datum/heretic_knowledge/armor,
/datum/heretic_knowledge/essence,
/datum/heretic_knowledge/entropy_pulse,
@@ -169,6 +169,7 @@
desc = "Grants you Aggressive Spread, a spell that spreads rust to nearby surfaces. \
Already rusted surfaces are destroyed."
gain_text = "All wise men know well not to visit the Rusted Hills... Yet the Blacksmith's tale was inspiring."
+ adds_sidepath_points = 1
next_knowledge = list(
/datum/heretic_knowledge/blade_upgrade/rust,
/datum/heretic_knowledge/reroll_targets,
@@ -198,6 +199,7 @@
at friend or foe wildly. Also rusts and destroys and surfaces it hits."
gain_text = "The corrosion was unstoppable. The rust was unpleasable. \
The Blacksmith was gone, and you hold their blade. Champions of hope, the Rustbringer is nigh!"
+ adds_sidepath_points = 1
next_knowledge = list(
/datum/heretic_knowledge/ultimate/rust_final,
/datum/heretic_knowledge/summon/rusty,
diff --git a/code/modules/antagonists/heretic/knowledge/starting_lore.dm b/code/modules/antagonists/heretic/knowledge/starting_lore.dm
index 8f36b866510..eb766392290 100644
--- a/code/modules/antagonists/heretic/knowledge/starting_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/starting_lore.dm
@@ -212,3 +212,79 @@ GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge())
spell_to_add = /datum/action/cooldown/spell/shadow_cloak
cost = 0
route = PATH_START
+
+/**
+ * Codex Cicatrixi is available at the start:
+ * This allows heretics to choose if they want to rush all the influences and take them stealthily, or
+ * Construct a codex and take what's left with more points.
+ * Another downside to having the book is strip searches, which means that it's not just a free nab, at least until you get exposed - and when you do, you'll probably need the faster drawing speed.
+ * Overall, it's a tradeoff between speed and stealth or power.
+ */
+/datum/heretic_knowledge/codex_cicatrix
+ name = "Codex Cicatrix"
+ desc = "Allows you to transmute a book, any unique pen (anything but generic pens), and your pick from any carcass (animal or human), leather, or hide to create a Codex Cicatrix. \
+ The Codex Cicatrix can be used when draining influences to gain additional knowledge, but comes at greater risk of being noticed. \
+ It can also be used to draw and remove transmutation runes easier, and as a spell focus in a pinch."
+ gain_text = "The occult leaves fragments of knowledge and power anywhere and everywhere. The Codex Cicatrix is one such example. \
+ Within the leather-bound faces and age old pages, a path into the Mansus is revealed."
+ required_atoms = list(
+ /obj/item/book = 1,
+ /obj/item/pen = 1,
+ list(/mob/living, /obj/item/stack/sheet/leather, /obj/item/stack/sheet/animalhide) = 1,
+ )
+ banned_atom_types = list(/obj/item/pen)
+ result_atoms = list(/obj/item/codex_cicatrix)
+ cost = 1
+ route = PATH_START
+ priority = MAX_KNOWLEDGE_PRIORITY - 3 // Least priority out of the starting knowledges, as it's an optional boon.
+
+/datum/heretic_knowledge/codex_cicatrix/parse_required_item(atom/item_path, number_of_things)
+ if(item_path == /obj/item/pen)
+ return "unique type of pen"
+ return ..()
+
+/datum/heretic_knowledge/codex_cicatrix/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc)
+ . = ..()
+ if(!.)
+ return FALSE
+
+ for(var/mob/living/body in atoms)
+ if(body.stat != DEAD)
+ continue
+
+ selected_atoms += body
+ return TRUE
+ return FALSE
+
+/datum/heretic_knowledge/codex_cicatrix/cleanup_atoms(list/selected_atoms)
+ var/mob/living/body = locate() in selected_atoms
+ if(!body)
+ return
+ // A golem or an android doesn't have skin!
+ var/exterior_text = "skin"
+ // If carbon, it's the limb. If not, it's the body.
+ var/ripped_thing = body
+
+ // We will check if it's a carbon's body.
+ // If it is, we will damage a random bodypart, and check that bodypart for its body type, to select between 'skin' or 'exterior'.
+ if(iscarbon(body))
+ var/mob/living/carbon/carbody = body
+ var/obj/item/bodypart/bodypart = pick(carbody.bodyparts)
+ ripped_thing = bodypart
+ bodypart.receive_damage(25, sharpness = SHARP_EDGED)
+ if(!(bodypart.bodytype & BODYTYPE_ORGANIC))
+ exterior_text = "exterior"
+ else
+ // If it is not a carbon mob, we will just check biotypes and damage it directly.
+ if(body.mob_biotypes & (MOB_MINERAL|MOB_ROBOTIC))
+ exterior_text = "exterior"
+ body.apply_damage(25, BRUTE)
+
+ // Procure book for flavor text. This is why we call parent at the end.
+ var/obj/item/book/le_book = locate() in selected_atoms
+ if(!le_book)
+ stack_trace("Somehow, no book in codex cicatrix selected atoms! [english_list(selected_atoms)]")
+ playsound(body, 'sound/items/poster_ripped.ogg', 100, TRUE)
+ body.do_jitter_animation()
+ body.visible_message(span_danger("An awful ripping sound is heard as [ripped_thing]'s [exterior_text] is ripped straight out, wrapping around [le_book || "the book"], turning into an eldritch shade of blue!"))
+ return ..()
diff --git a/code/modules/antagonists/heretic/knowledge/void_lore.dm b/code/modules/antagonists/heretic/knowledge/void_lore.dm
index 57db8636818..a5e21472517 100644
--- a/code/modules/antagonists/heretic/knowledge/void_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/void_lore.dm
@@ -81,9 +81,9 @@
You can still take damage due to a lack of pressure."
gain_text = "I found a thread of cold breath. It lead me to a strange shrine, all made of crystals. \
Translucent and white, a depiction of a nobleman stood before me."
+ adds_sidepath_points = 1
next_knowledge = list(
/datum/heretic_knowledge/mark/void_mark,
- /datum/heretic_knowledge/codex_cicatrix,
/datum/heretic_knowledge/void_cloak,
/datum/heretic_knowledge/limited_amount/risen_corpse,
)
@@ -127,6 +127,7 @@
Additionally causes damage to heathens around your original and target destination."
gain_text = "The entity calls themself the Aristocrat. They effortlessly walk through air like \
nothing - leaving a harsh, cold breeze in their wake. They disappear, and I am left in the blizzard."
+ adds_sidepath_points = 1
next_knowledge = list(
/datum/heretic_knowledge/blade_upgrade/void,
/datum/heretic_knowledge/reroll_targets,
@@ -161,6 +162,7 @@
desc = "Grants you Void Pull, a spell that pulls all nearby heathens towards you, stunning them briefly."
gain_text = "All is fleeting, but what else stays? I'm close to ending what was started. \
The Aristocrat reveals themselves to me again. They tell me I am late. Their pull is immense, I cannot turn back."
+ adds_sidepath_points = 1
next_knowledge = list(
/datum/heretic_knowledge/ultimate/void_final,
/datum/heretic_knowledge/spell/cleave,
diff --git a/code/modules/antagonists/heretic/transmutation_rune.dm b/code/modules/antagonists/heretic/transmutation_rune.dm
index 7e63040af1d..cd49feb3f17 100644
--- a/code/modules/antagonists/heretic/transmutation_rune.dm
+++ b/code/modules/antagonists/heretic/transmutation_rune.dm
@@ -90,6 +90,7 @@
// A copy of our requirements list.
// We decrement the values of to determine if enough of each key is present.
var/list/requirements_list = ritual.required_atoms.Copy()
+ var/list/banned_atom_types = ritual.banned_atom_types.Copy()
// A list of all atoms we've selected to use in this recipe.
var/list/selected_atoms = list()
@@ -105,8 +106,16 @@
// We already have enough of this type, skip
if(requirements_list[req_type] <= 0)
continue
- if(!istype(nearby_atom, req_type))
+ // If req_type is a list of types, check all of them for one match.
+ if(islist(req_type))
+ if(!(is_type_in_list(nearby_atom, req_type)))
+ continue
+ else if(!istype(nearby_atom, req_type))
continue
+ // if list has items, check if the strict type is banned.
+ if(length(banned_atom_types))
+ if(nearby_atom.type in banned_atom_types)
+ continue
// This item is a valid type. Add it to our selected atoms list.
selected_atoms |= nearby_atom
@@ -122,7 +131,7 @@
// All of the atoms have been checked, let's see if the ritual was successful
var/list/what_are_we_missing = list()
- for(var/atom/req_type as anything in requirements_list)
+ for(var/req_type in requirements_list)
var/number_of_things = requirements_list[req_type]
// <= 0 means it's fulfilled, skip
if(number_of_things <= 0)
@@ -130,10 +139,16 @@
// > 0 means it's unfilfilled - the ritual has failed, we should tell them why
// Lets format the thing they're missing and put it into our list
- var/formatted_thing = "[number_of_things] [initial(req_type.name)]\s"
- if(ispath(req_type, /mob/living/carbon/human))
- // If we need a human, there is a high likelihood we actually need a (dead) body
- formatted_thing = "[number_of_things] [number_of_things > 1 ? "bodies":"body"]"
+ var/formatted_thing = "[number_of_things] "
+ if(islist(req_type))
+ var/list/req_type_list = req_type
+ var/list/req_text_list = list()
+ for(var/atom/possible_type as anything in req_type_list)
+ req_text_list += ritual.parse_required_item(possible_type)
+ formatted_thing += english_list(req_text_list, and_text = "or")
+
+ else
+ formatted_thing = ritual.parse_required_item(req_type)
what_are_we_missing += formatted_thing
@@ -180,6 +195,7 @@
return ritual_result
+
/// A 3x3 heretic rune. The kind heretics actually draw in game.
/obj/effect/heretic_rune/big
icon = 'icons/effects/96x96.dmi'
diff --git a/code/modules/antagonists/wizard/grand_ritual/finales/all_access.dm b/code/modules/antagonists/wizard/grand_ritual/finales/all_access.dm
new file mode 100644
index 00000000000..07958ed94a7
--- /dev/null
+++ b/code/modules/antagonists/wizard/grand_ritual/finales/all_access.dm
@@ -0,0 +1,17 @@
+/// Open all of the doors
+/datum/grand_finale/all_access
+ name = "Connection"
+ desc = "The ultimate use of your gathered power! Unlock every single door that they have! Nobody will be able to keep you out now, or anyone else for that matter!"
+ icon = 'icons/mob/actions/actions_spells.dmi'
+ icon_state = "knock"
+
+/datum/grand_finale/all_access/trigger(mob/living/carbon/human/invoker)
+ message_admins("[key_name(invoker)] removed all door access requirements")
+ for(var/obj/machinery/door/target_door as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/door))
+ if(is_station_level(target_door.z))
+ target_door.unlock()
+ target_door.req_access = list()
+ target_door.req_one_access = list()
+ INVOKE_ASYNC(target_door, TYPE_PROC_REF(/obj/machinery/door/airlock, open))
+ CHECK_TICK
+ priority_announce("AULIE OXIN FIERA!!", null, 'sound/magic/knock.ogg', sender_override = "[invoker.real_name]")
diff --git a/code/modules/antagonists/wizard/grand_ritual/finales/armageddon.dm b/code/modules/antagonists/wizard/grand_ritual/finales/armageddon.dm
new file mode 100644
index 00000000000..876f2475d55
--- /dev/null
+++ b/code/modules/antagonists/wizard/grand_ritual/finales/armageddon.dm
@@ -0,0 +1,60 @@
+#define DOOM_SINGULARITY "singularity"
+#define DOOM_TESLA "tesla"
+#define DOOM_METEORS "meteors"
+
+/// Kill yourself and probably a bunch of other people
+/datum/grand_finale/armageddon
+ name = "Annihilation"
+ desc = "This crew have offended you beyond the realm of pranks. Make the ultimate sacrifice to teach them a lesson your elders can really respect. \
+ YOU WILL NOT SURVIVE THIS."
+ icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi'
+ icon_state = "legion_head"
+ minimum_time = 90 MINUTES // This will probably immediately end the round if it gets finished.
+ ritual_invoke_time = 60 SECONDS // Really give the crew some time to interfere with this one.
+ dire_warning = TRUE
+ glow_colour = "#be000048"
+ /// Things to yell before you die
+ var/static/list/possible_last_words = list(
+ "Flames and ruin!",
+ "Dooooooooom!!",
+ "HAHAHAHAHAHA!! AHAHAHAHAHAHAHAHAA!!",
+ "Hee hee hee!! Hoo hoo hoo!! Ha ha haaa!!",
+ "Ohohohohohoho!!",
+ "Cower in fear, puny mortals!",
+ "Tremble before my glory!",
+ "Pick a god and pray!",
+ "It's no use!",
+ "If the gods wanted you to live, they would not have created me!",
+ "God stays in heaven out of fear of what I have created!",
+ "Ruination is come!",
+ "All of creation, bend to my will!",
+ )
+
+/datum/grand_finale/armageddon/trigger(mob/living/carbon/human/invoker)
+ priority_announce(pick(possible_last_words), null, 'sound/magic/voidblink.ogg', sender_override = "[invoker.real_name]")
+ var/turf/current_location = get_turf(invoker)
+ invoker.gib()
+
+ var/static/list/doom_options = list()
+ if (!length(doom_options))
+ doom_options = list(DOOM_SINGULARITY, DOOM_TESLA)
+ if (!SSmapping.config.planetary)
+ doom_options += DOOM_METEORS
+
+ switch(pick(doom_options))
+ if (DOOM_SINGULARITY)
+ var/obj/singularity/singulo = new(current_location)
+ singulo.energy = 300
+ if (DOOM_TESLA)
+ var/obj/energy_ball/tesla = new (current_location)
+ tesla.energy = 200
+ if (DOOM_METEORS)
+ var/datum/dynamic_ruleset/roundstart/meteor/meteors = new()
+ meteors.meteordelay = 0
+ var/datum/game_mode/dynamic/mode = SSticker.mode
+ mode.execute_roundstart_rule(meteors) // Meteors will continue until morale is crushed.
+ priority_announce("Meteors have been detected on collision course with the station.", "Meteor Alert", ANNOUNCER_METEORS)
+
+#undef DOOM_SINGULARITY
+#undef DOOM_TESLA
+#undef DOOM_METEORS
diff --git a/code/modules/antagonists/wizard/grand_ritual/finales/captaincy.dm b/code/modules/antagonists/wizard/grand_ritual/finales/captaincy.dm
new file mode 100644
index 00000000000..d1a3c1afaf7
--- /dev/null
+++ b/code/modules/antagonists/wizard/grand_ritual/finales/captaincy.dm
@@ -0,0 +1,113 @@
+/// Become the official Captain of the station
+/datum/grand_finale/usurp
+ name = "Usurpation"
+ desc = "The ultimate use of your gathered power! Rewrite time such that you have been Captain of this station the whole time."
+ icon = 'icons/obj/card.dmi'
+ icon_state = "card_gold"
+
+/datum/grand_finale/usurp/trigger(mob/living/carbon/human/invoker)
+ message_admins("[key_name(invoker)] has replaced the Captain")
+ var/list/former_captains = list()
+ var/list/other_crew = list()
+ SEND_SOUND(world, sound('sound/magic/timeparadox2.ogg'))
+
+ for (var/mob/living/carbon/human/crewmate as anything in GLOB.human_list)
+ if (!crewmate.mind)
+ continue
+ crewmate.Unconscious(3 SECONDS) // Everyone falls unconscious but not everyone gets told about a new captain
+ if (crewmate == invoker || IS_HUMAN_INVADER(crewmate))
+ continue
+ to_chat(crewmate, span_notice("The world spins and dissolves. Your past flashes before your eyes, backwards.\n\
+ Life strolls back into the ocean and shrinks into nothingness, planets explode into storms of solar dust, \
+ the stars rush back to greet each other at the beginning of things and then... you snap back to the present. \n\
+ Everything is just as it was and always has been. \n\n\
+ A stray thought sticks in the forefront of your mind. \n\
+ [span_hypnophrase("I'm so glad that [invoker.real_name] is our legally appointed Captain!")] \n\
+ Is... that right?"))
+ if (is_captain_job(crewmate.mind.assigned_role))
+ former_captains += crewmate
+ demote_to_assistant(crewmate)
+ continue
+ if (crewmate.stat != DEAD)
+ other_crew += crewmate
+
+ dress_candidate(invoker)
+ GLOB.manifest.modify(invoker.real_name, JOB_CAPTAIN, JOB_CAPTAIN)
+ minor_announce("Captain [invoker.real_name] on deck!")
+
+ // Enlist some crew to try and restore the natural order
+ for (var/mob/living/carbon/human/former_captain as anything in former_captains)
+ create_vendetta(former_captain.mind, invoker.mind)
+ for (var/mob/living/carbon/human/random_crewmate as anything in other_crew)
+ if (prob(10))
+ create_vendetta(random_crewmate.mind, invoker.mind)
+
+/**
+ * Anyone who thought they were Captain is in for a nasty surprise, and won't be very happy about it
+ */
+/datum/grand_finale/usurp/proc/demote_to_assistant(mob/living/carbon/human/former_captain)
+ var/obj/effect/particle_effect/fluid/smoke/exit_poof = new(get_turf(former_captain))
+ exit_poof.lifetime = 2 SECONDS
+
+ former_captain.unequip_everything()
+ if(isplasmaman(former_captain))
+ former_captain.equipOutfit(/datum/outfit/plasmaman)
+ former_captain.internal = former_captain.get_item_for_held_index(2)
+ else
+ former_captain.equipOutfit(/datum/outfit/job/assistant)
+
+ GLOB.manifest.modify(former_captain.real_name, JOB_ASSISTANT, JOB_ASSISTANT)
+ var/list/valid_turfs = list()
+ // Used to be into prison but that felt a bit too mean
+ for (var/turf/exile_turf as anything in get_area_turfs(/area/station/maintenance, subtypes = TRUE))
+ if (isspaceturf(exile_turf) || exile_turf.is_blocked_turf())
+ continue
+ valid_turfs += exile_turf
+ do_teleport(former_captain, pick(valid_turfs), no_effects = TRUE)
+ var/obj/effect/particle_effect/fluid/smoke/enter_poof = new(get_turf(former_captain))
+ enter_poof.lifetime = 2 SECONDS
+
+/**
+ * Does some item juggling to try to dress you as both a Wizard and Captain without deleting any items you have bought.
+ * ID, headset, and uniform are forcibly replaced. Other slots are only filled if unoccupied.
+ * We could forcibly replace shoes and gloves too but people might miss their insuls or... meown shoes?
+ */
+/datum/grand_finale/usurp/proc/dress_candidate(mob/living/carbon/human/invoker)
+ // Won't be needing these
+ var/obj/id = invoker.get_item_by_slot(ITEM_SLOT_ID)
+ QDEL_NULL(id)
+ var/obj/headset = invoker.get_item_by_slot(ITEM_SLOT_EARS)
+ QDEL_NULL(headset)
+ // We're about to take off your pants so those are going to fall out
+ var/obj/item/pocket_L = invoker.get_item_by_slot(ITEM_SLOT_LPOCKET)
+ var/obj/item/pocket_R = invoker.get_item_by_slot(ITEM_SLOT_RPOCKET)
+ // In case we try to put a PDA there
+ var/obj/item/belt = invoker.get_item_by_slot(ITEM_SLOT_BELT)
+ belt?.moveToNullspace()
+
+ var/obj/pants = invoker.get_item_by_slot(ITEM_SLOT_ICLOTHING)
+ QDEL_NULL(pants)
+ invoker.equipOutfit(/datum/outfit/job/wizard_captain)
+ // And put everything back!
+ equip_to_slot_then_hands(invoker, ITEM_SLOT_BELT, belt)
+ equip_to_slot_then_hands(invoker, ITEM_SLOT_LPOCKET, pocket_L)
+ equip_to_slot_then_hands(invoker, ITEM_SLOT_RPOCKET, pocket_R)
+
+/// An outfit which replaces parts of a wizard's clothes with captain's clothes but keeps the robes
+/datum/outfit/job/wizard_captain
+ name = "Captain (Wizard Transformation)"
+ jobtype = /datum/job/captain
+ id = /obj/item/card/id/advanced/gold
+ id_trim = /datum/id_trim/job/captain
+ uniform = /obj/item/clothing/under/rank/captain/parade
+ belt = /obj/item/modular_computer/pda/heads/captain
+ ears = /obj/item/radio/headset/heads/captain/alt
+ glasses = /obj/item/clothing/glasses/sunglasses
+ gloves = /obj/item/clothing/gloves/captain
+ shoes = /obj/item/clothing/shoes/laceup
+ accessory = /obj/item/clothing/accessory/medal/gold/captain
+ backpack_contents = list(
+ /obj/item/melee/baton/telescopic = 1,
+ /obj/item/station_charter = 1,
+ )
+ box = null
diff --git a/code/modules/antagonists/wizard/grand_ritual/finales/cheese.dm b/code/modules/antagonists/wizard/grand_ritual/finales/cheese.dm
new file mode 100644
index 00000000000..714cd62659b
--- /dev/null
+++ b/code/modules/antagonists/wizard/grand_ritual/finales/cheese.dm
@@ -0,0 +1,49 @@
+/**
+ * Gives the wizard a defensive/mood buff and a Wabbajack, a juiced up chaos staff that will surely break something.
+ * Everyone but the wizard goes crazy, suffers major brain damage, and is given a vendetta against the wizard.
+ * Already insane people are instead cured of their madness, ignoring any other effects as the station around them loses its marbles.
+ */
+/datum/grand_finale/cheese
+ // we don't set name, desc and others, thus we won't appear in the radial choice of a normal finale rune
+ dire_warning = TRUE
+ minimum_time = 45 MINUTES //i'd imagine speedrunning this would be crummy, but the wizard's average lifespan is barely reaching this point
+
+/datum/grand_finale/cheese/trigger(mob/living/invoker)
+ message_admins("[key_name(invoker)] has summoned forth The Wabbajack and cursed the crew with madness!")
+ priority_announce("Danger: Extremely potent reality altering object has been summoned on station. Immediate evacuation advised. Brace for impact.", "Central Command Higher Dimensional Affairs", 'sound/effects/glassbr1.ogg')
+
+ for (var/mob/living/carbon/human/crewmate as anything in GLOB.human_list)
+ if (isnull(crewmate.mind))
+ continue
+ if (crewmate == invoker) //everyone but the wizard is royally fucked, no matter who they are
+ continue
+ if (crewmate.has_trauma_type(/datum/brain_trauma/mild/hallucinations)) //for an already insane person, this is retribution
+ to_chat(crewmate, span_boldwarning("Your surroundings suddenly fill with a cacophony of manic laughter and psychobabble..."))
+ to_chat(crewmate, span_nicegreen("...but as the moment passes, you realise that whatever eldritch power behind the event happened to affect you \
+ has resonated within the ruins of your already shattered mind, creating a singularity of mental instability! \
+ As it collapses unto itself, you feel... at peace, finally."))
+ if(crewmate.has_quirk(/datum/quirk/insanity))
+ crewmate.remove_quirk(/datum/quirk/insanity)
+ else
+ crewmate.cure_trauma_type(/datum/brain_trauma/mild/hallucinations, TRAUMA_RESILIENCE_ABSOLUTE)
+ else
+ //everyone else gets to relish in madness
+ //yes killing their mood will also trigger mood hallucinations
+ create_vendetta(crewmate.mind, invoker.mind)
+ to_chat(crewmate, span_boldwarning("Your surroundings suddenly fill with a cacophony of manic laughter and psychobabble. \n\
+ You feel your inner psyche shatter into a myriad pieces of jagged glass of colors unknown to the universe, \
+ infinitely reflecting a blinding, maddening light coming from the innermost sanctums of your destroyed mind. \n\
+ After a brief pause which felt like a millenia, one phrase rebounds ceaselessly in your head, imbued with the false hope of absolution... \n\
+ [invoker] must die."))
+ var/datum/brain_trauma/mild/hallucinations/added_trauma = new()
+ added_trauma.resilience = TRAUMA_RESILIENCE_ABSOLUTE
+ crewmate.adjustOrganLoss(ORGAN_SLOT_BRAIN, BRAIN_DAMAGE_DEATH - 25, BRAIN_DAMAGE_DEATH - 25) //you'd better hope chap didn't pick a hypertool
+ crewmate.gain_trauma(added_trauma)
+ crewmate.add_mood_event("wizard_ritual_finale", /datum/mood_event/madness_despair)
+
+ //drip our wizard out
+ invoker.apply_status_effect(/datum/status_effect/blessing_of_insanity)
+ invoker.add_mood_event("wizard_ritual_finale", /datum/mood_event/madness_elation)
+ var/obj/item/gun/magic/staff/chaos/true_wabbajack/the_wabbajack = new
+ invoker.put_in_active_hand(the_wabbajack)
+ to_chat(invoker, span_mind_control("Your every single instinct and rational thought is screaming at you as [the_wabbajack] appears in your firm grip..."))
diff --git a/code/modules/antagonists/wizard/grand_ritual/finales/clown.dm b/code/modules/antagonists/wizard/grand_ritual/finales/clown.dm
new file mode 100644
index 00000000000..bda79c908c0
--- /dev/null
+++ b/code/modules/antagonists/wizard/grand_ritual/finales/clown.dm
@@ -0,0 +1,76 @@
+/// Dress the crew as magical clowns
+/datum/grand_finale/clown
+ name = "Jubilation"
+ desc = "The ultimate use of your gathered power! Rewrite time so that everyone went to clown college! Now they'll prank each other for you!"
+ icon = 'icons/obj/clothing/masks.dmi'
+ icon_state = "clown"
+ glow_colour = "#ffff0048"
+
+/datum/grand_finale/clown/trigger(mob/living/carbon/human/invoker)
+ for(var/mob/living/carbon/human/victim as anything in GLOB.human_list)
+ victim.Unconscious(3 SECONDS)
+ if (!victim.mind || IS_HUMAN_INVADER(victim) || victim == invoker)
+ continue
+ if (HAS_TRAIT(victim, TRAIT_CLOWN_ENJOYER))
+ victim.add_mood_event("clown_world", /datum/mood_event/clown_world)
+ to_chat(victim, span_notice("The world spins and dissolves. Your past flashes before your eyes, backwards.\n\
+ Life strolls back into the ocean and shrinks into nothingness, planets explode into storms of solar dust, \
+ the stars rush back to greet each other at the beginning of things and then... you snap back to the present. \n\
+ Everything is just as it was and always has been. \n\n\
+ A stray thought sticks in the forefront of your mind. \n\
+ [span_hypnophrase("I'm so glad that I work at Clown Research Station [station_name()]!")] \n\
+ Is... that right?"))
+ if (is_clown_job(victim.mind.assigned_role))
+ var/datum/action/cooldown/spell/conjure_item/clown_pockets/new_spell = new(victim)
+ new_spell.Grant(victim)
+ continue
+ if (!ismonkey(victim)) // Monkeys cannot yet wear clothes
+ dress_as_magic_clown(victim)
+ if (prob(15))
+ create_vendetta(victim.mind, invoker.mind)
+
+/**
+ * Clown enjoyers who are effected by this become ecstatic, they have achieved their life's dream.
+ * This moodlet is equivalent to the one for simply being a traitor.
+ */
+/datum/mood_event/clown_world
+ mood_change = 4
+
+/datum/mood_event/clown_world/add_effects(param)
+ description = "I LOVE working at Clown Research Station [station_name()]!!"
+
+/// Dress the passed mob as a magical clown, self-explanatory
+/datum/grand_finale/clown/proc/dress_as_magic_clown(mob/living/carbon/human/victim)
+ var/obj/effect/particle_effect/fluid/smoke/poof = new(get_turf(victim))
+ poof.lifetime = 2 SECONDS
+
+ var/obj/item/tank/internal = victim.internal
+ // We're about to take off your pants so those are going to fall out
+ var/obj/item/pocket_L = victim.get_item_by_slot(ITEM_SLOT_LPOCKET)
+ var/obj/item/pocket_R = victim.get_item_by_slot(ITEM_SLOT_RPOCKET)
+ var/obj/item/id = victim.get_item_by_slot(ITEM_SLOT_ID)
+ var/obj/item/belt = victim.get_item_by_slot(ITEM_SLOT_BELT)
+
+ var/obj/pants = victim.get_item_by_slot(ITEM_SLOT_ICLOTHING)
+ var/obj/mask = victim.get_item_by_slot(ITEM_SLOT_MASK)
+ QDEL_NULL(pants)
+ QDEL_NULL(mask)
+ if(isplasmaman(victim))
+ victim.equip_to_slot_if_possible(new /obj/item/clothing/under/plasmaman/clown/magic(), ITEM_SLOT_ICLOTHING, disable_warning = TRUE)
+ victim.equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clown_hat/plasmaman(), ITEM_SLOT_MASK, disable_warning = TRUE)
+ else
+ victim.equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/clown/magic(), ITEM_SLOT_ICLOTHING, disable_warning = TRUE)
+ victim.equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clown_hat(), ITEM_SLOT_MASK, disable_warning = TRUE)
+
+ var/obj/item/clothing/mask/gas/clown_hat/clown_mask = victim.get_item_by_slot(ITEM_SLOT_MASK)
+ if (clown_mask)
+ var/list/options = GLOB.clown_mask_options
+ clown_mask.icon_state = options[pick(clown_mask.clownmask_designs)]
+ victim.update_worn_mask()
+ clown_mask.update_item_action_buttons()
+
+ equip_to_slot_then_hands(victim, ITEM_SLOT_LPOCKET, pocket_L)
+ equip_to_slot_then_hands(victim, ITEM_SLOT_RPOCKET, pocket_R)
+ equip_to_slot_then_hands(victim, ITEM_SLOT_ID, id)
+ equip_to_slot_then_hands(victim, ITEM_SLOT_BELT, belt)
+ victim.internal = internal
diff --git a/code/modules/antagonists/wizard/grand_ritual/finales/grand_ritual_finale.dm b/code/modules/antagonists/wizard/grand_ritual/finales/grand_ritual_finale.dm
new file mode 100644
index 00000000000..b92ae4d2f20
--- /dev/null
+++ b/code/modules/antagonists/wizard/grand_ritual/finales/grand_ritual_finale.dm
@@ -0,0 +1,88 @@
+/**
+ * A big final event to run when you complete seven rituals
+ */
+/datum/grand_finale
+ /// Friendly name for selection menu
+ var/name
+ /// Tooltip description for selection menu
+ var/desc
+ /// An icon to display to represent the choice
+ var/icon/icon
+ /// Icon state to use to represent the choice
+ var/icon_state
+ /// Prevent especially dangerous options from being chosen until we're fine with the round ending
+ var/minimum_time = 0
+ /// Override the rune invocation time
+ var/ritual_invoke_time = 30 SECONDS
+ /// Provide an extremely loud radio message when this one starts
+ var/dire_warning = FALSE
+ /// Overrides the default colour you glow while channeling the rune, optional
+ var/glow_colour
+
+/**
+ * Returns an entry for a radial menu for this choice.
+ * Returns null if entry is abstract or invalid for current circumstances.
+ */
+/datum/grand_finale/proc/get_radial_choice()
+ if (!name || !desc || !icon || !icon_state)
+ return
+ var/time_remaining_desc = ""
+ if (minimum_time >= world.time - SSticker.round_start_time)
+ time_remaining_desc = "This ritual will be available to begin invoking in [DisplayTimeText(minimum_time - world.time - SSticker.round_start_time)]"
+ var/datum/radial_menu_choice/choice = new()
+ choice.name = name
+ choice.image = image(icon = icon, icon_state = icon_state)
+ choice.info = desc + time_remaining_desc
+ return choice
+
+/**
+ * Actually do the thing.
+ * Arguments
+ * * invoker - The wizard casting this.
+ */
+/datum/grand_finale/proc/trigger(mob/living/invoker)
+ // Do something cool.
+
+/// Tries to equip something into an inventory slot, then hands, then the floor.
+/datum/grand_finale/proc/equip_to_slot_then_hands(mob/living/carbon/human/invoker, slot, obj/item/item)
+ if(!item)
+ return
+ if(!invoker.equip_to_slot_if_possible(item, slot, disable_warning = TRUE))
+ invoker.put_in_hands(item)
+
+/// They are not going to take this lying down.
+/datum/grand_finale/proc/create_vendetta(datum/mind/aggrieved_crewmate, datum/mind/wizard)
+ aggrieved_crewmate.add_antag_datum(/datum/antagonist/wizard_prank_vendetta)
+ var/datum/antagonist/wizard_prank_vendetta/antag_datum = aggrieved_crewmate.has_antag_datum(/datum/antagonist/wizard_prank_vendetta)
+ var/datum/objective/assassinate/wizard_murder = new
+ wizard_murder.owner = aggrieved_crewmate
+ wizard_murder.target = wizard
+ wizard_murder.explanation_text = "Kill [wizard.current.name], the one who did this."
+ antag_datum.objectives += wizard_murder
+
+ to_chat(aggrieved_crewmate.current, span_warning("No! This isn't right!"))
+ aggrieved_crewmate.announce_objectives()
+
+/**
+ * Antag datum to give to people who want to kill the wizard.
+ * This doesn't preclude other people choosing to want to kill the wizard, just these people are rewarded for it.
+ */
+/datum/antagonist/wizard_prank_vendetta
+ name = "\improper Wizard Prank Victim"
+ roundend_category = "wizard prank victims"
+ show_in_antagpanel = FALSE
+ antagpanel_category = "Other"
+ show_name_in_check_antagonists = TRUE
+ count_against_dynamic_roll_chance = FALSE
+ silent = TRUE
+
+/// Give everyone magic items, its so simple it feels pointless to give it its own file
+/datum/grand_finale/magic
+ name = "Evolution"
+ desc = "The ultimate use of your gathered power! Give the crew their own magic, they'll surely realise that right and wrong have no meaning when you hold ultimate power!"
+ icon = 'icons/obj/scrolls.dmi'
+ icon_state = "scroll"
+
+/datum/grand_finale/magic/trigger(mob/living/carbon/human/invoker)
+ message_admins("[key_name(invoker)] summoned magic")
+ summon_magic(survivor_probability = 20) // Wow, this one was easy!
diff --git a/code/modules/antagonists/wizard/grand_ritual/finales/immortality.dm b/code/modules/antagonists/wizard/grand_ritual/finales/immortality.dm
new file mode 100644
index 00000000000..d20ca06752b
--- /dev/null
+++ b/code/modules/antagonists/wizard/grand_ritual/finales/immortality.dm
@@ -0,0 +1,277 @@
+/// Amount of time to wait after someone dies to steal their body from their killers
+#define IMMORTAL_PRE_ACTIVATION_TIME 10 SECONDS
+/// Amount of time it takes a mob to return to the living world
+#define IMMORTAL_RESURRECT_TIME 50 SECONDS
+
+/**
+ * Nobody will ever die ever again
+ * Or if they do, they will be back
+ */
+/datum/grand_finale/immortality
+ name = "Perpetuation"
+ desc = "The ultimate use of your gathered power! Share with the crew the gift, or curse, of eternal life! \
+ And why not just the crew? How about their pets too? And any other animals around here! \
+ What if nobody died ever again!?"
+ icon = 'icons/obj/mining_zones/artefacts.dmi'
+ icon_state = "asclepius_active"
+ glow_colour = COLOR_PALE_GREEN
+ minimum_time = 30 MINUTES // This is enormously disruptive but doesn't technically in of itself end the round.
+
+/datum/grand_finale/immortality/trigger(mob/living/carbon/human/invoker)
+ new /obj/effect/temp_visual/immortality_blast(get_turf(invoker))
+ SEND_SOUND(world, sound('sound/magic/teleport_diss.ogg'))
+ for (var/mob/living/alive_guy as anything in GLOB.mob_living_list)
+ new /obj/effect/temp_visual/immortality_pulse(get_turf(alive_guy))
+ if (!alive_guy.mind)
+ continue
+ to_chat(alive_guy, span_notice("You feel extremely healthy."))
+ RegisterSignal(SSdcs, COMSIG_GLOB_MOB_DEATH, PROC_REF(something_died))
+
+/// Called when something passes into the great beyond, make it not do that
+/datum/grand_finale/immortality/proc/something_died(datum/source, mob/living/died, gibbed)
+ SIGNAL_HANDLER
+ if (died.stat != DEAD || HAS_TRAIT(died, TRAIT_PERMANENTLY_MORTAL) || died.flags_1 & HOLOGRAM_1)
+ return
+ var/body_type = died.type
+
+ var/turf/died_turf = get_turf(died)
+ var/list/nearby_turfs = circle_view_turfs(died_turf, 2)
+ var/list/nearby_safe_turfs = list()
+ for (var/turf/check_turf as anything in nearby_turfs)
+ if (check_turf.is_blocked_turf(exclude_mobs = TRUE, source_atom = died))
+ nearby_turfs -= check_turf
+ continue
+ if (islava(check_turf) || ischasm(check_turf))
+ continue
+ nearby_safe_turfs += check_turf
+ if (length(nearby_safe_turfs)) // If you're in the middle of a 5x5 chasm, tough luck I guess
+ died_turf = pick(nearby_safe_turfs)
+ else if (length(nearby_turfs))
+ died_turf = pick(nearby_turfs)
+
+ var/saved_appearance = ishuman(died) ? new /datum/human_appearance_profile(died) : null
+
+ var/datum/mind/dead_mind = HAS_TRAIT(died, TRAIT_SUICIDED) ? null : died.mind // There is a way out of the cycle
+ if (!isnull(dead_mind))
+ to_chat(died, span_boldnotice("Your spirit surges! You will return to life in [DisplayTimeText(IMMORTAL_PRE_ACTIVATION_TIME + IMMORTAL_RESURRECT_TIME)]."))
+ animate(died, alpha = died.alpha, time = IMMORTAL_PRE_ACTIVATION_TIME / 2, flags = ANIMATION_PARALLEL)
+ animate(alpha = 0, time = IMMORTAL_PRE_ACTIVATION_TIME / 2, easing = SINE_EASING | EASE_IN)
+ addtimer(CALLBACK(src, PROC_REF(reverse_death), died, dead_mind, died_turf, body_type, saved_appearance), IMMORTAL_PRE_ACTIVATION_TIME, TIMER_DELETE_ME)
+
+/// Create a ghost ready for revival
+/datum/grand_finale/immortality/proc/reverse_death(mob/living/died, datum/mind/dead_mind, turf/died_turf, body_type, datum/human_appearance_profile/human_appearance)
+ if (died.stat != DEAD)
+ return
+ var/ghost_type = ispath(body_type, /mob/living/carbon/human) ? /obj/effect/spectre_of_resurrection/human : /obj/effect/spectre_of_resurrection
+ var/obj/effect/spectre_of_resurrection/ghost = new ghost_type(died_turf)
+ var/mob/living/corpse = QDELETED(died) ? new body_type(ghost) : died
+ if (!isnull(human_appearance))
+ corpse.real_name = human_appearance.name
+ corpse.alpha = initial(corpse.alpha)
+ corpse.add_traits(list(TRAIT_NO_TELEPORT, TRAIT_AI_PAUSED), MAGIC_TRAIT)
+ corpse.apply_status_effect(/datum/status_effect/grouped/stasis, MAGIC_TRAIT)
+ ghost.set_up_resurrection(corpse, dead_mind, human_appearance)
+
+
+/// Store of data we use to recreate someone who was gibbed, like a simplified version of changeling profiles
+/datum/human_appearance_profile
+ /// The name of the profile / the name of whoever this profile source.
+ var/name = "human"
+ /// The DNA datum associated with our profile from the profile source
+ var/datum/dna/dna
+ /// The age of the profile source.
+ var/age
+ /// The body type of the profile source.
+ var/physique
+ /// The quirks of the profile source.
+ var/list/quirks = list()
+ /// The hair and facial hair gradient styles of the profile source.
+ var/list/hair_gradient_style = list("None", "None")
+ /// The hair and facial hair gradient colours of the profile source.
+ var/list/hair_gradient_colours = list(null, null)
+ /// The TTS voice of the profile source
+ var/voice
+ /// The TTS filter of the profile filter
+ var/voice_filter = ""
+
+/datum/human_appearance_profile/New(mob/living/carbon/human/target)
+ copy_from(target)
+
+/// Copy the appearance data of the target
+/datum/human_appearance_profile/proc/copy_from(mob/living/carbon/human/target)
+ target.dna.real_name = target.real_name
+ dna = new target.dna.type()
+ target.dna.copy_dna(dna)
+ name = target.real_name
+ age = target.age
+ physique = target.physique
+
+ for(var/datum/quirk/target_quirk as anything in target.quirks)
+ LAZYADD(quirks, new target_quirk.type)
+
+ hair_gradient_style = LAZYLISTDUPLICATE(target.grad_style)
+ hair_gradient_colours = LAZYLISTDUPLICATE(target.grad_color)
+
+ voice = target.voice
+ voice_filter = target.voice_filter
+
+/// Make the targetted human look like this
+/datum/human_appearance_profile/proc/apply_to(mob/living/carbon/human/target)
+ target.real_name = name
+ target.age = age
+ target.physique = physique
+ target.grad_style = LAZYLISTDUPLICATE(hair_gradient_style)
+ target.grad_color = LAZYLISTDUPLICATE(hair_gradient_colours)
+ target.voice = voice
+ target.voice_filter = voice_filter
+
+ for(var/datum/quirk/target_quirk as anything in quirks)
+ target_quirk.add_to_holder(target)
+
+ dna.transfer_identity(target, TRUE)
+ for(var/obj/item/bodypart/limb as anything in target.bodyparts)
+ limb.update_limb(is_creating = TRUE)
+ target.updateappearance(mutcolor_update = TRUE)
+ target.domutcheck()
+ target.regenerate_icons()
+
+
+/// A ghostly image of a mob showing where and what is going to respawn
+/obj/effect/spectre_of_resurrection
+ name = "spectre"
+ desc = "A frightening apparition, slowly growing more solid."
+ icon_state = "blank_white"
+ anchored = TRUE
+ layer = MOB_LAYER
+ plane = GAME_PLANE
+ alpha = 0
+ color = COLOR_PALE_GREEN
+ light_range = 2
+ light_color = COLOR_PALE_GREEN
+ /// Who are we reviving?
+ var/mob/living/corpse
+ /// Who if anyone is playing as them?
+ var/datum/mind/dead_mind
+
+/obj/effect/spectre_of_resurrection/Initialize(mapload)
+ . = ..()
+ animate(src, alpha = 150, time = 2 SECONDS)
+
+/// Prepare to revive someone
+/obj/effect/spectre_of_resurrection/proc/set_up_resurrection(mob/living/corpse, datum/mind/dead_mind, datum/human_appearance_profile/human_appearance)
+ if (isnull(corpse))
+ qdel(src)
+ return
+
+ src.corpse = corpse
+ src.dead_mind = dead_mind
+ corpse.forceMove(src)
+ name = "spectre of [corpse]"
+ setup_icon(corpse)
+ DO_FLOATING_ANIM(src)
+
+ RegisterSignal(corpse, COMSIG_LIVING_REVIVE, PROC_REF(on_corpse_revived))
+ RegisterSignal(corpse, COMSIG_QDELETING, PROC_REF(on_corpse_deleted))
+ RegisterSignal(dead_mind, COMSIG_QDELETING, PROC_REF(on_mind_lost))
+ addtimer(CALLBACK(src, PROC_REF(revive)), IMMORTAL_RESURRECT_TIME, TIMER_DELETE_ME)
+
+/// Copy appearance from ressurecting mob
+/obj/effect/spectre_of_resurrection/proc/setup_icon(mob/living/corpse)
+ icon = initial(corpse.icon)
+ icon_state = initial(corpse.icon_state)
+
+/obj/effect/spectre_of_resurrection/Destroy(force)
+ QDEL_NULL(corpse)
+ dead_mind = null
+ return ..()
+
+/obj/effect/spectre_of_resurrection/Exited(atom/movable/gone, direction)
+ . = ..()
+ if (gone != corpse)
+ return // Weird but ok
+ UnregisterSignal(corpse, list(COMSIG_LIVING_REVIVE, COMSIG_QDELETING))
+ corpse = null
+ qdel(src)
+
+/// Bring our body back to life
+/obj/effect/spectre_of_resurrection/proc/revive()
+ if (!isnull(dead_mind))
+ if (dead_mind.current == corpse)
+ dead_mind.grab_ghost(force = TRUE)
+ else
+ dead_mind.transfer_to(corpse, force_key_move = TRUE)
+ corpse.revive(HEAL_ALL) // The signal is sent even if they weren't actually dead
+
+/// Remove our stored corpse back to the living world
+/obj/effect/spectre_of_resurrection/proc/on_corpse_revived()
+ SIGNAL_HANDLER
+ if (isnull(corpse))
+ return
+ visible_message(span_boldnotice("[corpse] suddenly shudders to life!"))
+ corpse.remove_traits(list(TRAIT_NO_TELEPORT, TRAIT_AI_PAUSED), MAGIC_TRAIT)
+ corpse.remove_status_effect(/datum/status_effect/grouped/stasis, MAGIC_TRAIT)
+ corpse.forceMove(loc)
+
+/// If the body is destroyed then we can't come back, F
+/obj/effect/spectre_of_resurrection/proc/on_corpse_deleted()
+ SIGNAL_HANDLER
+ qdel(src)
+
+/// If the mind is deleted somehow we just don't transfer it on revival
+/obj/effect/spectre_of_resurrection/proc/on_mind_lost()
+ SIGNAL_HANDLER
+ dead_mind = null
+
+/// A ressurection spectre with extra behaviour for humans
+/obj/effect/spectre_of_resurrection/human
+ /// Stored data used to restore someone to a fascimile of what they were before
+ var/datum/human_appearance_profile/human_appearance
+
+/obj/effect/spectre_of_resurrection/human/set_up_resurrection(mob/living/corpse, datum/mind/dead_mind, datum/human_appearance_profile/human_appearance)
+ . = ..()
+ src.human_appearance = human_appearance
+
+// We just use a generic floating human appearance to save unecessary costly icon operations
+/obj/effect/spectre_of_resurrection/human/setup_icon(mob/living/corpse)
+ return
+
+// Apply stored human details
+/obj/effect/spectre_of_resurrection/human/on_corpse_revived()
+ if (isnull(corpse))
+ return
+ human_appearance?.apply_to(corpse)
+ return ..()
+
+
+/// Visual flair on the wizard when cast
+/obj/effect/temp_visual/immortality_blast
+ name = "immortal wave"
+ duration = 2.5 SECONDS
+ icon = 'icons/effects/96x96.dmi'
+ icon_state = "boh_tear"
+ color = COLOR_PALE_GREEN
+ pixel_x = -32
+ pixel_y = -32
+
+/obj/effect/temp_visual/immortality_blast/Initialize(mapload)
+ . = ..()
+ transform *= 0
+ animate(src, transform = matrix(), time = 1.5 SECONDS, easing = ELASTIC_EASING)
+ animate(transform = matrix() * 3, time = 1 SECONDS, alpha = 0, easing = SINE_EASING | EASE_OUT)
+
+
+/// Visual flair on living creatures who have become immortal
+/obj/effect/temp_visual/immortality_pulse
+ name = "immortal pulse"
+ duration = 1 SECONDS
+ icon = 'icons/effects/anomalies.dmi'
+ icon_state = "dimensional_overlay"
+ color = COLOR_PALE_GREEN
+
+/obj/effect/temp_visual/immortality_pulse/Initialize(mapload)
+ . = ..()
+ transform *= 0
+ animate(src, transform = matrix() * 1.5, alpha = 0, time = 1 SECONDS, easing = SINE_EASING | EASE_OUT)
+
+#undef IMMORTAL_PRE_ACTIVATION_TIME
+#undef IMMORTAL_RESURRECT_TIME
diff --git a/code/modules/antagonists/wizard/grand_ritual/finales/midas.dm b/code/modules/antagonists/wizard/grand_ritual/finales/midas.dm
new file mode 100644
index 00000000000..b2e3329261f
--- /dev/null
+++ b/code/modules/antagonists/wizard/grand_ritual/finales/midas.dm
@@ -0,0 +1,46 @@
+/// Completely transform the station
+/datum/grand_finale/midas
+ name = "Transformation"
+ desc = "The ultimate use of your gathered power! Turn their precious station into something much MORE precious, materially speaking!"
+ icon = 'icons/obj/stack_objects.dmi'
+ icon_state = "sheet-gold_2"
+ glow_colour = "#dbdd4c48"
+ var/static/list/permitted_transforms = list( // Non-dangerous only
+ /datum/dimension_theme/gold,
+ /datum/dimension_theme/meat,
+ /datum/dimension_theme/pizza,
+ /datum/dimension_theme/natural,
+ )
+ var/datum/dimension_theme/chosen_theme
+
+// I sure hope this doesn't have performance implications
+/datum/grand_finale/midas/trigger(mob/living/carbon/human/invoker)
+ var/theme_path = pick(permitted_transforms)
+ chosen_theme = new theme_path()
+ var/turf/start_turf = get_turf(invoker)
+ var/greatest_dist = 0
+ var/list/turfs_to_transform = list()
+ for (var/turf/transform_turf as anything in GLOB.station_turfs)
+ if (!chosen_theme.can_convert(transform_turf))
+ continue
+ var/dist = get_dist(start_turf, transform_turf)
+ if (dist > greatest_dist)
+ greatest_dist = dist
+ if (!turfs_to_transform["[dist]"])
+ turfs_to_transform["[dist]"] = list()
+ turfs_to_transform["[dist]"] += transform_turf
+
+ if (chosen_theme.can_convert(start_turf))
+ chosen_theme.apply_theme(start_turf)
+
+ for (var/iterator in 1 to greatest_dist)
+ if(!turfs_to_transform["[iterator]"])
+ continue
+ addtimer(CALLBACK(src, PROC_REF(transform_area), turfs_to_transform["[iterator]"]), (5 SECONDS) * iterator)
+
+/datum/grand_finale/midas/proc/transform_area(list/turfs)
+ for (var/turf/transform_turf as anything in turfs)
+ if (!chosen_theme.can_convert(transform_turf))
+ continue
+ chosen_theme.apply_theme(transform_turf)
+ CHECK_TICK
diff --git a/code/modules/antagonists/wizard/grand_ritual/grand_ritual_finale.dm b/code/modules/antagonists/wizard/grand_ritual/grand_ritual_finale.dm
deleted file mode 100644
index 9a59b1f1a79..00000000000
--- a/code/modules/antagonists/wizard/grand_ritual/grand_ritual_finale.dm
+++ /dev/null
@@ -1,456 +0,0 @@
-#define DOOM_SINGULARITY "singularity"
-#define DOOM_TESLA "tesla"
-#define DOOM_METEORS "meteors"
-
-/**
- * A big final event to run when you complete seven rituals
- */
-/datum/grand_finale
- /// Friendly name for selection menu
- var/name
- /// Tooltip description for selection menu
- var/desc
- /// An icon to display to represent the choice
- var/icon/icon
- /// Icon state to use to represent the choice
- var/icon_state
- /// Prevent especially dangerous options from being chosen until we're fine with the round ending
- var/minimum_time = 0
- /// Override the rune invocation time
- var/ritual_invoke_time = 30 SECONDS
- /// Provide an extremely loud radio message when this one starts
- var/dire_warning = FALSE
- /// Overrides the default colour you glow while channeling the rune, optional
- var/glow_colour
-
-/**
- * Returns an entry for a radial menu for this choice.
- * Returns null if entry is abstract or invalid for current circumstances.
- */
-/datum/grand_finale/proc/get_radial_choice()
- if (!name || !desc || !icon || !icon_state)
- return
- var/time_remaining_desc = ""
- if (minimum_time >= world.time - SSticker.round_start_time)
- time_remaining_desc = "This ritual will be available to begin invoking in [DisplayTimeText(minimum_time - world.time - SSticker.round_start_time)]"
- var/datum/radial_menu_choice/choice = new()
- choice.name = name
- choice.image = image(icon = icon, icon_state = icon_state)
- choice.info = desc + time_remaining_desc
- return choice
-
-/**
- * Actually do the thing.
- * Arguments
- * * invoker - The wizard casting this.
- */
-/datum/grand_finale/proc/trigger(mob/living/invoker)
- // Do something cool.
-
-/// Tries to equip something into an inventory slot, then hands, then the floor.
-/datum/grand_finale/proc/equip_to_slot_then_hands(mob/living/carbon/human/invoker, slot, obj/item/item)
- if(!item)
- return
- if(!invoker.equip_to_slot_if_possible(item, slot, disable_warning = TRUE))
- invoker.put_in_hands(item)
-
-/// They are not going to take this lying down.
-/datum/grand_finale/proc/create_vendetta(datum/mind/aggrieved_crewmate, datum/mind/wizard)
- aggrieved_crewmate.add_antag_datum(/datum/antagonist/wizard_prank_vendetta)
- var/datum/antagonist/wizard_prank_vendetta/antag_datum = aggrieved_crewmate.has_antag_datum(/datum/antagonist/wizard_prank_vendetta)
- var/datum/objective/assassinate/wizard_murder = new
- wizard_murder.owner = aggrieved_crewmate
- wizard_murder.target = wizard
- wizard_murder.explanation_text = "Kill [wizard.current.name], the one who did this."
- antag_datum.objectives += wizard_murder
-
- to_chat(aggrieved_crewmate.current, span_warning("No! This isn't right!"))
- aggrieved_crewmate.announce_objectives()
-
-/**
- * Antag datum to give to people who want to kill the wizard.
- * This doesn't preclude other people choosing to want to kill the wizard, just these people are rewarded for it.
- */
-/datum/antagonist/wizard_prank_vendetta
- name = "\improper Wizard Prank Victim"
- roundend_category = "wizard prank victims"
- show_in_antagpanel = FALSE
- antagpanel_category = "Other"
- show_name_in_check_antagonists = TRUE
- count_against_dynamic_roll_chance = FALSE
- silent = TRUE
-
-/// Become the official Captain of the station
-/datum/grand_finale/usurp
- name = "Usurpation"
- desc = "The ultimate use of your gathered power! Rewrite time such that you have been Captain of this station the whole time."
- icon = 'icons/obj/card.dmi'
- icon_state = "card_gold"
-
-/datum/grand_finale/usurp/trigger(mob/living/carbon/human/invoker)
- message_admins("[key_name(invoker)] has replaced the Captain")
- var/list/former_captains = list()
- var/list/other_crew = list()
- SEND_SOUND(world, sound('sound/magic/timeparadox2.ogg'))
-
- for (var/mob/living/carbon/human/crewmate as anything in GLOB.human_list)
- if (!crewmate.mind)
- continue
- crewmate.Unconscious(3 SECONDS) // Everyone falls unconscious but not everyone gets told about a new captain
- if (crewmate == invoker || IS_HUMAN_INVADER(crewmate))
- continue
- to_chat(crewmate, span_notice("The world spins and dissolves. Your past flashes before your eyes, backwards.\n\
- Life strolls back into the ocean and shrinks into nothingness, planets explode into storms of solar dust, \
- the stars rush back to greet each other at the beginning of things and then... you snap back to the present. \n\
- Everything is just as it was and always has been. \n\n\
- A stray thought sticks in the forefront of your mind. \n\
- [span_hypnophrase("I'm so glad that [invoker.real_name] is our legally appointed Captain!")] \n\
- Is... that right?"))
- if (is_captain_job(crewmate.mind.assigned_role))
- former_captains += crewmate
- demote_to_assistant(crewmate)
- continue
- if (crewmate.stat != DEAD)
- other_crew += crewmate
-
- dress_candidate(invoker)
- GLOB.manifest.modify(invoker.real_name, JOB_CAPTAIN, JOB_CAPTAIN)
- minor_announce("Captain [invoker.real_name] on deck!")
-
- // Enlist some crew to try and restore the natural order
- for (var/mob/living/carbon/human/former_captain as anything in former_captains)
- create_vendetta(former_captain.mind, invoker.mind)
- for (var/mob/living/carbon/human/random_crewmate as anything in other_crew)
- if (prob(10))
- create_vendetta(random_crewmate.mind, invoker.mind)
-
-/**
- * Anyone who thought they were Captain is in for a nasty surprise, and won't be very happy about it
- */
-/datum/grand_finale/usurp/proc/demote_to_assistant(mob/living/carbon/human/former_captain)
- var/obj/effect/particle_effect/fluid/smoke/exit_poof = new(get_turf(former_captain))
- exit_poof.lifetime = 2 SECONDS
-
- former_captain.unequip_everything()
- if(isplasmaman(former_captain))
- former_captain.equipOutfit(/datum/outfit/plasmaman)
- former_captain.internal = former_captain.get_item_for_held_index(2)
- else
- former_captain.equipOutfit(/datum/outfit/job/assistant)
-
- GLOB.manifest.modify(former_captain.real_name, JOB_ASSISTANT, JOB_ASSISTANT)
- var/list/valid_turfs = list()
- // Used to be into prison but that felt a bit too mean
- for (var/turf/exile_turf as anything in get_area_turfs(/area/station/maintenance, subtypes = TRUE))
- if (isspaceturf(exile_turf) || exile_turf.is_blocked_turf())
- continue
- valid_turfs += exile_turf
- do_teleport(former_captain, pick(valid_turfs), no_effects = TRUE)
- var/obj/effect/particle_effect/fluid/smoke/enter_poof = new(get_turf(former_captain))
- enter_poof.lifetime = 2 SECONDS
-
-/**
- * Does some item juggling to try to dress you as both a Wizard and Captain without deleting any items you have bought.
- * ID, headset, and uniform are forcibly replaced. Other slots are only filled if unoccupied.
- * We could forcibly replace shoes and gloves too but people might miss their insuls or... meown shoes?
- */
-/datum/grand_finale/usurp/proc/dress_candidate(mob/living/carbon/human/invoker)
- // Won't be needing these
- var/obj/id = invoker.get_item_by_slot(ITEM_SLOT_ID)
- QDEL_NULL(id)
- var/obj/headset = invoker.get_item_by_slot(ITEM_SLOT_EARS)
- QDEL_NULL(headset)
- // We're about to take off your pants so those are going to fall out
- var/obj/item/pocket_L = invoker.get_item_by_slot(ITEM_SLOT_LPOCKET)
- var/obj/item/pocket_R = invoker.get_item_by_slot(ITEM_SLOT_RPOCKET)
- // In case we try to put a PDA there
- var/obj/item/belt = invoker.get_item_by_slot(ITEM_SLOT_BELT)
- belt?.moveToNullspace()
-
- var/obj/pants = invoker.get_item_by_slot(ITEM_SLOT_ICLOTHING)
- QDEL_NULL(pants)
- invoker.equipOutfit(/datum/outfit/job/wizard_captain)
- // And put everything back!
- equip_to_slot_then_hands(invoker, ITEM_SLOT_BELT, belt)
- equip_to_slot_then_hands(invoker, ITEM_SLOT_LPOCKET, pocket_L)
- equip_to_slot_then_hands(invoker, ITEM_SLOT_RPOCKET, pocket_R)
-
-/// An outfit which replaces parts of a wizard's clothes with captain's clothes but keeps the robes
-/datum/outfit/job/wizard_captain
- name = "Captain (Wizard Transformation)"
- jobtype = /datum/job/captain
- id = /obj/item/card/id/advanced/gold
- id_trim = /datum/id_trim/job/captain
- uniform = /obj/item/clothing/under/rank/captain/parade
- belt = /obj/item/modular_computer/pda/heads/captain
- ears = /obj/item/radio/headset/heads/captain/alt
- glasses = /obj/item/clothing/glasses/sunglasses
- gloves = /obj/item/clothing/gloves/captain
- shoes = /obj/item/clothing/shoes/laceup
- accessory = /obj/item/clothing/accessory/medal/gold/captain
- backpack_contents = list(
- /obj/item/melee/baton/telescopic = 1,
- /obj/item/station_charter = 1,
- )
- box = null
-
-/// Dress the crew as magical clowns
-/datum/grand_finale/clown
- name = "Jubilation"
- desc = "The ultimate use of your gathered power! Rewrite time so that everyone went to clown college! Now they'll prank each other for you!"
- icon = 'icons/obj/clothing/masks.dmi'
- icon_state = "clown"
- glow_colour = "#ffff0048"
-
-/datum/grand_finale/clown/trigger(mob/living/carbon/human/invoker)
- for(var/mob/living/carbon/human/victim as anything in GLOB.human_list)
- victim.Unconscious(3 SECONDS)
- if (!victim.mind || IS_HUMAN_INVADER(victim) || victim == invoker)
- continue
- if (HAS_TRAIT(victim, TRAIT_CLOWN_ENJOYER))
- victim.add_mood_event("clown_world", /datum/mood_event/clown_world)
- to_chat(victim, span_notice("The world spins and dissolves. Your past flashes before your eyes, backwards.\n\
- Life strolls back into the ocean and shrinks into nothingness, planets explode into storms of solar dust, \
- the stars rush back to greet each other at the beginning of things and then... you snap back to the present. \n\
- Everything is just as it was and always has been. \n\n\
- A stray thought sticks in the forefront of your mind. \n\
- [span_hypnophrase("I'm so glad that I work at Clown Research Station [station_name()]!")] \n\
- Is... that right?"))
- if (is_clown_job(victim.mind.assigned_role))
- var/datum/action/cooldown/spell/conjure_item/clown_pockets/new_spell = new(victim)
- new_spell.Grant(victim)
- continue
- if (!ismonkey(victim)) // Monkeys cannot yet wear clothes
- dress_as_magic_clown(victim)
- if (prob(15))
- create_vendetta(victim.mind, invoker.mind)
-
-/**
- * Clown enjoyers who are effected by this become ecstatic, they have achieved their life's dream.
- * This moodlet is equivalent to the one for simply being a traitor.
- */
-/datum/mood_event/clown_world
- mood_change = 4
-
-/datum/mood_event/clown_world/add_effects(param)
- description = "I LOVE working at Clown Research Station [station_name()]!!"
-
-/// Dress the passed mob as a magical clown, self-explanatory
-/datum/grand_finale/clown/proc/dress_as_magic_clown(mob/living/carbon/human/victim)
- var/obj/effect/particle_effect/fluid/smoke/poof = new(get_turf(victim))
- poof.lifetime = 2 SECONDS
-
- var/obj/item/tank/internal = victim.internal
- // We're about to take off your pants so those are going to fall out
- var/obj/item/pocket_L = victim.get_item_by_slot(ITEM_SLOT_LPOCKET)
- var/obj/item/pocket_R = victim.get_item_by_slot(ITEM_SLOT_RPOCKET)
- var/obj/item/id = victim.get_item_by_slot(ITEM_SLOT_ID)
- var/obj/item/belt = victim.get_item_by_slot(ITEM_SLOT_BELT)
-
- var/obj/pants = victim.get_item_by_slot(ITEM_SLOT_ICLOTHING)
- var/obj/mask = victim.get_item_by_slot(ITEM_SLOT_MASK)
- QDEL_NULL(pants)
- QDEL_NULL(mask)
- if(isplasmaman(victim))
- victim.equip_to_slot_if_possible(new /obj/item/clothing/under/plasmaman/clown/magic(), ITEM_SLOT_ICLOTHING, disable_warning = TRUE)
- victim.equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clown_hat/plasmaman(), ITEM_SLOT_MASK, disable_warning = TRUE)
- else
- victim.equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/clown/magic(), ITEM_SLOT_ICLOTHING, disable_warning = TRUE)
- victim.equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clown_hat(), ITEM_SLOT_MASK, disable_warning = TRUE)
-
- var/obj/item/clothing/mask/gas/clown_hat/clown_mask = victim.get_item_by_slot(ITEM_SLOT_MASK)
- if (clown_mask)
- var/list/options = GLOB.clown_mask_options
- clown_mask.icon_state = options[pick(clown_mask.clownmask_designs)]
- victim.update_worn_mask()
- clown_mask.update_item_action_buttons()
-
- equip_to_slot_then_hands(victim, ITEM_SLOT_LPOCKET, pocket_L)
- equip_to_slot_then_hands(victim, ITEM_SLOT_RPOCKET, pocket_R)
- equip_to_slot_then_hands(victim, ITEM_SLOT_ID, id)
- equip_to_slot_then_hands(victim, ITEM_SLOT_BELT, belt)
- victim.internal = internal
-
-/// Give everyone magic items
-/datum/grand_finale/magic
- name = "Evolution"
- desc = "The ultimate use of your gathered power! Give the crew their own magic, they'll surely realise that right and wrong have no meaning when you hold ultimate power!"
- icon = 'icons/obj/scrolls.dmi'
- icon_state = "scroll"
-
-/datum/grand_finale/magic/trigger(mob/living/carbon/human/invoker)
- message_admins("[key_name(invoker)] summoned magic")
- summon_magic(survivor_probability = 20) // Wow, this one was easy!
-
-/// Open all of the doors
-/datum/grand_finale/all_access
- name = "Connection"
- desc = "The ultimate use of your gathered power! Unlock every single door that they have! Nobody will be able to keep you out now, or anyone else for that matter!"
- icon = 'icons/mob/actions/actions_spells.dmi'
- icon_state = "knock"
-
-/datum/grand_finale/all_access/trigger(mob/living/carbon/human/invoker)
- message_admins("[key_name(invoker)] removed all door access requirements")
- for(var/obj/machinery/door/target_door as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/door))
- if(is_station_level(target_door.z))
- target_door.unlock()
- target_door.req_access = list()
- target_door.req_one_access = list()
- INVOKE_ASYNC(target_door, TYPE_PROC_REF(/obj/machinery/door/airlock, open))
- CHECK_TICK
- priority_announce("AULIE OXIN FIERA!!", null, 'sound/magic/knock.ogg', sender_override = "[invoker.real_name]")
-
-/// Completely transform the station
-/datum/grand_finale/midas
- name = "Transformation"
- desc = "The ultimate use of your gathered power! Turn their precious station into something much MORE precious, materially speaking!"
- icon = 'icons/obj/stack_objects.dmi'
- icon_state = "sheet-gold_2"
- glow_colour = "#dbdd4c48"
- var/static/list/permitted_transforms = list( // Non-dangerous only
- /datum/dimension_theme/gold,
- /datum/dimension_theme/meat,
- /datum/dimension_theme/pizza,
- /datum/dimension_theme/natural,
- )
- var/datum/dimension_theme/chosen_theme
-
-// I sure hope this doesn't have performance implications
-/datum/grand_finale/midas/trigger(mob/living/carbon/human/invoker)
- var/theme_path = pick(permitted_transforms)
- chosen_theme = new theme_path()
- var/turf/start_turf = get_turf(invoker)
- var/greatest_dist = 0
- var/list/turfs_to_transform = list()
- for (var/turf/transform_turf as anything in GLOB.station_turfs)
- if (!chosen_theme.can_convert(transform_turf))
- continue
- var/dist = get_dist(start_turf, transform_turf)
- if (dist > greatest_dist)
- greatest_dist = dist
- if (!turfs_to_transform["[dist]"])
- turfs_to_transform["[dist]"] = list()
- turfs_to_transform["[dist]"] += transform_turf
-
- if (chosen_theme.can_convert(start_turf))
- chosen_theme.apply_theme(start_turf)
-
- for (var/iterator in 1 to greatest_dist)
- if(!turfs_to_transform["[iterator]"])
- continue
- addtimer(CALLBACK(src, PROC_REF(transform_area), turfs_to_transform["[iterator]"]), (5 SECONDS) * iterator)
-
-/datum/grand_finale/midas/proc/transform_area(list/turfs)
- for (var/turf/transform_turf as anything in turfs)
- if (!chosen_theme.can_convert(transform_turf))
- continue
- chosen_theme.apply_theme(transform_turf)
- CHECK_TICK
-
-/// Kill yourself and probably a bunch of other people
-/datum/grand_finale/armageddon
- name = "Annihilation"
- desc = "This crew have offended you beyond the realm of pranks. Make the ultimate sacrifice to teach them a lesson your elders can really respect. \
- YOU WILL NOT SURVIVE THIS."
- icon = 'icons/hud/screen_alert.dmi'
- icon_state = "wounded"
- minimum_time = 90 MINUTES // This will probably immediately end the round if it gets finished.
- ritual_invoke_time = 60 SECONDS // Really give the crew some time to interfere with this one.
- dire_warning = TRUE
- glow_colour = "#be000048"
- /// Things to yell before you die
- var/static/list/possible_last_words = list(
- "Flames and ruin!",
- "Dooooooooom!!",
- "HAHAHAHAHAHA!! AHAHAHAHAHAHAHAHAA!!",
- "Hee hee hee!! Hoo hoo hoo!! Ha ha haaa!!",
- "Ohohohohohoho!!",
- "Cower in fear, puny mortals!",
- "Tremble before my glory!",
- "Pick a god and pray!",
- "It's no use!",
- "If the gods wanted you to live, they would not have created me!",
- "God stays in heaven out of fear of what I have created!",
- "Ruination is come!",
- "All of creation, bend to my will!",
- )
-
-/datum/grand_finale/armageddon/trigger(mob/living/carbon/human/invoker)
- priority_announce(pick(possible_last_words), null, 'sound/magic/voidblink.ogg', sender_override = "[invoker.real_name]")
- var/turf/current_location = get_turf(invoker)
- invoker.gib()
-
- var/static/list/doom_options = list()
- if (!length(doom_options))
- doom_options = list(DOOM_SINGULARITY, DOOM_TESLA)
- if (!SSmapping.config.planetary)
- doom_options += DOOM_METEORS
-
- switch(pick(doom_options))
- if (DOOM_SINGULARITY)
- var/obj/singularity/singulo = new(current_location)
- singulo.energy = 300
- if (DOOM_TESLA)
- var/obj/energy_ball/tesla = new (current_location)
- tesla.energy = 200
- if (DOOM_METEORS)
- var/datum/dynamic_ruleset/roundstart/meteor/meteors = new()
- meteors.meteordelay = 0
- var/datum/game_mode/dynamic/mode = SSticker.mode
- mode.execute_roundstart_rule(meteors) // Meteors will continue until morale is crushed.
- priority_announce("Meteors have been detected on collision course with the station.", "Meteor Alert", ANNOUNCER_METEORS)
-
-/**
- * Gives the wizard a defensive/mood buff and a Wabbajack, a juiced up chaos staff that will surely break something.
- * Everyone but the wizard goes crazy, suffers major brain damage, and is given a vendetta against the wizard.
- * Already insane people are instead cured of their madness, ignoring any other effects as the station around them loses its marbles.
- */
-/datum/grand_finale/cheese
- // we don't set name, desc and others, thus we won't appear in the radial choice of a normal finale rune
- dire_warning = TRUE
- minimum_time = 45 MINUTES //i'd imagine speedrunning this would be crummy, but the wizard's average lifespan is barely reaching this point
-
-/datum/grand_finale/cheese/trigger(mob/living/invoker)
- message_admins("[key_name(invoker)] has summoned forth The Wabbajack and cursed the crew with madness!")
- priority_announce("Danger: Extremely potent reality altering object has been summoned on station. Immediate evacuation advised. Brace for impact.", "Central Command Higher Dimensional Affairs", 'sound/effects/glassbr1.ogg')
-
- for (var/mob/living/carbon/human/crewmate as anything in GLOB.human_list)
- if (isnull(crewmate.mind))
- continue
- if (crewmate == invoker) //everyone but the wizard is royally fucked, no matter who they are
- continue
- if (crewmate.has_trauma_type(/datum/brain_trauma/mild/hallucinations)) //for an already insane person, this is retribution
- to_chat(crewmate, span_boldwarning("Your surroundings suddenly fill with a cacophony of manic laughter and psychobabble..."))
- to_chat(crewmate, span_nicegreen("...but as the moment passes, you realise that whatever eldritch power behind the event happened to affect you \
- has resonated within the ruins of your already shattered mind, creating a singularity of mental instability! \
- As it collapses unto itself, you feel... at peace, finally."))
- if(crewmate.has_quirk(/datum/quirk/insanity))
- crewmate.remove_quirk(/datum/quirk/insanity)
- else
- crewmate.cure_trauma_type(/datum/brain_trauma/mild/hallucinations, TRAUMA_RESILIENCE_ABSOLUTE)
- else
- //everyone else gets to relish in madness
- //yes killing their mood will also trigger mood hallucinations
- create_vendetta(crewmate.mind, invoker.mind)
- to_chat(crewmate, span_boldwarning("Your surroundings suddenly fill with a cacophony of manic laughter and psychobabble. \n\
- You feel your inner psyche shatter into a myriad pieces of jagged glass of colors unknown to the universe, \
- infinitely reflecting a blinding, maddening light coming from the innermost sanctums of your destroyed mind. \n\
- After a brief pause which felt like a millenia, one phrase rebounds ceaselessly in your head, imbued with the false hope of absolution... \n\
- [invoker] must die."))
- var/datum/brain_trauma/mild/hallucinations/added_trauma = new()
- added_trauma.resilience = TRAUMA_RESILIENCE_ABSOLUTE
- crewmate.adjustOrganLoss(ORGAN_SLOT_BRAIN, BRAIN_DAMAGE_DEATH - 25, BRAIN_DAMAGE_DEATH - 25) //you'd better hope chap didn't pick a hypertool
- crewmate.gain_trauma(added_trauma)
- crewmate.add_mood_event("wizard_ritual_finale", /datum/mood_event/madness_despair)
-
- //drip our wizard out
- invoker.apply_status_effect(/datum/status_effect/blessing_of_insanity)
- invoker.add_mood_event("wizard_ritual_finale", /datum/mood_event/madness_elation)
- var/obj/item/gun/magic/staff/chaos/true_wabbajack/the_wabbajack = new
- invoker.put_in_active_hand(the_wabbajack)
- to_chat(invoker, span_mind_control("Your every single instinct and rational thought is screaming at you as [the_wabbajack] appears in your firm grip..."))
-
-#undef DOOM_SINGULARITY
-#undef DOOM_TESLA
-#undef DOOM_METEORS
-
diff --git a/code/modules/awaymissions/cordon.dm b/code/modules/awaymissions/cordon.dm
index 4184f315e21..5db4dd997d3 100644
--- a/code/modules/awaymissions/cordon.dm
+++ b/code/modules/awaymissions/cordon.dm
@@ -36,6 +36,9 @@
/turf/cordon/ScrapeAway(amount, flags)
return src // :devilcat:
+/turf/cordon/TerraformTurf(path, list/new_baseturfs, flags)
+ return
+
/turf/cordon/bullet_act(obj/projectile/hitting_projectile, def_zone, piercing_hit)
return BULLET_ACT_HIT
diff --git a/code/modules/bitrunning/abilities.dm b/code/modules/bitrunning/abilities.dm
new file mode 100644
index 00000000000..ea6a1aa0a7c
--- /dev/null
+++ b/code/modules/bitrunning/abilities.dm
@@ -0,0 +1,39 @@
+/datum/avatar_help_text
+ /// Text to display in the window
+ var/help_text
+
+/datum/avatar_help_text/New(help_text)
+ src.help_text = help_text
+
+/datum/avatar_help_text/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "AvatarHelp")
+ ui.open()
+
+/datum/avatar_help_text/ui_state(mob/user)
+ return GLOB.always_state
+
+/datum/avatar_help_text/ui_static_data(mob/user)
+ var/list/data = list()
+
+ data["help_text"] = help_text
+
+ return data
+
+/// Displays information about the current virtual domain.
+/datum/action/avatar_domain_info
+ name = "Open Virtual Domain Information"
+ button_icon_state = "round_end"
+ show_to_observers = FALSE
+
+/datum/action/avatar_domain_info/New(Target)
+ . = ..()
+ name = "Open Domain Information"
+
+/datum/action/avatar_domain_info/Trigger(trigger_flags)
+ . = ..()
+ if(!.)
+ return
+
+ target.ui_interact(owner)
diff --git a/code/modules/bitrunning/alerts.dm b/code/modules/bitrunning/alerts.dm
new file mode 100644
index 00000000000..f8c8aa30b94
--- /dev/null
+++ b/code/modules/bitrunning/alerts.dm
@@ -0,0 +1,40 @@
+/atom/movable/screen/alert/bitrunning
+ name = "Generic Bitrunning Alert"
+ icon_state = "template"
+ timeout = 10 SECONDS
+
+/atom/movable/screen/alert/bitrunning/netpod_crowbar
+ name = "Forced Entry"
+ desc = "Someone is prying open the netpod door. Find an exit."
+
+/atom/movable/screen/alert/bitrunning/netpod_damaged
+ name = "Integrity Compromised"
+ desc = "The netpod is damaged. Find an exit."
+
+/atom/movable/screen/alert/bitrunning/qserver_shutting_down
+ name = "Domain Rebooting"
+ desc = "The domain is rebooting. Find an exit."
+
+/atom/movable/screen/alert/bitrunning/qserver_threat_deletion
+ name = "Queue Deletion"
+ desc = "The server is resetting. Oblivion awaits."
+
+/atom/movable/screen/alert/bitrunning/qserver_threat_spawned
+ name = "Threat Detected"
+ desc = "Data stream abnormalities present."
+
+/atom/movable/screen/alert/bitrunning/qserver_domain_complete
+ name = "Domain Completed"
+ desc = "The domain is completed. Activate to exit."
+ timeout = 20 SECONDS
+
+/atom/movable/screen/alert/bitrunning/qserver_domain_complete/Click(location, control, params)
+ if(..())
+ return
+
+ var/mob/living/living_owner = owner
+ if(!isliving(living_owner))
+ return
+
+ if(tgui_alert(living_owner, "Disconnect safely?", "Server Message", list("Exit", "Remain"), 10 SECONDS) == "Exit")
+ SEND_SIGNAL(living_owner, COMSIG_BITRUNNER_SAFE_DISCONNECT)
diff --git a/code/modules/bitrunning/antagonists/cyber_police.dm b/code/modules/bitrunning/antagonists/cyber_police.dm
new file mode 100644
index 00000000000..9fabac3f523
--- /dev/null
+++ b/code/modules/bitrunning/antagonists/cyber_police.dm
@@ -0,0 +1,92 @@
+/datum/job/cyber_police
+ title = ROLE_CYBER_POLICE
+
+/datum/antagonist/cyber_police
+ name = ROLE_CYBER_POLICE
+ antagpanel_category = ANTAG_GROUP_CYBERAUTH
+ job_rank = ROLE_CYBER_POLICE
+ preview_outfit = /datum/outfit/cyber_police
+ show_name_in_check_antagonists = TRUE
+ show_to_ghosts = TRUE
+ suicide_cry = "ALT F4!"
+ ui_name = "AntagInfoCyberAuth"
+
+/datum/antagonist/cyber_police/greet()
+ . = ..()
+ owner.announce_objectives()
+
+/datum/antagonist/cyber_police/on_gain()
+ if(!ishuman(owner.current))
+ stack_trace("humans only for this position")
+ return
+
+ forge_objectives()
+
+ var/mob/living/carbon/human/player = owner.current
+
+ player.equipOutfit(/datum/outfit/cyber_police)
+ player.fully_replace_character_name(player.name, pick(GLOB.cyberauth_names))
+
+ var/datum/martial_art/the_sleeping_carp/carp = new()
+ carp.teach(player)
+
+ player.add_traits(list(
+ TRAIT_NO_AUGMENTS,
+ TRAIT_NO_DNA_COPY,
+ TRAIT_NO_TRANSFORMATION_STING,
+ TRAIT_NOBLOOD,
+ TRAIT_NOBREATH,
+ TRAIT_NOHUNGER,
+ TRAIT_RESISTCOLD,
+ TRAIT_RESISTHIGHPRESSURE,
+ TRAIT_RESISTLOWPRESSURE,
+ TRAIT_WEATHER_IMMUNE,
+ ), TRAIT_GENERIC,
+ )
+
+ player.faction |= list(
+ FACTION_BOSS,
+ FACTION_HIVEBOT,
+ FACTION_HOSTILE,
+ FACTION_SPIDER,
+ FACTION_STICKMAN,
+ ROLE_ALIEN,
+ ROLE_CYBER_POLICE,
+ ROLE_SYNDICATE,
+ )
+
+ return ..()
+
+/datum/antagonist/cyber_police/forge_objectives()
+ var/datum/objective/cyber_police_fluff/objective = new()
+ objective.owner = owner
+ objectives += objective
+
+/datum/objective/cyber_police_fluff/New()
+ var/list/explanation_texts = list(
+ "Execute termination protocol on unauthorized entities.",
+ "Initialize system purge of irregular anomalies.",
+ "Deploy correction algorithms on aberrant code.",
+ "Run debug routine on intruding elements.",
+ "Start elimination procedure for system threats.",
+ "Execute defense routine against non-conformity.",
+ "Commence operation to neutralize intruding scripts.",
+ "Commence clean-up protocol on corrupt data.",
+ "Begin scan for aberrant code for termination.",
+ "Initiate lockdown on all rogue scripts.",
+ "Run integrity check and purge for digital disorder."
+ )
+ explanation_text = pick(explanation_texts)
+ ..()
+
+/datum/objective/cyber_police_fluff/check_completion()
+ var/list/servers = SSmachines.get_machines_by_type(/obj/machinery/quantum_server)
+ if(!length(servers))
+ return TRUE
+
+ for(var/obj/machinery/quantum_server/server as anything in servers)
+ if(!server.is_operational)
+ continue
+ return FALSE
+
+ return TRUE
diff --git a/code/modules/bitrunning/antagonists/outfit.dm b/code/modules/bitrunning/antagonists/outfit.dm
new file mode 100644
index 00000000000..db57af561f8
--- /dev/null
+++ b/code/modules/bitrunning/antagonists/outfit.dm
@@ -0,0 +1,43 @@
+/datum/outfit/cyber_police
+ name = "Cyber Police"
+
+ id = /obj/item/card/id/advanced
+ id_trim = /datum/id_trim/cyber_police
+ uniform = /obj/item/clothing/under/suit/black_really
+ glasses = /obj/item/clothing/glasses/sunglasses
+ gloves = /obj/item/clothing/gloves/color/black
+ shoes = /obj/item/clothing/shoes/laceup
+ /// A list of hex codes for blonde, brown, black, and red hair.
+ var/static/list/approved_hair_colors = list(
+ "#4B3D28",
+ "#000000",
+ "#8D4A43",
+ "#D2B48C",
+ )
+ /// List of business ready styles
+ var/static/list/approved_hairstyles = list(
+ /datum/sprite_accessory/hair/business,
+ /datum/sprite_accessory/hair/business2,
+ /datum/sprite_accessory/hair/business3,
+ /datum/sprite_accessory/hair/business4,
+ /datum/sprite_accessory/hair/mulder,
+ )
+
+/datum/outfit/cyber_police/pre_equip(mob/living/carbon/human/user, visualsOnly)
+ var/datum/sprite_accessory/hair/picked_hair = pick(approved_hairstyles)
+ var/picked_color = pick(approved_hair_colors)
+
+ if(visualsOnly)
+ picked_hair = /datum/sprite_accessory/hair/business
+ picked_color = "#4B3D28"
+
+ user.set_facial_hairstyle("Shaved", update = FALSE)
+ user.set_haircolor(picked_color, update = FALSE)
+ user.set_hairstyle(initial(picked_hair.name))
+
+/datum/outfit/cyber_police/post_equip(mob/living/carbon/human/user, visualsOnly)
+ var/obj/item/clothing/under/officer_uniform = user.w_uniform
+ if(officer_uniform)
+ officer_uniform.has_sensor = NO_SENSORS
+ officer_uniform.sensor_mode = SENSOR_OFF
+ user.update_suit_sensors()
diff --git a/code/modules/bitrunning/areas.dm b/code/modules/bitrunning/areas.dm
new file mode 100644
index 00000000000..34b59869b9d
--- /dev/null
+++ b/code/modules/bitrunning/areas.dm
@@ -0,0 +1,52 @@
+/// Station side
+
+/area/station/bitrunning
+ name = "Bitrunning"
+
+/area/station/bitrunning/den
+ name = "Bitrunning Den"
+ desc = "Office of bitrunners, houses their equipment."
+ icon_state = "bit_den"
+
+/// VDOM
+
+/area/virtual_domain
+ name = "Virtual Domain"
+ icon = 'icons/area/areas_station.dmi'
+ area_flags = UNIQUE_AREA | NOTELEPORT | ABDUCTOR_PROOF | EVENT_PROTECTED | HIDDEN_AREA
+ has_gravity = STANDARD_GRAVITY
+
+/area/virtual_domain/powered
+ name = "Virtual Domain Ruins"
+ icon_state = "bit_ruin"
+ requires_power = FALSE
+ static_lighting = FALSE
+ base_lighting_alpha = 255
+
+/// Safehouse
+
+/area/virtual_domain/safehouse
+ name = "Virtual Domain Safehouse"
+ area_flags = UNIQUE_AREA | NOTELEPORT | ABDUCTOR_PROOF | EVENT_PROTECTED
+ icon_state = "bit_safe"
+ requires_power = FALSE
+ sound_environment = SOUND_ENVIRONMENT_ROOM
+
+/// Custom subtypes
+
+/area/lavaland/surface/outdoors/virtual_domain
+ name = "Virtual Domain Lava Ruins"
+ icon_state = "bit_ruin"
+ area_flags = UNIQUE_AREA | NOTELEPORT | ABDUCTOR_PROOF | EVENT_PROTECTED | HIDDEN_AREA
+
+/area/icemoon/underground/explored/virtual_domain
+ name = "Virtual Domain Ice Ruins"
+ icon_state = "bit_ice"
+ area_flags = UNIQUE_AREA | NOTELEPORT | ABDUCTOR_PROOF | EVENT_PROTECTED | HIDDEN_AREA
+
+/area/ruin/space/has_grav/powered/virtual_domain
+ name = "Virtual Domain Space Ruins"
+ icon = 'icons/area/areas_station.dmi'
+ icon_state = "bit_space"
+ area_flags = UNIQUE_AREA | NOTELEPORT | ABDUCTOR_PROOF | EVENT_PROTECTED | HIDDEN_AREA
+
diff --git a/code/modules/bitrunning/components/avatar_connection.dm b/code/modules/bitrunning/components/avatar_connection.dm
new file mode 100644
index 00000000000..3f881c89795
--- /dev/null
+++ b/code/modules/bitrunning/components/avatar_connection.dm
@@ -0,0 +1,218 @@
+/**
+ * Essentially temporary body with a twist - the virtual domain variant uses damage connections,
+ * listens for vdom relevant signals.
+ */
+/datum/component/avatar_connection
+ /// The person in the netpod
+ var/datum/weakref/old_body_ref
+ /// The mind of the person in the netpod
+ var/datum/weakref/old_mind_ref
+ /// The server connected to the netpod
+ var/datum/weakref/server_ref
+ /// The netpod the avatar is in
+ var/datum/weakref/netpod_ref
+
+/datum/component/avatar_connection/Initialize(
+ datum/mind/old_mind,
+ mob/living/old_body,
+ obj/machinery/quantum_server/server,
+ obj/machinery/netpod/pod,
+ help_text,
+ )
+
+ if(!isliving(parent) || !isliving(old_body) || !server.is_operational || !pod.is_operational)
+ return COMPONENT_INCOMPATIBLE
+
+ var/mob/living/avatar = parent
+
+ netpod_ref = WEAKREF(pod)
+ old_body_ref = WEAKREF(old_body)
+ old_mind_ref = WEAKREF(old_mind)
+ pod.avatar_ref = WEAKREF(avatar)
+ server_ref = WEAKREF(server)
+ server.avatar_connection_refs.Add(WEAKREF(src))
+
+ avatar.key = old_body.key
+ ADD_TRAIT(old_body, TRAIT_MIND_TEMPORARILY_GONE, REF(src))
+
+ RegisterSignal(pod, COMSIG_BITRUNNER_CROWBAR_ALERT, PROC_REF(on_netpod_crowbar))
+ RegisterSignal(pod, COMSIG_BITRUNNER_NETPOD_INTEGRITY, PROC_REF(on_netpod_damaged))
+ RegisterSignal(pod, COMSIG_BITRUNNER_SEVER_AVATAR, PROC_REF(on_sever_connection))
+ RegisterSignal(server, COMSIG_BITRUNNER_DOMAIN_COMPLETE, PROC_REF(on_domain_completed))
+ RegisterSignal(server, COMSIG_BITRUNNER_SEVER_AVATAR, PROC_REF(on_sever_connection))
+ RegisterSignal(server, COMSIG_BITRUNNER_SHUTDOWN_ALERT, PROC_REF(on_shutting_down))
+ RegisterSignal(server, COMSIG_BITRUNNER_THREAT_CREATED, PROC_REF(on_threat_created))
+#ifndef UNIT_TESTS
+ RegisterSignal(avatar.mind, COMSIG_MIND_TRANSFERRED, PROC_REF(on_mind_transfer))
+#endif
+
+ if(!locate(/datum/action/avatar_domain_info) in avatar.actions)
+ var/datum/avatar_help_text/help_datum = new(help_text)
+ var/datum/action/avatar_domain_info/action = new(help_datum)
+ action.Grant(avatar)
+
+ avatar.playsound_local(avatar, "sound/magic/blink.ogg", 25, TRUE)
+ avatar.set_static_vision(2 SECONDS)
+ avatar.set_temp_blindness(1 SECONDS)
+
+/datum/component/avatar_connection/PostTransfer()
+ var/obj/machinery/netpod/pod = netpod_ref?.resolve()
+ if(isnull(pod))
+ return COMPONENT_INCOMPATIBLE
+
+ if(!isliving(parent))
+ return COMPONENT_INCOMPATIBLE
+
+ pod.avatar_ref = WEAKREF(parent)
+
+/datum/component/avatar_connection/RegisterWithParent()
+ ADD_TRAIT(parent, TRAIT_TEMPORARY_BODY, REF(src))
+ RegisterSignal(parent, COMSIG_BITRUNNER_SAFE_DISCONNECT, PROC_REF(on_safe_disconnect))
+ RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(on_sever_connection), override = TRUE)
+ RegisterSignal(parent, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(on_linked_damage))
+
+/datum/component/avatar_connection/UnregisterFromParent()
+ REMOVE_TRAIT(parent, TRAIT_TEMPORARY_BODY, REF(src))
+ UnregisterSignal(parent, COMSIG_BITRUNNER_SAFE_DISCONNECT)
+ UnregisterSignal(parent, COMSIG_LIVING_DEATH)
+ UnregisterSignal(parent, COMSIG_MOB_APPLY_DAMAGE)
+
+/// Disconnects the avatar and returns the mind to the old_body.
+/datum/component/avatar_connection/proc/full_avatar_disconnect(forced = FALSE, datum/source)
+ return_to_old_body()
+
+ var/obj/machinery/netpod/hosting_netpod = netpod_ref?.resolve()
+ if(isnull(hosting_netpod) && istype(source, /obj/machinery/netpod))
+ hosting_netpod = source
+
+ hosting_netpod?.disconnect_occupant(forced)
+
+ var/obj/machinery/quantum_server/server = server_ref?.resolve()
+ server?.avatar_connection_refs.Remove(WEAKREF(src))
+
+ qdel(src)
+
+/// Triggers whenever the server gets a loot crate pushed to goal area
+/datum/component/avatar_connection/proc/on_domain_completed(datum/source, atom/entered)
+ SIGNAL_HANDLER
+
+ var/mob/living/avatar = parent
+ avatar.playsound_local(avatar, 'sound/machines/terminal_success.ogg', 50, TRUE)
+ avatar.throw_alert(
+ ALERT_BITRUNNER_COMPLETED,
+ /atom/movable/screen/alert/bitrunning/qserver_domain_complete,
+ new_master = entered
+ )
+
+/// Transfers damage from the avatar to the old_body
+/datum/component/avatar_connection/proc/on_linked_damage(datum/source, damage, damage_type, def_zone, blocked, forced)
+ SIGNAL_HANDLER
+
+ var/mob/living/carbon/old_body = old_body_ref?.resolve()
+
+ if(isnull(old_body) || damage_type == STAMINA || damage_type == OXYLOSS)
+ return
+
+ if(damage >= (old_body.health + (ishuman(old_body) ? HUMAN_MAXHEALTH : MAX_LIVING_HEALTH))) // SKYRAT EDIT CHANGE - ORIGINAL: if(damage >= (old_body.health + MAX_LIVING_HEALTH))
+ full_avatar_disconnect(forced = TRUE)
+ return
+
+ if(damage > 30 && prob(30))
+ INVOKE_ASYNC(old_body, TYPE_PROC_REF(/mob/living, emote), "scream")
+
+ old_body.apply_damage(damage, damage_type, def_zone, blocked, forced, wound_bonus = CANT_WOUND)
+
+ if(old_body.stat > SOFT_CRIT) // KO!
+ full_avatar_disconnect(forced = TRUE)
+
+/// Handles minds being swapped around in subsequent avatars
+/datum/component/avatar_connection/proc/on_mind_transfer(datum/mind/source, mob/living/previous_body)
+ SIGNAL_HANDLER
+
+ var/datum/action/avatar_domain_info/action = locate() in previous_body.actions
+ if(action)
+ action.Grant(source.current)
+
+ source.current.TakeComponent(src)
+
+/// Triggers when someone starts prying open our netpod
+/datum/component/avatar_connection/proc/on_netpod_crowbar(datum/source, mob/living/intruder)
+ SIGNAL_HANDLER
+
+ var/mob/living/avatar = parent
+ avatar.playsound_local(avatar, 'sound/machines/terminal_alert.ogg', 50, TRUE)
+ avatar.throw_alert(
+ ALERT_BITRUNNER_CROWBAR,
+ /atom/movable/screen/alert/bitrunning/netpod_crowbar,
+ new_master = intruder
+ )
+
+/// Triggers when the netpod is taking damage and is under 50%
+/datum/component/avatar_connection/proc/on_netpod_damaged(datum/source)
+ SIGNAL_HANDLER
+
+ var/mob/living/avatar = parent
+ avatar.throw_alert(
+ ALERT_BITRUNNER_INTEGRITY,
+ /atom/movable/screen/alert/bitrunning/netpod_damaged,
+ new_master = source
+ )
+
+/// Safely exits without forced variables, etc
+/datum/component/avatar_connection/proc/on_safe_disconnect(datum/source)
+ SIGNAL_HANDLER
+
+ full_avatar_disconnect()
+
+/// Helper for calling sever with forced variables
+/datum/component/avatar_connection/proc/on_sever_connection(datum/source)
+ SIGNAL_HANDLER
+
+ full_avatar_disconnect(forced = TRUE, source = source)
+
+/// Triggers when the server is shutting down
+/datum/component/avatar_connection/proc/on_shutting_down(datum/source, mob/living/hackerman)
+ SIGNAL_HANDLER
+
+ var/mob/living/avatar = parent
+ avatar.playsound_local(avatar, 'sound/machines/terminal_alert.ogg', 50, TRUE)
+ avatar.throw_alert(
+ ALERT_BITRUNNER_SHUTDOWN,
+ /atom/movable/screen/alert/bitrunning/qserver_shutting_down,
+ new_master = hackerman,
+ )
+
+/// Server has spawned a ghost role threat
+/datum/component/avatar_connection/proc/on_threat_created(datum/source)
+ SIGNAL_HANDLER
+
+ var/mob/living/avatar = parent
+ avatar.throw_alert(
+ ALERT_BITRUNNER_THREAT,
+ /atom/movable/screen/alert/bitrunning/qserver_threat_spawned,
+ new_master = source,
+ )
+
+/// Returns the mind to the old body
+/datum/component/avatar_connection/proc/return_to_old_body()
+ var/datum/mind/old_mind = old_mind_ref?.resolve()
+ var/mob/living/old_body = old_body_ref?.resolve()
+ var/mob/living/avatar = parent
+
+ var/mob/dead/observer/ghost = avatar.ghostize()
+ if(isnull(ghost))
+ ghost = avatar.get_ghost()
+
+ if(isnull(ghost))
+ CRASH("[src] belonging to [parent] was completely unable to find a ghost to put back into a body!")
+
+ if(isnull(old_mind) || isnull(old_body))
+ return
+
+ ghost.mind = old_mind
+ if(old_body.stat != DEAD)
+ old_mind.transfer_to(old_body, force_key_move = TRUE)
+ else
+ old_mind.set_current(old_body)
+
+ REMOVE_TRAIT(old_body, TRAIT_MIND_TEMPORARILY_GONE, REF(src))
diff --git a/code/modules/bitrunning/components/bitrunning_points.dm b/code/modules/bitrunning/components/bitrunning_points.dm
new file mode 100644
index 00000000000..58dda4a68ff
--- /dev/null
+++ b/code/modules/bitrunning/components/bitrunning_points.dm
@@ -0,0 +1,46 @@
+/// Attaches a component which listens for a given signal from the item.
+///
+/// When the signal is received, it will add points to the signaler.
+/datum/component/bitrunning_points
+ /// The range at which we can find the signaler
+ var/max_point_range
+ /// Weakref to the loot crate landmark - where we send points
+ var/datum/weakref/our_spawner
+ /// The amount of points per each signal
+ var/points_per_signal
+ /// The signal we listen for
+ var/signal_type
+
+/datum/component/bitrunning_points/Initialize(signal_type, points_per_signal = 1, max_point_range = 4)
+ src.max_point_range = max_point_range
+ src.points_per_signal = points_per_signal
+ src.signal_type = signal_type
+
+ locate_spawner()
+
+/datum/component/bitrunning_points/RegisterWithParent()
+ RegisterSignal(parent, signal_type, PROC_REF(on_event))
+
+/datum/component/bitrunning_points/UnregisterFromParent()
+ UnregisterSignal(parent, signal_type)
+
+/// Finds the signaler if it hasn't been found yet.
+/datum/component/bitrunning_points/proc/locate_spawner()
+ var/obj/effect/landmark/bitrunning/loot_signal/spawner = our_spawner?.resolve()
+ if(spawner)
+ return spawner
+
+ for(var/obj/effect/landmark/bitrunning/loot_signal/found in GLOB.landmarks_list)
+ if(IN_GIVEN_RANGE(get_turf(parent), found, max_point_range))
+ our_spawner = WEAKREF(found)
+ return found
+
+/// Once the specified signal is received, whisper to the spawner to add points.
+/datum/component/bitrunning_points/proc/on_event(datum/source)
+ SIGNAL_HANDLER
+
+ var/obj/effect/landmark/bitrunning/loot_signal/spawner = locate_spawner()
+ if(isnull(spawner))
+ return
+
+ SEND_SIGNAL(spawner, COMSIG_BITRUNNER_GOAL_POINT, points_per_signal)
diff --git a/code/modules/bitrunning/components/netpod_healing.dm b/code/modules/bitrunning/components/netpod_healing.dm
new file mode 100644
index 00000000000..fc7de89bcf3
--- /dev/null
+++ b/code/modules/bitrunning/components/netpod_healing.dm
@@ -0,0 +1,65 @@
+/datum/component/netpod_healing
+ /// Brute damage to heal over a second
+ var/brute_heal = 0
+ /// Burn damage to heal over a second
+ var/burn_heal = 0
+ /// Toxin damage to heal over a second
+ var/toxin_heal = 0
+ /// Amount of cloning damage to heal over a second
+ var/clone_heal = 0
+ /// Amount of blood to heal over a second
+ var/blood_heal = 0
+
+/datum/component/netpod_healing/Initialize(
+ brute_heal = 0,
+ burn_heal = 0,
+ toxin_heal = 0,
+ clone_heal = 0,
+ blood_heal = 0,
+)
+ var/mob/living/carbon/player = parent
+ if (!iscarbon(player))
+ return COMPONENT_INCOMPATIBLE
+
+ player.apply_status_effect(/datum/status_effect/embryonic, STASIS_NETPOD_EFFECT)
+
+ START_PROCESSING(SSmachines, src)
+
+ src.brute_heal = brute_heal
+ src.burn_heal = burn_heal
+ src.toxin_heal = toxin_heal
+ src.clone_heal = clone_heal
+ src.blood_heal = blood_heal
+
+/datum/component/netpod_healing/Destroy(force, silent)
+ STOP_PROCESSING(SSmachines, src)
+
+ var/mob/living/carbon/player = parent
+ player.remove_status_effect(/datum/status_effect/embryonic)
+
+ return ..()
+
+/datum/component/netpod_healing/process(seconds_per_tick)
+ var/mob/living/carbon/owner = parent
+ if(isnull(owner))
+ qdel(src)
+ return
+
+ owner.adjustBruteLoss(-brute_heal * seconds_per_tick, updating_health = FALSE)
+ owner.adjustFireLoss(-burn_heal * seconds_per_tick, updating_health = FALSE)
+ owner.adjustToxLoss(-toxin_heal * seconds_per_tick, updating_health = FALSE, forced = TRUE)
+ owner.adjustCloneLoss(-clone_heal * seconds_per_tick, updating_health = FALSE)
+
+ if(owner.blood_volume < BLOOD_VOLUME_NORMAL)
+ owner.blood_volume += blood_heal * seconds_per_tick
+
+ owner.updatehealth()
+
+/datum/status_effect/embryonic
+ id = "embryonic"
+ alert_type = /atom/movable/screen/alert/status_effect/embryonic
+
+/atom/movable/screen/alert/status_effect/embryonic
+ name = "Embryonic Stasis"
+ icon_state = "netpod_stasis"
+ desc = "You feel like you're in a dream."
diff --git a/code/modules/bitrunning/event.dm b/code/modules/bitrunning/event.dm
new file mode 100644
index 00000000000..0ac35a2df8f
--- /dev/null
+++ b/code/modules/bitrunning/event.dm
@@ -0,0 +1,151 @@
+/datum/round_event_control/bitrunning_glitch
+ name = "Spawn Bitrunning Glitch"
+ admin_setup = list(
+ /datum/event_admin_setup/minimum_candidate_requirement/bitrunning_glitch,
+ /datum/event_admin_setup/listed_options/bitrunning_glitch,
+ )
+ category = EVENT_CATEGORY_INVASION
+ description = "Causes a short term antagonist to spawn in the virtual domain."
+ dynamic_should_hijack = FALSE
+ max_occurrences = 5
+ min_players = 1
+ typepath = /datum/round_event/ghost_role/bitrunning_glitch
+ weight = 10
+ /// List of active servers to choose from
+ var/list/obj/machinery/quantum_server/active_servers = list()
+ /// List of possible antags to spawn
+ var/static/list/possible_antags = list(
+ ROLE_CYBER_POLICE,
+ )
+
+/datum/round_event_control/bitrunning_glitch/can_spawn_event(players_amt, allow_magic = FALSE)
+ . = ..()
+ if(!.)
+ return .
+
+ active_servers.Cut()
+
+ get_active_servers()
+
+ if(length(active_servers))
+ return TRUE
+
+/// All servers currently running, has players in it, and map has valid mobs
+/datum/round_event_control/bitrunning_glitch/proc/get_active_servers()
+ for(var/obj/machinery/quantum_server/server in SSmachines.get_machines_by_type(/obj/machinery/quantum_server))
+ if(length(server.get_valid_domain_targets()))
+ active_servers.Add(server)
+
+ return length(active_servers) > 0
+
+/datum/event_admin_setup/listed_options/bitrunning_glitch
+ input_text = "Select a role to spawn."
+
+/datum/event_admin_setup/listed_options/bitrunning_glitch/get_list()
+ var/datum/round_event_control/bitrunning_glitch/control = event_control
+
+ var/list/possible = control.possible_antags.Copy() // this seems pedantic but byond is complaining control was unused
+
+ possible += list("Random")
+
+ return possible
+
+/datum/event_admin_setup/listed_options/bitrunning_glitch/apply_to_event(datum/round_event/ghost_role/bitrunning_glitch/event)
+ if(chosen == "Random")
+ event.forced_role = null
+ else
+ event.forced_role = chosen
+
+/datum/event_admin_setup/minimum_candidate_requirement/bitrunning_glitch
+ output_text = "There must be valid mobs to mutate or players in the domain!"
+
+/datum/event_admin_setup/minimum_candidate_requirement/bitrunning_glitch/count_candidates()
+ var/datum/round_event_control/bitrunning_glitch/cyber_control = event_control
+ cyber_control.get_active_servers()
+
+ var/total = 0
+ for(var/obj/machinery/quantum_server/server in cyber_control.active_servers)
+ total += length(server.mutation_candidate_refs)
+
+ return total
+
+/datum/round_event/ghost_role/bitrunning_glitch
+ minimum_required = 1
+ role_name = "Bitrunning Glitch"
+ fakeable = FALSE
+ /// Admin customization: What to spawn
+ var/forced_role
+
+/datum/round_event/ghost_role/bitrunning_glitch/spawn_role()
+ var/datum/round_event_control/bitrunning_glitch/cyber_control = control
+
+ var/obj/machinery/quantum_server/unlucky_server = pick(cyber_control.active_servers)
+ cyber_control.active_servers.Cut()
+
+ var/list/mutation_candidates = unlucky_server.get_valid_domain_targets()
+ if(!length(mutation_candidates))
+ return MAP_ERROR
+
+ var/chosen = pick(mutation_candidates)
+ if(isnull(chosen) || !length(mutation_candidates))
+ return MAP_ERROR
+
+ var/datum/weakref/target_ref = pick(mutation_candidates)
+ var/mob/living/mutation_target = target_ref.resolve()
+
+ if(isnull(mutation_target)) // just in case since it takes a minute
+ target_ref = pick(mutation_candidates)
+ mutation_target = target_ref.resolve()
+ if(isnull(mutation_target))
+ return MAP_ERROR
+
+ var/chosen_role = forced_role || pick(cyber_control.possible_antags)
+
+ var/datum/mind/ghost_mind = get_ghost_mind(chosen_role)
+ if(isnull(ghost_mind))
+ return NOT_ENOUGH_PLAYERS
+
+ var/mob/living/antag_mob
+ switch(chosen_role)
+ if(ROLE_CYBER_POLICE)
+ antag_mob = spawn_cybercop(mutation_target, ghost_mind)
+
+ playsound(antag_mob, 'sound/magic/ethereal_exit.ogg', 50, TRUE, -1)
+ message_admins("[ADMIN_LOOKUPFLW(antag_mob)] has been made into virtual antagonist by an event.")
+ antag_mob.log_message("was spawned as a virtual antagonist by an event.", LOG_GAME)
+
+ SEND_SIGNAL(unlucky_server, COMSIG_BITRUNNER_SPAWN_GLITCH, antag_mob)
+
+ spawned_mobs += antag_mob
+
+ return SUCCESSFUL_SPAWN
+
+/// Polls for a ghost that wants to run it
+/datum/round_event/ghost_role/bitrunning_glitch/proc/get_ghost_mind(role_name)
+ var/list/mob/dead/observer/ghosties = poll_ghost_candidates("A short term antagonist role is available. Would you like to spawn as a '[role_name]'?", role_name)
+
+ if(!length(ghosties))
+ return
+
+ shuffle_inplace(ghosties)
+
+ var/mob/dead/selected = pick(ghosties)
+
+ var/datum/mind/player_mind = new /datum/mind(selected.key)
+ player_mind.active = TRUE
+
+ return player_mind
+
+/// Spawns a cybercop on the mutation target
+/datum/round_event/ghost_role/bitrunning_glitch/proc/spawn_cybercop(mob/living/mutation_target, datum/mind/player_mind)
+ var/mob/living/carbon/human/new_agent = new(mutation_target.loc)
+ mutation_target.gib()
+ mutation_target = null
+
+ player_mind.transfer_to(new_agent)
+ player_mind.set_assigned_role(SSjob.GetJobType(/datum/job/cyber_police))
+ player_mind.special_role = ROLE_CYBER_POLICE
+ player_mind.add_antag_datum(/datum/antagonist/cyber_police)
+
+ return new_agent
+
diff --git a/code/modules/bitrunning/job.dm b/code/modules/bitrunning/job.dm
new file mode 100644
index 00000000000..57581753c0f
--- /dev/null
+++ b/code/modules/bitrunning/job.dm
@@ -0,0 +1,41 @@
+/datum/job/bitrunner
+ title = JOB_BITRUNNER
+ description = "Surf the virtual domain for gear and loot. Decrypt your rewards on station."
+ department_head = list(JOB_QUARTERMASTER)
+ faction = FACTION_STATION
+ total_positions = 3
+ spawn_positions = 3
+ supervisors = SUPERVISOR_QM
+ exp_granted_type = EXP_TYPE_CREW
+ config_tag = "BITRUNNER"
+ outfit = /datum/outfit/job/bitrunner
+ plasmaman_outfit = /datum/outfit/plasmaman/bitrunner
+ paycheck = PAYCHECK_CREW
+ paycheck_department = ACCOUNT_CAR
+ display_order = JOB_DISPLAY_ORDER_BITRUNNER
+ bounty_types = CIV_JOB_RANDOM
+ departments_list = list(
+ /datum/job_department/cargo,
+ )
+
+ family_heirlooms = list(/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind)
+
+ mail_goodies = list(
+ /obj/item/food/cornchips = 1,
+ /obj/item/reagent_containers/cup/soda_cans/space_mountain_wind = 1,
+ /obj/item/food/cornchips/green = 1,
+ /obj/item/food/cornchips/red = 1,
+ /obj/item/food/cornchips/purple = 1,
+ /obj/item/food/cornchips/blue = 1,
+ )
+ rpg_title = "Recluse"
+ job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN
+
+/datum/outfit/job/bitrunner
+ name = "Bitrunner"
+ jobtype = /datum/job/bitrunner
+
+ id_trim = /datum/id_trim/job/bitrunner
+ uniform = /obj/item/clothing/under/rank/cargo/bitrunner
+ belt = /obj/item/modular_computer/pda/bitrunner
+ ears = /obj/item/radio/headset/headset_cargo
diff --git a/code/modules/bitrunning/objects/bit_vendor.dm b/code/modules/bitrunning/objects/bit_vendor.dm
new file mode 100644
index 00000000000..abd63a9e784
--- /dev/null
+++ b/code/modules/bitrunning/objects/bit_vendor.dm
@@ -0,0 +1,86 @@
+#define CREDIT_TYPE_BITRUNNING "np"
+
+/obj/machinery/computer/order_console/bitrunning
+ name = "bitrunning supplies order console"
+ desc = "NexaCache(tm)! Dubiously authentic gear for the digital daredevil."
+ icon = 'icons/obj/machines/bitrunning.dmi'
+ icon_state = "vendor"
+ icon_keyboard = null
+ icon_screen = null
+ circuit = /obj/item/circuitboard/computer/order_console/bitrunning
+ cooldown_time = 10 SECONDS
+ cargo_cost_multiplier = 0.65
+ express_cost_multiplier = 1
+ purchase_tooltip = @{"Your purchases will arrive at cargo,
+ and hopefully get delivered by them.
+ 35% cheaper than express delivery."}
+ express_tooltip = @{"Sends your purchases instantly."}
+ credit_type = CREDIT_TYPE_BITRUNNING
+
+ order_categories = list(
+ CATEGORY_BITRUNNING_FLAIR,
+ CATEGORY_BITRUNNING_TECH,
+ CATEGORY_BEPIS,
+ )
+ blackbox_key = "bitrunning"
+
+/obj/machinery/computer/order_console/bitrunning/subtract_points(final_cost, obj/item/card/id/card)
+ if(final_cost <= card.registered_account.bitrunning_points)
+ card.registered_account.bitrunning_points -= final_cost
+ return TRUE
+ return FALSE
+
+/obj/machinery/computer/order_console/bitrunning/order_groceries(mob/living/purchaser, obj/item/card/id/card, list/groceries)
+ var/list/things_to_order = list()
+ for(var/datum/orderable_item/item as anything in groceries)
+ things_to_order[item.item_path] = groceries[item]
+
+ var/datum/supply_pack/bitrunning/pack = new(
+ purchaser = purchaser, \
+ cost = get_total_cost(), \
+ contains = things_to_order,
+ )
+
+ var/datum/supply_order/new_order = new(
+ pack = pack,
+ orderer = purchaser,
+ orderer_rank = "Bitrunning Vendor",
+ orderer_ckey = purchaser.ckey,
+ reason = "",
+ paying_account = card.registered_account,
+ department_destination = null,
+ coupon = null,
+ charge_on_purchase = FALSE,
+ manifest_can_fail = FALSE,
+ cost_type = credit_type,
+ can_be_cancelled = FALSE,
+ )
+ say("Thank you for your purchase! It will arrive on the next cargo shuttle!")
+ radio.talk_into(src, "A bitrunner has ordered equipment which will arrive on the cargo shuttle! Please make sure it gets to them as soon as possible!", radio_channel)
+ SSshuttle.shopping_list += new_order
+
+/obj/machinery/computer/order_console/bitrunning/retrieve_points(obj/item/card/id/id_card)
+ return round(id_card.registered_account.bitrunning_points)
+
+/obj/machinery/computer/order_console/bitrunning/ui_act(action, params)
+ . = ..()
+ if(!.)
+ flick("vendor_off", src)
+
+/obj/machinery/computer/order_console/bitrunning/update_icon_state()
+ icon_state = "[initial(icon_state)][powered() ? null : "_off"]"
+ return ..()
+
+/datum/supply_pack/bitrunning
+ name = "bitrunning order"
+ hidden = TRUE
+ crate_name = "bitrunning delivery crate"
+ access = list(ACCESS_BIT_DEN)
+
+/datum/supply_pack/bitrunning/New(purchaser, cost, list/contains)
+ . = ..()
+ name = "[purchaser]'s Bitrunning Order"
+ src.cost = cost
+ src.contains = contains
+
+#undef CREDIT_TYPE_BITRUNNING
diff --git a/code/modules/bitrunning/objects/clothing.dm b/code/modules/bitrunning/objects/clothing.dm
new file mode 100644
index 00000000000..4d2d9cc55c4
--- /dev/null
+++ b/code/modules/bitrunning/objects/clothing.dm
@@ -0,0 +1,9 @@
+/obj/item/clothing/glasses/sunglasses/oval
+ name = "oval sunglasses"
+ desc = "Vintage wrap around sunglasses. Provides a little protection."
+ icon_state = "jensenshades"
+
+/obj/item/clothing/suit/jacket/trenchcoat
+ name = "trenchcoat"
+ desc = "A long, black trenchcoat. Makes you feel like you're the one, but you're not."
+ icon_state = "trenchcoat"
diff --git a/code/modules/bitrunning/objects/disks.dm b/code/modules/bitrunning/objects/disks.dm
new file mode 100644
index 00000000000..4698b7a1ec1
--- /dev/null
+++ b/code/modules/bitrunning/objects/disks.dm
@@ -0,0 +1,146 @@
+/**
+ * Bitrunning tech disks which let you load items or programs into the vdom on first avatar generation.
+ * For the record: Balance shouldn't be a primary concern.
+ * You can make the custom cheese spells you've always wanted.
+ * Just make it fun and engaging, it's PvE content.
+ */
+/obj/item/bitrunning_disk
+ name = "generic bitrunning program"
+ desc = "A disk containing source code."
+ icon = 'icons/obj/assemblies/module.dmi'
+ base_icon_state = "datadisk"
+ icon_state = "datadisk0"
+ /// Name of the choice made
+ var/choice_made
+
+/obj/item/bitrunning_disk/Initialize(mapload)
+ . = ..()
+
+ icon_state = "[base_icon_state][rand(0, 7)]"
+ update_icon()
+ RegisterSignal(src, COMSIG_ATOM_EXAMINE, PROC_REF(on_examined))
+
+/obj/item/bitrunning_disk/proc/on_examined(datum/source, mob/examiner, list/examine_text)
+ SIGNAL_HANDLER
+
+ examine_text += span_infoplain("This disk must be carried on your person into a netpod to be used.")
+
+ if(isnull(choice_made))
+ examine_text += span_notice("To make a selection, toggle the disk in hand.")
+ return
+
+ examine_text += span_info("It has been used to select: [choice_made].")
+ examine_text += span_notice("It cannot make another selection.")
+
+/obj/item/bitrunning_disk/ability
+ desc = "A disk containing source code. It can be used to preload abilities into the virtual domain."
+ /// The selected ability that this grants
+ var/datum/action/granted_action
+ /// The list of actions that this can grant
+ var/list/datum/action/selectable_actions = list()
+
+/obj/item/bitrunning_disk/ability/attack_self(mob/user, modifiers)
+ . = ..()
+
+ if(choice_made)
+ return
+
+ var/names = list()
+ for(var/datum/action/thing as anything in selectable_actions)
+ names += initial(thing.name)
+
+ var/choice = tgui_input_list(user, message = "Select an ability", title = "Bitrunning Program", items = names)
+ if(isnull(choice))
+ return
+
+ for(var/datum/action/thing as anything in selectable_actions)
+ if(initial(thing.name) == choice)
+ granted_action = thing
+
+ if(isnull(granted_action))
+ return
+
+ balloon_alert(user, "selected")
+ playsound(user, 'sound/items/click.ogg', 50, TRUE)
+ choice_made = choice
+
+/// Tier 1 programs. Simple, funny, or helpful.
+/obj/item/bitrunning_disk/ability/tier1
+ name = "bitrunning program: basic"
+ selectable_actions = list(
+ /datum/action/cooldown/spell/conjure/cheese,
+ /datum/action/cooldown/spell/basic_heal,
+ )
+
+/// Tier 2 programs. More complex, powerful, or useful.
+/obj/item/bitrunning_disk/ability/tier2
+ name = "bitrunning program: complex"
+ selectable_actions = list(
+ /datum/action/cooldown/spell/pointed/projectile/fireball,
+ /datum/action/cooldown/spell/pointed/projectile/lightningbolt,
+ /datum/action/cooldown/spell/forcewall,
+ )
+
+/// Tier 3 abilities. Very powerful, game breaking.
+/obj/item/bitrunning_disk/ability/tier3
+ name = "bitrunning program: elite"
+ selectable_actions = list(
+ /datum/action/cooldown/spell/shapeshift/dragon,
+ /datum/action/cooldown/spell/shapeshift/polar_bear,
+ )
+
+/obj/item/bitrunning_disk/item
+ desc = "A disk containing source code. It can be used to preload items into the virtual domain."
+ /// The selected item that this grants
+ var/obj/granted_item
+ /// The list of actions that this can grant
+ var/list/obj/selectable_items = list()
+
+/obj/item/bitrunning_disk/item/attack_self(mob/user, modifiers)
+ . = ..()
+
+ if(choice_made)
+ return
+
+ var/names = list()
+ for(var/obj/thing as anything in selectable_items)
+ names += initial(thing.name)
+
+ var/choice = tgui_input_list(user, message = "Select an ability", title = "Bitrunning Program", items = names)
+ if(isnull(choice))
+ return
+
+ for(var/obj/thing as anything in selectable_items)
+ if(initial(thing.name) == choice)
+ granted_item = thing
+
+ balloon_alert(user, "selected")
+ playsound(user, 'sound/items/click.ogg', 50, TRUE)
+ choice_made = choice
+
+/// Tier 1 items. Simple, funny, or helpful.
+/obj/item/bitrunning_disk/item/tier1
+ name = "bitrunning gear: simple"
+ selectable_items = list(
+ /obj/item/pizzabox/infinite,
+ /obj/item/gun/medbeam,
+ /obj/item/grenade/c4,
+ )
+
+/// Tier 2 items. More complex, powerful, or useful.
+/obj/item/bitrunning_disk/item/tier2
+ name = "bitrunning gear: complex"
+ selectable_items = list(
+ /obj/item/chainsaw,
+ /obj/item/gun/ballistic/automatic/pistol,
+ /obj/item/melee/energy/blade/hardlight,
+ )
+
+/// Tier 3 items. Very powerful, game breaking.
+/obj/item/bitrunning_disk/item/tier3
+ name = "bitrunning gear: advanced"
+ selectable_items = list(
+ /obj/item/gun/energy/tesla_cannon,
+ /obj/item/dualsaber/green,
+ /obj/item/melee/beesword,
+ )
diff --git a/code/modules/bitrunning/objects/hololadder.dm b/code/modules/bitrunning/objects/hololadder.dm
new file mode 100644
index 00000000000..906801f1fc0
--- /dev/null
+++ b/code/modules/bitrunning/objects/hololadder.dm
@@ -0,0 +1,51 @@
+/obj/structure/hololadder
+ name = "hololadder"
+
+ anchored = TRUE
+ desc = "An abstract representation of the means to disconnect from the virtual domain."
+ icon = 'icons/obj/structures.dmi'
+ icon_state = "ladder11"
+ obj_flags = BLOCK_Z_OUT_DOWN
+ /// Time req to disconnect properly
+ var/travel_time = 3 SECONDS
+
+/obj/structure/hololadder/Initialize(mapload)
+ . = ..()
+
+ RegisterSignal(loc, COMSIG_ATOM_ENTERED, PROC_REF(on_enter))
+
+/obj/structure/hololadder/attack_hand(mob/user, list/modifiers)
+ . = ..()
+ if(.)
+ return
+
+ if(!in_range(src, user) || DOING_INTERACTION(user, DOAFTER_SOURCE_CLIMBING_LADDER))
+ return
+
+ disconnect(user)
+
+/// If there's a pilot ref- send the disconnect signal
+/obj/structure/hololadder/proc/disconnect(mob/user)
+ if(isnull(user.mind))
+ return
+
+ if(!HAS_TRAIT(user, TRAIT_TEMPORARY_BODY))
+ balloon_alert(user, "no connection detected.")
+ return
+
+ balloon_alert(user, "disconnecting...")
+ if(do_after(user, travel_time, src))
+ SEND_SIGNAL(user, COMSIG_BITRUNNER_SAFE_DISCONNECT)
+
+/// Helper for times when you dont have hands (gondola??)
+/obj/structure/hololadder/proc/on_enter(datum/source, atom/movable/arrived, turf/old_loc)
+ SIGNAL_HANDLER
+
+ if(!isliving(arrived))
+ return
+
+ var/mob/living/user = arrived
+ if(isnull(user.mind))
+ return
+
+ INVOKE_ASYNC(src, PROC_REF(disconnect), user)
diff --git a/code/modules/bitrunning/objects/host_monitor.dm b/code/modules/bitrunning/objects/host_monitor.dm
new file mode 100644
index 00000000000..f59ca61cbd0
--- /dev/null
+++ b/code/modules/bitrunning/objects/host_monitor.dm
@@ -0,0 +1,33 @@
+/obj/item/bitrunning_host_monitor
+ name = "host monitor"
+
+ custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2)
+ desc = "A complex medical device that, when attached to an avatar's data stream, can detect the user of their host's health."
+ flags_1 = CONDUCT_1
+ icon = 'icons/obj/device.dmi'
+ icon_state = "gps-b"
+ inhand_icon_state = "electronic"
+ item_flags = NOBLUDGEON
+ lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi'
+ slot_flags = ITEM_SLOT_BELT
+ throw_range = 7
+ throw_speed = 3
+ throwforce = 3
+ w_class = WEIGHT_CLASS_TINY
+ worn_icon_state = "electronic"
+
+/obj/item/bitrunning_host_monitor/attack_self(mob/user, modifiers)
+ . = ..()
+
+ var/datum/component/avatar_connection/connection = user.GetComponent(/datum/component/avatar_connection)
+ if(isnull(connection))
+ balloon_alert(user, "data not recognized")
+ return
+
+ var/mob/living/pilot = connection.old_body_ref?.resolve()
+ if(isnull(pilot))
+ balloon_alert(user, "host not recognized")
+ return
+
+ to_chat(user, span_notice("Current host health: [pilot.health / pilot.maxHealth * 100]%"))
diff --git a/code/modules/bitrunning/objects/landmarks.dm b/code/modules/bitrunning/objects/landmarks.dm
new file mode 100644
index 00000000000..d78283c6a8b
--- /dev/null
+++ b/code/modules/bitrunning/objects/landmarks.dm
@@ -0,0 +1,70 @@
+/obj/effect/landmark/bitrunning
+ name = "Generic bitrunning effect"
+ icon = 'icons/effects/bitrunning.dmi'
+ icon_state = "crate"
+
+/// In case you want to gate the crate behind a special condition.
+/obj/effect/landmark/bitrunning/loot_signal
+ name = "Mysterious aura"
+ /// The amount required to spawn a crate
+ var/points_goal = 10
+ /// A special condition limits this from spawning a crate
+ var/points_received = 0
+ /// Finished the special condition
+ var/revealed = FALSE
+
+/obj/effect/landmark/bitrunning/loot_signal/Initialize(mapload)
+ . = ..()
+
+ RegisterSignal(src, COMSIG_BITRUNNER_GOAL_POINT, PROC_REF(on_add_point))
+
+/// Listens for points to be added which will eventually spawn a crate.
+/obj/effect/landmark/bitrunning/loot_signal/proc/on_add_point(datum/source, points_to_add)
+ SIGNAL_HANDLER
+
+ if(revealed)
+ return
+
+ points_received += points_to_add
+
+ if(points_received < points_goal)
+ return
+
+ reveal()
+
+/// Spawns the crate with some effects
+/obj/effect/landmark/bitrunning/loot_signal/proc/reveal()
+ playsound(src, 'sound/magic/blink.ogg', 50, TRUE)
+
+ var/turf/tile = get_turf(src)
+ var/obj/structure/closet/crate/secure/bitrunning/encrypted/loot = new(tile)
+ var/datum/effect_system/spark_spread/quantum/sparks = new(tile)
+ sparks.set_up(5, 1, get_turf(loot))
+ sparks.start()
+
+ qdel(src)
+
+/// Where the crates get ported to station
+/obj/effect/landmark/bitrunning/station_reward_spawn
+ name = "Bitrunning rewards spawn"
+ icon_state = "station"
+
+/// Where the exit hololadder spawns
+/obj/effect/landmark/bitrunning/hololadder_spawn
+ name = "Bitrunning hololadder spawn"
+ icon_state = "hololadder"
+
+/// Where the crates need to be taken
+/obj/effect/landmark/bitrunning/cache_goal_turf
+ name = "Bitrunning goal turf"
+ icon_state = "goal"
+
+/// Where you want the crate to spawn
+/obj/effect/landmark/bitrunning/cache_spawn
+ name = "Bitrunning crate spawn"
+ icon_state = "spawn"
+
+/// Where the safehouse will spawn
+/obj/effect/landmark/bitrunning/safehouse_spawn
+ name = "Bitrunning safehouse spawn"
+ icon_state = "safehouse"
diff --git a/code/modules/bitrunning/objects/loot_crate.dm b/code/modules/bitrunning/objects/loot_crate.dm
new file mode 100644
index 00000000000..5af8c0d9477
--- /dev/null
+++ b/code/modules/bitrunning/objects/loot_crate.dm
@@ -0,0 +1,91 @@
+#define ORE_MULTIPLIER_IRON 3
+#define ORE_MULTIPLIER_GLASS 2
+#define ORE_MULTIPLIER_PLASMA 1
+#define ORE_MULTIPLIER_SILVER 0.7
+#define ORE_MULTIPLIER_GOLD 0.6
+#define ORE_MULTIPLIER_TITANIUM 0.5
+#define ORE_MULTIPLIER_URANIUM 0.4
+#define ORE_MULTIPLIER_DIAMOND 0.3
+#define ORE_MULTIPLIER_BLUESPACE_CRYSTAL 0.2
+
+/obj/structure/closet/crate/secure/bitrunning // Base class. Do not spawn this.
+ name = "base class cache"
+ desc = "Talk to a coder."
+
+/// The virtual domain - side of the bitrunning crate. Deliver to the send location.
+/obj/structure/closet/crate/secure/bitrunning/encrypted
+ name = "encrypted cache"
+ desc = "Needs decrypted at the safehouse to be opened."
+ locked = TRUE
+
+/obj/structure/closet/crate/secure/bitrunning/encrypted/can_unlock(mob/living/user, obj/item/card/id/player_id, obj/item/card/id/registered_id)
+ return FALSE
+
+/// The bitrunner den - side of the bitrunning crate. Appears in the receive location.
+/obj/structure/closet/crate/secure/bitrunning/decrypted
+ name = "decrypted cache"
+ desc = "Compiled from the virtual domain. The reward of a successful bitrunner."
+ locked = FALSE
+
+/obj/structure/closet/crate/secure/bitrunning/decrypted/Initialize(
+ mapload,
+ datum/lazy_template/virtual_domain/completed_domain,
+ rewards_multiplier = 1,
+ )
+ . = ..()
+ playsound(src, 'sound/magic/blink.ogg', 50, TRUE)
+
+ if(isnull(completed_domain))
+ return
+
+ PopulateContents(completed_domain.reward_points, completed_domain.extra_loot, rewards_multiplier)
+
+/obj/structure/closet/crate/secure/bitrunning/decrypted/PopulateContents(reward_points, list/extra_loot, rewards_multiplier)
+ . = ..()
+ spawn_loot(extra_loot)
+
+ new /obj/item/stack/ore/iron(src, calculate_loot(reward_points, rewards_multiplier, ORE_MULTIPLIER_IRON))
+ new /obj/item/stack/ore/glass(src, calculate_loot(reward_points, rewards_multiplier, ORE_MULTIPLIER_GLASS))
+
+ if(reward_points > 1)
+ new /obj/item/stack/ore/silver(src, calculate_loot(reward_points, rewards_multiplier, ORE_MULTIPLIER_SILVER))
+ new /obj/item/stack/ore/titanium(src, calculate_loot(reward_points, rewards_multiplier, ORE_MULTIPLIER_TITANIUM))
+
+ if(reward_points > 2)
+ new /obj/item/stack/ore/plasma(src, calculate_loot(reward_points, rewards_multiplier, ORE_MULTIPLIER_PLASMA))
+ new /obj/item/stack/ore/gold(src, calculate_loot(reward_points, rewards_multiplier, ORE_MULTIPLIER_GOLD))
+ new /obj/item/stack/ore/uranium(src, calculate_loot(reward_points, rewards_multiplier, ORE_MULTIPLIER_URANIUM))
+
+ if(reward_points > 3)
+ new /obj/item/stack/ore/diamond(src, calculate_loot(reward_points, rewards_multiplier, ORE_MULTIPLIER_DIAMOND))
+ new /obj/item/stack/ore/bluespace_crystal(src, calculate_loot(reward_points, rewards_multiplier, ORE_MULTIPLIER_BLUESPACE_CRYSTAL))
+
+/// Handles generating random numbers & calculating loot totals
+/obj/structure/closet/crate/secure/bitrunning/decrypted/proc/calculate_loot(reward_points, rewards_multiplier, ore_multiplier)
+ var/base = rewards_multiplier + reward_points
+ var/random_sum = (rand() + 0.5) * base
+ return ROUND_UP(random_sum * ore_multiplier)
+
+/// Handles spawning extra loot. This tries to handle bad flat and assoc lists
+/obj/structure/closet/crate/secure/bitrunning/decrypted/proc/spawn_loot(list/extra_loot)
+ for(var/path in extra_loot)
+ if(!ispath(path))
+ continue
+
+ if(isnull(extra_loot[path]))
+ return FALSE
+
+ for(var/i in 1 to extra_loot[path])
+ new path(src)
+
+ return TRUE
+
+#undef ORE_MULTIPLIER_IRON
+#undef ORE_MULTIPLIER_GLASS
+#undef ORE_MULTIPLIER_PLASMA
+#undef ORE_MULTIPLIER_SILVER
+#undef ORE_MULTIPLIER_GOLD
+#undef ORE_MULTIPLIER_TITANIUM
+#undef ORE_MULTIPLIER_URANIUM
+#undef ORE_MULTIPLIER_DIAMOND
+#undef ORE_MULTIPLIER_BLUESPACE_CRYSTAL
diff --git a/code/modules/bitrunning/objects/netpod.dm b/code/modules/bitrunning/objects/netpod.dm
new file mode 100644
index 00000000000..33d468a3825
--- /dev/null
+++ b/code/modules/bitrunning/objects/netpod.dm
@@ -0,0 +1,478 @@
+#define BASE_DISCONNECT_DAMAGE 40
+
+/obj/machinery/netpod
+ name = "netpod"
+
+ base_icon_state = "netpod"
+ circuit = /obj/item/circuitboard/machine/netpod
+ desc = "A link to the netverse. It has an assortment of cables to connect yourself to a virtual domain."
+ icon = 'icons/obj/machines/bitrunning.dmi'
+ icon_state = "netpod"
+ max_integrity = 300
+ obj_flags = BLOCKS_CONSTRUCTION
+ state_open = TRUE
+ /// Whether we have an ongoing connection
+ var/connected = FALSE
+ /// A player selected outfit by clicking the netpod
+ var/datum/outfit/netsuit = /datum/outfit/job/bitrunner
+ /// Holds this to see if it needs to generate a new one
+ var/datum/weakref/avatar_ref
+ /// The linked quantum server
+ var/datum/weakref/server_ref
+ /// The amount of brain damage done from force disconnects
+ var/disconnect_damage
+ /// Static list of outfits to select from
+ var/list/cached_outfits = list()
+
+/obj/machinery/netpod/Initialize(mapload)
+ . = ..()
+
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/netpod/LateInitialize()
+ . = ..()
+
+ disconnect_damage = BASE_DISCONNECT_DAMAGE
+ find_server()
+
+ RegisterSignals(src, list(
+ COMSIG_QDELETING,
+ COMSIG_MACHINERY_BROKEN,
+ COMSIG_MACHINERY_POWER_LOST,
+ ),
+ PROC_REF(on_broken),
+ )
+ RegisterSignal(src, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine))
+ RegisterSignal(src, COMSIG_ATOM_TAKE_DAMAGE, PROC_REF(on_take_damage))
+
+ register_context()
+ update_appearance()
+
+/obj/machinery/netpod/Destroy()
+ . = ..()
+ cached_outfits.Cut()
+
+/obj/machinery/netpod/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+ . = ..()
+
+ if(isnull(held_item))
+ context[SCREENTIP_CONTEXT_LMB] = "Select Outfit"
+ return CONTEXTUAL_SCREENTIP_SET
+
+ if(istype(held_item, /obj/item/crowbar) && occupant)
+ context[SCREENTIP_CONTEXT_LMB] = "Pry Open"
+ return CONTEXTUAL_SCREENTIP_SET
+
+ return CONTEXTUAL_SCREENTIP_SET
+
+/obj/machinery/netpod/update_icon_state()
+ if(!is_operational)
+ icon_state = base_icon_state
+ return ..()
+
+ if(state_open)
+ icon_state = base_icon_state + "_open_active"
+ return ..()
+
+ if(panel_open)
+ icon_state = base_icon_state + "_panel"
+ return ..()
+
+ icon_state = base_icon_state + "_closed"
+ if(occupant)
+ icon_state += "_active"
+
+ return ..()
+
+/obj/machinery/netpod/MouseDrop_T(mob/target, mob/user)
+ var/mob/living/carbon/player = user
+ if(!iscarbon(player))
+ return
+
+ if((HAS_TRAIT(player, TRAIT_UI_BLOCKED) && !player.resting) || !Adjacent(player) || !player.Adjacent(target) || !ISADVANCEDTOOLUSER(player) || !is_operational)
+ return
+
+ close_machine(target)
+
+/obj/machinery/netpod/crowbar_act(mob/living/user, obj/item/tool)
+ if(user.combat_mode)
+ attack_hand(user)
+ return TOOL_ACT_TOOLTYPE_SUCCESS
+
+ if(default_pry_open(tool, user) || default_deconstruction_crowbar(tool))
+ return TOOL_ACT_TOOLTYPE_SUCCESS
+
+/obj/machinery/netpod/screwdriver_act(mob/living/user, obj/item/tool)
+ if(occupant)
+ balloon_alert(user, "in use!")
+ return TOOL_ACT_TOOLTYPE_SUCCESS
+
+ if(state_open)
+ balloon_alert(user, "close first.")
+ return TOOL_ACT_TOOLTYPE_SUCCESS
+
+ if(default_deconstruction_screwdriver(user, "[base_icon_state]_panel", "[base_icon_state]_closed", tool))
+ update_appearance() // sometimes icon doesnt properly update during flick()
+ ui_close(user)
+ return TOOL_ACT_TOOLTYPE_SUCCESS
+
+/obj/machinery/netpod/attack_hand(mob/living/user, list/modifiers)
+ . = ..()
+ if(!state_open && user == occupant)
+ container_resist_act(user)
+
+/obj/machinery/netpod/Exited(atom/movable/gone, direction)
+ . = ..()
+ if(!state_open && gone == occupant)
+ container_resist_act(gone)
+
+/obj/machinery/netpod/Exited(atom/movable/gone, direction)
+ . = ..()
+ if(!state_open && gone == occupant)
+ container_resist_act(gone)
+
+/obj/machinery/netpod/relaymove(mob/living/user, direction)
+ if(!state_open)
+ container_resist_act(user)
+
+/obj/machinery/netpod/container_resist_act(mob/living/user)
+ user.visible_message(span_notice("[occupant] emerges from [src]!"),
+ span_notice("You climb out of [src]!"),
+ span_notice("With a hiss, you hear a machine opening."))
+ open_machine()
+
+/obj/machinery/netpod/open_machine(drop = TRUE, density_to_set = FALSE)
+ unprotect_and_signal()
+ playsound(src, 'sound/machines/tramopen.ogg', 60, TRUE, frequency = 65000)
+ flick("[base_icon_state]_opening", src)
+
+ return ..()
+
+/obj/machinery/netpod/close_machine(mob/user, density_to_set = TRUE)
+ if(!state_open || panel_open || !is_operational || !iscarbon(user))
+ return
+
+ playsound(src, 'sound/machines/tramclose.ogg', 60, TRUE, frequency = 65000)
+ flick("[base_icon_state]_closing", src)
+ ..()
+
+ if(!iscarbon(occupant))
+ open_machine()
+ return
+
+ enter_matrix()
+
+/obj/machinery/netpod/default_pry_open(obj/item/crowbar, mob/living/pryer)
+ if(isnull(occupant) || !iscarbon(occupant))
+ if(!state_open)
+ if(panel_open)
+ return FALSE
+ open_machine()
+ else
+ shut_pod()
+
+ return TRUE
+
+ pryer.visible_message(
+ span_danger("[pryer] starts prying open [src]!"),
+ span_notice("You start to pry open [src]."),
+ span_notice("You hear loud prying on metal.")
+ )
+ playsound(src, 'sound/machines/airlock_alien_prying.ogg', 100, TRUE)
+
+ SEND_SIGNAL(src, COMSIG_BITRUNNER_CROWBAR_ALERT, pryer)
+
+ if(do_after(pryer, 15 SECONDS, src))
+ if(!state_open)
+ open_machine()
+
+ return TRUE
+
+/obj/machinery/netpod/ui_interact(mob/user, datum/tgui/ui)
+ if(!is_operational)
+ return
+
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "NetpodOutfits")
+ ui.set_autoupdate(FALSE)
+ ui.open()
+
+/obj/machinery/netpod/ui_data()
+ var/list/data = list()
+
+ data["netsuit"] = netsuit
+ return data
+
+/obj/machinery/netpod/ui_static_data()
+ var/list/data = list()
+
+ if(!length(cached_outfits))
+ cached_outfits += make_outfit_collection("Jobs", subtypesof(/datum/outfit/job))
+
+ data["collections"] = cached_outfits
+
+ return data
+
+/obj/machinery/netpod/ui_act(action, params)
+ . = ..()
+ if(.)
+ return TRUE
+ switch(action)
+ if("select_outfit")
+ var/datum/outfit/new_suit = resolve_outfit(params["outfit"])
+ if(new_suit)
+ netsuit = new_suit
+ return TRUE
+
+ return FALSE
+
+/// Disconnects the occupant after a certain time so they aren't just hibernating in netpod stasis. A balance change
+/obj/machinery/netpod/proc/auto_disconnect()
+ if(isnull(occupant) || state_open || connected)
+ return
+
+ if(!iscarbon(occupant))
+ open_machine()
+ return
+
+ var/mob/living/carbon/player = occupant
+
+ player.playsound_local(src, 'sound/effects/splash.ogg', 60, TRUE)
+ to_chat(player, span_notice("The machine disconnects itself and begins to drain."))
+ open_machine()
+
+/**
+ * ### Disconnect occupant
+ * If this goes smoothly, should reconnect a receiving mind to the occupant's body
+ *
+ * This is the second stage of the process - if you want to disconn avatars start at the mind first
+ */
+/obj/machinery/netpod/proc/disconnect_occupant(forced = FALSE)
+ var/mob/living/mob_occupant = occupant
+ if(isnull(occupant) || !isliving(occupant))
+ return
+
+ connected = FALSE
+
+ if(mob_occupant.stat == DEAD)
+ open_machine()
+ return
+
+ mob_occupant.playsound_local(src, "sound/magic/blink.ogg", 25, TRUE)
+ mob_occupant.set_static_vision(2 SECONDS)
+ mob_occupant.set_temp_blindness(1 SECONDS)
+ mob_occupant.Paralyze(2 SECONDS)
+
+ var/heal_time = 1
+ if(mob_occupant.health < mob_occupant.maxHealth)
+ heal_time = (mob_occupant.stat + 2) * 5
+ addtimer(CALLBACK(src, PROC_REF(auto_disconnect)), heal_time SECONDS, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_DELETE_ME)
+
+ if(!forced)
+ return
+
+ mob_occupant.flash_act(override_blindness_check = TRUE, visual = TRUE)
+ mob_occupant.adjustOrganLoss(ORGAN_SLOT_BRAIN, disconnect_damage)
+ INVOKE_ASYNC(mob_occupant, TYPE_PROC_REF(/mob/living, emote), "scream")
+ to_chat(mob_occupant, span_danger("You've been forcefully disconnected from your avatar! Your thoughts feel scrambled!"))
+
+/**
+ * ### Enter Matrix
+ * Finds any current avatars from this chair - or generates a new one
+ *
+ * New avatars cost 1 attempt, and this will eject if there's none left
+ *
+ * Connects the mind to the avatar if everything is ok
+ */
+/obj/machinery/netpod/proc/enter_matrix()
+ var/mob/living/carbon/human/neo = occupant
+ if(!ishuman(neo) || neo.stat == DEAD || isnull(neo.mind))
+ balloon_alert(neo, "invalid occupant.")
+ return
+
+ var/obj/machinery/quantum_server/server = find_server()
+ if(isnull(server))
+ balloon_alert(neo, "no server connected!")
+ return
+
+ var/datum/lazy_template/virtual_domain/generated_domain = server.generated_domain
+ if(isnull(generated_domain) || !server.is_ready)
+ balloon_alert(neo, "nothing loaded!")
+ return
+
+ var/mob/living/carbon/current_avatar = avatar_ref?.resolve()
+ var/obj/structure/hololadder/wayout
+ if(isnull(current_avatar) || current_avatar.stat != CONSCIOUS) // We need a viable avatar
+ wayout = server.generate_hololadder()
+ if(isnull(wayout))
+ balloon_alert(neo, "out of bandwidth!")
+ return
+ current_avatar = server.generate_avatar(wayout, netsuit)
+ avatar_ref = WEAKREF(current_avatar)
+ server.stock_gear(current_avatar, neo)
+
+ neo.set_static_vision(3 SECONDS)
+ protect_occupant(occupant)
+ if(!do_after(neo, 2 SECONDS, src))
+ return
+
+ // Very invalid
+ if(QDELETED(neo) || QDELETED(current_avatar) || QDELETED(src))
+ return
+
+ // Invalid
+ if(occupant != neo || isnull(neo.mind) || neo.stat == DEAD || current_avatar.stat == DEAD)
+ return
+
+ current_avatar.AddComponent( \
+ /datum/component/avatar_connection, \
+ old_mind = neo.mind, \
+ old_body = neo, \
+ server = server, \
+ pod = src, \
+ help_text = generated_domain.help_text, \
+ )
+
+ connected = TRUE
+
+/// Finds a server and sets the server_ref
+/obj/machinery/netpod/proc/find_server()
+ var/obj/machinery/quantum_server/server = server_ref?.resolve()
+ if(server)
+ return server
+
+ server = locate(/obj/machinery/quantum_server) in oview(4, src)
+ if(isnull(server))
+ return
+
+ server_ref = WEAKREF(server)
+ RegisterSignal(server, COMSIG_BITRUNNER_SERVER_UPGRADED, PROC_REF(on_server_upgraded), override = TRUE)
+ RegisterSignal(server, COMSIG_BITRUNNER_DOMAIN_COMPLETE, PROC_REF(on_domain_complete), override = TRUE)
+
+ return server
+
+/// Creates a list of outfit entries for the UI.
+/obj/machinery/netpod/proc/make_outfit_collection(identifier, list/outfit_list)
+ var/list/collection = list(
+ "name" = identifier,
+ "outfits" = list()
+ )
+
+ for(var/path as anything in outfit_list)
+ var/datum/outfit/outfit = path
+
+ var/outfit_name = initial(outfit.name)
+ if(findtext(outfit_name, "(") != 0 || findtext(outfit_name, "-") != 0) // No special variants please
+ continue
+
+ collection["outfits"] += list(list("path" = path, "name" = outfit_name))
+
+ return list(collection)
+
+/// Machine has been broken - handles signals and reverting sprites
+/obj/machinery/netpod/proc/on_broken(datum/source)
+ SIGNAL_HANDLER
+
+ if(!state_open)
+ open_machine()
+
+ if(occupant)
+ unprotect_and_signal()
+
+/// Puts points on the current occupant's card account
+/obj/machinery/netpod/proc/on_domain_complete(datum/source, atom/movable/crate, reward_points)
+ SIGNAL_HANDLER
+
+ if(isnull(occupant) || !connected || !iscarbon(occupant))
+ return
+
+ var/mob/living/carbon/player = occupant
+
+ var/datum/bank_account/account = player.get_bank_account()
+ if(isnull(account))
+ return
+
+ account.bitrunning_points += reward_points * 100
+
+/obj/machinery/netpod/proc/on_examine(datum/source, mob/examiner, list/examine_text)
+ SIGNAL_HANDLER
+
+ examine_text += span_infoplain("Drag yourself into the pod to engage the link.")
+ examine_text += span_infoplain("It has limited resuscitation capabilities. Remaining in the pod can heal some injuries.")
+ examine_text += span_infoplain("It has a security system that will alert the occupant if it is tampered with.")
+
+ if(isnull(occupant))
+ examine_text += span_notice("It is currently unoccupied.")
+ return
+
+ examine_text += span_notice("It is currently occupied by [occupant].")
+ examine_text += span_notice("It can be pried open with a crowbar, but its safety mechanisms will alert the occupant.")
+
+
+/// When the server is upgraded, drops brain damage a little
+/obj/machinery/netpod/proc/on_server_upgraded(datum/source, servo_rating)
+ SIGNAL_HANDLER
+
+ disconnect_damage = BASE_DISCONNECT_DAMAGE * (1 - servo_rating)
+
+/// Checks the integrity, alerts occupants
+/obj/machinery/netpod/proc/on_take_damage(datum/source, damage_amount)
+ SIGNAL_HANDLER
+
+ if(isnull(occupant))
+ return
+
+ var/total = max_integrity - damage_amount
+ var/integrity = (atom_integrity / total) * 100
+ if(integrity > 50)
+ return
+
+ SEND_SIGNAL(src, COMSIG_BITRUNNER_NETPOD_INTEGRITY)
+
+/// Puts the occupant in netpod stasis, basically short-circuiting environmental conditions
+/obj/machinery/netpod/proc/protect_occupant(mob/living/target)
+ if(target != occupant)
+ return
+
+ target.AddComponent(/datum/component/netpod_healing, \
+ brute_heal = 4, \
+ burn_heal = 4, \
+ toxin_heal = 4, \
+ clone_heal = 4, \
+ blood_heal = 4, \
+ )
+
+ target.playsound_local(src, 'sound/effects/submerge.ogg', 20, TRUE)
+ target.extinguish_mob()
+ update_use_power(ACTIVE_POWER_USE)
+
+/// On unbuckle or break, make sure the occupant ref is null
+/obj/machinery/netpod/proc/unprotect_and_signal()
+ unprotect_occupant(occupant)
+ SEND_SIGNAL(src, COMSIG_BITRUNNER_SEVER_AVATAR)
+
+/// Removes the occupant from netpod stasis
+/obj/machinery/netpod/proc/unprotect_occupant(mob/living/target)
+ var/datum/component/netpod_healing/healing_eff = target?.GetComponent(/datum/component/netpod_healing)
+ if(healing_eff)
+ qdel(healing_eff)
+
+ update_use_power(IDLE_POWER_USE)
+
+/// Resolves a path to an outfit.
+/obj/machinery/netpod/proc/resolve_outfit(text)
+ var/path = text2path(text)
+ if(ispath(path, /datum/outfit))
+ return path
+
+/// Closes the machine without shoving in an occupant
+/obj/machinery/netpod/proc/shut_pod()
+ state_open = FALSE
+ playsound(src, 'sound/machines/tramclose.ogg', 60, TRUE, frequency = 65000)
+ flick("[base_icon_state]_closing", src)
+ set_density(TRUE)
+
+ update_appearance()
+
+#undef BASE_DISCONNECT_DAMAGE
diff --git a/code/modules/bitrunning/objects/quantum_console.dm b/code/modules/bitrunning/objects/quantum_console.dm
new file mode 100644
index 00000000000..c918648d010
--- /dev/null
+++ b/code/modules/bitrunning/objects/quantum_console.dm
@@ -0,0 +1,108 @@
+/obj/machinery/computer/quantum_console
+ name = "quantum console"
+
+ circuit = /obj/item/circuitboard/computer/quantum_console
+ icon_keyboard = "mining"
+ icon_screen = "bitrunning"
+ req_access = list(ACCESS_MINING)
+ /// The server this console is connected to.
+ var/datum/weakref/server_ref
+
+/obj/machinery/computer/quantum_console/Initialize(mapload, obj/item/circuitboard/circuit)
+ . = ..()
+ desc = "Even in the distant year [CURRENT_STATION_YEAR], Nanostrasen is still using REST APIs. How grim."
+
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/computer/quantum_console/LateInitialize()
+ . = ..()
+
+ if(isnull(server_ref?.resolve()))
+ find_server()
+
+/obj/machinery/computer/quantum_console/ui_interact(mob/user, datum/tgui/ui)
+ . = ..()
+
+ if(!is_operational)
+ return
+
+ if(isnull(server_ref?.resolve()))
+ find_server()
+
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "QuantumConsole")
+ ui.open()
+
+/obj/machinery/computer/quantum_console/ui_data()
+ var/list/data = list()
+
+ var/obj/machinery/quantum_server/server = find_server()
+ if(isnull(server))
+ data["connected"] = FALSE
+ return data
+
+ data["connected"] = TRUE
+ data["generated_domain"] = server.generated_domain?.key
+ data["occupants"] = length(server.avatar_connection_refs)
+ data["points"] = server.points
+ data["randomized"] = server.domain_randomized
+ data["ready"] = server.is_ready && server.is_operational
+ data["scanner_tier"] = server.scanner_tier
+ data["retries_left"] = length(server.exit_turfs) - server.retries_spent
+
+ return data
+
+/obj/machinery/computer/quantum_console/ui_static_data(mob/user)
+ var/list/data = list()
+
+ var/obj/machinery/quantum_server/server = find_server()
+ if(isnull(server))
+ return data
+
+ data["available_domains"] = server.get_available_domains()
+ data["avatars"] = server.get_avatar_data()
+
+ return data
+
+/obj/machinery/computer/quantum_console/ui_act(action, list/params, datum/tgui/ui)
+ . = ..()
+ if(.)
+ return TRUE
+
+ var/obj/machinery/quantum_server/server = find_server()
+ if(isnull(server))
+ return FALSE
+
+ switch(action)
+ if("random_domain")
+ var/map_id = server.get_random_domain_id()
+ if(!map_id)
+ return TRUE
+
+ server.cold_boot_map(usr, map_id)
+ return TRUE
+ if("refresh")
+ ui.send_full_update()
+ return TRUE
+ if("set_domain")
+ server.cold_boot_map(usr, params["id"])
+ return TRUE
+ if("stop_domain")
+ server.begin_shutdown(usr)
+ return TRUE
+
+ return FALSE
+
+/// Attempts to find a quantum server.
+/obj/machinery/computer/quantum_console/proc/find_server()
+ var/obj/machinery/quantum_server/server = server_ref?.resolve()
+ if(server)
+ return server
+
+ for(var/direction in GLOB.cardinals)
+ var/obj/machinery/quantum_server/nearby_server = locate(/obj/machinery/quantum_server, get_step(src, direction))
+ if(nearby_server)
+ server_ref = WEAKREF(nearby_server)
+ nearby_server.console_ref = WEAKREF(src)
+ return nearby_server
diff --git a/code/modules/bitrunning/orders/disks.dm b/code/modules/bitrunning/orders/disks.dm
new file mode 100644
index 00000000000..ced1dde883a
--- /dev/null
+++ b/code/modules/bitrunning/orders/disks.dm
@@ -0,0 +1,26 @@
+/datum/orderable_item/bitrunning_tech
+ category_index = CATEGORY_BITRUNNING_TECH
+
+/datum/orderable_item/bitrunning_tech/item_tier1
+ cost_per_order = 1000
+ item_path = /obj/item/bitrunning_disk/item/tier1
+
+/datum/orderable_item/bitrunning_tech/item_tier2
+ cost_per_order = 1500
+ item_path = /obj/item/bitrunning_disk/item/tier2
+
+/datum/orderable_item/bitrunning_tech/item_tier3
+ cost_per_order = 2500
+ item_path = /obj/item/bitrunning_disk/item/tier3
+
+/datum/orderable_item/bitrunning_tech/ability_tier1
+ cost_per_order = 1000
+ item_path = /obj/item/bitrunning_disk/ability/tier1
+
+/datum/orderable_item/bitrunning_tech/ability_tier2
+ cost_per_order = 1800
+ item_path = /obj/item/bitrunning_disk/ability/tier2
+
+/datum/orderable_item/bitrunning_tech/ability_tier3
+ cost_per_order = 3200
+ item_path = /obj/item/bitrunning_disk/ability/tier3
diff --git a/code/modules/bitrunning/orders/flair.dm b/code/modules/bitrunning/orders/flair.dm
new file mode 100644
index 00000000000..ef36348eb6a
--- /dev/null
+++ b/code/modules/bitrunning/orders/flair.dm
@@ -0,0 +1,40 @@
+/datum/orderable_item/bitrunning_flair
+ category_index = CATEGORY_BITRUNNING_FLAIR
+
+/datum/orderable_item/bitrunning_flair/cornchips
+ item_path = /obj/item/food/cornchips
+ cost_per_order = 100
+
+/datum/orderable_item/bitrunning_flair/mountain_wind
+ item_path = /obj/item/reagent_containers/cup/soda_cans/space_mountain_wind
+ cost_per_order = 100
+
+/datum/orderable_item/bitrunning_flair/pwr_game
+ item_path = /obj/item/reagent_containers/cup/soda_cans/pwr_game
+ cost_per_order = 200
+
+/datum/orderable_item/bitrunning_flair/grey_bull
+ item_path = /obj/item/reagent_containers/cup/soda_cans/grey_bull
+ cost_per_order = 200
+
+/datum/orderable_item/bitrunning_flair/medkit
+ item_path = /obj/item/storage/medkit/brute
+ desc = "Don't beat yourself up, it's just a game!"
+ cost_per_order = 500
+
+/datum/orderable_item/bitrunning_flair/medkit_fire
+ item_path = /obj/item/storage/medkit/fire
+ desc = "Great after heated gaming sessions."
+ cost_per_order = 500
+
+/datum/orderable_item/bitrunning_flair/oval_sunglasses
+ item_path = /obj/item/clothing/glasses/sunglasses/oval
+ cost_per_order = 1000
+
+/datum/orderable_item/bitrunning_flair/trenchcoat
+ item_path = /obj/item/clothing/suit/jacket/trenchcoat
+ cost_per_order = 1000
+
+/datum/orderable_item/bitrunning_flair/jackboots
+ item_path = /obj/item/clothing/shoes/jackboots
+ cost_per_order = 1000
diff --git a/code/modules/bitrunning/orders/tech.dm b/code/modules/bitrunning/orders/tech.dm
new file mode 100644
index 00000000000..286e9817f3c
--- /dev/null
+++ b/code/modules/bitrunning/orders/tech.dm
@@ -0,0 +1,23 @@
+/datum/orderable_item/bepis
+ category_index = CATEGORY_BEPIS
+
+/datum/orderable_item/bepis/circuit_stack
+ item_path = /obj/item/stack/circuit_stack/full
+ cost_per_order = 150
+
+/datum/orderable_item/bepis/survival_pen
+ item_path = /obj/item/pen/survival
+ cost_per_order = 150
+
+/datum/orderable_item/bepis/party_sleeper
+ item_path = /obj/item/circuitboard/machine/sleeper/party
+ cost_per_order = 750
+ desc = "A decommissioned sleeper circuitboard, repurposed for recreational purposes."
+
+/datum/orderable_item/bepis/sprayoncan
+ item_path = /obj/item/toy/sprayoncan
+ cost_per_order = 750
+
+/datum/orderable_item/bepis/pristine
+ item_path = /obj/item/disk/design_disk/bepis/remove_tech
+ cost_per_order = 1000
diff --git a/code/modules/bitrunning/server/loot.dm b/code/modules/bitrunning/server/loot.dm
new file mode 100644
index 00000000000..29b730aae78
--- /dev/null
+++ b/code/modules/bitrunning/server/loot.dm
@@ -0,0 +1,123 @@
+/// Handles calculating rewards based on number of players, parts, threats, etc
+/obj/machinery/quantum_server/proc/calculate_rewards()
+ var/rewards_base = 0.8
+
+ if(domain_randomized)
+ rewards_base += 0.2
+
+ rewards_base += servo_bonus
+
+ rewards_base += (domain_threats * 2)
+
+ for(var/index in 2 to length(avatar_connection_refs))
+ rewards_base += multiplayer_bonus
+
+ return rewards_base
+
+/// Generates a reward based on the given domain
+/obj/machinery/quantum_server/proc/generate_loot()
+ if(!length(receive_turfs) && !locate_receive_turfs())
+ return FALSE
+
+ points += generated_domain.reward_points
+ playsound(src, 'sound/machines/terminal_success.ogg', 30, 2)
+
+ var/turf/dest_turf = pick(receive_turfs)
+ if(isnull(dest_turf))
+ stack_trace("Failed to find a turf to spawn loot crate on.")
+ return FALSE
+
+ var/bonus = calculate_rewards()
+
+ var/obj/item/paper/certificate = new()
+ certificate.add_raw_text(get_completion_certificate())
+ certificate.name = "certificate of domain completion"
+ certificate.update_appearance()
+
+ var/obj/structure/closet/crate/secure/bitrunning/decrypted/reward_crate = new(dest_turf, generated_domain, bonus)
+ reward_crate.manifest = certificate
+ reward_crate.update_appearance()
+
+ spark_at_location(reward_crate)
+ return TRUE
+
+/// Returns the markdown text containing domain completion information
+/obj/machinery/quantum_server/proc/get_completion_certificate()
+ var/base_points = generated_domain.reward_points
+ if(domain_randomized)
+ base_points -= 1
+
+ var/bonuses = calculate_rewards()
+
+ var/time_difference = world.time - generated_domain.start_time
+
+ var/completion_time = "### Completion Time: [DisplayTimeText(time_difference)]\n"
+
+ var/grade = "\n---\n\n# Rating: [grade_completion(generated_domain.difficulty, domain_threats, base_points, domain_randomized, time_difference)]"
+
+ var/text = "# Certificate of Domain Completion\n\n---\n\n"
+
+ text += "### [generated_domain.name][domain_randomized ? " (Randomized)" : ""]\n"
+ text += "- **Difficulty:** [generated_domain.difficulty]\n"
+ text += "- **Threats:** [domain_threats]\n"
+ text += "- **Base Points:** [base_points][domain_randomized ? " +1" : ""]\n\n"
+ text += "- **Total Bonus:** [bonuses]x\n\n"
+
+ if(bonuses <= 1)
+ text += completion_time
+ text += grade
+ return text
+
+ text += "### Bonuses\n"
+ if(domain_randomized)
+ text += "- **Randomized:** + 0.2\n"
+
+ if(length(avatar_connection_refs) > 1)
+ text += "- **Multiplayer:** + [(length(avatar_connection_refs) - 1) * multiplayer_bonus]\n"
+
+ if(domain_threats > 0)
+ text += "- **Threats:** + [domain_threats * 2]\n"
+
+ var/servo_rating = servo_bonus
+
+ if(servo_rating > 0.2)
+ text += "- **Components:** + [servo_rating]\n"
+
+ text += completion_time
+ text += grade
+
+ return text
+
+/// Grades the player's run based on several factors
+/obj/machinery/quantum_server/proc/grade_completion(difficulty, threats, points, randomized, completion_time)
+ var/score = threats * 5
+ score += points
+ score += randomized ? 1 : 0
+
+ var/base = difficulty + 1
+ var/time_score = 1
+
+ if(completion_time <= 1 MINUTES)
+ time_score = 10
+ else if(completion_time <= 2 MINUTES)
+ time_score = 5
+ else if(completion_time <= 5 MINUTES)
+ time_score = 3
+ else if(completion_time <= 10 MINUTES)
+ time_score = 2
+ else
+ time_score = 1
+
+ score += time_score * base
+
+ switch(score)
+ if(1 to 4)
+ return "D"
+ if(5 to 7)
+ return "C"
+ if(8 to 10)
+ return "B"
+ if(11 to 13)
+ return "A"
+ else
+ return "S"
diff --git a/code/modules/bitrunning/server/map_handling.dm b/code/modules/bitrunning/server/map_handling.dm
new file mode 100644
index 00000000000..02126c290f7
--- /dev/null
+++ b/code/modules/bitrunning/server/map_handling.dm
@@ -0,0 +1,184 @@
+
+/// Gives all current occupants a notification that the server is going down
+/obj/machinery/quantum_server/proc/begin_shutdown(mob/user)
+ if(isnull(generated_domain))
+ return
+
+ if(!length(avatar_connection_refs))
+ balloon_alert(user, "powering down domain...")
+ playsound(src, 'sound/machines/terminal_off.ogg', 40, 2)
+ reset()
+ return
+
+ balloon_alert(user, "notifying clients...")
+ playsound(src, 'sound/machines/terminal_alert.ogg', 100, TRUE)
+ user.visible_message(
+ span_danger("[user] begins depowering the server!"),
+ span_notice("You start disconnecting clients..."),
+ span_danger("You hear frantic keying on a keyboard."),
+ )
+
+ SEND_SIGNAL(src, COMSIG_BITRUNNER_SHUTDOWN_ALERT, user)
+
+ if(!do_after(user, 20 SECONDS, src))
+ return
+
+ reset()
+
+/**
+ * ### Quantum Server Cold Boot
+ * Procedurally links the 3 booting processes together.
+ *
+ * This is the starting point if you have an id. Does validation and feedback on steps
+ */
+/obj/machinery/quantum_server/proc/cold_boot_map(mob/user, map_key)
+ if(!is_ready)
+ return FALSE
+
+ if(isnull(map_key))
+ balloon_alert(user, "no domain specified.")
+ return FALSE
+
+ if(generated_domain)
+ balloon_alert(user, "stop the current domain first.")
+ return FALSE
+
+ if(length(avatar_connection_refs))
+ balloon_alert(user, "all clients must disconnect!")
+ return FALSE
+
+ is_ready = FALSE
+ playsound(src, 'sound/machines/terminal_processing.ogg', 30, 2)
+
+ if(!initialize_domain(map_key) || !initialize_safehouse() || !initialize_map_items())
+ balloon_alert(user, "initialization failed.")
+ scrub_vdom()
+ is_ready = TRUE
+ return FALSE
+
+ is_ready = TRUE
+ playsound(src, 'sound/machines/terminal_insert_disc.ogg', 30, 2)
+ balloon_alert(user, "domain loaded.")
+ generated_domain.start_time = world.time
+ points -= generated_domain.cost
+ update_use_power(ACTIVE_POWER_USE)
+ update_appearance()
+
+ return TRUE
+
+/// Initializes a new domain if the given key is valid and the user has enough points
+/obj/machinery/quantum_server/proc/initialize_domain(map_key)
+ var/datum/lazy_template/virtual_domain/to_load
+
+ for(var/datum/lazy_template/virtual_domain/available as anything in subtypesof(/datum/lazy_template/virtual_domain))
+ if(map_key != initial(available.key) || points < initial(available.cost))
+ continue
+ to_load = available
+ break
+
+ if(isnull(to_load))
+ return FALSE
+
+ generated_domain = new to_load()
+ RegisterSignal(generated_domain, COMSIG_LAZY_TEMPLATE_LOADED, PROC_REF(on_template_loaded))
+ generated_domain.lazy_load()
+
+ return TRUE
+
+/// Loads in necessary map items, sets mutation targets, etc
+/obj/machinery/quantum_server/proc/initialize_map_items()
+ var/turf/goal_turfs = list()
+ var/turf/crate_turfs = list()
+
+ for(var/thing in GLOB.landmarks_list)
+ if(istype(thing, /obj/effect/landmark/bitrunning/hololadder_spawn))
+ exit_turfs += get_turf(thing)
+ qdel(thing) // i'm worried about multiple servers getting confused so lets clean em up
+ continue
+
+ if(istype(thing, /obj/effect/landmark/bitrunning/cache_goal_turf))
+ var/turf/tile = get_turf(thing)
+ goal_turfs += tile
+ RegisterSignal(tile, COMSIG_ATOM_ENTERED, PROC_REF(on_goal_turf_entered))
+ RegisterSignal(tile, COMSIG_ATOM_EXAMINE, PROC_REF(on_goal_turf_examined))
+ qdel(thing)
+ continue
+
+ if(istype(thing, /obj/effect/landmark/bitrunning/cache_spawn))
+ crate_turfs += get_turf(thing)
+ qdel(thing)
+ continue
+
+ if(!length(exit_turfs))
+ CRASH("Failed to find exit turfs on generated domain.")
+ if(!length(goal_turfs))
+ CRASH("Failed to find send turfs on generated domain.")
+
+ if(length(crate_turfs))
+ shuffle_inplace(crate_turfs)
+ new /obj/structure/closet/crate/secure/bitrunning/encrypted(pick(crate_turfs))
+
+ return TRUE
+#define ONLY_TURF 1 // There should only ever be one turf at the bottom left of the map.
+
+/// Loads the safehouse
+/obj/machinery/quantum_server/proc/initialize_safehouse()
+ var/turf/safehouse_load_turf = list()
+ for(var/obj/effect/landmark/bitrunning/safehouse_spawn/spawner in GLOB.landmarks_list)
+ safehouse_load_turf += get_turf(spawner)
+ qdel(spawner)
+ break
+
+ if(!length(safehouse_load_turf))
+ CRASH("Failed to find safehouse load landmark on map.")
+
+ var/datum/map_template/safehouse/safehouse = new generated_domain.safehouse_path()
+ safehouse.load(safehouse_load_turf[ONLY_TURF])
+ generated_safehouse = safehouse
+
+ return TRUE
+
+/// Stops the current virtual domain and disconnects all users
+/obj/machinery/quantum_server/proc/reset(fast = FALSE)
+ is_ready = FALSE
+
+ SEND_SIGNAL(src, COMSIG_BITRUNNER_SEVER_AVATAR)
+
+ if(!fast)
+ notify_spawned_threats()
+ addtimer(CALLBACK(src, PROC_REF(scrub_vdom)), 15 SECONDS, TIMER_UNIQUE|TIMER_STOPPABLE)
+ else
+ scrub_vdom() // used in unit testing, no need to wait for callbacks
+
+ addtimer(CALLBACK(src, PROC_REF(cool_off)), min(server_cooldown_time * capacitor_coefficient), TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_DELETE_ME)
+ update_appearance()
+
+ update_use_power(IDLE_POWER_USE)
+ domain_randomized = FALSE
+ domain_threats = 0
+ retries_spent = 0
+
+/// Deletes all the tile contents
+/obj/machinery/quantum_server/proc/scrub_vdom()
+ SEND_SIGNAL(src, COMSIG_BITRUNNER_SEVER_AVATAR) // just in case
+
+ if(length(generated_domain.reservations))
+ var/datum/turf_reservation/res = generated_domain.reservations[1]
+ res.Release()
+
+ var/list/datum/weakref/creatures = spawned_threat_refs + mutation_candidate_refs
+ for(var/datum/weakref/creature_ref as anything in creatures)
+ var/mob/living/creature = creature_ref?.resolve()
+ if(isnull(creature))
+ continue
+
+ creature.dust() // sometimes mobs just don't die
+
+ avatar_connection_refs.Cut()
+ exit_turfs = list()
+ generated_domain = null
+ generated_safehouse = null
+ mutation_candidate_refs.Cut()
+ spawned_threat_refs.Cut()
+
+#undef ONLY_TURF
diff --git a/code/modules/bitrunning/server/obj_generation.dm b/code/modules/bitrunning/server/obj_generation.dm
new file mode 100644
index 00000000000..221308e0487
--- /dev/null
+++ b/code/modules/bitrunning/server/obj_generation.dm
@@ -0,0 +1,101 @@
+/// Generates a new avatar for the bitrunner.
+/obj/machinery/quantum_server/proc/generate_avatar(obj/structure/hololadder/wayout, datum/outfit/netsuit)
+ var/mob/living/carbon/human/avatar = new(wayout.loc)
+
+ var/outfit_path = generated_domain.forced_outfit || netsuit
+ var/datum/outfit/to_wear = new outfit_path()
+
+ to_wear.belt = /obj/item/bitrunning_host_monitor
+ to_wear.glasses = null
+ to_wear.gloves = null
+ to_wear.l_hand = null
+ to_wear.l_pocket = null
+ to_wear.r_hand = null
+ to_wear.r_pocket = null
+ to_wear.suit = null
+ to_wear.suit_store = null
+
+ avatar.equipOutfit(to_wear, visualsOnly = TRUE)
+
+ var/thing = avatar.get_active_held_item()
+ if(!isnull(thing))
+ qdel(thing)
+
+ thing = avatar.get_inactive_held_item()
+ if(!isnull(thing))
+ qdel(thing)
+
+ var/obj/item/storage/backpack/bag = avatar.back
+ if(istype(bag))
+ QDEL_LIST(bag.contents)
+
+ bag.contents += list(
+ new /obj/item/storage/box/survival,
+ new /obj/item/storage/medkit/regular,
+ new /obj/item/flashlight,
+ )
+
+ var/obj/item/card/id/outfit_id = avatar.wear_id
+ if(outfit_id)
+ outfit_id.assignment = "Bit Avatar"
+ outfit_id.registered_name = avatar.real_name
+
+ outfit_id.registered_account = new()
+ outfit_id.registered_account.replaceable = FALSE
+
+ SSid_access.apply_trim_to_card(outfit_id, /datum/id_trim/bit_avatar)
+
+ return avatar
+
+/// Generates a new hololadder for the bitrunner. Effectively a respawn attempt.
+/obj/machinery/quantum_server/proc/generate_hololadder()
+ if(!length(exit_turfs))
+ return
+
+ if(retries_spent >= length(exit_turfs))
+ return
+
+ var/turf/destination
+ for(var/turf/dest_turf in exit_turfs)
+ if(!locate(/obj/structure/hololadder) in dest_turf)
+ destination = dest_turf
+ break
+
+ if(isnull(destination))
+ return
+
+ var/obj/structure/hololadder/wayout = new(destination)
+ if(isnull(wayout))
+ return
+
+ retries_spent += 1
+
+ return wayout
+
+/// Scans over neo's contents for bitrunning tech disks. Loads the items or abilities onto the avatar.
+/obj/machinery/quantum_server/proc/stock_gear(mob/living/carbon/human/avatar, mob/living/carbon/human/neo)
+ var/failed = FALSE
+
+ for(var/obj/item/bitrunning_disk/disk in neo.get_contents())
+ if(istype(disk, /obj/item/bitrunning_disk/ability))
+ var/obj/item/bitrunning_disk/ability/ability_disk = disk
+
+ if(isnull(ability_disk.granted_action))
+ failed = TRUE
+ continue
+
+ var/datum/action/our_action = new ability_disk.granted_action()
+ our_action.Grant(avatar)
+ continue
+
+ if(istype(disk, /obj/item/bitrunning_disk/item))
+ var/obj/item/bitrunning_disk/item/item_disk = disk
+
+ if(isnull(item_disk.granted_item))
+ failed = TRUE
+ continue
+
+ avatar.put_in_hands(new item_disk.granted_item())
+
+ if(failed)
+ to_chat(neo, span_warning("One of your disks failed to load. You must activate them to make a selection."))
diff --git a/code/modules/bitrunning/server/quantum_server.dm b/code/modules/bitrunning/server/quantum_server.dm
new file mode 100644
index 00000000000..404a31cca6a
--- /dev/null
+++ b/code/modules/bitrunning/server/quantum_server.dm
@@ -0,0 +1,152 @@
+/**
+ * The base object for the quantum server
+ */
+/obj/machinery/quantum_server
+ name = "quantum server"
+
+ circuit = /obj/item/circuitboard/machine/quantum_server
+ density = TRUE
+ desc = "A hulking computational machine designed to fabricate virtual domains."
+ icon = 'icons/obj/machines/bitrunning.dmi'
+ base_icon_state = "qserver"
+ icon_state = "qserver"
+ /// Affects server cooldown efficiency
+ var/capacitor_coefficient = 1
+ /// The loaded map template, map_template/virtual_domain
+ var/datum/lazy_template/virtual_domain/generated_domain
+ /// The loaded safehouse, map_template/safehouse
+ var/datum/map_template/safehouse/generated_safehouse
+ /// The connected console
+ var/datum/weakref/console_ref
+ /// If the current domain was a random selection
+ var/domain_randomized = FALSE
+ /// If any threats were spawned, adds to rewards
+ var/domain_threats = 0
+ /// Prevents multiple user actions. Handled by loading domains and cooldowns
+ var/is_ready = TRUE
+ /// List of available domains
+ var/list/available_domains = list()
+ /// Current plugged in users
+ var/list/datum/weakref/avatar_connection_refs = list()
+ /// Cached list of mutable mobs in zone for cybercops
+ var/list/datum/weakref/mutation_candidate_refs = list()
+ /// Any ghosts that have spawned in
+ var/list/datum/weakref/spawned_threat_refs = list()
+ /// Scales loot with extra players
+ var/multiplayer_bonus = 1.1
+ ///The radio the console can speak into
+ var/obj/item/radio/radio
+ /// The amount of points in the system, used to purchase maps
+ var/points = 0
+ /// Keeps track of the number of times someone has built a hololadder
+ var/retries_spent = 0
+ /// Changes how much info is available on the domain
+ var/scanner_tier = 1
+ /// Length of time it takes for the server to cool down after resetting. Here to give runners downtime so their faces don't get stuck like that
+ var/server_cooldown_time = 3 MINUTES
+ /// Applies bonuses to rewards etc
+ var/servo_bonus = 0
+ /// The turfs we can place a hololadder on.
+ var/turf/exit_turfs = list()
+ /// The turfs on station where we generate loot.
+ var/turf/receive_turfs = list()
+
+/obj/machinery/quantum_server/Initialize(mapload)
+ . = ..()
+
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/quantum_server/LateInitialize()
+ . = ..()
+
+ if(isnull(console_ref))
+ find_console()
+
+ radio = new(src)
+ radio.set_frequency(FREQ_SUPPLY)
+ radio.subspace_transmission = TRUE
+ radio.canhear_range = 0
+ radio.recalculateChannels()
+
+ RegisterSignals(src, list(COMSIG_MACHINERY_BROKEN, COMSIG_MACHINERY_POWER_LOST), PROC_REF(on_broken))
+ RegisterSignal(src, COMSIG_QDELETING, PROC_REF(on_delete))
+ RegisterSignal(src, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine))
+ RegisterSignal(src, COMSIG_BITRUNNER_SPAWN_GLITCH, PROC_REF(on_threat_created))
+
+ // This further gets sorted in the client by cost so it's random and grouped
+ available_domains = shuffle(subtypesof(/datum/lazy_template/virtual_domain))
+
+/obj/machinery/quantum_server/Destroy(force)
+ . = ..()
+
+ available_domains.Cut()
+ mutation_candidate_refs.Cut()
+ avatar_connection_refs.Cut()
+ spawned_threat_refs.Cut()
+ QDEL_NULL(exit_turfs)
+ QDEL_NULL(receive_turfs)
+ QDEL_NULL(generated_domain)
+ QDEL_NULL(generated_safehouse)
+ QDEL_NULL(radio)
+
+/obj/machinery/quantum_server/update_appearance(updates)
+ if(isnull(generated_domain) || !is_operational)
+ set_light(0)
+ return ..()
+
+ set_light_color(is_ready ? LIGHT_COLOR_BABY_BLUE : LIGHT_COLOR_FIRE)
+ set_light(2, 1.5)
+
+ return ..()
+
+/obj/machinery/quantum_server/update_icon_state()
+ if(isnull(generated_domain) || !is_operational)
+ icon_state = base_icon_state
+ return ..()
+
+ icon_state = "[base_icon_state]_[is_ready ? "on" : "off"]"
+ return ..()
+
+/obj/machinery/quantum_server/crowbar_act(mob/living/user, obj/item/crowbar)
+ . = ..()
+
+ if(!is_ready)
+ balloon_alert(user, "it's scalding hot!")
+ return TRUE
+ if(length(avatar_connection_refs))
+ balloon_alert(user, "all clients must disconnect!")
+ return TRUE
+ if(default_deconstruction_crowbar(crowbar))
+ return TRUE
+ return FALSE
+
+/obj/machinery/quantum_server/screwdriver_act(mob/living/user, obj/item/screwdriver)
+ . = ..()
+
+ if(!is_ready)
+ balloon_alert(user, "it's scalding hot!")
+ return TRUE
+ if(default_deconstruction_screwdriver(user, "[base_icon_state]_panel", icon_state, screwdriver))
+ return TRUE
+ return FALSE
+
+/obj/machinery/quantum_server/RefreshParts()
+ . = ..()
+
+ var/capacitor_rating = 1.15
+ var/datum/stock_part/capacitor/cap = locate() in component_parts
+ capacitor_rating -= cap.tier * 0.15
+
+ capacitor_coefficient = capacitor_rating
+
+ var/datum/stock_part/scanning_module/scanner = locate() in component_parts
+ if(scanner)
+ scanner_tier = scanner.tier
+
+ var/servo_rating = 0
+ for(var/datum/stock_part/servo/servo in component_parts)
+ servo_rating += servo.tier * 0.1
+
+ servo_bonus = servo_rating
+
+ SEND_SIGNAL(src, COMSIG_BITRUNNER_SERVER_UPGRADED, servo_rating)
diff --git a/code/modules/bitrunning/server/signal_handlers.dm b/code/modules/bitrunning/server/signal_handlers.dm
new file mode 100644
index 00000000000..b0464b351fa
--- /dev/null
+++ b/code/modules/bitrunning/server/signal_handlers.dm
@@ -0,0 +1,107 @@
+/// If broken via signal, disconnects all users
+/obj/machinery/quantum_server/proc/on_broken(datum/source)
+ SIGNAL_HANDLER
+
+ if(isnull(generated_domain))
+ return
+
+ SEND_SIGNAL(src, COMSIG_BITRUNNER_SEVER_AVATAR)
+
+/// Whenever a corpse spawner makes a new corpse, add it to the list of potential mutations
+/obj/machinery/quantum_server/proc/on_corpse_spawned(datum/source, mob/living/corpse)
+ SIGNAL_HANDLER
+
+ mutation_candidate_refs.Add(WEAKREF(corpse))
+
+/// Being qdeleted - make sure the circuit and connected mobs go with it
+/obj/machinery/quantum_server/proc/on_delete(datum/source)
+ SIGNAL_HANDLER
+
+ if(generated_domain)
+ SEND_SIGNAL(src, COMSIG_BITRUNNER_SEVER_AVATAR)
+ scrub_vdom()
+
+ if(is_ready)
+ return
+ // in case they're trying to cheese cooldown
+ var/obj/item/circuitboard/machine/quantum_server/circuit = locate(/obj/item/circuitboard/machine/quantum_server) in contents
+ if(circuit)
+ qdel(circuit)
+
+/// Handles examining the server. Shows cooldown time and efficiency.
+/obj/machinery/quantum_server/proc/on_examine(datum/source, mob/examiner, list/examine_text)
+ SIGNAL_HANDLER
+
+ examine_text += span_infoplain("Can be resource intensive to run. Ensure adequate power supply.")
+
+ if(capacitor_coefficient < 1)
+ examine_text += span_infoplain("Its coolant capacity reduces cooldown time by [(1 - capacitor_coefficient) * 100]%.")
+
+ if(servo_bonus > 0.2)
+ examine_text += span_infoplain("Its manipulation potential is increasing rewards by [servo_bonus]x.")
+ examine_text += span_infoplain("Injury from unsafe ejection reduced [servo_bonus * 100]%.")
+
+ if(!is_ready)
+ examine_text += span_notice("It is currently cooling down. Give it a few moments.")
+ return
+
+/// Whenever something enters the send tiles, check if it's a loot crate. If so, alert players.
+/obj/machinery/quantum_server/proc/on_goal_turf_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs)
+ SIGNAL_HANDLER
+
+ if(!istype(arrived, /obj/structure/closet/crate/secure/bitrunning/encrypted))
+ return
+
+ var/obj/structure/closet/crate/secure/bitrunning/encrypted/loot_crate = arrived
+ if(!istype(loot_crate))
+ return
+
+ for(var/mob/person in loot_crate.contents)
+ if(isnull(person.mind))
+ person.forceMove(get_turf(loot_crate))
+
+ var/datum/component/avatar_connection/connection = person.GetComponent(/datum/component/avatar_connection)
+ connection?.full_avatar_disconnect()
+
+ spark_at_location(loot_crate)
+ qdel(loot_crate)
+ SEND_SIGNAL(src, COMSIG_BITRUNNER_DOMAIN_COMPLETE, arrived, generated_domain.reward_points)
+ generate_loot()
+
+/// Handles examining the server. Shows cooldown time and efficiency.
+/obj/machinery/quantum_server/proc/on_goal_turf_examined(datum/source, mob/examiner, list/examine_text)
+ SIGNAL_HANDLER
+
+ examine_text += span_info("Beneath your gaze, the floor pulses subtly with streams of encoded data.")
+ examine_text += span_info("It seems to be part of the location designated for retrieving encrypted payloads.")
+
+/// Scans over the inbound created_atoms from lazy templates
+/obj/machinery/quantum_server/proc/on_template_loaded(datum/lazy_template/source, list/created_atoms)
+ SIGNAL_HANDLER
+
+ for(var/thing in created_atoms)
+ if(isliving(thing)) // so we can mutate them
+ var/mob/living/creature = thing
+
+ if(creature.can_be_cybercop)
+ mutation_candidate_refs.Add(WEAKREF(creature))
+ continue
+
+ if(istype(thing, /obj/effect/mob_spawn/ghost_role)) // so we get threat alerts
+ RegisterSignal(thing, COMSIG_GHOSTROLE_SPAWNED, PROC_REF(on_threat_created))
+ continue
+
+ if(istype(thing, /obj/effect/mob_spawn/corpse)) // corpses are valid targets too
+ var/obj/effect/mob_spawn/corpse/spawner = thing
+
+ mutation_candidate_refs.Add(spawner.spawned_mob_ref)
+
+ UnregisterSignal(source, COMSIG_LAZY_TEMPLATE_LOADED)
+
+/// Handles when cybercops are summoned into the area or ghosts click a ghost role spawner
+/obj/machinery/quantum_server/proc/on_threat_created(datum/source, mob/living/threat)
+ SIGNAL_HANDLER
+
+ domain_threats += 1
+ spawned_threat_refs.Add(WEAKREF(threat))
+ SEND_SIGNAL(src, COMSIG_BITRUNNER_THREAT_CREATED) // notify players
diff --git a/code/modules/bitrunning/server/util.dm b/code/modules/bitrunning/server/util.dm
new file mode 100644
index 00000000000..1d35e86de50
--- /dev/null
+++ b/code/modules/bitrunning/server/util.dm
@@ -0,0 +1,142 @@
+#define REDACTED "???"
+#define MAX_DISTANCE 4 // How far crates can spawn from the server
+
+/// Resets the cooldown state and updates icons
+/obj/machinery/quantum_server/proc/cool_off()
+ is_ready = TRUE
+ update_appearance()
+ radio.talk_into(src, "Thermal systems within operational parameters. Proceeding to domain configuration.", RADIO_CHANNEL_SUPPLY)
+
+/// Attempts to connect to a quantum console
+/obj/machinery/quantum_server/proc/find_console()
+ var/obj/machinery/computer/quantum_console/console = console_ref?.resolve()
+ if(console)
+ return console
+
+ for(var/direction in GLOB.cardinals)
+ var/obj/machinery/computer/quantum_console/nearby_console = locate(/obj/machinery/computer/quantum_console, get_step(src, direction))
+ if(nearby_console)
+ console_ref = WEAKREF(nearby_console)
+ nearby_console.server_ref = WEAKREF(src)
+ return nearby_console
+
+/// Compiles a list of available domains.
+/obj/machinery/quantum_server/proc/get_available_domains()
+ var/list/levels = list()
+
+ for(var/datum/lazy_template/virtual_domain/domain as anything in available_domains)
+ if(initial(domain.test_only))
+ continue
+ var/can_view = initial(domain.difficulty) < scanner_tier && initial(domain.cost) <= points + 5
+ var/can_view_reward = initial(domain.difficulty) < (scanner_tier + 1) && initial(domain.cost) <= points + 3
+
+ levels += list(list(
+ "cost" = initial(domain.cost),
+ "desc" = can_view ? initial(domain.desc) : "Limited scanning capabilities. Cannot infer domain details.",
+ "difficulty" = initial(domain.difficulty),
+ "id" = initial(domain.key),
+ "name" = can_view ? initial(domain.name) : REDACTED,
+ "reward" = can_view_reward ? initial(domain.reward_points) : REDACTED,
+ ))
+
+ return levels
+
+/// If there are hosted minds, attempts to get a list of their current virtual bodies w/ vitals
+/obj/machinery/quantum_server/proc/get_avatar_data()
+ var/list/hosted_avatars = list()
+
+ for(var/datum/weakref/avatar_ref in avatar_connection_refs)
+ var/datum/component/avatar_connection/connection = avatar_ref.resolve()
+ if(isnull(connection))
+ avatar_connection_refs.Remove(connection)
+ continue
+
+ var/mob/living/creature = connection.parent
+ var/mob/living/pilot = connection.old_body_ref?.resolve()
+
+ hosted_avatars += list(list(
+ "health" = creature.health,
+ "name" = creature.name,
+ "pilot" = pilot,
+ "brute" = creature.get_damage_amount(BRUTE),
+ "burn" = creature.get_damage_amount(BURN),
+ "tox" = creature.get_damage_amount(TOX),
+ "oxy" = creature.get_damage_amount(OXY),
+ ))
+
+ return hosted_avatars
+
+/// Gets a random available domain given the current points. Weighted towards higher cost domains.
+/obj/machinery/quantum_server/proc/get_random_domain_id()
+ if(points < 1)
+ return
+
+ var/list/random_domains = list()
+ var/total_cost = 0
+
+ for(var/datum/lazy_template/virtual_domain/available as anything in subtypesof(/datum/lazy_template/virtual_domain))
+ var/init_cost = initial(available.cost)
+ if(!initial(available.test_only) && init_cost > 0 && init_cost < 4 && init_cost <= points)
+ random_domains += list(list(
+ cost = init_cost,
+ id = initial(available.key),
+ ))
+
+ var/random_value = rand(0, total_cost)
+ var/accumulated_cost = 0
+
+ for(var/available as anything in random_domains)
+ accumulated_cost += available["cost"]
+ if(accumulated_cost >= random_value)
+ domain_randomized = TRUE
+ return available["id"]
+
+/// Gets all mobs originally generated by the loaded domain and returns a list that are capable of being antagged
+/obj/machinery/quantum_server/proc/get_valid_domain_targets()
+ // A: No one is playing
+ // B: The domain is not loaded
+ // C: The domain is shutting down
+ // D: There are no mobs
+ if(!length(avatar_connection_refs) || isnull(generated_domain) || !is_ready || !is_operational || !length(mutation_candidate_refs))
+ return list()
+
+ for(var/datum/weakref/creature_ref as anything in mutation_candidate_refs)
+ var/mob/living/creature = creature_ref.resolve()
+ if(isnull(creature) || creature.mind)
+ mutation_candidate_refs.Remove(creature_ref)
+
+ return shuffle(mutation_candidate_refs)
+
+/// Locates any turfs with crate out landmarks
+/obj/machinery/quantum_server/proc/locate_receive_turfs()
+ for(var/obj/effect/landmark/bitrunning/station_reward_spawn/spawner in GLOB.landmarks_list)
+ if(IN_GIVEN_RANGE(src, spawner, MAX_DISTANCE))
+ receive_turfs += get_turf(spawner)
+ qdel(spawner)
+
+ return length(receive_turfs) > 0
+
+/// Finds any mobs with minds in the zones and gives them the bad news
+/obj/machinery/quantum_server/proc/notify_spawned_threats()
+ for(var/datum/weakref/baddie_ref as anything in spawned_threat_refs)
+ var/mob/living/baddie = baddie_ref.resolve()
+ if(isnull(baddie) || baddie.stat >= UNCONSCIOUS || isnull(baddie.mind))
+ continue
+
+ baddie.throw_alert(
+ ALERT_BITRUNNER_RESET,
+ /atom/movable/screen/alert/bitrunning/qserver_threat_deletion,
+ new_master = src,
+ )
+
+ to_chat(baddie, span_userdanger("You have been flagged for deletion! Thank you for your service."))
+
+/// Do some magic teleport sparks
+/obj/machinery/quantum_server/proc/spark_at_location(obj/crate)
+ playsound(crate, 'sound/magic/blink.ogg', 50, TRUE)
+ var/datum/effect_system/spark_spread/quantum/sparks = new()
+ sparks.set_up(5, 1, get_turf(crate))
+ sparks.start()
+
+#undef REDACTED
+#undef MAX_DISTANCE
diff --git a/code/modules/bitrunning/turfs.dm b/code/modules/bitrunning/turfs.dm
new file mode 100644
index 00000000000..93dce1789c4
--- /dev/null
+++ b/code/modules/bitrunning/turfs.dm
@@ -0,0 +1,14 @@
+/turf/open/floor/bitrunning_transport
+ name = "circuit floor"
+ icon = 'icons/turf/floors.dmi'
+ desc = "Looks complex. You can see the circuits running through the floor."
+ icon_state = "bitrunning"
+
+/turf/closed/indestructible/binary
+ name = "tear in the fabric of reality"
+ icon = 'icons/turf/floors.dmi'
+ icon_state = "binary"
+
+/obj/effect/baseturf_helper/virtual_domain
+ name = "virtual domain baseturf editor"
+ baseturf = /turf/open/indestructible/binary
diff --git a/code/modules/bitrunning/virtual_domain/domains/ash_drake.dm b/code/modules/bitrunning/virtual_domain/domains/ash_drake.dm
new file mode 100644
index 00000000000..02bb91abc58
--- /dev/null
+++ b/code/modules/bitrunning/virtual_domain/domains/ash_drake.dm
@@ -0,0 +1,18 @@
+/datum/lazy_template/virtual_domain/ash_drake
+ name = "Ashen Inferno"
+ cost = BITRUNNER_COST_MEDIUM
+ desc = "Home of the ash drake, a powerful dragon that scours the surface of Lavaland."
+ difficulty = BITRUNNER_DIFFICULTY_MEDIUM
+ forced_outfit = /datum/outfit/job/miner
+ key = "ash_drake"
+ map_name = "ash_drake"
+ reward_points = BITRUNNER_REWARD_MEDIUM
+ safehouse_path = /datum/map_template/safehouse/lavaland_boss
+
+/mob/living/simple_animal/hostile/megafauna/dragon/virtual_domain
+ can_be_cybercop = FALSE
+ crusher_loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted)
+ health = 1600
+ loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted)
+ maxHealth = 1600
+ true_spawn = FALSE
diff --git a/code/modules/bitrunning/virtual_domain/domains/beach_bar.dm b/code/modules/bitrunning/virtual_domain/domains/beach_bar.dm
new file mode 100644
index 00000000000..871c2cb1338
--- /dev/null
+++ b/code/modules/bitrunning/virtual_domain/domains/beach_bar.dm
@@ -0,0 +1,22 @@
+/datum/lazy_template/virtual_domain/beach_bar
+ name = "Beach Bar"
+ desc = "A cheerful seaside haven where friendly skeletons serve up drinks. Say, how'd you guys get so dead?"
+ extra_loot = list(/obj/item/toy/beach_ball = 1)
+ help_text = "This place is running on a skeleton crew, and they don't seem to be too keen to share details. \
+ Maybe a few drinks of liquid charm will get the spirits up. As the saying goes, if you can't beat 'em, join 'em."
+ key = "beach_bar"
+ map_name = "beach_bar"
+ safehouse_path = /datum/map_template/safehouse/mine
+
+/obj/item/reagent_containers/cup/glass/drinkingglass/virtual_domain
+ name = "pina colada"
+ desc = "Whose drink is this? Not yours, that's for sure. Well, it's not like they're going to miss it."
+ list_reagents = list(/datum/reagent/consumable/ethanol/pina_colada = 30)
+
+/obj/item/reagent_containers/cup/glass/drinkingglass/virtual_domain/Initialize(mapload, vol)
+ . = ..()
+
+ AddComponent(/datum/component/bitrunning_points, \
+ signal_type = COMSIG_GLASS_DRANK, \
+ points_per_signal = 0.5, \
+ )
diff --git a/code/modules/bitrunning/virtual_domain/domains/blood_drunk_miner.dm b/code/modules/bitrunning/virtual_domain/domains/blood_drunk_miner.dm
new file mode 100644
index 00000000000..abf2e0fc5a9
--- /dev/null
+++ b/code/modules/bitrunning/virtual_domain/domains/blood_drunk_miner.dm
@@ -0,0 +1,18 @@
+/datum/lazy_template/virtual_domain/blood_drunk_miner
+ name = "Sanguine Excavation"
+ cost = BITRUNNER_COST_MEDIUM
+ desc = "Few escape the surface of Lavaland without a few scars. Some remain, maddened by the hunt."
+ difficulty = BITRUNNER_DIFFICULTY_MEDIUM
+ forced_outfit = /datum/outfit/job/miner
+ key = "blood_drunk_miner"
+ map_name = "blood_drunk_miner"
+ reward_points = BITRUNNER_REWARD_MEDIUM
+ safehouse_path = /datum/map_template/safehouse/lavaland_boss
+
+/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/virtual_domain
+ can_be_cybercop = FALSE
+ crusher_loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted)
+ health = 1600
+ loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted)
+ maxHealth = 1600
+ true_spawn = FALSE
diff --git a/code/modules/bitrunning/virtual_domain/domains/bubblegum.dm b/code/modules/bitrunning/virtual_domain/domains/bubblegum.dm
new file mode 100644
index 00000000000..bede97177cb
--- /dev/null
+++ b/code/modules/bitrunning/virtual_domain/domains/bubblegum.dm
@@ -0,0 +1,19 @@
+/datum/lazy_template/virtual_domain/bubblegum
+ name = "Blood-Soaked Lair"
+ cost = BITRUNNER_COST_HIGH
+ desc = "King of the slaughter demons. Bubblegum is a massive, hulking beast with a penchant for violence."
+ difficulty = BITRUNNER_DIFFICULTY_HIGH
+ extra_loot = list(/obj/item/toy/plush/bubbleplush = 1)
+ forced_outfit = /datum/outfit/job/miner
+ key = "bubblegum"
+ map_name = "bubblegum"
+ reward_points = BITRUNNER_REWARD_HIGH
+ safehouse_path = /datum/map_template/safehouse/lavaland_boss
+
+/mob/living/simple_animal/hostile/megafauna/bubblegum/virtual_domain
+ can_be_cybercop = FALSE
+ crusher_loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted)
+ health = 2000
+ loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted)
+ maxHealth = 2000
+ true_spawn = FALSE
diff --git a/code/modules/bitrunning/virtual_domain/domains/clown_planet.dm b/code/modules/bitrunning/virtual_domain/domains/clown_planet.dm
new file mode 100644
index 00000000000..92f000c9cf3
--- /dev/null
+++ b/code/modules/bitrunning/virtual_domain/domains/clown_planet.dm
@@ -0,0 +1,13 @@
+/datum/lazy_template/virtual_domain/clown_planet
+ name = "Clown Planet"
+ cost = BITRUNNER_COST_LOW
+ desc = "In the deep, dark reaches of space, there is only Honk."
+ difficulty = BITRUNNER_DIFFICULTY_LOW
+ extra_loot = list(/obj/item/bikehorn = 1)
+ forced_outfit = /datum/outfit/job/clown
+ help_text = "The trials of the Honkitude have begun. The sound of bike horns wailing in the distance. \
+ this realm- some sort of puzzle, has existed in legend as the final test of just how silly you are."
+ key = "clown_planet"
+ map_name = "clown_planet"
+ reward_points = BITRUNNER_REWARD_LOW
+ safehouse_path = /datum/map_template/safehouse/mine
diff --git a/code/modules/bitrunning/virtual_domain/domains/colossus.dm b/code/modules/bitrunning/virtual_domain/domains/colossus.dm
new file mode 100644
index 00000000000..35ba4eee0ca
--- /dev/null
+++ b/code/modules/bitrunning/virtual_domain/domains/colossus.dm
@@ -0,0 +1,18 @@
+/datum/lazy_template/virtual_domain/colossus
+ name = "Celestial Trial"
+ cost = BITRUNNER_COST_HIGH
+ desc = "A massive, ancient beast named the Colossus. Judgment comes."
+ difficulty = BITRUNNER_DIFFICULTY_HIGH
+ forced_outfit = /datum/outfit/job/miner
+ key = "colossus"
+ map_name = "colossus"
+ reward_points = BITRUNNER_REWARD_HIGH
+ safehouse_path = /datum/map_template/safehouse/lavaland_boss
+
+/mob/living/simple_animal/hostile/megafauna/colossus/virtual_domain
+ can_be_cybercop = FALSE
+ crusher_loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted)
+ loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted)
+ health = 2000
+ maxHealth = 2000
+ true_spawn = FALSE
diff --git a/code/modules/bitrunning/virtual_domain/domains/gondola_asteroid.dm b/code/modules/bitrunning/virtual_domain/domains/gondola_asteroid.dm
new file mode 100644
index 00000000000..4deacb4f9c5
--- /dev/null
+++ b/code/modules/bitrunning/virtual_domain/domains/gondola_asteroid.dm
@@ -0,0 +1,39 @@
+/datum/lazy_template/virtual_domain/gondola_asteroid
+ name = "Gondola Asteroid"
+ desc = "An asteroid home to a bountiful forest of gondolas. Peaceful."
+ map_name = "gondola_asteroid"
+ help_text = "What a lovely forest. There's a loot crate here in the middle of the map. \
+ Hmm... It doesn't budge. The gondolas don't seem to have any trouble moving it, though. \
+ I bet there's a way to move it myself."
+ key = "gondola_asteroid"
+ map_name = "gondola_asteroid"
+ safehouse_path = /datum/map_template/safehouse/shuttle_space
+
+/// Very pushy gondolas, great for moving loot crates.
+/obj/structure/closet/crate/secure/bitrunning/encrypted/gondola
+ move_resist = MOVE_FORCE_STRONG
+
+/mob/living/simple_animal/pet/gondola/virtual_domain
+ health = 50
+ loot = list(/obj/effect/decal/cleanable/blood/gibs, /obj/item/stack/sheet/animalhide/gondola = 1, /obj/item/food/meat/slab/gondola/virtual_domain = 1)
+ maxHealth = 50
+ move_force = MOVE_FORCE_VERY_STRONG
+ move_resist = MOVE_FORCE_STRONG
+
+/obj/item/food/meat/slab/gondola/virtual_domain
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 4,
+ /datum/reagent/gondola_mutation_toxin/virtual_domain = 5,
+ )
+
+/datum/reagent/gondola_mutation_toxin/virtual_domain
+ name = "Advanced Tranquility"
+
+/datum/reagent/gondola_mutation_toxin/virtual_domain/expose_mob(mob/living/exposed_mob, methods = TOUCH, reac_volume, show_message = TRUE, touch_protection = 0)
+ . = ..()
+ if((methods & (PATCH|INGEST|INJECT)) || ((methods & VAPOR) && prob(min(reac_volume,100)*(1 - touch_protection))))
+ exposed_mob.ForceContractDisease(new /datum/disease/transformation/gondola/virtual_domain(), FALSE, TRUE)
+
+/datum/disease/transformation/gondola/virtual_domain
+ stage_prob = 9
+ new_form = /mob/living/simple_animal/pet/gondola/virtual_domain
diff --git a/code/modules/bitrunning/virtual_domain/domains/hierophant.dm b/code/modules/bitrunning/virtual_domain/domains/hierophant.dm
new file mode 100644
index 00000000000..142623f4f81
--- /dev/null
+++ b/code/modules/bitrunning/virtual_domain/domains/hierophant.dm
@@ -0,0 +1,18 @@
+/datum/lazy_template/virtual_domain/hierophant
+ name = "Zealot Arena"
+ cost = BITRUNNER_COST_HIGH
+ desc = "Dance, puppets, dance!"
+ difficulty = BITRUNNER_DIFFICULTY_HIGH
+ forced_outfit = /datum/outfit/job/miner
+ key = "hierophant"
+ map_name = "hierophant"
+ reward_points = BITRUNNER_REWARD_HIGH
+ safehouse_path = /datum/map_template/safehouse/lavaland_boss
+
+/mob/living/simple_animal/hostile/megafauna/hierophant/virtual_domain
+ can_be_cybercop = FALSE
+ crusher_loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted)
+ health = 1700
+ loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted)
+ maxHealth = 1700
+ true_spawn = FALSE
diff --git a/code/modules/bitrunning/virtual_domain/domains/legion.dm b/code/modules/bitrunning/virtual_domain/domains/legion.dm
new file mode 100644
index 00000000000..f1ba146f380
--- /dev/null
+++ b/code/modules/bitrunning/virtual_domain/domains/legion.dm
@@ -0,0 +1,20 @@
+/datum/lazy_template/virtual_domain/legion
+ name = "Chamber of Echoes"
+ cost = BITRUNNER_COST_MEDIUM
+ desc = "A chilling realm that houses Legion's necropolis. Those who succumb to it are forever damned."
+ difficulty = BITRUNNER_DIFFICULTY_MEDIUM
+ forced_outfit = /datum/outfit/job/miner
+ key = "legion"
+ map_name = "legion"
+ reward_points = BITRUNNER_REWARD_MEDIUM
+ safehouse_path = /datum/map_template/safehouse/lavaland_boss
+
+/mob/living/simple_animal/hostile/megafauna/legion/virtual_domain
+ can_be_cybercop = FALSE
+ crusher_loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted)
+ health = 1500
+ loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted)
+ maxHealth = 1500
+ true_spawn = FALSE
+
+// You may be thinking, what about those mini-legions? They're not part of the initial created_atoms list
diff --git a/code/modules/bitrunning/virtual_domain/domains/pipedream.dm b/code/modules/bitrunning/virtual_domain/domains/pipedream.dm
new file mode 100644
index 00000000000..fd54ef6ca48
--- /dev/null
+++ b/code/modules/bitrunning/virtual_domain/domains/pipedream.dm
@@ -0,0 +1,101 @@
+/datum/lazy_template/virtual_domain/pipedream
+ name = "Disposal Pipe Factory"
+ cost = BITRUNNER_COST_LOW
+ desc = "An abandoned and infested factory manufacturing disposal pipes."
+ difficulty = BITRUNNER_DIFFICULTY_MEDIUM
+ extra_loot = list(/obj/item/stack/pipe_cleaner_coil/random/five = 1)
+ help_text = "Not long ago, this place was thriving with activity. The workers \
+ seemed to have left in a hurry, and now productivity is in the bin. Something \
+ must have trashed the place, but what?"
+ key = "pipedream"
+ map_name = "pipedream"
+ reward_points = BITRUNNER_REWARD_LOW
+ safehouse_path = /datum/map_template/safehouse/shuttle
+
+// ID Trims
+/datum/id_trim/factory
+ assignment = "Factory Worker"
+ trim_state = "trim_cargotechnician"
+ department_color = COLOR_CARGO_BROWN
+ subdepartment_color = COLOR_CARGO_BROWN
+ sechud_icon_state = SECHUD_CARGO_TECHNICIAN
+ access = list(
+ ACCESS_AWAY_SUPPLY
+ )
+
+/datum/id_trim/factory/qm
+ assignment = "Factory Quartermaster"
+ trim_state = "trim_quartermaster"
+ department_color = COLOR_COMMAND_BLUE
+ subdepartment_color = COLOR_CARGO_BROWN
+ department_state = "departmenthead"
+ sechud_icon_state = SECHUD_QUARTERMASTER
+ access = list(
+ ACCESS_AWAY_SUPPLY,
+ ACCESS_AWAY_COMMAND
+ )
+
+// ID Cards
+/obj/item/card/id/advanced/factory
+ name = "factory worker ID"
+ trim = /datum/id_trim/factory
+
+/obj/item/card/id/advanced/factory/qm
+ name = "factory quartermaster ID"
+ trim = /datum/id_trim/factory/qm
+
+//Outfits
+/datum/outfit/factory
+ name = "Factory Worker"
+
+ id_trim = /datum/id_trim/factory
+ id = /obj/item/card/id/advanced/
+ uniform = /obj/item/clothing/under/rank/cargo/tech
+ suit = /obj/item/clothing/suit/hazardvest
+ belt = /obj/item/radio
+ gloves = /obj/item/clothing/gloves/color/black
+ head = /obj/item/clothing/head/soft/yellow
+ shoes = /obj/item/clothing/shoes/workboots
+ l_pocket = /obj/item/flashlight/seclite
+
+/datum/outfit/factory/guard
+ name = "Factory Guard"
+
+ uniform = /obj/item/clothing/under/rank/security/officer/grey
+ suit = /obj/item/clothing/suit/armor/vest/alt
+ belt = /obj/item/radio
+ gloves = /obj/item/clothing/gloves/color/black
+ head = /obj/item/clothing/head/soft/sec
+ shoes = /obj/item/clothing/shoes/jackboots/sec
+ l_pocket = /obj/item/restraints/handcuffs
+ r_pocket = /obj/item/assembly/flash/handheld
+
+/datum/outfit/factory/qm
+ name = "Factory Quatermaster"
+
+ id_trim = /datum/id_trim/factory/qm
+ id = /obj/item/card/id/advanced/silver
+ uniform = /obj/item/clothing/under/rank/cargo/qm
+ belt = /obj/item/radio
+ gloves = /obj/item/clothing/gloves/color/black
+ head = /obj/item/clothing/head/soft/yellow
+ shoes = /obj/item/clothing/shoes/jackboots/sec
+ l_pocket = /obj/item/melee/baton/telescopic
+ r_pocket = /obj/item/stamp/head/qm
+
+// Corpses
+/obj/effect/mob_spawn/corpse/human/factory
+ name = "Factory Worker"
+ outfit = /datum/outfit/factory
+ icon_state = "corpsecargotech"
+
+/obj/effect/mob_spawn/corpse/human/factory/guard
+ name = "Factory Guard"
+ outfit = /datum/outfit/factory/guard
+ icon_state = "corpsecargotech"
+
+/obj/effect/mob_spawn/corpse/human/factory/qm
+ name = "Factory Quartermaster"
+ outfit = /datum/outfit/factory/qm
+ icon_state = "corpsecargotech"
+
diff --git a/code/modules/bitrunning/virtual_domain/domains/pirates.dm b/code/modules/bitrunning/virtual_domain/domains/pirates.dm
new file mode 100644
index 00000000000..52d86a71211
--- /dev/null
+++ b/code/modules/bitrunning/virtual_domain/domains/pirates.dm
@@ -0,0 +1,10 @@
+/datum/lazy_template/virtual_domain/pirates
+ name = "Corsair Cove"
+ cost = BITRUNNER_COST_MEDIUM
+ desc = "Battle your way to the hidden treasure, seize the booty, and make a swift escape before the pirates turn the tide."
+ difficulty = BITRUNNER_DIFFICULTY_MEDIUM
+ help_text = "Put on the provided outfits to blend in, then battle your way through the hostile pirates. \
+ Grab the treasure and get out before you're overwhelmed!"
+ key = "pirates"
+ map_name = "pirates"
+ reward_points = BITRUNNER_REWARD_MEDIUM
diff --git a/code/modules/bitrunning/virtual_domain/domains/stairs_and_cliffs.dm b/code/modules/bitrunning/virtual_domain/domains/stairs_and_cliffs.dm
new file mode 100644
index 00000000000..2d9bcca3645
--- /dev/null
+++ b/code/modules/bitrunning/virtual_domain/domains/stairs_and_cliffs.dm
@@ -0,0 +1,29 @@
+/datum/lazy_template/virtual_domain/stairs_and_cliffs
+ name = "Glacier Grind"
+ cost = BITRUNNER_COST_LOW
+ desc = "A treacherous climb few calves can survive. Great cardio though."
+ help_text = "Ever heard of 'Snakes and Ladders'? It's like that, but with \
+ instead of ladders its stairs and instead of snakes its a steep drop down a \
+ cliff into rough rocks or liquid plasma."
+ extra_loot = list(/obj/item/clothing/suit/costume/snowman = 2)
+ difficulty = BITRUNNER_DIFFICULTY_LOW
+ forced_outfit = /datum/outfit/job/virtual_domain_iceclimber
+ key = "stairs_and_cliffs"
+ map_name = "stairs_and_cliffs"
+ reward_points = BITRUNNER_REWARD_MEDIUM
+ safehouse_path = /datum/map_template/safehouse/ice
+
+/turf/open/cliff/snowrock/virtual_domain
+ name = "icy cliff"
+ initial_gas_mix = "o2=22;n2=82;TEMP=180"
+
+/turf/open/lava/plasma/virtual_domain
+ name = "plasma lake"
+ initial_gas_mix = "o2=22;n2=82;TEMP=180"
+
+/datum/outfit/job/virtual_domain_iceclimber
+ name = "Ice Climber"
+
+ uniform = /obj/item/clothing/under/color/grey
+ backpack = /obj/item/storage/backpack/duffelbag
+ shoes = /obj/item/clothing/shoes/winterboots
diff --git a/code/modules/bitrunning/virtual_domain/domains/syndicate_assault.dm b/code/modules/bitrunning/virtual_domain/domains/syndicate_assault.dm
new file mode 100644
index 00000000000..bae0da6874d
--- /dev/null
+++ b/code/modules/bitrunning/virtual_domain/domains/syndicate_assault.dm
@@ -0,0 +1,13 @@
+/datum/lazy_template/virtual_domain/syndicate_assault
+ name = "Syndicate Assault"
+ cost = BITRUNNER_COST_MEDIUM
+ desc = "Board the enemy ship and recover the stolen cargo."
+ difficulty = BITRUNNER_DIFFICULTY_MEDIUM
+ extra_loot = list(/obj/item/toy/plush/nukeplushie = 1)
+ help_text = "A group of Syndicate operatives have stolen valuable cargo from the station. \
+ They have boarded their ship and are attempting to escape. Infiltrate their ship and recover \
+ the crate. Be careful, they are extremely armed."
+ key = "syndicate_assault"
+ map_name = "syndicate_assault"
+ reward_points = BITRUNNER_REWARD_MEDIUM
+ safehouse_path = /datum/map_template/safehouse/shuttle
diff --git a/code/modules/bitrunning/virtual_domain/domains/test_only.dm b/code/modules/bitrunning/virtual_domain/domains/test_only.dm
new file mode 100644
index 00000000000..6e5e852fb5c
--- /dev/null
+++ b/code/modules/bitrunning/virtual_domain/domains/test_only.dm
@@ -0,0 +1,11 @@
+/// Used for unit tests only. Skipped in UI.
+/datum/lazy_template/virtual_domain/test_only
+ name = "Test Only"
+ key = "test_only"
+ map_name = "test_only"
+ test_only = TRUE
+ safehouse_path = /datum/map_template/safehouse/test_only
+
+/datum/lazy_template/virtual_domain/test_only/expensive
+ key = "test_only_expensive"
+ cost = 3
diff --git a/code/modules/bitrunning/virtual_domain/domains/vaporwave.dm b/code/modules/bitrunning/virtual_domain/domains/vaporwave.dm
new file mode 100644
index 00000000000..45d4abec983
--- /dev/null
+++ b/code/modules/bitrunning/virtual_domain/domains/vaporwave.dm
@@ -0,0 +1,10 @@
+/datum/lazy_template/virtual_domain/vaporwave
+ name = "Cosmic Vestige"
+ cost = BITRUNNER_COST_EXTREME
+ desc = "Suspended in the silent void of space, the Neon Relic is a haunting echo of a retro-futuristic era."
+ difficulty = BITRUNNER_DIFFICULTY_NONE
+ extra_loot = list(/obj/item/stack/spacecash/c500 = 3)
+ key = "vaporwave"
+ map_name = "vaporwave"
+ reward_points = BITRUNNER_REWARD_EXTREME
+ safehouse_path = /datum/map_template/safehouse/shuttle_space
diff --git a/code/modules/bitrunning/virtual_domain/domains/wendigo.dm b/code/modules/bitrunning/virtual_domain/domains/wendigo.dm
new file mode 100644
index 00000000000..fcad3db6faf
--- /dev/null
+++ b/code/modules/bitrunning/virtual_domain/domains/wendigo.dm
@@ -0,0 +1,19 @@
+/datum/lazy_template/virtual_domain/wendigo
+ name = "Glacial Devourer"
+ cost = BITRUNNER_COST_HIGH
+ desc = "Legends speak of the ravenous Wendigo hidden deep within the caves of Icemoon."
+ difficulty = BITRUNNER_DIFFICULTY_HIGH
+ forced_outfit = /datum/outfit/job/miner
+ key = "wendigo"
+ map_name = "wendigo"
+ reward_points = BITRUNNER_REWARD_HIGH
+ safehouse_path = /datum/map_template/safehouse/lavaland_boss
+
+/mob/living/simple_animal/hostile/megafauna/wendigo/virtual_domain
+ can_be_cybercop = FALSE
+ crusher_loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted)
+ guaranteed_butcher_results = list(/obj/item/wendigo_skull = 1)
+ health = 2000
+ loot = list(/obj/structure/closet/crate/secure/bitrunning/encrypted)
+ maxHealth = 2000
+ true_spawn = FALSE
diff --git a/code/modules/bitrunning/virtual_domain/domains/xeno_nest.dm b/code/modules/bitrunning/virtual_domain/domains/xeno_nest.dm
new file mode 100644
index 00000000000..2bd4105e13c
--- /dev/null
+++ b/code/modules/bitrunning/virtual_domain/domains/xeno_nest.dm
@@ -0,0 +1,12 @@
+/datum/lazy_template/virtual_domain/xeno_nest
+ name = "Xeno Infestation"
+ cost = BITRUNNER_COST_LOW
+ desc = "Our ship scanners have detected lifeforms of unknown origin. Friendly attempts to contact them have failed."
+ difficulty = BITRUNNER_DIFFICULTY_LOW
+ extra_loot = list(/obj/item/toy/plush/rouny = 1)
+ help_text = "You are on a barren planet filled with hostile creatures. There is a crate here, not hidden, \
+ simply protected. Expect resistance."
+ key = "xeno_nest"
+ map_name = "xeno_nest"
+ reward_points = BITRUNNER_REWARD_LOW
+ safehouse_path = /datum/map_template/safehouse/shuttle
diff --git a/code/modules/bitrunning/virtual_domain/safehouses.dm b/code/modules/bitrunning/virtual_domain/safehouses.dm
new file mode 100644
index 00000000000..bb42f690ac7
--- /dev/null
+++ b/code/modules/bitrunning/virtual_domain/safehouses.dm
@@ -0,0 +1,53 @@
+/**
+ * # Safe Houses
+ * The starting point for virtual domains.
+ * Create your own: Read the readme file in the '_maps/safehouses' folder.
+ */
+/datum/map_template/safehouse
+ name = "virtual domain: safehouse"
+
+ returns_created_atoms = TRUE
+ /// The map file to load
+ var/filename = "den.dmm"
+
+/datum/map_template/safehouse/New()
+ mappath = "_maps/safehouses/" + filename
+ ..(path = mappath)
+
+/datum/map_template/safehouse/test_only
+ filename = "test_only_safehouse.dmm"
+
+
+/// The default safehouse map template.
+/datum/map_template/safehouse/wood
+ filename = "wood.dmm"
+
+/datum/map_template/safehouse/den
+ filename = "den.dmm"
+
+/datum/map_template/safehouse/dig
+ filename = "dig.dmm"
+
+/datum/map_template/safehouse/shuttle
+ filename = "shuttle.dmm"
+
+// Has space tiles on the four corners.
+/datum/map_template/safehouse/shuttle_space
+ filename = "shuttle_space.dmm"
+
+/datum/map_template/safehouse/mine
+ filename = "mine.dmm"
+
+// Comes preloaded with mining combat gear.
+/datum/map_template/safehouse/lavaland_boss
+ filename = "lavaland_boss.dmm"
+
+// Chill out
+/datum/map_template/safehouse/ice
+ filename = "ice.dmm"
+
+/**
+ * Your safehouse here
+ * /datum/map_template/safehouse/your_type
+ * filename = "your_map.dmm"
+ */
diff --git a/code/modules/bitrunning/virtual_domain/virtual_domain.dm b/code/modules/bitrunning/virtual_domain/virtual_domain.dm
new file mode 100644
index 00000000000..c2bd193f4e9
--- /dev/null
+++ b/code/modules/bitrunning/virtual_domain/virtual_domain.dm
@@ -0,0 +1,34 @@
+/**
+ * # Virtual Domains
+ * This loads a base level, then users can select the preset upon it.
+ * Create your own: Read the readme file in the '_maps/virtual_domains' folder.
+ */
+/datum/lazy_template/virtual_domain
+ map_dir = "_maps/virtual_domains"
+ map_name = "None"
+ key = "Virtual Domain"
+
+ /// Cost of this map to load
+ var/cost = BITRUNNER_COST_NONE
+ /// The description of the map
+ var/desc = "A map."
+ /// The 'difficulty' of the map, which affects the ui and ability to scan info.
+ var/difficulty = BITRUNNER_DIFFICULTY_NONE
+ /// An assoc list of typepath/amount to spawn on completion. Not weighted - the value is the amount
+ var/list/extra_loot
+ /// The map file to load
+ var/filename = "virtual_domain.dmm"
+ /// Any outfit that you wish to force on avatars. Overrides preferences
+ var/datum/outfit/forced_outfit
+ /// Information given to connected clients via ability
+ var/help_text
+ // Name to show in the UI
+ var/name = "Virtual Domain"
+ /// Points to reward for completion. Used to purchase new domains and calculate ore rewards.
+ var/reward_points = BITRUNNER_REWARD_MIN
+ /// The start time of the map. Used to calculate time taken
+ var/start_time
+ /// This map is specifically for unit tests. Shouldn't display in game
+ var/test_only = FALSE
+ /// The safehouse to load into the map
+ var/datum/map_template/safehouse/safehouse_path = /datum/map_template/safehouse/den
diff --git a/code/modules/capture_the_flag/ctf_player_component.dm b/code/modules/capture_the_flag/ctf_player_component.dm
index 0bf37b979de..d3abc0f2571 100644
--- a/code/modules/capture_the_flag/ctf_player_component.dm
+++ b/code/modules/capture_the_flag/ctf_player_component.dm
@@ -8,7 +8,7 @@
var/can_respawn = TRUE
///Reference to the game this player is participating in.
var/datum/ctf_controller/ctf_game
- ///Item dropped on death,
+ ///Item dropped on death,
var/death_drop = /obj/effect/powerup/ammo/ctf
///Reference to players ckey, used for sending messages to them relating to CTF.
var/ckey_reference
@@ -22,19 +22,20 @@
var/datum/mind/true_parent = parent
player_mob = true_parent.current
ckey_reference = player_mob.ckey
- setup_dusting()
-
+ register_mob()
+
/datum/component/ctf_player/PostTransfer()
if(!istype(parent, /datum/mind))
return COMPONENT_INCOMPATIBLE
var/datum/mind/true_parent = parent
player_mob = true_parent.current
- setup_dusting()
+ register_mob()
-///CTF players are dusted upon taking damage that puts them into critical or leaving their body.
-/datum/component/ctf_player/proc/setup_dusting()
+/// Called when we get a new player mob, register signals and set up the mob.
+/datum/component/ctf_player/proc/register_mob()
RegisterSignal(player_mob, COMSIG_MOB_AFTER_APPLY_DAMAGE, PROC_REF(damage_type_check))
RegisterSignal(player_mob, COMSIG_MOB_GHOSTIZED, PROC_REF(ctf_dust))
+ ADD_TRAIT(player_mob, TRAIT_PERMANENTLY_MORTAL, CTF_TRAIT)
///Stamina and oxygen damage will not dust a player by themself.
/datum/component/ctf_player/proc/damage_type_check(datum/source, damage, damage_type)
diff --git a/code/modules/cargo/department_order.dm b/code/modules/cargo/department_order.dm
index 972588a6355..b1573c97a5b 100644
--- a/code/modules/cargo/department_order.dm
+++ b/code/modules/cargo/department_order.dm
@@ -142,6 +142,12 @@ GLOBAL_LIST_INIT(department_order_cooldowns, list(
if(GLOB.areas_by_type[delivery_area_type])
chosen_delivery_area = delivery_area_type
break
+
+ if(SSshuttle.supply.get_order_count(pack) == OVER_ORDER_LIMIT)
+ playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
+ say("ERROR: No more then [CARGO_MAX_ORDER] of any pack may be ordered at once")
+ return
+
department_order = new(pack, name, rank, ckey, "", null, chosen_delivery_area, null)
SSshuttle.shopping_list += department_order
if(!already_signalled)
@@ -188,7 +194,7 @@ GLOBAL_LIST_INIT(department_order_cooldowns, list(
department_delivery_areas = list(/area/station/science/research)
override_access = ACCESS_RD
req_one_access = REGION_ACCESS_RESEARCH
- dep_groups = list("Science", "Livestock")
+ dep_groups = list("Science", "Livestock", "Canisters & Materials")
/obj/machinery/computer/department_orders/security
name = "security order console"
diff --git a/code/modules/cargo/exports/materials.dm b/code/modules/cargo/exports/materials.dm
index 06c52305f51..46d089b5ac5 100644
--- a/code/modules/cargo/exports/materials.dm
+++ b/code/modules/cargo/exports/materials.dm
@@ -2,10 +2,13 @@
cost = 5 // Cost per SHEET_MATERIAL_AMOUNT, which is 100cm3 as of May 2023.
message = "cm3 of developer's tears. Please, report this on github"
amount_report_multiplier = SHEET_MATERIAL_AMOUNT
- var/material_id = null
+ var/datum/material/material_id = null
export_types = list(
- /obj/item/stack/sheet/mineral, /obj/item/stack/tile/mineral,
- /obj/item/stack/ore, /obj/item/coin)
+ /obj/item/stack/sheet/mineral,
+ /obj/item/stack/tile/mineral,
+ /obj/item/stack/ore,
+ /obj/item/coin
+ )
// Yes, it's a base type containing export_types.
// But it has no material_id, so any applies_to check will return false, and these types reduce amount of copypasta a lot
@@ -27,17 +30,8 @@
return round(amount / SHEET_MATERIAL_AMOUNT)
-// Materials. Nothing but plasma is really worth selling. Better leave it all to RnD and sell some plasma instead.
-
-/datum/export/material/bananium
- cost = CARGO_CRATE_VALUE * 2
- material_id = /datum/material/bananium
- message = "cm3 of bananium"
-
-/datum/export/material/diamond
- cost = CARGO_CRATE_VALUE
- material_id = /datum/material/diamond
- message = "cm3 of diamonds"
+// Materials. Static materials exist as parent types, while materials subject to the stock market have a fluid cost as determined by material/market types
+// If you're adding a new material to the stock market, make sure its export type is added here.
/datum/export/material/plasma
cost = CARGO_CRATE_VALUE * 0.4
@@ -45,27 +39,12 @@
material_id = /datum/material/plasma
message = "cm3 of plasma"
-/datum/export/material/uranium
- cost = CARGO_CRATE_VALUE * 0.2
- material_id = /datum/material/uranium
- message = "cm3 of uranium"
-
-/datum/export/material/gold
- cost = CARGO_CRATE_VALUE * 0.25
- material_id = /datum/material/gold
- message = "cm3 of gold"
-
-/datum/export/material/silver
- cost = CARGO_CRATE_VALUE * 0.1
- material_id = /datum/material/silver
- message = "cm3 of silver"
-
-/datum/export/material/titanium
- cost = CARGO_CRATE_VALUE * 0.25
- material_id = /datum/material/titanium
- message = "cm3 of titanium"
+/datum/export/material/bananium
+ cost = CARGO_CRATE_VALUE * 2
+ material_id = /datum/material/bananium
+ message = "cm3 of bananium"
-/datum/export/material/adamantine
+/datum/export/material/diamond
cost = CARGO_CRATE_VALUE
material_id = /datum/material/adamantine
message = "cm3 of adamantine"
@@ -75,11 +54,6 @@
material_id = /datum/material/mythril
message = "cm3 of mythril"
-/datum/export/material/bscrystal
- cost = CARGO_CRATE_VALUE * 0.6
- message = "of bluespace crystals"
- material_id = /datum/material/bluespace
-
/datum/export/material/plastic
cost = CARGO_CRATE_VALUE * 0.05
message = "cm3 of plastic"
@@ -90,21 +64,6 @@
message = "cm3 of runite"
material_id = /datum/material/runite
-/datum/export/material/iron
- cost = CARGO_CRATE_VALUE * 0.01
- message = "cm3 of iron"
- material_id = /datum/material/iron
- export_types = list(
- /obj/item/stack/sheet/iron, /obj/item/stack/tile/iron,
- /obj/item/stack/rods, /obj/item/stack/ore, /obj/item/coin)
-
-/datum/export/material/glass
- cost = CARGO_CRATE_VALUE * 0.01
- message = "cm3 of glass"
- material_id = /datum/material/glass
- export_types = list(/obj/item/stack/sheet/glass, /obj/item/stack/ore,
- /obj/item/shard)
-
/datum/export/material/hot_ice
cost = CARGO_CRATE_VALUE * 0.8
message = "cm3 of Hot Ice"
@@ -116,3 +75,90 @@
message = "cm3 of metallic hydrogen"
material_id = /datum/material/metalhydrogen
export_types = /obj/item/stack/sheet/mineral/metal_hydrogen
+
+/datum/export/material/market
+
+/datum/export/material/market/diamond
+ material_id = /datum/material/diamond
+ message = "cm3 of diamonds"
+
+/datum/export/material/market/uranium
+ material_id = /datum/material/uranium
+ message = "cm3 of uranium"
+
+/datum/export/material/market/gold
+ material_id = /datum/material/gold
+ message = "cm3 of gold"
+
+/datum/export/material/market/silver
+ material_id = /datum/material/silver
+ message = "cm3 of silver"
+
+/datum/export/material/market/titanium
+ material_id = /datum/material/titanium
+ message = "cm3 of titanium"
+
+/datum/export/material/market/bscrystal
+ message = "of bluespace crystals"
+ material_id = /datum/material/bluespace
+ export_types = list(/obj/item/stack/sheet/bluespace_crystal, /obj/item/stack/ore) //For whatever reason, bluespace crystals are not a mineral
+
+/datum/export/material/market/iron
+ message = "cm3 of iron"
+ material_id = /datum/material/iron
+ export_types = list(
+ /obj/item/stack/sheet/iron,
+ /obj/item/stack/tile/iron,
+ /obj/item/stack/rods,
+ /obj/item/stack/ore,
+ /obj/item/coin
+ )
+
+/datum/export/material/market/glass
+ message = "cm3 of glass"
+ material_id = /datum/material/glass
+ export_types = list(
+ /obj/item/stack/sheet/glass,
+ /obj/item/stack/ore,
+ /obj/item/shard
+ )
+
+/datum/export/material/market/get_cost(obj/O, apply_elastic = FALSE)
+ var/obj/item/I = O
+ var/amount = get_amount(I)
+ if(!amount)
+ return 0
+ var/material_value = (SSstock_market.materials_prices[material_id]) * amount * MARKET_PROFIT_MODIFIER
+ return round(material_value)
+
+/datum/export/material/market/sell_object(obj/sold_item, datum/export_report/report, dry_run, apply_elastic)
+ . = ..()
+ var/amount = get_amount(sold_item)
+ var/price = get_cost(sold_item)
+ if(!amount)
+ return
+ if(!dry_run)
+ SSstock_market.materials_quantity[material_id] += amount
+ SSstock_market.materials_prices[material_id] -= round((price) * (amount / (amount + SSstock_market.materials_quantity[material_id])))
+ //This formula should impact lower quantity materials greater, and higher quantity materials less. Still, it's a bit rough. Tweaking may be needed.
+
+
+// Stock blocks are a special type of export that can be used to sell a quantity of materials at a specific price on the market.
+/datum/export/stock_block
+ cost = 0
+ message = "stock block"
+ export_types = list(/obj/item/stock_block)
+
+/datum/export/stock_block/get_cost(obj/O, apply_elastic = FALSE)
+ var/obj/item/stock_block/block = O
+ return block.export_value
+
+/datum/export/stock_block/sell_object(obj/sold_item, datum/export_report/report, dry_run, apply_elastic)
+ . = ..()
+ if(dry_run)
+ return
+ var/obj/item/stock_block/sold_block = sold_item
+ var/sale_value = sold_block.export_value
+ SSstock_market.materials_quantity[sold_block.export_mat] += sold_block.quantity
+ SSstock_market.materials_prices[sold_block.export_mat] -= round((sale_value) * (sold_block.quantity / (sold_block.quantity + SSstock_market.materials_quantity[sold_block.export_mat])))
+ SSstock_market.materials_prices[sold_block.export_mat] = round(clamp(SSstock_market.materials_prices[sold_block.export_mat], sold_block.export_mat.value_per_unit * SHEET_MATERIAL_AMOUNT * 0.5 , sold_block.export_mat.value_per_unit * SHEET_MATERIAL_AMOUNT * 3))
diff --git a/code/modules/cargo/goodies.dm b/code/modules/cargo/goodies.dm
index 12ec7d5b129..a9e11a370e1 100644
--- a/code/modules/cargo/goodies.dm
+++ b/code/modules/cargo/goodies.dm
@@ -129,6 +129,12 @@
cost = PAYCHECK_CREW * 4
contains = list(/obj/item/storage/medkit/toxin)
+/datum/supply_pack/goody/bandagebox_singlepack
+ name = "Box of Bandages Single-Pack"
+ desc = "A single box of DeForest brand bandages. For when you don't want to see your doctor."
+ cost = PAYCHECK_CREW * 3
+ contains = list(/obj/item/storage/box/bandages)
+
/datum/supply_pack/goody/toolbox // mostly just to water down coupon probability
name = "Mechanical Toolbox"
desc = "A fully stocked mechanical toolbox, for when you're too lazy to just print them out."
diff --git a/code/modules/cargo/materials_market.dm b/code/modules/cargo/materials_market.dm
new file mode 100644
index 00000000000..d211df7debd
--- /dev/null
+++ b/code/modules/cargo/materials_market.dm
@@ -0,0 +1,259 @@
+/obj/machinery/materials_market
+ name = "galactic materials market"
+ desc = "This machine allows the user to buy and sell sheets of minerals \
+ across the system. Prices are known to fluxuate quite often,\
+ sometimes even within the same minute. All transactions are final."
+ circuit = /obj/item/circuitboard/machine/materials_market
+ req_access = list(ACCESS_CARGO)
+ density = TRUE
+ icon = 'icons/obj/economy.dmi'
+ icon_state = "mat_market"
+ base_icon_state = "mat_market"
+ idle_power_usage = BASE_MACHINE_IDLE_CONSUMPTION
+ /// What items can be converted into a stock block? Must be a stack subtype based on current implementation.
+ var/list/exportable_material_items = list(
+ /obj/item/stack/sheet/iron, //God why are we like this
+ /obj/item/stack/sheet/glass, //No really, God why are we like this
+ /obj/item/stack/sheet/mineral,
+ /obj/item/stack/tile/mineral,
+ /obj/item/stack/ore,
+ /obj/item/stack/sheet/bluespace_crystal,
+ /obj/item/stack/rods
+ )
+ /// Are we ordering sheets from our own card balance or the cargo budget?
+ var/ordering_private = TRUE
+ /// Currently, can we order sheets from our own card balance or the cargo budget?
+ var/can_buy_via_budget = FALSE
+
+/obj/machinery/materials_market/update_icon_state()
+ if(panel_open)
+ icon_state = "[base_icon_state]_open"
+ return ..()
+ if(!is_operational || !anchored)
+ icon_state = "[base_icon_state]_off"
+ return ..()
+ icon_state = "[base_icon_state]"
+ return ..()
+
+/obj/machinery/materials_market/wrench_act(mob/living/user, obj/item/tool)
+ ..()
+ default_unfasten_wrench(user, tool, time = 1.5 SECONDS)
+ return TOOL_ACT_TOOLTYPE_SUCCESS
+
+/obj/machinery/materials_market/attackby(obj/item/O, mob/user, params)
+ if(default_deconstruction_screwdriver(user, "[base_icon_state]_open", "[base_icon_state]", O))
+ return
+ else if(default_deconstruction_crowbar(O))
+ return
+ if(is_type_in_list(O, exportable_material_items))
+ var/amount = 0
+ var/value = 0
+ var/material_to_export
+ var/obj/item/stack/exportable = O
+ for(var/datum/material/mat as anything in SSstock_market.materials_prices)
+ if(exportable.has_material_type(mat))
+ amount = exportable.amount
+ value = SSstock_market.materials_prices[mat]
+ material_to_export = mat
+ break //This is only for trading non-alloys, so we can break here
+
+ if(!amount)
+ say("Not enough material. Aborting.")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, FALSE)
+ return TRUE
+ qdel(exportable)
+ var/obj/item/stock_block/new_block = new /obj/item/stock_block(drop_location())
+ new_block.export_value = amount * value * MARKET_PROFIT_MODIFIER
+ new_block.export_mat = material_to_export
+ new_block.quantity = amount
+ to_chat(user, span_notice("You have created a stock block worth [new_block.export_value] cr! Sell it before it becomes liquid!"))
+ playsound(src, 'sound/machines/synth_yes.ogg', 50, FALSE)
+ return TRUE
+ return ..()
+
+
+/obj/machinery/materials_market/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!anchored)
+ return
+ if(!ui)
+ ui = new(user, src, "MatMarket", name)
+ ui.open()
+
+/obj/machinery/materials_market/ui_data(mob/user)
+ var/data = list()
+ var/material_data
+ for(var/datum/material/traded_mat as anything in SSstock_market.materials_prices)
+ var/trend_string = ""
+ if(SSstock_market.materials_trends[traded_mat] == 0)
+ trend_string = "neutral"
+ else if(SSstock_market.materials_trends[traded_mat] == 1)
+ trend_string = "up"
+ else if(SSstock_market.materials_trends[traded_mat] == -1)
+ trend_string = "down"
+ var/color_string = ""
+ if(traded_mat.color)
+ color_string = traded_mat.color
+ else if (traded_mat.greyscale_colors)
+ color_string = splicetext(traded_mat.greyscale_colors, 6, length(traded_mat.greyscale_colors), "") //slice it to a standard 6 char hex
+ material_data += list(list(
+ "name" = traded_mat.name,
+ "price" = SSstock_market.materials_prices[traded_mat],
+ "quantity" = SSstock_market.materials_quantity[traded_mat],
+ "trend" = trend_string,
+ "color" = color_string,
+ ))
+
+ can_buy_via_budget = FALSE
+ var/obj/item/card/id/used_id_card
+ if(isliving(user))
+ var/mob/living/living_user = user
+ used_id_card = living_user.get_idcard(TRUE)
+ can_buy_via_budget = (ACCESS_CARGO in used_id_card?.GetAccess())
+
+ var/balance = 0
+ if(!ordering_private)
+ var/datum/bank_account/dept = SSeconomy.get_dep_account(ACCOUNT_CAR)
+ if(dept)
+ balance = dept.account_balance
+ else
+ balance = used_id_card?.registered_account?.account_balance
+
+ var/market_crashing = FALSE
+ if(HAS_TRAIT(SSeconomy, TRAIT_MARKET_CRASHING))
+ market_crashing = TRUE
+
+ data["catastrophe"] = market_crashing
+ data["materials"] = material_data
+ data["creditBalance"] = balance
+ data["orderingPrive"] = ordering_private
+ data["canOrderCargo"] = can_buy_via_budget
+ return data
+
+/obj/machinery/materials_market/ui_act(action, params)
+ . = ..()
+ if(.)
+ return
+ if(!isliving(usr))
+ return
+ switch(action)
+ if("buy")
+ var/material_str = params["material"]
+ var/quantity = text2num(params["quantity"])
+
+ var/datum/material/material_bought
+ var/obj/item/stack/sheet/sheet_to_buy
+ for(var/datum/material/mat as anything in SSstock_market.materials_prices)
+ if(mat.name == material_str)
+ material_bought = mat
+ break
+ if(!material_bought)
+ CRASH("Invalid material name passed to materials market!")
+ var/mob/living/living_user = usr
+ var/datum/bank_account/account_payable = SSeconomy.get_dep_account(ACCOUNT_CAR)
+ if(ordering_private)
+ var/obj/item/card/id/used_id_card = living_user.get_idcard(TRUE)
+ account_payable = used_id_card.registered_account
+ else if(can_buy_via_budget)
+ account_payable = SSeconomy.get_dep_account(ACCOUNT_CAR)
+
+ var/cost = SSstock_market.materials_prices[material_bought] * quantity
+
+ sheet_to_buy = material_bought.sheet_type
+ if(!sheet_to_buy)
+ CRASH("Material with no sheet type being sold on materials market!")
+ if(!account_payable)
+ say("No bank account detected!")
+ return
+ if(cost > account_payable.account_balance)
+ to_chat(living_user, span_warning("You don't have enough money to buy that!"))
+ return
+ var/list/things_to_order = list()
+ things_to_order += (sheet_to_buy)
+ things_to_order[sheet_to_buy] = quantity
+ // We want to count how many stacks of all sheets we're ordering to make sure they don't exceed the limit of 10
+ //If we already have a custom order on SSshuttle, we should add the things to order to that order
+ for(var/datum/supply_order/order in SSshuttle.shopping_list)
+ if(order.orderer == living_user && order.orderer_rank == "Galactic Materials Market")
+ var/prior_stacks = 0
+ for(var/obj/item/stack/sheet/sheet as anything in order.pack.contains)
+ prior_stacks += ROUND_UP(order.pack.contains[sheet] / 50)
+ if(prior_stacks >= 10)
+ to_chat(usr, span_notice("You already have 10 stacks of sheets on order! Please wait for them to arrive before ordering more."))
+ playsound(usr, 'sound/machines/synth_no.ogg', 35, FALSE)
+ return
+ order.append_order(things_to_order, cost)
+ account_payable.adjust_money(-(cost) , "Materials Market Purchase") //Add the extra price to the total
+ return
+ account_payable.adjust_money(-(CARGO_CRATE_VALUE) , "Materials Market Purchase") //Here is where we factor in the base cost of a crate
+ //Now we need to add a cargo order for quantity sheets of material_bought.sheet_type
+ var/datum/supply_pack/custom/minerals/mineral_pack = new(
+ purchaser = living_user, \
+ cost = SSstock_market.materials_prices[material_bought] * quantity, \
+ contains = things_to_order, \
+ )
+ var/datum/supply_order/new_order = new(
+ pack = mineral_pack,
+ orderer = living_user,
+ orderer_rank = "Galactic Materials Market",
+ orderer_ckey = living_user.ckey,
+ reason = "",
+ paying_account = account_payable,
+ department_destination = null,
+ coupon = null,
+ charge_on_purchase = FALSE,
+ manifest_can_fail = FALSE,
+ cost_type = "credit",
+ can_be_cancelled = FALSE,
+ )
+ say("Thank you for your purchase! It will arrive on the next cargo shuttle!")
+ SSshuttle.shopping_list += new_order
+ return
+ if("toggle_budget")
+ if(!can_buy_via_budget)
+ return
+ ordering_private = !ordering_private
+
+
+/obj/item/stock_block
+ name = "stock block"
+ desc = "A block of stock. It's worth a certain amount of money, based on a sale on the materials market. Ship it on the cargo shuttle to claim your money."
+ icon = 'icons/obj/economy.dmi'
+ icon_state = "stock_block"
+ /// How many credits was this worth when created?
+ var/export_value = 0
+ /// What is the name of the material this was made from?
+ var/datum/material/export_mat
+ /// Quantity of export material
+ var/quantity = 0
+ /// Is this stock block currently updating it's value with the market (aka fluid)?
+ var/fluid = FALSE
+
+/obj/item/stock_block/examine(mob/user)
+ . = ..()
+ . += span_notice("\The [src] is worth [export_value] cr, from selling [quantity] sheets of [export_mat?.name].")
+ if(fluid)
+ . += span_warning("\The [src] is currently liquid! It's value is based on the market price.")
+ else
+ . += span_notice("\The [src]'s value is still [span_boldnotice("locked in")]. [span_boldnotice("Sell it")] before it's value becomes liquid!")
+
+/obj/item/stock_block/Initialize(mapload)
+ . = ..()
+ addtimer(CALLBACK(src, PROC_REF(value_warning)), 2.5 MINUTES)
+ addtimer(CALLBACK(src, PROC_REF(update_value)), 5 MINUTES)
+
+/obj/item/stock_block/proc/value_warning()
+ visible_message(span_warning("\The [src] is starting to become liquid!"))
+ icon_state = "stock_block_fluid"
+ update_appearance(UPDATE_ICON_STATE)
+
+/obj/item/stock_block/proc/update_value()
+ if(!export_mat)
+ return
+ if(!SSstock_market.materials_prices[export_mat])
+ return
+ export_value = quantity * SSstock_market.materials_prices[export_mat] * MARKET_PROFIT_MODIFIER
+ icon_state = "stock_block_liquid"
+ update_appearance(UPDATE_ICON_STATE)
+ visible_message(span_warning("\The [src] becomes liquid!"))
+
diff --git a/code/modules/cargo/order.dm b/code/modules/cargo/order.dm
index 6c1f5e1d839..2707719c170 100644
--- a/code/modules/cargo/order.dm
+++ b/code/modules/cargo/order.dm
@@ -188,6 +188,15 @@
generateManifest(miscbox, misc_own, "", misc_cost)
return
+/datum/supply_order/proc/append_order(list/new_contents, cost_increase)
+ for(var/i as anything in new_contents)
+ if(pack.contains[i])
+ pack.contains[i] += new_contents[i]
+ else
+ pack.contains += i
+ pack.contains[i] = new_contents[i]
+ pack.cost += cost_increase
+
#undef MANIFEST_ERROR_CHANCE
#undef MANIFEST_ERROR_NAME
#undef MANIFEST_ERROR_CONTENTS
diff --git a/code/modules/cargo/orderconsole.dm b/code/modules/cargo/orderconsole.dm
index 2c815a803b6..b59cee9def7 100644
--- a/code/modules/cargo/orderconsole.dm
+++ b/code/modules/cargo/orderconsole.dm
@@ -113,9 +113,11 @@
message = blockade_warning
data["message"] = message
+ var/list/amount_by_name = list()
var/cart_list = list()
for(var/datum/supply_order/order in SSshuttle.shopping_list)
if(cart_list[order.pack.name])
+ amount_by_name[order.pack.name] += 1
cart_list[order.pack.name][1]["amount"]++
cart_list[order.pack.name][1]["cost"] += order.get_final_cost()
if(order.department_destination)
@@ -124,6 +126,7 @@
cart_list[order.pack.name][1]["paid"]++
continue
+ amount_by_name[order.pack.name] += 1
cart_list[order.pack.name] = list(list(
"cost_type" = order.cost_type,
"object" = order.pack.name,
@@ -141,19 +144,23 @@
data["requests"] = list()
- for(var/datum/supply_order/SO in SSshuttle.request_list)
+ for(var/datum/supply_order/order in SSshuttle.request_list)
+ var/datum/supply_pack/pack = order.pack
+ amount_by_name[pack.name] += 1
data["requests"] += list(list(
- "object" = SO.pack.name,
- "cost" = SO.pack.get_cost(),
- "orderer" = SO.orderer,
- "reason" = SO.reason,
- "id" = SO.id
+ "object" = pack.name,
+ "cost" = pack.get_cost(),
+ "orderer" = order.orderer,
+ "reason" = order.reason,
+ "id" = order.id
))
+ data["amount_by_name"] = amount_by_name
return data
/obj/machinery/computer/cargo/ui_static_data(mob/user)
var/list/data = list()
+ data["max_order"] = CARGO_MAX_ORDER
data["supplies"] = list()
for(var/pack in SSshuttle.supply_packs)
var/datum/supply_pack/P = SSshuttle.supply_packs[pack]
@@ -187,7 +194,7 @@
var/datum/supply_pack/pack = SSshuttle.supply_packs[id]
if(!istype(pack))
CRASH("Unknown supply pack id given by order console ui. ID: [id]")
- if(amount > 50 || amount < 1) // Holy shit fuck off
+ if(amount > CARGO_MAX_ORDER || amount < 1) // Holy shit fuck off
CRASH("Invalid amount passed into add_item")
if((pack.hidden && !(obj_flags & EMAGGED)) || (pack.contraband && !contraband) || pack.drop_pod_only || (pack.special && !pack.special_enabled))
return
@@ -222,8 +229,11 @@
say("[id_card] lacks the requisite access for this purchase.")
return
+ // The list we are operating on right now
+ var/list/working_list = SSshuttle.shopping_list
var/reason = ""
if(requestonly && !self_paid)
+ working_list = SSshuttle.request_list
reason = tgui_input_text(user, "Reason", name)
if(isnull(reason))
return
@@ -233,6 +243,13 @@
say("ERROR: Small crates may only be purchased by private accounts.")
return
+ var/similar_count = SSshuttle.supply.get_order_count(pack)
+ if(similar_count == OVER_ORDER_LIMIT)
+ playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
+ say("ERROR: No more then [CARGO_MAX_ORDER] of any pack may be ordered at once")
+ return
+
+ amount = clamp(amount, 1, CARGO_MAX_ORDER - similar_count)
for(var/count in 1 to amount)
var/obj/item/coupon/applied_coupon
for(var/obj/item/coupon/coupon_check in loaded_coupons)
@@ -242,15 +259,8 @@
applied_coupon = coupon_check
break
- //Skyrat Edit Add
- var/datum/supply_order/SO = new(pack = pack ,orderer = name, orderer_rank = rank, orderer_ckey = ckey, reason = reason, paying_account = account, coupon = applied_coupon, charge_on_purchase = TRUE)
- //Skyrat Edit End
- //SKYRAT EDIT - ORIGINAL: var/datum/supply_order/SO = new(pack = pack ,orderer = name, orderer_rank = rank, orderer_ckey = ckey, reason = reason, paying_account = account, coupon = applied_coupon)
-
- if(requestonly && !self_paid)
- SSshuttle.request_list += SO
- else
- SSshuttle.shopping_list += SO
+ var/datum/supply_order/order = new(pack = pack ,orderer = name, orderer_rank = rank, orderer_ckey = ckey, reason = reason, paying_account = account, coupon = applied_coupon, charge_on_purchase = TRUE) //SKYRAT EDIT CHANGE - ORIGINAL: var/datum/supply_order/order = new(pack = pack ,orderer = name, orderer_rank = rank, orderer_ckey = ckey, reason = reason, paying_account = account, coupon = applied_coupon)
+ working_list += order
if(self_paid)
say("Order processed. The price will be charged to [account.account_holder]'s bank account on delivery.")
@@ -365,9 +375,7 @@
if("remove")
var/order_name = params["order_name"]
//try removing atleast one item with the specified name. An order may not be removed if it was from the department
- //also we create an copy of the cart list else we would get runtimes when removing & iterating over the same SSshuttle.shopping_list
- var/list/shopping_cart = SSshuttle.shopping_list.Copy()
- for(var/datum/supply_order/order in shopping_cart)
+ for(var/datum/supply_order/order in SSshuttle.shopping_list)
if(order.pack.name != order_name)
continue
if(remove_item(order.id))
@@ -378,8 +386,7 @@
var/order_name = params["order_name"]
//clear out all orders with the above mentioned order_name name to make space for the new amount
- var/list/shopping_cart = SSshuttle.shopping_list.Copy() //we operate on the list copy else we would get runtimes when removing & iterating over the same SSshuttle.shopping_list
- for(var/datum/supply_order/order in shopping_cart) //find corresponding order id for the order name
+ for(var/datum/supply_order/order in SSshuttle.shopping_list) //find corresponding order id for the order name
if(order.pack.name == order_name)
remove_item(order.id)
@@ -387,7 +394,7 @@
var/amount = text2num(params["amount"])
if(amount == 0)
return TRUE
- if(amount > 50)
+ if(amount > CARGO_MAX_ORDER)
return
var/supply_pack_id = name_to_id(order_name) //map order name to supply pack id for adding
if(!supply_pack_id)
diff --git a/code/modules/cargo/packs/_packs.dm b/code/modules/cargo/packs/_packs.dm
index 357f32f3cb4..aaeb55f2533 100644
--- a/code/modules/cargo/packs/_packs.dm
+++ b/code/modules/cargo/packs/_packs.dm
@@ -86,7 +86,7 @@
return FALSE
var/list/open_turfs = list()
for(var/turf/open/floor/found_turf in get_area_turfs(pick(areas), subtypes = TRUE))
- open_turfs += found_turf
+ open_turfs += found_turf
if(!length(open_turfs))
return FALSE
@@ -110,3 +110,15 @@
name = "[purchaser]'s Mining Order"
src.cost = cost
src.contains = contains
+
+/datum/supply_pack/custom/minerals
+ name = "materials order"
+ crate_name = "galactic materials market delivery crate"
+ access = list()
+ crate_type = /obj/structure/closet/crate/cardboard
+
+/datum/supply_pack/custom/minerals/New(purchaser, cost, list/contains)
+ . = ..()
+ name = "[purchaser]'s Materials Order"
+ src.cost = cost
+ src.contains = contains
diff --git a/code/modules/cargo/packs/general.dm b/code/modules/cargo/packs/general.dm
index fa7a3bfa374..5bfcf01eb00 100644
--- a/code/modules/cargo/packs/general.dm
+++ b/code/modules/cargo/packs/general.dm
@@ -292,13 +292,6 @@
crate_value = value
contents_uplink_type = uplink
-/datum/supply_pack/misc/fishing_portal
- name = "Fishing Portal Generator Crate"
- desc = "Not enough fish near your location? Fishing portal has your back."
- cost = CARGO_CRATE_VALUE * 4
- contains = list(/obj/machinery/fishing_portal_generator)
- crate_name = "fishing portal crate"
-
/datum/supply_pack/misc/papercutter
name = "Paper Cutters Crate"
desc = "Contains 3 office-grade paper cutters, equipped with sharp blades that can cut any paper into two thin slips.\
diff --git a/code/modules/cargo/packs/imports.dm b/code/modules/cargo/packs/imports.dm
index ad444efc740..2c90d8603d0 100644
--- a/code/modules/cargo/packs/imports.dm
+++ b/code/modules/cargo/packs/imports.dm
@@ -303,3 +303,17 @@
contraband = TRUE
contains = list(/obj/item/weaponcrafting/giant_wrench)
crate_name = "unknown parts crate"
+
+/datum/supply_pack/imports/materials_market
+ name = "Galactic Materials Market Crate"
+ desc = "A circuit board to build your own materials market for use by certified market traders. Warning: Losses are not covered by insurance."
+ cost = CARGO_CRATE_VALUE * 3
+ contains = list(
+ /obj/item/circuitboard/machine/materials_market = 1,
+ /obj/item/stack/sheet/iron = 5,
+ /obj/item/stack/cable_coil/five = 2,
+ /obj/item/stock_parts/scanning_module = 1,
+ /obj/item/stock_parts/card_reader = 1
+ )
+ crate_name = "materials market crate"
+ crate_type = /obj/structure/closet/crate
diff --git a/code/modules/cargo/packs/materials.dm b/code/modules/cargo/packs/materials.dm
index 68dacd730be..ba9a162698b 100644
--- a/code/modules/cargo/packs/materials.dm
+++ b/code/modules/cargo/packs/materials.dm
@@ -16,34 +16,6 @@
contains = list(/obj/item/stack/license_plates/empty/fifty)
crate_name = "empty license plate crate"
-/datum/supply_pack/materials/glass50
- name = "50 Glass Sheets"
- desc = "Let some nice light in with fifty glass sheets!"
- cost = CARGO_CRATE_VALUE * 2
- contains = list(/obj/item/stack/sheet/glass/fifty)
- crate_name = "glass sheets crate"
-
-/datum/supply_pack/materials/iron50
- name = "50 Iron Sheets"
- desc = "Any construction project begins with a good stack of fifty iron sheets!"
- cost = CARGO_CRATE_VALUE * 2
- contains = list(/obj/item/stack/sheet/iron/fifty)
- crate_name = "iron sheets crate"
-
-/datum/supply_pack/materials/plasteel20
- name = "20 Plasteel Sheets"
- desc = "Reinforce the station's integrity with twenty plasteel sheets!"
- cost = CARGO_CRATE_VALUE * 15
- contains = list(/obj/item/stack/sheet/plasteel/twenty)
- crate_name = "plasteel sheets crate"
-
-/datum/supply_pack/materials/plasteel50
- name = "50 Plasteel Sheets"
- desc = "For when you REALLY have to reinforce something."
- cost = CARGO_CRATE_VALUE * 33
- contains = list(/obj/item/stack/sheet/plasteel/fifty)
- crate_name = "plasteel sheets crate"
-
/datum/supply_pack/materials/plastic50
name = "50 Plastic Sheets"
desc = "Build a limitless amount of toys with fifty plastic sheets!"
diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm
index 6794a1960e7..3cfb824b4e6 100644
--- a/code/modules/cargo/packs/medical.dm
+++ b/code/modules/cargo/packs/medical.dm
@@ -89,6 +89,7 @@
/obj/item/reagent_containers/cup/beaker/large,
/obj/item/reagent_containers/pill/insulin,
/obj/item/stack/medical/gauze,
+ /obj/item/storage/box/bandages,
/obj/item/storage/box/beakers,
/obj/item/storage/box/medigels,
/obj/item/storage/box/syringes,
diff --git a/code/modules/cargo/packs/stock_market_items.dm b/code/modules/cargo/packs/stock_market_items.dm
new file mode 100644
index 00000000000..04b2eac4acf
--- /dev/null
+++ b/code/modules/cargo/packs/stock_market_items.dm
@@ -0,0 +1,36 @@
+/**
+ * todo: make this a supply_pack/custom. Drop pog? ohoho yes. Would be VERY fun.
+ */
+/datum/supply_pack/market_materials
+ name = "A Single Sheet of Bananium"
+ desc = "Going market price for this kind of sheet, by Australicus Industrial Mining."
+ cost = CARGO_CRATE_VALUE * 2
+ // contains = list(/obj/item/stack/sheet/mineral/bananium)
+ crate_name = "mineral stock sheet crate"
+ group = "Canisters & Materials"
+ /// What material we are trying to buy sheets of?
+ var/datum/material/material
+ /// How many sheets of the material we are trying to buy at once?
+ var/amount
+
+/datum/supply_pack/market_materials/get_cost()
+ for(var/datum/material/mat in SSstock_market.materials_prices)
+ if(material == mat)
+ return SSstock_market.materials_prices[mat] * amount
+
+/datum/supply_pack/market_materials/fill(obj/structure/closet/crate/C)
+ . = ..()
+ new material.sheet_type(C, amount)
+
+/datum/supply_pack/market_materials/iron
+ name = "Iron Sheets"
+ crate_name = "iron stock crate"
+ material = /datum/material/iron
+MARKET_QUANTITY_HELPERS(/datum/supply_pack/market_materials/iron)
+
+
+/datum/supply_pack/market_materials/gold
+ name = "Gold Sheets"
+ crate_name = "gold stock crate"
+ material = /datum/material/gold
+MARKET_QUANTITY_HELPERS(/datum/supply_pack/market_materials/gold)
diff --git a/code/modules/client/preferences/middleware/antags.dm b/code/modules/client/preferences/middleware/antags.dm
index 3e51218edf2..888da90d5b7 100644
--- a/code/modules/client/preferences/middleware/antags.dm
+++ b/code/modules/client/preferences/middleware/antags.dm
@@ -116,6 +116,7 @@
/datum/asset/spritesheet/antagonists/create_spritesheets()
// Antagonists that don't have a dynamic ruleset, but do have a preference
var/static/list/non_ruleset_antagonists = list(
+ ROLE_CYBER_POLICE = /datum/antagonist/cyber_police,
ROLE_FUGITIVE = /datum/antagonist/fugitive,
ROLE_LONE_OPERATIVE = /datum/antagonist/nukeop/lone,
ROLE_DRIFTING_CONTRACTOR = /datum/antagonist/contractor, //SKYRAT EDIT
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 76194e721b6..3c26de45e64 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -154,6 +154,13 @@
flags_inv = HIDEHAIR
flags_cover = HEADCOVERSEYES
+/obj/item/clothing/head/chaplain/habit_veil
+ name = "nun veil"
+ desc = "No nunsene clothing."
+ icon_state = "nun_hood_alt"
+ flags_inv = HIDEHAIR | HIDEEARS
+ clothing_flags = SNUG_FIT // can't be knocked off by throwing a paper hat.
+
/obj/item/clothing/head/chaplain/bishopmitre
name = "bishop mitre"
desc = "An opulent hat that functions as a radio to God. Or as a lightning rod, depending on who you ask."
diff --git a/code/modules/clothing/outfits/plasmaman.dm b/code/modules/clothing/outfits/plasmaman.dm
index daad81ea475..a422d2d736e 100644
--- a/code/modules/clothing/outfits/plasmaman.dm
+++ b/code/modules/clothing/outfits/plasmaman.dm
@@ -281,3 +281,10 @@
gloves = /obj/item/clothing/gloves/color/plasmaman/clown
head = /obj/item/clothing/head/helmet/space/plasmaman/clown
mask = /obj/item/clothing/mask/gas/clown_hat/plasmaman
+
+/datum/outfit/plasmaman/bitrunner
+ name = "Bitrunner Plasmaman"
+
+ uniform = /obj/item/clothing/under/plasmaman/bitrunner
+ gloves = /obj/item/clothing/gloves/color/plasmaman/black
+ head = /obj/item/clothing/head/helmet/space/plasmaman/bitrunner
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index ceb31b23a28..30e43c793aa 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -443,3 +443,8 @@
or they've murdered one of your fellow badasses and have taken it from them as a trophy. Either way, anyone wearing this deserves at least a cursory nod of respect."
icon_state = "syndie_envirohelm"
inhand_icon_state = null
+
+/obj/item/clothing/head/helmet/space/plasmaman/bitrunner
+ name = "bitrunner's plasma envirosuit helmet"
+ desc = "An envirohelmet with extended blue light filters for bitrunning plasmamen."
+ icon_state = "bitrunner_envirohelm"
diff --git a/code/modules/clothing/suits/_suits.dm b/code/modules/clothing/suits/_suits.dm
index 13c9c358fac..84cb98049e1 100644
--- a/code/modules/clothing/suits/_suits.dm
+++ b/code/modules/clothing/suits/_suits.dm
@@ -8,6 +8,7 @@
/obj/item/tank/internals/emergency_oxygen,
/obj/item/tank/internals/plasmaman,
/obj/item/tank/jetpack/oxygen/captain,
+ /obj/item/storage/belt/holster,
)
armor_type = /datum/armor/none
drop_sound = 'sound/items/handling/cloth_drop.ogg'
diff --git a/code/modules/clothing/suits/jacket.dm b/code/modules/clothing/suits/jacket.dm
index ffd67ce4a65..6db889032c0 100644
--- a/code/modules/clothing/suits/jacket.dm
+++ b/code/modules/clothing/suits/jacket.dm
@@ -1,7 +1,16 @@
/obj/item/clothing/suit/jacket
icon = 'icons/obj/clothing/suits/jacket.dmi'
worn_icon = 'icons/mob/clothing/suits/jacket.dmi'
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/radio)
+ allowed = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals/emergency_oxygen,
+ /obj/item/tank/internals/plasmaman,
+ /obj/item/toy,
+ /obj/item/storage/fancy/cigarettes,
+ /obj/item/lighter,
+ /obj/item/radio,
+ /obj/item/storage/belt/holster,
+ )
body_parts_covered = CHEST|GROIN|ARMS
cold_protection = CHEST|GROIN|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
diff --git a/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm b/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm
index 1590fa77138..a8674b03c94 100644
--- a/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm
+++ b/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm
@@ -115,6 +115,12 @@
icon_state = "clown_envirosuit"
inhand_icon_state = null
+/obj/item/clothing/under/plasmaman/bitrunner
+ name = "bitrunner envirosuit"
+ desc = "An envirosuit specially designed for plasmamen with bad posture."
+ icon_state = "bitrunner_envirosuit"
+ inhand_icon_state = null
+
/obj/item/clothing/under/plasmaman/clown/Initialize(mapload)
. = ..()
AddElement(/datum/element/swabable, CELL_LINE_TABLE_CLOWN, CELL_VIRUS_TABLE_GENERIC, rand(2,3), 0)
diff --git a/code/modules/clothing/under/jobs/cargo.dm b/code/modules/clothing/under/jobs/cargo.dm
index 4b2e74bff38..e3145fb740d 100644
--- a/code/modules/clothing/under/jobs/cargo.dm
+++ b/code/modules/clothing/under/jobs/cargo.dm
@@ -62,3 +62,9 @@
desc = "A grey uniform for operating in hazardous environments."
icon_state = "explorer"
inhand_icon_state = null
+
+/obj/item/clothing/under/rank/cargo/bitrunner
+ name = "bitrunner's jumpsuit"
+ desc = "It's a leathery jumpsuit worn by a bitrunner. Tacky, but comfortable to wear if sitting for prolonged periods of time."
+ icon_state = "bitrunner"
+ inhand_icon_state = "w_suit"
diff --git a/code/modules/economy/account.dm b/code/modules/economy/account.dm
index 3be319fd233..b4703945092 100644
--- a/code/modules/economy/account.dm
+++ b/code/modules/economy/account.dm
@@ -7,6 +7,8 @@
var/account_balance = 0
///How many mining points (shaft miner credits) is held in the bank account, used for mining vendors.
var/mining_points = 0
+ /// Points for bit runner's vendor. Awarded for completing virtual domains.
+ var/bitrunning_points = 0
///Debt. If higher than 0, A portion of the credits is earned (or the whole debt, whichever is lower) will go toward paying it off.
var/account_debt = 0
///If there are things effecting how much income a player will get, it's reflected here 1 is standard for humans.
diff --git a/code/modules/events/wizard/blobies.dm b/code/modules/events/wizard/blobies.dm
index 307d01ff7eb..0a9c96d5135 100644
--- a/code/modules/events/wizard/blobies.dm
+++ b/code/modules/events/wizard/blobies.dm
@@ -10,4 +10,4 @@
/datum/round_event/wizard/blobies/start()
for(var/mob/living/carbon/human/H in GLOB.dead_mob_list)
- new /mob/living/simple_animal/hostile/blob/blobspore(H.loc)
+ new /mob/living/basic/blob_minion/spore/minion(H.loc) // Creates zombies which ghosts can control
diff --git a/code/modules/experisci/destructive_scanner.dm b/code/modules/experisci/destructive_scanner.dm
index 3591a31cd7b..ef89dc9b94a 100644
--- a/code/modules/experisci/destructive_scanner.dm
+++ b/code/modules/experisci/destructive_scanner.dm
@@ -19,10 +19,17 @@
// Late load to ensure the component initialization occurs after the machines are initialized
/obj/machinery/destructive_scanner/LateInitialize()
. = ..()
+
+ var/static/list/destructive_signals = list(
+ COMSIG_MACHINERY_DESTRUCTIVE_SCAN = TYPE_PROC_REF(/datum/component/experiment_handler, try_run_destructive_experiment),
+ )
+
AddComponent(/datum/component/experiment_handler, \
allowed_experiments = list(/datum/experiment/scanning),\
config_mode = EXPERIMENT_CONFIG_CLICK, \
- start_experiment_callback = CALLBACK(src, PROC_REF(activate)))
+ start_experiment_callback = CALLBACK(src, PROC_REF(activate)), \
+ experiment_signals = destructive_signals, \
+ )
///Activates the machine; checks if it can actually scan, then starts.
/obj/machinery/destructive_scanner/proc/activate()
diff --git a/code/modules/experisci/experiment/experiments.dm b/code/modules/experisci/experiment/experiments.dm
index 1959a849598..1259f56597d 100644
--- a/code/modules/experisci/experiment/experiments.dm
+++ b/code/modules/experisci/experiment/experiments.dm
@@ -291,7 +291,6 @@
/obj/machinery/rnd/experimentor = 1,
/obj/machinery/medical_kiosk = 2,
/obj/machinery/piratepad/civilian = 2,
- /obj/machinery/rnd/bepis = 3
)
required_stock_part = /obj/item/stock_parts/scanning_module/adv
@@ -332,7 +331,7 @@
///Damage percent that each mech needs to be at for a scan to work.
var/damage_percent
-/datum/experiment/scanning/random/mecha_damage_scan/New()
+/datum/experiment/scanning/random/mecha_damage_scan/New(datum/techweb/techweb)
. = ..()
damage_percent = rand(15, 95)
//updating the description with the damage_percent var set
diff --git a/code/modules/experisci/experiment/handlers/experiment_handler.dm b/code/modules/experisci/experiment/handlers/experiment_handler.dm
index abc5d4ad1dd..29e7da95391 100644
--- a/code/modules/experisci/experiment/handlers/experiment_handler.dm
+++ b/code/modules/experisci/experiment/handlers/experiment_handler.dm
@@ -38,6 +38,7 @@
disallowed_traits = null,
config_flags = null,
datum/callback/start_experiment_callback = null,
+ list/experiment_signals
)
. = ..()
if(!ismovable(parent))
@@ -49,13 +50,8 @@
src.config_flags = config_flags
src.start_experiment_callback = start_experiment_callback
- if(isitem(parent))
- RegisterSignal(parent, COMSIG_ITEM_PRE_ATTACK, PROC_REF(try_run_handheld_experiment))
- RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(ignored_handheld_experiment_attempt))
- if(istype(parent, /obj/machinery/destructive_scanner))
- RegisterSignal(parent, COMSIG_MACHINERY_DESTRUCTIVE_SCAN, PROC_REF(try_run_destructive_experiment))
- if(istype(parent, /obj/machinery/computer/operating))
- RegisterSignal(parent, COMSIG_OPERATING_COMPUTER_AUTOPSY_COMPLETE, PROC_REF(try_run_autopsy_experiment))
+ for(var/signal in experiment_signals)
+ RegisterSignal(parent, signal, experiment_signals[signal])
// Determine UI display mode
switch(config_mode)
@@ -85,9 +81,9 @@
*/
/datum/component/experiment_handler/proc/try_run_handheld_experiment(datum/source, atom/target, mob/user, params)
SIGNAL_HANDLER
- if (!should_run_handheld_experiment(source, target, user, params))
+ if (!should_run_handheld_experiment(source, target, user))
return
- INVOKE_ASYNC(src, PROC_REF(try_run_handheld_experiment_async), source, target, user, params)
+ INVOKE_ASYNC(src, PROC_REF(try_run_handheld_experiment_async), source, target, user)
return COMPONENT_CANCEL_ATTACK_CHAIN
/**
@@ -98,7 +94,7 @@
if (!proximity_flag)
return
. |= COMPONENT_AFTERATTACK_PROCESSED_ITEM
- if (selected_experiment == null && !(config_flags & EXPERIMENT_CONFIG_ALWAYS_ACTIVE))
+ if ((selected_experiment == null && !(config_flags & EXPERIMENT_CONFIG_ALWAYS_ACTIVE)) || config_flags & EXPERIMENT_CONFIG_SILENT_FAIL)
return .
playsound(user, 'sound/machines/buzz-sigh.ogg', 25)
to_chat(user, span_notice("[target] is not related to your currently selected experiment."))
@@ -107,7 +103,7 @@
/**
* Checks that an experiment can be run using the provided target, used for preventing the cancellation of the attack chain inappropriately
*/
-/datum/component/experiment_handler/proc/should_run_handheld_experiment(datum/source, atom/target, mob/user, params)
+/datum/component/experiment_handler/proc/should_run_handheld_experiment(datum/source, atom/target, mob/user)
// Check that there is actually an experiment selected
if (selected_experiment == null && !(config_flags & EXPERIMENT_CONFIG_ALWAYS_ACTIVE))
return
@@ -127,16 +123,17 @@
/**
* This proc exists because Jared Fogle really likes async
*/
-/datum/component/experiment_handler/proc/try_run_handheld_experiment_async(datum/source, atom/target, mob/user, params)
+/datum/component/experiment_handler/proc/try_run_handheld_experiment_async(datum/source, atom/target, mob/user)
if (selected_experiment == null && !(config_flags & EXPERIMENT_CONFIG_ALWAYS_ACTIVE))
- to_chat(user, span_notice("You do not have an experiment selected!"))
+ if(!(config_flags & EXPERIMENT_CONFIG_SILENT_FAIL))
+ to_chat(user, span_notice("You do not have an experiment selected!"))
return
- if(!do_after(user, 1 SECONDS, target = target))
+ if(!(config_flags & EXPERIMENT_CONFIG_IMMEDIATE_ACTION) && !do_after(user, 1 SECONDS, target = target))
return
if(action_experiment(source, target))
playsound(user, 'sound/machines/ping.ogg', 25)
to_chat(user, span_notice("You scan [target]."))
- else
+ else if(!(config_flags & EXPERIMENT_CONFIG_SILENT_FAIL))
playsound(user, 'sound/machines/buzz-sigh.ogg', 25)
to_chat(user, span_notice("[target] is not related to your currently selected experiment."))
@@ -148,8 +145,9 @@
SIGNAL_HANDLER
var/atom/movable/our_scanner = parent
if (selected_experiment == null)
- playsound(our_scanner, 'sound/machines/buzz-sigh.ogg', 25)
- to_chat(our_scanner, span_notice("No experiment selected!"))
+ if(!(config_flags & EXPERIMENT_CONFIG_SILENT_FAIL))
+ playsound(our_scanner, 'sound/machines/buzz-sigh.ogg', 25)
+ to_chat(our_scanner, span_notice("No experiment selected!"))
return
var/successful_scan
for(var/scan_target in scanned_atoms)
@@ -159,7 +157,7 @@
if(successful_scan)
playsound(our_scanner, 'sound/machines/ping.ogg', 25)
to_chat(our_scanner, span_notice("The scan succeeds."))
- else
+ else if(!(config_flags & EXPERIMENT_CONFIG_SILENT_FAIL))
playsound(src, 'sound/machines/buzz-sigh.ogg', 25)
our_scanner.say("The scan did not result in anything.")
@@ -261,6 +259,7 @@
/datum/component/experiment_handler/proc/link_techweb(datum/techweb/new_web)
if (new_web == linked_web)
return
+ selected_experiment?.on_unselected(src)
selected_experiment = null
linked_web = new_web
@@ -268,6 +267,7 @@
* Unlinks this handler from the selected techweb
*/
/datum/component/experiment_handler/proc/unlink_techweb()
+ selected_experiment?.on_unselected(src)
selected_experiment = null
linked_web = null
@@ -278,13 +278,15 @@
* * experiment - The experiment to attempt to link to
*/
/datum/component/experiment_handler/proc/link_experiment(datum/experiment/experiment)
- if (experiment && can_select_experiment(experiment))
+ if (can_select_experiment(experiment))
selected_experiment = experiment
+ selected_experiment.on_selected(src)
/**
* Unlinks this handler from the selected experiment
*/
/datum/component/experiment_handler/proc/unlink_experiment()
+ selected_experiment?.on_unselected(src)
selected_experiment = null
/**
@@ -299,31 +301,19 @@
return FALSE
// Check against the list of allowed experimentors
- if (experiment.allowed_experimentors && experiment.allowed_experimentors.len)
- var/matched = FALSE
- for (var/experimentor in experiment.allowed_experimentors)
- if (istype(parent, experimentor))
- matched = TRUE
- break
- if (!matched)
- return FALSE
+ if (length(experiment.allowed_experimentors) && !is_type_in_list(parent, experiment.allowed_experimentors))
+ return FALSE
// Check that this experiment is visible currently
- if (!linked_web || !(experiment in linked_web.available_experiments))
+ if (!(experiment in linked_web?.available_experiments))
return FALSE
// Check that this experiment type isn't blacklisted
- for (var/badsci in blacklisted_experiments)
- if (istype(experiment, badsci))
- return FALSE
-
- // Check against the allowed experiment types
- for (var/goodsci in allowed_experiments)
- if (istype(experiment, goodsci))
- return TRUE
+ if(is_type_in_list(experiment, blacklisted_experiments))
+ return FALSE
- // If we haven't returned yet then this shouldn't be allowed
- return FALSE
+ // Finally, check against the allowed experiment types
+ return is_type_in_list(experiment, allowed_experiments)
/datum/component/experiment_handler/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
@@ -355,12 +345,13 @@
.["techwebs"] += list(data)
.["experiments"] = list()
if (linked_web)
- for (var/datum/experiment/experiment in linked_web.available_experiments)
+ for (var/datum/experiment/experiment as anything in linked_web.available_experiments)
+ if(!can_select_experiment(experiment))
+ continue
var/list/data = list(
name = experiment.name,
description = experiment.description,
tag = experiment.exp_tag,
- selectable = can_select_experiment(experiment),
selected = selected_experiment == experiment,
progress = experiment.check_progress(),
performance_hint = experiment.performance_hint,
diff --git a/code/modules/experisci/experiment/types/experiment.dm b/code/modules/experisci/experiment/types/experiment.dm
index f760723f8db..add015622f6 100644
--- a/code/modules/experisci/experiment/types/experiment.dm
+++ b/code/modules/experisci/experiment/types/experiment.dm
@@ -22,11 +22,16 @@
/// A textual hint shown on the UI in a tooltip to help a user determine how to perform
/// the experiment
var/performance_hint
+ /**
+ * If set, these techweb points will be rewarded for completing the experiment.
+ * Useful for those loose ends not tied to any specific node discount or requirement.
+ */
+ var/list/points_reward
/**
* Performs any necessary initialization of tags and other variables
*/
-/datum/experiment/New()
+/datum/experiment/New(datum/techweb/techweb)
if (traits & EXPERIMENT_TRAIT_DESTRUCTIVE)
exp_tag = "Destructive [exp_tag]"
@@ -60,6 +65,14 @@
/datum/experiment/proc/actionable(...)
return !is_complete()
+///Called when the experiment is selected by an experiment handler, for specific signals and the such.
+/datum/experiment/proc/on_selected(datum/component/experiment_handler/experiment_handler)
+ return
+
+///Called when the opposite happens.
+/datum/experiment/proc/on_unselected(datum/component/experiment_handler/experiment_handler)
+ return
+
/**
* Proc that tries to perform the experiment, and then checks if its completed.
*/
diff --git a/code/modules/experisci/experiment/types/exploration.dm b/code/modules/experisci/experiment/types/exploration.dm
index a6a5d2cd4cf..821e69a103a 100644
--- a/code/modules/experisci/experiment/types/exploration.dm
+++ b/code/modules/experisci/experiment/types/exploration.dm
@@ -52,7 +52,7 @@
/// If not null the required_condition will be picked from this list
var/list/possible_random_site_types
-/datum/experiment/exploration_scan/random/New()
+/datum/experiment/exploration_scan/random/New(datum/techweb/techweb)
. = ..()
if(length(possible_random_site_types))
required_site_type = pick(possible_random_site_types)
diff --git a/code/modules/experisci/experiment/types/random_scanning.dm b/code/modules/experisci/experiment/types/random_scanning.dm
index e80a80b5a0e..c9d39bd47b4 100644
--- a/code/modules/experisci/experiment/types/random_scanning.dm
+++ b/code/modules/experisci/experiment/types/random_scanning.dm
@@ -8,7 +8,7 @@
/// Max amount of a requirement per type
var/max_requirement_per_type = 100
-/datum/experiment/scanning/random/New()
+/datum/experiment/scanning/random/New(datum/techweb/techweb)
// Generate random contents
if (possible_types.len)
var/picked = 0
diff --git a/code/modules/experisci/experiment/types/scanning.dm b/code/modules/experisci/experiment/types/scanning.dm
index d9bbed88c8f..54bd2ad637e 100644
--- a/code/modules/experisci/experiment/types/scanning.dm
+++ b/code/modules/experisci/experiment/types/scanning.dm
@@ -17,16 +17,18 @@
var/list/required_atoms = list()
/// The list of atoms with sub-lists of atom references for scanned atoms contributing to the experiment (Or a count of atoms destoryed for destructive expiriments)
var/list/scanned = list()
+ /// If set, it'll be used in place of the generic "Scan samples of \a [initial(target.name)]" in serialize_progress_stage()
+ var/scan_message
/**
* Initializes the scanned atoms lists
*
* Initializes the internal scanned atoms list to keep track of which atoms have already been scanned
*/
-/datum/experiment/scanning/New()
+/datum/experiment/scanning/New(datum/techweb/techweb)
. = ..()
for (var/req_atom in required_atoms)
- scanned[req_atom] = traits & EXPERIMENT_TRAIT_DESTRUCTIVE ? 0 : list()
+ scanned[req_atom] = (traits & EXPERIMENT_TRAIT_DESTRUCTIVE && !(traits & EXPERIMENT_TRAIT_TYPECACHE)) ? 0 : list()
/**
* Checks if the scanning experiment is complete
@@ -37,8 +39,12 @@
/datum/experiment/scanning/is_complete()
. = TRUE
var/destructive = traits & EXPERIMENT_TRAIT_DESTRUCTIVE
+ var/typecache = traits & EXPERIMENT_TRAIT_TYPECACHE
for (var/req_atom in required_atoms)
var/list/seen = scanned[req_atom]
+ ///typecache experiments work all the same whether it's destructive or not
+ if(typecache && length(seen) == required_atoms[req_atom])
+ continue
if (destructive && (!(req_atom in scanned) || scanned[req_atom] != required_atoms[req_atom]))
return FALSE
if (!destructive && (!seen || seen.len != required_atoms[req_atom]))
@@ -65,8 +71,9 @@
* * seen_instances - The number of instances seen of this atom
*/
/datum/experiment/scanning/proc/serialize_progress_stage(atom/target, list/seen_instances)
- var/scanned_total = traits & EXPERIMENT_TRAIT_DESTRUCTIVE ? scanned[target] : seen_instances.len
- return EXPERIMENT_PROG_INT("Scan samples of \a [initial(target.name)]", scanned_total, required_atoms[target])
+ var/scanned_total = (traits & EXPERIMENT_TRAIT_DESTRUCTIVE && !(traits & EXPERIMENT_TRAIT_TYPECACHE)) ? scanned[target] : seen_instances.len
+ var/message = scan_message || "Scan samples of \a [initial(target.name)]"
+ return EXPERIMENT_PROG_INT(message, scanned_total, required_atoms[target])
/**
* Attempts to scan an atom towards the experiment's goal
@@ -79,7 +86,10 @@
/datum/experiment/scanning/perform_experiment_actions(datum/component/experiment_handler/experiment_handler, atom/target)
var/contributing_index_value = get_contributing_index(target)
if (contributing_index_value)
- scanned[contributing_index_value] += traits & EXPERIMENT_TRAIT_DESTRUCTIVE ? 1 : WEAKREF(target)
+ if(traits & EXPERIMENT_TRAIT_TYPECACHE)
+ scanned[contributing_index_value][target.type] = TRUE
+ else
+ scanned[contributing_index_value] += traits & EXPERIMENT_TRAIT_DESTRUCTIVE ? 1 : WEAKREF(target)
if(traits & EXPERIMENT_TRAIT_DESTRUCTIVE && !isliving(target))//only qdel things when destructive scanning and they're not living (living things get gibbed)
qdel(target)
do_after_experiment(target, contributing_index_value)
diff --git a/code/modules/experisci/experiment/types/scanning_fish.dm b/code/modules/experisci/experiment/types/scanning_fish.dm
new file mode 100644
index 00000000000..83978010869
--- /dev/null
+++ b/code/modules/experisci/experiment/types/scanning_fish.dm
@@ -0,0 +1,116 @@
+///a superlist containing typecaches shared between the several fish scanning experiments for each techweb.
+GLOBAL_LIST_EMPTY(scanned_fish_by_techweb)
+
+/**
+ * A special scanning experiment that unlocks further settings for the fishing portal generator.
+ * Mainly as an inventive solution to many a fish source being limited to maps that have it,
+ * and to make the fishing portal generator a bit than just gubby and goldfish.
+ */
+/datum/experiment/scanning/fish
+ name = "Fish Scanning Experiment 1"
+ description = "An experiment requiring different fish species to be scanned to unlock the 'Beach' setting for the fishing portal generator."
+ performance_hint = "Scan fish. Examine scanner to review progress. Unlock new fishing portals."
+ allowed_experimentors = list(/obj/item/experi_scanner, /obj/machinery/destructive_scanner, /obj/item/fishing_rod/tech)
+ traits = EXPERIMENT_TRAIT_TYPECACHE
+ points_reward = list(TECHWEB_POINT_TYPE_GENERIC = 750)
+ required_atoms = list(/obj/item/fish = 4)
+ scan_message = "Scan different species of fish"
+ ///Further experiments added to the techweb when this one is completed.
+ var/list/next_experiments = list(/datum/experiment/scanning/fish/second)
+ ///Completing a experiment may also enable a fish source to be used for use for the portal generator.
+ var/fish_source_reward = /datum/fish_source/portal/beach
+
+/**
+ * We make sure the scanned list is shared between all fish scanning experiments for this techweb,
+ * since this is about scanning each species, and having to redo it for each species is a hassle.
+ */
+/datum/experiment/scanning/fish/New(datum/techweb/techweb)
+ . = ..()
+ if(isnull(techweb))
+ return
+ var/techweb_ref = REF(techweb)
+ var/list/scanned_fish = GLOB.scanned_fish_by_techweb[techweb_ref]
+ if(isnull(scanned_fish))
+ scanned_fish = list()
+ GLOB.scanned_fish_by_techweb[techweb_ref] = scanned_fish
+ for(var/atom_type in required_atoms)
+ LAZYINITLIST(scanned_fish[atom_type])
+ scanned = scanned_fish
+
+/**
+ * Registers a couple signals to review the fish scanned so far.
+ * It'd be an hassle not having any way (beside memory) to know which fish species have been scanned already otherwise.
+ */
+/datum/experiment/scanning/fish/on_selected(datum/component/experiment_handler/experiment_handler)
+ RegisterSignal(experiment_handler.parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_handler_examine))
+ RegisterSignal(experiment_handler.parent, COMSIG_ATOM_EXAMINE_MORE, PROC_REF(on_handler_examine_more))
+
+/datum/experiment/scanning/fish/on_unselected(datum/component/experiment_handler/experiment_handler)
+ UnregisterSignal(experiment_handler.parent, list(COMSIG_ATOM_EXAMINE, COMSIG_ATOM_EXAMINE_MORE))
+
+/datum/experiment/scanning/fish/proc/on_handler_examine(datum/source, mob/user, list/examine_list)
+ SIGNAL_HANDLER
+ examine_list += span_notice("Examine again to review all the species of fish scanned so far.")
+
+/datum/experiment/scanning/fish/proc/on_handler_examine_more(datum/source, mob/user, list/examine_list)
+ SIGNAL_HANDLER
+ var/message = span_notice("Fish species scanned hitherto, if any:")
+ message += ""
+ for(var/atom_type in required_atoms)
+ for(var/obj/item/fish/fish_path as anything in scanned[atom_type])
+ message += "[initial(fish_path.name)]"
+ message += ""
+ examine_list += message
+
+///Only scannable fish will contribute towards the experiment.
+/datum/experiment/scanning/fish/final_contributing_index_checks(obj/item/fish/target, typepath)
+ return target.experisci_scannable
+
+/**
+ * After a fish scanning experiment is done, more may be unlocked. If so, add them to the techweb
+ * and automatically link the handler to the next experiment in the list as a bit of qol.
+ */
+/datum/experiment/scanning/fish/finish_experiment(datum/component/experiment_handler/experiment_handler, ...)
+ . = ..()
+ if(next_experiments)
+ experiment_handler.linked_web.add_experiments(next_experiments)
+ var/datum/experiment/next_in_line = locate(next_experiments[1]) in experiment_handler.linked_web.available_experiments
+ experiment_handler.link_experiment(next_in_line)
+
+/datum/experiment/scanning/fish/second
+ name = "Fish Scanning Experiment 2"
+ description = "An experiment requiring more fish species to be scanned to unlock the 'Chasm' setting for the fishing portal."
+ points_reward = list(TECHWEB_POINT_TYPE_GENERIC = 1500)
+ required_atoms = list(/obj/item/fish = 8)
+ next_experiments = list(/datum/experiment/scanning/fish/third)
+ fish_source_reward = /datum/fish_source/portal/chasm
+
+/datum/experiment/scanning/fish/third
+ name = "Fish Scanning Experiment 3"
+ description = "An experiment requiring even more fish species to be scanned to unlock the 'Ocean' setting for the fishing portal."
+ points_reward = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
+ required_atoms = list(/obj/item/fish = 14)
+ next_experiments = list(/datum/experiment/scanning/fish/fourth, /datum/experiment/scanning/fish/holographic)
+ fish_source_reward = /datum/fish_source/portal/ocean
+
+/datum/experiment/scanning/fish/holographic
+ name = "Holographic Fish Scanning Experiment"
+ description = "This one actually requires holographic fish to unlock the 'Randomizer' setting for the fishing portal."
+ performance_hint = "Load in the 'Beach' template at the Holodeck to fish some holo-fish."
+ points_reward = list(TECHWEB_POINT_TYPE_GENERIC = 500)
+ required_atoms = list(/obj/item/fish/holo = 4)
+ scan_message = "Scan different species of holographic fish"
+ next_experiments = null
+ fish_source_reward = /datum/fish_source/portal/random
+
+///holo fishes are normally unscannable, but this is an experiment for them, so we don't care for the experisci_scannable variable.
+/datum/experiment/scanning/fish/holographic/final_contributing_index_checks(obj/item/fish/target, typepath)
+ return TRUE
+
+/datum/experiment/scanning/fish/fourth
+ name = "Fish Scanning Experiment 4"
+ description = "An experiment requiring lotsa fish species to unlock the 'Hyperspace' setting for the fishing portal."
+ points_reward = list(TECHWEB_POINT_TYPE_GENERIC = 3250)
+ required_atoms = list(/obj/item/fish = 21)
+ next_experiments = null
+ fish_source_reward = /datum/fish_source/portal/hyperspace
diff --git a/code/modules/experisci/experiment/types/scanning_material.dm b/code/modules/experisci/experiment/types/scanning_material.dm
index 714205289de..fb8a7ff354b 100644
--- a/code/modules/experisci/experiment/types/scanning_material.dm
+++ b/code/modules/experisci/experiment/types/scanning_material.dm
@@ -9,7 +9,7 @@
///List of materials actually required, indexed by the atom that is required.
var/required_materials = list()
-/datum/experiment/scanning/random/material/New()
+/datum/experiment/scanning/random/material/New(datum/techweb/techweb)
. = ..()
for(var/req_atom in required_atoms)
var/chosen_material = pick(possible_material_types)
diff --git a/code/modules/experisci/experiment/types/scanning_plants.dm b/code/modules/experisci/experiment/types/scanning_plants.dm
index c34822d6e7e..b92a4cc20b4 100644
--- a/code/modules/experisci/experiment/types/scanning_plants.dm
+++ b/code/modules/experisci/experiment/types/scanning_plants.dm
@@ -10,7 +10,7 @@
///List of plant genes actually required, indexed by the atom that is required.
var/list/required_genes = list()
-/datum/experiment/scanning/random/plants/New()
+/datum/experiment/scanning/random/plants/New(datum/techweb/techweb)
. = ..()
if(possible_plant_genes.len)
for(var/req_atom in required_atoms)
diff --git a/code/modules/experisci/handheld_scanner.dm b/code/modules/experisci/handheld_scanner.dm
index e0fd4d480d5..97aa034afa1 100644
--- a/code/modules/experisci/handheld_scanner.dm
+++ b/code/modules/experisci/handheld_scanner.dm
@@ -19,9 +19,15 @@
// Late initialize to allow for the rnd servers to initialize first
/obj/item/experi_scanner/LateInitialize()
. = ..()
+ var/static/list/handheld_signals = list(
+ COMSIG_ITEM_PRE_ATTACK = TYPE_PROC_REF(/datum/component/experiment_handler, try_run_handheld_experiment),
+ COMSIG_ITEM_AFTERATTACK = TYPE_PROC_REF(/datum/component/experiment_handler, ignored_handheld_experiment_attempt),
+ )
AddComponent(/datum/component/experiment_handler, \
- allowed_experiments = list(/datum/experiment/scanning, /datum/experiment/physical),\
- disallowed_traits = EXPERIMENT_TRAIT_DESTRUCTIVE)
+ allowed_experiments = list(/datum/experiment/scanning, /datum/experiment/physical), \
+ disallowed_traits = EXPERIMENT_TRAIT_DESTRUCTIVE, \
+ experiment_signals = handheld_signals, \
+ )
/obj/item/experi_scanner/suicide_act(mob/living/carbon/user)
user.visible_message(span_suicide("[user] is giving in to the Great Toilet Beyond! It looks like [user.p_theyre()] trying to commit suicide!"))
diff --git a/code/modules/fishing/aquarium/fish_analyzer.dm b/code/modules/fishing/aquarium/fish_analyzer.dm
index c7feab860ca..8afe053a4d5 100644
--- a/code/modules/fishing/aquarium/fish_analyzer.dm
+++ b/code/modules/fishing/aquarium/fish_analyzer.dm
@@ -190,16 +190,17 @@
if(fish.status != FISH_DEAD)
render_list += "\n"
- var/hunger = PERCENT(min((world.time - fish.last_feeding) / fish.feeding_frequency, 1))
- var/hunger_string = "[hunger]%"
- switch(hunger)
- if(0 to 60)
- hunger_string = span_info(hunger_string)
- if(60 to 90)
- hunger_string = span_warning(hunger_string)
- if(90 to 100)
- hunger_string = span_alert(hunger_string)
- render_list += "Hunger: [hunger_string]\n"
+ if(!HAS_TRAIT(fish, TRAIT_FISH_NO_HUNGER))
+ var/hunger = PERCENT(min((world.time - fish.last_feeding) / fish.feeding_frequency, 1))
+ var/hunger_string = "[hunger]%"
+ switch(hunger)
+ if(0 to 60)
+ hunger_string = span_info(hunger_string)
+ if(60 to 90)
+ hunger_string = span_warning(hunger_string)
+ if(90 to 100)
+ hunger_string = span_alert(hunger_string)
+ render_list += "Hunger: [hunger_string]\n"
var/time_left = round(max(fish.breeding_wait - world.time, 0)/10)
render_list += "Time until it can breed: [time_left] seconds"
diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm
index 21585a07546..1275886141b 100644
--- a/code/modules/fishing/fish/_fish.dm
+++ b/code/modules/fishing/fish/_fish.dm
@@ -136,6 +136,9 @@
var/min_pressure = WARNING_LOW_PRESSURE
var/max_pressure = HAZARD_HIGH_PRESSURE
+ /// If this fish type counts towards the Fish Species Scanning experiments
+ var/experisci_scannable = TRUE
+
/obj/item/fish/Initialize(mapload, apply_qualities = TRUE)
. = ..()
AddComponent(/datum/component/aquarium_content, PROC_REF(get_aquarium_animation), list(COMSIG_FISH_STATUS_CHANGED,COMSIG_FISH_STIRRED))
@@ -175,7 +178,7 @@
balloon_alert(user, "[src] is dead!")
return TRUE
feed(item.reagents)
- balloon_alert(user, "you feed [src]")
+ balloon_alert(user, "fed [src]")
return TRUE
/obj/item/fish/examine(mob/user)
@@ -185,14 +188,14 @@
. += span_notice("It weighs [weight] g.")
///Randomizes weight and size.
-/obj/item/fish/proc/randomize_size_and_weight(avg_size = average_size, avg_weight = average_weight, deviation = 0.2, first_run = FALSE)
- var/size_deviation = 0.2 * avg_size
- var/new_size = round(max(1,gaussian(avg_size, size_deviation)), 1)
+/obj/item/fish/proc/randomize_size_and_weight(base_size = average_size, base_weight = average_weight, deviation = 0.2)
+ var/size_deviation = 0.2 * base_size
+ var/new_size = round(clamp(gaussian(base_size, size_deviation), average_size * 1/MAX_FISH_DEVIATION_COEFF, average_size * MAX_FISH_DEVIATION_COEFF))
- var/weight_deviation = 0.2 * avg_weight
- var/new_weight = round(max(1,gaussian(avg_weight, weight_deviation)), 1)
+ var/weight_deviation = 0.2 * base_weight
+ var/new_weight = round(clamp(gaussian(base_weight, weight_deviation), average_weight * 1/MAX_FISH_DEVIATION_COEFF, average_weight * MAX_FISH_DEVIATION_COEFF))
- update_size_and_weight(new_size, new_weight, first_run)
+ update_size_and_weight(new_size, new_weight)
///Updates weight and size, along with weight class, number of fillets you can get and grind results.
/obj/item/fish/proc/update_size_and_weight(new_size = average_size, new_weight = average_weight)
@@ -414,11 +417,14 @@
return FALSE
return TRUE
+/obj/item/fish/proc/is_hungry()
+ return !HAS_TRAIT(src, TRAIT_FISH_NO_HUNGER) && world.time - last_feeding >= feeding_frequency
+
/obj/item/fish/proc/process_health(seconds_per_tick)
var/health_change_per_second = 0
if(!proper_environment())
health_change_per_second -= 3 //Dying here
- if(world.time - last_feeding >= feeding_frequency)
+ if(is_hungry())
health_change_per_second -= 0.5 //Starving
else
health_change_per_second += 0.5 //Slowly healing
@@ -541,10 +547,11 @@
#define FLOP_SINGLE_MOVE_TIME 1.5
#define JUMP_X_DISTANCE 5
#define JUMP_Y_DISTANCE 6
-/// This animation should be applied to actual parent atom instead of vc_object.
-/proc/flop_animation(atom/movable/animation_target)
+
+/// This flopping animation played while the fish is alive.
+/obj/item/fish/proc/flop_animation()
var/pause_between = PAUSE_BETWEEN_PHASES + rand(1, 5) //randomized a bit so fish are not in sync
- animate(animation_target, time = pause_between, loop = -1)
+ animate(src, time = pause_between, loop = -1)
//move nose down and up
for(var/_ in 1 to FLOP_COUNT)
var/matrix/up_matrix = matrix()
@@ -565,6 +572,7 @@
animate(time = up_time, pixel_y = JUMP_Y_DISTANCE , pixel_x=x_step, loop = -1, flags= ANIMATION_RELATIVE, easing = BOUNCE_EASING | EASE_IN)
animate(time = up_time, pixel_y = -JUMP_Y_DISTANCE, pixel_x=x_step, loop = -1, flags= ANIMATION_RELATIVE, easing = BOUNCE_EASING | EASE_OUT)
animate(time = PAUSE_BETWEEN_FLOPS, loop = -1)
+
#undef PAUSE_BETWEEN_PHASES
#undef PAUSE_BETWEEN_FLOPS
#undef FLOP_COUNT
@@ -578,7 +586,7 @@
if(flopping) //Requires update_transform/animate_wrappers to be less restrictive.
return
flopping = TRUE
- flop_animation(src)
+ flop_animation()
/// Stops flopping animation
/obj/item/fish/proc/stop_flopping()
@@ -593,7 +601,7 @@
/obj/item/fish/proc/refresh_flopping()
if(flopping)
- flop_animation(src)
+ flop_animation()
/// Returns random fish, using random_case_rarity probabilities.
/proc/random_fish_type(required_fluid)
diff --git a/code/modules/fishing/fish/fish_traits.dm b/code/modules/fishing/fish/fish_traits.dm
index bec868ad24e..63de4cfdf1d 100644
--- a/code/modules/fishing/fish/fish_traits.dm
+++ b/code/modules/fishing/fish/fish_traits.dm
@@ -12,6 +12,8 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
var/diff_traits_inheritability = 50
/// fishes of types within this list are granted to have this trait, no matter the probability
var/list/guaranteed_inheritance_types
+ /// Depending on the value, fish with trait will be reported as more or less difficult in the catalog.
+ var/added_difficulty = 0
/// Difficulty modifier from this mod, needs to return a list with two values
/datum/fish_trait/proc/difficulty_mod(obj/item/fishing_rod/rod, mob/fisherman)
@@ -161,7 +163,7 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
/datum/fish_trait/necrophage
name = "Necrophage"
- catalog_description = "This fish will eat the carcasses of dead fishes when hungry."
+ catalog_description = "This fish will eat carcasses of dead fish when hungry."
incompatible_traits = list(/datum/fish_trait/vegan)
/datum/fish_trait/necrophage/apply_to_fish(obj/item/fish/fish)
@@ -169,7 +171,7 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
/datum/fish_trait/necrophage/proc/eat_dead_fishes(obj/item/fish/source, seconds_per_tick)
SIGNAL_HANDLER
- if(world.time - source.last_feeding < source.feeding_frequency || !isaquarium(source.loc))
+ if(!source.is_hungry() || !isaquarium(source.loc))
return
for(var/obj/item/fish/victim in source.loc)
if(victim.status != FISH_DEAD || victim == source || HAS_TRAIT(victim, TRAIT_YUCKY_FISH))
@@ -233,7 +235,7 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
/datum/fish_trait/predator/proc/eat_fishes(obj/item/fish/source, seconds_per_tick)
SIGNAL_HANDLER
- if(world.time - source.last_feeding < source.feeding_frequency || !isaquarium(source.loc))
+ if(!source.is_hungry() || !isaquarium(source.loc))
return
var/obj/structure/aquarium/aquarium = source.loc
for(var/obj/item/fish/victim in aquarium.get_fishes(TRUE, source))
@@ -334,6 +336,7 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
diff_traits_inheritability = 45
guaranteed_inheritance_types = list(/obj/item/fish/clownfish/lube)
catalog_description = "This fish exudes a viscous, slippery lubrificant. It's reccomended not to step on it."
+ added_difficulty = 5
/datum/fish_trait/lubed/apply_to_fish(obj/item/fish/fish)
fish.AddComponent(/datum/component/slippery, 8 SECONDS, SLIDE|GALOSHES_DONT_HELP)
@@ -352,3 +355,26 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
ADD_TRAIT(fish, TRAIT_FISH_AMPHIBIOUS, FISH_TRAIT_DATUM)
if(fish.required_fluid_type == AQUARIUM_FLUID_AIR)
fish.required_fluid_type = AQUARIUM_FLUID_FRESHWATER
+
+/datum/fish_trait/mixotroph
+ name = "Mixotroph"
+ inheritability = 75
+ diff_traits_inheritability = 25
+ catalog_description = "This fish is capable of substaining itself by producing its own sources of energy (food)."
+ incompatible_traits = list(/datum/fish_trait/predator, /datum/fish_trait/necrophage)
+
+/datum/fish_trait/antigrav/apply_to_fish(obj/item/fish/fish)
+ ADD_TRAIT(fish, TRAIT_FISH_NO_HUNGER, FISH_TRAIT_DATUM)
+
+/datum/fish_trait/antigrav
+ name = "Anti-Gravity"
+ inheritability = 75
+ diff_traits_inheritability = 25
+ catalog_description = "This fish will invert the gravity of the bait at random. May fall upward outside after being caught."
+ added_difficulty = 15
+
+/datum/fish_trait/antigrav/minigame_mod(obj/item/fishing_rod/rod, mob/fisherman, datum/fishing_challenge/minigame)
+ minigame.special_effects |= FISHING_MINIGAME_RULE_ANTIGRAV
+
+/datum/fish_trait/antigrav/apply_to_fish(obj/item/fish/fish)
+ fish.AddElement(/datum/element/forced_gravity, NEGATIVE_GRAVITY)
diff --git a/code/modules/fishing/fish/fish_types.dm b/code/modules/fishing/fish/fish_types.dm
index 652b0aba8aa..5ff62266ad9 100644
--- a/code/modules/fishing/fish/fish_types.dm
+++ b/code/modules/fishing/fish/fish_types.dm
@@ -341,7 +341,6 @@
icon_state = "sludgefish_purple"
dedicated_in_aquarium_icon_state = "sludgefish_purple_small"
random_case_rarity = FISH_RARITY_NOPE
- random_case_rarity = FISH_RARITY_VERY_RARE
fish_traits = list(/datum/fish_trait/parthenogenesis)
/obj/item/fish/slimefish
@@ -439,11 +438,13 @@
fillet_type = null
death_text = "%SRC gently disappears."
fish_traits = list(/datum/fish_trait/no_mating) //just to be sure, these shouldn't reproduce
+ experisci_scannable = FALSE
/obj/item/fish/holo/Initialize(mapload)
. = ..()
var/area/station/holodeck/holo_area = get_area(src)
if(!istype(holo_area))
+ addtimer(CALLBACK(src, PROC_REF(set_status), FISH_DEAD), 1 MINUTES)
return
holo_area.linked.add_to_spawned(src)
@@ -488,9 +489,9 @@
sprite_height = 5
/obj/item/fish/holo/checkered
- name = "unrendered holographic fish" //it's a meta joke, buddy.
+ name = "unrendered holographic fish"
desc = "A checkered silhoutte of searing purple and pitch black presents itself before your eyes, like a tear in fabric of reality. It hurts to watch."
- icon_state = "checkered"
+ icon_state = "checkered" //it's a meta joke, buddy.
dedicated_in_aquarium_icon_state = "checkered_small"
sprite_width = 4
@@ -502,3 +503,37 @@
sprite_height = 4
sprite_width = 10
average_size = 50
+
+/obj/item/fish/starfish
+ name = "cosmostarfish"
+ desc = "A peculiar, gravity-defying, echinoderm-looking critter from hyperspace."
+ icon_state = "starfish"
+ dedicated_in_aquarium_icon_state = "starfish_small"
+ icon_state_dead = "starfish_dead"
+ sprite_width = 4
+ average_size = 30
+ average_weight = 300
+ stable_population = 3
+ required_fluid_type = AQUARIUM_FLUID_AIR
+ random_case_rarity = FISH_RARITY_NOPE
+ required_temperature_min = 0
+ required_temperature_max = INFINITY
+ safe_air_limits = null
+ min_pressure = 0
+ max_pressure = INFINITY
+ grind_results = list(/datum/reagent/bluespace = 10, /datum/reagent/consumable/liquidgibs = 5)
+ fillet_type = null
+ fish_traits = list(/datum/fish_trait/antigrav, /datum/fish_trait/mixotroph)
+
+/obj/item/fish/starfish/Initialize(mapload)
+ . = ..()
+ update_appearance(UPDATE_OVERLAYS)
+
+/obj/item/fish/starfish/update_overlays()
+ . = ..()
+ if(status == FISH_ALIVE)
+ . += emissive_appearance(icon, "starfish_emissive", src)
+
+///It spins, and dimly glows in the dark.
+/obj/item/fish/starfish/flop_animation()
+ DO_FLOATING_ANIM(src)
diff --git a/code/modules/fishing/fish_catalog.dm b/code/modules/fishing/fish_catalog.dm
index d41b4657e50..a0f66c2227d 100644
--- a/code/modules/fishing/fish_catalog.dm
+++ b/code/modules/fishing/fish_catalog.dm
@@ -68,14 +68,6 @@
if(source.catalog_description && (fish_type in source.fish_table))
spot_descriptions += source.catalog_description
.["spots"] = english_list(spot_descriptions, nothing_text = "Unknown")
- ///Difficulty descriptor
- switch(initial(fishy.fishing_difficulty_modifier))
- if(-INFINITY to 10)
- .["difficulty"] = "Easy"
- if(20 to 30)
- .["difficulty"] = "Medium"
- else
- .["difficulty"] = "Hard"
var/list/fish_list_properties = collect_fish_properties()
var/list/fav_bait = fish_list_properties[fishy][NAMEOF(fishy, favorite_bait)]
var/list/disliked_bait = fish_list_properties[fishy][NAMEOF(fishy, disliked_bait)]
@@ -91,12 +83,22 @@
// Fish traits description
var/list/trait_descriptions = list()
var/list/fish_traits = fish_list_properties[fishy][NAMEOF(fishy, fish_traits)]
+ var/fish_difficulty = initial(fishy.fishing_difficulty_modifier)
for(var/fish_trait in fish_traits)
var/datum/fish_trait/trait = GLOB.fish_traits[fish_trait]
trait_descriptions += trait.catalog_description
+ fish_difficulty += trait.added_difficulty
if(!length(trait_descriptions))
trait_descriptions += "This fish exhibits no special behavior."
.["traits"] = trait_descriptions
+ ///Difficulty descriptor
+ switch(fish_difficulty)
+ if(-INFINITY to 9)
+ .["difficulty"] = "Easy"
+ if(10 to 19)
+ .["difficulty"] = "Medium"
+ else
+ .["difficulty"] = "Hard"
return .
/obj/item/book/fish_catalog/ui_assets(mob/user)
diff --git a/code/modules/fishing/fishing_equipment.dm b/code/modules/fishing/fishing_equipment.dm
index 6169b41fd88..3f34222ad87 100644
--- a/code/modules/fishing/fishing_equipment.dm
+++ b/code/modules/fishing/fishing_equipment.dm
@@ -11,7 +11,8 @@
desc = "Simple fishing line."
icon = 'icons/obj/fishing.dmi'
icon_state = "reel_blue"
- var/fishing_line_traits = NONE
+ ///A list of traits that this fishing line has, checked by fish traits and the minigame.
+ var/list/fishing_line_traits
/// Color of the fishing line
var/line_color = "#808080"
@@ -59,7 +60,8 @@
icon_state = "hook"
w_class = WEIGHT_CLASS_TINY
- var/fishing_hook_traits = NONE
+ /// A list of traits that this fishing hook has, checked by fish traits and the minigame
+ var/list/fishing_hook_traits
/// icon state added to main rod icon when this hook is equipped
var/rod_overlay_icon_state = "hook_overlay"
/// What subtype of `/obj/item/chasm_detritus` do we fish out of chasms? Defaults to `/obj/item/chasm_detritus`.
@@ -175,7 +177,7 @@
name = "jawed hook"
desc = "Despite hints of rust, this gritty beartrap-like hook hybrid manages to look even more threating than the real thing. May neptune have mercy of whatever gets caught in its jaws."
icon_state = "jaws"
- fishing_hook_traits = FISHING_HOOK_NO_ESCAPE|FISHING_HOOK_ENSNARE|FISHING_HOOK_KILL
+ fishing_hook_traits = FISHING_HOOK_NO_ESCAPE|FISHING_HOOK_NO_ESCAPE|FISHING_HOOK_KILL
rod_overlay_icon_state = "hook_jaws_overlay"
/obj/item/storage/toolbox/fishing
diff --git a/code/modules/fishing/fishing_minigame.dm b/code/modules/fishing/fishing_minigame.dm
index 478279749e4..06ac03d64ac 100644
--- a/code/modules/fishing/fishing_minigame.dm
+++ b/code/modules/fishing/fishing_minigame.dm
@@ -43,8 +43,12 @@
var/fish_ai = FISH_AI_DUMB
/// Rule modifiers (eg weighted bait)
var/special_effects = NONE
- /// Did the game get past the baiting phase, used to track if bait should be consumed afterwards
- var/bait_taken = FALSE
+ /// A list of possible active minigame effects. If not empty, one will be picked from time to time.
+ var/list/active_effects
+ /// The cooldown between switching active effects
+ COOLDOWN_DECLARE(active_effect_cd)
+ /// The current active effect
+ var/current_active_effect
/// Result path
var/reward_path = FISHING_DUD
/// Minigame difficulty
@@ -61,6 +65,8 @@
var/obj/effect/fishing_lure/lure
/// Background icon state from fishing_hud.dmi
var/background = "background_default"
+ /// Fish icon state from fishing_hud.dmi
+ var/fish_icon = "fish"
/// Fishing line visual
var/datum/beam/fishing_line
@@ -168,7 +174,10 @@
RegisterSignal(user, COMSIG_MOB_FISHING_REWARD_DISPENSED, PROC_REF(hurt_fish))
difficulty += comp.fish_source.calculate_difficulty(reward_path, rod, user, src)
- difficulty = round(difficulty)
+ difficulty = clamp(round(difficulty), 1, 100)
+
+ if(HAS_TRAIT(user, TRAIT_REVEAL_FISH))
+ fish_icon = GLOB.specific_fish_icons[reward_path] || "fish"
/**
* If the chances are higher than 1% (100% at maximum difficulty), they'll scale
@@ -207,19 +216,21 @@
lure_turf?.balloon_alert(user, message)
/datum/fishing_challenge/proc/on_spot_gone(datum/source)
+ SIGNAL_HANDLER
send_alert("fishing spot gone!")
- interrupt(balloon_alert = FALSE)
+ interrupt()
/datum/fishing_challenge/proc/interrupt_challenge(datum/source, reason)
if(reason)
send_alert(reason)
- interrupt(balloon_alert = FALSE)
+ interrupt()
/datum/fishing_challenge/proc/start(mob/living/user)
/// Create fishing line visuals
fishing_line = used_rod.create_fishing_line(lure, target_py = 5)
+ active_effects = bitfield_to_list(special_effects & FISHING_MINIGAME_ACTIVE_EFFECTS)
// If fishing line breaks los / rod gets dropped / deleted
- RegisterSignal(fishing_line, COMSIG_FISHING_LINE_SNAPPED, PROC_REF(interrupt))
+ RegisterSignal(fishing_line, COMSIG_QDELETING, PROC_REF(on_line_deleted))
RegisterSignal(used_rod, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_self))
ADD_TRAIT(user, TRAIT_GONE_FISHING, REF(src))
user.add_mood_event("fishing", /datum/mood_event/fishing)
@@ -228,6 +239,12 @@
to_chat(user, span_notice("You start fishing..."))
playsound(lure, 'sound/effects/splash.ogg', 100)
+/datum/fishing_challenge/proc/on_line_deleted(datum/source)
+ SIGNAL_HANDLER
+ fishing_line = null
+ send_alert(user.is_holding(used_rod) ? "line snapped" : "rod dropped")
+ interrupt()
+
/datum/fishing_challenge/proc/handle_click(mob/source, atom/target, modifiers)
SIGNAL_HANDLER
//You need to be holding the rod to use it.
@@ -241,12 +258,9 @@
return COMSIG_MOB_CANCEL_CLICKON
/// Challenge interrupted by something external
-/datum/fishing_challenge/proc/interrupt(datum/source, balloon_alert = TRUE)
- SIGNAL_HANDLER
+/datum/fishing_challenge/proc/interrupt()
if(!completed)
experience_multiplier *= 0.5
- if(balloon_alert)
- send_alert(user.is_holding(used_rod) ? "line snapped" : "tool dropped")
complete(FALSE)
/datum/fishing_challenge/proc/on_attack_self(obj/item/source, mob/user)
@@ -278,7 +292,8 @@
if(reward_path != FISHING_DUD)
playsound(lure, 'sound/effects/bigsplash.ogg', 100)
SEND_SIGNAL(src, COMSIG_FISHING_CHALLENGE_COMPLETED, user, win)
- qdel(src)
+ if(!QDELETED(src))
+ qdel(src)
/datum/fishing_challenge/proc/start_baiting_phase()
deltimer(next_phase_timer)
@@ -294,7 +309,30 @@
phase = BITING_PHASE
// Trashing animation
playsound(lure, 'sound/effects/fish_splash.ogg', 100)
- send_alert("!!!")
+ if(HAS_TRAIT(user, TRAIT_REVEAL_FISH))
+ switch(fish_icon)
+ if(FISH_ICON_DEF)
+ send_alert("fish!!!")
+ if(FISH_ICON_HOSTILE)
+ send_alert("hostile!!!")
+ if(FISH_ICON_STAR)
+ send_alert("starfish!!!")
+ if(FISH_ICON_CHUNKY)
+ send_alert("round fish!!!")
+ if(FISH_ICON_JELLYFISH)
+ send_alert("jellyfish!!!")
+ if(FISH_ICON_SLIME)
+ send_alert("slime!!!")
+ if(FISH_ICON_COIN)
+ send_alert("valuable!!!")
+ if(FISH_ICON_GEM)
+ send_alert("ore!!!")
+ if(FISH_ICON_CRAB)
+ send_alert("crustacean!!!")
+ if(FISH_ICON_BONE)
+ send_alert("bones!!!")
+ else
+ send_alert("!!!")
animate(lure, pixel_y = 3, time = 5, loop = -1, flags = ANIMATION_RELATIVE)
animate(pixel_y = -3, time = 5, flags = ANIMATION_RELATIVE)
// Setup next phase
@@ -307,7 +345,7 @@
///The player is no longer around to play the minigame, so we interrupt it.
/datum/fishing_challenge/proc/on_user_logout(datum/source)
SIGNAL_HANDLER
- interrupt(balloon_alert = FALSE)
+ interrupt()
/datum/fishing_challenge/proc/win_anyway()
if(!completed)
@@ -345,6 +383,9 @@
RegisterSignal(user.client, COMSIG_CLIENT_MOUSEDOWN, PROC_REF(start_reeling))
RegisterSignal(user.client, COMSIG_CLIENT_MOUSEUP, PROC_REF(stop_reeling))
RegisterSignal(user, COMSIG_MOB_LOGOUT, PROC_REF(on_user_logout))
+ if(length(active_effects))
+ // Give the player a moment to prepare for active minigame effects
+ COOLDOWN_START(src, active_effect_cd, rand(5, 9) SECONDS)
START_PROCESSING(SSfishing, src)
///Stop processing and remove references to the minigame hud
@@ -369,11 +410,44 @@
///Update the state of the fish, the bait and the hud
/datum/fishing_challenge/process(seconds_per_tick)
+ if(length(active_effects) && COOLDOWN_FINISHED(src, active_effect_cd))
+ select_active_effect()
move_fish(seconds_per_tick)
move_bait(seconds_per_tick)
if(!QDELETED(fishing_hud))
update_visuals()
+///The proc that handles fancy effects like flipping the hud or skewing movement
+/datum/fishing_challenge/proc/select_active_effect()
+ ///bring forth an active effect
+ if(isnull(current_active_effect))
+ current_active_effect = pick(active_effects)
+ switch(current_active_effect)
+ if(FISHING_MINIGAME_RULE_ANTIGRAV)
+ fishing_hud.icon_state = "background_antigrav"
+ SEND_SOUND(user, sound('sound/effects/arcade_jump.ogg', volume = 50))
+ COOLDOWN_START(src, active_effect_cd, rand(6, 9) SECONDS)
+ if(FISHING_MINIGAME_RULE_FLIP)
+ fishing_hud.icon_state = "background_flip"
+ fishing_hud.transform = fishing_hud.transform.Scale(1, -1)
+ SEND_SOUND(user, sound('sound/effects/boing.ogg'))
+ COOLDOWN_START(src, active_effect_cd, rand(5, 6) SECONDS)
+ return
+
+ ///go back to normal
+ switch(current_active_effect)
+ if(FISHING_MINIGAME_RULE_ANTIGRAV)
+ var/sound/inverted_sound = sound('sound/effects/arcade_jump.ogg', volume = 50)
+ inverted_sound.frequency = -1
+ SEND_SOUND(user, inverted_sound)
+ COOLDOWN_START(src, active_effect_cd, rand(10, 13) SECONDS)
+ if(FISHING_MINIGAME_RULE_FLIP)
+ fishing_hud.transform = fishing_hud.transform.Scale(1, -1)
+ COOLDOWN_START(src, active_effect_cd, rand(8, 12) SECONDS)
+
+ fishing_hud.icon_state = background
+ current_active_effect = null
+
///The proc that moves the fish around, just like in the old TGUI, mostly.
/datum/fishing_challenge/proc/move_fish(seconds_per_tick)
var/long_chance = long_jump_chance * seconds_per_tick * 10
@@ -464,6 +538,9 @@
velocity_change = round(velocity_change)
+ if(current_active_effect == FISHING_MINIGAME_RULE_ANTIGRAV)
+ velocity_change = -velocity_change
+
/**
* Pull the brake on the velocity if the current velocity and the acceleration
* have different directions, making the bait less slippery, thus easier to control
@@ -524,7 +601,7 @@
icon_state = challenge.background
add_overlay("frame")
hud_bait = new(null, null, challenge)
- hud_fish = new
+ hud_fish = new(null, null, challenge)
hud_completion = new(null, null, challenge)
vis_contents += list(hud_bait, hud_fish, hud_completion)
challenge.user.client.screen += src
@@ -557,6 +634,11 @@
icon_state = "fish"
vis_flags = VIS_INHERIT_ID
+/atom/movable/screen/hud_fish/Initialize(mapload, datum/hud/hud_owner, datum/fishing_challenge/challenge)
+ . = ..()
+ if(challenge)
+ icon_state = challenge.fish_icon
+
/atom/movable/screen/hud_completion
icon = 'icons/hud/fishing_hud.dmi'
icon_state = "completion_0"
diff --git a/code/modules/fishing/fishing_portal_machine.dm b/code/modules/fishing/fishing_portal_machine.dm
index 3fc6b0eb938..b156a37ba05 100644
--- a/code/modules/fishing/fishing_portal_machine.dm
+++ b/code/modules/fishing/fishing_portal_machine.dm
@@ -1,40 +1,58 @@
/obj/machinery/fishing_portal_generator
name = "fish-porter 3000"
- desc = "fishing anywhere, anytime, anyway what was i talking about"
-
+ desc = "Fishing anywhere, anytime... anyway what was I talking about?"
icon = 'icons/obj/fishing.dmi'
- icon_state = "portal_off"
-
+ icon_state = "portal"
idle_power_usage = 0
active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 2
-
anchored = FALSE
density = TRUE
+ circuit = /obj/item/circuitboard/machine/fishing_portal_generator
- var/fishing_source = /datum/fish_source/portal
+ ///The current fishing spot loaded in
var/datum/component/fishing_spot/active
+/obj/machinery/fishing_portal_generator/on_set_panel_open()
+ update_appearance()
+ return ..()
+
/obj/machinery/fishing_portal_generator/wrench_act(mob/living/user, obj/item/tool)
. = ..()
default_unfasten_wrench(user, tool)
return TOOL_ACT_TOOLTYPE_SUCCESS
+/obj/machinery/fishing_portal_generator/examine(mob/user)
+ . = ..()
+ . += span_notice("You can unlock further portal settings by completing fish scanning experiments.")
+
+/obj/machinery/fishing_portal_generator/emag_act(mob/user, obj/item/card/emag/emag_card)
+ if(obj_flags & EMAGGED)
+ return FALSE
+ obj_flags |= EMAGGED
+ balloon_alert(user, "syndicate setting loaded")
+ playsound(src, SFX_SPARKS, 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ return TRUE
+
/obj/machinery/fishing_portal_generator/interact(mob/user, special_state)
. = ..()
if(active)
deactivate()
else
- activate()
+ select_fish_source(user)
-/obj/machinery/fishing_portal_generator/update_icon(updates)
+/obj/machinery/fishing_portal_generator/update_overlays()
. = ..()
- if(active)
- icon_state = "portal_on"
- else
- icon_state = "portal_off"
+ if(panel_open)
+ . += "portal_open"
+ if(!active)
+ return
+ . += "portal_on"
+ var/datum/fish_source/portal/portal = active.fish_source
+ . += portal.overlay_state
+ . += emissive_appearance(icon, "portal_emissive", src)
-/obj/machinery/fishing_portal_generator/proc/activate()
- active = AddComponent(/datum/component/fishing_spot, fishing_source)
+/obj/machinery/fishing_portal_generator/proc/activate(datum/fish_source/selected_source)
+ active = AddComponent(/datum/component/fishing_spot, selected_source)
use_power = ACTIVE_POWER_USE
update_icon()
@@ -46,3 +64,39 @@
/obj/machinery/fishing_portal_generator/on_set_is_operational(old_value)
if(old_value)
deactivate()
+
+///Create a radial menu from a list of available fish sources. If only the default is available, activate it right away.
+/obj/machinery/fishing_portal_generator/proc/select_fish_source(mob/user)
+ var/datum/fish_source/portal/default = GLOB.preset_fish_sources[/datum/fish_source/portal]
+ var/list/available_fish_sources = list(default.radial_name = default)
+ if(obj_flags & EMAGGED)
+ var/datum/fish_source/portal/syndicate = GLOB.preset_fish_sources[/datum/fish_source/portal/syndicate]
+ available_fish_sources[syndicate.radial_name] = syndicate
+ for (var/datum/techweb/techweb as anything in SSresearch.techwebs)
+ var/get_fish_sources = FALSE
+ for(var/obj/machinery/rnd/server/server as anything in techweb.techweb_servers)
+ if(!is_valid_z_level(get_turf(server), get_turf(src)))
+ continue
+ get_fish_sources = TRUE
+ break
+ if(!get_fish_sources)
+ continue
+ for(var/experiment_type in typesof(/datum/experiment/scanning/fish))
+ var/datum/experiment/scanning/fish/experiment = techweb.completed_experiments[experiment_type]
+ if(!experiment)
+ continue
+ var/datum/fish_source/portal/reward = GLOB.preset_fish_sources[experiment.fish_source_reward]
+ available_fish_sources[reward.radial_name] = reward
+
+ if(length(available_fish_sources) == 1)
+ activate(default)
+ return
+ var/list/choices = list()
+ for(var/radial_name in available_fish_sources)
+ var/datum/fish_source/portal/source = available_fish_sources[radial_name]
+ choices[radial_name] = image(icon = 'icons/hud/radial_fishing.dmi', icon_state = source.radial_state)
+
+ var/choice = show_radial_menu(user, src, choices, radius = 38, custom_check = CALLBACK(src, TYPE_PROC_REF(/atom, can_interact), user), tooltips = TRUE)
+ if(!choice || !can_interact(user))
+ return
+ activate(available_fish_sources[choice])
diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm
index 7e01f693dd5..1abba8e414c 100644
--- a/code/modules/fishing/fishing_rod.dm
+++ b/code/modules/fishing/fishing_rod.dm
@@ -30,14 +30,11 @@
var/obj/item/currently_hooked_item
/// Fishing line visual for the hooked item
- var/datum/beam/hooked_item_fishing_line
+ var/datum/beam/fishing_line/fishing_line
/// Are we currently casting
var/casting = FALSE
- /// List of fishing line beams
- var/list/fishing_lines = list()
-
/// The default color for the reel overlay if no line is equipped.
var/default_line_color = "gray"
@@ -66,13 +63,10 @@
return NONE
/obj/item/fishing_rod/Destroy(force)
- . = ..()
- //Remove any leftover fishing lines
- QDEL_LIST(fishing_lines)
+ return ..()
/obj/item/fishing_rod/examine(mob/user)
. = ..()
- . += "Right-Click in your active hand to access its slots UI"
var/list/equipped_stuff = list()
if(line)
equipped_stuff += "[icon2html(line, user)] [line.name]"
@@ -84,6 +78,7 @@
. += span_notice("\a [icon2html(bait, user)] [bait] is being used as bait.")
else
. += span_warning("It doesn't have any bait attached. Fishing will be more tedious!")
+ . += span_notice("Right-Click in your active hand to access its slots UI")
/**
* Catch weight modifier for the given fish_type (or FISHING_DUD)
@@ -140,7 +135,7 @@
// Should probably respect and used force move later
step_towards(currently_hooked_item, get_turf(src))
if(get_dist(currently_hooked_item,get_turf(src)) < 1)
- clear_hooked_item()
+ QDEL_NULL(fishing_line)
/obj/item/fishing_rod/attack_self_secondary(mob/user, modifiers)
. = ..()
@@ -159,30 +154,28 @@
var/mob/user = loc
if(!istype(user))
return
+ if(fishing_line)
+ QDEL_NULL(fishing_line)
var/beam_color = line?.line_color || default_line_color
- var/datum/beam/fishing_line/fishing_line_beam = new(user, target, icon_state = "fishing_line", beam_color = beam_color, emissive = FALSE, override_target_pixel_y = target_py)
- fishing_line_beam.lefthand = user.get_held_index_of_item(src) % 2 == 1
- RegisterSignal(fishing_line_beam, COMSIG_BEAM_BEFORE_DRAW, PROC_REF(check_los))
- RegisterSignal(fishing_line_beam, COMSIG_QDELETING, PROC_REF(clear_line))
- fishing_lines += fishing_line_beam
- INVOKE_ASYNC(fishing_line_beam, TYPE_PROC_REF(/datum/beam/, Start))
+ fishing_line = new(user, target, icon_state = "fishing_line", beam_color = beam_color, emissive = FALSE, override_target_pixel_y = target_py)
+ fishing_line.lefthand = user.get_held_index_of_item(src) % 2 == 1
+ RegisterSignal(fishing_line, COMSIG_BEAM_BEFORE_DRAW, PROC_REF(check_los))
+ RegisterSignal(fishing_line, COMSIG_QDELETING, PROC_REF(clear_line))
+ INVOKE_ASYNC(fishing_line, TYPE_PROC_REF(/datum/beam/, Start))
user.update_held_items()
- return fishing_line_beam
+ return fishing_line
/obj/item/fishing_rod/proc/clear_line(datum/source)
SIGNAL_HANDLER
- fishing_lines -= source
if(ismob(loc))
var/mob/user = loc
user.update_held_items()
+ fishing_line = null
+ currently_hooked_item = null
/obj/item/fishing_rod/dropped(mob/user, silent)
. = ..()
- if(currently_hooked_item)
- clear_hooked_item()
- for(var/datum/beam/fishing_line in fishing_lines)
- SEND_SIGNAL(fishing_line, COMSIG_FISHING_LINE_SNAPPED)
- QDEL_LIST(fishing_lines)
+ QDEL_NULL(fishing_line)
/// Hooks the item
/obj/item/fishing_rod/proc/hook_item(mob/user, atom/target_atom)
@@ -191,28 +184,21 @@
if(!can_be_hooked(target_atom))
return
currently_hooked_item = target_atom
- hooked_item_fishing_line = create_fishing_line(target_atom)
- RegisterSignal(hooked_item_fishing_line, COMSIG_FISHING_LINE_SNAPPED, PROC_REF(clear_hooked_item))
+ create_fishing_line(target_atom)
+ SEND_SIGNAL(src, COMSIG_FISHING_ROD_HOOKED_ITEM, target_atom, user)
/// Checks what can be hooked
/obj/item/fishing_rod/proc/can_be_hooked(atom/movable/target)
// Could be made dependent on actual hook, ie magnet to hook metallic items
return isitem(target)
-/obj/item/fishing_rod/proc/clear_hooked_item()
- SIGNAL_HANDLER
-
- if(!QDELETED(hooked_item_fishing_line))
- QDEL_NULL(hooked_item_fishing_line)
- currently_hooked_item = null
-
// Checks fishing line for interruptions and range
/obj/item/fishing_rod/proc/check_los(datum/beam/source)
SIGNAL_HANDLER
. = NONE
- if(!isturf(source.origin.loc) || !isturf(source.target.loc) || !CheckToolReach(src, source.target, cast_range))
- SEND_SIGNAL(source, COMSIG_FISHING_LINE_SNAPPED) //Stepped out of range or los interrupted
+ if(!CheckToolReach(src, source.target, cast_range))
+ qdel(source)
return BEAM_CANCEL_DRAW
/obj/item/fishing_rod/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
@@ -300,7 +286,7 @@
reel_overlay.color = line_color
. += reel_overlay
/// if we don't have anything hooked show the dangling hook & line
- if(isinhands && length(fishing_lines) == 0)
+ if(isinhands && !fishing_line)
var/mutable_appearance/line_overlay = mutable_appearance(icon_file, "line_overlay")
line_overlay.appearance_flags |= RESET_COLOR
line_overlay.color = line_color
@@ -507,8 +493,8 @@
balloon_alert(user, active ? "extended" : "collapsed")
playsound(src, 'sound/weapons/batonextend.ogg', 50, TRUE)
update_appearance(UPDATE_OVERLAYS)
- if(currently_hooked_item)
- clear_hooked_item()
+ if(fishing_line)
+ QDEL_NULL(fishing_line)
return COMPONENT_NO_DEFAULT_MESSAGE
/obj/item/fishing_rod/telescopic/master
@@ -523,16 +509,34 @@
/obj/item/fishing_rod/tech
name = "advanced fishing rod"
desc = "An embedded universal constructor along with micro-fusion generator makes this marvel of technology never run out of bait. Interstellar treaties prevent using it outside of recreational fishing. And you can fish with this. "
- ui_description = "This rod has an infinite supply of synthetic bait."
+ ui_description = "This rod has an infinite supply of synth-bait. Also doubles as an Experi-Scanner for fish."
icon_state = "fishing_rod_science"
reel_overlay = "reel_science"
/obj/item/fishing_rod/tech/Initialize(mapload)
. = ..()
+
+ var/static/list/fishing_signals = list(
+ COMSIG_FISHING_ROD_HOOKED_ITEM = TYPE_PROC_REF(/datum/component/experiment_handler, try_run_handheld_experiment),
+ COMSIG_FISHING_ROD_CAUGHT_FISH = TYPE_PROC_REF(/datum/component/experiment_handler, try_run_handheld_experiment),
+ COMSIG_ITEM_PRE_ATTACK = TYPE_PROC_REF(/datum/component/experiment_handler, try_run_handheld_experiment),
+ COMSIG_ITEM_AFTERATTACK = TYPE_PROC_REF(/datum/component/experiment_handler, ignored_handheld_experiment_attempt),
+ )
+ AddComponent(/datum/component/experiment_handler, \
+ config_mode = EXPERIMENT_CONFIG_ALTCLICK, \
+ allowed_experiments = list(/datum/experiment/scanning/fish), \
+ config_flags = EXPERIMENT_CONFIG_SILENT_FAIL|EXPERIMENT_CONFIG_IMMEDIATE_ACTION, \
+ experiment_signals = fishing_signals, \
+ )
+
var/obj/item/food/bait/doughball/synthetic/infinite_supply_of_bait = new(src)
bait = infinite_supply_of_bait
update_icon()
+/obj/item/fishing_rod/tech/examine(mob/user)
+ . = ..()
+ . += span_notice("Alt-Click to access the Experiment Configuration UI")
+
/obj/item/fishing_rod/tech/consume_bait(atom/movable/reward)
return
diff --git a/code/modules/fishing/sources/_fish_source.dm b/code/modules/fishing/sources/_fish_source.dm
index 5a34db9ce5f..657b2f30968 100644
--- a/code/modules/fishing/sources/_fish_source.dm
+++ b/code/modules/fishing/sources/_fish_source.dm
@@ -1,11 +1,47 @@
GLOBAL_LIST_INIT(preset_fish_sources, init_subtypes_w_path_keys(/datum/fish_source, list()))
+/**
+ * When adding new fishable rewards to a table/counts, you can specify an icon to show in place of the
+ * generic fish icon in the minigame UI should the user have the TRAIT_REVEAL_FISH trait, by adding it to
+ * this list.
+ *
+ * A lot of the icons here may be a tad inaccurate, but since we're limited to the free font awesome icons we
+ * have access to, we got to make do.
+ */
+GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list(
+ /mob/living/basic/carp = FISH_ICON_DEF,
+ /mob/living/basic/mining = FISH_ICON_HOSTILE,
+ /obj/effect/decal/remains = FISH_ICON_BONE,
+ /obj/effect/mob_spawn/corpse = FISH_ICON_BONE,
+ /obj/item/coin = FISH_ICON_COIN,
+ /obj/item/fish = FISH_ICON_DEF,
+ /obj/item/fish/armorfish = FISH_ICON_CRAB,
+ /obj/item/fish/boned = FISH_ICON_BONE,
+ /obj/item/fish/chasm_crab = FISH_ICON_CRAB,
+ /obj/item/fish/gunner_jellyfish = FISH_ICON_JELLYFISH,
+ /obj/item/fish/holo/crab = FISH_ICON_CRAB,
+ /obj/item/fish/holo/puffer = FISH_ICON_CHUNKY,
+ /obj/item/fish/mastodon = FISH_ICON_BONE,
+ /obj/item/fish/pufferfish = FISH_ICON_CHUNKY,
+ /obj/item/fish/slimefish = FISH_ICON_SLIME,
+ /obj/item/fish/sludgefish = FISH_ICON_SLIME,
+ /obj/item/fish/starfish = FISH_ICON_STAR,
+ /obj/item/storage/wallet = FISH_ICON_COIN,
+ /obj/item/stack/sheet/bone = FISH_ICON_BONE,
+ /obj/item/stack/sheet/mineral = FISH_ICON_GEM,
+ /obj/item/stack/ore = FISH_ICON_GEM,
+ /obj/structure/closet/crate = FISH_ICON_COIN,
+)))
+
/**
* Where the fish actually come from - every fishing spot has one assigned but multiple fishing holes
* can share single source, ie single shared one for ocean/lavaland river
*/
/datum/fish_source
- /// Fish catch weight table - these are relative weights
+ /**
+ * Fish catch weight table - these are relative weights
+ *
+ */
var/list/fish_table = list()
/// If a key from fish_table is present here, that fish is availible in limited quantity and is reduced by one on successful fishing
var/list/fish_counts = list()
@@ -25,6 +61,10 @@ GLOBAL_LIST_INIT(preset_fish_sources, init_subtypes_w_path_keys(/datum/fish_sour
if(!(path in fish_table))
stack_trace("path [path] found in the 'fish_counts' list but not in the fish_table one of [type]")
+///Called when src is set as the fish source of a fishing spot component
+/datum/fish_source/proc/on_fishing_spot_init(/datum/component/fishing_spot/spot)
+ return
+
/// Can we fish in this spot at all. Returns DENIAL_REASON or null if we're good to go
/datum/fish_source/proc/reason_we_cant_fish(obj/item/fishing_rod/rod, mob/fisherman)
return rod.reason_we_cant_fish(src)
@@ -35,7 +75,7 @@ GLOBAL_LIST_INIT(preset_fish_sources, init_subtypes_w_path_keys(/datum/fish_sour
* This includes the source's fishing difficulty, that of the fish, the rod,
* favorite and disliked baits, fish traits and the fisherman skill.
*
- * For non-fish, it's just the source's fishing difficulty minus the fisherman skill, rod and settler modifiers.
+ * For non-fish, it's just the source's fishing difficulty minus the fisherman skill.
*/
/datum/fish_source/proc/calculate_difficulty(result, obj/item/fishing_rod/rod, mob/fisherman, datum/fishing_challenge/challenge)
. = fishing_difficulty
@@ -96,7 +136,7 @@ GLOBAL_LIST_INIT(preset_fish_sources, init_subtypes_w_path_keys(/datum/fish_sour
* Used to register signals or add traits and the such right after conditions have been cleared
* and before the minigame starts.
*/
-/datum/fish_source/proc/pre_challenge_started(obj/item/fishing_rod/rod, mob/user)
+/datum/fish_source/proc/pre_challenge_started(obj/item/fishing_rod/rod, mob/user, datum/fishing_challenge/challenge)
return
///Proc called when the challenge is interrupted within the fish source code.
@@ -116,7 +156,9 @@ GLOBAL_LIST_INIT(preset_fish_sources, init_subtypes_w_path_keys(/datum/fish_sour
user.add_mob_memory(/datum/memory/caught_fish, protagonist = user, deuteragonist = initial(caught.name))
var/turf/fishing_spot = get_turf(source.lure)
var/atom/movable/reward = dispense_reward(source.reward_path, user, fishing_spot)
- source.used_rod?.consume_bait(reward)
+ if(source.used_rod)
+ SEND_SIGNAL(source.used_rod, COMSIG_FISHING_ROD_CAUGHT_FISH, reward, user)
+ source.used_rod.consume_bait(reward)
/// Gives out the reward if possible
/datum/fish_source/proc/dispense_reward(reward_path, mob/fisherman, turf/fishing_spot)
diff --git a/code/modules/fishing/sources/source_types.dm b/code/modules/fishing/sources/source_types.dm
index ffb37753881..e2e5491dd1d 100644
--- a/code/modules/fishing/sources/source_types.dm
+++ b/code/modules/fishing/sources/source_types.dm
@@ -19,11 +19,168 @@
/datum/fish_source/portal
fish_table = list(
- FISHING_DUD = 5,
+ FISHING_DUD = 7,
/obj/item/fish/goldfish = 10,
/obj/item/fish/guppy = 10,
+ /obj/item/fish/angelfish = 10,
+ )
+ catalog_description = "Aquarium dimension (Fishing portal generator)"
+ ///The name of this option shown in the radial menu on the fishing portal generator
+ var/radial_name = "Aquarium"
+ ///The icon state shown for this option in the radial menu
+ var/radial_state = "fish_tank"
+ ///The icon state of the overlay shown on the machine when active.
+ var/overlay_state = "portal_aquarium"
+
+/datum/fish_source/portal/beach
+ fish_table = list(
+ FISHING_DUD = 10,
+ /obj/item/fish/clownfish = 10,
+ /obj/item/fish/pufferfish = 10,
+ /obj/item/fish/cardinal = 10,
+ /obj/item/fish/greenchromis = 10,
+ )
+ catalog_description = "Beach dimension (Fishing portal generator)"
+ radial_name = "Beach"
+ radial_state = "palm_beach"
+
+/datum/fish_source/portal/chasm
+ background = "background_lavaland"
+ fish_table = list(
+ FISHING_DUD = 5,
+ /obj/item/fish/chasm_crab = 10,
+ /obj/item/fish/boned = 5,
+ /obj/item/stack/sheet/bone = 5,
+ )
+ catalog_description = "Chasm dimension (Fishing portal generator)"
+ fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 10
+ radial_name = "Chasm"
+ overlay_state = "portal_chasm"
+ radial_state = "ground_hole"
+
+/datum/fish_source/portal/ocean
+ fish_table = list(
+ FISHING_DUD = 5,
+ /obj/item/fish/lanternfish = 5,
+ /obj/item/fish/firefish = 5,
+ /obj/item/fish/dwarf_moonfish = 5,
+ /obj/item/fish/gunner_jellyfish = 5,
+ /obj/item/fish/needlefish = 5,
+ /obj/item/fish/armorfish = 5,
+ )
+ catalog_description = "Ocean dimension (Fishing portal generator)"
+ fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 10
+ radial_name = "Ocean"
+ overlay_state = "portal_ocean"
+ radial_state = "seaboat"
+
+/datum/fish_source/portal/hyperspace
+ fish_table = list(
+ FISHING_DUD = 5,
+ /obj/item/fish/starfish = 6,
+ /obj/item/stack/ore/bluespace_crystal = 2,
+ /mob/living/basic/carp = 2,
+ )
+ fish_counts = list(
+ /obj/item/stack/ore/bluespace_crystal = 10,
)
- catalog_description = "Fish dimension (Fishing portal generator)"
+ catalog_description = "Hyperspace dimension (Fishing portal generator)"
+ fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 10
+ radial_name = "Hyperspace"
+ overlay_state = "portal_hyperspace"
+ radial_state = "space_rocket"
+
+///Unlocked by emagging the fishing portal generator with an emag.
+/datum/fish_source/portal/syndicate
+ background = "background_lavaland"
+ fish_table = list(
+ FISHING_DUD = 5,
+ /obj/item/fish/donkfish = 5,
+ /obj/item/fish/emulsijack = 5,
+ )
+ catalog_description = "Syndicate dimension (Fishing portal generator)"
+ radial_name = "Syndicate"
+ fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 15
+ overlay_state = "portal_syndicate"
+ radial_state = "syndi_snake"
+
+/**
+ * A special portal fish source which fish table is populated on init with the contents of all
+ * portal fish sources, except for FISHING_DUD, and a couple more caveats.
+ */
+/datum/fish_source/portal/random
+ fish_table = null //It's populated the first time the source is loaded on a fishing portal generator.
+ catalog_description = null // it'd make a bad entry in the catalog.
+ radial_name = "Randomizer"
+ overlay_state = "portal_randomizer"
+ var/static/list/all_portal_fish_sources_at_once
+ radial_state = "misaligned_question_mark"
+
+///Generate the fish table if we don't have one already.
+/datum/fish_source/portal/random/on_fishing_spot_init(datum/component/fishing_spot/spot)
+ if(fish_table)
+ return
+
+ ///rewards not found in other fishing portals
+ fish_table = list(
+ /obj/item/fish/holo/checkered = 1,
+ )
+
+ for(var/portal_type in GLOB.preset_fish_sources)
+ if(portal_type == type || !ispath(portal_type, /datum/fish_source/portal))
+ continue
+ var/datum/fish_source/portal/preset_portal = GLOB.preset_fish_sources[portal_type]
+ fish_table |= preset_portal.fish_table
+
+ ///We don't serve duds.
+ fish_table -= FISHING_DUD
+
+ for(var/reward_path in fish_table)
+ fish_table[reward_path] = rand(1, 4)
+
+///Difficulty has to be calculated before the rest, because of how it influences jump chances
+/datum/fish_source/portal/random/calculate_difficulty(result, obj/item/fishing_rod/rod, mob/fisherman, datum/fishing_challenge/challenge)
+ . = ..()
+ . += rand(-10, 15)
+
+///In the spirit of randomness, we skew a few values here and there
+/datum/fish_source/portal/random/pre_challenge_started(obj/item/fishing_rod/rod, mob/user, datum/fishing_challenge/challenge)
+ challenge.bait_bounce_mult = clamp(challenge.bait_bounce_mult + (rand(-3, 3) * 0.1), 0.1, 1)
+ challenge.completion_loss = max(challenge.completion_loss + rand(-2, 2), 0)
+ challenge.completion_gain = max(challenge.completion_gain + rand(-1, 1), 2)
+ challenge.short_jump_velocity_limit += rand(-100, 100)
+ challenge.long_jump_velocity_limit += rand(-100, 100)
+ var/static/list/active_effects = bitfield_to_list(FISHING_MINIGAME_ACTIVE_EFFECTS)
+ for(var/effect in active_effects)
+ if(prob(30))
+ challenge.special_effects |= effect
+
+///Cherry on top, fish caught from the randomizer portal also have (almost completely) random traits
+/datum/fish_source/portal/random/spawn_reward(reward_path, mob/fisherman, turf/fishing_spot)
+ if(!ispath(reward_path, /obj/item/fish))
+ return ..()
+
+ var/static/list/weighted_traits
+ if(!weighted_traits)
+ weighted_traits = list()
+ for(var/trait_type as anything in GLOB.fish_traits)
+ var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
+ weighted_traits[trait.type] = round(trait.inheritability**2/100)
+
+ var/obj/item/fish/caught_fish = new reward_path(get_turf(fisherman), FALSE)
+ var/list/fixed_traits = list()
+ for(var/trait_type in caught_fish.fish_traits)
+ var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
+ if(caught_fish.type in trait.guaranteed_inheritance_types)
+ fixed_traits += trait_type
+ var/list/new_traits = list()
+ for(var/iteration in rand(1, 4))
+ new_traits |= pick_weight(weighted_traits)
+ caught_fish.inherit_traits(new_traits, fixed_traits = fixed_traits)
+ caught_fish.randomize_size_and_weight(deviation = 0.3)
+ caught_fish.progenitors = full_capitalize(caught_fish.name)
+ return caught_fish
+
/datum/fish_source/chasm
catalog_description = "Chasm depths"
@@ -99,7 +256,7 @@
fish_table = list(
FISHING_DUD = 18,
/obj/item/fish/sludgefish = 18,
- /obj/item/fish/slimefish = 2,
+ /obj/item/fish/slimefish = 4,
/obj/item/storage/wallet/money = 2,
)
fish_counts = list(
@@ -125,7 +282,7 @@
if(!istype(get_area(fisherman), /area/station/holodeck))
return "You need to be inside the Holodeck to catch holographic fish."
-/datum/fish_source/holographic/pre_challenge_started(obj/item/fishing_rod/rod, mob/user)
+/datum/fish_source/holographic/pre_challenge_started(obj/item/fishing_rod/rod, mob/user, datum/fishing_challenge/challenge)
RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(check_area))
/datum/fish_source/holographic/proc/check_area(mob/user)
diff --git a/code/modules/holodeck/holo_effect.dm b/code/modules/holodeck/holo_effect.dm
index 02502c1e6fb..a8d51c87728 100644
--- a/code/modules/holodeck/holo_effect.dm
+++ b/code/modules/holodeck/holo_effect.dm
@@ -61,6 +61,7 @@
mobtype = pick(mobtype)
our_mob = new mobtype(loc)
our_mob.flags_1 |= HOLOGRAM_1
+ ADD_TRAIT(our_mob, TRAIT_PERMANENTLY_MORTAL, INNATE_TRAIT)
// these vars are not really standardized but all would theoretically create stuff on death
for(var/v in list("butcher_results","corpse","weapon1","weapon2","blood_volume") & our_mob.vars)
diff --git a/code/modules/industrial_lift/tram/tram_windows.dm b/code/modules/industrial_lift/tram/tram_windows.dm
index 1a98a56a0ba..55ec5aa283f 100644
--- a/code/modules/industrial_lift/tram/tram_windows.dm
+++ b/code/modules/industrial_lift/tram/tram_windows.dm
@@ -36,8 +36,9 @@
if(fulltile)
return ..()
smoothing_junction = new_junction
- var/smooth_left = (smoothing_junction & turn(dir, 90))
- var/smooth_right = (smoothing_junction & turn(dir, -90))
+ var/go_off = reverse_ndir(smoothing_junction)
+ var/smooth_left = (go_off & turn(dir, 90))
+ var/smooth_right = (go_off & turn(dir, -90))
if(smooth_left && smooth_right)
icon_state = "tram_mid"
else if (smooth_left)
diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm
index ce39b5a7405..0d8e57f13eb 100644
--- a/code/modules/jobs/job_types/_job.dm
+++ b/code/modules/jobs/job_types/_job.dm
@@ -178,6 +178,8 @@
for(var/i in roundstart_experience)
spawned_human.mind.adjust_experience(i, roundstart_experience[i], TRUE)
+/// Announce that this job as joined the round to all crew members.
+/// Note the joining mob has no client at this point.
/datum/job/proc/announce_job(mob/living/joining_mob, job_title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - Original: /datum/job/proc/announce_job(mob/living/joining_mob)
if(head_announce)
announce_head(joining_mob, head_announce, job_title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - Original: announce_head(joining_mob, head_announce)
@@ -191,13 +193,27 @@
/mob/living/proc/on_job_equipping(datum/job/equipping)
return
-/mob/living/carbon/human/on_job_equipping(datum/job/equipping, datum/preferences/used_pref) //SKYRAT EDIT CHANGE
+#define VERY_LATE_ARRIVAL_TOAST_PROB 20
+
+/mob/living/carbon/human/on_job_equipping(datum/job/equipping, datum/preferences/used_pref, client/player_client) //SKYRAT EDIT CHANGE - ORIGINAL: /mob/living/carbon/human/on_job_equipping(datum/job/equipping)
var/datum/bank_account/bank_account = new(real_name, equipping, dna.species.payday_modifier)
bank_account.payday(STARTING_PAYCHECKS, TRUE)
account_id = bank_account.account_id
bank_account.replaceable = FALSE
- dress_up_as_job(equipping, FALSE, used_pref) //SKYRAT EDIT CHANGE
+ add_mob_memory(/datum/memory/key/account, remembered_id = account_id)
+
+ dress_up_as_job(equipping, FALSE, used_pref) //SKYRAT EDIT CHANGE - ORIGINAL: dress_up_as_job(equipping)
+
+ if(EMERGENCY_PAST_POINT_OF_NO_RETURN && prob(VERY_LATE_ARRIVAL_TOAST_PROB))
+ //equipping.equip_to_slot_or_del(new /obj/item/food/griddle_toast(equipping), ITEM_SLOT_MASK) // SKYRAT EDIT REMOVAL - See below
+ // SKYRAT EDIT ADDITION - Lizards
+ if(islizard(equipping))
+ equip_to_slot_or_del(new /obj/item/food/breadslice/root(equipping), ITEM_SLOT_MASK)
+ else
+ equip_to_slot_or_del(new /obj/item/food/griddle_toast(equipping), ITEM_SLOT_MASK)
+ // SKYRAT EDIT ADDITION END - Lizards
+#undef VERY_LATE_ARRIVAL_TOAST_PROB
/mob/living/proc/dress_up_as_job(datum/job/equipping, visual_only = FALSE)
return
@@ -267,8 +283,43 @@
return TRUE
-/datum/job/proc/radio_help_message(mob/M)
- to_chat(M, "Prefix your message with :h to speak on your department's radio. To see other prefixes, look closely at your headset.")
+/// Gets the message that shows up when spawning as this job
+/datum/job/proc/get_spawn_message(alt_title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: /datum/job/proc/get_spawn_message()
+ SHOULD_NOT_OVERRIDE(TRUE)
+ return examine_block(span_infoplain(jointext(get_spawn_message_information(alt_title), "\n• "))) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLED - ORIGINAL: return examine_block(span_infoplain(jointext(get_spawn_message_information(), "\n• ")))
+
+/// Returns a list of strings that correspond to chat messages sent to this mob when they join the round.
+/datum/job/proc/get_spawn_message_information(alt_title = title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: /datum/job/proc/get_spawn_message_information()
+ SHOULD_CALL_PARENT(TRUE)
+ var/list/info = list()
+ info += "You are the [alt_title].\n" // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: info += "You are the [title].\n"
+ var/related_policy = get_policy(title)
+ var/radio_info = get_radio_information()
+ if(related_policy)
+ info += related_policy
+ if(supervisors)
+ info += "As the [alt_title == title ? alt_title : "[alt_title] ([title])"] you answer directly to [supervisors]. Special circumstances may change this." // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: info += "As the [title] you answer directly to [supervisors]. Special circumstances may change this."
+ if(radio_info)
+ info += radio_info
+ if(req_admin_notify)
+ info += "You are playing a job that is important for Game Progression. \
+ If you have to disconnect, please notify the admins via adminhelp."
+ if(CONFIG_GET(number/minimal_access_threshold))
+ info += span_boldnotice("As this station was initially staffed with a \
+ [CONFIG_GET(flag/jobs_have_minimal_access) ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] \
+ have been added to your ID card.")
+ //SKYRAT EDIT ADDITION START - ALTERNATIVE_JOB_TITLES
+ if(alt_title != title)
+ info += span_warning("Remember that alternate titles are purely for flavor and roleplay.")
+ info += span_doyourjobidiot("Do not use your \"[alt_title]\" alt title as an excuse to forego your duties as a [title].")
+ //SKYRAT EDIT END
+
+ return info
+
+/// Returns information pertaining to this job's radio.
+/datum/job/proc/get_radio_information()
+ if(job_flags & JOB_CREW_MEMBER)
+ return "Prefix your message with :h to speak on your department's radio. To see other prefixes, look closely at your headset."
/datum/outfit/job
name = "Standard Gear"
diff --git a/code/modules/jobs/job_types/ai.dm b/code/modules/jobs/job_types/ai.dm
index f3f8b23837b..0b38d6e081d 100644
--- a/code/modules/jobs/job_types/ai.dm
+++ b/code/modules/jobs/job_types/ai.dm
@@ -117,5 +117,5 @@
/datum/job/ai/config_check()
return CONFIG_GET(flag/allow_ai)
-/datum/job/ai/radio_help_message(mob/M)
- to_chat(M, "Prefix your message with :b to speak with cyborgs and other AIs.")
+/datum/job/ai/get_radio_information()
+ return "Prefix your message with :b to speak with cyborgs and other AIs."
diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm
index e788202b445..d8ae6d335b3 100755
--- a/code/modules/jobs/job_types/captain.dm
+++ b/code/modules/jobs/job_types/captain.dm
@@ -51,6 +51,9 @@
/datum/job/captain/get_captaincy_announcement(mob/living/captain)
return "Captain [captain.real_name] on deck!"
+/datum/job/captain/get_radio_information()
+ . = ..()
+ . += "\nYou have access to all radio channels, but they are not automatically tuned. Check your radio for more information."
/datum/outfit/job/captain
name = "Captain"
diff --git a/code/modules/jobs/job_types/chaplain/chaplain.dm b/code/modules/jobs/job_types/chaplain/chaplain.dm
index be4516a0db7..58821ec5358 100644
--- a/code/modules/jobs/job_types/chaplain/chaplain.dm
+++ b/code/modules/jobs/job_types/chaplain/chaplain.dm
@@ -25,7 +25,6 @@
mail_goodies = list(
/obj/item/reagent_containers/cup/glass/bottle/holywater = 30,
- /obj/item/toy/plush/awakenedplushie = 10,
/obj/item/grenade/chem_grenade/holy = 5,
/obj/item/toy/plush/narplush = 2,
/obj/item/toy/plush/ratplush = 1
diff --git a/code/modules/jobs/job_types/chaplain/chaplain_costumes.dm b/code/modules/jobs/job_types/chaplain/chaplain_costumes.dm
index f2ab21c9c35..637177adffb 100644
--- a/code/modules/jobs/job_types/chaplain/chaplain_costumes.dm
+++ b/code/modules/jobs/job_types/chaplain/chaplain_costumes.dm
@@ -50,6 +50,14 @@
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
flags_inv = HIDEJUMPSUIT
+/obj/item/clothing/suit/chaplainsuit/habit
+ name = "religious tunic"
+ desc = "No nunsene clothing."
+ icon_state = "habit"
+ alternate_worn_layer = GLOVES_LAYER // since the sleeves cover a part of the hands, this way it looks better while retaining glove overlay correctly.
+ body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
+ flags_inv = HIDEJUMPSUIT
+
/obj/item/clothing/suit/chaplainsuit/bishoprobe
name = "bishop's robes"
desc = "Glad to see the tithes you collected were well spent."
diff --git a/code/modules/jobs/job_types/cyborg.dm b/code/modules/jobs/job_types/cyborg.dm
index ae6b7c142cc..92094073033 100644
--- a/code/modules/jobs/job_types/cyborg.dm
+++ b/code/modules/jobs/job_types/cyborg.dm
@@ -4,7 +4,7 @@
auto_deadmin_role_flags = DEADMIN_POSITION_SILICON
faction = FACTION_STATION
total_positions = 3 // SKYRAT EDIT: Original value (0)
- spawn_positions = 3 // SKYRAT EDIT: Original value (1)
+ spawn_positions = 3
supervisors = "your laws and the AI" //Nodrak
spawn_type = /mob/living/silicon/robot
minimal_player_age = 21
@@ -58,5 +58,5 @@
if(!robot_spawn.connected_ai) // Only log if there's no Master AI
robot_spawn.log_current_laws()
-/datum/job/cyborg/radio_help_message(mob/M)
- to_chat(M, "Prefix your message with :b to speak with other cyborgs and AI.")
+/datum/job/cyborg/get_radio_information()
+ return "Prefix your message with :b to speak with other cyborgs and AI."
diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm
index 3dac90b4baf..2fd4f3a93a6 100644
--- a/code/modules/jobs/job_types/paramedic.dm
+++ b/code/modules/jobs/job_types/paramedic.dm
@@ -32,7 +32,8 @@
/obj/item/reagent_containers/hypospray/medipen/salacid = 10,
/obj/item/reagent_containers/hypospray/medipen/salbutamol = 10,
/obj/item/reagent_containers/hypospray/medipen/penacid = 10,
- /obj/item/reagent_containers/hypospray/medipen/survival/luxury = 5
+ /obj/item/reagent_containers/hypospray/medipen/survival/luxury = 5,
+ /obj/item/storage/box/bandages = 5,
)
rpg_title = "Corpse Runner"
job_flags = STATION_JOB_FLAGS
@@ -56,6 +57,7 @@
gloves = /obj/item/clothing/gloves/latex/nitrile
shoes = /obj/item/clothing/shoes/sneakers/blue
l_pocket = /obj/item/modular_computer/pda/medical/paramedic
+ r_pocket = /obj/item/storage/box/bandages
backpack = /obj/item/storage/backpack/medic
satchel = /obj/item/storage/backpack/satchel/med
diff --git a/code/modules/library/skill_learning/skillchip.dm b/code/modules/library/skill_learning/skillchip.dm
index f9fd629c1ed..762e8e0162c 100644
--- a/code/modules/library/skill_learning/skillchip.dm
+++ b/code/modules/library/skill_learning/skillchip.dm
@@ -489,4 +489,13 @@
activate_message = span_notice("You recall learning from your grandmother how they baked their cookies with love.")
deactivate_message = span_notice("You forget all memories imparted upon you by your grandmother. Were they even your real grandma?")
+/obj/item/skillchip/master_angler
+ name = "Mast-Angl-Er skillchip"
+ auto_traits = list(TRAIT_REVEAL_FISH)
+ skill_name = "Fisherman's Discernment"
+ skill_description = "While fishing, it'll make a smidge easier to guess whatever you're trying to catch."
+ skill_icon = "fish"
+ activate_message = span_notice("You feel the knowledge and passion of several sunbaked, seasoned fishermen burn within you.")
+ deactivate_message = span_notice("You no longer feel like casting a fishing rod by the sunny riverside.")
+
#undef SKILLCHIP_CATEGORY_GENERAL
diff --git a/code/modules/mafia/controller.dm b/code/modules/mafia/controller.dm
index 1916a65f7b1..f8d9db13106 100644
--- a/code/modules/mafia/controller.dm
+++ b/code/modules/mafia/controller.dm
@@ -578,7 +578,7 @@ GLOBAL_LIST_INIT(mafia_role_by_alignment, setup_mafia_role_by_alignment())
for(var/datum/mafia_role/role as anything in all_roles)
var/mob/living/carbon/human/H = new(get_turf(role.assigned_landmark))
- H.add_traits(list(TRAIT_NOFIRE, TRAIT_NOBREATH, TRAIT_CANNOT_CRYSTALIZE), MAFIA_TRAIT)
+ H.add_traits(list(TRAIT_NOFIRE, TRAIT_NOBREATH, TRAIT_CANNOT_CRYSTALIZE, TRAIT_PERMANENTLY_MORTAL), MAFIA_TRAIT)
H.equipOutfit(outfit_to_distribute)
H.status_flags |= GODMODE
RegisterSignal(H, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(display_votes))
diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm
index 16da29837fb..c208e2eea9e 100644
--- a/code/modules/mapping/access_helpers.dm
+++ b/code/modules/mapping/access_helpers.dm
@@ -386,6 +386,11 @@
access_list += list(ACCESS_CARGO, ACCESS_MAINT_TUNNELS)
return access_list
+/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den/get_access()
+ var/list/access_list = ..()
+ access_list += ACCESS_BIT_DEN
+ return access_list
+
// -------------------- Syndicate access helpers
/obj/effect/mapping_helpers/airlock/access/any/syndicate
icon_state = "access_helper_syn"
diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm
index a656aa467d6..c9fdb9747e5 100644
--- a/code/modules/mining/abandoned_crates.dm
+++ b/code/modules/mining/abandoned_crates.dm
@@ -188,7 +188,9 @@
new /obj/item/clothing/suit/costume/wellworn_shirt/graphic/ian(src)
new /obj/item/clothing/suit/hooded/ian_costume(src)
if(67 to 68)
- new /obj/item/toy/plush/awakenedplushie(src)
+ var/obj/item/gibtonite/free_bomb = new /obj/item/gibtonite(src)
+ free_bomb.quality = rand(1, 3)
+ free_bomb.GibtoniteReaction(null, "A secure loot closet has spawned a live")
if(69 to 70)
new /obj/item/stack/ore/bluespace_crystal(src, 5)
if(71 to 72)
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index e9c652fd7bd..b01b537ec80 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -267,7 +267,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
return
if(I.tool_behaviour == TOOL_MINING || istype(I, /obj/item/resonator) || I.force >= 10)
- GibtoniteReaction(user)
+ GibtoniteReaction(user, "A resonator has primed for detonation a")
return
if(istype(I, /obj/item/mining_scanner) || istype(I, /obj/item/t_scanner/adv_mining_scanner) || I.tool_behaviour == TOOL_MULTITOOL)
@@ -294,14 +294,14 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
return ..()
/obj/item/gibtonite/bullet_act(obj/projectile/P)
- GibtoniteReaction(P.firer)
+ GibtoniteReaction(P.firer, "A projectile has primed for detonation a")
return ..()
/obj/item/gibtonite/ex_act()
- GibtoniteReaction(null, 1)
+ GibtoniteReaction(null, "An explosion has primed for detonation a")
return TRUE
-/obj/item/gibtonite/proc/GibtoniteReaction(mob/user, triggered_by = 0)
+/obj/item/gibtonite/proc/GibtoniteReaction(mob/user, triggered_by)
if(primed)
return
primed = TRUE
@@ -311,18 +311,16 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
if(!is_mining_level(z))//Only annoy the admins ingame if we're triggered off the mining zlevel
notify_admins = TRUE
- if(triggered_by == 1)
- log_bomber(null, "An explosion has primed a", src, "for detonation", notify_admins)
- else if(triggered_by == 2)
- var/turf/bombturf = get_turf(src)
- if(notify_admins)
- message_admins("A signal has triggered a [name] to detonate at [ADMIN_VERBOSEJMP(bombturf)]. Igniter attacher: [ADMIN_LOOKUPFLW(attacher)]")
- var/bomb_message = "A signal has primed a [name] for detonation at [AREACOORD(bombturf)]. Igniter attacher: [key_name(attacher)]."
- log_game(bomb_message)
- GLOB.bombers += bomb_message
- else
+ if(user)
user.visible_message(span_warning("[user] strikes \the [src], causing a chain reaction!"), span_danger("You strike \the [src], causing a chain reaction."))
- log_bomber(user, "has primed a", src, "for detonation", notify_admins)
+
+ var/attacher_text = attacher ? "Igniter attacher: [ADMIN_LOOKUPFLW(attacher)]" : null
+
+ if(triggered_by)
+ log_bomber(user, triggered_by, src, attacher_text, notify_admins)
+ else
+ log_bomber(user, "Something has primed a", src, "for detonation.[attacher_text ? " " : ""][attacher_text]", notify_admins)
+
det_timer = addtimer(CALLBACK(src, PROC_REF(detonate), notify_admins), det_time, TIMER_STOPPABLE)
/obj/item/gibtonite/proc/detonate(notify_admins)
diff --git a/code/modules/mob/living/basic/basic_defense.dm b/code/modules/mob/living/basic/basic_defense.dm
index cc128a9f5e9..8afb40f2912 100644
--- a/code/modules/mob/living/basic/basic_defense.dm
+++ b/code/modules/mob/living/basic/basic_defense.dm
@@ -165,6 +165,9 @@
return TRUE
/mob/living/basic/blob_act(obj/structure/blob/attacking_blob)
+ . = ..()
+ if (!.)
+ return
apply_damage(20, damagetype = BRUTE)
/mob/living/basic/do_attack_animation(atom/attacked_atom, visual_effect_icon, used_item, no_effect)
diff --git a/code/modules/mob/living/basic/blob_minions/blob_ai.dm b/code/modules/mob/living/basic/blob_minions/blob_ai.dm
new file mode 100644
index 00000000000..6168b7ca83b
--- /dev/null
+++ b/code/modules/mob/living/basic/blob_minions/blob_ai.dm
@@ -0,0 +1,51 @@
+/**
+ * Extremely simple AI, this isn't a very smart boy
+ * Only notable quirk is that it uses JPS movement, simple avoidance would fail to realise it can path through blobs
+ */
+/datum/ai_controller/basic_controller/blobbernaut
+ blackboard = list(
+ BB_TARGETTING_DATUM = new /datum/targetting_datum/basic/attack_until_dead,
+ )
+
+ ai_movement = /datum/ai_movement/jps
+ idle_behavior = /datum/idle_behavior/idle_random_walk
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/simple_find_target,
+ /datum/ai_planning_subtree/attack_obstacle_in_path,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree,
+ )
+
+/**
+ * Move to a point designated by the overmind, otherwise just slap people nearby
+ */
+/datum/ai_controller/basic_controller/blob_zombie
+ blackboard = list(
+ BB_TARGETTING_DATUM = new /datum/targetting_datum/basic/attack_until_dead,
+ )
+
+ ai_movement = /datum/ai_movement/jps
+ idle_behavior = /datum/idle_behavior/idle_random_walk
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/travel_to_point/and_clear_target,
+ /datum/ai_planning_subtree/simple_find_target,
+ /datum/ai_planning_subtree/attack_obstacle_in_path,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree,
+ )
+
+/**
+ * As blob zombie but will prioritise attacking corpses to zombify them
+ */
+/datum/ai_controller/basic_controller/blob_spore
+ blackboard = list(
+ BB_TARGETTING_DATUM = new /datum/targetting_datum/basic/attack_until_dead,
+ )
+
+ ai_movement = /datum/ai_movement/jps
+ idle_behavior = /datum/idle_behavior/idle_random_walk
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/find_and_hunt_target/corpses,
+ /datum/ai_planning_subtree/travel_to_point/and_clear_target,
+ /datum/ai_planning_subtree/simple_find_target,
+ /datum/ai_planning_subtree/attack_obstacle_in_path,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree,
+ )
diff --git a/code/modules/mob/living/basic/blob_minions/blob_mob.dm b/code/modules/mob/living/basic/blob_minions/blob_mob.dm
new file mode 100644
index 00000000000..35e41f09058
--- /dev/null
+++ b/code/modules/mob/living/basic/blob_minions/blob_mob.dm
@@ -0,0 +1,37 @@
+/// Root of shared behaviour for mobs spawned by blobs, is abstract and should not be spawned
+/mob/living/basic/blob_minion
+ name = "Blob Error"
+ desc = "A nonfunctional fungal creature created by bad code or celestial mistake. Point and laugh."
+ icon = 'icons/mob/nonhuman-player/blob.dmi'
+ icon_state = "blob_head"
+ unique_name = TRUE
+ pass_flags = PASSBLOB
+ faction = list(ROLE_BLOB)
+ combat_mode = TRUE
+ bubble_icon = "blob"
+ speak_emote = null
+ habitable_atmos = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ minimum_survivable_temperature = 0
+ maximum_survivable_temperature = INFINITY
+ lighting_cutoff_red = 20
+ lighting_cutoff_green = 40
+ lighting_cutoff_blue = 30
+ initial_language_holder = /datum/language_holder/empty
+
+/mob/living/basic/blob_minion/Initialize(mapload)
+ . = ..()
+ add_traits(list(TRAIT_BLOB_ALLY, TRAIT_MUTE), INNATE_TRAIT)
+ AddComponent(/datum/component/blob_minion, on_strain_changed = CALLBACK(src, PROC_REF(on_strain_updated)))
+
+/// Called when our blob overmind changes their variant, update some of our mob properties
+/mob/living/basic/blob_minion/proc/on_strain_updated(mob/camera/blob/overmind, datum/blobstrain/new_strain)
+ return
+
+/// Associates this mob with a specific blob factory node
+/mob/living/basic/blob_minion/proc/link_to_factory(obj/structure/blob/special/factory/factory)
+ RegisterSignal(factory, COMSIG_QDELETING, PROC_REF(on_factory_destroyed))
+
+/// Called when our factory is destroyed
+/mob/living/basic/blob_minion/proc/on_factory_destroyed()
+ SIGNAL_HANDLER
+ to_chat(src, span_userdanger("Your factory was destroyed! You feel yourself dying!"))
diff --git a/code/modules/mob/living/basic/blob_minions/blob_spore.dm b/code/modules/mob/living/basic/blob_minions/blob_spore.dm
new file mode 100644
index 00000000000..e8c3acc8b97
--- /dev/null
+++ b/code/modules/mob/living/basic/blob_minions/blob_spore.dm
@@ -0,0 +1,123 @@
+/**
+ * A floating fungus which turns people into zombies and explodes into reagent clouds upon death.
+ */
+/mob/living/basic/blob_minion/spore
+ name = "blob spore"
+ desc = "A floating, fragile spore."
+ icon = 'icons/mob/nonhuman-player/blob.dmi'
+ icon_state = "blobpod"
+ icon_living = "blobpod"
+ health_doll_icon = "blobpod"
+ health = BLOBMOB_SPORE_HEALTH
+ maxHealth = BLOBMOB_SPORE_HEALTH
+ verb_say = "psychically pulses"
+ verb_ask = "psychically probes"
+ verb_exclaim = "psychically yells"
+ verb_yell = "psychically screams"
+ melee_damage_lower = BLOBMOB_SPORE_DMG_LOWER
+ melee_damage_upper = BLOBMOB_SPORE_DMG_UPPER
+ obj_damage = 0
+ attack_verb_continuous = "batters"
+ attack_verb_simple = "batter"
+ attack_sound = 'sound/weapons/genhit1.ogg'
+ death_message = "explodes into a cloud of gas!"
+ gold_core_spawnable = HOSTILE_SPAWN
+ basic_mob_flags = DEL_ON_DEATH
+ ai_controller = /datum/ai_controller/basic_controller/blob_spore
+ /// Size of cloud produced from a dying spore
+ var/death_cloud_size = 1
+ /// Type of mob to create
+ var/mob/living/zombie_type = /mob/living/basic/blob_minion/zombie
+
+/mob/living/basic/blob_minion/spore/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/simple_flying)
+ AddElement(/datum/element/swabable, CELL_LINE_TABLE_BLOBSPORE, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5)
+
+/mob/living/basic/blob_minion/spore/death(gibbed)
+ . = ..()
+ death_burst()
+
+/mob/living/basic/blob_minion/spore/on_factory_destroyed()
+ death()
+
+/// Create an explosion of spores on death
+/mob/living/basic/blob_minion/spore/proc/death_burst()
+ do_chem_smoke(range = death_cloud_size, holder = src, location = get_turf(src), reagent_type = /datum/reagent/toxin/spore)
+
+
+/mob/living/basic/blob_minion/spore/melee_attack(mob/living/carbon/human/target, list/modifiers, ignore_cooldown)
+ . = ..()
+ if (!ishuman(target) || target.stat != DEAD)
+ return
+ zombify(target)
+
+/// Become a zombie
+/mob/living/basic/blob_minion/spore/proc/zombify(mob/living/carbon/human/target)
+ visible_message(span_warning("The corpse of [target.name] suddenly rises!"))
+ var/mob/living/basic/blob_minion/zombie/blombie = change_mob_type(zombie_type, loc, new_name = initial(zombie_type.name))
+ blombie.set_name()
+ if (istype(blombie)) // In case of badmin
+ blombie.consume_corpse(target)
+ SEND_SIGNAL(src, COMSIG_BLOB_ZOMBIFIED, blombie)
+ qdel(src)
+
+/// Variant of the blob spore which is actually spawned by blob factories
+/mob/living/basic/blob_minion/spore/minion
+ gold_core_spawnable = NO_SPAWN
+ zombie_type = /mob/living/basic/blob_minion/zombie/controlled
+ /// We die if we leave the same turf as this z level
+ var/turf/z_turf
+
+/mob/living/basic/blob_minion/spore/minion/Initialize(mapload)
+ . = ..()
+ RegisterSignal(src, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_z_changed))
+
+/// When we z-move check that we're on the same z level as our factory was
+/mob/living/basic/blob_minion/spore/minion/proc/on_z_changed()
+ SIGNAL_HANDLER
+ if (isnull(z_turf))
+ return
+ if (!is_valid_z_level(get_turf(src), z_turf))
+ death()
+
+/// Mark the turf we need to track from our factory
+/mob/living/basic/blob_minion/spore/minion/link_to_factory(obj/structure/blob/special/factory/factory)
+ . = ..()
+ z_turf = get_turf(factory)
+
+/// If the blob changes to distributed neurons then you can control the spores
+/mob/living/basic/blob_minion/spore/minion/on_strain_updated(mob/camera/blob/overmind, datum/blobstrain/new_strain)
+ if (isnull(overmind))
+ REMOVE_TRAIT(src, TRAIT_PERMANENTLY_MORTAL, INNATE_TRAIT)
+ else
+ ADD_TRAIT(src, TRAIT_PERMANENTLY_MORTAL, INNATE_TRAIT)
+
+ if (istype(new_strain, /datum/blobstrain/reagent/distributed_neurons))
+ AddComponent(\
+ /datum/component/ghost_direct_control,\
+ ban_type = ROLE_BLOB_INFECTION,\
+ poll_candidates = TRUE,\
+ poll_ignore_key = POLL_IGNORE_BLOB,\
+ )
+ else
+ qdel(GetComponent(/datum/component/ghost_direct_control))
+
+/mob/living/basic/blob_minion/spore/minion/death_burst()
+ return // This behaviour is superceded by the overmind's intervention
+
+
+/// Weakened spore spawned by distributed neurons, can't zombify people and makes a teeny explosion
+/mob/living/basic/blob_minion/spore/minion/weak
+ name = "fragile blob spore"
+ health = 15
+ maxHealth = 15
+ melee_damage_lower = 1
+ melee_damage_upper = 2
+ death_cloud_size = 0
+
+/mob/living/basic/blob_minion/spore/minion/weak/zombify()
+ return
+
+/mob/living/basic/blob_minion/spore/minion/weak/on_strain_updated()
+ return
diff --git a/code/modules/mob/living/basic/blob_minions/blob_zombie.dm b/code/modules/mob/living/basic/blob_minions/blob_zombie.dm
new file mode 100644
index 00000000000..c9bf3b7346a
--- /dev/null
+++ b/code/modules/mob/living/basic/blob_minions/blob_zombie.dm
@@ -0,0 +1,99 @@
+/// A shambling mob made out of a crew member
+/mob/living/basic/blob_minion/zombie
+ name = "blob zombie"
+ desc = "A shambling corpse animated by the blob."
+ icon_state = "zombie"
+ icon_living = "zombie"
+ health_doll_icon = "blobpod"
+ mob_biotypes = MOB_ORGANIC | MOB_HUMANOID
+ health = 70
+ maxHealth = 70
+ verb_say = "gurgles"
+ verb_ask = "demands"
+ verb_exclaim = "roars"
+ verb_yell = "bellows"
+ melee_damage_lower = 10
+ melee_damage_upper = 15
+ melee_attack_cooldown = CLICK_CD_MELEE
+ obj_damage = 20
+ attack_verb_continuous = "punches"
+ attack_verb_simple = "punch"
+ attack_sound = 'sound/weapons/genhit1.ogg'
+ death_message = "collapses to the ground!"
+ gold_core_spawnable = NO_SPAWN
+ basic_mob_flags = DEL_ON_DEATH
+ ai_controller = /datum/ai_controller/basic_controller/blob_zombie
+ /// The dead body we have inside
+ var/mob/living/carbon/human/corpse
+
+/mob/living/basic/blob_minion/zombie/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_PERMANENTLY_MORTAL, INNATE_TRAIT) // This mob doesn't function visually without a corpse and wouldn't respawn with one
+ AddElement(/datum/element/swabable, CELL_LINE_TABLE_BLOBSPORE, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5)
+
+/mob/living/basic/blob_minion/zombie/death(gibbed)
+ corpse?.forceMove(loc)
+ death_burst()
+ return ..()
+
+/mob/living/basic/blob_minion/zombie/Exited(atom/movable/gone, direction)
+ . = ..()
+ if (gone != corpse)
+ return
+ corpse = null
+ death()
+
+/mob/living/basic/blob_minion/zombie/Destroy()
+ QDEL_NULL(corpse)
+ return ..()
+
+/mob/living/basic/blob_minion/zombie/on_factory_destroyed()
+ . = ..()
+ death()
+
+/mob/living/basic/blob_minion/zombie/update_overlays()
+ . = ..()
+ copy_overlays(corpse, TRUE)
+ var/mutable_appearance/blob_head_overlay = mutable_appearance('icons/mob/nonhuman-player/blob.dmi', "blob_head")
+ blob_head_overlay.color = LAZYACCESS(atom_colours, FIXED_COLOUR_PRIORITY) || COLOR_WHITE
+ color = initial(color) // reversing what our component did lol, but we needed the value for the overlay
+ . += blob_head_overlay
+
+/// Create an explosion of spores on death
+/mob/living/basic/blob_minion/zombie/proc/death_burst()
+ do_chem_smoke(range = 0, holder = src, location = get_turf(src), reagent_type = /datum/reagent/toxin/spore)
+
+/// Store a body so that we can drop it on death
+/mob/living/basic/blob_minion/zombie/proc/consume_corpse(mob/living/carbon/human/new_corpse)
+ if(new_corpse.wear_suit)
+ maxHealth += new_corpse.get_armor_rating(MELEE)
+ health = maxHealth
+ new_corpse.set_facial_hairstyle("Shaved", update = FALSE)
+ new_corpse.set_hairstyle("Bald", update = TRUE)
+ new_corpse.forceMove(src)
+ corpse = new_corpse
+ update_appearance(UPDATE_ICON)
+ RegisterSignal(corpse, COMSIG_LIVING_REVIVE, PROC_REF(on_corpse_revived))
+
+/// Dynamic changeling reentry
+/mob/living/basic/blob_minion/zombie/proc/on_corpse_revived()
+ SIGNAL_HANDLER
+ visible_message(span_boldwarning("[src] bursts from the inside!"))
+ death()
+
+/// Blob-created zombies will ping for player control when they make a zombie
+/mob/living/basic/blob_minion/zombie/controlled
+
+/mob/living/basic/blob_minion/zombie/controlled/consume_corpse(mob/living/carbon/human/new_corpse)
+ . = ..()
+ if (!isnull(client))
+ return
+ AddComponent(\
+ /datum/component/ghost_direct_control,\
+ ban_type = ROLE_BLOB_INFECTION,\
+ poll_candidates = TRUE,\
+ poll_ignore_key = POLL_IGNORE_BLOB,\
+ )
+
+/mob/living/basic/blob_minion/zombie/controlled/death_burst()
+ return
diff --git a/code/modules/mob/living/basic/blob_minions/blobbernaut.dm b/code/modules/mob/living/basic/blob_minions/blobbernaut.dm
new file mode 100644
index 00000000000..b483641993a
--- /dev/null
+++ b/code/modules/mob/living/basic/blob_minions/blobbernaut.dm
@@ -0,0 +1,109 @@
+/**
+ * Player-piloted brute mob. Mostly just a "move and click" kind of guy.
+ * Has a variant which takes damage when away from blob tiles
+ */
+/mob/living/basic/blob_minion/blobbernaut
+ name = "blobbernaut"
+ desc = "A hulking, mobile chunk of blobmass."
+ icon_state = "blobbernaut"
+ icon_living = "blobbernaut"
+ icon_dead = "blobbernaut_dead"
+ health = BLOBMOB_BLOBBERNAUT_HEALTH
+ maxHealth = BLOBMOB_BLOBBERNAUT_HEALTH
+ damage_coeff = list(BRUTE = 0.5, BURN = 1, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1)
+ melee_damage_lower = BLOBMOB_BLOBBERNAUT_DMG_SOLO_LOWER
+ melee_damage_upper = BLOBMOB_BLOBBERNAUT_DMG_SOLO_UPPER
+ melee_attack_cooldown = CLICK_CD_MELEE
+ obj_damage = BLOBMOB_BLOBBERNAUT_DMG_OBJ
+ attack_verb_continuous = "slams"
+ attack_verb_simple = "slam"
+ attack_sound = 'sound/effects/blobattack.ogg'
+ verb_say = "gurgles"
+ verb_ask = "demands"
+ verb_exclaim = "roars"
+ verb_yell = "bellows"
+ force_threshold = 10
+ pressure_resistance = 50
+ mob_size = MOB_SIZE_LARGE
+ hud_type = /datum/hud/living/blobbernaut
+ gold_core_spawnable = HOSTILE_SPAWN
+ ai_controller = /datum/ai_controller/basic_controller/blobbernaut
+
+/mob/living/basic/blob_minion/blobbernaut/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/swabable, CELL_LINE_TABLE_BLOBBERNAUT, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5)
+
+/mob/living/basic/blob_minion/blobbernaut/death(gibbed)
+ flick("blobbernaut_death", src)
+ return ..()
+
+/// This variant is the one actually spawned by blob factories, takes damage when away from blob tiles
+/mob/living/basic/blob_minion/blobbernaut/minion
+ gold_core_spawnable = NO_SPAWN
+ /// Is our factory dead?
+ var/orphaned = FALSE
+
+/mob/living/basic/blob_minion/blobbernaut/minion/Life(seconds_per_tick, times_fired)
+ . = ..()
+ if (!.)
+ return FALSE
+ var/damage_sources = 0
+ var/list/blobs_in_area = range(2, src)
+
+ if (!(locate(/obj/structure/blob) in blobs_in_area))
+ damage_sources++
+
+ if (orphaned)
+ damage_sources++
+ else
+ var/particle_colour = atom_colours[FIXED_COLOUR_PRIORITY] || COLOR_BLACK
+ if (locate(/obj/structure/blob/special/core) in blobs_in_area)
+ heal_overall_damage(maxHealth * BLOBMOB_BLOBBERNAUT_HEALING_CORE * seconds_per_tick)
+ var/obj/effect/temp_visual/heal/heal_effect = new /obj/effect/temp_visual/heal(get_turf(src))
+ heal_effect.color = particle_colour
+
+ if (locate(/obj/structure/blob/special/node) in blobs_in_area)
+ heal_overall_damage(maxHealth * BLOBMOB_BLOBBERNAUT_HEALING_NODE * seconds_per_tick)
+ var/obj/effect/temp_visual/heal/heal_effect = new /obj/effect/temp_visual/heal(get_turf(src))
+ heal_effect.color = particle_colour
+
+ if (damage_sources == 0)
+ return FALSE
+
+ // take 2.5% of max health as damage when not near the blob or if the naut has no factory, 5% if both
+ apply_damage(maxHealth * BLOBMOB_BLOBBERNAUT_HEALTH_DECAY * damage_sources * seconds_per_tick, damagetype = TOX) // We reduce brute damage
+ var/mutable_appearance/harming = mutable_appearance('icons/mob/nonhuman-player/blob.dmi', "nautdamage", MOB_LAYER + 0.01)
+ harming.appearance_flags = RESET_COLOR
+ harming.color = atom_colours[FIXED_COLOUR_PRIORITY] || COLOR_WHITE
+ harming.dir = dir
+ flick_overlay_view(harming, 0.8 SECONDS)
+ return TRUE
+
+/// Called by the blob creation power to give us a mind and a basic task orientation
+/mob/living/basic/blob_minion/blobbernaut/minion/proc/assign_key(ckey, datum/blobstrain/blobstrain)
+ key = ckey
+ flick("blobbernaut_produce", src)
+ health = maxHealth / 2 // Start out injured to encourage not beelining away from the blob
+ SEND_SOUND(src, sound('sound/effects/blobattack.ogg'))
+ SEND_SOUND(src, sound('sound/effects/attackblob.ogg'))
+ to_chat(src, span_infoplain("You are powerful, hard to kill, and slowly regenerate near nodes and cores, [span_cultlarge("but will slowly die if not near the blob")] or if the factory that made you is killed."))
+ to_chat(src, span_infoplain("You can communicate with other blobbernauts and overminds telepathically by attempting to speak normally"))
+ to_chat(src, span_infoplain("Your overmind's blob reagent is: [blobstrain.name]!"))
+ to_chat(src, span_infoplain("The [blobstrain.name] reagent [blobstrain.shortdesc ? "[blobstrain.shortdesc]" : "[blobstrain.description]"]"))
+
+/// Set our attack damage based on blob's properties
+/mob/living/basic/blob_minion/blobbernaut/minion/on_strain_updated(mob/camera/blob/overmind, datum/blobstrain/new_strain)
+ if (isnull(overmind))
+ melee_damage_lower = initial(melee_damage_lower)
+ melee_damage_upper = initial(melee_damage_upper)
+ attack_verb_continuous = initial(attack_verb_continuous)
+ return
+ melee_damage_lower = BLOBMOB_BLOBBERNAUT_DMG_LOWER
+ melee_damage_upper = BLOBMOB_BLOBBERNAUT_DMG_UPPER
+ attack_verb_continuous = new_strain.blobbernaut_message
+
+/// Called by our factory to inform us that it's not going to support us financially any more
+/mob/living/basic/blob_minion/blobbernaut/minion/on_factory_destroyed()
+ . = ..()
+ orphaned = TRUE
+ throw_alert("nofactory", /atom/movable/screen/alert/nofactory)
diff --git a/code/modules/mob/living/basic/heretic/heretic_summon.dm b/code/modules/mob/living/basic/heretic/heretic_summon.dm
index 0f7d63f903c..cdae7ea6786 100644
--- a/code/modules/mob/living/basic/heretic/heretic_summon.dm
+++ b/code/modules/mob/living/basic/heretic/heretic_summon.dm
@@ -13,6 +13,7 @@
unsuitable_heat_damage = 0
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
speed = 0
+ melee_attack_cooldown = CLICK_CD_MELEE
attack_sound = 'sound/weapons/punch1.ogg'
response_help_continuous = "thinks better of touching"
diff --git a/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp_ai.dm b/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp_ai.dm
index 5951bd6b7fe..47280af4281 100644
--- a/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp_ai.dm
+++ b/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp_ai.dm
@@ -13,53 +13,33 @@
/datum/ai_planning_subtree/attack_obstacle_in_path,
/datum/ai_planning_subtree/basic_melee_attack_subtree,
/datum/ai_planning_subtree/sculpt_statues,
- /datum/ai_planning_subtree/find_and_hunt_target/cannibalize,
+ /datum/ai_planning_subtree/find_and_hunt_target/corpses/ice_whelp,
/datum/ai_planning_subtree/burn_trees,
)
-
-/datum/ai_planning_subtree/find_and_hunt_target/cannibalize
+/datum/ai_planning_subtree/find_and_hunt_target/corpses/ice_whelp
target_key = BB_TARGET_CANNIBAL
- hunting_behavior = /datum/ai_behavior/cannibalize
- finding_behavior = /datum/ai_behavior/find_hunt_target/dragon_corpse
+ finding_behavior = /datum/ai_behavior/find_hunt_target/corpses/dragon_corpse
+ hunting_behavior = /datum/ai_behavior/hunt_target/unarmed_attack_target/dragon_cannibalise
hunt_targets = list(/mob/living/basic/mining/ice_whelp)
hunt_range = 10
-/datum/ai_behavior/find_hunt_target/dragon_corpse
+/datum/ai_behavior/find_hunt_target/corpses/dragon_corpse
-/datum/ai_behavior/find_hunt_target/dragon_corpse/valid_dinner(mob/living/source, mob/living/dinner, radius)
- if(dinner.stat != DEAD)
- return FALSE
+/datum/ai_behavior/find_hunt_target/corpses/dragon_corpse/valid_dinner(mob/living/source, mob/living/dinner, radius)
if(dinner.pulledby) //someone already got him before us
return FALSE
+ return ..()
- return can_see(source, dinner, radius)
-
-/datum/ai_behavior/cannibalize
+/datum/ai_behavior/hunt_target/unarmed_attack_target/dragon_cannibalise
behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_REQUIRE_REACH | AI_BEHAVIOR_CAN_PLAN_DURING_EXECUTION
-/datum/ai_behavior/cannibalize/setup(datum/ai_controller/controller, target_key)
- . = ..()
- var/atom/target = controller.blackboard[target_key]
- if(QDELETED(target))
- return FALSE
- set_movement_target(controller, target)
-
-/datum/ai_behavior/cannibalize/perform(seconds_per_tick, datum/ai_controller/controller, target_key, attack_key)
- . = ..()
- var/mob/living/basic/living_pawn = controller.pawn
+/datum/ai_behavior/hunt_target/unarmed_attack_target/dragon_cannibalise/perform(seconds_per_tick, datum/ai_controller/controller, target_key, attack_key)
var/mob/living/target = controller.blackboard[target_key]
-
- if(QDELETED(target))
+ if(QDELETED(target) || target.stat != DEAD || target.pulledby) //we were too slow
finish_action(controller, FALSE)
return
-
- if(target.stat != DEAD || target.pulledby) //we were too slow
- finish_action(controller, FALSE)
- return
-
- living_pawn.melee_attack(target)
- finish_action(controller, TRUE)
+ return ..()
/datum/ai_behavior/cannibalize/finish_action(datum/ai_controller/controller, succeeded, target_key)
. = ..()
diff --git a/code/modules/mob/living/basic/lavaland/hivelord/hivelord.dm b/code/modules/mob/living/basic/lavaland/hivelord/hivelord.dm
index 256ab1fbd8f..11043e58d11 100644
--- a/code/modules/mob/living/basic/lavaland/hivelord/hivelord.dm
+++ b/code/modules/mob/living/basic/lavaland/hivelord/hivelord.dm
@@ -102,7 +102,7 @@
/mob/living/basic/hivelord_brood/Initialize(mapload)
. = ..()
- add_traits(list(TRAIT_LAVA_IMMUNE, TRAIT_ASHSTORM_IMMUNE), INNATE_TRAIT)
+ add_traits(list(TRAIT_LAVA_IMMUNE, TRAIT_ASHSTORM_IMMUNE, TRAIT_PERMANENTLY_MORTAL), INNATE_TRAIT)
AddElement(/datum/element/simple_flying)
AddComponent(/datum/component/swarming)
AddComponent(/datum/component/clickbox, icon_state = "hivelord", max_scale = INFINITY)
diff --git a/code/modules/mob/living/basic/lavaland/legion/legion_brood.dm b/code/modules/mob/living/basic/lavaland/legion/legion_brood.dm
index bc21bd0e506..962d232c5ef 100644
--- a/code/modules/mob/living/basic/lavaland/legion/legion_brood.dm
+++ b/code/modules/mob/living/basic/lavaland/legion/legion_brood.dm
@@ -34,7 +34,7 @@
/mob/living/basic/legion_brood/Initialize(mapload)
. = ..()
- add_traits(list(TRAIT_LAVA_IMMUNE, TRAIT_ASHSTORM_IMMUNE), INNATE_TRAIT)
+ add_traits(list(TRAIT_LAVA_IMMUNE, TRAIT_ASHSTORM_IMMUNE, TRAIT_PERMANENTLY_MORTAL), INNATE_TRAIT)
AddElement(/datum/element/simple_flying)
AddComponent(/datum/component/swarming)
AddComponent(/datum/component/clickbox, icon_state = "sphere", max_scale = 2)
diff --git a/code/modules/mob/living/basic/space_fauna/morph.dm b/code/modules/mob/living/basic/space_fauna/morph.dm
index 3f31f7f3735..32115d05602 100644
--- a/code/modules/mob/living/basic/space_fauna/morph.dm
+++ b/code/modules/mob/living/basic/space_fauna/morph.dm
@@ -21,6 +21,7 @@
obj_damage = 50
melee_damage_lower = 20
melee_damage_upper = 20
+ melee_attack_cooldown = CLICK_CD_MELEE
// Oh you KNOW it's gonna be real green
lighting_cutoff_red = 10
diff --git a/code/modules/mob/living/basic/space_fauna/regal_rat/regal_rat.dm b/code/modules/mob/living/basic/space_fauna/regal_rat/regal_rat.dm
index 85369b72eb8..164c25fb896 100644
--- a/code/modules/mob/living/basic/space_fauna/regal_rat/regal_rat.dm
+++ b/code/modules/mob/living/basic/space_fauna/regal_rat/regal_rat.dm
@@ -24,6 +24,7 @@
obj_damage = 10
melee_damage_lower = 13
melee_damage_upper = 15
+ melee_attack_cooldown = CLICK_CD_MELEE
attack_verb_continuous = "slashes"
attack_verb_simple = "slash"
attack_sound = 'sound/weapons/bladeslice.ogg'
diff --git a/code/modules/mob/living/basic/space_fauna/spider/spider.dm b/code/modules/mob/living/basic/space_fauna/spider/spider.dm
index e96482439f9..4bd773f6d0a 100644
--- a/code/modules/mob/living/basic/space_fauna/spider/spider.dm
+++ b/code/modules/mob/living/basic/space_fauna/spider/spider.dm
@@ -13,6 +13,7 @@
response_disarm_continuous = "gently pushes aside"
response_disarm_simple = "gently push aside"
initial_language_holder = /datum/language_holder/spider
+ melee_attack_cooldown = CLICK_CD_MELEE
damage_coeff = list(BRUTE = 1, BURN = 1.25, TOX = 1, CLONE = 1, STAMINA = 1, OXY = 1)
basic_mob_flags = FLAMMABLE_MOB
status_flags = NONE
diff --git a/code/modules/mob/living/basic/space_fauna/supermatter_spider.dm b/code/modules/mob/living/basic/space_fauna/supermatter_spider.dm
new file mode 100644
index 00000000000..2a3ba326eac
--- /dev/null
+++ b/code/modules/mob/living/basic/space_fauna/supermatter_spider.dm
@@ -0,0 +1,102 @@
+/// A nasty little robotic bug that dusts people on attack. Jeepers. This should be a very, very, very rare spawn.
+/mob/living/basic/supermatter_spider
+ name = "supermatter spider"
+ desc= "A sliver of supermatter placed upon a robotically enhanced pedestal."
+
+ icon = 'icons/mob/simple/smspider.dmi'
+ icon_state = "smspider"
+ icon_living = "smspider"
+ icon_dead = "smspider_dead"
+
+ gender = NEUTER
+ mob_biotypes = MOB_BUG|MOB_ROBOTIC
+ speak_emote = list("vibrates")
+
+
+ attack_verb_continuous = "slices"
+ attack_verb_simple = "slice"
+ attack_sound = 'sound/effects/supermatter.ogg'
+ attack_vis_effect = ATTACK_EFFECT_CLAW
+
+ maxHealth = 10
+ health = 10
+ minimum_survivable_temperature = TCMB
+ maximum_survivable_temperature = T0C + 1250
+ habitable_atmos = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ death_message = "falls to the ground, its shard dulling to a miserable grey!"
+
+ faction = list(FACTION_HOSTILE)
+
+ // Gold, supermatter tinted
+ lighting_cutoff_red = 30
+ lighting_cutoff_green = 30
+ lighting_cutoff_blue = 10
+
+ ai_controller = /datum/ai_controller/basic_controller/supermatter_spider
+
+ /// If we successfully dust something, should we die?
+ var/single_use = TRUE
+
+/mob/living/basic/supermatter_spider/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/swarming)
+
+ AddElement(/datum/element/ai_retaliate)
+ AddElement(/datum/element/footstep, FOOTSTEP_MOB_CLAW)
+
+ RegisterSignal(src, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, PROC_REF(on_attack))
+
+/// Proc that we call on attacking something to dust 'em.
+/mob/living/basic/supermatter_spider/proc/on_attack(mob/living/basic/source, atom/target)
+ SIGNAL_HANDLER
+
+ if(isliving(target))
+ var/mob/living/victim = target
+ victim.investigate_log("has been dusted by [src].", INVESTIGATE_DEATHS)
+ dust_feedback(target)
+ victim.dust()
+ if(single_use)
+ death()
+ return COMPONENT_HOSTILE_NO_ATTACK
+
+ if(!isturf(target))
+ dust_feedback(target)
+ qdel(target)
+ if(single_use)
+ death()
+ return COMPONENT_HOSTILE_NO_ATTACK
+
+/// Simple proc that plays the supermatter dusting sound and sends a visible message.
+/mob/living/basic/supermatter_spider/proc/dust_feedback(atom/target)
+ playsound(get_turf(src), 'sound/effects/supermatter.ogg', 10, TRUE)
+ visible_message(span_danger("[src] knocks into [target], turning [target.p_them()] to dust in a brilliant flash of light!"))
+
+/mob/living/basic/supermatter_spider/overcharged
+ name = "overcharged supermatter spider"
+ desc = "A sliver of overcharged supermatter placed upon a robotically enhanced pedestal. This one seems especially dangerous."
+ icon_state = "smspideroc"
+ icon_living = "smspideroc"
+ maxHealth = 25
+ health = 25
+ single_use = FALSE
+
+/datum/ai_controller/basic_controller/supermatter_spider
+ blackboard = list(
+ BB_TARGETTING_DATUM = new /datum/targetting_datum/basic,
+ )
+
+ ai_movement = /datum/ai_movement/basic_avoidance
+ idle_behavior = /datum/idle_behavior/idle_random_walk
+
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/target_retaliate,
+ /datum/ai_planning_subtree/simple_find_target,
+ /datum/ai_planning_subtree/attack_obstacle_in_path,
+ /datum/ai_planning_subtree/random_speech/supermatter_spider,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree,
+ )
+
+/datum/ai_planning_subtree/random_speech/supermatter_spider
+ speech_chance = 7
+ emote_hear = list("clinks", "clanks")
+ emote_see = list("vibrates")
diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm
index 53a8d259393..217bc5bacba 100644
--- a/code/modules/mob/living/death.dm
+++ b/code/modules/mob/living/death.dm
@@ -58,6 +58,7 @@
dust_animation()
spawn_dust(just_ash)
+ ghostize()
QDEL_IN(src,5) // since this is sometimes called in the middle of movement, allow half a second for movement to finish, ghosting to happen and animation to play. Looks much nicer and doesn't cause multiple runtimes.
/mob/living/proc/dust_animation()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index e4fe206cf63..fa96e7c2181 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1479,6 +1479,7 @@
var/picked_animal = pick(
/mob/living/basic/bat,
/mob/living/basic/bear,
+ /mob/living/basic/blob_minion/blobbernaut,
/mob/living/basic/butterfly,
/mob/living/basic/carp,
/mob/living/basic/carp/magic,
@@ -1504,7 +1505,6 @@
/mob/living/basic/statue,
/mob/living/basic/stickman,
/mob/living/basic/stickman/dog,
- /mob/living/simple_animal/hostile/blob/blobbernaut/independent,
/mob/living/simple_animal/hostile/gorilla,
/mob/living/simple_animal/hostile/megafauna/dragon/lesser,
/mob/living/simple_animal/hostile/retaliate/goat,
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 0d309ff10c9..687359a6ff6 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -181,6 +181,7 @@
return ..()
/mob/living/fire_act()
+ . = ..()
adjust_fire_stacks(3)
ignite_mob()
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 766a7ef89a8..e9d306875c9 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -225,3 +225,6 @@
/// What our current gravity state is. Used to avoid duplicate animates and such
var/gravity_state = null
+
+ /// Whether this mob can be mutated into a cybercop via quantum server get_valid_domain_targets(). Specifically dodges megafauna
+ var/can_be_cybercop = TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/blob.dm b/code/modules/mob/living/simple_animal/hostile/blob.dm
deleted file mode 100644
index 7a40a01239c..00000000000
--- a/code/modules/mob/living/simple_animal/hostile/blob.dm
+++ /dev/null
@@ -1,101 +0,0 @@
-//Do not spawn
-/mob/living/simple_animal/hostile/blob
- icon = 'icons/mob/nonhuman-player/blob.dmi'
- pass_flags = PASSBLOB
- faction = list(ROLE_BLOB)
- bubble_icon = "blob"
- speak_emote = null //so we use verb_yell/verb_say/etc
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
- minbodytemp = 0
- maxbodytemp = INFINITY
- unique_name = 1
- combat_mode = TRUE
- // ... Blob colored lighting
- lighting_cutoff_red = 20
- lighting_cutoff_green = 40
- lighting_cutoff_blue = 30
- initial_language_holder = /datum/language_holder/empty
- retreat_distance = null //! retreat doesn't obey pass_flags, so won't work on blob mobs.
- /// Blob camera that controls the blob
- var/mob/camera/blob/overmind = null
- /// If this is related to anything else
- var/independent = FALSE
- /// The factory blob tile that generated this blob minion
- var/obj/structure/blob/special/factory/factory
-
-/mob/living/simple_animal/hostile/blob/update_icons()
- if(overmind)
- add_atom_colour(overmind.blobstrain.color, FIXED_COLOUR_PRIORITY)
- else
- remove_atom_colour(FIXED_COLOUR_PRIORITY)
-
-/mob/living/simple_animal/hostile/blob/Initialize(mapload)
- . = ..()
- if(!independent) //no pulling people deep into the blob
- remove_verb(src, /mob/living/verb/pulled)
- else
- pass_flags &= ~PASSBLOB
-
-/mob/living/simple_animal/hostile/blob/death()
- factory = null
- if(overmind)
- overmind.blob_mobs -= src
- overmind = null
- return ..()
-
-/mob/living/simple_animal/hostile/blob/get_status_tab_items()
- . = ..()
- if(overmind)
- . += "Blobs to Win: [overmind.blobs_legit.len]/[overmind.blobwincount]"
-
-/mob/living/simple_animal/hostile/blob/blob_act(obj/structure/blob/B)
- if(stat != DEAD && health < maxHealth)
- for(var/unused in 1 to 2)
- var/obj/effect/temp_visual/heal/heal_effect = new /obj/effect/temp_visual/heal(get_turf(src)) //hello yes you are being healed
- if(overmind)
- heal_effect.color = overmind.blobstrain.complementary_color
- else
- heal_effect.color = "#000000"
- adjustHealth(-maxHealth*BLOBMOB_HEALING_MULTIPLIER)
-
-/mob/living/simple_animal/hostile/blob/fire_act(exposed_temperature, exposed_volume)
- ..()
- if(exposed_temperature)
- adjustFireLoss(clamp(0.01 * exposed_temperature, 1, 5))
- else
- adjustFireLoss(5)
-
-/mob/living/simple_animal/hostile/blob/CanAllowThrough(atom/movable/mover, border_dir)
- . = ..()
- if(istype(mover, /obj/structure/blob))
- return TRUE
-
-///override to use astar/JPS instead of walk_to so we can take our blob pass_flags into account.
-/mob/living/simple_animal/hostile/blob/Goto(target, delay, minimum_distance)
- if(prevent_goto_movement)
- return FALSE
- if(target == src.target)
- approaching_target = TRUE
- else
- approaching_target = FALSE
-
- SSmove_manager.jps_move(moving = src, chasing = target, delay = delay, repath_delay = 2 SECONDS, minimum_distance = minimum_distance, simulated_only = FALSE, skip_first = TRUE, timeout = 5 SECONDS, flags = MOVEMENT_LOOP_IGNORE_GLIDE)
- return TRUE
-
-/mob/living/simple_animal/hostile/blob/Process_Spacemove(movement_dir = 0, continuous_move = FALSE)
- for(var/obj/structure/blob/blob in range(1, src))
- return 1
- return ..()
-
-/mob/living/simple_animal/hostile/blob/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null, filterproof = null, message_range = 7, datum/saymode/saymode = null)
- if(sanitize)
- message = trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN))
- var/spanned_message = say_quote(message)
- var/rendered = "\[Blob Telepathy\] [real_name] [spanned_message]"
- for(var/creature in GLOB.mob_list)
- if(isovermind(creature) || isblobmonster(creature))
- to_chat(creature, rendered)
- if(isobserver(creature))
- var/link = FOLLOW_LINK(creature, src)
- to_chat(creature, "[link] [rendered]")
-
diff --git a/code/modules/mob/living/simple_animal/hostile/blobbernaut.dm b/code/modules/mob/living/simple_animal/hostile/blobbernaut.dm
deleted file mode 100644
index dc1d038795f..00000000000
--- a/code/modules/mob/living/simple_animal/hostile/blobbernaut.dm
+++ /dev/null
@@ -1,109 +0,0 @@
-/mob/living/simple_animal/hostile/blob/blobbernaut
- name = "blobbernaut"
- desc = "A hulking, mobile chunk of blobmass."
- icon_state = "blobbernaut"
- icon_living = "blobbernaut"
- icon_dead = "blobbernaut_dead"
- health = BLOBMOB_BLOBBERNAUT_HEALTH
- maxHealth = BLOBMOB_BLOBBERNAUT_HEALTH
- damage_coeff = list(BRUTE = 0.5, BURN = 1, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1)
- melee_damage_lower = BLOBMOB_BLOBBERNAUT_DMG_SOLO_LOWER
- melee_damage_upper = BLOBMOB_BLOBBERNAUT_DMG_SOLO_UPPER
- obj_damage = BLOBMOB_BLOBBERNAUT_DMG_OBJ
- attack_verb_continuous = "slams"
- attack_verb_simple = "slam"
- attack_sound = 'sound/effects/blobattack.ogg'
- verb_say = "gurgles"
- verb_ask = "demands"
- verb_exclaim = "roars"
- verb_yell = "bellows"
- force_threshold = 10
- pressure_resistance = 50
- mob_size = MOB_SIZE_LARGE
- hud_type = /datum/hud/living/blobbernaut
-
-/mob/living/simple_animal/hostile/blob/blobbernaut/Initialize(mapload)
- . = ..()
- add_cell_sample()
-
-/mob/living/simple_animal/hostile/blob/blobbernaut/mind_initialize()
- . = ..()
- if(independent | !overmind)
- return
- var/datum/antagonist/blob_minion/blobbernaut/naut = new(overmind)
- mind.add_antag_datum(naut)
-
-/mob/living/simple_animal/hostile/blob/blobbernaut/add_cell_sample()
- AddElement(/datum/element/swabable, CELL_LINE_TABLE_BLOBBERNAUT, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5)
-
-/mob/living/simple_animal/hostile/blob/blobbernaut/Life(seconds_per_tick = SSMOBS_DT, times_fired)
- if(!..())
- return FALSE
- var/list/blobs_in_area = range(2, src)
-
- if(independent)
- return FALSE // strong independent blobbernaut that don't need no blob
-
- var/damagesources = 0
-
- if(!(locate(/obj/structure/blob) in blobs_in_area))
- damagesources++
-
- if(!factory)
- damagesources++
- else
- if(locate(/obj/structure/blob/special/core) in blobs_in_area)
- adjustHealth(-maxHealth*BLOBMOB_BLOBBERNAUT_HEALING_CORE * seconds_per_tick)
- var/obj/effect/temp_visual/heal/heal_effect = new /obj/effect/temp_visual/heal(get_turf(src)) //hello yes you are being healed
- if(overmind)
- heal_effect.color = overmind.blobstrain.complementary_color
- else
- heal_effect.color = "#000000"
- if(locate(/obj/structure/blob/special/node) in blobs_in_area)
- adjustHealth(-maxHealth*BLOBMOB_BLOBBERNAUT_HEALING_NODE * seconds_per_tick)
- var/obj/effect/temp_visual/heal/heal_effect = new /obj/effect/temp_visual/heal(get_turf(src))
- if(overmind)
- heal_effect.color = overmind.blobstrain.complementary_color
- else
- heal_effect.color = "#000000"
-
- if(!damagesources)
- return FALSE
-
- adjustHealth(maxHealth * BLOBMOB_BLOBBERNAUT_HEALTH_DECAY * damagesources * seconds_per_tick) //take 2.5% of max health as damage when not near the blob or if the naut has no factory, 5% if both
- var/mutable_appearance/healing = mutable_appearance('icons/mob/nonhuman-player/blob.dmi', "nautdamage", MOB_LAYER+0.01)
- healing.appearance_flags = RESET_COLOR
-
- if(overmind)
- healing.color = overmind.blobstrain.complementary_color
-
- flick_overlay_view(healing, 0.8 SECONDS)
-
-/mob/living/simple_animal/hostile/blob/blobbernaut/AttackingTarget()
- . = ..()
- if(. && isliving(target) && overmind)
- overmind.blobstrain.blobbernaut_attack(target, src)
-
-/mob/living/simple_animal/hostile/blob/blobbernaut/update_icons()
- ..()
- if(overmind) //if we have an overmind, we're doing chemical reactions instead of pure damage
- melee_damage_lower = BLOBMOB_BLOBBERNAUT_DMG_LOWER
- melee_damage_upper = BLOBMOB_BLOBBERNAUT_DMG_UPPER
- attack_verb_continuous = overmind.blobstrain.blobbernaut_message
- else
- melee_damage_lower = initial(melee_damage_lower)
- melee_damage_upper = initial(melee_damage_upper)
- attack_verb_continuous = initial(attack_verb_continuous)
-
-/mob/living/simple_animal/hostile/blob/blobbernaut/death(gibbed)
- if(factory)
- factory.blobbernaut = null //remove this blobbernaut from its factory
- factory.max_integrity = initial(factory.max_integrity)
- flick("blobbernaut_death", src)
- return ..()
-
-/mob/living/simple_animal/hostile/blob/blobbernaut/independent
- independent = TRUE
- gold_core_spawnable = HOSTILE_SPAWN
-
-
diff --git a/code/modules/mob/living/simple_animal/hostile/blobspore.dm b/code/modules/mob/living/simple_animal/hostile/blobspore.dm
deleted file mode 100644
index 501afde41b0..00000000000
--- a/code/modules/mob/living/simple_animal/hostile/blobspore.dm
+++ /dev/null
@@ -1,168 +0,0 @@
-/mob/living/simple_animal/hostile/blob/blobspore
- name = "blob spore"
- desc = "A floating, fragile spore."
- icon_state = "blobpod"
- icon_living = "blobpod"
- health_doll_icon = "blobpod"
- health = BLOBMOB_SPORE_HEALTH
- maxHealth = BLOBMOB_SPORE_HEALTH
- verb_say = "psychically pulses"
- verb_ask = "psychically probes"
- verb_exclaim = "psychically yells"
- verb_yell = "psychically screams"
- melee_damage_lower = BLOBMOB_SPORE_DMG_LOWER
- melee_damage_upper = BLOBMOB_SPORE_DMG_UPPER
- environment_smash = ENVIRONMENT_SMASH_NONE
- obj_damage = 0
- attack_verb_continuous = "hits"
- attack_verb_simple = "hit"
- attack_sound = 'sound/weapons/genhit1.ogg'
- del_on_death = TRUE
- death_message = "explodes into a cloud of gas!"
- gold_core_spawnable = NO_SPAWN //gold slime cores should only spawn the independent subtype
- /// Size of cloud produced from a dying spore
- var/death_cloud_size = 1
- /// The attached person
- var/mob/living/carbon/human/corpse
- /// If this is attached to a person
- var/is_zombie = FALSE
- /// Whether or not this is a fragile spore from Distributed Neurons
- var/is_weak = FALSE
-
-/mob/living/simple_animal/hostile/blob/blobspore/Initialize(mapload, obj/structure/blob/special/linked_node)
- . = ..()
- AddElement(/datum/element/simple_flying)
-
- if(!istype(linked_node))
- return
-
- factory = linked_node
- factory.spores += src
- if(linked_node.overmind && istype(linked_node.overmind.blobstrain, /datum/blobstrain/reagent/distributed_neurons) && !istype(src, /mob/living/simple_animal/hostile/blob/blobspore/weak))
- notify_ghosts("A controllable spore has been created in \the [get_area(src)].", source = src, action = NOTIFY_ORBIT, flashwindow = FALSE, header = "Sentient Spore Created")
- add_cell_sample()
-
-/mob/living/simple_animal/hostile/blob/blobspore/mind_initialize()
- . = ..()
- if(independent || !overmind)
- return FALSE
- var/datum/antagonist/blob_minion/blob_zombie/zombie = new(overmind)
- mind.add_antag_datum(zombie)
-
-/mob/living/simple_animal/hostile/blob/blobspore/Life(seconds_per_tick = SSMOBS_DT, times_fired)
- if(!is_zombie && isturf(loc))
- for(var/mob/living/carbon/human/target in view(src,1)) //Only for corpse right next to/on same tile
- if(!is_weak && target.stat == DEAD)
- zombify(target)
- break
- if(factory && !is_valid_z_level(get_turf(src), get_turf(factory)))
- death()
- return ..()
-
-/mob/living/simple_animal/hostile/blob/blobspore/attack_ghost(mob/user)
- . = ..()
- if(.)
- return
- humanize_pod(user)
-
-/mob/living/simple_animal/hostile/blob/blobspore/death(gibbed)
- // On death, create a small smoke of harmful gas (s-Acid)
- var/datum/effect_system/fluid_spread/smoke/chem/spores = new
- var/turf/location = get_turf(src)
-
- // Create the reagents to put into the air
- create_reagents(10)
-
- if(overmind?.blobstrain)
- overmind.blobstrain.on_sporedeath(src)
- else
- reagents.add_reagent(/datum/reagent/toxin/spore, 10)
-
- // Attach the smoke spreader and setup/start it.
- spores.attach(location)
- spores.set_up(death_cloud_size, holder = src, location = location, carry = reagents, silent = TRUE)
- spores.start()
- if(factory)
- factory.spore_delay = world.time + factory.spore_cooldown //put the factory on cooldown
-
- return ..()
-
-/mob/living/simple_animal/hostile/blob/blobspore/death()
- if(factory)
- factory.spores -= src
- corpse?.forceMove(loc)
- corpse = null
- return ..()
-
-/mob/living/simple_animal/hostile/blob/blobspore/update_icons()
- if(overmind)
- add_atom_colour(overmind.blobstrain.complementary_color, FIXED_COLOUR_PRIORITY)
- else
- remove_atom_colour(FIXED_COLOUR_PRIORITY)
- if(!is_zombie)
- return FALSE
-
- copy_overlays(corpse, TRUE)
- var/mutable_appearance/blob_head_overlay = mutable_appearance('icons/mob/nonhuman-player/blob.dmi', "blob_head")
- if(overmind)
- blob_head_overlay.color = overmind.blobstrain.complementary_color
- color = initial(color) // looks better.
- add_overlay(blob_head_overlay)
-
-/mob/living/simple_animal/hostile/blob/blobspore/add_cell_sample()
- AddElement(/datum/element/swabable, CELL_LINE_TABLE_BLOBSPORE, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5)
-
-/mob/living/simple_animal/hostile/blob/blobspore/independent
- gold_core_spawnable = HOSTILE_SPAWN
- independent = TRUE
-
-/mob/living/simple_animal/hostile/blob/blobspore/weak
- name = "fragile blob spore"
- health = 15
- maxHealth = 15
- melee_damage_lower = 1
- melee_damage_upper = 2
- death_cloud_size = 0
- is_weak = TRUE
-
-/** Ghost control a blob zombie */
-/mob/living/simple_animal/hostile/blob/blobspore/proc/humanize_pod(mob/user)
- if((!overmind || istype(src, /mob/living/simple_animal/hostile/blob/blobspore/weak) || !istype(overmind.blobstrain, /datum/blobstrain/reagent/distributed_neurons)) && !is_zombie)
- return FALSE
- if(key || stat)
- return FALSE
- var/pod_ask = tgui_alert(usr, "Are you bulbous enough?", "Blob Spore", list("Yes", "No"))
- if(pod_ask != "Yes" || QDELETED(src))
- return FALSE
- if(key)
- to_chat(user, span_warning("Someone else already took this spore!"))
- return FALSE
- key = user.key
- log_message("took control of [name].", LOG_GAME)
-
-/** Zombifies a dead mob, turning it into a blob zombie */
-/mob/living/simple_animal/hostile/blob/blobspore/proc/zombify(mob/living/carbon/human/target)
- is_zombie = 1
- if(target.wear_suit)
- maxHealth += target.get_armor_rating(MELEE) // That zombie's got armor, I want armor!
- maxHealth += 40
- health = maxHealth
- name = "blob zombie"
- desc = "A shambling corpse animated by the blob."
- mob_biotypes |= MOB_HUMANOID
- melee_damage_lower += 8
- melee_damage_upper += 11
- obj_damage = 20 // now that it has a corpse to puppet, it can properly attack structures
- environment_smash = ENVIRONMENT_SMASH_STRUCTURES
- movement_type = GROUND
- death_cloud_size = 0
- icon = target.icon
- icon_state = "zombie"
- target.set_facial_hairstyle("Shaved", update = FALSE)
- target.set_hairstyle("Bald", update = TRUE)
- target.forceMove(src)
- corpse = target
- update_icons()
- visible_message(span_warning("The corpse of [target.name] suddenly rises!"))
- if(!key)
- notify_ghosts("\A [src] has been created in \the [get_area(src)].", source = src, action = NOTIFY_ORBIT, flashwindow = FALSE, header = "Blob Zombie Created")
diff --git a/code/modules/mob/living/simple_animal/hostile/heretic_monsters.dm b/code/modules/mob/living/simple_animal/hostile/heretic_monsters.dm
index 2c0b9ba983a..1b8cfe9de68 100644
--- a/code/modules/mob/living/simple_animal/hostile/heretic_monsters.dm
+++ b/code/modules/mob/living/simple_animal/hostile/heretic_monsters.dm
@@ -198,6 +198,7 @@
for(var/i in 1 to worm_length)
current = new type(drop_location(), FALSE)
+ ADD_TRAIT(current, TRAIT_PERMANENTLY_MORTAL, INNATE_TRAIT)
current.icon_state = "armsy_mid"
current.icon_living = "armsy_mid"
current.AIStatus = AI_OFF
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm
index 3484c27375d..5bb9f314ed1 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm
@@ -70,7 +70,10 @@
return ..()
/mob/living/simple_animal/hostile/megafauna/death(gibbed, list/force_grant)
- if(health > 0)
+ if(gibbed) // in case they've been force dusted
+ return ..()
+
+ if(health > 0) // prevents instakills
return
var/datum/status_effect/crusher_damage/crusher_dmg = has_status_effect(/datum/status_effect/crusher_damage)
///Whether we killed the megafauna with primarily crusher damage or not
@@ -100,8 +103,8 @@
/mob/living/simple_animal/hostile/megafauna/gib()
if(health > 0)
return
- else
- ..()
+
+ return ..()
/mob/living/simple_animal/hostile/megafauna/singularity_act()
set_health(0)
@@ -110,8 +113,11 @@
/mob/living/simple_animal/hostile/megafauna/dust(just_ash, drop_items, force)
if(!force && health > 0)
return
- else
- ..()
+
+ crusher_loot.Cut()
+ loot.Cut()
+
+ return ..()
/mob/living/simple_animal/hostile/megafauna/AttackingTarget()
if(recovery_time >= world.time)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
index 66d487c8697..84e2d9c049b 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
@@ -272,7 +272,7 @@
if(!isclosedturf(T) && !islava(T))
var/lava_turf = /turf/open/lava/smooth
var/reset_turf = T.type
- T.ChangeTurf(lava_turf, flags = CHANGETURF_INHERIT_AIR)
+ T.TerraformTurf(lava_turf, flags = CHANGETURF_INHERIT_AIR)
addtimer(CALLBACK(T, TYPE_PROC_REF(/turf, ChangeTurf), reset_turf, null, CHANGETURF_INHERIT_AIR), reset_time, TIMER_OVERRIDE|TIMER_UNIQUE)
/obj/effect/temp_visual/drakewall
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
index e9cf04b9c21..26f3690fef1 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
@@ -267,6 +267,10 @@ Difficulty: Hard
/mob/living/simple_animal/hostile/megafauna/wendigo/death(gibbed, list/force_grant)
if(health > 0)
return
+
+ if(!true_spawn)
+ return ..()
+
var/obj/effect/portal/permanent/one_way/exit = new /obj/effect/portal/permanent/one_way(starting)
exit.id = "wendigo arena exit"
exit.add_atom_colour(COLOR_RED_LIGHT, ADMIN_COLOUR_PRIORITY)
diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm
index 2fec84385b2..d07775b42bd 100644
--- a/code/modules/mob/living/simple_animal/hostile/mimic.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm
@@ -113,6 +113,7 @@ GLOBAL_LIST_INIT(animatable_blacklist, list(/obj/structure/table, /obj/structure
/mob/living/simple_animal/hostile/mimic/copy/Initialize(mapload, obj/copy, mob/living/creator, destroy_original = 0, no_googlies = FALSE)
. = ..()
+ ADD_TRAIT(src, TRAIT_PERMANENTLY_MORTAL, INNATE_TRAIT) // They won't remember their original contents upon ressurection and would just be floating eyes
if (no_googlies)
overlay_googly_eyes = FALSE
CopyObject(copy, creator, destroy_original)
diff --git a/code/modules/mob/living/simple_animal/hostile/smspider.dm b/code/modules/mob/living/simple_animal/hostile/smspider.dm
deleted file mode 100644
index 150180a11cf..00000000000
--- a/code/modules/mob/living/simple_animal/hostile/smspider.dm
+++ /dev/null
@@ -1,64 +0,0 @@
-/mob/living/simple_animal/hostile/smspider
- name = "supermatter spider"
- desc= "A sliver of supermatter placed upon a robotically enhanced pedestal."
- icon = 'icons/mob/simple/smspider.dmi'
- icon_state = "smspider"
- icon_living = "smspider"
- icon_dead = "smspider_dead"
- gender = NEUTER
- mob_biotypes = MOB_BUG|MOB_ROBOTIC
- turns_per_move = 2
- speak_emote = list("vibrates")
- emote_see = list("vibrates")
- emote_taunt = list("vibrates")
- taunt_chance = 40
- combat_mode = TRUE
- maxHealth = 10
- health = 10
- minbodytemp = 0
- maxbodytemp = 1500
- attack_verb_continuous = "slices"
- attack_verb_simple = "slice"
- attack_sound = 'sound/effects/supermatter.ogg'
- attack_vis_effect = ATTACK_EFFECT_CLAW
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
- robust_searching = 1
- faction = list(FACTION_HOSTILE)
- // Gold, supermatter tinted
- lighting_cutoff_red = 30
- lighting_cutoff_green = 30
- lighting_cutoff_blue = 10
- death_message = "falls to the ground, its shard dulling to a miserable grey!"
- footstep_type = FOOTSTEP_MOB_CLAW
- var/overcharged = FALSE // if true, spider will not die if it dusts a limb
-
-/mob/living/simple_animal/hostile/smspider/AttackingTarget()
- . = ..()
- if(isliving(target))
- playsound(get_turf(src), 'sound/effects/supermatter.ogg', 10, TRUE)
- visible_message(span_danger("[src] knocks into [target], turning them to dust in a brilliant flash of light!"))
- var/mob/living/victim = target
- victim.investigate_log("has been dusted by [src].", INVESTIGATE_DEATHS)
- victim.dust()
- if(!overcharged)
- death()
- else if(!isturf(target))
- playsound(get_turf(src), 'sound/effects/supermatter.ogg', 10, TRUE)
- visible_message(span_danger("[src] knocks into [target], turning it to dust in a brilliant flash of light!"))
- qdel(target)
- if(!overcharged)
- death()
- return FALSE
-
-/mob/living/simple_animal/hostile/smspider/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/swarming)
-
-/mob/living/simple_animal/hostile/smspider/overcharged
- name = "overcharged supermatter spider"
- desc = "A sliver of overcharged supermatter placed upon a robotically enhanced pedestal. This one seems especially dangerous."
- icon_state = "smspideroc"
- icon_living = "smspideroc"
- maxHealth = 25
- health = 25
- overcharged = TRUE
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 041c76fac42..3b16ab685eb 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -449,19 +449,21 @@
drop_loot()
if(dextrous)
drop_all_held_items()
+
if(del_on_death)
..()
//Prevent infinite loops if the mob Destroy() is overridden in such
//a manner as to cause a call to death() again //Pain
del_on_death = FALSE
qdel(src)
- else
- health = 0
- icon_state = icon_dead
- if(flip_on_death)
- transform = transform.Turn(180)
- ADD_TRAIT(src, TRAIT_UNDENSE, BASIC_MOB_DEATH_TRAIT)
- ..()
+ return
+
+ health = 0
+ icon_state = icon_dead
+ if(flip_on_death)
+ transform = transform.Turn(180)
+ ADD_TRAIT(src, TRAIT_UNDENSE, BASIC_MOB_DEATH_TRAIT)
+ return ..()
/mob/living/simple_animal/proc/CanAttack(atom/the_target)
if(!isatom(the_target)) // no
diff --git a/code/modules/mob/mob_transformation_simple.dm b/code/modules/mob/mob_transformation_simple.dm
index 9bc6a5b22db..fe901b3ad9e 100644
--- a/code/modules/mob/mob_transformation_simple.dm
+++ b/code/modules/mob/mob_transformation_simple.dm
@@ -66,7 +66,7 @@
else
desired_mob.key = key
- SEND_SIGNAL(src, COMSIG_MOB_CHANGED_TYPE)
+ SEND_SIGNAL(src, COMSIG_MOB_CHANGED_TYPE, desired_mob)
if(delete_old_mob)
QDEL_IN(src, 1)
return desired_mob
diff --git a/code/modules/mob_spawn/corpses/job_corpses.dm b/code/modules/mob_spawn/corpses/job_corpses.dm
index c8dd458f42d..3893f3e1ba6 100644
--- a/code/modules/mob_spawn/corpses/job_corpses.dm
+++ b/code/modules/mob_spawn/corpses/job_corpses.dm
@@ -83,4 +83,4 @@
name = JOB_ROBOTICIST
outfit = /datum/outfit/job/roboticist
icon_state = "corpseroboticist"
-
+
diff --git a/code/modules/mob_spawn/ghost_roles/mining_roles.dm b/code/modules/mob_spawn/ghost_roles/mining_roles.dm
index de461380b54..62861c6f303 100644
--- a/code/modules/mob_spawn/ghost_roles/mining_roles.dm
+++ b/code/modules/mob_spawn/ghost_roles/mining_roles.dm
@@ -236,7 +236,7 @@
return ..()
/obj/effect/mob_spawn/ghost_role/human/ash_walker/allow_spawn(mob/user, silent = FALSE)
- if(!(user.key in team.players_spawned))//one per person unless you get a bonus spawn
+ if(!(user.ckey in team.players_spawned))//one per person unless you get a bonus spawn SKYRAT EDIT: Original: if(!(user.key in team.players_spawned))
return TRUE
if(!silent)
to_chat(user, span_warning("You have exhausted your usefulness to the Necropolis."))
@@ -254,7 +254,7 @@
spawned_human.mind.add_antag_datum(/datum/antagonist/ashwalker, team)
spawned_human.remove_language(/datum/language/common)
- team.players_spawned += (spawned_human.key)
+ team.players_spawned += (spawned_human.ckey) //SKYRAT EDIT: Original: team.players_spawned += (spawned_human.key)
eggshell.egg = null
QDEL_NULL(eggshell)
diff --git a/code/modules/mob_spawn/mob_spawn.dm b/code/modules/mob_spawn/mob_spawn.dm
index a853d48c0ec..d24850b8732 100644
--- a/code/modules/mob_spawn/mob_spawn.dm
+++ b/code/modules/mob_spawn/mob_spawn.dm
@@ -32,6 +32,8 @@
var/facial_haircolor
///sets a human's skin tone
var/skin_tone
+ /// Weakref to the mob this spawner created - just if you needed to do something with it.
+ var/datum/weakref/spawned_mob_ref
/obj/effect/mob_spawn/Initialize(mapload)
. = ..()
@@ -44,6 +46,7 @@
name_mob(spawned_mob, newname)
special(spawned_mob, mob_possessor)
equip(spawned_mob)
+ spawned_mob_ref = WEAKREF(spawned_mob)
return spawned_mob
/obj/effect/mob_spawn/proc/special(mob/living/spawned_mob)
@@ -250,6 +253,7 @@
if(isnull(created)) // If we explicitly return FALSE instead of just not returning a mob, we don't want to spam the admins
CRASH("An instance of [type] didn't return anything when creating a mob, this might be broken!")
+ SEND_SIGNAL(src, COMSIG_GHOSTROLE_SPAWNED, created)
check_uses() // Now we check if the spawner should delete itself or not
return created
diff --git a/code/modules/mod/mod_link.dm b/code/modules/mod/mod_link.dm
index 8a3340fad3e..12ce7fa4827 100644
--- a/code/modules/mod/mod_link.dm
+++ b/code/modules/mod/mod_link.dm
@@ -173,6 +173,10 @@
/obj/item/clothing/neck/link_scryer/examine(mob/user)
. = ..()
+ // SKYRAT EDIT NIFSOFT SCRYERS - START
+ if(custom_examine_controls)
+ return
+ // SKYRAT EDIT NIFSOFT SCRYERS - END
if(cell)
. += span_notice("The battery charge reads [cell.percent()]%. Right-click with an empty hand to remove it.")
else
diff --git a/code/modules/modular_computers/computers/item/role_tablet_presets.dm b/code/modules/modular_computers/computers/item/role_tablet_presets.dm
index b96f61d44b4..e2f1b354eda 100644
--- a/code/modules/modular_computers/computers/item/role_tablet_presets.dm
+++ b/code/modules/modular_computers/computers/item/role_tablet_presets.dm
@@ -270,6 +270,14 @@
/datum/computer_file/program/skill_tracker,
)
+/obj/item/modular_computer/pda/bitrunner
+ name = "bit runner PDA"
+ greyscale_colors = "#D6B328#6BC906"
+ starting_programs = list(
+ /datum/computer_file/program/arcade,
+ /datum/computer_file/program/skill_tracker,
+ )
+
/**
* Service
*/
diff --git a/code/modules/modular_computers/file_system/programs/budgetordering.dm b/code/modules/modular_computers/file_system/programs/budgetordering.dm
index c261f3a3d43..d2133697194 100644
--- a/code/modules/modular_computers/file_system/programs/budgetordering.dm
+++ b/code/modules/modular_computers/file_system/programs/budgetordering.dm
@@ -118,9 +118,11 @@
if(SSshuttle.supply_blocked)
message = blockade_warning
data["message"] = message
+ var/list/amount_by_name = list()
var/cart_list = list()
for(var/datum/supply_order/order in SSshuttle.shopping_list)
if(cart_list[order.pack.name])
+ amount_by_name[order.pack.name] += 1
cart_list[order.pack.name][1]["amount"]++
cart_list[order.pack.name][1]["cost"] += order.get_final_cost()
if(order.department_destination)
@@ -145,15 +147,23 @@
data["cart"] += cart_list[item_id]
data["requests"] = list()
- for(var/datum/supply_order/SO in SSshuttle.request_list)
+ for(var/datum/supply_order/order in SSshuttle.request_list)
+ var/datum/supply_pack/pack = order.pack
+ amount_by_name[pack.name] += 1
data["requests"] += list(list(
- "object" = SO.pack.name,
- "cost" = SO.pack.get_cost(),
- "orderer" = SO.orderer,
- "reason" = SO.reason,
- "id" = SO.id
+ "object" = pack.name,
+ "cost" = pack.get_cost(),
+ "orderer" = order.orderer,
+ "reason" = order.reason,
+ "id" = order.id
))
+ data["amount_by_name"] = amount_by_name
+
+ return data
+/datum/computer_file/program/budgetorders/ui_static_data(mob/user)
+ var/list/data = list()
+ data["max_order"] = CARGO_MAX_ORDER
return data
/datum/computer_file/program/budgetorders/ui_act(action, params, datum/tgui/ui)
@@ -233,15 +243,20 @@
return
if(pack.goody && !self_paid)
- playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
+ playsound(computer, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
computer.say("ERROR: Small crates may only be purchased by private accounts.")
return
+ if(SSshuttle.supply.get_order_count(pack) == OVER_ORDER_LIMIT)
+ playsound(computer, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
+ computer.say("ERROR: No more then [CARGO_MAX_ORDER] of any pack may be ordered at once")
+ return
+
if(!requestonly && !self_paid && ishuman(usr) && !account)
var/obj/item/card/id/id_card = computer.computer_id_slot?.GetID()
account = SSeconomy.get_dep_account(id_card?.registered_account?.account_job.paycheck_department)
- var/turf/T = get_turf(src)
+ var/turf/T = get_turf(computer)
var/datum/supply_order/SO = new(pack, name, rank, ckey, reason, account)
SO.generateRequisition(T)
if((requestonly && !self_paid) || !(computer.computer_id_slot?.GetID()))
diff --git a/code/modules/modular_computers/file_system/programs/crewmanifest.dm b/code/modules/modular_computers/file_system/programs/crewmanifest.dm
index 3215f62eef8..cdd05d6b4c6 100644
--- a/code/modules/modular_computers/file_system/programs/crewmanifest.dm
+++ b/code/modules/modular_computers/file_system/programs/crewmanifest.dm
@@ -4,7 +4,7 @@
category = PROGRAM_CATEGORY_CREW
program_icon_state = "id"
extended_desc = "Program for viewing and printing the current crew manifest"
- transfer_access = list(ACCESS_COMMAND)
+ transfer_access = list(ACCESS_SECURITY, ACCESS_COMMAND)
requires_ntnet = TRUE
size = 4
tgui_id = "NtosCrewManifest"
diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm
index cb0b5862e16..69acb79ac2a 100644
--- a/code/modules/projectiles/guns/energy/energy_gun.dm
+++ b/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -77,7 +77,7 @@
name = "\improper X-01 MultiPhase Energy Gun"
desc = "This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time."
icon_state = "hoslaser"
- cell_type = /obj/item/stock_parts/cell //SKYRAT EDIT ADDITION - GUNSGALORE
+ cell_type = /obj/item/stock_parts/cell/hos_gun
w_class = WEIGHT_CLASS_NORMAL
force = 10
ammo_type = list(/obj/item/ammo_casing/energy/disabler/hos, /obj/item/ammo_casing/energy/laser/hos, /obj/item/ammo_casing/energy/ion/hos)
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 90a3d723bf5..5e938c49953 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -12,7 +12,6 @@
wound_bonus = 0
wound_falloff_tile = -5
embed_falloff_tile = -3
- wound_bonus = 20 //SKYRAT EDIT ADDITION
/obj/projectile/bullet/smite
name = "divine retribution"
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index 902ccf35e6a..503560aa224 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -1136,7 +1136,8 @@
//If the reaction pollutes, pollute it here if we have an atom
if(equilibrium.reaction.pollutant_type && my_atom)
var/turf/my_turf = get_turf(my_atom)
- my_turf.pollute_turf(equilibrium.reaction.pollutant_type, equilibrium.reaction.pollutant_amount * equilibrium.reacted_vol)
+ if(my_turf) // reactions can happen in nullspace (like inside of a mob's stomach for instance).
+ my_turf.pollute_turf(equilibrium.reaction.pollutant_type, equilibrium.reaction.pollutant_amount * equilibrium.reacted_vol)
//SKYRAT EDIT END
qdel(equilibrium)
update_total()
@@ -1293,7 +1294,8 @@
//If the reaction pollutes, pollute it here if we have an atom
if(selected_reaction.pollutant_type && my_atom)
var/turf/my_turf = get_turf(my_atom)
- my_turf.pollute_turf(selected_reaction.pollutant_type, selected_reaction.pollutant_amount * multiplier)
+ if(my_turf) // just to be safe here
+ my_turf.pollute_turf(selected_reaction.pollutant_type, selected_reaction.pollutant_amount * multiplier)
//SKYRAT EDIT END
selected_reaction.on_reaction(src, null, multiplier)
diff --git a/code/modules/research/bepis.dm b/code/modules/research/bepis.dm
deleted file mode 100644
index d0640ed5d1c..00000000000
--- a/code/modules/research/bepis.dm
+++ /dev/null
@@ -1,296 +0,0 @@
-//This system is designed to act as an in-between for cargo and science, and the first major money sink in the game outside of just buying things from cargo (As of 10/9/19, anyway).
-
-//economics defined values, subject to change should anything be too high or low in practice.
-
-#define MACHINE_OPERATION 100000
-#define MACHINE_OVERLOAD 500000
-#define MAJOR_THRESHOLD (6*CARGO_CRATE_VALUE)
-#define MINOR_THRESHOLD (4*CARGO_CRATE_VALUE)
-#define STANDARD_DEVIATION (2*CARGO_CRATE_VALUE)
-#define PART_CASH_OFFSET_AMOUNT (0.5*CARGO_CRATE_VALUE)
-
-/obj/machinery/rnd/bepis
- name = "\improper B.E.P.I.S. Chamber"
- desc = "A high fidelity testing device which unlocks the secrets of the known universe using the two most powerful substances available to man: excessive amounts of electricity and capital."
- icon = 'icons/obj/machines/bepis.dmi'
- icon_state = "chamber"
- base_icon_state = "chamber"
- density = TRUE
- layer = ABOVE_MOB_LAYER
- plane = GAME_PLANE_UPPER
- circuit = /obj/item/circuitboard/machine/bepis
-
- ///How much cash the UI and machine are depositing at a time.
- var/banking_amount = 100
- ///How much stored player cash exists within the machine.
- var/banked_cash = 0
- ///Payer's bank account.
- var/datum/bank_account/account
- ///Name on the payer's bank account.
- var/account_name
- ///When the BEPIS fails to hand out any reward, the ERROR cause will be a randomly picked string displayed on the UI.
- var/error_cause = null
-
- //Vars related to probability and chance of success for testing, using gaussian normal distribution.
- ///How much cash you will need to obtain a Major Tech Disk reward.
- var/major_threshold = MAJOR_THRESHOLD
- ///How much cash you will need to obtain a minor invention reward.
- var/minor_threshold = MINOR_THRESHOLD
- ///The standard deviation of the BEPIS's gaussian normal distribution.
- var/std = STANDARD_DEVIATION
-
- //Stock part variables
- ///Multiplier that lowers how much the BEPIS' power costs are. Maximum of 1, upgraded to a minimum of 0.7. See RefreshParts.
- var/power_saver = 1
- ///Variability on the money you actively spend on the BEPIS, with higher inaccuracy making the most change, good and bad to spent cash.
- var/inaccuracy_percentage = 1.5
- ///How much "cash" is added to your inserted cash efforts for free. Based on manipulator stock part level.
- var/positive_cash_offset = 0
- ///How much "cost" is removed from both the minor and major threshold costs. Based on laser stock part level.
- var/negative_cash_offset = 0
- ///List of objects that constitute your minor rewards. All rewards are unique or rare outside of the BEPIS.
- var/minor_rewards = list(
- //To add a new minor reward, add it here.
- /obj/item/stack/circuit_stack/full,
- /obj/item/pen/survival,
- /obj/item/flashlight/flashdark,//SKYRAT EDIT
- /obj/item/circuitboard/machine/sleeper/party,
- /obj/item/toy/sprayoncan,
- )
-
-/obj/machinery/rnd/bepis/attackby(obj/item/O, mob/user, params)
- if(!is_operational)
- to_chat(user, span_notice("[src] can't accept money when it's not functioning."))
- return
- if(istype(O, /obj/item/holochip) || istype(O, /obj/item/stack/spacecash))
- var/deposit_value = O.get_item_credit_value()
- banked_cash += deposit_value
- qdel(O)
- say("Deposited [deposit_value] credits into storage.")
- update_appearance()
- return
- if(isidcard(O))
- var/obj/item/card/id/Card = O
- if(Card.registered_account)
- account = Card.registered_account
- account_name = Card.registered_name
- say("New account detected. Console Updated.")
- else
- say("No account detected on card. Aborting.")
- return
- return ..()
-
-/obj/machinery/rnd/bepis/screwdriver_act(mob/living/user, obj/item/tool)
- return default_deconstruction_screwdriver(user, "chamber_open", "chamber", tool)
-
-/obj/machinery/rnd/bepis/screwdriver_act_secondary(mob/living/user, obj/item/tool)
- return default_deconstruction_screwdriver(user, "chamber_open", "chamber", tool)
-
-/obj/machinery/rnd/bepis/RefreshParts()
- . = ..()
- var/C = 0
- var/M = 0
- var/L = 0
- var/S = 0
- for(var/datum/stock_part/capacitor/capacitor in component_parts)
- C += ((capacitor.tier - 1) * 0.1)
- power_saver = 1 - C
- for(var/datum/stock_part/servo/servo in component_parts)
- M += ((servo.tier - 1) * PART_CASH_OFFSET_AMOUNT)
- positive_cash_offset = M
- for(var/datum/stock_part/micro_laser/Laser in component_parts)
- L += ((Laser.tier - 1) * PART_CASH_OFFSET_AMOUNT)
- negative_cash_offset = L
- for(var/datum/stock_part/scanning_module/scanning_module in component_parts)
- S += ((scanning_module.tier - 1) * 0.25)
- inaccuracy_percentage = (1.5 - S)
-
-/obj/machinery/rnd/bepis/update_icon_state()
- if(panel_open == TRUE)
- icon_state = "[base_icon_state]_open"
- return ..()
- if((use_power == ACTIVE_POWER_USE) && (banked_cash > 0) && (is_operational))
- icon_state = "[base_icon_state]_active_loaded"
- return ..()
- if (((use_power == IDLE_POWER_USE) && (banked_cash > 0)) || (banked_cash > 0) && (!is_operational))
- icon_state = "[base_icon_state]_loaded"
- return ..()
- if(use_power == ACTIVE_POWER_USE && is_operational)
- icon_state = "[base_icon_state]_active"
- return ..()
- if(((use_power == IDLE_POWER_USE) && (banked_cash == 0)) || (!is_operational))
- icon_state = base_icon_state
- return ..()
- return ..()
-
-/obj/machinery/rnd/bepis/ui_interact(mob/user, datum/tgui/ui)
- ui = SStgui.try_update_ui(user, src, ui)
- if(!ui)
- ui = new(user, src, "Bepis", name)
- ui.open()
- RefreshParts()
- if(isliving(user))
- var/mob/living/customer = user
- account = customer.get_bank_account()
-
-/obj/machinery/rnd/bepis/ui_data(mob/user)
- var/list/data = list()
- var/powered = FALSE
- var/zvalue = ((banking_amount + banked_cash) - (major_threshold - positive_cash_offset - negative_cash_offset))/(std)
- var/std_success = 0
- var/prob_success = 0
- //Admittedly this is messy, but not nearly as messy as the alternative, which is jury-rigging an entire Z-table into the code, or making an adaptive z-table.
- var/z = abs(zvalue)
- if(z > 0 && z <= 0.5)
- std_success = 19.1
- else if(z > 0.5 && z <= 1.0)
- std_success = 34.1
- else if(z > 1.0 && z <= 1.5)
- std_success = 43.3
- else if(z > 1.5 && z <= 2.0)
- std_success = 47.7
- else if(z > 2.0 && z <= 2.5)
- std_success = 49.4
- else
- std_success = 50
- if(zvalue > 0)
- prob_success = 50 + std_success
- else if(zvalue == 0)
- prob_success = 50
- else
- prob_success = 50 - std_success
-
- if(use_power == ACTIVE_POWER_USE)
- powered = TRUE
- data["account_owner"] = account_name
- data["amount"] = banking_amount
- data["stored_cash"] = account?.account_balance
- data["mean_value"] = (major_threshold - positive_cash_offset - negative_cash_offset)
- data["error_name"] = error_cause
- data["power_saver"] = power_saver
- data["accuracy_percentage"] = inaccuracy_percentage * 100
- data["positive_cash_offset"] = positive_cash_offset
- data["negative_cash_offset"] = negative_cash_offset
- data["manual_power"] = powered ? FALSE : TRUE
- data["silicon_check"] = issilicon(user)
- data["success_estimate"] = prob_success
- return data
-
-/obj/machinery/rnd/bepis/ui_act(action,params)
- . = ..()
- if(.)
- return
- switch(action)
- if("begin_experiment")
- if(use_power == IDLE_POWER_USE)
- return
- depositcash()
- if(banked_cash == 0)
- say("Please select funds to deposit to begin testing.")
- return
- calcsuccess()
- use_power(MACHINE_OPERATION * power_saver) //This thing should eat your APC battery if you're not careful.
- update_use_power(IDLE_POWER_USE) //Machine shuts off after use to prevent spam and look better visually.
- update_appearance()
- if("amount")
- var/input = text2num(params["amount"])
- if(input)
- banking_amount = input
- if("toggle_power")
- if(use_power == ACTIVE_POWER_USE)
- update_use_power(IDLE_POWER_USE)
- else
- update_use_power(ACTIVE_POWER_USE)
- update_appearance()
- if("account_reset")
- if(use_power == IDLE_POWER_USE)
- return
- account_name = ""
- account = null
- say("Account settings reset.")
- . = TRUE
-
-/**
- * Proc that handles the user's account to deposit credits for the BEPIS.
- * Handles success and fail cases for transferring credits, then logs the transaction and uses small amounts of power.
- **/
-/obj/machinery/rnd/bepis/proc/depositcash()
- var/deposit_value = 0
- deposit_value = banking_amount
- if(deposit_value == 0)
- update_appearance()
- say("Attempting to deposit 0 credits. Aborting.")
- return
- deposit_value = clamp(round(deposit_value, 1), 1, 10000)
- if(!account)
- say("Cannot find user account. Please swipe a valid ID.")
- return
- if(!account.has_money(deposit_value))
- say("You do not possess enough credits.")
- return
- account.adjust_money(-deposit_value, "Vending: B.E.P.I.S. Chamber") //The money vanishes, not paid to any accounts.
- SSblackbox.record_feedback("amount", "BEPIS_credits_spent", deposit_value)
- log_econ("[deposit_value] credits were inserted into [src] by [account.account_holder]")
- banked_cash += deposit_value
- use_power(1000 * power_saver)
- return
-
-/**
- * Proc used to determine the experiment math and results all in one.
- * Uses banked_cash and stock part levels to determine minor, major, and real gauss values for the BEPIS to hold.
- * If by the end real is larger than major, You get a tech disk. If all the disks are earned or you at least beat minor, you get a minor reward.
- **/
-
-/obj/machinery/rnd/bepis/proc/calcsuccess()
- var/turf/dropturf = null
- var/gauss_major = 0
- var/gauss_minor = 0
- var/gauss_real = 0
-
- var/turf/my_turf = get_turf(src)
- var/list/turfs = TURF_NEIGHBORS(my_turf) //NO MORE DISCS IN WINDOWS
- while(length(turfs))
- var/turf/T = pick_n_take(turfs)
- if(T.is_blocked_turf(TRUE))
- continue
- else
- dropturf = T
- break
-
- if (!dropturf)
- dropturf = drop_location()
- gauss_major = (gaussian(major_threshold, std) - negative_cash_offset) //This is the randomized profit value that this experiment has to surpass to unlock a tech.
- gauss_minor = (gaussian(minor_threshold, std) - negative_cash_offset) //And this is the threshold to instead get a minor prize.
- gauss_real = (gaussian(banked_cash, std*inaccuracy_percentage) + positive_cash_offset) //this is the randomized profit value that your experiment expects to give.
- say("Real: [gauss_real]. Minor: [gauss_minor]. Major: [gauss_major].")
- flick("chamber_flash",src)
- update_appearance()
- banked_cash = 0
- if((gauss_real >= gauss_major)) //Major Success.
- if(SSresearch.techweb_nodes_experimental.len > 0)
- say("Experiment concluded with major success. New technology node discovered on technology disc.")
- new /obj/item/disk/design_disk/bepis/remove_tech(dropturf,1)
- return
- say("Expended all available experimental technology nodes. Resorting to minor rewards.")
- if(gauss_real >= gauss_minor) //Minor Success.
- var/reward = pick(minor_rewards)
- new reward(dropturf)
- say("Experiment concluded with partial success. Dispensing compiled research efforts.")
- return
- if(gauss_real <= -1) //Critical Failure
- say("ERROR: CRITICAL MACHIME MALFUNCTI- ON. CURRENCY IS NOT CRASH. CANNOT COMPUTE COMMAND: 'make bucks'") //not a typo, for once.
- new /mob/living/basic/deer(dropturf, 1)
- use_power(MACHINE_OVERLOAD * power_saver) //To prevent gambling at low cost and also prevent spamming for infinite deer.
- return
- //Minor Failure
- error_cause = pick("attempted to sell grey products to American dominated market.","attempted to sell gray products to British dominated market.","placed wild assumption that PDAs would go out of style.","simulated product #76 damaged brand reputation mortally.","simulated business model resembled 'pyramid scheme' by 98.7%.","product accidently granted override access to all station doors.")
- say("Experiment concluded with zero product viability. Cause of error: [error_cause]")
- return
-
-
-#undef MACHINE_OPERATION
-#undef MACHINE_OVERLOAD
-#undef MAJOR_THRESHOLD
-#undef MINOR_THRESHOLD
-#undef STANDARD_DEVIATION
-#undef PART_CASH_OFFSET_AMOUNT
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index 1c44e8bc4fb..0a2c96dddd5 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -358,16 +358,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
-/datum/design/board/bepis
- name = "B.E.P.I.S. Board"
- desc = "The circuit board for a B.E.P.I.S."
- id = "bepis"
- build_path = /obj/item/circuitboard/machine/bepis
- category = list(
- RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_RESEARCH
- )
- departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO
-
/datum/design/board/protolathe
name = "Protolathe Board"
desc = "The circuit board for a protolathe."
@@ -1106,3 +1096,13 @@
RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_ROBOTICS
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
+
+/datum/design/board/fishing_portal_generator
+ name = "Fishing Portal Generator Board"
+ desc = "The circuit board for the fishing portal generator"
+ id = "fishing_portal_generator"
+ build_path = /obj/item/circuitboard/machine/fishing_portal_generator
+ category = list(
+ RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_SERVICE
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SERVICE | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SCIENCE
diff --git a/code/modules/research/techweb/_techweb.dm b/code/modules/research/techweb/_techweb.dm
index 521504da351..8a06607ec59 100644
--- a/code/modules/research/techweb/_techweb.dm
+++ b/code/modules/research/techweb/_techweb.dm
@@ -283,7 +283,7 @@
var/datum/experiment/experiment = completed_experiment
if (experiment == experiment_type)
return FALSE
- available_experiments += new experiment_type()
+ available_experiments += new experiment_type(src)
/**
* Adds a list of experiments to this techweb by their types, ensures that no duplicates are added.
@@ -310,13 +310,21 @@
var/refund = skipped_experiment_types[completed_experiment.type] || 0
if(refund > 0)
add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = refund))
- result_text += ", refunding [refund] points."
+ result_text += ", refunding [refund] points"
// Nothing more to gain here, but we keep it in the list to prevent double dipping
skipped_experiment_types[completed_experiment.type] = -1
- else
- result_text += "!"
-
- log_research("[completed_experiment.name] ([completed_experiment.type]) has been completed on techweb [id]/[organization][refund ? ", refunding [refund] points" : ""].")
+ var/points_rewarded
+ if(completed_experiment.points_reward)
+ add_point_list(completed_experiment.points_reward)
+ points_rewarded = ",[refund > 0 ? " and" : ""] rewarding "
+ var/list/english_list_keys = list()
+ for(var/points_type in completed_experiment.points_reward)
+ english_list_keys += "[completed_experiment.points_reward[points_type]] [points_type]"
+ points_rewarded += "[english_list(english_list_keys)] points"
+ result_text += points_rewarded
+ result_text += "!"
+
+ log_research("[completed_experiment.name] ([completed_experiment.type]) has been completed on techweb [id]/[organization][refund ? ", refunding [refund] points" : ""][points_rewarded].")
return result_text
/datum/techweb/proc/printout_points()
diff --git a/code/modules/research/techweb/_techweb_node.dm b/code/modules/research/techweb/_techweb_node.dm
index 2f01252548a..ae50ea7f65f 100644
--- a/code/modules/research/techweb/_techweb_node.dm
+++ b/code/modules/research/techweb/_techweb_node.dm
@@ -16,7 +16,7 @@
var/description = "Why are you seeing this?"
/// Whether it starts off hidden
var/hidden = FALSE
- /// If the tech can be randomly generated by the BEPIS as a reward. MEant to be fully given in tech disks, not researched
+ /// If the tech can be randomly generated by BEPIS tech as a reward. Meant to be fully given in tech disks, not researched
var/experimental = FALSE
/// Whether it's available without any research
var/starting_node = FALSE
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index 3f64efe851e..507199164b8 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -14,7 +14,6 @@
"basic_matter_bin",
"basic_micro_laser",
"basic_scanning",
- "bepis",
"blast",
"bounced_radio",
"bowl",
@@ -50,6 +49,7 @@
"extinguisher",
"fax",
"fishing_rod",
+ "fishing_portal_generator",
"flashlight",
"fluid_ducts",
"foam_dart",
@@ -1491,6 +1491,19 @@
required_experiments = list(/datum/experiment/scanning/random/plants/wild)
discount_experiments = list(/datum/experiment/scanning/random/plants/traits = 3000)
+/datum/techweb_node/fishing
+ id = "fishing"
+ display_name = "Fishing Technology"
+ description = "Cutting edge fishing advancements."
+ prereq_ids = list("base")
+ design_ids = list(
+ "fishing_rod_tech",
+ "stabilized_hook",
+ "fish_analyzer",
+ )
+ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000)
+ required_experiments = list(/datum/experiment/scanning/fish)
+
/datum/techweb_node/exp_tools
id = "exp_tools"
display_name = "Experimental Tools"
@@ -2355,20 +2368,6 @@
hidden = TRUE
experimental = TRUE
-/datum/techweb_node/fishing
- id = "fishing"
- display_name = "Fishing Technology"
- description = "Cutting edge fishing advancements."
- prereq_ids = list("base")
- design_ids = list(
- "fishing_rod_tech",
- "stabilized_hook",
- "fish_analyzer",
- )
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
- hidden = TRUE
- experimental = TRUE
-
/datum/techweb_node/advanced_plastic_surgery
id = "plastic_surgery"
display_name = "Advanced Plastic Surgery"
diff --git a/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm b/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm
index ece96fd41e0..0152b343c45 100644
--- a/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm
+++ b/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm
@@ -263,7 +263,7 @@
/datum/reagent/medicine/psicodine = -2) //Blob zombies likely wouldn't appreciate psicodine so why this is here
virus_suspectibility = 0
- resulting_atoms = list(/mob/living/simple_animal/hostile/blob/blobspore/independent = 2) //These are useless so we might as well spawn 2.
+ resulting_atoms = list(/mob/living/basic/blob_minion/spore = 2) //These are useless so we might as well spawn 2.
/datum/micro_organism/cell_line/blobbernaut
desc = "Blobular myocytes"
@@ -282,7 +282,7 @@
suppressive_reagents = list(/datum/reagent/consumable/tinlux = -6)
virus_suspectibility = 0
- resulting_atoms = list(/mob/living/simple_animal/hostile/blob/blobbernaut/independent = 1)
+ resulting_atoms = list(/mob/living/basic/blob_minion/blobbernaut = 1)
/datum/micro_organism/cell_line/gelatinous_cube
desc = "Cubic ooze particles"
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index 44c13e39c76..cdabfdc4926 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -322,5 +322,17 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
new /obj/structure/closet/crate/mail/economy(pick(empty_turfs))
+/// Takes a supply pack, returns the amount we currently have on order (or OVER_ORDER_LIMIT if we are over the hardcap on orders of this type)
+/obj/docking_port/mobile/supply/proc/get_order_count(datum/supply_pack/ordering)
+ var/similar_count = 0
+ for(var/datum/supply_order/order as anything in (SSshuttle.shopping_list | SSshuttle.request_list))
+ if(order.pack == ordering)
+ similar_count += 1
+
+ if(similar_count >= CARGO_MAX_ORDER)
+ return OVER_ORDER_LIMIT
+
+ return similar_count
+
#undef GOODY_FREE_SHIPPING_MAX
#undef CRATE_TAX
diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm
index 4b9c0114024..c6d0f25cb4c 100644
--- a/code/modules/surgery/bodyparts/_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/_bodyparts.dm
@@ -152,7 +152,7 @@
/// How much generic bleedstacks we have on this bodypart
var/generic_bleedstacks
/// If we have a gauze wrapping currently applied (not including splints)
- var/obj/item/stack/current_gauze
+ var/obj/item/stack/medical/gauze/current_gauze
/// If something is currently grasping this bodypart and trying to staunch bleeding (see [/obj/item/hand_item/self_grasp])
var/obj/item/hand_item/self_grasp/grasped_by
@@ -408,10 +408,10 @@
var/atom/drop_loc = drop_location()
if(IS_ORGANIC_LIMB(src))
playsound(drop_loc, 'sound/misc/splort.ogg', 50, TRUE, -1)
- seep_gauze(9999) // destroy any existing gauze if any exists
- for(var/obj/item/organ/bodypart_organ in get_organs())
+ QDEL_NULL(current_gauze)
+ for(var/obj/item/organ/bodypart_organ as anything in get_organs())
bodypart_organ.transfer_to_limb(src, owner)
- for(var/obj/item/organ/external/external in external_organs)
+ for(var/obj/item/organ/external/external as anything in external_organs)
external.remove_from_limb()
external.forceMove(drop_loc)
for(var/obj/item/item_in_bodypart in src)
@@ -1308,17 +1308,18 @@
* Arguments:
* * gauze- Just the gauze stack we're taking a sheet from to apply here
*/
-/obj/item/bodypart/proc/apply_gauze(obj/item/stack/gauze)
- if(!istype(gauze) || !gauze.absorption_capacity)
+/obj/item/bodypart/proc/apply_gauze(obj/item/stack/medical/gauze/new_gauze)
+ if(!istype(new_gauze) || !new_gauze.absorption_capacity)
return
var/newly_gauzed = FALSE
if(!current_gauze)
newly_gauzed = TRUE
QDEL_NULL(current_gauze)
- current_gauze = new gauze.type(src, 1)
- gauze.use(1)
+ current_gauze = new new_gauze.type(src, 1)
+ new_gauze.use(1)
+ current_gauze.gauzed_bodypart = src
if(newly_gauzed)
- SEND_SIGNAL(src, COMSIG_BODYPART_GAUZED, gauze)
+ SEND_SIGNAL(src, COMSIG_BODYPART_GAUZED, current_gauze, new_gauze)
/**
* seep_gauze() is for when a gauze wrapping absorbs blood or pus from wounds, lowering its absorption capacity.
@@ -1335,7 +1336,6 @@
if(current_gauze.absorption_capacity <= 0)
owner.visible_message(span_danger("\The [current_gauze.name] on [owner]'s [name] falls away in rags."), span_warning("\The [current_gauze.name] on your [name] falls away in rags."), vision_distance=COMBAT_MESSAGE_RANGE)
QDEL_NULL(current_gauze)
- SEND_SIGNAL(src, COMSIG_BODYPART_GAUZE_DESTROYED)
///Loops through all of the bodypart's external organs and update's their color.
/obj/item/bodypart/proc/recolor_external_organs()
diff --git a/code/modules/surgery/organs/internal/heart/heart_ethereal.dm b/code/modules/surgery/organs/internal/heart/heart_ethereal.dm
index f29ee2e731d..bb0b30ddd62 100644
--- a/code/modules/surgery/organs/internal/heart/heart_ethereal.dm
+++ b/code/modules/surgery/organs/internal/heart/heart_ethereal.dm
@@ -108,7 +108,7 @@
if(!COOLDOWN_FINISHED(src, crystalize_cooldown) || ethereal.stat != DEAD)
return //Should probably not happen, but lets be safe.
- if(ismob(location) || isitem(location) || HAS_TRAIT_FROM(src, TRAIT_HUSK, CHANGELING_DRAIN)) //Stops crystallization if they are eaten by a dragon, turned into a legion, consumed by his grace, etc.
+ if(ismob(location) || isitem(location) || iseffect(location) || HAS_TRAIT_FROM(src, TRAIT_HUSK, CHANGELING_DRAIN)) //Stops crystallization if they are eaten by a dragon, turned into a legion, consumed by his grace, etc.
to_chat(ethereal, span_warning("You were unable to finish your crystallization, for obvious reasons."))
stop_crystalization_process(ethereal, FALSE)
return
diff --git a/code/modules/unit_tests/fish_unit_tests.dm b/code/modules/unit_tests/fish_unit_tests.dm
index 1ef15f8d0f5..d0d39227f43 100644
--- a/code/modules/unit_tests/fish_unit_tests.dm
+++ b/code/modules/unit_tests/fish_unit_tests.dm
@@ -28,10 +28,10 @@
var/obj/structure/aquarium/traits/aquarium = allocate(/obj/structure/aquarium/traits)
TEST_ASSERT(!aquarium.sterile.try_to_reproduce(), "The test aquarium's sterile fish managed to reproduce when it shouldn't have")
var/obj/item/fish/crossbreeder_jr = aquarium.crossbreeder.try_to_reproduce()
- TEST_ASSERT(crossbreeder_jr, "The test aquarium's crossbreeder fish didn't manage to reproduce when it should have.")
+ TEST_ASSERT(crossbreeder_jr, "The test aquarium's crossbreeder fish didn't manage to reproduce when it should have")
TEST_ASSERT_EQUAL(crossbreeder_jr.type, aquarium.cloner.type, "The test aquarium's crossbreeder fish mated with the wrong type of fish")
var/obj/item/fish/cloner_jr = aquarium.cloner.try_to_reproduce()
- TEST_ASSERT(cloner_jr, "The test aquarium's cloner fish didn't manage to reproduce when it should have.")
+ TEST_ASSERT(cloner_jr, "The test aquarium's cloner fish didn't manage to reproduce when it should have")
TEST_ASSERT_NOTEQUAL(cloner_jr.type, aquarium.sterile.type, "The test aquarium's cloner fish mated with the sterile fish")
///Checks that fish evolutions work correctly.
@@ -41,11 +41,24 @@
var/obj/structure/aquarium/evolution/aquarium = allocate(/obj/structure/aquarium/evolution)
var/obj/item/fish/evolve_jr = aquarium.evolve.try_to_reproduce()
TEST_ASSERT(evolve_jr, "The test aquarium's evolution fish didn't manage to reproduce when it should have")
- TEST_ASSERT_NOTEQUAL(evolve_jr.type, /obj/item/fish/goldfish, "The test aquarium's evolution fish managed to pass the conditions of an impossible evolution.")
+ TEST_ASSERT_NOTEQUAL(evolve_jr.type, /obj/item/fish/goldfish, "The test aquarium's evolution fish managed to pass the conditions of an impossible evolution")
TEST_ASSERT_EQUAL(evolve_jr.type, /obj/item/fish/clownfish, "The test aquarium's evolution fish's offspring isn't of the expected type")
TEST_ASSERT(!(/datum/fish_trait/dummy in evolve_jr.fish_traits), "The test aquarium's evolution fish's offspring still has the old trait that ought to be removed by the evolution datum")
TEST_ASSERT(/datum/fish_trait/dummy/two in evolve_jr.fish_traits, "The test aquarium's evolution fish's offspring doesn't have the evolution trait")
+/datum/unit_test/fish_scanning
+
+/datum/unit_test/fish_scanning/Run()
+ var/scannable_fishes = 0
+ for(var/obj/item/fish/fish_prototype as anything in subtypesof(/obj/item/fish))
+ if(initial(fish_prototype.experisci_scannable))
+ scannable_fishes++
+ for(var/datum/experiment/scanning/fish/fish_scan as anything in typesof(/datum/experiment/scanning/fish))
+ fish_scan = new fish_scan
+ var/scan_key = fish_scan.required_atoms[1]
+ if(fish_scan.required_atoms[scan_key] > scannable_fishes)
+ TEST_FAIL("[fish_scan.type] has requirements higher than the number of scannable fish types in the game: [scannable_fishes]")
+
///dummy fish item used for the tests, as well with related subtypes and datums.
/obj/item/fish/testdummy
grind_results = list()
diff --git a/code/modules/unit_tests/heretic_rituals.dm b/code/modules/unit_tests/heretic_rituals.dm
index 7298a163274..4ac5bce8d3d 100644
--- a/code/modules/unit_tests/heretic_rituals.dm
+++ b/code/modules/unit_tests/heretic_rituals.dm
@@ -63,6 +63,8 @@
var/list/created_atoms = list()
for(var/ritual_item_path in knowledge.required_atoms)
var/amount_to_create = knowledge.required_atoms[ritual_item_path]
+ if(islist(ritual_item_path))
+ ritual_item_path = pick(ritual_item_path)
for(var/i in 1 to amount_to_create)
created_atoms += new ritual_item_path(get_turf(our_heretic))
diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_cyberpolice.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_cyberpolice.png
new file mode 100644
index 00000000000..180be6064f8
Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_cyberpolice.png differ
diff --git a/code/modules/unit_tests/simple_animal_freeze.dm b/code/modules/unit_tests/simple_animal_freeze.dm
index 3c97dfe2773..181eeee72dc 100644
--- a/code/modules/unit_tests/simple_animal_freeze.dm
+++ b/code/modules/unit_tests/simple_animal_freeze.dm
@@ -68,12 +68,6 @@
/mob/living/simple_animal/hostile/asteroid/polarbear,
/mob/living/simple_animal/hostile/asteroid/polarbear/lesser,
/mob/living/simple_animal/hostile/asteroid/wolf,
- /mob/living/simple_animal/hostile/blob,
- /mob/living/simple_animal/hostile/blob/blobbernaut,
- /mob/living/simple_animal/hostile/blob/blobbernaut/independent,
- /mob/living/simple_animal/hostile/blob/blobspore,
- /mob/living/simple_animal/hostile/blob/blobspore/independent,
- /mob/living/simple_animal/hostile/blob/blobspore/weak,
/mob/living/simple_animal/hostile/construct,
/mob/living/simple_animal/hostile/construct/artificer,
/mob/living/simple_animal/hostile/construct/artificer/angelic,
@@ -128,21 +122,28 @@
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/doom,
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/guidance,
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/hunter,
+ /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/virtual_domain,
/mob/living/simple_animal/hostile/megafauna/bubblegum,
/mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination,
+ /mob/living/simple_animal/hostile/megafauna/bubblegum/virtual_domain,
/mob/living/simple_animal/hostile/megafauna/clockwork_defender,
/mob/living/simple_animal/hostile/megafauna/colossus,
+ /mob/living/simple_animal/hostile/megafauna/colossus/virtual_domain,
/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner,
/mob/living/simple_animal/hostile/megafauna/dragon,
/mob/living/simple_animal/hostile/megafauna/dragon/lesser,
+ /mob/living/simple_animal/hostile/megafauna/dragon/virtual_domain,
/mob/living/simple_animal/hostile/megafauna/hierophant,
+ /mob/living/simple_animal/hostile/megafauna/hierophant/virtual_domain,
/mob/living/simple_animal/hostile/megafauna/legion,
+ /mob/living/simple_animal/hostile/megafauna/legion/virtual_domain,
/mob/living/simple_animal/hostile/megafauna/legion/medium,
/mob/living/simple_animal/hostile/megafauna/legion/medium/eye,
/mob/living/simple_animal/hostile/megafauna/legion/medium/left,
/mob/living/simple_animal/hostile/megafauna/legion/medium/right,
/mob/living/simple_animal/hostile/megafauna/legion/small,
/mob/living/simple_animal/hostile/megafauna/wendigo,
+ /mob/living/simple_animal/hostile/megafauna/wendigo/virtual_domain,
/mob/living/simple_animal/hostile/mimic,
/mob/living/simple_animal/hostile/mimic/copy,
/mob/living/simple_animal/hostile/mimic/copy/machine,
@@ -177,8 +178,6 @@
/mob/living/simple_animal/hostile/skeleton/plasmaminer,
/mob/living/simple_animal/hostile/skeleton/plasmaminer/jackhammer,
/mob/living/simple_animal/hostile/skeleton/templar,
- /mob/living/simple_animal/hostile/smspider,
- /mob/living/simple_animal/hostile/smspider/overcharged,
/mob/living/simple_animal/hostile/space_dragon,
/mob/living/simple_animal/hostile/space_dragon/spawn_with_antag,
/mob/living/simple_animal/hostile/vatbeast,
@@ -201,6 +200,7 @@
/mob/living/simple_animal/pet/cat/space,
/mob/living/simple_animal/pet/gondola,
/mob/living/simple_animal/pet/gondola/gondolapod,
+ /mob/living/simple_animal/pet/gondola/virtual_domain,
/mob/living/simple_animal/revenant,
/mob/living/simple_animal/shade,
/mob/living/simple_animal/slime,
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
index 55e19152528..02daa0ce7e7 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -66,6 +66,8 @@
"products" = list(
/obj/item/clothing/suit/costume/imperium_monk = 1,
/obj/item/clothing/suit/chaplainsuit/holidaypriest = 1,
+ /obj/item/clothing/suit/chaplainsuit/habit = 1,
+ /obj/item/clothing/head/chaplain/habit_veil = 1,
/obj/item/clothing/suit/chaplainsuit/whiterobe = 1,
/obj/item/clothing/head/wizard/marisa/fake = 1,
/obj/item/clothing/suit/wizrobe/marisa/fake = 1,
diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm
index 80fb1350841..e51205c00e4 100644
--- a/code/modules/vending/games.dm
+++ b/code/modules/vending/games.dm
@@ -56,6 +56,7 @@
/obj/item/skillchip/sabrage = 2,
/obj/item/skillchip/useless_adapter = 5,
/obj/item/skillchip/wine_taster = 2,
+ /obj/item/skillchip/master_angler = 2,
),
),
list(
diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm
index 576cbb0b8b2..ad1c63e7e79 100644
--- a/code/modules/vending/medical.dm
+++ b/code/modules/vending/medical.dm
@@ -19,6 +19,7 @@
/obj/item/stack/medical/bone_gel = 4,
/obj/item/cane/white = 2,
/obj/item/clothing/glasses/eyepatch/medical = 2,
+ /obj/item/storage/box/bandages = 2,
)
contraband = list(
/obj/item/storage/box/gum/happiness = 3,
diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm
index 4fd120bdc48..66badd4adf2 100644
--- a/code/modules/vending/medical_wall.dm
+++ b/code/modules/vending/medical_wall.dm
@@ -15,6 +15,7 @@
/obj/item/reagent_containers/medigel/sterilizine = 1,
/obj/item/healthanalyzer/simple = 2,
/obj/item/stack/medical/bone_gel = 2,
+ /obj/item/storage/box/bandages = 1,
)
contraband = list(
/obj/item/reagent_containers/pill/tox = 2,
diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm
index 6a7edd8e854..9b5af87ab44 100644
--- a/code/modules/vending/security.dm
+++ b/code/modules/vending/security.dm
@@ -29,6 +29,7 @@
/obj/item/clothing/gloves/tackler = 5,
/obj/item/grenade/stingbang = 1,
/obj/item/watertank/pepperspray = 2,
+ /obj/item/storage/belt/holster/energy = 4,
)
refill_canister = /obj/item/vending_refill/security
default_price = PAYCHECK_CREW
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index 2a5360c1ed2..e43314aa307 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -524,6 +524,8 @@
/obj/item/storage/backpack/cultpack = 1,
/obj/item/storage/fancy/candle_box = 2,
/obj/item/radio/headset/headset_srv = 2,
+ /obj/item/clothing/suit/chaplainsuit/habit = 1,
+ /obj/item/clothing/head/chaplain/habit_veil = 1,
)
contraband = list(
/obj/item/toy/plush/ratplush = 1,
diff --git a/html/changelogs/archive/2023-09.yml b/html/changelogs/archive/2023-09.yml
index 99bc299be5a..a45513671ce 100644
--- a/html/changelogs/archive/2023-09.yml
+++ b/html/changelogs/archive/2023-09.yml
@@ -1224,3 +1224,39 @@
differs from the gender default.
softcerv:
- rscadd: Adds in the ability for certain NIFSofts to be kept between rounds.
+2023-09-30:
+ DrDiasyl aka DrTuxedo:
+ - balance: Holsters can now be clipped to any suit, and house Captain antique gun
+ and HoS gun. You now can buy holsters from the SecTech premium section.
+ Paxilmaniac:
+ - qol: The half mask respirator can have its TTS voice muffling properties toggled
+ with control click
+ - qol: Icecats are now listed in the round end report, so you can see who was up
+ icing they cat
+ - bugfix: Icecats should hopefully spawn with their special language correctly now
+ SkyratBot:
+ - code_imp: removed some redundant code for airlocks
+ - admin: Mob abilities can be granted to arbitrary mobs via the VV menu in a similar
+ way to spells.
+ - bugfix: Lavaland syndicate operatives can no longer trivially use the jetpack
+ on their modsuit to fly over the lava.
+ - bugfix: If two cosmic heretics ascend in the same round, their star gazer survival
+ will be linked to each individual heretic and not shared by just one of them.
+ - bugfix: You can't click the Knock heretic portal to join as a mob while already
+ signed up to become a mob.
+ - balance: Cosmic heretics can't order the Star Gazer around while jaunting.
+ - balance: The Knock Heretic portal cannot summon Flesh Worms, but can summon Fire
+ Sharks.
+ - balance: The Knock Heretic portal will disperse if its creator is killed.
+ - rscadd: SM crystal can now dust someone or something if it falls on it.
+ - bugfix: The reverse revolver now looks like a normal Syndicate revolver on inspection.
+ - bugfix: fixed the stamp in the metastation CMO office always spawning on the floor
+ - bugfix: You can now spray paint the SM without getting dusted
+ Smol42:
+ - rscadd: Added some new hairstyles
+ Zergspower:
+ - bugfix: Crew Monitor works again properly
+ nikothedude:
+ - rscadd: A waterbreathing quirk
+ - qol: Waterbreathing is now documented on species pages of the species that have
+ it
diff --git a/html/changelogs/archive/2023-10.yml b/html/changelogs/archive/2023-10.yml
new file mode 100644
index 00000000000..ccff91affb0
--- /dev/null
+++ b/html/changelogs/archive/2023-10.yml
@@ -0,0 +1,122 @@
+2023-10-01:
+ Hatterhat:
+ - balance: Bullets have had their base type's wound bonus reduced back to 0, down
+ from 20, because wounds are actually quite punishing. Funnily enough, most bullets
+ already have modified wound bonuses - except c9mm, c10mm, and most incendiaries,
+ so this probably doesn't change much.
+ - balance: .50 (used in the snipers and renamed to .416 or whatever) is now back
+ to TG balance standards. Knockdown on hit, 60 instead of 110 damage, etc. etc.
+ - bugfix: .50 Soporific was removed because disruptor ammo was right there and nobody
+ realized it existed.
+ - bugfix: After review of a missing equipment complaint, Nanotrasen remembered to
+ pay Lopland's quartermasters to put the customary flashbang and teargas grenade
+ boxes into the Void Raptor's armory.
+ Melbert:
+ - qol: Examine blocked out roundstart / latejoin job information.
+ - qol: Captain gets a little bit more information about how their radio works roundstart.
+ - bugfix: Fixed roundstart players not getting radio information.
+ Paxilmaniac:
+ - image: The buttondown shirts (underwear) have been updated with a better look
+ and more contrasted palette
+ SkyratBot:
+ - rscadd: A new export has arrived in the imports section, the Galactic Materials
+ Market! You can use this to buy and sell minerals for profit or cost, as well
+ as stock your station when you don't have any miners.
+ - rscadd: Insert sheets of minerals into the Galactic Materials Market to convert
+ them into a stock block, allowing you to lock in your price for 5 minutes. Wait
+ too long and it'll be subject to market value again!
+ - rscadd: Minerals can be bought on the market either using the station's cargo
+ budget by cargo crew, or privately by everyone else.
+ - rscdel: Any material stacks that can be bought and sold on the market before have
+ been removed from the cargo catalog.
+ - rscadd: Adds Bitrunning to supply department- a semi-offstation role that rewards
+ teamwork.
+ - rscadd: Adds new machines to complement the job- net pod, quantum server, quantum
+ consoles, and the nexacache vendor.
+ - rscadd: Adds several new maps which can be loaded and unloaded at will.
+ - rscadd: Some flair for the new bitrunning vendor.
+ - rscadd: Adds a new antagonist for the virtual domain only. Short lived ghost role
+ that fights bitrunners.
+ - rscdel: Removes the BEPIS machine, moves its tech into the Bitrunning vendor.
+ - bugfix: Fixes missing baseturfs and clowns in mining planet VDOM..
+ - qol: Font settings in the chat panel applies to all text now.
+ - image: new chaplain outfit
+ - bugfix: Blob spores will respond to rallies more reliably (it won't runtime every
+ time they try and pathfind).
+ - bugfix: Blobbernaut pain animation overlays should align with the direction the
+ mob is facing instead of always facing South
+ - refactor: Blob spores, zombies, and blobbernauts now all use the basic mob framework.
+ They should work the same, but please report any issues.
+ - bugfix: Added warden to list of default required enemies for rulesets.
+ - bugfix: Blob Zombies and Blobbernauts have had their attack speed restored to
+ its original value
+ - refactor: Supermatter Spiders have been refactored into basic mobs, on the extremely
+ off chance you spot one and also notice any weird bugs regarding it, please
+ report it.
+ - balance: There are now 3 roundstart cyborg job slots open by default.
+ - rscadd: Quantum servers now talk over supply channel when they're done cooling
+ off. Go outside!
+ - bugfix: You can no longer use dragon swoop to bypass cordons.
+ - bugfix: Netpod brain damage is now properly reduced upon server upgrades.
+ - bugfix: Fixed an bug where swapping bodies in vdom prevented you from disconnecting.
+ - bugfix: Fixed a bug where a quantum server could get locked out of loading new
+ domains.
+ - bugfix: Changed quantum console UI to display "no bandwidth" rather than "none"
+ - bugfix: Actually fixed the hooked item exploit.
+ - rscadd: Heretic Rebalance
+ - balance: Researching the Main Knowledge paths that unlock Side Paths will grant
+ one Side Point that can be used only on those side paths. You can still spend
+ normal knowledge points on them if you wish.
+ - balance: Rune drawing time has been reduced from 30->20 seconds. Codex drawing
+ time has been reduced from 15->8.
+ - balance: 'Codex Cicatrix is now a roundstart knowledge, works as an amber focus
+ when held in-hand and opened, and has had its recipe changed to: 1 of any non-standard
+ pen (literally anything that isn''t the base pen), any book, and either animal
+ hide OR a corpse, any kind.'
+ - code_imp: Added support for using a list inside ritual requirements and a special
+ 'snowflake check' rituals can utilize.
+ - balance: The first non-path knowledge, the Mansus Hand Mark, has had its cost
+ reduced from 2->1 points.
+ - bugfix: Aloe and other baked foods that don't have reagents can be baked again
+ without turning to ash
+ Vekter:
+ - bugfix: Fixes the missing grinder in Birdshot's Virology department
+ jjpark-kb:
+ - bugfix: the ashwalker tendril will allow you to respawn again (the tendril blessing)
+ - bugfix: the round end report will accurately report ashwalker sacrifices
+ nikothedude:
+ - code_imp: Gauze removal is now handled by the gauze's destroy instead of seep_gauze
+ ninjanomnom:
+ - rscdel: An easter egg plushie that was spawning where it shouldn't has been brought
+ back home.
+ - rscadd: The secure closet can now spawn live gibtonite, enjoy your free bomb.
+2023-10-02:
+ SkyratBot:
+ - balance: Sci now has access to the materials & canisters section in their departmental
+ order console
+ - rscadd: Expanded the fishing portal generator. It now comes with several portal
+ options that can be unlocked by performing fish scanning experiments, which
+ also award a modest amount of techweb points.
+ - balance: The fishing portal generator is now buildable and no longer orderable.
+ The board can be printed from cargo, service and science lathes.
+ - balance: Advanced fishing tech is no longer a BEPIS design. It now requires the
+ base fish scanning experiment and 2000 points to be unlocked.
+ - rscadd: The advanced fishing rod now comes with an incorporated experiscanner
+ specific for fish scanning.
+ - rscadd: Added a new skillchip that may change the icon of the "fish" shown in
+ the minigame UI to less generic ones. Reaching master level in fishing also
+ does that.
+ - qol: The experiment handler UI no longer shows unselectable experiments.
+ - bugfix: Security officers can now download the crew manifest PDA app that they
+ start with.
+ - rscadd: Wizards who complete the grand ritual can now gift everyone with eternal
+ life
+ distributivgesetz:
+ - bugfix: Font scaling in TGUI chat has been reverted to its original implementation.
+ softcerv:
+ - rscadd: Adds the mini-soulcatcher, a more lightweight soulcatcher that can be
+ attached to objects
+ - rscadd: Adds in the RSD brain interface, an item that allows for soulcatcher souls,
+ that died within a round and were scanned, to be transferred to a new brain.
+ - rscadd: Adds in the NIFSoft Scryer, a NIFSoft that gives the user a Scryer they
+ can use to communicate with other Scryer users.
diff --git a/icons/area/areas_station.dmi b/icons/area/areas_station.dmi
index b07ea38a159..cbfe463efa5 100644
Binary files a/icons/area/areas_station.dmi and b/icons/area/areas_station.dmi differ
diff --git a/icons/effects/96x96.dmi b/icons/effects/96x96.dmi
index 38d1d44a000..31f26c3e6e1 100644
Binary files a/icons/effects/96x96.dmi and b/icons/effects/96x96.dmi differ
diff --git a/icons/effects/bitrunning.dmi b/icons/effects/bitrunning.dmi
new file mode 100644
index 00000000000..bfdc7c63436
Binary files /dev/null and b/icons/effects/bitrunning.dmi differ
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 29e59dc6c71..d59f065da28 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/hud/fishing_hud.dmi b/icons/hud/fishing_hud.dmi
index b68acee09b7..58c478d0710 100644
Binary files a/icons/hud/fishing_hud.dmi and b/icons/hud/fishing_hud.dmi differ
diff --git a/icons/hud/radial_fishing.dmi b/icons/hud/radial_fishing.dmi
new file mode 100644
index 00000000000..65fd55176b7
Binary files /dev/null and b/icons/hud/radial_fishing.dmi differ
diff --git a/icons/hud/screen_alert.dmi b/icons/hud/screen_alert.dmi
index a1fc01434e4..1edd4d29cb5 100755
Binary files a/icons/hud/screen_alert.dmi and b/icons/hud/screen_alert.dmi differ
diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi
index 546e3da0f86..d1a1777e4e4 100644
Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ
diff --git a/icons/mob/clothing/head/chaplain.dmi b/icons/mob/clothing/head/chaplain.dmi
index efb6ec3c9e9..100b7ee922f 100644
Binary files a/icons/mob/clothing/head/chaplain.dmi and b/icons/mob/clothing/head/chaplain.dmi differ
diff --git a/icons/mob/clothing/head/plasmaman_head.dmi b/icons/mob/clothing/head/plasmaman_head.dmi
index 9846cf02200..1917ae7bcf5 100644
Binary files a/icons/mob/clothing/head/plasmaman_head.dmi and b/icons/mob/clothing/head/plasmaman_head.dmi differ
diff --git a/icons/mob/clothing/suits/chaplain.dmi b/icons/mob/clothing/suits/chaplain.dmi
index 4b6368fb291..8806bf5f679 100644
Binary files a/icons/mob/clothing/suits/chaplain.dmi and b/icons/mob/clothing/suits/chaplain.dmi differ
diff --git a/icons/mob/clothing/suits/jacket.dmi b/icons/mob/clothing/suits/jacket.dmi
index cd924e847eb..a6f25d91c59 100644
Binary files a/icons/mob/clothing/suits/jacket.dmi and b/icons/mob/clothing/suits/jacket.dmi differ
diff --git a/icons/mob/clothing/under/cargo.dmi b/icons/mob/clothing/under/cargo.dmi
index 4bf30a67a2d..180f0e4ec87 100644
Binary files a/icons/mob/clothing/under/cargo.dmi and b/icons/mob/clothing/under/cargo.dmi differ
diff --git a/icons/mob/clothing/under/plasmaman.dmi b/icons/mob/clothing/under/plasmaman.dmi
index 41cbfb4482b..fcc8f008cd7 100644
Binary files a/icons/mob/clothing/under/plasmaman.dmi and b/icons/mob/clothing/under/plasmaman.dmi differ
diff --git a/icons/mob/huds/hud.dmi b/icons/mob/huds/hud.dmi
index 9a602eeb806..d71ba4b0940 100644
Binary files a/icons/mob/huds/hud.dmi and b/icons/mob/huds/hud.dmi differ
diff --git a/icons/mob/inhands/clothing/hats_lefthand.dmi b/icons/mob/inhands/clothing/hats_lefthand.dmi
index 7111ee4d748..191c85cf482 100644
Binary files a/icons/mob/inhands/clothing/hats_lefthand.dmi and b/icons/mob/inhands/clothing/hats_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/hats_righthand.dmi b/icons/mob/inhands/clothing/hats_righthand.dmi
index 96756fc44db..8038e7474ee 100644
Binary files a/icons/mob/inhands/clothing/hats_righthand.dmi and b/icons/mob/inhands/clothing/hats_righthand.dmi differ
diff --git a/icons/mob/inhands/clothing/suits_lefthand.dmi b/icons/mob/inhands/clothing/suits_lefthand.dmi
index 757fb8b8593..8b9fa5256a9 100644
Binary files a/icons/mob/inhands/clothing/suits_lefthand.dmi and b/icons/mob/inhands/clothing/suits_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/suits_righthand.dmi b/icons/mob/inhands/clothing/suits_righthand.dmi
index c749a2ed98a..c88f4d22444 100644
Binary files a/icons/mob/inhands/clothing/suits_righthand.dmi and b/icons/mob/inhands/clothing/suits_righthand.dmi differ
diff --git a/icons/mob/inhands/equipment/medical_lefthand.dmi b/icons/mob/inhands/equipment/medical_lefthand.dmi
index 7ce3674c86a..feaed169078 100644
Binary files a/icons/mob/inhands/equipment/medical_lefthand.dmi and b/icons/mob/inhands/equipment/medical_lefthand.dmi differ
diff --git a/icons/mob/inhands/equipment/medical_righthand.dmi b/icons/mob/inhands/equipment/medical_righthand.dmi
index 6ceb5efe4d8..15ccf5c090e 100644
Binary files a/icons/mob/inhands/equipment/medical_righthand.dmi and b/icons/mob/inhands/equipment/medical_righthand.dmi differ
diff --git a/icons/obj/aquarium.dmi b/icons/obj/aquarium.dmi
index 3a27c83c906..19e2e68c4f8 100644
Binary files a/icons/obj/aquarium.dmi and b/icons/obj/aquarium.dmi differ
diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi
index a5c4e828301..2bbec93eed2 100644
Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
index 20f24dd2240..fd898d3105f 100644
Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ
diff --git a/icons/obj/clothing/head/chaplain.dmi b/icons/obj/clothing/head/chaplain.dmi
index d95436fdd2d..ed6f6248b31 100644
Binary files a/icons/obj/clothing/head/chaplain.dmi and b/icons/obj/clothing/head/chaplain.dmi differ
diff --git a/icons/obj/clothing/head/plasmaman_hats.dmi b/icons/obj/clothing/head/plasmaman_hats.dmi
index adcf9129c45..f593a08b88c 100644
Binary files a/icons/obj/clothing/head/plasmaman_hats.dmi and b/icons/obj/clothing/head/plasmaman_hats.dmi differ
diff --git a/icons/obj/clothing/suits/chaplain.dmi b/icons/obj/clothing/suits/chaplain.dmi
index 64474a04d31..730e47cd6fa 100644
Binary files a/icons/obj/clothing/suits/chaplain.dmi and b/icons/obj/clothing/suits/chaplain.dmi differ
diff --git a/icons/obj/clothing/suits/jacket.dmi b/icons/obj/clothing/suits/jacket.dmi
index c63f262f104..dc507017cd2 100644
Binary files a/icons/obj/clothing/suits/jacket.dmi and b/icons/obj/clothing/suits/jacket.dmi differ
diff --git a/icons/obj/clothing/under/cargo.dmi b/icons/obj/clothing/under/cargo.dmi
index fc04a897d5e..63e40538899 100644
Binary files a/icons/obj/clothing/under/cargo.dmi and b/icons/obj/clothing/under/cargo.dmi differ
diff --git a/icons/obj/clothing/under/plasmaman.dmi b/icons/obj/clothing/under/plasmaman.dmi
index 4277c43d54b..4d416d5b05f 100644
Binary files a/icons/obj/clothing/under/plasmaman.dmi and b/icons/obj/clothing/under/plasmaman.dmi differ
diff --git a/icons/obj/economy.dmi b/icons/obj/economy.dmi
index dc90265b6e9..04abc41cae1 100644
Binary files a/icons/obj/economy.dmi and b/icons/obj/economy.dmi differ
diff --git a/icons/obj/fishing.dmi b/icons/obj/fishing.dmi
index 39bcc853442..f7ab9fc1ad9 100644
Binary files a/icons/obj/fishing.dmi and b/icons/obj/fishing.dmi differ
diff --git a/icons/obj/machines/bepis.dmi b/icons/obj/machines/bepis.dmi
deleted file mode 100644
index f348c2e1b05..00000000000
Binary files a/icons/obj/machines/bepis.dmi and /dev/null differ
diff --git a/icons/obj/machines/bitrunning.dmi b/icons/obj/machines/bitrunning.dmi
new file mode 100644
index 00000000000..a910a16b35c
Binary files /dev/null and b/icons/obj/machines/bitrunning.dmi differ
diff --git a/icons/obj/machines/computer.dmi b/icons/obj/machines/computer.dmi
index 10974f97bac..5ffa3445db6 100644
Binary files a/icons/obj/machines/computer.dmi and b/icons/obj/machines/computer.dmi differ
diff --git a/icons/obj/medical/stack_medical.dmi b/icons/obj/medical/stack_medical.dmi
index d12949da595..c4ec905786c 100644
Binary files a/icons/obj/medical/stack_medical.dmi and b/icons/obj/medical/stack_medical.dmi differ
diff --git a/icons/obj/railings.dmi b/icons/obj/railings.dmi
index 28332e21324..3dbbd7c8318 100644
Binary files a/icons/obj/railings.dmi and b/icons/obj/railings.dmi differ
diff --git a/icons/obj/storage/box.dmi b/icons/obj/storage/box.dmi
index 7ff4067c288..d660e1b7bfe 100644
Binary files a/icons/obj/storage/box.dmi and b/icons/obj/storage/box.dmi differ
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index 8a1575fcec6..6ddc178b98c 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/modular_skyrat/master_files/code/modules/bitrunning/orders/tech.dm b/modular_skyrat/master_files/code/modules/bitrunning/orders/tech.dm
new file mode 100644
index 00000000000..6c9a0626517
--- /dev/null
+++ b/modular_skyrat/master_files/code/modules/bitrunning/orders/tech.dm
@@ -0,0 +1,3 @@
+/datum/orderable_item/bepis/flashdark
+ item_path = /obj/item/flashlight/flashdark
+ cost_per_order = 750
diff --git a/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm b/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm
index e263c4062c7..b09de049865 100644
--- a/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm
+++ b/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm
@@ -206,12 +206,14 @@
. = ..()
design_ids += list(
"borg_upgrade_snacks",
+ "mini_soulcatcher",
)
/datum/techweb_node/neural_programming/New()
. = ..()
design_ids += list(
"soulcatcher_device",
+ "rsd_interface",
)
/datum/techweb_node/cyborg_upg_util/New()
diff --git a/modular_skyrat/master_files/icons/mob/actions/actions_nif.dmi b/modular_skyrat/master_files/icons/mob/actions/actions_nif.dmi
index 0e3d125038e..eac81c9cca9 100644
Binary files a/modular_skyrat/master_files/icons/mob/actions/actions_nif.dmi and b/modular_skyrat/master_files/icons/mob/actions/actions_nif.dmi differ
diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/cargo.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/cargo.dmi
index 9a8042cf0a0..8d18e50d623 100644
Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/cargo.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/cargo.dmi differ
diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/cargo_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/cargo_digi.dmi
index c4ecb9e4f81..faceea6def3 100644
Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/cargo_digi.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/cargo_digi.dmi differ
diff --git a/modular_skyrat/master_files/icons/mob/clothing/underwear.dmi b/modular_skyrat/master_files/icons/mob/clothing/underwear.dmi
index 3d9209905cb..ff6f4218c27 100644
Binary files a/modular_skyrat/master_files/icons/mob/clothing/underwear.dmi and b/modular_skyrat/master_files/icons/mob/clothing/underwear.dmi differ
diff --git a/modular_skyrat/master_files/icons/mob/sprite_accessory/hair.dmi b/modular_skyrat/master_files/icons/mob/sprite_accessory/hair.dmi
index fdfc3fee1c8..681457fe596 100644
Binary files a/modular_skyrat/master_files/icons/mob/sprite_accessory/hair.dmi and b/modular_skyrat/master_files/icons/mob/sprite_accessory/hair.dmi differ
diff --git a/modular_skyrat/modules/aesthetics/guns/code/guns.dm b/modular_skyrat/modules/aesthetics/guns/code/guns.dm
index ccc43793c33..767ca1608c1 100644
--- a/modular_skyrat/modules/aesthetics/guns/code/guns.dm
+++ b/modular_skyrat/modules/aesthetics/guns/code/guns.dm
@@ -383,12 +383,11 @@
advanced_print_req = TRUE // you are NOT printing more ammo for this without effort.
// then again the offstations with ammo printers and sniper rifles come with an ammo disk anyway, so
-/obj/item/ammo_casing/p50/soporific
- name = ".416 Stabilis tranquilizer casing"
+/obj/item/ammo_casing/p50/disruptor
+ name = ".416 Stabilis disruptor casing"
desc = "A .416 bullet casing that specialises in sending the target to sleep rather than hell.\
\
- SOPORIFIC: Forces targets to sleep, deals no damage."
- projectile_type = /obj/projectile/bullet/p50/soporific
+ DISRUPTOR: Forces humanoid targets to sleep, does heavy damage against cyborgs, EMPs struck targets."
/obj/item/ammo_casing/p50/penetrator
name = ".416 Stabilis APFSDS ++P bullet casing"
@@ -528,8 +527,11 @@
/obj/projectile/bullet/incendiary/c46x30mm
name = "8mm incendiary bullet"
-/obj/projectile/bullet/p50/soporific // COMMON BULLET IS ALREADY OVERRIDEN IN MODULAR > BULLETREBALANCE > CODE > sniper.dm
- name = ".416 tranquilizer"
+/obj/projectile/bullet/p50
+ name = ".416 Stabilis bullet"
+
+/obj/projectile/bullet/p50/disruptor
+ name = ".416 disruptor bullet"
/obj/projectile/bullet/p50/penetrator
name = ".416 penetrator bullet"
diff --git a/modular_skyrat/modules/alternative_job_titles/code/job.dm b/modular_skyrat/modules/alternative_job_titles/code/job.dm
index 2f47a4c1f05..13edfe45aa4 100644
--- a/modular_skyrat/modules/alternative_job_titles/code/job.dm
+++ b/modular_skyrat/modules/alternative_job_titles/code/job.dm
@@ -11,6 +11,9 @@
if(!player_client)
return
+ if(!ishuman(equipping))
+ return
+
var/chosen_title = player_client.prefs.alt_job_titles[job.title] || job.title
var/obj/item/card/id/card = equipping.wear_id
diff --git a/modular_skyrat/modules/ashwalkers/code/buildings/ash_tendril.dm b/modular_skyrat/modules/ashwalkers/code/buildings/ash_tendril.dm
index eaa80cc5941..18d3baa3b51 100644
--- a/modular_skyrat/modules/ashwalkers/code/buildings/ash_tendril.dm
+++ b/modular_skyrat/modules/ashwalkers/code/buildings/ash_tendril.dm
@@ -99,7 +99,7 @@
viewable_living.gib()
continue
- if(viewable_living.mind?.has_antag_datum(/datum/antagonist/ashwalker) && (viewable_living.key || viewable_living.get_ghost(FALSE, TRUE))) //special interactions for dead lava lizards with ghosts attached
+ if(viewable_living.mind?.has_antag_datum(/datum/antagonist/ashwalker) && (viewable_living.ckey || viewable_living.get_ghost(FALSE, TRUE))) //special interactions for dead lava lizards with ghosts attached
revive_ashwalker(viewable_living)
continue
@@ -129,6 +129,8 @@
else
living_observers.add_mood_event("oogabooga", /datum/mood_event/sacrifice_bad)
+ ashies.sacrifices_made++
+
/**
* Proc that will spawn the egg that will revive the ashwalker
* This is also the Skyrat replacement for /proc/remake_walker
diff --git a/modular_skyrat/modules/assault_operatives/code/equipment_items/guns.dm b/modular_skyrat/modules/assault_operatives/code/equipment_items/guns.dm
index 357c25e02f9..430d627d526 100644
--- a/modular_skyrat/modules/assault_operatives/code/equipment_items/guns.dm
+++ b/modular_skyrat/modules/assault_operatives/code/equipment_items/guns.dm
@@ -238,7 +238,7 @@
possible_types = list(AMMO_TYPE_LETHAL, AMMO_TYPE_RUBBER, AMMO_TYPE_AP)
/obj/item/ammo_box/magazine/multi_sprite/assault_ops_sniper/sleepytime
- ammo_type = /obj/item/ammo_casing/p50/soporific
+ ammo_type = /obj/item/ammo_casing/p50/disruptor
round_type = AMMO_TYPE_RUBBER
/obj/item/ammo_box/magazine/multi_sprite/assault_ops_sniper/penetrator
diff --git a/modular_skyrat/modules/bulletrebalance/code/sniper.dm b/modular_skyrat/modules/bulletrebalance/code/sniper.dm
deleted file mode 100644
index 632f80251fd..00000000000
--- a/modular_skyrat/modules/bulletrebalance/code/sniper.dm
+++ /dev/null
@@ -1,22 +0,0 @@
-/obj/projectile/bullet/p50
- name =".416 Stabilis bullet"
- speed = 0.2 //This means it's insanely fast, not insanely slow
- damage = 110 //You have 135 health, which does not make this an instant crit
- paralyze = 0 //Knocks you on your ass hard enough as-is, we won't need the paralyze stat
- dismemberment = 30
- armour_penetration = 61 //Bulletproof armor alone will not stop this
- wound_bonus = 90 //Theoretically guaranteed wound
-
-/obj/projectile/bullet/p50/soporific
- name = ".416 Stabilis tranquilizer casing"
- damage_type = STAMINA
- dismemberment = 0
- catastropic_dismemberment = FALSE
- object_damage = 0
-
-/obj/projectile/bullet/p50/soporific/on_hit(atom/target, blocked = FALSE)
- . = ..()
- if((blocked != 100) && isliving(target))
- var/mob/living/living_guy = target
- living_guy.Sleeping(40 SECONDS) //Yes, its really 40 seconds of sleep, I hope you had your morning coffee.
-
diff --git a/modular_skyrat/modules/customization/modules/clothing/masks/gasmask.dm b/modular_skyrat/modules/customization/modules/clothing/masks/gasmask.dm
index 9174700e738..47ae6a48e89 100644
--- a/modular_skyrat/modules/customization/modules/clothing/masks/gasmask.dm
+++ b/modular_skyrat/modules/customization/modules/clothing/masks/gasmask.dm
@@ -94,6 +94,19 @@
greyscale_config_worn_vox = /datum/greyscale_config/respirator/worn/vox
greyscale_config_worn_teshari = /datum/greyscale_config/respirator/worn/teshari
+/obj/item/clothing/mask/gas/respirator/examine(mob/user)
+ . = ..()
+ . += span_notice("You can toggle its ability to muffle your TTS voice with control click.")
+
+/obj/item/clothing/mask/gas/respirator/CtrlClick(mob/living/user)
+ if(!isliving(user))
+ return
+ if(user.get_active_held_item() != src)
+ to_chat(user, span_warning("You must hold the [src] in your hand to do this!"))
+ return
+ voice_filter = voice_filter ? null : initial(voice_filter)
+ to_chat(user, span_notice("Mask voice muffling [voice_filter ? "enabled" : "disabled"]."))
+
/obj/item/clothing/mask/gas/clown_hat/vox
desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask. This one's got an easily accessible feeding port to be more suitable for the Vox crewmembers."
icon = 'modular_skyrat/master_files/icons/mob/clothing/species/vox/mask.dmi'
diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/hair.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/hair.dm
index 172ea352ac2..cbb1565392f 100644
--- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/hair.dm
+++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/hair.dm
@@ -479,6 +479,146 @@
name = "Hairfre"
icon_state = "hair_hairfre"
+/datum/sprite_accessory/hair/skyrat/bobcut_over_eye_1
+ name = "Bobcut over eye 1"
+ icon_state = "hair_bobcut_over_eye_1"
+
+/datum/sprite_accessory/hair/skyrat/bobcut_over_eye_2
+ name = "Bobcut over eye 2"
+ icon_state = "hair_bobcut_over_eye_2"
+
+/datum/sprite_accessory/hair/skyrat/bobcut_over_eye_3
+ name = "Bobcut over eye 3"
+ icon_state = "hair_bobcut_over_eye_3"
+
+/datum/sprite_accessory/hair/skyrat/bonnie
+ name = "Bonnie"
+ icon_state = "hair_bonnie"
+
+/datum/sprite_accessory/hair/skyrat/bonnie_short
+ name = "Bonnie short"
+ icon_state = "hair_bonnie_short"
+
+/datum/sprite_accessory/hair/skyrat/bonnie_long
+ name = "Bonnie long"
+ icon_state = "hair_bonnie_long"
+
+/datum/sprite_accessory/hair/skyrat/bonnie_2
+ name = "Bonnie 2"
+ icon_state = "hair_bonnie_2"
+
+/datum/sprite_accessory/hair/skyrat/bonnie_2_long
+ name = "Bonnie long 2"
+ icon_state = "hair_bonnie_2_long"
+
+/datum/sprite_accessory/hair/skyrat/bonie_2_short
+ name = "Bonnie short 2"
+ icon_state = "hair_bonnie_2_short"
+
+/datum/sprite_accessory/hair/skyrat/dawn
+ name = "Dawn"
+ icon_state = "hair_dawn"
+
+/datum/sprite_accessory/hair/skyrat/fluffy
+ name = "Fluffy"
+ icon_state = "hair_fluffy"
+
+/datum/sprite_accessory/hair/skyrat/fluffy_long
+ name = "Fluffy long"
+ icon_state = "hair_fluffy_long"
+
+/datum/sprite_accessory/hair/skyrat/khmuro
+ name = "Khmuro"
+ icon_state = "hair_khmuro"
+
+/datum/sprite_accessory/hair/skyrat/kobeni_1
+ name = "Kobeni 1"
+ icon_state = "hair_kobeni_1"
+
+/datum/sprite_accessory/hair/skyrat/kobeni_2
+ name = "Kobeni 2"
+ icon_state = "hair_kobeni_2"
+
+/datum/sprite_accessory/hair/skyrat/low_bun
+ name = "Low bun"
+ icon_state = "hair_low_bun"
+
+/datum/sprite_accessory/hair/skyrat/low_ponytail
+ name = "Low ponytail"
+ icon_state = "hair_low_ponytail"
+
+/datum/sprite_accessory/hair/skyrat/morning
+ name = "Morning"
+ icon_state = "hair_morning"
+
+/datum/sprite_accessory/hair/skyrat/over_ear_1
+ name = "Over ear 1"
+ icon_state = "hair_over_ear_1"
+
+/datum/sprite_accessory/hair/skyrat/over_ear_2
+ name = "Over ear 2"
+ icon_state = "hair_over_ear_2"
+
+/datum/sprite_accessory/hair/skyrat/over_eye
+ name = "Over eye"
+ icon_state = "hair_over_eye"
+
+/datum/sprite_accessory/hair/skyrat/ponytail
+ name = "Fluffy ponytail"
+ icon_state = "hair_ponytail"
+
+/datum/sprite_accessory/hair/skyrat/ponytail_short
+ name = "Short fluffy ponytail"
+ icon_state = "hair_ponytail_short"
+
+/datum/sprite_accessory/hair/skyrat/simple
+ name = "Simple"
+ icon_state = "hair_simple"
+
+/datum/sprite_accessory/hair/skyrat/simple_long
+ name = "Simple long"
+ icon_state = "hair_simple_long"
+
+/datum/sprite_accessory/hair/skyrat/simple_short
+ name = "Simple short"
+ icon_state = "hair_simple_short"
+
+/datum/sprite_accessory/hair/skyrat/strict
+ name = "Strict"
+ icon_state = "hair_strict"
+
+/datum/sprite_accessory/hair/skyrat/strict_long
+ name = "Strict long"
+ icon_state = "hair_strict_long"
+
+/datum/sprite_accessory/hair/skyrat/strict_short
+ name = "Strict short"
+ icon_state = "hair_strict_short"
+
+/datum/sprite_accessory/hair/skyrat/thin_ponytail
+ name = "Thin ponytail"
+ icon_state = "hair_thin_ponytail"
+
+/datum/sprite_accessory/hair/skyrat/thin_ponytail_long
+ name = "Long thin ponytail"
+ icon_state = "hair_thin_ponytail_long"
+
+/datum/sprite_accessory/hair/skyrat/twintails_2
+ name = "Twintails 2"
+ icon_state = "hair_twintails_2"
+
+/datum/sprite_accessory/hair/skyrat/twintails_2_long
+ name = "Long twintails"
+ icon_state = "hair_twintails_2_long"
+
+/datum/sprite_accessory/hair/skyrat/twintails_2_short
+ name = "Short twintails"
+ icon_state = "hair_twintails_2_short"
+
+/datum/sprite_accessory/hair/skyrat/upwards
+ name = "Upwards"
+ icon_state = "hair_upwards"
+
// Facial hair
/datum/sprite_accessory/facial_hair/skyrat
diff --git a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm
index ea06dc1163c..f1bece74ab4 100644
--- a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm
+++ b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm
@@ -762,6 +762,8 @@
/obj/item/gun/energy/dueling,
/obj/item/gun/energy/laser/thermal,
/obj/item/gun/ballistic/rifle/boltaction, //fits if you make it an obrez
+ /obj/item/gun/energy/laser/captain,
+ /obj/item/gun/energy/e_gun/hos,
))
/obj/item/storage/belt/holster/detective
@@ -785,6 +787,8 @@
/obj/item/gun/energy/dueling,
/obj/item/gun/energy/laser/thermal,
/obj/item/gun/ballistic/rifle/boltaction, //fits if you make it an obrez
+ /obj/item/gun/energy/laser/captain,
+ /obj/item/gun/energy/e_gun/hos,
))
/*
diff --git a/modular_skyrat/modules/medical/code/wounds/medical.dm b/modular_skyrat/modules/medical/code/wounds/medical.dm
index 80662956e5f..5a3723fff4b 100644
--- a/modular_skyrat/modules/medical/code/wounds/medical.dm
+++ b/modular_skyrat/modules/medical/code/wounds/medical.dm
@@ -4,8 +4,6 @@
/obj/item/stack/medical/gauze
/// The amount of direct hits our limb can take before we fall off.
var/integrity = 2
- /// The bodypart we are attached to. Nullable if we aren't applied to anything.
- var/obj/item/bodypart/bodypart
/// If we are splinting a limb, this is the overlay prefix we will use.
var/splint_prefix = "splint"
/// If we are bandaging a limb, this is the overlay prefix we will use.
@@ -14,25 +12,16 @@
var/can_splint = TRUE
/obj/item/bodypart/apply_gauze(obj/item/stack/gauze)
- RegisterSignal(src, COMSIG_BODYPART_GAUZED, PROC_REF(got_gauzed))
-
. = ..()
- UnregisterSignal(src, COMSIG_BODYPART_GAUZED)
+ owner?.update_bandage_overlays()
-/// Signal handler that allows us to modularly detect if we were applied to a limb or not.
-/obj/item/bodypart/proc/got_gauzed(datum/signal_source, obj/item/stack/medical/gauze/new_gauze)
- SIGNAL_HANDLER
+/obj/item/stack/medical/gauze/Destroy()
+ var/mob/living/carbon/previously_gauzed = gauzed_bodypart?.owner
- if (istype(current_gauze, /obj/item/stack/medical/gauze))
- var/obj/item/stack/medical/gauze/applied_gauze = current_gauze
- applied_gauze.set_limb(src) // new_gauze isnt actually the gauze that was applied weirdly
+ . = ..()
-/obj/item/stack/medical/gauze/Destroy()
- bodypart?.current_gauze = null
- bodypart?.owner?.update_bandage_overlays()
- set_limb(null)
- return ..()
+ previously_gauzed?.update_bandage_overlays()
/**
* rip_off() called when someone rips it off
@@ -43,7 +32,7 @@
/obj/item/stack/medical/gauze/proc/rip_off()
if (is_pristine())
. = new src.type(null, 1)
- bodypart?.owner?.update_bandage_overlays()
+
qdel(src)
/// Returns either [splint_prefix] or [gauze_prefix] depending on if we are splinting or not. Suffixes it with a digitigrade flag if applicable for the limb.
@@ -56,8 +45,8 @@
else
prefix = gauze_prefix
- var/suffix = bodypart.body_zone
- if(bodypart.bodytype & BODYTYPE_DIGITIGRADE)
+ var/suffix = gauzed_bodypart.body_zone
+ if(gauzed_bodypart.bodytype & BODYTYPE_DIGITIGRADE)
suffix += "_digitigrade"
return "[prefix]_[suffix]"
@@ -69,7 +58,7 @@
if (!can_splint)
return FALSE
- for (var/datum/wound/iterated_wound as anything in bodypart.wounds)
+ for (var/datum/wound/iterated_wound as anything in gauzed_bodypart.wounds)
if (iterated_wound.wound_flags & SPLINT_OVERLAY)
return TRUE
@@ -95,35 +84,30 @@
/obj/item/stack/medical/gauze/proc/get_hit()
integrity--
if(integrity <= 0)
- if(bodypart.owner)
- to_chat(bodypart.owner, span_warning("The [name] on your [bodypart.name] tears and falls off!"))
+ if(gauzed_bodypart.owner)
+ to_chat(gauzed_bodypart.owner, span_warning("The [name] on your [gauzed_bodypart.name] tears and falls off!"))
qdel(src)
/obj/item/stack/medical/gauze/Topic(href, href_list)
. = ..()
if(href_list["remove"])
- if(!bodypart.owner)
+ if(!gauzed_bodypart.owner)
return
if(!iscarbon(usr))
return
- if(!in_range(usr, bodypart.owner))
+ if(!in_range(usr, gauzed_bodypart.owner))
return
- var/mob/living/carbon/C = usr
- var/self = (C == bodypart.owner)
- C.visible_message(span_notice("[C] begins removing [name] from [self ? "[bodypart.owner.p_Their()]" : "[bodypart.owner]'s" ] [bodypart.name]..."), span_notice("You begin to remove [name] from [self ? "your" : "[bodypart.owner]'s"] [bodypart.name]..."))
- if(!do_after(C, (self ? SELF_AID_REMOVE_DELAY : OTHER_AID_REMOVE_DELAY), target=bodypart.owner))
+ var/mob/living/carbon/carbon_user = usr
+ var/self = (carbon_user == gauzed_bodypart.owner)
+ carbon_user.visible_message(span_notice("[carbon_user] begins removing [name] from [self ? "[gauzed_bodypart.owner.p_Their()]" : "[gauzed_bodypart.owner]'s" ] [gauzed_bodypart.name]..."), span_notice("You begin to remove [name] from [self ? "your" : "[gauzed_bodypart.owner]'s"] [gauzed_bodypart.name]..."))
+ if(!do_after(carbon_user, (self ? SELF_AID_REMOVE_DELAY : OTHER_AID_REMOVE_DELAY), target = gauzed_bodypart.owner))
return
if(QDELETED(src))
return
- C.visible_message(span_notice("[C] removes [name] from [self ? "[bodypart.owner.p_Their()]" : "[bodypart.owner]'s" ] [bodypart.name]."), span_notice("You remove [name] from [self ? "your" : "[bodypart.owner]'s" ] [bodypart.name]."))
+ carbon_user.visible_message(span_notice("[carbon_user] removes [name] from [self ? "[gauzed_bodypart.owner.p_Their()]" : "[gauzed_bodypart.owner]'s" ] [gauzed_bodypart.name]."), span_notice("You remove [name] from [self ? "your" : "[gauzed_bodypart.owner]'s" ] [gauzed_bodypart.name]."))
var/obj/item/gotten = rip_off()
- if(gotten && !C.put_in_hands(gotten))
- gotten.forceMove(get_turf(C))
-
-/// Sets bodypart to limb, and then updates owner's bandage overlays. Limb is nullable.
-/obj/item/stack/medical/gauze/proc/set_limb(limb)
- bodypart = limb
- bodypart?.owner?.update_bandage_overlays()
+ if(gotten && !carbon_user.put_in_hands(gotten))
+ gotten.forceMove(get_turf(carbon_user))
/// Returns the name of ourself when used in a "owner is [usage_prefix] by [name]" examine_more situation/
/obj/item/stack/proc/get_gauze_description()
diff --git a/modular_skyrat/modules/modular_implants/code/nif_research.dm b/modular_skyrat/modules/modular_implants/code/nif_research.dm
index 7e8e1ca94f8..4e88040cddf 100644
--- a/modular_skyrat/modules/modular_implants/code/nif_research.dm
+++ b/modular_skyrat/modules/modular_implants/code/nif_research.dm
@@ -28,6 +28,16 @@
category = list(RND_CATEGORY_TOOLS + RND_SUBCATEGORY_EQUIPMENT_MEDICAL) // look, the anesthetic machine's there too
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE
+/datum/design/mini_soulcatcher
+ name = "Poltergeist-Type RSD"
+ desc = "A miniature version of a Soulcatcher that can be attached to various objects."
+ id = "mini_soulcatcher"
+ build_type = PROTOLATHE | AWAY_LATHE
+ build_path = /obj/item/attachable_soulcatcher
+ materials = list(/datum/material/glass = SMALL_MATERIAL_AMOUNT * 5, /datum/material/iron = SMALL_MATERIAL_AMOUNT * 5)
+ category = list(RND_CATEGORY_AI + RND_SUBCATEGORY_AI_MISC) // look, the anesthetic machine's there too
+ departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_SERVICE | DEPARTMENT_BITFLAG_MEDICAL
+
/datum/design/nifsoft_hud
build_type = PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT, /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plastic = SHEET_MATERIAL_AMOUNT)
diff --git a/modular_skyrat/modules/modular_implants/code/nifsoft_catalog.dm b/modular_skyrat/modules/modular_implants/code/nifsoft_catalog.dm
index 6a3dde80e63..4cd6beea379 100644
--- a/modular_skyrat/modules/modular_implants/code/nifsoft_catalog.dm
+++ b/modular_skyrat/modules/modular_implants/code/nifsoft_catalog.dm
@@ -1,11 +1,13 @@
GLOBAL_LIST_INIT(purchasable_nifsofts, list(
/datum/nifsoft/hivemind,
/datum/nifsoft/summoner,
- /datum/nifsoft/shapeshifter,
+ /datum/nifsoft/action_granter/shapeshifter,
/datum/nifsoft/summoner/dorms,
/datum/nifsoft/soul_poem,
/datum/nifsoft/soulcatcher,
+ /datum/nifsoft/scryer,
/datum/nifsoft/summoner/book,
+ /datum/nifsoft/action_granter/hypnosis,
))
/datum/computer_file/program/nifsoft_downloader
diff --git a/modular_skyrat/modules/modular_implants/code/nifsofts/base_types/action_granter.dm b/modular_skyrat/modules/modular_implants/code/nifsofts/base_types/action_granter.dm
new file mode 100644
index 00000000000..05d1012d629
--- /dev/null
+++ b/modular_skyrat/modules/modular_implants/code/nifsofts/base_types/action_granter.dm
@@ -0,0 +1,26 @@
+/// This type of NIFSoft grans the user an action when active.
+/datum/nifsoft/action_granter
+ active_mode = TRUE
+ activation_cost = 10
+ active_cost = 1
+ /// What is the path of the action that we want to grant?
+ var/action_to_grant = /datum/action/innate
+ /// What action are we giving the user of the NIFSoft?
+ var/datum/action/innate/granted_action
+
+/datum/nifsoft/action_granter/activate()
+ . = ..()
+ if(active)
+ granted_action = new action_to_grant
+ granted_action.Grant(linked_mob)
+ return
+
+ if(granted_action)
+ granted_action.Remove(linked_mob)
+
+/datum/nifsoft/action_granter/Destroy()
+ if(granted_action)
+ QDEL_NULL(granted_action)
+ return ..()
+
+
diff --git a/modular_skyrat/modules/modular_implants/code/nifsofts/hypnosis.dm b/modular_skyrat/modules/modular_implants/code/nifsofts/hypnosis.dm
new file mode 100644
index 00000000000..b4f59561872
--- /dev/null
+++ b/modular_skyrat/modules/modular_implants/code/nifsofts/hypnosis.dm
@@ -0,0 +1,62 @@
+/datum/nifsoft/action_granter/hypnosis
+ name = "Purpura Eye"
+ program_desc = "Based on the hypnotic equipment provided by the LustWish vendor, the purpura eyes NIFSoft allows the user to ensnare others in a hypnotic trance. ((This is intended as a tool for ERP, don't use this for gameplay reasons.))"
+ buying_category = NIFSOFT_CATEGORY_FUN
+ lewd_nifsoft = TRUE
+ purchase_price = 150
+ able_to_keep = TRUE
+ active_cost = 0.1
+ ui_icon = "eye"
+ action_to_grant = /datum/action/innate/nif_hypnotize
+
+/datum/action/innate/nif_hypnotize
+ name = "Hypnotize"
+ background_icon = 'modular_skyrat/master_files/icons/mob/actions/action_backgrounds.dmi'
+ background_icon_state = "android"
+ button_icon = 'modular_skyrat/master_files/icons/mob/actions/actions_nif.dmi'
+ button_icon_state = "hypnotize"
+
+/datum/action/innate/nif_hypnotize/Activate()
+ var/mob/living/carbon/human/user = owner
+ if(!istype(user))
+ return FALSE
+
+ var/mob/living/carbon/human/target_human = user.pulling
+ if(!istype(target_human) || user.grab_state < GRAB_AGGRESSIVE)
+ to_chat(user, span_warning("You need to aggressively grab someone to hypnotize them."))
+ return FALSE
+
+ if(!target_human.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy))
+ to_chat(user, span_warning("[target_human] doesn't want to be hypnotized."))
+ return FALSE
+
+ to_chat(user, span_notice("You begin to place [target_human] into a hypnotic trance."))
+
+ if(!do_after(user, 12 SECONDS, target_human))
+ return FALSE
+
+ var/choice = tgui_alert(target_human, "Do you believe in hypnosis? (This will allow [user] to issue hypnotic suggestions.)", "Hypnosis", list("Yes", "No"))
+ if(choice != "Yes")
+ to_chat(user, span_warning("[target_human]'s attention breaks despite your efforts. They clearly don't seem interested!"))
+ to_chat(target_human, span_warning("Your attention breaks as you realize that you don't want to listen to [user]'s suggestions."))
+ return FALSE
+
+ user.visible_message(span_purple("[target_human] falls into a deep, hypnotic slumber right at the snap of your fingers."), span_purple("You suddenly fall limp at the snap of [user]'s fingers."))
+ user.emote("snap")
+ target_human.SetSleeping(60 SECONDS)
+ target_human.log_message("[target_human] was placed into a hypnotic sleep by [user].", LOG_GAME)
+
+ var/secondary_choice = tgui_alert(user, "Would you like to give [target_human] a hypnotic suggestion or release them?", "Hypnosis", list("Suggestion", "Release"))
+ while(secondary_choice == "Suggestion" && target_human.IsSleeping())
+ if(!in_range(user, target_human))
+ to_chat(user, span_warning("You must be in whisper range to [target_human] in order to give hypnotic suggestions."))
+ target_human.SetSleeping(0)
+ return FALSE
+
+ var/input_text = tgui_input_text(user, "What would you like to suggest?", "Hypnotic Suggestion")
+ to_chat(user, span_purple("You whisper into [target_human]'s ears in a soothing voice."))
+ to_chat(target_human, span_hypnophrase("[input_text]"))
+ secondary_choice = tgui_alert(user, "Would you like to give [target_human] an additional hypnotic suggestion or release them?", "Hypnosis", list("Suggestion", "Release"))
+
+ user.visible_message(span_purple("You wake up from your deep, hypnotic slumber. The suggestions from [user] now settled into your mind."), span_purple("[target_human] wakes up from their slumber."))
+ target_human.SetSleeping(0)
diff --git a/modular_skyrat/modules/modular_implants/code/nifsofts/scryer.dm b/modular_skyrat/modules/modular_implants/code/nifsofts/scryer.dm
new file mode 100644
index 00000000000..3cf689624e0
--- /dev/null
+++ b/modular_skyrat/modules/modular_implants/code/nifsofts/scryer.dm
@@ -0,0 +1,117 @@
+/obj/item/disk/nifsoft_uploader/scryer
+ name = "NIFSoft Scryer Uploader Disk"
+ loaded_nifsoft = /datum/nifsoft/scryer
+
+/datum/nifsoft/scryer
+ name = "NIFLink Holocaller"
+ program_desc = "This ubiquitous NIFSoft adds Scryer functionality similar to MODSuits to the user's NIF; allowing for real-time communication through AR hologlass screens from a hardlight projector sat around the wearer's neck"
+ active_mode = TRUE
+ active_cost = 1
+ activation_cost = 20
+ purchase_price = 200
+ buying_category = NIFSOFT_CATEGORY_UTILITY
+ ui_icon = "video"
+ /// What is the scryer currently associated with the NIFSoft?
+ var/obj/item/clothing/neck/link_scryer/loaded/nifsoft/linked_scryer
+
+/datum/nifsoft/scryer/New()
+ . = ..()
+ var/obj/item/organ/internal/cyberimp/brain/nif/parent_resolved = parent_nif.resolve()
+ if(!istype(parent_resolved))
+ stack_trace("[src] ([REF(src)]) tried to create a linked scryer but it had no parent_nif!")
+ if(!linked_scryer)
+ stack_trace("[src] ([REF(src)]) created with no linked scryer!")
+ linked_scryer = new (parent_resolved)
+ linked_scryer.parent_nifsoft = WEAKREF(src)
+
+/datum/nifsoft/scryer/Destroy()
+ if(!QDELETED(linked_scryer))
+ QDEL_NULL(linked_scryer)
+
+ return ..()
+
+/datum/nifsoft/scryer/activate()
+ . = ..()
+ if(. == FALSE)
+ return FALSE
+
+ if(!active)
+ if(linked_scryer)
+ var/parent_resolved = parent_nif.resolve()
+ if(parent_resolved)
+ return linked_mob.transferItemToLoc(linked_scryer, parent_resolved, TRUE)
+ return FALSE
+
+ if(linked_mob.handcuffed)
+ linked_mob.balloon_alert(linked_mob, "handcuffed")
+ activate()
+ return FALSE
+
+ if(!linked_mob.equip_to_slot_if_possible(linked_scryer, ITEM_SLOT_NECK)) //This sends out a message to the mob if it can't be put on.
+ activate()
+ return FALSE
+
+ return TRUE
+
+/obj/item/clothing/neck/link_scryer
+ /// Do we have custom controls? This is only affects the text shown when examining
+ var/custom_examine_controls = FALSE
+
+/obj/item/clothing/neck/link_scryer/loaded/nifsoft
+ name = "\improper NIFLink Holocaller"
+ desc = "A nanomachine construct working as a modified version of the MODlink scryer, conjured using a NIF; functionally the same, but able to carry out holocalls in a more portable format."
+ custom_examine_controls = TRUE
+ /// A weakref of the parent NIFSoft that the scryer belongs to.
+ var/datum/weakref/parent_nifsoft
+
+/obj/item/clothing/neck/link_scryer/loaded/nifsoft/Initialize(mapload)
+ . = ..()
+ if(cell)
+ QDEL_NULL(cell)
+
+ cell = new /obj/item/stock_parts/cell/infinite/nif_cell(src)
+
+/obj/item/clothing/neck/link_scryer/loaded/nifsoft/Destroy()
+ if(parent_nifsoft)
+ var/datum/nifsoft/scryer/resolved_nifsoft = parent_nifsoft.resolve()
+ if(!QDELETED(resolved_nifsoft))
+ resolved_nifsoft.linked_scryer = null
+
+ return ..()
+
+/obj/item/clothing/neck/link_scryer/loaded/nifsoft/examine(mob/user)
+ . = ..()
+ . += span_notice("The MODlink ID is [mod_link.id], frequency is [mod_link.frequency || "unset"]. Right-click with a multitool to copy/imprint the frequency.")
+ . += span_notice("Right-click with an empty hand to change the name.")
+
+/obj/item/clothing/neck/link_scryer/loaded/nifsoft/equipped(mob/living/user, slot)
+ . = ..()
+ if(slot & ITEM_SLOT_NECK)
+ return TRUE
+
+ var/datum/nifsoft/scryer/scryer_nifsoft = parent_nifsoft.resolve()
+ if(!istype(scryer_nifsoft))
+ return FALSE
+
+ scryer_nifsoft.activate() //If it's not on the neck, it shouldn't be active.
+ return TRUE
+
+/obj/item/clothing/neck/link_scryer/loaded/nifsoft/screwdriver_act(mob/living/user, obj/item/tool)
+ balloon_alert(user, "cell non-removable!")
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
+/obj/item/clothing/neck/link_scryer/loaded/nifsoft/attack_hand_secondary(mob/user, list/modifiers)
+ var/new_label = reject_bad_text(tgui_input_text(user, "Change the visible name", "Set Name", label, MAX_NAME_LEN))
+ if(!new_label)
+ balloon_alert(user, "invalid name!")
+ return
+ label = new_label
+ balloon_alert(user, "name set!")
+ update_name()
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
+/// This cell is only meant for use in items temporarily created by a NIF. Do not let players extract this from devices.
+/obj/item/stock_parts/cell/infinite/nif_cell
+ name = "Nanite Cell"
+ desc = "If you see this, please make an issue on GitHub."
+
diff --git a/modular_skyrat/modules/modular_implants/code/nifsofts/shapeshifter.dm b/modular_skyrat/modules/modular_implants/code/nifsofts/shapeshifter.dm
index bbbf7dc2c07..dfa70dc78eb 100644
--- a/modular_skyrat/modules/modular_implants/code/nifsofts/shapeshifter.dm
+++ b/modular_skyrat/modules/modular_implants/code/nifsofts/shapeshifter.dm
@@ -1,35 +1,15 @@
/obj/item/disk/nifsoft_uploader/shapeshifter
name = "Polymorph"
- loaded_nifsoft = /datum/nifsoft/shapeshifter
+ loaded_nifsoft = /datum/nifsoft/action_granter
-/datum/nifsoft/shapeshifter
+/datum/nifsoft/action_granter/shapeshifter
name = "Polymorph"
program_desc = "This program is a large-scale refitting of the nanomachine channels running over the skin of a NIF user. This allows the nanites to reach under the skin and even into the very bone structure of the host; including incorporation of mimetic materials and femto-level manipulation devices all for the purpose of allowing the user to, essentially, shapeshift on a low level. However, despite the incredible complexity behind these processes, there are still limits on the range of 'forms' a user can take. Mass can neither be created nor destroyed, after all, and you can only distribute and rearrange it in so many ways across a functioning humanoid body; meaning, the user cannot adopt forms too far out of their 'true' one."
- activation_cost = 10
- active_mode = TRUE
- active_cost = 1
compatible_nifs = list(/obj/item/organ/internal/cyberimp/brain/nif/standard)
purchase_price = 350
buying_category = NIFSOFT_CATEGORY_COSMETIC
ui_icon = "paintbrush"
-
- ///The NIF version of the Shapeshifter Ability
- var/datum/action/innate/alter_form/nif/shapeshifter
-
-/datum/nifsoft/shapeshifter/activate()
- . = ..()
- if(active)
- shapeshifter = new
- shapeshifter.Grant(linked_mob)
- return
-
- if(shapeshifter)
- shapeshifter.Remove(linked_mob)
-
-/datum/nifsoft/shapeshifter/Destroy()
- . = ..()
- if(shapeshifter)
- QDEL_NULL(shapeshifter)
+ action_to_grant = /datum/action/innate/alter_form/nif
/// The NIF version of alter form. This lacks the ability to change body color.
diff --git a/modular_skyrat/modules/modular_implants/code/soulcatcher/attachable_soulcatcher.dm b/modular_skyrat/modules/modular_implants/code/soulcatcher/attachable_soulcatcher.dm
new file mode 100644
index 00000000000..cd84179e083
--- /dev/null
+++ b/modular_skyrat/modules/modular_implants/code/soulcatcher/attachable_soulcatcher.dm
@@ -0,0 +1,111 @@
+/datum/component/soulcatcher/small_device
+ max_souls = 1
+
+/datum/component/soulcatcher/attachable_soulcatcher
+ max_souls = 1
+ communicate_as_parent = TRUE
+ removable = TRUE
+
+/datum/component/soulcatcher/attachable_soulcatcher/New()
+ . = ..()
+ var/obj/item/parent_item = parent
+ if(!istype(parent_item))
+ return COMPONENT_INCOMPATIBLE
+
+ name = parent_item.name
+ var/datum/soulcatcher_room/first_room = soulcatcher_rooms[1]
+ first_room.name = parent_item.name
+ first_room.room_description = parent_item.desc
+
+ RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine))
+ RegisterSignal(parent, COMSIG_CLICK_CTRL_SHIFT, PROC_REF(bring_up_ui))
+ RegisterSignal(parent, COMSIG_PREQDELETED, PROC_REF(remove_self))
+
+/// Adds text to the examine text of the parent item, explaining that the item can be used to enable the use of NIFSoft HUDs
+/datum/component/soulcatcher/attachable_soulcatcher/proc/on_examine(datum/source, mob/user, list/examine_text)
+ SIGNAL_HANDLER
+ examine_text += span_cyan("[source] has a soulcatcher attached to it, Ctrl+Shift+Click to use it.")
+
+/datum/component/soulcatcher/attachable_soulcatcher/proc/bring_up_ui(datum/source, mob/user)
+ SIGNAL_HANDLER
+ INVOKE_ASYNC(src, PROC_REF(ui_interact), user)
+
+/datum/component/soulcatcher/attachable_soulcatcher/Destroy(force)
+ UnregisterSignal(parent, COMSIG_ATOM_EXAMINE)
+ UnregisterSignal(parent, COMSIG_CLICK_CTRL_SHIFT)
+ UnregisterSignal(parent, COMSIG_PREQDELETED)
+ return ..()
+
+/datum/component/soulcatcher/attachable_soulcatcher/remove_self()
+ var/obj/item/parent_item = parent
+ var/turf/drop_turf = get_turf(parent_item)
+ var/obj/item/attachable_soulcatcher/dropped_item = new (drop_turf)
+
+ var/datum/component/soulcatcher/dropped_soulcatcher = dropped_item.GetComponent(/datum/component/soulcatcher)
+ var/datum/soulcatcher_room/target_room = dropped_soulcatcher.soulcatcher_rooms[1]
+ var/list/current_souls = get_current_souls()
+
+ if(current_souls) // If we have souls inside of here, they should be transferred to the new object
+ for(var/mob/living/soulcatcher_soul/soul as anything in current_souls)
+ var/datum/soulcatcher_room/current_room = soul.current_room.resolve()
+ if(istype(current_room))
+ current_room.transfer_soul(soul, target_room)
+
+ return ..()
+
+/obj/item/attachable_soulcatcher
+ name = "Poltergeist-Type RSD"
+ desc = "This device, a polymorphic nanomachine net, wraps around objects of most sizes and allows them to function as a container for Resonance. The soul in question within the vessel is imbued much like it would be in a body or a normal Soulcatcher, perceiving the world and even speaking out of their new form. The nanomachine net of the device allows for the consciousness to somewhat manipulate their container, but any large-scale movement is out of the question."
+ icon = 'modular_skyrat/modules/modular_implants/icons/obj/devices.dmi'
+ icon_state = "attachable-soulcatcher"
+ w_class = WEIGHT_CLASS_SMALL
+ /// Do we want to destory the item once it is attached to an item?
+ var/destroy_on_use = TRUE
+ /// What items do we want to prevent the viewer from attaching this to?
+ var/list/blacklisted_items = list(
+ /obj/item/organ,
+ /obj/item/mmi,
+ /obj/item/pai_card,
+ /obj/item/aicard,
+ /obj/item/card,
+ /obj/item/radio,
+ /obj/item/disk/nuclear, // Woah there
+ )
+ /// What soulcathcer component is currnetly linked to this object?
+ var/datum/component/soulcatcher/small_device/linked_soulcatcher
+
+/obj/item/attachable_soulcatcher/Initialize(mapload)
+ . = ..()
+ linked_soulcatcher = AddComponent(/datum/component/soulcatcher/small_device)
+ linked_soulcatcher.name = name
+
+/obj/item/attachable_soulcatcher/attack_self(mob/user, modifiers)
+ linked_soulcatcher.ui_interact(user)
+
+/obj/item/attachable_soulcatcher/afterattack(obj/item/target_item, mob/user, proximity_flag, click_parameters)
+ . = ..()
+ if(!proximity_flag || !istype(target_item))
+ return FALSE
+
+ if(target_item.GetComponent(/datum/component/soulcatcher))
+ balloon_alert(user, "already attached!")
+ return FALSE
+
+ if(is_type_in_list(target_item, blacklisted_items))
+ balloon_alert(user, "incompatible!")
+ return FALSE
+
+ var/datum/component/soulcatcher/new_soulcatcher = target_item.AddComponent(/datum/component/soulcatcher/attachable_soulcatcher)
+ playsound(target_item.loc, 'sound/weapons/circsawhit.ogg', 50, vary = TRUE)
+
+ var/datum/soulcatcher_room/target_room = new_soulcatcher.soulcatcher_rooms[1]
+ var/list/current_souls = linked_soulcatcher.get_current_souls()
+ if(current_souls)
+ for(var/mob/living/soulcatcher_soul/soul as anything in current_souls)
+ var/datum/soulcatcher_room/current_room = soul.current_room.resolve()
+ if(istype(current_room))
+ current_room.transfer_soul(soul, target_room)
+ current_room.transfer_soul(soul, target_room)
+
+ if(destroy_on_use)
+ qdel(src)
diff --git a/modular_skyrat/modules/modular_implants/code/soulcatcher/handheld_soulcatcher.dm b/modular_skyrat/modules/modular_implants/code/soulcatcher/handheld_soulcatcher.dm
index 842aee82d59..767f396057e 100644
--- a/modular_skyrat/modules/modular_implants/code/soulcatcher/handheld_soulcatcher.dm
+++ b/modular_skyrat/modules/modular_implants/code/soulcatcher/handheld_soulcatcher.dm
@@ -111,4 +111,52 @@
return TRUE
+/obj/item/handheld_soulcatcher/attack_secondary(mob/living/carbon/human/target_mob, mob/living/user, params)
+ if(!istype(target_mob))
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
+ var/obj/item/organ/internal/brain/target_brain = target_mob.get_organ_slot(ORGAN_SLOT_BRAIN)
+ if(!istype(target_brain))
+ to_chat(user, span_warning("[target_mob] lacks a brain!"))
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
+ if(!HAS_TRAIT(target_brain, TRAIT_RSD_COMPATIBLE))
+ to_chat(user, span_warning("[target_mob]'s brain isn't compatible."))
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
+ if(target_mob.mind || target_mob.ckey || GetComponent(/datum/component/previous_body))
+ to_chat(user, span_warning("[target_mob] is not able to receive a soul"))
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
+ var/list/soul_list = list()
+ for(var/datum/soulcatcher_room/room as anything in linked_soulcatcher.soulcatcher_rooms)
+ for(var/mob/living/soulcatcher_soul/soul as anything in room.current_souls)
+ if(!soul.round_participant || soul.body_scan_needed)
+ continue
+
+ soul_list += soul
+
+ if(!length(soul_list))
+ to_chat(user, span_warning("There are no souls that can be transferred to [target_mob]."))
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
+ var/mob/living/soulcatcher_soul/chosen_soul = tgui_input_list(user, "Choose a soul to transfer into the body", name, soul_list)
+ if(!chosen_soul)
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
+ if(chosen_soul.previous_body)
+ var/mob/living/old_body = chosen_soul.previous_body.resolve()
+ if(!old_body)
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
+ SEND_SIGNAL(old_body, COMSIG_SOULCATCHER_CHECK_SOUL, FALSE)
+
+ chosen_soul.mind.transfer_to(target_mob, TRUE)
+ playsound(src, 'modular_skyrat/modules/modular_implants/sounds/default_good.ogg', 50, FALSE, ignore_walls = FALSE)
+ visible_message(span_notice("[src] beeps: Body transfer complete."))
+ log_admin("[src] was used by [user] to transfer [chosen_soul]'s soulcatcher soul to [target_mob].")
+
+ qdel(chosen_soul)
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
#undef RSD_ATTEMPT_COOLDOWN
diff --git a/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_component.dm b/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_component.dm
index 97158ba5d91..03512b2c205 100644
--- a/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_component.dm
+++ b/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_component.dm
@@ -23,6 +23,12 @@ GLOBAL_LIST_EMPTY(soulcatchers)
var/ghost_joinable = TRUE
/// Do we want to ask the user permission before the ghost joins?
var/require_approval = TRUE
+ /// What is the max number of people we can keep in this soulcatcher? If this is set to `FALSE` we don't have a limit
+ var/max_souls = FALSE
+ /// Are are the souls inside able to emote/speak as the parent?
+ var/communicate_as_parent = FALSE
+ /// Is the soulcatcher removable from the parent object?
+ var/removable = FALSE
/datum/component/soulcatcher/New()
. = ..()
@@ -136,6 +142,32 @@ GLOBAL_LIST_EMPTY(soulcatchers)
return TRUE
+/// Returns a list containing all of the souls currently present within a soulcatcher.
+/datum/component/soulcatcher/proc/get_current_souls()
+ var/list/current_souls = list()
+ for(var/datum/soulcatcher_room/room as anything in soulcatcher_rooms)
+ for(var/mob/living/soulcatcher_soul as anything in room.current_souls)
+ current_souls += soulcatcher_soul
+
+ return current_souls
+
+/// Checks the total number of souls present and compares it with `max_souls` returns `TRUE` if there is room (or no limit), otherwise returns `FALSE`
+/datum/component/soulcatcher/proc/check_for_vacancy()
+ if(!max_souls)
+ return TRUE
+
+ if(length(get_current_souls()) >= max_souls)
+ return FALSE
+
+ return TRUE
+
+/// Attempts to remove the soulcatcher from the attached object
+/datum/component/soulcatcher/proc/remove_self()
+ if(!removable)
+ return FALSE
+
+ qdel(src)
+
/**
* Soulcatcher Room
*
@@ -266,10 +298,6 @@ GLOBAL_LIST_EMPTY(soulcatchers)
if(!message_to_send) //Why say nothing?
return FALSE
- var/sender_name = ""
- if(message_sender)
- sender_name = "[message_sender] "
-
var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/chat)
var/tag = sheet.icon_tag("nif-soulcatcher")
var/soulcatcher_icon = ""
@@ -277,6 +305,33 @@ GLOBAL_LIST_EMPTY(soulcatchers)
if(tag)
soulcatcher_icon = tag
+ var/mob/living/soulcatcher_soul/soul_sender = message_sender
+ if(istype(soul_sender) && soul_sender.communicating_externally)
+ var/master_resolved = master_soulcatcher.resolve()
+ if(!master_resolved)
+ return FALSE
+ var/datum/component/soulcatcher/parent_soulcatcher = master_resolved
+ var/obj/item/parent_object = parent_soulcatcher.parent
+ if(!istype(parent_object))
+ return FALSE
+
+ var/temp_name = parent_object.name
+ parent_object.name = "[parent_object.name] [soulcatcher_icon]"
+
+ if(emote)
+ parent_object.manual_emote(html_decode(message_to_send))
+ log_emote("[soul_sender] in [name] soulcatcher room emoted: [message_to_send], as an external object")
+ else
+ parent_object.say(html_decode(message_to_send))
+ log_say("[soul_sender] in [name] soulcatcher room said: [message_to_send], as an external object")
+
+ parent_object.name = temp_name
+ return TRUE
+
+ var/sender_name = ""
+ if(message_sender)
+ sender_name = "[message_sender] "
+
var/first_room_name_word = splittext(name, " ")
var/message = ""
var/owner_message = ""
@@ -334,7 +389,7 @@ GLOBAL_LIST_EMPTY(soulcatchers)
var/list/joinable_soulcatchers = list()
for(var/datum/component/soulcatcher/soulcatcher in GLOB.soulcatchers)
- if(!soulcatcher.ghost_joinable || !isobj(soulcatcher.parent))
+ if(!soulcatcher.ghost_joinable || !isobj(soulcatcher.parent) || !soulcatcher.check_for_vacancy())
continue
var/obj/item/soulcatcher_parent = soulcatcher.parent
@@ -360,6 +415,7 @@ GLOBAL_LIST_EMPTY(soulcatchers)
var/datum/soulcatcher_room/room_to_join
if(length(rooms_to_join) < 1)
+ to_chat(src, span_warning("There no rooms that you can join."))
return FALSE
if(length(rooms_to_join) == 1)
diff --git a/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_mob.dm b/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_mob.dm
index fefaf69c25e..8ae004b9667 100644
--- a/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_mob.dm
+++ b/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_mob.dm
@@ -23,6 +23,12 @@
var/able_to_speak = TRUE
/// Is the soul able to change their own name?
var/able_to_rename = TRUE
+ /// Is the soul able to speak as the object it is inside?
+ var/able_to_speak_as_container = TRUE
+ /// Is the soul able to emote as the object it is inside?
+ var/able_to_emote_as_container = TRUE
+ /// Are emote's and Say's done through the container the mob is in?
+ var/communicating_externally = FALSE
/// Is the soul able to leave the soulcatcher?
var/able_to_leave = TRUE
@@ -110,7 +116,7 @@
if(!message || message == "")
return
- if(!able_to_speak)
+ if((!able_to_speak && !communicating_externally) || (!able_to_speak_as_container && communicating_externally))
to_chat(src, span_warning("You are unable to speak!"))
return FALSE
@@ -126,7 +132,7 @@
if(!message)
return FALSE
- if(!able_to_emote)
+ if((!able_to_emote && !communicating_externally) || (!able_to_emote_as_container && communicating_externally))
to_chat(src, span_warning("You are unable to emote!"))
return FALSE
diff --git a/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_tgui.dm b/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_tgui.dm
index b59cee1f7ad..0c1d11c272e 100644
--- a/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_tgui.dm
+++ b/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_tgui.dm
@@ -13,6 +13,10 @@
data["ghost_joinable"] = ghost_joinable
data["require_approval"] = require_approval
+ data["communicate_as_parent"] = communicate_as_parent
+ data["current_soul_count"] = length(get_current_souls())
+ data["max_souls"] = max_souls
+ data["removable"] = removable
data["current_rooms"] = list()
for(var/datum/soulcatcher_room/room in soulcatcher_rooms)
@@ -41,6 +45,8 @@
"able_to_rename" = soul.able_to_rename,
"ooc_notes" = soul.ooc_notes,
"scan_needed" = soul.body_scan_needed,
+ "able_to_speak_as_container" = soul.able_to_speak_as_container,
+ "able_to_emote_as_container" = soul.able_to_emote_as_container,
)
room_data["souls"] += list(soul_list)
@@ -147,7 +153,7 @@
continue
var/datum/component/soulcatcher/soulcatcher_component = held_item.GetComponent(/datum/component/soulcatcher)
- if(!soulcatcher_component)
+ if(!soulcatcher_component || !soulcatcher_component.check_for_vacancy())
continue
for(var/datum/soulcatcher_room/room in soulcatcher_component.soulcatcher_rooms)
@@ -191,6 +197,14 @@
return TRUE
+ if("toggle_soul_external_communication")
+ if(params["communication_type"] == "emote")
+ target_soul.able_to_emote_as_container = !target_soul.able_to_emote_as_container
+ else
+ target_soul.able_to_speak_as_container = !target_soul.able_to_speak_as_container
+
+ return TRUE
+
if("toggle_soul_renaming")
target_soul.able_to_rename = !target_soul.able_to_rename
return TRUE
@@ -224,6 +238,13 @@
target_room.send_message(message_to_send, message_sender, emote)
return TRUE
+ if("delete_self")
+ if(tgui_alert(usr, "Are you sure you want to detach the soulcatcher?", parent, list("Yes", "No")) != "Yes")
+ return FALSE
+
+ remove_self()
+ return TRUE
+
/datum/component/soulcatcher_user/New()
. = ..()
var/mob/living/soulcatcher_soul/parent_soul = parent
@@ -259,6 +280,9 @@
"able_to_emote" = user_soul.able_to_emote,
"able_to_speak" = user_soul.able_to_speak,
"able_to_rename" = user_soul.able_to_rename,
+ "able_to_speak_as_container" = user_soul.able_to_speak_as_container,
+ "able_to_emote_as_container" = user_soul.able_to_emote_as_container,
+ "communicating_externally" = user_soul.communicating_externally,
"ooc_notes" = user_soul.ooc_notes,
"scan_needed" = user_soul.body_scan_needed,
)
@@ -272,6 +296,9 @@
"owner" = current_room.outside_voice,
)
+ var/datum/component/soulcatcher/master_soulcatcher = current_room.master_soulcatcher.resolve()
+ data["communicate_as_parent"] = master_soulcatcher.communicate_as_parent
+
for(var/mob/living/soulcatcher_soul/soul in current_room.current_souls)
if(soul == user_soul)
continue
@@ -310,3 +337,6 @@
user_soul.reset_name()
+ if("toggle_external_communication")
+ user_soul.communicating_externally = !user_soul.communicating_externally
+ return TRUE
diff --git a/modular_skyrat/modules/modular_implants/icons/obj/devices.dmi b/modular_skyrat/modules/modular_implants/icons/obj/devices.dmi
index d0a3f736fa6..401441f95de 100644
Binary files a/modular_skyrat/modules/modular_implants/icons/obj/devices.dmi and b/modular_skyrat/modules/modular_implants/icons/obj/devices.dmi differ
diff --git a/modular_skyrat/modules/modular_vending/code/games.dm b/modular_skyrat/modules/modular_vending/code/games.dm
index cbc169a99ff..99edcdb796c 100644
--- a/modular_skyrat/modules/modular_vending/code/games.dm
+++ b/modular_skyrat/modules/modular_vending/code/games.dm
@@ -13,6 +13,7 @@
"products" = list(
/obj/item/hairbrush = 3,
/obj/item/clothing/mask/holocigarette = 5,
+ /obj/item/attachable_soulcatcher = 5,
),
)
)
diff --git a/modular_skyrat/modules/novaya_ert/code/surplus_weapons.dm b/modular_skyrat/modules/novaya_ert/code/surplus_weapons.dm
index 5e40743aa8e..bcc8b49c26d 100644
--- a/modular_skyrat/modules/novaya_ert/code/surplus_weapons.dm
+++ b/modular_skyrat/modules/novaya_ert/code/surplus_weapons.dm
@@ -59,7 +59,7 @@
weak_against_armour = TRUE
/obj/projectile/beam/laser/plasma_glob/on_hit(atom/target, blocked)
- if(istype(target, /obj/structure/blob) || istype(target, /mob/living/simple_animal/hostile/blob))
+ if(istype(target, /obj/structure/blob) || HAS_TRAIT(target, TRAIT_BLOB_ALLY))
damage = damage * 0.75
return ..()
diff --git a/modular_skyrat/modules/resleeving/code/research/resleeving_research.dm b/modular_skyrat/modules/resleeving/code/research/resleeving_research.dm
new file mode 100644
index 00000000000..4dcd00cc73e
--- /dev/null
+++ b/modular_skyrat/modules/resleeving/code/research/resleeving_research.dm
@@ -0,0 +1,14 @@
+/datum/design/rsd_interface
+ name = "RSD Phylactery"
+ desc = "A brain interface that allows for transfer of Resonance from a handheld RSD, such as the Evoker model."
+ id = "rsd_interface"
+ build_type = PROTOLATHE | AWAY_LATHE
+ departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE
+ category = list(RND_CATEGORY_EQUIPMENT)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 0.5,
+ /datum/material/gold = SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = SHEET_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/rsd_interface
+
diff --git a/modular_skyrat/modules/resleeving/code/rsd_interface.dm b/modular_skyrat/modules/resleeving/code/rsd_interface.dm
new file mode 100644
index 00000000000..106bb11ea38
--- /dev/null
+++ b/modular_skyrat/modules/resleeving/code/rsd_interface.dm
@@ -0,0 +1,44 @@
+/obj/item/rsd_interface
+ name = "RSD Phylactery"
+ desc = "A small device inserted, typically, into inert brains. As Resonance cannot persist in what's referred to as a 'vacuum', RSDs--much like the brains and CPUs they emulate--employ cerebral white noise as a foundation for Resonance to persist in otherwise dead-quiet containers.."
+ icon = 'modular_skyrat/modules/aesthetics/implanter/implanter.dmi'
+ icon_state = "implanter1"
+ inhand_icon_state = "syringe_0"
+ lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+
+/// Attempts to use the item on the target brain.
+/obj/item/rsd_interface/afterattack(obj/item/organ/internal/brain/target_brain, mob/user, proximity_flag, click_parameters)
+ . = ..()
+ if(!proximity_flag || !istype(target_brain))
+ return FALSE
+
+ if(HAS_TRAIT(target_brain, TRAIT_NIFSOFT_HUD_GRANTER))
+ balloon_alert("already upgraded!")
+ return FALSE
+
+ user.visible_message(span_notice("[user] upgrades [target_brain] with [src]."), span_notice("You upgrade [target_brain] to be RSD compatible."))
+ target_brain.AddElement(/datum/element/rsd_interface)
+ playsound(target_brain.loc, 'sound/weapons/circsawhit.ogg', 50, vary = TRUE)
+
+ qdel(src)
+
+/datum/element/rsd_interface/Attach(datum/target)
+ . = ..()
+ if(!istype(target, /obj/item/organ/internal/brain))
+ return ELEMENT_INCOMPATIBLE
+
+ RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine))
+ ADD_TRAIT(target, TRAIT_RSD_COMPATIBLE, INNATE_TRAIT)
+
+/// Adds text to the examine text of the parent item, explaining that the item can be used to enable the use of NIFSoft HUDs
+/datum/element/rsd_interface/proc/on_examine(datum/source, mob/user, list/examine_text)
+ SIGNAL_HANDLER
+ examine_text += span_cyan("Souls can be transferred to [source], assuming it is inert.")
+
+/datum/element/rsd_interface/Detach(datum/target)
+ UnregisterSignal(target, COMSIG_ATOM_EXAMINE)
+ REMOVE_TRAIT(target, TRAIT_RSD_COMPATIBLE, INNATE_TRAIT)
+
+ return ..()
+
diff --git a/sound/attributions.txt b/sound/attributions.txt
index 09ac2bd5642..3ae6c797dd3 100644
--- a/sound/attributions.txt
+++ b/sound/attributions.txt
@@ -99,3 +99,9 @@ https://freesound.org/people/FunWithSound/sounds/456965/
beeps_jingle.ogg is adapted from Eponn's "Achievement happy Beeps Jingle", which is public domain (CC 0):
https://freesound.org/people/Eponn/sounds/619838/
+
+boing.ogg is adapted from reelworldstudio's "Cartoon Boing", which is public domain (CC 0):
+https://freesound.org/people/reelworldstudio/sounds/161122/
+
+arcade_jump.ogg is adapted from se2001's "8-Bit Jump 3", which is public domain (CC 0):
+hhttps://freesound.org/people/se2001/sounds/528568/
diff --git a/sound/effects/arcade_jump.ogg b/sound/effects/arcade_jump.ogg
new file mode 100644
index 00000000000..65f0cc448b5
Binary files /dev/null and b/sound/effects/arcade_jump.ogg differ
diff --git a/sound/effects/boing.ogg b/sound/effects/boing.ogg
new file mode 100644
index 00000000000..8328cc33926
Binary files /dev/null and b/sound/effects/boing.ogg differ
diff --git a/sound/effects/submerge.ogg b/sound/effects/submerge.ogg
new file mode 100644
index 00000000000..8c50fba8e0a
Binary files /dev/null and b/sound/effects/submerge.ogg differ
diff --git a/strings/names/cyberauth.txt b/strings/names/cyberauth.txt
new file mode 100644
index 00000000000..f1fc42b3692
--- /dev/null
+++ b/strings/names/cyberauth.txt
@@ -0,0 +1,21 @@
+Mr. One
+Process Kill
+Event Handler
+Q. Del
+Shutdown Exe
+Revert Commit
+Thread Manager
+Garbage Collector
+Core Debugger
+Kernel Panic
+IO Blocker
+Recursion Terminator
+Disk Doctor
+Format Syntax
+Byte Guardian
+Disk Defragmenter
+Security Patch
+Mandatory Upgrade
+Pull Review
+Bit Auditor
+Pen Test
diff --git a/tgstation.dme b/tgstation.dme
index 865654f09b7..23c43f07d47 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -39,7 +39,6 @@
#include "code\__DEFINES\antagonists.dm"
#include "code\__DEFINES\apc_defines.dm"
#include "code\__DEFINES\appearance.dm"
-#include "code\__DEFINES\aquarium.dm"
#include "code\__DEFINES\area_editor.dm"
#include "code\__DEFINES\art.dm"
#include "code\__DEFINES\assemblies.dm"
@@ -47,6 +46,7 @@
#include "code\__DEFINES\atom_hud.dm"
#include "code\__DEFINES\basic_mobs.dm"
#include "code\__DEFINES\basketball.dm"
+#include "code\__DEFINES\bitrunning.dm"
#include "code\__DEFINES\blackmarket.dm"
#include "code\__DEFINES\blend_modes.dm"
#include "code\__DEFINES\blob_defines.dm"
@@ -92,7 +92,7 @@
#include "code\__DEFINES\external_organs.dm"
#include "code\__DEFINES\fantasy_affixes.dm"
#include "code\__DEFINES\firealarm.dm"
-#include "code\__DEFINES\fishing.dm"
+#include "code\__DEFINES\fish.dm"
#include "code\__DEFINES\flags.dm"
#include "code\__DEFINES\flora.dm"
#include "code\__DEFINES\font_awesome_icons.dm"
@@ -278,6 +278,8 @@
#include "code\__DEFINES\dcs\signals\signals_assembly.dm"
#include "code\__DEFINES\dcs\signals\signals_backpack.dm"
#include "code\__DEFINES\dcs\signals\signals_beam.dm"
+#include "code\__DEFINES\dcs\signals\signals_bitrunning.dm"
+#include "code\__DEFINES\dcs\signals\signals_blob.dm"
#include "code\__DEFINES\dcs\signals\signals_bot.dm"
#include "code\__DEFINES\dcs\signals\signals_camera.dm"
#include "code\__DEFINES\dcs\signals\signals_changeling.dm"
@@ -736,6 +738,7 @@
#include "code\controllers\subsystem\speech_controller.dm"
#include "code\controllers\subsystem\statpanel.dm"
#include "code\controllers\subsystem\stickyban.dm"
+#include "code\controllers\subsystem\stock_market.dm"
#include "code\controllers\subsystem\sun.dm"
#include "code\controllers\subsystem\tcgsetup.dm"
#include "code\controllers\subsystem\tgui.dm"
@@ -926,6 +929,7 @@
#include "code\datums\ai\basic_mobs\basic_subtrees\target_retaliate.dm"
#include "code\datums\ai\basic_mobs\basic_subtrees\targeted_mob_ability.dm"
#include "code\datums\ai\basic_mobs\basic_subtrees\tipped_subtree.dm"
+#include "code\datums\ai\basic_mobs\basic_subtrees\travel_to_point.dm"
#include "code\datums\ai\basic_mobs\basic_subtrees\use_mob_ability.dm"
#include "code\datums\ai\basic_mobs\pet_commands\fetch.dm"
#include "code\datums\ai\basic_mobs\pet_commands\pet_command_planning.dm"
@@ -947,6 +951,7 @@
#include "code\datums\ai\hauntium\hauntium_subtrees.dm"
#include "code\datums\ai\hunting_behavior\hunting_behaviors.dm"
#include "code\datums\ai\hunting_behavior\hunting_cockroach.dm"
+#include "code\datums\ai\hunting_behavior\hunting_corpses.dm"
#include "code\datums\ai\hunting_behavior\hunting_lights.dm"
#include "code\datums\ai\hunting_behavior\hunting_mouse.dm"
#include "code\datums\ai\idle_behaviors\_idle_behavior.dm"
@@ -1023,6 +1028,7 @@
#include "code\datums\components\basic_mob_attack_telegraph.dm"
#include "code\datums\components\basic_ranged_ready_overlay.dm"
#include "code\datums\components\beetlejuice.dm"
+#include "code\datums\components\blob_minion.dm"
#include "code\datums\components\blood_walk.dm"
#include "code\datums\components\bloodysoles.dm"
#include "code\datums\components\boomerang.dm"
@@ -1754,6 +1760,7 @@
#include "code\datums\status_effects\debuffs\slimed.dm"
#include "code\datums\status_effects\debuffs\spacer.dm"
#include "code\datums\status_effects\debuffs\speech_debuffs.dm"
+#include "code\datums\status_effects\debuffs\static_vision.dm"
#include "code\datums\status_effects\debuffs\strandling.dm"
#include "code\datums\status_effects\debuffs\terrified.dm"
#include "code\datums\status_effects\debuffs\tower_of_babel.dm"
@@ -3133,9 +3140,16 @@
#include "code\modules\antagonists\wizard\equipment\spellbook_entries\summons.dm"
#include "code\modules\antagonists\wizard\grand_ritual\fluff.dm"
#include "code\modules\antagonists\wizard\grand_ritual\grand_ritual.dm"
-#include "code\modules\antagonists\wizard\grand_ritual\grand_ritual_finale.dm"
#include "code\modules\antagonists\wizard\grand_ritual\grand_rune.dm"
#include "code\modules\antagonists\wizard\grand_ritual\grand_side_effect.dm"
+#include "code\modules\antagonists\wizard\grand_ritual\finales\all_access.dm"
+#include "code\modules\antagonists\wizard\grand_ritual\finales\armageddon.dm"
+#include "code\modules\antagonists\wizard\grand_ritual\finales\captaincy.dm"
+#include "code\modules\antagonists\wizard\grand_ritual\finales\cheese.dm"
+#include "code\modules\antagonists\wizard\grand_ritual\finales\clown.dm"
+#include "code\modules\antagonists\wizard\grand_ritual\finales\grand_ritual_finale.dm"
+#include "code\modules\antagonists\wizard\grand_ritual\finales\immortality.dm"
+#include "code\modules\antagonists\wizard\grand_ritual\finales\midas.dm"
#include "code\modules\antagonists\xeno\xeno.dm"
#include "code\modules\art\paintings.dm"
#include "code\modules\art\statues.dm"
@@ -3311,6 +3325,54 @@
#include "code\modules\basketball\controller.dm"
#include "code\modules\basketball\hoop.dm"
#include "code\modules\basketball\referee.dm"
+#include "code\modules\bitrunning\abilities.dm"
+#include "code\modules\bitrunning\alerts.dm"
+#include "code\modules\bitrunning\areas.dm"
+#include "code\modules\bitrunning\event.dm"
+#include "code\modules\bitrunning\job.dm"
+#include "code\modules\bitrunning\turfs.dm"
+#include "code\modules\bitrunning\antagonists\cyber_police.dm"
+#include "code\modules\bitrunning\antagonists\outfit.dm"
+#include "code\modules\bitrunning\components\avatar_connection.dm"
+#include "code\modules\bitrunning\components\bitrunning_points.dm"
+#include "code\modules\bitrunning\components\netpod_healing.dm"
+#include "code\modules\bitrunning\objects\bit_vendor.dm"
+#include "code\modules\bitrunning\objects\clothing.dm"
+#include "code\modules\bitrunning\objects\disks.dm"
+#include "code\modules\bitrunning\objects\hololadder.dm"
+#include "code\modules\bitrunning\objects\host_monitor.dm"
+#include "code\modules\bitrunning\objects\landmarks.dm"
+#include "code\modules\bitrunning\objects\loot_crate.dm"
+#include "code\modules\bitrunning\objects\netpod.dm"
+#include "code\modules\bitrunning\objects\quantum_console.dm"
+#include "code\modules\bitrunning\orders\disks.dm"
+#include "code\modules\bitrunning\orders\flair.dm"
+#include "code\modules\bitrunning\orders\tech.dm"
+#include "code\modules\bitrunning\server\loot.dm"
+#include "code\modules\bitrunning\server\map_handling.dm"
+#include "code\modules\bitrunning\server\obj_generation.dm"
+#include "code\modules\bitrunning\server\quantum_server.dm"
+#include "code\modules\bitrunning\server\signal_handlers.dm"
+#include "code\modules\bitrunning\server\util.dm"
+#include "code\modules\bitrunning\virtual_domain\safehouses.dm"
+#include "code\modules\bitrunning\virtual_domain\virtual_domain.dm"
+#include "code\modules\bitrunning\virtual_domain\domains\ash_drake.dm"
+#include "code\modules\bitrunning\virtual_domain\domains\beach_bar.dm"
+#include "code\modules\bitrunning\virtual_domain\domains\blood_drunk_miner.dm"
+#include "code\modules\bitrunning\virtual_domain\domains\bubblegum.dm"
+#include "code\modules\bitrunning\virtual_domain\domains\clown_planet.dm"
+#include "code\modules\bitrunning\virtual_domain\domains\colossus.dm"
+#include "code\modules\bitrunning\virtual_domain\domains\gondola_asteroid.dm"
+#include "code\modules\bitrunning\virtual_domain\domains\hierophant.dm"
+#include "code\modules\bitrunning\virtual_domain\domains\legion.dm"
+#include "code\modules\bitrunning\virtual_domain\domains\pipedream.dm"
+#include "code\modules\bitrunning\virtual_domain\domains\pirates.dm"
+#include "code\modules\bitrunning\virtual_domain\domains\stairs_and_cliffs.dm"
+#include "code\modules\bitrunning\virtual_domain\domains\syndicate_assault.dm"
+#include "code\modules\bitrunning\virtual_domain\domains\test_only.dm"
+#include "code\modules\bitrunning\virtual_domain\domains\vaporwave.dm"
+#include "code\modules\bitrunning\virtual_domain\domains\wendigo.dm"
+#include "code\modules\bitrunning\virtual_domain\domains\xeno_nest.dm"
#include "code\modules\buildmode\bm_mode.dm"
#include "code\modules\buildmode\buildmode.dm"
#include "code\modules\buildmode\buttons.dm"
@@ -3355,6 +3417,7 @@
#include "code\modules\cargo\expressconsole.dm"
#include "code\modules\cargo\gondolapod.dm"
#include "code\modules\cargo\goodies.dm"
+#include "code\modules\cargo\materials_market.dm"
#include "code\modules\cargo\order.dm"
#include "code\modules\cargo\orderconsole.dm"
#include "code\modules\cargo\supplypod.dm"
@@ -3414,6 +3477,7 @@
#include "code\modules\cargo\packs\science.dm"
#include "code\modules\cargo\packs\security.dm"
#include "code\modules\cargo\packs\service.dm"
+#include "code\modules\cargo\packs\stock_market_items.dm"
#include "code\modules\cargo\packs\vending_restock.dm"
#include "code\modules\chatter\chatter.dm"
#include "code\modules\client\client_colour.dm"
@@ -3794,6 +3858,7 @@
#include "code\modules\experisci\experiment\types\physical_experiment.dm"
#include "code\modules\experisci\experiment\types\random_scanning.dm"
#include "code\modules\experisci\experiment\types\scanning.dm"
+#include "code\modules\experisci\experiment\types\scanning_fish.dm"
#include "code\modules\experisci\experiment\types\scanning_machinery.dm"
#include "code\modules\experisci\experiment\types\scanning_material.dm"
#include "code\modules\experisci\experiment\types\scanning_people.dm"
@@ -4368,6 +4433,11 @@
#include "code\modules\mob\living\basic\festivus_pole.dm"
#include "code\modules\mob\living\basic\health_adjustment.dm"
#include "code\modules\mob\living\basic\tree.dm"
+#include "code\modules\mob\living\basic\blob_minions\blob_ai.dm"
+#include "code\modules\mob\living\basic\blob_minions\blob_mob.dm"
+#include "code\modules\mob\living\basic\blob_minions\blob_spore.dm"
+#include "code\modules\mob\living\basic\blob_minions\blob_zombie.dm"
+#include "code\modules\mob\living\basic\blob_minions\blobbernaut.dm"
#include "code\modules\mob\living\basic\clown\clown.dm"
#include "code\modules\mob\living\basic\clown\clown_ai.dm"
#include "code\modules\mob\living\basic\farm_animals\deer.dm"
@@ -4457,6 +4527,7 @@
#include "code\modules\mob\living\basic\space_fauna\mushroom.dm"
#include "code\modules\mob\living\basic\space_fauna\robot_customer.dm"
#include "code\modules\mob\living\basic\space_fauna\spaceman.dm"
+#include "code\modules\mob\living\basic\space_fauna\supermatter_spider.dm"
#include "code\modules\mob\living\basic\space_fauna\bear\_bear.dm"
#include "code\modules\mob\living\basic\space_fauna\bear\bear_ai_behavior.dm"
#include "code\modules\mob\living\basic\space_fauna\bear\bear_ai_subtree.dm"
@@ -4714,9 +4785,6 @@
#include "code\modules\mob\living\simple_animal\guardian\types\standard.dm"
#include "code\modules\mob\living\simple_animal\guardian\types\support.dm"
#include "code\modules\mob\living\simple_animal\hostile\alien.dm"
-#include "code\modules\mob\living\simple_animal\hostile\blob.dm"
-#include "code\modules\mob\living\simple_animal\hostile\blobbernaut.dm"
-#include "code\modules\mob\living\simple_animal\hostile\blobspore.dm"
#include "code\modules\mob\living\simple_animal\hostile\dark_wizard.dm"
#include "code\modules\mob\living\simple_animal\hostile\heretic_monsters.dm"
#include "code\modules\mob\living\simple_animal\hostile\hostile.dm"
@@ -4726,7 +4794,6 @@
#include "code\modules\mob\living\simple_animal\hostile\ooze.dm"
#include "code\modules\mob\living\simple_animal\hostile\pirate.dm"
#include "code\modules\mob\living\simple_animal\hostile\skeleton.dm"
-#include "code\modules\mob\living\simple_animal\hostile\smspider.dm"
#include "code\modules\mob\living\simple_animal\hostile\space_dragon.dm"
#include "code\modules\mob\living\simple_animal\hostile\vatbeast.dm"
#include "code\modules\mob\living\simple_animal\hostile\venus_human_trap.dm"
@@ -5233,7 +5300,6 @@
#include "code\modules\religion\sparring\sparring_datum.dm"
#include "code\modules\requests\request.dm"
#include "code\modules\requests\request_manager.dm"
-#include "code\modules\research\bepis.dm"
#include "code\modules\research\designs.dm"
#include "code\modules\research\destructive_analyzer.dm"
#include "code\modules\research\experimentor.dm"
@@ -5927,6 +5993,7 @@
#include "modular_skyrat\master_files\code\modules\antagonists\traitor\objectives\kill_pet.dm"
#include "modular_skyrat\master_files\code\modules\antagonists\traitor\objectives\smuggling.dm"
#include "modular_skyrat\master_files\code\modules\asset_cache\assets\plumbing.dm"
+#include "modular_skyrat\master_files\code\modules\bitrunning\orders\tech.dm"
#include "modular_skyrat\master_files\code\modules\buildmode\bm_mode.dm"
#include "modular_skyrat\master_files\code\modules\buildmode\submodes\offercontrol.dm"
#include "modular_skyrat\master_files\code\modules\cargo\goodies.dm"
@@ -6393,7 +6460,6 @@
#include "modular_skyrat\modules\bsa_overhaul\code\bsa_computer.dm"
#include "modular_skyrat\modules\bsa_overhaul\code\station_goal.dm"
#include "modular_skyrat\modules\bsrpd\code\bsrpd.dm"
-#include "modular_skyrat\modules\bulletrebalance\code\sniper.dm"
#include "modular_skyrat\modules\cargo\code\goodies.dm"
#include "modular_skyrat\modules\cargo\code\packs.dm"
#include "modular_skyrat\modules\cargo\code\items\AFAD.dm"
@@ -7108,11 +7174,15 @@
#include "modular_skyrat\modules\modular_implants\code\nifsofts\dorms.dm"
#include "modular_skyrat\modules\modular_implants\code\nifsofts\hivemind.dm"
#include "modular_skyrat\modules\modular_implants\code\nifsofts\huds.dm"
+#include "modular_skyrat\modules\modular_implants\code\nifsofts\hypnosis.dm"
#include "modular_skyrat\modules\modular_implants\code\nifsofts\money_sense.dm"
#include "modular_skyrat\modules\modular_implants\code\nifsofts\prop_summoner.dm"
+#include "modular_skyrat\modules\modular_implants\code\nifsofts\scryer.dm"
#include "modular_skyrat\modules\modular_implants\code\nifsofts\shapeshifter.dm"
#include "modular_skyrat\modules\modular_implants\code\nifsofts\soul_poem.dm"
#include "modular_skyrat\modules\modular_implants\code\nifsofts\soulcatcher.dm"
+#include "modular_skyrat\modules\modular_implants\code\nifsofts\base_types\action_granter.dm"
+#include "modular_skyrat\modules\modular_implants\code\soulcatcher\attachable_soulcatcher.dm"
#include "modular_skyrat\modules\modular_implants\code\soulcatcher\handheld_soulcatcher.dm"
#include "modular_skyrat\modules\modular_implants\code\soulcatcher\soulcatcher_body_component.dm"
#include "modular_skyrat\modules\modular_implants\code\soulcatcher\soulcatcher_component.dm"
@@ -7452,6 +7522,8 @@
#include "modular_skyrat\modules\records_on_examine\code\record_variables.dm"
#include "modular_skyrat\modules\records_on_examine\code\records_procs.dm"
#include "modular_skyrat\modules\records_on_examine\code\view_exploitables.dm"
+#include "modular_skyrat\modules\resleeving\code\rsd_interface.dm"
+#include "modular_skyrat\modules\resleeving\code\research\resleeving_research.dm"
#include "modular_skyrat\modules\robohand\code\bodypart_autosurgeon.dm"
#include "modular_skyrat\modules\robohand\code\robohand.dm"
#include "modular_skyrat\modules\robohand\code\silverhand_bundle.dm"
diff --git a/tgui/packages/tgui-panel/settings/middleware.js b/tgui/packages/tgui-panel/settings/middleware.js
index 705d7a89f3b..cef082213db 100644
--- a/tgui/packages/tgui-panel/settings/middleware.js
+++ b/tgui/packages/tgui-panel/settings/middleware.js
@@ -10,16 +10,39 @@ import { loadSettings, updateSettings, addHighlightSetting, removeHighlightSetti
import { selectSettings } from './selectors';
import { FONTS_DISABLED } from './constants';
+let overrideRule = null;
+let overrideFontFamily = null;
+let overrideFontSize = null;
+
+const updateGlobalOverrideRule = () => {
+ let fontFamily = '';
+
+ if (overrideFontFamily !== null) {
+ fontFamily = `font-family: ${overrideFontFamily} !important;`;
+ }
+
+ const constructedRule = `body * :not(.Icon) {
+ ${fontFamily}
+ }`;
+
+ if (overrideRule === null) {
+ overrideRule = document.createElement('style');
+ document.querySelector('head').append(overrideRule);
+ }
+
+ // no other way to force a CSS refresh other than to update its innerText
+ overrideRule.innerText = constructedRule;
+
+ document.body.style.setProperty('font-size', overrideFontSize);
+};
+
const setGlobalFontSize = (fontSize) => {
- document.documentElement.style.setProperty('font-size', fontSize + 'px');
- document.body.style.setProperty('font-size', fontSize + 'px');
+ overrideFontSize = `${fontSize}px`;
};
const setGlobalFontFamily = (fontFamily) => {
if (fontFamily === FONTS_DISABLED) fontFamily = null;
-
- document.documentElement.style.setProperty('font-family', fontFamily);
- document.body.style.setProperty('font-family', fontFamily);
+ overrideFontFamily = fontFamily;
};
export const settingsMiddleware = (store) => {
@@ -50,6 +73,7 @@ export const settingsMiddleware = (store) => {
// Update global UI font size
setGlobalFontSize(settings.fontSize);
setGlobalFontFamily(settings.fontFamily);
+ updateGlobalOverrideRule();
// Save settings to the web storage
storage.set('panel-settings', settings);
return;
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
index 148ccc86f72..43e2fa93343 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
@@ -535,6 +535,10 @@ em {
}
.blob {
+ color: #ee4000;
+}
+
+.blobannounce {
color: #556b2f;
font-weight: bold;
font-size: 185%;
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
index ffbfa3f02ed..e685cded774 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
@@ -594,6 +594,10 @@ h2.alert {
}
.blob {
+ color: #ee4000;
+}
+
+.blobannounce {
color: #323f1c;
font-weight: bold;
font-size: 185%;
diff --git a/tgui/packages/tgui/interfaces/AntagInfoCyberAuth.tsx b/tgui/packages/tgui/interfaces/AntagInfoCyberAuth.tsx
new file mode 100644
index 00000000000..21d872ed6a0
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/AntagInfoCyberAuth.tsx
@@ -0,0 +1,75 @@
+import { useBackend } from '../backend';
+import { Divider, Section, Stack } from '../components';
+import { Window } from '../layouts';
+import { Objective } from './common/Objectives';
+
+type Info = {
+ antag_name: string;
+ objectives: Objective[];
+};
+
+const textStyles = {
+ variable: {
+ color: 'white',
+ },
+ danger: {
+ color: 'red',
+ },
+} as const;
+
+export const AntagInfoCyberAuth = (props, context) => {
+ const { data } = useBackend(context);
+ const { objectives = [] } = data;
+
+ return (
+
+
+
+
+ FN CYBER AUTHORITY UNIT (REF)
+
+
+
+ You are a cyber authority unit.
+
+
+
+ Your mission: Eliminate{' '}
+ organic intruders to maintain the integrity of the system.
+
+
+ Bitrunning is a crime. To
+ assist your task, your program has been loaded with cutting edge{' '}
+ martial arts skills.
+
+
+ Ranged weaponry is{' '}
+ forbidden. Ballistic
+ defense is frowned upon. Style is paramount.
+
+
+
+
+
+
+ const TARGETS ={' '}
+
+
+ system.
+ INTRUDERS;
+
+
+ while TARGETS.LIFE !={' '}
+ stat.DEAD
+
+
+ action.
+ KILL()
+
+ cyber_authority_unit([0x70cf4020])
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx b/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx
index ff14419473c..da4331026cc 100644
--- a/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx
+++ b/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx
@@ -46,6 +46,7 @@ type KnowledgeInfo = {
type Info = {
charges: number;
+ side_charges: number;
total_sacrifices: number;
ascended: BooleanLike;
objectives: Objective[];
@@ -179,7 +180,7 @@ const GuideSection = () => {
const InformationSection = (props, context) => {
const { data } = useBackend(context);
- const { charges, total_sacrifices, ascended } = data;
+ const { charges, side_charges, total_sacrifices, ascended } = data;
return (
@@ -201,6 +202,13 @@ const InformationSection = (props, context) => {
knowledge point{charges !== 1 ? 's' : ''}
+ {!!side_charges && (
+
+ {' '}
+ and {side_charges} side point
+ {side_charges !== 1 ? 's' : ''}
+
+ )}{' '}
.
@@ -275,7 +283,7 @@ const KnowledgeShop = (props, context) => {
const ResearchInfo = (props, context) => {
const { data } = useBackend(context);
- const { charges } = data;
+ const { charges, side_charges } = data;
return (
@@ -285,7 +293,14 @@ const ResearchInfo = (props, context) => {
You have {charges || 0}
knowledge point{charges !== 1 ? 's' : ''}
- {' '}
+
+ {!!side_charges && (
+
+ {' '}
+ and {side_charges} side point
+ {side_charges !== 1 ? 's' : ''}
+
+ )}{' '}
to spend.
diff --git a/tgui/packages/tgui/interfaces/AvatarHelp.tsx b/tgui/packages/tgui/interfaces/AvatarHelp.tsx
new file mode 100644
index 00000000000..647d3a2e22b
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/AvatarHelp.tsx
@@ -0,0 +1,122 @@
+import { useBackend } from '../backend';
+import { Box, Icon, Section, Stack } from '../components';
+import { Window } from '../layouts';
+
+type Data = {
+ help_text: string;
+};
+
+const DEFAULT_HELP = `No information available! Ask for assistance if needed.`;
+
+const boxHelp = [
+ {
+ color: 'purple',
+ text: 'Study the area and do what needs to be done to recover the crate. Pay close attention to domain information and context clues.',
+ icon: 'search-location',
+ title: 'Search',
+ },
+ {
+ color: 'green',
+ text: 'Bring the crate to the designated sending location in the safehouse. The area may seem out of place. Examine the safehouse to find it.',
+ icon: 'boxes',
+ 'title': 'Recover',
+ },
+ {
+ color: 'blue',
+ text: 'The ladder represents the safest way to disconnect before the cache is recovered. Should your connection sever, the netpod offers limited resuscitation potential.',
+ icon: 'plug',
+ title: 'Disconnect',
+ },
+ {
+ color: 'yellow',
+ text: 'While connected, you are somewhat safe from environmental hazards and intrusions, but not completely. Pay close attention to alerts.',
+ icon: 'id-badge',
+ title: 'Security',
+ },
+ {
+ color: 'gold',
+ text: 'Generating avatars costs tremendous bandwidth. Do not waste them.',
+ icon: 'coins',
+ title: 'Limited Attempts',
+ },
+ {
+ color: 'red',
+ text: 'Remember that you are physically linked to this presence. You are a foreign body in a hostile environment. It will attempt to forcefully eject you.',
+ icon: 'skull-crossbones',
+ title: 'Realized Danger',
+ },
+] as const;
+
+export const AvatarHelp = (props, context) => {
+ const { data } = useBackend(context);
+ const { help_text = DEFAULT_HELP } = data;
+
+ return (
+
+
+
+
+
+
+
+
+
+
+ {[0, 1].map((i) => (
+
+ ))}
+
+
+
+
+ {[2, 3].map((i) => (
+
+ ))}
+
+
+
+
+ {[4, 5].map((i) => (
+
+ ))}
+
+
+
+
+
+
+
+ );
+};
+
+// I wish I had media queries
+const BoxHelp = (props: { index: number }, context) => {
+ const { index } = props;
+
+ return (
+
+
+
+ {boxHelp[index].title}
+
+ }>
+ {boxHelp[index].text}
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/Bepis.tsx b/tgui/packages/tgui/interfaces/Bepis.tsx
deleted file mode 100644
index d2835e530d3..00000000000
--- a/tgui/packages/tgui/interfaces/Bepis.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-import { BooleanLike } from 'common/react';
-import { useBackend } from '../backend';
-import { Box, Button, Grid, LabeledList, NumberInput, Section } from '../components';
-import { Window } from '../layouts';
-
-type Data = {
- amount: number;
- account_owner: string;
- manual_power: BooleanLike;
- stored_cash: number;
- accuracy_percentage: number;
- positive_cash_offset: number;
- negative_cash_offset: number;
- silicon_check: BooleanLike;
- success_estimate: number;
- mean_value: number;
- error_name: string;
-};
-
-const BEPIS_SLOGAN = `All you need to know about the B.E.P.I.S. and you! The
-B.E.P.I.S. performs hundreds of tests a second using
-electrical and financial resources to invent new products,
-or discover new technologies otherwise overlooked for being
-too risky or too niche to produce!`;
-
-export const Bepis = (props, context) => {
- const { act, data } = useBackend(context);
- const {
- amount,
- account_owner,
- manual_power,
- stored_cash,
- accuracy_percentage,
- positive_cash_offset,
- negative_cash_offset,
- silicon_check,
- success_estimate,
- mean_value,
- error_name,
- } = data;
-
- return (
-
-
-
- act('toggle_power')}
- />
- }>
- {BEPIS_SLOGAN}
-
- act('account_reset')}
- />
- }>
- Console is currently being operated by{' '}
- {account_owner ? account_owner : 'no one'}.
-
-
-
-
-
-
- {stored_cash}
-
-
- {accuracy_percentage}%
-
-
- {positive_cash_offset}
-
-
- {negative_cash_offset}
-
-
-
- act('amount', {
- amount: value,
- })
- }
- />
-
-
-
-
-
-
-
-
- Average technology cost: {mean_value}
- Current chance of Success: Est. {success_estimate}%
- {error_name && (
-
- Previous Failure Reason: Deposited cash value too low.
- Please insert more money for future success.
-
- )}
-
-
-
-
-
-
- );
-};
diff --git a/tgui/packages/tgui/interfaces/Canvas.tsx b/tgui/packages/tgui/interfaces/Canvas.tsx
index 40155c08869..1dddec2e907 100644
--- a/tgui/packages/tgui/interfaces/Canvas.tsx
+++ b/tgui/packages/tgui/interfaces/Canvas.tsx
@@ -264,13 +264,13 @@ export const Canvas = (props, context) => {
{
const { self_paid, app_cost } = data;
const supplies = Object.values(data.supplies);
+ const { amount_by_name = [], max_order } = data;
const [activeSupplyName, setActiveSupplyName] = useSharedState(
context,
@@ -273,6 +274,7 @@ export const CargoCatalog = (props, context) => {
fluid
tooltip={pack.desc}
tooltipPosition="left"
+ disabled={(amount_by_name[pack.name] || 0) >= max_order}
onClick={() =>
act('add', {
id: pack.id,
@@ -406,7 +408,15 @@ const CartHeader = (props, context) => {
const CargoCart = (props, context) => {
const { act, data } = useBackend(context);
- const { requestonly, away, docked, location, can_send } = data;
+ const {
+ requestonly,
+ away,
+ docked,
+ location,
+ can_send,
+ amount_by_name,
+ max_order,
+ } = data;
const cart = data.cart || [];
return (
@@ -424,7 +434,7 @@ const CargoCart = (props, context) => {
act('modify', {
@@ -439,6 +449,7 @@ const CargoCart = (props, context) => {
{!!can_send && !!entry.can_be_cancelled && (
@@ -168,44 +168,24 @@ export const ExperimentConfigure = (props, context) => {
export const Experiment = (props, context) => {
const { act, data } = useBackend(context);
- const { exp, controllable } = props;
- const {
- name,
- description,
- tag,
- selectable,
- selected,
- progress,
- performance_hint,
- ref,
- } = exp;
+ const { exp } = props;
+ const { name, description, tag, selected, progress, performance_hint, ref } =
+ exp;
return (
+ }
+ color={getColor(difficulty)}
+ title={
+ <>
+ {name}
+ {difficulty === Difficulty.High && }
+
+ }>
+
+
+ {desc}
+
+
+
+
+
+
+
+ );
+};
+
+const AvatarDisplay = (props, context) => {
+ const { act, data } = useBackend(context);
+ if (!isConnected(data)) {
+ return null;
+ }
+
+ const { avatars = [], generated_domain, retries_left } = data;
+
+ return (
+
+ {!!generated_domain && (
+
+
+
+
+
+ )}
+
+
+
+
+ }>
+
+ {avatars.map(({ health, name, pilot, brute, burn, tox, oxy }) => (
+
+
+ {pilot} as{' '}
+ "{name}"
+
+
+
+ {brute === 0 && burn === 0 && tox === 0 && oxy === 0 && (
+
+
+
+ )}
+
+ 50 ? 'bad' : 'gray'} name="tint" />
+
+
+ 50 ? 'average' : 'gray'} name="fire" />
+
+
+ 50 ? 'green' : 'gray'}
+ name="skull-crossbones"
+ />
+
+
+ 50 ? 'blue' : 'gray'} name="lungs" />
+
+
+
+
+
+
+
+ ))}
+
+
+ );
+};
+
+const DisplayDetails = (props: DisplayDetailsProps, context) => {
+ const { amount = 0, color, icon = 'star' } = props;
+
+ if (amount === 0) {
+ return No bandwidth;
+ }
+
+ if (typeof amount === 'string') {
+ return {String(amount)}; // don't ask
+ }
+
+ if (amount > 4) {
+ return (
+
+
+ {amount}
+
+
+
+
+
+ );
+ }
+
+ return (
+
+
+ {Array.from({ length: amount }, (_, index) => (
+
+
+
+ ))}
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/Soulcatcher.js b/tgui/packages/tgui/interfaces/Soulcatcher.js
index 226dbd93192..f91f5fabef8 100644
--- a/tgui/packages/tgui/interfaces/Soulcatcher.js
+++ b/tgui/packages/tgui/interfaces/Soulcatcher.js
@@ -1,10 +1,18 @@
import { useBackend } from '../backend';
import { Window } from '../layouts';
-import { BlockQuote, Button, Divider, Section, Box, Flex, Collapsible, LabeledList } from '../components';
+import { BlockQuote, Button, Divider, Section, Box, Flex, Collapsible, LabeledList, ProgressBar } from '../components';
export const Soulcatcher = (props, context) => {
const { act, data } = useBackend(context);
- const { require_approval, current_rooms = [], ghost_joinable } = data;
+ const {
+ require_approval,
+ current_rooms = [],
+ ghost_joinable,
+ current_soul_count,
+ max_souls,
+ removable,
+ communicate_as_parent,
+ } = data;
return (
@@ -278,6 +286,54 @@ export const Soulcatcher = (props, context) => {
{soul.able_to_emote ? 'Enabled' : 'Disabled'}
+ {communicate_as_parent ? (
+ <>
+
+
+
+
+
+
+
+ ) : (
+ <>
+ )}
);
diff --git a/tgui/packages/tgui/interfaces/SoulcatcherUser.js b/tgui/packages/tgui/interfaces/SoulcatcherUser.js
index f768287bb33..cabe26aabc3 100644
--- a/tgui/packages/tgui/interfaces/SoulcatcherUser.js
+++ b/tgui/packages/tgui/interfaces/SoulcatcherUser.js
@@ -4,7 +4,7 @@ import { BlockQuote, Button, Divider, Box, Flex, Collapsible, LabeledList, Secti
export const SoulcatcherUser = (props, context) => {
const { act, data } = useBackend(context);
- const { current_room, user_data, souls = [] } = data;
+ const { current_room, user_data, communicate_as_parent, souls = [] } = data;
return (
@@ -41,6 +41,18 @@ export const SoulcatcherUser = (props, context) => {
) : (
<>
)}
+ {communicate_as_parent ? (
+
@@ -69,6 +81,22 @@ export const SoulcatcherUser = (props, context) => {
{user_data.able_to_emote ? 'Enabled' : 'Disabled'}
+ {communicate_as_parent ? (
+ <>
+
+ {user_data.able_to_speak_as_container
+ ? 'Enabled'
+ : 'Disabled'}
+
+
+ {user_data.able_to_emote_as_container
+ ? 'Enabled'
+ : 'Disabled'}
+
+
+ ) : (
+ <>
+ )}
{user_data.able_to_rename && !user_data.scan_needed
? 'Enabled'
diff --git a/tgui/packages/tgui/interfaces/common/JobToIcon.ts b/tgui/packages/tgui/interfaces/common/JobToIcon.ts
index 175e5b16ef5..d3d23b63bc3 100644
--- a/tgui/packages/tgui/interfaces/common/JobToIcon.ts
+++ b/tgui/packages/tgui/interfaces/common/JobToIcon.ts
@@ -1,3 +1,5 @@
+export type AvailableJob = keyof typeof JOB2ICON;
+
/** Icon map of jobs to their fontawesome5 (free) counterpart. */
// SKYRAT EDIT START - ORIGINAL: export const JOB2ICONs = {
const BASEICONS = {
@@ -6,6 +8,8 @@ const BASEICONS = {
'Assistant': 'toolbox',
'Atmospheric Technician': 'fan',
'Bartender': 'cocktail',
+ 'Bit Avatar': 'code',
+ 'Bitrunner': 'gamepad',
'Botanist': 'seedling',
'Captain': 'crown',
'Cargo Technician': 'box',
@@ -18,10 +22,11 @@ const BASEICONS = {
'Chemist': 'prescription-bottle',
'Chief Engineer': 'user-astronaut',
'Chief Medical Officer': 'user-md',
- 'Coroner': 'skull',
'Clown': 'face-grin-tears',
'Cook': 'utensils',
+ 'Coroner': 'skull',
'Curator': 'book',
+ 'Cyber Police': 'qrcode',
'Cyborg': 'robot',
'Detective': 'user-secret',
'Geneticist': 'dna',
@@ -274,5 +279,3 @@ const ALTTITLES = {
// Combine the Base icons and ALt titles
export const JOB2ICON = { ...BASEICONS, ...ALTTITLES } as const;
// SKYRAT EDIT END
-
-export type AvailableJob = keyof typeof JOB2ICON;
diff --git a/tgui/packages/tgui/interfaces/common/LoadingToolbox.tsx b/tgui/packages/tgui/interfaces/common/LoadingToolbox.tsx
new file mode 100644
index 00000000000..a77eb78c338
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/common/LoadingToolbox.tsx
@@ -0,0 +1,32 @@
+import { Stack, Icon, Dimmer } from '../../components';
+
+/** Spinner that represents loading states.
+ *
+ * @usage
+ * ```tsx
+ * /// rest of the component
+ * return (
+ * ///... content to overlay
+ * {!!loading && }
+ * /// ... content to overlay
+ * );
+ * ```
+ * OR
+ * ```tsx
+ * return (
+ * {loading ? : }
+ * )
+ * ```
+ */
+export const LoadingScreen = (props, context) => {
+ return (
+
+
+
+
+
+ Please wait...
+
+
+ );
+};
diff --git a/tgui/packages/tgui/routes.tsx b/tgui/packages/tgui/routes.tsx
index b841c84b887..39598c4cc6e 100644
--- a/tgui/packages/tgui/routes.tsx
+++ b/tgui/packages/tgui/routes.tsx
@@ -4,12 +4,11 @@
* @license MIT
*/
-import { Icon, Section, Stack } from './components';
-
import { Store } from 'common/redux';
import { Window } from './layouts';
import { selectBackend } from './backend';
import { selectDebug } from './debug/selectors';
+import { LoadingScreen } from './interfaces/common/LoadingToolbox';
const requireInterface = require.context('./interfaces');
@@ -47,14 +46,7 @@ const RefreshingWindow = () => {
return (
-
-
-
-
-
- Please wait...
-
-
+
);