From 8fe05c8171917cc8c3dcc4279055bb4af6b03458 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 4 Feb 2018 23:14:15 -0600 Subject: [PATCH] [MIRROR] Allows blobs to destroy decals (#5279) * Allows blobs to destroy decals * Allows blobs to destroy decals --- code/game/objects/effects/decals/decal.dm | 4 ++++ code/game/objects/effects/decals/misc.dm | 3 +++ code/game/objects/effects/effects.dm | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/code/game/objects/effects/decals/decal.dm b/code/game/objects/effects/decals/decal.dm index fed77da115..00d977deeb 100644 --- a/code/game/objects/effects/decals/decal.dm +++ b/code/game/objects/effects/decals/decal.dm @@ -8,6 +8,10 @@ if(!isturf(loc) || NeverShouldHaveComeHere(loc)) return INITIALIZE_HINT_QDEL +/obj/effect/decal/blob_act(obj/structure/blob/B) + if(B && B.loc == loc) + qdel(src) + /obj/effect/decal/proc/NeverShouldHaveComeHere(turf/T) return isspaceturf(T) || isclosedturf(T) || islava(T) || istype(T, /turf/open/water) || ischasm(T) diff --git a/code/game/objects/effects/decals/misc.dm b/code/game/objects/effects/decals/misc.dm index a973ec7c94..05ff9cb863 100644 --- a/code/game/objects/effects/decals/misc.dm +++ b/code/game/objects/effects/decals/misc.dm @@ -20,6 +20,9 @@ pass_flags = PASSTABLE | PASSGRILLE layer = FLY_LAYER +/obj/effect/decal/chempuff/blob_act(obj/structure/blob/B) + return + /obj/effect/decal/fakelattice name = "lattice" desc = "A lightweight support lattice." diff --git a/code/game/objects/effects/effects.dm b/code/game/objects/effects/effects.dm index 1ac6f8d007..410923fe25 100644 --- a/code/game/objects/effects/effects.dm +++ b/code/game/objects/effects/effects.dm @@ -18,7 +18,7 @@ /obj/effect/mech_melee_attack(obj/mecha/M) return 0 -/obj/effect/blob_act() +/obj/effect/blob_act(obj/structure/blob/B) return /obj/effect/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)