Merge branch 'master' of https://github.com/MemeSnorfer/Shiptest into…

… swat_suits

_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm

@@ -4,6 +4,14 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/carpet,
 /area/ruin/beach)
+"bl" = (
+/obj/machinery/light/floor,
+/obj/machinery/porta_turret/ship/frontiersmen{
+	dir = 6;
+	faction = list("Frontiersmen","Turret")
+	},
+/turf/open/floor/concrete/reinforced,
+/area/ruin/beach)
 "bs" = (
 /obj/effect/turf_decal/borderfloor{
 	dir = 1
@@ -139,12 +147,9 @@
 /area/ruin/beach)
 "hd" = (
 /obj/machinery/light/floor,
-/obj/machinery/porta_turret/syndicate/energy{
-	active_power_usage = 0;
-	faction = list("Frontiersmen","beach");
-	idle_power_usage = 0;
-	reqpower = 0;
-	name = "Point defense anti-carp turret"
+/obj/machinery/porta_turret/ship/frontiersmen{
+	dir = 10;
+	faction = list("Frontiersmen","Turret")
 	},
 /turf/open/floor/concrete/reinforced,
 /area/ruin/beach)
@@ -259,6 +264,14 @@
 	},
 /turf/open/water/beach/deep,
 /area/overmap_encounter/planetoid/beachplanet/explored)
+"lT" = (
+/obj/machinery/light/floor,
+/obj/machinery/porta_turret/ship/frontiersmen{
+	dir = 5;
+	faction = list("Frontiersmen","Turret")
+	},
+/turf/open/floor/concrete/reinforced,
+/area/ruin/beach)
 "lX" = (
 /obj/effect/turf_decal/weather/sand{
 	dir = 1
@@ -383,6 +396,14 @@
 	},
 /turf/open/water/beach,
 /area/overmap_encounter/planetoid/beachplanet/explored)
