Merge pull request #114 from Mirag1993/master

Тестовый мердж
CeladonSS13 · Nov 1, 2023 · fa56b5b · fa56b5b
2 parents 0934358 + e561127
commit fa56b5b
Show file tree

Hide file tree

Showing 1,071 changed files with 97,614 additions and 31,698 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm b/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm
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
@@ -83,9 +83,6 @@
 /area/ruin/unpowered/corprejectengineering)
 "cN" = (
 /obj/structure/safe/floor,
-/obj/item/stack/sheet/capitalisium{
-	amount = 10
-	},
 /obj/item/hand_tele,
 /obj/item/stack/sheet/mineral/adamantine,
 /obj/item/stack/sheet/mineral/adamantine,
@@ -1703,7 +1700,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)