Merge pull request #17192 from Incoming5643/I_was_feeling_down_so_heres_some_magic

Buffs the staff/wand of door creation
This commit is contained in:
KorPhaeron
2016-04-29 08:27:49 -05:00
2 changed files with 15 additions and 4 deletions
+4 -2
View File
@@ -142,8 +142,10 @@
max_charges = 20 //20, 10, 10, 7
no_den_usage = 1
/obj/item/weapon/gun/magic/wand/door/zap_self()
return
/obj/item/weapon/gun/magic/wand/door/zap_self(mob/living/user)
user << "<span class='notice'>You feel vaguely more open with your feelings.</span>"
charges--
..()
/////////////////////////////////////
//WAND OF FIREBALL
+11 -2
View File
@@ -98,6 +98,7 @@
/obj/structure/mineral_door/gold,/obj/structure/mineral_door/uranium,/obj/structure/mineral_door/sandstone,/obj/structure/mineral_door/transparent/plasma,\
/obj/structure/mineral_door/transparent/diamond)
/obj/item/projectile/magic/door/on_hit(atom/target)
. = ..()
var/atom/T = target.loc
@@ -105,12 +106,20 @@
CreateDoor(target)
else if (isturf(T) && T.density)
CreateDoor(T)
else if(istype(target, /obj/machinery/door))
OpenDoor(target)
/obj/item/projectile/magic/door/proc/CreateDoor(turf/T)
var/door_type = pick(door_types)
new door_type(T)
var/obj/structure/mineral_door/D = new door_type(T)
T.ChangeTurf(/turf/open/floor/plating)
D.Open()
/obj/item/projectile/magic/door/proc/OpenDoor(var/obj/machinery/door/D)
if(istype(D,/obj/machinery/door/airlock))
var/obj/machinery/door/airlock/A = D
A.locked = 0
D.open()
/obj/item/projectile/magic/change
name = "bolt of change"
@@ -322,4 +331,4 @@
else if(istype(change, /mob/living/simple_animal/hostile/mimic/copy))
// Change our allegiance!
var/mob/living/simple_animal/hostile/mimic/copy/C = change
C.ChangeOwner(firer)
C.ChangeOwner(firer)