Merge pull request #6343 from Citadel-Station-13/upstream-merge-36670

[MIRROR] Whether or not a pacifist can fire a gun is no longer based on the gun being harmful, but the chambered round being harmful

code/modules/mob/living/living.dm

@@ -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