From c8bcaa3cb9d9d27d85af0a9ba809fdcee8a9615a Mon Sep 17 00:00:00 2001 From: zevo <95449138+Zevotech@users.noreply.github.com> Date: Mon, 6 Nov 2023 22:13:39 -0500 Subject: [PATCH] Fixes snow siding pathing. (#2440) ## About The Pull Request Fixes the pathing for the snow siding decals used on all of three maps. It crashed my SDMM once so im fixing it. Maps affected by this are updated to use the newly pathed decals. Also makes the surrounded snow decal usable since the sprite was previously unused. ## Why It's Good For The Game ![image](https://github.com/shiptest-ss13/Shiptest/assets/95449138/7b261aab-47b2-4773-941e-bdf56d5ef47e) Previously was an incorrectly pathed decal that would crash SDMM if you tried to generate its directions. ## Changelog :cl: fix: Fixed snow siding decal pathing add: Surrounded snow siding turf decal /:cl: --- .../IceRuins/icemoon_surface_engioutpost.dmm | 12 +++++---- .../RandomRuins/SpaceRuins/provinggrounds.dmm | 1 - _maps/outpost/nanotrasen_asteroid.dmm | 23 ++++++++---------- .../effects/decals/turfdecal/weather.dm | 14 +++++------ icons/turf/snow.dmi | Bin 54118 -> 54122 bytes 5 files changed, 24 insertions(+), 26 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm index 2dd6c4cbea84..661098d293d2 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm @@ -1456,32 +1456,34 @@ /area/ruin) "dA" = ( /obj/effect/turf_decal/trimline/transparent/neutral/filled/line, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 10 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, +/obj/effect/turf_decal/weather/snow{ + dir = 10 + }, /turf/open/floor/plasteel/dark{ initial_gas_mix = "ICEMOON_ATMOS" }, /area/ruin) "dB" = ( /obj/effect/turf_decal/trimline/transparent/neutral/filled/line, -/obj/effect/turf_decal/weather/snow/corner, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, +/obj/effect/turf_decal/weather/snow, /turf/open/floor/plasteel/dark{ initial_gas_mix = "ICEMOON_ATMOS" }, /area/ruin) "dC" = ( /obj/effect/turf_decal/trimline/transparent/neutral/filled/line, -/obj/effect/turf_decal/weather/snow/corner, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, +/obj/effect/turf_decal/weather/snow{ + dir = 6 + }, /turf/open/floor/plasteel/dark{ initial_gas_mix = "ICEMOON_ATMOS" }, diff --git a/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm b/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm index 521b2beac456..98a95198de5a 100644 --- a/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm +++ b/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm @@ -324,7 +324,6 @@ /area/ruin/space/has_grav/syndicircle/winter) "iR" = ( /obj/effect/mine/shrapnel, -/obj/effect/turf_decal/weather/snow/corner, /obj/item/stack/tile/mineral/snow, /obj/machinery/light/dim/directional/west, /obj/effect/decal/cleanable/dirt/dust, diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm index e127c600d71e..39a1808839b2 100644 --- a/_maps/outpost/nanotrasen_asteroid.dmm +++ b/_maps/outpost/nanotrasen_asteroid.dmm @@ -580,16 +580,13 @@ pixel_y = -3 }, /obj/item/toy/plush/beeplushie, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 5 - }, -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6 - }, /obj/item/reagent_containers/food/drinks/mug/tea{ pixel_y = -14; pixel_x = -4 }, +/obj/effect/turf_decal/weather/snow/surround{ + dir = 4 + }, /turf/open/floor/plating/asteroid/snow/under/lit, /area/outpost/external) "cm" = ( @@ -998,7 +995,7 @@ /area/outpost/maintenance/fore) "dO" = ( /obj/effect/turf_decal/snow, -/obj/effect/turf_decal/weather/snow/corner{ +/obj/effect/turf_decal/weather/snow{ dir = 8 }, /turf/open/floor/concrete/reinforced, @@ -3253,7 +3250,7 @@ pixel_y = 3; pixel_x = -1 }, -/obj/effect/turf_decal/weather/snow/corner{ +/obj/effect/turf_decal/weather/snow{ dir = 9 }, /turf/open/floor/plating/asteroid/snow/under/lit, @@ -6619,7 +6616,7 @@ /area/outpost/hallway/central) "xk" = ( /obj/structure/bonfire/prelit, -/obj/effect/turf_decal/weather/snow/corner{ +/obj/effect/turf_decal/weather/snow{ dir = 1 }, /turf/open/floor/plating/asteroid/snow/under/lit, @@ -9282,7 +9279,7 @@ pixel_y = 5; pixel_x = 1 }, -/obj/effect/turf_decal/weather/snow/corner{ +/obj/effect/turf_decal/weather/snow{ dir = 10 }, /turf/open/floor/plating/asteroid/snow/under/lit, @@ -11618,13 +11615,13 @@ /turf/open/floor/concrete/slab_3, /area/outpost/hallway/central) "Os" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 6 - }, /obj/item/shovel, /obj/item/flashlight/lantern{ pixel_x = 7 }, +/obj/effect/turf_decal/weather/snow{ + dir = 6 + }, /turf/open/floor/plating/asteroid/snow/under/lit, /area/outpost/external) "Ot" = ( diff --git a/code/game/objects/effects/decals/turfdecal/weather.dm b/code/game/objects/effects/decals/turfdecal/weather.dm index d73af55ef7e9..04dcf807314a 100644 --- a/code/game/objects/effects/decals/turfdecal/weather.dm +++ b/code/game/objects/effects/decals/turfdecal/weather.dm @@ -2,14 +2,14 @@ name = "sandy floor" icon_state = "sandyfloor" -/obj/effect/turf_decal/weather/snow - name = "snowy floor" - icon_state = "snowyfloor" - -/obj/effect/turf_decal/weather/snow/corner - name = "snow corner piece" +/obj/effect/turf_decal/weather/snow //add a corner decal if you resprite this to look like the other sidings + name = "snow siding" icon = 'icons/turf/snow.dmi' - icon_state = "snow_corner" + icon_state = "snow_side" + +/obj/effect/turf_decal/weather/snow/surround + name = "surround" + icon_state = "snow_surround" /obj/effect/turf_decal/weather/dirt name = "dirt siding" diff --git a/icons/turf/snow.dmi b/icons/turf/snow.dmi index 594a4f91e6c232f53cf18d94baf4239aea43eaa8..6801384e018239a0f350ad005b2ddddde5453de3 100644 GIT binary patch delta 397 zcmV;80doH4rUUAx1CS(tX?j#xbVOxyV{&P5bZKvH004NLm6X9w!ax*7*X>ulz_ywW zpyHw%12HV%7n;fpZ6myA=Cw@xdlwQ37M$y{$vKnBN$-s5W%;_=&|gr^-2ZJ(`4s=tAkT2$owXI@1u|oq0?X>-Ns@u12Q;zgAu#FHvZh&NT1fJL1{)H7BUjE~hfSbp>cRhDpf zbE%jA<3WVW+Dp&2+)CvY8|hGkW;@iNArCcZ+CvQ*`%r`CKh&THVW>f`@P+29?Yp!8 r)$}0JHMguWEjJ5VtXJt5#?q4YPizx_001BWNklrh+Dq zd76aAwlx(r9;Hd`nyPMpKC~@cM+FU(C2Y3h+4(`5*v2arG)t3zoi7hgsUY)*)y{kA z*q-UhKeX+tGia`Zl`oI?T;rFAukyJs+lJ#eIdRrEyEb}gvvu#z#}7SmISLvS9HHPC z1t%!@go0BPd`7_Q%rs4`+m~Nd&?wJLW-^m!Cc9Lj{7`x*JCq#C4W))M#}g|{fS`Cy zWeM?|$`ax|l_kV~gDOji7gd%JPpT{--c(rv7Ig+uFIZJDK33mg`Oz0tS;E83rC$Dz z2NB*>UOKj$t(0D|k@hucwtWp6a$kd{-PfS8_cdt#eGPgL`Wo~KUueGEemHxtrU#L> rzGV$*v7Xa>wM@SOlQ)yu4Yb@<001BWNkl