Merge remote-tracking branch 'refs/remotes/origin/master' into guns

This commit is contained in:
Spades
2017-07-02 00:30:23 -04:00
72 changed files with 1148 additions and 299 deletions
+2 -2
View File
@@ -113,9 +113,9 @@
prob(4);/obj/item/ammo_magazine/m762,\
prob(4);/obj/item/ammo_magazine/m762,\
prob(3);/obj/item/ammo_magazine/clip/c10mm,\
prob(3);/obj/item/ammo_magazine/clip/c50,\
prob(3);/obj/item/ammo_magazine/clip/c44,\
prob(3);/obj/item/ammo_magazine/m556,\
prob(2);/obj/item/ammo_magazine/m50,\
prob(2);/obj/item/ammo_magazine/m44,\
prob(2);/obj/item/ammo_magazine/m556,\
prob(1);/obj/item/weapon/storage/box/frags,\
/* prob(1);/obj/item/ammo_magazine/battlerifle,\ */