From 4486ae01ecde7af7ae3d7de6d8490e380e918c00 Mon Sep 17 00:00:00 2001 From: dearmochi Date: Mon, 14 Dec 2020 18:10:28 +0100 Subject: [PATCH] Fixes snowballs damaging structures (#15111) * Fixes snowballs damaging structures * Check for blocking, isliving --- code/game/objects/effects/snowcloud.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/objects/effects/snowcloud.dm b/code/game/objects/effects/snowcloud.dm index f0eb0b79c8d..b8d193e13a3 100644 --- a/code/game/objects/effects/snowcloud.dm +++ b/code/game/objects/effects/snowcloud.dm @@ -125,12 +125,15 @@ /obj/item/snowball name = "snowball" desc = "Get ready for a snowball fight!" - throwforce = 10 icon_state = "snowball" - damtype = STAMINA + /// The amount of stamina damage to do on hit. + var/stamina_damage = 10 /obj/item/snowball/throw_impact(atom/target) - ..() + . = ..() + if(!. && isliving(target)) + var/mob/living/M = target + M.adjustStaminaLoss(stamina_damage) qdel(src) /obj/item/snowball/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)