diff --git a/_maps/map_files/nova/nova.dmm b/_maps/map_files/nova/nova.dmm
index f8997e7806c..20d9368ddfb 100644
--- a/_maps/map_files/nova/nova.dmm
+++ b/_maps/map_files/nova/nova.dmm
@@ -513,31 +513,11 @@
/turf/simulated/floor/plasteel/dark,
/area/engineering/controlroom)
"aek" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/obj/machinery/hologram/holopad,
-/obj/effect/decal/warning_stripes/green/hollow,
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/item/radio/intercom{
- pixel_x = 28;
- pixel_y = 32
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
+/obj/machinery/atmospherics/binary/valve{
+ dir = 4
},
-/area/medical/virology)
+/turf/simulated/floor/plating,
+/area/medical/virology/lab)
"aeq" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -1048,11 +1028,12 @@
},
/area/medical/research/nhallway)
"ahS" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitegreen"
@@ -1642,6 +1623,7 @@
/area/quartermaster/storage)
"ama" = (
/obj/effect/decal/cleanable/dirt,
+/obj/item/folder,
/turf/simulated/floor/plasteel,
/area/maintenance/xenozoo)
"amf" = (
@@ -1973,10 +1955,17 @@
/turf/simulated/floor/grass,
/area/hydroponics)
"aok" = (
-/obj/structure/closet/l3closet/virology,
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
-/turf/simulated/floor/plating,
-/area/medical/virology/lab)
+/obj/structure/table/reinforced,
+/obj/item/storage/ashtray/glass{
+ pixel_x = 6
+ },
+/obj/item/storage/fancy/cigarettes/cigpack_robust,
+/obj/item/lighter,
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "red"
+ },
+/area/security/interrogation)
"aop" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -4520,7 +4509,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
-/area/engineering/engine)
+/area/engineering/break_room)
"aIf" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -4700,13 +4689,7 @@
dir = 8;
do_not_delete_me = 1
},
-/obj/structure/chair/stool/bar{
- icon = 'icons/obj/lighting.dmi';
- icon_state = "lantern-on";
- light_color = "#FFBF00";
- light_range = 6;
- name = "lantern"
- },
+/obj/item/flashlight/lantern,
/turf/simulated/floor/carpet/red,
/area/chapel/main)
"aJv" = (
@@ -4804,7 +4787,6 @@
},
/area/crew_quarters/fitness)
"aJZ" = (
-/obj/effect/spawner/random_spawners/crate_spawner,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
dir = 1
@@ -5650,9 +5632,10 @@
id = "mining_home";
name = "mining shuttle bay";
width = 7;
- turf_type = /turf/simulated/floor/plating
+ turf_type = /turf/simulated/floor/plating;
+ area_type = /area/quartermaster/miningdock
},
-/turf/space{
+/turf/space/openspace{
icon_state = "black"
},
/area/quartermaster/miningdock)
@@ -8365,15 +8348,21 @@
/turf/simulated/floor/carpet/black,
/area/chapel/main)
"bkx" = (
-/obj/effect/decal/warning_stripes/northeast,
-/obj/machinery/chem_master{
- pixel_x = -1
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/table/glass,
+/obj/item/reagent_containers/dropper/precision,
+/obj/item/reagent_containers/dropper/precision,
+/obj/item/reagent_containers/dropper,
+/obj/item/reagent_containers/dropper,
+/obj/item/healthanalyzer/advanced,
+/obj/item/healthanalyzer/advanced,
/turf/simulated/floor/plasteel,
/area/medical/virology/lab)
"bky" = (
@@ -9155,13 +9144,14 @@
/turf/simulated/floor/wood,
/area/maintenance/fsmaint)
"bqo" = (
-/obj/effect/decal/warning_stripes/northwestcorner,
-/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb2,
-/obj/item/toy/figure/scientist,
/obj/machinery/light/small{
dir = 1
},
+/obj/structure/closet/l3closet/scientist,
+/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/effect/decal/warning_stripes/northwestcorner,
+/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/maintenance/xenozoo)
"bqr" = (
@@ -9756,7 +9746,7 @@
dir = 4;
icon_state = "whitegreen"
},
-/area/medical/virology/lab)
+/area/medical/virology)
"buq" = (
/obj/machinery/firealarm{
dir = 8;
@@ -10128,21 +10118,26 @@
},
/area/maintenance/fpmaint)
"bwt" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
- dir = 4
+/obj/structure/cable/multiz{
+ color = "#dd1010"
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
},
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/structure/table/glass,
+/obj/item/paper_bin,
+/obj/item/pen/red,
+/obj/item/reagent_containers/spray/cleaner/medical{
+ pixel_x = 7;
+ pixel_y = 9
},
-/obj/structure/disposalpipe/segment{
- invisibility = 101
+/obj/item/reagent_containers/spray/cleaner/medical{
+ pixel_x = -2;
+ pixel_y = 9
},
-/turf/simulated/floor/plating,
+/obj/effect/decal/warning_stripes/north,
+/turf/simulated/floor/plasteel,
/area/medical/virology/lab)
"bwE" = (
/obj/effect/decal/cleanable/dirt,
@@ -10685,15 +10680,21 @@
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"bAV" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/structure/closet/crate/freezer,
+/obj/item/reagent_containers/iv_bag/bloodsynthetic/nitrogenis,
+/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis,
+/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis,
+/obj/machinery/light/small{
+ dir = 8
},
-/turf/simulated/floor/plasteel{
- icon_state = "white"
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
+ dir = 8
},
-/area/medical/virology)
+/obj/structure/sign/poster/contraband/random{
+ pixel_x = -32
+ },
+/turf/simulated/floor/plating,
+/area/medical/virology/lab)
"bAX" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -13060,11 +13061,6 @@
/turf/simulated/floor/plating,
/area/hallway/secondary/exit)
"bRE" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/cable{
d1 = 1;
d2 = 4;
@@ -13182,20 +13178,12 @@
},
/area/hallway/primary/central/second/east)
"bSF" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/ashtray/glass{
- pixel_x = 6
- },
-/obj/item/storage/fancy/cigarettes/cigpack_robust,
-/obj/item/lighter,
-/obj/item/radio/intercom{
- pixel_y = 24
- },
-/turf/simulated/floor/plasteel{
- dir = 9;
- icon_state = "red"
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/contraband/random{
+ pixel_y = 32
},
-/area/security/interrogation)
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint4)
"bSJ" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -14933,12 +14921,6 @@
},
/area/atmos)
"cfF" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
@@ -14948,6 +14930,14 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitegreen"
@@ -16049,9 +16039,7 @@
/turf/simulated/floor/plating,
/area/maintenance/tourist)
"con" = (
-/obj/vehicle/ridden/janicart{
- dir = 4
- },
+/obj/vehicle/ridden/janicart,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "purple"
@@ -16179,6 +16167,10 @@
icon_state = "cult"
},
/area/chapel/office)
+"cpg" = (
+/obj/effect/spawner/random_spawners/crate_spawner,
+/turf/simulated/floor/plating,
+/area/maintenance/starboard)
"cpj" = (
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
@@ -16433,15 +16425,20 @@
/turf/simulated/floor/plating,
/area/maintenance/asmaint)
"cqS" = (
-/obj/machinery/light/small{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
},
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
+/obj/item/radio/intercom{
+ pixel_x = 28;
+ pixel_y = 26
},
-/turf/simulated/floor/plasteel{
- icon_state = "freezerfloor"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
},
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/carpet/green,
/area/medical/virology)
"cqU" = (
/obj/effect/spawner/window/reinforced,
@@ -17520,6 +17517,12 @@
/area/crew_quarters/locker)
"czo" = (
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 2
+ },
+/obj/structure/sign/poster/official/random{
+ pixel_x = -32
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkred"
@@ -18863,6 +18866,11 @@
},
/turf/simulated/floor/plating,
/area/crew_quarters/kitchen)
+"cKa" = (
+/obj/structure/closet,
+/obj/effect/spawner/lootdrop/maintenance/tripple,
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint4)
"cKc" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
@@ -19525,9 +19533,6 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light{
- dir = 4
- },
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "darkred"
@@ -21669,16 +21674,9 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"dgD" = (
-/obj/machinery/door/airlock/maintenance{
- req_access = list(12,39);
- name = "Virology maintenance"
- },
-/obj/structure/cable{
- icon_state = "1-2";
- tag = ""
+/turf/simulated/floor/plasteel{
+ icon_state = "ramptop"
},
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plating,
/area/maintenance/asmaint4)
"dgH" = (
/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
@@ -24708,6 +24706,11 @@
/obj/effect/decal/ants,
/turf/simulated/floor/plating,
/area/security/permabrig)
+"dCH" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random_spawners/crate_spawner,
+/turf/simulated/floor/plating,
+/area/maintenance/tourist)
"dCL" = (
/obj/structure/chair/sofa/right,
/obj/effect/decal/cleanable/dirt,
@@ -26917,6 +26920,9 @@
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plating/airless,
/area/space)
+"dUj" = (
+/turf/simulated/floor/carpet/green,
+/area/medical/virology)
"dUt" = (
/obj/effect/turf_decal/siding/wood{
dir = 4
@@ -27216,7 +27222,7 @@
icon_state = "whitegreen";
tag = "icon-whitegreen (EAST)"
},
-/area/medical/virology/lab)
+/area/medical/virology)
"dXy" = (
/obj/machinery/vending/clothing/departament/security,
/obj/effect/decal/warning_stripes/red/hollow,
@@ -27319,9 +27325,8 @@
/turf/simulated/floor/plating,
/area/maintenance/tourist)
"dYK" = (
-/obj/structure/closet/l3closet/scientist,
-/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/effect/decal/cleanable/dirt,
+/obj/item/paper_bin,
/turf/simulated/floor/plasteel,
/area/maintenance/xenozoo)
"dYN" = (
@@ -28435,7 +28440,7 @@
dir = 10;
icon_state = "whitegreen"
},
-/area/medical/virology/lab)
+/area/medical/virology)
"egq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 5
@@ -29094,6 +29099,18 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/trading)
+"ekJ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint)
"ekP" = (
/obj/structure/railing{
dir = 10
@@ -29388,6 +29405,17 @@
icon_state = "red"
},
/area/security/processing)
+"emp" = (
+/obj/machinery/light,
+/obj/machinery/vending/wallmed{
+ layer = 3.3;
+ name = "Emergency NanoMed";
+ pixel_y = -30
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1
+ },
+/area/hallway/primary/central/second/east)
"emr" = (
/obj/structure/flora/ausbushes/ppflowers,
/obj/structure/flora/ausbushes/ywflowers,
@@ -30234,6 +30262,15 @@
icon_state = "dark"
},
/area/security/securearmory)
+"etN" = (
+/obj/item/pen,
+/obj/structure/table,
+/obj/item/toy/figure/scientist,
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/xenozoo)
"etQ" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
@@ -30532,7 +30569,7 @@
name = "fore bay 1";
width = 9
},
-/turf/space{
+/turf/space/openspace{
icon_state = "black"
},
/area/space)
@@ -31126,11 +31163,14 @@
},
/area/medical/cloning)
"ezI" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
+/obj/structure/disposalpipe/trunk{
+ dir = 4
},
-/area/security/interrogation)
+/obj/structure/disposaloutlet{
+ dir = 8
+ },
+/turf/simulated/floor/plating/airless,
+/area/space)
"ezJ" = (
/obj/structure/table,
/obj/item/storage/fancy/cigarettes/cigpack_robust{
@@ -33351,17 +33391,11 @@
/turf/simulated/floor/wood,
/area/security/permabrig)
"eRj" = (
-/obj/machinery/shower{
- dir = 8;
- tag = "icon-shower (WEST)"
- },
-/obj/item/radio/intercom{
- pixel_x = 32;
- pixel_y = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "freezerfloor"
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
},
+/obj/item/twohanded/required/kirbyplants,
+/turf/simulated/floor/carpet/green,
/area/medical/virology)
"eRo" = (
/obj/machinery/door/airlock/maintenance{
@@ -33443,19 +33477,12 @@
},
/area/hallway/primary/command/west)
"eSe" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/radio/intercom{
- pixel_x = 28;
- pixel_y = -2
- },
-/obj/machinery/light{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "darkred"
+/obj/structure/sign/poster/contraband/random{
+ pixel_y = -32
},
-/area/security/interrogation)
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint4)
"eSn" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -34532,7 +34559,6 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/green/hollow,
/obj/structure/disposalpipe/junction,
/turf/simulated/floor/plasteel{
@@ -34605,8 +34631,8 @@
d2 = 4;
icon_state = "0-4"
},
-/obj/structure/cable{
- icon_state = "2-4"
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/turf/simulated/floor/plating,
/area/medical/virology/lab)
@@ -34657,7 +34683,7 @@
icon_state = "whitegreen";
tag = "icon-whitegreen (EAST)"
},
-/area/medical/virology/lab)
+/area/medical/virology)
"fbw" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -35304,7 +35330,7 @@
dir = 6;
icon_state = "whitegreen"
},
-/area/medical/virology/lab)
+/area/medical/virology)
"fgy" = (
/turf/simulated/floor/plasteel{
dir = 2;
@@ -35393,14 +35419,12 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"fhc" = (
-/obj/machinery/camera{
- c_tag = "Virology Bedroom 1";
- dir = 8;
- network = list("Medical","SS13")
- },
-/obj/item/twohanded/required/kirbyplants,
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/simulated/floor/carpet/green,
/area/medical/virology)
@@ -35662,9 +35686,28 @@
/turf/simulated/floor/shuttle,
/area/shuttle/arrival/station)
"fjf" = (
-/obj/structure/dresser,
-/turf/simulated/floor/carpet/green,
-/area/medical/virology)
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 8;
+ id_tag = "Virology1";
+ name = "Virology Shutters"
+ },
+/obj/machinery/door/poddoor{
+ density = 0;
+ icon_state = "open";
+ id_tag = "Biohazard_medi";
+ name = "Quarantine Lockdown";
+ opacity = 0
+ },
+/obj/structure/cable{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/effect/spawner/window/reinforced,
+/turf/simulated/floor/plating,
+/area/medical/virology/lab)
"fjk" = (
/obj/structure/disposalpipe/junction/reversed{
dir = 2
@@ -36842,12 +36885,14 @@
/area/maintenance/banya)
"frL" = (
/obj/structure/cable{
- d2 = 4;
- icon_state = "0-4"
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/medical/virology)
+/obj/machinery/computer/pandemic,
+/obj/effect/decal/warning_stripes/northeast,
+/turf/simulated/floor/plasteel,
+/area/medical/virology/lab)
"frO" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -37261,6 +37306,16 @@
/obj/effect/landmark/start/chaplain,
/turf/simulated/floor/carpet,
/area/chapel/office)
+"fve" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/hallway/primary/central/ne)
"fvl" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -38251,6 +38306,17 @@
icon_state = "green"
},
/area/hallway/secondary/exit)
+"fCh" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/vending/wallmed{
+ name = "Emergency NanoMed";
+ pixel_x = 25
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "neutral"
+ },
+/area/crew_quarters/serviceyard)
"fCk" = (
/turf/simulated/floor/shuttle,
/area/shuttle/arrival/station)
@@ -38437,6 +38503,11 @@
/area/medical/medrest)
"fDM" = (
/obj/machinery/light,
+/obj/machinery/vending/wallmed{
+ layer = 3.3;
+ name = "Emergency NanoMed";
+ pixel_y = -30
+ },
/turf/simulated/floor/plasteel{
dir = 1
},
@@ -39375,19 +39446,11 @@
/turf/simulated/floor/grass,
/area/hydroponics)
"fKM" = (
-/obj/effect/spawner/window/reinforced/polarized{
- id = "vir2"
- },
-/obj/machinery/door/poddoor/shutters/preopen{
- dir = 1;
- id_tag = "Virology1";
- name = "Virology Shutters"
- },
-/obj/structure/cable{
- icon_state = "0-2"
+/obj/machinery/atmospherics/unary/tank/air{
+ dir = 8
},
/turf/simulated/floor/plating,
-/area/medical/virology)
+/area/medical/virology/lab)
"fKP" = (
/obj/effect/decal/cleanable/flour,
/obj/machinery/light/small{
@@ -39685,7 +39748,9 @@
},
/area/security/permabrig)
"fNi" = (
-/obj/structure/statue/unknown,
+/obj/structure/statue/unknown{
+ max_integrity = 500
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -39976,6 +40041,7 @@
/obj/structure/sign/poster/contraband/tools{
pixel_y = 32
},
+/obj/item/clothing/gloves/color/yellow,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -40771,6 +40837,7 @@
/turf/simulated/floor/plasteel,
/area/assembly/showroom)
"fVo" = (
+/obj/effect/decal/cleanable/dust,
/turf/simulated/floor/wood{
icon_state = "wood-broken5";
tag = "icon-wood-broken5"
@@ -44575,20 +44642,23 @@
},
/area/security/securearmory)
"gxv" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
+/obj/machinery/camera{
+ c_tag = "Virology Bedroom 1";
+ dir = 5;
+ network = list("Medical","SS13");
+ pixel_y = 9
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
},
/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
+ icon_state = "2-4"
},
-/obj/item/radio/intercom{
- pixel_x = 28;
- pixel_y = 26
+/obj/machinery/vending/wallmed{
+ pixel_x = -26
},
/turf/simulated/floor/carpet/green,
/area/medical/virology)
@@ -44857,12 +44927,10 @@
},
/area/maintenance/trading)
"gAb" = (
-/obj/structure/disposaloutlet{
- dir = 8
- },
-/obj/structure/disposalpipe/trunk,
-/turf/simulated/floor/plating/airless,
-/area/space)
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/remains/human,
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint4)
"gAe" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -44951,24 +45019,14 @@
},
/area/crew_quarters/theatre)
"gBh" = (
-/obj/structure/closet/crate/freezer,
-/obj/item/reagent_containers/iv_bag/bloodsynthetic/nitrogenis,
-/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis,
-/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis,
-/obj/machinery/status_display{
- pixel_x = -32
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 4
- },
-/obj/machinery/light{
- dir = 1;
- in_use = 1
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/item/wrench,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 6
},
-/area/medical/virology)
+/turf/simulated/floor/plating,
+/area/medical/virology/lab)
"gBD" = (
/obj/structure/table/wood,
/obj/item/kitchen/utensil/fork,
@@ -45476,11 +45534,12 @@
dir = 8;
pixel_x = 25
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "whitegreen"
@@ -46304,27 +46363,8 @@
/turf/simulated/floor/plating,
/area/medical/virology/lab)
"gLO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/button/windowtint{
- id = "vir2";
- pixel_x = -24;
- pixel_y = 24
- },
-/obj/machinery/light_switch{
- pixel_x = -32;
- pixel_y = 24
- },
-/turf/simulated/floor/carpet/green,
+/obj/structure/sign/biohazard,
+/turf/simulated/wall/r_wall,
/area/medical/virology)
"gLP" = (
/obj/machinery/vending/wallmed{
@@ -46566,7 +46606,8 @@
/area/bridge/meeting_room)
"gOD" = (
/obj/structure/stairs{
- dir = 1
+ dir = 1;
+ layer = 2
},
/obj/structure/railing{
dir = 8
@@ -46729,7 +46770,8 @@
/area/engineering/mechanic_workshop/hangar)
"gPX" = (
/obj/structure/stairs{
- dir = 8
+ dir = 8;
+ layer = 2
},
/turf/simulated/floor/plasteel,
/area/engineering/controlroom)
@@ -47072,6 +47114,9 @@
/area/medical/research/nhallway)
"gSZ" = (
/obj/item/twohanded/required/kirbyplants,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "red"
@@ -48742,7 +48787,7 @@
icon_state = "2-8"
},
/turf/simulated/floor/plasteel,
-/area/engineering/engine)
+/area/engineering/break_room)
"hes" = (
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
@@ -48823,6 +48868,9 @@
/area/security/brig)
"hfj" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/structure/chair/sofa/pew/left{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "chapel"
},
@@ -49619,17 +49667,17 @@
/turf/simulated/floor/plasteel/white,
/area/teleporter)
"hlh" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+/obj/structure/table/reinforced,
+/obj/item/flashlight/lamp{
+ layer = 4;
+ pixel_x = 7;
+ pixel_y = 12
},
-/obj/structure/disposalpipe/segment{
- dir = 9
+/obj/item/radio/intercom/department/security,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
},
-/turf/simulated/floor/plating,
-/area/maintenance/asmaint4)
+/area/security/interrogation)
"hlo" = (
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel{
@@ -49793,10 +49841,10 @@
/area/security/securearmory)
"hmk" = (
/obj/effect/decal/warning_stripes/northeastsouth,
-/obj/vehicle/ridden/ambulance{
+/obj/machinery/light{
dir = 4
},
-/obj/machinery/light{
+/obj/vehicle/ridden/ambulance{
dir = 4
},
/turf/simulated/floor/plasteel{
@@ -50046,10 +50094,10 @@
},
/area/medical/virology/lab)
"how" = (
-/obj/effect/spawner/window/reinforced,
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/railing/corner{
+ dir = 1
},
+/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/maintenance/asmaint4)
"hoC" = (
@@ -50559,6 +50607,9 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
+/obj/structure/chair/sofa/pew/right{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "chapel"
@@ -50941,7 +50992,8 @@
/area/toxins/rdoffice)
"hwg" = (
/obj/structure/stairs{
- dir = 8
+ dir = 8;
+ layer = 2
},
/turf/simulated/floor/plating,
/area/maintenance/fsmaint2)
@@ -50983,12 +51035,12 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"
@@ -52368,6 +52420,7 @@
req_access = list(3,4);
dir = 2
},
+/obj/effect/turf_decal/siding/wood,
/turf/simulated/floor/wood,
/area/security/detectives_office)
"hJH" = (
@@ -52453,6 +52506,14 @@
"hKK" = (
/turf/simulated/floor/carpet/orange,
/area/maintenance/casino)
+"hKO" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "ramptop"
+ },
+/area/maintenance/asmaint4)
"hKS" = (
/obj/structure/cable{
d1 = 4;
@@ -53586,7 +53647,8 @@
/area/quartermaster/qm)
"hUk" = (
/obj/structure/stairs{
- dir = 1
+ dir = 1;
+ layer = 2
},
/obj/structure/railing{
dir = 8
@@ -54180,7 +54242,8 @@
/area/toxins/xenobiology)
"hYO" = (
/obj/structure/stairs{
- dir = 1
+ dir = 1;
+ layer = 2
},
/turf/simulated/floor/plasteel{
dir = 5;
@@ -54377,6 +54440,7 @@
"iaB" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/moth,
+/obj/effect/decal/cleanable/dust,
/turf/simulated/floor/wood,
/area/maintenance/livingcomplex)
"iaP" = (
@@ -57320,6 +57384,14 @@
icon_state = "bar"
},
/area/clownoffice)
+"ivf" = (
+/obj/effect/spawner/random_spawners/grille_50,
+/obj/structure/cable{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint)
"ivi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -58006,11 +58078,13 @@
/turf/simulated/floor/plating,
/area/blueshield)
"izO" = (
-/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
-/area/medical/virology/lab)
+/area/medical/virology)
"izT" = (
/obj/structure/rack,
/mob/living/simple_animal/bot/floorbot{
@@ -58185,7 +58259,9 @@
},
/area/toxins/lab)
"iBe" = (
-/obj/structure/stairs,
+/obj/structure/stairs{
+ layer = 2
+ },
/turf/simulated/floor/plasteel,
/area/crew_quarters/serviceyard)
"iBi" = (
@@ -59563,7 +59639,7 @@
dir = 4
},
/turf/simulated/floor/plasteel,
-/area/engineering/engine)
+/area/engineering/break_room)
"iNO" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -60162,12 +60238,13 @@
},
/area/hallway/primary/command/east)
"iTG" = (
-/obj/structure/stairs{
- dir = 1
- },
/obj/structure/railing{
dir = 4
},
+/obj/structure/stairs{
+ dir = 1;
+ layer = 2
+ },
/turf/simulated/floor/plasteel{
dir = 1
},
@@ -60750,7 +60827,8 @@
dir = 8
},
/obj/structure/stairs{
- dir = 1
+ dir = 1;
+ layer = 2
},
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
@@ -61276,11 +61354,12 @@
/turf/simulated/floor/engine,
/area/toxins/explab)
"jcp" = (
-/obj/machinery/atmospherics/unary/tank/air{
- dir = 1
+/obj/structure/stairs{
+ dir = 1;
+ layer = 2
},
/turf/simulated/floor/plating,
-/area/medical/virology/lab)
+/area/maintenance/asmaint4)
"jcr" = (
/obj/effect/decal/warning_stripes/south,
/obj/machinery/atmospherics/pipe/simple/insulated,
@@ -62142,6 +62221,10 @@
/obj/machinery/light{
dir = 8
},
+/obj/machinery/vending/wallmed{
+ pixel_y = 0;
+ pixel_x = -26
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
@@ -62374,13 +62457,10 @@
},
/area/aisat/aihallway)
"jjR" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- dir = 1
- },
-/area/security/interrogation)
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/railing/corner,
+/turf/simulated/floor/plasteel,
+/area/maintenance/xenozoo)
"jjS" = (
/obj/machinery/light{
dir = 8
@@ -62878,17 +62958,14 @@
/turf/simulated/floor/plating,
/area/bridge/checkpoint/south)
"jnG" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
- dir = 1
+/obj/structure/closet/crate,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/light/small,
+/obj/structure/sign/poster/contraband/random{
+ pixel_y = -32
},
-/area/security/interrogation)
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint4)
"jnH" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -63188,12 +63265,8 @@
/turf/simulated/floor/plasteel,
/area/engineering/engine)
"jqb" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
- icon_state = "1-2";
- tag = ""
- },
-/obj/structure/disposalpipe/segment,
+/obj/structure/closet,
+/obj/effect/spawner/lootdrop/maintenance/double,
/turf/simulated/floor/plating,
/area/maintenance/asmaint4)
"jqf" = (
@@ -64907,7 +64980,7 @@
name = "gamma dock";
width = 7
},
-/turf/space{
+/turf/space/openspace{
icon_state = "black"
},
/area/space)
@@ -66190,17 +66263,20 @@
/turf/simulated/floor/bluegrid,
/area/assembly/showroom)
"jMH" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 4
+/obj/machinery/light,
+/obj/structure/table/glass,
+/obj/machinery/reagentgrinder{
+ pixel_x = -1;
+ pixel_y = 9
},
-/obj/structure/cable/multiz{
- color = "#dd1010"
+/obj/item/stack/sheet/mineral/plasma{
+ amount = 5
},
-/obj/structure/cable{
- d2 = 4;
- icon_state = "0-4"
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
},
-/turf/simulated/floor/plating,
+/obj/effect/decal/warning_stripes/north,
+/turf/simulated/floor/plasteel,
/area/medical/virology/lab)
"jMK" = (
/obj/effect/spawner/window/reinforced/plasma,
@@ -66446,17 +66522,11 @@
/turf/simulated/floor/wood,
/area/maintenance/casino)
"jOz" = (
-/obj/structure/chair{
- dir = 8
- },
-/obj/machinery/alarm{
- pixel_y = 24
- },
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "red"
- },
-/area/security/interrogation)
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/emcloset,
+/obj/effect/decal/warning_stripes/yellow/hollow,
+/turf/simulated/floor/plating,
+/area/maintenance/xenozoo)
"jOA" = (
/turf/simulated/floor/plasteel{
icon_state = "redfull"
@@ -67359,7 +67429,8 @@
/area/atmos)
"jWz" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/remains/mouse,
+/obj/structure/closet/firecloset,
+/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
/area/maintenance/xenozoo)
"jWA" = (
@@ -67394,6 +67465,24 @@
icon_state = "dark"
},
/area/quartermaster/qm)
+"jWG" = (
+/obj/structure/dresser,
+/obj/machinery/button/windowtint{
+ id = "vir2";
+ pixel_x = 24;
+ pixel_y = 24
+ },
+/obj/machinery/light_switch{
+ pixel_y = 24;
+ pixel_x = 32
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/carpet/green,
+/area/medical/virology)
"jWH" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/white/line,
@@ -68002,13 +68091,11 @@
/area/maintenance/apmaint)
"kch" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4
- },
/obj/structure/cable{
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "red"
},
@@ -68048,6 +68135,7 @@
/area/engineering/break_room)
"kcN" = (
/obj/effect/decal/remains/mouse,
+/obj/effect/decal/cleanable/dust,
/turf/simulated/floor/wood,
/area/maintenance/livingcomplex)
"kcQ" = (
@@ -70492,8 +70580,7 @@
/obj/machinery/shower{
dir = 1;
layer = 5;
- pixel_y = -5;
- on = 1
+ pixel_y = -5
},
/obj/structure/curtain/open/shower,
/obj/item/soap,
@@ -70505,8 +70592,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/obj/machinery/light_switch{
+ pixel_y = -24;
+ pixel_x = -24
},
/turf/simulated/floor/plasteel{
dir = 8;
@@ -72264,12 +72355,13 @@
},
/area/hallway/primary/central/second/south)
"kLA" = (
-/obj/structure/stairs{
- dir = 1
- },
/obj/structure/railing{
dir = 4
},
+/obj/structure/stairs{
+ dir = 1;
+ layer = 2
+ },
/turf/simulated/floor/plasteel{
dir = 1
},
@@ -72756,11 +72848,7 @@
},
/area/hallway/primary/central/east)
"kPs" = (
-/obj/structure/closet/emcloset,
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light_construct,
-/turf/simulated/floor/plasteel,
+/turf/simulated/openspace,
/area/maintenance/xenozoo)
"kPw" = (
/obj/structure/cable{
@@ -73154,13 +73242,10 @@
},
/obj/machinery/hologram/holopad,
/obj/effect/decal/warning_stripes/green/hollow,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
-/area/medical/virology/lab)
+/area/medical/virology)
"kTd" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/sign/securearea{
@@ -73181,7 +73266,7 @@
/area/chapel/office)
"kTl" = (
/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plating,
/area/maintenance/tourist)
"kTo" = (
/obj/machinery/atmospherics/unary/portables_connector,
@@ -73334,9 +73419,6 @@
/turf/space/openspace,
/area/space)
"kUw" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 10;
@@ -73536,6 +73618,15 @@
/obj/structure/lattice,
/turf/space/openspace,
/area/space)
+"kVT" = (
+/obj/machinery/vending/wallmed{
+ pixel_x = -25
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutral"
+ },
+/area/hallway/primary/central/west)
"kVV" = (
/obj/structure/chair{
dir = 8
@@ -73884,14 +73975,15 @@
},
/area/medical/morgue)
"kYo" = (
-/obj/machinery/light{
- dir = 4
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/clown{
+ pixel_y = 0;
+ pixel_x = 32
},
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "red"
+ icon_state = "bar"
},
-/area/security/interrogation)
+/area/maintenance/backstage)
"kYp" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -74512,15 +74604,14 @@
/turf/simulated/floor/carpet/red,
/area/lawoffice)
"lcj" = (
-/obj/structure/bed,
-/obj/item/bedsheet/medical,
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/machinery/light{
- dir = 4
+/obj/structure/table/glass,
+/obj/item/flashlight/lamp{
+ pixel_y = 8
},
-/obj/structure/cable{
- icon_state = "1-2";
- tag = ""
+/obj/item/storage/belt/medical,
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_y = 0;
+ pixel_x = -32
},
/turf/simulated/floor/carpet/green,
/area/medical/virology)
@@ -75405,7 +75496,8 @@
/area/crew_quarters/theatre)
"lki" = (
/obj/structure/stairs{
- dir = 1
+ dir = 1;
+ layer = 2
},
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
@@ -76050,10 +76142,11 @@
id_tag = "ntstation";
locked = 1
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plating,
/area/maintenance/tourist)
"lpK" = (
/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dust,
/turf/simulated/floor/wood{
icon_state = "wood-broken3";
tag = "icon-wood-broken3"
@@ -76233,19 +76326,15 @@
},
/area/medical/surgery/south)
"lqY" = (
-/obj/structure/table/reinforced,
-/obj/item/flashlight/lamp{
- layer = 4;
- pixel_x = 7;
- pixel_y = 12
- },
-/obj/item/radio/intercom/department/security{
- pixel_y = -4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
+/obj/machinery/door/airlock/external{
+ frequency = 1379;
+ id_tag = "vir_maint2_outer";
+ locked = 1;
+ name = "West Maintenance External Access"
},
-/area/security/interrogation)
+/obj/effect/decal/warning_stripes/west,
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint4)
"lqZ" = (
/obj/effect/decal/warning_stripes/northeast,
/turf/simulated/floor/plasteel,
@@ -76844,6 +76933,15 @@
/obj/structure/disposalpipe/trunk,
/turf/simulated/floor/wood,
/area/crew_quarters/arcade)
+"lwL" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/radio/intercom{
+ pixel_y = -28
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "darkred"
+ },
+/area/security/interrogation)
"lxc" = (
/obj/structure/railing/corner{
dir = 4
@@ -77559,6 +77657,9 @@
/turf/simulated/floor/plating,
/area/toxins/rdoffice)
"lCp" = (
+/obj/machinery/status_display{
+ pixel_y = 32
+ },
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitegreen"
@@ -78221,18 +78322,16 @@
},
/area/maintenance/trading)
"lHD" = (
-/obj/machinery/door/airlock/silver{
- name = "Bathroom"
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "freezerfloor"
+/obj/structure/cable{
+ icon_state = "1-8"
},
+/turf/simulated/floor/carpet/green,
/area/medical/virology)
"lHL" = (
/obj/machinery/atmospherics/unary/vent_scrubber{
@@ -78522,7 +78621,8 @@
/area/medical/chemistry)
"lKB" = (
/obj/structure/stairs{
- dir = 1
+ dir = 1;
+ layer = 2
},
/turf/simulated/floor/plasteel{
dir = 1
@@ -78802,7 +78902,7 @@
/obj/structure/closet/radiation,
/obj/effect/decal/warning_stripes/southeast,
/turf/simulated/floor/plasteel,
-/area/engineering/engine)
+/area/engineering/break_room)
"lNh" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -79140,6 +79240,10 @@
dir = 1;
pixel_y = -24
},
+/obj/structure/closet/crate/freezer,
+/obj/item/reagent_containers/iv_bag/bloodsynthetic/nitrogenis,
+/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis,
+/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis,
/turf/simulated/floor/plasteel{
icon_state = "whitegreen"
},
@@ -80306,9 +80410,6 @@
/turf/simulated/floor/plasteel,
/area/engineering/controlroom)
"lYF" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
/turf/simulated/floor/plasteel{
icon_state = "red"
},
@@ -81375,9 +81476,6 @@
/area/chapel/office)
"mfx" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -82219,6 +82317,11 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/arcade)
+"mlt" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random_spawners/crate_spawner,
+/turf/simulated/floor/plasteel,
+/area/maintenance/apmaint)
"mlz" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/radio/intercom{
@@ -82492,25 +82595,13 @@
/turf/simulated/floor/wood,
/area/library/game_zone)
"mnl" = (
-/obj/structure/cable{
- d2 = 4;
- icon_state = "0-4"
- },
-/obj/effect/spawner/window/reinforced,
-/obj/machinery/door/poddoor{
- density = 0;
- icon_state = "open";
- id_tag = "Biohazard_medi";
- name = "Quarantine Lockdown";
- opacity = 0
+/obj/structure/sign/poster/official/random{
+ pixel_y = -32
},
-/obj/machinery/door/poddoor/shutters/preopen{
- dir = 8;
- id_tag = "Virology1";
- name = "Virology Shutters"
+/turf/simulated/floor/plasteel{
+ icon_state = "whitegreen"
},
-/turf/simulated/floor/plating,
-/area/medical/virology)
+/area/medical/virology/lab)
"mnp" = (
/turf/simulated/floor/plasteel{
dir = 9;
@@ -82819,6 +82910,14 @@
icon_state = "dark"
},
/area/maintenance/fsmaint3)
+"mqs" = (
+/obj/effect/spawner/window/reinforced,
+/obj/structure/cable{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/turf/simulated/floor/plating,
+/area/medical/virology)
"mqD" = (
/obj/structure/closet/gmcloset,
/obj/item/wrench,
@@ -83534,9 +83633,9 @@
/obj/structure/cable{
icon_state = "0-2"
},
-/obj/machinery/power/apc{
+/obj/machinery/power/apc/worn_out{
+ cell_type = 0;
dir = 1;
- name = "north bump";
pixel_y = 26
},
/turf/simulated/floor/plating,
@@ -83615,22 +83714,13 @@
/turf/simulated/floor/plating,
/area/maintenance/fsmaint3)
"mya" = (
-/obj/machinery/atmospherics/binary/valve,
-/obj/item/wrench,
-/obj/machinery/light/small{
- dir = 4;
- pixel_y = 8
- },
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 9
+/obj/structure/chair,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
},
-/turf/simulated/floor/plating,
-/area/medical/virology/lab)
+/turf/simulated/floor/plasteel,
+/area/maintenance/xenozoo)
"myd" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance,
@@ -84309,6 +84399,7 @@
"mDO" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/reagent_dispensers/fueltank,
+/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
/area/maintenance/xenozoo)
"mDV" = (
@@ -84399,6 +84490,7 @@
/obj/structure/barricade/wooden/crude{
layer = 4
},
+/obj/structure/cable,
/turf/simulated/floor/plating,
/area/maintenance/xenozoo)
"mEB" = (
@@ -86101,6 +86193,9 @@
/obj/item/clothing/under/retro/medical,
/obj/effect/decal/warning_stripes/north,
/obj/machinery/light,
+/obj/structure/sign/poster/official/random{
+ pixel_y = -32
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -86112,11 +86207,18 @@
/turf/simulated/wall,
/area/crew_quarters/serviceyard)
"mQk" = (
-/obj/machinery/light{
+/obj/structure/chair{
dir = 8
},
+/obj/machinery/alarm{
+ pixel_y = 24
+ },
+/obj/item/radio/intercom{
+ pixel_y = 24;
+ pixel_x = -32
+ },
/turf/simulated/floor/plasteel{
- dir = 8;
+ dir = 1;
icon_state = "red"
},
/area/security/interrogation)
@@ -86466,11 +86568,15 @@
/area/toxins/server)
"mSP" = (
/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/remains/mouse,
/obj/item/radio/intercom{
name = "west station intercom (General)";
- pixel_x = -28
+ pixel_x = -28;
+ pixel_y = 24
+ },
+/obj/machinery/light/small{
+ dir = 8
},
-/obj/item/folder,
/turf/simulated/floor/plating,
/area/maintenance/xenozoo)
"mSR" = (
@@ -86775,11 +86881,15 @@
pixel_x = -1;
pixel_y = 7
},
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -24
+ },
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "whitegreen"
},
-/area/medical/virology/lab)
+/area/medical/virology)
"mVb" = (
/obj/structure/window/reinforced{
dir = 8
@@ -87646,6 +87756,7 @@
scrub_N2O = 1;
scrub_Toxins = 1
},
+/obj/effect/decal/cleanable/dust,
/turf/simulated/floor/wood{
icon_state = "wood-broken6";
tag = "icon-wood-broken6"
@@ -90140,17 +90251,12 @@
/turf/simulated/floor/glass,
/area/hallway/secondary/exit)
"nuJ" = (
-/obj/item/twohanded/required/kirbyplants,
-/obj/machinery/ai_status_display{
- pixel_x = -32
- },
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
+/obj/structure/closet/l3closet/virology,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 5
},
-/area/medical/virology)
+/turf/simulated/floor/plating,
+/area/medical/virology/lab)
"nuS" = (
/turf/simulated/floor/plasteel{
icon_state = "whitegreen"
@@ -90234,15 +90340,30 @@
/turf/simulated/floor/plasteel,
/area/hallway/secondary/exit)
"nvF" = (
-/obj/machinery/washing_machine,
-/obj/machinery/newscaster{
- pixel_y = 32
+/obj/structure/table,
+/obj/item/storage/box/syringes{
+ pixel_y = 9
+ },
+/obj/item/storage/box/syringes{
+ pixel_y = 11;
+ pixel_x = 4
+ },
+/obj/item/storage/lockbox/vials{
+ pixel_y = -3;
+ pixel_x = 1
+ },
+/obj/item/storage/fancy/vials{
+ pixel_x = 6;
+ pixel_y = -2
+ },
+/obj/machinery/alarm{
+ pixel_y = 24
},
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitegreen"
},
-/area/medical/virology/lab)
+/area/medical/virology)
"nvL" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
@@ -91999,6 +92120,7 @@
/turf/simulated/floor/plasteel,
/area/storage/secure)
"nIR" = (
+/obj/effect/decal/cleanable/dust,
/turf/simulated/floor/wood{
icon_state = "wood-broken";
tag = "icon-wood-broken"
@@ -92420,7 +92542,7 @@
scrub_Toxins = 1
},
/turf/simulated/floor/plasteel,
-/area/engineering/engine)
+/area/engineering/break_room)
"nLM" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -93349,7 +93471,7 @@
dir = 8
},
/turf/simulated/floor/plasteel,
-/area/engineering/engine)
+/area/engineering/break_room)
"nSN" = (
/obj/machinery/light{
dir = 8
@@ -95172,6 +95294,10 @@
},
/area/turret_protected/aisat_interior/secondary)
"ohy" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
+ },
+/obj/item/twohanded/required/kirbyplants,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "red"
@@ -95304,14 +95430,19 @@
/turf/simulated/floor/plating,
/area/security/permabrig)
"ojn" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/obj/structure/disposalpipe/segment{
- dir = 9
+ dir = 4
},
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "red"
+ dir = 8;
+ icon_state = "whitegreen"
},
-/area/security/interrogation)
+/area/medical/virology/lab)
"ojo" = (
/obj/machinery/atmospherics/unary/vent_scrubber{
name = "standard air scrubber";
@@ -96586,7 +96717,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
-/area/medical/medrest)
+/area/maintenance/asmaint)
"otS" = (
/obj/structure/closet/secure_closet/engineering_electrical,
/obj/effect/decal/warning_stripes/east,
@@ -98098,9 +98229,11 @@
/turf/simulated/floor/plasteel,
/area/crew_quarters/toilet)
"oFH" = (
-/obj/item/pen,
-/obj/structure/table,
-/turf/simulated/floor/plating,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel,
/area/maintenance/xenozoo)
"oFT" = (
/obj/structure/cable{
@@ -99232,13 +99365,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/effect/decal/cleanable/dirt,
/obj/machinery/button/windowtint{
id = "Interrogation";
pixel_y = -24;
req_access = list(63);
pixel_x = 24
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkred"
@@ -99306,14 +99439,12 @@
/area/medical/biostorage)
"oPd" = (
/obj/effect/decal/warning_stripes/southeast,
-/obj/machinery/chem_master{
- pixel_x = -1
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/obj/machinery/computer/pandemic,
/turf/simulated/floor/plasteel,
/area/medical/virology/lab)
"oPf" = (
@@ -99708,34 +99839,11 @@
},
/area/blueshield)
"oSq" = (
-/obj/structure/closet/crate/medical,
-/obj/item/reagent_containers/spray/cleaner{
- pixel_x = -4;
- pixel_y = 5
- },
-/obj/item/reagent_containers/spray/cleaner{
- pixel_x = -11;
- pixel_y = 5
- },
-/obj/item/storage/box/beakers{
- pixel_x = 8;
- pixel_y = 2
- },
-/obj/item/storage/box/beakers{
- pixel_y = -1
- },
-/obj/item/storage/box/syringes{
- pixel_x = 10;
- pixel_y = -3
- },
-/obj/item/storage/box/gloves{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 6
+/obj/machinery/chem_master{
+ pixel_x = -1
},
-/turf/simulated/floor/plating,
+/obj/effect/decal/warning_stripes/northeastcorner,
+/turf/simulated/floor/plasteel,
/area/medical/virology/lab)
"oSw" = (
/obj/structure/railing{
@@ -101086,7 +101194,8 @@
/area/quartermaster/miningstorage)
"pbD" = (
/obj/structure/stairs{
- dir = 4
+ dir = 4;
+ layer = 2
},
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
@@ -101423,6 +101532,7 @@
/obj/item/clothing/mask/muzzle,
/obj/item/reagent_containers/hypospray/safety,
/obj/item/reagent_containers/hypospray/safety,
+/obj/item/clothing/glasses/sunglasses/blindfold/black,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "dark"
@@ -103441,10 +103551,16 @@
/turf/simulated/floor/plating,
/area/security/hos)
"ptP" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/paper_bin,
+/obj/machinery/door/airlock/external{
+ frequency = 1379;
+ id_tag = "vir_maint2_inner";
+ locked = 1;
+ name = "West Maintenance External Access";
+ req_access = list(10,13)
+ },
+/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plating,
-/area/maintenance/xenozoo)
+/area/maintenance/asmaint4)
"ptQ" = (
/obj/structure/extinguisher_cabinet{
name = "north extinguisher cabinet";
@@ -103876,7 +103992,7 @@
dir = 8;
icon_state = "whitegreen"
},
-/area/medical/virology/lab)
+/area/medical/virology)
"pwZ" = (
/obj/structure/dispenser/oxygen,
/obj/machinery/light{
@@ -104016,7 +104132,9 @@
},
/area/hallway/primary/central/sw)
"pyi" = (
-/obj/structure/stairs,
+/obj/structure/stairs{
+ layer = 2
+ },
/turf/simulated/floor/plating,
/area/maintenance/casino)
"pyl" = (
@@ -104065,12 +104183,10 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4
- },
/obj/structure/cable{
icon_state = "2-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
/area/maintenance/xenozoo)
"pyA" = (
@@ -106302,13 +106418,12 @@
/turf/simulated/floor/plasteel,
/area/engineering/gravitygenerator)
"pOS" = (
-/obj/structure/cable{
- icon_state = "1-2";
- tag = ""
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 1
},
-/obj/structure/disposalpipe/segment,
+/obj/machinery/portable_atmospherics/canister/air,
/turf/simulated/floor/plating,
-/area/medical/virology/lab)
+/area/maintenance/asmaint4)
"pOZ" = (
/obj/structure/window/reinforced{
dir = 4
@@ -106513,7 +106628,7 @@
dir = 4;
icon_state = "whitegreen"
},
-/area/medical/virology/lab)
+/area/medical/virology)
"pQE" = (
/obj/effect/turf_decal/siding/wood{
dir = 6
@@ -106808,21 +106923,24 @@
},
/area/crew_quarters/serviceyard)
"pTe" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
-/area/medical/virology/lab)
+/area/medical/virology)
"pTg" = (
/obj/machinery/atmospherics/trinary/tvalve/digital/bypass,
/turf/simulated/floor/plasteel,
@@ -107394,6 +107512,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plasteel,
/area/maintenance/xenozoo)
"pWx" = (
@@ -108055,14 +108176,9 @@
/turf/simulated/floor/grass,
/area/crew_quarters/fitness)
"qbi" = (
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
+/obj/machinery/door/airlock/maintenance,
/turf/simulated/floor/plating,
-/area/medical/virology/lab)
+/area/maintenance/asmaint4)
"qbk" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -108452,7 +108568,7 @@
name = "pod4 home dock";
width = 5
},
-/turf/space{
+/turf/space/openspace{
icon_state = "black"
},
/area/space)
@@ -108677,26 +108793,15 @@
/area/security/permahallway)
"qgf" = (
/obj/structure/table,
-/obj/item/storage/box/syringes{
- pixel_y = 15
- },
-/obj/item/storage/box/syringes{
- pixel_y = 15;
- pixel_x = 4
- },
-/obj/item/storage/fancy/vials{
- pixel_x = 3;
- pixel_y = 4
- },
-/obj/item/storage/lockbox/vials{
- pixel_y = -1;
- pixel_x = -2
+/obj/item/storage/box/donkpockets{
+ pixel_x = 2;
+ pixel_y = 3
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitegreen"
},
-/area/medical/virology/lab)
+/area/medical/virology)
"qgg" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/cable,
@@ -110846,12 +110951,12 @@
/obj/item/rcd_ammo,
/obj/item/clothing/glasses/meson,
/obj/item/clothing/glasses/meson,
-/obj/item/clothing/gloves/color/yellow/fake,
-/obj/item/clothing/gloves/color/yellow/fake,
/obj/machinery/light/small{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
+/obj/item/clothing/gloves/color/fyellow,
+/obj/item/clothing/gloves/color/fyellow,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -111150,7 +111255,9 @@
/turf/simulated/floor/plating,
/area/maintenance/apmaint)
"qzm" = (
-/obj/structure/stairs,
+/obj/structure/stairs{
+ layer = 2
+ },
/turf/simulated/floor/plasteel,
/area/hallway/primary/fore)
"qzn" = (
@@ -111562,11 +111669,20 @@
},
/area/maintenance/cafeteria)
"qBV" = (
-/obj/structure/disposalpipe/segment{
- dir = 5
+/obj/machinery/access_button{
+ command = "cycle_interior";
+ frequency = 1379;
+ master_tag = "vir_maint2_airlock";
+ name = "interior access button";
+ pixel_x = -24;
+ pixel_y = -24
},
-/turf/simulated/floor/plating/airless,
-/area/space)
+/obj/structure/sign/vacuum{
+ pixel_y = 32
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint4)
"qBX" = (
/obj/structure/disposalpipe/junction/reversed{
dir = 4
@@ -113087,13 +113203,27 @@
},
/area/quartermaster/office)
"qOG" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+ dir = 2;
+ frequency = 1379;
+ id_tag = "vir_maint2_pump"
+ },
+/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
+ id_tag = "vir_maint2_airlock";
+ pixel_y = 25;
+ tag_airpump = "vir_maint2_pump";
+ tag_chamber_sensor = "vir_maint2_sensor";
+ tag_exterior_door = "vir_maint2_outer";
+ tag_interior_door = "vir_maint2_inner"
+ },
+/obj/machinery/airlock_sensor{
+ id_tag = "vir_maint2_sensor";
+ pixel_y = 33
+ },
+/obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/light/small{
+ dir = 1
},
-/obj/effect/spawner/random_spawners/rodent,
/turf/simulated/floor/plating,
/area/maintenance/asmaint4)
"qON" = (
@@ -114734,7 +114864,7 @@
dir = 4
},
/turf/simulated/floor/plasteel,
-/area/engineering/engine)
+/area/engineering/break_room)
"rcb" = (
/obj/structure/closet/boxinggloves,
/turf/simulated/floor/plasteel,
@@ -115163,11 +115293,13 @@
/area/crew_quarters/serviceyard)
"rfY" = (
/obj/effect/decal/warning_stripes/southeastcorner,
-/obj/machinery/computer/pandemic,
/obj/machinery/light{
dir = 1;
in_use = 1
},
+/obj/machinery/chem_master{
+ pixel_x = -1
+ },
/turf/simulated/floor/plasteel,
/area/medical/virology/lab)
"rge" = (
@@ -115210,7 +115342,7 @@
/obj/effect/decal/warning_stripes/northwest,
/obj/structure/closet/firecloset,
/turf/simulated/floor/plasteel,
-/area/engineering/engine)
+/area/engineering/break_room)
"rgA" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -115447,26 +115579,13 @@
/turf/simulated/floor/plating,
/area/security/permabrig)
"ris" = (
-/obj/machinery/door/airlock/medical{
- name = "Virology Bedroom";
- req_access = list(39)
- },
-/obj/effect/turf_decal/siding/wood{
+/obj/machinery/atmospherics/unary/portables_connector{
+ layer = 2;
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/carpet/green,
-/area/medical/virology)
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/simulated/floor/plating,
+/area/medical/virology/lab)
"riu" = (
/obj/machinery/photocopier,
/obj/machinery/camera{
@@ -115917,6 +116036,41 @@
icon_state = "tranquillite"
},
/area/crew_quarters/kitchen)
+"rlz" = (
+/obj/structure/closet/crate/medical,
+/obj/item/reagent_containers/spray/cleaner{
+ pixel_x = -4;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/spray/cleaner{
+ pixel_x = -11;
+ pixel_y = 5
+ },
+/obj/item/storage/box/beakers{
+ pixel_x = 8;
+ pixel_y = 2
+ },
+/obj/item/storage/box/beakers{
+ pixel_y = -1
+ },
+/obj/item/storage/box/syringes{
+ pixel_x = 10;
+ pixel_y = -3
+ },
+/obj/item/storage/box/gloves{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc{
+ dir = 4;
+ pixel_x = 26
+ },
+/turf/simulated/floor/plating,
+/area/medical/virology/lab)
"rlC" = (
/obj/effect/spawner/random_spawners/rodent,
/turf/simulated/floor/plating,
@@ -116917,6 +117071,15 @@
},
/turf/simulated/openspace,
/area/crew_quarters/serviceyard)
+"rtD" = (
+/obj/structure/chair/sofa/pew/right{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "chapel"
+ },
+/area/chapel/main)
"rtK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -117612,18 +117775,17 @@
/obj/effect/decal/cleanable/blood/tracks{
dir = 4
},
-/obj/structure/chair,
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
+ },
/turf/simulated/floor/plating,
/area/maintenance/xenozoo)
"rxW" = (
@@ -119308,7 +119470,7 @@
/turf/simulated/floor/plasteel,
/area/storage/eva)
"rKn" = (
-/turf/space{
+/turf/space/openspace{
icon_state = "black"
},
/area/quartermaster/miningdock)
@@ -120886,7 +121048,9 @@
/turf/simulated/floor/plating,
/area/toxins/xenobiology)
"rVp" = (
-/obj/structure/stairs,
+/obj/structure/stairs{
+ layer = 2
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -122494,22 +122658,17 @@
},
/area/hallway/primary/central/second/west)
"sgK" = (
-/obj/machinery/door/airlock/medical/glass{
- name = "Virology Bedroom";
- req_access = list(39)
- },
/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/turf/simulated/floor/plasteel{
- icon_state = "white"
+/obj/machinery/atmospherics/pipe/simple/hidden/universal,
+/obj/machinery/door/airlock/maintenance{
+ req_access = list(12,39)
},
-/area/medical/virology)
+/turf/simulated/floor/plating,
+/area/medical/virology/lab)
"sgU" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/reagent_dispensers/watertank,
@@ -122627,7 +122786,7 @@
pixel_x = 28
},
/turf/simulated/floor/plasteel,
-/area/engineering/engine)
+/area/engineering/break_room)
"shV" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -125404,6 +125563,10 @@
dir = 4
},
/obj/effect/decal/warning_stripes/east,
+/obj/machinery/vending/wallmed{
+ name = "Emergency NanoMed";
+ pixel_x = 25
+ },
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry/eastarrival)
"sDU" = (
@@ -125625,19 +125788,10 @@
/turf/simulated/floor/plating,
/area/maintenance/fsmaint3)
"sGa" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 12
- },
-/obj/structure/mirror{
- pixel_x = 26
- },
-/obj/structure/toilet{
- pixel_y = 19
- },
-/turf/simulated/floor/plasteel{
- icon_state = "freezerfloor"
- },
+/obj/structure/bed,
+/obj/item/bedsheet/medical,
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/carpet/green,
/area/medical/virology)
"sGd" = (
/obj/effect/decal/warning_stripes/south,
@@ -126494,7 +126648,7 @@
icon_state = "0-8"
},
/turf/simulated/floor/plating,
-/area/medical/virology/lab)
+/area/medical/virology)
"sMu" = (
/obj/machinery/camera{
c_tag = "Second Floor Central Lobby North"
@@ -126552,12 +126706,15 @@
/turf/simulated/floor/plating,
/area/security/permabrig)
"sMR" = (
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 1
+/obj/structure/stairs{
+ dir = 1;
+ layer = 2
+ },
+/obj/structure/railing{
+ dir = 4
},
-/obj/machinery/portable_atmospherics/canister/air,
/turf/simulated/floor/plating,
-/area/medical/virology/lab)
+/area/maintenance/asmaint4)
"sMX" = (
/obj/effect/decal/warning_stripes/north,
/obj/machinery/camera{
@@ -126647,15 +126804,19 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment{
- invisibility = 101
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
+/obj/structure/disposalpipe/junction/yjunction{
+ dir = 8
+ },
+/obj/machinery/hologram/holopad,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -126789,11 +126950,19 @@
},
/area/crew_quarters/fitness)
"sOA" = (
-/obj/structure/table/glass,
-/obj/item/flashlight/lamp{
- pixel_y = 12;
- pixel_x = -4
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/door/airlock/medical/glass{
+ name = "Virology Bedroom";
+ req_access = list(39)
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
+/obj/machinery/door/firedoor,
/turf/simulated/floor/carpet/green,
/area/medical/virology)
"sOF" = (
@@ -127179,20 +127348,18 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"sSj" = (
-/obj/structure/table,
-/obj/item/storage/box/donkpockets{
- pixel_x = 2;
- pixel_y = 3
- },
-/obj/machinery/light{
- dir = 1;
- in_use = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitegreen"
},
-/area/medical/virology/lab)
+/area/medical/virology)
"sSp" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -129736,10 +129903,14 @@
},
/area/toxins/misc_lab)
"tiT" = (
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/tracks{
+ dir = 8;
+ pixel_y = 8;
+ pixel_x = -11
},
-/area/security/interrogation)
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint4)
"tiU" = (
/obj/effect/decal/warning_stripes/east,
/obj/machinery/light{
@@ -130171,7 +130342,7 @@
"tlF" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/double,
+/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/light/small,
/turf/simulated/floor/plating,
/area/maintenance/asmaint4)
@@ -131567,7 +131738,7 @@
icon_state = "1-8"
},
/turf/simulated/floor/plating,
-/area/medical/virology/lab)
+/area/medical/virology)
"twu" = (
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/vending/assist,
@@ -131821,7 +131992,8 @@
/area/engineering/gravitygenerator)
"txG" = (
/obj/structure/stairs{
- dir = 8
+ dir = 8;
+ layer = 2
},
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
@@ -133489,16 +133661,12 @@
/turf/simulated/floor/plasteel,
/area/hallway/secondary/entry/commercial)
"tJU" = (
-/obj/structure/chair/stool/bar{
- icon = 'icons/obj/lighting.dmi';
- icon_state = "lantern-on";
- light_color = "#FFBF00";
- light_range = 6;
- name = "lantern"
- },
/obj/structure/sign/poster/official/nanotrasen_logo{
pixel_y = 32
},
+/obj/item/flashlight/lantern{
+ on = 1
+ },
/turf/simulated/floor/grass,
/area/hallway/primary/central/nw)
"tJV" = (
@@ -133907,7 +134075,7 @@
},
/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
pixel_x = 5;
- pixel_y = -3
+ pixel_y = 4
},
/turf/simulated/floor/plasteel{
icon_state = "darkred"
@@ -135149,7 +135317,7 @@
icon_state = "0-4"
},
/turf/simulated/floor/plating,
-/area/medical/virology/lab)
+/area/medical/virology)
"tWl" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -135488,19 +135656,14 @@
},
/area/hallway/spacebridge/somsec)
"tYA" = (
-/obj/effect/decal/warning_stripes/northeast,
-/obj/structure/table/glass,
-/obj/item/radio/intercom{
- pixel_y = -28
- },
-/obj/item/reagent_containers/dropper/precision,
-/obj/item/reagent_containers/dropper/precision,
-/obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/dropper,
-/obj/machinery/atmospherics/unary/vent_pump/on{
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
dir = 4
},
-/turf/simulated/floor/plasteel,
+/obj/effect/decal/warning_stripes/red,
+/turf/simulated/floor/plasteel{
+ icon_state = "whitegreenfull"
+ },
/area/medical/virology/lab)
"tYB" = (
/obj/structure/railing{
@@ -136143,6 +136306,25 @@
},
/turf/simulated/floor/plating,
/area/security/permabrig)
+"udr" = (
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/door/poddoor/preopen{
+ id_tag = "Biohazard_medi";
+ name = "Quarantine Lockdown"
+ },
+/obj/machinery/door/poddoor/shutters/preopen{
+ dir = 1;
+ id_tag = "Virology1";
+ layer = 3.2;
+ name = "Virology Shutters"
+ },
+/obj/effect/spawner/window/reinforced/polarized{
+ id = "vir2"
+ },
+/turf/simulated/floor/plating,
+/area/medical/virology)
"udt" = (
/obj/effect/landmark/tiles/damageturf,
/obj/effect/spawner/random_spawners/blood_20,
@@ -137200,6 +137382,13 @@
/obj/machinery/portable_atmospherics/canister/sleeping_agent,
/turf/simulated/floor/plating,
/area/security/permabrig)
+"umr" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random_spawners/crate_spawner,
+/turf/simulated/floor/plasteel{
+ dir = 1
+ },
+/area/maintenance/trading)
"umD" = (
/obj/structure/chair/office/dark,
/obj/structure/cable{
@@ -138597,10 +138786,12 @@
/obj/structure/cable{
icon_state = "2-4"
},
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
dir = 1
},
@@ -140533,6 +140724,18 @@
icon_state = "neutralfull"
},
/area/hallway/primary/fore)
+"uNf" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "red"
+ },
+/area/security/interrogation)
"uNg" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
@@ -142095,6 +142298,7 @@
req_access = list(3,4);
name = "Forensic laboratory"
},
+/obj/effect/turf_decal/siding/wood,
/turf/simulated/floor/wood,
/area/security/detectives_office)
"uZh" = (
@@ -143939,7 +144143,8 @@
/area/engineering/engine)
"vnM" = (
/obj/structure/stairs{
- dir = 4
+ dir = 4;
+ layer = 2
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -144380,7 +144585,8 @@
/area/maintenance/casino)
"vsB" = (
/obj/structure/stairs{
- dir = 1
+ dir = 1;
+ layer = 2
},
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
@@ -144438,17 +144644,17 @@
/turf/simulated/floor/wood,
/area/crew_quarters/courtroom)
"vte" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/xeno,
-/obj/structure/cable/multiz{
- color = "#dd1010"
- },
-/obj/structure/cable{
- d2 = 4;
- icon_state = "0-4"
+/obj/structure/lattice/catwalk,
+/obj/machinery/access_button{
+ command = "cycle_exterior";
+ frequency = 1379;
+ master_tag = "vir_maint2_airlock";
+ name = "exterior access button";
+ pixel_x = 24;
+ pixel_y = 24
},
-/turf/simulated/floor/plating,
-/area/maintenance/xenozoo)
+/turf/space,
+/area/space)
"vtf" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -144513,22 +144719,40 @@
icon_state = "whiteblue"
},
/area/medical/cmo)
+"vtz" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/medical/virology)
"vtK" = (
/turf/simulated/floor/plasteel/grimy,
/area/crew_quarters/bar)
"vtN" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal,
-/obj/machinery/door/airlock/medical{
- name = "Virology";
- req_access = list(39)
- },
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- invisibility = 101
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/alarm{
+ dir = 8;
+ pixel_x = 22
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
},
-/turf/simulated/floor/plating,
/area/medical/virology/lab)
"vtS" = (
/turf/simulated/wall,
@@ -144608,6 +144832,7 @@
/obj/machinery/light/small{
dir = 1
},
+/obj/effect/spawner/random_spawners/crate_spawner,
/turf/simulated/floor/plating,
/area/maintenance/xenozoo)
"vuI" = (
@@ -145149,25 +145374,14 @@
/turf/simulated/floor/glass/reinforced,
/area/quartermaster/qm)
"vyk" = (
-/obj/structure/closet/crate/freezer,
-/obj/item/reagent_containers/iv_bag/bloodsynthetic/nitrogenis,
-/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis,
-/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
-/obj/machinery/power/apc{
- dir = 1;
- pixel_y = 26
- },
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2"
+/obj/machinery/atmospherics/binary/valve{
+ dir = 4
},
-/turf/simulated/floor/plasteel{
- icon_state = "white"
+/obj/structure/sign/biohazard{
+ pixel_y = 32
},
-/area/medical/virology)
+/turf/simulated/floor/plating,
+/area/medical/virology/lab)
"vyp" = (
/obj/effect/turf_decal/box,
/obj/machinery/hologram/holopad,
@@ -151279,7 +151493,7 @@
name = "pod3 home dock";
width = 5
},
-/turf/space{
+/turf/space/openspace{
icon_state = "black"
},
/area/space)
@@ -151944,20 +152158,14 @@
/turf/simulated/wall/r_wall,
/area/turret_protected/ai)
"wxG" = (
-/obj/machinery/vending/wallmed{
- pixel_x = 26
- },
/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4
+ icon_state = "2-4"
},
-/turf/simulated/floor/plasteel{
- icon_state = "white"
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 10
},
-/area/medical/virology)
+/turf/simulated/floor/plating,
+/area/medical/virology/lab)
"wxM" = (
/obj/machinery/door/airlock/public{
name = "Kitchen";
@@ -153272,7 +153480,15 @@
/turf/simulated/floor/plasteel{
icon_state = "white"
},
-/area/medical/virology/lab)
+/area/medical/virology)
+"wJM" = (
+/obj/effect/spawner/random_spawners/grille_50,
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint)
"wJR" = (
/obj/machinery/light/small{
dir = 4
@@ -153654,11 +153870,15 @@
/area/hallway/primary/starboard/south)
"wMc" = (
/obj/structure/closet/wardrobe/virology_white,
+/obj/item/storage/belt/medical,
+/obj/machinery/newscaster{
+ pixel_y = 32
+ },
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "whitegreen"
},
-/area/medical/virology/lab)
+/area/medical/virology)
"wMd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -156971,6 +157191,9 @@
"xmr" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/remains/human,
+/obj/structure/railing/corner{
+ dir = 8
+ },
/turf/simulated/floor/plasteel,
/area/maintenance/xenozoo)
"xmw" = (
@@ -157002,8 +157225,11 @@
/area/crew_quarters/serviceyard)
"xmD" = (
/obj/effect/decal/warning_stripes/northeastcorner,
-/obj/machinery/computer/pandemic,
-/obj/machinery/light,
+/obj/machinery/smartfridge/secure/chemistry/virology/preloaded,
+/obj/machinery/newscaster{
+ pixel_y = 0;
+ pixel_x = -32
+ },
/turf/simulated/floor/plasteel,
/area/medical/virology/lab)
"xmH" = (
@@ -158317,15 +158543,12 @@
},
/area/hallway/primary/command/west)
"xxs" = (
-/obj/effect/decal/warning_stripes/green,
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment{
- invisibility = 101
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4
+ dir = 9
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -158366,6 +158589,26 @@
icon_state = "brown"
},
/area/quartermaster/delivery)
+"xxO" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint)
"xxV" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/closet/emcloset,
@@ -160310,11 +160553,11 @@
},
/area/tcommsat/chamber)
"xMp" = (
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/firecloset,
+/obj/structure/railing/corner{
+ dir = 4
+ },
/turf/simulated/floor/plating,
-/area/maintenance/xenozoo)
+/area/maintenance/asmaint4)
"xMr" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/caution/red{
@@ -160450,10 +160693,12 @@
"xNB" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/extinguisher,
+/obj/structure/cable/multiz{
+ color = "#dd1010"
+ },
/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+ d2 = 4;
+ icon_state = "0-4"
},
/turf/simulated/floor/plasteel,
/area/maintenance/xenozoo)
@@ -162727,6 +162972,15 @@
"ycY" = (
/turf/simulated/floor/glass/reinforced,
/area/hallway/secondary/exit/maint)
+"ydn" = (
+/obj/machinery/vending/wallmed{
+ pixel_x = 25
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "purple"
+ },
+/area/hallway/primary/central/ne)
"ydo" = (
/obj/structure/sign/fire,
/turf/simulated/wall/r_wall,
@@ -162831,11 +163085,11 @@
},
/obj/item/kitchen/utensil/spoon{
pixel_x = -3;
- pixel_y = 18
+ pixel_y = 5
},
/obj/item/kitchen/utensil/fork{
pixel_x = -4;
- pixel_y = 18
+ pixel_y = 5
},
/obj/item/bikehorn/rubberducky,
/obj/machinery/light/small,
@@ -163047,6 +163301,14 @@
icon_state = "stage_bleft"
},
/area/maintenance/cafeteria)
+"yeR" = (
+/obj/structure/chair/sofa/pew/left{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "chapel"
+ },
+/area/chapel/main)
"yeT" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -163252,13 +163514,13 @@
},
/area/toxins/server)
"ygG" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
/obj/machinery/light/small{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkred"
@@ -179980,7 +180242,7 @@ tkq
tkq
tkq
tkq
-rSe
+eIe
eIe
tkq
eIe
@@ -180231,13 +180493,13 @@ tkq
tkq
tkq
tkq
-tkq
-tkq
-tkq
-tkq
-tkq
-tkq
+lBr
+lBr
+lBr
eIe
+lBr
+lBr
+lBr
eIe
ocY
ocY
@@ -180488,13 +180750,13 @@ tkq
tkq
tkq
tkq
+eIe
+eIe
+eIe
+vte
+eIe
tkq
-tkq
-tkq
-tkq
-tkq
-tkq
-lBr
+eIe
eIe
ocY
iBD
@@ -180745,14 +181007,14 @@ tkq
tkq
tkq
tkq
-tkq
-tkq
-tkq
-tkq
-tkq
-tkq
+lBr
eIe
-tkq
+dFQ
+lqY
+dFQ
+dFQ
+dFQ
+dFQ
ocY
mWj
eCk
@@ -180995,21 +181257,21 @@ eIe
lBr
lBr
lBr
-eIe
-lBr
-lBr
-lBr
-eIe
-lBr
lBr
+iuf
+tkq
+iuf
lBr
lBr
eIe
lBr
tkq
-tkq
-lBr
-eIe
+dFQ
+qOG
+pOS
+dFQ
+gAb
+cKa
ocY
kbT
qfb
@@ -181252,21 +181514,21 @@ tkq
eIe
eIe
tkq
-tkq
-eIe
-tkq
-tkq
eIe
-tkq
+iuf
+ezI
+iuf
eIe
tkq
eIe
tkq
eIe
-eIe
-lBr
-lBr
-tkq
+dFQ
+ptP
+dFQ
+dFQ
+tiT
+jnG
ocY
eLr
mwG
@@ -181512,18 +181774,18 @@ tSU
qwc
bxz
fbg
-oPv
-bxz
-bxz
-bxz
bxz
+fjf
+oPv
bxz
-gAb
+dFQ
+dFQ
+dFQ
qBV
-eIe
-tkq
-eIe
-tkq
+hMh
+qbi
+tiT
+jqb
ocY
vnM
vnM
@@ -181770,14 +182032,14 @@ oPd
xzW
bkx
xmD
-bxz
+frL
oSq
-aok
-jcp
bxz
-dFQ
-how
-dFQ
+jcp
+dgD
+hMh
+hMh
+lmz
cOv
cOv
cOv
@@ -182025,16 +182287,16 @@ bCd
vNi
stX
hov
-stX
+ojn
tYA
-bxz
+stX
jMH
-qbi
-pOS
+bxz
+jcp
dgD
-jqb
-hlh
-dtq
+hMh
+hMh
+eSe
cOv
rhA
rhA
@@ -182286,11 +182548,11 @@ sNz
xxs
vtN
bwt
-mya
-sMR
bxz
-suX
-rDZ
+sMR
+hKO
+xMp
+hMh
tlF
cOv
edT
@@ -182546,8 +182808,8 @@ sGG
sGG
sGG
sGG
-lmz
-rDZ
+how
+hMh
suX
cOv
rhA
@@ -182803,8 +183065,8 @@ rGy
pFf
kwv
sGG
-hMh
-qOG
+bSF
+oCY
hMh
cOv
vgO
@@ -183037,18 +183299,18 @@ tkq
tkq
rSe
eIe
-kCc
-kCc
-mnl
-kCc
-kCc
+bxz
+bxz
+bxz
+bxz
+bxz
eAo
suh
dNs
fIM
fxa
vHH
-nuS
+mnl
bxz
sMg
wEJ
@@ -183061,7 +183323,7 @@ dAZ
gjh
sGG
hMh
-rDZ
+lmz
hMh
cOv
rhA
@@ -183294,11 +183556,11 @@ tkq
tkq
tkq
eIe
-kCc
+bxz
gBh
bAV
nuJ
-frL
+bxz
lCp
fIM
fIM
@@ -183551,7 +183813,7 @@ rSe
eIe
lBr
eIe
-kCc
+bxz
vyk
aek
wxG
@@ -183808,16 +184070,16 @@ eIe
tkq
tkq
eIe
-kCc
-kCc
+bxz
+fKM
ris
+rlz
kCc
kCc
-bxz
-aFN
+mqs
wJK
-bxz
-mnF
+kCc
+gLO
lXM
bxz
sGG
@@ -183889,7 +184151,7 @@ bKi
aYM
qYW
lHU
-ttn
+dCH
bYW
tkq
eIe
@@ -184066,15 +184328,15 @@ eIe
eIe
eIe
kCc
-fjf
-gLO
-sOA
+kCc
+kCc
+kCc
kCc
mVa
qgf
pwW
ego
-bxz
+kCc
rnr
uhE
sGG
@@ -184322,13 +184584,13 @@ eIe
tkq
tkq
eIe
-fKM
+kCc
lcj
gxv
fhc
-kCc
+sOA
sSj
-fIM
+vtz
pTe
dXw
tWh
@@ -184579,10 +184841,10 @@ eIe
tkq
tkq
eIe
-kCc
-kCc
+udr
+jWG
lHD
-kCc
+dUj
kCc
nvF
izO
@@ -185098,11 +185360,11 @@ kCc
kCc
kCc
kCc
-bxz
-bxz
-bxz
-bxz
-bxz
+kCc
+kCc
+kCc
+kCc
+kCc
eiG
pGR
sGG
@@ -186109,7 +186371,7 @@ tkq
tkq
eIe
eIe
-tkq
+eIe
eIe
ucR
quA
@@ -186365,7 +186627,7 @@ tkq
tkq
tkq
eIe
-tkq
+eIe
ucR
gxN
ucR
@@ -186937,7 +187199,7 @@ pYK
gNr
iFh
fhv
-dAF
+kVT
svF
dAF
dAF
@@ -190852,7 +191114,7 @@ xQs
hUD
pcS
tkq
-eIe
+lBr
tkq
tkq
tkq
@@ -191109,7 +191371,7 @@ jOw
eGy
wsu
eIe
-lBr
+eIe
tkq
tkq
tkq
@@ -191623,7 +191885,7 @@ ttn
bYW
eIe
eIe
-eIe
+lBr
tkq
tkq
tkq
@@ -191879,8 +192141,8 @@ fXy
eXZ
bYW
eIe
-lBr
tkq
+lBr
tkq
tkq
tkq
@@ -192136,8 +192398,8 @@ fXy
ttn
bYW
eIe
-lBr
-tkq
+eIe
+eIe
tkq
tkq
tkq
@@ -192652,8 +192914,8 @@ bYW
bYW
eIe
lBr
+lBr
eIe
-rSe
lBr
lBr
eIe
@@ -192674,7 +192936,7 @@ tkq
tkq
tkq
lBr
-eIe
+lBr
tkq
tkq
eIe
@@ -193441,10 +193703,10 @@ rSe
rSe
rSe
rSe
-tkq
+eIe
rSe
rSe
-tkq
+eIe
eIe
rGI
rGI
@@ -195471,7 +195733,7 @@ rmx
mQB
fuX
fuX
-fuX
+fCh
fuX
dKf
fuX
@@ -198172,7 +198434,7 @@ tkq
tkq
eIe
tkq
-vjO
+pAn
pAn
pAn
pAn
@@ -201770,10 +202032,10 @@ tkq
tkq
tkq
tkq
+tkq
eIe
eIe
tkq
-tkq
eIe
tkq
eIe
@@ -202030,7 +202292,7 @@ tkq
tkq
tkq
lBr
-tkq
+eIe
eIe
tkq
tkq
@@ -202862,10 +203124,10 @@ uiv
uiv
uiv
aFk
-uiv
fyE
uiv
uiv
+uiv
thK
dJK
dJK
@@ -203119,8 +203381,8 @@ jmX
jmX
jmX
qPF
-jmX
dOx
+fve
jmX
jmX
eJP
@@ -203376,8 +203638,8 @@ kIw
kIw
nSH
wkv
-kIw
pKv
+ydn
kIw
rvm
rcj
@@ -206017,7 +206279,7 @@ xXx
pWK
pWK
eIe
-tkq
+eIe
tkq
tkq
tkq
@@ -206507,7 +206769,7 @@ wuh
wuh
rSe
rSe
-tkq
+eIe
rSe
eIe
xXx
@@ -206527,8 +206789,8 @@ aSY
rMb
xXx
eIe
-tkq
-tkq
+eIe
+eIe
rSe
rSe
rSe
@@ -207536,7 +207798,7 @@ eIe
eIe
tkq
tkq
-tkq
+eIe
eIe
pWK
pWK
@@ -209597,7 +209859,7 @@ osb
laS
eIe
eIe
-tkq
+eIe
tkq
tkq
tkq
@@ -210368,7 +210630,7 @@ kBa
pyF
lWk
eIe
-tkq
+eIe
tkq
tkq
tkq
@@ -212106,9 +212368,9 @@ hjv
xjC
ujn
yiU
-efd
+lto
fjp
-efd
+lto
ulx
fxL
ugC
@@ -214937,7 +215199,7 @@ ibo
cxn
hRb
hRb
-ulx
+ibo
jKe
fti
kcL
@@ -215194,7 +215456,7 @@ bUe
lLp
hRb
eOZ
-ulx
+ibo
qiC
rnu
gjV
@@ -215451,7 +215713,7 @@ xav
uXa
qEE
vkH
-ulx
+ibo
jKe
rwA
kcL
@@ -215708,7 +215970,7 @@ ibo
pLe
dZk
vkH
-ulx
+ibo
kmZ
rwA
ifZ
@@ -238850,15 +239112,15 @@ bkc
bkc
bkc
sLA
-bkc
+uJG
wTd
sLA
wTd
sLA
-bkc
+uJG
sLA
sLA
-bkc
+uJG
bkc
bkc
bkc
@@ -239108,18 +239370,18 @@ bkc
sLA
sLA
uJG
+bkc
uJG
+bkc
uJG
uJG
-uJG
-uJG
-uJG
+bkc
uJG
uJG
ngN
ngN
-bkc
-bkc
+uJG
+uJG
bkc
bkc
bkc
@@ -239357,13 +239619,13 @@ bkc
bkc
sLA
sLA
-bkc
+uJG
sLA
sLA
sLA
uJG
uJG
-uJG
+bkc
uJG
jKG
iXN
@@ -239373,7 +239635,7 @@ ptL
oLX
jKG
uJG
-uJG
+bkc
uJG
uJG
ngN
@@ -239614,9 +239876,9 @@ bkc
bkc
sLA
uJG
+bkc
uJG
-uJG
-uJG
+bkc
uJG
uJG
jKG
@@ -239869,7 +240131,7 @@ bkc
bkc
bkc
bkc
-bkc
+uJG
uJG
jKG
iAa
@@ -239891,7 +240153,7 @@ jqG
jKG
uJG
uJG
-bkc
+uJG
bkc
bkc
bkc
@@ -240127,7 +240389,7 @@ bkc
bkc
bkc
sLA
-uJG
+bkc
jKG
naa
vDU
@@ -240382,7 +240644,7 @@ bkc
ngN
ngN
ngN
-bkc
+uJG
sLA
uJG
jKG
@@ -240404,7 +240666,7 @@ fuE
uCv
jKG
fvL
-bkc
+uJG
ngN
bkc
bkc
@@ -240639,7 +240901,7 @@ bkc
ngN
uJG
uJG
-uJG
+bkc
uJG
uJG
jKG
@@ -240661,7 +240923,7 @@ pWX
aJw
jKG
fvL
-uJG
+bkc
uJG
bkc
bkc
@@ -240894,7 +241156,7 @@ bkc
bkc
bkc
ngN
-uJG
+bkc
nNF
nNF
nNF
@@ -240918,7 +241180,7 @@ dgS
mll
jKG
fvL
-bkc
+uJG
ngN
bkc
bkc
@@ -241149,8 +241411,8 @@ bkc
bkc
ngN
ngN
-bkc
-bkc
+uJG
+uJG
uJG
nNF
txs
@@ -241175,7 +241437,7 @@ jpI
kZm
jKG
fvL
-uJG
+bkc
ngN
bkc
bkc
@@ -241407,7 +241669,7 @@ bkc
ngN
uJG
uJG
-uJG
+bkc
uJG
nNF
tfW
@@ -241661,7 +241923,7 @@ bkc
bkc
bkc
bkc
-bkc
+uJG
uJG
nNF
nNF
@@ -241689,7 +241951,7 @@ kmU
qtJ
jKG
uJG
-uJG
+bkc
bkc
uJG
bkc
@@ -241919,7 +242181,7 @@ bkc
bkc
bkc
ngN
-uJG
+bkc
nNF
wZC
xId
@@ -242688,7 +242950,7 @@ bkc
bkc
bkc
bkc
-bkc
+uJG
uJG
xoL
xoL
@@ -242946,7 +243208,7 @@ bkc
bkc
bkc
ngN
-uJG
+bkc
xoL
ajW
xoL
@@ -243460,7 +243722,7 @@ bkc
bkc
bkc
ngN
-uJG
+bkc
xoL
ajW
xoL
@@ -243716,7 +243978,7 @@ bkc
bkc
bkc
bkc
-bkc
+uJG
uJG
xoL
ajW
@@ -243974,7 +244236,7 @@ bkc
bkc
bkc
ngN
-uJG
+bkc
xoL
ajW
xoL
@@ -244015,7 +244277,7 @@ hcX
ueH
jsA
uJG
-bkc
+uJG
bkc
bkc
bkc
@@ -244230,7 +244492,7 @@ bkc
bkc
bkc
bkc
-bkc
+uJG
uJG
xoL
ajW
@@ -244488,7 +244750,7 @@ bkc
bkc
bkc
ngN
-uJG
+bkc
xoL
ajW
xoL
@@ -245001,8 +245263,8 @@ bkc
bkc
bkc
bkc
-bkc
uJG
+bkc
xoL
ajW
xoL
@@ -245515,7 +245777,7 @@ bkc
bkc
bkc
bkc
-bkc
+uJG
uJG
xoL
ajW
@@ -245766,9 +246028,9 @@ bkc
bkc
bkc
bkc
+bkc
sLA
sLA
-uJG
sLA
sLA
uJG
@@ -246023,13 +246285,13 @@ bkc
bkc
bkc
bkc
-sLA
-uJG
-uJG
+bkc
uJG
uJG
+bkc
uJG
uJG
+bkc
uJG
uJG
jHy
@@ -246280,7 +246542,8 @@ bkc
bkc
bkc
bkc
-uJG
+bkc
+ngN
uJG
rzS
rzS
@@ -246288,7 +246551,6 @@ rzS
rzS
rzS
rzS
-rzS
jHy
kEO
iXG
@@ -246321,13 +246583,13 @@ xAy
xAy
xAy
uJG
-wuh
-wuh
-wuh
-wuh
+bXf
+bXf
+bXf
+bXf
jEv
-wuh
-wuh
+bXf
+bXf
uJG
uJG
cYe
@@ -246531,19 +246793,19 @@ uJG
ngN
ngN
ngN
-uJG
-ngN
-ngN
ngN
uJG
+bkc
+uJG
ngN
ngN
uJG
+ngN
+bkc
rzS
gHR
wFz
czo
-czo
ygG
kUw
jHy
@@ -246578,23 +246840,23 @@ qEX
pjI
asI
uJG
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
uJG
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
uJG
uJG
uJG
@@ -246788,21 +247050,21 @@ bkc
uJG
uJG
bkc
-bkc
uJG
-bkc
+uJG
bkc
uJG
+uJG
bkc
uJG
bkc
+uJG
rzS
sDU
-lqY
+hlh
dQY
-tiT
alP
-kcV
+lwL
rzS
wrz
wrz
@@ -246835,23 +247097,23 @@ tcn
vmD
aGc
uJG
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
uJG
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
uJG
fvL
fvL
@@ -247051,13 +247313,13 @@ mPK
mPK
mPK
mPK
+bSt
mPK
mPK
rzS
oar
keF
vIl
-ezI
dpQ
kcV
rzS
@@ -247092,23 +247354,23 @@ xrE
uTI
asI
uJG
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
uJG
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
uJG
fvL
kdb
@@ -247309,12 +247571,12 @@ bSt
mDO
mSP
ama
-xMp
+kPs
+kPs
rzS
noH
aMO
aMO
-eSe
oOA
cOS
rzS
@@ -247349,23 +247611,23 @@ vvJ
hGB
asI
uJG
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
uJG
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
fvL
fvL
fvL
@@ -247564,27 +247826,27 @@ gnI
wut
bSt
jWz
-vte
-ptP
+vYm
+pof
+kPs
kPs
rzS
fNN
fYS
fMe
-rzS
dNd
rzS
rzS
fkD
pTl
dCj
-sVG
+jHy
dRE
eNC
xey
viK
fJx
-sVG
+jHy
fKV
tka
kWp
@@ -247606,23 +247868,23 @@ oZD
xOi
asI
uJG
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
uJG
-wuh
-wuh
-wuh
-wuh
-wuh
-wuh
+bXf
+bXf
+bXf
+bXf
+bXf
+bXf
evW
-wuh
-wuh
+bXf
+bXf
fvL
kdb
kdb
@@ -247820,15 +248082,15 @@ kGq
aFJ
iyK
bSt
-vYm
+jOz
xNB
-amE
-dYK
+jjR
+kPs
+kPs
rzS
-bSF
+aok
hMq
yaw
-mQk
kwG
ohy
bFy
@@ -248081,11 +248343,11 @@ pMx
mfx
xmr
oFH
+etN
rzS
-jOz
+mQk
kVV
aLJ
-jjR
jmO
lYF
mlg
@@ -248337,12 +248599,12 @@ hKj
xTe
pyy
rxN
+mya
hnU
rzS
ohi
ruz
rEd
-jnG
uxF
kch
aCQ
@@ -248594,12 +248856,12 @@ pfP
bqo
xqa
dbx
+dYK
obP
rzS
wAY
-ojn
+uNf
exG
-kYo
hwt
gSZ
wHo
@@ -248852,7 +249114,7 @@ pfP
mPK
btV
pfP
-rzS
+mPK
rzS
rzS
rzS
@@ -248914,7 +249176,7 @@ nxU
sZA
sef
uJG
-bkc
+uJG
bkc
bkc
bkc
@@ -251235,9 +251497,9 @@ bkc
bkc
bkc
bkc
-wuh
-wuh
-wuh
+bXf
+bXf
+bXf
bkc
bkc
bkc
@@ -251491,11 +251753,11 @@ bkc
bkc
bkc
bkc
-wuh
-wuh
-wuh
-wuh
-wuh
+bXf
+bXf
+bXf
+bXf
+bXf
bkc
bkc
bkc
@@ -251748,11 +252010,11 @@ ngN
ngN
ngN
bkc
-wuh
-wuh
-wuh
-wuh
-wuh
+bXf
+bXf
+bXf
+bXf
+bXf
bkc
bkc
bkc
@@ -252005,11 +252267,11 @@ uJG
uJG
uJG
bkc
-wuh
-wuh
-wuh
-wuh
-wuh
+bXf
+bXf
+bXf
+bXf
+bXf
bkc
bkc
bkc
@@ -252262,11 +252524,11 @@ kmy
cRI
cRI
bkc
-wuh
-wuh
-wuh
-wuh
-wuh
+bXf
+bXf
+bXf
+bXf
+bXf
bkc
bkc
bkc
@@ -252520,17 +252782,17 @@ pEe
cRI
cRI
wsu
-wuh
+bXf
qev
-wuh
+bXf
wsu
bkc
uJG
uJG
-wTd
-wTd
+sLA
+sLA
uJG
-wTd
+sLA
uJG
sLA
sLA
@@ -252968,8 +253230,8 @@ sCs
eNt
bfp
wIv
-frh
-uol
+ivf
+xxO
dLa
myO
xoV
@@ -253476,7 +253738,7 @@ dDu
cCL
uRm
aAz
-dvq
+ekJ
dvq
dvq
xtI
@@ -253733,7 +253995,7 @@ dDu
jKZ
pve
pve
-frh
+wJM
pve
fJX
bNO
@@ -253819,7 +254081,7 @@ wsu
uJG
ngN
uJG
-wTd
+sLA
bkc
bkc
bkc
@@ -254333,7 +254595,7 @@ wsu
wsu
uJG
uJG
-wTd
+sLA
bkc
bkc
bkc
@@ -262296,7 +262558,7 @@ sBh
jNK
bzv
jBe
-ijm
+mlt
sBh
bkc
bkc
@@ -266046,7 +266308,7 @@ klY
oSY
phm
bci
-nOX
+cpg
pTU
gTm
sGT
@@ -266105,7 +266367,7 @@ bkc
dPJ
ajv
xqA
-rCd
+emp
uMt
vXd
sJR
@@ -270451,13 +270713,13 @@ iJr
jrc
jrc
jrc
-ryD
+rtD
hfj
xOw
bqm
aPU
htm
-qpG
+yeR
jrc
eIO
cUD
@@ -270687,7 +270949,7 @@ bTE
eXp
ggb
jVu
-aQG
+kYo
qwv
fWk
eXp
@@ -270965,13 +271227,13 @@ xxH
xxH
wdF
jrc
-ryD
-qpG
+rtD
+yeR
iUn
qOC
iUn
-ryD
-qpG
+rtD
+yeR
jrc
eIO
cUD
@@ -274580,7 +274842,7 @@ uUw
uUw
uUw
gzW
-rgA
+umr
uUw
fVa
hZY
@@ -283810,9 +284072,9 @@ heE
heE
heE
vTB
-wuh
+bXf
wta
-wuh
+bXf
vTB
bkc
fvL
@@ -284066,11 +284328,11 @@ qGV
dYv
veL
heE
-wuh
-wuh
-wuh
-wuh
-wuh
+bXf
+bXf
+bXf
+bXf
+bXf
bkc
fvL
kdb
@@ -284323,11 +284585,11 @@ vLu
aTK
qsW
heE
-wuh
-wuh
-wuh
-wuh
-wuh
+bXf
+bXf
+bXf
+bXf
+bXf
bkc
fvL
kdb
@@ -284580,11 +284842,11 @@ uOA
dmy
veL
heE
-wuh
-wuh
-wuh
-wuh
-wuh
+bXf
+bXf
+bXf
+bXf
+bXf
bkc
fvL
kdb
@@ -284837,11 +285099,11 @@ heE
heE
heE
heE
-wuh
-wuh
-wuh
-wuh
-wuh
+bXf
+bXf
+bXf
+bXf
+bXf
bkc
fvL
kdb
@@ -285095,9 +285357,9 @@ uJG
bkc
uJG
bkc
-wuh
-wuh
-wuh
+bXf
+bXf
+bXf
bkc
fvL
fvL
diff --git a/code/controllers/subsystem/non-firing/mapping.dm b/code/controllers/subsystem/non-firing/mapping.dm
index ce5325f34a8..c0c6a4cd231 100644
--- a/code/controllers/subsystem/non-firing/mapping.dm
+++ b/code/controllers/subsystem/non-firing/mapping.dm
@@ -41,6 +41,8 @@ SUBSYSTEM_DEF(mapping)
var/list/critical_planes
/// The largest plane offset we've generated so far
var/max_plane_offset = 0
+ /// Maps played in previous rounds, stores typepaths
+ var/list/previous_maps
// This has to be here because world/New() uses [station_name()], which looks this datum up
@@ -57,7 +59,9 @@ SUBSYSTEM_DEF(mapping)
catch
map_datum = fallback_map // Assume delta if non-existent
fdel("data/next_map.txt") // Remove to avoid the same map existing forever
+
return
+
map_datum = fallback_map // Assume delta if non-existent
/datum/controller/subsystem/mapping/Shutdown()
@@ -65,9 +69,41 @@ SUBSYSTEM_DEF(mapping)
var/F = file("data/next_map.txt")
F << next_map.type
+
+/datum/controller/subsystem/mapping/proc/convert_map_datums()
+ var/list/map_subtypes = subtypesof(/datum/map)
+ var/list/result = list()
+ for(var/datum/map/subtype as anything in map_subtypes)
+ result[initial(subtype.name)] = subtype
+
+ return result
+
+/datum/controller/subsystem/mapping/proc/find_last_played_maps()
+ if(CONFIG_GET(flag/sql_enabled))
+ var/datum/db_query/query = \
+ SSdbcore.NewQuery("SELECT id, map_name \
+ FROM [format_table_name("round")] \
+ WHERE server_port=[world.port] \
+ AND end_state IS NOT NULL \
+ ORDER BY id DESC LIMIT 1") //Generally gets the last played map, but can be configured to get any count.
+
+ if(!query.warn_execute())
+ qdel(query)
+ return
+
+ var/list/map_names = convert_map_datums()
+ var/list/maps = list()
+ //Query row structure: id, map_name
+ for(var/map in query.rows)
+ var/map_path = map_names[map[2]]
+ if(map_path)
+ maps += map_path
+
+ previous_maps = maps
+
/datum/controller/subsystem/mapping/Initialize()
setupPlanes()
-
+ find_last_played_maps()
var/datum/lavaland_theme/lavaland_theme_type = pick(subtypesof(/datum/lavaland_theme))
ASSERT(lavaland_theme_type)
lavaland_theme = new lavaland_theme_type
diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm
index 6a1cd0cec23..4b06dc48cb0 100644
--- a/code/game/objects/structures/statues.dm
+++ b/code/game/objects/structures/statues.dm
@@ -325,7 +325,7 @@
desc = "An antique statue of a human angel made of stone."
icon_state = "angel"
anchored = TRUE
- oreAmount = 0
+ obj_flags = NODECONSTRUCT
/obj/structure/statue/russian_mulebot
desc = "Like a MULEbot, but more Russian and less functional.";
@@ -445,7 +445,8 @@
bound_width = 64
var/lit = 0
layer = EDGED_TURF_LAYER
-
+ anchored = TRUE
+ obj_flags = NODECONSTRUCT
/obj/structure/statue/unknown/update_icon_state()
icon_state = "unknown[lit ? "_lit" : ""]"
diff --git a/code/modules/instruments/songs/_song_ui.dm b/code/modules/instruments/songs/_song_ui.dm
index 7d13daadb01..bcfe26a205c 100644
--- a/code/modules/instruments/songs/_song_ui.dm
+++ b/code/modules/instruments/songs/_song_ui.dm
@@ -87,6 +87,10 @@
return
if(length(newline) > MUSIC_MAXLINECHARS)
newline = copytext(newline, 1, MUSIC_MAXLINECHARS)
+
+ if(!legality_check(user, newline))
+ return
+
lines.Add(newline)
if("deleteline")
var/num = round(text2num(params["line"]))
@@ -98,8 +102,13 @@
var/content = tgui_input_text(user, "Enter your line:", parent.name, lines[num], max_length = MUSIC_MAXLINECHARS)
if(!content || !(state.can_use_topic(parent, user) == UI_INTERACTIVE))
return
+
if(num > length(lines) || num < 1)
return
+
+ if(!legality_check(user, content))
+ return
+
lines[num] = content
if("stop")
stop_playing()
@@ -143,6 +152,7 @@
set_dropoff_volume(initial(sustain_dropoff_volume), TRUE)
else
return FALSE
+
parent.add_fingerprint(user)
/**
@@ -150,25 +160,45 @@
*/
/datum/song/proc/parse_song(text, mob/user)
set waitfor = FALSE
- //split into lines
stop_playing()
- lines = splittext(text, "\n")
- if(length(lines))
+ //split into lines
+ var/list/lines_to_add = splittext(text, "\n")
+ if(length(lines_to_add))
var/bpm_string = "BPM: "
- if(findtext(lines[1], bpm_string, 1, length(bpm_string) + 1))
- var/divisor = text2num(copytext(lines[1], length(bpm_string) + 1)) || 120 // default
+ if(findtext(lines_to_add[1], bpm_string, 1, length(bpm_string) + 1))
+ var/divisor = text2num(copytext(lines_to_add[1], length(bpm_string) + 1)) || 120 // default
tempo = sanitize_tempo(600 / round(divisor, 1))
- lines.Cut(1, 2)
+ lines_to_add.Cut(1, 2)
else
tempo = sanitize_tempo(5) // default 120 BPM
- if(length(lines) > MUSIC_MAXLINES)
+ if(length(lines_to_add) > MUSIC_MAXLINES)
to_chat(user, "Too many lines!")
- lines.Cut(MUSIC_MAXLINES + 1)
+ lines_to_add.Cut(MUSIC_MAXLINES + 1)
var/linenum = 1
- for(var/l in lines)
+ for(var/l in lines_to_add)
if(length_char(l) > MUSIC_MAXLINECHARS)
to_chat(user, "Line [linenum] too long!")
- lines.Remove(l)
+ lines_to_add.Remove(l)
+ continue
else
linenum++
+
+ if(!legality_check(user, l))
+ break
+
+ lines = lines_to_add
SStgui.update_uis(parent)
+
+///Checks string for containing only midi-sequence characters.
+/datum/song/proc/legality_check(mob/user, text)
+ var/static/regex/regex = regex(@"[^A-G0-9n\#\-\,\/\.(\r\n|\r|\n)]")
+ var/detection = regex.Find(text)
+ if(detection)
+ var/position_prev = clamp(detection - 16, 1, length(text))
+ var/position_next = clamp(detection + 16, 1, length(text))
+ var/illegal_text = copytext_char(text, position_prev, position_next + 1)
+ message_admins("[user] ([user.ckey]) tried to put an illegal string into a song. Part of a string: [illegal_text]")
+ log_admin("[user] ([user.ckey]) tried to put an illegal string into a song. Part of a string: [illegal_text]")
+ return FALSE
+
+ return TRUE
diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm
index 0aa9fca0317..50f9f03aab0 100644
--- a/code/modules/mob/language.dm
+++ b/code/modules/mob/language.dm
@@ -257,6 +257,64 @@
flags = RESTRICTED
syllables = list("qr","qrr","xuq","qil","quum","xuqm","vol","xrim","zaoo","qu-uu","qix","qoo","zix","*","!")
+
+#define SKRELL_ADDITIONAL_SYLLABLES 2 // Maximum of additional syllables for first and second names
+
+/datum/language/skrell/get_random_name() // Name generator authors: @saichi23 && @cadavrik
+ // Now I love making list in list in list in list in list
+ // Two sublists were made by authors so that the names would turn out most consonant for reading (in a way that's possible for skrells)
+ var/list/ru_name_syllables = list(
+ list( // list 1
+ list("заоо", "зао", "зикс", "зо", "йуо", "кью", "кьюм", "кси", "ксу", "квум", "кву", // sublist1
+ "кви", "квей", "квиш", "куу", "кюан", "киэн", "ку", "кил", "лиа", "люик", "луи",
+ "рио", "сейу", "тсой", "уль", "улур", "урр", "ур", "цу", "эль", "эо", "эу"),
+
+ list(
+ "аг", "вум", "вул", "вол", "гли", "зи", "заоо", "зао", "зикс", "зуо", "зук", "зуво", // sublist2
+ "икс", "ил", "ис", "йук", "кву", "квум", "куум", "куо", "куа", "куак", "кул", "квол",
+ "кью", "кьюа", "кэ", "кин", "кии", "кс", "ки", "киу", "кос", "лоа", "лак", "лум", "лик",
+ "лии", "ллак", "мзикс", "мвол", "ори", "ору", "орр", "ррум", "ру", "руум", "руа", "рл",
+ "сэк", "су", "сиа", "тейе", "тейку", "тсу", "туа", "туи", "ту", "тал", "уат", "уок", "урр",
+ "уоо", "уо", "уик", "уии", "уэк", "эйкс", "эль", "эрр", "эй", "эйс", "о", "у", "а", "з", "э", "м" ,"к", "с", "р"
+ )
+ ),
+
+ list( // list 2
+ list("заоо", "зао", "зо", "йуо", "лиа", "луи", "рио", "сейу", "эо"), // sublist1
+
+ list(
+ "вум", "вул", "вол", "гли", "зи", "заоо", "зао", "зикс", "зуо", "зук", "зуво", // sublist2
+ "йук", "кву", "квум", "куум", "куо", "куа", "куак", "кул", "квол", "кью", "кьюа",
+ "кэ", "кин", "кии", "кс", "ки", "киу", "кос", "лоа", "лак", "лум", "лик", "лии", "ллак",
+ "мзикс", "мвол", "ррум", "ру", "руум", "руа", "рл", "сэк", "су", "сиа", "тейе", "тейку",
+ "тсу", "туа", "туи", "ту", "тал", "з", "м", "к", "с", "р"
+ )
+ )
+ )
+
+ var/full_name = ""
+
+ for(var/i in 1 to 2) // First and second names, making from 2-3 syllables each.
+ var/apostrophe = "'"
+ var/new_name = ""
+ var/using_list = rand(1, LAZYLEN(ru_name_syllables)) // We use only one list for the first name and one list for the second name, without mixing syllables from different lists.
+
+ new_name += pick(ru_name_syllables[using_list][1]) // The first syllable is only from the first sublist.
+
+ for(var/add_syllables in 1 to rand(1, SKRELL_ADDITIONAL_SYLLABLES)) // Additional 1-2 syllables, taken from sublist2.
+ if(apostrophe && prob(50))
+ new_name += apostrophe
+ apostrophe = null // Adding "'" with chance, but only once for first and second names
+
+ new_name += pick(ru_name_syllables[using_list][2])
+
+ full_name += " [capitalize(new_name)]"
+
+ return "[trim(full_name)]"
+
+#undef SKRELL_ADDITIONAL_SYLLABLES
+
+
/datum/language/vox
name = "Vox-pidgin"
desc = "The common tongue of the various Vox ships making up the Shoal. It sounds like chaotic shrieking to everyone else."
diff --git a/code/modules/mob/living/carbon/human/species/diona.dm b/code/modules/mob/living/carbon/human/species/diona.dm
index c0f28df0c9a..29ef143cd6b 100644
--- a/code/modules/mob/living/carbon/human/species/diona.dm
+++ b/code/modules/mob/living/carbon/human/species/diona.dm
@@ -109,8 +109,8 @@
return FALSE
if("salglu_solution")
if(prob(33))
- H.adjustBruteLoss(-1)
- H.adjustFireLoss(-1)
+ H.adjustBruteLoss(-1, FALSE, affect_robotic = FALSE)
+ H.adjustFireLoss(-1, affect_robotic = FALSE)
H.reagents.remove_reagent(R.id, R.metabolization_rate * H.get_metabolism() * H.digestion_ratio)
return FALSE
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 49fc4822919..0cf03152c3b 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -134,7 +134,7 @@
magin_sound = 'sound/weapons/gun_interactions/batrifle_magin.ogg'
magout_sound = 'sound/weapons/gun_interactions/batrifle_magout.ogg'
fire_delay = 2
- can_suppress = FALSE
+ can_suppress = TRUE
can_flashlight = TRUE
burst_size = 2
can_bayonet = TRUE
@@ -146,6 +146,11 @@
/obj/item/gun/projectile/automatic/wt550/update_icon_state()
icon_state = "wt550[magazine ? "-[CEILING(get_ammo(FALSE)/4, 1)*4]" : ""]"
+/obj/item/gun/projectile/automatic/wt550/update_overlays()
+ . = ..()
+ if(suppressed)
+ . += image(icon = icon, icon_state = "wt-sp_supp", pixel_x = 3)
+
/obj/item/gun/projectile/automatic/wt550/ui_action_click(mob/user, datum/action/action, leftclick)
if(..())
@@ -165,7 +170,7 @@
magin_sound = 'sound/weapons/gun_interactions/batrifle_magin.ogg'
magout_sound = 'sound/weapons/gun_interactions/batrifle_magout.ogg'
fire_delay = 2
- can_suppress = FALSE
+ can_suppress = TRUE
can_flashlight = TRUE
burst_size = 3
can_bayonet = FALSE
@@ -176,6 +181,10 @@
icon_state = "SP-91-RC[magazine ? "-[CEILING(get_ammo(FALSE)/5, 1)*5]" : ""]"
item_state = "SP-91-RC[magazine ? "-[get_ammo(FALSE) ? "20" : "0"]" : ""]"
+/obj/item/gun/projectile/automatic/sp91rc/update_overlays()
+ . = ..()
+ if(suppressed)
+ . += image(icon = icon, icon_state = "wt-sp_supp", pixel_x = 3)
/obj/item/gun/projectile/automatic/sp91rc/ui_action_click(mob/user, datum/action/action, leftclick)
if(..())
diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm
index ffe2251c0f5..bd53cd4611d 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol.dm
@@ -138,8 +138,8 @@
/datum/reagent/consumable/ethanol/hooch/on_mob_life(mob/living/carbon/M)
if(M.mind && M.mind.assigned_role == JOB_TITLE_CIVILIAN)
var/update_flags = STATUS_UPDATE_NONE
- update_flags |= M.adjustBruteLoss(-1, FALSE)
- update_flags |= M.adjustFireLoss(-1, FALSE)
+ update_flags |= M.adjustBruteLoss(-1, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/consumable/ethanol/rum
@@ -1468,8 +1468,8 @@
/datum/reagent/consumable/ethanol/rainbow_sky/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
- update_flags |= M.adjustBruteLoss(-1, FALSE)
- update_flags |= M.adjustFireLoss(-1, FALSE)
+ update_flags |= M.adjustBruteLoss(-1, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE, affect_robotic = FALSE)
M.Druggy(30 SECONDS)
M.Jitter(10 SECONDS)
M.AdjustHallucinate(10 SECONDS)
@@ -1711,13 +1711,13 @@
/datum/reagent/consumable/ethanol/alcomender/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
- update_flags |= M.adjustFireLoss(-0.7, FALSE)
+ update_flags |= M.adjustFireLoss(-0.7, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/consumable/ethanol/alcomender/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume) // It is alcohol after all, so don't try to pour it on someone who's on fire ... please.
if(iscarbon(M))
if(method == REAGENT_TOUCH)
- M.adjustFireLoss(-volume * 0.7)
+ M.adjustFireLoss(-volume * 0.7, affect_robotic = FALSE)
to_chat(M, "The diluted silver sulfadiazine soothes your burns.")
return STATUS_UPDATE_NONE
diff --git a/code/modules/reagents/chemistry/reagents/drink_cold.dm b/code/modules/reagents/chemistry/reagents/drink_cold.dm
index 0376c8a4292..a63b8789013 100644
--- a/code/modules/reagents/chemistry/reagents/drink_cold.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_cold.dm
@@ -265,8 +265,8 @@
/datum/reagent/consumable/drink/cold/zaza/on_mob_life(mob/living/user)
var/update_flags = STATUS_UPDATE_NONE
if(ishuman(user) && prob(40))
- update_flags |= user.adjustBruteLoss(-healamount, FALSE)
- update_flags |= user.adjustFireLoss(-healamount, FALSE)
+ update_flags |= user.adjustBruteLoss(-healamount, FALSE, affect_robotic = FALSE)
+ update_flags |= user.adjustFireLoss(-healamount, FALSE, affect_robotic = FALSE)
return ..() | update_flags
diff --git a/code/modules/reagents/chemistry/reagents/drinks.dm b/code/modules/reagents/chemistry/reagents/drinks.dm
index be59b1dc296..c52fd0bab7f 100644
--- a/code/modules/reagents/chemistry/reagents/drinks.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks.dm
@@ -37,7 +37,7 @@
/datum/reagent/consumable/drink/tomatojuice/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(prob(20))
- update_flags |= M.adjustFireLoss(-1, FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/consumable/drink/limejuice
@@ -179,8 +179,8 @@
/datum/reagent/consumable/drink/banana/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(HAS_TRAIT(M, TRAIT_COMIC) || is_monkeybasic(M))
- update_flags |= M.adjustBruteLoss(-1, FALSE)
- update_flags |= M.adjustFireLoss(-1, FALSE)
+ update_flags |= M.adjustBruteLoss(-1, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/consumable/drink/nothing
@@ -195,8 +195,8 @@
/datum/reagent/consumable/drink/nothing/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(ishuman(M) && M.mind && M.mind.miming)
- update_flags |= M.adjustBruteLoss(-1, FALSE)
- update_flags |= M.adjustFireLoss(-1, FALSE)
+ update_flags |= M.adjustBruteLoss(-1, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/consumable/drink/potato_juice
@@ -223,7 +223,7 @@
/datum/reagent/consumable/drink/milk/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(prob(20))
- update_flags |= M.adjustBruteLoss(-1, FALSE)
+ update_flags |= M.adjustBruteLoss(-1, FALSE, affect_robotic = FALSE)
if(holder.has_reagent("capsaicin"))
holder.remove_reagent("capsaicin", 2)
return ..() | update_flags
@@ -329,7 +329,7 @@
var/update_flags = STATUS_UPDATE_NONE
M.SetSleeping(0)
if(prob(20))
- update_flags |= M.adjustBruteLoss(-1, FALSE)
+ update_flags |= M.adjustBruteLoss(-1, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/consumable/drink/coffee/cafe_latte
@@ -348,7 +348,7 @@
var/update_flags = STATUS_UPDATE_NONE
M.SetSleeping(0)
if(prob(20))
- update_flags |= M.adjustBruteLoss(-1, FALSE)
+ update_flags |= M.adjustBruteLoss(-1, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/consumable/drink/coffee/cafe_latte/cafe_mocha
@@ -414,8 +414,8 @@
/datum/reagent/consumable/drink/bananahonk/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(HAS_TRAIT(src, TRAIT_COMIC) || is_monkeybasic(M))
- update_flags |= M.adjustBruteLoss(-1, FALSE)
- update_flags |= M.adjustFireLoss(-1, FALSE)
+ update_flags |= M.adjustBruteLoss(-1, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/consumable/drink/silencer
@@ -431,8 +431,8 @@
/datum/reagent/consumable/drink/silencer/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(ishuman(M) && (M.job in list(JOB_TITLE_MIME)))
- update_flags |= M.adjustBruteLoss(-1, FALSE)
- update_flags |= M.adjustFireLoss(-1, FALSE)
+ update_flags |= M.adjustBruteLoss(-1, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/consumable/drink/chocolatepudding
diff --git a/code/modules/reagents/chemistry/reagents/drugs.dm b/code/modules/reagents/chemistry/reagents/drugs.dm
index e5ef68bffb7..80b88a14389 100644
--- a/code/modules/reagents/chemistry/reagents/drugs.dm
+++ b/code/modules/reagents/chemistry/reagents/drugs.dm
@@ -612,8 +612,8 @@
if(M.reagents.get_reagent_amount("thc") <= 20)
M.Drowsy(20 SECONDS)
if(prob(25))
- update_flags |= M.adjustBruteLoss(-2, FALSE)
- update_flags |= M.adjustFireLoss(-2, FALSE)
+ update_flags |= M.adjustBruteLoss(-2, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-2, FALSE, affect_robotic = FALSE)
return ..() | update_flags
diff --git a/code/modules/reagents/chemistry/reagents/food.dm b/code/modules/reagents/chemistry/reagents/food.dm
index 5af02464a3a..a0be8517221 100644
--- a/code/modules/reagents/chemistry/reagents/food.dm
+++ b/code/modules/reagents/chemistry/reagents/food.dm
@@ -29,8 +29,8 @@
/datum/reagent/consumable/nutriment/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(!isvampire(M))
- update_flags |= M.adjustBruteLoss(-brute_heal, FALSE)
- update_flags |= M.adjustFireLoss(-burn_heal, FALSE)
+ update_flags |= M.adjustBruteLoss(-brute_heal, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-burn_heal, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/consumable/nutriment/on_new(list/supplied_data)
@@ -490,8 +490,8 @@
else
if(H.job == JOB_TITLE_CHEF)
if(prob(20)) //stays in the system much longer than sprinkles/banana juice, so heals slower to partially compensate
- update_flags |= H.adjustBruteLoss(-1, FALSE)
- update_flags |= H.adjustFireLoss(-1, FALSE)
+ update_flags |= H.adjustBruteLoss(-1, FALSE, affect_robotic = FALSE)
+ update_flags |= H.adjustFireLoss(-1, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/consumable/sprinkles
@@ -504,8 +504,8 @@
/datum/reagent/consumable/sprinkles/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(ishuman(M) && (M.job in list(JOB_TITLE_OFFICER, JOB_TITLE_PILOT, JOB_TITLE_DETECTIVE, JOB_TITLE_WARDEN, JOB_TITLE_HOS, JOB_TITLE_BRIGDOC, JOB_TITLE_LAWYER, JOB_TITLE_JUDGE)))
- update_flags |= M.adjustBruteLoss(-1, FALSE)
- update_flags |= M.adjustFireLoss(-1, FALSE)
+ update_flags |= M.adjustBruteLoss(-1, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/consumable/cornoil
@@ -686,8 +686,8 @@
var/update_flags = STATUS_UPDATE_NONE
M.reagents.add_reagent("sugar", 3)
if(prob(20))
- update_flags |= M.adjustBruteLoss(-3, FALSE)
- update_flags |= M.adjustFireLoss(-1, FALSE)
+ update_flags |= M.adjustBruteLoss(-3, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/consumable/onion
@@ -743,8 +743,8 @@
if(M.mind.special_role == SPECIAL_ROLE_WIZARD || M.mind.special_role == SPECIAL_ROLE_WIZARD_APPRENTICE)
update_flags |= M.adjustToxLoss(-0.5, FALSE)
update_flags |= M.adjustOxyLoss(-0.5, FALSE)
- update_flags |= M.adjustBruteLoss(-0.5, FALSE)
- update_flags |= M.adjustFireLoss(-0.5, FALSE)
+ update_flags |= M.adjustBruteLoss(-0.5, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-0.5, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/consumable/porktonium
@@ -962,8 +962,8 @@
/datum/reagent/msg/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(istype(M.mind?.martial_art, /datum/martial_art/mr_chang))
- update_flags |= M.adjustBruteLoss(-0.75)
- update_flags |= M.adjustFireLoss(-0.75)
+ update_flags |= M.adjustBruteLoss(-0.75, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-0.75, affect_robotic = FALSE)
else
if(prob(5))
if(prob(10))
@@ -1138,8 +1138,8 @@
/datum/reagent/consumable/vitfro/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(prob(80))
- update_flags |= M.adjustBruteLoss(-0.5, FALSE)
- update_flags |= M.adjustFireLoss(-0.5, FALSE)
+ update_flags |= M.adjustBruteLoss(-0.5, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-0.5, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/consumable/animal_feed
@@ -1153,8 +1153,8 @@
/datum/reagent/consumable/animal_feed/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(isvulpkanin(M) || istajaran(M))
- update_flags |= M.adjustBruteLoss(-0.25, FALSE)
- update_flags |= M.adjustFireLoss(-0.25, FALSE)
+ update_flags |= M.adjustBruteLoss(-0.25, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-0.25, FALSE, affect_robotic = FALSE)
M.AdjustDisgust(-5 SECONDS)
if(prob(2))
to_chat(M, span_notice("You feel delicious yummy snack taste!"))
diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm
index a589fc00556..238ab0615fa 100644
--- a/code/modules/reagents/chemistry/reagents/medicine.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine.dm
@@ -156,8 +156,8 @@
update_flags |= M.adjustCloneLoss(-1, FALSE)
update_flags |= M.adjustOxyLoss(-2, FALSE)
update_flags |= M.adjustToxLoss(-0.5, FALSE)
- update_flags |= M.adjustBruteLoss(-2, FALSE)
- update_flags |= M.adjustFireLoss(-4, FALSE)
+ update_flags |= M.adjustBruteLoss(-2, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-4, FALSE, affect_robotic = FALSE)
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/obj/item/organ/external/head/head = H.get_organ(BODY_ZONE_HEAD)
@@ -186,8 +186,8 @@
/datum/reagent/medicine/rezadone/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
update_flags |= M.adjustCloneLoss(-5, FALSE) //What? We just set cloneloss to 0. Why? Simple; this is so external organs properly unmutate. // why don't you fix the code instead // i fix the code dont worry
- update_flags |= M.adjustBruteLoss(-1, FALSE)
- update_flags |= M.adjustFireLoss(-1, FALSE)
+ update_flags |= M.adjustBruteLoss(-1, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE, affect_robotic = FALSE)
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/obj/item/organ/external/head/head = H.get_organ(BODY_ZONE_HEAD)
@@ -295,8 +295,8 @@
/datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(prob(33))
- update_flags |= M.adjustBruteLoss(-1, FALSE)
- update_flags |= M.adjustFireLoss(-1, FALSE)
+ update_flags |= M.adjustBruteLoss(-1, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE, affect_robotic = FALSE)
if(ishuman(M) && prob(33))
var/mob/living/carbon/human/H = M
//do not restore blood on things with no blood by nature.
@@ -339,7 +339,7 @@
/datum/reagent/medicine/ab_stimulant/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
to_chat(M, "Вы чуствуете чесотку.")
- update_flags |= M.adjustFireLoss(-1.5, FALSE)
+ update_flags |= M.adjustFireLoss(-1.5, FALSE, affect_robotic = FALSE)
if(volume > 1.9)
if(HAS_TRAIT(M, TRAIT_HUSK))
var/mob/living/carbon/human/H = M
@@ -393,8 +393,8 @@
var/update_flags = STATUS_UPDATE_NONE
update_flags |= M.adjustToxLoss(-0.5, FALSE)
update_flags |= M.adjustOxyLoss(-0.5, FALSE)
- update_flags |= M.adjustBruteLoss(-1, FALSE)
- update_flags |= M.adjustFireLoss(-1, FALSE)
+ update_flags |= M.adjustBruteLoss(-1, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE, affect_robotic = FALSE)
if(prob(50))
M.AdjustLoseBreath(-2 SECONDS)
return ..() | update_flags
@@ -512,7 +512,7 @@
/datum/reagent/medicine/sal_acid/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(prob(55))
- update_flags |= M.adjustBruteLoss(-1, FALSE)
+ update_flags |= M.adjustBruteLoss(-1, FALSE, affect_robotic = FALSE)
if(M.bodytemperature > BODYTEMP_NORMAL)
M.adjust_bodytemperature(-10)
return ..() | update_flags
@@ -529,7 +529,7 @@
/datum/reagent/medicine/menthol/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(prob(55))
- update_flags |= M.adjustFireLoss(-1, FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE, affect_robotic = FALSE)
if(M.bodytemperature > 280)
M.adjust_bodytemperature(-10)
return ..() | update_flags
@@ -567,8 +567,8 @@
if(volume >= 4)
M.LoseBreath(12 SECONDS)
if(prob(33))
- update_flags |= M.adjustBruteLoss(-0.5, FALSE)
- update_flags |= M.adjustFireLoss(-0.5, FALSE)
+ update_flags |= M.adjustBruteLoss(-0.5, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-0.5, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/medicine/ephedrine
@@ -597,8 +597,8 @@
update_flags |= M.adjustOxyLoss(-1, FALSE)
if(M.health < 0 || M.health > 0 && prob(33))
update_flags |= M.adjustToxLoss(-1, FALSE)
- update_flags |= M.adjustBruteLoss(-1, FALSE)
- update_flags |= M.adjustFireLoss(-1, FALSE)
+ update_flags |= M.adjustBruteLoss(-1, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/medicine/ephedrine/overdose_process(mob/living/M, severity)
@@ -738,8 +738,8 @@
update_flags |= M.adjustOxyLoss(-5, FALSE)
if(M.health < -25)
update_flags |= M.adjustToxLoss(-1, FALSE)
- update_flags |= M.adjustBruteLoss(-1.5, FALSE)
- update_flags |= M.adjustFireLoss(-1.5, FALSE)
+ update_flags |= M.adjustBruteLoss(-1.5, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-1.5, FALSE, affect_robotic = FALSE)
else if(M.health > -60)
update_flags |= M.adjustToxLoss(1, FALSE)
M.reagents.remove_reagent("sarin", 20)
@@ -775,8 +775,8 @@
update_flags |= M.adjustOxyLoss(-5, FALSE)
if(M.health < -10 && M.health > -65)
update_flags |= M.adjustToxLoss(-0.5, FALSE)
- update_flags |= M.adjustBruteLoss(-0.5, FALSE)
- update_flags |= M.adjustFireLoss(-0.5, FALSE)
+ update_flags |= M.adjustBruteLoss(-0.5, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-0.5, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/medicine/epinephrine/overdose_process(mob/living/M, severity)
@@ -953,8 +953,8 @@
if(volume > 5)
update_flags |= M.adjustOxyLoss(-2.5, FALSE)
update_flags |= M.adjustToxLoss(-2.5, FALSE)
- update_flags |= M.adjustBruteLoss(-5, FALSE)
- update_flags |= M.adjustFireLoss(-5, FALSE)
+ update_flags |= M.adjustBruteLoss(-5, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-5, FALSE, affect_robotic = FALSE)
update_flags |= M.setStaminaLoss(0, FALSE)
M.SetSlowed(0)
M.AdjustDizzy(-20 SECONDS)
@@ -996,8 +996,8 @@
var/update_flags = STATUS_UPDATE_NONE
if(user.health < 50 && user.health > 0)
update_flags |= user.adjustOxyLoss(-2, FALSE)
- update_flags |= user.adjustBruteLoss(-2, FALSE)
- update_flags |= user.adjustFireLoss(-2, FALSE)
+ update_flags |= user.adjustBruteLoss(-2, FALSE, affect_robotic = FALSE)
+ update_flags |= user.adjustFireLoss(-2, FALSE, affect_robotic = FALSE)
user.AdjustParalysis(-6 SECONDS)
user.AdjustStunned(-6 SECONDS)
user.AdjustWeakened(-6 SECONDS)
@@ -1160,8 +1160,8 @@
/datum/reagent/medicine/syndicate_nanites/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
- update_flags |= M.adjustBruteLoss(-2.5, FALSE) //A ton of healing - this is a 50 telecrystal investment.
- update_flags |= M.adjustFireLoss(-2.5, FALSE)
+ update_flags |= M.adjustBruteLoss(-2.5, FALSE, affect_robotic = FALSE) //A ton of healing - this is a 50 telecrystal investment.
+ update_flags |= M.adjustFireLoss(-2.5, FALSE, affect_robotic = FALSE)
update_flags |= M.adjustOxyLoss(-7.5, FALSE)
update_flags |= M.adjustToxLoss(-2.5, FALSE)
update_flags |= M.adjustBrainLoss(-7.5, FALSE)
@@ -1189,8 +1189,8 @@
var/update_flags = STATUS_UPDATE_NONE
update_flags |= M.adjustToxLoss(-0.25, FALSE)
update_flags |= M.adjustOxyLoss(-0.25, FALSE)
- update_flags |= M.adjustBruteLoss(-0.25, FALSE)
- update_flags |= M.adjustFireLoss(-0.25, FALSE)
+ update_flags |= M.adjustBruteLoss(-0.25, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-0.25, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/medicine/omnizine_diluted/overdose_process(mob/living/M, severity)
@@ -1281,7 +1281,7 @@
/datum/reagent/medicine/bicaridine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
- update_flags |= M.adjustBruteLoss(-1, FALSE)
+ update_flags |= M.adjustBruteLoss(-1, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/medicine/bicaridine/overdose_process(mob/living/M)
@@ -1301,7 +1301,7 @@
/datum/reagent/medicine/kelotane/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
- update_flags |= M.adjustFireLoss(-1, FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/medicine/kelotane/overdose_process(mob/living/M)
@@ -1321,8 +1321,8 @@
/datum/reagent/medicine/earthsblood/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
- update_flags |= M.adjustBruteLoss(-1.5, FALSE)
- update_flags |= M.adjustFireLoss(-1.5, FALSE)
+ update_flags |= M.adjustBruteLoss(-1.5, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-1.5, FALSE, affect_robotic = FALSE)
update_flags |= M.adjustOxyLoss(-7.5, FALSE)
update_flags |= M.adjustToxLoss(-1.5, FALSE)
update_flags |= M.adjustBrainLoss(1, FALSE) //This does, after all, come from ambrosia, and the most powerful ambrosia in existence, at that!
@@ -1350,8 +1350,8 @@
/datum/reagent/medicine/syndiezine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
- update_flags |= M.adjustBruteLoss(-0.5, FALSE)
- update_flags |= M.adjustFireLoss(-0.5, FALSE)
+ update_flags |= M.adjustBruteLoss(-0.5, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-0.5, FALSE, affect_robotic = FALSE)
update_flags |= M.adjustOxyLoss(-4.5, FALSE)
update_flags |= M.adjustToxLoss(-0.5, FALSE)
update_flags |= M.adjustCloneLoss(-0.5, FALSE)
@@ -1440,8 +1440,8 @@
if(M.health < 40)
update_flags |= M.adjustOxyLoss(-6, FALSE)
update_flags |= M.adjustToxLoss(-2, FALSE)
- update_flags |= M.adjustBruteLoss(-4, FALSE)
- update_flags |= M.adjustFireLoss(-4, FALSE)
+ update_flags |= M.adjustBruteLoss(-4, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-4, FALSE, affect_robotic = FALSE)
else
if(prob(50))
to_chat(M, span_warning("Your skin feels like it is ripping apart and your veins are on fire!")) //It is experimental and does cause scars, after all.
@@ -1460,8 +1460,8 @@
/datum/reagent/medicine/lavaland_extract/on_mob_life(mob/living/carbon/M)
var/update_flags = STATUS_UPDATE_NONE
- update_flags |= M.adjustBruteLoss(-2.5, FALSE)
- update_flags |= M.adjustFireLoss(-2.5, FALSE)
+ update_flags |= M.adjustBruteLoss(-2.5, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-2.5, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/medicine/lavaland_extract/overdose_process(mob/living/M) // This WILL be brutal
@@ -1485,8 +1485,8 @@
/datum/reagent/medicine/zessulblood/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
- update_flags |= M.adjustBruteLoss(-1, FALSE)
- update_flags |= M.adjustFireLoss(-1, FALSE)
+ update_flags |= M.adjustBruteLoss(-1, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/medicine/pure_plasma //unique chemical for plasmaman
@@ -1508,8 +1508,8 @@
normal_temperature = BODYTEMP_NORMAL
if(M.bodytemperature < normal_temperature)
M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT)
- update_flags |= M.adjustBruteLoss(-0.25, FALSE)
- update_flags |= M.adjustFireLoss(-0.25, FALSE)
+ update_flags |= M.adjustBruteLoss(-0.25, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-0.25, FALSE, affect_robotic = FALSE)
else
update_flags |= M.adjustToxLoss(4, FALSE)
return ..() | update_flags
@@ -1592,18 +1592,18 @@
var/update_flags = STATUS_UPDATE_NONE
update_flags |= M.adjustOxyLoss(-3.5, FALSE)
update_flags |= M.adjustToxLoss(-2.5, FALSE)
- update_flags |= M.adjustBruteLoss(-3, FALSE)
- update_flags |= M.adjustFireLoss(-3, FALSE)
+ update_flags |= M.adjustBruteLoss(-3, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-3, FALSE, affect_robotic = FALSE)
if(prob(50))
M.AdjustLoseBreath(-2 SECONDS)
M.SetConfused(0)
M.SetSleeping(0)
if(M.getFireLoss() > 35)
- update_flags |= M.adjustFireLoss(-4, FALSE)
+ update_flags |= M.adjustFireLoss(-4, FALSE, affect_robotic = FALSE)
if(M.health < 0)
update_flags |= M.adjustToxLoss(-1, FALSE)
- update_flags |= M.adjustBruteLoss(-1, FALSE)
- update_flags |= M.adjustFireLoss(-1, FALSE)
+ update_flags |= M.adjustBruteLoss(-1, FALSE, affect_robotic = FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE, affect_robotic = FALSE)
return ..() | update_flags
/datum/reagent/medicine/adv_lava_extract/overdose_process(mob/living/M, severity)
diff --git a/code/modules/reagents/chemistry/reagents/misc.dm b/code/modules/reagents/chemistry/reagents/misc.dm
index ff21df5e77a..6380e5ef680 100644
--- a/code/modules/reagents/chemistry/reagents/misc.dm
+++ b/code/modules/reagents/chemistry/reagents/misc.dm
@@ -473,7 +473,7 @@
if(prob(10))
M.emote("giggle")
if(M?.mind.assigned_role == JOB_TITLE_CLOWN || M?.mind.assigned_role == SPECIAL_ROLE_HONKSQUAD)
- update_flags |= M.adjustBruteLoss(-0.75) //Screw those pesky clown beatings!
+ update_flags |= M.adjustBruteLoss(-0.75, affect_robotic = FALSE) //Screw those pesky clown beatings!
else
M.AdjustDizzy(20 SECONDS, 0, 1000 SECONDS)
M.Druggy(30 SECONDS)
diff --git a/code/modules/reagents/chemistry/reagents/ninja.dm b/code/modules/reagents/chemistry/reagents/ninja.dm
index 0775e13e05b..fff9810cf6f 100644
--- a/code/modules/reagents/chemistry/reagents/ninja.dm
+++ b/code/modules/reagents/chemistry/reagents/ninja.dm
@@ -51,8 +51,8 @@
our_mob.AdjustDrunk(-8 SECONDS)
our_mob.reagents.remove_all_type(/datum/reagent/consumable/ethanol, 8, 0, 1)
//Basic damage types
- update_flags |= our_mob.adjustBruteLoss(-5, FALSE)
- update_flags |= our_mob.adjustFireLoss(-5, FALSE)
+ update_flags |= our_mob.adjustBruteLoss(-5, FALSE, affect_robotic = FALSE)
+ update_flags |= our_mob.adjustFireLoss(-5, FALSE, affect_robotic = FALSE)
update_flags |= our_mob.adjustOxyLoss(-5, FALSE)
update_flags |= our_mob.adjustToxLoss(-5, FALSE)
//Eyes and ears
diff --git a/code/modules/reagents/chemistry/reagents/paradise_pop.dm b/code/modules/reagents/chemistry/reagents/paradise_pop.dm
index fdf6d358779..c4dd3635b7d 100644
--- a/code/modules/reagents/chemistry/reagents/paradise_pop.dm
+++ b/code/modules/reagents/chemistry/reagents/paradise_pop.dm
@@ -48,9 +48,9 @@
var/heal_type = rand(0, 5) //still prefer the string version
switch(heal_type)
if(0)
- update_flags |= M.adjustBruteLoss(-0.25, FALSE)
+ update_flags |= M.adjustBruteLoss(-0.25, FALSE, affect_robotic = FALSE)
if(1)
- update_flags |= M.adjustFireLoss(-0.25, FALSE)
+ update_flags |= M.adjustFireLoss(-0.25, FALSE, affect_robotic = FALSE)
if(2)
update_flags |= M.adjustToxLoss(-0.25, FALSE)
if(3)
diff --git a/code/modules/vote/vote_presets.dm b/code/modules/vote/vote_presets.dm
index 57948610b03..27882075ac0 100644
--- a/code/modules/vote/vote_presets.dm
+++ b/code/modules/vote/vote_presets.dm
@@ -31,6 +31,12 @@
if(CONFIG_GET(string/map_vote_mode) == "nodoubles")
map_pool -= SSmapping.map_datum.type
+ if(CONFIG_GET(string/map_vote_mode) == "notriples")
+ if(SSmapping.previous_maps && length(SSmapping.previous_maps))
+ var/current_map = SSmapping.map_datum.type
+ if(current_map == SSmapping.previous_maps[1])
+ map_pool -= current_map
+
for(var/datum/map/possible_map as anything in map_pool)
if(initial(possible_map.admin_only))
continue
diff --git a/config/example/config.txt b/config/example/config.txt
index f01c8c80f7d..dd91cc71d4e 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -663,6 +663,7 @@ MAP_ROTATE none
## Server map voting mode:
## all - all maps can be selected
## nodoubles - current map can't be selected as next
+## notriples - current map can't be selected as next if played twice in a row
MAP_VOTE_MODE all
## Default server map
diff --git a/html/changelogs/archive/2024-10.yml b/html/changelogs/archive/2024-10.yml
index a8c4c63301b..1357b50994a 100644
--- a/html/changelogs/archive/2024-10.yml
+++ b/html/changelogs/archive/2024-10.yml
@@ -91,3 +91,75 @@
'2024-10-09':
kartowkar:
- bugfix: eatable component multitool fix (#6001)
+'2024-10-10':
+ Antoonij:
+ - qol: recharge spell million istypes removal (#5915)
+ LiquidPotroh:
+ - bugfix: permeability of adjusted mask (#6003)
+ Valtor:
+ - imageadd: tajaran pathes head sprite fix (#6008)
+ kartowkar:
+ - bugfix: Borer spell datum fix (#6002)
+'2024-10-11':
+ Arceniu:
+ - qol: sst hardsuit speed (#6009)
+'2024-10-13':
+ Antoonij:
+ - bugfix: Sintouched fixes (#6016)
+ - refactor: Animal temperature (#5930)
+ Daeberdir:
+ - add: NektoeN Abandoned Storage Map. (#5996)
+ - tweak: Engi areas type shuffling. Supermatter and sub-engine areas overload-protected
+ APCs. (#5995)
+ - tweak: ashstorm immunity for minebots. (#6006)
+ NightDawnFox:
+ - add: basic ridable element and components & fireman carry (#5705)
+ PiroMage:
+ - bugfix: 'Nova Station #7 Patch (#6014)'
+ TimChi:
+ - add: Disease - Babylonian Fever (#5997)
+ Valtor:
+ - bugfix: diona blood regen (#6011)
+ - bugfix: thick tape roll fix (#6013)
+ Vladisvell:
+ - bugfix: Fixed tos consent acception (#6012)
+ github-actions[bot]:
+ - server: Automatic NanoMap Update (#5946)
+ kartowkar:
+ - bugfix: fix some inhand sprites (#6004)
+ - bugfix: reinforced.wall deconstruction Fix (#6017)
+'2024-10-14':
+ TimChi:
+ - bugfix: Babylon Fever runtime fix (#6020)
+ Vladisvell:
+ - tweak: sets up audio emotes cooldown (#6019)
+'2024-10-15':
+ Anorak2020:
+ - add: more objectives for vampires and clings (#6024)
+ Den109G:
+ - refactor: Now wiki comes from config and not hardcoded. (#5983)
+ Etrnlmelancholy:
+ - add: Повязки на глаза с ХУДом. (#6010)
+ NightDawnFox:
+ - bugfix: holoparasites are no longer can be refreshed in colossus crystal (#6028)
+ - bugfix: no more multiple tipping (#6027)
+ - tweak: decreased speed of vehicles (#6022)
+ PlayerUnknown14:
+ - imageadd: SP-91-RC - new sprites (#6026)
+ TimChi:
+ - bugfix: Brains in mmi can cast spells (#6021)
+ Vladisvell:
+ - bugfix: fixes elite fauna (#6032)
+'2024-10-16':
+ Anorak2020:
+ - bugfix: '[customat] some items has wrong keys (#6040)'
+ NightDawnFox:
+ - spellcheck: ревьеюру (#6037)
+ - bugfix: you can no longer be immortal with sindie uno card (#6038)
+ TimChi:
+ - bugfix: Keybind "Y" resulted in the use of an item in hand. (#6039)
+ Vladisvell:
+ - add: byond 1644 compat (#6041)
+'2024-10-18':
+ PiroMage:
+ - bugfix: 'Nova Station #8 Patch (#6033)'
diff --git a/icons/_nanomaps/Nova_nanomap_z1.png b/icons/_nanomaps/Nova_nanomap_z1.png
index b9c75d65c3b..227991edc30 100644
Binary files a/icons/_nanomaps/Nova_nanomap_z1.png and b/icons/_nanomaps/Nova_nanomap_z1.png differ
diff --git a/icons/_nanomaps/Nova_nanomap_z2.png b/icons/_nanomaps/Nova_nanomap_z2.png
index 5b6d201f801..80723ffdcfc 100644
Binary files a/icons/_nanomaps/Nova_nanomap_z2.png and b/icons/_nanomaps/Nova_nanomap_z2.png differ
diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi
index c0d5b532e50..8ff67b1f4a7 100644
Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ
diff --git a/icons/obj/weapons/projectile.dmi b/icons/obj/weapons/projectile.dmi
index 9c0309dc245..4dd37d84e0f 100644
Binary files a/icons/obj/weapons/projectile.dmi and b/icons/obj/weapons/projectile.dmi differ