Merge branch 'master' of https://github.com/tgstation/TerraGov-Marine…

…-Corps
Xander3359 · Feb 27, 2024 · 64ad625 · 64ad625
2 parents 38874dc + 256ea70
commit 64ad625
Show file tree

Hide file tree

Showing 235 changed files with 3,850 additions and 4,189 deletions.
diff --git a/_maps/map_files/Campaign maps/orion_2/orionoutpost_2.dmm b/_maps/map_files/Campaign maps/orion_2/orionoutpost_2.dmm
@@ -2863,7 +2863,7 @@
 /area/orion_outpost/ground/underground/caveN)
 "nJ" = (
 /obj/item/ammo_magazine/tank/ltb_cannon,
-/obj/item/ammo_magazine/tank/ltaaap_minigun,
+/obj/item/ammo_magazine/tank/ltaap_minigun,
 /turf/open/floor/mainship/black{
 	dir = 8
 	},
@@ -6740,7 +6740,7 @@
 /area/orion_outpost/ground/outpostcent)
 "Gr" = (
 /obj/item/ammo_magazine/tank/ltb_cannon,
-/obj/item/ammo_magazine/tank/ltaaap_minigun,
+/obj/item/ammo_magazine/tank/ltaap_minigun,
 /turf/open/floor/mainship/black/full,
 /area/orion_outpost/surface/building/ammodepot)
 "Gs" = (