diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index 7b330d10f9..e9bfb9f927 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -180,15 +180,17 @@
if(!get_danger_level(target_temperature, TLV["temperature"]) && abs(environment.temperature - target_temperature) > 2.0)
update_use_power(2)
regulating_temperature = 1
- visible_message("\The [src] clicks as it starts [environment.temperature > target_temperature ? "cooling" : "heating"] the room.",\
+ audible_message("\The [src] clicks as it starts [environment.temperature > target_temperature ? "cooling" : "heating"] the room.",\
"You hear a click and a faint electronic hum.")
+ playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
else
//check for when we should stop adjusting temperature
if(get_danger_level(target_temperature, TLV["temperature"]) || abs(environment.temperature - target_temperature) <= 0.5)
update_use_power(1)
regulating_temperature = 0
- visible_message("\The [src] clicks quietly as it stops [environment.temperature > target_temperature ? "cooling" : "heating"] the room.",\
+ audible_message("\The [src] clicks quietly as it stops [environment.temperature > target_temperature ? "cooling" : "heating"] the room.",\
"You hear a click as a faint electronic humming stops.")
+ playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
if(regulating_temperature)
if(target_temperature > T0C + MAX_TEMPERATURE)
diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm
index ac433353e0..3223e26649 100644
--- a/code/game/objects/items/weapons/implants/implant.dm
+++ b/code/game/objects/items/weapons/implants/implant.dm
@@ -351,6 +351,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
R << "You hear a faint *beep*."
if(!src.reagents.total_volume)
R << "You hear a faint click from your chest."
+ playsound(R, 'sound/weapons/empty.ogg', 10, 1)
spawn(0)
qdel(src)
return
diff --git a/code/game/objects/items/weapons/paiwire.dm b/code/game/objects/items/weapons/paiwire.dm
index 990453f423..638d8f51cb 100644
--- a/code/game/objects/items/weapons/paiwire.dm
+++ b/code/game/objects/items/weapons/paiwire.dm
@@ -1,11 +1,12 @@
/obj/item/weapon/pai_cable/proc/plugin(obj/machinery/M as obj, mob/user as mob)
if(istype(M, /obj/machinery/door) || istype(M, /obj/machinery/camera))
user.visible_message("[user] inserts [src] into a data port on [M].", "You insert [src] into a data port on [M].", "You hear the satisfying click of a wire jack fastening into place.")
+ playsound(user, 'sound/machines/click.ogg', 50, 1)
user.drop_item()
src.loc = M
src.machine = M
else
- user.visible_message("[user] dumbly fumbles to find a place on [M] to plug in [src].", "There aren't any ports on [M] that match the jack belonging to [src].")
+ user.visible_message("[user] fumbles to find a place on [M] to plug in [src].", "There aren't any ports on [M] that match the jack belonging to [src].")
/obj/item/weapon/pai_cable/attack(obj/machinery/M as obj, mob/user as mob)
src.plugin(M, user)
diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm
index e6abdcb366..748d7df06d 100644
--- a/code/game/objects/items/weapons/traps.dm
+++ b/code/game/objects/items/weapons/traps.dm
@@ -34,6 +34,7 @@
"You have deployed \the [src]!",
"You hear a latch click loudly."
)
+ playsound(src.loc, 'sound/machines/click.ogg',70, 1)
deployed = 1
user.drop_from_inventory(src)
@@ -56,6 +57,8 @@
"You begin disarming \the [src]!",
"You hear a latch click followed by the slow creaking of a spring."
)
+ playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
+
if(do_after(user, 60))
user.visible_message(
"[user] has disarmed \the [src].",
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index 7003f4d3a2..b2c5e93cb8 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -42,9 +42,9 @@ FLOOR SAFES
/obj/structure/safe/proc/check_unlocked(mob/user as mob, canhear)
if(user && canhear)
if(tumbler_1_pos == tumbler_1_open)
- user << "You hear a [pick("tonk", "krunk", "plunk")] from [src]."
+ to_chat(user, "You hear a [pick("tonk", "krunk", "plunk")] from \the [src].")
if(tumbler_2_pos == tumbler_2_open)
- user << "You hear a [pick("tink", "krink", "plink")] from [src]."
+ to_chat(user, "You hear a [pick("tink", "krink", "plink")] from \the [src].")
if(tumbler_1_pos == tumbler_1_open && tumbler_2_pos == tumbler_2_open)
if(user) visible_message("[pick("Spring", "Sprang", "Sproing", "Clunk", "Krunk")]!")
return 1
@@ -95,13 +95,13 @@ FLOOR SAFES
if(href_list["open"])
if(check_unlocked())
- user << "You [open ? "close" : "open"] [src]."
+ to_chat(user, "You [open ? "close" : "open"] [src].")
open = !open
update_icon()
updateUsrDialog()
return
else
- user << "You can't [open ? "close" : "open"] [src], the lock is engaged!"
+ to_chat(user, "You can't [open ? "close" : "open"] [src], the lock is engaged!")
return
if(href_list["decrement"])
@@ -109,12 +109,14 @@ FLOOR SAFES
if(dial == tumbler_1_pos + 1 || dial == tumbler_1_pos - 71)
tumbler_1_pos = decrement(tumbler_1_pos)
if(canhear)
- user << "You hear a [pick("clack", "scrape", "clank")] from [src]."
+ to_chat(user, "You hear a [pick("clack", "scrape", "clank")] from \the [src].")
if(tumbler_1_pos == tumbler_2_pos + 37 || tumbler_1_pos == tumbler_2_pos - 35)
tumbler_2_pos = decrement(tumbler_2_pos)
if(canhear)
- user << "You hear a [pick("click", "chink", "clink")] from [src]."
- check_unlocked(user, canhear)
+ to_chat(user, "You hear a [pick("click", "chink", "clink")] from \the [src].")
+ playsound(user, 'sound/machines/click.ogg', 20, 1)
+ check_unlocked(user, canhear)
+
updateUsrDialog()
return
@@ -123,11 +125,12 @@ FLOOR SAFES
if(dial == tumbler_1_pos - 1 || dial == tumbler_1_pos + 71)
tumbler_1_pos = increment(tumbler_1_pos)
if(canhear)
- user << "You hear a [pick("clack", "scrape", "clank")] from [src]."
+ to_chat(user, "You hear a [pick("clack", "scrape", "clank")] from \the [src].")
if(tumbler_1_pos == tumbler_2_pos - 37 || tumbler_1_pos == tumbler_2_pos + 35)
tumbler_2_pos = increment(tumbler_2_pos)
if(canhear)
- user << "You hear a [pick("click", "chink", "clink")] from [src]."
+ to_chat(user, "You hear a [pick("click", "chink", "clink")] from \the [src].")
+ playsound(user, 'sound/machines/click.ogg', 20, 1)
check_unlocked(user, canhear)
updateUsrDialog()
return
@@ -148,15 +151,15 @@ FLOOR SAFES
space += I.w_class
user.drop_item()
I.loc = src
- user << "You put [I] in [src]."
+ to_chat(user, "You put [I] in \the [src].")
updateUsrDialog()
return
else
- user << "[I] won't fit in [src]."
+ to_chat(user, "[I] won't fit in \the [src].")
return
else
if(istype(I, /obj/item/clothing/accessory/stethoscope))
- user << "Hold [I] in one of your hands while you manipulate the dial."
+ to_chat(user, "Hold [I] in one of your hands while you manipulate the dial.")
return
diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm
index d818d6edf2..e33a487a61 100644
--- a/code/modules/mob/living/silicon/pai/life.dm
+++ b/code/modules/mob/living/silicon/pai/life.dm
@@ -8,6 +8,8 @@
var/turf/T = get_turf_or_move(src.loc)
for (var/mob/M in viewers(T))
M.show_message("The data cable rapidly retracts back into its spool.", 3, "You hear a click and the sound of wire spooling rapidly.", 2)
+ playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
+
qdel(src.cable)
src.cable = null
@@ -28,10 +30,11 @@
if(health <= 0)
death(null,"gives one shrill beep before falling lifeless.")
+
/mob/living/silicon/pai/updatehealth()
if(status_flags & GODMODE)
health = 100
stat = CONSCIOUS
else
- health = 100 - getBruteLoss() - getFireLoss()
\ No newline at end of file
+ health = 100 - getBruteLoss() - getFireLoss()