mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 12:41:09 +01:00
The Soundening: Security and guns edition. (#85309)
## About The Pull Request https://github.com/user-attachments/assets/9c47c512-ff22-4832-9524-fd6f3e6147c7 Pickup sounds for: - all guns - riot shields - handcuffs - batons and telebatons - pepper spray - all grenades Storage open sound for: - security belt, security webbing, all holsters Successfully cuffing someone now has its own satisfying sound! ## Why It's Good For The Game The most combat intensive role in the game doesn't have these sounds to complement their gameplay, these sounds will increase the amount of danger audio cues you can listen for and give feedback to players on what others are doing. ## Changelog 🆑 sound: guns have pickup and drop sounds sound: security belts and holsters have opening sounds sound: handcuffs have pickup and drop sounds sound: stun batons and telescopic batons now have pickup and drop sounds sound: grenades have pickup and drop sounds sounds: riot shields and telescopic shields have pickup and drop sounds sound: successfully handcuffing someone has sound /🆑
This commit is contained in:
@@ -17,6 +17,8 @@
|
||||
obj_flags = CONDUCTS_ELECTRICITY
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
max_integrity = 40
|
||||
pickup_sound = 'sound/items/grenade_pick_up.ogg'
|
||||
drop_sound = 'sound/items/grenade_drop.ogg'
|
||||
/// Bitfields which prevent the grenade from detonating if set. Includes ([GRENADE_DUD]|[GRENADE_USED])
|
||||
var/dud_flags = NONE
|
||||
///Is this grenade currently armed?
|
||||
|
||||
@@ -48,6 +48,8 @@
|
||||
breakouttime = 1 MINUTES
|
||||
armor_type = /datum/armor/restraints_handcuffs
|
||||
custom_price = PAYCHECK_COMMAND * 0.35
|
||||
pickup_sound = 'sound/items/handcuffs_pick_up.ogg'
|
||||
drop_sound = 'sound/items/handcuffs_drop.ogg'
|
||||
|
||||
///How long it takes to handcuff someone
|
||||
var/handcuff_time = 4 SECONDS
|
||||
@@ -55,6 +57,8 @@
|
||||
var/handcuff_time_mod = 1
|
||||
///Sound that plays when starting to put handcuffs on someone
|
||||
var/cuffsound = 'sound/weapons/handcuffs.ogg'
|
||||
///Sound that plays when restrain is successful
|
||||
var/cuffsuccesssound = 'sound/items/handcuff_finish.ogg'
|
||||
///If set, handcuffs will be destroyed on application and leave behind whatever this is set to.
|
||||
var/trashtype = null
|
||||
/// How strong the cuffs are. Weak cuffs can be broken with wirecutters or boxcutters.
|
||||
@@ -120,6 +124,7 @@
|
||||
return
|
||||
|
||||
apply_cuffs(victim, user, dispense = iscyborg(user))
|
||||
playsound(loc, cuffsuccesssound, 30, TRUE, -2)
|
||||
|
||||
victim.visible_message(
|
||||
span_notice("[user] handcuffs [victim]."),
|
||||
|
||||
@@ -318,6 +318,8 @@
|
||||
bare_wound_bonus = 5
|
||||
clumsy_knockdown_time = 15 SECONDS
|
||||
active = FALSE
|
||||
pickup_sound = 'sound/items/stun_baton_pick_up.ogg'
|
||||
drop_sound = 'sound/items/stun_baton_drop.ogg'
|
||||
|
||||
/// The sound effecte played when our baton is extended.
|
||||
var/on_sound = 'sound/weapons/batonextend.ogg'
|
||||
@@ -436,6 +438,8 @@
|
||||
light_on = FALSE
|
||||
light_color = LIGHT_COLOR_ORANGE
|
||||
light_power = 0.5
|
||||
pickup_sound = 'sound/items/stun_baton_pick_up.ogg'
|
||||
drop_sound = 'sound/items/stun_baton_drop.ogg'
|
||||
|
||||
|
||||
var/throw_stun_chance = 35
|
||||
|
||||
@@ -149,6 +149,8 @@
|
||||
shield_break_sound = 'sound/effects/glassbr3.ogg'
|
||||
shield_break_leftover = /obj/item/shard
|
||||
armor_type = /datum/armor/item_shield/riot
|
||||
pickup_sound = 'sound/items/plastic_shield_pick_up.ogg'
|
||||
drop_sound = 'sound/items/plastic_shield_drop.ogg'
|
||||
|
||||
/obj/item/shield/riot/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
@@ -373,6 +373,9 @@
|
||||
/obj/item/restraints/handcuffs,
|
||||
/obj/item/restraints/legcuffs/bola,
|
||||
))
|
||||
atom_storage.open_sound = 'sound/items/holster.ogg'
|
||||
atom_storage.open_sound_vary = TRUE
|
||||
atom_storage.rustle_sound = FALSE
|
||||
|
||||
/obj/item/storage/belt/security/full/PopulateContents()
|
||||
new /obj/item/reagent_containers/spray/pepper(src)
|
||||
|
||||
@@ -33,6 +33,8 @@
|
||||
/obj/item/gun/energy/laser/captain,
|
||||
/obj/item/gun/energy/e_gun/hos,
|
||||
))
|
||||
atom_storage.open_sound = 'sound/items/holster.ogg'
|
||||
atom_storage.open_sound_vary = TRUE
|
||||
|
||||
/obj/item/storage/belt/holster/energy
|
||||
name = "energy shoulder holsters"
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
name = "projectile gun"
|
||||
icon_state = "debug"
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
pickup_sound = 'sound/items/gun_pick_up.ogg'
|
||||
drop_sound = 'sound/items/gun_drop.ogg'
|
||||
|
||||
///sound when inserting magazine
|
||||
var/load_sound = 'sound/weapons/gun/general/magazine_insert_full.ogg'
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
name = "energy gun"
|
||||
desc = "A basic energy-based gun."
|
||||
icon = 'icons/obj/weapons/guns/energy.dmi'
|
||||
pickup_sound = 'sound/items/gun_pick_up.ogg'
|
||||
drop_sound = 'sound/items/gun_drop.ogg'
|
||||
|
||||
/// What type of power cell this uses
|
||||
var/obj/item/stock_parts/power_store/cell
|
||||
|
||||
@@ -229,6 +229,8 @@
|
||||
stream_range = 4
|
||||
amount_per_transfer_from_this = 5
|
||||
list_reagents = list(/datum/reagent/consumable/condensedcapsaicin = 50)
|
||||
pickup_sound = 'sound/items/pepper_spray_pick_up.ogg'
|
||||
drop_sound = 'sound/items/pepper_spray_drop.ogg'
|
||||
|
||||
/obj/item/reagent_containers/spray/pepper/empty //for protolathe printing
|
||||
list_reagents = null
|
||||
|
||||
@@ -24,6 +24,21 @@ plastic_pick_up.ogg - https://freesound.org/people/Jessica190091/sounds/491304/
|
||||
plastic_drop.ogg - https://freesound.org/people/martian/sounds/338854/ , License: CC0
|
||||
} - edited by sadboysuss
|
||||
|
||||
{
|
||||
gun_drop.ogg - FN FAL Rifle Load and Cock 01.mp3 by PNMCarrieRailfan -- https://freesound.org/s/682029/ -- License: Attribution NonCommercial 4.0
|
||||
gun_pick_up.ogg - FN FAL Rifle Unload and Cock.mp3 by PNMCarrieRailfan -- https://freesound.org/s/682031/ -- License: Attribution NonCommercial 4.0
|
||||
handcuffs_drop.ogg - handcuffs.ogg by kimuracarter -- https://freesound.org/s/528749/ -- License: Attribution 3.0
|
||||
handcuffs_pick_up.ogg - handcuffs.ogg by kimuracarter -- https://freesound.org/s/528749/ -- License: Attribution 3.0
|
||||
plastic_shield_drop.ogg - made by sadboysuss -- License: CC-by-SA
|
||||
plastic_shield_pick_up.ogg - made by sadboysuss -- License: CC-by-SA
|
||||
stun_baton_drop.ogg - Fn P90 Submachine Gun 5.7Mm. Mechan; Empty Mag Inserted Into And Pulled Out Slow And Various 02 by PNMCarrieRailfan -- https://freesound.org/s/682041/ -- License: Attribution NonCommercial 4.0
|
||||
stun_baton_pick_up.ogg - Fn P90 Submachine Gun 5.7Mm. Mechan; Empty Mag Inserted Into And Pulled Out Slow And Various 02 by PNMCarrieRailfan -- https://freesound.org/s/682041/ -- License: Attribution NonCommercial 4.0
|
||||
pepper_spray_drop.ogg - Spray Paint Shake Slow Five.wav by cbakos -- https://freesound.org/s/200376/ -- License: Creative Commons 0
|
||||
pepper_spray_pick_up.ogg - Spray Paint Shake Slow Five.wav by cbakos -- https://freesound.org/s/200376/ -- License: Creative Commons 0
|
||||
grenade_drop.ogg - made by sadboysuss -- License: CC-by-SA
|
||||
grenade_pick_up.ogg - made by sadboysuss -- License: CC-by-SA
|
||||
} - edited by sadboysuss
|
||||
|
||||
{
|
||||
skin_drop.ogg - https://freesound.org/people/Crinkem/sounds/501015/ , License: CC4
|
||||
skin_pick_up.ogg - https://freesound.org/people/Crinkem/sounds/501015/ , License CC3
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user