Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229

2020-02-22 00:55:32 +01:00
parent 5dc1de1d04 0cffb2e672
commit 8fbfd07692
1009 changed files with 20505 additions and 13193 deletions
@@ -13,7 +13,7 @@
 	name = "magpistol magazine (non-lethal disabler)"
 	icon_state = "smallmagmag"
 	ammo_type = /obj/item/ammo_casing/caseless/magnetic/weak/disabler
-	max_ammo = 15
+	max_ammo = 16

 /obj/item/ammo_box/magazine/mmag/small/lethal
 	name = "magpistol magazine (lethal)"
@@ -0,0 +1,6 @@
+/obj/item/ammo_box/magazine/internal/bow
+	name = "bow... magazine?" //shouldn't be seeing this
+	ammo_type = /obj/item/ammo_casing/caseless/arrow
+	caliber = "arrow"
+	max_ammo = 1
+	start_empty = 1