From da9d1eb78667f4b51239be0ed8064e217b68c9b4 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Fri, 27 May 2016 16:46:53 +0100 Subject: [PATCH 1/3] Fixes snow and adjusts a definition --- code/game/turfs/flooring/flooring.dm | 21 ++++++++++++++++ code/game/turfs/flooring/flooring_premade.dm | 24 +++++++++++++++++-- icons/turf/snow.dmi | Bin 24484 -> 21377 bytes 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm index ad7a0f91ce..b9c5f0ea27 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -56,6 +56,27 @@ var/list/flooring_types flags = TURF_HAS_EDGES | TURF_REMOVE_SHOVEL build_type = null +/decl/flooring/snow + name = "snow" + desc = "A layer of many tiny bits of frozen water. It's hard to tell how deep it is." + icon = 'icons/turf/snow.dmi' + icon_base = "snow" + flags = TURF_HAS_EDGES + +/decl/flooring/snow/gravsnow + name = "snow" + icon_base = "gravsnow" + +/decl/flooring/snow/plating + name = "snowy plating" + desc = "Steel plating coated with a light layer of snow." + icon = 'icons/turf/snow.dmi' + icon_base = "plating" + flags = null + +/decl/flooring/snow/plating/drift + icon_base = "platingdrift" + /decl/flooring/carpet name = "carpet" desc = "Imported and comfy." diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm index 73bb5f71f8..2f23a96623 100644 --- a/code/game/turfs/flooring/flooring_premade.dm +++ b/code/game/turfs/flooring/flooring_premade.dm @@ -45,6 +45,27 @@ icon_state = "reinforced" initial_flooring = /decl/flooring/reinforced +/turf/simulated/floor/snow + name = "snow" + icon = 'icons/turf/floors.dmi' + icon_state = "snow" + initial_flooring = /decl/flooring/snow + +/turf/simulated/floor/snow/gravsnow + name = "snow" + icon_state = "gravsnow" + initial_flooring = /decl/flooring/snow/gravsnow + +/turf/simulated/floor/snow/plating + name = "snowy playing" + icon_state = "plating" + initial_flooring = /decl/flooring/snow/plating + +/turf/simulated/floor/snow/plating/drift + name = "snowy plating" + icon_state = "platingdrift" + initial_flooring = /decl/flooring/snow/plating/drift + /turf/simulated/floor/reinforced/airless oxygen = 0 nitrogen = 0 @@ -195,7 +216,6 @@ /turf/simulated/floor/airless/lava /turf/simulated/floor/light -/turf/simulated/floor/snow /* /turf/simulated/floor/beach /turf/simulated/floor/beach/sand @@ -204,5 +224,5 @@ /turf/simulated/floor/beach/water /turf/simulated/floor/beach/water/ocean */ -/turf/simulated/floor/plating/snow /turf/simulated/floor/airless/ceiling +/turf/simulated/floor/plating \ No newline at end of file diff --git a/icons/turf/snow.dmi b/icons/turf/snow.dmi index 2a6b8625ba032197fb5d0875d912b69c3eda707d..2e453d5d545025db01883b816be5e8ee59f2cb0f 100644 GIT binary patch delta 3596 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 S@YZ4g0000lQ4(j9{_ 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 Yed8DGZ_}P-K){!Vimq~vl5NEQ0mz^DTL1t6 From f778f29b9d4fa8c4f8f3ae9feb374a16218f5aa2 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sat, 28 May 2016 01:45:03 +0100 Subject: [PATCH 2/3] Finishes snowy stuff, adds overlays etc --- code/game/objects/effects/overlays.dm | 42 +++++++++++++++++++ code/game/turfs/flooring/flooring.dm | 5 +-- code/game/turfs/flooring/flooring_premade.dm | 6 +-- code/game/turfs/simulated/floor_types.dm | 2 + icons/turf/overlays.dmi | Bin 6730 -> 14009 bytes icons/turf/snow.dmi | Bin 21377 -> 21385 bytes 6 files changed, 49 insertions(+), 6 deletions(-) diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index cc52bf7bbf..71d97169bb 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -52,3 +52,45 @@ ..() pixel_x += rand(-10, 10) pixel_y += rand(-10, 10) + +/obj/effect/overlay/snow + name = "snow" + icon = 'icons/turf/overlays.dmi' + icon_state = "snow" + layer = 10 + +/obj/effect/overlay/snow/floor + icon_state = "snowfloor" + +/obj/effect/overlay/snow/floor/edges + icon_state = "snow_edges" + +/obj/effect/overlay/snow/floor/surround + icon_state = "snow_surround" + +/obj/effect/overlay/snow/airlock + icon_state = "snowairlock" + +/obj/effect/overlay/snow/floor/north + icon_state = "snowfloor_n" + +/obj/effect/overlay/snow/floor/south + icon_state = "snowfloor_s" + +/obj/effect/overlay/snow/floor/east + icon_state = "snowfloor_e" + +/obj/effect/overlay/snow/floor/west + icon_state = "snowfloor_w" + +/obj/effect/overlay/snow/wall/north + icon_state = "snowwall_n" + +/obj/effect/overlay/snow/wall/south + icon_state = "snowwall_s" + +/obj/effect/overlay/snow/wall/east + icon_state = "snowwall_e" + +/obj/effect/overlay/snow/wall/west + icon_state = "snowwall_w" \ No newline at end of file diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm index b9c5f0ea27..bee9159e3c 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -70,12 +70,11 @@ var/list/flooring_types /decl/flooring/snow/plating name = "snowy plating" desc = "Steel plating coated with a light layer of snow." - icon = 'icons/turf/snow.dmi' - icon_base = "plating" + icon_base = "snowyplating" flags = null /decl/flooring/snow/plating/drift - icon_base = "platingdrift" + icon_base = "snowyplayingdrift" /decl/flooring/carpet name = "carpet" diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm index 2f23a96623..86ec1b2891 100644 --- a/code/game/turfs/flooring/flooring_premade.dm +++ b/code/game/turfs/flooring/flooring_premade.dm @@ -47,7 +47,7 @@ /turf/simulated/floor/snow name = "snow" - icon = 'icons/turf/floors.dmi' + icon = 'icons/turf/snow.dmi' icon_state = "snow" initial_flooring = /decl/flooring/snow @@ -58,12 +58,12 @@ /turf/simulated/floor/snow/plating name = "snowy playing" - icon_state = "plating" + icon_state = "snowyplating" initial_flooring = /decl/flooring/snow/plating /turf/simulated/floor/snow/plating/drift name = "snowy plating" - icon_state = "platingdrift" + icon_state = "snowyplayingdrift" initial_flooring = /decl/flooring/snow/plating/drift /turf/simulated/floor/reinforced/airless diff --git a/code/game/turfs/simulated/floor_types.dm b/code/game/turfs/simulated/floor_types.dm index e5341c7719..0d3e43bbfa 100644 --- a/code/game/turfs/simulated/floor_types.dm +++ b/code/game/turfs/simulated/floor_types.dm @@ -40,3 +40,5 @@ name = "skipjack floor" oxygen = 0 nitrogen = MOLES_N2STANDARD + MOLES_O2STANDARD + + diff --git a/icons/turf/overlays.dmi b/icons/turf/overlays.dmi index 4a489751273a1d2ff4c2ab211278426d17e8dffd..a96f6b14bc5bdf9b01fe131f6679f85b85adf9f4 100644 GIT binary patch literal 14009 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 diff --git a/icons/turf/snow.dmi b/icons/turf/snow.dmi index 2e453d5d545025db01883b816be5e8ee59f2cb0f..5871cbdfc632768a190e1d40333cd75af74aeebe 100644 GIT binary patch delta 199 zcmV;&0671FrvZtl0gxnruzFNjbVOxyV{&P5bZKvH004NLjnKUcgD?=l@i}>lL-*1T zhb~!)QXKRZN+2;Fw29nB#kcPutrXgl?GAn%e=dhhb*)<{n_5nm7=s4|#cnUfj3)M= z;B=Itx9Iw~E*y2Vpde!(=1dBM#Gv3HMMwH!*ZBk8tZ|k%dj3N?c_a#>H=8cLYe#xY zDtN)fiZ@R#VISsYxa)}CCH-R=?s`G*3}F|4ozJ0aODLOKJ^{JaeL4;$?nJTGtWw!_ BTS@=` delta 191 zcmV;w06_nVrvZVd0gxnrsCrabbVOxyV{&P5bZKvH004NLjn2yo!Y~kp;dSy9L%SC* zUAW0cS|p416(o=}8PKFm()RUTR4sy+>}KHO@Rx9E&a#8Lm3%T3F?bMAZMK}vsFMQ$ zhdpP`pmk|^Vp7R~fFk-Z7o2IN2m*GT^`vfQx!=&mXlvq1k3VQK9Erl{^{T7S+LD^G t3Z5{t;>EK|hO0{G?cb1x(}aEcHd;c{)lj#R-vN9Qc(oU;kD#&LtWxB%U-19{ From d32a708ec72a361cbd3eecadbfb1c185ab18e1ce Mon Sep 17 00:00:00 2001 From: Yoshax Date: Wed, 1 Jun 2016 16:01:36 +0100 Subject: [PATCH 3/3] Fixes snowy overlays layering --- code/game/objects/effects/overlays.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index 71d97169bb..4fc07a2a8a 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -57,10 +57,11 @@ name = "snow" icon = 'icons/turf/overlays.dmi' icon_state = "snow" - layer = 10 + anchored = 1 /obj/effect/overlay/snow/floor icon_state = "snowfloor" + layer = 2.01 //Just above floor /obj/effect/overlay/snow/floor/edges icon_state = "snow_edges" @@ -70,6 +71,7 @@ /obj/effect/overlay/snow/airlock icon_state = "snowairlock" + layer = 3.2 //Just above airlocks /obj/effect/overlay/snow/floor/north icon_state = "snowfloor_n" @@ -85,6 +87,7 @@ /obj/effect/overlay/snow/wall/north icon_state = "snowwall_n" + layer = 5 //Same as lights so humans can stand under it /obj/effect/overlay/snow/wall/south icon_state = "snowwall_s"