From b819963102cc3522b1b6ff54495c9db0ecb919ea Mon Sep 17 00:00:00 2001
From: Belsima <31827220+Belsima@users.noreply.github.com>
Date: Thu, 7 Dec 2017 18:50:12 -0500
Subject: [PATCH] Flashes now click when they say they click. (#4393)
* Flashes now click when they say they click.
* Better sound effect.
---
code/game/objects/items/devices/flash.dm | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index 2435e807f9..6027976134 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -18,7 +18,7 @@
/obj/item/device/flash/proc/clown_check(var/mob/user)
if(user && (CLUMSY in user.mutations) && prob(50))
- user << "\The [src] slips out of your hand."
+ to_chat(user, "\The [src] slips out of your hand.")
user.drop_item()
return 0
return 1
@@ -43,7 +43,7 @@
if(prob( round(times_used / 2) )) //if you use it 10 times in a minute it has a 5% chance to break.
broken = 1
if(user)
- user << "The bulb has burnt out!"
+ to_chat(user, "The bulb has burnt out!")
icon_state = "flashburnt"
return FALSE
else
@@ -51,7 +51,8 @@
return TRUE
else //can only use it 10 times a minute
if(user)
- user << "*click* *click*"
+ to_chat(user, "click")
+ playsound(src.loc, 'sound/weapons/empty.ogg', 80, 1)
return FALSE
//attack_as_weapon
@@ -67,7 +68,7 @@
if(!clown_check(user)) return
if(broken)
- user << "\The [src] is broken."
+ to_chat(user, "\The [src] is broken.")
return
flash_recharge()
@@ -204,12 +205,12 @@
..()
if(!broken)
broken = 1
- user << "The bulb has burnt out!"
+ to_chat(user, "The bulb has burnt out!")
icon_state = "flashburnt"
/obj/item/device/flash/synthetic/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0)
..()
if(!broken)
broken = 1
- user << "The bulb has burnt out!"
+ to_chat(user, "The bulb has burnt out!")
icon_state = "flashburnt"