Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes snow siding pathing. #2440

Merged
merged 2 commits into from
Nov 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions _maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 0 additions & 1 deletion _maps/RandomRuins/SpaceRuins/provinggrounds.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
23 changes: 10 additions & 13 deletions _maps/outpost/nanotrasen_asteroid.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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" = (
Expand Down
14 changes: 7 additions & 7 deletions code/game/objects/effects/decals/turfdecal/weather.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Binary file modified icons/turf/snow.dmi
Binary file not shown.