Gas scanner no longer scans the inside of your backpack on storage
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 420843512aca3..47d89c497e716 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -22204,7 +22204,29 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY sierra_genchangelog.p
\u0430 \u0437\u043E\u043D"
- maptweak: "\u041C\u0435\u043B\u043A\u043E\u0444\u0438\u043A\u0441\u044B \u0442\
\u043E \u0442\u0443\u0442 \u0442\u043E \u0442\u0430\u043C"
+ LordNest:
+ - bugfix: "\u041F\u043E\u0444\u0438\u043A\u0441\u0438\u043B \u0441\u043F\u0430\u0432\
+ \u043D\u043F\u043E\u0438\u043D\u0442\u044B \u043F\u0438\u043E\u043D\u0435\u0440\
+ \u043E\u0432, \u0441\u0435\u0440\u0436\u0430\u043D\u0442\u0430 \u0438 \u0438\
+ \u043D\u0436\u0435\u043D\u0435\u0440\u0430 \u041F\u0438\u043E\u043D\u0435\u0440\
+ \u0441\u043A\u043E\u0433\u043E \u041A\u043E\u0440\u043F\u0443\u0441\u0430"
SierraKomodo:
- bugfix: Cryopods can now be used to leave the round even if there's no power.
+ SuhEugene:
+ - bugfix: Fixed red circle triangle exclaimnation mark airlock opening icon
+ - bugfix: "\u041F\u043E\u0447\u0438\u043D\u0438\u043B \u043A\u043E\u0434\u0438\u0440\
+ \u043E\u0432\u043A\u0443 \u0442\u0438\u043A\u0435\u0442-\u043F\u0430\u043D\u0435\
+ \u043B\u0438 (\u0432 \u043E\u0447\u0435\u0440\u0435\u0434\u043D\u043E\u0439\
+ \ \u0440\u0430\u0437)."
+ - bugfix: "\u0423\u0431\u0440\u0430\u043B \u043B\u043E\u0433\u0438\u0440\u043E\u0432\
+ \u0430\u043D\u0438\u0435, \u043A\u043E\u0442\u043E\u0440\u043E\u0435 \u0432\u043E\
+ \u0437\u043C\u043E\u0436\u043D\u043E \u0441\u0438\u043B\u044C\u043D\u043E \u043D\
+ \u0430\u0433\u0440\u0443\u0436\u0430\u0435\u0442 \u0441\u0435\u0440\u0432\u0435\
+ \u0440."
+ - bugfix: "\u0421\u0434\u0435\u043B\u0430\u043B \u0431\u0443\u043D\u043A\u0435\u0440\
+ \u044B \u0440\u0430\u0431\u043E\u0447\u0438\u043C\u0438."
+ - maptweak: "\u0423\u0434\u0430\u043B\u0438\u043B \u0442\u0430\u0431\u043B\u0438\
+ \u0447\u043A\u0443 \u0431\u043E\u0442\u0430\u043D\u0438\u043A\u0438 \u0438\u0437\
+ \ \u043C\u0435\u0434\u0430."
emmanuelbassil:
- bugfix: Gas scanner no longer scans the inside of your backpack on storage
diff --git a/maps/sierra/areas/z3_sierra_deck2.dm b/maps/sierra/areas/z3_sierra_deck2.dm
index daae6d65dbb8d..f31317b09ba31 100644
--- a/maps/sierra/areas/z3_sierra_deck2.dm
+++ b/maps/sierra/areas/z3_sierra_deck2.dm
@@ -61,8 +61,6 @@
/area/crew_quarters/safe_room/seconddeck
name = "Second Deck - Safe Room"
- area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED
- holomap_color = HOLOMAP_AREACOLOR_ESCAPE
/area/maintenance/substation/seconddeck
name = "Second Deck - Substation"
diff --git a/maps/sierra/areas/z4_sierra_deck1.dm b/maps/sierra/areas/z4_sierra_deck1.dm
index 3149874b5067a..7fa05a52fb5a2 100644
--- a/maps/sierra/areas/z4_sierra_deck1.dm
+++ b/maps/sierra/areas/z4_sierra_deck1.dm
@@ -181,10 +181,8 @@
name = "First Deck - Living - Library"
holomap_color = HOLOMAP_AREACOLOR_CREW
-/area/crew_quarters/safe_room
+/area/crew_quarters/safe_room/firstdeck
name = "First Deck - Citadel"
- area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED
- holomap_color = HOLOMAP_AREACOLOR_ESCAPE
/* SECURITY AREAS
* ==============
diff --git a/maps/sierra/areas/z5_sierra_bridge.dm b/maps/sierra/areas/z5_sierra_bridge.dm
index dc71fe303eb88..75a12fad9e91b 100644
--- a/maps/sierra/areas/z5_sierra_bridge.dm
+++ b/maps/sierra/areas/z5_sierra_bridge.dm
@@ -129,7 +129,6 @@
/area/crew_quarters/safe_room/bridge
name = "Bridge - Safe Room"
- holomap_color = HOLOMAP_AREACOLOR_ESCAPE
/area/crew_quarters/heads/office/rd/cobed
icon_state = "heads_rd"
diff --git a/maps/sierra/sierra_areas.dm b/maps/sierra/sierra_areas.dm
index 0b56257448072..59038096d6ca9 100644
--- a/maps/sierra/sierra_areas.dm
+++ b/maps/sierra/sierra_areas.dm
@@ -65,6 +65,10 @@
icon_state = "thruster"
req_access = list(access_engine)
+/area/crew_quarters/safe_room
+ area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED
+ holomap_color = HOLOMAP_AREACOLOR_ESCAPE
+
#include "areas/shuttles.dm"
#include "areas/z1_sierra_deck4.dm"
#include "areas/z2_sierra_deck3.dm"
diff --git a/maps/sierra/sierra_procs.dm b/maps/sierra/sierra_procs.dm
index 7ef0e46fd101e..08b88383f6b0b 100644
--- a/maps/sierra/sierra_procs.dm
+++ b/maps/sierra/sierra_procs.dm
@@ -32,3 +32,19 @@
to_chat(Player, "
Вы не пережили события на [station_name()]...")
else
to_chat(Player, "
Вы не пережили события на [station_name()]...")
+
+/datum/map/bolt_saferooms()
+ for(var/atype in typesof(/area/crew_quarters/safe_room))
+ var/area/A = locate(atype)
+ if(istype(A))
+ for(var/obj/machinery/door/airlock/vault/bolted/V in A.contents)
+ if(!V.locked)
+ V.lock()
+
+/datum/map/unbolt_saferooms()
+ for(var/atype in typesof(/area/crew_quarters/safe_room))
+ var/area/A = locate(atype)
+ if(istype(A))
+ for(var/obj/machinery/door/airlock/vault/bolted/V in A.contents)
+ if(V.locked)
+ V.unlock()
diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm
index 158dd5725b196..a044b9216ab9b 100644
--- a/maps/sierra/z1-z5_sierra.dmm
+++ b/maps/sierra/z1-z5_sierra.dmm
@@ -1260,7 +1260,7 @@
},
/obj/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"ajO" = (
/obj/structure/catwalk,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -5963,7 +5963,7 @@
/obj/item/storage/briefcase/inflatable,
/obj/machinery/light,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"aSj" = (
/obj/structure/cable/green{
d1 = 4;
@@ -10570,7 +10570,7 @@
},
/obj/structure/curtain/open/bed,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"bDH" = (
/obj/machinery/stasis_cage,
/obj/floor_decal/industrial/outline/yellow,
@@ -20872,7 +20872,7 @@
dir = 5
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"dfu" = (
/obj/paint_stripe/nt_red,
/obj/paint/nt_white,
@@ -21417,7 +21417,7 @@
dir = 10
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"djF" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 6
@@ -21449,7 +21449,7 @@
},
/obj/structure/bed/chair/padded/blue,
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"djQ" = (
/obj/paint/red,
/obj/paint_stripe/white,
@@ -22028,7 +22028,7 @@
dir = 8
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"doM" = (
/obj/wallframe_spawn/reinforced/hull,
/obj/machinery/door/firedoor,
@@ -24190,7 +24190,7 @@
pixel_y = 24
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"dDN" = (
/obj/floor_decal/borderfloor{
dir = 1
@@ -24223,7 +24223,7 @@
dir = 1
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"dEo" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -27950,7 +27950,7 @@
},
/obj/structure/closet/emcloset/anchored,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"egL" = (
/obj/floor_decal/techfloor{
dir = 4
@@ -29114,7 +29114,7 @@
/obj/machinery/atmospherics/pipe/manifold4w/visible,
/obj/machinery/meter,
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"epy" = (
/obj/structure/cable{
d1 = 2;
@@ -29661,7 +29661,7 @@
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"etE" = (
/obj/floor_decal/corner/purple/three_quarters,
/obj/structure/railing/mapped{
@@ -33193,7 +33193,7 @@
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"eVU" = (
/obj/machinery/computer/station_alert/security,
/turf/simulated/floor/tiled/steel_ridged,
@@ -34787,7 +34787,7 @@
dir = 1
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"fhY" = (
/obj/floor_decal/techfloor/corner{
dir = 4
@@ -36450,7 +36450,7 @@
},
/obj/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"fvb" = (
/obj/structure/closet/crate/secure/weapon,
/turf/simulated/floor/plating,
@@ -37251,7 +37251,7 @@
dir = 4
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"fCD" = (
/obj/structure/table/rack,
/obj/item/stack/material/glass/fifty,
@@ -38130,7 +38130,7 @@
},
/obj/machinery/light,
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"fIN" = (
/obj/structure/cable{
d1 = 1;
@@ -52061,7 +52061,7 @@
},
/obj/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"hSu" = (
/obj/machinery/porta_turret{
dir = 8
@@ -55078,7 +55078,7 @@
/obj/floor_decal/techfloor/orange/corner,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"irx" = (
/obj/structure/cable/green{
d1 = 4;
@@ -55486,7 +55486,7 @@
/obj/item/bedsheet/green,
/obj/structure/curtain/open/bed,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"ivb" = (
/obj/machinery/atmospherics/pipe/simple/visible/green{
dir = 5
@@ -57389,7 +57389,7 @@
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"iKs" = (
/obj/structure/railing/mapped{
dir = 1
@@ -59286,7 +59286,7 @@
/obj/structure/bed/chair/padded/blue,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"iXz" = (
/obj/structure/flora/seaweed,
/obj/fluid_mapped,
@@ -63793,7 +63793,7 @@
dir = 1
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"jKg" = (
/obj/item/device/radio/intercom{
pixel_y = 26
@@ -65284,7 +65284,6 @@
/obj/machinery/hologram/holopad,
/obj/floor_decal/industrial/outline/yellow,
/obj/floor_decal/industrial/outline/yellow,
-/obj/structure/sign/botany,
/turf/simulated/floor/tiled/white/monotile,
/area/medical/sleeper)
"jVp" = (
@@ -67393,7 +67392,7 @@
dir = 1
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"kkO" = (
/obj/decal/cleanable/blood,
/obj/structure/foamedmetal,
@@ -67766,7 +67765,7 @@
pixel_x = 24
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"knQ" = (
/obj/machinery/light/small{
dir = 8
@@ -69493,7 +69492,7 @@
dir = 1
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"kAo" = (
/obj/structure/table/standard,
/obj/item/paper_bin,
@@ -80416,7 +80415,7 @@
"mhV" = (
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"mib" = (
/obj/structure/table/woodentable/maple,
/obj/item/reagent_containers/food/drinks/cans/speer,
@@ -80623,7 +80622,7 @@
dir = 6
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"mjZ" = (
/obj/machinery/door/airlock/command{
id_tag = "cmodoor";
@@ -82078,7 +82077,7 @@
pixel_x = 14
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"mwj" = (
/turf/simulated/wall/prepainted,
/area/maintenance/firstdeck/centralport)
@@ -89635,7 +89634,7 @@
dir = 8
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"nDA" = (
/obj/item/ladder_mobile,
/obj/item/stack/cable_coil,
@@ -90802,7 +90801,7 @@
/area/security/sierra/brig)
"nNm" = (
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"nNq" = (
/obj/structure/cable/green{
d1 = 1;
@@ -92146,7 +92145,7 @@
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"oao" = (
/obj/structure/closet/emcloset,
/obj/random/crayon,
@@ -99091,7 +99090,7 @@
},
/obj/structure/closet/crate/freezer/rations,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"pbE" = (
/obj/structure/cable/cyan{
d1 = 4;
@@ -100305,7 +100304,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"pjG" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -100390,7 +100389,7 @@
},
/obj/floor_decal/techfloor/orange/corner,
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"pkl" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -100429,7 +100428,7 @@
/obj/item/bedsheet/green,
/obj/structure/curtain/open/bed,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"pkw" = (
/turf/simulated/floor/reinforced,
/area/maintenance/fourthdeck/forestarboard)
@@ -101197,7 +101196,7 @@
"pqE" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"pqF" = (
/obj/machinery/door/firedoor,
/obj/wallframe_spawn/no_grille,
@@ -102673,7 +102672,7 @@
pixel_y = 4
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"pBQ" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/regular/open{
@@ -109452,7 +109451,7 @@
dir = 8
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"qFV" = (
/obj/floor_decal/industrial/hatch/grey,
/obj/structure/cable/green{
@@ -111808,7 +111807,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"qWV" = (
/obj/structure/cable/green{
d1 = 4;
@@ -113350,7 +113349,7 @@
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"rhN" = (
/obj/structure/cable{
d1 = 1;
@@ -117944,7 +117943,7 @@
dir = 9
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"rSz" = (
/obj/floor_decal/borderfloor,
/obj/floor_decal/corner/lime/border,
@@ -119562,7 +119561,7 @@
pixel_x = 24
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"seC" = (
/obj/structure/closet/l3closet/virology,
/obj/floor_decal/industrial/outline/yellow,
@@ -121085,7 +121084,7 @@
"sqF" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"sqQ" = (
/obj/structure/table/standard,
/obj/random/tech_supply,
@@ -121434,7 +121433,7 @@
/area/assembly/office)
"stL" = (
/turf/simulated/wall/r_wall/prepainted,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"stN" = (
/obj/structure/cable{
d1 = 1;
@@ -123934,7 +123933,7 @@
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"sKW" = (
/obj/structure/cable/green{
d1 = 1;
@@ -124297,7 +124296,7 @@
/obj/random_multi/single_item/boombox,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"sNE" = (
/obj/floor_decal/corner/darkblue/bordercorner2,
/obj/floor_decal/corner/darkblue/bordercorner2{
@@ -126602,7 +126601,7 @@
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"tfs" = (
/obj/machinery/newscaster/security_unit{
pixel_x = -32
@@ -128254,7 +128253,7 @@
pixel_x = 32
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"tuE" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -133938,7 +133937,7 @@
pixel_y = 26
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"unx" = (
/obj/structure/catwalk,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -140087,7 +140086,7 @@
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"vjK" = (
/obj/floor_decal/borderfloor,
/obj/floor_decal/steeldecal/steel_decals4{
@@ -140640,7 +140639,7 @@
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"vnW" = (
/obj/machinery/sleeper/survival_pod{
dir = 4
@@ -144089,7 +144088,7 @@
dir = 1
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"vQb" = (
/obj/floor_decal/industrial/warning/fulltile,
/obj/machinery/door/airlock/external/escapepod{
@@ -146327,7 +146326,7 @@
dir = 1
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"wfJ" = (
/obj/structure/table/standard,
/obj/item/storage/firstaid/surgery,
@@ -146750,7 +146749,7 @@
},
/obj/random/maintenance/solgov,
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"wiB" = (
/obj/structure/table/rack,
/obj/item/stack/flag/blue,
@@ -148568,7 +148567,7 @@
/obj/random/medical,
/obj/item/reagent_containers/food/snacks/proteinbar,
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"wxx" = (
/obj/floor_decal/borderfloor{
dir = 10
@@ -152906,7 +152905,7 @@
pixel_x = -14
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"xjQ" = (
/obj/structure/railing/mapped,
/obj/structure/table/rack,
@@ -154970,7 +154969,7 @@
/obj/item/clothing/head/helmet/space/emergency,
/obj/item/clothing/head/helmet/space/emergency,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"xBo" = (
/obj/floor_decal/carpet/blue2{
dir = 8
@@ -155911,7 +155910,7 @@
"xIG" = (
/obj/structure/bed/chair/padded/blue,
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"xII" = (
/obj/floor_decal/industrial/warning{
dir = 6
@@ -158920,7 +158919,7 @@
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"yeN" = (
/obj/structure/cable/green{
d1 = 1;
@@ -159231,7 +159230,7 @@
pixel_y = 32
},
/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/safe_room)
+/area/crew_quarters/safe_room/firstdeck)
"ygP" = (
/obj/machinery/atmospherics/unary/tank/air{
dir = 4
diff --git a/mods/_maps/farfleet/code/farfleet_crew.dm b/mods/_maps/farfleet/code/farfleet_crew.dm
index d61c6d239c3e3..9f20fd3a8f066 100644
--- a/mods/_maps/farfleet/code/farfleet_crew.dm
+++ b/mods/_maps/farfleet/code/farfleet_crew.dm
@@ -24,11 +24,11 @@
GLOB.admin_departments += "Lordania Pioneer Corps Relay"
/obj/submap_landmark/spawnpoint/away_iccgn_farfleet
- name = "ICCG Droptrooper"
+ name = "Pioneer Corps Trooper"
movable_flags = MOVABLE_FLAG_EFFECTMOVE
/obj/submap_landmark/spawnpoint/away_iccgn_farfleet/sergeant
- name = "ICCG Droptrooper Sergeant"
+ name = "Pioneer Corps Starszy Bosman"
/obj/submap_landmark/spawnpoint/away_iccgn_farfleet/captain
name = "Pioneer Corps Captain"
@@ -40,7 +40,7 @@
name = "Pioneer Corpsman"
/obj/submap_landmark/spawnpoint/away_iccgn_farfleet/gunner
- name = "Senior Technician"
+ name = "Pioneer Corps Technician"
/* ACCESS
* =======
diff --git a/mods/don_loadout/code/donations/ooc_color.dm b/mods/don_loadout/code/donations/ooc_color.dm
index 9ab8ed54a5713..9e1b8133318ad 100644
--- a/mods/don_loadout/code/donations/ooc_color.dm
+++ b/mods/don_loadout/code/donations/ooc_color.dm
@@ -23,7 +23,6 @@
continue
var/sent_message = "[create_text_tag("ooc", "OOC:", target)]
[ckey]: [SPAN_CLASS("message linkify", "[message]")]"
- log_debug(sent_message)
if(can_badmin)
receive_communication(C, target, SPAN_COLOR(ooc_color, SPAN_CLASS("ooc", sent_message)))
else