diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index c010111113c..d6fa14771dc 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -216,6 +216,12 @@ ammo_band_image.appearance_flags = RESET_COLOR|KEEP_APART return ammo_band_image +/obj/item/ammo_box/magazine + name = "A magazine (what?)" + desc = "A magazine of rounds, they look like error signs..." + drop_sound = 'sound/items/handling/gun/ballistics/magazine/magazine_drop1.ogg' + pickup_sound = 'sound/items/handling/gun/ballistics/magazine/magazine_pickup1.ogg' + ///Count of number of bullets in the magazine /obj/item/ammo_box/magazine/proc/ammo_count(countempties = TRUE) var/boolets = 0 diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index f09f650aca7..1c158cf4a87 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -10,6 +10,8 @@ rack_sound = 'sound/items/weapons/gun/smg/smgrack.ogg' suppressed_sound = 'sound/items/weapons/gun/smg/shot_suppressed.ogg' burst_fire_selection = TRUE + drop_sound = 'sound/items/handling/gun/ballistics/smg/smg_drop1.ogg' + pickup_sound = 'sound/items/handling/gun/ballistics/smg/smg_pickup1.ogg' /obj/item/gun/ballistic/automatic/proto name = "\improper Nanotrasen Saber SMG" diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index 5bf89d4876f..5dbc13169db 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -20,6 +20,8 @@ rack_sound = 'sound/items/weapons/gun/pistol/rack_small.ogg' lock_back_sound = 'sound/items/weapons/gun/pistol/lock_small.ogg' bolt_drop_sound = 'sound/items/weapons/gun/pistol/drop_small.ogg' + drop_sound = 'sound/items/handling/gun/ballistics/pistol/pistol_drop1.ogg' + pickup_sound = 'sound/items/handling/gun/ballistics/pistol/pistol_pickup1.ogg' fire_sound_volume = 90 bolt_wording = "slide" suppressor_x_offset = 10 diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm index 855547dd5f3..c65cc51e9a8 100644 --- a/code/modules/projectiles/guns/ballistic/rifle.dm +++ b/code/modules/projectiles/guns/ballistic/rifle.dm @@ -13,6 +13,8 @@ fire_sound_volume = 90 rack_sound = 'sound/items/weapons/gun/rifle/bolt_out.ogg' bolt_drop_sound = 'sound/items/weapons/gun/rifle/bolt_in.ogg' + drop_sound = 'sound/items/handling/gun/ballistics/rifle/rifle_drop1.ogg' + pickup_sound = 'sound/items/handling/gun/ballistics/rifle/rifle_pickup1.ogg' tac_reloads = FALSE /obj/item/gun/ballistic/rifle/rack(mob/user = null) diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 6c722e5772d..4269700378f 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -12,6 +12,8 @@ fire_sound_volume = 90 rack_sound = 'sound/items/weapons/gun/shotgun/rack.ogg' load_sound = 'sound/items/weapons/gun/shotgun/insert_shell.ogg' + drop_sound = 'sound/items/handling/gun/ballistics/shotgun/shotgun_drop1.ogg' + pickup_sound = 'sound/items/handling/gun/ballistics/shotgun/shotgun_pickup1.ogg' w_class = WEIGHT_CLASS_BULKY force = 10 obj_flags = CONDUCTS_ELECTRICITY diff --git a/sound/items/handling/gun/ballistics/attribution.txt b/sound/items/handling/gun/ballistics/attribution.txt new file mode 100644 index 00000000000..7311c7d8e33 --- /dev/null +++ b/sound/items/handling/gun/ballistics/attribution.txt @@ -0,0 +1,17 @@ +shotgun_pickup1.ogg - https://freesound.org/people/PNMCarrieRailfan/sounds/681692/ , License: CC BY-NC 4.0 +shotgun_drop1.ogg - https://freesound.org/people/PNMCarrieRailfan/sounds/681690/ , License: CC BY-NC 4.0 +pistol_pickup1.ogg - https://freesound.org/people/PNMCarrieRailfan/sounds/682043/ , License: CC BY-NC 4.0 +pistol_drop1.ogg - https://freesound.org/people/PNMCarrieRailfan/sounds/682043/ , License: CC BY-NC 4.0 +rifle_pickup.ogg - https://freesound.org/people/the_Carlos/sounds/706972/ , License: CC BY 4.0 +rifle_drop1.ogg - https://freesound.org/people/the_Carlos/sounds/706972/ , License: CC BY 4.0 +smg_drop1.ogg - https://freesound.org/people/hyperix6/sounds/676588/ , License: CC0 +smg_pickup1.ogg - https://freesound.org/people/hyperix6/sounds/676588/ , License: CC0 +magazine_pickup1.ogg - https://freesound.org/people/PNMCarrieRailfan/sounds/681511/ , License: CC BY-NC 4.0 +magazine_drop1.ogg - https://freesound.org/people/PNMCarrieRailfan/sounds/681511/ , License: CC BY-NC 4.0 + + + + + + + diff --git a/sound/items/handling/gun/ballistics/magazine/magazine_drop1.ogg b/sound/items/handling/gun/ballistics/magazine/magazine_drop1.ogg new file mode 100644 index 00000000000..024b0343cb2 Binary files /dev/null and b/sound/items/handling/gun/ballistics/magazine/magazine_drop1.ogg differ diff --git a/sound/items/handling/gun/ballistics/magazine/magazine_pickup1.ogg b/sound/items/handling/gun/ballistics/magazine/magazine_pickup1.ogg new file mode 100644 index 00000000000..077f44a029d Binary files /dev/null and b/sound/items/handling/gun/ballistics/magazine/magazine_pickup1.ogg differ diff --git a/sound/items/handling/gun/ballistics/pistol/pistol_drop1.ogg b/sound/items/handling/gun/ballistics/pistol/pistol_drop1.ogg new file mode 100644 index 00000000000..d0081424414 Binary files /dev/null and b/sound/items/handling/gun/ballistics/pistol/pistol_drop1.ogg differ diff --git a/sound/items/handling/gun/ballistics/pistol/pistol_pickup1.ogg b/sound/items/handling/gun/ballistics/pistol/pistol_pickup1.ogg new file mode 100644 index 00000000000..28922b2c2c2 Binary files /dev/null and b/sound/items/handling/gun/ballistics/pistol/pistol_pickup1.ogg differ diff --git a/sound/items/handling/gun/ballistics/rifle/rifle_drop1.ogg b/sound/items/handling/gun/ballistics/rifle/rifle_drop1.ogg new file mode 100644 index 00000000000..eada3f9bf76 Binary files /dev/null and b/sound/items/handling/gun/ballistics/rifle/rifle_drop1.ogg differ diff --git a/sound/items/handling/gun/ballistics/rifle/rifle_pickup1.ogg b/sound/items/handling/gun/ballistics/rifle/rifle_pickup1.ogg new file mode 100644 index 00000000000..470c5e23096 Binary files /dev/null and b/sound/items/handling/gun/ballistics/rifle/rifle_pickup1.ogg differ diff --git a/sound/items/handling/gun/ballistics/shotgun/shotgun_drop1.ogg b/sound/items/handling/gun/ballistics/shotgun/shotgun_drop1.ogg new file mode 100644 index 00000000000..97d3a9e6fb9 Binary files /dev/null and b/sound/items/handling/gun/ballistics/shotgun/shotgun_drop1.ogg differ diff --git a/sound/items/handling/gun/ballistics/shotgun/shotgun_pickup1.ogg b/sound/items/handling/gun/ballistics/shotgun/shotgun_pickup1.ogg new file mode 100644 index 00000000000..76c3f8ce231 Binary files /dev/null and b/sound/items/handling/gun/ballistics/shotgun/shotgun_pickup1.ogg differ diff --git a/sound/items/handling/gun/ballistics/smg/smg_drop1.ogg b/sound/items/handling/gun/ballistics/smg/smg_drop1.ogg new file mode 100644 index 00000000000..c0a39efbc28 Binary files /dev/null and b/sound/items/handling/gun/ballistics/smg/smg_drop1.ogg differ diff --git a/sound/items/handling/gun/ballistics/smg/smg_pickup1.ogg b/sound/items/handling/gun/ballistics/smg/smg_pickup1.ogg new file mode 100644 index 00000000000..1d732f893b1 Binary files /dev/null and b/sound/items/handling/gun/ballistics/smg/smg_pickup1.ogg differ