From 064a3fe398082ad09aa4b627ed2e2750bf9566d7 Mon Sep 17 00:00:00 2001 From: AnuvKH <65099811+AnuvKH@users.noreply.github.com> Date: Fri, 25 Aug 2023 21:32:13 -0700 Subject: [PATCH] NV fixes (#4240) # About the pull request Removal of deep ocean around the monsoon that was causing players to get stuck as well as removal of previously hidden incend ammo not caught. Tested, small map changes only. # Explain why it's good for the game As requested. # Testing Photographs and Procedure # Changelog :cl: maptweak: Fixed deep ocean around NV monsoon, removed incend ammo. /:cl: --- maps/map_files/New_Varadero/New_Varadero.dmm | 970 ++++++++++--------- 1 file changed, 490 insertions(+), 480 deletions(-) diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm index 4488d13b9bc7..12eaf10beabc 100644 --- a/maps/map_files/New_Varadero/New_Varadero.dmm +++ b/maps/map_files/New_Varadero/New_Varadero.dmm @@ -10422,9 +10422,9 @@ /area/varadero/interior/hall_SE) "gIE" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/river/ocean{ - name = "deep ocean"; - default_name = "deep ocean" +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, /area/varadero/exterior/eastocean) "gJs" = ( @@ -12234,14 +12234,29 @@ /turf/open/gm/dirt, /area/varadero/exterior/pontoon_beach) "hXg" = ( -/obj/structure/bed/chair{ - dir = 1 +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 }, -/obj/structure/machinery/light, -/turf/open/floor/shiva{ - icon_state = "green" +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 }, -/area/varadero/interior/court) +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/floor/wood, +/area/varadero/interior/bunks) "hXq" = ( /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" @@ -20020,9 +20035,9 @@ /obj/effect/landmark/lv624/fog_blocker{ time_to_dispel = 25000 }, -/turf/open/gm/river/ocean{ - name = "deep ocean"; - default_name = "deep ocean" +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, /area/varadero/exterior/eastocean) "mRq" = ( @@ -24543,9 +24558,9 @@ /obj/effect/landmark/lv624/fog_blocker{ time_to_dispel = 25000 }, -/turf/open/gm/river/ocean{ - name = "deep ocean"; - default_name = "deep ocean" +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, /area/varadero/exterior/eastocean) "pOa" = ( @@ -26178,7 +26193,10 @@ /obj/effect/landmark/lv624/fog_blocker{ time_to_dispel = 25000 }, -/turf/open/gm/coast/beachcorner2/north_west, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, /area/varadero/exterior/eastocean) "qNu" = ( /turf/open/gm/dirt{ @@ -28386,15 +28404,6 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/east) -"sfo" = ( -/obj/effect/landmark/lv624/fog_blocker{ - time_to_dispel = 25000 - }, -/turf/open/gm/river/ocean{ - name = "deep ocean"; - default_name = "deep ocean" - }, -/area/varadero/exterior/eastocean) "sfs" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -32084,9 +32093,9 @@ /obj/effect/landmark/lv624/fog_blocker{ time_to_dispel = 25000 }, -/turf/open/gm/river/ocean{ - name = "deep ocean"; - default_name = "deep ocean" +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, /area/varadero/exterior/eastocean) "uDw" = ( @@ -32241,7 +32250,8 @@ /obj/structure/barricade/handrail/wire{ layer = 3.1 }, -/obj/item/ammo_magazine/handful/shotgun/incendiary, +/obj/item/ammo_magazine/handful/shotgun/buckshot, +/obj/item/ammo_magazine/handful/shotgun/buckshot, /turf/open/floor/wood, /area/varadero/interior/bunks) "uIl" = ( @@ -34952,9 +34962,9 @@ }, /obj/structure/blocker/invisible_wall/water, /obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/river/ocean{ - name = "deep ocean"; - default_name = "deep ocean" +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, /area/varadero/exterior/farocean) "wkM" = ( @@ -54732,7 +54742,7 @@ eMi qRy moK hPD -hXg +uQH riJ aQc qqA @@ -55298,7 +55308,7 @@ bAE kIg nmC ben -uIj +hXg hDk aZb rAy @@ -67132,9 +67142,9 @@ bGU rqg gPi xeU -xFb -sfo -sfo +dRs +spv +spv pNZ kyj gPi @@ -67312,15 +67322,15 @@ gPi bko gPi qNr -xFb -sfo -xFb -sfo -sfo -sfo -xFb -xFb -sfo +dRs +spv +dRs +spv +spv +spv +dRs +dRs +spv ghN pZS kyD @@ -67490,19 +67500,19 @@ qoI gPi xfQ spv -xFb +dRs uDr -xFb +dRs uDr -xFb -sfo -xFb -xFb -sfo -sfo -xFb -sfo -sfo +dRs +spv +dRs +dRs +spv +spv +dRs +spv +spv ghN gRj bGU @@ -67670,21 +67680,21 @@ gPi gPi xfQ bUP -jFL -sfo -xFb -sfo -tHc -sfo -xFb -xFb +bUP +spv +dRs +spv +ulb +spv +dRs +dRs uDr -sfo -sfo -xFb -xFb -sfo -xFb +spv +spv +dRs +dRs +spv +dRs veV bko gPi @@ -67850,25 +67860,25 @@ bUP bUP bUP bUP -xFb -xFb -sfo -xFb -xFb -sfo -xFb -xFb -sfo -xFb -xFb -xFb -xFb -xFb -xFb -sfo -xFb -xFb -sfo +dRs +dRs +spv +dRs +dRs +spv +dRs +dRs +spv +dRs +dRs +dRs +dRs +dRs +dRs +spv +dRs +dRs +spv hwE ghN pZS @@ -68025,33 +68035,33 @@ xFb xFb dRs dRs -xFb -xFb -xFb -xFb dRs dRs -xFb -xFb -xFb +dRs +dRs +dRs +dRs +dRs +dRs +dRs uDr -xFb -xFb -sfo -xFb -xFb -sfo -xFb -xFb -xFb -xFb -xFb -sfo -sfo -xFb -sfo -xFb -xFb +dRs +dRs +spv +dRs +dRs +spv +dRs +dRs +dRs +dRs +dRs +spv +spv +dRs +spv +dRs +dRs aaG dkS qlw @@ -68201,38 +68211,38 @@ xFb xFb xFb xFb +dRs xFb xFb xFb xFb -xFb -xFb -xFb -tHc dRs -xFb -xFb dRs -xFb -xFb -sfo +ulb +dRs +dRs +dRs +dRs +dRs +dRs +spv uDr -xFb -xFb -sfo -xFb -xFb -xFb -sfo -sfo -xFb -xFb +dRs +dRs +spv +dRs +dRs +dRs +spv +spv +dRs +dRs mRk -sfo -xFb -sfo -xFb -xFb +spv +dRs +spv +dRs +dRs uDr ihC ghN @@ -68384,38 +68394,38 @@ xFb xFb xFb xFb -xFb -xFb -xFb dRs xFb xFb -xFb dRs xFb xFb -xFb dRs -xFb +dRs +dRs +dRs +dRs +dRs +dRs uDr -sfo -xFb -xFb -sfo -sfo -xFb -xFb -xFb -sfo +spv +dRs +dRs +spv +spv +dRs +dRs +dRs +spv uDr -sfo -sfo -xFb -xFb +spv +spv +dRs +dRs uDr -xFb +dRs uDr -xFb +dRs bUP ghN bGU @@ -68572,31 +68582,31 @@ xFb xFb byC xFb -xFb -xFb -xFb -byC -xFb -byC -xFb +dRs +dRs +dRs +exX +dRs +exX +dRs uDr -xFb +dRs gIE -xFb -xFb +dRs +dRs uDr -sfo -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -sfo -sfo -xFb +spv +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +spv +spv +dRs dRs bUP veV @@ -68759,26 +68769,26 @@ xVw wBp wBp wBp -rYC +bBV wBp xBH -xFb -xFb -xFb -xFb -xFb -xFb +dRs +dRs +dRs +dRs +dRs +dRs uDr -sfo -xFb -xFb -xFb -xFb -sfo +spv +dRs +dRs +dRs +dRs +spv uDr uDr -xFb -xFb +dRs +dRs dRs bUP bUP @@ -68934,7 +68944,7 @@ mPk mPk mPk mPk -mPk +pRa cJL mPk mPk @@ -68944,24 +68954,24 @@ mPk cJL mPk wkJ -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -sfo -sfo -sfo -sfo -sfo -sfo -xFb -xFb dRs -xFb +dRs +dRs +dRs +dRs +dRs +dRs +dRs +spv +spv +spv +spv +spv +spv +dRs +dRs +dRs +dRs bUP ucL ghN @@ -69120,31 +69130,31 @@ mPk mPk mPk mPk -mPk +pRa mPk mPk mPk mPk rYC -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs bUP ghN bGU @@ -69306,27 +69316,27 @@ mPk mPk mPk mPk -cJL -wBp -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -tHc +rUa +mPW +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +ulb bUP veV jTR @@ -69490,26 +69500,26 @@ mPk mPk mPk xVw -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs bUP ghN bGU @@ -69671,153 +69681,138 @@ mPk mPk mPk mPk -wBp -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -dRs -xFb -bUP -veV -jTR -bGU -bGU -bGU -vNB -rvD -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -bsf -bsf -bsf -bsf -bsf -ulv -uvd -uvd -uvd -brT -kjI -vNT -brT -reA -brT -brT -snS -kjI -kjI -snS -brT -brT -rmS -brT -qwU -nnk -brT -uvd -uvd -uvd -brT -bsf -bsf -bsf -bsf -bsf -pGs -pGs -pGs -wUU -"} -(175,1,1) = {" -wUU -nvv -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -pkl -kkF -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk -mPk +wBp +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +bUP +veV +jTR +bGU +bGU +bGU +vNB +rvD +pGs +pGs +pGs +pGs +pGs +pGs +pGs +pGs +pGs +bsf +bsf +bsf +bsf +bsf +ulv +uvd +uvd +uvd +brT +kjI +vNT +brT +reA +brT +brT +snS +kjI +kjI +snS +brT +brT +rmS +brT +qwU +nnk +brT +uvd +uvd +uvd +brT +bsf +bsf +bsf +bsf +bsf +pGs +pGs +pGs +wUU +"} +(175,1,1) = {" +wUU +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pkl +kkF +mPk +mPk +mPk +mPk +mPk +mPk +mPk mPk mPk mPk @@ -69853,27 +69848,42 @@ mPk mPk mPk mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa wBp byC +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs xFb xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -dRs bUP bUP ghN @@ -70038,26 +70048,26 @@ mPk rYC xFb xFb +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs +dRs xFb xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb +dRs +dRs tHc -bUP +jFL ghN bGU bGU @@ -70222,24 +70232,24 @@ byC xFb xFb xFb +dRs +dRs +dRs +dRs +dRs +dRs +dRs xFb +dRs +dRs xFb +dRs xFb +dRs +dRs xFb xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -xFb -bUP +jFL ghN vNB rvD @@ -70402,18 +70412,18 @@ mPk wBp xFb xFb -xFb +dRs xFb byC +dRs xFb -xFb -xFb +dRs byC xFb xFb -xFb +dRs byC -xFb +dRs xFb byC xFb @@ -70766,6 +70776,7 @@ mPk mPk mPk mPk +pRa mPk mPk mPk @@ -70775,14 +70786,13 @@ mPk mPk mPk mPk -mPk -mPk +pRa cJL mPk mPk mPk cJL -mPk +pRa mPk mPk mPk @@ -70951,10 +70961,10 @@ mPk mPk mPk mPk +pRa mPk -mPk -mPk -mPk +pRa +pRa mPk mPk mPk