+"pd" = (
+/obj/machinery/light/floor,
+/obj/machinery/porta_turret/ship/frontiersmen{
+	dir = 9;
+	faction = list("Frontiersmen","Turret")
+	},
+/turf/open/floor/concrete/reinforced,
+/area/ruin/beach)
 "pe" = (
 /obj/effect/turf_decal/sand/plating,
 /obj/effect/turf_decal/siding/wood{
@@ -478,6 +499,7 @@
 /obj/machinery/light/small/directional/north{
 	light_color = "#694c12"
 	},
+/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/neutered,
 /turf/open/floor/carpet,
 /area/ruin/beach)
 "tj" = (
@@ -657,9 +679,7 @@
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "Bg" = (
 /obj/effect/turf_decal/corner/opaque/pink/diagonal,
-/mob/living/simple_animal/hostile/human/frontier{
-	faction = list("Frontiersmen","beach")
-	},
+/mob/living/simple_animal/hostile/human/frontier,
 /turf/open/floor/plastic,
 /area/ruin/beach)
 "Bo" = (
@@ -840,9 +860,7 @@
 "GP" = (
 /obj/structure/chair/sofa/brown/right/directional/south,
 /obj/effect/decal/cleanable/cobweb,
-/mob/living/simple_animal/hostile/human/frontier{
-	faction = list("Frontiersmen","beach")
-	},
+/mob/living/simple_animal/hostile/human/frontier,
 /turf/open/floor/carpet,
 /area/ruin/beach)
 "Hb" = (
@@ -1032,9 +1050,7 @@
 /obj/structure/chair/plastic{
 	dir = 8
 	},
-/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/neutered{
-	faction = list("Frontiersmen","beach")
-	},
+/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/neutered,
 /turf/open/floor/wood/ebony,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "Os" = (
@@ -1108,9 +1124,7 @@
 /area/ruin/beach)
 "Rh" = (
 /obj/structure/chair/sofa/brown/corner/directional/south,
-/mob/living/simple_animal/hostile/human/frontier{
-	faction = list("Frontiersmen","beach")
-	},
+/mob/living/simple_animal/hostile/human/frontier,
 /turf/open/floor/carpet,
 /area/ruin/beach)
 "RE" = (
@@ -1223,9 +1237,7 @@
 	pixel_x = 4;
 	layer = 2.9
 	},
-/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/neutered{
-	faction = list("Frontiersmen","beach")
-	},
+/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/neutered,
 /turf/open/floor/wood/ebony,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "Vm" = (
@@ -1305,9 +1317,7 @@
 /turf/open/water/beach,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "ZJ" = (
-/mob/living/simple_animal/hostile/human/frontier{
-	faction = list("Frontiersmen","beach")
-	},
+/mob/living/simple_animal/hostile/human/frontier,
 /turf/open/floor/wood,
 /area/ruin/beach)
 "ZV" = (
@@ -1673,7 +1683,7 @@ Fr
 Fr
 Fr
 sG
-hd
+pd
 Fq
 Fr
 QQ
@@ -2260,7 +2270,7 @@ Fr
 Fr
 Fr
 sG
-hd
+lT
 Fq
 QQ
 ut
@@ -2356,7 +2366,7 @@ YL
 ID
 Fr
 sG
-hd
+bl
 Fq
 Fr
 Fr

_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm

@@ -1365,16 +1365,12 @@
 	icon_state = "0-8"
 	},
 /obj/machinery/light/small/directional/east,
-/obj/machinery/porta_turret/syndicate/pod{
-	desc = "A turret built with substandard parts and run down further with age. Still capable of delivering lethal lasers to the odd space carp, but not much else.";
-	dir = 8;
-	faction = list("Frontiersmen");
-	lethal_projectile = /obj/projectile/beam/weak/penetrator;
-	lethal_projectile_sound = 'sound/weapons/plasma_cutter.ogg';
-	name = "laser turret"
-	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/porta_turret/ship/frontiersmen/light{
+	dir = 10;
+	faction = list("Frontiersmen","Turret")
+	},
 /turf/open/floor/plating,
 /area/ruin/beach/piratecrash)
 "PH" = (

_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm

@@ -1748,9 +1748,9 @@
 	pixel_y = -5
 	},
 /obj/item/ammo_casing/a4570,
-/obj/item/ammo_box/magazine/skm_545_39,
-/obj/item/ammo_box/magazine/skm_545_39,
-/obj/item/ammo_box/magazine/skm_545_39,
+/obj/item/ammo_box/magazine/skm_46_30,
+/obj/item/ammo_box/magazine/skm_46_30,
+/obj/item/ammo_box/magazine/skm_46_30,
 /obj/item/ammo_box/magazine/illestren_a850r,
 /obj/item/ammo_box/magazine/illestren_a850r,
 /turf/open/floor/plasteel/tech,

_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm

@@ -956,7 +956,7 @@
 	pixel_y = 11
 	},
 /obj/effect/gibspawner/human,
-/obj/item/ammo_box/magazine/skm_545_39,
+/obj/item/ammo_box/magazine/skm_46_30,
 /turf/open/floor/plasteel/tech,
 /area/ship/science)
 "oJ" = (

_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm

@@ -1224,7 +1224,7 @@
 "lR" = (
 /obj/effect/decal/cleanable/blood/gibs/core,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/stamp/qm{
+/obj/item/stamp/nanotrasen/ns/supply{
 	pixel_x = 7;
 	pixel_y = 10
 	},
@@ -2717,7 +2717,7 @@
 /obj/item/ammo_box/magazine/smgm9mm{
 	start_empty = 1
 	},
-/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto,
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/saber,
 /turf/open/floor/plasteel/dark,
 /area/ruin/lavaland/factory/dorms)
 "zC" = (
@@ -4194,9 +4194,8 @@
 "Pv" = (
 /obj/structure/table/reinforced,
 /obj/machinery/recharger,
-/obj/item/stamp/hos{
-	pixel_x = 10;
-	pixel_y = -8
+/obj/item/stamp/nanotrasen/vigilitas{
+	pixel_x = 11
 	},
 /obj/effect/turf_decal/corner/opaque/red/border{
 	dir = 10
@@ -4525,7 +4524,7 @@
 /obj/item/pen/fountain/captain{
 	pixel_x = 5
 	},
-/obj/item/stamp/captain{
+/obj/item/stamp/nanotrasen/captain{
 	pixel_x = -8
 	},
 /turf/open/floor/carpet/blue,

_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm

@@ -1304,7 +1304,7 @@
 	pixel_x = -9;
 	pixel_y = 3
 	},
-/obj/item/stamp/hos{
+/obj/item/stamp/nanotrasen/vigilitas/security{
 	pixel_x = -9;
 	pixel_y = 9
 	},
@@ -2187,7 +2187,7 @@
 	pixel_x = 7;
 	pixel_y = 3
 	},
-/obj/item/stamp/rd{
+/obj/item/stamp/nanotrasen/science{
 	pixel_x = -6;
 	pixel_y = 12
 	},

_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm

@@ -995,7 +995,7 @@
 "KJ" = (
 /obj/structure/table,
 /obj/item/gun/ballistic/automatic/smg/skm_carbine,
-/obj/item/ammo_box/magazine/skm_545_39,
+/obj/item/ammo_box/magazine/skm_46_30,
 /turf/open/floor/concrete,
 /area/ruin)
 "Ld" = (

_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm

@@ -2460,7 +2460,7 @@
 /obj/structure/railing{
 	dir = 8
 	},
-/obj/item/stamp/captain{
+/obj/item/stamp/nanotrasen/captain{
 	pixel_x = -6;
 	pixel_y = 8
 	},

_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm

@@ -797,7 +797,7 @@
 /turf/open/floor/wood/waste,
 /area/ruin/wasteplanet)
 "Fn" = (
-/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto{
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/saber{
 	pixel_y = -18
 	},
 /obj/item/ammo_casing/spent{

_maps/configs/pgf_crying_sun.json

@@ -40,6 +40,7 @@
 		},
 		"Marine Lieutenant": {
 			"outfit": "/datum/outfit/job/gezena/hos",
+			"officer": true,
 			"slots": 1
 		},
 		"Marine": {

_maps/configs/pgf_woeful_cthonian.json

@@ -0,0 +1,38 @@
+{
+	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"faction": "/datum/faction/pgf",
+	"prefix": "PGFN",
+	"map_name": "Woeful Cthonian-class Patrol Cutter",
+	"namelists": [
+		"PGF"
+	],
+	"map_short_name": "Cthonian-class",
+	"description": "A new design of patrol ship designed by Etherbor's Lihmona Navy Shipyards and manufactured by Axilai Orbital Works, the Woeful Cthonian is a small ship with average maneuverability and firepower designed for sustained operations in contested space. While it is not able to hold its own in a firefight with proper warships, lacks specialization into any particular field, and carries no proper marine complement. Despite what some would consider shortcomings, it still finds solid usage as a generalist vessel for the Gezenan navy.",
+	"tags": [
+		"RP Focus",
+		"Medical"
+	],
+	"starting_funds": 1000,
+	"map_path": "_maps/shuttles/pgf/pgf_woeful_cthonian.dmm",
+	"limit": 1,
+	"job_slots": {
+		"Captain": {
+			"outfit": "/datum/outfit/job/gezena/captain",
+			"officer": true,
+			"slots": 1
+		},
+		"Navy Engineer": {
+			"outfit": "/datum/outfit/job/gezena/engineer",
+			"slots": 1
+		},
+		"Navy Doctor": {
+			"outfit": "/datum/outfit/job/gezena/doctor",
+			"slots": 1
+		},
+		"Crewman": {
+			"outfit": "/datum/outfit/job/gezena/assistant",
+			"slots": 3
+		}
+	},
+	"enabled":true
+}

_maps/configs/syndicate_litieguai.json → _maps/configs/syndicate_cybersun_litieguai.json

@@ -8,7 +8,7 @@
 	"tags": [
 		"Medical"
 	],
-	"map_path": "_maps/shuttles/syndicate/syndicate_litieguai.dmm",
+	"map_path": "_maps/shuttles/syndicate/syndicate_cybersun_litieguai.dmm",
 	"namelists": [
 		"SPACE",
 		"BEASTS",
@@ -17,6 +17,7 @@
 	"job_slots": {
 		"Captain": {
 			"outfit": "/datum/outfit/job/syndicate/captain/cybersun",
+			"officer": true,
 			"slots": 1
 		},
 		"Medical Director": {