BS12 -> Ponies merge

This commit is contained in:
ZomgPonies
2013-09-09 10:51:16 -04:00
parent b389395c0e
commit c1222034ee
125 changed files with 18129 additions and 1673 deletions
@@ -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"