diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index b037c19a9ad..cc1e327478b 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -133,6 +133,7 @@
// step_towards(M, src)
. = buckle_mob(M, forced)
+ playsound(src.loc, 'sound/effects/seatbelt.ogg', 50, 1)
if(.)
var/reveal_message = list("buckled_mob" = null, "buckled_to" = null) //VORE EDIT: This being a list and messages existing for the buckle target atom.
if(!silent)
@@ -160,6 +161,7 @@
/atom/movable/proc/user_unbuckle_mob(mob/living/buckled_mob, mob/user)
var/mob/living/M = unbuckle_mob(buckled_mob)
+ playsound(src.loc, 'sound/effects/seatbelt.ogg', 50, 1)
if(M)
if(M != user)
M.visible_message(\
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index d8fe6304c5d..759ae702abe 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -505,6 +505,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
slot_flags = SLOT_BELT
attack_verb = list("burnt", "singed")
var/base_state
+ var/activation_sound = 'sound/items/lighter_on.ogg'
+ var/deactivation_sound = 'sound/items/lighter_off.ogg'
/obj/item/weapon/flame/lighter/zippo
name = "\improper Zippo lighter"
@@ -512,6 +514,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon = 'icons/obj/zippo.dmi'
icon_state = "zippo"
item_state = "zippo"
+ activation_sound = 'sound/items/zippo_on.ogg'
+ deactivation_sound = 'sound/items/zippo_off.ogg'
/obj/item/weapon/flame/lighter/random
New()
@@ -526,6 +530,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
lit = 1
icon_state = "[base_state]on"
item_state = "[base_state]on"
+ playsound(src.loc, activation_sound, 75, 1)
if(istype(src, /obj/item/weapon/flame/lighter/zippo) )
user.visible_message("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.")
else
@@ -545,6 +550,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
lit = 0
icon_state = "[base_state]"
item_state = "[base_state]"
+ playsound(src.loc, deactivation_sound, 75, 1)
if(istype(src, /obj/item/weapon/flame/lighter/zippo) )
user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing.")
else
diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm
index 27bdbcd6f62..c94f59b988e 100644
--- a/code/modules/clothing/under/accessories/holster.dm
+++ b/code/modules/clothing/under/accessories/holster.dm
@@ -6,6 +6,8 @@
concealed_holster = 1
var/obj/item/holstered = null
var/list/can_hold //VOREStation Add
+ var/holster_in = 'sound/items/holsterin.ogg'
+ var/holster_out = 'sound/items/holsterout.ogg'
/obj/item/clothing/accessory/holster/proc/holster(var/obj/item/I, var/mob/living/user)
if(holstered && istype(user))
@@ -22,6 +24,9 @@
to_chat(user, "[I] won't fit in [src]!")
return
+ if(holster_in)
+ playsound(get_turf(src), holster_in, 50)
+
if(istype(user))
user.stop_aiming(no_message=1)
holstered = I
@@ -43,7 +48,9 @@
if(istype(user.get_active_hand(),/obj) && istype(user.get_inactive_hand(),/obj))
to_chat(user, "You need an empty hand to draw \the [holstered]!")
else
+ var/sound_vol = 25
if(user.a_intent == I_HURT)
+ sound_vol = 50
usr.visible_message(
"[user] draws \the [holstered], ready to go!", //VOREStation Edit
"You draw \the [holstered], ready to go!" //VOREStation Edit
@@ -53,6 +60,10 @@
"[user] draws \the [holstered], pointing it at the ground.",
"You draw \the [holstered], pointing it at the ground."
)
+
+ if(holster_out)
+ playsound(get_turf(src), holster_out, sound_vol)
+
user.put_in_hands(holstered)
holstered.add_fingerprint(user)
w_class = initial(w_class)
diff --git a/sound/effects/seatbelt.ogg b/sound/effects/seatbelt.ogg
new file mode 100644
index 00000000000..aac0903cf9c
Binary files /dev/null and b/sound/effects/seatbelt.ogg differ
diff --git a/sound/items/holsterin.ogg b/sound/items/holsterin.ogg
new file mode 100644
index 00000000000..58ef29b549d
Binary files /dev/null and b/sound/items/holsterin.ogg differ
diff --git a/sound/items/holsterout.ogg b/sound/items/holsterout.ogg
new file mode 100644
index 00000000000..a61e4f77080
Binary files /dev/null and b/sound/items/holsterout.ogg differ
diff --git a/sound/items/lighter_off.ogg b/sound/items/lighter_off.ogg
new file mode 100644
index 00000000000..8a2037e27d2
Binary files /dev/null and b/sound/items/lighter_off.ogg differ
diff --git a/sound/items/lighter_on.ogg b/sound/items/lighter_on.ogg
new file mode 100644
index 00000000000..82c318bb4f3
Binary files /dev/null and b/sound/items/lighter_on.ogg differ
diff --git a/sound/items/zippo_off.ogg b/sound/items/zippo_off.ogg
new file mode 100644
index 00000000000..e007ba0b37a
Binary files /dev/null and b/sound/items/zippo_off.ogg differ
diff --git a/sound/items/zippo_on.ogg b/sound/items/zippo_on.ogg
new file mode 100644
index 00000000000..0c5e7fd44f5
Binary files /dev/null and b/sound/items/zippo_on.ogg differ