diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index a1ddb256d89..6a8d6b2ff14 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -118,11 +118,11 @@
if(safety)
safety = 0
src.visible_message("[src] beeps: Safety protocols disabled!")
- playsound(get_turf(src), 'sound/machines/twobeep.ogg', 50, 0)
+ playsound(get_turf(src), 'sound/machines/defib_saftyOff.ogg', 50, 0)
else
safety = 1
src.visible_message("[src] beeps: Safety protocols enabled!")
- playsound(get_turf(src), 'sound/machines/twobeep.ogg', 50, 0)
+ playsound(get_turf(src), 'sound/machines/defib_saftyOn.ogg', 50, 0)
update_icon()
..()
@@ -187,14 +187,14 @@
if(bcell)
if(bcell.charge >= paddles.revivecost)
user.visible_message("[src] beeps: Unit ready.")
- playsound(get_turf(src), 'sound/machines/twobeep.ogg', 50, 0)
+ playsound(get_turf(src), 'sound/machines/defib_ready.ogg', 50, 0)
else
user.visible_message("[src] beeps: Charge depleted.")
- playsound(get_turf(src), 'sound/machines/twobeep.ogg', 50, 0)
+ playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
paddles.cooldown = 0
paddles.update_icon()
update_icon()
-
+
/obj/item/weapon/defibrillator/compact
name = "compact defibrillator"
desc = "A belt-equipped defibrillator that can be rapidly deployed."
@@ -274,7 +274,7 @@
/obj/item/weapon/twohanded/shockpaddles/suicide_act(mob/user)
user.visible_message("[user] is putting the live paddles on \his chest! It looks like \he's trying to commit suicide.")
defib.deductcharge(revivecost)
- playsound(get_turf(src), 'sound/weapons/Egloves.ogg', 50, 1, -1)
+ playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
return (OXYLOSS)
/obj/item/weapon/twohanded/shockpaddles/dropped(mob/user as mob)
@@ -305,7 +305,7 @@
return
if(!defib.powered)
user.visible_message("[defib] beeps: Unit is unpowered.")
- playsound(get_turf(src), 'sound/machines/twobeep.ogg', 50, 0)
+ playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
return
if(!wielded)
user << "You need to wield the paddles in both hands before you can use them on someone!"
@@ -324,7 +324,7 @@
H.adjustStaminaLoss(50)
H.Weaken(5)
H.updatehealth() //forces health update before next life tick
- playsound(get_turf(src), 'sound/weapons/Egloves.ogg', 50, 1, -1)
+ playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
H.emote("gasp")
add_logs(user, M, "stunned", object="defibrillator")
defib.deductcharge(revivecost)
@@ -339,7 +339,7 @@
update_icon()
if(do_after(user, 30)) //beginning to place the paddles on patient's chest to allow some time for people to move away to stop the process
user.visible_message("[user] places [src] on [M.name]'s chest.", "You place [src] on [M.name]'s chest.")
- playsound(get_turf(src), 'sound/weapons/flash.ogg', 50, 0)
+ playsound(get_turf(src), 'sound/machines/defib_charge.ogg', 50, 0)
var/mob/dead/observer/ghost = H.get_ghost()
var/tplus = world.time - H.timeofdeath
var/tlimit = 6000 //past this much time the patient is unrecoverable (in deciseconds)
@@ -351,7 +351,7 @@
if(istype(carried_item, /obj/item/clothing/suit/space))
if(!defib.combat)
user.visible_message("[defib] buzzes: Patient's chest is obscured. Operation aborted.")
- playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 50, 0)
+ playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
busy = 0
update_icon()
return
@@ -359,7 +359,7 @@
var/health = H.health
M.visible_message("[M]'s body convulses a bit.")
playsound(get_turf(src), "bodyfall", 50, 1)
- playsound(get_turf(src), 'sound/weapons/Egloves.ogg', 50, 1, -1)
+ playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
for(var/datum/organ/external/O in H.organs)
total_brute += O.brute_dam
total_burn += O.burn_dam
@@ -371,7 +371,7 @@
H.adjustFireLoss(tobehealed)
H.adjustBruteLoss(tobehealed)
user.visible_message("[defib] pings: Resuscitation successful.")
- playsound(get_turf(src), 'sound/machines/ping.ogg', 50, 0)
+ playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0)
H.stat = 1
H.update_revive()
H.emote("gasp")
@@ -389,14 +389,14 @@
if(ghost)
ghost << "Your heart is being defibrillated. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)"
ghost << sound('sound/effects/genetics.ogg')
- playsound(get_turf(src), 'sound/machines/buzz-two.ogg', 50, 0)
+ playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
defib.deductcharge(revivecost)
update_icon()
cooldown = 1
defib.cooldowncheck(user)
else
user.visible_message("[defib] buzzes: Patient is not in a valid state. Operation aborted.")
- playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 50, 0)
+ playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
busy = 0
update_icon()
else
diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm
index f71ec7f6a48..5d7da87b77e 100644
--- a/code/modules/admin/verbs/onlyone.dm
+++ b/code/modules/admin/verbs/onlyone.dm
@@ -51,5 +51,4 @@
message_admins("\blue [key_name_admin(usr)] used THERE CAN BE ONLY ONE! -NO ATTACK LOGS WILL BE SENT TO ADMINS FROM THIS POINT FORTH-", 1)
nologevent = 1
- log_admin("[key_name(usr)] used there can be only one.")
- world << sound('sound/music/highlander.ogg')
+ log_admin("[key_name(usr)] used there can be only one.")
\ No newline at end of file
diff --git a/code/modules/admin/verbs/onlyoneteam.dm b/code/modules/admin/verbs/onlyoneteam.dm
index 90a3d0b8b8e..c909a6c7d3c 100644
--- a/code/modules/admin/verbs/onlyoneteam.dm
+++ b/code/modules/admin/verbs/onlyoneteam.dm
@@ -58,7 +58,6 @@
message_admins("\blue [key_name_admin(usr)] used DODGEBAWWWWWWWL! -NO ATTACK LOGS WILL BE SENT TO ADMINS FROM THIS POINT FORTH-", 1)
nologevent = 1
log_admin("[key_name(usr)] used dodgeball.")
- world << sound('sound/music/nowyouman.ogg')
/obj/item/weapon/beach_ball/dodgeball
name = "dodgeball"
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index b7d8ac6c05e..84ff50ef76e 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -55,19 +55,22 @@
flags = FPRINT | TABLEPASS| CONDUCT
slot_flags = SLOT_BELT
force = 15.0
- throwforce = 4.0
+ throwforce = 10.0
item_state = "pickaxe"
w_class = 4.0
m_amt = 3750 //one sheet, but where can you make them?
var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
origin_tech = "materials=1;engineering=1"
attack_verb = list("hit", "pierced", "sliced", "attacked")
- var/drill_sound = 'sound/weapons/Genhit.ogg'
+ var/list/digsound = list('sound/effects/picaxe1.ogg','sound/effects/picaxe2.ogg','sound/effects/picaxe3.ogg')
var/drill_verb = "picking"
sharp = 1
var/excavation_amount = 100
+ proc/playDigSound()
+ playsound(src, pick(digsound),20,1)
+
hammer
name = "sledgehammer"
//icon_state = "sledgehammer" Waiting on sprite
@@ -86,6 +89,8 @@
icon_state = "handdrill"
item_state = "jackhammer"
digspeed = 30
+ hitsound = 'sound/weapons/drill.ogg'
+ digsound = list('sound/weapons/drill.ogg')
origin_tech = "materials=2;powerstorage=3;engineering=2"
desc = "Yours is the drill that will pierce through the rock walls."
@@ -94,6 +99,8 @@
icon_state = "jackhammer"
item_state = "jackhammer"
digspeed = 15 //faster than drill, but cannot dig
+ hitsound = 'sound/weapons/sonic_jackhammer.ogg'
+ digsound = list('sound/weapons/sonic_jackhammer.ogg')
origin_tech = "materials=3;powerstorage=2;engineering=2"
desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
@@ -112,6 +119,8 @@
w_class = 3.0 //it is smaller than the pickaxe
damtype = "fire"
digspeed = 20 //Can slice though normal walls, all girders, or be used in reinforced wall deconstruction/ light thermite on fire
+ hitsound = 'sound/weapons/plasma_cutter.ogg'
+ digsound = list('sound/weapons/plasma_cutter.ogg')
origin_tech = "materials=4;plasmatech=3;engineering=3"
desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff."
@@ -129,6 +138,8 @@
item_state = "jackhammer"
digspeed = 5 //Digs through walls, girders, and can dig up sand
origin_tech = "materials=6;powerstorage=4;engineering=5"
+ hitsound = 'sound/weapons/drill.ogg'
+ digsound = list('sound/weapons/drill.ogg')
desc = "Yours is the drill that will pierce the heavens!"
traitor //Pocket-sized traitor diamond drill.
@@ -143,6 +154,8 @@
icon_state = "jackhammer"
item_state = "jackhammer"
digspeed = 15
+ hitsound = 'sound/weapons/drill.ogg'
+ digsound = list('sound/weapons/drill.ogg')
desc = ""
/*****************************Shovel********************************/
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index b315ae31e5b..97216012983 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -137,7 +137,7 @@
return
last_act = world.time
- playsound(user, P.drill_sound, 20, 1)
+ P.playDigSound()
//handle any archaeological finds we might uncover
var/fail_message
diff --git a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
index 62bd9009603..48a5e0514d4 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
@@ -10,7 +10,7 @@
digspeed = 20
desc = "Thick metallic wires for clearing away dust and loose scree (1 centimetre excavation depth)."
excavation_amount = 0.5
- drill_sound = 'sound/weapons/thudswoosh.ogg'
+ digsound = list('sound/weapons/thudswoosh.ogg')
drill_verb = "brushing"
w_class = 2
@@ -22,7 +22,7 @@
digspeed = 20
desc = "A miniature excavation tool for precise digging (2 centimetre excavation depth)."
excavation_amount = 1
- drill_sound = 'sound/items/Screwdriver.ogg'
+ digsound = list('sound/items/Screwdriver.ogg')
drill_verb = "delicately picking"
w_class = 2
@@ -34,7 +34,7 @@
digspeed = 20
desc = "A miniature excavation tool for precise digging (4 centimetre excavation depth)."
excavation_amount = 2
- drill_sound = 'sound/items/Screwdriver.ogg'
+ digsound = list('sound/items/Screwdriver.ogg')
drill_verb = "delicately picking"
w_class = 2
@@ -46,7 +46,7 @@
digspeed = 20
desc = "A miniature excavation tool for precise digging (6 centimetre excavation depth)."
excavation_amount = 3
- drill_sound = 'sound/items/Screwdriver.ogg'
+ digsound = list('sound/items/Screwdriver.ogg')
drill_verb = "delicately picking"
w_class = 2
@@ -58,7 +58,7 @@
digspeed = 20
desc = "A miniature excavation tool for precise digging (8 centimetre excavation depth)."
excavation_amount = 4
- drill_sound = 'sound/items/Screwdriver.ogg'
+ digsound = list('sound/items/Screwdriver.ogg')
drill_verb = "delicately picking"
w_class = 2
@@ -70,7 +70,7 @@
digspeed = 20
desc = "A miniature excavation tool for precise digging (10 centimetre excavation depth)."
excavation_amount = 5
- drill_sound = 'sound/items/Screwdriver.ogg'
+ digsound = list('sound/items/Screwdriver.ogg')
drill_verb = "delicately picking"
w_class = 2
@@ -82,7 +82,7 @@
digspeed = 20
desc = "A miniature excavation tool for precise digging (12 centimetre excavation depth)."
excavation_amount = 6
- drill_sound = 'sound/items/Screwdriver.ogg'
+ digsound = list('sound/items/Screwdriver.ogg')
drill_verb = "delicately picking"
w_class = 2
@@ -94,7 +94,7 @@
digspeed = 30
desc = "A smaller, more precise version of the pickaxe (30 centimetre excavation depth)."
excavation_amount = 15
- drill_sound = 'sound/items/Crowbar.ogg'
+ digsound = list('sound/items/Crowbar.ogg')
drill_verb = "clearing"
w_class = 3
diff --git a/sound/effects/picaxe1.ogg b/sound/effects/picaxe1.ogg
new file mode 100644
index 00000000000..337422d39e4
Binary files /dev/null and b/sound/effects/picaxe1.ogg differ
diff --git a/sound/effects/picaxe2.ogg b/sound/effects/picaxe2.ogg
new file mode 100644
index 00000000000..c1a2fd631bd
Binary files /dev/null and b/sound/effects/picaxe2.ogg differ
diff --git a/sound/effects/picaxe3.ogg b/sound/effects/picaxe3.ogg
new file mode 100644
index 00000000000..f4656613284
Binary files /dev/null and b/sound/effects/picaxe3.ogg differ
diff --git a/sound/machines/defib_SaftyOn.ogg b/sound/machines/defib_SaftyOn.ogg
new file mode 100644
index 00000000000..cf261536466
Binary files /dev/null and b/sound/machines/defib_SaftyOn.ogg differ
diff --git a/sound/machines/defib_charge.ogg b/sound/machines/defib_charge.ogg
new file mode 100644
index 00000000000..3e2be160fd1
Binary files /dev/null and b/sound/machines/defib_charge.ogg differ
diff --git a/sound/machines/defib_failed.ogg b/sound/machines/defib_failed.ogg
new file mode 100644
index 00000000000..341f70ce84e
Binary files /dev/null and b/sound/machines/defib_failed.ogg differ
diff --git a/sound/machines/defib_ready.ogg b/sound/machines/defib_ready.ogg
new file mode 100644
index 00000000000..718128602ed
Binary files /dev/null and b/sound/machines/defib_ready.ogg differ
diff --git a/sound/machines/defib_saftyOff.ogg b/sound/machines/defib_saftyOff.ogg
new file mode 100644
index 00000000000..6ab57097de3
Binary files /dev/null and b/sound/machines/defib_saftyOff.ogg differ
diff --git a/sound/machines/defib_success.ogg b/sound/machines/defib_success.ogg
new file mode 100644
index 00000000000..3f71438c168
Binary files /dev/null and b/sound/machines/defib_success.ogg differ
diff --git a/sound/machines/defib_zap.ogg b/sound/machines/defib_zap.ogg
new file mode 100644
index 00000000000..5612db39a43
Binary files /dev/null and b/sound/machines/defib_zap.ogg differ
diff --git a/sound/music/highlander.ogg b/sound/music/highlander.ogg
deleted file mode 100644
index 787926383c7..00000000000
Binary files a/sound/music/highlander.ogg and /dev/null differ
diff --git a/sound/music/nowyouman.ogg b/sound/music/nowyouman.ogg
deleted file mode 100644
index 83471f1fc0d..00000000000
Binary files a/sound/music/nowyouman.ogg and /dev/null differ
diff --git a/sound/weapons/Taser.ogg b/sound/weapons/Taser.ogg
index f6bcb648212..8992b71f50f 100644
Binary files a/sound/weapons/Taser.ogg and b/sound/weapons/Taser.ogg differ
diff --git a/sound/weapons/drill.ogg b/sound/weapons/drill.ogg
new file mode 100644
index 00000000000..fd7495f74fa
Binary files /dev/null and b/sound/weapons/drill.ogg differ
diff --git a/sound/weapons/plasma_cutter.ogg b/sound/weapons/plasma_cutter.ogg
new file mode 100644
index 00000000000..ba95317cc1e
Binary files /dev/null and b/sound/weapons/plasma_cutter.ogg differ
diff --git a/sound/weapons/sonic_jackhammer.ogg b/sound/weapons/sonic_jackhammer.ogg
new file mode 100644
index 00000000000..dae5762b2c4
Binary files /dev/null and b/sound/weapons/sonic_jackhammer.ogg differ