Merge pull request #921 from CeladonSS13/beta-dev

Мерж беты с альфой
CeladonSS13 · Aug 31, 2024 · 7ff0c93 · 7ff0c93
2 parents be947ee + 69249f3
commit 7ff0c93
Show file tree

Hide file tree

Showing 365 changed files with 40,500 additions and 3,955 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/assault/p16/minutemen{
+/obj/item/gun/ballistic/automatic/assault/cm82{
 	pixel_y = 7;
 	pixel_x = -9
 	},

diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
@@ -1066,7 +1066,7 @@
 /turf/open/floor/wood,
 /area/ruin)
 "Ok" = (
-/turf/open/acid/whitesands,
+/turf/open/water/acid/whitesands,
 /area/overmap_encounter/planetoid/sand/explored)
 "Ov" = (
 /obj/item/clothing/head/cowboy{

diff --git a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_treasure_cove.dmm b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_treasure_cove.dmm
@@ -390,9 +390,9 @@
 	pixel_x = 9;
 	pixel_y = -1
 	},
-/obj/item/gun/ballistic/automatic/assault/p16/minutemen{
-	pixel_y = 7;
-	pixel_x = -9
+/obj/item/gun/ballistic/automatic/assault/p16{
+	pixel_x = -9;
+	pixel_y = 7
 	},
 /turf/open/floor/carpet/red,
 /area/ruin/beach/treasure_cove)