Merge remote-tracking branch 'upstream/master' into food-rework

This commit is contained in:
Fox-McCloud
2016-12-05 12:40:32 -05:00
67 changed files with 836 additions and 312 deletions
@@ -1,6 +1,6 @@
/obj/item/weapon/gun/projectile/automatic/l6_saw
name = "\improper L6 SAW"
desc = "A heavily modified 7.62 light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the reciever below the designation."
desc = "A heavily modified 5.56 light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the reciever below the designation."
icon_state = "l6closed100"
item_state = "l6closedmag"
w_class = 5