[MIRROR] harmful var for guns (#5879)

* harmful var for guns (#36265)

* harmful var for guns

support for pacifism to use non-harmful guns

* fixes bad spacing

oops

* harmful var for guns
This commit is contained in:
CitadelStationBot
2018-03-10 07:57:57 -06:00
committed by Poojawa
parent 4f4d486244
commit aa7b9f192f
8 changed files with 24 additions and 2 deletions
@@ -49,6 +49,7 @@
modifystate = 1
ammo_x_offset = 1
selfcharge = 1
harmful = FALSE
/obj/item/gun/energy/meteorgun
name = "meteor gun"
+5 -1
View File
@@ -5,6 +5,7 @@
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
harmful = FALSE
/obj/item/gun/energy/tesla_revolver
name = "tesla gun"
@@ -22,6 +23,7 @@
icon_state = "advtaser"
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/disabler)
ammo_x_offset = 2
harmful = FALSE
/obj/item/gun/energy/e_gun/advtaser/cyborg
name = "cyborg taser"
@@ -29,6 +31,7 @@
can_flashlight = 0
can_charge = 0
use_cyborg_cell = 1
harmful = FALSE
/obj/item/gun/energy/disabler
name = "disabler"
@@ -37,10 +40,11 @@
item_state = null
ammo_type = list(/obj/item/ammo_casing/energy/disabler)
ammo_x_offset = 3
harmful = FALSE
/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
harmful = FALSE