diff --git a/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm b/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm
index a317684f03..fec45c7310 100644
--- a/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm
+++ b/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm
@@ -675,6 +675,7 @@
/area/mine/production)
"mp" = (
/obj/docking_port/stationary{
+ area_type = /area/lavaland/surface/outdoors;
dir = 8;
dwidth = 2;
height = 5;
@@ -1901,6 +1902,7 @@
/area/mine/laborcamp)
"Hk" = (
/obj/docking_port/stationary{
+ area_type = /area/lavaland/surface/outdoors;
dir = 8;
dwidth = 3;
height = 7;
@@ -2291,6 +2293,7 @@
/area/mine/living_quarters)
"Lb" = (
/obj/docking_port/stationary{
+ area_type = /area/lavaland/surface/outdoors;
dir = 8;
dwidth = 3;
height = 10;
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 4743d12d0e..a630c54b6e 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -173,19 +173,6 @@
"aay" = (
/turf/open/floor/plating,
/area/security/prison)
-"aaz" = (
-/obj/structure/lattice/catwalk,
-/obj/item/stack/marker_beacon{
- anchored = 1;
- icon_state = "markerburgundy-on";
- light_color = "#FA644B";
- light_power = 3;
- light_range = 3;
- name = "Docking Beacon";
- picked_color = "Burgundy"
- },
-/turf/open/space/basic,
-/area/space/nearstation)
"aaA" = (
/obj/machinery/seed_extractor,
/turf/open/floor/plasteel,
@@ -247,46 +234,10 @@
/obj/structure/chair/stool,
/turf/open/floor/plasteel,
/area/security/prison)
-"aaK" = (
-/obj/structure/lattice/catwalk,
-/obj/item/stack/marker_beacon{
- anchored = 1;
- icon_state = "markerburgundy-on";
- light_color = "#FA644B";
- light_power = 3;
- light_range = 3;
- name = "Docking Beacon";
- picked_color = "Burgundy"
- },
-/turf/open/floor/plating,
-/area/space/nearstation)
-"aaL" = (
-/obj/machinery/photocopier,
-/turf/open/floor/wood,
-/area/library)
-"aaM" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/quartermaster/office)
"aaN" = (
/obj/structure/chair/sofa/right,
/turf/open/floor/plasteel,
/area/security/prison)
-"aaO" = (
-/obj/effect/spawner/lootdrop/keg,
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
"aaP" = (
/obj/machinery/computer/cryopod{
dir = 8;
@@ -297,12 +248,6 @@
},
/turf/open/floor/plasteel,
/area/security/prison)
-"aaQ" = (
-/obj/structure/sign/poster/contraband/random{
- pixel_y = 32
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
"aaR" = (
/obj/structure/lattice,
/obj/structure/sign/warning/securearea{
@@ -340,15 +285,6 @@
},
/turf/open/floor/plasteel,
/area/security/prison)
-"aaY" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 4;
- name = "4maintenance loot spawner"
- },
-/obj/item/poster/random_official,
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
"aaZ" = (
/turf/closed/wall/r_wall,
/area/ai_monitored/security/armory)
@@ -569,11 +505,6 @@
"abF" = (
/turf/open/floor/plasteel/freezer,
/area/security/prison)
-"abG" = (
-/obj/structure/door_assembly/door_assembly_mai,
-/obj/item/electronics/airlock,
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
"abH" = (
/obj/structure/table,
/obj/item/storage/box/chemimp{
@@ -1634,10 +1565,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
-"adO" = (
-/obj/effect/spawner/structure/window/shuttle,
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
"adP" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -2052,34 +1979,6 @@
},
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
-"aeD" = (
-/obj/structure/grille/broken,
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
-"aeE" = (
-/obj/structure/girder,
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
-"aeF" = (
-/obj/machinery/airalarm{
- dir = 4;
- pixel_x = -23
- },
-/obj/machinery/computer/station_alert{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/turret_protected/aisat_interior)
"aeG" = (
/obj/structure/cable,
/obj/machinery/power/solar{
@@ -2458,12 +2357,6 @@
},
/turf/open/floor/plasteel,
/area/security/main)
-"afn" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
- },
-/turf/open/floor/plasteel/grimy,
-/area/ai_monitored/turret_protected/aisat_interior)
"afo" = (
/obj/machinery/door/airlock/external{
name = "Escape Pod Three"
@@ -2484,39 +2377,6 @@
},
/turf/open/space/basic,
/area/space)
-"afq" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel/grimy,
-/area/ai_monitored/turret_protected/aisat_interior)
-"afr" = (
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
-/turf/open/floor/plasteel/grimy,
-/area/ai_monitored/turret_protected/aisat_interior)
-"afs" = (
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_x = -31
- },
-/obj/machinery/computer/monitor{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/turret_protected/aisat_interior)
"aft" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 5
@@ -2827,15 +2687,6 @@
/obj/machinery/atmospherics/pipe/manifold4w/general/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
-"age" = (
-/obj/structure/chair/office/dark{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/grimy,
-/area/ai_monitored/turret_protected/aisat_interior)
"agf" = (
/obj/structure/table,
/obj/item/stack/sheet/metal,
@@ -2985,10 +2836,6 @@
/obj/machinery/suit_storage_unit/security,
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
-"agv" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/grimy,
-/area/ai_monitored/turret_protected/aisat_interior)
"agw" = (
/obj/structure/table,
/obj/machinery/syndicatebomb/training,
@@ -3118,14 +2965,6 @@
},
/turf/open/floor/plasteel,
/area/security/main)
-"agH" = (
-/obj/machinery/bluespace_beacon,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/landmark/start/cyborg,
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/turret_protected/aisat_interior)
"agI" = (
/obj/machinery/airalarm{
pixel_y = 23
@@ -3255,12 +3094,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/security/warden)
-"agX" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
- },
-/turf/open/floor/plasteel/grimy,
-/area/ai_monitored/turret_protected/aisat_interior)
"agY" = (
/obj/structure/table,
/obj/item/storage/fancy/donut_box,
@@ -3501,16 +3334,6 @@
},
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
-"ahw" = (
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel/grimy,
-/area/ai_monitored/turret_protected/aisat_interior)
"ahx" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -4651,16 +4474,6 @@
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/security/brig)
-"ajC" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/grimy,
-/area/ai_monitored/turret_protected/aisat_interior)
"ajD" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -4869,18 +4682,6 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/maintenance/solars/port/fore)
-"ajX" = (
-/obj/machinery/computer/teleporter{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/ai_monitored/turret_protected/aisat_interior)
-"ajY" = (
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/landmark/start/cyborg,
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/turret_protected/aisat/atmos)
"ajZ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/warning/vacuum/external{
@@ -5164,18 +4965,6 @@
},
/turf/open/floor/plasteel,
/area/security/courtroom)
-"akz" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/effect/landmark/start/cyborg,
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/turret_protected/aisat_interior)
"akA" = (
/obj/structure/chair{
dir = 8;
@@ -6276,14 +6065,6 @@
/turf/open/floor/plasteel,
/area/security/processing)
"anu" = (
-/obj/machinery/button/door{
- desc = "A remote control switch for the exit.";
- id = "laborexit";
- name = "exit button";
- normaldoorcontrol = 1;
- pixel_x = 26;
- pixel_y = -6
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
@@ -6432,10 +6213,8 @@
/area/space)
"anP" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security{
- id_tag = "laborexit";
- name = "Labor Shuttle";
- req_access_txt = "63"
+/obj/machinery/door/airlock/security/glass{
+ name = "Labor Camp Shuttle Airlock"
},
/turf/open/floor/plasteel,
/area/security/processing)
@@ -16138,6 +15917,10 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/port)
+"aNV" = (
+/obj/machinery/photocopier,
+/turf/open/floor/wood,
+/area/library)
"aNW" = (
/obj/machinery/door/airlock/public/glass{
name = "Chapel Office";
@@ -22009,7 +21792,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
},
-/turf/open/floor/wood,
+/turf/open/floor/carpet,
/area/crew_quarters/heads/captain)
"bcR" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -22128,6 +21911,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/computer/arcade/minesweeper,
/turf/open/floor/wood,
/area/crew_quarters/heads/captain)
"bdj" = (
@@ -23115,7 +22899,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/heads/captain)
"bfD" = (
/obj/structure/cable{
@@ -26705,6 +26489,7 @@
/area/crew_quarters/heads/captain)
"boa" = (
/obj/structure/toilet{
+ contents = newlist(/obj/item/toy/snappop/phoenix);
dir = 4
},
/turf/open/floor/plasteel/freezer,
@@ -30020,6 +29805,12 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/qm)
+"bvG" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/space/nearstation)
"bvH" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
@@ -30190,6 +29981,21 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
+"bwc" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/office)
"bwd" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -48366,6 +48172,16 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
+"coh" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"coi" = (
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
+/turf/open/floor/plasteel,
+/area/security/brig)
"cop" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{
dir = 1
@@ -48524,6 +48340,10 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
+"coI" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
+/area/hydroponics)
"coJ" = (
/obj/machinery/door/firedoor,
/obj/structure/cable/yellow{
@@ -48754,6 +48574,15 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
+"cpF" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/structure/sign/poster/official/space_cops{
+ pixel_x = -32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
"cpG" = (
/obj/structure/table/optable,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
@@ -49488,9 +49317,46 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
+"ctu" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/open/floor/plasteel/grimy,
+/area/ai_monitored/turret_protected/aisat_interior)
"ctv" = (
/turf/closed/wall/r_wall,
/area/space/nearstation)
+"ctw" = (
+/obj/machinery/airalarm{
+ dir = 4;
+ pixel_x = -23
+ },
+/obj/machinery/computer/station_alert{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/turret_protected/aisat_interior)
+"ctx" = (
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
+/turf/open/floor/plasteel/grimy,
+/area/ai_monitored/turret_protected/aisat_interior)
+"cty" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/grimy,
+/area/ai_monitored/turret_protected/aisat_interior)
"ctz" = (
/obj/machinery/door/poddoor/shutters{
id = "teledoor";
@@ -49535,6 +49401,41 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
+"ctG" = (
+/obj/structure/chair/office/dark{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/grimy,
+/area/ai_monitored/turret_protected/aisat_interior)
+"ctH" = (
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_x = -31
+ },
+/obj/machinery/computer/monitor{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/turret_protected/aisat_interior)
+"ctI" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/grimy,
+/area/ai_monitored/turret_protected/aisat_interior)
"ctJ" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -49558,6 +49459,14 @@
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/aisat_interior)
+"ctM" = (
+/obj/machinery/bluespace_beacon,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/landmark/start/cyborg,
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/turret_protected/aisat_interior)
"ctN" = (
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 10
@@ -49565,6 +49474,12 @@
/obj/structure/lattice,
/turf/open/space,
/area/space/nearstation)
+"ctP" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/open/floor/plasteel/grimy,
+/area/ai_monitored/turret_protected/aisat_interior)
"ctQ" = (
/obj/structure/table,
/obj/machinery/microwave{
@@ -49590,6 +49505,26 @@
/obj/structure/sign/warning/radiation/rad_area,
/turf/closed/wall,
/area/engine/engineering)
+"ctS" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/grimy,
+/area/ai_monitored/turret_protected/aisat_interior)
+"ctT" = (
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/grimy,
+/area/ai_monitored/turret_protected/aisat_interior)
"ctU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -49612,6 +49547,12 @@
/obj/structure/chair,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
+"ctW" = (
+/obj/machinery/computer/teleporter{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/ai_monitored/turret_protected/aisat_interior)
"ctX" = (
/obj/machinery/camera{
c_tag = "MiniSat Teleporter";
@@ -49892,6 +49833,12 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/atmos)
+"cuC" = (
+/obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/landmark/start/cyborg,
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/turret_protected/aisat/atmos)
"cuD" = (
/obj/machinery/light/small{
dir = 8
@@ -49940,6 +49887,18 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
+"cuG" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/landmark/start/cyborg,
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/turret_protected/aisat_interior)
"cuH" = (
/obj/machinery/light/small{
dir = 8
@@ -50882,14 +50841,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
-"cwP" = (
-/obj/structure/fireplace,
-/obj/machinery/airalarm{
- dir = 8;
- pixel_x = 23
- },
-/turf/open/floor/plating,
-/area/maintenance/port)
"cwT" = (
/obj/machinery/camera{
c_tag = "Arrivals Escape Pod 2";
@@ -51199,14 +51150,6 @@
},
/turf/open/floor/plating,
/area/engine/engineering)
-"czi" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 8;
- name = "8maintenance loot spawner"
- },
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
"czk" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
@@ -52077,6 +52020,15 @@
/obj/machinery/deepfryer,
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
+"cCt" = (
+/obj/structure/closet,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 4;
+ name = "4maintenance loot spawner"
+ },
+/obj/item/poster/random_official,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
"cCB" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 10
@@ -52238,6 +52190,36 @@
/obj/structure/closet/radiation,
/turf/open/floor/plasteel,
/area/engine/engineering)
+"cEo" = (
+/obj/structure/closet/boxinggloves,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"cGz" = (
+/obj/structure/table/wood,
+/obj/item/instrument/violin,
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"cHf" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/condiment/saltshaker{
+ pixel_x = -3;
+ pixel_y = 20
+ },
+/obj/item/reagent_containers/food/condiment/peppermill{
+ dir = 1;
+ pixel_x = 3;
+ pixel_y = 20
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/item/reagent_containers/food/drinks/britcup,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"cHD" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -52548,27 +52530,10 @@
},
/turf/open/floor/plating,
/area/hallway/secondary/entry)
-"cJn" = (
-/obj/structure/reagent_dispensers/watertank/high,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/box,
-/turf/open/floor/plasteel,
-/area/engine/atmos)
-"cMk" = (
-/obj/machinery/vr_sleeper{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
+"cIv" = (
+/obj/structure/sign/poster/official/cohiba_robusto_ad,
+/turf/closed/wall,
+/area/lawoffice)
"cMC" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -52599,6 +52564,10 @@
},
/turf/open/floor/plasteel/airless/solarpanel,
/area/solar/starboard/aft)
+"cMS" = (
+/obj/item/chair/wood,
+/turf/open/floor/plating,
+/area/maintenance/port)
"cNa" = (
/obj/structure/cable,
/obj/machinery/power/solar{
@@ -52752,6 +52721,10 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"cPn" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/freezer,
+/area/crew_quarters/toilet)
"cPA" = (
/obj/machinery/atmospherics/components/binary/valve{
dir = 4
@@ -52794,47 +52767,25 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"cRz" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
+"cQF" = (
+/obj/structure/closet,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 8;
+ name = "8maintenance loot spawner"
},
-/obj/machinery/button/door{
- id = "holoprivacy";
- name = "Holodeck Privacy";
- pixel_y = 24
+/obj/item/radio/intercom{
+ pixel_y = 25
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"cRD" = (
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/structure/dresser,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/machinery/power/apc{
- areastring = "/area/crew_quarters/theatre";
- dir = 8;
- name = "Theatre APC";
- pixel_x = -25
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/theatre)
-"cSn" = (
-/obj/machinery/light_switch{
- pixel_y = 28
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
+"cQT" = (
+/obj/structure/filingcabinet,
/obj/machinery/light{
- dir = 1
+ dir = 8;
+ light_color = "#e8eaff"
},
-/turf/open/floor/circuit,
-/area/ai_monitored/nuke_storage)
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
"cSA" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -53196,6 +53147,12 @@
},
/turf/open/floor/plating,
/area/maintenance/department/medical/morgue)
+"cTT" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/circuit,
+/area/ai_monitored/nuke_storage)
"cTX" = (
/obj/structure/cable{
icon_state = "0-2"
@@ -53218,952 +53175,31 @@
},
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
+"cUx" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/bridge/meeting_room)
"cVb" = (
/turf/closed/wall,
/area/hallway/secondary/service)
-"cVp" = (
-/obj/structure/window/reinforced/tinted{
- dir = 8
- },
-/obj/structure/window/reinforced/tinted{
- dir = 4
- },
-/obj/structure/curtain,
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/dorms)
-"cVu" = (
-/obj/machinery/camera{
- c_tag = "Locker Room South";
- dir = 8
- },
-/obj/structure/closet/secure_closet/personal,
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
+"cVs" = (
+/obj/machinery/vending/coffee,
+/turf/open/floor/wood,
+/area/bridge/meeting_room)
"cVK" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"cXx" = (
-/obj/machinery/door/airlock/security{
- name = "Labor Shuttle";
- req_access_txt = "2"
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
-/area/security/processing)
-"dbn" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall/r_wall,
-/area/engine/engine_smes)
-"dbM" = (
-/turf/open/floor/plating,
-/area/space/nearstation)
-"dcG" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/closet/wardrobe/pjs,
-/obj/item/clothing/under/maid,
-/obj/item/clothing/under/maid,
-/obj/item/clothing/under/janimaid,
-/obj/item/clothing/under/janimaid,
-/obj/item/clothing/accessory/maidapron,
-/obj/item/clothing/accessory/maidapron,
-/obj/machinery/light{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"dfh" = (
-/obj/machinery/power/apc{
- areastring = "/area/science/circuit";
- name = "Circuitry Lab APC";
- pixel_x = 30
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/open/floor/plasteel,
-/area/science/circuit)
-"dfI" = (
-/obj/machinery/door/firedoor,
-/obj/structure/sign/departments/evac{
- pixel_y = -32
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/starboard)
-"dfL" = (
-/obj/structure/reagent_dispensers/keg/gargle,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"dgh" = (
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green,
-/obj/machinery/camera{
- c_tag = "VR Sleepers";
- dir = 1
- },
-/obj/machinery/light/small,
-/turf/open/floor/plasteel/white/side{
- dir = 1
- },
-/area/crew_quarters/fitness)
-"dgz" = (
-/turf/closed/wall,
-/area/crew_quarters/cryopod)
-"dhx" = (
-/obj/structure/mirror{
- pixel_y = 32
- },
-/obj/structure/sink{
- dir = 1;
- pixel_y = 25
- },
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/dorms)
-"dok" = (
-/obj/item/twohanded/required/kirbyplants{
- icon_state = "plant-22"
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
-"doP" = (
-/obj/structure/chair/stool{
- pixel_y = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/carpet{
- icon_state = "carpetsymbol"
- },
-/area/crew_quarters/theatre)
-"dqu" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/closed/wall/r_wall,
-/area/maintenance/disposal/incinerator)
-"dtE" = (
-/obj/machinery/light{
- dir = 8
- },
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"dvc" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
- },
-/turf/open/floor/carpet,
-/area/crew_quarters/cryopod)
-"dvO" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 10
- },
-/turf/closed/wall,
-/area/science/circuit)
-"dwc" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"dxB" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/machinery/light/small{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/security/prison)
-"dzi" = (
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/open/floor/carpet,
-/area/crew_quarters/cryopod)
-"dzy" = (
-/obj/machinery/door/airlock{
- name = "Shower Room"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/toilet)
-"dHb" = (
-/obj/structure/chair/comfy/black{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"dKP" = (
-/turf/closed/wall,
-/area/maintenance/bar)
-"dKV" = (
-/obj/structure/chair/stool/bar,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"dMu" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 5
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"dMX" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 6
- },
-/obj/structure/chair/comfy/brown,
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"dMZ" = (
-/obj/structure/sign/poster/official/random{
- pixel_y = 32
- },
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
-"dRC" = (
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel,
-/area/hydroponics)
-"dSv" = (
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/power/apc{
- areastring = "/area/crew_quarters/abandoned_gambling_den";
- name = "Abandoned Gambling Den APC";
- pixel_y = -24
- },
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
-"dTe" = (
-/obj/structure/chair/comfy/beige{
- dir = 8
- },
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/plasteel/grimy,
-/area/hallway/secondary/entry)
-"dTJ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 10
- },
-/obj/structure/chair/comfy/brown{
- dir = 4
- },
-/turf/open/floor/carpet,
-/area/crew_quarters/heads/captain)
-"eaI" = (
-/obj/structure/table/reinforced,
-/obj/item/radio/intercom{
- pixel_x = -30
- },
-/obj/item/stock_parts/cell/high,
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
-"edH" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"ego" = (
-/obj/machinery/atmospherics/components/binary/valve,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"egQ" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "kitchen";
- name = "kitchen shutters"
- },
-/obj/item/reagent_containers/food/snacks/bluecherrycupcake{
- pixel_y = 5
- },
-/turf/open/floor/plasteel/cafeteria,
-/area/crew_quarters/kitchen)
-"egS" = (
-/obj/structure/table/wood/fancy,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4;
- pixel_y = 5
- },
-/obj/item/reagent_containers/food/snacks/burger/plain,
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"elw" = (
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
+"cXU" = (
/obj/effect/turf_decal/tile/red,
+/obj/machinery/light{
+ light_color = "#c9d3e8"
+ },
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
-"epV" = (
-/obj/structure/bed,
-/obj/machinery/button/door{
- id = "Dorm6";
- name = "Cabin Bolt Control";
- normaldoorcontrol = 1;
- pixel_y = -25;
- specialfunctions = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/obj/effect/spawner/lootdrop/bedsheet,
-/turf/open/floor/wood,
-/area/crew_quarters/dorms)
-"eqm" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 9
- },
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"est" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/machinery/computer/shuttle/mining/common{
- dir = 4
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/entry)
-"evR" = (
-/turf/open/floor/plating,
-/area/maintenance/bar)
-"ewZ" = (
-/obj/structure/chair/sofa/right,
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"eyM" = (
-/obj/machinery/mineral/ore_redemption{
- input_dir = 2;
- output_dir = 1
- },
-/obj/machinery/door/firedoor,
-/turf/open/floor/plasteel,
-/area/quartermaster/miningdock)
-"eHI" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/maintenance/disposal/incinerator)
-"eLH" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/open/floor/plating,
-/area/maintenance/fore)
-"eMQ" = (
-/obj/item/radio/intercom{
- pixel_y = 25
- },
-/obj/machinery/vending/wardrobe/curator_wardrobe,
-/turf/open/floor/carpet,
-/area/library)
-"eND" = (
-/obj/structure/filingcabinet,
-/obj/machinery/light{
- dir = 8;
- light_color = "#e8eaff"
- },
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"eNK" = (
-/obj/structure/table/wood,
-/obj/item/instrument/guitar,
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"eNW" = (
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/dorms)
-"eOv" = (
-/obj/effect/landmark/event_spawn,
-/turf/closed/wall,
-/area/crew_quarters/fitness)
-"eOy" = (
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
-"ePO" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4;
- pixel_y = 5
- },
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"eRk" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"eRn" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 6
- },
-/turf/closed/wall,
-/area/quartermaster/warehouse)
-"eRz" = (
-/obj/structure/lattice,
-/obj/structure/grille,
-/turf/open/space/basic,
-/area/space/nearstation)
-"eUd" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/chair/comfy/brown{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"eVC" = (
-/obj/effect/spawner/structure/window,
-/obj/machinery/door/firedoor,
-/turf/open/floor/plating,
-/area/crew_quarters/cryopod)
-"eVL" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/light_switch{
- pixel_y = 28
- },
-/obj/machinery/light{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/quartermaster/miningdock)
-"eXm" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"fbm" = (
-/obj/structure/chair/comfy/brown{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"fby" = (
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"fcG" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5
- },
-/turf/closed/wall/r_wall,
-/area/science/mixing)
-"fhP" = (
-/obj/machinery/light{
- dir = 8;
- light_color = "#e8eaff"
- },
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"fjy" = (
-/obj/structure/lattice,
-/turf/closed/wall/r_wall,
-/area/crew_quarters/heads/captain)
-"flc" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/fancy/donut_box,
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
-"fnC" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
- },
-/obj/machinery/airalarm{
- dir = 4;
- pixel_x = -23
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/service)
-"fnJ" = (
-/obj/structure/sign/mining{
- pixel_y = 7
- },
-/turf/closed/wall,
-/area/quartermaster/miningdock)
-"frE" = (
-/obj/machinery/vr_sleeper{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/crew_quarters/fitness)
-"ftv" = (
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 4;
- name = "4maintenance loot spawner"
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"fuo" = (
-/obj/item/reagent_containers/glass/bucket,
-/turf/open/floor/grass,
-/area/security/prison)
-"fvk" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
-"fvW" = (
-/obj/structure/chair/comfy/brown{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"fvY" = (
-/obj/machinery/computer/cryopod{
- pixel_y = 26
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
- },
-/turf/open/floor/carpet,
-/area/crew_quarters/cryopod)
-"fxa" = (
-/obj/structure/chair/wood/normal,
-/turf/open/floor/wood{
- icon_state = "wood-broken4"
- },
-/area/maintenance/bar)
-"fyq" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1;
- pixel_x = 5
- },
-/obj/machinery/light/small,
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/toilet)
-"fyM" = (
-/obj/structure/closet/wardrobe/cargotech,
-/obj/item/radio/headset/headset_cargo,
-/turf/open/floor/plasteel,
-/area/quartermaster/storage)
-"fzd" = (
-/turf/closed/wall,
-/area/crew_quarters/abandoned_gambling_den)
-"fGf" = (
-/obj/machinery/smartfridge/disks{
- pixel_y = 2
- },
-/obj/structure/table,
-/obj/item/radio/intercom{
- pixel_y = 25
- },
-/turf/open/floor/plasteel,
-/area/hydroponics)
-"fGl" = (
-/obj/effect/landmark/event_spawn,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel,
-/area/security/brig)
-"fGC" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/door/airlock/vault,
-/obj/effect/mapping_helpers/airlock/locked,
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/nuke_storage)
-"fHK" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"fIn" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 8
- },
-/obj/machinery/meter,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"fJa" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4;
- pixel_y = 5
- },
-/obj/structure/chair/sofa{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"fKl" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/plasteel,
-/area/science/circuit)
-"fLd" = (
-/obj/structure/table/wood,
-/obj/machinery/requests_console{
- department = "Theatre";
- name = "theatre RC";
- pixel_x = -32
- },
-/obj/item/reagent_containers/food/snacks/baguette,
-/obj/item/toy/dummy,
-/obj/item/lipstick/random{
- pixel_x = 2;
- pixel_y = 2
- },
-/obj/item/lipstick/random{
- pixel_x = -2;
- pixel_y = -2
- },
-/turf/open/floor/plasteel/white/side{
- dir = 4
- },
-/area/crew_quarters/theatre)
-"fOc" = (
-/obj/structure/bed,
-/obj/item/bedsheet/random,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"fPs" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "kitchen";
- name = "kitchen shutters"
- },
-/obj/item/reagent_containers/food/snacks/cheesynachos{
- pixel_y = 5
- },
-/turf/open/floor/plasteel/cafeteria,
-/area/crew_quarters/kitchen)
-"fQF" = (
-/obj/structure/sign/warning/fire{
- desc = "A sign that states the labeled room's number.";
- dir = 5;
- icon_state = "roomnum";
- name = "Room Number 7";
- pixel_y = 24
- },
-/obj/structure/chair/sofa/right,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"fSr" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/light,
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"fTg" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/firealarm{
- pixel_y = 24
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
-"fVU" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Holodeck Door"
- },
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/fitness)
-"fZD" = (
-/obj/structure/filingcabinet,
-/obj/machinery/light{
- dir = 4;
- light_color = "#e8eaff"
- },
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"gbq" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/airalarm{
- dir = 1;
- pixel_y = -22
- },
-/turf/open/floor/plating,
-/area/construction)
-"gbT" = (
-/obj/structure/table,
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/turf/open/floor/plating,
-/area/maintenance/department/medical/morgue)
-"gdu" = (
-/obj/structure/toilet{
- dir = 4
- },
-/obj/structure/mirror{
- pixel_y = 32
- },
-/obj/structure/sink{
- dir = 1;
- pixel_y = 25
- },
-/obj/machinery/button/door{
- id = "LockerShitter2";
- name = "Door Bolt Control";
- normaldoorcontrol = 1;
- pixel_x = 14;
- pixel_y = 38;
- specialfunctions = 4
- },
-/obj/machinery/light/small{
- dir = 8
- },
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/toilet/locker)
-"gfD" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/carpet,
-/area/crew_quarters/cryopod)
-"ggg" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/cable,
-/turf/open/space,
-/area/solar/starboard/aft)
-"ghs" = (
-/obj/structure/table/wood/fancy,
-/obj/machinery/light,
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -3;
- pixel_y = 20
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- dir = 1;
- pixel_x = 3;
- pixel_y = 20
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4;
- pixel_y = 5
- },
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"ghJ" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/structure/sign/warning/fire{
- desc = "A sign that states the labeled room's number.";
- icon_state = "roomnum";
- name = "Room Number 1";
- pixel_x = -30;
- pixel_y = -7
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"ghY" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"gjf" = (
-/obj/machinery/vending/coffee,
-/turf/open/floor/wood,
-/area/bridge/meeting_room)
-"gjl" = (
-/turf/closed/wall,
-/area/quartermaster/warehouse)
-"gjC" = (
-/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
- },
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"gtL" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 10
- },
-/turf/closed/wall/r_wall,
-/area/engine/gravity_generator)
-"gwd" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/science/circuit)
-"gwi" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"gBo" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"gCe" = (
-/obj/effect/spawner/lootdrop/keg,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"gFD" = (
-/obj/structure/table/wood/fancy/royalblue,
-/obj/item/crowbar/red,
-/turf/open/floor/plating,
-/area/maintenance/port)
-"gIO" = (
-/obj/structure/bed,
-/obj/effect/spawner/lootdrop/bedsheet,
-/turf/open/floor/plating,
-/area/security/prison)
-"gJg" = (
-/turf/closed/wall/mineral/titanium,
-/area/space/nearstation)
-"gKk" = (
-/obj/machinery/vr_sleeper{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plasteel/white/side{
- dir = 4
- },
-/area/crew_quarters/fitness)
-"gLH" = (
-/obj/machinery/door/airlock/external{
- name = "External Access";
- req_access_txt = "13"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/maintenance/port/fore)
-"gMl" = (
-/obj/structure/chair/wood/normal{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"gOZ" = (
-/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
- },
-/turf/open/floor/plating,
-/area/crew_quarters/fitness)
-"gQn" = (
-/obj/machinery/light/small,
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/dorms)
-"gSH" = (
-/obj/structure/grille,
-/turf/closed/wall/r_wall,
-/area/space/nearstation)
-"gVX" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 6
- },
-/turf/closed/wall/r_wall,
-/area/engine/engine_smes)
-"gVY" = (
+"daI" = (
/obj/structure/reagent_dispensers/foamtank,
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -54178,488 +53214,20 @@
/obj/effect/turf_decal/stripes/box,
/turf/open/floor/plasteel,
/area/engine/atmos)
-"gWd" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/turf/open/floor/plating,
-/area/construction)
-"gXs" = (
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/space/nearstation)
-"gZG" = (
-/obj/structure/closet/crate/freezer/surplus_limbs,
-/obj/item/reagent_containers/glass/beaker/synthflesh,
-/turf/open/floor/plasteel/white/side{
- dir = 8
- },
-/area/medical/sleeper)
-"haz" = (
-/obj/machinery/autolathe{
- name = "public autolathe"
- },
-/turf/open/floor/plasteel,
-/area/quartermaster/office)
-"haX" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 10
- },
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "holoprivacy";
- name = "Holodeck Shutters"
- },
-/turf/open/floor/plating,
-/area/crew_quarters/fitness)
-"hcd" = (
-/obj/machinery/smartfridge/organ/preloaded,
-/turf/closed/wall,
-/area/medical/sleeper)
-"hdb" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"hdp" = (
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 3;
- name = "3maintenance loot spawner"
- },
+"dbU" = (
/obj/structure/light_construct{
- dir = 8
+ dir = 1
},
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
-"hfe" = (
-/obj/structure/sign/poster/contraband/smoke{
- desc = "This poster reminds us all that the Detective is a parasite. Year after year, they must get replacement lungs because of their addiction. ";
- pixel_y = -32
- },
-/turf/open/floor/plasteel/grimy,
-/area/security/detectives_office)
-"hgX" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
+"dce" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
-/obj/machinery/light/small,
-/obj/structure/extinguisher_cabinet{
- pixel_x = 5;
- pixel_y = -32
- },
-/turf/open/floor/plasteel/white/side{
- dir = 1
- },
-/area/crew_quarters/fitness)
-"hik" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/space,
-/area/solar/starboard/aft)
-"hjw" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall/r_wall,
-/area/engine/gravity_generator)
-"hkg" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/closed/wall,
-/area/crew_quarters/dorms)
-"hlY" = (
-/obj/machinery/door/airlock{
- name = "Recharging Station"
- },
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
-"hoo" = (
-/obj/effect/landmark/carpspawn,
-/turf/open/space/basic,
-/area/space)
-"htr" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/hydroponics)
-"hvS" = (
-/obj/effect/landmark/stationroom/box/engine,
-/turf/open/space/basic,
-/area/space)
-"hwu" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel/grimy,
-/area/security/detectives_office)
-"hzw" = (
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/structure/window{
- dir = 1
- },
-/obj/structure/window{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"hzR" = (
-/obj/machinery/light{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"hKF" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/turf/open/floor/plating,
-/area/storage/tech)
-"hMx" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"hRa" = (
-/obj/structure/table/reinforced,
-/obj/machinery/light{
- dir = 8
- },
-/obj/machinery/cell_charger{
- pixel_y = 5
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
-"hRz" = (
-/obj/structure/chair/comfy/brown{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
-"hRT" = (
-/obj/effect/landmark/blobstart,
-/turf/open/floor/plating,
-/area/maintenance/department/electrical)
-"hRX" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"hSU" = (
-/obj/structure/chair/sofa/left,
-/obj/structure/window{
- dir = 1
- },
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"hVw" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"hWn" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 5
- },
-/turf/closed/wall/r_wall,
-/area/engine/gravity_generator)
-"hYW" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 2;
- name = "2maintenance loot spawner"
- },
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
-"hZH" = (
-/obj/machinery/hydroponics/constructable,
-/obj/item/radio/intercom{
- name = "Station Intercom (General)";
- pixel_x = 29
- },
-/turf/open/floor/plasteel/dark,
-/area/hydroponics)
-"idX" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/central)
-"iep" = (
-/obj/structure/mirror{
- pixel_y = 32
- },
-/obj/structure/sink{
- dir = 1;
- pixel_y = 25
- },
-/obj/structure/toilet{
- dir = 4
- },
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/dorms)
-"ier" = (
-/obj/machinery/button/door{
- id = "Room Two";
- name = "Door Bolt Control";
- normaldoorcontrol = 1;
- pixel_x = 7;
- pixel_y = -24;
- specialfunctions = 4
- },
-/obj/structure/chair/comfy/brown{
- dir = 8
- },
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"igT" = (
-/obj/structure/table/wood/poker,
-/obj/item/toy/cards/deck{
- pixel_y = 5
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1
- },
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"ihm" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/junction/flip,
-/turf/open/floor/plasteel,
-/area/hallway/primary/central)
-"ihC" = (
-/obj/item/chair/wood,
-/turf/open/floor/plating,
-/area/maintenance/port)
-"iiW" = (
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"ilJ" = (
-/obj/effect/turf_decal/tile/red,
-/obj/machinery/light{
- light_color = "#c9d3e8"
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
-"imH" = (
-/obj/structure/falsewall,
-/turf/open/floor/plating,
-/area/maintenance/bar)
-"ioB" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
- },
-/obj/effect/landmark/start/mime,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/white/side{
- dir = 4
- },
-/area/crew_quarters/theatre)
-"ioG" = (
-/obj/machinery/vending/cola/red,
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"ioX" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"ipc" = (
-/obj/machinery/door/airlock/engineering{
- name = "Gravity Generator";
- req_access_txt = "11"
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel,
-/area/engine/engine_smes)
-"ipA" = (
-/turf/open/floor/plating,
-/area/maintenance/department/medical/morgue)
-"iqw" = (
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red,
-/turf/open/floor/plasteel,
-/area/security/brig)
-"isy" = (
-/obj/structure/urinal{
- pixel_y = 32
- },
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/toilet)
-"itG" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin,
-/obj/item/pen,
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
-"itT" = (
-/obj/machinery/airalarm{
- dir = 1;
- pixel_y = -22
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/starboard)
-"ium" = (
-/mob/living/simple_animal/bot/cleanbot{
- name = "C.L.E.A.N."
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
-"ivF" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
- },
-/obj/machinery/light{
- dir = 8;
- light_color = "#e8eaff"
- },
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"iyC" = (
-/obj/machinery/light{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/item/twohanded/required/kirbyplants{
- icon_state = "plant-06"
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/entry)
-"izv" = (
-/obj/machinery/vending/clothing,
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"iEx" = (
-/obj/structure/table/wood,
-/obj/machinery/light{
- dir = 4
- },
-/obj/item/instrument/trombone,
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"iEI" = (
-/obj/machinery/vending/autodrobe/all_access,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"iEJ" = (
-/obj/machinery/door/airlock/external{
- name = "Escape Pod One"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/hallway/secondary/entry)
-"iES" = (
-/obj/structure/fireplace,
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"iFL" = (
-/obj/machinery/light{
- dir = 8
- },
-/turf/open/floor/carpet,
-/area/crew_quarters/theatre)
-"iMG" = (
-/obj/item/twohanded/required/kirbyplants{
- icon_state = "plant-14"
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/port)
-"iNn" = (
-/obj/machinery/camera{
- c_tag = "Kitchen Cold Room"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/reagent_dispensers/cooking_oil,
-/turf/open/floor/plasteel/showroomfloor,
-/area/crew_quarters/kitchen)
-"iOt" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/structure/sign/poster/contraband/free_drone{
- pixel_y = 32
- },
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
-"iOV" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/light_construct{
- dir = 4
- },
+/obj/machinery/meter,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
-"iRJ" = (
+"dev" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -54680,150 +53248,67 @@
},
/turf/open/floor/plating,
/area/maintenance/port)
-"iVU" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/spawner/structure/window,
-/obj/machinery/door/firedoor,
-/turf/open/floor/plating,
-/area/crew_quarters/cryopod)
-"iWa" = (
-/obj/structure/closet/crate,
-/obj/item/book/manual/wiki/telescience,
-/obj/item/book/manual/wiki/engineering_guide,
-/obj/item/book/manual/wiki/engineering_construction,
-/obj/item/book/manual/wiki/atmospherics,
-/obj/item/book/manual/wiki/detective,
-/obj/item/book/manual/wiki/tcomms,
-/obj/item/book/manual/wiki/engineering_singulo_tesla,
-/obj/item/book/manual/wiki/experimentor,
-/obj/item/book/manual/wiki/research_and_development,
-/obj/item/book/manual/wiki/robotics_cyborgs,
-/obj/item/book/manual/wiki/security_space_law,
-/obj/item/book/manual/wiki/medicine,
-/obj/item/book/manual/wiki/medical_cloning,
-/obj/item/book/manual/wiki/infections,
-/obj/item/book/manual/ripley_build_and_repair,
-/obj/item/book/manual/hydroponics_pod_people,
-/obj/item/book/manual/wiki/toxins,
-/obj/item/book/manual/wiki/grenades,
-/obj/item/book{
- desc = "An undeniably handy book.";
- icon_state = "bookknock";
- name = "A Simpleton's Guide to Safe-cracking with Stethoscopes"
- },
-/turf/open/floor/wood,
-/area/library)
-"iWk" = (
-/obj/structure/bookcase{
- name = "Forbidden Knowledge"
- },
-/turf/open/floor/carpet,
-/area/library)
-"iYz" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/theatre)
-"jaa" = (
-/obj/machinery/hydroponics/constructable,
-/obj/machinery/light{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/hydroponics)
-"jbf" = (
-/obj/structure/cable{
- icon_state = "0-2"
- },
+"dfh" = (
/obj/machinery/power/apc{
- areastring = "/area/hallway/secondary/service";
- dir = 1;
- name = "Service Hall APC";
- pixel_y = 25
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/service)
-"jdT" = (
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"jeR" = (
-/obj/structure/chair/sofa/left,
-/turf/open/floor/plasteel,
-/area/security/prison)
-"jeT" = (
-/obj/machinery/vending/clothing,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"jgm" = (
-/obj/structure/disposalpipe/segment{
- dir = 10
+ areastring = "/area/science/circuit";
+ name = "Circuitry Lab APC";
+ pixel_x = 30
},
/obj/effect/turf_decal/stripes/line{
- dir = 6
+ dir = 4
},
-/obj/machinery/camera{
- c_tag = "Circuitry Lab";
- dir = 8;
- network = list("ss13","rd")
+/obj/structure/cable{
+ icon_state = "0-8"
},
/turf/open/floor/plasteel,
/area/science/circuit)
-"jgv" = (
-/obj/structure/chair/comfy/brown{
- color = "#596479";
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
-"jhF" = (
-/obj/effect/turf_decal/stripes/line{
+"dfL" = (
+/obj/structure/reagent_dispensers/keg/gargle,
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"dgz" = (
+/turf/closed/wall,
+/area/crew_quarters/cryopod)
+"dgO" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/light{
- dir = 4;
- light_color = "#c1caff"
- },
-/turf/open/floor/plasteel,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall/r_wall,
/area/engine/gravity_generator)
-"jiR" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
+"diq" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/door/airlock/maintenance{
+ req_access_txt = "12"
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"dly" = (
+/obj/machinery/door/window/southright{
+ name = "Target Storage"
+ },
+/obj/item/target/alien,
+/obj/item/target/alien,
+/obj/item/target/syndicate,
+/turf/open/floor/plating,
+/area/security/prison)
+"dml" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
+"dqb" = (
+/obj/structure/bed,
+/obj/item/bedsheet/random,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/structure/window,
-/obj/structure/window{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"jlm" = (
-/obj/machinery/rnd/production/techfab/department/cargo,
-/turf/open/floor/plasteel,
-/area/quartermaster/office)
-"jly" = (
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"dqu" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/closed/wall/r_wall,
+/area/maintenance/disposal/incinerator)
+"dsC" = (
/obj/structure/chair/stool{
pixel_y = 8
},
@@ -54834,65 +53319,273 @@
icon_state = "carpetsymbol"
},
/area/crew_quarters/theatre)
-"jmC" = (
-/obj/structure/lattice/catwalk,
-/turf/open/space/basic,
-/area/space/nearstation)
-"jnm" = (
-/obj/machinery/power/smes{
- charge = 5e+006
+"dtx" = (
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 6
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 11
+ },
+/obj/structure/mirror{
+ pixel_x = 25
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
+"dvc" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/cryopod)
+"dvO" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
+ },
+/turf/closed/wall,
+/area/science/circuit)
+"dyS" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/security/prison)
+"dzi" = (
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/cryopod)
+"dBm" = (
+/obj/machinery/portable_atmospherics/scrubber,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"dCV" = (
+/obj/structure/table,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/machinery/recharger,
+/obj/item/gun/energy/laser/practice,
+/obj/item/gun/energy/laser/practice,
+/turf/open/floor/plasteel,
+/area/security/prison)
+"dKP" = (
+/turf/closed/wall,
+/area/maintenance/bar)
+"dKV" = (
+/obj/structure/chair/stool/bar,
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"dLG" = (
+/obj/machinery/door/airlock/security{
+ name = "Firing Range";
+ req_access_txt = "2"
},
/obj/structure/cable{
- icon_state = "0-8"
+ icon_state = "1-2"
},
/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"jnX" = (
-/obj/machinery/door/airlock/external{
- name = "Common Mining Shuttle Bay"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/hallway/secondary/entry)
-"job" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/machinery/door/window/westright{
- name = "Red Corner"
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"jqv" = (
-/obj/structure/chair/wood/normal{
- dir = 1
- },
-/turf/open/floor/wood{
- icon_state = "wood-broken7"
- },
-/area/maintenance/bar)
-"jrE" = (
+/area/security/prison)
+"dMZ" = (
/obj/structure/sign/poster/official/random{
- pixel_x = 32
+ pixel_y = 32
},
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"jsy" = (
+"dPk" = (
+/obj/structure/closet{
+ name = "Costume Closet"
+ },
+/obj/item/clothing/head/russobluecamohat,
+/obj/item/clothing/head/russobluecamohat,
+/obj/item/clothing/head/helmet/rus_ushanka,
+/obj/item/clothing/head/helmet/rus_ushanka,
+/obj/item/clothing/head/helmet/rus_ushanka,
+/obj/item/clothing/head/helmet/rus_ushanka,
+/obj/item/clothing/under/mw2_russian_para,
+/obj/item/clothing/under/mw2_russian_para,
+/obj/item/clothing/under/mw2_russian_para,
+/obj/item/clothing/under/mw2_russian_para,
+/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/shoes/jackboots,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"dTI" = (
+/obj/structure/urinal{
+ pixel_y = 32
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
+"dVU" = (
+/turf/open/floor/plating,
+/area/space/nearstation)
+"dXq" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#c1caff"
+ },
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"eaI" = (
+/obj/structure/table/reinforced,
+/obj/item/radio/intercom{
+ pixel_x = -30
+ },
+/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/cell/high,
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
+"eaR" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/space,
+/area/solar/starboard/fore)
+"edA" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/item/twohanded/required/kirbyplants{
+ icon_state = "plant-04"
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
+"efO" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/turf/open/floor/plating,
+/area/space/nearstation)
+"egt" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/machinery/requests_console{
+ department = "Bar";
+ departmentType = 2;
+ pixel_x = -30;
+ pixel_y = 45;
+ receive_ore_updates = 1
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/bar)
+"eih" = (
+/obj/structure/chair{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
+"elh" = (
+/obj/structure/chair/comfy/black{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"enB" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall,
+/area/security/execution/transfer)
+"epC" = (
+/obj/machinery/door/airlock{
+ desc = "To keep the station within regulations, space IKEA requires one storage cupboard for their Nanotrasen partnership to continue.";
+ id_tag = "MaintDorm1";
+ name = "Furniture Storage"
+ },
+/turf/open/floor/plasteel/dark,
+/area/maintenance/port)
+"epD" = (
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#e8eaff"
+ },
+/obj/structure/chair/sofa/right{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"eqd" = (
+/obj/item/electropack/shockcollar,
+/obj/item/assembly/signaler,
+/turf/open/floor/plating,
+/area/security/prison)
+"eqA" = (
+/obj/machinery/shower{
+ dir = 8
+ },
+/turf/open/floor/plasteel/freezer,
+/area/security/prison)
+"esZ" = (
+/obj/machinery/door/airlock{
+ desc = "Private study room where nerds are probably playing Dungeons and Dragons 13e, or a place for blood cult rituals.";
+ id_tag = "PrivateStudy";
+ name = "Private Study"
+ },
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/wood,
+/area/library)
+"evR" = (
+/turf/open/floor/plating,
+/area/maintenance/bar)
+"ewu" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 6
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "holoprivacy";
+ name = "Holodeck Shutters"
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/fitness)
+"exP" = (
+/obj/item/twohanded/required/kirbyplants{
+ icon_state = "plant-14"
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/port)
+"eyM" = (
+/obj/machinery/mineral/ore_redemption{
+ input_dir = 2;
+ output_dir = 1
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel,
+/area/quartermaster/miningdock)
+"eAJ" = (
+/obj/structure/chair{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"eBX" = (
+/obj/machinery/vending/cola/space_up,
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
+"eCr" = (
/obj/structure/closet{
name = "Suit Closet"
},
@@ -54916,61 +53609,1168 @@
/obj/item/clothing/under/lawyer/really_black,
/obj/item/clothing/under/lawyer/red,
/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"jtk" = (
-/obj/structure/chair/comfy/black{
+/area/crew_quarters/fitness)
+"eCR" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
+ },
+/turf/closed/wall/r_wall,
+/area/engine/gravity_generator)
+"eEe" = (
+/obj/machinery/door/airlock{
+ name = "Theatre Backstage";
+ req_access_txt = "46"
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"eFW" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
+"eHI" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/disposal/incinerator)
+"eHU" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/security/prison)
+"eJa" = (
+/obj/structure/table/wood/poker,
+/obj/item/toy/cards/deck{
+ pixel_y = 5
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"eQb" = (
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"eRz" = (
+/obj/structure/lattice,
+/obj/structure/grille,
+/turf/open/space/basic,
+/area/space/nearstation)
+"eSe" = (
+/obj/structure/closet/secure_closet/personal/cabinet{
+ desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here.";
+ name = "Personal ID-Locked Closet";
+ pixel_y = 15
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"eVC" = (
+/obj/effect/spawner/structure/window,
+/obj/machinery/door/firedoor,
+/turf/open/floor/plating,
+/area/crew_quarters/cryopod)
+"eVL" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/light_switch{
+ pixel_y = 28
+ },
+/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"jtU" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall,
-/area/security/execution/transfer)
-"jvN" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/area/quartermaster/miningdock)
+"fcn" = (
+/obj/structure/lattice,
+/turf/closed/wall/r_wall,
+/area/ai_monitored/nuke_storage)
+"fcG" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
+/turf/closed/wall/r_wall,
+/area/science/mixing)
+"fde" = (
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"jwi" = (
+/area/security/brig)
+"feE" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plating{
+ icon_state = "panelscorched"
+ },
+/area/maintenance/starboard/fore)
+"feG" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
/turf/open/floor/wood,
-/area/crew_quarters/heads/captain)
-"jzi" = (
+/area/crew_quarters/bar)
+"fgG" = (
+/obj/structure/table/wood,
+/obj/machinery/requests_console{
+ department = "Theatre";
+ name = "theatre RC";
+ pixel_x = -32
+ },
+/obj/item/reagent_containers/food/snacks/baguette,
+/obj/item/toy/dummy,
+/obj/item/lipstick/random{
+ pixel_x = 2;
+ pixel_y = 2
+ },
+/obj/item/lipstick/random{
+ pixel_x = -2;
+ pixel_y = -2
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 4
+ },
+/area/crew_quarters/theatre)
+"fjS" = (
+/obj/structure/closet/radiation,
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"flc" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/fancy/donut_box,
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
+"flE" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"fne" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/obj/effect/landmark/start/mime,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 4
+ },
+/area/crew_quarters/theatre)
+"fnC" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/obj/machinery/airalarm{
+ dir = 4;
+ pixel_x = -23
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/service)
+"fpl" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "holoprivacy";
+ name = "Holodeck Shutters"
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/fitness)
+"fpI" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/item/twohanded/required/kirbyplants{
+ icon_state = "plant-06"
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/entry)
+"fsj" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/security/main";
+ dir = 4;
+ name = "Firing Range APC";
+ pixel_x = 24
+ },
+/turf/open/floor/plasteel,
+/area/security/prison)
+"ftE" = (
+/obj/item/radio/intercom{
+ pixel_y = 25
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
+"fup" = (
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"fvY" = (
+/obj/machinery/computer/cryopod{
+ pixel_y = 26
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/cryopod)
+"fxa" = (
+/obj/structure/chair/wood/normal,
+/turf/open/floor/wood{
+ icon_state = "wood-broken4"
+ },
+/area/maintenance/bar)
+"fxe" = (
+/obj/structure/chair/sofa,
+/obj/structure/window{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"fxV" = (
+/turf/closed/wall/r_wall,
+/area/hallway/primary/central)
+"fzd" = (
+/obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/plasteel,
+/area/hydroponics)
+"fAj" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/structure/sign/poster/official/love_ian{
+ pixel_x = 32;
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
+"fBy" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
+"fCx" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/button/door{
+ id = "holoprivacy";
+ name = "Holodeck Privacy";
+ pixel_y = 24
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"fFA" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/hydroponics)
+"fGf" = (
+/obj/machinery/smartfridge/disks{
+ pixel_y = 2
+ },
+/obj/structure/table,
+/obj/item/radio/intercom{
+ pixel_y = 25
+ },
+/turf/open/floor/plasteel,
+/area/hydroponics)
+"fHG" = (
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"fIs" = (
/obj/structure/grille,
/obj/structure/lattice,
/turf/open/floor/plating,
/area/space/nearstation)
-"jzD" = (
-/obj/structure/piano{
- icon_state = "piano"
+"fKl" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/plasteel,
+/area/science/circuit)
+"fMZ" = (
+/obj/item/radio/intercom{
+ dir = 4;
+ name = "Station Intercom (General)";
+ pixel_x = 27
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"fOA" = (
+/obj/machinery/door/airlock{
+ name = "Theatre Backstage";
+ req_access_txt = "46"
},
/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"jAD" = (
-/obj/structure/grille,
-/turf/open/floor/plating/airless,
+/area/crew_quarters/theatre)
+"fOI" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/item/twohanded/required/kirbyplants{
+ icon_state = "plant-18"
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"fTg" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/firealarm{
+ pixel_y = 24
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
+"fTC" = (
+/obj/structure/filingcabinet,
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#e8eaff"
+ },
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
+"fZm" = (
+/obj/structure/chair/sofa/left,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"gbd" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/hydroponics)
+"gbh" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Holodeck Door"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/fitness)
+"gbq" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/airalarm{
+ dir = 1;
+ pixel_y = -22
+ },
+/turf/open/floor/plating,
+/area/construction)
+"gbu" = (
+/obj/structure/bed,
+/obj/effect/spawner/lootdrop/bedsheet,
+/turf/open/floor/plating,
+/area/security/prison)
+"gbT" = (
+/obj/structure/table,
+/obj/item/stack/sheet/metal/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/turf/open/floor/plating,
+/area/maintenance/department/medical/morgue)
+"gcF" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/light_construct{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"gfr" = (
+/obj/structure/bed,
+/turf/open/floor/plating,
+/area/maintenance/port)
+"gfC" = (
+/obj/effect/turf_decal/tile/red,
+/obj/structure/chair{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
+"gfD" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/cryopod)
+"ghq" = (
+/obj/structure/lattice/catwalk,
+/obj/item/stack/marker_beacon{
+ anchored = 1;
+ icon_state = "markerburgundy-on";
+ light_color = "#FA644B";
+ light_power = 3;
+ light_range = 3;
+ name = "Docking Beacon";
+ picked_color = "Burgundy"
+ },
+/turf/open/floor/plating,
/area/space/nearstation)
-"jBZ" = (
+"ghD" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"gjl" = (
+/turf/closed/wall,
+/area/quartermaster/warehouse)
+"gnf" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/sign/departments/custodian{
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
+"gpD" = (
+/obj/machinery/light_switch{
+ pixel_y = 28
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/circuit,
+/area/ai_monitored/nuke_storage)
+"grA" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Holodeck Door"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/fitness)
+"gwd" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/science/circuit)
+"gxc" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
+"gzf" = (
+/obj/structure/window/reinforced/tinted{
+ dir = 8
+ },
+/obj/structure/window/reinforced/tinted{
+ dir = 4
+ },
+/obj/structure/curtain,
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/dorms)
+"gBo" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"gCC" = (
+/obj/structure/sign/poster/contraband/tools,
+/turf/closed/wall,
+/area/storage/primary)
+"gDl" = (
+/obj/effect/landmark/carpspawn,
+/turf/open/space/basic,
+/area/space)
+"gIU" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/turf/open/floor/plating,
+/area/space/nearstation)
+"gJi" = (
+/obj/structure/lattice/catwalk,
+/turf/open/space/basic,
+/area/space/nearstation)
+"gLH" = (
+/obj/machinery/door/airlock/external{
+ name = "External Access";
+ req_access_txt = "13"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/fore)
+"gMl" = (
+/obj/structure/chair/wood/normal{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"gNC" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/wood,
+/area/bridge/meeting_room)
+"gOZ" = (
+/obj/machinery/door/airlock/maintenance{
+ req_access_txt = "12"
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/fitness)
+"gQX" = (
+/obj/machinery/button/door{
+ desc = "Alright, GAMER! Want to take your PWRGAME addiction to the MAX? Just smash this button with your chubby chetto encrusted hands an- oh, you broke the switch. Good job, idiot.";
+ id = "RIPFUN";
+ name = "Powerful Gamer Toggle";
+ normaldoorcontrol = 1;
+ pixel_x = -24;
+ pixel_y = 7;
+ specialfunctions = 4
+ },
+/obj/structure/table_frame/wood,
+/turf/open/floor/plating,
+/area/maintenance/port)
+"gRZ" = (
+/obj/structure/bookcase{
+ name = "Forbidden Knowledge"
+ },
+/turf/open/floor/carpet,
+/area/library)
+"gTx" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/light,
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/nuke_storage)
+"gUu" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
+/turf/closed/wall/r_wall,
+/area/engine/gravity_generator)
+"gWd" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plating,
+/area/construction)
+"gXs" = (
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
+"gZG" = (
+/obj/structure/closet/crate/freezer/surplus_limbs,
+/obj/item/reagent_containers/glass/beaker/synthflesh,
+/turf/open/floor/plasteel/white/side{
+ dir = 8
+ },
+/area/medical/sleeper)
+"haL" = (
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space)
+"haM" = (
+/obj/item/radio/intercom{
+ name = "Station Intercom (General)";
+ pixel_y = -29
+ },
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/structure/cable{
- icon_state = "1-8"
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"hcb" = (
+/turf/open/floor/carpet,
+/area/crew_quarters/theatre)
+"hcA" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"hew" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/obj/structure/cable{
- icon_state = "1-4"
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/plating,
+/area/maintenance/port)
+"hgO" = (
+/obj/structure/table,
+/obj/item/storage/pill_bottle/dice{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/food/snacks/cherrycupcake,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"hiV" = (
+/obj/effect/landmark/blobstart,
+/turf/open/floor/plating,
+/area/maintenance/department/electrical)
+"hlV" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/closed/wall,
+/area/crew_quarters/dorms)
+"hnl" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/turf/closed/wall,
+/area/maintenance/port)
+"hnU" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/security/prison)
+"hrF" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/space,
+/area/solar/port/aft)
+"hsb" = (
+/obj/structure/table/wood,
+/obj/item/book/codex_gigas,
+/obj/item/clothing/under/suit_jacket/red,
+/obj/structure/destructible/cult/tome,
+/turf/open/floor/carpet,
+/area/library)
+"hse" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/turf/open/floor/plating,
+/area/space/nearstation)
+"hBA" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/table,
+/obj/item/storage/firstaid/regular{
+ pixel_y = 5
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"hGH" = (
+/obj/machinery/door/airlock{
+ desc = "Private study room where nerds are probably playing Dungeons and Dragons 13e, or a place for blood cult rituals.";
+ id_tag = "PrivateStudy";
+ name = "Private Study"
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/wood,
+/area/library)
+"hHQ" = (
+/obj/structure/cable{
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
+"hIL" = (
+/obj/structure/sign/poster/contraband/space_up{
+ pixel_x = -32;
+ pixel_y = 32
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"hIM" = (
+/obj/machinery/door/airlock{
+ name = "Unisex Restrooms"
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
+"hOv" = (
+/obj/structure/table/wood/fancy,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/food/snacks/burger/plain,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"hPs" = (
+/obj/structure/fireplace,
+/obj/machinery/airalarm{
+ dir = 8;
+ pixel_x = 23
+ },
+/turf/open/floor/plating,
+/area/maintenance/port)
+"hPP" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 6
+ },
+/turf/closed/wall,
+/area/quartermaster/warehouse)
+"hRa" = (
+/obj/structure/table/reinforced,
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/machinery/cell_charger{
+ pixel_y = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
+"hRI" = (
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
+"hSZ" = (
+/obj/structure/chair/comfy/brown{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"hWd" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"idK" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/security/prison)
+"iiW" = (
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"ijG" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/structure/window,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
+"ikk" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"ikm" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
+"imH" = (
+/obj/structure/falsewall,
+/turf/open/floor/plating,
+/area/maintenance/bar)
+"inR" = (
+/obj/structure/chair/stool{
+ pixel_y = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/carpet{
+ icon_state = "carpetsymbol"
+ },
+/area/crew_quarters/theatre)
+"iou" = (
+/obj/machinery/light/small,
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/dorms)
+"ipA" = (
+/turf/open/floor/plating,
+/area/maintenance/department/medical/morgue)
+"itG" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin,
+/obj/item/pen,
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
+"itK" = (
+/obj/structure/table,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 3;
+ name = "3maintenance loot spawner"
+ },
+/obj/structure/light_construct{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"itQ" = (
+/obj/machinery/door/window/southleft{
+ name = "Target Storage"
+ },
+/obj/item/target/clown,
+/obj/item/target/clown,
+/obj/item/target,
+/obj/item/target,
+/turf/open/floor/plating,
+/area/security/prison)
+"ium" = (
+/mob/living/simple_animal/bot/cleanbot{
+ name = "C.L.E.A.N."
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
+"iuR" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green,
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
+"iwB" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/closed/wall,
+/area/maintenance/port)
+"izv" = (
+/obj/machinery/vending/clothing,
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"iDo" = (
+/obj/structure/grille,
+/turf/open/space/basic,
+/area/space/nearstation)
+"iDS" = (
+/obj/docking_port/stationary{
+ dir = 8;
+ dwidth = 3;
+ height = 5;
+ id = "commonmining_home";
+ name = "SS13: Common Mining Dock";
+ roundstart_template = /datum/map_template/shuttle/mining_common/meta;
+ width = 7
+ },
+/turf/open/space/basic,
+/area/space)
+"iEJ" = (
+/obj/machinery/door/airlock/external{
+ name = "Escape Pod One"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
+"iHk" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
+ },
+/turf/closed/wall/r_wall,
+/area/engine/gravity_generator)
+"iNn" = (
+/obj/machinery/camera{
+ c_tag = "Kitchen Cold Room"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/reagent_dispensers/cooking_oil,
+/turf/open/floor/plasteel/showroomfloor,
+/area/crew_quarters/kitchen)
+"iTq" = (
+/obj/structure/chair/stool{
+ pixel_y = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/carpet{
+ icon_state = "carpetsymbol"
+ },
+/area/crew_quarters/theatre)
+"iTU" = (
+/obj/structure/piano{
+ icon_state = "piano"
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"iVU" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/spawner/structure/window,
+/obj/machinery/door/firedoor,
+/turf/open/floor/plating,
+/area/crew_quarters/cryopod)
+"iWx" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/item/coin/silver,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"jaF" = (
+/obj/machinery/light/small,
+/obj/machinery/atmospherics/components/unary/tank/air{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"jaH" = (
+/obj/structure/door_assembly/door_assembly_mai,
+/obj/item/electronics/airlock,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
+"jbf" = (
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/hallway/secondary/service";
+ dir = 1;
+ name = "Service Hall APC";
+ pixel_y = 25
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/service)
+"jex" = (
+/obj/machinery/smartfridge/organ/preloaded,
+/turf/closed/wall,
+/area/medical/sleeper)
+"jez" = (
+/obj/effect/landmark/blobstart,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"jgm" = (
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/machinery/camera{
+ c_tag = "Circuitry Lab";
+ dir = 8;
+ network = list("ss13","rd")
+ },
+/turf/open/floor/plasteel,
+/area/science/circuit)
+"jgA" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"jjC" = (
+/obj/structure/table/wood,
+/obj/item/toy/cards/deck,
+/turf/open/floor/plasteel,
+/area/security/prison)
+"jkx" = (
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/machinery/computer/slot_machine,
+/obj/item/coin/iron,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"jkz" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 5
+ },
+/turf/closed/wall/r_wall,
+/area/engine/gravity_generator)
+"jlm" = (
+/obj/machinery/rnd/production/techfab/department/cargo,
+/turf/open/floor/plasteel,
+/area/quartermaster/office)
+"jls" = (
+/obj/machinery/door/airlock/security{
+ name = "Labor Shuttle";
+ req_access_txt = "2"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/security/processing)
+"jmV" = (
+/obj/structure/table/wood/fancy,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/item/reagent_containers/food/drinks/britcup{
+ desc = "Kingston's personal cup.";
+ pixel_x = 5;
+ pixel_y = 5
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"jqv" = (
+/obj/structure/chair/wood/normal{
+ dir = 1
+ },
+/turf/open/floor/wood{
+ icon_state = "wood-broken7"
+ },
+/area/maintenance/bar)
+"jrE" = (
+/obj/structure/sign/poster/official/random{
+ pixel_x = 32
+ },
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
+"juG" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "kitchen";
+ name = "kitchen shutters"
+ },
+/obj/item/reagent_containers/food/snacks/bluecherrycupcake{
+ pixel_y = 5
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/crew_quarters/kitchen)
+"jvd" = (
+/obj/structure/closet/athletic_mixed,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"jxF" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/plating,
+/area/maintenance/port)
+"jAD" = (
+/obj/structure/grille,
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
+"jAN" = (
+/obj/machinery/vr_sleeper{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 8
+ },
+/area/crew_quarters/fitness)
+"jBi" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Holodeck Door"
+ },
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/fitness)
+"jBA" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 9
+ },
+/turf/closed/wall/r_wall,
+/area/engine/gravity_generator)
"jCq" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -54983,22 +54783,46 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"jDY" = (
-/obj/structure/chair{
+"jEc" = (
+/obj/machinery/vr_sleeper{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
dir = 4
},
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"jFy" = (
-/obj/machinery/door/airlock{
- desc = "Private study room where nerds are probably playing Dungeons and Dragons 13e, or a place for blood cult rituals.";
- id_tag = "PrivateStudy";
- name = "Private Study"
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
},
-/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/wood,
-/area/library)
+/area/crew_quarters/fitness)
+"jFH" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"jGW" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/light,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"jHh" = (
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
"jHt" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment{
@@ -55012,10 +54836,23 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"jHM" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/security/prison)
+"jIs" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/space,
+/area/solar/starboard/fore)
+"jJg" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4;
+ pixel_y = 5
+ },
+/obj/structure/chair/sofa{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
"jJF" = (
/obj/machinery/door/airlock/maintenance,
/obj/structure/cable{
@@ -55023,53 +54860,42 @@
},
/turf/open/floor/wood,
/area/maintenance/port/aft)
-"jLM" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
+"jKP" = (
+/obj/structure/disposalpipe/segment,
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-2"
},
/turf/open/floor/plating,
-/area/maintenance/fore)
-"jMK" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
-"jNo" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/turf/open/floor/plating,
-/area/space/nearstation)
-"jRy" = (
-/obj/machinery/door/airlock{
- name = "Instrument Storage"
- },
-/turf/open/floor/plasteel/dark,
-/area/maintenance/starboard/fore)
-"jSa" = (
-/obj/item/electropack/shockcollar,
-/obj/item/assembly/signaler,
-/turf/open/floor/plating,
-/area/security/prison)
-"jSD" = (
-/obj/machinery/door/airlock/security{
- name = "Firing Range";
- req_access_txt = "2"
+/area/maintenance/fore/secondary)
+"jLn" = (
+/obj/machinery/door/airlock/engineering{
+ name = "Gravity Generator";
+ req_access_txt = "11"
},
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel,
+/area/engine/engine_smes)
+"jLT" = (
+/obj/machinery/button/door{
+ id = "Room Two";
+ name = "Door Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_x = 7;
+ pixel_y = -24;
+ specialfunctions = 4
+ },
+/obj/structure/chair/comfy/brown{
+ dir = 8
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"jRw" = (
+/obj/machinery/computer/arcade/minesweeper{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
/area/security/prison)
"jSO" = (
/obj/machinery/light{
@@ -55089,65 +54915,71 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"jXg" = (
-/obj/machinery/power/apc{
- areastring = "/area/ai_monitored/nuke_storage";
- dir = 1;
- name = "Vault APC";
- pixel_y = 25
- },
+"jZT" = (
/obj/structure/cable{
- icon_state = "0-2"
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/light{
- dir = 1
+/obj/machinery/door/poddoor/preopen{
+ id = "maint2"
},
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"kaq" = (
+/turf/closed/wall/mineral/titanium,
+/area/space/nearstation)
+"kdP" = (
/obj/structure/cable{
icon_state = "2-8"
},
-/turf/open/floor/circuit,
-/area/ai_monitored/nuke_storage)
-"jYI" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/security/prison)
+"ker" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"keM" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/machinery/washing_machine,
+/turf/open/floor/plasteel/freezer,
+/area/security/prison)
+"kfv" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plating,
+/area/storage/tech)
+"kfX" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"kay" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/snacks/bluecherrycupcake{
- pixel_y = 5
- },
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"kcj" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
+/turf/closed/wall/r_wall,
+/area/engine/engine_smes)
+"kgr" = (
+/obj/machinery/light/small{
+ brightness = 3;
dir = 8
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"kdm" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
/turf/open/floor/plating,
/area/security/prison)
-"kel" = (
-/obj/effect/landmark/blobstart,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"kfE" = (
-/obj/machinery/computer/libraryconsole/bookmanagement,
-/obj/structure/table,
-/turf/open/floor/plasteel,
-/area/security/prison)
"khb" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
@@ -55158,22 +54990,6 @@
/obj/item/reagent_containers/glass/bucket,
/turf/open/floor/plasteel,
/area/hallway/secondary/service)
-"khA" = (
-/obj/structure/table,
-/obj/item/instrument/guitar{
- pixel_x = -7
- },
-/obj/item/instrument/eguitar{
- pixel_x = 5
- },
-/obj/item/instrument/violin,
-/obj/item/instrument/trombone,
-/obj/item/instrument/saxophone,
-/obj/item/instrument/piano_synth,
-/obj/item/instrument/recorder,
-/obj/item/instrument/accordion,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
"khB" = (
/obj/machinery/door/airlock/external{
req_access_txt = "13"
@@ -55183,10 +54999,37 @@
},
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
-"klu" = (
+"khV" = (
+/obj/machinery/vending/cola/red,
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
+"kls" = (
/obj/structure/lattice,
-/turf/open/space/basic,
-/area/space)
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
+"kmw" = (
+/obj/structure/chair/comfy/black{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"kmS" = (
+/obj/item/flashlight/lamp/green{
+ pixel_x = -3;
+ pixel_y = 22
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4;
+ pixel_y = 5
+ },
+/obj/structure/dresser{
+ desc = "There's plenty of clothes here to change into! It has a surprising amount of variety, too.";
+ name = "Dresser";
+ pixel_y = 7
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"knx" = (
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
@@ -55215,75 +55058,57 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"ksn" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
+"kqI" = (
/obj/structure/window,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"ktP" = (
+/obj/machinery/power/smes{
+ charge = 5e+006
},
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"ktS" = (
+/turf/open/space/basic,
+/area/space/nearstation)
+"kvl" = (
+/obj/structure/grille,
+/turf/closed/wall/r_wall,
+/area/space/nearstation)
+"kvL" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"kuY" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/door/poddoor/preopen{
- id = "maint2"
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"kvb" = (
-/obj/structure/shuttle/engine/heater{
- dir = 1
- },
-/turf/closed/wall/mineral/titanium,
-/area/space/nearstation)
-"kvZ" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/nuke_storage)
-"kwy" = (
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/obj/machinery/requests_console{
- department = "Bar";
- departmentType = 2;
- pixel_x = -30;
- pixel_y = 45;
- receive_ore_updates = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
-"kxc" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"kyi" = (
-/obj/structure/bed,
-/obj/machinery/button/door{
- id = "Dorm5";
- name = "Cabin Bolt Control";
- normaldoorcontrol = 1;
- pixel_y = -25;
- specialfunctions = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/wood,
-/area/crew_quarters/dorms)
+/area/bridge/meeting_room)
+"kxf" = (
+/obj/machinery/vr_sleeper{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 4
+ },
+/area/crew_quarters/fitness)
"kyF" = (
/obj/effect/landmark/xeno_spawn,
/turf/open/floor/wood,
@@ -55292,91 +55117,83 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall/r_wall,
/area/science/mixing)
-"kCk" = (
-/obj/structure/mirror{
- pixel_y = 32
+"kAH" = (
+/obj/machinery/camera{
+ c_tag = "Bar West";
+ dir = 4
},
-/obj/structure/sink{
- dir = 1;
- pixel_y = 25
- },
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/toilet)
-"kCW" = (
-/obj/machinery/portable_atmospherics/scrubber,
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
-"kDD" = (
-/obj/structure/lattice,
-/turf/closed/wall/r_wall,
-/area/ai_monitored/nuke_storage)
-"kHJ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 6
- },
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "holoprivacy";
- name = "Holodeck Shutters"
- },
-/turf/open/floor/plating,
-/area/crew_quarters/fitness)
-"kHK" = (
-/obj/machinery/button/door{
- desc = "Bolts the doors to the Private Study.";
- id = "PrivateStudy";
- name = "Private Study Lock";
- pixel_x = 25;
- pixel_y = 25;
- req_access_txt = "";
- req_one_access_txt = "28;63"
+/obj/machinery/computer/arcade/orion_trail,
+/obj/structure/sign/poster/official/foam_force_ad{
+ pixel_x = -32
},
/turf/open/floor/wood,
-/area/library)
-"kJr" = (
-/obj/effect/turf_decal/stripes/line{
+/area/crew_quarters/bar)
+"kAJ" = (
+/obj/machinery/portable_atmospherics/pump,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"kAO" = (
+/obj/structure/chair/sofa{
+ dir = 1
+ },
+/obj/structure/window,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"kCo" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
dir = 8
},
-/turf/open/floor/plating,
-/area/security/prison)
-"kJY" = (
-/obj/item/flashlight/lamp/green{
- pixel_x = -3;
- pixel_y = 22
- },
-/obj/structure/dresser{
- desc = "There's plenty of clothes here to change into! It has a surprising amount of variety, too.";
- name = "Dresser";
- pixel_y = 7
- },
-/turf/open/floor/plating,
-/area/maintenance/port)
-"kKw" = (
-/obj/structure/lattice/catwalk,
+/turf/open/floor/plasteel,
+/area/crew_quarters/theatre)
+"kEY" = (
+/obj/effect/landmark/stationroom/box/engine,
+/turf/open/space/basic,
+/area/space)
+"kGJ" = (
/obj/structure/cable{
icon_state = "4-8"
},
-/turf/open/space,
-/area/solar/port/aft)
-"kLR" = (
-/obj/machinery/door/poddoor/shutters/preopen{
- desc = "Privacy shutters for the Private Study. Stops people spying in on your game.";
- id = "PrivateStudy1";
- name = "Private Study Privacy Shutters"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
},
-/obj/effect/spawner/structure/window,
-/turf/open/floor/wood,
-/area/library)
-"kOf" = (
-/obj/structure/chair{
- dir = 8
+/obj/structure/cable{
+ icon_state = "1-8"
},
-/obj/machinery/light/small{
- dir = 4;
- light_color = "#d8b1b1"
+/obj/structure/cable{
+ icon_state = "1-4"
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"kMt" = (
+/obj/structure/lattice,
+/turf/closed/wall,
+/area/security/prison)
+"kNv" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/sign/poster/contraband/free_drone{
+ pixel_y = 32
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"kPd" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/structure/cable{
@@ -55384,6 +55201,13 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/service)
+"kPj" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/junction/flip,
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
"kQk" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance{
@@ -55393,254 +55217,32 @@
/obj/item/storage/toolbox/electrical,
/turf/open/floor/plating,
/area/maintenance/department/medical/morgue)
-"kQZ" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 9
- },
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "holoprivacy";
- name = "Holodeck Shutters"
- },
+"kQO" = (
+/obj/structure/reagent_dispensers/keg/semen,
/turf/open/floor/plating,
-/area/crew_quarters/fitness)
-"kRk" = (
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
-/obj/machinery/light{
- dir = 4;
- light_color = "#e8eaff"
- },
-/obj/structure/chair/sofa/right{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"kRw" = (
-/obj/effect/landmark/start/roboticist,
-/turf/open/floor/plasteel/white,
-/area/science/robotics/lab)
+/area/maintenance/bar)
"kSb" = (
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
-"kSh" = (
-/obj/item/radio/intercom{
- name = "Station Intercom (General)";
- pixel_y = -29
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"kSB" = (
-/obj/machinery/atmospherics/components/unary/tank/air{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"kTz" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/dark,
-/area/bridge/meeting_room)
-"kWI" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/structure/window{
+"kWp" = (
+/obj/structure/shuttle/engine/heater{
dir = 1
},
-/turf/open/floor/plasteel/cafeteria,
-/area/crew_quarters/locker)
-"lhg" = (
-/obj/machinery/vending/clothing,
-/obj/structure/disposalpipe/segment{
- dir = 4
+/turf/closed/wall/mineral/titanium,
+/area/space/nearstation)
+"kYk" = (
+/obj/machinery/door/firedoor,
+/obj/structure/sign/departments/evac{
+ pixel_y = 32
},
/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"lmi" = (
-/obj/structure/door_assembly/door_assembly_mai,
-/obj/item/electronics/airlock,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
-"lnu" = (
-/obj/structure/chair/wood/normal{
- dir = 4
- },
-/turf/open/floor/wood{
- icon_state = "wood-broken6"
- },
-/area/maintenance/bar)
-"lwj" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
- pixel_x = 5;
- pixel_y = 7
- },
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
- pixel_x = -3;
- pixel_y = 2
- },
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"lwp" = (
-/obj/structure/chair/stool{
- pixel_y = 8
- },
-/turf/open/floor/carpet{
- icon_state = "carpetsymbol"
- },
-/area/crew_quarters/theatre)
-"lwY" = (
-/obj/machinery/door/window/westleft{
- base_state = "right";
- icon_state = "right";
- name = "Unisex Showers"
- },
-/turf/open/floor/plasteel/freezer,
+/area/hallway/primary/starboard)
+"laq" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/plasteel,
/area/security/prison)
-"lxx" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/closed/wall,
-/area/crew_quarters/bar)
-"lAB" = (
-/obj/structure/sign/nanotrasen,
-/turf/closed/wall,
-/area/science/circuit)
-"lBE" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"lCi" = (
-/obj/docking_port/stationary/public_mining_dock{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/construction/mining/aux_base)
-"lCB" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/turf/open/floor/plating,
-/area/space/nearstation)
-"lCL" = (
-/turf/open/space/basic,
-/area/space/nearstation)
-"lFl" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 5
- },
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "holoprivacy";
- name = "Holodeck Shutters"
- },
-/turf/open/floor/plating,
-/area/crew_quarters/fitness)
-"lLt" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/space/nearstation)
-"lLI" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/door/airlock/maintenance{
- req_access_txt = "12"
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
-"lMg" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/turf/open/floor/plasteel,
-/area/science/circuit)
-"lMx" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/closed/wall,
-/area/crew_quarters/dorms)
-"lMY" = (
-/obj/structure/flora/ausbushes/fullgrass,
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/structure/flora/ausbushes/ppflowers,
-/obj/structure/flora/ausbushes/ywflowers,
-/obj/structure/flora/ausbushes/brflowers,
-/obj/effect/spawner/structure/window,
-/turf/open/floor/grass,
-/area/crew_quarters/bar)
-"lNB" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/space/nearstation)
-"lQG" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/science/circuit)
-"lTq" = (
-/obj/structure/table,
-/obj/item/folder/blue,
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"lYU" = (
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/structure/sign/departments/security{
- pixel_x = -32;
- pixel_y = -32
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
-"lYZ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/structure/disposalpipe/junction,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"maC" = (
-/obj/structure/table,
-/obj/item/storage/pill_bottle/dice{
- pixel_x = 4;
- pixel_y = 4
- },
-/obj/item/reagent_containers/food/snacks/cherrycupcake,
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"mbD" = (
+"lip" = (
/obj/structure/closet{
name = "Suit Closet"
},
@@ -55664,108 +55266,142 @@
/obj/item/clothing/under/lawyer/really_black,
/obj/item/clothing/under/lawyer/red,
/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
+"lnu" = (
+/obj/structure/chair/wood/normal{
+ dir = 4
+ },
+/turf/open/floor/wood{
+ icon_state = "wood-broken6"
+ },
+/area/maintenance/bar)
+"lsk" = (
+/obj/machinery/vending/autodrobe/all_access,
+/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
-"mfb" = (
-/obj/structure/toilet{
+"ltK" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"lva" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/hydroponics)
+"lyR" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plating,
+/area/security/prison)
+"lAB" = (
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall,
+/area/science/circuit)
+"lCi" = (
+/obj/docking_port/stationary/public_mining_dock{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/construction/mining/aux_base)
+"lGV" = (
+/obj/machinery/button/door{
+ id = "maintdiy";
+ name = "Shutters Control Button";
+ pixel_x = -6;
+ pixel_y = 24
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
+"lMg" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/turf/open/floor/plasteel,
+/area/science/circuit)
+"lOe" = (
+/obj/machinery/shower{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
/area/crew_quarters/dorms)
+"lPr" = (
+/obj/item/twohanded/required/kirbyplants{
+ icon_state = "applebush"
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/port)
+"lQG" = (
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
+/area/science/circuit)
+"lSa" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/theatre)
+"lUS" = (
+/obj/structure/table/wood/fancy/black,
+/obj/machinery/light/small,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"lXE" = (
+/obj/structure/sign/warning/fire{
+ desc = "A sign that states the labeled room's number.";
+ dir = 5;
+ icon_state = "roomnum";
+ name = "Room Number 7";
+ pixel_y = 24
+ },
+/obj/structure/chair/sofa/right,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"lZl" = (
+/obj/structure/closet,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/item/coin/gold,
+/obj/item/coin/gold,
+/obj/item/coin/gold,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"mbU" = (
+/obj/machinery/vr_sleeper{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/crew_quarters/fitness)
+"mcp" = (
+/obj/structure/target_stake,
+/obj/item/target/syndicate,
+/turf/open/floor/plating,
+/area/security/prison)
"mjr" = (
/obj/structure/reagent_dispensers/keg/milk,
/turf/open/floor/wood,
/area/crew_quarters/bar)
-"mlr" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/light_construct{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"moq" = (
-/obj/structure/chair/comfy/brown{
- dir = 1
- },
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"mpI" = (
-/obj/structure/table/wood,
-/turf/open/floor/wood{
- icon_state = "wood-broken5"
- },
-/area/maintenance/bar)
-"mqa" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"mqZ" = (
-/obj/structure/reagent_dispensers/keg/aphro/strong,
-/obj/item/reagent_containers/glass/beaker,
-/turf/open/floor/plating,
-/area/maintenance/bar)
-"mrR" = (
-/obj/effect/spawner/lootdrop/keg,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"mte" = (
-/obj/structure/extinguisher_cabinet,
-/turf/closed/wall/r_wall,
-/area/hallway/primary/central)
-"mwO" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"myt" = (
-/obj/structure/closet/secure_closet/personal/cabinet{
- desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here.";
- name = "Personal ID-Locked Closet";
- pixel_y = 15
- },
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"mCq" = (
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
-"mEN" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
-"mHC" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
-"mIS" = (
-/obj/structure/table,
-/obj/item/clothing/gloves/boxing/yellow,
-/obj/item/clothing/gloves/boxing/green,
-/obj/item/clothing/gloves/boxing/blue,
-/obj/item/clothing/gloves/boxing/blue,
-/obj/item/clothing/gloves/boxing,
-/obj/item/clothing/gloves/boxing,
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"mNi" = (
-/obj/machinery/light_switch{
- pixel_x = -20
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
-"mPE" = (
-/obj/machinery/chem_dispenser/drinks,
-/obj/structure/table/wood,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"mQR" = (
+"mkv" = (
/obj/machinery/camera{
c_tag = "Gravity Generator Room";
dir = 8
@@ -55776,6 +55412,211 @@
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
+"mkO" = (
+/obj/machinery/door/airlock{
+ name = "Shower Room"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/toilet)
+"mnC" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/security/prison)
+"moD" = (
+/obj/structure/table,
+/obj/item/reagent_containers/food/snacks/bluecherrycupcake{
+ pixel_y = 5
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"mps" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"mpI" = (
+/obj/structure/table/wood,
+/turf/open/floor/wood{
+ icon_state = "wood-broken5"
+ },
+/area/maintenance/bar)
+"mqZ" = (
+/obj/structure/reagent_dispensers/keg/aphro/strong,
+/obj/item/reagent_containers/glass/beaker,
+/turf/open/floor/plating,
+/area/maintenance/bar)
+"mrR" = (
+/obj/effect/spawner/lootdrop/keg,
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"mse" = (
+/obj/machinery/airalarm{
+ pixel_y = 23
+ },
+/obj/structure/chair/sofa/left,
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"mvt" = (
+/obj/machinery/airalarm{
+ dir = 1;
+ pixel_y = -22
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
+"myh" = (
+/obj/structure/piano,
+/obj/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"mzB" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/door/window,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"mAH" = (
+/obj/machinery/atmospherics/components/unary/tank/air{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"mGw" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/security/prison)
+"mHU" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/light_construct{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"mIZ" = (
+/obj/structure/falsewall,
+/turf/open/floor/plating,
+/area/security/prison)
+"mJo" = (
+/obj/structure/door_assembly/door_assembly_mai,
+/obj/item/electronics/airlock,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"mJG" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"mNi" = (
+/obj/machinery/light_switch{
+ pixel_x = -20
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
+"mNW" = (
+/obj/structure/sign/poster/official/fruit_bowl{
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/primary/starboard)
+"mOB" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/airlock/engineering/glass{
+ name = "Gravity Generator";
+ req_access_txt = "11"
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/gravity_generator)
+"mOO" = (
+/obj/structure/chair/sofa/left{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"mPk" = (
+/obj/structure/bed,
+/obj/machinery/button/door{
+ id = "Dorm5";
+ name = "Cabin Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_y = -25;
+ specialfunctions = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/effect/spawner/lootdrop/bedsheet,
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
+"mPr" = (
+/obj/structure/rack,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/effect/decal/cleanable/cobweb,
+/obj/item/clothing/under/color/grey,
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"mPt" = (
+/obj/structure/table,
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/item/clothing/glasses/sunglasses{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/clothing/glasses/sunglasses{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/clothing/ears/earmuffs{
+ pixel_x = -3;
+ pixel_y = -2
+ },
+/obj/item/clothing/ears/earmuffs{
+ pixel_x = -3;
+ pixel_y = -2
+ },
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = 24
+ },
+/turf/open/floor/plasteel,
+/area/security/prison)
+"mPE" = (
+/obj/machinery/chem_dispenser/drinks,
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"mQS" = (
+/obj/machinery/light{
+ dir = 8;
+ light_color = "#e8eaff"
+ },
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
"mRe" = (
/obj/machinery/light{
dir = 8
@@ -55783,134 +55624,109 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"mTp" = (
-/obj/structure/chair/sofa/left,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 10
+"mRQ" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 4
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"mXB" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"ncj" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/structure/sign/poster/contraband/fun_police{
- pixel_x = 32
+/turf/open/floor/wood,
+/area/crew_quarters/heads/captain)
+"mTG" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
},
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
-"ndC" = (
/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
dir = 8
},
/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"nea" = (
-/obj/machinery/recharge_station,
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
-"neb" = (
-/obj/item/radio/intercom{
- pixel_y = 25
+/area/crew_quarters/locker)
+"nbT" = (
+/obj/structure/cable{
+ icon_state = "0-8"
},
-/turf/open/floor/plasteel,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
+ id = "bridge blast";
+ name = "bridge blast door"
+ },
+/turf/open/floor/plating,
/area/hallway/primary/central)
-"nel" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 10
- },
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "holoprivacy";
- name = "Holodeck Shutters"
- },
+"ndq" = (
/turf/open/floor/plating,
-/area/crew_quarters/fitness)
-"new" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plating,
-/area/security/prison)
-"neC" = (
+/area/crew_quarters/abandoned_gambling_den)
+"nez" = (
/obj/structure/table/wood,
-/obj/item/toy/cards/deck,
-/turf/open/floor/plasteel,
-/area/security/prison)
+/obj/item/instrument/piano_synth,
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
"nfm" = (
/obj/machinery/vending/autodrobe,
/turf/open/floor/wood,
/area/maintenance/bar)
-"nie" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Holodeck Door"
+"ngs" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5
- },
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/fitness)
-"nlt" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"nmx" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"nmS" = (
-/obj/structure/closet/athletic_mixed,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"nrR" = (
-/obj/machinery/door/airlock{
- name = "Unisex Restrooms"
- },
-/obj/machinery/door/firedoor,
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"nsJ" = (
-/obj/machinery/door/airlock{
- desc = "Private study room where nerds are probably playing Dungeons and Dragons 13e, or a place for blood cult rituals.";
- id_tag = "PrivateStudy";
- name = "Private Study"
- },
-/obj/machinery/door/firedoor,
/turf/open/floor/wood,
-/area/library)
-"ntf" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
+/area/crew_quarters/theatre)
+"ngV" = (
+/obj/structure/table/wood,
+/obj/item/instrument/guitar,
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"nhY" = (
+/obj/structure/closet,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 4;
+ name = "4maintenance loot spawner"
},
-/obj/structure/chair{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"nuV" = (
-/obj/structure/chair/stool{
- pixel_y = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
+"nkP" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 8;
+ name = "8maintenance loot spawner"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"noy" = (
+/obj/structure/sign/poster/contraband/smoke{
+ desc = "This poster reminds us all that the Detective is a parasite. Year after year, they must get replacement lungs because of their addiction. ";
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel/grimy,
+/area/security/detectives_office)
+"noF" = (
+/obj/machinery/door/airlock{
+ name = "Instrument Storage"
+ },
+/turf/open/floor/plasteel/dark,
+/area/maintenance/starboard/fore)
+"nsA" = (
+/turf/closed/wall,
+/area/crew_quarters/abandoned_gambling_den)
+"nuw" = (
+/obj/structure/table,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 4;
+ name = "4maintenance loot spawner"
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"nwX" = (
+/obj/structure/grille/broken,
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"nxv" = (
/obj/machinery/power/apc{
areastring = "/area/construction";
@@ -55922,13 +55738,13 @@
},
/turf/open/floor/plating,
/area/construction)
-"nyH" = (
-/obj/machinery/airalarm{
- dir = 1;
- pixel_y = -22
+"nGf" = (
+/obj/machinery/hydroponics/constructable,
+/obj/machinery/light{
+ dir = 1
},
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
+/turf/open/floor/plasteel/dark,
+/area/hydroponics)
"nGt" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -55940,51 +55756,74 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"nGS" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+"nGI" = (
+/obj/machinery/door/airlock/external{
+ name = "Common Mining Shuttle Bay"
},
-/obj/effect/turf_decal/tile/blue{
- alpha = 255;
- dir = 1
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
-"nIE" = (
-/obj/structure/sign/poster/contraband/tools,
-/turf/closed/wall,
-/area/storage/primary)
-"nLf" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
-/turf/open/floor/wood,
-/area/bridge/meeting_room)
-"nMx" = (
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/vault,
-/obj/structure/cable{
- icon_state = "1-2"
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
+"nLu" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
},
-/obj/effect/turf_decal/tile/neutral{
+/obj/effect/turf_decal/tile/blue,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"nLw" = (
+/obj/effect/turf_decal/tile/red{
dir = 1
},
-/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/structure/window{
+ dir = 1
+ },
+/obj/structure/window{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
+"nQi" = (
+/obj/machinery/recharge_station,
+/turf/open/floor/plating,
+/area/maintenance/fore/secondary)
+"nRG" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"nSt" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"nUV" = (
+/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/turf/open/floor/plasteel,
+/area/hydroponics)
+"nXE" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/plasteel/dark,
-/area/ai_monitored/nuke_storage)
-"nOS" = (
+/area/hallway/primary/central)
+"nYe" = (
/obj/structure/safe,
/obj/item/clothing/head/bearpelt,
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
@@ -56004,266 +55843,228 @@
/obj/item/gun/ballistic/revolver/nagant,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/nuke_storage)
-"nQr" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/closed/wall,
-/area/maintenance/port)
-"nRG" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 10
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
-"nTE" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 4
- },
-/turf/closed/wall/r_wall,
-/area/engine/gravity_generator)
-"nWq" = (
-/obj/machinery/door/airlock/engineering{
- name = "Gravity Generator";
- req_access_txt = "11"
- },
+"nZE" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/tile/neutral,
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"nXa" = (
-/obj/machinery/light{
- dir = 4;
- light_color = "#e8eaff"
+/area/crew_quarters/dorms)
+"oax" = (
+/obj/structure/table/wood/fancy,
+/obj/machinery/light,
+/obj/item/reagent_containers/food/condiment/saltshaker{
+ pixel_x = -3;
+ pixel_y = 20
},
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
+/obj/item/reagent_containers/food/condiment/peppermill{
+ dir = 1;
+ pixel_x = 3;
+ pixel_y = 20
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4;
+ pixel_y = 5
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"obc" = (
+/obj/structure/chair/sofa/right,
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"oce" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
/turf/open/floor/plasteel/white,
/area/science/mixing)
+"ocv" = (
+/obj/structure/table,
+/obj/item/clothing/gloves/boxing/yellow,
+/obj/item/clothing/gloves/boxing/green,
+/obj/item/clothing/gloves/boxing/blue,
+/obj/item/clothing/gloves/boxing/blue,
+/obj/item/clothing/gloves/boxing,
+/obj/item/clothing/gloves/boxing,
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
"odx" = (
/obj/machinery/vending/kink,
/turf/open/floor/plating,
/area/maintenance/bar)
-"oeJ" = (
-/obj/structure/table/wood,
-/obj/item/instrument/violin,
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"oeQ" = (
-/obj/structure/chair{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"ohX" = (
-/obj/structure/table/wood,
-/obj/machinery/airalarm{
- dir = 1;
- pixel_y = -22
- },
-/turf/open/floor/wood,
-/area/security/vacantoffice)
-"olr" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
-"olv" = (
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
-/turf/open/floor/plasteel,
-/area/security/brig)
-"olw" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 4;
- name = "4maintenance loot spawner"
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"oma" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+"ofU" = (
+/obj/structure/chair/comfy/black{
dir = 4
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
-"orw" = (
-/obj/structure/table,
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
+"old" = (
/obj/effect/turf_decal/tile/red{
dir = 8
},
-/obj/machinery/recharger,
-/obj/item/gun/energy/laser/practice,
-/obj/item/gun/energy/laser/practice,
-/turf/open/floor/plasteel,
-/area/security/prison)
-"ory" = (
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green,
-/turf/open/floor/plasteel,
-/area/hallway/primary/starboard)
-"otF" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/extinguisher_cabinet{
- pixel_x = 5;
+/obj/structure/sign/departments/security{
+ pixel_x = -32;
pixel_y = -32
},
/turf/open/floor/plasteel,
-/area/hallway/primary/central)
-"ouD" = (
-/obj/structure/reagent_dispensers/keg/semen,
-/turf/open/floor/plating,
-/area/maintenance/bar)
-"oBp" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plating,
-/area/maintenance/port)
-"oDy" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/item/twohanded/required/kirbyplants{
- icon_state = "plant-04"
- },
+/area/hallway/primary/fore)
+"olr" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
-"oFk" = (
-/obj/structure/closet/boxinggloves,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"oHU" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel,
/area/science/circuit)
-"oKh" = (
-/obj/structure/chair/wood/normal{
- dir = 8
+"omY" = (
+/obj/item/flashlight/lamp/green{
+ pixel_x = -3;
+ pixel_y = 22
},
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"oMY" = (
-/obj/machinery/button/door{
- desc = "Alright, GAMER! Want to take your PWRGAME addiction to the MAX? Just smash this button with your chubby chetto encrusted hands an- oh, you broke the switch. Good job, idiot.";
- id = "RIPFUN";
- name = "Powerful Gamer Toggle";
- normaldoorcontrol = 1;
- pixel_x = -24;
- pixel_y = 7;
- specialfunctions = 4
+/obj/structure/dresser{
+ desc = "There's plenty of clothes here to change into! It has a surprising amount of variety, too.";
+ name = "Dresser";
+ pixel_y = 7
},
-/obj/structure/table_frame/wood,
/turf/open/floor/plating,
/area/maintenance/port)
-"oNb" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
+"oqj" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 9
},
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "holoprivacy";
+ name = "Holodeck Shutters"
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/fitness)
+"oqO" = (
/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
- pixel_x = -3;
- pixel_y = 5
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
-"oNQ" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/obj/machinery/light{
dir = 4;
light_color = "#c1caff"
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
-"oOb" = (
-/obj/structure/sign/poster/official/cohiba_robusto_ad,
-/turf/closed/wall,
-/area/lawoffice)
-"oSO" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+"ouQ" = (
+/obj/structure/table,
+/obj/item/paper_bin{
+ pixel_y = 6
+ },
+/obj/item/pen/fountain,
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
+"oxm" = (
+/obj/structure/flora/ausbushes/fullgrass,
+/obj/structure/flora/ausbushes/sparsegrass,
+/obj/structure/flora/ausbushes/ppflowers,
+/obj/structure/flora/ausbushes/ywflowers,
+/obj/structure/flora/ausbushes/brflowers,
+/obj/effect/spawner/structure/window,
+/turf/open/floor/grass,
+/area/crew_quarters/bar)
+"oyl" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/structure/chair/sofa,
-/obj/item/radio/intercom{
- pixel_y = 25
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
},
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"oUh" = (
-/obj/structure/disposalpipe/trunk{
+/obj/effect/turf_decal/tile/blue,
+/obj/machinery/door/window/eastleft{
+ name = "Blue Corner"
+ },
+/obj/effect/turf_decal/tile/blue{
dir = 1
},
-/obj/machinery/disposal/bin,
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
-"oXL" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
-/area/security/prison)
-"oYc" = (
-/obj/machinery/light/small{
- dir = 4;
- light_color = "#d8b1b1"
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
},
/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"phu" = (
+/area/crew_quarters/locker)
+"oyz" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4;
pixel_y = 5
},
/turf/open/floor/wood,
/area/crew_quarters/theatre)
-"phH" = (
-/turf/open/floor/grass,
-/area/security/prison)
-"phY" = (
+"oyN" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
+/area/space/nearstation)
+"oyX" = (
+/obj/machinery/atmospherics/components/binary/pump/on{
+ dir = 4;
+ name = "Air In"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/maintenance/fore/secondary)
+"oAb" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/red{
- dir = 1
+/turf/closed/wall,
+/area/crew_quarters/bar)
+"oAB" = (
+/obj/structure/fireplace,
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"oDN" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "holoprivacy";
+ name = "Holodeck Shutters"
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/turf/open/floor/plating,
+/area/crew_quarters/fitness)
+"oEZ" = (
+/obj/effect/spawner/lootdrop/keg,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"oHB" = (
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/dorms)
+"oHU" = (
+/obj/structure/cable{
+ icon_state = "1-2"
},
/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"pjh" = (
+/area/science/circuit)
+"oIJ" = (
+/obj/structure/chair/comfy/brown{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"oIW" = (
+/obj/structure/toilet{
+ dir = 8
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/dorms)
+"oKh" = (
+/obj/structure/chair/wood/normal{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"oLl" = (
/obj/structure/cable{
icon_state = "4-8"
},
@@ -56272,10 +56073,96 @@
},
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
-"poa" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+"oLn" = (
+/obj/machinery/light/small{
dir = 4
},
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 2;
+ name = "2maintenance loot spawner"
+ },
+/turf/open/floor/plating,
+/area/maintenance/fore/secondary)
+"oTW" = (
+/obj/structure/chair/stool{
+ pixel_y = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/open/floor/carpet{
+ icon_state = "carpetsymbol"
+ },
+/area/crew_quarters/theatre)
+"oUh" = (
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/obj/machinery/disposal/bin,
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
+"oZl" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/closet/wardrobe/pjs,
+/obj/item/clothing/under/maid,
+/obj/item/clothing/under/maid,
+/obj/item/clothing/under/janimaid,
+/obj/item/clothing/under/janimaid,
+/obj/item/clothing/accessory/maidapron,
+/obj/item/clothing/accessory/maidapron,
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"pem" = (
+/obj/machinery/button/door{
+ desc = "Bolts the doors to the Private Study.";
+ id = "PrivateStudy";
+ name = "Private Study Lock";
+ pixel_x = 25;
+ pixel_y = 25;
+ req_access_txt = "";
+ req_one_access_txt = "28;63"
+ },
+/turf/open/floor/wood,
+/area/library)
+"pfm" = (
+/obj/structure/sign/poster/official/twelve_gauge,
+/turf/closed/wall/r_wall,
+/area/ai_monitored/security/armory)
+"pgf" = (
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/dorms)
+"pgn" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/security/prison)
+"plm" = (
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/box,
+/turf/open/floor/plasteel,
+/area/engine/atmos)
+"plC" = (
+/obj/machinery/door/airlock/maintenance{
+ req_access_txt = "12"
+ },
/turf/open/floor/wood,
/area/crew_quarters/bar)
"poc" = (
@@ -56287,85 +56174,71 @@
},
/turf/open/floor/plasteel,
/area/science/mixing)
-"ppY" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/structure/sign/poster/official/love_ian{
- pixel_x = 32;
- pixel_y = -32
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/central)
-"pqR" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/light,
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"prP" = (
-/obj/structure/grille,
-/turf/open/space/basic,
-/area/space/nearstation)
-"prU" = (
-/obj/item/radio/intercom{
+"pou" = (
+/obj/machinery/light{
dir = 4;
- name = "Station Intercom (General)";
- pixel_x = 27
+ light_color = "#e8eaff"
},
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"ptV" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/heads/captain)
-"puG" = (
-/obj/structure/rack,
-/obj/item/tank/internals/emergency_oxygen,
-/obj/item/tank/internals/emergency_oxygen,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/effect/decal/cleanable/cobweb,
-/obj/item/clothing/under/color/grey,
/turf/open/floor/plating,
-/area/maintenance/port/aft)
-"pxD" = (
+/area/crew_quarters/abandoned_gambling_den)
+"pqe" = (
/obj/structure/chair/sofa,
/obj/structure/window{
dir = 1
},
+/obj/effect/landmark/start/assistant,
/turf/open/floor/wood,
/area/crew_quarters/bar)
-"pzk" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 9
+"pqs" = (
+/obj/machinery/vending/clothing,
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/structure/table,
-/obj/item/coin/gold,
/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"pAl" = (
-/obj/machinery/light/small,
-/obj/machinery/atmospherics/components/unary/tank/air{
+/area/crew_quarters/locker)
+"psk" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/bridge/meeting_room)
+"pst" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/airlock/vault,
+/obj/effect/mapping_helpers/airlock/locked,
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/nuke_storage)
+"puh" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
dir = 8
},
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"pFt" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/cable{
- icon_state = "0-2"
+/obj/machinery/light/small,
+/obj/structure/extinguisher_cabinet{
+ pixel_x = 5;
+ pixel_y = -32
},
-/turf/open/space,
-/area/solar/starboard/aft)
+/turf/open/floor/plasteel/white/side{
+ dir = 1
+ },
+/area/crew_quarters/fitness)
+"pBp" = (
+/obj/effect/landmark/event_spawn,
+/turf/closed/wall,
+/area/crew_quarters/fitness)
+"pFX" = (
+/obj/structure/table/wood/fancy,
+/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+ pixel_x = -3;
+ pixel_y = 5
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
"pHl" = (
/obj/structure/table,
/obj/item/storage/box/beakers{
@@ -56392,12 +56265,31 @@
},
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
-"pHo" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+"pHO" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/structure/sign/poster/contraband/fun_police{
+ pixel_x = 32
},
/turf/open/floor/plasteel,
-/area/hydroponics)
+/area/hallway/primary/fore)
+"pIf" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 4
+ },
+/area/crew_quarters/theatre)
+"pJR" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/chair/comfy/brown{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/library)
"pLn" = (
/obj/machinery/conveyor/inverted{
dir = 5;
@@ -56405,88 +56297,7 @@
},
/turf/open/floor/plating,
/area/maintenance/disposal)
-"pLt" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/light{
- dir = 4
- },
-/obj/machinery/power/apc{
- areastring = "/area/security/main";
- dir = 4;
- name = "Firing Range APC";
- pixel_x = 24
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
-"pNH" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/door/window,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"pNI" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/sign/poster/official/pda_ad{
- pixel_y = -32
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/central)
-"pPE" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/machinery/door/window/eastleft{
- name = "Blue Corner"
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"pQr" = (
-/obj/structure/table,
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/item/clothing/glasses/sunglasses{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/clothing/glasses/sunglasses{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/clothing/ears/earmuffs{
- pixel_x = -3;
- pixel_y = -2
- },
-/obj/item/clothing/ears/earmuffs{
- pixel_x = -3;
- pixel_y = -2
- },
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = 24
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
-"pQD" = (
-/obj/structure/sign/poster/official/ion_rifle,
-/turf/closed/wall/r_wall,
-/area/ai_monitored/security/armory)
-"pSf" = (
+"pPi" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -56498,361 +56309,13 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
-"pTn" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/power/terminal,
-/turf/closed/wall/r_wall,
-/area/engine/gravity_generator)
-"pTR" = (
-/obj/machinery/light{
- dir = 1
- },
-/obj/item/radio/intercom{
- pixel_y = 25
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/central)
-"pUl" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/door/airlock/command{
- name = "Command Access To Vault";
- req_access = "19"
- },
-/turf/open/floor/plasteel/dark,
-/area/bridge/meeting_room)
-"pZv" = (
-/obj/machinery/shower{
- dir = 8
- },
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/dorms)
-"qbx" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
- pixel_x = -3;
- pixel_y = 5
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"qeQ" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/science/circuit)
-"qje" = (
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/starboard)
-"qkC" = (
-/obj/machinery/power/apc{
- areastring = "/area/maintenance/starboard/fore";
- dir = 1;
- name = "Starboard Bow Maintenance APC";
- pixel_y = 24
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"qlr" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/structure/window{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"qlF" = (
-/obj/structure/lattice,
-/turf/closed/wall,
-/area/security/prison)
-"qmM" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"qoP" = (
-/obj/machinery/airalarm{
- pixel_y = 23
- },
-/obj/structure/chair/sofa/left,
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"qpA" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/structure/sign/poster/official/cohiba_robusto_ad{
- pixel_y = -32
- },
-/turf/open/floor/plasteel/grimy,
-/area/security/detectives_office)
-"qux" = (
-/obj/structure/chair/sofa/left{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"quT" = (
-/obj/structure/lattice,
-/obj/structure/grille/broken,
-/turf/open/space/basic,
-/area/space/nearstation)
-"qvM" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/turf/open/floor/circuit,
-/area/ai_monitored/nuke_storage)
-"qwe" = (
-/turf/open/floor/plasteel/white/side{
- dir = 4
- },
-/area/crew_quarters/theatre)
-"qwB" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/door/airlock/engineering/glass{
- name = "Gravity Generator";
- req_access_txt = "11"
- },
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/gravity_generator)
-"qxc" = (
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/machinery/computer/slot_machine,
-/obj/item/coin/iron,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"qAQ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/table,
-/obj/item/storage/firstaid/regular{
- pixel_y = 5
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"qBc" = (
-/turf/open/floor/carpet,
-/area/crew_quarters/theatre)
-"qBe" = (
-/obj/structure/chair/comfy/black{
- dir = 8
- },
+"pPI" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 8
- },
-/turf/open/floor/carpet,
-/area/bridge/meeting_room)
-"qEv" = (
-/obj/structure/table/wood/fancy,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/reagent_containers/food/drinks/britcup{
- desc = "Kingston's personal cup.";
- pixel_x = 5;
- pixel_y = 5
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"qHB" = (
-/obj/structure/chair/stool{
- pixel_y = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
- },
-/turf/open/floor/carpet{
- icon_state = "carpetsymbol"
- },
-/area/crew_quarters/theatre)
-"qIf" = (
-/obj/machinery/door/airlock{
- name = "Unisex Restrooms"
- },
-/obj/machinery/door/firedoor,
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/bar)
-"qIw" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/carpet,
-/area/crew_quarters/cryopod)
-"qJZ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/carpet,
-/area/crew_quarters/theatre)
-"qMu" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/machinery/light/small{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/security/prison)
-"qNs" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green{
- on = 0;
- pixel_x = -7;
- pixel_y = 12
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"qOf" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
- },
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"qQJ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/white/side{
- dir = 4
- },
-/area/crew_quarters/theatre)
-"qUm" = (
-/obj/structure/filingcabinet/employment,
-/turf/open/floor/wood,
-/area/crew_quarters/heads/captain)
-"qXH" = (
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
-"rcD" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/closed/wall/r_wall,
-/area/science/circuit)
-"reZ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/closed/wall/r_wall,
-/area/engine/engine_smes)
-"rfW" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/turf/open/floor/plasteel,
-/area/maintenance/disposal/incinerator)
-"rgF" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/item/coin/silver,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"rhb" = (
-/obj/machinery/vending/cola/space_up,
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"riA" = (
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/machinery/camera{
- c_tag = "Firing Range";
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
-"riB" = (
-/obj/machinery/door/firedoor,
-/obj/structure/sign/departments/evac{
- pixel_y = 32
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/starboard)
-"rmX" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/beer,
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
-"rsv" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/space,
-/area/solar/starboard/fore)
-"rsX" = (
-/obj/effect/turf_decal/tile/red,
-/obj/structure/chair{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
-"rtT" = (
-/obj/structure/chair/comfy/brown{
- color = "#66b266";
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
-"rvZ" = (
-/obj/structure/target_stake,
-/obj/item/target/syndicate,
-/turf/open/floor/plating,
-/area/security/prison)
-"rzg" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/heads/captain)
-"rBq" = (
-/obj/item/clothing/head/kitty,
-/obj/item/clothing/under/maid,
-/obj/item/clothing/mask/muzzle,
-/turf/open/floor/plating,
-/area/maintenance/bar)
-"rEV" = (
+/area/engine/gravity_generator)
+"pQp" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -56861,56 +56324,410 @@
},
/turf/open/floor/plating,
/area/crew_quarters/fitness)
-"rFc" = (
-/obj/machinery/door/airlock{
- desc = "To keep the station within regulations, space IKEA requires one storage cupboard for their Nanotrasen partnership to continue.";
- id_tag = "MaintDorm1";
- name = "Furniture Storage"
+"pRs" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 5
},
-/turf/open/floor/plasteel/dark,
-/area/maintenance/port)
-"rHa" = (
-/obj/docking_port/stationary{
- dir = 8;
- dwidth = 3;
- height = 5;
- id = "commonmining_home";
- name = "SS13: Common Mining Dock";
- roundstart_template = /datum/map_template/shuttle/mining_common/meta;
- width = 7
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "holoprivacy";
+ name = "Holodeck Shutters"
},
-/turf/open/space/basic,
-/area/space)
-"rKc" = (
+/turf/open/floor/plating,
+/area/crew_quarters/fitness)
+"pTB" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
icon_state = "0-2"
},
/turf/open/space,
-/area/solar/port/fore)
+/area/solar/starboard/aft)
+"qaY" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
+/area/crew_quarters/bar)
+"qcm" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/heads/captain)
+"qeb" = (
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/abandoned_gambling_den";
+ name = "Abandoned Gambling Den APC";
+ pixel_y = -24
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
+"qeQ" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/science/circuit)
+"qfk" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/structure/window,
+/obj/structure/window{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
+"qfD" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+ desc = "Privacy shutters for the Private Study. Stops people spying in on your game.";
+ id = "PrivateStudy1";
+ name = "Private Study Privacy Shutters"
+ },
+/obj/effect/spawner/structure/window,
+/turf/open/floor/wood,
+/area/library)
+"qje" = (
+/obj/structure/sign/mining{
+ pixel_y = 7
+ },
+/turf/closed/wall,
+/area/quartermaster/miningdock)
+"qmn" = (
+/obj/machinery/computer/libraryconsole/bookmanagement,
+/obj/structure/table,
+/turf/open/floor/plasteel,
+/area/security/prison)
+"qqs" = (
+/obj/structure/mirror{
+ pixel_y = 32
+ },
+/obj/structure/sink{
+ dir = 1;
+ pixel_y = 25
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
+"qus" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "kitchen";
+ name = "kitchen shutters"
+ },
+/obj/item/reagent_containers/food/snacks/cheesynachos{
+ pixel_y = 5
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/crew_quarters/kitchen)
+"quT" = (
+/obj/structure/lattice,
+/obj/structure/grille/broken,
+/turf/open/space/basic,
+/area/space/nearstation)
+"qAm" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/light/small,
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"qBi" = (
+/obj/structure/lattice,
+/turf/closed/wall/r_wall,
+/area/crew_quarters/heads/captain)
+"qIw" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/cryopod)
+"qJr" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/space,
+/area/solar/port/aft)
+"qLR" = (
+/obj/structure/mirror{
+ pixel_y = 32
+ },
+/obj/structure/sink{
+ dir = 1;
+ pixel_y = 25
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/dorms)
+"qOc" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/machinery/camera{
+ c_tag = "VR Sleepers";
+ dir = 1
+ },
+/obj/machinery/light/small,
+/turf/open/floor/plasteel/white/side{
+ dir = 1
+ },
+/area/crew_quarters/fitness)
+"qOB" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/heads/captain)
+"qTG" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/theatre)
+"qTV" = (
+/obj/item/twohanded/required/kirbyplants{
+ icon_state = "plant-22"
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
+"qVP" = (
+/obj/effect/spawner/structure/window,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
+"qXg" = (
+/obj/structure/chair/sofa/left,
+/turf/open/floor/plasteel,
+/area/security/prison)
+"rcD" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/closed/wall/r_wall,
+/area/science/circuit)
+"rdG" = (
+/obj/machinery/hydroponics/constructable,
+/obj/item/radio/intercom{
+ name = "Station Intercom (General)";
+ pixel_x = 29
+ },
+/turf/open/floor/plasteel/dark,
+/area/hydroponics)
+"reA" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/vending/kink,
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#e8eaff"
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"rfW" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/maintenance/disposal/incinerator)
+"rjQ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"rmN" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
+/obj/structure/chair/comfy/brown,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"rmX" = (
+/obj/structure/table,
+/obj/item/reagent_containers/food/drinks/beer,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"rnt" = (
+/obj/structure/chair/comfy/black{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 8
+ },
+/turf/open/floor/carpet,
+/area/bridge/meeting_room)
+"rnK" = (
+/obj/structure/shuttle/engine/propulsion{
+ dir = 1
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
+"rqf" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/item/radio/intercom{
+ pixel_y = 25
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
+"rqk" = (
+/obj/structure/reagent_dispensers/water_cooler,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"rqE" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 9
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"rqW" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/structure/dresser,
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/theatre";
+ dir = 8;
+ name = "Theatre APC";
+ pixel_x = -25
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/theatre)
+"rrM" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 4
+ },
+/obj/structure/closet/wardrobe/black,
+/obj/item/clothing/under/skirt/black,
+/obj/item/clothing/head/beret/black,
+/obj/item/clothing/head/beret/black,
+/obj/item/clothing/under/trendy_fit,
+/obj/item/clothing/under/trendy_fit,
+/obj/item/clothing/under/sundress,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"rtl" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/obj/machinery/camera{
+ c_tag = "Bar Backroom"
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"ruo" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"rvr" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/chair{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"rvS" = (
+/obj/structure/chair/comfy/brown{
+ color = "#66b266";
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/security/prison)
+"ryr" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"rBq" = (
+/obj/item/clothing/head/kitty,
+/obj/item/clothing/under/maid,
+/obj/item/clothing/mask/muzzle,
+/turf/open/floor/plating,
+/area/maintenance/bar)
+"rGq" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"rIA" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
"rKP" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
/turf/open/floor/plating,
/area/construction)
-"rLr" = (
-/obj/structure/window,
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"rLR" = (
-/obj/structure/sign/poster/contraband/space_up{
- pixel_x = -32;
- pixel_y = 32
- },
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"rMc" = (
-/obj/structure/table/wood/fancy/black,
-/obj/machinery/light/small,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
"rMN" = (
/obj/structure/bed,
/obj/item/tank/internals/anesthetic,
@@ -56933,38 +56750,32 @@
},
/turf/open/floor/plasteel,
/area/science/mixing)
-"rOm" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/airalarm{
- dir = 8;
- pixel_x = 23
- },
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/toilet)
-"rTQ" = (
-/obj/machinery/vr_sleeper{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
+"rPU" = (
+/turf/open/floor/plasteel/white/side{
dir = 4
},
+/area/crew_quarters/theatre)
+"rTu" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/airlock/command{
+ name = "Command Access To Vault";
+ req_access = "19"
+ },
+/turf/open/floor/plasteel/dark,
+/area/bridge/meeting_room)
+"rXl" = (
+/obj/structure/chair/office/light,
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = -24
+ },
/obj/effect/turf_decal/stripes/line{
- dir = 1
+ dir = 9
},
-/turf/open/floor/plasteel/white/side{
- dir = 8
- },
-/area/crew_quarters/fitness)
-"rUQ" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/turf/open/floor/plating,
-/area/space/nearstation)
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
"saK" = (
/obj/structure/closet/crate,
/obj/item/target/alien,
@@ -56977,60 +56788,54 @@
/obj/item/gun/energy/laser/practice,
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"sdL" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5
+"saU" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/closed/wall/r_wall,
+/area/engine/engine_smes)
+"saX" = (
+/obj/item/reagent_containers/glass/bucket,
+/turf/open/floor/grass,
+/area/security/prison)
+"sci" = (
+/obj/machinery/vr_sleeper{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 4
+ },
+/area/crew_quarters/fitness)
+"seP" = (
+/obj/structure/cable{
+ icon_state = "0-4"
},
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "0-8"
},
-/turf/open/floor/plasteel/dark,
-/area/bridge/meeting_room)
-"sfa" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/door/poddoor/preopen{
+ id = "Secure Gate";
+ name = "brig shutters"
+ },
+/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"sgV" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
- dir = 4;
- name = "Air In"
+ icon_state = "1-8"
},
+/turf/open/floor/plating,
+/area/security/brig)
+"shR" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
-"sjm" = (
-/obj/structure/table/wood,
-/obj/item/instrument/piano_synth,
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"sjw" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 4
- },
-/obj/structure/closet/wardrobe/black,
-/obj/item/clothing/under/skirt/black,
-/obj/item/clothing/head/beret/black,
-/obj/item/clothing/head/beret/black,
-/obj/item/clothing/under/trendy_fit,
-/obj/item/clothing/under/trendy_fit,
-/obj/item/clothing/under/sundress,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"sjT" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/airalarm{
- dir = 8;
- pixel_x = 24
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
+/area/space/nearstation)
"slk" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -57043,86 +56848,45 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/maintenance/department/medical/morgue)
-"slp" = (
-/obj/effect/turf_decal/tile/blue{
- alpha = 255
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- alpha = 255;
+"spu" = (
+/obj/effect/turf_decal/tile/red{
dir = 1
},
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/tile/red{
dir = 8
},
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
-"smn" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 6
- },
+/obj/effect/turf_decal/tile/red,
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
+"sqp" = (
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/light,
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/nuke_storage)
-"snG" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/open/space,
-/area/solar/port/aft)
-"spX" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 9
- },
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/door/airlock/command{
+ name = "Captain's Vault Access";
+ req_access_txt = "20"
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/captain)
-"sqa" = (
-/obj/item/twohanded/required/kirbyplants{
- icon_state = "applebush"
+"srG" = (
+/obj/machinery/airalarm{
+ dir = 1;
+ pixel_y = -22
},
-/turf/open/floor/plasteel,
-/area/hallway/primary/port)
-"srq" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/dark,
-/area/bridge/meeting_room)
-"ssL" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/turf/open/space,
-/area/solar/starboard/fore)
-"suI" = (
-/obj/machinery/door/window/southleft{
- name = "Target Storage"
- },
-/obj/item/target/clown,
-/obj/item/target/clown,
-/obj/item/target,
-/obj/item/target,
/turf/open/floor/plating,
-/area/security/prison)
-"svw" = (
-/obj/structure/chair{
+/area/crew_quarters/abandoned_gambling_den)
+"ssB" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
dir = 4
},
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/area/hallway/primary/starboard)
"sxs" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/table,
@@ -57136,16 +56900,88 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/service)
-"sxX" = (
+"syJ" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/theatre)
+"szG" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plating{
- icon_state = "panelscorched"
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"sAM" = (
+/turf/open/floor/wood{
+ icon_state = "wood-broken6"
},
-/area/maintenance/starboard/fore)
-"sAI" = (
+/area/maintenance/bar)
+"sEi" = (
+/obj/machinery/vr_sleeper{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 4
+ },
+/area/crew_quarters/fitness)
+"sEt" = (
+/turf/open/floor/wood{
+ icon_state = "wood-broken7"
+ },
+/area/maintenance/bar)
+"sEM" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "holoprivacy";
+ name = "Holodeck Shutters"
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/fitness)
+"sFW" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/sign/departments/restroom{
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"sHx" = (
+/obj/structure/table,
+/obj/item/book/manual/hydroponics_pod_people{
+ pixel_x = -4;
+ pixel_y = 5
+ },
+/obj/item/paper/guides/jobs/hydroponics{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/turf/open/floor/plasteel,
+/area/hydroponics)
+"sJx" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/hydroponics)
+"sJI" = (
/obj/structure/table/wood/fancy,
/obj/item/reagent_containers/food/condiment/saltshaker{
pixel_x = -3;
@@ -57158,30 +56994,31 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
-"sAM" = (
-/turf/open/floor/wood{
- icon_state = "wood-broken6"
+"sLa" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
},
-/area/maintenance/bar)
-"sEt" = (
-/turf/open/floor/wood{
- icon_state = "wood-broken7"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
},
-/area/maintenance/bar)
-"sIe" = (
-/obj/structure/sign/poster/official/fruit_bowl{
- pixel_y = 32
+/obj/structure/window{
+ dir = 4
},
-/turf/open/floor/plasteel/white/corner{
+/obj/effect/turf_decal/tile/blue{
dir = 1
},
-/area/hallway/primary/starboard)
-"sLr" = (
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/item/coin/silver,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
+"sLj" = (
+/obj/structure/chair/comfy/brown{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
"sLv" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance,
@@ -57190,17 +57027,13 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"sMa" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
+"sNK" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/machinery/vending/kink,
-/obj/machinery/light{
- dir = 4;
- light_color = "#e8eaff"
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
"sOs" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -57208,9 +57041,38 @@
/obj/machinery/door/airlock/maintenance/abandoned,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"sOA" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/grimy,
+/area/security/detectives_office)
+"sPT" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/obj/machinery/light{
+ dir = 8;
+ light_color = "#e8eaff"
+ },
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"sPY" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall/r_wall,
+/area/engine/engine_smes)
"sQX" = (
/turf/open/floor/plating,
/area/space)
+"sRH" = (
+/obj/machinery/autolathe{
+ name = "public autolathe"
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/office)
"sRT" = (
/obj/machinery/vending/cola/random,
/turf/open/floor/wood,
@@ -57242,52 +57104,56 @@
/obj/machinery/vending/boozeomat/all_access,
/turf/closed/wall,
/area/maintenance/bar)
-"sYv" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 6
+"sYR" = (
+/obj/machinery/door/airlock{
+ name = "Unisex Restrooms"
},
-/turf/closed/wall/r_wall,
-/area/engine/gravity_generator)
-"sZa" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/obj/machinery/camera{
- c_tag = "Bar Backroom"
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"sZR" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 9
- },
-/turf/closed/wall/r_wall,
-/area/engine/gravity_generator)
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/bar)
"tal" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
/area/hallway/secondary/service)
-"tdF" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/light{
+"tgH" = (
+/obj/structure/filingcabinet/employment,
+/turf/open/floor/wood,
+/area/crew_quarters/heads/captain)
+"tif" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"tkq" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"tkB" = (
+/obj/structure/sign/poster/official/help_others{
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
"tkU" = (
/turf/open/floor/wood{
icon_state = "wood-broken5"
},
/area/maintenance/bar)
+"tmO" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/security/prison)
"tqg" = (
/obj/machinery/cryopod{
dir = 4
@@ -57297,20 +57163,98 @@
},
/turf/open/floor/carpet,
/area/crew_quarters/cryopod)
-"tqt" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/chair/comfy/brown{
- dir = 1
+"tqB" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
},
-/turf/open/floor/wood,
-/area/library)
+/turf/open/floor/plating,
+/area/space/nearstation)
"trb" = (
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plasteel,
/area/security/courtroom)
-"tru" = (
+"ttL" = (
+/obj/structure/sign/poster/contraband/random{
+ pixel_y = 32
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"ttX" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/machinery/camera{
+ c_tag = "Firing Range";
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/security/prison)
+"tur" = (
+/obj/item/restraints/handcuffs/fake,
+/turf/open/floor/plating,
+/area/maintenance/bar)
+"tvi" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/chair/comfy/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"txm" = (
+/obj/structure/table/wood/fancy/royalblue,
+/obj/item/crowbar/red,
+/turf/open/floor/plating,
+/area/maintenance/port)
+"tyX" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/nuke_storage)
+"tzQ" = (
+/obj/machinery/shower{
+ dir = 4
+ },
+/obj/item/soap,
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/dorms)
+"tCa" = (
+/obj/structure/table/wood,
+/obj/item/instrument/guitar{
+ pixel_x = -7
+ },
+/obj/item/instrument/eguitar{
+ pixel_x = 5
+ },
+/obj/item/instrument/violin,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"tCd" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ alpha = 255;
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
+"tJi" = (
/obj/machinery/airalarm{
dir = 4;
pixel_x = -22
@@ -57332,248 +57276,106 @@
/obj/item/megaphone/clown,
/turf/open/floor/plasteel,
/area/crew_quarters/theatre)
-"trY" = (
-/obj/structure/sign/poster/contraband/lizard{
- pixel_x = -32
- },
-/obj/structure/sign/poster/contraband/lizard{
- pixel_x = -32
- },
-/obj/structure/sign/poster/contraband/lizard{
- pixel_x = -32
+"tJK" = (
+/obj/machinery/door/airlock/engineering{
+ name = "Gravity Generator";
+ req_access_txt = "11"
},
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"tsr" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
/turf/open/floor/plasteel,
-/area/hydroponics)
-"tuj" = (
-/obj/structure/light_construct{
- dir = 1
- },
+/area/engine/gravity_generator)
+"tJS" = (
+/obj/effect/spawner/lootdrop/keg,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
-"tur" = (
-/obj/item/restraints/handcuffs/fake,
-/turf/open/floor/plating,
-/area/maintenance/bar)
-"tuN" = (
-/obj/structure/chair/sofa,
-/obj/structure/window{
+"tKk" = (
+/obj/effect/turf_decal/tile/neutral{
dir = 1
},
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"tAb" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/door/airlock/command{
- name = "Captain's Vault Access";
- req_access_txt = "20"
- },
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/heads/captain)
-"tAE" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -3;
- pixel_y = 20
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- dir = 1;
- pixel_x = 3;
- pixel_y = 20
- },
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/obj/effect/turf_decal/tile/neutral,
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/structure/sign/warning/fire{
+ desc = "A sign that states the labeled room's number.";
+ icon_state = "roomnum";
+ name = "Room Number 1";
+ pixel_x = -30;
+ pixel_y = -7
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
-"tAV" = (
-/obj/machinery/light{
- dir = 4
- },
-/turf/open/floor/carpet,
-/area/crew_quarters/theatre)
-"tCi" = (
-/obj/machinery/vr_sleeper{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 4
- },
-/area/crew_quarters/fitness)
-"tFt" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/hydroponics)
-"tGG" = (
-/obj/structure/table/wood,
-/obj/item/book/codex_gigas,
-/obj/item/clothing/under/suit_jacket/red,
-/obj/structure/destructible/cult/tome,
-/turf/open/floor/carpet,
-/area/library)
-"tHx" = (
-/obj/machinery/computer/arcade/minesweeper{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/security/prison)
-"tIk" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "maintdiy";
- name = "Security Shutters"
- },
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
-"tIC" = (
-/obj/structure/table/wood,
-/obj/item/instrument/guitar{
- pixel_x = -7
- },
-/obj/item/instrument/eguitar{
- pixel_x = 5
- },
-/obj/item/instrument/violin,
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"tLl" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/security/prison)
"tMl" = (
/obj/effect/turf_decal/loading_area,
/turf/open/floor/plasteel/showroomfloor,
/area/crew_quarters/kitchen)
-"tMS" = (
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_y = 6
+"tNF" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
},
-/obj/item/pen/fountain,
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"tNJ" = (
-/obj/effect/spawner/structure/window,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
-"tOd" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/security/prison)
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
"tOq" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
/turf/open/floor/plasteel/white,
/area/science/mixing)
-"tOU" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/machinery/light/small,
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
"tPT" = (
/obj/machinery/chem_dispenser/drinks/beer,
/obj/structure/table/wood,
/turf/open/floor/wood,
/area/maintenance/bar)
-"tQk" = (
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/dorms)
"tRe" = (
/obj/machinery/chem_master,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
+"tRB" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 5
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"tRF" = (
/obj/machinery/light/small{
dir = 8
},
/turf/open/floor/wood,
/area/maintenance/bar)
-"tTW" = (
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/entry)
-"tUm" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+"tWj" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4;
+ pixel_y = 5
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plating,
-/area/maintenance/port)
-"tUw" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/theatre)
-"tWs" = (
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
-"tWR" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
"tXL" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
+"tZe" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/sign/poster/official/pda_ad{
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
+"uaj" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
"uaw" = (
/obj/machinery/power/apc{
areastring = "/area/storage/art";
@@ -57586,37 +57388,380 @@
},
/turf/open/floor/wood,
/area/maintenance/bar)
-"udi" = (
+"ubj" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/machinery/door/window/westright{
+ name = "Red Corner"
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
+"ucq" = (
+/obj/structure/sign/poster/contraband/red_rum{
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
+"ufD" = (
+/obj/machinery/vr_sleeper{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 4
+ },
+/area/crew_quarters/fitness)
+"ugu" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"uhm" = (
+/obj/machinery/door/airlock{
+ name = "Recharging Station"
+ },
+/turf/open/floor/plating,
+/area/maintenance/fore/secondary)
+"ujv" = (
+/obj/structure/sign/departments/restroom,
+/turf/closed/wall,
+/area/crew_quarters/toilet)
+"ujF" = (
+/obj/machinery/cryopod{
+ dir = 4
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/cryopod)
+"ujS" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 6
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"unA" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"unW" = (
+/obj/effect/landmark/event_spawn,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/security/brig)
+"uoB" = (
+/obj/structure/table/reinforced,
+/obj/item/multitool,
+/obj/item/screwdriver,
+/obj/machinery/camera{
+ c_tag = "Circuitry Lab North";
+ network = list("ss13","rd")
+ },
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
+"uoG" = (
+/obj/machinery/power/apc{
+ areastring = "/area/security/detectives_office";
+ dir = 4;
+ name = "Detective's Office APC";
+ pixel_x = 24
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plasteel/grimy,
+/area/security/detectives_office)
+"usO" = (
+/obj/machinery/vending/snack/random,
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"uua" = (
+/obj/machinery/atmospherics/components/binary/valve,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"uuG" = (
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"uve" = (
+/obj/structure/table,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/item/coin/silver,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"uvZ" = (
+/obj/structure/mineral_door/wood,
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"uxY" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/disposalpipe/junction,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"uBa" = (
+/obj/structure/table,
+/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+ pixel_x = 5;
+ pixel_y = 7
+ },
+/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
+ pixel_x = -3;
+ pixel_y = 2
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"uDO" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/space,
+/area/solar/port/fore)
+"uEI" = (
/obj/structure/chair/comfy/brown{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/security/prison)
+"uFp" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/structure/sign/poster/official/cohiba_robusto_ad{
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel/grimy,
+/area/security/detectives_office)
+"uGI" = (
+/turf/open/floor/grass,
+/area/security/prison)
+"uIO" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
+ },
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"uJx" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/theatre)
+"uNu" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel,
+/area/science/circuit)
+"uOJ" = (
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/door/airlock/vault,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/nuke_storage)
+"uPT" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/closed/wall/r_wall,
+/area/maintenance/disposal/incinerator)
+"uQS" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1;
+ pixel_x = 5
+ },
+/obj/machinery/light/small,
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
+"uRd" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/terminal,
+/turf/closed/wall/r_wall,
+/area/engine/gravity_generator)
+"uRS" = (
+/obj/structure/chair/stool{
+ pixel_y = 8
+ },
+/turf/open/floor/carpet{
+ icon_state = "carpetsymbol"
+ },
+/area/crew_quarters/theatre)
+"uVS" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"vae" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/space/nearstation)
+"vbi" = (
+/obj/structure/table,
+/obj/item/instrument/guitar{
+ pixel_x = -7
+ },
+/obj/item/instrument/eguitar{
+ pixel_x = 5
+ },
+/obj/item/instrument/violin,
+/obj/item/instrument/trombone,
+/obj/item/instrument/saxophone,
+/obj/item/instrument/piano_synth,
+/obj/item/instrument/recorder,
+/obj/item/instrument/accordion,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"vbD" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/command/glass{
+ name = "EVA Storage";
+ req_access_txt = "18"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/ai_monitored/storage/eva)
+"vcN" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"vda" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/door/window/westleft{
+ base_state = "right";
+ dir = 4;
+ icon_state = "right";
+ name = "Shooting Range"
+ },
+/turf/open/floor/plating,
+/area/security/prison)
+"vdu" = (
+/obj/structure/table/wood,
/obj/machinery/airalarm{
dir = 1;
pixel_y = -22
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"ued" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
+/turf/open/floor/wood,
+/area/security/vacantoffice)
+"vhb" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+/obj/effect/turf_decal/tile/blue{
dir = 8
},
-/obj/machinery/airalarm{
- dir = 4;
- pixel_x = -22
+/obj/structure/window{
+ dir = 1
},
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"uhm" = (
+/turf/open/floor/plasteel/cafeteria,
+/area/crew_quarters/locker)
+"viF" = (
+/obj/structure/table/wood,
+/obj/item/instrument/trumpet,
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"vjm" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/rag,
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"vmQ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "holoprivacy";
+ name = "Holodeck Shutters"
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/fitness)
+"vnI" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -57633,305 +57778,50 @@
},
/turf/open/floor/plating,
/area/maintenance/port)
-"ujF" = (
-/obj/machinery/cryopod{
- dir = 4
- },
-/turf/open/floor/carpet,
-/area/crew_quarters/cryopod)
-"uko" = (
+"vob" = (
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "1-4"
},
/turf/open/floor/plasteel,
-/area/security/brig)
-"ukP" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"ukS" = (
-/obj/machinery/shower{
- dir = 4
- },
-/obj/item/soap,
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/dorms)
-"unl" = (
-/obj/item/flashlight/lamp/green{
- pixel_x = -3;
- pixel_y = 22
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4;
- pixel_y = 5
- },
-/obj/structure/dresser{
- desc = "There's plenty of clothes here to change into! It has a surprising amount of variety, too.";
- name = "Dresser";
- pixel_y = 7
- },
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"unu" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/washing_machine,
-/turf/open/floor/plasteel/freezer,
-/area/security/prison)
-"unE" = (
-/obj/structure/fans/tiny/invisible,
-/turf/open/space/basic,
-/area/space)
-"unY" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/sign/departments/custodian{
- pixel_y = -32
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/central)
-"uoB" = (
-/obj/structure/table/reinforced,
-/obj/item/multitool,
-/obj/item/screwdriver,
-/obj/machinery/camera{
- c_tag = "Circuitry Lab North";
- network = list("ss13","rd")
- },
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
-"upX" = (
-/obj/structure/chair/stool{
- pixel_y = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/carpet{
- icon_state = "carpetsymbol"
- },
-/area/crew_quarters/theatre)
-"usO" = (
-/obj/machinery/vending/snack/random,
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"uuG" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
-"uvZ" = (
-/obj/structure/mineral_door/wood,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"uya" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/sign/departments/restroom{
- pixel_y = -32
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"uzk" = (
-/obj/structure/sign/departments/restroom,
-/turf/closed/wall,
-/area/crew_quarters/toilet)
-"uDW" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"uNu" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/turf/open/floor/plasteel,
-/area/science/circuit)
-"uPT" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/closed/wall/r_wall,
-/area/maintenance/disposal/incinerator)
-"uTq" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 9
- },
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"uVq" = (
-/obj/machinery/light{
- dir = 1;
- light_color = "#d1dfff"
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
-"uVt" = (
-/obj/machinery/light/small{
- brightness = 3;
- dir = 8
- },
-/turf/open/floor/plating,
-/area/security/prison)
-"uVS" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 9
- },
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
-"uYE" = (
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red,
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
-"uZM" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/structure/sign/poster/official/space_cops{
- pixel_x = -32
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
-"vbD" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/command/glass{
- name = "EVA Storage";
- req_access_txt = "18"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/ai_monitored/storage/eva)
-"vbY" = (
-/obj/machinery/vr_sleeper{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 4
- },
-/area/crew_quarters/fitness)
-"vdz" = (
-/obj/machinery/shower{
- dir = 8
- },
-/turf/open/floor/plasteel/freezer,
-/area/security/prison)
-"vdH" = (
-/obj/structure/bed,
-/turf/open/floor/plating,
-/area/maintenance/port)
-"vgp" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 9
- },
-/turf/closed/wall/r_wall,
/area/engine/gravity_generator)
-"vjm" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/rag,
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"vjq" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
-"vpm" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "holoprivacy";
- name = "Holodeck Shutters"
- },
-/turf/open/floor/plating,
-/area/crew_quarters/fitness)
-"vpz" = (
-/obj/structure/sign/poster/official/twelve_gauge,
-/turf/closed/wall/r_wall,
-/area/ai_monitored/security/armory)
"vpY" = (
/obj/structure/closet/lasertag/blue,
/obj/item/clothing/under/pj/blue,
/obj/item/clothing/under/pj/blue,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
-"vrM" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/item/twohanded/required/kirbyplants{
- icon_state = "plant-18"
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/entry)
"vsM" = (
/obj/machinery/power/apc/auto_name/south,
/obj/structure/cable,
/turf/open/floor/carpet,
/area/crew_quarters/cryopod)
+"vsT" = (
+/obj/structure/closet/crate,
+/obj/item/book/manual/wiki/telescience,
+/obj/item/book/manual/wiki/engineering_guide,
+/obj/item/book/manual/wiki/engineering_construction,
+/obj/item/book/manual/wiki/atmospherics,
+/obj/item/book/manual/wiki/detective,
+/obj/item/book/manual/wiki/tcomms,
+/obj/item/book/manual/wiki/engineering_singulo_tesla,
+/obj/item/book/manual/wiki/experimentor,
+/obj/item/book/manual/wiki/research_and_development,
+/obj/item/book/manual/wiki/robotics_cyborgs,
+/obj/item/book/manual/wiki/security_space_law,
+/obj/item/book/manual/wiki/medicine,
+/obj/item/book/manual/wiki/medical_cloning,
+/obj/item/book/manual/wiki/infections,
+/obj/item/book/manual/ripley_build_and_repair,
+/obj/item/book/manual/hydroponics_pod_people,
+/obj/item/book/manual/wiki/toxins,
+/obj/item/book/manual/wiki/grenades,
+/obj/item/book{
+ desc = "An undeniably handy book.";
+ icon_state = "bookknock";
+ name = "A Simpleton's Guide to Safe-cracking with Stethoscopes"
+ },
+/turf/open/floor/wood,
+/area/library)
"vxh" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance{
@@ -57940,23 +57830,10 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"vys" = (
-/obj/machinery/vr_sleeper{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plasteel/white/side{
- dir = 4
- },
-/area/crew_quarters/fitness)
+"vyp" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/closed/wall,
+/area/crew_quarters/dorms)
"vzp" = (
/obj/structure/table/reinforced,
/obj/machinery/firealarm{
@@ -57973,35 +57850,42 @@
},
/turf/open/floor/wood,
/area/maintenance/bar)
-"vzS" = (
-/obj/structure/table,
-/obj/item/book/manual/hydroponics_pod_people{
- pixel_x = -4;
- pixel_y = 5
+"vBa" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
},
-/obj/item/paper/guides/jobs/hydroponics{
- pixel_x = -5;
- pixel_y = 3
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/turf/open/floor/plasteel,
-/area/hydroponics)
+/turf/open/floor/plasteel/dark,
+/area/bridge/meeting_room)
"vCb" = (
/obj/machinery/rnd/production/techfab/department/service,
/turf/open/floor/plasteel,
/area/hallway/secondary/service)
+"vCn" = (
+/obj/structure/chair{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
"vCt" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"vDq" = (
-/obj/effect/turf_decal/stripes/line,
+"vCy" = (
+/obj/machinery/power/apc{
+ areastring = "/area/maintenance/starboard/fore";
+ dir = 1;
+ name = "Starboard Bow Maintenance APC";
+ pixel_y = 24
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
/turf/open/floor/plating,
-/area/space/nearstation)
-"vFt" = (
-/obj/machinery/portable_atmospherics/pump,
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
-"vGX" = (
+/area/maintenance/starboard/fore)
+"vDR" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/structure/closet/secure_closet/personal/cabinet{
desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here.";
@@ -58010,6 +57894,38 @@
},
/turf/open/floor/wood,
/area/crew_quarters/dorms)
+"vEi" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/extinguisher_cabinet{
+ pixel_x = 5;
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
+"vEp" = (
+/obj/structure/sign/poster/contraband/lizard{
+ pixel_x = -32
+ },
+/obj/structure/sign/poster/contraband/lizard{
+ pixel_x = -32
+ },
+/obj/structure/sign/poster/contraband/lizard{
+ pixel_x = -32
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"vFr" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
"vHj" = (
/obj/machinery/door/airlock/public/glass{
name = "Cryogenics "
@@ -58020,108 +57936,311 @@
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel,
/area/crew_quarters/cryopod)
-"vHv" = (
-/obj/structure/closet{
- name = "Costume Closet"
- },
-/obj/item/clothing/head/russobluecamohat,
-/obj/item/clothing/head/russobluecamohat,
-/obj/item/clothing/head/helmet/rus_ushanka,
-/obj/item/clothing/head/helmet/rus_ushanka,
-/obj/item/clothing/head/helmet/rus_ushanka,
-/obj/item/clothing/head/helmet/rus_ushanka,
-/obj/item/clothing/under/mw2_russian_para,
-/obj/item/clothing/under/mw2_russian_para,
-/obj/item/clothing/under/mw2_russian_para,
-/obj/item/clothing/under/mw2_russian_para,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/shoes/jackboots,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"vHM" = (
-/obj/machinery/vr_sleeper{
+"vHz" = (
+/obj/structure/chair{
dir = 8
},
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
+/obj/machinery/light/small{
+ dir = 4;
+ light_color = "#d8b1b1"
},
+/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
+"vHT" = (
+/obj/machinery/door/firedoor,
+/obj/structure/sign/departments/evac{
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
"vHY" = (
/turf/open/floor/plating,
/area/science/mixing)
-"vLD" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 10
- },
+"vIi" = (
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-2"
},
-/obj/machinery/light,
-/obj/machinery/camera/motion{
- c_tag = "Vault";
- dir = 1;
- network = list("vault")
+/obj/machinery/airalarm{
+ dir = 8;
+ pixel_x = 24
},
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/nuke_storage)
-"vNh" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+/turf/open/floor/plasteel,
+/area/security/prison)
+"vJu" = (
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
dir = 8
},
-/turf/open/floor/carpet,
-/area/crew_quarters/theatre)
-"vOq" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/item/coin/gold,
-/obj/item/coin/gold,
-/obj/item/coin/gold,
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
+"vPs" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/space,
+/area/solar/starboard/aft)
"vPE" = (
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"vRr" = (
-/obj/effect/turf_decal/stripes/line{
+"vZA" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable,
+/turf/open/space,
+/area/solar/starboard/aft)
+"vZR" = (
+/obj/structure/chair/comfy/brown{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/library)
+"wbE" = (
+/obj/effect/turf_decal/tile/blue{
+ alpha = 255
+ },
+/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/obj/machinery/door/window/westleft{
- base_state = "right";
- dir = 4;
- icon_state = "right";
- name = "Shooting Range"
+/obj/effect/turf_decal/tile/blue{
+ alpha = 255;
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
+"wcB" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
+ },
+/obj/structure/chair/comfy/brown{
+ dir = 4
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/heads/captain)
+"wdv" = (
+/obj/structure/fans/tiny/invisible,
+/turf/open/space/basic,
+/area/space)
+"weM" = (
+/obj/structure/girder,
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
+"wfR" = (
+/obj/item/electropack/shockcollar,
+/obj/item/assembly/signaler,
+/turf/open/floor/plating,
+/area/maintenance/bar)
+"wig" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green{
+ on = 0;
+ pixel_x = -7;
+ pixel_y = 12
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"wkN" = (
+/turf/closed/wall,
+/area/science/circuit)
+"woR" = (
+/obj/machinery/cryopod{
+ dir = 1
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/cryopod)
+"wph" = (
+/obj/docking_port/stationary{
+ area_type = /area/construction/mining/aux_base;
+ dheight = 4;
+ dir = 8;
+ dwidth = 4;
+ height = 9;
+ id = "aux_base_zone";
+ name = "aux base zone";
+ roundstart_template = /datum/map_template/shuttle/aux_base/default;
+ width = 9
},
/turf/open/floor/plating,
-/area/security/prison)
-"vRX" = (
-/obj/machinery/power/apc{
- areastring = "/area/security/detectives_office";
- dir = 4;
- name = "Detective's Office APC";
- pixel_x = 24
+/area/construction/mining/aux_base)
+"wql" = (
+/obj/structure/extinguisher_cabinet,
+/turf/closed/wall/r_wall,
+/area/hallway/primary/central)
+"wqF" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/chair/comfy/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/airalarm{
+ dir = 1;
+ pixel_y = -22
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"wrp" = (
+/obj/machinery/light{
+ dir = 8
},
/obj/structure/cable{
- icon_state = "0-8"
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/service)
+"wvX" = (
+/obj/structure/table/reinforced,
+/obj/machinery/light,
+/obj/item/stack/sheet/metal/ten,
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
+"wxT" = (
+/obj/structure/chair/sofa/left,
+/obj/structure/window{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"wBd" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
+/turf/closed/wall,
+/area/hallway/secondary/service)
+"wHz" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
+/turf/closed/wall/r_wall,
+/area/maintenance/disposal/incinerator)
+"wIG" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/turf/open/floor/plasteel,
+/area/security/brig)
+"wKe" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "maintdiy";
+ name = "Security Shutters"
},
-/turf/open/floor/plasteel/grimy,
-/area/security/detectives_office)
-"vUR" = (
-/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
+"wTf" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
+"wUg" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/obj/machinery/airalarm{
+ dir = 4;
+ pixel_x = -22
+ },
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"wUr" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/carpet,
+/area/crew_quarters/theatre)
+"wUY" = (
+/obj/structure/table,
+/obj/item/stack/packageWrap,
+/obj/item/stack/packageWrap,
+/obj/item/hand_labeler,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/service)
+"wWT" = (
+/obj/effect/landmark/start/roboticist,
+/turf/open/floor/plasteel/white,
+/area/science/robotics/lab)
+"wXl" = (
+/obj/structure/mirror{
+ pixel_y = 32
+ },
+/obj/structure/sink{
+ dir = 1;
+ pixel_y = 25
+ },
+/obj/structure/toilet{
+ dir = 4
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/dorms)
+"wYc" = (
+/obj/machinery/vr_sleeper{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
/area/security/prison)
-"vVP" = (
+"wZI" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/heads/captain)
+"xbn" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 9
+ },
+/obj/structure/table,
+/obj/item/coin/gold,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"xfS" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/machinery/computer/shuttle/mining/common{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/entry)
+"xgk" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"xgC" = (
/obj/structure/cable{
icon_state = "0-4"
},
@@ -58147,325 +58266,22 @@
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
-"vWw" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/plasteel,
-/area/security/prison)
-"vYa" = (
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"vZs" = (
-/obj/structure/lattice,
-/obj/structure/lattice,
-/turf/open/space,
-/area/space/nearstation)
-"wcy" = (
-/obj/structure/reagent_dispensers/water_cooler,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"wfR" = (
-/obj/item/electropack/shockcollar,
-/obj/item/assembly/signaler,
-/turf/open/floor/plating,
-/area/maintenance/bar)
-"wgb" = (
-/obj/structure/falsewall,
-/turf/open/floor/plating,
-/area/security/prison)
-"wkN" = (
-/turf/closed/wall,
-/area/science/circuit)
-"woR" = (
-/obj/machinery/cryopod{
- dir = 1
- },
-/turf/open/floor/carpet,
-/area/crew_quarters/cryopod)
-"woX" = (
-/obj/machinery/door/window/southright{
- name = "Target Storage"
- },
-/obj/item/target/alien,
-/obj/item/target/alien,
-/obj/item/target/syndicate,
-/turf/open/floor/plating,
-/area/security/prison)
-"wph" = (
-/obj/docking_port/stationary{
- area_type = /area/construction/mining/aux_base;
- dheight = 4;
- dir = 8;
- dwidth = 4;
- height = 9;
- id = "aux_base_zone";
- name = "aux base zone";
- roundstart_template = /datum/map_template/shuttle/aux_base/default;
- width = 9
- },
-/turf/open/floor/plating,
-/area/construction/mining/aux_base)
-"wpo" = (
-/obj/machinery/camera{
- c_tag = "Bar West";
- dir = 4
- },
-/obj/machinery/computer/arcade/orion_trail,
-/obj/structure/sign/poster/official/foam_force_ad{
- pixel_x = -32
- },
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"wrp" = (
-/obj/machinery/light{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/service)
-"wuB" = (
-/obj/structure/chair/comfy/brown{
- dir = 1
- },
-/turf/open/floor/wood,
-/area/library)
-"wvX" = (
-/obj/structure/table/reinforced,
-/obj/machinery/light,
-/obj/item/stack/sheet/metal/ten,
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
-"wwn" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"wwB" = (
-/turf/closed/wall/r_wall,
-/area/hallway/primary/central)
-"wwC" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/sink{
- dir = 4;
- pixel_x = 11
- },
-/obj/structure/mirror{
- pixel_x = 25
- },
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/toilet)
-"wyM" = (
-/obj/machinery/door/airlock{
- name = "Theatre Backstage";
- req_access_txt = "46"
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"wAB" = (
-/obj/structure/chair/office/light,
-/obj/machinery/firealarm{
- dir = 4;
- pixel_x = -24
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"wBd" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 6
- },
-/turf/closed/wall,
-/area/hallway/secondary/service)
-"wCa" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "holoprivacy";
- name = "Holodeck Shutters"
- },
-/turf/open/floor/plating,
-/area/crew_quarters/fitness)
-"wDR" = (
-/obj/structure/sign/poster/official/help_others{
- pixel_y = -32
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/starboard)
-"wEp" = (
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
- id = "bridge blast";
- name = "bridge blast door"
- },
-/turf/open/floor/plating,
-/area/hallway/primary/central)
-"wFk" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
-/area/security/prison)
-"wFX" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Holodeck Door"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 6
- },
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/fitness)
-"wGP" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 10
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"wHz" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5
- },
-/turf/closed/wall/r_wall,
-/area/maintenance/disposal/incinerator)
-"wJz" = (
-/obj/machinery/light{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
-"wLT" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/turf/closed/wall,
-/area/maintenance/port)
-"wNM" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"wOT" = (
-/obj/effect/turf_decal/stripes/corner,
-/turf/open/floor/plasteel,
-/area/hydroponics)
-"wUY" = (
-/obj/structure/table,
-/obj/item/stack/packageWrap,
-/obj/item/stack/packageWrap,
-/obj/item/hand_labeler,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/service)
-"wVs" = (
-/obj/structure/table/wood,
-/obj/item/instrument/trumpet,
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"wXP" = (
-/obj/machinery/button/door{
- id = "maintdiy";
- name = "Shutters Control Button";
- pixel_x = -6;
- pixel_y = 24
- },
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
-"wZB" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"xbu" = (
-/obj/structure/chair/comfy/black{
- dir = 8
- },
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"xcg" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/turf/open/floor/plating,
-/area/space/nearstation)
-"xdb" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 8;
- name = "8maintenance loot spawner"
- },
-/obj/item/radio/intercom{
- pixel_y = 25
- },
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
-"xdV" = (
-/obj/machinery/door/airlock{
- name = "Theatre Backstage";
- req_access_txt = "46"
- },
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
"xgF" = (
/obj/structure/chair/stool/bar,
/turf/open/floor/wood{
icon_state = "wood-broken5"
},
/area/maintenance/bar)
-"xhx" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+"xhS" = (
/obj/structure/cable{
icon_state = "2-4"
},
-/turf/open/floor/wood,
-/area/bridge/meeting_room)
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
"xhV" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -58475,6 +58291,14 @@
},
/turf/open/floor/plating,
/area/construction)
+"xib" = (
+/obj/machinery/door/window/westleft{
+ base_state = "right";
+ icon_state = "right";
+ name = "Unisex Showers"
+ },
+/turf/open/floor/plasteel/freezer,
+/area/security/prison)
"xiw" = (
/obj/machinery/door/airlock{
name = "Service Hall";
@@ -58486,142 +58310,310 @@
},
/turf/open/floor/plating,
/area/hallway/secondary/service)
-"xkk" = (
-/obj/structure/piano,
-/obj/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"xlN" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+"xkd" = (
+/obj/machinery/light/small{
+ dir = 4;
+ light_color = "#d8b1b1"
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"xls" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
+/area/security/prison)
+"xmo" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
},
-/obj/structure/disposalpipe/segment{
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"xmS" = (
+/obj/structure/chair/comfy/beige{
+ dir = 8
+ },
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/plasteel/grimy,
+/area/hallway/secondary/entry)
+"xqG" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+ pixel_x = -3;
+ pixel_y = 5
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/bar)
+"xrN" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/light,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"xtP" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plating,
+/area/maintenance/fore)
+"xxi" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plating,
-/area/maintenance/port/aft)
-"xpx" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
+/area/maintenance/fore)
+"xzd" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
+/obj/structure/chair/sofa,
+/obj/item/radio/intercom{
+ pixel_y = 25
+ },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
-"xqW" = (
-/obj/structure/cable{
- icon_state = "0-4"
+"xzj" = (
+/obj/machinery/light{
+ dir = 1;
+ light_color = "#d1dfff"
},
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/door/poddoor/preopen{
- id = "Secure Gate";
- name = "brig shutters"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
- icon_state = "1-8"
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
+"xAk" = (
+/obj/structure/chair/stool{
+ pixel_y = 8
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
-/area/security/brig)
-"xzh" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/space/nearstation)
-"xzy" = (
-/obj/effect/turf_decal/stripes/corner{
+/area/maintenance/starboard/fore)
+"xAv" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel,
-/area/hydroponics)
+/area/crew_quarters/dorms)
+"xBk" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/airalarm{
+ dir = 8;
+ pixel_x = 23
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
+"xBw" = (
+/obj/structure/closet/wardrobe/cargotech,
+/obj/item/radio/headset/headset_cargo,
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"xDM" = (
+/obj/machinery/camera{
+ c_tag = "Locker Room South";
+ dir = 8
+ },
+/obj/structure/closet/secure_closet/personal,
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
"xEu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
+"xEB" = (
+/obj/machinery/power/apc{
+ areastring = "/area/ai_monitored/nuke_storage";
+ dir = 1;
+ name = "Vault APC";
+ pixel_y = 25
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/circuit,
+/area/ai_monitored/nuke_storage)
+"xEE" = (
+/obj/item/radio/intercom{
+ pixel_y = 25
+ },
+/obj/machinery/vending/wardrobe/curator_wardrobe,
+/turf/open/floor/carpet,
+/area/library)
"xIa" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/grille_or_trash,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"xIn" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"xLZ" = (
-/obj/structure/closet/radiation,
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"xMl" = (
-/obj/structure/chair/sofa{
- dir = 1
- },
-/obj/structure/window,
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"xNY" = (
-/obj/structure/shuttle/engine/propulsion{
- dir = 1
+"xLX" = (
+/obj/structure/lattice/catwalk,
+/obj/item/stack/marker_beacon{
+ anchored = 1;
+ icon_state = "markerburgundy-on";
+ light_color = "#FA644B";
+ light_power = 3;
+ light_range = 3;
+ name = "Docking Beacon";
+ picked_color = "Burgundy"
},
/turf/open/space/basic,
/area/space/nearstation)
-"xXY" = (
+"xOx" = (
+/obj/structure/chair/comfy/brown{
+ color = "#596479";
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/security/prison)
+"xPk" = (
+/obj/structure/bed,
+/obj/machinery/button/door{
+ id = "Dorm6";
+ name = "Cabin Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_y = -25;
+ specialfunctions = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/effect/spawner/lootdrop/bedsheet,
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
+"xPY" = (
+/obj/structure/table/wood,
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/item/instrument/trombone,
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"xQG" = (
+/obj/machinery/door/airlock/external{
+ name = "Common Mining Shuttle Bay"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
+"xTy" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"xUe" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/security/prison)
+"xUL" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/light,
+/obj/machinery/camera/motion{
+ c_tag = "Vault";
+ dir = 1;
+ network = list("vault")
+ },
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/nuke_storage)
+"xXi" = (
+/obj/machinery/vending/clothing,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"xZD" = (
/obj/structure/closet/lasertag/red,
/obj/item/clothing/under/pj/red,
/obj/item/clothing/under/pj/red,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
-"xYO" = (
-/obj/structure/sign/poster/contraband/red_rum{
+"ybj" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/security/prison)
+"ycd" = (
+/obj/structure/toilet{
+ dir = 4
+ },
+/obj/structure/mirror{
pixel_y = 32
},
-/turf/open/floor/plasteel,
-/area/hallway/primary/starboard)
+/obj/structure/sink{
+ dir = 1;
+ pixel_y = 25
+ },
+/obj/machinery/button/door{
+ id = "LockerShitter2";
+ name = "Door Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_x = 14;
+ pixel_y = 38;
+ specialfunctions = 4
+ },
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet/locker)
"ycu" = (
/obj/structure/cable{
icon_state = "2-4"
},
/turf/open/floor/plasteel,
/area/science/circuit)
-"ycF" = (
-/obj/machinery/door/airlock/external{
- name = "Common Mining Shuttle Bay"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/hallway/secondary/entry)
"ydD" = (
/obj/effect/turf_decal/bot,
/obj/machinery/suit_storage_unit/rd,
/turf/open/floor/plasteel,
/area/science/mixing)
-"yiN" = (
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/starboard)
+"yhz" = (
+/obj/structure/table,
+/obj/item/folder/blue,
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
+"yiY" = (
+/obj/structure/sign/poster/official/ion_rifle,
+/turf/closed/wall/r_wall,
+/area/ai_monitored/security/armory)
(1,1,1) = {"
aaa
@@ -64643,11 +64635,11 @@ aaa
aaa
aaa
aaa
-aaK
+ghq
aaa
aaa
aaa
-aaK
+ghq
aaa
aaa
aaa
@@ -64660,7 +64652,7 @@ aaa
aaa
aaa
aaa
-hoo
+gDl
aaa
aaa
aaa
@@ -64894,9 +64886,9 @@ aaa
aaa
aaa
aaa
-aaK
+ghq
aaa
-aaK
+ghq
aaa
aaa
aaa
@@ -64908,9 +64900,9 @@ gXs
aaa
aaa
aaa
-aaK
+ghq
aaa
-aaK
+ghq
aaa
aaa
aaa
@@ -65157,11 +65149,11 @@ gXs
aaa
aaa
gXs
-jmC
+gJi
gXs
gXs
gXs
-jmC
+gJi
gXs
aaa
aaa
@@ -65407,11 +65399,11 @@ aaa
aaa
aaa
aaa
-jmC
-jmC
+gJi
+gJi
gXs
aag
-jmC
+gJi
gXs
gXs
aaa
@@ -65421,11 +65413,11 @@ aaa
aaa
gXs
gXs
-jmC
-jmC
-klu
+gJi
+gJi
+haL
aag
-jmC
+gJi
aaa
aaa
aaa
@@ -65664,11 +65656,11 @@ aaa
aaa
aaa
aaa
-xcg
-lLt
+gIU
+shR
aaa
-lLt
-jNo
+shR
+hse
gXs
aoV
aaa
@@ -65678,11 +65670,11 @@ aaa
aaa
aaa
gXs
-xcg
-lLt
+gIU
+shR
aaa
-lLt
-jNo
+shR
+hse
aaa
aaa
aaa
@@ -65921,11 +65913,11 @@ aaa
aaa
aaa
aaa
-xzh
+bvG
aaa
cpe
aaa
-vDq
+oyN
aaa
aaa
aaa
@@ -65935,11 +65927,11 @@ aaa
aaa
aaa
aaa
-xzh
+bvG
aaa
cwV
aaa
-vDq
+oyN
aaa
aaa
aaa
@@ -66177,7 +66169,7 @@ aaa
aaa
aaa
aae
-lCL
+ktS
gXs
aaa
aaa
@@ -66434,7 +66426,7 @@ aaa
aaa
aaa
aaa
-lCL
+ktS
gXs
aaa
aaa
@@ -66691,7 +66683,7 @@ aaa
aaa
aaa
aaa
-lCL
+ktS
gXs
aaa
aaa
@@ -66948,7 +66940,7 @@ aaa
aaa
aaa
aaa
-lCL
+ktS
gXs
aaa
cqq
@@ -66975,7 +66967,7 @@ aaa
aaa
aoV
aaa
-rHa
+iDS
aaa
aaa
aoV
@@ -67205,7 +67197,7 @@ aaf
aaf
aaf
aaa
-lCL
+ktS
arB
asE
cyb
@@ -67232,7 +67224,7 @@ aaa
aaa
asE
asE
-ycF
+nGI
asE
asE
aoV
@@ -67492,7 +67484,7 @@ awW
auP
awW
aaf
-vZs
+kls
aaa
aaa
aaa
@@ -67746,7 +67738,7 @@ aaa
aaa
arB
arB
-jnX
+xQG
asE
aAC
aaf
@@ -67978,7 +67970,7 @@ apN
apN
apN
apJ
-iyC
+fpI
ayk
awW
aAD
@@ -68002,7 +67994,7 @@ aaa
aaa
aaa
arB
-est
+xfS
ayk
awW
aAD
@@ -69278,7 +69270,7 @@ aaa
awW
aOh
ayl
-tTW
+jHh
aRY
awW
aaa
@@ -70574,7 +70566,7 @@ awW
arB
awZ
aym
-vrM
+fOI
awW
aaf
aaa
@@ -71855,7 +71847,7 @@ aUO
aUy
aWm
aWf
-ohX
+vdu
czK
bhN
bcl
@@ -72873,7 +72865,7 @@ aHy
ayl
aKk
aLA
-dTe
+xmS
aNf
aLA
aQD
@@ -74899,7 +74891,7 @@ ady
ady
ady
ady
-rKc
+uDO
ajq
ajW
akB
@@ -74943,7 +74935,7 @@ aXQ
aXQ
aPz
aPz
-rFc
+epC
aPz
bhQ
bjj
@@ -75197,11 +75189,11 @@ aPA
aXQ
aZt
aXQ
-gdu
+ycd
aPz
-kJY
-ihC
-oMY
+omY
+cMS
+gQX
bhQ
bjj
bkF
@@ -75457,10 +75449,10 @@ aXQ
bbL
aPz
bdJ
-gFD
+txm
bgr
-nQr
-tUm
+iwB
+hew
bkF
aaa
aaa
@@ -75715,7 +75707,7 @@ aZw
aPz
bct
bfa
-vdH
+gfr
bhQ
bjk
bkE
@@ -75970,10 +75962,10 @@ baO
aZo
baw
aPz
-cwP
+hPs
cBn
bgs
-wLT
+hnl
bjk
bkF
aaa
@@ -76274,7 +76266,7 @@ ccb
ccb
ccb
aaa
-snG
+qJr
aaa
ccb
ccb
@@ -76469,7 +76461,7 @@ bxk
aDo
aDo
aIX
-nIE
+gCC
aLE
aLE
aOp
@@ -76483,7 +76475,7 @@ aQN
aQN
aQN
aQN
-kWI
+vhb
bbO
aPA
bgt
@@ -76531,7 +76523,7 @@ aaa
aaf
aaa
aaa
-kKw
+hrF
aaa
aaa
aaf
@@ -76546,7 +76538,7 @@ aaa
aaa
aaa
aaa
-hoo
+gDl
aaa
aaa
aaa
@@ -76735,7 +76727,7 @@ aQN
aQN
aTz
aUp
-job
+ubj
aXr
aZx
aQN
@@ -76788,7 +76780,7 @@ aaf
aaf
aaf
aaf
-kKw
+hrF
aaf
aaf
aaf
@@ -76997,7 +76989,7 @@ aXv
aYS
aQN
aQN
-kWI
+vhb
bbO
aPA
aSg
@@ -77240,18 +77232,18 @@ aDo
aDo
aDo
aIY
-nIE
+gCC
aLE
aLE
aOl
aPA
-lhg
+pqs
aQN
aTC
aUs
-phY
+mTG
aXt
-ksn
+ijG
aQN
aQN
aPA
@@ -77506,9 +77498,9 @@ aQV
aQN
aTC
aUu
-eRk
+gxc
aXt
-ksn
+ijG
aQN
aQN
aZB
@@ -77761,11 +77753,11 @@ aOl
aPA
aQU
aQN
-hzw
-qlr
-pPE
+nLw
+sLa
+oyl
aXw
-jiR
+qfk
aQN
aQN
aZA
@@ -78273,10 +78265,10 @@ aLm
aLE
aOl
aPA
-xIn
+vJu
aQN
aTD
-mIS
+ocv
aUZ
aYU
aYU
@@ -78517,14 +78509,14 @@ aaf
avY
axo
arP
-fLd
-cRD
+fgG
+rqW
aGD
-tru
+tJi
aCr
-qBc
-iFL
-qBc
+hcb
+qTG
+hcb
aKu
aLM
aLF
@@ -78534,14 +78526,14 @@ aPG
aPG
aPG
aPG
-jsy
+lip
aQW
aQW
aQW
aQW
-cVu
+xDM
aPA
-oBp
+jxF
aYb
aZE
bjp
@@ -78774,14 +78766,14 @@ aaa
avY
axo
arP
-qwe
-ioB
+rPU
+fne
aGr
aHI
-xdV
-ePO
-phu
-qBc
+fOA
+tWj
+oyz
+hcb
aKu
aLL
bDe
@@ -79032,13 +79024,13 @@ avY
axo
arP
aCh
-qQJ
-iYz
+pIf
+kCo
aHK
aCr
-tUw
-mqa
-qBc
+uJx
+ikk
+hcb
aKu
aLN
aLE
@@ -79052,13 +79044,13 @@ aWu
aYc
aZD
aZD
-uhm
+vnI
aZD
aZD
bff
-iRJ
+dev
aZE
-fyM
+xBw
bjr
ama
bmh
@@ -79117,18 +79109,18 @@ bLv
bLv
bLv
aaa
-prP
-prP
-prP
-prP
-prP
-prP
-prP
-prP
-prP
+iDo
+iDo
+iDo
+iDo
+iDo
+iDo
+iDo
+iDo
+iDo
aaa
aaa
-hoo
+gDl
aaa
aaa
aaa
@@ -79289,13 +79281,13 @@ avZ
axp
ayC
azH
-wyM
+eEe
aGv
aCr
aCr
-tUw
-mqa
-qBc
+uJx
+ikk
+hcb
aKu
aLN
aLE
@@ -79306,7 +79298,7 @@ aRa
aTF
aPG
aSX
-eRn
+hPP
aZF
aZF
aZF
@@ -79374,7 +79366,7 @@ cqK
crl
bLv
aaa
-prP
+iDo
ctv
ctv
ctv
@@ -79382,7 +79374,7 @@ ctv
ctv
ctv
ctv
-prP
+iDo
aaa
aaa
aaa
@@ -79543,14 +79535,14 @@ aGh
aqR
aqR
awb
-eLH
+xtP
ayA
-fHK
-hRX
+sNK
+xmo
aBV
-pNH
-sfa
-ioX
+mzB
+mJG
+szG
aHG
aJe
aKw
@@ -79631,15 +79623,15 @@ cAQ
crm
bLv
aaa
-prP
-prP
-prP
-prP
-prP
-prP
-prP
-prP
-prP
+iDo
+iDo
+iDo
+iDo
+iDo
+iDo
+iDo
+iDo
+iDo
aaa
aaa
aaa
@@ -79803,13 +79795,13 @@ awa
axq
ayD
azI
-gwi
+rjQ
aBU
-xkk
-upX
-qJZ
-doP
-qBc
+myh
+inR
+wUr
+iTq
+hcb
aKu
aLN
aMQ
@@ -79856,7 +79848,7 @@ aoV
bCq
bHE
bHE
-puG
+mPr
cdb
bCq
bVE
@@ -79898,9 +79890,9 @@ gXs
aaa
aaa
aaa
-prP
-prP
-prP
+iDo
+iDo
+iDo
aaa
aaa
aaa
@@ -80057,16 +80049,16 @@ aaa
aaa
aag
avY
-jLM
+xxi
ayD
-oeJ
+cGz
aMr
-qOf
+ngs
aDv
-lwp
-tUw
-jly
-qBc
+uRS
+uJx
+dsC
+hcb
aKu
aLN
aMS
@@ -80155,9 +80147,9 @@ gXs
aaa
aaa
aaa
-prP
+iDo
ctv
-prP
+iDo
aaa
aaa
aaa
@@ -80314,21 +80306,21 @@ aaa
aaa
aag
avY
-jLM
+xxi
ayD
-wVs
+viF
aMr
aMr
aOH
-lwp
-vNh
-qHB
-qBc
+uRS
+lSa
+oTW
+hcb
aKu
aLN
aMS
aOi
-sqa
+lPr
aPK
aSl
aTH
@@ -80383,7 +80375,7 @@ mrR
dKP
odx
rBq
-ouD
+kQO
bCq
bUs
bLv
@@ -80402,19 +80394,19 @@ aaf
aaa
aaf
gXs
-sYv
+gUu
crn
bij
bij
bij
bij
bij
-hWn
+jkz
btG
aaa
-prP
+iDo
ctv
-prP
+iDo
aaa
aaa
aaa
@@ -80573,14 +80565,14 @@ aag
avY
axs
ayD
-sjm
-eNK
-iEx
+nez
+ngV
+xPY
aOH
-qBc
-qBc
-tAV
-qBc
+hcb
+hcb
+syJ
+hcb
aKu
aLN
aMS
@@ -80610,7 +80602,7 @@ bbR
btu
bbR
bOL
-fnJ
+qje
byF
bwW
bGm
@@ -80652,26 +80644,26 @@ cjJ
cjJ
cjJ
cjJ
-gVX
-reZ
-reZ
+kfX
+saU
+saU
bij
crn
bij
bij
-sZR
-ued
+eCR
+wUg
bnT
bph
bsc
-fhP
+mQS
bsc
-eXm
+tNF
btG
gXs
-prP
+iDo
ctv
-prP
+iDo
aaa
aaa
aaa
@@ -80912,12 +80904,12 @@ cov
cpj
cpS
cjJ
-xLZ
-ivF
+fjS
+sPT
btG
-wAB
-vVP
-mwO
+rXl
+xgC
+ugu
bnV
bph
bih
@@ -80926,9 +80918,9 @@ bii
bsc
btG
aaa
-prP
+iDo
ctv
-prP
+iDo
aaa
aaa
aaa
@@ -81104,8 +81096,8 @@ aPK
aSn
aTK
aPK
-vRX
-hwu
+uoG
+sOA
asW
baW
bLE
@@ -81123,7 +81115,7 @@ bpB
bpB
brR
bsV
-aaM
+bwc
bxA
bvI
bwX
@@ -81168,14 +81160,14 @@ cnN
cox
cpl
cpU
-ipc
-edH
-edH
-nWq
-edH
-wZB
-fby
-qwB
+jLn
+xTy
+xTy
+tJK
+xTy
+vob
+xhS
+mOB
bph
big
bgN
@@ -81183,9 +81175,9 @@ bkZ
bsc
btG
aaa
-prP
+iDo
ctv
-prP
+iDo
aaa
aaa
aaa
@@ -81322,7 +81314,7 @@ aaa
acd
acd
acd
-jHM
+xUe
acd
acd
aaa
@@ -81366,7 +81358,7 @@ aYi
aqW
aqW
bbQ
-qpA
+uFp
apd
aZH
aZK
@@ -81426,12 +81418,12 @@ cow
cpk
cpT
cjJ
-xLZ
-oNQ
+fjS
+dXq
btG
-sZa
-jhF
-qmM
+rtl
+oqO
+vFr
bnV
bph
bii
@@ -81440,9 +81432,9 @@ bih
bsc
btG
aaa
-prP
+iDo
ctv
-prP
+iDo
aaa
aaa
aaa
@@ -81577,10 +81569,10 @@ abc
abc
afu
abc
-suI
-qMu
-kJr
-dxB
+itQ
+pgn
+tmO
+eHU
acd
aaa
aaa
@@ -81681,25 +81673,25 @@ clG
cnP
coz
cpn
-dbn
-dbn
+sPY
+sPY
bgO
-hjw
+dgO
bgO
-nTE
-pTn
-jnm
+pPI
+uRd
+ktP
bnW
bph
bsc
-mQR
+mkv
bsc
-wNM
+jFH
btG
gXs
-prP
+iDo
ctv
-prP
+iDo
aaa
aaa
aaa
@@ -81834,11 +81826,11 @@ aea
aeH
aft
abc
-woX
-kdm
-rvZ
-vUR
-jHM
+dly
+mnC
+mcp
+xls
+xUe
aaa
aaa
aiU
@@ -81944,19 +81936,19 @@ aaf
aaa
aaa
gXs
-gtL
+iHk
bgO
bgO
bgO
bgO
bgO
bgO
-vgp
+jBA
btG
aaa
-gSH
+kvl
ctv
-prP
+iDo
aaa
aaa
aaa
@@ -82080,7 +82072,7 @@ aaa
aaa
gXs
gXs
-dbM
+dVU
abc
abu
abu
@@ -82092,10 +82084,10 @@ aeJ
afw
abc
abc
-kdm
+mnC
aay
-vUR
-qlF
+xls
+kMt
aaf
aaf
aiU
@@ -82163,7 +82155,7 @@ bCq
bHD
bJe
bCq
-czi
+nkP
bHE
bHE
bHE
@@ -82211,7 +82203,7 @@ aaa
aaa
aaa
aaa
-prP
+iDo
ctv
aaT
aaa
@@ -82349,9 +82341,9 @@ aeI
afv
agf
abc
-kdm
+mnC
aay
-vUR
+xls
aiT
aiT
aiV
@@ -82384,7 +82376,7 @@ aKA
aLN
aMS
aOz
-iMG
+exP
aPQ
aSa
aSr
@@ -82394,7 +82386,7 @@ aYZ
bLE
aqW
aqW
-hfe
+noy
apd
beA
bqp
@@ -82402,7 +82394,7 @@ cNG
cNJ
bLF
aZK
-haz
+sRH
bbR
bqt
cBq
@@ -82468,8 +82460,8 @@ aaa
aaa
aaa
aaa
-prP
-prP
+iDo
+iDo
aaT
aaa
aaa
@@ -82593,8 +82585,8 @@ aaa
aaa
aaa
aai
-jSa
-uVt
+eqd
+kgr
abe
abw
acc
@@ -82606,9 +82598,9 @@ aeL
afy
agh
abc
-tOd
-vRr
-tLl
+hnU
+vda
+ybj
aiT
ajs
akb
@@ -82850,7 +82842,7 @@ aaa
aaa
gXs
aai
-gIO
+gbu
aay
abd
abv
@@ -82863,9 +82855,9 @@ aeK
afx
agg
abc
-orw
-jMK
-riA
+dCV
+idK
+ttX
aiU
ajr
aka
@@ -83108,9 +83100,9 @@ aaf
aaf
aai
acd
-wgb
+mIZ
abg
-jtU
+enB
aby
aby
aby
@@ -83120,10 +83112,10 @@ aeN
afA
afA
abc
-vWw
-wFk
-oXL
-cXx
+laq
+kdP
+mGw
+jls
aju
akd
akK
@@ -83190,14 +83182,14 @@ bCn
bGq
bGq
bGq
-tdF
+rGq
bLw
bGq
bGq
bGq
bLw
bGq
-tdF
+rGq
bTD
bUx
bVI
@@ -83212,7 +83204,7 @@ bVI
bVI
bVI
bTA
-xlN
+xgk
bHE
bHE
bHE
@@ -83245,7 +83237,7 @@ aaa
aaa
aaa
aaa
-hvS
+kEY
aaa
aaa
aaa
@@ -83366,7 +83358,7 @@ aai
aai
abf
aat
-tHx
+jRw
abx
acd
acC
@@ -83375,12 +83367,12 @@ adF
aef
aeM
afz
-jSD
+dLG
aav
-sjT
-pLt
-pQr
-new
+vIi
+fsj
+mPt
+lyR
ajt
akc
akJ
@@ -83693,7 +83685,7 @@ bqw
aJq
aJq
aYl
-ppY
+fAj
aLX
aJq
aJq
@@ -83877,7 +83869,7 @@ aai
aan
aaw
aaB
-kfE
+qmn
aaJ
aat
abh
@@ -84132,7 +84124,7 @@ aag
aaa
aak
aap
-fuo
+saX
aaD
aau
aat
@@ -84207,7 +84199,7 @@ bqy
cBr
bqy
buK
-pNI
+tZe
aJw
aJq
aJq
@@ -84239,7 +84231,7 @@ bWB
bWB
cec
bVI
-iOt
+kNv
ccw
chY
ciX
@@ -84646,7 +84638,7 @@ aag
aaa
aal
aar
-phH
+uGI
aaF
aat
aat
@@ -84725,7 +84717,7 @@ bwi
bmr
aMm
aJq
-otF
+vEi
bCs
bCs
bEY
@@ -84903,12 +84895,12 @@ aag
aaf
aaj
aaq
-eOy
+dyS
aaE
aat
aaN
aaV
-rtT
+rvS
aat
acd
abL
@@ -84987,7 +84979,7 @@ bCs
bDv
bEX
bFb
-hKF
+kfv
bFa
bKt
bLx
@@ -85163,9 +85155,9 @@ aat
aat
aat
aat
-jeR
-neC
-jgv
+qXg
+jjC
+xOx
abD
acd
acd
@@ -85183,9 +85175,9 @@ agj
auj
akl
akO
-uko
-uko
-xqW
+fde
+fde
+seP
anw
anz
aox
@@ -85421,7 +85413,7 @@ aat
aat
aat
aat
-hRz
+uEI
aat
abC
acd
@@ -85465,7 +85457,7 @@ aGq
aHO
aJl
ayW
-neb
+ftE
aJq
aOE
aJn
@@ -85478,7 +85470,7 @@ aYq
aZO
aZC
baK
-qBe
+rnt
bbC
bdI
bgK
@@ -85735,10 +85727,10 @@ aYs
aZQ
bbi
bde
-nLf
+kvL
bcd
bcd
-xhx
+gNC
bcd
bcd
bcd
@@ -85930,14 +85922,14 @@ aaa
aag
aaf
aai
-cMk
-cMk
+wYc
+wYc
aaG
-cMk
+wYc
aaP
aaX
-unu
-lwY
+keM
+xib
acd
acD
acY
@@ -85993,7 +85985,7 @@ aZP
bbh
bcc
bdd
-gjf
+cVs
bfr
bgM
bif
@@ -86211,9 +86203,9 @@ aiz
ajg
akl
akR
-uko
-uko
-xqW
+fde
+fde
+seP
anz
anz
aov
@@ -86252,19 +86244,19 @@ bbk
bfu
bbk
bfs
-pUl
+rTu
aZM
aZM
aaf
aaf
-lCL
+ktS
aaf
-lCL
+ktS
aaf
-lCL
+ktS
aaf
-lCL
-wwB
+ktS
+fxV
aXf
aJq
bBi
@@ -86451,7 +86443,7 @@ aaa
aaf
aai
abi
-vdz
+eqA
ach
acK
adf
@@ -86509,19 +86501,19 @@ bce
bdf
beb
aYv
-kTz
-kDD
+cUx
+fcn
aaf
aaf
-lCL
-lCL
+ktS
+ktS
aaf
-wwB
-wwB
-wwB
-wwB
-wwB
-wwB
+fxV
+fxV
+fxV
+fxV
+fxV
+fxV
aXf
aJq
byU
@@ -86766,19 +86758,19 @@ aZR
bbm
bec
bfu
-sdL
+vBa
aBa
aBa
aBa
aBa
aBa
aBa
-wwB
+fxV
bsb
-lTq
-tMS
-eND
-wEp
+yhz
+ouQ
+cQT
+nbT
aXf
aJq
bBi
@@ -86972,7 +86964,7 @@ cpg
acv
adi
adi
-pQD
+yiY
aeW
agQ
ahv
@@ -86989,7 +86981,7 @@ anz
anz
aov
aph
-oOb
+cIv
ard
ard
ard
@@ -87023,7 +87015,7 @@ aZR
aZR
aZR
bft
-srq
+psk
aBa
aBT
aDs
@@ -87032,13 +87024,13 @@ aGb
aBa
bqD
bsa
-oeQ
+vCn
bsa
bsa
-wEp
+nbT
byS
aJq
-idX
+wTf
bCs
bCs
bCs
@@ -87229,7 +87221,7 @@ acl
cxA
acL
adi
-vpz
+pfm
agp
agT
ahx
@@ -87239,12 +87231,12 @@ ajc
ajI
akl
akT
-fGl
-uko
-xqW
+unW
+fde
+seP
anw
anz
-lYU
+old
apk
anw
anw
@@ -87255,7 +87247,7 @@ avj
awl
axC
ayY
-uZM
+cpF
azZ
azZ
azZ
@@ -87280,16 +87272,16 @@ bbm
bdh
bee
bfv
-vLD
+xUL
aBb
-cSn
+gpD
aDr
aEM
aGa
aHF
bqF
bsa
-nmx
+nXE
buQ
buQ
bxI
@@ -87359,7 +87351,7 @@ cgI
cgI
cgI
aaa
-hoo
+gDl
aaa
aaa
aaa
@@ -87537,13 +87529,13 @@ bcf
bdg
bed
bfv
-kvZ
-fGC
-qvM
+tyX
+pst
+cTT
alu
aEM
aGd
-nMx
+uOJ
bqE
bqE
bqE
@@ -87769,7 +87761,7 @@ avk
awk
axE
ayZ
-ncj
+pHO
aBu
aAa
aAa
@@ -87794,18 +87786,18 @@ bbm
bdh
bef
bfv
-smn
+gTx
aBc
-jXg
+xEB
aDt
aEO
aGc
aHF
aKG
bsf
-kxc
-kxc
-kxc
+dml
+dml
+dml
bxK
bwh
bAh
@@ -88015,7 +88007,7 @@ aml
amT
anw
anz
-ilJ
+cXU
apl
aqc
aqc
@@ -88051,19 +88043,19 @@ aZR
aZR
aZR
bfw
-rzg
+wZI
aBa
aBW
bjy
aEP
-nOS
+nYe
aBa
bqG
bsa
-jDY
+eih
bsa
bsa
-wEp
+nbT
bwb
aJq
bBr
@@ -88272,7 +88264,7 @@ amn
amV
anw
anz
-rsX
+gfC
aod
aqf
ahT
@@ -88308,19 +88300,19 @@ aZR
bbm
beh
bfx
-spX
+qcm
aBa
aBa
aBa
aBa
aBa
aBa
-mte
+wql
bsg
-lTq
-tMS
-fZD
-wEp
+yhz
+ouQ
+fTC
+nbT
aJq
aJq
bBu
@@ -88565,19 +88557,19 @@ bcg
aZU
beg
aYB
-ptV
-fjy
+qOB
+qBi
aaf
aaf
-lCL
-lCL
+ktS
+ktS
aaf
-wwB
-wwB
-wwB
-wwB
-wwB
-wwB
+fxV
+fxV
+fxV
+fxV
+fxV
+fxV
aJq
aJq
bBt
@@ -88782,9 +88774,9 @@ ajJ
akr
akX
alC
-iqw
+wIG
amX
-elw
+spu
anz
aoB
aod
@@ -88822,19 +88814,19 @@ bbp
bfx
bbp
bfz
-tAb
+sqp
aZV
aZV
aaf
aaf
-lCL
+ktS
aaf
-lCL
+ktS
aaf
-lCL
+ktS
aaf
-lCL
-wwB
+ktS
+fxV
aJq
aJq
aXf
@@ -89041,9 +89033,9 @@ akW
aiG
amo
amW
-uYE
+uaj
anz
-rsX
+gfC
aod
aqe
arf
@@ -89094,7 +89086,7 @@ bsh
bqH
aJq
aJq
-unY
+gnf
bCv
bDJ
bCt
@@ -89333,7 +89325,7 @@ aYD
aZX
baf
bdk
-jwi
+mRQ
bek
bfB
bgU
@@ -89576,7 +89568,7 @@ vHj
eVC
dgz
aJv
-ioG
+khV
aMg
bHt
aOE
@@ -89806,13 +89798,13 @@ ahC
aia
aiP
aiR
-olv
+coi
akv
ala
aww
afM
aiX
-uVq
+xzj
anz
aoF
apo
@@ -89823,8 +89815,8 @@ atj
aul
auR
atj
-kcj
-ghJ
+mps
+tKk
atj
aAX
azc
@@ -89847,7 +89839,7 @@ aPR
aZV
baq
baQ
-dTJ
+wcB
bcQ
bfC
bgV
@@ -90083,8 +90075,8 @@ avt
axL
bbl
azT
-nlt
-dwc
+nZE
+ker
aDG
aFd
auk
@@ -90137,7 +90129,7 @@ bOV
bQj
bRw
bSF
-gVY
+daI
bTP
bRA
bWQ
@@ -90336,11 +90328,11 @@ arf
arf
arf
arf
-ukP
-oma
+ltK
+xAv
awr
awr
-wwn
+ruo
aAh
aAh
aAh
@@ -90377,7 +90369,7 @@ btL
buY
buY
bqH
-neb
+ftE
aJq
aXf
bCv
@@ -90394,7 +90386,7 @@ bOV
bQo
bRz
bSH
-cJn
+plm
bTP
bRA
bWQ
@@ -90597,7 +90589,7 @@ avv
awu
awr
aAd
-uDW
+tkq
aAh
aDL
aAh
@@ -90651,7 +90643,7 @@ bOV
bQj
bRy
bSG
-gVY
+daI
bUK
bVT
bWR
@@ -90854,7 +90846,7 @@ awp
axN
awr
awr
-kSh
+haM
aAh
aDQ
aAh
@@ -90862,7 +90854,7 @@ aGl
aAh
aBy
aAh
-pTR
+rqf
aJq
aOE
aJn
@@ -90875,7 +90867,7 @@ aYF
aZV
bbw
bcn
-qUm
+tgH
ben
bfE
bgX
@@ -91105,13 +91097,13 @@ aqe
arf
ari
asu
-kyi
+mPk
aun
avR
-oma
-dHb
+xAv
+ofU
awr
-uya
+sFW
aAh
aDM
aGx
@@ -91364,18 +91356,18 @@ arf
arf
arf
arf
-ukP
+ltK
axP
azb
aAi
-wGP
+uIO
aCn
-rOm
-wwC
+xBk
+dtx
aGm
aHV
aDM
-nrR
+hIM
aJq
aJq
aJq
@@ -91406,9 +91398,9 @@ bva
bwu
bwu
bwu
-ihm
+kPj
bBB
-rhb
+eBX
bzs
bFp
bGJ
@@ -91624,8 +91616,8 @@ arf
awq
axO
aza
-jtk
-pqR
+kmw
+xrN
aAh
aAh
aAh
@@ -91874,7 +91866,7 @@ ajo
aps
aqk
arf
-vGX
+vDR
blU
aHw
avn
@@ -91882,14 +91874,14 @@ awv
axX
aze
awr
-hMx
+flE
aAh
aDU
aBz
aBz
aAh
-isy
-uzk
+dTI
+ujv
aJq
aJq
aJq
@@ -92133,7 +92125,7 @@ aqj
arf
ark
asu
-epV
+xPk
aun
awt
awr
@@ -92142,10 +92134,10 @@ azX
aAZ
aCe
aDT
-mEN
-mEN
-dzy
-fyq
+cPn
+cPn
+mkO
+uQS
aAh
aJC
aJC
@@ -92402,18 +92394,18 @@ aDP
aBx
aBx
aAh
-kCk
-qIf
+qqs
+sYR
aMq
adq
aQb
aPZ
aRu
-wpo
+kAH
aKR
-tIC
+tCa
aXi
-maC
+hgO
baa
aJC
bcq
@@ -92653,7 +92645,7 @@ awy
awr
awr
avG
-udi
+wqF
aAh
aAh
aAh
@@ -92663,13 +92655,13 @@ aAh
aAh
aKR
aKR
-pxD
+fxe
aPY
-xMl
+kAO
aRx
aKR
-jzD
-tuN
+iTU
+pqe
aPY
aZZ
aQg
@@ -92910,24 +92902,24 @@ awA
axT
axW
aAl
-tAE
+cHf
aJC
aDR
aFl
-rLr
+kqI
aHZ
aJC
aKJ
-rLR
+hIL
aKR
-hSU
-kay
+wxT
+moD
aQd
aQa
aKR
-xbu
-hSU
-lwj
+elh
+wxT
+uBa
bac
aJC
aYV
@@ -93151,7 +93143,7 @@ aif
aif
aif
bkV
-fvk
+jKP
alK
aif
aif
@@ -93159,19 +93151,19 @@ anc
anD
aoI
arf
-myt
+eSe
asN
aur
avy
-tWR
+nSt
axS
azk
aAk
-eUd
+tvi
aJC
aDY
aDY
-rLr
+kqI
aKR
aJk
aKR
@@ -93187,7 +93179,7 @@ aKR
aKR
bab
aJC
-xYO
+ucq
aYV
ber
bfF
@@ -93399,13 +93391,13 @@ abp
afo
abp
abp
-hlY
+uhm
ahn
aiA
aiA
aiA
ahn
-hYW
+oLn
anF
aod
ahn
@@ -93416,15 +93408,15 @@ ahn
ahn
ahn
arf
-iES
-jdT
+oAB
+eQb
aut
arf
aXF
awr
awr
aAn
-wcy
+rqk
aJC
aEc
aFk
@@ -93434,19 +93426,19 @@ aJC
aKr
aKR
aKR
-fbm
-fbm
-hzR
+sLj
+sLj
+vcN
aKR
aKR
aKR
-fbm
+sLj
aKR
aKR
bbx
aYV
aYV
-wDR
+tkB
bfF
bhd
bis
@@ -93652,11 +93644,11 @@ aaf
aaf
aaf
abp
-unE
+wdv
afp
-unE
+wdv
abp
-nea
+nQi
ahn
aaa
aaf
@@ -93666,39 +93658,39 @@ ahn
anE
aod
aoK
-sgV
+oyX
aqp
ahn
-ukS
-tQk
-cVp
-jdT
-jdT
-jdT
-rMc
+tzQ
+pgf
+gzf
+eQb
+eQb
+eQb
+lUS
aun
avz
awr
awr
aAn
-fSr
+jGW
aJC
aJC
-gjC
-lxx
+plC
+oAb
aJC
aJC
aKq
aKR
aNF
-egS
-ghs
-lMY
+hOv
+oax
+oxm
aSH
aKR
-dMX
-igT
-moq
+rmN
+eJa
+hSZ
aKR
aQg
aYV
@@ -93724,7 +93716,7 @@ bvj
bvj
bvd
bFu
-hcd
+jex
bvj
bvd
bKH
@@ -93926,19 +93918,19 @@ aoL
apy
aqq
ahn
-dhx
-mfb
+qLR
+oIW
arf
-unl
+kmS
ast
-jdT
+eQb
auv
arf
avA
axW
azo
aAp
-lYZ
+uxY
aBC
aCt
aEA
@@ -93949,13 +93941,13 @@ aKN
aKR
aKR
aOJ
-fvW
-dtE
+oIJ
+unA
aKR
aKR
aUg
bFC
-moq
+hSZ
aKR
bbx
aYV
@@ -93963,9 +93955,9 @@ aYV
bet
bfH
bhf
-slp
+wbE
bhh
-slp
+wbE
bmJ
bof
bpu
@@ -94191,11 +94183,11 @@ arf
arf
arf
arf
-hkg
-eNW
+hlV
+oHB
azf
aAo
-lMx
+vyp
aBB
aBB
aBB
@@ -94205,12 +94197,12 @@ cNE
aKM
aMu
aMu
-poa
-hdb
+feG
+tif
aMu
aMu
aMu
-uTq
+jgA
aSq
aKR
bad
@@ -94222,7 +94214,7 @@ bfG
bhe
bit
bjS
-nGS
+tCd
bli
boe
bli
@@ -94437,24 +94429,24 @@ aag
aag
aag
arf
-iep
-gQn
+wXl
+iou
arf
-myt
-qNs
-lMx
-sjw
+eSe
+wig
+vyp
+rrM
clO
asZ
aua
-dcG
+oZl
awB
att
azh
-vYa
-vYa
-gKk
-vbY
+fHG
+fHG
+kxf
+ufD
alP
aGI
aId
@@ -94468,7 +94460,7 @@ aMx
aMx
aMx
aMx
-eqm
+rqE
aKR
aZb
aJC
@@ -94679,11 +94671,11 @@ aaa
aaa
aaa
aaa
-xzh
+bvG
aaa
aqG
aaa
-vDq
+oyN
aaa
aaa
aaa
@@ -94694,24 +94686,24 @@ aaa
aaa
aaa
arf
-pZv
-tQk
-cVp
-jdT
-ier
+lOe
+pgf
+gzf
+eQb
+jLT
arf
arm
-vYa
+fHG
aya
-vYa
-vYa
+fHG
+fHG
auB
atZ
azg
azp
-vYa
+fHG
aCu
-dgh
+qOc
alP
aGH
aIc
@@ -94936,11 +94928,11 @@ aaa
aaa
aaa
aaa
-lCB
-lNB
+tqB
+vae
aaa
-lNB
-rUQ
+vae
+efO
aaa
aaa
aaa
@@ -94954,21 +94946,21 @@ arf
arf
arf
arf
-iES
-jYI
+oAB
+ujS
aqs
-hVw
-vYa
-vYa
-vYa
-vYa
-pSf
-vYa
+coh
+fHG
+fHG
+fHG
+fHG
+pPi
+fHG
ayb
-ndC
-vYa
+hWd
+fHG
aCv
-frE
+mbU
alP
aGJ
aIe
@@ -94982,7 +94974,7 @@ aXj
aVy
aSY
aVy
-oNb
+xqG
acN
bah
aJC
@@ -95193,11 +95185,11 @@ aaa
aaa
aaa
aaa
-jmC
-jmC
+gJi
+gJi
gXs
-jmC
-jmC
+gJi
+gJi
aaa
aaa
aaa
@@ -95210,22 +95202,22 @@ aaa
aaa
aaa
arf
-ewZ
-jdT
-tOU
+obc
+eQb
+qAm
arf
-fQF
-qbx
-qux
-vYa
-vYa
-pSf
-vYa
+lXE
+pFX
+mOO
+fHG
+fHG
+pPi
+fHG
ayb
-ndC
-vYa
-vys
-tCi
+hWd
+fHG
+sci
+sEi
alP
aGJ
aIe
@@ -95235,11 +95227,11 @@ aKQ
aNu
aJC
aPw
-kwy
+egt
aQc
aSZ
aQc
-vjq
+qaY
acN
bag
aJC
@@ -95467,22 +95459,22 @@ aaa
aaa
aaa
arf
-qoP
-prU
-fOc
+mse
+fMZ
+dqb
arf
-oSO
-sAI
-fJa
-vYa
-svw
-ntf
-jvN
-lBE
-xpx
-vYa
+xzd
+sJI
+jJg
+fHG
+eAJ
+rvr
+nLu
+hcA
+ryr
+fHG
aCu
-hgX
+puh
alP
aGA
aHS
@@ -95504,7 +95496,7 @@ aYV
aYV
bet
bfH
-dok
+qTV
bhh
bhg
bln
@@ -95708,9 +95700,9 @@ aaa
aaa
aaa
aaa
-aaz
+xLX
aaa
-aaz
+xLX
aaa
aaa
aaa
@@ -95728,18 +95720,18 @@ arf
arf
arf
arf
-mTp
-qEv
-kRk
-mXB
-qAQ
-pzk
-vYa
-sMa
-iEI
-jeT
-rTQ
-vHM
+fZm
+jmV
+epD
+ghD
+hBA
+xbn
+fHG
+reA
+lsk
+xXi
+jAN
+jEc
alP
aGL
aHM
@@ -95984,18 +95976,18 @@ aaa
aaa
aaa
gXs
-kHJ
-rEV
-rEV
-kQZ
-fVU
-vpm
-vpm
-fVU
-nel
-wCa
-wCa
-lFl
+ewu
+pQp
+pQp
+oqj
+jBi
+fpl
+fpl
+jBi
+oDN
+sEM
+sEM
+pRs
arj
alP
aGL
@@ -96092,7 +96084,7 @@ aaf
ctZ
cui
cuq
-ajY
+cuC
cuO
cuz
cvm
@@ -96270,7 +96262,7 @@ aVz
aVz
aYJ
aJI
-sIe
+mNW
aYV
aYV
aYV
@@ -96600,8 +96592,8 @@ czk
cti
cua
cua
-aeF
-afs
+ctw
+ctH
ctQ
cuc
cuj
@@ -96787,7 +96779,7 @@ baj
bbz
aYV
bdp
-itT
+mvt
bfK
bfK
bfK
@@ -96857,9 +96849,9 @@ ctb
cth
cua
ctr
-afn
-age
-agX
+ctu
+ctG
+ctP
cub
cuj
cur
@@ -97040,7 +97032,7 @@ aVD
aVE
aXm
aVz
-egQ
+juG
bbz
aYV
bdp
@@ -97114,13 +97106,13 @@ ctc
ctc
cto
ctt
-afq
+cty
ctJ
-ahw
+ctT
cue
cul
cuu
-akz
+cuG
cuS
cve
cvo
@@ -97371,9 +97363,9 @@ ctb
ctj
ctk
cts
-afr
-agv
-ajC
+ctx
+ctI
+ctS
cud
cuk
cus
@@ -97526,17 +97518,17 @@ aaa
aaa
aaa
aaa
-haX
-rEV
-rEV
-rEV
-nie
-vpm
-vpm
-wFX
-wCa
-wCa
-wCa
+vmQ
+pQp
+pQp
+pQp
+grA
+fpl
+fpl
+gbh
+sEM
+sEM
+sEM
aCy
arj
alP
@@ -97554,7 +97546,7 @@ aTO
cCq
aVz
aVz
-fPs
+qus
bbz
aYV
bdp
@@ -97787,14 +97779,14 @@ aaa
aaa
aaa
arj
-cRz
+fCx
avD
awC
ayb
-mbD
-nmS
-oFk
-xXY
+eCr
+jvd
+cEo
+xZD
vpY
alP
aGJ
@@ -97840,7 +97832,7 @@ bCR
bqQ
bGX
bCR
-oDy
+edA
bRN
bIK
bPq
@@ -98046,13 +98038,13 @@ aaf
arj
auz
avC
-kOf
+vHz
aya
-vYa
-vYa
-oYc
-vYa
-vYa
+fHG
+fHG
+xkd
+fHG
+fHG
gOZ
aGJ
avI
@@ -98143,7 +98135,7 @@ aaa
aaf
cua
ctF
-agH
+ctM
ctX
cuf
cum
@@ -98303,7 +98295,7 @@ alO
arj
arj
arj
-eOv
+pBp
gOZ
cVb
cVb
@@ -98401,7 +98393,7 @@ aaf
cua
ctE
ctL
-ajX
+ctW
cuf
cum
cuw
@@ -98815,10 +98807,10 @@ cxW
anf
aqv
ayf
-fIn
-ego
+dce
+uua
awE
-dMu
+tRB
cVb
vCb
wUY
@@ -99071,8 +99063,8 @@ aag
alO
anf
alO
-kSB
-pAl
+mAH
+jaF
alP
anf
aCG
@@ -99088,11 +99080,11 @@ aIq
aKK
aMy
aIp
-jaa
+nGf
aQm
-wOT
-htr
-htr
+fzd
+fFA
+fFA
aVK
aRJ
aRJ
@@ -99334,10 +99326,10 @@ alP
awF
aCG
alP
-olw
+nhY
aBE
aCz
-trY
+vEp
aCJ
aGT
aIn
@@ -99347,10 +99339,10 @@ aMt
aIp
aOW
aQm
-dRC
+coI
aSS
aUj
-pHo
+sJx
aRJ
aYQ
cBg
@@ -99584,7 +99576,7 @@ aoN
apA
aof
arq
-hdp
+itK
atv
auD
alP
@@ -99604,14 +99596,14 @@ aMA
aIp
aOX
aQm
-dRC
+coI
aST
aUk
-pHo
+sJx
aRJ
aYQ
bam
-yiN
+ssB
aYV
aYV
aYV
@@ -99828,10 +99820,10 @@ adU
adU
adU
adU
-ssL
-rsv
-rsv
-rsv
+eaR
+jIs
+jIs
+jIs
acx
amv
ane
@@ -99861,14 +99853,14 @@ aMz
aNQ
aOX
aQm
-tFt
-tsr
-tsr
-xzy
+lva
+nUV
+nUV
+gbd
aRJ
aYR
ban
-qje
+ikm
aYV
aYV
bez
@@ -100112,7 +100104,7 @@ aaa
aFq
aGX
aIp
-vzS
+sHx
aKU
aME
aNN
@@ -100125,7 +100117,7 @@ aXo
aXo
aYO
bap
-qje
+ikm
aYV
bci
beB
@@ -100354,7 +100346,7 @@ aof
aof
aof
aof
-qkC
+vCy
aoP
atw
auF
@@ -100362,7 +100354,7 @@ alP
aoP
auF
azr
-kel
+jez
atw
alP
alP
@@ -100376,13 +100368,13 @@ aNQ
aOZ
aOX
aOX
-hZH
+rdG
aUz
aVM
aOX
aYT
bam
-ory
+iuR
baR
bcb
bdl
@@ -100439,7 +100431,7 @@ bAw
bAw
clp
aag
-jmC
+gJi
aaa
aaa
aaa
@@ -100617,7 +100609,7 @@ aty
auF
alP
aAt
-kuY
+jZT
alP
alP
alP
@@ -100868,7 +100860,7 @@ aaa
aaa
apC
anf
-kel
+jez
alP
atx
auF
@@ -100877,7 +100869,7 @@ auD
auF
apE
aAs
-khA
+vbi
alP
aCG
aFr
@@ -101130,12 +101122,12 @@ alP
apE
auG
alP
-rgF
+iWx
auF
apE
anf
anf
-jRy
+noF
aCG
aDZ
aFu
@@ -101399,8 +101391,8 @@ bbE
aIr
bav
aLf
-aaL
-kLR
+aNV
+qfD
aRO
aQp
aRN
@@ -101464,11 +101456,11 @@ cQB
czY
cOT
aaa
-jmC
-jmC
-jmC
-jmC
-jmC
+gJi
+gJi
+gJi
+gJi
+gJi
aaa
aaa
aaa
@@ -101641,12 +101633,12 @@ apC
alP
alP
alP
-tuj
+dbU
auH
avF
awI
ayc
-mlr
+gcF
asw
asw
aCD
@@ -101657,7 +101649,7 @@ aIu
aJQ
aIt
aIt
-kLR
+qfD
aRO
aIt
aRN
@@ -101912,9 +101904,9 @@ anf
aFu
aIs
aJP
-wuB
+vZR
aIt
-nsJ
+hGH
aYW
aYW
aYW
@@ -101982,9 +101974,9 @@ aaa
aaa
aaa
aaH
-adO
-aeD
-aeE
+eFW
+nwX
+weM
aaa
aaa
aaa
@@ -102169,9 +102161,9 @@ aFu
aFu
aIw
aJS
-tqt
+pJR
aNP
-jFy
+esZ
aOS
aOS
aOS
@@ -102235,14 +102227,14 @@ cQB
cAa
cOT
gXs
-xNY
-kvb
+rnK
+kWp
aaa
aaa
aaH
aaH
aaH
-aeE
+weM
aaa
aaa
aaa
@@ -102419,7 +102411,7 @@ awJ
anf
alP
aAv
-gCe
+tJS
aCE
aDZ
aFu
@@ -102428,7 +102420,7 @@ aIv
aJR
aIt
aIt
-kLR
+qfD
aRO
aIt
aPd
@@ -102492,14 +102484,14 @@ czU
czZ
cOT
aaa
-jmC
+gJi
aaH
aaH
aaH
aaH
aaH
aaH
-adO
+eFW
aaa
aaa
aaa
@@ -102685,7 +102677,7 @@ aIx
aJF
aQq
aNS
-kLR
+qfD
aRO
aIt
aPd
@@ -102749,14 +102741,14 @@ cgm
czY
cOT
gXs
-xNY
-kvb
-gJg
+rnK
+kWp
+kaq
aaH
aaH
aaa
aaa
-gJg
+kaq
aaa
aaa
aaa
@@ -102946,12 +102938,12 @@ aFu
aPf
aQq
aRP
-kHK
+pem
aIt
aIt
aWd
aXV
-iWa
+vsT
bbD
aYV
aXq
@@ -102959,7 +102951,7 @@ aYV
bfV
bhw
cHM
-kRw
+wWT
blB
blF
cHS
@@ -103008,9 +103000,9 @@ cNW
aaa
aaa
aaa
-gJg
-gJg
-adO
+kaq
+kaq
+eFW
aaH
gXs
aaa
@@ -103182,8 +103174,8 @@ alO
anf
anf
arw
-ftv
-sLr
+nuw
+uve
anf
alP
awL
@@ -103456,7 +103448,7 @@ aIy
aJG
cAz
aFw
-iWk
+gRZ
aPg
aQr
aFu
@@ -103523,10 +103515,10 @@ aaa
aaa
aaa
aaa
-jmC
-jmC
-jmC
-jmC
+gJi
+gJi
+gJi
+gJi
aaa
aaa
aaa
@@ -103693,10 +103685,10 @@ aaa
aaa
gXs
alP
-qxc
+jkx
ayf
-nuV
-iOV
+xAk
+mHU
aFn
aFn
aBB
@@ -103713,7 +103705,7 @@ aFw
aLo
aLb
aFw
-eMQ
+xEE
aYW
aYW
aRQ
@@ -103947,13 +103939,13 @@ aaa
aaa
aaa
aaa
-fzd
-fzd
-fzd
-fzd
-tNJ
-fzd
-fzd
+nsA
+nsA
+nsA
+nsA
+qVP
+nsA
+nsA
atB
alP
alP
@@ -103970,7 +103962,7 @@ aIz
aJM
aLa
aFw
-tGG
+hsb
aYW
aQs
aFu
@@ -104204,21 +104196,21 @@ aaa
aaa
aaa
aaa
-fzd
-xdb
-mCq
-wJz
-mHC
-tWs
-lmi
-ghY
-sxX
-ghY
-jBZ
+nsA
+cQF
+ndq
+rIA
+fBy
+hRI
+jaH
+hHQ
+feE
+hHQ
+kGJ
avI
asA
apE
-vHv
+dPk
aCG
aEf
aFw
@@ -104461,12 +104453,12 @@ aaa
aaa
aaa
aaa
-tIk
-mCq
-mCq
-mCq
-mCq
-pjh
+wKe
+ndq
+ndq
+ndq
+ndq
+oLl
asB
asB
asB
@@ -104557,7 +104549,7 @@ cOe
cBT
aag
gXs
-jmC
+gJi
aaa
aaa
aaa
@@ -104718,12 +104710,12 @@ aaa
aaa
aaa
aaa
-tIk
-mCq
-mCq
-mCq
-mCq
-dSv
+wKe
+ndq
+ndq
+ndq
+ndq
+qeb
asB
atD
auJ
@@ -104975,12 +104967,12 @@ aaa
aaa
aaa
aaa
-fzd
-mCq
-mCq
-mCq
-mCq
-mCq
+nsA
+ndq
+ndq
+ndq
+ndq
+ndq
asB
atC
auI
@@ -105064,7 +105056,7 @@ cNW
cNW
cNW
cOe
-qXH
+fup
csy
cko
cAf
@@ -105232,12 +105224,12 @@ aaa
aaa
aaa
aaa
-tIk
-mCq
-mCq
-mCq
-mCq
-mCq
+wKe
+ndq
+ndq
+ndq
+ndq
+ndq
asB
atE
auI
@@ -105489,18 +105481,18 @@ aaa
aaa
aaa
aaa
-tIk
-mCq
-mCq
-mCq
-mCq
-mCq
+wKe
+ndq
+ndq
+ndq
+ndq
+ndq
asB
asB
asB
avL
awR
-hRT
+hiV
azu
aAz
asB
@@ -105574,7 +105566,7 @@ cgp
chv
ciJ
cbf
-lLI
+diq
clr
bnt
cOe
@@ -105746,12 +105738,12 @@ aaa
aaa
aaa
aaa
-fzd
-wXP
-mCq
-nXa
-mCq
-nyH
+nsA
+lGV
+ndq
+pou
+ndq
+srG
asB
atG
auL
@@ -106003,12 +105995,12 @@ aaa
aaa
aaa
aaa
-fzd
-fzd
-fzd
-fzd
-fzd
-fzd
+nsA
+nsA
+nsA
+nsA
+nsA
+nsA
asB
atF
auK
@@ -106092,7 +106084,7 @@ cNW
clt
cQw
cNW
-abG
+mJo
cNW
cNW
aaf
@@ -106294,9 +106286,9 @@ aXB
aZh
baB
aCR
-riB
+kYk
bdx
-dfI
+vHT
bgc
bgc
biX
@@ -106348,7 +106340,7 @@ aaa
cOT
clt
cQw
-aaO
+oEZ
cOe
cOe
cNW
@@ -106605,18 +106597,18 @@ aaa
cOT
clt
cQw
-aaQ
+ttL
cOe
cOe
cNW
aaa
-jzi
-jzi
-jzi
-jzi
-jzi
-jzi
-jzi
+fIs
+fIs
+fIs
+fIs
+fIs
+fIs
+fIs
aaS
aaS
aba
@@ -106866,7 +106858,7 @@ bNB
cOe
cOe
cNW
-lCL
+ktS
aaS
aaa
aaf
@@ -107119,7 +107111,7 @@ cNW
cNW
clt
cQw
-aaY
+cCt
cOe
cOe
cNW
@@ -107368,7 +107360,7 @@ cbZ
bSl
cmo
cNW
-vOq
+lZl
cNW
chC
ciL
@@ -108668,17 +108660,17 @@ cpi
cpi
cpi
cqJ
-ggg
+vZA
crk
crk
crk
crk
crk
-pFt
+pTB
cqJ
-ggg
+vZA
crk
-pFt
+pTB
cpi
cpi
ctB
@@ -108934,7 +108926,7 @@ crF
aaa
aaa
aaa
-hik
+vPs
aaa
aaa
aaa
@@ -109673,7 +109665,7 @@ cNW
cNW
cNW
cNW
-vFt
+kAJ
clt
cac
cbh
@@ -109939,7 +109931,7 @@ cbf
cbf
ceT
cNW
-kCW
+dBm
chH
cNW
aaf
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index f4135b7566..fd0f0a1742 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -35039,9 +35039,9 @@
/area/quartermaster/miningoffice)
"blX" = (
/obj/machinery/disposal/bin,
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/light,
/obj/effect/turf_decal/delivery,
+/obj/structure/disposalpipe/trunk,
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
"blY" = (
@@ -35915,7 +35915,6 @@
/area/quartermaster/miningoffice)
"bnA" = (
/obj/structure/plasticflaps/opaque,
-/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery,
/obj/machinery/door/window/northright{
req_access_txt = "48"
@@ -35923,7 +35922,6 @@
/turf/open/floor/plasteel,
/area/maintenance/starboard/fore)
"bnB" = (
-/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/white{
icon_state = "1-2"
},
@@ -36748,6 +36746,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"boW" = (
@@ -36760,6 +36761,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"boX" = (
@@ -36767,7 +36771,6 @@
name = "Maintenance Hatch";
req_access_txt = "12"
},
-/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/white{
icon_state = "4-8"
},
@@ -36780,10 +36783,12 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/maintenance/starboard/fore)
"boY" = (
-/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/white{
icon_state = "4-8"
},
@@ -36796,11 +36801,13 @@
/obj/effect/turf_decal/tile/brown{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/maintenance/starboard/fore)
"boZ" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/white{
icon_state = "1-8"
},
@@ -36808,18 +36815,17 @@
dir = 9
},
/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel,
-/area/maintenance/starboard/fore)
-"bpa" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/brown{
- dir = 1
- },
-/obj/effect/turf_decal/tile/brown{
+/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/open/floor/plasteel,
/area/maintenance/starboard/fore)
+"bpa" = (
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
"bpb" = (
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/effect/decal/cleanable/dirt,
@@ -38203,6 +38209,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"brb" = (
@@ -39341,12 +39348,12 @@
/area/hallway/primary/central)
"bsV" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bsW" = (
@@ -85386,10 +85393,6 @@
},
/turf/open/floor/plasteel,
/area/medical/medbay/central)
-"cNB" = (
-/obj/machinery/status_display/evac,
-/turf/closed/wall,
-/area/medical/medbay/central)
"cNC" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
@@ -125766,17 +125769,6 @@
},
/turf/open/floor/plasteel/dark,
/area/science/mixing)
-"eYg" = (
-/obj/machinery/door/airlock/external{
- name = "External Docking Port"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/entry)
"faI" = (
/obj/structure/cable/white{
icon_state = "1-2"
@@ -125813,6 +125805,27 @@
},
/turf/open/floor/plasteel,
/area/medical/medbay/central)
+"fiK" = (
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/disposalpipe/sorting/mail{
+ dir = 8;
+ name = "Mining Junction";
+ sortType = 22
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
"fno" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -125935,15 +125948,6 @@
},
/turf/open/floor/engine,
/area/science/mixing)
-"gdb" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/entry)
"giN" = (
/obj/structure/window/reinforced{
dir = 8
@@ -125955,19 +125959,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall/r_wall,
/area/science/circuit)
-"gmn" = (
-/obj/machinery/door/airlock/external{
- name = "External Docking Port"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/entry)
"gut" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -126102,11 +126093,6 @@
/obj/structure/sign/warning/vacuum,
/turf/closed/wall/r_wall,
/area/chapel/office)
-"hlu" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/computer/shuttle/mining/common,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/entry)
"hrP" = (
/obj/structure/cable/white{
icon_state = "1-2"
@@ -126387,6 +126373,10 @@
},
/turf/open/floor/plasteel,
/area/medical/morgue)
+"jOB" = (
+/obj/structure/disposalpipe/segment,
+/turf/closed/wall,
+/area/maintenance/starboard/fore)
"jOE" = (
/obj/machinery/newscaster{
pixel_x = 32
@@ -126585,6 +126575,17 @@
},
/turf/open/floor/plasteel/dark,
/area/medical/medbay/central)
+"lDl" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore)
"lEl" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -126700,23 +126701,6 @@
},
/turf/open/floor/plasteel,
/area/maintenance/port/aft)
-"mgh" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/landmark/start/cyborg,
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/turret_protected/aisat_interior)
"mkm" = (
/obj/machinery/atmospherics/components/binary/valve,
/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{
@@ -126767,6 +126751,15 @@
},
/turf/open/floor/plasteel,
/area/science/research/abandoned)
+"mvx" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
"mxm" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/circuit/green,
@@ -126776,6 +126769,17 @@
/obj/item/assembly/signaler,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
+"mLI" = (
+/obj/machinery/door/airlock/external{
+ name = "External Docking Port"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
"mPj" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
@@ -126838,10 +126842,28 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/maintenance/port/fore)
+"nQR" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/computer/shuttle/mining/common,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
"nSh" = (
/obj/machinery/atmospherics/pipe/simple/general/hidden,
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
+"nSS" = (
+/obj/machinery/door/airlock/external{
+ name = "External Docking Port"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
"oHk" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -127063,6 +127085,21 @@
},
/turf/open/floor/plasteel,
/area/science/research/abandoned)
+"qeN" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/landmark/start/cyborg,
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/turret_protected/aisat_interior)
"qhc" = (
/obj/structure/table/reinforced,
/obj/item/integrated_electronics/analyzer,
@@ -127458,6 +127495,17 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
+"xdp" = (
+/obj/docking_port/stationary{
+ dwidth = 3;
+ height = 5;
+ id = "commonmining_home";
+ name = "SS13: Common Mining Dock";
+ roundstart_template = /datum/map_template/shuttle/mining_common/meta;
+ width = 7
+ },
+/turf/open/space/basic,
+/area/space)
"xdZ" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -127510,17 +127558,23 @@
},
/turf/open/floor/plasteel,
/area/science/research/abandoned)
-"xDY" = (
-/obj/docking_port/stationary{
- dwidth = 3;
- height = 5;
- id = "commonmining_home";
- name = "SS13: Common Mining Dock";
- roundstart_template = /datum/map_template/shuttle/mining_common/meta;
- width = 7
+"xCB" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
},
-/turf/open/space/basic,
-/area/space)
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/landmark/start/cyborg,
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/turret_protected/aisat_interior)
"xDZ" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
@@ -127608,21 +127662,6 @@
},
/turf/open/floor/plating,
/area/science/research/abandoned)
-"ylW" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/landmark/start/cyborg,
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/turret_protected/aisat_interior)
(1,1,1) = {"
aaa
@@ -137517,7 +137556,7 @@ bPC
bRK
bTC
bVK
-ylW
+qeN
cal
bPC
aaa
@@ -137774,7 +137813,7 @@ bPC
bRL
bTC
bVx
-mgh
+xCB
cam
bPC
bRO
@@ -138031,7 +138070,7 @@ bPC
bRM
bTD
bVL
-mgh
+xCB
can
bPC
bkE
@@ -160040,10 +160079,10 @@ aaa
aaa
aaa
aaa
-xDY
-eYg
-gdb
-gmn
+xdp
+mLI
+mvx
+nSS
abe
abp
abC
@@ -160301,7 +160340,7 @@ aaa
aaO
aaO
aaO
-hlu
+nQR
abq
abD
abD
@@ -168897,7 +168936,7 @@ cHP
cIS
bqX
cMa
-cNB
+iQI
cPr
cQW
cSF
@@ -171166,7 +171205,7 @@ blS
baQ
boV
bra
-bsU
+fiK
bus
bvM
bwZ
@@ -172449,7 +172488,7 @@ bio
bjZ
blW
aig
-aiC
+lDl
aig
aad
but
@@ -172706,7 +172745,7 @@ bip
bka
baQ
aig
-apw
+auv
aig
aaa
but
@@ -172962,7 +173001,7 @@ bgP
biq
bjZ
blX
-aig
+jOB
bpa
aig
aaa
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 9e6259c1fe..3353d1b15b 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -29753,16 +29753,16 @@
/obj/item/clothing/under/rank/security/navyblue,
/obj/item/clothing/under/rank/security/navyblue,
/obj/item/clothing/under/rank/security/navyblue,
-/obj/item/clothing/suit/security/officer,
-/obj/item/clothing/suit/security/officer,
-/obj/item/clothing/suit/security/officer,
-/obj/item/clothing/suit/security/officer,
-/obj/item/clothing/suit/security/officer,
-/obj/item/clothing/suit/security/officer,
+/obj/item/clothing/suit/armor/navyblue,
+/obj/item/clothing/suit/armor/navyblue,
+/obj/item/clothing/suit/armor/navyblue,
+/obj/item/clothing/suit/armor/navyblue,
+/obj/item/clothing/suit/armor/navyblue,
+/obj/item/clothing/suit/armor/navyblue,
/obj/item/clothing/under/rank/warden/navyblue,
-/obj/item/clothing/suit/security/warden,
+/obj/item/clothing/suit/armor/vest/warden/navyblue,
/obj/item/clothing/under/rank/head_of_security/navyblue,
-/obj/item/clothing/suit/security/hos,
+/obj/item/clothing/suit/armor/hos/navyblue,
/obj/item/clothing/head/beret/sec/navyofficer,
/obj/item/clothing/head/beret/sec/navyofficer,
/obj/item/clothing/head/beret/sec/navyofficer,
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index c3e7ba0890..22734b0979 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -2564,7 +2564,7 @@
"aij" = (
/obj/structure/closet/secure_closet/contraband/armory,
/obj/item/poster/random_contraband,
-/obj/item/clothing/suit/security/officer/russian,
+/obj/item/clothing/suit/armor/navyblue/russian,
/obj/item/grenade/plastic/c4,
/turf/open/floor/plasteel/dark,
/area/security/armory)
diff --git a/code/__DEFINES/components.dm b/code/__DEFINES/components.dm
index 0d2e88042d..0efd5a1f79 100644
--- a/code/__DEFINES/components.dm
+++ b/code/__DEFINES/components.dm
@@ -106,6 +106,9 @@
#define COMSIG_CLICK "atom_click" //from base of atom/Click(): (location, control, params, mob/user)
#define COMSIG_CLICK_SHIFT "shift_click" //from base of atom/ShiftClick(): (/mob)
+ #define COMPONENT_ALLOW_EXAMINATE 1
+ #define COMPONENT_DENY_EXAMINATE 2 //Higher priority compared to the above one
+
#define COMSIG_CLICK_CTRL "ctrl_click" //from base of atom/CtrlClickOn(): (/mob)
#define COMSIG_CLICK_ALT "alt_click" //from base of atom/AltClick(): (/mob)
#define COMSIG_CLICK_CTRL_SHIFT "ctrl_shift_click" //from base of atom/CtrlShiftClick(/mob)
@@ -159,7 +162,6 @@
// /mob signals
#define COMSIG_MOB_EXAMINATE "mob_examinate" //from base of /mob/verb/examinate(): (atom/A)
- #define COMPONENT_ALLOW_EXAMINE 1
#define COMSIG_MOB_DEATH "mob_death" //from base of mob/death(): (gibbed)
#define COMPONENT_BLOCK_DEATH_BROADCAST 1 //stops the death from being broadcasted in deadchat.
#define COMSIG_MOB_GHOSTIZE "mob_ghostize" //from base of mob/Ghostize(): (can_reenter_corpse, special, penalize)
diff --git a/code/__DEFINES/dynamic.dm b/code/__DEFINES/dynamic.dm
index 45c1ba9cb2..0d57961f48 100644
--- a/code/__DEFINES/dynamic.dm
+++ b/code/__DEFINES/dynamic.dm
@@ -5,6 +5,7 @@
#define NO_ASSASSIN (1<<0)
#define WAROPS_ALWAYS_ALLOWED (1<<1)
+#define USE_PREF_WEIGHTS (1<<2)
#define ONLY_RULESET (1<<0)
#define HIGHLANDER_RULESET (1<<1)
diff --git a/code/__DEFINES/interaction_flags.dm b/code/__DEFINES/interaction_flags.dm
index dc3242c910..6df5bf77fb 100644
--- a/code/__DEFINES/interaction_flags.dm
+++ b/code/__DEFINES/interaction_flags.dm
@@ -20,3 +20,5 @@
#define INTERACT_MACHINE_SET_MACHINE (1<<6) //MACHINES HAVE THIS BY DEFAULT, SOMEONE SHOULD RUN THROUGH MACHINES AND REMOVE IT FROM THINGS LIKE LIGHT SWITCHES WHEN POSSIBLE!!--------------------------
//This flag determines if a machine set_machine's the user when the user uses it, making updateUsrDialog make the user re-call interact() on it.
//THIS FLAG IS ON ALL MACHINES BY DEFAULT, NEEDS TO BE RE-EVALUATED LATER!!
+
+#define INTERACT_GHOST_READ (1<<0)
\ No newline at end of file
diff --git a/code/__DEFINES/reagents.dm b/code/__DEFINES/reagents.dm
index 54f4648006..d08344cc96 100644
--- a/code/__DEFINES/reagents.dm
+++ b/code/__DEFINES/reagents.dm
@@ -40,6 +40,8 @@
#define ADD_REAGENT 2 // reagent added
#define REM_REAGENT 3 // reagent removed (may still exist)
+#define THRESHOLD_UNHUSK 50 // health threshold for synthflesh/rezadone to unhusk someone
+
//reagent bitflags, used for altering how they works
#define REAGENT_DEAD_PROCESS (1<<0) //calls on_mob_dead() if present in a dead body
#define REAGENT_DONOTSPLIT (1<<1) //Do not split the chem at all during processing
diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm
index 28a04c2a51..7fabb74157 100644
--- a/code/__DEFINES/role_preferences.dm
+++ b/code/__DEFINES/role_preferences.dm
@@ -38,6 +38,7 @@
#define ROLE_BLOODSUCKER "bloodsucker"
//#define ROLE_MONSTERHUNTER "monster hunter" Disabled for now
#define ROLE_GHOSTCAFE "ghostcafe"
+#define ROLE_MINOR_ANTAG "minorantag"
//Missing assignment means it's not a gamemode specific role, IT'S NOT A BUG OR ERROR.
//The gamemode specific ones are just so the gamemodes can query whether a player is old enough
//(in game days played) to play that role
diff --git a/code/__DEFINES/spaceman_dmm.dm b/code/__DEFINES/spaceman_dmm.dm
index e590a30ff9..b9c0544bc1 100644
--- a/code/__DEFINES/spaceman_dmm.dm
+++ b/code/__DEFINES/spaceman_dmm.dm
@@ -11,3 +11,8 @@
#define SHOULD_CALL_PARENT(X)
#define UNLINT(X) X
#endif
+
+/world/proc/enable_debugger()
+ var/dll = world.GetConfig("env", "EXTOOLS_DLL")
+ if (dll)
+ call(dll, "debug_initialize")()
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index 91645d6c95..d144254a50 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -234,9 +234,9 @@
#define SLEEPING_CARP_TRAIT "sleeping_carp"
#define RISING_BASS_TRAIT "rising_bass"
#define ABDUCTOR_ANTAGONIST "abductor-antagonist"
-#define NUKEOP_ANTAGONIST "nukeop-antagonist"
#define MADE_UNCLONEABLE "made-uncloneable"
#define TIMESTOP_TRAIT "timestop"
#define NUKEOP_TRAIT "nuke-op"
+#define CLOWNOP_TRAIT "clown-op"
#define MEGAFAUNA_TRAIT "megafauna"
#define DEATHSQUAD_TRAIT "deathsquad"
diff --git a/code/__DEFINES/vote.dm b/code/__DEFINES/vote.dm
index 8fb2e6deab..b83ea7b8f6 100644
--- a/code/__DEFINES/vote.dm
+++ b/code/__DEFINES/vote.dm
@@ -1,6 +1,8 @@
#define PLURALITY_VOTING 0
#define APPROVAL_VOTING 1
-#define RANKED_CHOICE_VOTING 2
+#define SCHULZE_VOTING 2
#define SCORE_VOTING 3
+#define MAJORITY_JUDGEMENT_VOTING 4
+#define INSTANT_RUNOFF_VOTING 5
GLOBAL_LIST_INIT(vote_score_options,list("Bad","Poor","Acceptable","Good","Great"))
diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index 339069a364..1669c941c2 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -179,7 +179,6 @@
"balls_cum_rate" = CUM_RATE,
"balls_cum_mult" = CUM_RATE_MULT,
"balls_efficiency" = CUM_EFFICIENCY,
- "balls_fluid" = "semen",
"has_ovi" = FALSE,
"ovi_shape" = "knotted",
"ovi_length" = 6,
@@ -194,7 +193,6 @@
"breasts_color" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
"breasts_size" = pick(GLOB.breasts_size_list),
"breasts_shape" = "Pair",
- "breasts_fluid" = "milk",
"breasts_producing" = FALSE,
"has_vag" = FALSE,
"vag_shape" = pick(GLOB.vagina_shapes_list),
@@ -206,7 +204,6 @@
"womb_cum_rate" = CUM_RATE,
"womb_cum_mult" = CUM_RATE_MULT,
"womb_efficiency" = CUM_EFFICIENCY,
- "womb_fluid" = "femcum",
"ipc_screen" = "Sunburst",
"ipc_antenna" = "None",
"flavor_text" = "",
diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm
index 19ee2b2a5a..04e7ffd721 100644
--- a/code/__HELPERS/roundend.dm
+++ b/code/__HELPERS/roundend.dm
@@ -3,6 +3,9 @@
#define POPCOUNT_SHUTTLE_ESCAPEES "shuttle_escapees" //Emergency shuttle only.
/datum/controller/subsystem/ticker/proc/gather_roundend_feedback()
+ var/datum/station_state/end_state = new /datum/station_state()
+ end_state.count()
+ station_integrity = min(PERCENT(GLOB.start_state.score(end_state)), 100)
gather_antag_data()
record_nuke_disk_location()
var/json_file = file("[GLOB.log_directory]/round_end_data.json")
@@ -71,9 +74,6 @@
mob_data += list("name" = m.name, "typepath" = m.type)
var/pos = length(file_data["[escaped]"]["[category]"]) + 1
file_data["[escaped]"]["[category]"]["[pos]"] = mob_data
- var/datum/station_state/end_state = new /datum/station_state()
- end_state.count()
- var/station_integrity = min(PERCENT(GLOB.start_state.score(end_state)), 100)
file_data["additional data"]["station integrity"] = station_integrity
WRITE_FILE(json_file, json_encode(file_data))
SSblackbox.record_feedback("nested tally", "round_end_stats", num_survivors, list("survivors", "total"))
@@ -111,7 +111,14 @@
if(A.objectives.len)
for(var/datum/objective/O in A.objectives)
- var/result = O.check_completion() ? "SUCCESS" : "FAIL"
+ var/result = "UNKNOWN"
+ var/actual_result = O.check_completion()
+ if(actual_result >= 1)
+ result = "SUCCESS"
+ else if(actual_result <= 0)
+ result = "FAIL"
+ else
+ result = "[actual_result*100]%"
antag_info["objectives"] += list(list("objective_type"=O.type,"text"=O.explanation_text,"result"=result))
SSblackbox.record_feedback("associative", "antagonists", 1, antag_info)
@@ -550,10 +557,16 @@
var/list/objective_parts = list()
var/count = 1
for(var/datum/objective/objective in objectives)
- if(objective.check_completion())
- objective_parts += "Objective #[count]: [objective.explanation_text] Success!"
+ if(objective.completable)
+ var/completion = objective.check_completion()
+ if(completion >= 1)
+ objective_parts += "Objective #[count]: [objective.explanation_text] Success!"
+ else if(completion <= 0)
+ objective_parts += "Objective #[count]: [objective.explanation_text] Fail."
+ else
+ objective_parts += "Objective #[count]: [objective.explanation_text] [completion*100]%"
else
- objective_parts += "Objective #[count]: [objective.explanation_text] Fail."
+ objective_parts += "Objective #[count]: [objective.explanation_text]"
count++
return objective_parts.Join("
")
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 9bf59d5e76..e8a57bb257 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -319,9 +319,11 @@
/mob/proc/ShiftClickOn(atom/A)
A.ShiftClick(src)
return
+
/atom/proc/ShiftClick(mob/user)
- SEND_SIGNAL(src, COMSIG_CLICK_SHIFT, user)
- user.examinate(src)
+ var/flags = SEND_SIGNAL(src, COMSIG_CLICK_SHIFT, user)
+ if(!(flags & COMPONENT_DENY_EXAMINATE) && user.client && (user.client.eye == user || user.client.eye == user.loc || flags & COMPONENT_ALLOW_EXAMINATE))
+ user.examinate(src)
return
/*
diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm
index 79d125f608..974a0c0e88 100644
--- a/code/controllers/configuration/configuration.dm
+++ b/code/controllers/configuration/configuration.dm
@@ -364,6 +364,29 @@
runnable_modes[M] = final_weight
return runnable_modes
+/datum/controller/configuration/proc/get_runnable_storytellers()
+ var/list/datum/dynamic_storyteller/runnable_storytellers = new
+ var/list/probabilities = Get(/datum/config_entry/keyed_list/storyteller_weight)
+ var/list/repeated_mode_adjust = Get(/datum/config_entry/number_list/repeated_mode_adjust)
+ for(var/T in storyteller_cache)
+ var/datum/dynamic_storyteller/S = T
+ var/config_tag = initial(S.config_tag)
+ var/final_weight = initial(S.weight)
+ if(probabilities[config_tag]<=0)
+ continue
+ final_weight = probabilities[config_tag]
+ if(SSpersistence.saved_storytellers.len == 3 && repeated_mode_adjust.len == 3)
+ var/name = initial(S.name)
+ var/recent_round = min(SSpersistence.saved_storytellers.Find(name),3)
+ var/adjustment = 0
+ while(recent_round)
+ adjustment += repeated_mode_adjust[recent_round]
+ recent_round = SSpersistence.saved_modes.Find(name,recent_round+1,0)
+ final_weight *= ((100-adjustment)/100)
+ runnable_storytellers[S] = final_weight
+ return runnable_storytellers
+
+
/datum/controller/configuration/proc/get_runnable_midround_modes(crew)
var/list/datum/game_mode/runnable_modes = new
var/list/probabilities = Get(/datum/config_entry/keyed_list/probability)
diff --git a/code/controllers/configuration/entries/dynamic.dm b/code/controllers/configuration/entries/dynamic.dm
index 7f3e16d57e..4c03de4678 100644
--- a/code/controllers/configuration/entries/dynamic.dm
+++ b/code/controllers/configuration/entries/dynamic.dm
@@ -88,3 +88,7 @@
/datum/config_entry/number/dynamic_warops_cost
config_entry_value = 10
min_val = 0
+
+/datum/config_entry/keyed_list/storyteller_weight
+ key_mode = KEY_MODE_TEXT
+ value_mode = VALUE_MODE_NUM
diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm
index 2825f4343b..de2ff17a97 100644
--- a/code/controllers/subsystem/persistence.dm
+++ b/code/controllers/subsystem/persistence.dm
@@ -13,7 +13,7 @@ SUBSYSTEM_DEF(persistence)
var/list/saved_messages = list()
var/list/saved_modes = list(1,2,3)
var/list/saved_dynamic_rules = list(list(),list(),list())
- var/list/saved_storytellers = list("foo","bar","baz","foo again","bar again")
+ var/list/saved_storytellers = list("foo","bar","baz")
var/list/saved_maps
var/list/saved_trophies = list()
var/list/spawned_objects = list()
@@ -191,6 +191,7 @@ SUBSYSTEM_DEF(persistence)
if(!json)
return
saved_storytellers = json["data"]
+ saved_storytellers.len = 3
/datum/controller/subsystem/persistence/proc/LoadRecentMaps()
var/json_file = file("data/RecentMaps.json")
@@ -265,7 +266,8 @@ SUBSYSTEM_DEF(persistence)
/datum/controller/subsystem/persistence/proc/LoadPanicBunker()
var/bunker_path = file("data/bunker_passthrough.json")
if(fexists(bunker_path))
- GLOB.bunker_passthrough = json_decode(file2text(bunker_path))
+ var/list/json = json_decode(file2text(bunker_path))
+ GLOB.bunker_passthrough = json["data"]
for(var/ckey in GLOB.bunker_passthrough)
if(daysSince(GLOB.bunker_passthrough[ckey]) >= CONFIG_GET(number/max_bunker_days))
GLOB.bunker_passthrough -= ckey
@@ -428,9 +430,7 @@ SUBSYSTEM_DEF(persistence)
WRITE_FILE(json_file, json_encode(file_data))
/datum/controller/subsystem/persistence/proc/CollectStoryteller(var/datum/game_mode/dynamic/mode)
- saved_storytellers.len = 5
- saved_storytellers[5] = saved_storytellers[4]
- saved_storytellers[4] = saved_storytellers[3]
+ saved_storytellers.len = 3
saved_storytellers[3] = saved_storytellers[2]
saved_storytellers[2] = saved_storytellers[1]
saved_storytellers[1] = mode.storyteller.name
diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm
index a52bcf4607..10655981e5 100644
--- a/code/controllers/subsystem/processing/quirks.dm
+++ b/code/controllers/subsystem/processing/quirks.dm
@@ -35,7 +35,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
var/list/my_quirks = cli.prefs.all_quirks.Copy()
var/list/cut
if(job?.blacklisted_quirks)
- cut = filter_quirks(my_quirks, job)
+ cut = filter_quirks(my_quirks, job.blacklisted_quirks)
for(var/V in my_quirks)
var/datum/quirk/Q = quirks[V]
if(Q)
@@ -63,11 +63,11 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
for(var/i in quirk_names)
. += quirk_points_by_name(i)
-/datum/controller/subsystem/processing/quirks/proc/filter_quirks(list/our_quirks, datum/job/job)
+/datum/controller/subsystem/processing/quirks/proc/filter_quirks(list/our_quirks, list/blacklisted_quirks)
var/list/cut = list()
var/list/banned_names = list()
var/pointscut = 0
- for(var/i in job.blacklisted_quirks)
+ for(var/i in blacklisted_quirks)
var/name = quirk_name_by_path(i)
if(name)
banned_names += name
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index c9562bcfd1..ceb003210e 100755
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -68,6 +68,8 @@ SUBSYSTEM_DEF(ticker)
var/modevoted = FALSE //Have we sent a vote for the gamemode?
+ var/station_integrity = 100 // stored at roundend for use in some antag goals
+
/datum/controller/subsystem/ticker/Initialize(timeofday)
load_mode()
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index c67a1620f1..2a7c4401f3 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -188,22 +188,44 @@ SUBSYSTEM_DEF(vote)
choices[score_name]++
/datum/controller/subsystem/vote/proc/calculate_scores(var/blackbox_text)
- var/list/scores_by_choice = list()
for(var/choice in choices)
- scores_by_choice += "[choice]"
- scores_by_choice["[choice]"] = list()
+ scores += "[choice]"
+ scores["[choice]"] = 0
for(var/ckey in voted)
var/list/this_vote = voted[ckey]
- for(var/choice in choices)
- if("[choice]" in this_vote && "[choice]" in scores_by_choice)
- sorted_insert(scores_by_choice["[choice]"],this_vote["[choice]"],/proc/cmp_numeric_asc)
- var/middle_score = round(GLOB.vote_score_options.len/2,1)
- for(var/score_name in scores_by_choice)
- var/list/score = scores_by_choice[score_name]
- for(var/S in score)
- scores[score_name] += S-middle_score
+ for(var/choice in this_vote)
+ scores["[choice]"] += this_vote["[choice]"]
+ var/min_score = 100
+ var/max_score = -100
+ for(var/score_name in scores) // normalize the scores from 0-1
+ max_score=max(max_score,scores[score_name])
+ min_score=min(min_score,scores[score_name])
+ for(var/score_name in scores)
+ scores[score_name] = (scores[score_name]-min_score)/(max_score-min_score)
SSblackbox.record_feedback("nested tally","voting",scores[score_name],list(blackbox_text,"Total scores",score_name))
+/datum/controller/subsystem/vote/proc/get_runoff_results(var/blackbox_text)
+ var/already_lost_runoff = list()
+ var/list/cur_choices = choices.Copy()
+ for(var/ckey in voted)
+ choices[choices[voted[ckey][1]]]++ // jesus christ how horrifying
+ for(var/_this_var_unused_ignore_it in 1 to choices.len) // if it takes more than this something REALLY wrong happened
+ for(var/ckey in voted)
+ cur_choices[cur_choices[voted[ckey][1]]]++ // jesus christ how horrifying
+ var/least_vote = 100000
+ var/least_voted
+ for(var/i in 1 to cur_choices.len)
+ var/option = cur_choices[i]
+ if(cur_choices[option] > voted.len/2)
+ return list(option)
+ else if(cur_choices[option] < least_vote && !(option in already_lost_runoff))
+ least_vote = cur_choices[option]
+ least_voted = i
+ already_lost_runoff += cur_choices[least_voted]
+ for(var/ckey in voted)
+ voted[ckey] -= least_voted
+ for(var/option in cur_choices)
+ cur_choices[option] = 0
/datum/controller/subsystem/vote/proc/announce_result()
var/vote_title_text
@@ -214,24 +236,22 @@ SUBSYSTEM_DEF(vote)
else
text += "[capitalize(mode)] Vote"
vote_title_text = "[capitalize(mode)] Vote"
- if(vote_system == RANKED_CHOICE_VOTING)
+ if(vote_system == SCHULZE_VOTING)
calculate_condorcet_votes(vote_title_text)
if(vote_system == SCORE_VOTING)
- calculate_majority_judgement_vote(vote_title_text)
calculate_scores(vote_title_text)
- var/list/winners = get_result()
+ if(vote_system == MAJORITY_JUDGEMENT_VOTING)
+ calculate_majority_judgement_vote(vote_title_text) // nothing uses this at the moment
+ var/list/winners = vote_system == INSTANT_RUNOFF_VOTING ? get_runoff_results() : get_result()
var/was_roundtype_vote = mode == "roundtype" || mode == "dynamic"
if(winners.len > 0)
if(was_roundtype_vote)
stored_gamemode_votes = list()
- if(!obfuscated && vote_system == RANKED_CHOICE_VOTING)
- text += "\nIt should be noted that this is not a raw tally of votes (impossible in ranked choice) but the score determined by the schulze method of voting, so the numbers will look weird!"
- if(mode == "mode tiers")
- for(var/score_name in scores)
- var/score = scores[score_name]
- if(!score)
- score = 0
- text = "\n[score_name]: [obfuscated ? "???" : score]"
+ if(!obfuscated)
+ if(vote_system == SCHULZE_VOTING)
+ text += "\nIt should be noted that this is not a raw tally of votes (impossible in ranked choice) but the score determined by the schulze method of voting, so the numbers will look weird!"
+ if(vote_system == MAJORITY_JUDGEMENT_VOTING)
+ text += "\nIt should be noted that this is not a raw tally of votes but the number of runoffs done by majority judgement!"
else
for(var/i=1,i<=choices.len,i++)
var/votes = choices[choices[i]]
@@ -249,6 +269,15 @@ SUBSYSTEM_DEF(vote)
text += "\nVote Result: [obfuscated ? "???" : .]" //CIT CHANGE - adds obfuscated votes
else
text += "\nDid not vote: [GLOB.clients.len-voted.len]"
+ else if(vote_system == SCORE_VOTING)
+ for(var/score_name in scores)
+ var/score = scores[score_name]
+ if(!score)
+ score = 0
+ if(was_roundtype_vote)
+ stored_gamemode_votes[score_name] = score
+ text = "\n[score_name]: [obfuscated ? "???" : score]"
+ . = 1
else
text += "Vote Result: Inconclusive - No Votes!"
log_vote(text)
@@ -258,7 +287,7 @@ SUBSYSTEM_DEF(vote)
if(APPROVAL_VOTING,PLURALITY_VOTING)
for(var/i=1,i<=choices.len,i++)
SSblackbox.record_feedback("nested tally","voting",choices[choices[i]],list(vote_title_text,choices[i]))
- if(RANKED_CHOICE_VOTING)
+ if(SCHULZE_VOTING,INSTANT_RUNOFF_VOTING)
for(var/i=1,i<=voted.len,i++)
var/list/myvote = voted[voted[i]]
if(islist(myvote))
@@ -266,13 +295,18 @@ SUBSYSTEM_DEF(vote)
SSblackbox.record_feedback("nested tally","voting",1,list(vote_title_text,"[j]\th",choices[myvote[j]]))
if(obfuscated) //CIT CHANGE - adds obfuscated votes. this messages admins with the vote's true results
var/admintext = "Obfuscated results"
- if(vote_system == RANKED_CHOICE_VOTING)
- admintext += "\nIt should be noted that this is not a raw tally of votes (impossible in ranked choice) but the score determined by the schulze method of voting, so the numbers will look weird!"
- else if(vote_system == SCORE_VOTING)
- admintext += "\nIt should be noted that this is not a raw tally of votes but the number of runoffs done by majority judgement!"
- for(var/i=1,i<=choices.len,i++)
- var/votes = choices[choices[i]]
- admintext += "\n[choices[i]]: [votes]"
+ if(vote_system != SCORE_VOTING)
+ if(vote_system == SCHULZE_VOTING)
+ admintext += "\nIt should be noted that this is not a raw tally of votes (impossible in ranked choice) but the score determined by the schulze method of voting, so the numbers will look weird!"
+ else if(vote_system == MAJORITY_JUDGEMENT_VOTING)
+ admintext += "\nIt should be noted that this is not a raw tally of votes but the number of runoffs done by majority judgement!"
+ for(var/i=1,i<=choices.len,i++)
+ var/votes = choices[choices[i]]
+ admintext += "\n[choices[i]]: [votes]"
+ else
+ for(var/i=1,i<=scores.len,i++)
+ var/score = scores[scores[i]]
+ admintext += "\n[scores[i]]: [score]"
message_admins(admintext)
return .
@@ -316,15 +350,13 @@ SUBSYSTEM_DEF(vote)
if("dynamic")
if(SSticker.current_state > GAME_STATE_PREGAME)//Don't change the mode if the round already started.
return message_admins("A vote has tried to change the gamemode, but the game has already started. Aborting.")
- if(. == "Secret")
- GLOB.master_mode = "secret"
- SSticker.save_mode(.)
- message_admins("The gamemode has been voted for, and has been changed to: [GLOB.master_mode]")
- log_admin("Gamemode has been voted for and switched to: [GLOB.master_mode].")
- else
- GLOB.master_mode = "dynamic"
- var/datum/dynamic_storyteller/S = config.pick_storyteller(.)
- GLOB.dynamic_storyteller_type = S
+ GLOB.master_mode = "dynamic"
+ var/list/runnable_storytellers = config.get_runnable_storytellers()
+ for(var/T in runnable_storytellers)
+ var/datum/dynamic_storyteller/S = T
+ runnable_storytellers[S] *= scores[initial(S.name)]
+ var/datum/dynamic_storyteller/S = pickweightAllowZero(runnable_storytellers)
+ GLOB.dynamic_storyteller_type = S
if("map")
var/datum/map_config/VM = config.maplist[.]
message_admins("The map has been voted for and will change to: [VM.map_name]")
@@ -375,7 +407,7 @@ SUBSYSTEM_DEF(vote)
voted[usr.ckey] = list(vote)
choices[choices[vote]]++
return vote
- if(RANKED_CHOICE_VOTING)
+ if(SCHULZE_VOTING,INSTANT_RUNOFF_VOTING)
if(usr.ckey in voted)
if(vote in voted[usr.ckey])
voted[usr.ckey] -= vote
@@ -384,7 +416,7 @@ SUBSYSTEM_DEF(vote)
voted[usr.ckey] = list()
voted[usr.ckey] += vote
saved -= usr.ckey
- if(SCORE_VOTING)
+ if(SCORE_VOTING,MAJORITY_JUDGEMENT_VOTING)
if(!(usr.ckey in voted))
voted += usr.ckey
voted[usr.ckey] = list()
@@ -444,15 +476,10 @@ SUBSYSTEM_DEF(vote)
if("dynamic")
for(var/T in config.storyteller_cache)
var/datum/dynamic_storyteller/S = T
- var/recent_rounds = 0
- for(var/i in 1 to SSpersistence.saved_storytellers.len)
- if(SSpersistence.saved_storytellers[i] == initial(S.name))
- recent_rounds++
- if(recent_rounds < initial(S.weight))
+ var/list/probabilities = CONFIG_GET(keyed_list/storyteller_weight)
+ if(probabilities[initial(S.config_tag)] > 0)
choices.Add(initial(S.name))
choice_descs.Add(initial(S.desc))
- choices.Add("Secret")
- choice_descs.Add("Standard secret. Switches mode if it wins.")
if("custom")
question = stripped_input(usr,"What is the vote for?")
if(!question)
@@ -514,9 +541,9 @@ SUBSYSTEM_DEF(vote)
. += "Vote one.
"
if(APPROVAL_VOTING)
. += "Vote any number of choices.
"
- if(RANKED_CHOICE_VOTING)
+ if(SCHULZE_VOTING,INSTANT_RUNOFF_VOTING)
. += "Vote by order of preference. Revoting will demote to the bottom. 1 is your favorite, and higher numbers are worse.
"
- if(SCORE_VOTING)
+ if(SCORE_VOTING,MAJORITY_JUDGEMENT_VOTING)
. += "Grade the candidates by how much you like them.
"
. += "No-votes have no power--your opinion is only heard if you vote!
"
. += "Time Left: [DisplayTimeText(end_time-world.time)]
"
@@ -536,7 +563,7 @@ SUBSYSTEM_DEF(vote)
if(choice_descs.len >= i)
. += "- [choice_descs[i]]
"
. += "
"
- if(RANKED_CHOICE_VOTING)
+ if(SCHULZE_VOTING,INSTANT_RUNOFF_VOTING)
var/list/myvote = voted[C.ckey]
for(var/i=1,i<=choices.len,i++)
var/vote = (islist(myvote) ? (myvote.Find(i)) : 0)
@@ -553,7 +580,7 @@ SUBSYSTEM_DEF(vote)
. += "(Saved!)"
. += "(Load vote from save)"
. += "(Reset votes)"
- if(SCORE_VOTING)
+ if(SCORE_VOTING,MAJORITY_JUDGEMENT_VOTING)
var/list/myvote = voted[C.ckey]
for(var/i=1,i<=choices.len,i++)
. += "[choices[i]]"
@@ -656,7 +683,7 @@ SUBSYSTEM_DEF(vote)
voted[usr.ckey] = SSpersistence.saved_votes[usr.ckey][mode]
if(islist(voted[usr.ckey]))
var/malformed = FALSE
- if(vote_system == SCORE_VOTING)
+ if(vote_system == SCORE_VOTING || vote_system == MAJORITY_JUDGEMENT_VOTING)
for(var/thing in voted[usr.ckey])
if(!(thing in choices))
malformed = TRUE
@@ -670,7 +697,7 @@ SUBSYSTEM_DEF(vote)
to_chat(usr,"Your saved vote was malformed! Start over!")
voted -= usr.ckey
else
- if(vote_system == SCORE_VOTING)
+ if(vote_system == SCORE_VOTING || vote_system == MAJORITY_JUDGEMENT_VOTING)
submit_vote(round(text2num(href_list["vote"])),round(text2num(href_list["score"])))
else
submit_vote(round(text2num(href_list["vote"])))
diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm
index 9c8622d16e..4d3ecc8d17 100644
--- a/code/datums/components/storage/concrete/pockets.dm
+++ b/code/datums/components/storage/concrete/pockets.dm
@@ -56,7 +56,7 @@
/obj/item/scalpel, /obj/item/reagent_containers/syringe, /obj/item/dnainjector,
/obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/dropper,
/obj/item/implanter, /obj/item/screwdriver, /obj/item/weldingtool/mini,
- /obj/item/firing_pin, /obj/item/gun/ballistic/automatic/pistol
+ /obj/item/firing_pin, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/automatic/magrifle/pistol
))
/datum/component/storage/concrete/pockets/shoes/clown/Initialize()
diff --git a/code/datums/elements/mob_holder.dm b/code/datums/elements/mob_holder.dm
new file mode 100644
index 0000000000..5b471a0dc7
--- /dev/null
+++ b/code/datums/elements/mob_holder.dm
@@ -0,0 +1,184 @@
+/datum/element/mob_holder
+ element_flags = ELEMENT_BESPOKE
+ id_arg_index = 2
+ var/worn_state
+ var/alt_worn
+ var/right_hand
+ var/left_hand
+ var/inv_slots
+ var/proctype //if present, will be invoked on headwear generation.
+
+/datum/element/mob_holder/Attach(datum/target, _worn_state, _alt_worn, _right_hand, _left_hand, _inv_slots = NONE, _proctype)
+ . = ..()
+
+ if(!isliving(target))
+ return ELEMENT_INCOMPATIBLE
+
+ worn_state = _worn_state
+ alt_worn = _alt_worn
+ right_hand = _right_hand
+ left_hand = _left_hand
+ inv_slots = _inv_slots
+ proctype = _proctype
+
+ RegisterSignal(target, COMSIG_CLICK_ALT, .proc/mob_try_pickup)
+ RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine)
+
+/datum/element/mob_holder/Detach(datum/source, force)
+ . = ..()
+ UnregisterSignal(source, COMSIG_CLICK_ALT)
+ UnregisterSignal(source, COMSIG_PARENT_EXAMINE)
+
+/datum/element/mob_holder/proc/on_examine(mob/living/source, mob/user, list/examine_list)
+ if(ishuman(user) && !istype(source.loc, /obj/item/clothing/head/mob_holder))
+ examine_list += "Looks like [source.p_they(TRUE)] can be picked up with Alt+Click!"
+
+/datum/element/mob_holder/proc/mob_try_pickup(mob/living/source, mob/user)
+ if(!ishuman(user) || !user.Adjacent(source) || user.incapacitated())
+ return FALSE
+ if(user.get_active_held_item())
+ to_chat(user, "Your hands are full!")
+ return FALSE
+ if(source.buckled)
+ to_chat(user, "[src] is buckled to something!")
+ return FALSE
+ if(source == user)
+ to_chat(user, "You can't pick yourself up.")
+ return FALSE
+ source.visible_message("[user] starts picking up [source].", \
+ "[user] starts picking you up!")
+ if(!do_after(user, 20, target = src) || source.buckled)
+ return FALSE
+
+ source.visible_message("[user] picks up [source]!", \
+ "[user] picks you up!")
+ to_chat(user, "You pick [src] up.")
+ source.drop_all_held_items()
+ var/obj/item/clothing/head/mob_holder/holder = new(get_turf(source), source, worn_state, alt_worn, right_hand, left_hand, inv_slots)
+ if(proctype)
+ INVOKE_ASYNC(src, proctype, source, holder, user)
+ user.put_in_hands(holder)
+ return TRUE
+
+/datum/element/mob_holder/proc/drone_worn_icon(mob/living/simple_animal/drone/D, obj/item/clothing/head/mob_holder/holder, mob/user)
+ var/new_state = "[D.visualAppearence]_hat"
+ holder.item_state = new_state
+ holder.icon_state = new_state
+
+
+//The item itself,
+/obj/item/clothing/head/mob_holder
+ name = "bugged mob"
+ desc = "Yell at coderbrush."
+ icon = null
+ alternate_worn_icon = 'icons/mob/animals_held.dmi'
+ righthand_file = 'icons/mob/animals_held_rh.dmi'
+ lefthand_file = 'icons/mob/animals_held_lh.dmi'
+ icon_state = ""
+ w_class = WEIGHT_CLASS_BULKY
+ var/mob/living/held_mob
+
+/obj/item/clothing/head/mob_holder/Initialize(mapload, mob/living/target, worn_state, alt_worn, right_hand, left_hand, slots = NONE)
+ . = ..()
+
+ if(target)
+ assimilate(target)
+
+ if(alt_worn)
+ alternate_worn_icon = alt_worn
+ if(worn_state)
+ item_state = worn_state
+ icon_state = worn_state
+ if(left_hand)
+ lefthand_file = left_hand
+ if(right_hand)
+ righthand_file = right_hand
+ slot_flags = slots
+
+/obj/item/clothing/head/mob_holder/proc/assimilate(mob/living/target)
+ target.setDir(SOUTH)
+ held_mob = target
+ target.forceMove(src)
+ var/image/I = new //work around to retain the same appearance to the mob idependently from inhands/worn states.
+ I.appearance = target.appearance
+ I.override = TRUE
+ add_overlay(I)
+ name = target.name
+ desc = target.desc
+ switch(target.mob_size)
+ if(MOB_SIZE_TINY)
+ w_class = WEIGHT_CLASS_TINY
+ if(MOB_SIZE_SMALL)
+ w_class = WEIGHT_CLASS_NORMAL
+ if(MOB_SIZE_LARGE)
+ w_class = WEIGHT_CLASS_HUGE
+ RegisterSignal(src, COMSIG_CLICK_SHIFT, .proc/examine_held_mob)
+
+/obj/item/clothing/head/mob_holder/Destroy()
+ if(held_mob)
+ release()
+ return ..()
+
+/obj/item/clothing/head/mob_holder/proc/examine_held_mob(datum/source, mob/user)
+ held_mob.ShiftClick(user)
+ return COMPONENT_DENY_EXAMINATE
+
+/obj/item/clothing/head/mob_holder/Exited(atom/movable/AM, atom/newloc)
+ . = ..()
+ if(AM == held_mob)
+ held_mob.reset_perspective()
+ held_mob = null
+ qdel(src)
+
+/obj/item/clothing/head/mob_holder/Entered(atom/movable/AM, atom/newloc)
+ . = ..()
+ if(AM != held_mob)
+ var/destination = loc
+ if(isliving(loc)) //the mob is held or worn, drop things on the floor
+ destination = get_turf(loc)
+ AM.forceMove(destination)
+
+/obj/item/clothing/head/mob_holder/dropped()
+ . = ..()
+ if(held_mob && isturf(loc))//don't release on soft-drops
+ release()
+
+/obj/item/clothing/head/mob_holder/proc/release()
+ if(held_mob)
+ var/mob/living/L = held_mob
+ held_mob = null
+ L.forceMove(get_turf(L))
+ L.reset_perspective()
+ L.setDir(SOUTH)
+ qdel(src)
+
+/obj/item/clothing/head/mob_holder/relaymove(mob/user)
+ return
+
+/obj/item/clothing/head/mob_holder/container_resist()
+ if(isliving(loc))
+ var/mob/living/L = loc
+ L.visible_message("[src] escapes from [L]!", "[src] escapes your grip!")
+ release()
+
+/obj/item/clothing/head/mob_holder/assume_air(datum/gas_mixture/env)
+ var/atom/location = loc
+ if(!loc)
+ return //null
+ var/turf/T = get_turf(loc)
+ while(location != T)
+ location = location.loc
+ if(ismob(location))
+ return location.loc.assume_air(env)
+ return loc.assume_air(env)
+
+/obj/item/clothing/head/mob_holder/remove_air(amount)
+ var/atom/location = loc
+ if(!loc)
+ return //null
+ var/turf/T = get_turf(loc)
+ while(location != T)
+ location = location.loc
+ if(ismob(location))
+ return location.loc.remove_air(amount)
+ return loc.remove_air(amount)
diff --git a/code/datums/elements/wuv.dm b/code/datums/elements/wuv.dm
index bac7d1ff21..55bc9bafad 100644
--- a/code/datums/elements/wuv.dm
+++ b/code/datums/elements/wuv.dm
@@ -30,6 +30,10 @@
RegisterSignal(target, COMSIG_MOB_ATTACK_HAND, .proc/on_attack_hand)
+/datum/element/wuv/Detach(datum/source, force)
+ . = ..()
+ UnregisterSignal(source, COMSIG_MOB_ATTACK_HAND)
+
/datum/element/wuv/proc/on_attack_hand(datum/source, mob/user)
var/mob/living/L = source
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index a3c5979b6e..61d467a20d 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -458,6 +458,7 @@
var/list/allowed_types = list(
/datum/objective/assassinate,
+ /datum/objective/assassinate/once,
/datum/objective/maroon,
/datum/objective/debrain,
/datum/objective/protect,
diff --git a/code/datums/traits/_quirk.dm b/code/datums/traits/_quirk.dm
index d68b11135f..c6466fdd96 100644
--- a/code/datums/traits/_quirk.dm
+++ b/code/datums/traits/_quirk.dm
@@ -8,6 +8,7 @@
var/gain_text
var/lose_text
var/medical_record_text //This text will appear on medical records for the trait. Not yet implemented
+ var/antag_removal_text // Text will be given to the quirk holder if they get an antag that has it blacklisted.
var/mood_quirk = FALSE //if true, this quirk affects mood and is unavailable if moodlets are disabled
var/mob_trait //if applicable, apply and remove this mob trait
var/mob/living/quirk_holder
diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index b19c6a71f7..faa7eec392 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -6,6 +6,7 @@
value = -2
gain_text = "You feel your vigor slowly fading away."
lose_text = "You feel vigorous again."
+ antag_removal_text = "Your antagonistic nature has removed your blood deficiency."
medical_record_text = "Patient requires regular treatment for blood loss due to low production of blood."
/datum/quirk/blooddeficiency/on_process()
@@ -38,6 +39,8 @@
var/obj/item/heirloom
var/where
+GLOBAL_LIST_EMPTY(family_heirlooms)
+
/datum/quirk/family_heirloom/on_spawn()
var/mob/living/carbon/human/H = quirk_holder
var/obj/item/heirloom_type
@@ -76,6 +79,7 @@
/obj/item/lighter,
/obj/item/dice/d20)
heirloom = new heirloom_type(get_turf(quirk_holder))
+ GLOB.family_heirlooms += heirloom
var/list/slots = list(
"in your left pocket" = SLOT_L_STORE,
"in your right pocket" = SLOT_R_STORE,
@@ -188,11 +192,7 @@
gain_text = "You feel repulsed by the thought of violence!"
lose_text = "You think you can defend yourself again."
medical_record_text = "Patient is unusually pacifistic and cannot bring themselves to cause physical harm."
-
-/datum/quirk/nonviolent/on_process()
- if(quirk_holder.mind && LAZYLEN(quirk_holder.mind.antag_datums))
- to_chat(quirk_holder, "Your antagonistic nature has caused you to renounce your pacifism.")
- qdel(src)
+ antag_removal_text = "Your antagonistic nature has caused you to renounce your pacifism."
/datum/quirk/paraplegic
name = "Paraplegic"
@@ -355,6 +355,7 @@
gain_text = "You find yourself unable to speak!"
lose_text = "You feel a growing strength in your vocal chords."
medical_record_text = "Functionally mute, patient is unable to use their voice in any capacity."
+ antag_removal_text = "Your antagonistic nature has caused your voice to be heard."
var/datum/brain_trauma/severe/mute/mute
/datum/quirk/mute/add()
@@ -366,11 +367,6 @@
var/mob/living/carbon/human/H = quirk_holder
H?.cure_trauma_type(mute, TRAUMA_RESILIENCE_ABSOLUTE)
-/datum/quirk/mute/on_process()
- if(quirk_holder.mind && LAZYLEN(quirk_holder.mind.antag_datums))
- to_chat(quirk_holder, "Your antagonistic nature has caused your voice to be heard.")
- qdel(src)
-
/datum/quirk/unstable
name = "Unstable"
desc = "Due to past troubles, you are unable to recover your sanity if you lose it. Be very careful managing your mood!"
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 83117bad64..7e224080b9 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -6,6 +6,7 @@
var/flags_1 = NONE
var/interaction_flags_atom = NONE
+ var/ghost_flags = NONE
var/datum/reagents/reagents = null
//This atom's HUD (med/sec, etc) images. Associative list.
diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm
index 821c819664..6fe52b0f8d 100644
--- a/code/game/gamemodes/dynamic/dynamic.dm
+++ b/code/game/gamemodes/dynamic/dynamic.dm
@@ -239,12 +239,20 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, null)
. += "Peaceful Waypoint
"
. += "Your station orbits deep within controlled, core-sector systems and serves as a waypoint for routine traffic through Nanotrasen's trade empire. Due to the combination of high security, interstellar traffic, and low strategic value, it makes any direct threat of violence unlikely. Your primary enemies will be incompetence and bored crewmen: try to organize team-building events to keep staffers interested and productive. However, even deep in our territory there may be subversive elements, especially for such a high-value target as your station. Keep an eye out, but don't expect much trouble."
set_security_level(SEC_LEVEL_GREEN)
+ for(var/T in subtypesof(/datum/station_goal))
+ var/datum/station_goal/G = new T
+ if(!(G in station_goals))
+ station_goals += G
if(21 to 79)
var/perc_green = 100-round(100*((threat_level-21)/(79-21)))
if(prob(perc_green))
. += "Core Territory
"
. += "Your station orbits within reliably mundane, secure space. Although Nanotrasen has a firm grip on security in your region, the valuable resources and strategic position aboard your station make it a potential target for infiltrations. Monitor crew for non-loyal behavior, but expect a relatively tame shift free of large-scale destruction. We expect great things from your station."
set_security_level(SEC_LEVEL_GREEN)
+ for(var/T in subtypesof(/datum/station_goal))
+ var/datum/station_goal/G = new T
+ if(!(G in station_goals))
+ station_goals += G
else if(prob(perc_green))
. += "Contested System
"
. += "Your station's orbit passes along the edge of Nanotrasen's sphere of influence. While subversive elements remain the most likely threat against your station, hostile organizations are bolder here, where our grip is weaker. Exercise increased caution against elite Syndicate strike forces, or Executives forbid, some kind of ill-conceived unionizing attempt."
@@ -273,7 +281,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, null)
if(GLOB.security_level >= SEC_LEVEL_BLUE)
priority_announce("A summary has been copied and printed to all communications consoles.", "Security level elevated.", "intercept")
else
- priority_announce("Thanks to the tireless efforts of our security and intelligence divisions, there are currently no likely threats to [station_name()]. Have a secure shift!", "Security Report", "commandreport")
+ priority_announce("Thanks to the tireless efforts of our security and intelligence divisions, there are currently no likely threats to [station_name()]. All station construction projects have been authorized. Have a secure shift!", "Security Report", "commandreport")
// Yes, this is copy pasted from game_mode
/datum/game_mode/dynamic/check_finished(force_ending)
@@ -346,7 +354,8 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, null)
generate_threat()
storyteller.start_injection_cooldowns()
-
+ SSevents.frequency_lower = storyteller.event_frequency_lower // 6 minutes by default
+ SSevents.frequency_upper = storyteller.event_frequency_upper // 20 minutes by default
log_game("DYNAMIC: Dynamic Mode initialized with a Threat Level of... [threat_level]!")
initial_threat_level = threat_level
return TRUE
@@ -395,7 +404,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, null)
/datum/game_mode/dynamic/post_setup(report)
update_playercounts()
-
+
for(var/datum/dynamic_ruleset/roundstart/rule in executed_rules)
addtimer(CALLBACK(src, /datum/game_mode/dynamic/.proc/execute_roundstart_rule, rule), rule.delay)
..()
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm
index f4e9971a05..f6755057e2 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm
@@ -47,6 +47,8 @@
assigned += M.mind
M.mind.special_role = antag_flag
M.mind.add_antag_datum(antag_datum)
+ log_admin("[M.name] was made into a [name] by dynamic.")
+ message_admins("[M.name] was made into a [name] by dynamic.")
return TRUE
//////////////////////////////////////////////
@@ -72,12 +74,6 @@
property_weights = list("story_potential" = 2, "trust" = -1, "extended" = 1)
always_max_weight = TRUE
-/datum/dynamic_ruleset/latejoin/infiltrator/execute()
- . = ..()
- for(var/datum/mind/M in assigned)
- log_admin("[M.name] was made into a traitor by dynamic.")
- message_admins("[M.name] was made into a traitor by dynamic.")
-
//////////////////////////////////////////////
// //
// REVOLUTIONARY PROVOCATEUR //
@@ -225,3 +221,25 @@
log_admin("[M.name] was made into a bloodsucker by dynamic.")
message_admins("[M.name] was made into a bloodsucker by dynamic.")
return TRUE
+
+//////////////////////////////////////////////
+// //
+// COLLECTOR //
+// //
+//////////////////////////////////////////////
+
+/datum/dynamic_ruleset/latejoin/collector
+ name = "Contraband Collector"
+ config_tag = "latejoin_collector"
+ antag_datum = /datum/antagonist/collector
+ antag_flag = ROLE_MINOR_ANTAG
+ restricted_roles = list("AI", "Cyborg")
+ protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
+ required_candidates = 1
+ weight = 5
+ cost = 1
+ requirements = list(10,10,10,10,10,10,10,10,10,10)
+ high_population_requirement = 10
+ repeatable = TRUE
+ flags = TRAITOR_RULESET
+ property_weights = list("story_potential" = 2, "trust" = -1, "extended" = 2)
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
index 92a02f5920..abd560171e 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
@@ -494,7 +494,7 @@
high_population_requirement = 50
repeatable_weight_decrease = 2
repeatable = TRUE
- property_weights = list("story_potential" = 1, "trust" = 1, "extended" = 1, "valid" = 2, "integrity" = 2)
+ property_weights = list("story_potential" = 1, "trust" = 1, "extended" = 1, "valid" = 2, "integrity" = 1)
var/list/spawn_locs = list()
/datum/dynamic_ruleset/midround/from_ghosts/nightmare/execute()
diff --git a/code/game/gamemodes/dynamic/dynamic_storytellers.dm b/code/game/gamemodes/dynamic/dynamic_storytellers.dm
index afa6ed8ba7..303c436f99 100644
--- a/code/game/gamemodes/dynamic/dynamic_storytellers.dm
+++ b/code/game/gamemodes/dynamic/dynamic_storytellers.dm
@@ -1,5 +1,6 @@
/datum/dynamic_storyteller
var/name = "none"
+ var/config_tag = null
var/desc = "A coder's idiocy."
var/list/property_weights = list()
var/curve_centre = 0
@@ -7,6 +8,8 @@
var/forced_threat_level = -1
var/flags = 0
var/weight = 3 // how many rounds need to have been recently played for this storyteller to be left out of the vote
+ var/event_frequency_lower = 6 MINUTES
+ var/event_frequency_upper = 20 MINUTES
var/datum/game_mode/dynamic/mode = null
/**
@@ -20,14 +23,6 @@ Property weights are:
"conversion" -- Basically a bool. Conversion antags, well, convert. It's its own class for a good reason.
*/
-/datum/dynamic_storyteller/New()
- ..()
- if (istype(SSticker.mode, /datum/game_mode/dynamic))
- mode = SSticker.mode
- GLOB.dynamic_curve_centre = curve_centre
- GLOB.dynamic_curve_width = curve_width
- GLOB.dynamic_forced_threat_level = forced_threat_level
-
/datum/dynamic_storyteller/proc/start_injection_cooldowns()
var/latejoin_injection_cooldown_middle = 0.5*(GLOB.dynamic_first_latejoin_delay_max + GLOB.dynamic_first_latejoin_delay_min)
mode.latejoin_injection_cooldown = round(CLAMP(EXP_DISTRIBUTION(latejoin_injection_cooldown_middle), GLOB.dynamic_first_latejoin_delay_min, GLOB.dynamic_first_latejoin_delay_max)) + world.time
@@ -42,7 +37,28 @@ Property weights are:
return
/datum/dynamic_storyteller/proc/on_start()
- return
+ if (istype(SSticker.mode, /datum/game_mode/dynamic))
+ mode = SSticker.mode
+ GLOB.dynamic_curve_centre = curve_centre
+ GLOB.dynamic_curve_width = curve_width
+ if(flags & USE_PREF_WEIGHTS)
+ var/voters = 0
+ var/mean = 0
+ for(var/client/c in GLOB.clients)
+ var/vote = c.prefs.preferred_chaos
+ if(vote)
+ voters += 1
+ switch(vote)
+ if(CHAOS_NONE)
+ mean -= 5
+ if(CHAOS_LOW)
+ mean -= 2.5
+ if(CHAOS_HIGH)
+ mean += 2.5
+ if(CHAOS_MAX)
+ mean += 5
+ GLOB.dynamic_curve_centre += (mean/voters)
+ GLOB.dynamic_forced_threat_level = forced_threat_level
/datum/dynamic_storyteller/proc/get_midround_cooldown()
var/midround_injection_cooldown_middle = 0.5*(GLOB.dynamic_midround_delay_max + GLOB.dynamic_midround_delay_min)
@@ -154,12 +170,15 @@ Property weights are:
/datum/dynamic_storyteller/cowabunga
name = "Chaotic"
+ config_tag = "chaotic"
curve_centre = 10
desc = "Chaos: high. Variation: high. Likely antags: clock cult, revs, wizard."
property_weights = list("extended" = -1, "chaos" = 10)
- weight = 2
+ weight = 1
+ event_frequency_lower = 2 MINUTES
+ event_frequency_upper = 10 MINUTES
flags = WAROPS_ALWAYS_ALLOWED
- var/refund_cooldown
+ var/refund_cooldown = 0
/datum/dynamic_storyteller/cowabunga/get_midround_cooldown()
return ..() / 4
@@ -169,12 +188,13 @@ Property weights are:
/datum/dynamic_storyteller/cowabunga/do_process()
if(refund_cooldown < world.time)
- mode.refund_threat(10)
- mode.log_threat("Cowabunga it is. Refunded 10 threat. Threat is now [mode.threat].")
- refund_cooldown = world.time + 300 SECONDS
+ mode.refund_threat(20)
+ mode.log_threat("Cowabunga it is. Refunded 20 threat. Threat is now [mode.threat].")
+ refund_cooldown = world.time + 600 SECONDS
/datum/dynamic_storyteller/team
name = "Teamwork"
+ config_tag = "teamwork"
desc = "Chaos: high. Variation: low. Likely antags: nukies, clockwork cult, wizard, blob, xenomorph."
curve_centre = 2
curve_width = 1.5
@@ -187,6 +207,7 @@ Property weights are:
/datum/dynamic_storyteller/conversion
name = "Conversion"
+ config_tag = "conversion"
desc = "Chaos: high. Variation: medium. Likely antags: cults, bloodsuckers, revs."
curve_centre = 3
curve_width = 1
@@ -196,24 +217,33 @@ Property weights are:
/datum/dynamic_storyteller/classic
name = "Random"
+ config_tag = "random"
desc = "Chaos: varies. Variation: highest. No special weights attached."
weight = 6
+ flags = USE_PREF_WEIGHTS
curve_width = 4
/datum/dynamic_storyteller/memes
name = "Story"
+ config_tag = "story"
desc = "Chaos: varies. Variation: high. Likely antags: abductors, nukies, wizard, traitor."
+ weight = 4
+ flags = USE_PREF_WEIGHTS
curve_width = 4
property_weights = list("story_potential" = 10)
/datum/dynamic_storyteller/suspicion
name = "Intrigue"
+ config_tag = "intrigue"
desc = "Chaos: low. Variation: high. Likely antags: traitor, bloodsucker. Rare: revs, blood cult."
+ weight = 4
+ flags = USE_PREF_WEIGHTS
curve_width = 4
property_weights = list("trust" = -5)
/datum/dynamic_storyteller/liteextended
name = "Calm"
+ config_tag = "calm"
desc = "Chaos: low. Variation: medium. Likely antags: bloodsuckers, traitors, sentient disease, revenant."
curve_centre = -5
curve_width = 0.5
@@ -226,10 +256,12 @@ Property weights are:
/datum/dynamic_storyteller/extended
name = "Extended"
+ config_tag = "extended"
desc = "Chaos: none. Variation: none. Likely antags: none."
curve_centre = -20
- weight = 2
+ weight = 0
curve_width = 0.5
/datum/dynamic_storyteller/extended/on_start()
+ ..()
GLOB.dynamic_forced_extended = TRUE
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index b7003e4f1e..459ff2f3d6 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -9,9 +9,10 @@ GLOBAL_LIST_EMPTY(objectives)
var/explanation_text = "Nothing" //What that person is supposed to do.
var/team_explanation_text //For when there are multiple owners.
var/datum/mind/target = null //If they are focused on a particular person.
- var/target_amount = 0 //If they are focused on a particular number. Steal objectives have their own counter.
- var/completed = 0 //currently only used for custom objectives.
- var/martyr_compatible = 0 //If the objective is compatible with martyr objective, i.e. if you can still do it while dead.
+ var/target_amount = FALSE //If they are focused on a particular number. Steal objectives have their own counter.
+ var/completed = FALSE //currently only used for custom objectives.
+ var/completable = TRUE //Whether this objective shows greentext when completed
+ var/martyr_compatible = FALSE //If the objective is compatible with martyr objective, i.e. if you can still do it while dead.
/datum/objective/New(var/text)
GLOB.objectives += src // CITADEL EDIT FOR CRYOPODS
@@ -172,6 +173,26 @@ GLOBAL_LIST_EMPTY(objectives)
/datum/objective/assassinate/admin_edit(mob/admin)
admin_simple_target_pick(admin)
+/datum/objective/assassinate/once
+ name = "kill once"
+ var/won = FALSE
+
+/datum/objective/assassinate/once/update_explanation_text()
+ ..()
+ if(target && target.current)
+ explanation_text = "Kill [target.name], the [!target_role_type ? target.assigned_role : target.special_role]. You only need to kill them once; if they come back, you've still succeeded."
+ START_PROCESSING(SSprocessing,src)
+ else
+ explanation_text = "Free Objective"
+
+/datum/objective/assassinate/once/check_completion()
+ return won || ..()
+
+/datum/objective/assassinate/once/process()
+ won = check_completion()
+ if(won)
+ STOP_PROCESSING(SSprocessing,src)
+
/datum/objective/assassinate/internal
var/stolen = 0 //Have we already eliminated this target?
@@ -365,6 +386,28 @@ GLOBAL_LIST_EMPTY(objectives)
return FALSE
return TRUE
+/datum/objective/breakout
+ name = "breakout"
+ martyr_compatible = 1
+ var/target_role_type = 0
+ var/human_check = TRUE
+
+/datum/objective/breakout/check_completion()
+ return !target || considered_escaped(target)
+
+/datum/objective/breakout/find_target_by_role(role, role_type=0, invert=0)
+ if(!invert)
+ target_role_type = role_type
+ ..()
+ return target
+
+/datum/objective/breakout/update_explanation_text()
+ ..()
+ if(target && target.current)
+ explanation_text = "Make sure [target.name], the [!target_role_type ? target.assigned_role : target.special_role] escapes on the shuttle or an escape pod alive and without being in custody."
+ else
+ explanation_text = "Free Objective"
+
/datum/objective/escape/escape_with_identity
name = "escape with identity"
var/target_real_name // Has to be stored because the target's real_name can change over the course of the round
@@ -582,7 +625,6 @@ GLOBAL_LIST_EMPTY(possible_items_special)
explanation_text = "Do not give up or lose [targetinfo.name]."
steal_target = targetinfo.targetitem
-
/datum/objective/download
name = "download"
@@ -786,40 +828,10 @@ GLOBAL_LIST_EMPTY(possible_items_special)
/datum/objective/destroy/internal
var/stolen = FALSE //Have we already eliminated this target?
-/datum/objective/steal_five_of_type
- name = "steal five of"
- explanation_text = "Steal at least five items!"
- var/list/wanted_items = list(/obj/item)
-
-/datum/objective/steal_five_of_type/New()
- ..()
- wanted_items = typecacheof(wanted_items)
-
-/datum/objective/steal_five_of_type/summon_guns
- name = "steal guns"
- explanation_text = "Steal at least five guns!"
- wanted_items = list(/obj/item/gun)
-
-/datum/objective/steal_five_of_type/summon_magic
- name = "steal magic"
- explanation_text = "Steal at least five magical artefacts!"
- wanted_items = list(/obj/item/spellbook, /obj/item/gun/magic, /obj/item/clothing/suit/space/hardsuit/wizard, /obj/item/scrying, /obj/item/antag_spawner/contract, /obj/item/necromantic_stone)
-
-/datum/objective/steal_five_of_type/check_completion()
- var/list/datum/mind/owners = get_owners()
- var/stolen_count = 0
- for(var/datum/mind/M in owners)
- if(!isliving(M.current))
- continue
- var/list/all_items = M.current.GetAllContents() //this should get things in cheesewheels, books, etc.
- for(var/obj/I in all_items) //Check for wanted items
- if(is_type_in_typecache(I, wanted_items))
- stolen_count++
- return stolen_count >= 5
-
//Created by admin tools
/datum/objective/custom
name = "custom"
+ completable = FALSE
/datum/objective/custom/admin_edit(mob/admin)
var/expl = stripped_input(admin, "Custom objective:", "Objective", explanation_text)
@@ -997,4 +1009,147 @@ GLOBAL_LIST_EMPTY(possible_items_special)
command_staff_only = TRUE
+/datum/objective/hoard
+ name = "hoard"
+ var/obj/item/hoarded_item = null
+/datum/objective/hoard/get_target()
+ return hoarded_item
+
+/datum/objective/hoard/proc/set_target(obj/item/I)
+ if(I)
+ hoarded_item = I
+ explanation_text = "Keep [I] on your person at all times."
+ return hoarded_item
+ else
+ explanation_text = "Free objective"
+ return
+
+/datum/objective/hoard/check_completion()
+ var/list/datum/mind/owners = get_owners()
+ if(!hoarded_item)
+ return TRUE
+ for(var/datum/mind/M in owners)
+ if(!isliving(M.current))
+ continue
+
+ var/list/all_items = M.current.GetAllContents() //this should get things in cheesewheels, books, etc.
+
+ for(var/obj/I in all_items) //Check for items
+ if(I == hoarded_item)
+ return TRUE
+ return FALSE
+
+/datum/objective/hoard/heirloom
+ name = "steal heirloom"
+
+/datum/objective/hoard/heirloom/find_target()
+ set_target(pick(GLOB.family_heirlooms))
+
+GLOBAL_LIST_EMPTY(traitor_contraband)
+
+GLOBAL_LIST_EMPTY(cult_contraband)
+
+/datum/objective/hoard/collector
+ name = "Hoard contraband"
+
+/datum/objective/collector/New()
+ ..()
+ if(!GLOB.traitor_contraband.len)//Only need to fill the list when it's needed.
+ GLOB.traitor_contraband = list(/obj/item/card/emag/empty,/obj/item/clothing/glasses/phantomthief,/obj/item/clothing/gloves/chameleon/broken)
+ if(!GLOB.cult_contraband.len)
+ GLOB.cult_contraband = list(/obj/item/clockwork/slab,/obj/item/clockwork/component/belligerent_eye,/obj/item/clockwork/component/belligerent_eye/lens_gem,/obj/item/shuttle_curse,/obj/item/cult_shift)
+
+/datum/objective/hoard/collector/find_target()
+ var/obj/item/I
+ var/I_type
+ if(prob(50))
+ I_type = pick_n_take(GLOB.traitor_contraband) // always unique unless it's run out, in which case we refill it anyway
+ else
+ I_type = pick_n_take(GLOB.cult_contraband)
+ I = new I_type
+ I.forceMove(get_turf(owner))
+ if(ishuman(owner))
+ var/mob/living/carbon/human/H = owner
+ H.equip_in_one_of_slots(I, list("backpack" = SLOT_IN_BACKPACK))
+ hoarded_item = I
+
+
+
+GLOBAL_LIST_EMPTY(possible_sabotages)
+// For saboteurs. Go in and cause some trouble somewhere. Not necessarily breaking things, just sufficiently troublemaking.
+/datum/objective/sabotage
+ name = "sabotage"
+ var/datum/sabotage_objective/targetinfo = null //composition > inheritance.
+
+/datum/objective/sabotage/get_target()
+ return targetinfo.sabotage_type
+
+/datum/objective/sabotage/New()
+ ..()
+ if(!GLOB.possible_sabotages.len)//Only need to fill the list when it's needed.
+ for(var/I in subtypesof(/datum/sabotage_objective))
+ new I
+
+/datum/objective/sabotage/find_target()
+ var/list/datum/mind/owners = get_owners()
+ var/approved_targets = list()
+ check_sabotages:
+ for(var/datum/sabotage_objective/possible_sabotage in GLOB.possible_sabotages)
+ if(!is_unique_objective(possible_sabotage.sabotage_type) || possible_sabotage.check_conditions())
+ continue
+ for(var/datum/mind/M in owners)
+ if(M.current.mind.assigned_role in possible_sabotage.excludefromjob)
+ continue check_sabotages
+ approved_targets += possible_sabotage
+ return set_target(safepick(approved_targets))
+
+/datum/objective/sabotage/proc/set_target(datum/sabotage_objective/sabo)
+ if(sabo)
+ targetinfo = sabo
+ explanation_text = "[targetinfo.name]"
+ give_special_equipment(targetinfo.special_equipment)
+ return sabo
+ else
+ explanation_text = "Free objective"
+ return
+
+/datum/objective/sabotage/check_completion()
+ return targetinfo.check_conditions()
+
+/datum/objective/flavor
+ name = "flavor"
+ completable = FALSE
+ var/flavor_file
+
+/datum/objective/flavor/proc/get_flavor_list()
+ return world.file2list(flavor_file)
+
+/datum/objective/flavor/proc/forge_objective()
+ var/flavor_list = get_flavor_list()
+ explanation_text = pick(flavor_list)
+
+/datum/objective/flavor/traitor
+ name = "traitor flavor"
+ flavor_file = "strings/flavor_objectives/traitor.txt"
+
+/datum/objective/flavor/traitor/get_flavor_list()
+ . = ..()
+ switch(owner.assigned_role)
+ if("Station Engineer", "Atmospheric Technician")
+ . += world.file2list("strings/flavor_objectives/traitor/engineering.txt")
+ if("Medical Doctor","Chemist","Virologist","Geneticist")
+ . += world.file2list("strings/flavor_objectives/traitor/medical.txt")
+ if("Scientist","Roboticist","Geneticist")
+ . += world.file2list("strings/flavor_objectives/traitor/science.txt")
+ if("Assistant")
+ . += world.file2list("strings/flavor_objectives/traitor/assistant.txt")
+
+/datum/objective/flavor/ninja_helping
+ flavor_file = "strings/flavor_objectives/ninja_helping.txt"
+
+/datum/objective/flavor/ninja_syndie
+ flavor_file = "strings/flavor_objectives/ninja_syndie.txt"
+
+/datum/objective/flavor/wizard
+ flavor_file = "strings/flavor_objectives/wizard.txt"
diff --git a/code/game/gamemodes/objective_sabotage.dm b/code/game/gamemodes/objective_sabotage.dm
new file mode 100644
index 0000000000..248524f1d2
--- /dev/null
+++ b/code/game/gamemodes/objective_sabotage.dm
@@ -0,0 +1,107 @@
+/datum/sabotage_objective
+ var/name = "Free Objective"
+ var/sabotage_type = "nothing"
+ var/special_equipment = list()
+ var/list/excludefromjob = list()
+
+/datum/sabotage_objective/New()
+ ..()
+ if(sabotage_type!="nothing")
+ GLOB.possible_sabotages += src
+
+/datum/sabotage_objective/proc/check_conditions()
+ return TRUE
+
+/datum/sabotage_objective/processing
+ var/won = FALSE
+
+/datum/sabotage_objective/processing/New()
+ ..()
+ START_PROCESSING(SSprocessing, src)
+
+/datum/sabotage_objective/processing/proc/check_condition_processing()
+ return 100
+
+/datum/sabotage_objective/processing/process()
+ check_condition_processing()
+ if(won >= 100)
+ STOP_PROCESSING(SSprocessing,src)
+
+/datum/sabotage_objective/processing/check_conditions()
+ return won
+
+/datum/sabotage_objective/processing/power_sink
+ name = "Drain at least 1 gigajoule of power using a power sink."
+ sabotage_type = "powersink"
+ special_equipment = list(/obj/item/powersink)
+ var/sink_found = FALSE
+ var/count = 0
+
+/datum/sabotage_objective/processing/power_sink/check_condition_processing()
+ count += 1
+ if(count==10 || sink_found) // doesn't need to fire that often unless a sink exists
+ var/sink_found_this_time = FALSE
+ for(var/datum/powernet/PN in GLOB.powernets)
+ for(var/obj/item/powersink/sink in PN.nodes)
+ sink_found_this_time = TRUE
+ won = max(won,sink.power_drained/1e9)
+ sink_found = sink_found_this_time
+ count = 0
+ return FALSE
+
+/obj/item/paper/guides/antag/supermatter_sabotage
+ info = "Ways to sabotage a supermatter:
\
+ \
+ - Set the air alarm's operating mode to anything that isn't 'draught' (yes, anything, though 'off' works best). Or just smash the air alarm, that works too.
\
+ - Wrench a pipe (the junction to the cold loop is most effective, but some setups will robust through this no issue; best to try for multiple)
\
+ - Pump in as much carbon dioxide, oxygen, plasma or tritium as you can find (this will likely also cause a singularity or tesla delamination, so watch out!)
\
+ - Unset the filters on the cooling loop, or, perhaps more insidious, set them to oxygen/plasma.
\
+ - Deactivate the digital valve that sends the exhaust gases to space (note: only works on box station; others you must unwrench).
\
+ - There are many other ways; be creative!
\
+
"
+
+/datum/sabotage_objective/processing/supermatter
+ name = "Sabotage the supermatter so that it goes under 50% integrity. If it is delaminated, you will fail."
+ sabotage_type = "supermatter"
+ special_equipment = list(/obj/item/paper/guides/antag/supermatter_sabotage)
+ var/list/supermatters = list()
+ excludefromjob = list("Chief Engineer", "Station Engineer", "Atmospheric Technician")
+
+/datum/sabotage_objective/processing/supermatter/check_condition_processing()
+ if(!supermatters.len)
+ supermatters = list()
+ for(var/obj/machinery/power/supermatter_crystal/S in GLOB.machines)
+ // Delaminating, not within coverage, not on a tile.
+ if (!isturf(S.loc) || !(is_station_level(S.z) || is_mining_level(S.z)))
+ continue
+ supermatters.Add(S)
+ for(var/obj/machinery/power/supermatter_crystal/S in supermatters) // you can win this with a wishgranter... lol.
+ won = max(1-((S.get_integrity()-50)/50),won)
+ return FALSE
+
+/datum/sabotage_objective/station_integrity
+ name = "Make sure the station is at less than 80% integrity by the end. Smash walls, windows etc. to reach this goal."
+ sabotage_type = "integrity"
+
+/datum/sabotage_objective/station_integrity/check_conditions()
+ return 5-(max(SSticker.station_integrity*4,320)/80)
+
+/datum/sabotage_objective/cloner
+ name = "Destroy all Nanotrasen cloning machines."
+ sabotage_type = "cloner"
+
+/datum/sabotage_objective/cloner/check_conditions()
+ return !(locate(/obj/machinery/clonepod) in GLOB.machines)
+
+/datum/sabotage_objective/ai_law
+ name = "Upload a hacked law to the AI."
+ sabotage_type = "ailaw"
+ special_equipment = list(/obj/item/aiModule/syndicate)
+ excludefromjob = list("Chief Engineer","Research Director","Head of Personnel","Captain","Chief Medical Officer","Head Of Security")
+
+/datum/sabotage_objective/ai_law/check_conditions()
+ for (var/i in GLOB.ai_list)
+ var/mob/living/silicon/ai/aiPlayer = i
+ if(aiPlayer.mind && length(aiPlayer.laws.hacked))
+ return TRUE
+ return FALSE
diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm
index 7132f046e6..2272d3db46 100644
--- a/code/game/machinery/_machinery.dm
+++ b/code/game/machinery/_machinery.dm
@@ -242,7 +242,7 @@ Class Procs:
else
if(interaction_flags_machine & INTERACT_MACHINE_REQUIRES_SILICON)
return FALSE
- if(!Adjacent(user))
+ if(!Adjacent(user) && !isobserver(user))
var/mob/living/carbon/H = user
if(!(istype(H) && H.has_dna() && H.dna.check_mutation(TK)))
return FALSE
diff --git a/code/game/machinery/defibrillator_mount.dm b/code/game/machinery/defibrillator_mount.dm
index f3be6ac214..a1931e133a 100644
--- a/code/game/machinery/defibrillator_mount.dm
+++ b/code/game/machinery/defibrillator_mount.dm
@@ -120,7 +120,7 @@
/obj/machinery/defibrillator_mount/AltClick(mob/living/carbon/user)
. = ..()
- if(!istype(user) || !user.canUseTopic(src, BE_CLOSE))
+ if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
return
. = TRUE
if(!defib)
@@ -129,9 +129,10 @@
if(clamps_locked)
to_chat(user, "You try to tug out [defib], but the mount's clamps are locked tight!")
return
- if(!user.put_in_hands(defib))
+ if(!user.get_empty_held_indexes())
to_chat(user, "You need a free hand!")
return
+ user.put_in_hands(defib)
user.visible_message("[user] unhooks [defib] from [src].", \
"You slide out [defib] from [src] and unhook the charging cables.")
playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
@@ -147,4 +148,4 @@
materials = list(MAT_METAL = 300, MAT_GLASS = 100)
w_class = WEIGHT_CLASS_BULKY
result_path = /obj/machinery/defibrillator_mount
- pixel_shift = -28
\ No newline at end of file
+ pixel_shift = -28
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index fbf98564f4..df5a6ced52 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -189,6 +189,7 @@ GLOBAL_LIST_EMPTY(allCasters)
armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
max_integrity = 200
integrity_failure = 50
+ ghost_flags = INTERACT_GHOST_READ
var/screen = 0
var/paper_remaining = 15
var/securityCaster = 0
@@ -196,6 +197,7 @@ GLOBAL_LIST_EMPTY(allCasters)
var/alert_delay = 500
var/alert = FALSE
var/scanned_user = "Unknown"
+ var/mob/active_user = null
var/msg = ""
var/datum/picture/picture
var/channel_name = ""
@@ -264,10 +266,10 @@ GLOBAL_LIST_EMPTY(allCasters)
/obj/machinery/newscaster/ui_interact(mob/user)
. = ..()
- if(ishuman(user) || issilicon(user))
- var/mob/living/human_or_robot_user = user
+ if(ishuman(user) || issilicon(user) || isobserver(user))
+ var/mob/M = user
var/dat
- scan_user(human_or_robot_user)
+ scan_user(M)
switch(screen)
if(0)
dat += "Welcome to Newscasting Unit #[unit_no].
Interface & News networks Operational."
@@ -279,7 +281,7 @@ GLOBAL_LIST_EMPTY(allCasters)
dat+= "
Submit new Feed story"
dat+= "
Print newspaper"
dat+= "
Re-scan User"
- dat+= "
Exit"
+ dat+= "
Exit"
if(securityCaster)
var/wanted_already = 0
if(GLOB.news_network.wanted_issue.active)
@@ -501,24 +503,36 @@ GLOBAL_LIST_EMPTY(allCasters)
if(21)
dat+="Unable to print newspaper. Insufficient paper. Please notify maintenance personnel to refill machine storage.
"
dat+="Return"
- var/datum/browser/popup = new(human_or_robot_user, "newscaster_main", "Newscaster Unit #[unit_no]", 400, 600)
+ var/datum/browser/popup = new(M, "newscaster_main", "Newscaster Unit #[unit_no]", 400, 600)
popup.set_content(dat)
- popup.set_title_image(human_or_robot_user.browse_rsc_icon(icon, icon_state))
+ popup.set_title_image(M.browse_rsc_icon(icon, icon_state))
popup.open()
/obj/machinery/newscaster/Topic(href, href_list)
if(..())
return
- if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && isturf(loc))) || hasSiliconAccessInArea(usr))
+ if(active_user && !isobserver(active_user) && get_dist(active_user,src)<=1 && usr!=active_user)
+ to_chat(usr, "You must wait for [active_user] to finish and move away.")
+ return
+ if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && isturf(loc))) || hasSiliconAccessInArea(usr) || isobserver(usr))
usr.set_machine(src)
scan_user(usr)
if(href_list["set_channel_name"])
+ if(isobserver(usr) && !canGhostWrite(usr,src,"set a channel's name"))
+ to_chat(usr, "You can't do that.")
+ return
channel_name = stripped_input(usr, "Provide a Feed Channel Name", "Network Channel Handler", "", MAX_NAME_LEN)
updateUsrDialog()
else if(href_list["set_channel_lock"])
+ if(isobserver(usr) && !canGhostWrite(usr,src,"locked a channel"))
+ to_chat(usr, "You can't do that.")
+ return
c_locked = !c_locked
updateUsrDialog()
else if(href_list["submit_new_channel"])
+ if(isobserver(usr) && !canGhostWrite(usr,src,"created a new channel"))
+ to_chat(usr, "You can't do that.")
+ return
var/list/existing_authors = list()
for(var/datum/newscaster/feed_channel/FC in GLOB.news_network.network_channels)
if(FC.authorCensor)
@@ -541,6 +555,9 @@ GLOBAL_LIST_EMPTY(allCasters)
screen=5
updateUsrDialog()
else if(href_list["set_channel_receiving"])
+ if(isobserver(usr) && !canGhostWrite(usr,src,"tried to set the receiving channel"))
+ to_chat(usr, "You can't do that.")
+ return
var/list/available_channels = list()
for(var/datum/newscaster/feed_channel/F in GLOB.news_network.network_channels)
if( (!F.locked || F.author == scanned_user) && !F.censored)
@@ -548,14 +565,23 @@ GLOBAL_LIST_EMPTY(allCasters)
channel_name = input(usr, "Choose receiving Feed Channel", "Network Channel Handler") in available_channels
updateUsrDialog()
else if(href_list["set_new_message"])
+ if(isobserver(usr) && !canGhostWrite(usr,src,"set the message of a new feed story"))
+ to_chat(usr, "You can't do that.")
+ return
var/temp_message = trim(stripped_multiline_input(usr, "Write your Feed story", "Network Channel Handler", msg))
if(temp_message)
msg = temp_message
updateUsrDialog()
else if(href_list["set_attachment"])
+ if(isobserver(usr))
+ to_chat(usr, "You can't do that.")
+ return
AttachPhoto(usr)
updateUsrDialog()
else if(href_list["submit_new_message"])
+ if(isobserver(usr) && !canGhostWrite(usr,src,"added a new story"))
+ to_chat(usr, "You can't do that.")
+ return
if(msg =="" || msg=="\[REDACTED\]" || scanned_user == "Unknown" || channel_name == "" )
screen=6
else
@@ -565,15 +591,27 @@ GLOBAL_LIST_EMPTY(allCasters)
msg = ""
updateUsrDialog()
else if(href_list["create_channel"])
+ if(isobserver(usr) && !canGhostWrite(usr,src,"created a channel"))
+ to_chat(usr, "You can't do that.")
+ return
screen=2
updateUsrDialog()
else if(href_list["create_feed_story"])
+ if(isobserver(usr) && !canGhostWrite(usr,src,"created a feed story"))
+ to_chat(usr, "You can't do that.")
+ return
screen=3
updateUsrDialog()
else if(href_list["menu_paper"])
+ if(isobserver(usr) && !canGhostWrite(usr,src,""))
+ to_chat(usr, "You can't do that.")
+ return
screen=8
updateUsrDialog()
else if(href_list["print_paper"])
+ if(isobserver(usr) && !canGhostWrite(usr,src,"printed a paper"))
+ to_chat(usr, "You can't do that.")
+ return
if(!paper_remaining)
screen=21
else
@@ -581,12 +619,21 @@ GLOBAL_LIST_EMPTY(allCasters)
screen = 20
updateUsrDialog()
else if(href_list["menu_censor_story"])
+ if(isobserver(usr) && !canGhostWrite(usr,src,"censored a story"))
+ to_chat(usr, "You can't do that.")
+ return
screen=10
updateUsrDialog()
else if(href_list["menu_censor_channel"])
+ if(isobserver(usr) && !canGhostWrite(usr,src,"censored a channel"))
+ to_chat(usr, "You can't do that.")
+ return
screen=11
updateUsrDialog()
else if(href_list["menu_wanted"])
+ if(isobserver(usr) && !canGhostWrite(usr,src,""))
+ to_chat(usr, "You can't do that.")
+ return
var/already_wanted = 0
if(GLOB.news_network.wanted_issue.active)
already_wanted = 1
@@ -596,12 +643,21 @@ GLOBAL_LIST_EMPTY(allCasters)
screen = 14
updateUsrDialog()
else if(href_list["set_wanted_name"])
+ if(isobserver(usr) && !canGhostWrite(usr,src,"tried to set the name of a wanted person"))
+ to_chat(usr, "You can't do that.")
+ return
channel_name = stripped_input(usr, "Provide the name of the Wanted person", "Network Security Handler")
updateUsrDialog()
else if(href_list["set_wanted_desc"])
+ if(isobserver(usr) && !canGhostWrite(usr,src,"tried to set the description of a wanted person"))
+ to_chat(usr, "You can't do that.")
+ return
msg = stripped_input(usr, "Provide a description of the Wanted person and any other details you deem important", "Network Security Handler")
updateUsrDialog()
else if(href_list["submit_wanted"])
+ if(isobserver(usr) && !canGhostWrite(usr,src,"submitted a wanted poster"))
+ to_chat(usr, "You can't do that.")
+ return
var/input_param = text2num(href_list["submit_wanted"])
if(msg == "" || channel_name == "" || scanned_user == "Unknown")
screen = 16
@@ -632,6 +688,9 @@ GLOBAL_LIST_EMPTY(allCasters)
screen=18
updateUsrDialog()
else if(href_list["censor_channel_author"])
+ if(isobserver(usr) && !canGhostWrite(usr,src,"tried to censor an author"))
+ to_chat(usr, "You can't do that.")
+ return
var/datum/newscaster/feed_channel/FC = locate(href_list["censor_channel_author"])
if(FC.is_admin_channel)
alert("This channel was created by a Nanotrasen Officer. You cannot censor it.","Ok")
@@ -639,6 +698,9 @@ GLOBAL_LIST_EMPTY(allCasters)
FC.toggleCensorAuthor()
updateUsrDialog()
else if(href_list["censor_channel_story_author"])
+ if(isobserver(usr) && !canGhostWrite(usr,src,"tried to censor a story's author"))
+ to_chat(usr, "You can't do that.")
+ return
var/datum/newscaster/feed_message/MSG = locate(href_list["censor_channel_story_author"])
if(MSG.is_admin_message)
alert("This message was created by a Nanotrasen Officer. You cannot censor its author.","Ok")
@@ -646,6 +708,9 @@ GLOBAL_LIST_EMPTY(allCasters)
MSG.toggleCensorAuthor()
updateUsrDialog()
else if(href_list["censor_channel_story_body"])
+ if(isobserver(usr) && !canGhostWrite(usr,src,"tried to censor a story"))
+ to_chat(usr, "You can't do that.")
+ return
var/datum/newscaster/feed_message/MSG = locate(href_list["censor_channel_story_body"])
if(MSG.is_admin_message)
alert("This channel was created by a Nanotrasen Officer. You cannot censor it.","Ok")
@@ -653,11 +718,17 @@ GLOBAL_LIST_EMPTY(allCasters)
MSG.toggleCensorBody()
updateUsrDialog()
else if(href_list["pick_d_notice"])
+ if(isobserver(usr) && !canGhostWrite(usr,src,""))
+ to_chat(usr, "You can't do that.")
+ return
var/datum/newscaster/feed_channel/FC = locate(href_list["pick_d_notice"])
viewing_channel = FC
screen=13
updateUsrDialog()
else if(href_list["toggle_d_notice"])
+ if(isobserver(usr) && !canGhostWrite(usr,src,"tried to set a D-notice"))
+ to_chat(usr, "You can't do that.")
+ return
var/datum/newscaster/feed_channel/FC = locate(href_list["toggle_d_notice"])
if(FC.is_admin_channel)
alert("This channel was created by a Nanotrasen Officer. You cannot place a D-Notice upon it.","Ok")
@@ -805,6 +876,12 @@ GLOBAL_LIST_EMPTY(allCasters)
picture = selection
/obj/machinery/newscaster/proc/scan_user(mob/living/user)
+ if(active_user)
+ if(active_user != user)
+ if(get_dist(active_user,src)<=1)
+ if(!isobserver(active_user))
+ to_chat(user, "Wait for [active_user] to finish and move away.")
+ return
if(ishuman(user))
var/mob/living/carbon/human/human_user = user
if(human_user.wear_id)
@@ -824,9 +901,14 @@ GLOBAL_LIST_EMPTY(allCasters)
else if(issilicon(user))
var/mob/living/silicon/ai_user = user
scanned_user = "[ai_user.name] ([ai_user.job])"
+ else if (IsAdminGhost(user))
+ scanned_user = "Nanotrasen Officer #[rand(0,9)][rand(0,9)][rand(0,9)]"
+ else if (isobserver(user))
+ scanned_user = "Space-Time Anomaly #[rand(0,9)][rand(0,9)][rand(0,9)]"
else
throw EXCEPTION("Invalid user for this proc")
return
+ active_user = user
/obj/machinery/newscaster/proc/print_paper()
SSblackbox.record_feedback("amount", "newspapers_printed", 1)
@@ -859,7 +941,6 @@ GLOBAL_LIST_EMPTY(allCasters)
say("Attention! Wanted issue distributed!")
playsound(loc, 'sound/machines/warning-buzzer.ogg', 75, 1)
-
/obj/item/newspaper
name = "newspaper"
desc = "An issue of The Griffon, the newspaper circulating aboard Nanotrasen Space Stations."
diff --git a/code/game/objects/effects/spawners/gibspawner.dm b/code/game/objects/effects/spawners/gibspawner.dm
index f47d3b8ed3..c135458873 100644
--- a/code/game/objects/effects/spawners/gibspawner.dm
+++ b/code/game/objects/effects/spawners/gibspawner.dm
@@ -10,7 +10,7 @@
var/list/gibamounts = list() //amount to spawn for each gib decal type we'll spawn.
var/list/gibdirections = list() //of lists of possible directions to spread each gib decal type towards.
-/obj/effect/gibspawner/Initialize(mapload, mob/living/source_mob, list/datum/disease/diseases)
+/obj/effect/gibspawner/Initialize(mapload, mob/living/source_mob, list/datum/disease/diseases, list/blood_dna)
. = ..()
if(gibtypes.len != gibamounts.len)
stack_trace("Gib list amount length mismatch!")
@@ -33,7 +33,7 @@
var/body_coloring = ""
if(source_mob)
if(!issilicon(source_mob))
- dna_to_add = source_mob.get_blood_dna_list() //ez pz
+ dna_to_add = blood_dna || source_mob.get_blood_dna_list() //ez pz
if(ishuman(source_mob))
var/mob/living/carbon/human/H = source_mob
if(H.dna.species.use_skintones)
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index 5e5ced2269..1bef477a30 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -128,6 +128,9 @@
return
. = ..()
+/obj/item/card/emag/empty
+ uses = 0
+
/obj/item/emagrecharge
name = "electromagnet charging device"
desc = "A small cell with two prongs lazily jabbed into it. It looks like it's made for charging the small batteries found in electromagnetic devices, sadly this can't be recharged like a normal cell."
@@ -538,4 +541,4 @@ update_label("John Doe", "Clowny")
id_color = "#0000FF"
/obj/item/card/id/knight/captain
- id_color = "#FFD700"
\ No newline at end of file
+ id_color = "#FFD700"
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index 5621a946bb..2196246b03 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -238,6 +238,14 @@
/obj/machinery/vending/cigarette = "ShadyCigs Deluxe",
/obj/machinery/vending/games = "\improper Good Clean Fun",
/obj/machinery/vending/autodrobe = "AutoDrobe",
+ /obj/machinery/vending/assist = "\improper Vendomat",
+ /obj/machinery/vending/engivend = "\improper Engi-Vend",
+ /obj/machinery/vending/engivend = "\improper YouTool",
+ /obj/machinery/vending/sustenance = "\improper Sustenance Vendor",
+ /obj/machinery/vending/dinnerware = "\improper Plasteel Chef's Dinnerware Vendor",
+ /obj/machinery/vending/cart = "\improper PTech",
+ /obj/machinery/vending/hydronutrients = "\improper NutriMax",
+ /obj/machinery/vending/hydroseeds = "\improper MegaSeed Servitor",
/obj/machinery/vending/wardrobe/sec_wardrobe = "SecDrobe",
/obj/machinery/vending/wardrobe/medi_wardrobe = "MediDrobe",
/obj/machinery/vending/wardrobe/engi_wardrobe = "EngiDrobe",
diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm
index cb69bc2450..7576fe83cc 100644
--- a/code/game/objects/items/devices/PDA/cart.dm
+++ b/code/game/objects/items/devices/PDA/cart.dm
@@ -100,7 +100,8 @@
bot_access_flags = CLEAN_BOT
/obj/item/cartridge/lawyer
- name = "\improper P.R.O.V.E. cartridge"
+ name = "\improper S.P.A.M. cartridge"
+ desc = "Introducing the Station Public Announcement Messenger cartridge, featuring the unique ability to broadcast-mark messages, designed for lawyers across Nanotrasen to advertise their useful and important services."
icon_state = "cart-law"
access = CART_SECURITY
spam_enabled = 1
diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm
index e47021c1f6..2762be8edf 100644
--- a/code/game/objects/items/storage/book.dm
+++ b/code/game/objects/items/storage/book.dm
@@ -244,3 +244,6 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
/obj/item/storage/book/bible/syndicate/add_blood_DNA(list/blood_dna)
return FALSE
+
+/obj/item/storage/book/bible/syndicate/empty
+ uses = 0
diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm
index c4457ea991..45313dc9b0 100644
--- a/code/game/objects/items/stunbaton.dm
+++ b/code/game/objects/items/stunbaton.dm
@@ -189,7 +189,7 @@
L.Knockdown(stunpwr, override_stamdmg = 0)
- L.apply_damage(stunpwr*0.55, STAMINA, user.zone_selected)
+ L.apply_damage(stunpwr*0.5, STAMINA, user.zone_selected)
L.apply_effect(EFFECT_STUTTER, stunforce)
SEND_SIGNAL(L, COMSIG_LIVING_MINOR_SHOCK)
if(user)
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 8f5a6e8e0b..6782ba0098 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -453,6 +453,7 @@
force_wielded = 0
attack_verb = list("attacked", "struck", "hit")
total_mass_on = TOTAL_MASS_TOY_SWORD
+ sharpness = IS_BLUNT
/obj/item/twohanded/dualsaber/toy/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
return FALSE
@@ -472,6 +473,7 @@
attack_verb = list("attacked", "struck", "hit")
total_mass_on = TOTAL_MASS_TOY_SWORD
slowdown_wielded = 0
+ sharpness = IS_BLUNT
/obj/item/twohanded/dualsaber/hypereutactic/toy/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
return FALSE
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 9246a00399..1d36b2b41b 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -37,7 +37,7 @@
structureclimber.visible_message("[structureclimber] has been knocked off [src].", "You're knocked off [src]!", "You see [structureclimber] get knocked off [src].")
/obj/structure/ui_act(action, params)
- ..()
+ . = ..()
add_fingerprint(usr)
/obj/structure/MouseDrop_T(atom/movable/O, mob/user)
diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm
index 9d22f669d5..92fda29101 100644
--- a/code/game/objects/structures/holosign.dm
+++ b/code/game/objects/structures/holosign.dm
@@ -8,14 +8,16 @@
max_integrity = 1
armor = list("melee" = 0, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 20)
var/obj/item/holosign_creator/projector
+ var/init_vis_overlay = TRUE
/obj/structure/holosign/Initialize(mapload, source_projector)
. = ..()
if(source_projector)
projector = source_projector
projector.signs += src
- SSvis_overlays.add_vis_overlay(src, icon, icon_state, ABOVE_MOB_LAYER, plane, dir, alpha, RESET_ALPHA) //you see mobs under it, but you hit them like they are above it
- alpha = 0
+ if(init_vis_overlay)
+ SSvis_overlays.add_vis_overlay(src, icon, icon_state, ABOVE_MOB_LAYER, plane, dir, alpha, RESET_ALPHA) //you see mobs under it, but you hit them like they are above it
+ alpha = 0
/obj/structure/holosign/Destroy()
if(projector)
@@ -74,8 +76,10 @@
icon_state = "holo_fan"
density = FALSE
anchored = TRUE
+ layer = ABOVE_NORMAL_TURF_LAYER
CanAtmosPass = ATMOS_PASS_NO
alpha = 150
+ init_vis_overlay = FALSE
/obj/structure/holosign/barrier/atmos/Initialize()
. = ..()
@@ -100,7 +104,9 @@
max_integrity = 30
density = FALSE
anchored = TRUE
+ layer = ABOVE_NORMAL_TURF_LAYER
alpha = 150
+ init_vis_overlay = FALSE
CanAtmosPass = ATMOS_PASS_NO
resistance_flags = FIRE_PROOF
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index d8434f986c..688e03def3 100755
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -362,8 +362,10 @@
. = ..()
if(.)
return
+ if(!user || !istype(user, /mob/living))
+ return FALSE
if(length(src_object.contents()))
- to_chat(usr, "You start dumping out the contents...")
+ to_chat(user, "You start dumping out the contents...")
if(!do_after(usr,20,target=src_object.parent))
return FALSE
diff --git a/code/game/world.dm b/code/game/world.dm
index 8e18f2ea51..6b380e0f94 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -8,6 +8,7 @@ GLOBAL_LIST(topic_status_cache)
//This happens after the Master subsystem new(s) (it's a global datum)
//So subsystems globals exist, but are not initialised
/world/New()
+ enable_debugger()
log_world("World loaded at [TIME_STAMP("hh:mm:ss", FALSE)]!")
diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm
index 8856982cf2..b5127929a7 100644
--- a/code/modules/admin/admin_ranks.dm
+++ b/code/modules/admin/admin_ranks.dm
@@ -138,15 +138,15 @@ GLOBAL_PROTECT(protected_ranks)
if(!line || findtextEx_char(line,"#",1,2))
continue
var/next = findtext(line, "=")
- var/datum/admin_rank/R = new(ckeyEx(copytext(line, 1, line[next])))
+ var/datum/admin_rank/R = new(ckeyEx(copytext(line, 1, next)))
if(!R)
continue
GLOB.admin_ranks += R
GLOB.protected_ranks += R
var/prev = findchar(line, "+-*", next, 0)
while(prev)
- next = findchar(line, "+-*", prev + 1, 0)
- R.process_keyword(copytext_char(line, prev, next), previous_rights)
+ next = findchar(line, "+-*", prev + length(line[prev]), 0)
+ R.process_keyword(copytext(line, prev, next), previous_rights)
prev = next
previous_rights = R.rights
if(!CONFIG_GET(flag/admin_legacy_system) || dbfail)
diff --git a/code/modules/admin/antag_panel.dm b/code/modules/admin/antag_panel.dm
index 1672310567..19e53b09b4 100644
--- a/code/modules/admin/antag_panel.dm
+++ b/code/modules/admin/antag_panel.dm
@@ -214,4 +214,4 @@ GLOBAL_VAR(antag_prototypes)
var/datum/browser/panel = new(usr, "traitorpanel", "", 600, 600)
panel.set_content(out)
panel.open()
- return
\ No newline at end of file
+ return
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 37c79b1123..b8b92b0a58 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -75,7 +75,7 @@
message_admins("[key_name_admin(src)] decided not to answer [key_name_admin(H)]'s [sender] request.")
return
- log_directed_talk(src, H, input, LOG_ADMIN, "reply")
+ log_directed_talk(mob, H, input, LOG_ADMIN, "reply")
message_admins("[key_name_admin(src)] replied to [key_name_admin(H)]'s [sender] message with: \"[input]\"")
to_chat(H, "You hear something crackle in your ears for a moment before a voice speaks. \"Please stand by for a message from [sender == "Syndicate" ? "your benefactor" : "Central Command"]. Message as follows[sender == "Syndicate" ? ", agent." : ":"] [input]. Message ends.\"")
diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm
index e15225b388..0c05afb155 100644
--- a/code/modules/antagonists/_common/antag_datum.dm
+++ b/code/modules/antagonists/_common/antag_datum.dm
@@ -20,6 +20,7 @@ GLOBAL_LIST_EMPTY(antagonists)
var/show_in_antagpanel = TRUE //This will hide adding this antag type in antag panel, use only for internal subtypes that shouldn't be added directly but still show if possessed by mind
var/antagpanel_category = "Uncategorized" //Antagpanel will display these together, REQUIRED
var/show_name_in_check_antagonists = FALSE //Will append antagonist name in admin listings - use for categories that share more than one antag type
+ var/list/blacklisted_quirks = list(/datum/quirk/nonviolent,/datum/quirk/mute) // Quirks that will be removed upon gaining this antag. Pacifist and mute are default.
/datum/antagonist/New()
GLOB.antagonists += src
@@ -70,6 +71,7 @@ GLOBAL_LIST_EMPTY(antagonists)
greet()
apply_innate_effects()
give_antag_moodies()
+ remove_blacklisted_quirks()
if(is_banned(owner.current) && replace_banned)
replace_banned_player()
@@ -117,6 +119,17 @@ GLOBAL_LIST_EMPTY(antagonists)
return
SEND_SIGNAL(owner.current, COMSIG_CLEAR_MOOD_EVENT, "antag_moodlet")
+/datum/antagonist/proc/remove_blacklisted_quirks()
+ var/mob/living/L = owner
+ if(istype(L))
+ var/list/cut = list()
+ cut = SSquirks.filter_quirks(L.roundstart_quirks,blacklisted_quirks)
+ for(var/q in cut)
+ var/datum/quirk/Q = q
+ if(Q.antag_removal_text)
+ to_chat(L, "[Q.antag_removal_text]")
+ L.remove_quirk(Q.type)
+
//Returns the team antagonist belongs to if any.
/datum/antagonist/proc/get_team()
return
@@ -134,7 +147,7 @@ GLOBAL_LIST_EMPTY(antagonists)
if(objectives.len)
report += printobjectives(objectives)
for(var/datum/objective/objective in objectives)
- if(!objective.check_completion())
+ if(objective.completable && !objective.check_completion())
objectives_complete = FALSE
break
diff --git a/code/modules/antagonists/_common/antag_team.dm b/code/modules/antagonists/_common/antag_team.dm
index 486b5b0414..027abc7c94 100644
--- a/code/modules/antagonists/_common/antag_team.dm
+++ b/code/modules/antagonists/_common/antag_team.dm
@@ -36,11 +36,17 @@
var/win = TRUE
var/objective_count = 1
for(var/datum/objective/objective in objectives)
- if(objective.check_completion())
- report += "Objective #[objective_count]: [objective.explanation_text] Success!"
+ if(objective.completable)
+ var/completion = objective.check_completion()
+ if(completion >= 1)
+ report += "Objective #[objective_count]: [objective.explanation_text] Success!"
+ else if(completion <= 0)
+ report += "Objective #[objective_count]: [objective.explanation_text] Fail."
+ win = FALSE
+ else
+ report += "Objective #[objective_count]: [objective.explanation_text] [completion*100]%"
else
- report += "Objective #[objective_count]: [objective.explanation_text] Fail."
- win = FALSE
+ report += "Objective #[objective_count]: [objective.explanation_text]"
objective_count++
if(win)
report += "The [name] was successful!"
diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm
index 7c589bb3ab..2292006da1 100644
--- a/code/modules/antagonists/brother/brother.dm
+++ b/code/modules/antagonists/brother/brother.dm
@@ -108,11 +108,17 @@
var/win = TRUE
var/objective_count = 1
for(var/datum/objective/objective in objectives)
- if(objective.check_completion())
- parts += "Objective #[objective_count]: [objective.explanation_text] Success!"
+ if(objective.completable)
+ var/completion = objective.check_completion()
+ if(completion >= 1)
+ parts += "Objective #[objective_count]: [objective.explanation_text] Success!"
+ else if(completion <= 0)
+ parts += "Objective #[objective_count]: [objective.explanation_text] Fail."
+ win = FALSE
+ else
+ parts += "Objective #[objective_count]: [objective.explanation_text] [completion*100]%"
else
- parts += "Objective #[objective_count]: [objective.explanation_text] Fail."
- win = FALSE
+ parts += "Objective #[objective_count]: [objective.explanation_text]"
objective_count++
if(win)
parts += "The blood brothers were successful!"
diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm
index 0d68660d9d..a81c409233 100644
--- a/code/modules/antagonists/changeling/changeling.dm
+++ b/code/modules/antagonists/changeling/changeling.dm
@@ -54,8 +54,10 @@
var/honorific
if(owner.current.gender == FEMALE)
honorific = "Ms."
- else
+ else if(owner.current.gender == MALE)
honorific = "Mr."
+ else
+ honorific = "Mx."
if(GLOB.possible_changeling_IDs.len)
changelingID = pick(GLOB.possible_changeling_IDs)
GLOB.possible_changeling_IDs -= changelingID
@@ -552,11 +554,17 @@
if(objectives.len)
var/count = 1
for(var/datum/objective/objective in objectives)
- if(objective.check_completion())
- parts += "Objective #[count]: [objective.explanation_text] Success!"
+ if(objective.completable)
+ var/completion = objective.check_completion()
+ if(completion >= 1)
+ parts += "Objective #[count]: [objective.explanation_text] Success!"
+ else if(completion <= 0)
+ parts += "Objective #[count]: [objective.explanation_text] Fail."
+ changelingwin = FALSE
+ else
+ parts += "Objective #[count]: [objective.explanation_text] [completion*100]%"
else
- parts += "Objective #[count]: [objective.explanation_text] Fail."
- changelingwin = 0
+ parts += "Objective #[count]: [objective.explanation_text]"
count++
if(changelingwin)
diff --git a/code/modules/antagonists/collector/collector.dm b/code/modules/antagonists/collector/collector.dm
new file mode 100644
index 0000000000..0e7a3a52e7
--- /dev/null
+++ b/code/modules/antagonists/collector/collector.dm
@@ -0,0 +1,19 @@
+/datum/antagonist/collector
+ name = "Contraband Collector"
+ show_in_antagpanel = FALSE
+ show_name_in_check_antagonists = FALSE
+ blacklisted_quirks = list() // no blacklist, these guys are harmless
+
+/datum/antagonist/collector/proc/forge_objectives()
+ var/datum/objective/hoard/collector/O = new
+ O.owner = owner
+ O.find_target()
+ objectives += O
+
+/datum/antagonist/collector/on_gain()
+ forge_objectives()
+ . = ..()
+
+/datum/antagonist/collector/greet()
+ to_chat(owner, "You are a contraband collector!")
+ owner.announce_objectives()
diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm
index df2383f892..4bab621674 100644
--- a/code/modules/antagonists/cult/cult.dm
+++ b/code/modules/antagonists/cult/cult.dm
@@ -300,7 +300,7 @@
if(ishuman(cultist))
var/mob/living/carbon/human/H = cultist
H.eye_color = "f00"
- H.dna.update_ui_block(DNA_EYE_COLOR_BLOCK)
+ H.dna?.update_ui_block(DNA_EYE_COLOR_BLOCK)
ADD_TRAIT(H, TRAIT_CULT_EYES, "valid_cultist")
H.update_body()
@@ -425,10 +425,16 @@
parts += "The cultists' objectives were:"
var/count = 1
for(var/datum/objective/objective in objectives)
- if(objective.check_completion())
- parts += "Objective #[count]: [objective.explanation_text] Success!"
+ if(objective.completable)
+ var/completion = objective.check_completion()
+ if(completion >= 1)
+ parts += "Objective #[count]: [objective.explanation_text] Success!"
+ else if(completion <= 0)
+ parts += "Objective #[count]: [objective.explanation_text] Fail."
+ else
+ parts += "Objective #[count]: [objective.explanation_text] [completion*100]%"
else
- parts += "Objective #[count]: [objective.explanation_text] Fail."
+ parts += "Objective #[count]: [objective.explanation_text]"
count++
if(members.len)
diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm
index 7948b30035..0111334748 100644
--- a/code/modules/antagonists/cult/runes.dm
+++ b/code/modules/antagonists/cult/runes.dm
@@ -885,7 +885,7 @@ structure_check() searches for nearby cultist structures required for the invoca
if(new_human)
new_human.visible_message("[new_human] suddenly dissolves into bones and ashes.", \
"Your link to the world fades. Your form breaks apart.")
- for(var/obj/I in new_human)
+ for(var/obj/item/I in new_human)
new_human.dropItemToGround(I, TRUE)
new_human.dust()
else if(choice == "Ascend as a Dark Spirit")
diff --git a/code/modules/antagonists/disease/disease_datum.dm b/code/modules/antagonists/disease/disease_datum.dm
index 1aef9ceba6..3c7de589d9 100644
--- a/code/modules/antagonists/disease/disease_datum.dm
+++ b/code/modules/antagonists/disease/disease_datum.dm
@@ -44,11 +44,17 @@
var/objectives_text = ""
var/count = 1
for(var/datum/objective/objective in objectives)
- if(objective.check_completion())
- objectives_text += "
Objective #[count]: [objective.explanation_text] Success!"
+ if(objective.completable)
+ var/completion = objective.check_completion()
+ if(completion >= 1)
+ result += "Objective #[count]: [objective.explanation_text] Success!"
+ else if(completion <= 0)
+ result += "Objective #[count]: [objective.explanation_text] Fail."
+ win = FALSE
+ else
+ result += "Objective #[count]: [objective.explanation_text] [completion*100]%"
else
- objectives_text += "
Objective #[count]: [objective.explanation_text] Fail."
- win = FALSE
+ result += "Objective #[count]: [objective.explanation_text]"
count++
result += objectives_text
diff --git a/code/modules/antagonists/ninja/ninja.dm b/code/modules/antagonists/ninja/ninja.dm
index 2a91f53ed4..943cb02696 100644
--- a/code/modules/antagonists/ninja/ninja.dm
+++ b/code/modules/antagonists/ninja/ninja.dm
@@ -63,10 +63,10 @@
possible_targets.Cut(index,index+1)
if(is_bad_guy ^ helping_station) //kill (good-ninja + bad-guy or bad-ninja + good-guy)
- var/datum/objective/assassinate/O = new /datum/objective/assassinate()
+ var/datum/objective/assassinate/once/O = new /datum/objective/assassinate()
O.owner = owner
O.target = M
- O.explanation_text = "Slay \the [M.current.real_name], the [M.assigned_role]."
+ O.explanation_text = "Slay \the [M.current.real_name], the [M.assigned_role]. You may let [M.p_they()] live, if they come back from death."
objectives += O
else //protect
var/datum/objective/protect/O = new /datum/objective/protect()
@@ -74,23 +74,16 @@
O.target = M
O.explanation_text = "Protect \the [M.current.real_name], the [M.assigned_role], from harm."
objectives += O
- if(4) //debrain/capture
- if(!possible_targets.len) continue
- var/selected = rand(1,possible_targets.len)
- var/datum/mind/M = possible_targets[selected]
- var/is_bad_guy = possible_targets[M]
- possible_targets.Cut(selected,selected+1)
-
- if(is_bad_guy ^ helping_station) //debrain (good-ninja + bad-guy or bad-ninja + good-guy)
- var/datum/objective/debrain/O = new /datum/objective/debrain()
+ if(4) //flavor
+ if(helping_station)
+ var/datum/objective/flavor/ninja_helping/O = new /datum/objective/flavor/ninja_helping
O.owner = owner
- O.target = M
- O.explanation_text = "Steal the brain of [M.current.real_name]."
+ O.forge_objective()
objectives += O
- else //capture
- var/datum/objective/capture/O = new /datum/objective/capture()
+ else
+ var/datum/objective/flavor/ninja_syndie/O = new /datum/objective/flavor/ninja_helping
O.owner = owner
- O.gen_amount_goal()
+ O.forge_objective()
objectives += O
else
break
diff --git a/code/modules/antagonists/nukeop/clownop.dm b/code/modules/antagonists/nukeop/clownop.dm
index 58b492b578..a3ccdee2b5 100644
--- a/code/modules/antagonists/nukeop/clownop.dm
+++ b/code/modules/antagonists/nukeop/clownop.dm
@@ -7,10 +7,10 @@
/datum/antagonist/nukeop/clownop/on_gain()
. = ..()
- ADD_TRAIT(owner, TRAIT_CLOWN_MENTALITY, NUKEOP_ANTAGONIST)
+ ADD_TRAIT(owner, TRAIT_CLOWN_MENTALITY, CLOWNOP_TRAIT)
/datum/antagonist/nukeop/clownop/on_removal()
- REMOVE_TRAIT(owner, TRAIT_CLOWN_MENTALITY, NUKEOP_ANTAGONIST)
+ REMOVE_TRAIT(owner, TRAIT_CLOWN_MENTALITY, CLOWNOP_TRAIT)
return ..()
/datum/antagonist/nukeop/leader/clownop
diff --git a/code/modules/antagonists/survivalist/survivalist.dm b/code/modules/antagonists/survivalist/survivalist.dm
index 4e0184b7b6..0b66e8cb23 100644
--- a/code/modules/antagonists/survivalist/survivalist.dm
+++ b/code/modules/antagonists/survivalist/survivalist.dm
@@ -2,6 +2,7 @@
name = "Survivalist"
show_in_antagpanel = FALSE
show_name_in_check_antagonists = TRUE
+ blacklisted_quirks = list(/datum/quirk/nonviolent) // mutes are allowed
var/greet_message = ""
/datum/antagonist/survivalist/proc/forge_objectives()
@@ -19,20 +20,8 @@
owner.announce_objectives()
/datum/antagonist/survivalist/guns
- greet_message = "Your own safety matters above all else, and the only way to ensure your safety is to stockpile weapons! Grab as many guns as possible, by any means necessary. Kill anyone who gets in your way."
-
-/datum/antagonist/survivalist/guns/forge_objectives()
- var/datum/objective/steal_five_of_type/summon_guns/guns = new
- guns.owner = owner
- objectives += guns
- ..()
+ greet_message = "Your own safety matters above all else, and the only way to ensure your safety is to stockpile weapons! Grab as many guns as possible, and don't let anyone take them!"
/datum/antagonist/survivalist/magic
name = "Amateur Magician"
- greet_message = "Grow your newfound talent! Grab as many magical artefacts as possible, by any means necessary. Kill anyone who gets in your way."
-
-/datum/antagonist/survivalist/magic/forge_objectives()
- var/datum/objective/steal_five_of_type/summon_magic/magic = new
- magic.owner = owner
- objectives += magic
- ..()
\ No newline at end of file
+ greet_message = "This magic stuff is... so powerful. You want more. More! They want your power. They can't have it! Don't let them have it!"
diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
index 595ce5bb90..1c7ee48f71 100644
--- a/code/modules/antagonists/traitor/datum_traitor.dm
+++ b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -77,19 +77,23 @@
var/is_hijacker = FALSE
var/datum/game_mode/dynamic/mode
var/is_dynamic = FALSE
+ var/hijack_prob = 0
if(istype(SSticker.mode,/datum/game_mode/dynamic))
mode = SSticker.mode
is_dynamic = TRUE
- if(mode.storyteller.flags & NO_ASSASSIN)
- is_hijacker = FALSE
+ if(mode.threat >= CONFIG_GET(number/dynamic_hijack_cost))
+ hijack_prob = CLAMP(mode.threat_level-50,0,20)
if(GLOB.joined_player_list.len>=GLOB.dynamic_high_pop_limit)
- is_hijacker = (prob(10) && mode.threat_level > CONFIG_GET(number/dynamic_hijack_high_population_requirement))
+ is_hijacker = (prob(hijack_prob) && mode.threat_level > CONFIG_GET(number/dynamic_hijack_high_population_requirement))
else
var/indice_pop = min(10,round(GLOB.joined_player_list.len/mode.pop_per_requirement)+1)
- is_hijacker = (prob(10) && (mode.threat_level >= CONFIG_GET(number_list/dynamic_hijack_requirements)[indice_pop]))
+ is_hijacker = (prob(hijack_prob) && (mode.threat_level >= CONFIG_GET(number_list/dynamic_hijack_requirements)[indice_pop]))
+ if(mode.storyteller.flags & NO_ASSASSIN)
+ is_hijacker = FALSE
else if (GLOB.joined_player_list.len >= 30) // Less murderboning on lowpop thanks
+ hijack_prob = 10
is_hijacker = prob(10)
- var/martyr_chance = prob(20)
+ var/martyr_chance = prob(hijack_prob*2)
var/objective_count = is_hijacker //Hijacking counts towards number of objectives
if(!SSticker.mode.exchange_blue && SSticker.mode.traitors.len >= 8) //Set up an exchange if there are enough traitors
if(!SSticker.mode.exchange_red)
@@ -170,7 +174,7 @@
if(istype(SSticker.mode,/datum/game_mode/dynamic))
mode = SSticker.mode
is_dynamic = TRUE
- assassin_prob = mode.threat_level*(2/3)
+ assassin_prob = max(0,mode.threat_level-20)
if(prob(assassin_prob))
if(is_dynamic)
var/threat_spent = CONFIG_GET(number/dynamic_assassinate_cost)
@@ -187,22 +191,37 @@
maroon_objective.owner = owner
maroon_objective.find_target()
add_objective(maroon_objective)
- else
+ else if(prob(max(0,assassin_prob-20)))
var/datum/objective/assassinate/kill_objective = new
kill_objective.owner = owner
kill_objective.find_target()
add_objective(kill_objective)
+ else
+ var/datum/objective/assassinate/once/kill_objective = new
+ kill_objective.owner = owner
+ kill_objective.find_target()
+ add_objective(kill_objective)
else
if(prob(15) && !(locate(/datum/objective/download) in objectives) && !(owner.assigned_role in list("Research Director", "Scientist", "Roboticist")))
var/datum/objective/download/download_objective = new
download_objective.owner = owner
download_objective.gen_amount_goal()
add_objective(download_objective)
- else
+ else if(prob(40)) // cum. not counting download: 40%.
var/datum/objective/steal/steal_objective = new
steal_objective.owner = owner
steal_objective.find_target()
add_objective(steal_objective)
+ else if(prob(100/3)) // cum. not counting download: 20%.
+ var/datum/objective/sabotage/sabotage_objective = new
+ sabotage_objective.owner = owner
+ sabotage_objective.find_target()
+ add_objective(sabotage_objective)
+ else // cum. not counting download: 40%
+ var/datum/objective/flavor/traitor/flavor_objective = new
+ flavor_objective.owner = owner
+ flavor_objective.forge_objective()
+ add_objective(flavor_objective)
/datum/antagonist/traitor/proc/forge_single_AI_objective()
.=1
@@ -369,11 +388,17 @@
if(objectives.len)//If the traitor had no objectives, don't need to process this.
var/count = 1
for(var/datum/objective/objective in objectives)
- if(objective.check_completion())
- objectives_text += "
Objective #[count]: [objective.explanation_text] Success!"
+ if(objective.completable)
+ var/completion = objective.check_completion()
+ if(completion >= 1)
+ objectives_text += "
Objective #[count]: [objective.explanation_text] Success!"
+ else if(completion <= 0)
+ objectives_text += "
Objective #[count]: [objective.explanation_text] Fail."
+ traitorwin = FALSE
+ else
+ objectives_text += "
Objective #[count]: [objective.explanation_text] [completion*100]%"
else
- objectives_text += "
Objective #[count]: [objective.explanation_text] Fail."
- traitorwin = FALSE
+ objectives_text += "
Objective #[count]: [objective.explanation_text]"
count++
if(uplink_true)
diff --git a/code/modules/antagonists/valentines/valentine.dm b/code/modules/antagonists/valentines/valentine.dm
index 19c08f3076..d3bcdf0c04 100644
--- a/code/modules/antagonists/valentines/valentine.dm
+++ b/code/modules/antagonists/valentines/valentine.dm
@@ -35,7 +35,7 @@
var/objectives_complete = TRUE
if(objectives.len)
for(var/datum/objective/objective in objectives)
- if(!objective.check_completion())
+ if(objective.completable && !objective.check_completion())
objectives_complete = FALSE
break
diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm
index f75d32e781..5e4cc17541 100644
--- a/code/modules/antagonists/wizard/wizard.dm
+++ b/code/modules/antagonists/wizard/wizard.dm
@@ -61,9 +61,9 @@
owner.current.forceMove(pick(GLOB.wizardstart))
/datum/antagonist/wizard/proc/create_objectives()
- var/datum/objective/new_objective = new("Cause as much creative mayhem as you can aboard the station! The more outlandish your methods of achieving this, the better! Make sure there's a decent amount of crew alive to tell of your tale.")
- new_objective.completed = TRUE //So they can greentext without admin intervention.
+ var/datum/objective/flavor/wizard/new_objective = new
new_objective.owner = owner
+ new_objective.forge_objective()
objectives += new_objective
if (!(locate(/datum/objective/escape) in objectives))
@@ -94,6 +94,7 @@
to_chat(owner, "You are the Space Wizard!")
to_chat(owner, "The Space Wizards Federation has given you the following tasks:")
owner.announce_objectives()
+ to_chat(owner, "These are merely guidelines! The federation are your masters, but you forge your own path!")
to_chat(owner, "You will find a list of available spells in your spell book. Choose your magic arsenal carefully.")
to_chat(owner, "The spellbook is bound to you, and others cannot use it.")
to_chat(owner, "In your pockets you will find a teleport scroll. Use it as needed.")
@@ -265,11 +266,17 @@
var/count = 1
var/wizardwin = 1
for(var/datum/objective/objective in objectives)
- if(objective.check_completion())
- parts += "Objective #[count]: [objective.explanation_text] Success!"
+ if(objective.completable)
+ var/completion = objective.check_completion()
+ if(completion >= 1)
+ parts += "Objective #[count]: [objective.explanation_text] Success!"
+ else if(completion <= 0)
+ parts += "Objective #[count]: [objective.explanation_text] Fail."
+ wizardwin = FALSE
+ else
+ parts += "Objective #[count]: [objective.explanation_text] [completion*100]%"
else
- parts += "Objective #[count]: [objective.explanation_text] Fail."
- wizardwin = 0
+ parts += "Objective #[count]: [objective.explanation_text]"
count++
if(wizardwin)
diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
index 12efa01a38..5ff8586c34 100644
--- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
@@ -337,8 +337,9 @@ GLOBAL_LIST_INIT(meta_gas_fusions, meta_gas_fusion_list())
if(!length(cached_gases))
return
var/list/reactions = list()
- for(var/I in cached_gases)
- reactions += SSair.gas_reactions[I]
+ for(var/datum/gas_reaction/G in SSair.gas_reactions)
+ if(cached_gases[G.major_gas])
+ reactions += G
if(!length(reactions))
return
reaction_results = new
diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm
index f9c831a65a..ebe894138d 100644
--- a/code/modules/atmospherics/gasmixtures/reactions.dm
+++ b/code/modules/atmospherics/gasmixtures/reactions.dm
@@ -2,8 +2,6 @@
/proc/init_gas_reactions()
. = list()
- for(var/type in subtypesof(/datum/gas))
- .[type] = list()
for(var/r in subtypesof(/datum/gas_reaction))
var/datum/gas_reaction/reaction = r
@@ -16,27 +14,19 @@
var/datum/gas/req_gas = req
if (!reaction_key || initial(reaction_key.rarity) > initial(req_gas.rarity))
reaction_key = req_gas
- .[reaction_key] += list(reaction)
- sortTim(., /proc/cmp_gas_reactions, TRUE)
+ reaction.major_gas = reaction_key
+ . += reaction
+ sortTim(., /proc/cmp_gas_reaction)
-/proc/cmp_gas_reactions(list/datum/gas_reaction/a, list/datum/gas_reaction/b) // compares lists of reactions by the maximum priority contained within the list
- if (!length(a) || !length(b))
- return length(b) - length(a)
- var/maxa
- var/maxb
- for (var/datum/gas_reaction/R in a)
- if (R.priority > maxa)
- maxa = R.priority
- for (var/datum/gas_reaction/R in b)
- if (R.priority > maxb)
- maxb = R.priority
- return maxb - maxa
+/proc/cmp_gas_reaction(datum/gas_reaction/a, datum/gas_reaction/b) // compares lists of reactions by the maximum priority contained within the list
+ return b.priority - a.priority
/datum/gas_reaction
//regarding the requirements lists: the minimum or maximum requirements must be non-zero.
//when in doubt, use MINIMUM_MOLE_COUNT.
var/list/min_requirements
var/list/max_requirements
+ var/major_gas //the highest rarity gas used in the reaction.
var/exclude = FALSE //do it this way to allow for addition/removal of reactions midmatch in the future
var/priority = 100 //lower numbers are checked/react later than higher numbers. if two reactions have the same priority they may happen in either order
var/name = "reaction"
diff --git a/code/modules/cargo/packs/security.dm b/code/modules/cargo/packs/security.dm
index 3b602d54d2..fd7e07a66c 100644
--- a/code/modules/cargo/packs/security.dm
+++ b/code/modules/cargo/packs/security.dm
@@ -81,8 +81,8 @@
desc = "An old russian crate full of surplus armor that they used to use! Has two sets of bulletproff armor, a few union suits and some warm hats!"
contraband = TRUE
cost = 5750 // Its basicly sec suits, good boots/gloves
- contains = list(/obj/item/clothing/suit/security/officer/russian,
- /obj/item/clothing/suit/security/officer/russian,
+ contains = list(/obj/item/clothing/suit/armor/navyblue/russian,
+ /obj/item/clothing/suit/armor/navyblue/russian,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/head/ushanka,
@@ -104,7 +104,7 @@
contraband = TRUE
access = FALSE
cost = 5500 //
- contains = list(/obj/item/clothing/suit/security/officer/russian,
+ contains = list(/obj/item/clothing/suit/armor/navyblue/russian,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/head/ushanka,
/obj/item/clothing/suit/armor/bulletproof,
@@ -141,15 +141,15 @@
cost = 3250
contains = list(/obj/item/clothing/under/rank/security/navyblue,
/obj/item/clothing/under/rank/security/navyblue,
- /obj/item/clothing/suit/security/officer,
- /obj/item/clothing/suit/security/officer,
+ /obj/item/clothing/suit/armor/navyblue,
+ /obj/item/clothing/suit/armor/navyblue,
/obj/item/clothing/head/beret/sec/navyofficer,
/obj/item/clothing/head/beret/sec/navyofficer,
/obj/item/clothing/under/rank/warden/navyblue,
- /obj/item/clothing/suit/security/warden,
+ /obj/item/clothing/suit/armor/vest/warden/navyblue,
/obj/item/clothing/head/beret/sec/navywarden,
/obj/item/clothing/under/rank/head_of_security/navyblue,
- /obj/item/clothing/suit/security/hos,
+ /obj/item/clothing/suit/armor/hos/navyblue,
/obj/item/clothing/head/beret/sec/navyhos)
crate_name = "security clothing crate"
diff --git a/code/modules/cargo/packs/vending.dm b/code/modules/cargo/packs/vending.dm
index f9982d17b6..344d19f6c9 100644
--- a/code/modules/cargo/packs/vending.dm
+++ b/code/modules/cargo/packs/vending.dm
@@ -22,6 +22,14 @@
/obj/item/book/granter/action/drink_fling)
crate_name = "bartending supply crate"
+/datum/supply_pack/vending/hydro
+ name = "Cartridge Supply Crate"
+ desc = "Restock you cartridges for PDAs. Contains a PTech vending machine refill."
+ cost = 5000
+ contains = list(/obj/item/vending_refill/cart)
+ crate_name = "hydroponics supply crate"
+ crate_type = /obj/structure/closet/crate
+
/datum/supply_pack/vending/cigarette
name = "Cigarette Supply Crate"
desc = "Don't believe the reports - smoke today! Contains a cigarette vending machine refill."
@@ -30,6 +38,25 @@
crate_name = "cigarette supply crate"
crate_type = /obj/structure/closet/crate
+/datum/supply_pack/vending/dinner
+ name = "Dinnerware Supply Crate"
+ desc = "Use a plate and have some utensils! Contains a dinnerware and sustenance vending machine refill."
+ cost = 2500
+ contains = list(/obj/item/vending_refill/sustenance,
+ /obj/item/vending_refill/dinnerware)
+ crate_name = "dinnerware supply crate"
+ crate_type = /obj/structure/closet/crate
+
+/datum/supply_pack/vending/dinner
+ name = "Engineering Supply Crate"
+ desc = "Packs of tools waiting to be used for repairing. Contains a tool and engineering vending machine refill. Requires CE access."
+ cost = 5500 //Powerfull
+ access = ACCESS_CE
+ contains = list(/obj/item/vending_refill/tool,
+ /obj/item/vending_refill/engivend)
+ crate_name = "engineering supply crate"
+ crate_type = /obj/structure/closet/crate/secure/engineering
+
/datum/supply_pack/vending/games
name = "Games Supply Crate"
desc = "Get your game on with this game vending machine refill."
@@ -38,8 +65,18 @@
crate_name = "games supply crate"
crate_type = /obj/structure/closet/crate
+/datum/supply_pack/vending/hydro
+ name = "Hydroponics Supply Crate"
+ desc = "Arnt you glad you dont have to do it the natural way? Contains a megaseed and nutrimax vending machine refill."
+ cost = 5000
+ contains = list(/obj/item/vending_refill/hydroseeds,
+ /obj/item/vending_refill/hydronutrients)
+ crate_name = "hydroponics supply crate"
+ crate_type = /obj/structure/closet/crate
+
/datum/supply_pack/vending/kinkmate
name = "Kinkmate Supply and Construction Kit"
+ desc = "A fun way to spend the shift. Contains unmentionable desires."
cost = 2000
contraband = TRUE
contains = list(/obj/item/vending_refill/kink, /obj/item/circuitboard/machine/kinkmate)
@@ -77,6 +114,13 @@
contains = list(/obj/item/vending_refill/cola)
crate_name = "soft drinks supply crate"
+/datum/supply_pack/vending/vendomat
+ name = "Vendomat Supply Crate"
+ desc = "Contains a Vendomat restock unit!"
+ cost = 1200
+ contains = list(/obj/item/vending_refill/assist)
+ crate_name = "vendomat supply crate"
+
//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Wardrobe Vendors ////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 006cdf8dc8..ba20fdacd2 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -137,7 +137,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
"balls_cum_rate" = CUM_RATE,
"balls_cum_mult" = CUM_RATE_MULT,
"balls_efficiency" = CUM_EFFICIENCY,
- "balls_fluid" = "semen",
"has_ovi" = FALSE,
"ovi_shape" = "knotted",
"ovi_length" = 6,
@@ -152,7 +151,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
"breasts_color" = "fff",
"breasts_size" = "C",
"breasts_shape" = "Pair",
- "breasts_fluid" = "milk",
"breasts_producing" = FALSE,
"has_vag" = FALSE,
"vag_shape" = "Human",
@@ -163,7 +161,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
"womb_cum_rate" = CUM_RATE,
"womb_cum_mult" = CUM_RATE_MULT,
"womb_efficiency" = CUM_EFFICIENCY,
- "womb_fluid" = "femcum",
"ipc_screen" = "Sunburst",
"ipc_antenna" = "None",
"flavor_text" = "",
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 24e44f191e..03c6051c5d 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -423,13 +423,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["feature_balls_size"] >> features["balls_size"]
S["feature_balls_shape"] >> features["balls_shape"]
S["feature_balls_sack_size"] >> features["balls_sack_size"]
- S["feature_balls_fluid"] >> features["balls_fluid"]
//breasts features
S["feature_has_breasts"] >> features["has_breasts"]
S["feature_breasts_size"] >> features["breasts_size"]
S["feature_breasts_shape"] >> features["breasts_shape"]
S["feature_breasts_color"] >> features["breasts_color"]
- S["feature_breasts_fluid"] >> features["breasts_fluid"]
S["feature_breasts_producing"] >> features["breasts_producing"]
//vagina features
S["feature_has_vag"] >> features["has_vag"]
diff --git a/code/modules/clothing/gloves/_gloves.dm b/code/modules/clothing/gloves/_gloves.dm
index 8ab897f5d9..0729317eac 100644
--- a/code/modules/clothing/gloves/_gloves.dm
+++ b/code/modules/clothing/gloves/_gloves.dm
@@ -11,6 +11,8 @@
var/transfer_blood = 0
strip_delay = 20
equip_delay_other = 40
+ var/strip_mod = 1 //how much they alter stripping items time by, higher is quicker
+ var/strip_silence = FALSE //if it shows a warning when stripping
/obj/item/clothing/gloves/ComponentInitialize()
. = ..()
diff --git a/code/modules/clothing/gloves/boxing.dm b/code/modules/clothing/gloves/boxing.dm
index a76ff7c583..fe07cc7ab9 100644
--- a/code/modules/clothing/gloves/boxing.dm
+++ b/code/modules/clothing/gloves/boxing.dm
@@ -5,6 +5,7 @@
item_state = "boxing"
equip_delay_other = 60
species_exception = list(/datum/species/golem) // now you too can be a golem boxing champion
+ strip_mod = 0.5
/obj/item/clothing/gloves/boxing/green
icon_state = "boxinggreen"
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index b630b121a9..f4b04f5bfe 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -41,6 +41,7 @@
permeability_coefficient = 1
resistance_flags = NONE
transfer_prints = TRUE
+ strip_mod = 0.8
/obj/item/clothing/gloves/cut/family
desc = "The old gloves your great grandfather stole from Engineering, many moons ago. They've seen some tough times recently."
@@ -76,6 +77,7 @@
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
resistance_flags = NONE
var/can_be_cut = 1
+ strip_mod = 1.2
/obj/item/clothing/gloves/color/black/hos
item_color = "hosred" //Exists for washing machines. Is not different from black gloves in any way.
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index efe32a1473..9f4b89f607 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -10,6 +10,7 @@
equip_delay_other = 20
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
+ strip_mod = 0.9
/obj/item/clothing/gloves/botanic_leather
name = "botanist's leather gloves"
@@ -23,6 +24,7 @@
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
resistance_flags = NONE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 30)
+ strip_mod = 0.9
/obj/item/clothing/gloves/combat
name = "combat gloves"
@@ -38,6 +40,7 @@
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
resistance_flags = NONE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50)
+ strip_mod = 1.5
/obj/item/clothing/gloves/bracer
@@ -103,3 +106,15 @@
/obj/item/clothing/gloves/rapid/hug/attack_self(mob/user)
return FALSE
+
+/obj/item/clothing/gloves/thief
+ name = "black gloves"
+ desc = "Gloves made with completely frictionless, insulated cloth, easier to steal from people with."
+ icon_state = "thief"
+ item_state = "blackgloves"
+ siemens_coefficient = 0
+ permeability_coefficient = 0.05
+ strip_delay = 80
+ transfer_prints = FALSE
+ strip_mod = 5
+ strip_silence = TRUE
\ No newline at end of file
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index e536d307ef..4591ba8b4e 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -15,6 +15,13 @@
if(!allowed)
allowed = GLOB.security_vest_allowed
+/obj/item/clothing/suit/armor/navyblue
+ name = "security officer's jacket"
+ desc = "This jacket is for those special occasions when a security officer isn't required to wear their armor."
+ icon_state = "officerbluejacket"
+ item_state = "officerbluejacket"
+ body_parts_covered = CHEST|ARMS
+
/obj/item/clothing/suit/armor/vest
name = "armor vest"
desc = "A slim Type I armored vest that provides decent protection against most types of damage."
@@ -52,8 +59,17 @@
heat_protection = CHEST|GROIN|LEGS|ARMS
strip_delay = 80
+/obj/item/clothing/suit/armor/hos/navyblue
+ name = "head of security's jacket"
+ desc = "This piece of clothing was specifically designed for asserting superior authority."
+ icon_state = "hosbluejacket"
+ item_state = "hosbluejacket"
+ body_parts_covered = CHEST|ARMS
+ cold_protection = CHEST|ARMS
+ heat_protection = CHEST|ARMS
+
/obj/item/clothing/suit/armor/hos/trenchcoat
- name = "armored trenchoat"
+ name = "armored trenchcoat"
desc = "A trenchcoat enhanced with a special lightweight kevlar. The epitome of tactical plainclothes."
icon_state = "hostrench"
item_state = "hostrench"
@@ -78,6 +94,13 @@
desc = "A red jacket with silver rank pips and body armor strapped on top."
icon_state = "warden_jacket"
+/obj/item/clothing/suit/armor/vest/warden/navyblue
+ name = "warden's jacket"
+ desc = "Perfectly suited for the warden that wants to leave an impression of style on those who visit the brig."
+ icon_state = "wardenbluejacket"
+ item_state = "wardenbluejacket"
+ body_parts_covered = CHEST|ARMS
+
/obj/item/clothing/suit/armor/vest/leather
name = "security overcoat"
desc = "Lightly armored leather overcoat meant as casual wear for high-ranking officers. Bears the crest of Nanotrasen Security."
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 88bafc842b..48fd8ccf1c 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -155,28 +155,6 @@
blood_overlay_type = "armor" //it's the less thing that I can put here
body_parts_covered = NONE
-//Security
-/obj/item/clothing/suit/security/officer
- name = "security officer's jacket"
- desc = "This jacket is for those special occasions when a security officer isn't required to wear their armor."
- icon_state = "officerbluejacket"
- item_state = "officerbluejacket"
- body_parts_covered = CHEST|ARMS
-
-/obj/item/clothing/suit/security/warden
- name = "warden's jacket"
- desc = "Perfectly suited for the warden that wants to leave an impression of style on those who visit the brig."
- icon_state = "wardenbluejacket"
- item_state = "wardenbluejacket"
- body_parts_covered = CHEST|ARMS
-
-/obj/item/clothing/suit/security/hos
- name = "head of security's jacket"
- desc = "This piece of clothing was specifically designed for asserting superior authority."
- icon_state = "hosbluejacket"
- item_state = "hosbluejacket"
- body_parts_covered = CHEST|ARMS
-
//Surgeon
/obj/item/clothing/suit/apron/surgical
name = "surgical apron"
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 84609e29d8..e9b96af8eb 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -317,7 +317,7 @@
flags_cover = HEADCOVERSEYES
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-/obj/item/clothing/suit/security/officer/russian
+/obj/item/clothing/suit/armor/navyblue/russian
name = "\improper Russian officer's jacket"
desc = "This jacket is for those special occasions when a russian officer isn't required to wear their armor."
icon_state = "officertanjacket"
diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm
index 8cdf403b00..4843d863c5 100644
--- a/code/modules/hydroponics/grown/flowers.dm
+++ b/code/modules/hydroponics/grown/flowers.dm
@@ -71,9 +71,10 @@
reagents_add = list(/datum/reagent/consumable/nutriment = 0.05)
rarity = 30
-/obj/item/seeds/poppy/lily/trumpet/Initialize()
- ..()
- unset_mutability(/datum/plant_gene/reagent/polypyr, PLANT_GENE_EXTRACTABLE)
+/obj/item/seeds/poppy/lily/trumpet/Initialize(mapload, nogenes = FALSE)
+ . = ..()
+ if(!nogenes)
+ unset_mutability(/datum/plant_gene/reagent/polypyr, PLANT_GENE_EXTRACTABLE)
/obj/item/reagent_containers/food/snacks/grown/trumpet
seed = /obj/item/seeds/poppy/lily/trumpet
diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm
index e0a2453353..b8496c865c 100644
--- a/code/modules/hydroponics/grown/misc.dm
+++ b/code/modules/hydroponics/grown/misc.dm
@@ -82,9 +82,10 @@
mutatelist = list()
reagents_add = list(/datum/reagent/consumable/nutriment = 0.05, /datum/reagent/medicine/silibinin = 0.1)
-/obj/item/seeds/galaxythistle/Initialize()
- ..()
- unset_mutability(/datum/plant_gene/trait/invasive, PLANT_GENE_REMOVABLE)
+/obj/item/seeds/galaxythistle/Initialize(mapload, nogenes = FALSE)
+ . = ..()
+ if(!nogenes)
+ unset_mutability(/datum/plant_gene/trait/invasive, PLANT_GENE_REMOVABLE)
/obj/item/reagent_containers/food/snacks/grown/galaxythistle
seed = /obj/item/seeds/galaxythistle
diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm
index 7e43911c5c..554115eb5f 100644
--- a/code/modules/hydroponics/grown/mushrooms.dm
+++ b/code/modules/hydroponics/grown/mushrooms.dm
@@ -217,10 +217,11 @@
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list(/datum/reagent/consumable/nutriment = 0.1)
-/obj/item/seeds/chanterelle/jupitercup/Initialize()
- ..()
- unset_mutability(/datum/plant_gene/reagent/liquidelectricity, PLANT_GENE_EXTRACTABLE)
- unset_mutability(/datum/plant_gene/trait/plant_type/carnivory, PLANT_GENE_REMOVABLE)
+/obj/item/seeds/chanterelle/jupitercup/Initialize(mapload, nogenes = FALSE)
+ . = ..()
+ if(!nogenes)
+ unset_mutability(/datum/plant_gene/reagent/liquidelectricity, PLANT_GENE_EXTRACTABLE)
+ unset_mutability(/datum/plant_gene/trait/plant_type/carnivory, PLANT_GENE_REMOVABLE)
/obj/item/reagent_containers/food/snacks/grown/mushroom/jupitercup
seed = /obj/item/seeds/chanterelle/jupitercup
diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm
index 99fd873995..756788898a 100644
--- a/code/modules/hydroponics/plant_genes.dm
+++ b/code/modules/hydroponics/plant_genes.dm
@@ -18,7 +18,9 @@
return !istype(S, /obj/item/seeds/sample) // Samples can't accept new genes
/datum/plant_gene/proc/Copy()
- return new type
+ var/datum/plant_gene/G = new type
+ G.mutability_flags = mutability_flags
+ return G
/datum/plant_gene/proc/apply_vars(obj/item/seeds/S) // currently used for fire resist, can prob. be further refactored
return
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index f459e97814..aa0e789721 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -37,7 +37,7 @@
var/weed_rate = 1 //If the chance below passes, then this many weeds sprout during growth
var/weed_chance = 5 //Percentage chance per tray update to grow weeds
-/obj/item/seeds/Initialize(loc, nogenes = 0)
+/obj/item/seeds/Initialize(mapload, nogenes = 0)
. = ..()
pixel_x = rand(-8, 8)
pixel_y = rand(-8, 8)
diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm
index 4e6e982fb9..a5eb2032fa 100644
--- a/code/modules/jobs/job_types/mime.dm
+++ b/code/modules/jobs/job_types/mime.dm
@@ -17,6 +17,7 @@
display_order = JOB_DISPLAY_ORDER_MIME
/datum/job/mime/after_spawn(mob/living/carbon/human/H, mob/M)
+ . = ..()
H.apply_pref_name("mime", M.client)
/datum/outfit/job/mime
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index 5ff1cbceb1..f128a76da2 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -129,6 +129,14 @@
choice.forceMove(drop_location())
update_icon()
+/obj/structure/bookcase/attack_ghost(mob/dead/observer/user as mob)
+ if(contents.len && in_range(user, src))
+ var/obj/item/book/choice = input("Which book would you like to read?") as null|obj in contents
+ if(choice)
+ if(!istype(choice)) //spellbook, cult tome, or the one weird bible storage
+ to_chat(user,"A mysterious force is keeping you from reading that.")
+ return
+ choice.attack_self(user)
/obj/structure/bookcase/deconstruct(disassembled = TRUE)
new /obj/item/stack/sheet/mineral/wood(loc, 4)
@@ -204,8 +212,9 @@
return
if(dat)
user << browse("Penned by [author].
" + "[dat]", "window=book[window_size != null ? ";size=[window_size]" : ""]")
- user.visible_message("[user] opens a book titled \"[title]\" and begins reading intently.")
- SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "book_nerd", /datum/mood_event/book_nerd)
+ if(istype(user, /mob/living))
+ user.visible_message("[user] opens a book titled \"[title]\" and begins reading intently.")
+ SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "book_nerd", /datum/mood_event/book_nerd)
onclose(user, "book")
else
to_chat(user, "This book is completely blank!")
@@ -311,6 +320,9 @@
else
..()
+/obj/item/book/attack_ghost(mob/user)
+ attack_self(user)
+
/*
* Barcode Scanner
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 439fe491cc..3559edc0fb 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -796,7 +796,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
update_icon()
/mob/dead/observer/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE, no_tk=FALSE)
- return IsAdminGhost(usr)
+ return IsAdminGhost(usr) || (M.ghost_flags & INTERACT_GHOST_READ)
/mob/dead/observer/is_literate()
return 1
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 113588facf..ef33afec25 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -559,7 +559,7 @@
health = round(maxHealth - getOxyLoss() - getToxLoss() - getCloneLoss() - total_burn - total_brute, DAMAGE_PRECISION)
staminaloss = round(total_stamina, DAMAGE_PRECISION)
update_stat()
- if(((maxHealth - total_burn) < HEALTH_THRESHOLD_DEAD) && stat == DEAD )
+ if(((maxHealth - total_burn) < HEALTH_THRESHOLD_DEAD*2) && stat == DEAD )
become_husk("burn")
med_hud_set_health()
if(stat == SOFT_CRIT)
@@ -986,4 +986,4 @@
if(H.clothing_flags & SCAN_REAGENTS)
return TRUE
if(isclothing(wear_mask) && (wear_mask.clothing_flags & SCAN_REAGENTS))
- return TRUE
\ No newline at end of file
+ return TRUE
diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm
index 34c268578c..3f2a259df7 100644
--- a/code/modules/mob/living/carbon/examine.dm
+++ b/code/modules/mob/living/carbon/examine.dm
@@ -16,10 +16,6 @@
. += "[t_He] [t_is] wearing [wear_mask.get_examine_string(user)] on [t_his] face."
if (wear_neck)
. += "[t_He] [t_is] wearing [wear_neck.get_examine_string(user)] around [t_his] neck.\n"
- if(can_be_held)
- . += "[t_He] looks small enough to be picked up with Alt+Click!\n"
-
-
for(var/obj/item/I in held_items)
if(!(I.item_flags & ABSTRACT))
@@ -116,4 +112,5 @@
. += "[t_He] look[p_s()] very happy."
if(MOOD_LEVEL_HAPPY4 to INFINITY)
. += "[t_He] look[p_s()] ecstatic."
+ SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .)
. += "*---------*"
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index d6f6b6d9ae..4e6aac4bcb 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -7,13 +7,14 @@
/mob/living/carbon/human/spawn_gibs(with_bodyparts, atom/loc_override)
var/location = loc_override ? loc_override.drop_location() : drop_location()
if(dna?.species?.gib_types)
+ var/blood_dna = get_blood_dna_list()
var/datum/species/S = dna.species
var/length = length(S.gib_types)
if(length)
var/path = (with_bodyparts && length > 1) ? S.gib_types[2] : S.gib_types[1]
new path(location, src, get_static_viruses())
else
- new S.gib_types(location, src, get_static_viruses())
+ new S.gib_types(location, src, get_static_viruses(), blood_dna)
else
if(with_bodyparts)
new /obj/effect/gibspawner/human(location, src, get_static_viruses())
@@ -67,4 +68,4 @@
/mob/living/carbon/proc/makeUncloneable()
ADD_TRAIT(src, TRAIT_NOCLONE, MADE_UNCLONEABLE)
blood_volume = 0
- return TRUE
\ No newline at end of file
+ return TRUE
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 982bbdce44..7a5fca3562 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -400,6 +400,7 @@
var/temp_flavor = print_flavor_text_2()
if(temp_flavor)
. += temp_flavor
+ SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .)
. += "*---------*"
/mob/living/proc/status_effect_examines(pronoun_replacement) //You can include this in any mob's examine() to show the examine texts of status effects!
diff --git a/code/modules/mob/living/carbon/human/examine_vr.dm b/code/modules/mob/living/carbon/human/examine_vr.dm
deleted file mode 100644
index 6ef1b687c2..0000000000
--- a/code/modules/mob/living/carbon/human/examine_vr.dm
+++ /dev/null
@@ -1,45 +0,0 @@
-/mob/living/carbon/human/proc/examine_nutrition()
- var/message = ""
- var/nutrition_examine = round(nutrition)
- var/t_He = "It" //capitalised for use at the start of each line.
- var/t_His = "Its"
- var/t_his = "its"
- var/t_is = "is"
- var/t_has = "has"
- switch(gender)
- if(MALE)
- t_He = "He"
- t_his = "his"
- t_His = "His"
- if(FEMALE)
- t_He = "She"
- t_his = "her"
- t_His = "Her"
- if(PLURAL)
- t_He = "They"
- t_his = "their"
- t_His = "Their"
- t_is = "are"
- t_has = "have"
- if(NEUTER)
- t_He = "It"
- t_his = "its"
- t_His = "Its"
- switch(nutrition_examine)
- if(0 to 49)
- message = "[t_He] [t_is] starving! You can hear [t_his] stomach snarling from across the room!\n"
- if(50 to 99)
- message = "[t_He] [t_is] extremely hungry. A deep growl occasionally rumbles from [t_his] empty stomach.\n"
- if(100 to 499)
- return message //Well that's pretty normal, really.
- if(500 to 864) // Fat.
- message = "[t_He] [t_has] a stuffed belly, bloated fat and round from eating too much.\n"
- if(1200 to 1934) // One person fully digested.
- message = "[t_He] [t_is] sporting a large, round, sagging stomach. It's contains at least their body weight worth of glorping slush.\n"
- if(1935 to 3004) // Two people.
- message = "[t_He] [t_is] engorged with a huge stomach that sags and wobbles as they move. [t_He] must have consumed at least twice their body weight. It looks incredibly soft.\n"
- if(3005 to 4074) // Three people.
- message = "[t_His] stomach is firmly packed with digesting slop. [t_He] must have eaten at least a few times worth their body weight! It looks hard for them to stand, and [t_his] gut jiggles when they move.\n"
- if(4075 to 10000) // Four or more people.
- message = "[t_He] [t_is] so absolutely stuffed that you aren't sure how it's possible to move. [t_He] can't seem to swell any bigger. The surface of [t_his] belly looks sorely strained!\n"
- return message
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index 29597344cf..1079c48bf9 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -91,7 +91,7 @@
var/say_starter = "Say \"" //"
if(findtextEx(temp, say_starter, 1, length(say_starter) + 1) && length(temp) > length(say_starter)) //case sensitive means
- temp = trim_left(copytext(temp, length(say_starter + 1)))
+ temp = trim_left(copytext(temp, length(say_starter) + 1))
temp = replacetext(temp, ";", "", 1, 2) //general radio
while(trim_left(temp)[1] == ":") //dept radio again (necessary)
temp = copytext_char(trim_left(temp), 3)
diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm
index 96d52dcb27..220e639e34 100644
--- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm
+++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm
@@ -132,14 +132,14 @@
return INITIALIZE_HINT_QDEL
owner = new_owner
START_PROCESSING(SSobj, src)
- RegisterSignal(owner, COMSIG_MOB_EXAMINATE, .proc/examinate_check)
+ RegisterSignal(owner, COMSIG_CLICK_SHIFT, .proc/examinate_check)
RegisterSignal(src, COMSIG_ATOM_HEARER_IN_VIEW, .proc/include_owner)
RegisterSignal(owner, COMSIG_LIVING_REGENERATE_LIMBS, .proc/unlist_head)
RegisterSignal(owner, COMSIG_LIVING_FULLY_HEAL, .proc/retrieve_head)
-/obj/item/dullahan_relay/proc/examinate_check(mob/source, atom/A)
- if(source.client.eye == src && ((A in view(source.client.view, src)) || (isturf(A) && source.sight & SEE_TURFS) || (ismob(A) && source.sight & SEE_MOBS) || (isobj(A) && source.sight & SEE_OBJS)))
- return COMPONENT_ALLOW_EXAMINE
+/obj/item/dullahan_relay/proc/examinate_check(atom/source, mob/user)
+ if(user.client.eye == src)
+ return COMPONENT_ALLOW_EXAMINATE
/obj/item/dullahan_relay/proc/include_owner(datum/source, list/processing_list, list/hearers)
if(!QDELETED(owner))
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index fa6cc44fca..f1b1570e24 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -182,10 +182,10 @@ There are several things that need to be remembered:
if(!gloves && bloody_hands)
var/mutable_appearance/bloody_overlay = mutable_appearance('icons/effects/blood.dmi', "bloodyhands", -GLOVES_LAYER, color = blood_DNA_to_color())
- if(get_num_arms() < 2)
- if(has_left_hand())
+ if(get_num_arms(FALSE) < 2)
+ if(has_left_hand(FALSE))
bloody_overlay.icon_state = "bloodyhands_left"
- else if(has_right_hand())
+ else if(has_right_hand(FALSE))
bloody_overlay.icon_state = "bloodyhands_right"
overlays_standing[GLOVES_LAYER] = bloody_overlay
@@ -265,7 +265,7 @@ There are several things that need to be remembered:
/mob/living/carbon/human/update_inv_shoes()
remove_overlay(SHOES_LAYER)
- if(get_num_legs() <2)
+ if(get_num_legs(FALSE) <2)
return
if(client && hud_used)
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 7d9b876876..534509523a 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -358,7 +358,7 @@
return
// No decay if formaldehyde in corpse or when the corpse is charred
- if(reagents.has_reagent(/datum/reagent/toxin/formaldehyde, 15) || HAS_TRAIT(src, TRAIT_HUSK))
+ if(reagents.has_reagent(/datum/reagent/toxin/formaldehyde, 1) || HAS_TRAIT(src, TRAIT_HUSK))
return
// Also no decay if corpse chilled or not organic/undead
@@ -397,6 +397,8 @@
if(O)
O.on_life()
else
+ if(reagents.has_reagent(/datum/reagent/toxin/formaldehyde, 1)) // No organ decay if the body contains formaldehyde.
+ return
for(var/V in internal_organs)
var/obj/item/organ/O = V
if(O)
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index ea5203778b..cd51a4234b 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -15,7 +15,6 @@
bodyparts = list(/obj/item/bodypart/chest/monkey, /obj/item/bodypart/head/monkey, /obj/item/bodypart/l_arm/monkey,
/obj/item/bodypart/r_arm/monkey, /obj/item/bodypart/r_leg/monkey, /obj/item/bodypart/l_leg/monkey)
hud_type = /datum/hud/monkey
- can_be_held = "monkey"
/mob/living/carbon/monkey/Initialize(mapload, cubespawned=FALSE, mob/spawner)
verbs += /mob/living/proc/mob_sleep
@@ -42,14 +41,15 @@
create_dna(src)
dna.initialize_dna(random_blood_type())
+/mob/living/carbon/monkey/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/mob_holder, "monkey", null, null, null, SLOT_HEAD)
+
+
/mob/living/carbon/monkey/Destroy()
SSmobs.cubemonkeys -= src
return ..()
-/mob/living/carbon/monkey/generate_mob_holder()
- var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, "monkey", 'icons/mob/animals_held.dmi', 'icons/mob/animals_held_lh.dmi', 'icons/mob/animals_held_rh.dmi', TRUE)
- return holder
-
/mob/living/carbon/monkey/create_internal_organs()
internal_organs += new /obj/item/organ/appendix
internal_organs += new /obj/item/organ/lungs
diff --git a/code/modules/mob/living/inhand_holder.dm b/code/modules/mob/living/inhand_holder.dm
deleted file mode 100644
index 695258f944..0000000000
--- a/code/modules/mob/living/inhand_holder.dm
+++ /dev/null
@@ -1,130 +0,0 @@
-//Generic system for picking up mobs.
-//Currently works for head and hands.
-/obj/item/clothing/head/mob_holder
- name = "bugged mob"
- desc = "Yell at coderbrush."
- icon = null
- icon_state = ""
- var/mob/living/held_mob
- var/can_head = FALSE
- w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/clothing/head/mob_holder/Initialize(mapload, mob/living/M, _worn_state, alt_worn, lh_icon, rh_icon, _can_head_override = FALSE)
- . = ..()
-
- if(M)
- M.setDir(SOUTH)
- held_mob = M
- M.forceMove(src)
- appearance = M.appearance
- name = M.name
- desc = M.desc
-
- if(_can_head_override)
- can_head = _can_head_override
- if(alt_worn)
- alternate_worn_icon = alt_worn
- if(_worn_state)
- item_state = _worn_state
- icon_state = _worn_state
- if(lh_icon)
- lefthand_file = lh_icon
- if(rh_icon)
- righthand_file = rh_icon
- if(!can_head)
- slot_flags = NONE
-
-/obj/item/clothing/head/mob_holder/Destroy()
- if(held_mob)
- release()
- return ..()
-
-/obj/item/clothing/head/mob_holder/dropped()
- ..()
- if(isturf(loc))//don't release on soft-drops
- release()
-
-/obj/item/clothing/head/mob_holder/proc/release()
- if(isliving(loc))
- var/mob/living/L = loc
- L.dropItemToGround(src)
- if(held_mob)
- var/mob/living/m = held_mob
- m.forceMove(get_turf(m))
- m.reset_perspective()
- m.setDir(SOUTH)
- held_mob = null
- qdel(src)
-
-/obj/item/clothing/head/mob_holder/relaymove(mob/user)
- return
-
-/obj/item/clothing/head/mob_holder/container_resist()
- if(isliving(loc))
- var/mob/living/L = loc
- visible_message("[src] escapes [L]!")
- release()
-
-/mob/living/proc/mob_pickup(mob/living/L)
- var/obj/item/clothing/head/mob_holder/holder = generate_mob_holder()
- if(!holder)
- return
- drop_all_held_items()
- L.put_in_hands(holder)
- return
-
-/mob/living/proc/mob_try_pickup(mob/living/user)
- if(!ishuman(user) || !src.Adjacent(user) || user.incapacitated() || !can_be_held)
- return FALSE
- if(user.get_active_held_item())
- to_chat(user, "Your hands are full!")
- return FALSE
- if(buckled)
- to_chat(user, "[src] is buckled to something!")
- return FALSE
- if(src == user)
- to_chat(user, "You can't pick yourself up.")
- return FALSE
- visible_message("[user] starts picking up [src].", \
- "[user] starts picking you up!")
- if(!do_after(user, 20, target = src))
- return FALSE
-
- if(user.get_active_held_item()||buckled)
- return FALSE
-
- visible_message("[user] picks up [src]!", \
- "[user] picks you up!")
- to_chat(user, "You pick [src] up.")
- mob_pickup(user)
- return TRUE
-
-/mob/living/AltClick(mob/user)
- . = ..()
- if(mob_try_pickup(user))
- return TRUE
-
-
-// I didn't define these for mobs, because you shouldn't be able to breathe out of mobs and using their loc isn't always the logical thing to do.
-
-/obj/item/clothing/head/mob_holder/assume_air(datum/gas_mixture/env)
- var/atom/location = loc
- if(!loc)
- return //null
- var/turf/T = get_turf(loc)
- while(location != T)
- location = location.loc
- if(ismob(location))
- return location.loc.assume_air(env)
- return loc.assume_air(env)
-
-/obj/item/clothing/head/mob_holder/remove_air(amount)
- var/atom/location = loc
- if(!loc)
- return //null
- var/turf/T = get_turf(loc)
- while(location != T)
- location = location.loc
- if(ismob(location))
- return location.loc.remove_air(amount)
- return loc.remove_air(amount)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 90ada3d718..9c8b2808ce 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -40,11 +40,6 @@
QDEL_LIST(diseases)
return ..()
-
-/mob/living/proc/generate_mob_holder()
- var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, (istext(can_be_held) ? can_be_held : ""), 'icons/mob/animals_held.dmi', 'icons/mob/animals_held_lh.dmi', 'icons/mob/animals_held_rh.dmi')
- return holder
-
/mob/living/onZImpact(turf/T, levels)
if(!isgroundlessturf(T))
ZImpactDamage(T, levels)
@@ -763,10 +758,22 @@
if(HAS_TRAIT(what, TRAIT_NODROP))
to_chat(src, "You can't remove \the [what.name], it appears to be stuck!")
return
- who.visible_message("[src] tries to remove [who]'s [what.name].", \
+ var/strip_mod = 1
+ var/strip_silence = FALSE
+ if (ishuman(src)) //carbon doesn't actually wear gloves
+ var/mob/living/carbon/C = src
+ var/obj/item/clothing/gloves/g = C.gloves
+ if (istype(g))
+ strip_mod = g.strip_mod
+ strip_silence = g.strip_silence
+ if (!strip_silence)
+ who.visible_message("[src] tries to remove [who]'s [what.name].", \
"[src] tries to remove [who]'s [what.name].")
- what.add_fingerprint(src)
- if(do_mob(src, who, what.strip_delay, ignorehelditem = TRUE))
+ what.add_fingerprint(src)
+ else
+ to_chat(src,"You try to remove [who]'s [what.name].")
+ what.add_fingerprint(src)
+ if(do_mob(src, who, round(what.strip_delay / strip_mod), ignorehelditem = TRUE))
if(what && Adjacent(who))
if(islist(where))
var/list/L = where
@@ -1172,8 +1179,6 @@
return
if(!over.Adjacent(src) || (user != src) || !canUseTopic(over))
return
- if(can_be_held)
- mob_try_pickup(over)
/mob/living/proc/get_static_viruses() //used when creating blood and other infective objects
if(!LAZYLEN(diseases))
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index e668828392..84f0004805 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -101,8 +101,6 @@
var/list/obj/effect/proc_holder/abilities = list()
- var/can_be_held = FALSE //whether this can be picked up and held.
-
var/radiation = 0 //If the mob is irradiated.
var/ventcrawl_layer = PIPING_LAYER_DEFAULT
var/losebreath = 0
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 9e2dea0442..409665f792 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -11,7 +11,7 @@
health = 500
maxHealth = 500
layer = BELOW_MOB_LAYER
- can_be_held = TRUE
+ var/datum/element/mob_holder/current_mob_holder //because only a few of their chassis can be actually held.
var/network = "ss13"
var/obj/machinery/camera/current = null
@@ -64,9 +64,6 @@
var/list/possible_chassis //initialized in initialize.
var/list/dynamic_chassis_icons //ditto.
var/list/chassis_pixel_offsets_x //stupid dogborgs
- var/static/item_head_icon = 'icons/mob/pai_item_head.dmi'
- var/static/item_lh_icon = 'icons/mob/pai_item_lh.dmi'
- var/static/item_rh_icon = 'icons/mob/pai_item_rh.dmi'
var/emitterhealth = 20
var/emittermaxhealth = 20
diff --git a/code/modules/mob/living/silicon/pai/pai_shell.dm b/code/modules/mob/living/silicon/pai/pai_shell.dm
index bb02bf172d..8ae44c042f 100644
--- a/code/modules/mob/living/silicon/pai/pai_shell.dm
+++ b/code/modules/mob/living/silicon/pai/pai_shell.dm
@@ -96,6 +96,12 @@
dynamic_chassis = choice
resist_a_rest(FALSE, TRUE)
update_icon()
+ if(possible_chassis[chassis])
+ current_mob_holder = AddElement(/datum/element/mob_holder, chassis, 'icons/mob/pai_item_head.dmi', 'icons/mob/pai_item_rh.dmi', 'icons/mob/pai_item_lh.dmi', SLOT_HEAD)
+ else
+ current_mob_holder?.Detach(src)
+ current_mob_holder = null
+ return
to_chat(src, "You switch your holochassis projection composite to [chassis]")
/mob/living/silicon/pai/lay_down()
@@ -117,19 +123,6 @@
set_light(0)
to_chat(src, "You disable your integrated light.")
-/mob/living/silicon/pai/mob_pickup(mob/living/L)
- var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, chassis, item_head_icon, item_lh_icon, item_rh_icon)
- if(!L.put_in_hands(holder))
- qdel(holder)
- else
- L.visible_message("[L] scoops up [src]!")
-
-/mob/living/silicon/pai/mob_try_pickup(mob/living/user)
- if(!possible_chassis[chassis])
- to_chat(user, "[src]'s current form isn't able to be carried!")
- return FALSE
- return ..()
-
/mob/living/silicon/pai/verb/toggle_chassis_sit()
set name = "Toggle Chassis Sit"
set category = "IC"
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 75e464721f..6112a1e800 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -182,8 +182,9 @@
return TRUE
/mob/living/simple_animal/bot/death(gibbed)
- explode()
- ..()
+ . = ..()
+ if(!gibbed)
+ explode()
/mob/living/simple_animal/bot/proc/explode()
qdel(src)
diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm
index 17d7530c29..9f3e44fee7 100644
--- a/code/modules/mob/living/simple_animal/corpse.dm
+++ b/code/modules/mob/living/simple_animal/corpse.dm
@@ -143,7 +143,7 @@
/datum/outfit/russiancorpse/officer
name = "Russian Officer Corpse"
uniform = /obj/item/clothing/under/rank/security/navyblue/russian
- suit = /obj/item/clothing/suit/security/officer/russian
+ suit = /obj/item/clothing/suit/armor/navyblue/russian
shoes = /obj/item/clothing/shoes/combat
ears = /obj/item/radio/headset
head = /obj/item/clothing/head/ushanka
@@ -207,7 +207,7 @@
/obj/effect/mob_spawn/human/corpse/bee_terrorist
name = "BLF Operative"
outfit = /datum/outfit/bee_terrorist
-
+
/datum/outfit/bee_terrorist
name = "BLF Operative"
uniform = /obj/item/clothing/under/color/yellow
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 016bee2d44..f12f3649cf 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -31,7 +31,7 @@
var/mob/living/simple_animal/mouse/movement_target
gold_core_spawnable = FRIENDLY_SPAWN
collar_type = "cat"
- can_be_held = "cat2"
+ var/held_icon = "cat2"
do_footstep = TRUE
/mob/living/simple_animal/pet/cat/Initialize()
@@ -41,6 +41,7 @@
/mob/living/simple_animal/pet/cat/ComponentInitialize()
. = ..()
AddElement(/datum/element/wuv, "purrs!", EMOTE_AUDIBLE, /datum/mood_event/pet_animal, "hisses!", EMOTE_AUDIBLE)
+ AddElement(/datum/element/mob_holder, held_icon)
/mob/living/simple_animal/pet/cat/update_canmove()
..()
@@ -60,6 +61,7 @@
icon_state = "spacecat"
icon_living = "spacecat"
icon_dead = "spacecat_dead"
+ held_icon = "spacecat"
unsuitable_atmos_damage = 0
minbodytemp = TCMB
maxbodytemp = T0C + 40
@@ -71,6 +73,7 @@
icon_state = "original"
icon_living = "original"
icon_dead = "original_dead"
+ held_icon = "original"
collar_type = null
unique_pet = TRUE
@@ -84,7 +87,7 @@
pass_flags = PASSMOB
mob_size = MOB_SIZE_SMALL
collar_type = "kitten"
- can_be_held = "cat"
+ held_icon = "cat"
//RUNTIME IS ALIVE! SQUEEEEEEEE~
/mob/living/simple_animal/pet/cat/Runtime
@@ -249,7 +252,7 @@
attacked_sound = 'sound/items/eatfood.ogg'
deathmessage = "loses its false life and collapses!"
death_sound = "bodyfall"
- can_be_held = "cak"
+ held_icon = "cak"
/mob/living/simple_animal/pet/cat/cak/CheckParts(list/parts)
..()
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index 554d03991a..f02d21c2af 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -13,13 +13,14 @@
see_in_dark = 5
speak_chance = 1
turns_per_move = 10
+ var/held_icon = "corgi"
do_footstep = TRUE
- can_be_held = TRUE
/mob/living/simple_animal/pet/dog/ComponentInitialize()
. = ..()
AddElement(/datum/element/wuv, "yaps_happily!", EMOTE_AUDIBLE, /datum/mood_event/pet_animal, "growls!", EMOTE_AUDIBLE)
+ AddElement(/datum/element/mob_holder, held_icon)
//Corgis and pugs are now under one dog subtype
@@ -34,13 +35,11 @@
childtype = list(/mob/living/simple_animal/pet/dog/corgi/puppy = 95, /mob/living/simple_animal/pet/dog/corgi/puppy/void = 5)
animal_species = /mob/living/simple_animal/pet/dog
gold_core_spawnable = FRIENDLY_SPAWN
- can_be_held = TRUE
collar_type = "corgi"
var/obj/item/inventory_head
var/obj/item/inventory_back
var/shaved = FALSE
var/nofur = FALSE //Corgis that have risen past the material plane of existence.
- can_be_held = "corgi"
/mob/living/simple_animal/pet/dog/corgi/Destroy()
QDEL_NULL(inventory_head)
@@ -69,7 +68,7 @@
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/pug = 3)
gold_core_spawnable = FRIENDLY_SPAWN
collar_type = "pug"
- can_be_held = "pug"
+ held_icon = "pug"
/mob/living/simple_animal/pet/dog/corgi/exoticcorgi
name = "Exotic Corgi"
@@ -156,13 +155,6 @@
..()
update_corgi_fluff()
-/mob/living/simple_animal/pet/dog/corgi/mob_pickup(mob/living/L)
- var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, "corgi", null, 'icons/mob/pets_held_lh.dmi', 'icons/mob/pets_held_rh.dmi', FALSE)
- if(!L.put_in_hands(holder))
- qdel(holder)
- else
- L.visible_message("[L] scoops up [src]!")
-
/mob/living/simple_animal/pet/dog/corgi/Topic(href, href_list)
if(!(iscarbon(usr) || iscyborg(usr)) || !usr.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
usr << browse(null, "window=mob[REF(src)]")
@@ -371,7 +363,10 @@
icon_dead = "old_corgi_dead"
desc = "At a ripe old age of [record_age] Ian's not as spry as he used to be, but he'll always be the HoP's beloved corgi." //RIP
turns_per_move = 20
- can_be_held = "old_corgi"
+ var/datum/element/mob_holder/ele = SSdcs.GetElement(/datum/element/mob_holder, held_icon)
+ if(ele)
+ ele.Detach(src)
+ AddElement(/datum/element/mob_holder, "old_corgi")
/mob/living/simple_animal/pet/dog/corgi/Ian/Life()
if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)
@@ -594,7 +589,7 @@
unsuitable_atmos_damage = 0
minbodytemp = TCMB
maxbodytemp = T0C + 40
- can_be_held = "void_puppy"
+ held_icon = "void_puppy"
/mob/living/simple_animal/pet/dog/corgi/puppy/void/Process_Spacemove(movement_dir = 0)
return 1 //Void puppies can navigate space.
@@ -616,7 +611,7 @@
response_harm = "kicks"
var/turns_since_scan = 0
var/puppies = 0
- can_be_held = "lisa"
+ held_icon = "lisa"
//Lisa already has a cute bow!
/mob/living/simple_animal/pet/dog/corgi/Lisa/Topic(href, href_list)
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
index 28fb1f5a42..158719414a 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
@@ -51,7 +51,7 @@
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
see_in_dark = 7
blood_volume = 0
- can_be_held = TRUE
+ var/can_be_held = TRUE //mob holder element.
held_items = list(null, null)
var/staticChoice = "static"
var/list/staticChoices = list("static", "blank", "letter", "animal")
@@ -101,6 +101,11 @@
for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
diag_hud.add_to_hud(src)
+/mob/living/simple_animal/drone/ComponentInitialize()
+ . = ..()
+ if(can_be_held)
+ //icon/item state is defined in mob_holder/drone_worn_icon()
+ AddElement(/datum/element/mob_holder, null, 'icons/mob/head.dmi', 'icons/mob/inhands/clothing_righthand.dmi', 'icons/mob/inhands/clothing_lefthand.dmi', TRUE, /datum/element/mob_holder.proc/drone_worn_icon)
/mob/living/simple_animal/drone/med_hud_set_health()
var/image/holder = hud_list[DIAG_HUD]
@@ -283,7 +288,3 @@
var/obj/item/clothing/H = head
if(H.clothing_flags & SCAN_REAGENTS)
return TRUE
-
-/mob/living/simple_animal/drone/generate_mob_holder()
- var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, "[visualAppearence]_hat", null, null, null, TRUE)
- return holder
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
index c9207fcf89..0f97a4c496 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
@@ -29,12 +29,6 @@
if("Nothing")
return
-//picky up the drone c:
-/mob/living/simple_animal/drone/attack_hand(mob/user)
- if(user.a_intent != INTENT_HELP)
- return ..() // TODO: convert picking up mobs into an element or component.
- mob_try_pickup(user)
-
/mob/living/simple_animal/drone/proc/try_reactivate(mob/living/user)
var/mob/dead/observer/G = get_ghost()
if(!client && (!G || !G.client))
diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm
index 3f58ca593e..95b082b733 100644
--- a/code/modules/mob/living/simple_animal/friendly/fox.dm
+++ b/code/modules/mob/living/simple_animal/friendly/fox.dm
@@ -18,9 +18,12 @@
response_disarm = "gently pushes aside"
response_harm = "kicks"
gold_core_spawnable = FRIENDLY_SPAWN
- can_be_held = "fox"
do_footstep = TRUE
+/mob/living/simple_animal/pet/fox/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/mob_holder, "fox")
+
//Captain fox
/mob/living/simple_animal/pet/fox/Renault
name = "Renault"
diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm
index cafa0d9009..6275256f5a 100644
--- a/code/modules/mob/living/simple_animal/friendly/lizard.dm
+++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm
@@ -23,7 +23,10 @@
obj_damage = 0
environment_smash = ENVIRONMENT_SMASH_NONE
var/static/list/edibles = typecacheof(list(/mob/living/simple_animal/butterfly, /mob/living/simple_animal/cockroach)) //list of atoms, however turfs won't affect AI, but will affect consumption.
- can_be_held = "lizard" //you can hold lizards now.
+
+/mob/living/simple_animal/hostile/lizard/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/mob_holder, "lizard", null, null, null, SLOT_HEAD) //you can hold lizards now.
/mob/living/simple_animal/hostile/lizard/CanAttack(atom/the_target)//Can we actually attack a possible target?
if(see_invisible < the_target.invisibility)//Target's invisible to us, forget it
@@ -40,7 +43,3 @@
return TRUE
else
return ..()
-
-/mob/living/simple_animal/hostile/lizard/generate_mob_holder()
- var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, "lizard", 'icons/mob/animals_held.dmi', 'icons/mob/animals_held_lh.dmi', 'icons/mob/animals_held_rh.dmi', TRUE)
- return holder
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index 69d9a0eef3..d326573957 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -26,17 +26,16 @@
var/body_color //brown, gray and white, leave blank for random
gold_core_spawnable = FRIENDLY_SPAWN
var/chew_probability = 1
- can_be_held = TRUE
/mob/living/simple_animal/mouse/Initialize()
. = ..()
AddComponent(/datum/component/squeak, list('sound/effects/mousesqueek.ogg'=1), 100)
if(!body_color)
- body_color = pick( list("brown","gray","white") )
+ body_color = pick(list("brown","gray","white"))
+ AddElement(/datum/element/mob_holder, "mouse_[body_color]")
icon_state = "mouse_[body_color]"
icon_living = "mouse_[body_color]"
icon_dead = "mouse_[body_color]_dead"
- can_be_held = "mouse_[body_color]"
/mob/living/simple_animal/mouse/proc/splat()
src.health = 0
@@ -89,17 +88,14 @@
/mob/living/simple_animal/mouse/white
body_color = "white"
icon_state = "mouse_white"
- can_be_held = "mouse_white"
/mob/living/simple_animal/mouse/gray
body_color = "gray"
icon_state = "mouse_gray"
- can_be_held = "mouse_gray"
/mob/living/simple_animal/mouse/brown
body_color = "brown"
icon_state = "mouse_brown"
- can_be_held = "mouse_brown"
//TOM IS ALIVE! SQUEEEEEEEE~K :)
/mob/living/simple_animal/mouse/brown/Tom
@@ -124,7 +120,3 @@
/obj/item/reagent_containers/food/snacks/deadmouse/on_grind()
reagents.clear_reagents()
-/mob/living/simple_animal/mouse/generate_mob_holder()
- var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, (istext(can_be_held) ? can_be_held : ""), 'icons/mob/animals_held.dmi', 'icons/mob/animals_held_lh.dmi', 'icons/mob/animals_held_rh.dmi')
- holder.w_class = WEIGHT_CLASS_TINY
- return holder
diff --git a/code/modules/mob/living/simple_animal/friendly/sloth.dm b/code/modules/mob/living/simple_animal/friendly/sloth.dm
index 175cb8e838..21df73fa61 100644
--- a/code/modules/mob/living/simple_animal/friendly/sloth.dm
+++ b/code/modules/mob/living/simple_animal/friendly/sloth.dm
@@ -22,9 +22,11 @@
maxHealth = 50
speed = 10
glide_size = 2
- can_be_held = "sloth" //finally oranges can be held
do_footstep = TRUE
+/mob/living/simple_animal/pet/fox/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/mob_holder, "sloth") //finally oranges can be held
//Cargo Sloth
/mob/living/simple_animal/sloth/paperwork
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index 4122cab6d9..d527a40120 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -17,10 +17,9 @@
emote_taunt = list("gnashes")
taunt_chance = 30
speed = 0
- maxHealth = 25
- health = 25
+ maxHealth = 35
+ health = 35
spacewalk = TRUE
-
harm_intent_damage = 8
obj_damage = 50
melee_damage_lower = 15
@@ -28,7 +27,6 @@
attacktext = "bites"
attack_sound = 'sound/weapons/bite.ogg'
speak_emote = list("gnashes")
-
//Space carp aren't affected by cold.
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
@@ -37,6 +35,19 @@
movement_type = FLYING
pressure_resistance = 200
gold_core_spawnable = HOSTILE_SPAWN
+ //some carps heal over time
+ var/regen_cooldown = 0 //Used for how long it takes before a healing will take place default in 60 seconds
+ var/regen_amount = 0 //How much is healed pre regen cooldown
+
+/mob/living/simple_animal/hostile/carp/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
+ . = ..()
+ if(regen_amount)
+ regen_cooldown = world.time + REGENERATION_DELAY
+
+/mob/living/simple_animal/hostile/carp/Life()
+ . = ..()
+ if(regen_amount && regen_cooldown < world.time)
+ heal_overall_damage(regen_amount)
/mob/living/simple_animal/hostile/carp/AttackingTarget()
. = ..()
@@ -59,8 +70,11 @@
icon_living = "megacarp"
icon_dead = "megacarp_dead"
icon_gib = "megacarp_gib"
- maxHealth = 20
- health = 20
+
+ regen_amount = 6
+
+ maxHealth = 30
+ health = 30
pixel_x = -16
mob_size = MOB_SIZE_LARGE
@@ -68,35 +82,26 @@
melee_damage_lower = 20
melee_damage_upper = 20
- var/regen_cooldown = 0
-
/mob/living/simple_animal/hostile/carp/megacarp/Initialize()
. = ..()
name = "[pick(GLOB.megacarp_first_names)] [pick(GLOB.megacarp_last_names)]"
- melee_damage_lower += rand(2, 10)
+ melee_damage_lower += rand(4, 10)
melee_damage_upper += rand(10,20)
- maxHealth += rand(30,60)
+ maxHealth += rand(40,60)
move_to_delay = rand(3,7)
-/mob/living/simple_animal/hostile/carp/megacarp/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
- . = ..()
- if(.)
- regen_cooldown = world.time + REGENERATION_DELAY
-
-/mob/living/simple_animal/hostile/carp/megacarp/Life()
- . = ..()
- if(regen_cooldown < world.time)
- heal_overall_damage(4)
-
/mob/living/simple_animal/hostile/carp/cayenne
name = "Cayenne"
desc = "A failed Syndicate experiment in weaponized space carp technology, it now serves as a lovable mascot."
gender = FEMALE
+
+ regen_amount = 8
+
speak_emote = list("squeaks")
maxHealth = 90
health = 90
gold_core_spawnable = NO_SPAWN
- faction = list(ROLE_SYNDICATE)
+ faction = list(ROLE_SYNDICATE, "carp") //They are still a carp
AIStatus = AI_OFF
harm_intent_damage = 12
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index 65ee6a69f2..d544671d3e 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -432,6 +432,7 @@ Difficulty: Very Hard
H.dropItemToGround(W)
var/datum/job/clown/C = new /datum/job/clown()
C.equip(H)
+ C.after_spawn(H, H, TRUE)
qdel(C)
affected_targets.Add(H)
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm
index f1e7494beb..0d62eb260d 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm
@@ -62,8 +62,9 @@
/mob/living/simple_animal/hostile/asteroid/elite/herald/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null)
. = ..()
- playsound(get_turf(src), 'sound/magic/clockwork/invoke_general.ogg', 20, TRUE)
-
+ if(.)
+ playsound(get_turf(src), 'sound/magic/clockwork/invoke_general.ogg', 20, TRUE)
+
/datum/action/innate/elite_attack/herald_trishot
name = "Triple Shot"
button_icon_state = "herald_trishot"
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index bd445acd25..0e39f43263 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -321,20 +321,18 @@ mob/visible_message(message, self_message, blind_message, vision_distance = DEFA
set name = "Examine"
set category = "IC"
- if(!client)
- return
-
- if(!(SEND_SIGNAL(src, COMSIG_MOB_EXAMINATE, A) & COMPONENT_ALLOW_EXAMINE) && ((client.eye != src && client.eye != loc) || (isturf(A) && !(sight & SEE_TURFS) && !(A in view(client ? client.view : world.view, src)))))
- //cameras & co don't allow users to examine far away things, also shift-click catcher may issue examinate() calls for out-of-sight turfs
+ if(isturf(A) && !(sight & SEE_TURFS) && !(A in view(client ? client.view : world.view, src)))
+ // shift-click catcher may issue examinate() calls for out-of-sight turfs
return
if(is_blind(src))
- to_chat(src, "Something is there but you can't see it.")
+ to_chat(src, "Something is there but you can't see it!")
return
face_atom(A)
var/list/result = A.examine(src)
to_chat(src, result.Join("\n"))
+ SEND_SIGNAL(src, COMSIG_MOB_EXAMINATE, A)
//same as above
//note: ghosts can point, this is intended
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 400e90266e..f4133bcf9d 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -428,6 +428,18 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
return I
return null
+/proc/canGhostWrite(var/mob/A, var/obj/target, var/desc="", var/allow_all=FALSE)
+ if(allow_all & TRUE)
+ if(!target.GetComponent(/datum/component/anti_magic))
+ return 1
+ if(IsAdminGhost(A))
+ if (desc != "")
+ log_admin("GHOST: [key_name(A)] [desc] ([target.name] at [loc_name(target)])")
+ else
+ log_admin("GHOST: [key_name(A)] fucked with the [target.name] at [loc_name(target)]")
+ return 1
+ return 0
+
/proc/offer_control(mob/M)
to_chat(M, "Control of your mob has been offered to dead players.")
if(usr)
diff --git a/code/modules/projectiles/boxes_magazines/external/magweapon.dm b/code/modules/projectiles/boxes_magazines/external/magweapon.dm
index fa90170ace..a1b7f58698 100644
--- a/code/modules/projectiles/boxes_magazines/external/magweapon.dm
+++ b/code/modules/projectiles/boxes_magazines/external/magweapon.dm
@@ -13,7 +13,7 @@
name = "magpistol magazine (non-lethal disabler)"
icon_state = "smallmagmag"
ammo_type = /obj/item/ammo_casing/caseless/magnetic/weak/disabler
- max_ammo = 15
+ max_ammo = 16
/obj/item/ammo_box/magazine/mmag/small/lethal
name = "magpistol magazine (lethal)"
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index d8fc47d1b8..e8913f9ce4 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -216,6 +216,14 @@
..()
. = 1
+/datum/reagent/medicine/rezadone/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
+ . = ..()
+ if(iscarbon(M))
+ var/mob/living/carbon/patient = M
+ if(reac_volume >= 5 && HAS_TRAIT_FROM(patient, TRAIT_HUSK, "burn") && patient.getFireLoss() < THRESHOLD_UNHUSK) //One carp yields 12u rezadone.
+ patient.cure_husk("burn")
+ patient.visible_message("[patient]'s body rapidly absorbs moisture from the enviroment, taking on a more healthy appearance.")
+
/datum/reagent/medicine/spaceacillin
name = "Spaceacillin"
description = "Spaceacillin will prevent a patient from conventionally spreading any diseases they are currently infected with."
@@ -436,6 +444,10 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
if(show_message)
to_chat(M, "You feel your burns and bruises healing! It stings like hell!")
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
+ //Has to be at less than THRESHOLD_UNHUSK burn damage and have 100 synthflesh before unhusking. Corpses dont metabolize.
+ if(HAS_TRAIT_FROM(M, TRAIT_HUSK, "burn") && M.getFireLoss() < THRESHOLD_UNHUSK && M.reagents.has_reagent(/datum/reagent/medicine/synthflesh, 100))
+ M.cure_husk("burn")
+ M.visible_message("Most of [M]'s burnt off or charred flesh has been restored.")
..()
/datum/reagent/medicine/synthflesh/overdose_start(mob/living/M)
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index f4bb5e0d08..eac8edcbc8 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -85,17 +85,17 @@
/obj/item/reagent_containers/hypospray/medipen
name = "epinephrine medipen"
- desc = "A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge."
+ desc = "A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge. Contains a powerful preservative that can delay decomposition when applied to a dead body."
icon_state = "medipen"
item_state = "medipen"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
- amount_per_transfer_from_this = 10
- volume = 10
+ amount_per_transfer_from_this = 13
+ volume = 13
ignore_flags = 1 //so you can medipen through hardsuits
reagent_flags = DRAWABLE
flags_1 = null
- list_reagents = list(/datum/reagent/medicine/epinephrine = 10)
+ list_reagents = list(/datum/reagent/medicine/epinephrine = 10, /datum/reagent/toxin/formaldehyde = 3)
/obj/item/reagent_containers/hypospray/medipen/suicide_act(mob/living/carbon/user)
user.visible_message("[user] begins to choke on \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")
@@ -423,18 +423,21 @@
else
unload_hypo(vial,user)
-/obj/item/hypospray/mkii/verb/modes()
- set name = "Toggle Application Mode"
- set category = "Object"
- set src in usr
- var/mob/M = usr
- switch(mode)
- if(HYPO_SPRAY)
- mode = HYPO_INJECT
- to_chat(M, "[src] is now set to inject contents on application.")
- if(HYPO_INJECT)
- mode = HYPO_SPRAY
- to_chat(M, "[src] is now set to spray contents on application.")
+/obj/item/hypospray/mkii/AltClick(mob/living/user)
+ . = ..()
+ if(user.canUseTopic(src, FALSE))
+ switch(mode)
+ if(HYPO_SPRAY)
+ mode = HYPO_INJECT
+ to_chat(user, "[src] is now set to inject contents on application.")
+ if(HYPO_INJECT)
+ mode = HYPO_SPRAY
+ to_chat(user, "[src] is now set to spray contents on application.")
+ return TRUE
+
+/obj/item/hypospray/mkii/examine(mob/user)
+ . = ..()
+ . += "Alt-Click it to toggle its mode from spraying to injecting and vice versa."
#undef HYPO_SPRAY
#undef HYPO_INJECT
diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_construction.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_construction.dm
index c3e3993cb2..bfc92d24d8 100644
--- a/code/modules/research/designs/autolathe_desings/autolathe_designs_construction.dm
+++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_construction.dm
@@ -1,11 +1,11 @@
///////////////////////////////////
-//////////Autolathe Designs ///////
+//////////Autolathe Designs////////
///////////////////////////////////
-////////////////
-///Construction//
-////////////////
+//////////////////
+///Construction///
+//////////////////
/datum/design/rods
name = "Metal Rod"
diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_tools.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_tools.dm
index c413f546f0..6affacf1b1 100644
--- a/code/modules/research/designs/autolathe_desings/autolathe_designs_tools.dm
+++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_tools.dm
@@ -1,8 +1,8 @@
///////////////////////////////////
-//////////Autolathe Designs ///////
+/////////Autolathe Designs/////////
///////////////////////////////////
///////////
-///Tools //
+///Tools///
///////////
/datum/design/bucket
name = "Bucket"
@@ -52,7 +52,8 @@
build_type = AUTOLATHE
materials = list(MAT_METAL = 50, MAT_GLASS = 20)
build_path = /obj/item/multitool
- category = list("initial","Tools")
+ category = list("initial","Tools","Tool Designs")
+ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/analyzer
name = "Analyzer"
diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm
index 0059e0c417..3867fa9f23 100644
--- a/code/modules/research/designs/misc_designs.dm
+++ b/code/modules/research/designs/misc_designs.dm
@@ -405,7 +405,7 @@
/datum/design/holosigncombifan
name = "ATMOS Holo-Combifan Projector"
- desc = "A holographic projector that creates holographic barriesr that prevent changes in atmospheric and temperature conditions."
+ desc = "A holographic projector that creates holographic barriers that prevent changes in atmospheric and temperature conditions."
id = "holosigncombifan"
build_type = PROTOLATHE
materials = list(MAT_METAL = 7500, MAT_GLASS = 2500, MAT_SILVER = 2500, MAT_GOLD = 2500, MAT_TITANIUM = 1750)
diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm
index 659a83c703..25e8b82cc4 100644
--- a/code/modules/research/machinery/_production.dm
+++ b/code/modules/research/machinery/_production.dm
@@ -2,7 +2,7 @@
name = "technology fabricator"
desc = "Makes researched and prototype items with materials and energy."
layer = BELOW_OBJ_LAYER
- var/consoleless_interface = FALSE //Whether it can be used without a console.
+ var/consoleless_interface = TRUE //Whether it can be used without a console.
var/efficiency_coeff = 1 //Materials needed / coeff = actual.
var/list/categories = list()
var/datum/component/remote_materials/materials
diff --git a/code/modules/research/machinery/departmental_circuit_imprinter.dm b/code/modules/research/machinery/departmental_circuit_imprinter.dm
index 623c40462a..336803c011 100644
--- a/code/modules/research/machinery/departmental_circuit_imprinter.dm
+++ b/code/modules/research/machinery/departmental_circuit_imprinter.dm
@@ -4,10 +4,9 @@
icon_state = "circuit_imprinter"
circuit = /obj/item/circuitboard/machine/circuit_imprinter/department
requires_console = FALSE
- consoleless_interface = TRUE
/obj/machinery/rnd/production/circuit_imprinter/department/science
name = "department circuit imprinter (Science)"
circuit = /obj/item/circuitboard/machine/circuit_imprinter/department/science
allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SCIENCE
- department_tag = "Science"
\ No newline at end of file
+ department_tag = "Science"
diff --git a/code/modules/research/machinery/departmental_protolathe.dm b/code/modules/research/machinery/departmental_protolathe.dm
index 0f9257cbeb..afea8248f3 100644
--- a/code/modules/research/machinery/departmental_protolathe.dm
+++ b/code/modules/research/machinery/departmental_protolathe.dm
@@ -4,7 +4,6 @@
icon_state = "protolathe"
circuit = /obj/item/circuitboard/machine/protolathe/department
requires_console = FALSE
- consoleless_interface = TRUE
/obj/machinery/rnd/production/protolathe/department/engineering
name = "department protolathe (Engineering)"
@@ -40,4 +39,4 @@
name = "department protolathe (Security)"
allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SECURITY
department_tag = "Security"
- circuit = /obj/item/circuitboard/machine/protolathe/department/security
\ No newline at end of file
+ circuit = /obj/item/circuitboard/machine/protolathe/department/security
diff --git a/code/modules/research/machinery/techfab.dm b/code/modules/research/machinery/techfab.dm
index 885f27c2cb..f93560ed10 100644
--- a/code/modules/research/machinery/techfab.dm
+++ b/code/modules/research/machinery/techfab.dm
@@ -31,5 +31,4 @@
console_link = FALSE
production_animation = "protolathe_n"
requires_console = FALSE
- consoleless_interface = TRUE
allowed_buildtypes = PROTOLATHE | IMPRINTER
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index 15e88fc811..e1abfedde6 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -191,7 +191,7 @@
prereq_ids = list("base")
design_ids = list("solarcontrol", "recharger", "powermonitor", "rped", "pacman", "adv_capacitor", "adv_scanning", "emitter", "high_cell", "adv_matter_bin",
"atmosalerts", "atmos_control", "recycler", "autolathe", "high_micro_laser", "nano_mani", "mesons", "thermomachine", "rad_collector", "tesla_coil", "grounding_rod",
- "apc_control", "cell_charger", "power control", "airlock_board", "firelock_board", "airalarm_electronics", "firealarm_electronics", "cell_charger", "stack_console", "stack_machine")
+ "apc_control", "cell_charger", "power control", "airlock_board", "firelock_board", "airalarm_electronics", "firealarm_electronics", "cell_charger", "stack_console", "stack_machine", "rcd_ammo")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 6000)
export_price = 5000
diff --git a/code/modules/spells/spell_types/rightandwrong.dm b/code/modules/spells/spell_types/rightandwrong.dm
index e5e856c630..ea131fb996 100644
--- a/code/modules/spells/spell_types/rightandwrong.dm
+++ b/code/modules/spells/spell_types/rightandwrong.dm
@@ -102,6 +102,12 @@ GLOBAL_VAR_INIT(summon_magic_triggered, FALSE)
var/gun_type = pick(GLOB.summoned_guns)
var/obj/item/gun/G = new gun_type(get_turf(H))
G.unlock()
+ var/datum/antagonist/survivalist/guns/our_antag_datum = H.mind.has_antag_datum(/datum/antagonist/survivalist/guns)
+ if(our_antag_datum)
+ var/datum/objective/hoard/O = new()
+ O.owner = H
+ O.set_target(G)
+ our_antag_datum.objectives += O
playsound(get_turf(H),'sound/magic/summon_guns.ogg', 50, 1)
var/in_hand = H.put_in_hands(G) // not always successful
@@ -128,6 +134,13 @@ GLOBAL_VAR_INIT(summon_magic_triggered, FALSE)
var/obj/item/M = new magic_type(get_turf(H))
playsound(get_turf(H),'sound/magic/summon_magic.ogg', 50, 1)
+ var/datum/antagonist/survivalist/magic/our_antag_datum = H.mind.has_antag_datum(/datum/antagonist/survivalist/magic)
+ if(istype(our_antag_datum))
+ var/datum/objective/hoard/O = new()
+ O.owner = H
+ O.set_target(M)
+ our_antag_datum.objectives += O
+
var/in_hand = H.put_in_hands(M)
to_chat(H, "\A [M] appears [in_hand ? "in your hand" : "at your feet"]!")
diff --git a/code/modules/uplink/uplink_items/uplink_clothing.dm b/code/modules/uplink/uplink_items/uplink_clothing.dm
index 5e2c09ec13..fcbe0fb9a6 100644
--- a/code/modules/uplink/uplink_items/uplink_clothing.dm
+++ b/code/modules/uplink/uplink_items/uplink_clothing.dm
@@ -78,3 +78,9 @@
cost = 30
include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
exclude_modes = list()
+
+/datum/uplink_item/suits/thiefgloves
+ name = "Thieving Gloves"
+ desc = "A pair of gloves that are insulated and frictionless, allowing you to steal easily from anyone you see."
+ item = /obj/item/clothing/gloves/thief
+ cost = 4
\ No newline at end of file
diff --git a/code/modules/vending/assist.dm b/code/modules/vending/assist.dm
index 0d0dd40b36..5dafd3935c 100644
--- a/code/modules/vending/assist.dm
+++ b/code/modules/vending/assist.dm
@@ -17,4 +17,8 @@
/obj/item/beacon = 2)
product_ads = "Only the finest!;Have some tools.;The most robust equipment.;The finest gear in space!"
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+ refill_canister = /obj/item/vending_refill/assist
resistance_flags = FIRE_PROOF
+
+/obj/item/vending_refill/assist
+ icon_state = "refill_engi"
\ No newline at end of file
diff --git a/code/modules/vending/cartridge.dm b/code/modules/vending/cartridge.dm
index 8b9c8e2e01..35b1a1da7a 100644
--- a/code/modules/vending/cartridge.dm
+++ b/code/modules/vending/cartridge.dm
@@ -14,4 +14,8 @@
/obj/item/cartridge/captain = 3,
/obj/item/cartridge/quartermaster = 10)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+ refill_canister = /obj/item/vending_refill/cart
resistance_flags = FIRE_PROOF
+
+/obj/item/vending_refill/cart
+ icon_state = "refill_pda"
diff --git a/code/modules/vending/drinnerware.dm b/code/modules/vending/drinnerware.dm
index 9ba8c53f6c..be74cc675b 100644
--- a/code/modules/vending/drinnerware.dm
+++ b/code/modules/vending/drinnerware.dm
@@ -27,4 +27,8 @@
/obj/item/reagent_containers/food/condiment/enzyme = 1,
/obj/item/reagent_containers/glass/bottle/cryoxadone = 2) // Bartender can literally make this with upgraded parts, or it gets stolen from medical.
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+ refill_canister = /obj/item/vending_refill/dinnerware
resistance_flags = FIRE_PROOF
+
+/obj/item/vending_refill/dinnerware
+ icon_state = "refill_cook"
\ No newline at end of file
diff --git a/code/modules/vending/engivend.dm b/code/modules/vending/engivend.dm
index ad65b5311f..15da7cab15 100644
--- a/code/modules/vending/engivend.dm
+++ b/code/modules/vending/engivend.dm
@@ -28,4 +28,8 @@
/obj/item/rcd_ammo/large = 5
)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+ refill_canister = /obj/item/vending_refill/engivend
resistance_flags = FIRE_PROOF
+
+/obj/item/vending_refill/engivend
+ icon_state = "refill_engi"
\ No newline at end of file
diff --git a/code/modules/vending/kinkmate.dm b/code/modules/vending/kinkmate.dm
index f840f391fa..39d5db8de8 100644
--- a/code/modules/vending/kinkmate.dm
+++ b/code/modules/vending/kinkmate.dm
@@ -1,7 +1,6 @@
/obj/machinery/vending/kink
name = "KinkMate"
desc = "A vending machine for all your unmentionable desires."
- icon = 'icons/obj/citvending.dmi'
icon_state = "kink"
circuit = /obj/item/circuitboard/machine/kinkmate
product_slogans = "Kinky!;Sexy!;Check me out, big boy!"
@@ -44,5 +43,4 @@
/obj/item/vending_refill/kink
machine_name = "KinkMate"
- icon = 'modular_citadel/icons/vending_restock.dmi'
icon_state = "refill_kink"
diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm
index 03241c4a86..37ce00069c 100644
--- a/code/modules/vending/megaseed.dm
+++ b/code/modules/vending/megaseed.dm
@@ -55,4 +55,8 @@
/obj/item/seeds/random = 2)
premium = list(/obj/item/reagent_containers/spray/waterflower = 1)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+ refill_canister = /obj/item/vending_refill/hydroseeds
resistance_flags = FIRE_PROOF
+
+/obj/item/vending_refill/hydroseeds
+ icon_state = "refill_hydro"
diff --git a/code/modules/vending/nutrimax.dm b/code/modules/vending/nutrimax.dm
index 392eecfc22..42b7848ac1 100644
--- a/code/modules/vending/nutrimax.dm
+++ b/code/modules/vending/nutrimax.dm
@@ -17,4 +17,8 @@
contraband = list(/obj/item/reagent_containers/glass/bottle/ammonia = 10,
/obj/item/reagent_containers/glass/bottle/diethylamine = 5)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+ refill_canister = /obj/item/vending_refill/hydronutrients
resistance_flags = FIRE_PROOF
+
+/obj/item/vending_refill/hydronutrients
+ icon_state = "refill_hydro"
diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm
index 6cf8136c50..666071e254 100644
--- a/code/modules/vending/security.dm
+++ b/code/modules/vending/security.dm
@@ -36,4 +36,4 @@
F.update_brightness()
/obj/item/vending_refill/security
- icon_state = "snackorange"
+ icon_state = "refill_games"
diff --git a/code/modules/vending/sovietvend.dm b/code/modules/vending/sovietvend.dm
index 5157f68410..c62cf53612 100644
--- a/code/modules/vending/sovietvend.dm
+++ b/code/modules/vending/sovietvend.dm
@@ -1,7 +1,6 @@
/obj/machinery/vending/sovietvend
name = "KomradeVendtink"
desc = "Rodina-mat' zovyot!"
- icon = 'icons/obj/citvending.dmi'
icon_state = "soviet"
vend_reply = "The fascist and capitalist svin'ya shall fall, komrade!"
product_slogans = "Quality worth waiting in line for!; Get Hammer and Sickled!; Sosvietsky soyuz above all!; With capitalist pigsky, you would have paid a fortunetink! ; Craftink in Motherland herself!"
diff --git a/code/modules/vending/sustenance.dm b/code/modules/vending/sustenance.dm
index 95838bbadd..9783607a21 100644
--- a/code/modules/vending/sustenance.dm
+++ b/code/modules/vending/sustenance.dm
@@ -12,4 +12,8 @@
/obj/item/tank/internals/emergency_oxygen = 6,
/obj/item/clothing/mask/breath = 6)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+ refill_canister = /obj/item/vending_refill/sustenance
resistance_flags = FIRE_PROOF
+
+/obj/item/vending_refill/sustenance
+ icon_state = "refill_cook"
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index cd643e4220..0a3ded63bd 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -20,7 +20,6 @@
/obj/item/clothing/under/rank/security/grey = 5,
/obj/item/clothing/under/pants/khaki = 5)
premium = list(/obj/item/clothing/under/rank/security/navyblue = 5,
- /obj/item/clothing/suit/security/officer = 5,
/obj/item/clothing/head/beret/sec/navyofficer = 5)
refill_canister = /obj/item/vending_refill/wardrobe/sec_wardrobe
diff --git a/code/modules/vending/youtool.dm b/code/modules/vending/youtool.dm
index 2a8d5ef733..c027cea6e5 100644
--- a/code/modules/vending/youtool.dm
+++ b/code/modules/vending/youtool.dm
@@ -19,4 +19,8 @@
premium = list(/obj/item/clothing/gloves/color/yellow = 2,
/obj/item/weldingtool/hugetank = 2)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
+ refill_canister = /obj/item/vending_refill/tool
resistance_flags = FIRE_PROOF
+
+/obj/item/vending_refill/tool
+ icon_state = "refill_engi"
\ No newline at end of file
diff --git a/code/modules/vore/eating/belly_obj.dm b/code/modules/vore/eating/belly_obj.dm
index f88f6bd6e8..460ea74225 100644
--- a/code/modules/vore/eating/belly_obj.dm
+++ b/code/modules/vore/eating/belly_obj.dm
@@ -533,9 +533,6 @@
//Yes, it's ""safe"" to drop items here
/obj/belly/AllowDrop()
return TRUE
-/*
-/obj/belly/onDropInto(var/atom/movable/AM)
- return null */
//Handle a mob struggling
// Called from /mob/living/carbon/relaymove()
diff --git a/code/modules/vore/eating/digest_act.dm b/code/modules/vore/eating/digest_act.dm
index ce67a3d296..c0c9423d10 100644
--- a/code/modules/vore/eating/digest_act.dm
+++ b/code/modules/vore/eating/digest_act.dm
@@ -71,14 +71,6 @@
/////////////
// Some special treatment
/////////////
-/*
-//PDAs need to lose their ID to not take it with them, so we can get a digested ID
-/obj/item/pda/digest_act(var/atom/movable/item_storage = null)
- if(id)
- id = null
-
- . = ..()
-*/
/obj/item/reagent_containers/food/digest_act(var/atom/movable/item_storage = null)
if(isbelly(item_storage))
@@ -92,15 +84,6 @@
. = ..()
-/*
-/obj/item/holder/digest_act(var/atom/movable/item_storage = null)
- for(var/mob/living/M in contents)
- if(item_storage)
- M.forceMove(item_storage)
- held_mob = null
-
- . = ..() */
-
/obj/item/organ/digest_act(var/atom/movable/item_storage = null)
if((. = ..()))
. += 70 //Organs give a little more
diff --git a/code/modules/vore/eating/living.dm b/code/modules/vore/eating/living.dm
index 4b50ade7e3..bf41c46332 100644
--- a/code/modules/vore/eating/living.dm
+++ b/code/modules/vore/eating/living.dm
@@ -404,10 +404,4 @@
taste_message += "they haven't bothered to set their flavor text"
else
taste_message += "a plain old normal [src]"
-
-/* if(ishuman(src))
- var/mob/living/carbon/human/H = src
- if(H.touching.reagent_list.len) //Just the first one otherwise I'll go insane.
- var/datum/reagent/R = H.touching.reagent_list[1]
- taste_message += " You also get the flavor of [R.taste_description] from something on them"*/
return taste_message
diff --git a/code/modules/vore/eating/voreitems.dm b/code/modules/vore/eating/voreitems.dm
index 4e6bdaa1e0..3ec4ba1956 100644
--- a/code/modules/vore/eating/voreitems.dm
+++ b/code/modules/vore/eating/voreitems.dm
@@ -30,33 +30,3 @@
H.visible_message("[H] contracts strangely, spewing out contents on the floor!", \
"You spew out everything inside you on the floor!")
return BULLET_ACT_HIT
-
-
-////////////////////////// Anti-Noms Drugs //////////////////////////
-/*
-/datum/reagent/medicine/ickypak
- name = "Ickypak"
- description = "A foul-smelling green liquid, for inducing muscle contractions to expel accidentally ingested things."
- reagent_state = LIQUID
- color = "#0E900E"
- metabolization_rate = 0.25 * REAGENTS_METABOLISM
-
-/datum/reagent/medicine/ickypak/on_mob_life(var/mob/living/M, method=INGEST)
- if(prob(10))
- M.visible_message("[M] retches!", \
- "You don't feel good...")
- for(var/I in M.vore_organs)
- var/datum/belly/B = M.vore_organs[I]
- for(var/atom/movable/A in B.internal_contents)
- if(prob(55))
- playsound(M, 'sound/effects/splat.ogg', 50, 1)
- B.release_specific_contents(A)
- M.visible_message("[M] contracts strangely, spewing out something!", \
- "You spew out something from inside you!")
- return ..()
-
-/datum/chemical_reaction/ickypak
- name = "Ickypak"
- id = /datum/reagent/medicine/ickypak
- results = list(/datum/reagent/medicine/ickypak = 2)
- required_reagents = list(/datum/reagent/chlorine = 2 , /datum/reagent/oil = 1) */
\ No newline at end of file
diff --git a/code/modules/vore/resizing/grav_pull_vr.dm b/code/modules/vore/resizing/grav_pull_vr.dm
deleted file mode 100644
index 921d1ab2b9..0000000000
--- a/code/modules/vore/resizing/grav_pull_vr.dm
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// Gravity Pull effect which draws in movable objects to its center.
-// In this case, "number" refers to the range. directions is ignored.
-//
-/datum/effect/effect/system/grav_pull
- var/pull_radius = 3
- var/pull_anchored = 0
- var/break_windows = 0
-
-/datum/effect/effect/system/grav_pull/set_up(range, num, loca)
- pull_radius = range
- number = num
- if(istype(loca, /turf/))
- location = loca
- else
- location = get_turf(loca)
-
-/datum/effect/effect/system/grav_pull/start()
- spawn(0)
- if(holder)
- src.location = get_turf(holder)
- for(var/i=0, i < number, i++)
- do_pull()
- sleep(25)
-
-/datum/effect/effect/system/grav_pull/proc/do_pull()
- //following is adapted from supermatter and singulo code
- if(defer_powernet_rebuild != 2)
- defer_powernet_rebuild = 1
-
- // Let's just make this one loop.
- for(var/atom/X in orange(pull_radius, location))
- // Movable atoms only
- if(istype(X, /atom/movable))
- if(istype(X, /obj/effect/overlay)) continue
- if(X && !istype(X, /mob/living/carbon/human))
- if(break_windows && istype(X, /obj/structure/window)) //shatter windows
- var/obj/structure/window/W = X
- W.ex_act(2.0)
-
- if(istype(X, /obj))
- var/obj/O = X
- if(O.anchored)
- if (!pull_anchored) continue // Don't pull anchored stuff unless configured
- step_towards(X, location) // step just once if anchored
- continue
-
- step_towards(X, location) // Step twice
- step_towards(X, location)
-
- else if(istype(X,/mob/living/carbon/human))
- var/mob/living/carbon/human/H = X
- if(istype(H.shoes,/obj/item/clothing/shoes/magboots))
- var/obj/item/clothing/shoes/magboots/M = H.shoes
- if(M.magpulse)
- step_towards(H, location) //step just once with magboots
- continue
- step_towards(H, location) //step twice
- step_towards(H, location)
-
- if(defer_powernet_rebuild != 2)
- defer_powernet_rebuild = 0
- return
diff --git a/code/modules/vore/resizing/holder_micro_vr.dm b/code/modules/vore/resizing/holder_micro_vr.dm
deleted file mode 100644
index 1f1aacf98d..0000000000
--- a/code/modules/vore/resizing/holder_micro_vr.dm
+++ /dev/null
@@ -1,34 +0,0 @@
-// Micro Holders - Extends /obj/item/holder
-
-/obj/item/holder/micro
- name = "micro"
- desc = "Another crewmember, small enough to fit in your hand."
- icon_state = "micro"
- slot_flags = SLOT_FEET | SLOT_HEAD | SLOT_ID
- w_class = 2
- item_icons = null // Override value from parent. We don't have magic sprites.
- pixel_y = 0 // Override value from parent.
-
-/obj/item/holder/micro/examine(var/mob/user)
- . = list()
- for(var/mob/living/M in contents)
- . += M.examine(user)
-
-/obj/item/holder/MouseDrop(mob/M as mob)
- ..()
- if(M != usr) return
- if(usr == src) return
- if(!Adjacent(usr)) return
- if(istype(M,/mob/living/silicon/ai)) return
- for(var/mob/living/carbon/human/O in contents)
- O.show_inv(usr)
-
-/obj/item/holder/micro/attack_self(var/mob/living/user)
- for(var/mob/living/carbon/human/M in contents)
- M.help_shake_act(user)
-
-/obj/item/holder/micro/update_state()
- // If any items have been dropped by contained mob, drop them to floor.
- for(var/obj/O in contents)
- O.forceMove(get_turf(src))
- ..()
diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm
deleted file mode 100644
index 052be48c2d..0000000000
--- a/code/modules/vore/resizing/resize_vr.dm
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
-//these aren't defines so they can stay in this file
-GLOBAL_VAR_CONST(SIZESCALE_HUGE, 2)
-GLOBAL_VAR_CONST(SIZESCALE_BIG, 1.5)
-GLOBAL_VAR_CONST(SIZESCALE_NORMAL, 1)
-GLOBAL_VAR_CONST(SIZESCALE_SMALL, 0.85)
-GLOBAL_VAR_CONST(SIZESCALE_TINY, 0.60)
-
-GLOBAL_VAR_CONST(SIZESCALE_A_HUGEBIG, (GLOB.SIZESCALE_HUGE + GLOB.SIZESCALE_BIG) / 2)
-GLOBAL_VAR_CONST(SIZESCALE_A_BIGNORMAL, (GLOB.SIZESCALE_BIG + GLOB.SIZESCALE_NORMAL) / 2)
-GLOBAL_VAR_CONST(SIZESCALE_A_NORMALSMALL,(GLOB.SIZESCALE_NORMAL + GLOB.SIZESCALE_SMALL) / 2)
-GLOBAL_VAR_CONST(SIZESCALE_A_SMALLTINY,(GLOB.SIZESCALE_SMALL + GLOB.SIZESCALE_TINY) / 2)
-*/
-// Adding needed defines to /mob/living
-// Note: Polaris had this on /mob/living/carbon/human We need it higher up for animals and stuff.
-/mob/living
- var/size_multiplier = 1 //multiplier for the mob's icon size
-
-// Define holder_type on types we want to be scoop-able
-//mob/living/carbon/human
-// holder_type = /obj/item/holder/micro
-
-/**
- * Scale up the size of a mob's icon by the size_multiplier.
- * NOTE: mob/living/carbon/human/update_transform() has a more complicated system and
- * is already applying this transform. BUT, it does not call ..()
- * as long as that is true, we should be fine. If that changes we need to
- * re-evaluate.
- */
-/mob/living/update_transform()
- ASSERT(!iscarbon(src))
- var/matrix/M = matrix()
- M.Scale(size_multiplier)
- M.Translate(0, 16*(size_multiplier-1))
- src.transform = M
-
-/**
- * Get the effective size of a mob.
- * Currently this is based only on size_multiplier for micro/macro stuff,
- * but in the future we may also incorporate the "mob_size", so that
- * a macro mouse is still only effectively "normal" or a micro dragon is still large etc.
- */
-/mob/living/proc/get_effective_size()
- return src.size_multiplier
-
-/**
- * Resizes the mob immediately to the desired mod, animating it growing/shrinking.
- * It can be used by anything that calls it.
- */
-/mob/living/proc/sizescale(var/new_size)
- var/matrix/sizescale = matrix() // Defines the matrix to change the player's size
- sizescale.Scale(new_size) //Change the size of the matrix
-
- if(new_size >= SIZESCALE_NORMAL)
- sizescale.Translate(0, -1 * (1 - new_size) * 16) //Move the player up in the tile so their feet align with the bottom
-
- animate(src, transform = sizescale, time = 5) //Animate the player resizing
- size_multiplier = new_size //Change size_multiplier so that other items can interact with them
-
-/*
- * Verb proc for a command that lets players change their size OOCly.
- * Ace was here! Redid this a little so we'd use math for shrinking characters. This is the old code.
-
-/mob/living/proc/set_size()
- set name = "Set Character Size"
- set category = "Vore"
- var/nagmessage = "DO NOT ABUSE THESE COMMANDS. They are not here for you to play with. \
- We were originally going to remove them but kept them for popular demand. \
- Do not abuse their existence outside of ERP scenes where they apply, \
- or reverting OOCly unwanted changes like someone lolshooting the crew with a shrink ray. -Ace"
-
- var/size_name = input(nagmessage, "Pick a Size") in player_sizes_list
- if (size_name && player_sizes_list[size_name])
- src.sizescale(player_sizes_list[size_name])
- message_admins("[key_name(src)] used the sizescale command in-game to be [size_name]. \
- ([src ? "JMP" : "null"])")
-
-/** Add the set_size() proc to usable verbs. */
-/hook/living_new/proc/sizescale_setup(mob/living/M)
- M.verbs += /mob/living/proc/set_size
- return 1
-
-
- * Attempt to scoop up this mob up into M's hands, if the size difference is large enough.
- * @return false if normal code should continue, 1 to prevent normal code.
-
-/mob/living/proc/attempt_to_scoop(var/mob/living/carbon/human/M)
- if(!istype(M))
- return 0;
- if(M.buckled)
- usr << "You have to unbuckle \the [M] before you pick them up."
- return 0
- if(M.get_effective_size() - src.get_effective_size() >= 0.75)
- var/obj/item/holder/m_holder = get_scooped(M)
- if (m_holder)
- return 1
- else
- return 0; // Unable to scoop, let other code run
-*/
-/*
- * Handle bumping into someone with helping intent.
- * Called from /mob/living/Bump() in the 'brohugs all around' section.
- * @return false if normal code should continue, 1 to prevent normal code.
- * // TODO - can the now_pushing = 0 be moved up? What does it do anyway?
- */
-/mob/living/proc/handle_micro_bump_helping(var/mob/living/tmob)
- if(src.get_effective_size() <= SIZESCALE_A_SMALLTINY && tmob.get_effective_size() <= SIZESCALE_A_SMALLTINY)
- // Both small! Go ahead and
- now_pushing = 0
- src.forceMove(tmob.loc)
- return 1
- if(abs(src.get_effective_size() - tmob.get_effective_size()) >= 0.20)
- now_pushing = 0
- src.forceMove(tmob.loc)
-
- if(src.get_effective_size() > tmob.get_effective_size())
-/* var/mob/living/carbon/human/tmob = src
- if(istype(tmob) && istype(tmob.tail_style, /datum/sprite_accessory/tail/taur/naga))
- src << "You carefully slither around [tmob]."
- M << "[src]'s huge tail slithers past beside you!"
- else
-*/
- src.forceMove(tmob.loc)
- src << "You carefully step over [tmob]."
- tmob << "[src] steps over you carefully!"
- if(tmob.get_effective_size() > src.get_effective_size())
-/* var/mob/living/carbon/human/M = M
- if(istype(M) && istype(M.tail_style, /datum/sprite_accessory/tail/taur/naga))
- src << "You jump over [M]'s thick tail."
- M << "[src] bounds over your tail."
- else
-*/
- src.forceMove(tmob.loc)
- src << "You run between [tmob]'s legs."
- tmob << "[src] runs between your legs."
- return 1
-
-/**
- * Handle bumping into someone without mutual help intent.
- * Called from /mob/living/Bump()
- * NW was here, adding even more options for stomping!
- *
- * @return false if normal code should continue, 1 to prevent normal code.
- */
-/mob/living/proc/handle_micro_bump_other(var/mob/living/tmob)
- ASSERT(isliving(tmob)) // Baby don't hurt me
-
- if(src.a_intent == "disarm" && src.canmove && !src.buckled)
- // If bigger than them by at least 0.75, move onto them and print message.
- if((src.get_effective_size() - tmob.get_effective_size()) >= 0.20)
- now_pushing = 0
- src.forceMove(tmob.loc)
- tmob.Stun(4)
-/*
- var/mob/living/carbon/human/H = src
- if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
- src << "You carefully squish [tmob] under your tail!"
- tmob << "[src] pins you under their tail!"
- else
-*/
- src << "You pin [tmob] beneath your foot!"
- tmob << "[src] pins you beneath their foot!"
- return 1
-
- if(src.a_intent == "harm" && src.canmove && !src.buckled)
- if((src.get_effective_size() - tmob.get_effective_size()) >= 0.20)
- now_pushing = 0
- src.forceMove(tmob.loc)
- tmob.adjustStaminaLoss(35)
- tmob.adjustBruteLoss(5)
-/* var/mob/living/carbon/human/M = src
- if(istype(M) && istype(M.tail_style, /datum/sprite_accessory/tail/taur/naga))
- src << "You steamroller over [tmob] with your heavy tail!"
- tmob << "[src] ploughs you down mercilessly with their heavy tail!"
- else
-*/
- src << "You bring your foot down heavily upon [tmob]!"
- tmob << "[src] steps carelessly on your body!"
- return 1
-
- // until I figure out grabbing micros with the godawful pull code...
- if(src.a_intent == "grab" && src.canmove && !src.buckled)
- if((src.get_effective_size() - tmob.get_effective_size()) >= 0.20)
- now_pushing = 0
- tmob.adjustStaminaLoss(15)
- src.forceMove(tmob.loc)
- src << "You press [tmob] beneath your foot!"
- tmob << "[src] presses you beneath their foot!"
-/*
- var/mob/living/carbon/human/M = src
- if(istype(M) && !M.shoes)
- // User is a human (capable of scooping) and not wearing shoes! Scoop into foot slot!
- equip_to_slot_if_possible(tmob.get_scooped(M), slot_shoes, 0, 1)
- if(istype(M.tail_style, /datum/sprite_accessory/tail/taur/naga))
- src << "You wrap up [tmob] with your powerful tail!"
- tmob << "[src] binds you with their powerful tail!"
- else
- src << "You clench your toes around [tmob]'s body!"
- tmob << "[src] grabs your body with their toes!"
- else if(istype(M) && istype(M.tail_style, /datum/sprite_accessory/tail/taur/naga))
- src << "You carefully squish [tmob] under your tail!"
- tmob << "[src] pins you under their tail!"
- else
- src << "You pin [tmob] beneath your foot!"
- tmob << "[src] pins you beneath their foot!"
- return 1
-*/
diff --git a/code/modules/vore/resizing/sizechemicals.dm b/code/modules/vore/resizing/sizechemicals.dm
deleted file mode 100644
index 612e8c9fde..0000000000
--- a/code/modules/vore/resizing/sizechemicals.dm
+++ /dev/null
@@ -1,110 +0,0 @@
-
-////////////////////////////
-/// shrinking serum ///
-////////////////////////////
-
-/datum/reagent/medicine/macrocillin
- name = "Macrocillin"
- description = "Glowing yellow liquid."
- reagent_state = LIQUID
- color = "#FFFF00" // rgb: 255, 255, 0
- overdose_threshold = 20
-
-/datum/reagent/medicine/macrocillin/on_mob_life(mob/living/M, method=INGEST)
- for(var/size in list(SIZESCALE_SMALL, SIZESCALE_NORMAL, SIZESCALE_BIG, SIZESCALE_HUGE))
- if(M.size_multiplier < size)
- M.sizescale(size)
- M << "You grow!"
- break
- if(M.reagents.has_reagent(/datum/reagent/medicine/macrocillin))
- M.reagents.remove_reagent(/datum/reagent/medicine/macrocillin, 20)
- ..()
-
-/datum/reagent/medicine/microcillin
- name = "Microcillin"
- description = "Murky purple liquid."
- reagent_state = LIQUID
- color = "#800080"
- overdose_threshold = 20
-
-/datum/reagent/microcillin/on_mob_life(mob/living/M, method=INGEST)
- for(var/size in list(SIZESCALE_BIG, SIZESCALE_NORMAL, SIZESCALE_SMALL, SIZESCALE_TINY))
- if(M.size_multiplier > size)
- M.sizescale(size)
- M << "You shrink!"
- break;
- if(M.reagents.has_reagent(/datum/reagent/medicine/microcillin))
- M.reagents.remove_reagent(/datum/reagent/medicine/microcillin, 20)
-
- ..()
-
-/datum/reagent/medicine/normalcillin
- name = "Normalcillin"
- description = "Translucent cyan liquid."
- reagent_state = LIQUID
- color = "#00FFFF"
- overdose_threshold = 20
-
-/datum/reagent/medicine/normalcillin/on_mob_life(mob/living/M, method=INGEST)
- if(M.size_multiplier > SIZESCALE_BIG)
- M.sizescale(SIZESCALE_BIG)
- M << "You shrink!"
- else if(M.size_multiplier > SIZESCALE_NORMAL)
- M.sizescale(SIZESCALE_NORMAL)
- M << "You shrink!"
- else if(M.size_multiplier < SIZESCALE_NORMAL)
- M.sizescale(SIZESCALE_NORMAL)
- M << "You grow!"
- else if(M.size_multiplier < SIZESCALE_SMALL)
- M.sizescale(SIZESCALE_SMALL)
- M << "You grow!"
-
- if(M.reagents.has_reagent(/datum/reagent/medicine/normalcillin))
- M.reagents.remove_reagent(/datum/reagent/medicine/normalcillin, 20)
- ..()
-
-
-/datum/reagent/medicine/sizeoxadone
- name = "Sizeoxadone"
- description = "A volatile liquid used as a precursor to size-altering chemicals. Causes dizziness if taken unprocessed."
- reagent_state = LIQUID
- color = "#1E90FF"
- overdose_threshold = 30
- metabolization_rate = 0.8 * REAGENTS_METABOLISM
-
-/datum/reagent/sizeoxadone/on_mob_life(var/mob/living/carbon/M, var/removed)
- if(M.hallucination < volume && prob(20))
- M.hallucination += 5
- if(!M.confused) M.confused = 1
- M.confused = max(M.confused, 20)
- return
-
-/datum/reagent/medicine/sizeoxadone/overdose_process(mob/living/M)
- M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1)
- M.adjustToxLoss(1)
- ..()
- . = 1
-
-////////////////////////// Anti-Noms Drugs //////////////////////////
-
-/datum/reagent/medicine/ickypak
- name = "Ickypak"
- description = "A foul-smelling green liquid, for inducing muscle contractions to expel accidentally ingested things."
- reagent_state = LIQUID
- color = "#0E900E"
- metabolization_rate = 0.25 * REAGENTS_METABOLISM
-
-/datum/reagent/medicine/ickypak/on_mob_life(var/mob/living/M, method=INGEST)
- ..()
- if(M.hallucination < volume && prob(20))
- M.hallucination += 5
- M.adjustToxLoss(-5)
-
- for(var/I in M.vore_organs)
- var/datum/belly/B = M.vore_organs[I]
- for(var/atom/movable/A in B.internal_contents)
- if(prob(55))
- playsound(M, 'sound/effects/splat.ogg', 50, 1)
- B.release_vore_contents(A)
- ..()
- . = 1
\ No newline at end of file
diff --git a/code/modules/vore/resizing/sizegun_vr.dm b/code/modules/vore/resizing/sizegun_vr.dm
deleted file mode 100644
index 156b220df3..0000000000
--- a/code/modules/vore/resizing/sizegun_vr.dm
+++ /dev/null
@@ -1,173 +0,0 @@
-//
-// Size Gun
-//
-/*
-/obj/item/gun/energy/sizegun
- name = "shrink ray"
- desc = "A highly advanced ray gun with two settings: Shrink and Grow. Warning: Do not insert into mouth."
- icon = 'icons/obj/gun_vr.dmi'
- icon_state = "sizegun-shrink100" // Someone can probably do better. -Ace
- item_state = null //so the human update icon uses the icon_state instead
- fire_sound = 'sound/weapons/wave.ogg'
- charge_cost = 100
- projectile_type = /obj/item/projectile/beam/shrinklaser
- modifystate = "sizegun-shrink"
- selfcharge = EGUN_SELFCHARGE
- firemodes = list(
- list(mode_name = "grow",
- projectile_type = /obj/item/projectile/beam/growlaser,
- modifystate = "sizegun-grow",
- fire_sound = 'sound/weapons/pulse3.ogg'
- ),
- list(mode_name = "shrink",
- projectile_type = /obj/item/projectile/beam/shrinklaser,
- modifystate = "sizegun-shrink",
- fire_sound = 'sound/weapons/wave.ogg'
- ))
-
-//
-// Beams for size gun
-//
-// tracers TBD
-
-/obj/item/projectile/beam/shrinklaser
- name = "shrink beam"
- icon_state = "xray"
- nodamage = 1
- damage = 0
- check_armour = "laser"
-
- muzzle_type = /obj/effect/projectile/xray/muzzle
- tracer_type = /obj/effect/projectile/xray/tracer
- impact_type = /obj/effect/projectile/xray/impact
-
-/obj/item/projectile/beam/shrinklaser/on_hit(var/atom/target, var/blocked = 0)
- . = ..()
- if(isliving(target))
- var/mob/living/M = target
- switch(M.size_multiplier)
- if(SIZESCALE_HUGE to INFINITY)
- M.sizescale(SIZESCALE_BIG)
- if(SIZESCALE_BIG to SIZESCALE_HUGE)
- M.sizescale(SIZESCALE_NORMAL)
- if(SIZESCALE_NORMAL to SIZESCALE_BIG)
- M.sizescale(SIZESCALE_SMALL)
- if((0 - INFINITY) to SIZESCALE_NORMAL)
- M.sizescale(SIZESCALE_TINY)
- M.update_transform()
- return BULLET_ACT_HIT
-
-/obj/item/projectile/beam/growlaser
- name = "growth beam"
- icon_state = "bluelaser"
- nodamage = 1
- damage = 0
- check_armour = "laser"
-
- muzzle_type = /obj/effect/projectile/laser_blue/muzzle
- tracer_type = /obj/effect/projectile/laser_blue/tracer
- impact_type = /obj/effect/projectile/laser_blue/impact
-
-/obj/item/projectile/beam/growlaser/on_hit(var/atom/target, var/blocked = 0)
- . = ..()
- if(isliving(target))
- var/mob/living/M = target
- switch(M.size_multiplier)
- if(SIZESCALE_BIG to SIZESCALE_HUGE)
- M.sizescale(SIZESCALE_HUGE)
- if(SIZESCALE_NORMAL to SIZESCALE_BIG)
- M.sizescale(SIZESCALE_BIG)
- if(SIZESCALE_SMALL to SIZESCALE_NORMAL)
- M.sizescale(SIZESCALE_NORMAL)
- if((0 - INFINITY) to SIZESCALE_TINY)
- M.sizescale(SIZESCALE_SMALL)
- M.update_transform()
- return BULLET_ACT_HIT
-*/
-
-datum/design/sizeray
- name = "Size Ray"
- desc = "Abuse bluespace tech to alter living matter scale."
- id = "sizeray"
- build_type = PROTOLATHE
- materials = list(MAT_METAL = 1000, MAT_GLASS = 1000, MAT_DIAMOND = 2500, MAT_URANIUM = 2500, MAT_TITANIUM = 1000)
- build_path = /obj/item/gun/energy/laser/sizeray
- category = list("Weapons")
-
-/obj/item/projectile/sizeray
- name = "sizeray beam"
- icon_state = "omnilaser"
- hitsound = null
- damage = 0
- damage_type = STAMINA
- flag = "laser"
- pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
-
-/obj/item/projectile/sizeray/shrinkray
- icon_state="bluelaser"
-
-/obj/item/projectile/sizeray/growthray
- icon_state="laser"
-
-/obj/item/projectile/sizeray/shrinkray/on_hit(var/atom/target, var/blocked = 0)
- . = ..()
- if(isliving(target))
- var/mob/living/M = target
- switch(M.size_multiplier)
- if(SIZESCALE_HUGE to INFINITY)
- M.sizescale(SIZESCALE_BIG)
- if(SIZESCALE_BIG to SIZESCALE_HUGE)
- M.sizescale(SIZESCALE_NORMAL)
- if(SIZESCALE_NORMAL to SIZESCALE_BIG)
- M.sizescale(SIZESCALE_SMALL)
- if((0 - INFINITY) to SIZESCALE_NORMAL)
- M.sizescale(SIZESCALE_TINY)
- M.update_transform()
- return BULLET_ACT_
-
-/obj/item/projectile/sizeray/growthray/on_hit(var/atom/target, var/blocked = 0)
- . = ..()
- if(isliving(target))
- var/mob/living/M = target
- switch(M.size_multiplier)
- if(SIZESCALE_BIG to SIZESCALE_HUGE)
- M.sizescale(SIZESCALE_HUGE)
- if(SIZESCALE_NORMAL to SIZESCALE_BIG)
- M.sizescale(SIZESCALE_BIG)
- if(SIZESCALE_SMALL to SIZESCALE_NORMAL)
- M.sizescale(SIZESCALE_NORMAL)
- if((0 - INFINITY) to SIZESCALE_TINY)
- M.sizescale(SIZESCALE_SMALL)
- M.update_transform()
- return BULLET_ACT_HIT
-
-/obj/item/ammo_casing/energy/laser/growthray
- projectile_type = /obj/item/projectile/sizeray/growthray
- select_name = "Growth"
-
-/obj/item/ammo_casing/energy/laser/shrinkray
- projectile_type = /obj/item/projectile/sizeray/shrinkray
- select_name = "Shrink"
-
-
-//Gun here
-/obj/item/gun/energy/laser/sizeray
- name = "size ray"
- icon_state = "bluetag"
- desc = "Size manipulator using bluespace breakthroughs."
- item_state = null //so the human update icon uses the icon_state instead.
- ammo_type = list(/obj/item/ammo_casing/energy/laser/shrinkray, /obj/item/ammo_casing/energy/laser/growthray)
- selfcharge = EGUN_SELFCHARGE
- charge_delay = 5
- ammo_x_offset = 2
- clumsy_check = 1
-
- attackby(obj/item/W, mob/user)
- if(W==src)
- if(icon_state=="bluetag")
- icon_state="redtag"
- ammo_type = list(/obj/item/ammo_casing/energy/laser/growthray)
- else
- icon_state="bluetag"
- ammo_type = list(/obj/item/ammo_casing/energy/laser/shrinkray)
- return ..()
\ No newline at end of file
diff --git a/config/dynamic_config.txt b/config/dynamic_config.txt
index 2ddebdf37a..25bc763d0b 100644
--- a/config/dynamic_config.txt
+++ b/config/dynamic_config.txt
@@ -1,3 +1,13 @@
+## Dynamic storytellers weights: how likely each storyteller is to show up. This is adjusted by voting and recency.
+STORYTELLER_WEIGHT CHAOTIC 2
+STORYTELLER_WEIGHT TEAMWORK 4
+STORYTELLER_WEIGHT CONVERSION 2
+STORYTELLER_WEIGHT RANDOM 6
+STORYTELLER_WEIGHT INTRIGUE 6
+STORYTELLER_WEIGHT STORY 6
+STORYTELLER_WEIGHT CALM 6
+STORYTELLER_WEIGHT EXTENDED 0
+
## Injection delays: how long (in minutes) will pass before a midround or latejoin antag is injected.
DYNAMIC_MIDROUND_DELAY_MIN 5
DYNAMIC_MIDROUND_DELAY_MAX 15
@@ -92,6 +102,7 @@ DYNAMIC_WEIGHT RADIATION_STORM 1
DYNAMIC_WEIGHT LATEJOIN_TRAITOR 7
DYNAMIC_WEIGHT LATEJOIN_REVOLUTION 2
DYNAMIC_WEIGHT LATEJOIN_BLOODSUCKER 4
+DYNAMIC_WEIGHT LATEJOIN_COLLECTOR 5
## Threat cost. This is decreased from the mode's threat when the rule is executed.
DYNAMIC_COST TRAITOR 10
@@ -153,6 +164,7 @@ DYNAMIC_COST RADIATION_STORM 3
DYNAMIC_COST LATEJOIN_TRAITOR 5
DYNAMIC_COST LATEJOIN_REVOLUTION 20
DYNAMIC_COST LATEJOIN_BLOODSUCKER 10
+DYNAMIC_COST LATEJOIN_COLLECTOR 1
## Rule will not be generated with threat levels below requirement at a pop value. Pop values are determined by dynamic's pop-per-requirement.
## By default it's 0-8, 9-17, 18-26, 27-35, 36-44, 45-53, 54-60, 61-69, 70-78, 79+.
@@ -210,6 +222,7 @@ DYNAMIC_REQUIREMENTS RADIATION_STORM 5 5 5 5 5 5 5 5 5 5
DYNAMIC_REQUIREMENTS LATEJOIN_TRAITOR 40 30 20 15 15 15 15 15 15 15
DYNAMIC_REQUIREMENTS LATEJOIN_REVOLUTION 101 101 70 40 40 40 40 40 40 40
DYNAMIC_REQUIREMENTS LATEJOIN_BLOODSUCKER 40 30 20 15 15 15 15 15 15 15
+DYNAMIC_REQUIREMENTS LATEJOIN_COLLECTOR 10 10 10 10 10 10 10 10 10 10
## An alternative, static requirement used instead when pop is over mode's high_pop_limit.
DYNAMIC_HIGH_POPULATION_REQUIREMENT TRAITOR 50
@@ -267,6 +280,7 @@ DYNAMIC_HIGH_POPULATION_REQUIREMENT RADIATION_STORM 5
DYNAMIC_HIGH_POPULATION_REQUIREMENT LATEJOIN_TRAITOR 15
DYNAMIC_HIGH_POPULATION_REQUIREMENT LATEJOIN_REVOLUTION 50
DYNAMIC_HIGH_POPULATION_REQUIREMENT LATEJOIN_BLOODSUCKER 15
+DYNAMIC_HIGH_POPULATION_REQUIREMENT LATEJOIN_COLLECTOR 10
## Dynamic traitor stuff
diff --git a/html/changelogs/AutoChangeLog-pr-10623.yml b/html/changelogs/AutoChangeLog-pr-10623.yml
new file mode 100644
index 0000000000..623560f7d2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10623.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - rscadd: "Lots of new traitor objectives"
diff --git a/html/changelogs/AutoChangeLog-pr-10700.yml b/html/changelogs/AutoChangeLog-pr-10700.yml
new file mode 100644
index 0000000000..296ebe4d99
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10700.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - tweak: "The anomalous honking crystal should now properly clown your mind."
diff --git a/html/changelogs/AutoChangeLog-pr-10787.yml b/html/changelogs/AutoChangeLog-pr-10787.yml
new file mode 100644
index 0000000000..ee221b69f3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10787.yml
@@ -0,0 +1,4 @@
+author: "Seris02"
+delete-after: True
+changes:
+ - rscadd: "thief's gloves"
diff --git a/html/changelogs/AutoChangeLog-pr-10798.yml b/html/changelogs/AutoChangeLog-pr-10798.yml
new file mode 100644
index 0000000000..637343c7b6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10798.yml
@@ -0,0 +1,5 @@
+author: "necromanceranne"
+delete-after: True
+changes:
+ - rscdel: "Removed the formal security officer jacket from the secdrobe"
+ - tweak: "formal security jackets are now armor vests"
diff --git a/html/changelogs/AutoChangeLog-pr-10868.yml b/html/changelogs/AutoChangeLog-pr-10868.yml
new file mode 100644
index 0000000000..629f93585a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10868.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - tweak: "Holographic fans won't display above mobs and other objects anymore."
diff --git a/html/changelogs/AutoChangeLog-pr-10870.yml b/html/changelogs/AutoChangeLog-pr-10870.yml
new file mode 100644
index 0000000000..672e6abdbc
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10870.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed paraplegics appearing as shoeless."
diff --git a/html/changelogs/AutoChangeLog-pr-10881.yml b/html/changelogs/AutoChangeLog-pr-10881.yml
new file mode 100644
index 0000000000..7c00713eae
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10881.yml
@@ -0,0 +1,6 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - refactor: "Refactored mob holders into an element."
+ - bugfix: "Fixed a few minor issues with that feature. such as mismatching sprites for certain held mobs and a slight lack of safety checks."
+ - rscdel: "holdable mobs can't force themselves into people's hands anymore."
diff --git a/html/changelogs/AutoChangeLog-pr-10883.yml b/html/changelogs/AutoChangeLog-pr-10883.yml
new file mode 100644
index 0000000000..f99613d846
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10883.yml
@@ -0,0 +1,4 @@
+author: "ancientpower"
+delete-after: True
+changes:
+ - tweak: "Ghosts are now literate."
diff --git a/html/changelogs/AutoChangeLog-pr-10885.yml b/html/changelogs/AutoChangeLog-pr-10885.yml
new file mode 100644
index 0000000000..bcc19eb9d2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10885.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Milkies fix."
diff --git a/html/changelogs/AutoChangeLog-pr-10894.yml b/html/changelogs/AutoChangeLog-pr-10894.yml
new file mode 100644
index 0000000000..770308755d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10894.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes:
+ - rscadd: "Carps have evolved to take more damage"
diff --git a/html/changelogs/AutoChangeLog-pr-10898.yml b/html/changelogs/AutoChangeLog-pr-10898.yml
new file mode 100644
index 0000000000..7c7198105f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10898.yml
@@ -0,0 +1,5 @@
+author: "EmeraldSundisk"
+delete-after: True
+changes:
+ - bugfix: "Connects mining's disposal unit on Delta."
+ - tweak: "Slight visual adjustments to the immediate affected area."
diff --git a/html/changelogs/AutoChangeLog-pr-10899.yml b/html/changelogs/AutoChangeLog-pr-10899.yml
new file mode 100644
index 0000000000..f1542b2b09
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10899.yml
@@ -0,0 +1,6 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes:
+ - rscadd: "restock crates for each vender"
+ - rscadd: "restock units for all station venders"
+ - bugfix: "Sec-vender missing icon"
diff --git a/html/changelogs/AutoChangeLog-pr-10900.yml b/html/changelogs/AutoChangeLog-pr-10900.yml
new file mode 100644
index 0000000000..0f79245c73
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10900.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - bugfix: "Atmos reaction priority works now."
diff --git a/html/changelogs/AutoChangeLog-pr-10901.yml b/html/changelogs/AutoChangeLog-pr-10901.yml
new file mode 100644
index 0000000000..57c1d821f7
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10901.yml
@@ -0,0 +1,5 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes:
+ - bugfix: "Box station captain office issues
+maping: Gulag on box can now be accessed"
diff --git a/html/changelogs/AutoChangeLog-pr-10902.yml b/html/changelogs/AutoChangeLog-pr-10902.yml
new file mode 100644
index 0000000000..9a60860f3f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10902.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed some mounted defibrillator issue with the altclicking functionality."
diff --git a/html/changelogs/AutoChangeLog-pr-10903.yml b/html/changelogs/AutoChangeLog-pr-10903.yml
new file mode 100644
index 0000000000..a353d6594a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10903.yml
@@ -0,0 +1,5 @@
+author: "Hatterhat"
+delete-after: True
+changes:
+ - rscadd: "Formaldehyde prevents organ decay and corpses' miasma production at 1u in the body."
+ - rscadd: "Epinephrine pens now contain 3u formaldehyde. This should not kill you."
diff --git a/html/changelogs/AutoChangeLog-pr-10905.yml b/html/changelogs/AutoChangeLog-pr-10905.yml
new file mode 100644
index 0000000000..de9374bd12
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10905.yml
@@ -0,0 +1,6 @@
+author: "Hatterhat"
+delete-after: True
+changes:
+ - tweak: "Standard RCD ammo can now be printed from Engineering-keyed techfabs once you hit Industrial Engineering."
+ - tweak: "Consoleless interfaces are now default - this means unrestricted protolathes and circuit imprinters can now be interfaced with by interacting with the machine itself."
+ - bugfix: "Multitools can now actually be printed from Engineering and Science protolathes/techfabs once you unlock Basic Tools."
diff --git a/html/changelogs/AutoChangeLog-pr-10906.yml b/html/changelogs/AutoChangeLog-pr-10906.yml
new file mode 100644
index 0000000000..ef725e921e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10906.yml
@@ -0,0 +1,5 @@
+author: "Hatterhat"
+delete-after: True
+changes:
+ - rscadd: "Husking (from being burned to shit) can now be reverted! 5u rezadone or 100u synthflesh, at below 50 burn."
+ - balance: "Turning a body into a burnt husk now takes more effort. 300 burn's worth of effort."
diff --git a/html/changelogs/AutoChangeLog-pr-10907.yml b/html/changelogs/AutoChangeLog-pr-10907.yml
new file mode 100644
index 0000000000..af893e9415
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10907.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed no-grav lavaland labor/mining shuttle areas."
diff --git a/html/changelogs/AutoChangeLog-pr-10915.yml b/html/changelogs/AutoChangeLog-pr-10915.yml
new file mode 100644
index 0000000000..88f0c1652e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10915.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - balance: "shoes can now fit magpistols again."
diff --git a/html/changelogs/AutoChangeLog-pr-10917.yml b/html/changelogs/AutoChangeLog-pr-10917.yml
new file mode 100644
index 0000000000..f6e5997348
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10917.yml
@@ -0,0 +1,4 @@
+author: "Arturlang"
+delete-after: True
+changes:
+ - tweak: "The MK2 hypospray now"
diff --git a/html/changelogs/AutoChangeLog-pr-10919.yml b/html/changelogs/AutoChangeLog-pr-10919.yml
new file mode 100644
index 0000000000..0fa6420e39
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10919.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixing accidental nerfs to the magpistol magazine."
diff --git a/html/changelogs/AutoChangeLog-pr-10921.yml b/html/changelogs/AutoChangeLog-pr-10921.yml
new file mode 100644
index 0000000000..d6d551b40d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10921.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "The Lavaland's Herald speech sound should only play if they are actually speaking."
diff --git a/html/changelogs/AutoChangeLog-pr-10922.yml b/html/changelogs/AutoChangeLog-pr-10922.yml
new file mode 100644
index 0000000000..c71630fd0d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10922.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - tweak: "The lawyer's PDA cartridge has been rebranded to something more accurate to its true nature."
diff --git a/html/changelogs/AutoChangeLog-pr-10924.yml b/html/changelogs/AutoChangeLog-pr-10924.yml
new file mode 100644
index 0000000000..d419928dd2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10924.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed whitelisted/donor loadouts"
diff --git a/html/changelogs/AutoChangeLog-pr-10929.yml b/html/changelogs/AutoChangeLog-pr-10929.yml
new file mode 100644
index 0000000000..fa9413f25a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10929.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Childproofs double-esword and hypereuplastic blade toys."
diff --git a/icons/obj/citvending.dmi b/icons/obj/citvending.dmi
deleted file mode 100644
index 8f836b7eb5..0000000000
Binary files a/icons/obj/citvending.dmi and /dev/null differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index 7e0d03abd5..515d6212c0 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index 143171f414..7d08a83fb7 100644
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ
diff --git a/icons/obj/vending_restock.dmi b/icons/obj/vending_restock.dmi
index a59fdd0f52..c9437d7d80 100644
Binary files a/icons/obj/vending_restock.dmi and b/icons/obj/vending_restock.dmi differ
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index 6ee9e6e824..9f3d8911ec 100644
--- a/interface/stylesheet.dm
+++ b/interface/stylesheet.dm
@@ -151,6 +151,7 @@ h1.alert, h2.alert {color: #000000;}
.extremelybig {font-size: 5;}
.greentext {color: #00FF00; font-size: 3;}
.redtext {color: #FF0000; font-size: 3;}
+.yellowtext {color: #FFCC00; font-size: 3;}
.clown {color: #FF69Bf; font-size: 3; font-family: "Comic Sans MS", cursive, sans-serif; font-weight: bold;}
.his_grace {color: #15D512; font-family: "Courier New", cursive, sans-serif; font-style: italic;}
.spooky {color: #FF9100;}
diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm
index d1f1a08ea8..1537d5cebe 100644
--- a/modular_citadel/code/modules/arousal/organs/breasts.dm
+++ b/modular_citadel/code/modules/arousal/organs/breasts.dm
@@ -46,7 +46,9 @@
desc += " You estimate that they're [uppertext(size)]-cups."
if(CHECK_BITFIELD(genital_flags, GENITAL_FUID_PRODUCTION) && aroused_state)
- desc += " They're leaking [initial(fluid_id.name)]."
+ var/datum/reagent/R = GLOB.chemical_reagents_list[fluid_id]
+ if(R)
+ desc += " They're leaking [lowertext(R.name)]."
var/string
if(owner)
if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"])
@@ -120,7 +122,6 @@
color = "#[D.features["breasts_color"]]"
size = D.features["breasts_size"]
shape = D.features["breasts_shape"]
- fluid_id = D.features["breasts_fluid"]
if(!D.features["breasts_producing"])
DISABLE_BITFIELD(genital_flags, GENITAL_FUID_PRODUCTION|CAN_CLIMAX_WITH|CAN_MASTURBATE_WITH)
if(!isnum(size))
diff --git a/modular_citadel/code/modules/arousal/organs/testicles.dm b/modular_citadel/code/modules/arousal/organs/testicles.dm
index e5b34926de..9573020417 100644
--- a/modular_citadel/code/modules/arousal/organs/testicles.dm
+++ b/modular_citadel/code/modules/arousal/organs/testicles.dm
@@ -68,7 +68,6 @@
shape = D.features["balls_shape"]
if(D.features["balls_shape"] == "Hidden")
ENABLE_BITFIELD(genital_flags, GENITAL_INTERNAL)
- fluid_id = D.features["balls_fluid"]
fluid_rate = D.features["balls_cum_rate"]
fluid_mult = D.features["balls_cum_mult"]
fluid_efficiency = D.features["balls_efficiency"]
diff --git a/modular_citadel/code/modules/client/loadout/_security.dm b/modular_citadel/code/modules/client/loadout/_security.dm
index 7a49b1f049..c9591540e6 100644
--- a/modular_citadel/code/modules/client/loadout/_security.dm
+++ b/modular_citadel/code/modules/client/loadout/_security.dm
@@ -5,7 +5,7 @@
restricted_roles = list("Head of Security")
/datum/gear/navybluehosberet
- name = "Head of security's Naviblue beret"
+ name = "Head of security's navyblue beret"
category = SLOT_HEAD
path = /obj/item/clothing/head/beret/sec/navyhos
restricted_roles = list("Head of Security")
@@ -13,13 +13,13 @@
/datum/gear/navybluejackethos
name = "head of security's navyblue jacket"
category = SLOT_WEAR_SUIT
- path = /obj/item/clothing/suit/security/hos
+ path = /obj/item/clothing/suit/armor/hos/navyblue
restricted_roles = list("Head of Security")
/datum/gear/navybluejacketofficer
name = "security officer's navyblue jacket"
category = SLOT_WEAR_SUIT
- path = /obj/item/clothing/suit/security/officer
+ path = /obj/item/clothing/suit/armor/navyblue
restricted_roles = list("Security Officer")
/datum/gear/navyblueofficerberet
@@ -37,7 +37,7 @@
/datum/gear/navybluejacketwarden
name = "warden navyblue jacket"
category = SLOT_WEAR_SUIT
- path = /obj/item/clothing/suit/security/warden
+ path = /obj/item/clothing/suit/armor/vest/warden/navyblue
restricted_roles = list("Warden")
/datum/gear/navybluewardenberet
diff --git a/modular_citadel/code/modules/client/preferences_savefile.dm b/modular_citadel/code/modules/client/preferences_savefile.dm
index 5584181a70..334f301dca 100644
--- a/modular_citadel/code/modules/client/preferences_savefile.dm
+++ b/modular_citadel/code/modules/client/preferences_savefile.dm
@@ -57,13 +57,11 @@
WRITE_FILE(S["feature_balls_size"], features["balls_size"])
WRITE_FILE(S["feature_balls_shape"], features["balls_shape"])
WRITE_FILE(S["feature_balls_sack_size"], features["balls_sack_size"])
- WRITE_FILE(S["feature_balls_fluid"], features["balls_fluid"])
//breasts features
WRITE_FILE(S["feature_has_breasts"], features["has_breasts"])
WRITE_FILE(S["feature_breasts_size"], features["breasts_size"])
WRITE_FILE(S["feature_breasts_shape"], features["breasts_shape"])
WRITE_FILE(S["feature_breasts_color"], features["breasts_color"])
- WRITE_FILE(S["feature_breasts_fluid"], features["breasts_fluid"])
WRITE_FILE(S["feature_breasts_producing"], features["breasts_producing"])
//vagina features
WRITE_FILE(S["feature_has_vag"], features["has_vag"])
diff --git a/modular_citadel/code/modules/custom_loadout/read_from_file.dm b/modular_citadel/code/modules/custom_loadout/read_from_file.dm
index 78124b0324..004757add4 100644
--- a/modular_citadel/code/modules/custom_loadout/read_from_file.dm
+++ b/modular_citadel/code/modules/custom_loadout/read_from_file.dm
@@ -18,13 +18,13 @@ GLOBAL_LIST(custom_item_list)
if(copytext(line,1,3) == "//") //Commented line, ignore. 3 == length("//") + 1
continue
var/ckey_str_sep = findtext(line, "|") //Process our stuff..
- var/char_str_sep = findtext(line, "|", ckey_str_sep + length(ckey_str_sep))
- var/job_str_sep = findtext(line, "|", char_str_sep + length(char_str_sep))
- var/item_str_sep = findtext(line, "|", job_str_sep + length(job_str_sep))
+ var/char_str_sep = findtext(line, "|", ckey_str_sep + length(line[ckey_str_sep]))
+ var/job_str_sep = findtext(line, "|", char_str_sep + length(line[char_str_sep]))
+ var/item_str_sep = findtext(line, "|", job_str_sep + length(line[job_str_sep]))
var/ckey_str = ckey(copytext(line, 1, ckey_str_sep))
- var/char_str = copytext(line, ckey_str_sep + length(ckey_str_sep), char_str_sep)
- var/job_str = copytext(line, char_str_sep + length(char_str_sep), job_str_sep)
- var/item_str = copytext(line, job_str_sep + length(job_str_sep), item_str_sep)
+ var/char_str = copytext(line, ckey_str_sep + length(line[ckey_str_sep]), char_str_sep)
+ var/job_str = copytext(line, char_str_sep + length(line[char_str_sep]), job_str_sep)
+ var/item_str = copytext(line, job_str_sep + length(line[job_str_sep]), item_str_sep)
if(!ckey_str || !char_str || !job_str || !item_str || !length(ckey_str) || !length(char_str) || !length(job_str) || !length(item_str))
log_admin("Errored custom_items_whitelist line: [line] - Component/separator missing!")
if(!islist(GLOB.custom_item_list[ckey_str]))
@@ -42,7 +42,7 @@ GLOBAL_LIST(custom_item_list)
for(var/item_string in item_strings)
var/path_str_sep = findtext(item_string, "=")
var/path = copytext(item_string, 1, path_str_sep) //Path to spawn
- var/amount = copytext(item_string, path_str_sep + length(path_str_sep)) //Amount to spawn
+ var/amount = copytext(item_string, path_str_sep + length(item_string[path_str_sep])) //Amount to spawn
//world << "DEBUG: Item string [item_string] processed"
amount = text2num(amount)
path = text2path(path)
diff --git a/modular_citadel/icons/vending_restock.dmi b/modular_citadel/icons/vending_restock.dmi
deleted file mode 100644
index 5df68f4e4c..0000000000
Binary files a/modular_citadel/icons/vending_restock.dmi and /dev/null differ
diff --git a/strings/flavor_objectives/ninja_helping.txt b/strings/flavor_objectives/ninja_helping.txt
new file mode 100644
index 0000000000..1280939b5c
--- /dev/null
+++ b/strings/flavor_objectives/ninja_helping.txt
@@ -0,0 +1,6 @@
+Nanotrasen want to make sure that their employees are on the up-and-up. Try to find any blackmail you can.
+Increase productivity however you can.
+You are a security ninja. Answer to the Head of Security, and follow space law.
+You are a cargo ninja. Answer to the Quartermaster, and do what they say.
+Nanotrasen want you to ensure maximum morale. Protect the members of the crew who are on break.
+Ensure that all the paperwork is being done.
\ No newline at end of file
diff --git a/strings/flavor_objectives/ninja_syndie.txt b/strings/flavor_objectives/ninja_syndie.txt
new file mode 100644
index 0000000000..4527c693f4
--- /dev/null
+++ b/strings/flavor_objectives/ninja_syndie.txt
@@ -0,0 +1,5 @@
+The Gorlex Marauders want you to teach the heads of staff a lesson they will never forget.
+Waffle Co. wants you To cause as much humorous terrorism against Nanotrasen as possible! How? We don’t care as long as it’s entertaining! Be as creative and exciting as possible when carrying out your dirty deeds. Have fun!
+The Tiger Cooperative want you to kill one of the station's beloved pets. Make a show of it, though you don't have to reveal yourself.
+The Animal Rights Consortium needs you to save the innocent non-humanoid creatures aboard Citadel Station by any means necessary. Use your best judgement to decide whether an animal or xenobiological is abused, but if they are, ensure the abuser is punished. Avoid killing too many people if possible, and if you do harm any creatures, you will be terminated upon extraction.
+Donk Co. wants ransom money, and you are going to get it. Your goal is to kidnap and crewmember you can get your hands on and hold them hostage until you get something of significant value. Try to work out the best deal you can. Remember that Higher Value Targets are generally going to get a better deal so try to prioritize heads of staff if possible. We do not approve of mindless killing of Nanotrasen employees, so don’t do it.
\ No newline at end of file
diff --git a/strings/flavor_objectives/traitor.txt b/strings/flavor_objectives/traitor.txt
new file mode 100644
index 0000000000..6d54c8ed9d
--- /dev/null
+++ b/strings/flavor_objectives/traitor.txt
@@ -0,0 +1,8 @@
+The Gorlex Marauders want you to teach the heads of staff a lesson they will never forget.
+Show Nanotrasen the utility of a 40% oxygen atmosphere.
+Waffle Co. wants you To cause as much humorous terrorism against Nanotrasen as possible! How? We don’t care as long as it’s entertaining! Be as creative and exciting as possible when carrying out your dirty deeds. Have fun!
+Kill one of the station's beloved pets. Make a show of it, though you don't have to reveal yourself.
+The Tiger Cooperative want you to get their illegal technology spread through the station.
+The Animal Rights Consortium needs you to save the innocent non-humanoid creatures aboard Citadel Station by any means necessary. Use your best judgement to decide whether an animal or xenobiological is abused, but if they are, ensure the abuser is punished. Avoid killing too many people if possible, and if you do harm any creatures, you will be terminated upon extraction.
+Donk Co. wants ransom money, and you are going to get it. Your goal is to kidnap and crewmember you can get your hands on and hold them hostage until you get something of significant value. Try to work out the best deal you can. Remember that Higher Value Targets are generally going to get a better deal so try to prioritize heads of staff if possible. We do not approve of mindless killing of Nanotrasen employees, so don’t do it.
+The Gorlex Marauders want you to steal as many shoes as possible. Lay broken glass everywhere.
\ No newline at end of file
diff --git a/strings/flavor_objectives/traitor/assistant.txt b/strings/flavor_objectives/traitor/assistant.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/strings/flavor_objectives/traitor/engineering.txt b/strings/flavor_objectives/traitor/engineering.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/strings/flavor_objectives/traitor/medical.txt b/strings/flavor_objectives/traitor/medical.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/strings/flavor_objectives/traitor/science.txt b/strings/flavor_objectives/traitor/science.txt
new file mode 100644
index 0000000000..6367e78da2
--- /dev/null
+++ b/strings/flavor_objectives/traitor/science.txt
@@ -0,0 +1 @@
+The Tiger Cooperative want you to slow down the process of research as much as possible.
\ No newline at end of file
diff --git a/strings/flavor_objectives/wizard.txt b/strings/flavor_objectives/wizard.txt
new file mode 100644
index 0000000000..e65a6052bc
--- /dev/null
+++ b/strings/flavor_objectives/wizard.txt
@@ -0,0 +1,4 @@
+Cause as much creative mayhem as you can aboard the station! The more outlandish your methods of achieving this, the better! Make sure there's a decent amount of crew alive to tell of your tale.
+The Wizard Federation have sent you to take over the station by force. Kill the captain and take their place. The magocracy starts now.
+You are the slipperiest wizard there ever was. Be loud, cause a ruckus, start a manhunt, and keep it going for as long as you can.
+The crew must be shown the wonders of magic. Do some tricks for them. If they stop moving, that means they're in awe.
\ No newline at end of file
diff --git a/tgstation.dme b/tgstation.dme
index 5ce515a212..3a1382a2df 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -487,6 +487,7 @@
#include "code\datums\elements\dusts_on_leaving_area.dm"
#include "code\datums\elements\earhealing.dm"
#include "code\datums\elements\ghost_role_eligibility.dm"
+#include "code\datums\elements\mob_holder.dm"
#include "code\datums\elements\wuv.dm"
#include "code\datums\helper_datums\events.dm"
#include "code\datums\helper_datums\getrev.dm"
@@ -581,6 +582,7 @@
#include "code\game\gamemodes\game_mode.dm"
#include "code\game\gamemodes\objective.dm"
#include "code\game\gamemodes\objective_items.dm"
+#include "code\game\gamemodes\objective_sabotage.dm"
#include "code\game\gamemodes\bloodsucker\bloodsucker.dm"
#include "code\game\gamemodes\bloodsucker\hunter.dm"
#include "code\game\gamemodes\brother\traitor_bro.dm"
@@ -1391,6 +1393,7 @@
#include "code\modules\antagonists\clockcult\clock_structures\traps\brass_skewer.dm"
#include "code\modules\antagonists\clockcult\clock_structures\traps\power_null.dm"
#include "code\modules\antagonists\clockcult\clock_structures\traps\steam_vent.dm"
+#include "code\modules\antagonists\collector\collector.dm"
#include "code\modules\antagonists\cult\blood_magic.dm"
#include "code\modules\antagonists\cult\cult.dm"
#include "code\modules\antagonists\cult\cult_comms.dm"
@@ -2125,7 +2128,6 @@
#include "code\modules\mob\living\damage_procs.dm"
#include "code\modules\mob\living\death.dm"
#include "code\modules\mob\living\emote.dm"
-#include "code\modules\mob\living\inhand_holder.dm"
#include "code\modules\mob\living\life.dm"
#include "code\modules\mob\living\living.dm"
#include "code\modules\mob\living\living_defense.dm"
@@ -2199,7 +2201,6 @@
#include "code\modules\mob\living\carbon\human\dummy.dm"
#include "code\modules\mob\living\carbon\human\emote.dm"
#include "code\modules\mob\living\carbon\human\examine.dm"
-#include "code\modules\mob\living\carbon\human\examine_vr.dm"
#include "code\modules\mob\living\carbon\human\human.dm"
#include "code\modules\mob\living\carbon\human\human_defense.dm"
#include "code\modules\mob\living\carbon\human\human_defines.dm"