diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
index 543b2cf8186..357fa9ad81d 100644
--- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
@@ -23,12 +23,12 @@
if (isrobot(usr) || src.locked)
if(istype(O, /obj/item/device/multitool))
- user << "\red Resetting circuitry..."
+ user << " Resetting circuitry..."
playsound(user, 'sound/machines/lockreset.ogg', 50, 1)
- sleep(50) // Sleeping time~
- src.locked = 0
- user << "\blue You disable the locking modules."
- update_icon()
+ if(do_after(user, 20))
+ src.locked = 0
+ user << " You disable the locking modules."
+ update_icon()
return
else if(istype(O, /obj/item/weapon))
var/obj/item/weapon/W = O
@@ -41,7 +41,7 @@
else
playsound(user, 'sound/effects/Glasshit.ogg', 100, 1) //We don't want this playing every time
if(W.force < 15)
- user << "\blue The cabinet's protective glass glances off the hit."
+ user << " The cabinet's protective glass glances off the hit."
else
src.hitstaken++
if(src.hitstaken == 4)
@@ -54,12 +54,12 @@
if (istype(O, /obj/item/weapon/twohanded/fireaxe) && src.localopened)
if(!fireaxe)
if(O:wielded)
- user << "\red Unwield the axe first."
+ user << " Unwield the axe first."
return
fireaxe = O
user.drop_item()
src.contents += O
- user << "\blue You place the fire axe back in the [src.name]."
+ user << " You place the fire axe back in the [src.name]."
update_icon()
else
if(src.smashed)
@@ -82,11 +82,11 @@
spawn(10) update_icon()
return
else
- user << "\red Resetting circuitry..."
- sleep(50)
- src.locked = 1
- user << "\blue You re-enable the locking modules."
+ user << " Resetting circuitry..."
playsound(user, 'sound/machines/lockenable.ogg', 50, 1)
+ if(do_after(user, 20))
+ src.locked = 1
+ user << " You re-enable the locking modules."
return
else
localopened = !localopened
@@ -107,13 +107,13 @@
hasaxe = 1
if(src.locked)
- user <<"\red The cabinet won't budge!"
+ user <<" The cabinet won't budge!"
return
if(localopened)
if(fireaxe)
user.put_in_hands(fireaxe)
fireaxe = null
- user << "\blue You take the fire axe from the [name]."
+ user << " You take the fire axe from the [name]."
src.add_fingerprint(user)
update_icon()
else
@@ -140,7 +140,7 @@
attack_tk(mob/user as mob)
if(localopened && fireaxe)
fireaxe.loc = loc
- user << "\blue You telekinetically remove the fire axe."
+ user << " You telekinetically remove the fire axe."
fireaxe = null
update_icon()
return
@@ -184,14 +184,14 @@
attack_ai(mob/user as mob)
if(src.smashed)
- user << "\red The security of the cabinet is compromised."
+ user << " The security of the cabinet is compromised."
return
else
locked = !locked
if(locked)
- user << "\red Cabinet locked."
+ user << " Cabinet locked."
else
- user << "\blue Cabinet unlocked."
+ user << " Cabinet unlocked."
return
update_icon() //Template: fireaxe[has fireaxe][is opened][hits taken][is smashed]. If you want the opening or closing animations, add "opening" or "closing" right after the numbers
@@ -204,4 +204,4 @@
return
close()
- return
\ No newline at end of file
+ return