From 34ab06d03bd22b7271058fc0b85449abccf1f4b9 Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+AnArgonianLizardThatStealsPRs@users.noreply.github.com> Date: Wed, 25 Oct 2023 09:24:13 +0300 Subject: [PATCH] [MIRROR] fixes thermal pistols doing literally nothing on impact [MDB IGNORE] (#24567) (#270) * fixes thermal pistols doing literally nothing on impact (#79175) ## About The Pull Request Fixes https://github.com/tgstation/tgstation/issues/79167 ## Why It's Good For The Game refactors sometimes overlook things ## Changelog :cl: fix: The nanites inside of thermal pistols are once again angry, and aggressively want to burn/puncture people. /:cl: * fixes thermal pistols doing literally nothing on impact --------- Co-authored-by: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com> --- code/modules/projectiles/projectile/energy/thermal.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/projectiles/projectile/energy/thermal.dm b/code/modules/projectiles/projectile/energy/thermal.dm index 41efd21475c..0efb983eb3b 100644 --- a/code/modules/projectiles/projectile/energy/thermal.dm +++ b/code/modules/projectiles/projectile/energy/thermal.dm @@ -10,8 +10,8 @@ bare_wound_bonus = 10 impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser -/obj/projectile/energy/inferno/on_hit(atom/target, blocked, pierce_hit) - ..() +/obj/projectile/energy/inferno/on_hit(atom/target, blocked = 0, pierce_hit) + . = ..() if(!ishuman(target)) return @@ -35,8 +35,8 @@ wound_bonus = 0 bare_wound_bonus = 10 -/obj/projectile/energy/cryo/on_hit(atom/target, blocked, pierce_hit) - ..() +/obj/projectile/energy/cryo/on_hit(atom/target, blocked = 0, pierce_hit) + . = ..() if(!ishuman(target)) return