From a472eee850eeef47760908fec95c14a6a10c9582 Mon Sep 17 00:00:00 2001 From: Purpose Date: Sat, 6 Oct 2018 19:22:20 +0100 Subject: [PATCH] dirt smoothing --- .../objects/effects/decals/Cleanable/misc.dm | 10 +++++++--- code/game/objects/effects/decals/cleanable.dm | 8 ++++++++ icons/effects/dirt.dmi | Bin 0 -> 6011 bytes 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 icons/effects/dirt.dmi diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm index 1b9880bb79a..e67d2c9954a 100644 --- a/code/game/objects/effects/decals/Cleanable/misc.dm +++ b/code/game/objects/effects/decals/Cleanable/misc.dm @@ -27,10 +27,16 @@ density = 0 anchored = 1 layer = 2 - icon = 'icons/effects/effects.dmi' + icon = 'icons/effects/dirt.dmi' icon_state = "dirt" + canSmoothWith = list(/obj/effect/decal/cleanable/dirt, /turf/simulated/wall, /obj/structure/falsewall) + smooth = SMOOTH_MORE mouse_opacity = 0 +/obj/effect/decal/cleanable/dirt/Initialize() + ..() + icon_state = "" + /obj/effect/decal/cleanable/dirt/blackpowder name = "black powder" mouse_opacity = 1 @@ -199,5 +205,3 @@ icon_state = "confetti1" random_icon_states = list("confetti1", "confetti2", "confetti3") anchored = 1 - - diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index 09baf2b7518..a3567ac5098 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -11,8 +11,16 @@ if(random_icon_states && length(src.random_icon_states) > 0) src.icon_state = pick(src.random_icon_states) create_reagents(100) + if(smooth) + queue_smooth(src) + queue_smooth_neighbors(src) ..() +/obj/effect/decal/cleanable/Destroy() + if(smooth) + queue_smooth_neighbors(src) + return ..() + /obj/effect/decal/cleanable/attackby(obj/item/W as obj, mob/user as mob,) if(istype(W, /obj/item/reagent_containers/glass) || istype(W, /obj/item/reagent_containers/food/drinks)) if(src.reagents && W.reagents && !noscoop) diff --git a/icons/effects/dirt.dmi b/icons/effects/dirt.dmi new file mode 100644 index 0000000000000000000000000000000000000000..5c8bc8f61a0c4e40e936dcfaf89e1c95036b8f57 GIT binary patch literal 6011 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