From d3aeb714f134ca33d2a56e8a36214ef11162dcd7 Mon Sep 17 00:00:00 2001 From: qweq12yt <45515587+qweq12yt@users.noreply.github.com> Date: Sun, 28 Feb 2021 20:21:19 -0300 Subject: [PATCH 1/2] flamethrowers now can't be used by pacifists --- code/game/objects/items/flamethrower.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/game/objects/items/flamethrower.dm b/code/game/objects/items/flamethrower.dm index 3d1ea9e7a2..73299a2006 100644 --- a/code/game/objects/items/flamethrower.dm +++ b/code/game/objects/items/flamethrower.dm @@ -180,6 +180,11 @@ //Called from turf.dm turf/dblclick /obj/item/flamethrower/proc/flame_turf(turflist) + var/mob/living/carbon/human/user = loc + // no fun for pacifists + if(HAS_TRAIT(user, TRAIT_PACIFISM)) + to_chat(user, "You don't want to put others in danger!") + return if(!lit || operating) return operating = TRUE From 2bfe99c2be453b9d11170e166616d09beef2ef0d Mon Sep 17 00:00:00 2001 From: qweq12yt <45515587+qweq12yt@users.noreply.github.com> Date: Sun, 28 Feb 2021 23:27:52 -0300 Subject: [PATCH 2/2] fixes kinetic accelerator reload() proc --- code/modules/projectiles/guns/energy/kinetic_accelerator.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 438c000a1e..1e6318ecba 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -182,6 +182,7 @@ /obj/item/gun/energy/kinetic_accelerator/proc/reload() cell.give(cell.maxcharge) + process_chamber() if(!suppressed) playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1) else