Merge pull request #14344 from qweq12yt/pacifist-flamethrower-fix

[FIX] More pacifism bug squashing
This commit is contained in:
silicons
2021-03-02 16:57:26 -07:00
committed by GitHub
2 changed files with 6 additions and 0 deletions
+5
View File
@@ -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, "<span class='warning'>You don't want to put others in danger!</span>")
return
if(!lit || operating)
return
operating = TRUE