[CHERRYPICK] September Part 1

_maps/PentestMaps/BeachRuins/_modular_beachplanet.dm

@@ -17,6 +17,21 @@
 	description = "A abandoned colony. It seems that this colony was abandoned, for a reason or another"
 	suffix = "beach_colony.dmm"
 
+/datum/map_template/ruin/beachplanet/pentest/crashedengie
+	name = "Crashed Engineer Ship"
+	id = "beach_crashed_engineer"
+	description = "An abandoned camp built by a crashed engineer"
+	suffix = "beach_crashed_engineer.dmm"
+	ruin_tags = list(RUIN_TAG_MINOR_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_HAZARDOUS)
+	ruin_mission_types = list(/datum/mission/ruin/lost_axe)
+
+/datum/mission/ruin/lost_axe
+	name = "Axe Retrieval"
+	desc = "I recently lost a heirloom axe - produced by a very fine Syebenaltch Guild. I was unable to retrieve it when my vessel crashed, and I was rescued. Please bring it home to me."
+	mission_limit = 1
+	value = 1000
+	setpiece_item = /obj/item/melee/axe/fire
+
 /datum/map_template/ruin/beachplanet/pentest/fishing_hole
 	name = "Fishing Hole"
 	id = "fishing_hole"
@@ -41,6 +56,14 @@
 	description = "A rather large town built on the edge of the ocean."
 	suffix = "beach_ocean_town.dmm"
 
+/datum/map_template/ruin/beachplanet/pentest/scrapvillage
+	name = "Pirate Village"
+	id = "beach_pirate"
+	description = "A small pirate outpost formed from the remains of a wrecked shuttle."
+	suffix = "beach_pirate_crash.dmm"
+	ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_LIVEABLE)
+	ruin_mission_types = list(/datum/mission/ruin/signaled/kill/frontiersmen)
+
 /// Maps that do exist on shiptest code - Custom Modified ///
 
 /datum/map_template/ruin/beachplanet/pentest/fishinghut

_maps/PentestMaps/BeachRuins/beach_pirate_crash.dmm

@@ -568,11 +568,11 @@
 /obj/item/stack/medical/gauze/improvised,
 /obj/item/stack/medical/gauze/improvised,
 /obj/item/stack/medical/gauze/improvised,
-/obj/item/reagent_containers/pill/patch/silver_sulf{
+/obj/item/reagent_containers/pill/patch/alvitane{
 	pixel_x = 5;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/pill/patch/styptic,
+/obj/item/reagent_containers/pill/patch/indomide,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/wood,
 /area/ruin/beach/piratecrash)

_maps/PentestMaps/BeachRuins/beach_pirate_treasure_cove.dmm

@@ -414,9 +414,9 @@
 	pixel_x = 9;
 	pixel_y = -1
 	},
-/obj/item/gun/ballistic/automatic/assault/cm82{
-	pixel_y = 7;
-	pixel_x = -9
+/obj/item/gun/ballistic/automatic/smg/cm5{
+	pixel_x = -5;
+	pixel_y = 5
 	},
 /turf/open/floor/carpet/red,
 /area/ruin/beach/treasure_cove)
@@ -1656,7 +1656,6 @@
 /obj/structure/closet/crate/secure/weapon,
 /obj/item/gun/energy/laser,
 /obj/item/gun/energy/laser,
-/obj/item/gun/energy/laser,
 /turf/open/floor/wood,
 /area/ruin/beach/treasure_cove)
 "Ya" = (
@@ -1746,26 +1745,10 @@
 /area/ruin/beach/treasure_cove)
 "ZG" = (
 /obj/effect/mob_spawn/human/corpse/damaged,
-/obj/item/ammo_box/magazine/p16{
-	pixel_x = -7;
-	pixel_y = 2
-	},
-/obj/item/ammo_box/magazine/p16{
-	pixel_x = -7;
-	pixel_y = 2
-	},
-/obj/item/ammo_box/magazine/p16{
-	pixel_x = -7;
-	pixel_y = 2
-	},
 /obj/structure/closet/body_bag,
-/obj/item/ammo_box/magazine/p16{
-	pixel_x = -7;
-	pixel_y = 2
-	},
-/obj/item/ammo_box/magazine/p16{
-	pixel_x = -7;
-	pixel_y = 2
+/obj/item/ammo_box/magazine/cm5_9mm{
+	pixel_x = -8;
+	pixel_y = -1
 	},
 /obj/item/clothing/head/helmet/bulletproof/x11/clip,
 /obj/item/clothing/under/clip/officer,

_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm

@@ -486,11 +486,11 @@
 /turf/open/floor/concrete/slab_1,
 /area/ruin/beach/complex/wall)
 "iB" = (
-/obj/item/reagent_containers/pill/patch/styptic{
+/obj/item/reagent_containers/pill/patch/indomide{
 	name = "industrial medicine";
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/pill/patch/styptic{
+/obj/item/reagent_containers/pill/patch/indomide{
 	name = "industrial medicine"
 	},
 /obj/structure/table,
@@ -1726,10 +1726,10 @@
 /area/ruin/beach/complex)
 "Cb" = (
 /obj/structure/table,
-/obj/item/reagent_containers/pill/patch/silver_sulf{
+/obj/item/reagent_containers/pill/patch/alvitane{
 	name = "industrial medicine"
 	},
-/obj/item/reagent_containers/pill/patch/silver_sulf{
+/obj/item/reagent_containers/pill/patch/alvitane{
 	pixel_y = -5;
 	name = "industrial medicine"
 	},