cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10395 from granodd/GunsAndGunAccessories

Browse Source 
New Gun Sounds
This commit is contained in:
variableundefined
2019-01-27 10:37:03 +08:00
committed by GitHub
parent fb9a788944 e3c0acfd42
commit 920395cc7e
61 changed files with 154 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/latexballoon.dm
+1 -1
View File
@@ -28,7 +28,7 @@
/obj/item/latexballon/proc/burst()
if(!air_contents || icon_state != "latexballon_blow")
return
playsound(src, 'sound/weapons/Gunshot.ogg', 100, 1)
playsound(src, 'sound/weapons/gunshots/gunshot.ogg', 100, 1)
icon_state = "latexballon_bursted"
item_state = "lgloves"
if(isliving(loc))
code/game/objects/items/toys.dm
+2 -2
View File
@@ -1375,7 +1375,7 @@ obj/item/toy/cards/deck/syndicate/black
/obj/item/toy/russian_revolver/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] quickly loads six bullets into [src]'s cylinder and points it at [user.p_their()] head before pulling the trigger! It looks like [user.p_theyre()] trying to commit suicide.</span>")
playsound(loc, 'sound/weapons/Gunshot.ogg', 50, 1)
playsound(loc, 'sound/weapons/gunshots/gunshot_strong.ogg', 50, 1)
return (BRUTELOSS)
/obj/item/toy/russian_revolver/New()
@@ -1409,7 +1409,7 @@ obj/item/toy/cards/deck/syndicate/black
return
else
bullet_position = null
playsound(src, 'sound/weapons/Gunshot.ogg', 50, 1)
playsound(src, 'sound/weapons/gunshots/gunshot_strong.ogg', 50, 1)
user.visible_message("<span class='danger'>[src] goes off!</span>")
user.apply_damage(200, BRUTE, "head", sharp = 1, used_weapon = "Self-inflicted gunshot wound to the head.")
user.death()