Removes a bunch of sleeps/spawns and makes a few booleans defines

This commit is contained in:
kevinz000
2017-10-14 16:53:17 -07:00
committed by CitadelStationBot
parent b200389630
commit b20e5916ea
24 changed files with 272 additions and 236 deletions
@@ -11,15 +11,15 @@
charge_counter = charge_max
attached_hand = null
to_chat(user, "<span class='notice'>You draw the power out of your hand.</span>")
return 0
return FALSE
..()
/obj/effect/proc_holder/spell/targeted/touch/cast(list/targets,mob/user = usr)
for(var/mob/living/carbon/C in targets)
if(!attached_hand)
if(!ChargeHand(C))
return 0
while(attached_hand) //hibernate untill the spell is actually used
return FALSE
while(attached_hand)
charge_counter = 0
stoplag(1)
@@ -30,9 +30,9 @@
charge_counter = charge_max
attached_hand = null
to_chat(user, "<span class='warning'>Your hands are full!</span>")
return 0
return FALSE
to_chat(user, "<span class='notice'>You channel the power of the spell to your hand.</span>")
return 1
return TRUE
/obj/effect/proc_holder/spell/targeted/touch/disintegrate
@@ -58,4 +58,4 @@
cooldown_min = 200 //100 deciseconds reduction per rank
action_icon_state = "statue"
sound = 'sound/magic/fleshtostone.ogg'
sound = 'sound/magic/fleshtostone.ogg'