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

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

Browse Source 
# Conflicts:
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/projectiles.dmi
This commit is contained in:
Markolie
2017-01-23 17:36:37 +01:00
parent e9cc69ea3f 0c3813134e
commit a7205cfd3e
18 changed files with 945 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/projectile/pistol.dm
+8
View File
@@ -40,6 +40,14 @@
mag_type = /obj/item/ammo_box/magazine/m50
can_suppress = 0
/obj/item/weapon/gun/projectile/automatic/pistol/enforcer45
name = "Enforcer .45"
desc = "A pistol of modern design."
icon_state = "enforcer"
force = 10
mag_type = /obj/item/ammo_box/magazine/m45/enforcer45
can_suppress = 0
/obj/item/weapon/gun/projectile/automatic/pistol/deagle/update_icon()
..()
icon_state = "[initial(icon_state)][magazine ? "" : "-e"]"