This commit is contained in:
Joan Lung
2017-04-06 19:43:12 -04:00
parent bbd81a1a30
commit fa50886ee2
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -26,7 +26,7 @@ var/list/GPS_list = list()
emped = TRUE
cut_overlay("working")
add_overlay("emp")
addtimer(CALLBACK(src, .proc/reboot), 300)
addtimer(CALLBACK(src, .proc/reboot), 300, TIMER_OVERRIDE) //if a new EMP happens, remove the old timer so it doesn't reactivate early
/obj/item/device/gps/proc/reboot()
emped = FALSE
+1 -1
View File
@@ -71,7 +71,7 @@
/obj/item/stack/sheet/bluespace_crystal/attack_hand(mob/user)
if(user.get_inactive_held_item() == src)
if(zero_amount())
return
return
var/BC = new crystal_type(src)
user.put_in_hands(BC)
use(1)