diff --git a/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm b/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
index 4aaff2b5a160..7f0ccabb175f 100644
--- a/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
+++ b/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
@@ -19,7 +19,9 @@
 /area/ruin/beach)
 "bG" = (
 /obj/item/oar,
-/obj/item/oar,
+/obj/item/oar{
+	pixel_y = 3
+	},
 /obj/structure/rack,
 /turf/open/floor/wood/ebony,
 /area/overmap_encounter/planetoid/beachplanet/explored)
@@ -80,15 +82,18 @@
 /area/ruin/beach)
 "eV" = (
 /obj/structure/closet/crate/freezer,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 9
+	},
+/obj/effect/turf_decal/corner/opaque/lightgrey/diagonal,
+/obj/item/reagent_containers/food/snacks/fishmeat/carp,
+/obj/item/reagent_containers/food/snacks/fishmeat/carp,
+/obj/item/reagent_containers/food/snacks/fishmeat/carp,
 /obj/item/reagent_containers/food/snacks/fishmeat/carp,
 /obj/item/reagent_containers/food/snacks/fishmeat/carp,
 /obj/item/reagent_containers/food/snacks/fishmeat/carp,
 /obj/item/reagent_containers/food/snacks/fishmeat/carp,
 /obj/item/reagent_containers/food/snacks/fishmeat/carp,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
-	dir = 9
-	},
-/obj/effect/turf_decal/corner/opaque/lightgrey/diagonal,
 /turf/open/floor/plastic,
 /area/ruin/beach)
 "fo" = (
@@ -184,15 +189,16 @@
 /turf/open/water/beach/deep,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "jz" = (
-/obj/item/toy/plush/carpplushie/dehy_carp,
-/obj/item/toy/plush/carpplushie/dehy_carp,
-/obj/item/toy/plush/carpplushie/dehy_carp,
-/obj/item/toy/plush/carpplushie/dehy_carp,
 /obj/structure/closet/crate/wooden{
 	name = "freeze dried carp"
 	},
 /obj/effect/turf_decal/corner/opaque/pink/diagonal,
 /obj/machinery/light/dim/directional/south,
+/obj/item/reagent_containers/food/snacks/fishmeat/carp/imitation,
+/obj/item/reagent_containers/food/snacks/fishmeat/carp/imitation,
+/obj/item/reagent_containers/food/snacks/fishmeat/carp/imitation,
+/obj/item/reagent_containers/food/snacks/fishmeat/carp/imitation,
+/obj/item/reagent_containers/food/snacks/fishmeat/carp/imitation,
 /turf/open/floor/plastic,
 /area/ruin/beach)
 "kg" = (
@@ -295,7 +301,6 @@
 "mD" = (
 /obj/structure/table/wood,
 /obj/machinery/light/small/directional/north,
-/obj/item/gun/ballistic/shotgun/flamingarrow,
 /turf/open/floor/wood,
 /area/ruin/beach)
 "mE" = (
@@ -457,11 +462,6 @@
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 5
 	},
-/obj/item/reagent_containers/food/snacks/fishmeat/carp,
-/obj/item/reagent_containers/food/snacks/fishmeat/carp,
-/obj/item/reagent_containers/food/snacks/fishmeat/carp,
-/obj/item/reagent_containers/food/snacks/fishmeat/carp,
-/obj/item/reagent_containers/food/snacks/fishmeat/carp,
 /obj/structure/closet/secure_closet/freezer,
 /turf/open/floor/plastic,
 /area/ruin/beach)
@@ -485,9 +485,6 @@
 /obj/machinery/light/small/directional/north{
 	light_color = "#694c12"
 	},
-/obj/structure/safe/floor,
-/obj/item/book/granter/martial/carp,
-/obj/item/grenade/clusterbuster/spawner_spesscarp,
 /turf/open/floor/carpet,
 /area/ruin/beach)
 "tj" = (
@@ -576,12 +573,13 @@
 /obj/structure/table/wood/poker,
 /obj/item/kirbyplants{
 	icon_state = "plant-17";
-	pixel_y = 13;
-	layer = 3
+	pixel_y = 7;
+	layer = 3;
+	pixel_x = -7
 	},
 /obj/item/reagent_containers/food/snacks/burger/fish{
-	pixel_y = -3;
-	pixel_x = 11;
+	pixel_y = 5;
+	pixel_x = 6;
 	layer = 3.1
 	},
 /turf/open/floor/carpet,
@@ -827,27 +825,14 @@
 /area/ruin/beach)
 "Gt" = (
 /obj/effect/turf_decal/corner/opaque/lightgrey/diagonal,
-/mob/living/simple_animal/hostile/cat_butcherer{
-	atmos_requirements = list("min_oxy"=0,"max_oxy"=0,"min_tox"=0,"max_tox"=0,"min_co2"=0,"max_co2"=0,"min_n2"=0,"max_n2"=0);
-	desc = "A profession carp butcher, gone mad due to carptoxin exposure. There seems to be something in their pocket...";
-	faction = list("beach","pirate");
-	health = 300;
-	loot = list(/obj/effect/mob_spawn/human/corpse/cat_butcher,/obj/item/guardiancreator/carp);
-	maxHealth = 300;
-	maxbodytemp = 10000;
-	melee_damage_lower = 20;
-	melee_damage_upper = 25;
-	minbodytemp = 0;
-	name = "The Butcher";
-	ranged_cooldown_time = 15;
-	ranged_message = "fires the speargun at";
-	real_name = "The Butcher";
-	unique_name = 1
-	},
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 1
 	},
 /obj/effect/decal/cleanable/blood/splatter,
