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:
iksyp
2018-04-11 04:59:57 -05:00
committed by CitadelStationBot
parent 4063781baf
commit 5a06fd98ed
14 changed files with 23 additions and 26 deletions
@@ -13,7 +13,6 @@
clumsy_check = 0
item_flags = NONE
casing_ejector = FALSE
harmful = FALSE
/obj/item/gun/ballistic/automatic/toy/unrestricted
pin = /obj/item/device/firing_pin
@@ -28,7 +27,6 @@
burst_size = 1
fire_delay = 0
actions_types = list()
harmful = FALSE
/obj/item/gun/ballistic/automatic/toy/pistol/update_icon()
..()
@@ -58,7 +56,6 @@
item_flags = NONE
casing_ejector = FALSE
can_suppress = FALSE
harmful = FALSE
/obj/item/gun/ballistic/shotgun/toy/process_chamber(empty_chamber = 0)
..()