From a08aa9e3a21866cccfec1d39d112e6b299a949a4 Mon Sep 17 00:00:00 2001 From: Ergovisavi Date: Tue, 27 Jun 2017 06:29:26 -0700 Subject: [PATCH] Fixes resin stacking & allows lasers to pass through resin (#28842) * Fixes resin stacking Lets you shoot through Resin with lasers! * Small code cleanup * TRUE --- code/game/objects/effects/effect_system/effects_foam.dm | 4 ++++ code/game/objects/items/weapons/tanks/watertank.dm | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index 002e988dccb..f394cd0ebea 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -276,6 +276,10 @@ for(var/obj/item/Item in O) Item.extinguish() +/obj/structure/foamedmetal/resin/CanPass(atom/movable/mover, turf/target, height) + if(istype(mover) && mover.checkpass(PASSGLASS)) + return TRUE + . = ..() #undef ALUMINUM_FOAM #undef IRON_FOAM diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 7431d4ff850..416a843dc3b 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -295,6 +295,10 @@ if(nozzle_mode == RESIN_FOAM) if(!Adj|| !isturf(target)) return + for(var/S in target) + if(istype(S, /obj/effect/particle_effect/foam/metal/resin) || istype(S, /obj/structure/foamedmetal/resin)) + to_chat(user, "There's already resin here!") + return if(metal_synthesis_cooldown < 5) var/obj/effect/particle_effect/foam/metal/resin/F = new (get_turf(target)) F.amount = 0