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.
46 lines
1.8 KiB
Plaintext
46 lines
1.8 KiB
Plaintext
/obj/item/gun/energy/taser
|
|
name = "taser gun"
|
|
desc = "A low-capacity, energy-based stun gun used by security teams to subdue targets at range."
|
|
icon_state = "taser"
|
|
item_state = null //so the human update icon uses the icon_state instead.
|
|
ammo_type = list(/obj/item/ammo_casing/energy/electrode)
|
|
ammo_x_offset = 3
|
|
|
|
/obj/item/gun/energy/tesla_revolver
|
|
name = "tesla gun"
|
|
desc = "An experimental gun based on an experimental engine, it's about as likely to kill its operator as it is the target."
|
|
icon_state = "tesla"
|
|
item_state = "tesla"
|
|
ammo_type = list(/obj/item/ammo_casing/energy/tesla_revolver)
|
|
can_flashlight = 0
|
|
pin = null
|
|
shaded_charge = 1
|
|
|
|
/obj/item/gun/energy/e_gun/advtaser
|
|
name = "hybrid taser"
|
|
desc = "A dual-mode taser designed to fire both short-range high-power electrodes and long-range disabler beams."
|
|
icon_state = "advtaser"
|
|
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/disabler)
|
|
ammo_x_offset = 2
|
|
|
|
/obj/item/gun/energy/e_gun/advtaser/cyborg
|
|
name = "cyborg taser"
|
|
desc = "An integrated hybrid taser that draws directly from a cyborg's power cell. The weapon contains a limiter to prevent the cyborg's power cell from overheating."
|
|
can_flashlight = 0
|
|
can_charge = 0
|
|
use_cyborg_cell = 1
|
|
|
|
/obj/item/gun/energy/disabler
|
|
name = "disabler"
|
|
desc = "A self-defense weapon that exhausts organic targets, weakening them until they collapse."
|
|
icon_state = "disabler"
|
|
item_state = null
|
|
ammo_type = list(/obj/item/ammo_casing/energy/disabler)
|
|
ammo_x_offset = 3
|
|
|
|
/obj/item/gun/energy/disabler/cyborg
|
|
name = "cyborg disabler"
|
|
desc = "An integrated disabler that draws from a cyborg's power cell. This weapon contains a limiter to prevent the cyborg's power cell from overheating."
|
|
can_charge = 0
|
|
use_cyborg_cell = 1
|