Merge remote-tracking branch 'upstream/master' into haha

This commit is contained in:
lolman360
2020-08-19 12:20:07 +10:00
354 changed files with 15240 additions and 2131 deletions
@@ -16,6 +16,11 @@
name = "speed loader (.357 AP)"
ammo_type = /obj/item/ammo_casing/a357/ap
/obj/item/ammo_box/a357/dumdum
name = "speed loader (.357 DumDum)"
desc = "Designed to quickly reload revolvers. Usage of these rounds will constitute a war crime in your area."
ammo_type = /obj/item/ammo_casing/a357/dumdum
/obj/item/ammo_box/c38
name = "speed loader (.38 rubber)"
desc = "Designed to quickly reload revolvers."