+/mob/living/simple_animal/hostile/pirate/ranged/space{
+	name = "Pirate Captain";
+	faction = list("carp","beach","pirate")
+	},
 /turf/open/floor/plastic,
 /area/ruin/beach)
 "GP" = (
@@ -1004,9 +989,6 @@
 /area/overmap_encounter/planetoid/cave/explored)
 "LM" = (
 /obj/structure/closet/crate/bin,
-/obj/item/reagent_containers/food/snacks/fishmeat/carp/imitation,
-/obj/item/reagent_containers/food/snacks/fishmeat/carp/imitation,
-/obj/item/reagent_containers/food/snacks/fishmeat/carp/imitation,
 /obj/effect/turf_decal/corner/opaque/pink/diagonal,
 /turf/open/floor/plastic,
 /area/ruin/beach)
@@ -1119,17 +1101,13 @@
 	dir = 8
 	},
 /obj/structure/table/wood,
-/obj/item/grenade/spawnergrenade/spesscarp{
-	pixel_x = 3;
-	pixel_y = -21
-	},
 /obj/item/stack/medical/bruise_pack/herb{
 	pixel_x = -5;
 	name = "herbal pack"
 	},
 /obj/item/stack/medical/ointment/herb{
-	pixel_y = 6;
-	pixel_x = 11
+	pixel_y = 11;
+	pixel_x = 3
 	},
 /turf/open/floor/wood,
 /area/ruin/beach)
@@ -1190,6 +1168,7 @@
 "Ty" = (
 /obj/structure/table/wood,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/item/gun/ballistic/shotgun/winchester/mk1,
 /turf/open/floor/wood,
 /area/ruin/beach)
 "TM" = (
@@ -1215,8 +1194,24 @@
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "Uj" = (
 /obj/structure/table/wood/reinforced,
-/obj/machinery/reagentgrinder,
+/obj/machinery/reagentgrinder{
+	pixel_x = 6;
+	pixel_y = 17
+	},
 /obj/effect/turf_decal/corner/opaque/pink/diagonal,
+/obj/item/reagent_containers/food/snacks/fishmeat/carp/imitation,
+/obj/item/reagent_containers/food/snacks/fishmeat/carp/imitation,
+/obj/item/reagent_containers/food/snacks/fishmeat/carp/imitation{
+	pixel_x = 6;
+	pixel_y = -3
+	},
+/obj/item/reagent_containers/food/snacks/fishmeat/carp/imitation{
+	pixel_y = 5;
+	pixel_x = -6
+	},
+/obj/item/reagent_containers/food/snacks/fishmeat/carp/imitation{
+	pixel_y = 3
+	},
 /turf/open/floor/plastic,
 /area/ruin/beach)
 "UC" = (
@@ -1281,9 +1276,6 @@
 "Wk" = (
 /obj/effect/turf_decal/corner/opaque/lightgrey/diagonal,
 /obj/machinery/atmospherics/pipe/heat_exchanging/junction,
-/mob/living/simple_animal/hostile/carp{
-	bruteloss = 100
-	},
 /obj/effect/decal/cleanable/blood/footprints{
 	dir = 4
 	},
@@ -1291,6 +1283,9 @@
 	dir = 8;
 	pixel_y = 6
 	},
+/mob/living/simple_animal/hostile/carp{
+	bruteloss = 100
+	},
 /turf/open/floor/plastic,
 /area/ruin/beach)
 "WT" = (