[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
@@ -27,6 +27,7 @@
ammo_type = /obj/item/ammo_casing/magic/heal
icon_state = "staffofhealing"
item_state = "staffofhealing"
harmful = FALSE
/obj/item/gun/magic/staff/healing/handle_suicide() //Stops people trying to commit suicide to heal themselves
return
@@ -59,6 +60,7 @@
max_charges = 10
recharge_rate = 2
no_den_usage = 1
harmful = FALSE
/obj/item/gun/magic/staff/honk
name = "staff of the honkmother"
@@ -69,6 +71,7 @@
item_state = "honker"
max_charges = 4
recharge_rate = 8
harmful = FALSE
/obj/item/gun/magic/staff/spellblade
name = "spellblade"
@@ -8,6 +8,7 @@
can_charge = 0
max_charges = 100 //100, 50, 50, 34 (max charge distribution by 25%ths)
var/variable_charges = 1
harmful = FALSE
/obj/item/gun/magic/wand/Initialize()
if(prob(75) && variable_charges) //25% chance of listed max charges, 50% chance of 1/2 max charges, 25% chance of 1/3 max charges
@@ -85,6 +86,7 @@
fire_sound = 'sound/magic/staff_healing.ogg'
icon_state = "revivewand"
max_charges = 10 //10, 5, 5, 4
harmful = FALSE
/obj/item/gun/magic/wand/resurrection/zap_self(mob/living/user)
user.revive(full_heal = 1)
@@ -125,6 +127,7 @@
icon_state = "telewand"
max_charges = 10 //10, 5, 5, 4
no_den_usage = 1
harmful = FALSE
/obj/item/gun/magic/wand/teleport/zap_self(mob/living/user)
if(do_teleport(user, user, 10))
@@ -146,6 +149,7 @@
fire_sound = 'sound/magic/staff_door.ogg'
max_charges = 20 //20, 10, 10, 7
no_den_usage = 1
harmful = FALSE
/obj/item/gun/magic/wand/door/zap_self(mob/living/user)
to_chat(user, "<span class='notice'>You feel vaguely more open with your feelings.</span>")