Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…

…to faction-stuff
shiptest-ss13 · Jul 17, 2024 · f0f278e · f0f278e
2 parents a94c258 + 865ae9c
commit f0f278e
Show file tree

Hide file tree

Showing 345 changed files with 15,438 additions and 12,896 deletions.
diff --git a/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm b/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm
@@ -193,7 +193,7 @@
 	pixel_x = 6;
 	pixel_y = -6
 	},
-/obj/item/gun/ballistic/automatic/pistol/no_mag{
+/obj/item/gun/ballistic/automatic/pistol/syndicate/no_mag{
 	name = "bible gun";
 	pixel_x = -7;
 	pixel_y = -8;

diff --git a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
@@ -5613,7 +5613,7 @@
 /obj/structure/closet,
 /obj/item/clothing/suit/armor/ngr/captain,
 /obj/item/clothing/under/syndicate/ngr/officer,
-/obj/item/gun/ballistic/automatic/pistol,
+/obj/item/gun/ballistic/automatic/pistol/syndicate,
 /obj/item/ammo_box/magazine/m10mm,
 /obj/item/ammo_box/magazine/m10mm,
 /turf/open/floor/wood{
@@ -5787,7 +5787,7 @@
 /area/overmap_encounter/planetoid/jungle/explored)
 "Nh" = (
 /obj/structure/filingcabinet,
-/obj/item/gun/ballistic/automatic/pistol,
+/obj/item/gun/ballistic/automatic/pistol/syndicate,
 /obj/item/ammo_box/magazine/m10mm,
 /obj/item/ammo_box/magazine/m10mm,
 /turf/open/floor/mineral/plastitanium,

diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
@@ -1762,7 +1762,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ruin/jungle/cavecrew/security)
 "vr" = (
-/obj/machinery/computer/cargo/express,
+/obj/machinery/computer/cargo,
 /turf/open/floor/plasteel/patterned,
 /area/ruin/jungle/cavecrew/cargo)
 "vH" = (

diff --git a/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm b/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
@@ -3173,7 +3173,7 @@
 /obj/structure/closet/cabinet,
 /obj/item/hatchet/wooden,
 /obj/item/ammo_box/a357,
-/obj/item/gun/ballistic/revolver,
+/obj/item/gun/ballistic/revolver/syndicate,
 /turf/open/floor/wood,
 /area/ship/bridge)
 "VM" = (

diff --git a/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm b/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm
@@ -1108,7 +1108,7 @@
 "Il" = (
 /obj/effect/decal/cleanable/cobweb,
 /obj/structure/rack,
-/obj/item/gun/ballistic/automatic/pistol,
+/obj/item/gun/ballistic/automatic/pistol/syndicate,
 /turf/open/floor/plating,
 /area/ruin/jungle/syndifort)
 "Iv" = (

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
@@ -608,7 +608,7 @@
 	dir = 9
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/obj/structure/spawner/burrow/lava_planet,
 /turf/open/floor/plasteel/white,
 /area/ruin/unpowered/winter_biodome/living_quarters)
 "fs" = (
@@ -896,7 +896,7 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/obj/structure/spawner/burrow/lava_planet,
 /turf/open/floor/plasteel/white,
 /area/ruin/unpowered/winter_biodome/living_quarters)
 "lq" = (
@@ -952,7 +952,7 @@
 "mD" = (
 /obj/effect/turf_decal/solgov/wood/center,
 /obj/effect/decal/cleanable/dirt/dust,
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/obj/structure/spawner/burrow/lava_planet,
 /turf/open/floor/wood,
 /area/ruin/unpowered/winter_biodome/living_quarters)
 "mX" = (
@@ -1081,7 +1081,7 @@
 	},
 /obj/effect/turf_decal/corner/opaque/solgovgold/diagonal,
 /obj/effect/decal/cleanable/dirt/dust,
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/obj/structure/spawner/burrow/lava_planet,
 /turf/open/floor/plasteel/white,
 /area/ruin/unpowered/winter_biodome/engineering)
 "qt" = (
@@ -1467,7 +1467,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/blood/gibs/up,
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/obj/structure/spawner/burrow/lava_planet,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
@@ -1925,7 +1925,7 @@
 /turf/open/floor/wood,
 /area/ruin/unpowered/winter_biodome/sauna)
 "Lf" = (
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/obj/structure/spawner/burrow/lava_planet,
 /turf/open/floor/grass/snow,
 /area/ruin/unpowered/winter_biodome)
 "Lt" = (

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_buried_shrine.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_buried_shrine.dmm
@@ -542,7 +542,7 @@
 /area/ruin/unpowered/buried_shrine)
 "nq" = (
 /obj/structure/stone_tile/surrounding,
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/obj/structure/spawner/burrow/lava_planet,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/buried_shrine)
 "nz" = (
@@ -664,7 +664,7 @@
 	dir = 5
 	},
 /obj/structure/chair/wood,
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/obj/structure/spawner/burrow/lava_planet,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/buried_shrine)
 "qT" = (
@@ -931,7 +931,7 @@
 /area/ruin/unpowered/buried_shrine)
 "wM" = (
 /obj/structure/stone_tile/slab,
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/obj/structure/spawner/burrow/lava_planet,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/buried_shrine)
 "wS" = (
@@ -1647,7 +1647,7 @@
 /obj/structure/stone_tile/cracked{
 	dir = 1
 	},
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/obj/structure/spawner/burrow/lava_planet,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/buried_shrine)
 "QR" = (
@@ -1864,7 +1864,7 @@
 /obj/structure/stone_tile{
 	dir = 1
 	},
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/obj/structure/spawner/burrow/lava_planet,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface/lit,
 /area/ruin/unpowered/buried_shrine)
 "Xr" = (

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm
@@ -2716,7 +2716,7 @@
 /obj/item/ammo_box/magazine/smgm9mm{
 	start_empty = 1
 	},
-/obj/item/gun/ballistic/automatic/smg/proto,
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto,
 /turf/open/floor/plasteel/dark,
 /area/ruin/lavaland/factory/dorms)
 "zC" = (

diff --git a/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm b/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm
@@ -601,7 +601,7 @@
 /area/ruin/space/has_grav/corporatemine/crewquarters)
 "nN" = (
 /obj/structure/closet/cabinet,
-/obj/item/gun/ballistic/automatic/pistol/suppressed,
+/obj/item/gun/ballistic/automatic/pistol/syndicate,
 /obj/item/ammo_box/magazine/m10mm,
 /obj/item/clothing/under/syndicate/donk,
 /obj/item/clothing/suit/hazardvest/donk/qm,
@@ -1577,7 +1577,7 @@
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/space)
 "Iv" = (
-/obj/structure/spawner/mining/hivelord,
+/obj/structure/spawner/burrow/asteroid,
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/space)
 "IE" = (
@@ -2036,7 +2036,7 @@
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/space)
 "TO" = (
-/obj/structure/spawner/mining/goliath,
+/obj/structure/spawner/burrow/asteroid,
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/space)
 "TR" = (

diff --git a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm
@@ -3490,7 +3490,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 9
 	},
-/obj/machinery/computer/cargo/express,
+/obj/machinery/computer/cargo,
 /turf/open/floor/carpet/nanoweave/beige,
 /area/ruin/space/has_grav/singularitylab/cargo)
 "nT" = (

diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm b/_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/proto{
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto{
 	pixel_y = -18
 	},
 /obj/item/ammo_casing/spent{

diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_unhonorable.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_unhonorable.dmm
@@ -137,7 +137,7 @@
 /turf/open/floor/plating,
 /area/ruin/wasteplanet/wasteplanet_radiation/containment)
 "iT" = (
-/obj/structure/spawner/wasteplanet/hivebot/low_threat,
+/obj/structure/spawner/hivebot,
 /turf/open/floor/plating/asteroid/wasteplanet,
 /area/ruin/wasteplanet/wasteplanet_radiation)
 "jh" = (

diff --git a/_maps/configs/independent_beluga.json b/_maps/configs/independent_beluga.json
@@ -16,7 +16,7 @@
 		"Service"
 	],
 	"starting_funds": 4000,
-	"limit": 2,
+	"limit": 1,
 	"job_slots": {
 		"Captain": {
 			"outfit": "/datum/outfit/job/independent/captain",

diff --git a/_maps/configs/independent_mudskipper.json b/_maps/configs/independent_mudskipper.json
@@ -15,7 +15,7 @@
 		"SPACE"
 	],
 	"map_path": "_maps/shuttles/independent/independent_mudskipper.dmm",
-	"limit": 2,
+	"limit": 1,
 	"starting_funds": 1500,
 	"job_slots": {
 		"Salvage Leader": {

diff --git a/_maps/configs/independent_schmiedeberg.json b/_maps/configs/independent_schmiedeberg.json
@@ -15,7 +15,7 @@
 		"SUNS",
 		"GENERAL"
 	],
-	"limit": 2,
+	"limit": 1,
 	"job_slots": {
 		"Chief Pharmacist": {
 			"outfit": "/datum/outfit/job/independent/cmo/pharma",

diff --git a/_maps/configs/independent_sunskipper.json b/_maps/configs/independent_sunskipper.json
@@ -2,7 +2,7 @@
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Sunskipper-class Culinary Vessel",
 	"faction": "/datum/faction/independent",
-	"prefix": "ISV",
+	"prefix": "SV",
 	"namelists": ["CRUISE", "NATURAL"],
 	"map_short_name": "Sunskipper-class",
 	"map_path": "_maps/shuttles/independent/independent_sunskipper.dmm",

diff --git a/_maps/configs/inteq_colossus.json b/_maps/configs/inteq_colossus.json
@@ -19,7 +19,7 @@
 	"limit": 1,
 	"job_slots": {
 		"Vanguard": {
-			"outfit": "/datum/outfit/job/inteq/captain",
+			"outfit": "/datum/outfit/job/inteq/captain/empty",
 			"officer": true,
 			"slots": 1
 		},

diff --git a/_maps/configs/inteq_hound.json b/_maps/configs/inteq_hound.json
@@ -18,7 +18,7 @@
 	"limit": 2,
 	"job_slots": {
 		"Vanguard": {
-			"outfit": "/datum/outfit/job/inteq/captain",
+			"outfit": "/datum/outfit/job/inteq/captain/empty",
 			"officer": true,
 			"slots": 1
 		},

diff --git a/_maps/configs/inteq_talos.json b/_maps/configs/inteq_talos.json
@@ -19,7 +19,7 @@
 	"limit": 1,
 	"job_slots": {
 		"Vanguard": {
-			"outfit": "/datum/outfit/job/inteq/captain",
+			"outfit": "/datum/outfit/job/inteq/captain/empty",
 			"officer": true,
 			"slots": 1
 		},
@@ -28,7 +28,7 @@
 			"officer": true,
 			"slots": 1
 		},
-		"Artificer Class II": {
+		"Honorable Artificer": {
 			"outfit": "/datum/outfit/job/inteq/ce",
 			"officer": true,
 			"slots": 1
@@ -37,10 +37,6 @@
 			"outfit": "/datum/outfit/job/inteq/engineer",
 			"slots": 3
 		},
-		"Corpsman": {
-			"outfit": "/datum/outfit/job/inteq/paramedic",
-			"slots": 2
-		},
 		"Enforcer": {
 			"outfit": "/datum/outfit/job/inteq/security",
 			"slots": 1

diff --git a/_maps/configs/inteq_valor.json b/_maps/configs/inteq_valor.json
@@ -24,9 +24,18 @@
 			"officer": true,
 			"slots": 1
 		},
+		"Shuttle Pilot": {
+			"outfit": "/datum/outfit/job/inteq/warden/pilot",
+			"officer": true,
+			"slots": 1
+		},
+		"Shuttle Corpsman": {
+			"outfit": "/datum/outfit/job/inteq/paramedic/empty",
+			"slots": 1
+		},
 		"Corpsman": {
 			"outfit": "/datum/outfit/job/inteq/paramedic/empty",
-			"slots": 3
+			"slots": 2
 		},
 		"Enforcer": {
 			"outfit": "/datum/outfit/job/inteq/security/empty",

diff --git a/_maps/configs/inteq_vaquero.json b/_maps/configs/inteq_vaquero.json
@@ -16,7 +16,7 @@
 	"limit": 1,
 	"job_slots": {
 		"Vanguard": {
-			"outfit": "/datum/outfit/job/inteq/captain",
+			"outfit": "/datum/outfit/job/inteq/captain/empty",
 			"officer": true,
 			"slots": 1
 		},

diff --git a/_maps/configs/nanotrasen_gecko.json b/_maps/configs/nanotrasen_gecko.json
@@ -15,7 +15,7 @@
 		"Mining",
 		"Engineering"
 	],
-	"limit": 2,
+	"limit": 1,
 	"starting_funds": 5000,
 	"job_slots": {
 		"Captain": {

diff --git a/_maps/configs/syndicate_aegis.json b/_maps/configs/syndicate_aegis.json