From 7cd7d76eb668502343deb684c5551813de7ccc7b Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Sat, 3 Oct 2020 15:26:20 +0200 Subject: [PATCH] Makes laser tags have 0 damage + check in field/generator/bullet_act --- code/modules/power/singularity/field_generator.dm | 2 +- code/modules/projectiles/projectile/beams.dm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 960340e90b6..4d3eb5f51f0 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -144,7 +144,7 @@ field_generator power level display ..() /obj/machinery/field/generator/bullet_act(obj/item/projectile/Proj) - if(Proj.flag != "bullet") + if(Proj.flag != "bullet" && !Proj.nodamage) power = min(power + Proj.damage, field_generator_max_power) check_power_level() return 0 diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index c320296e0bd..766975a4aad 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -85,6 +85,7 @@ icon_state = "omnilaser" hitsound = 'sound/weapons/tap.ogg' nodamage = 1 + damage = 0 damage_type = STAMINA flag = "laser" var/suit_types = list(/obj/item/clothing/suit/redtag, /obj/item/clothing/suit/bluetag)