Merge remote-tracking branch 'citadel/master' into combat_v7

2021-04-26 14:17:43 -07:00
parent 1fd06a89b7 3fac51374f
commit 275b532a8c
480 changed files with 310849 additions and 306446 deletions
@@ -73,3 +73,11 @@
 	name = ".38 DumDum bullet casing"
 	desc = "A .38 DumDum bullet casing."
 	projectile_type = /obj/item/projectile/bullet/c38/dumdum
+
+//.45-70 GOVT (Gunslinger's Derringer)
+
+/obj/item/ammo_casing/g4570
+	name= ".45-70 Govt bullet casing"
+	desc = "An exceedingly rare .45-70 Govt bullet casing."
+	caliber = "45-70g"
+	projectile_type = /obj/item/projectile/bullet/g4570