From 2e35184d41bdb42b799f0934fe3376ee7622f63b Mon Sep 17 00:00:00 2001 From: spartanbobby <71467726+spartanbobby@users.noreply.github.com> Date: Sat, 7 Oct 2023 15:46:29 +0100 Subject: [PATCH] Fixes incorrect floating objects/incorrect tiles/incorrect area/HEFA cult symbol on USS Almayer (#4556) # About the pull request Title # Explain why it's good for the game In order of title Bug, missed them in last PR, bug, HEFA knight stuff shouldn't be on Almayer Update: I'm also removing the Piano in this PR because it cant be slashed by xenos # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: maptweak: Fixes floating Cameras and Light in the maint tunnels north of south of brig maptweak: Fixes incorrect Shower tiles in maint shower north of engineering maptweak: Fixes incorrect area in maint south of VC bunk maptweak: Removes Piano from USS Almayer upper lifeboat area /:cl: --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 172 +++++++++++++-------- 1 file changed, 110 insertions(+), 62 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 5939075b1b5b..6dd8a24fe240 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -2371,11 +2371,18 @@ }, /area/almayer/living/offices/flight) "ahX" = ( -/obj/structure/machinery/light/small{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_f_s) +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hull/upper_hull/u_a_s) "ahY" = ( /obj/structure/machinery/light, /obj/structure/surface/table/woodentable/fancy, @@ -3482,6 +3489,15 @@ /obj/item/device/radio, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) +"alv" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_f_p) "alw" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2; @@ -8918,6 +8934,7 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Port Railguns and Viewing Room" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -9111,9 +9128,7 @@ /obj/structure/sink{ pixel_y = 24 }, -/turf/open/floor/almayer{ - icon_state = "sterile" - }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_s) "aCv" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -9216,9 +9231,7 @@ pixel_y = 16 }, /obj/item/tool/soap, -/turf/open/floor/almayer{ - icon_state = "sterile" - }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_s) "aDg" = ( /obj/structure/machinery/light/small{ @@ -12149,8 +12162,15 @@ }, /area/almayer/medical/upper_medical) "aQA" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, /turf/open/floor/almayer{ - icon_state = "sterile" + icon_state = "dark_sterile" }, /area/almayer/hull/upper_hull/u_a_s) "aQF" = ( @@ -12278,8 +12298,15 @@ /obj/structure/mirror{ pixel_x = 28 }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, /turf/open/floor/almayer{ - icon_state = "sterile" + icon_state = "dark_sterile" }, /area/almayer/hull/upper_hull/u_a_s) "aRo" = ( @@ -17001,9 +17028,7 @@ /obj/structure/toilet{ dir = 1 }, -/turf/open/floor/almayer{ - icon_state = "sterile" - }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_s) "bph" = ( /obj/structure/bed/chair/comfy/orange, @@ -17466,9 +17491,7 @@ /area/almayer/living/bridgebunks) "brT" = ( /obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "sterile" - }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_s) "brW" = ( /obj/structure/disposalpipe/segment, @@ -17520,11 +17543,11 @@ /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) "bsf" = ( -/obj/structure/largecrate/random, /obj/structure/machinery/camera/autoname/almayer{ dir = 8; name = "ship-grade camera" }, +/obj/structure/largecrate/random, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -24088,6 +24111,13 @@ icon_state = "blue" }, /area/almayer/squads/delta) +"bVr" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_p) "bVt" = ( /obj/structure/machinery/door_control{ id = "laddersoutheast"; @@ -32527,7 +32557,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/living/tankerbunks) +/area/almayer/hull/lower_hull/l_f_p) "eim" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -32712,6 +32742,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) "elq" = ( @@ -33966,8 +33997,8 @@ pixel_y = -32 }, /obj/structure/sign/safety/rewire{ - pixel_y = -32; - pixel_x = 14 + pixel_x = 14; + pixel_y = -32 }, /turf/open/floor/almayer{ icon_state = "mono" @@ -35567,15 +35598,13 @@ }, /area/almayer/living/starboard_garden) "fwF" = ( -/obj/structure/largecrate/random/case/double, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" +/obj/structure/machinery/light/small{ + dir = 4 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hull/upper_hull/u_f_p) +/area/almayer/hull/upper_hull/u_f_s) "fwY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -36530,6 +36559,7 @@ /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -43558,12 +43588,14 @@ }, /area/almayer/hull/lower_hull/l_f_p) "iVY" = ( -/obj/effect/decal/hefa_cult_decals/d32, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "orange" +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, -/area/almayer/engineering/upper_engineering/starboard) +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cic_hallway) "iVZ" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/folder/black, @@ -55713,6 +55745,16 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) +"odM" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cic_hallway) "odN" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -57123,6 +57165,7 @@ "oIm" = ( /obj/structure/prop/server_equipment/broken, /turf/open/floor/almayer{ + dir = 1; icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) @@ -59313,9 +59356,9 @@ }, /area/almayer/medical/lower_medical_medbay) "pLv" = ( -/obj/structure/device/broken_moog, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/almayer{ + dir = 1; icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) @@ -60180,8 +60223,8 @@ pixel_y = 32 }, /obj/structure/sign/safety/rewire{ - pixel_y = 32; - pixel_x = 14 + pixel_x = 14; + pixel_y = 32 }, /turf/open/floor/almayer{ icon_state = "mono" @@ -63503,6 +63546,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) "rzN" = ( @@ -75687,11 +75731,15 @@ }, /area/almayer/command/airoom) "wyK" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/open/floor/almayer{ - icon_state = "orangecorner" + dir = 1; + icon_state = "silvercorner" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/shipboard/brig/cic_hallway) "wyO" = ( /obj/structure/largecrate/random/barrel/red, /obj/structure/prop/invuln/overhead_pipe{ @@ -94544,7 +94592,7 @@ bdH aad aag pCi -nfI +wcn rPC cQv cQv @@ -94747,8 +94795,8 @@ aaf aag aag pCi -bsf -ahX +hKi +wcn aFN wcn cXZ @@ -94785,7 +94833,7 @@ kIV hUc wNU mnm -fwF +sIk xEF aag aag @@ -94950,8 +94998,8 @@ adG adG adG adG -rPC -rPC +bsf +fwF dav rPC rPC @@ -94988,7 +95036,7 @@ mnm kIV wNU kIV -kIV +alv tuA tuA tuA @@ -96603,13 +96651,13 @@ vGA uwN pYX xuZ -jnD +wyK elh rzM aBN fQS -tJo -tJo +bVr +bVr bpd bqT vZv @@ -96805,8 +96853,8 @@ awz vSN mPj rWs -mIy -eEw +iVY +odM lPC mgy wWT @@ -104103,7 +104151,7 @@ yjM qbO aqw hnI -ayT +bYe amO wZM aPm @@ -104712,7 +104760,7 @@ aiX aKG amb aiX -bYe +ayT amO avj qFl @@ -105924,10 +105972,10 @@ bbL bbL kij bbL -bbL -bbL -yfv bYe +bYe +yfv +bbL aWl bbL bbL @@ -106356,8 +106404,8 @@ baw baw baw mnA -aJU -aJU +baw +baw qVM iBt iBt @@ -106958,7 +107006,7 @@ coa aoe ahr akU -ajC +bYe xCX csz vGk @@ -118527,7 +118575,7 @@ dxv cnS cnv ajt -anf +bYe xCX csz csz @@ -123196,7 +123244,7 @@ fDG alL alG aYD -wyK +aTS qgK tEB uBM @@ -126003,7 +126051,7 @@ pVZ xlX psm psm -jFX +ahX psm psm fnZ @@ -133926,7 +133974,7 @@ aaa aaa uMc iKc -iVY +uiG cMN trB nVX