Merge branch 'master' into guns-changes

_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm

@@ -136,7 +136,7 @@
 /obj/machinery/light/floor,
 /obj/machinery/porta_turret/syndicate/energy{
 	active_power_usage = 0;
-	faction = list("beach","pirate");
+	faction = list("Frontiersmen","beach");
 	idle_power_usage = 0;
 	reqpower = 0;
 	name = "Point defense anti-carp turret"
@@ -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" = (
@@ -667,8 +664,8 @@
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "Bg" = (
 /obj/effect/turf_decal/corner/opaque/pink/diagonal,
-/mob/living/simple_animal/hostile/human/pirate/melee{
-	faction = list("beach","pirate")
+/mob/living/simple_animal/hostile/human/frontier{
+	faction = list("Frontiersmen","beach")
 	},
 /turf/open/floor/plastic,
 /area/ruin/beach)
@@ -726,8 +723,7 @@
 "Ch" = (
 /obj/effect/turf_decal/corner/opaque/pink/diagonal,
 /obj/structure/sink/kitchen{
-	dir = 4;
-	pixel_x = -11
+	dir = 4
 	},
 /turf/open/floor/plastic,
 /area/ruin/beach)
@@ -827,23 +823,6 @@
 /area/ruin/beach)
 "Gt" = (
 /obj/effect/turf_decal/corner/opaque/lightgrey/diagonal,
-/mob/living/simple_animal/hostile/human/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
 	},
@@ -853,8 +832,8 @@
 "GP" = (
 /obj/structure/chair/sofa/brown/right/directional/south,
 /obj/effect/decal/cleanable/cobweb,
-/mob/living/simple_animal/hostile/human/pirate/melee{
-	faction = list("beach","pirate")
+/mob/living/simple_animal/hostile/human/frontier{
+	faction = list("Frontiersmen","beach")
 	},
 /turf/open/floor/carpet,
 /area/ruin/beach)
@@ -1045,8 +1024,8 @@
 /obj/structure/chair/plastic{
 	dir = 8
 	},
-/mob/living/simple_animal/hostile/human/pirate/ranged{
-	faction = list("beach","pirate")
+/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/neutered{
+	faction = list("Frontiersmen","beach")
 	},
 /turf/open/floor/wood/ebony,
 /area/overmap_encounter/planetoid/beachplanet/explored)
@@ -1119,10 +1098,6 @@
 	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"
@@ -1135,8 +1110,8 @@
 /area/ruin/beach)
 "Rh" = (
 /obj/structure/chair/sofa/brown/corner/directional/south,
-/mob/living/simple_animal/hostile/human/pirate/melee{
-	faction = list("beach","pirate")
+/mob/living/simple_animal/hostile/human/frontier{
+	faction = list("Frontiersmen","beach")
 	},
 /turf/open/floor/carpet,
 /area/ruin/beach)
@@ -1250,8 +1225,8 @@
 	pixel_x = 4;
 	layer = 2.9
 	},
-/mob/living/simple_animal/hostile/human/pirate/ranged{
-	faction = list("beach","pirate")
+/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/neutered{
+	faction = list("Frontiersmen","beach")
 	},
 /turf/open/floor/wood/ebony,
 /area/overmap_encounter/planetoid/beachplanet/explored)
@@ -1333,8 +1308,8 @@
 /turf/open/water/beach,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "ZJ" = (
-/mob/living/simple_animal/hostile/human/pirate/melee{
-	faction = list("beach","pirate")
+/mob/living/simple_animal/hostile/human/frontier{
+	faction = list("Frontiersmen","beach")
 	},
 /turf/open/floor/wood,
 /area/ruin/beach)