Merge branch 'master' into columba2

Signed-off-by: goober3 <[email protected]>
shiptest-ss13 · Oct 15, 2023 · a01c81e · a01c81e
2 parents 9d2ea59 + dfae6f0
commit a01c81e
Show file tree

Hide file tree

Showing 147 changed files with 28,756 additions and 6,303 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
@@ -393,7 +393,7 @@
 	pixel_x = 9;
 	pixel_y = -1
 	},
-/obj/item/gun/ballistic/automatic/assualt/p16/minutemen{
+/obj/item/gun/ballistic/automatic/assault/p16/minutemen{
 	pixel_y = 7;
 	pixel_x = -9
 	},

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm
@@ -1703,7 +1703,7 @@
 "Md" = (
 /obj/structure/rack,
 /obj/item/ammo_box/magazine/smgm9mm/ap,
-/obj/item/ammo_box/magazine/smgm9mm/fire,
+/obj/item/ammo_box/magazine/smgm9mm/inc,
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/vault,
 /area/ruin/unpowered/corprejectvault)