From 6d4bddcc556a02ffce5d1abb856a9a0a1b2db6d9 Mon Sep 17 00:00:00 2001 From: Fhaxaris Date: Tue, 3 Sep 2019 01:53:44 -0500 Subject: [PATCH] makes riot darts work (#46307) * if it has an effect, that counts as doing damage ok? * Update damage_procs.dm * that does not fix that * i meant to remove that --- code/modules/projectiles/projectile/magic.dm | 2 +- code/modules/projectiles/projectile/reusable/foam_dart.dm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index d859c833633..36c7c0f8397 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -688,7 +688,7 @@ icon_state = "ice_2" damage = 0 damage_type = BURN - nodamage = TRUE + nodamage = FALSE armour_penetration = 100 temperature = 50 flag = "magic" diff --git a/code/modules/projectiles/projectile/reusable/foam_dart.dm b/code/modules/projectiles/projectile/reusable/foam_dart.dm index d360c4f4c7a..85e648a3099 100644 --- a/code/modules/projectiles/projectile/reusable/foam_dart.dm +++ b/code/modules/projectiles/projectile/reusable/foam_dart.dm @@ -38,4 +38,5 @@ name = "riot foam dart" icon_state = "foamdart_riot_proj" ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot + nodamage = FALSE stamina = 25