cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-22 19:46:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev

Browse Source
This commit is contained in:
Mloc-Argent
2013-08-13 22:21:09 +01:00
parent 310283f581 f3264a05e7
commit e2e747fa0a
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/bullets.dm
+2 -2
View File
@@ -47,7 +47,7 @@
/obj/item/ammo_casing/a12mm
desc = "A 12mm bullet casing."
caliber = "12mm"
projectile_type = "/obj/item/projectile/bullet/midbullet"
projectile_type = "/obj/item/projectile/bullet/midbullet2"
/obj/item/ammo_casing/shotgun
@@ -93,4 +93,4 @@
/obj/item/ammo_casing/a762
desc = "A 7.62 bullet casing."
caliber = "a762"
projectile_type = "/obj/item/projectile/bullet"
projectile_type = "/obj/item/projectile/bullet/a762"