Whether or not a pacifist can fire a gun is no longer based on the gun being harmful, but the chambered round being harmful (#36670)
fix: makes dragnet non harmful tweak: pacifists can now use any disabler or stun setting on any energy gun code: removed all of the pacifism check code from code/modules/mob/living/living.dm code: gun objects no longer have a harmful variable, instead, ammo_casing objects now have a harmful variable, which is by default set to TRUE code: if a pacifist fires a gun, it checks whether or not the round chambered is lethal, instead of whether or not the gun itself is lethal.
This commit is contained in:
@@ -879,14 +879,6 @@
|
||||
if(G.trigger_guard != TRIGGER_GUARD_ALLOW_ALL && !IsAdvancedToolUser())
|
||||
to_chat(src, "<span class='warning'>You don't have the dexterity to do this!</span>")
|
||||
return FALSE
|
||||
var/obj/item/gun/shooty
|
||||
if(istype(G, /obj/item/gun))
|
||||
shooty = G
|
||||
if(has_trait(TRAIT_PACIFISM))
|
||||
if(shooty && !shooty.harmful)
|
||||
return TRUE
|
||||
to_chat(src, "<span class='notice'>You don't want to risk harming anyone!</span>")
|
||||
return FALSE
|
||||
return TRUE
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user