From 6d132c8b55524a0f40c179e6d1cd12116a076d2e Mon Sep 17 00:00:00 2001 From: SuhEugene <32931701+SuhEugene@users.noreply.github.com> Date: Fri, 3 Nov 2023 18:22:38 +0300 Subject: [PATCH 01/11] [MIRROR] Fix parrot drop message visible to observers --- .../mob/living/simple_animal/hostile/retaliate/parrot.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/parrot.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/parrot.dm index e0ef7bcc2d9b8..895a5c7253483 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/parrot.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/parrot.dm @@ -664,7 +664,7 @@ return -1 if(!held_item) - to_chat(usr, SPAN_WARNING("You have nothing to drop!")) + to_chat(src, SPAN_WARNING("You have nothing to drop!")) return 0 if(!drop_gently) From 9a23bf1683c57eb00b7536a2e2babdf343e16c04 Mon Sep 17 00:00:00 2001 From: SuhEugene <32931701+SuhEugene@users.noreply.github.com> Date: Fri, 3 Nov 2023 17:25:40 +0300 Subject: [PATCH 02/11] Make saferooms area datum better --- maps/sierra/areas/z3_sierra_deck2.dm | 2 - maps/sierra/areas/z4_sierra_deck1.dm | 4 +- maps/sierra/areas/z5_sierra_bridge.dm | 1 - maps/sierra/sierra_areas.dm | 4 + maps/sierra/z1-z5_sierra.dmm | 122 +++++++++++++------------- 5 files changed, 66 insertions(+), 67 deletions(-) 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/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm index 158dd5725b196..c4c36343d1fa1 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 @@ -67393,7 +67393,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 +67766,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 +69493,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 +80416,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 +80623,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 +82078,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 +89635,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 +90802,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 +92146,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 +99091,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 +100305,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 +100390,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 +100429,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 +101197,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 +102673,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 +109452,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 +111808,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 +113350,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 +117944,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 +119562,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 +121085,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 +121434,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 +123934,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 +124297,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 +126602,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 +128254,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 +133938,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 +140087,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 +140640,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 +144089,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 +146327,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 +146750,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 +148568,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 +152906,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 +154970,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 +155911,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 +158920,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 +159231,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 From 54aaf056cb2c22ab7b794769eb32eeb50ca42874 Mon Sep 17 00:00:00 2001 From: SuhEugene <32931701+SuhEugene@users.noreply.github.com> Date: Fri, 3 Nov 2023 17:26:26 +0300 Subject: [PATCH 03/11] Remove medbay botany sign --- maps/sierra/z1-z5_sierra.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm index c4c36343d1fa1..a044b9216ab9b 100644 --- a/maps/sierra/z1-z5_sierra.dmm +++ b/maps/sierra/z1-z5_sierra.dmm @@ -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" = ( From ca885e14205f97ee6f459fa91d3edae1b091085a Mon Sep 17 00:00:00 2001 From: SuhEugene <32931701+SuhEugene@users.noreply.github.com> Date: Fri, 3 Nov 2023 17:27:35 +0300 Subject: [PATCH 04/11] Add saferooms ability to bolt and unbolt --- maps/sierra/sierra_procs.dm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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() From 1a5311f9e4555573005dc3237a519512691920ee Mon Sep 17 00:00:00 2001 From: SuhEugene <32931701+SuhEugene@users.noreply.github.com> Date: Fri, 3 Nov 2023 19:49:08 +0300 Subject: [PATCH 05/11] Remove unecessary logging --- mods/don_loadout/code/donations/ooc_color.dm | 1 - 1 file changed, 1 deletion(-) 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 From 0c52da7bf166f1e360c7a66d11f47e9800a56cd0 Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Fri, 3 Nov 2023 21:28:36 +0300 Subject: [PATCH 06/11] =?UTF-8?q?=D0=A7=D0=B5=D0=B9=D0=BD=D0=B4=D0=B6?= =?UTF-8?q?=D0=BB=D0=BE=D0=B3=20=D0=B4=D0=BB=D1=8F=20PR=20#1325=20[ci=20sk?= =?UTF-8?q?ip]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html/changelogs/AutoChangeLog-sierra-pr-1325.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1325.yml diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1325.yml b/html/changelogs/AutoChangeLog-sierra-pr-1325.yml new file mode 100644 index 0000000000000..2314dd70dfb31 --- /dev/null +++ b/html/changelogs/AutoChangeLog-sierra-pr-1325.yml @@ -0,0 +1,6 @@ +author: SuhEugene +changes: + - {bugfix: 'Убрал логирование, которое возможно сильно нагружает сервер.'} + - {bugfix: Сделал бункеры рабочими.} + - {maptweak: Удалил табличку ботаники из меда.} +delete-after: true From 202457070a44cc717f895e80aefee9511a7ad311 Mon Sep 17 00:00:00 2001 From: SuhEugene <32931701+SuhEugene@users.noreply.github.com> Date: Fri, 3 Nov 2023 21:11:02 +0300 Subject: [PATCH 07/11] Fix UTF-8 browser charset --- code/datums/browser.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/browser.dm b/code/datums/browser.dm index a13b119528e42..2f671129dbaaa 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -84,7 +84,7 @@ return {" - + [head_content] From 856813d36bbb90965dcaad1e04da1d0fe9c4c91c Mon Sep 17 00:00:00 2001 From: LordNest <77477080+LordNest@users.noreply.github.com> Date: Fri, 3 Nov 2023 22:29:28 +0400 Subject: [PATCH 08/11] Fix Pioneer Corps spawnpoint (#1312) --- mods/_maps/farfleet/code/farfleet_crew.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 * ======= From 73d84574b75d48e771a2b449afffa09c1f37ca90 Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Fri, 3 Nov 2023 21:29:31 +0300 Subject: [PATCH 09/11] =?UTF-8?q?=D0=A7=D0=B5=D0=B9=D0=BD=D0=B4=D0=B6?= =?UTF-8?q?=D0=BB=D0=BE=D0=B3=20=D0=B4=D0=BB=D1=8F=20PR=20#1332=20[ci=20sk?= =?UTF-8?q?ip]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html/changelogs/AutoChangeLog-sierra-pr-1332.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1332.yml diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1332.yml b/html/changelogs/AutoChangeLog-sierra-pr-1332.yml new file mode 100644 index 0000000000000..c81203da0902b --- /dev/null +++ b/html/changelogs/AutoChangeLog-sierra-pr-1332.yml @@ -0,0 +1,4 @@ +author: SuhEugene +changes: + - {bugfix: Починил кодировку тикет-панели (в очередной раз).} +delete-after: true From b2329c4961898e21bdea374f9e6c9420daf42eda Mon Sep 17 00:00:00 2001 From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com> Date: Fri, 3 Nov 2023 21:30:12 +0300 Subject: [PATCH 10/11] =?UTF-8?q?=D0=A7=D0=B5=D0=B9=D0=BD=D0=B4=D0=B6?= =?UTF-8?q?=D0=BB=D0=BE=D0=B3=20=D0=B4=D0=BB=D1=8F=20PR=20#1312=20[ci=20sk?= =?UTF-8?q?ip]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html/changelogs/AutoChangeLog-sierra-pr-1312.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-sierra-pr-1312.yml diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1312.yml b/html/changelogs/AutoChangeLog-sierra-pr-1312.yml new file mode 100644 index 0000000000000..15a5b82f0cb11 --- /dev/null +++ b/html/changelogs/AutoChangeLog-sierra-pr-1312.yml @@ -0,0 +1,4 @@ +author: LordNest +changes: + - {bugfix: 'Пофиксил спавнпоинты пионеров, сержанта и инженера Пионерского Корпуса'} +delete-after: true From a2418b0f4a447b43af36cafdbbb4cb661d717f94 Mon Sep 17 00:00:00 2001 From: SuhEugene <32931701+SuhEugene@users.noreply.github.com> Date: Fri, 3 Nov 2023 21:50:04 +0300 Subject: [PATCH 11/11] Fix airlock red circle triangle exclaimnation mark icon --- code/game/machinery/doors/door.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 36e411a4c70bd..65ccd01bb031b 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -360,7 +360,6 @@ operating = DOOR_OPERATING_YES do_animate("opening") - icon_state = "door0" set_opacity(0) if(width > 1) set_fillers_opacity(0)