From fa50886ee28d0cec12abd49ab3f8bb884b019d98 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Thu, 6 Apr 2017 19:43:12 -0400 Subject: [PATCH] kill me --- code/game/objects/items/devices/gps.dm | 2 +- code/game/objects/items/stacks/bscrystal.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index 9d3e2ff8fb1..a59312ca302 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -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 diff --git a/code/game/objects/items/stacks/bscrystal.dm b/code/game/objects/items/stacks/bscrystal.dm index 1efc15e4e31..9bceb57e0bd 100644 --- a/code/game/objects/items/stacks/bscrystal.dm +++ b/code/game/objects/items/stacks/bscrystal.dm @@ -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)