Merge pull request #1150 from Citadel-Station-13/upstream-merge-27535

[MIRROR] Ballistic Weapon/Shotgun Reload Sounds
This commit is contained in:
LetterJay
2017-05-24 08:33:34 -05:00
committed by GitHub
12 changed files with 12 additions and 0 deletions
+2
View File
@@ -86,6 +86,7 @@
if(num_loaded)
if(!silent)
to_chat(user, "<span class='notice'>You load [num_loaded] shell\s into \the [src]!</span>")
playsound(user, 'sound/weapons/bulletinsert.ogg', 60, 1)
A.update_icon()
update_icon()
@@ -96,6 +97,7 @@
if(A)
user.put_in_hands(A)
to_chat(user, "<span class='notice'>You remove a round from \the [src]!</span>")
playsound(user, 'sound/weapons/bulletremove.ogg', 60, 1)
update_icon()
/obj/item/ammo_box/update_icon()
@@ -44,6 +44,8 @@
oldmag.update_icon()
else
to_chat(user, "<span class='notice'>You insert the magazine into \the [src].</span>")
playsound(user, 'sound/weapons/autoguninsert.ogg', 60, 1)
chamber_round()
A.update_icon()
update_icon()
@@ -300,6 +302,10 @@
/obj/item/weapon/gun/ballistic/automatic/l6_saw/attack_self(mob/user)
cover_open = !cover_open
to_chat(user, "<span class='notice'>You [cover_open ? "open" : "close"] [src]'s cover.</span>")
if(cover_open)
playsound(user, 'sound/weapons/sawopen.ogg', 60, 1)
else
playsound(user, 'sound/weapons/sawclose.ogg', 60, 1)
update_icon()
@@ -330,6 +336,7 @@
magazine = null
update_icon()
to_chat(user, "<span class='notice'>You remove the magazine from [src].</span>")
playsound(user, 'sound/weapons/magout.ogg', 60, 1)
/obj/item/weapon/gun/ballistic/automatic/l6_saw/attackby(obj/item/A, mob/user, params)
@@ -28,6 +28,7 @@
var/num_loaded = magazine.attackby(A, user, params, 1)
if(num_loaded)
to_chat(user, "<span class='notice'>You load [num_loaded] shell\s into \the [src].</span>")
playsound(user, 'sound/weapons/bulletinsert.ogg', 60, 1)
A.update_icon()
update_icon()
chamber_round(0)
@@ -45,6 +46,7 @@
num_unloaded++
if (num_unloaded)
to_chat(user, "<span class='notice'>You unload [num_unloaded] shell\s from [src].</span>")
playsound(user, 'sound/weapons/bulletremove.ogg', 60, 1)
else
to_chat(user, "<span class='warning'>[src] is empty!</span>")
@@ -20,6 +20,7 @@
var/num_loaded = magazine.attackby(A, user, params, 1)
if(num_loaded)
to_chat(user, "<span class='notice'>You load [num_loaded] shell\s into \the [src]!</span>")
playsound(user, 'sound/weapons/shotguninsert.ogg', 60, 1)
A.update_icon()
update_icon()
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.