Merge remote-tracking branch 'origin/master' into magrifles_again

2019-10-21 00:47:03 -07:00
parent 28072a31dc c59f15a8bc
commit c6c2a703e5
2558 changed files with 107307 additions and 77068 deletions
@@ -11,7 +11,7 @@
 	max_ammo = 1

 /obj/item/ammo_box/magazine/internal/rocketlauncher
-	name = "grenade launcher internal magazine"
+	name = "rocket launcher internal magazine"
 	ammo_type = /obj/item/ammo_casing/caseless/rocket
 	caliber = "84mm"
 	max_ammo = 1