cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #514 from SamCroswell/master

Browse Source 
Dismemberment Update, Fireaxe Fixes, Gunshot Sound Changes
This commit is contained in:
Fox-McCloud
2014-11-23 20:56:27 -05:00
parent 549cf1f2b8 70ee0cff3e
commit b41026c4e6
7 changed files with 62 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/projectile/automatic.dm
+2 -2
View File
@@ -67,7 +67,7 @@
slot_flags = 0
origin_tech = "combat=5;materials=1;syndicate=2"
mag_type = "/obj/item/ammo_box/magazine/m762"
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
fire_sound = 'sound/weapons/Gunshot3.ogg'
var/cover_open = 0
@@ -123,7 +123,7 @@
w_class = 3.0
origin_tech = "combat=5;materials=4;syndicate=6"
mag_type = "/obj/item/ammo_box/magazine/m12g"
fire_sound = 'sound/weapons/Gunshot.ogg'
fire_sound = 'sound/weapons/Gunshot4.ogg'
/obj/item/weapon/gun/projectile/automatic/bulldog/New()
..()
code/modules/projectiles/guns/projectile/pistol.dm
+1
View File
@@ -81,6 +81,7 @@
silenced = 0
origin_tech = "combat=2;materials=2;syndicate=2"
mag_type = "/obj/item/ammo_box/magazine/m10mm"
fire_sound = 'sound/weapons/Gunshot2.ogg'
/obj/item/weapon/gun/projectile/automatic/pistol/attack_hand(mob/user as mob)
if(loc == user)