Merge branch 'master' into pAI-chassis-tweaks-n-radials

shiptest-ss13 · Jan 26, 2024 · 0f30f46 · 0f30f46
2 parents e2d1f68 + 286941e
commit 0f30f46
Show file tree

Hide file tree

Showing 135 changed files with 3,091 additions and 2,518 deletions.
diff --git a/.github/workflows/autowiki.yml b/.github/workflows/autowiki.yml
@@ -33,7 +33,7 @@ jobs:
       run: |
         sudo dpkg --add-architecture i386
         sudo apt update || true
-        sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
+        sudo apt install -o APT::Immediate-Configure=false libssl-dev:i386
         bash tools/ci/install_rust_g.sh
     - name: Install auxmos
       if: steps.secrets_set.outputs.SECRETS_ENABLED

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
@@ -6,7 +6,7 @@
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/ruin)
 "ac" = (
-/obj/effect/mob_spawn/human/engineer/rig,
+/obj/effect/mob_spawn/human/engineer,
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/overmap_encounter/planetoid/ice/explored)
 "ad" = (
@@ -1199,7 +1199,7 @@
 /turf/open/floor/plating/ice/icemoon,
 /area/overmap_encounter/planetoid/ice/explored)
 "cU" = (
-/obj/effect/mob_spawn/human/engineer/rig,
+/obj/effect/mob_spawn/human/engineer,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm
@@ -127,7 +127,8 @@
 "iT" = (
 /obj/structure/stone_tile/slab,
 /mob/living/simple_animal/hostile/megafauna/dragon/icemoon{
-	loot = list(/obj/structure/closet/crate/necropolis/dragon,/obj/item/keycard/gatedrop/drakelair)
+	loot = list(/obj/structure/closet/crate/necropolis/dragon,/obj/item/keycard/gatedrop/drakelair);
+	crusher_loot = list(/obj/structure/closet/crate/necropolis/dragon/crusher,/obj/item/keycard/gatedrop/drakelair)
 	},
 /turf/open/indestructible/boss,
 /area/ruin)

diff --git a/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm b/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm
@@ -1564,7 +1564,7 @@
 /obj/effect/mob_spawn/human/corpse/assistant{
 	oxy_damage = 200;
 	name = "Dungeon Master";
-	outfit = /datum/outfit/job/curator/dungeonmaster;
+	outfit = /datum/outfit/job/curator;
 	backpack_contents = null
 	},
 /obj/effect/decal/cleanable/blood,

diff --git a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm
@@ -6481,7 +6481,7 @@
 /turf/open/water/jungle,
 /area/overmap_encounter/planetoid/cave/explored)
 "Pe" = (
-/obj/effect/mob_spawn/human/miner/old,
+/obj/effect/mob_spawn/human/miner,
 /obj/effect/decal/cleanable/vomit/old{
 	pixel_x = 13;
 	pixel_y = 6

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm
@@ -78,7 +78,7 @@
 /turf/open/floor/pod/dark,
 /area/ruin/powered)
 "q" = (
-/obj/effect/mob_spawn/human/miner/explorer{
+/obj/effect/mob_spawn/human/miner{
 	brute_damage = 150;
 	oxy_damage = 50
 	},

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm b/_maps/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm
@@ -264,7 +264,7 @@
 /area/ruin/unpowered)
 "Qo" = (
 /obj/effect/decal/cleanable/blood,
-/obj/effect/mob_spawn/human/miner/explorer,
+/obj/effect/mob_spawn/human/miner,
 /obj/item/pickaxe,
 /turf/open/floor/plating/asteroid/rockplanet/lit,
 /area/overmap_encounter/planetoid/rockplanet/explored)

diff --git a/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm b/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm
@@ -579,12 +579,12 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/blood/gibs/bubblegum,
-/obj/effect/mob_spawn/human/miner/rig,
+/obj/effect/mob_spawn/human/miner,
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/space)
 "ns" = (
 /obj/item/pickaxe/drill,
-/obj/effect/mob_spawn/human/miner/rig,
+/obj/effect/mob_spawn/human/miner,
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/space)
 "nu" = (
@@ -635,7 +635,7 @@
 /turf/closed/wall/rust,
 /area/ruin/space/has_grav/corporatemine/crewquarters)
 "ol" = (
-/obj/effect/mob_spawn/human/miner/rig,
+/obj/effect/mob_spawn/human/miner,
 /obj/item/shovel,
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/space)
@@ -758,7 +758,7 @@
 /area/ruin/space/has_grav/corporatemine/bridge)
 "rh" = (
 /obj/effect/decal/cleanable/blood/old,
-/obj/effect/mob_spawn/human/miner/rig,
+/obj/effect/mob_spawn/human/miner,
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/space)
 "rk" = (
@@ -1177,7 +1177,7 @@
 /turf/open/floor/plasteel/grimy,
 /area/ruin/space/has_grav/corporatemine/crewquarters)
 "Bp" = (
-/obj/effect/mob_spawn/human/miner/rig,
+/obj/effect/mob_spawn/human/miner,
 /obj/effect/decal/cleanable/blood,
 /obj/item/gun/energy/kinetic_accelerator,
 /turf/open/floor/plating/asteroid/airless,

diff --git a/_maps/RandomRuins/SpaceRuins/ntfacility.dmm b/_maps/RandomRuins/SpaceRuins/ntfacility.dmm
@@ -755,7 +755,7 @@
 /area/ruin/powered)
 "rY" = (
 /obj/effect/mob_spawn/human/corpse/assistant{
-	outfit = /datum/outfit/job/doctor/surgeon
+	outfit = /datum/outfit/job/doctor
 	},
 /obj/effect/decal/cleanable/blood,
 /obj/effect/decal/cleanable/dirt/dust,

diff --git a/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm b/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm
@@ -1656,7 +1656,7 @@
 	},
 /obj/effect/turf_decal/corner/transparent/grey/diagonal,
 /obj/effect/mob_spawn/human/corpse/cargo_tech{
-	outfit = /datum/outfit/job/engineer/nt
+	outfit = /datum/outfit/job/nanotrasen/engineer
 	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/has_grav/powerpuzzle/engineering)
@@ -2493,7 +2493,7 @@
 	dir = 9
 	},
 /obj/effect/mob_spawn/human/corpse/cargo_tech{
-	outfit = /datum/outfit/job/engineer/nt
+	outfit = /datum/outfit/job/nanotrasen/engineer
 	},
 /obj/item/wirecutters{
 	pixel_y = 15

diff --git a/_maps/RandomRuins/SpaceRuins/scav_mining.dmm b/_maps/RandomRuins/SpaceRuins/scav_mining.dmm
@@ -243,7 +243,7 @@
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/space/has_grav)
 "rl" = (
-/obj/effect/mob_spawn/human/miner/explorer,
+/obj/effect/mob_spawn/human/miner,
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/space/has_grav)
 "rH" = (
@@ -550,12 +550,12 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/scav_mining/core)
 "LT" = (
-/obj/effect/mob_spawn/human/miner/explorer,
+/obj/effect/mob_spawn/human/miner,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/scav_mining/dorm)
 "MZ" = (
 /obj/effect/decal/cleanable/blood,
-/obj/effect/mob_spawn/human/miner/explorer,
+/obj/effect/mob_spawn/human/miner,
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/space/has_grav)
 "No" = (

diff --git a/_maps/configs/independent_beluga.json b/_maps/configs/independent_beluga.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Beluga-class Transport",
-	"prefix": "ISV",
+	"prefix": "SV",
 	"namelists": ["CRUISE", "NATURAL"],
 	"map_short_name": "Beluga-class",
 	"map_path": "_maps/shuttles/independent/independent_beluga.dmm",
@@ -16,37 +16,37 @@
 	"roundstart": true,
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/captain",
+			"outfit": "/datum/outfit/job/independent/captain",
 			"officer": true,
 			"slots": 1
 		},
 		"First Officer": {
-			"outfit": "/datum/outfit/job/head_of_personnel/beluga",
+			"outfit": "/datum/outfit/job/independent/hop",
 			"officer": true,
 			"slots": 1
 		},
 		"Mechanic": {
-			"outfit": "/datum/outfit/job/engineer",
+			"outfit": "/datum/outfit/job/independent/engineer",
 			"slots": 1
 		},
 		"Private Security Officer": {
-			"outfit": "/datum/outfit/job/security/inteq/beluga",
+			"outfit": "/datum/outfit/job/inteq/security/beluga",
 			"slots": 2
 		},
 		"High-Class Passenger": {
-			"outfit": "/datum/outfit/job/lawyer/passenger",
+			"outfit": "/datum/outfit/job/independent/lawyer",
 			"slots": 4
 		},
 		"Bartender": {
-			"outfit": "/datum/outfit/job/bartender",
+			"outfit": "/datum/outfit/job/independent/bartender",
 			"slots": 1
 		},
 		"Janitor": {
-			"outfit": "/datum/outfit/job/janitor",
+			"outfit": "/datum/outfit/job/independent/janitor",
 			"slots": 1
 		},
 		"Assistant": {
-			"outfit": "/datum/outfit/job/assistant",
+			"outfit": "/datum/outfit/job/independent/assistant",
 			"slots": 2
 		}
 	},

diff --git a/_maps/configs/independent_box.json b/_maps/configs/independent_box.json
@@ -12,22 +12,22 @@
 		"SPACE",
 		"NATURAL"
 	],
-	"prefix": "ISV",
+	"prefix": "IMV",
 	"job_slots": {
 		"Chief Medical Officer": {
-			"outfit": "/datum/outfit/job/cmo",
+			"outfit": "/datum/outfit/job/independent/cmo",
 			"slots": 1
 		},
 		"Medical Doctor": {
-			"outfit": "/datum/outfit/job/doctor",
+			"outfit": "/datum/outfit/job/independent/doctor",
 			"slots": 3
 		},
 		"Paramedic": {
-			"outfit": "/datum/outfit/job/paramedic",
+			"outfit": "/datum/outfit/job/independent/paramedic",
 			"slots": 2
 		},
 		"Assistant": {
-			"outfit": "/datum/outfit/job/assistant",
+			"outfit": "/datum/outfit/job/independent/assistant",
 			"slots": 3
 		}
 	},

diff --git a/_maps/configs/independent_boyardee.json b/_maps/configs/independent_boyardee.json
@@ -18,23 +18,23 @@
 	"map_path": "_maps/shuttles/independent/independent_boyardee.dmm",
 	"job_slots": {
 		"Bartender": {
-			"outfit": "/datum/outfit/job/bartender",
+			"outfit": "/datum/outfit/job/independent/bartender",
 			"slots": 1
 		},
 		"Cook": {
-			"outfit": "/datum/outfit/job/cook",
+			"outfit": "/datum/outfit/job/independent/cook",
 			"slots": 3
 		},
 		"Botanist": {
-			"outfit": "/datum/outfit/job/botanist",
+			"outfit": "/datum/outfit/job/independent/botanist",
 			"slots": 2
 		},
 		"Janitor": {
-			"outfit": "/datum/outfit/job/janitor",
+			"outfit": "/datum/outfit/job/independent/janitor",
 			"slots": 1
 		},
 		"Waiter": {
-			"outfit": "/datum/outfit/job/assistant/waiter",
+			"outfit": "/datum/outfit/job/independent/assistant/waiter",
 			"slots": 2
 		}
 	},

diff --git a/_maps/configs/independent_bubble.json b/_maps/configs/independent_bubble.json
@@ -16,23 +16,23 @@
 	"limit": 1,
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/captain",
+			"outfit": "/datum/outfit/job/independent/captain",
 			"slots": 1
 		},
 		"Scientist": {
-			"outfit": "/datum/outfit/job/scientist",
+			"outfit": "/datum/outfit/job/independent/scientist",
 			"slots": 1
 		},
 		"Station Engineer": {
-			"outfit": "/datum/outfit/job/engineer",
+			"outfit": "/datum/outfit/job/independent/engineer",
 			"slots": 1
 		},
 		"Shaft Miner": {
-			"outfit": "/datum/outfit/job/miner",
+			"outfit": "/datum/outfit/job/independent/miner",
 			"slots": 1
 		},
 		"Assistant": {
-			"outfit": "/datum/outfit/job/assistant",
+			"outfit": "/datum/outfit/job/independent/assistant",
 			"slots": 3
 		}
 	},

diff --git a/_maps/configs/independent_byo.json b/_maps/configs/independent_byo.json
@@ -15,11 +15,11 @@
 	"prefix": "ISV",
 	"job_slots": {
 		"Architect": {
-			"outfit": "/datum/outfit/job/engineer/hazard",
+			"outfit": "/datum/outfit/job/independent/ce",
 			"slots": 1
 		},
 		"Maso-Mechanic": {
-			"outfit": "/datum/outfit/job/engineer/hazard",
+			"outfit": "/datum/outfit/job/independent/engineer",
 			"slots": 4
 		}
 	},

diff --git a/_maps/configs/independent_caravan.json b/_maps/configs/independent_caravan.json
@@ -18,28 +18,28 @@
 	"roundstart": true,
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/captain/western",
+			"outfit": "/datum/outfit/job/independent/captain/western",
 			"officer": true,
 			"slots": 1
 		},
 		"Ship's Doctor": {
-			"outfit": "/datum/outfit/job/doctor",
+			"outfit": "/datum/outfit/job/independent/doctor",
 			"slots": 1
 		},
 		"Engine Technician": {
-			"outfit": "/datum/outfit/job/atmos",
+			"outfit": "/datum/outfit/job/independent/atmos",
 			"slots": 1
 		},
 		"Asteroid Miner": {
-			"outfit": "/datum/outfit/job/miner/hazard",
+			"outfit": "/datum/outfit/job/independent/miner",
 			"slots": 1
 		},
 		"Fauna Researcher": {
-			"outfit": "/datum/outfit/job/scientist",
+			"outfit": "/datum/outfit/job/independent/scientist",
 			"slots": 1
 		},
 		"Assistant": {
-			"outfit": "/datum/outfit/job/assistant",
+			"outfit": "/datum/outfit/job/independent/assistant",
 			"slots": 1
 		}
 	},

diff --git a/_maps/configs/independent_dwayne.json b/_maps/configs/independent_dwayne.json
@@ -19,28 +19,28 @@
 	"limit": 1,
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/captain/western",
+			"outfit": "/datum/outfit/job/independent/captain/western",
 			"officer": true,
 			"slots": 1
 		},
 		"Foreman": {
-			"outfit": "/datum/outfit/job/quartermaster/western",
+			"outfit": "/datum/outfit/job/independent/quartermaster/western",
 			"slots": 1
 		},
 		"Ship's Doctor": {
-			"outfit": "/datum/outfit/job/doctor",
+			"outfit": "/datum/outfit/job/independent/doctor",
 			"slots": 1
 		},
 		"Ship's Engineer": {
-			"outfit": "/datum/outfit/job/engineer/hazard",
+			"outfit": "/datum/outfit/job/independent/engineer",
 			"slots": 1
 		},
 		"Asteroid Miner": {
-			"outfit": "/datum/outfit/job/miner/hazard",
+			"outfit": "/datum/outfit/job/independent/miner/hazard",
 			"slots": 2
 		},
 		"Deckhand": {
-			"outfit": "/datum/outfit/job/assistant",
+			"outfit": "/datum/outfit/job/independent/assistant",
 			"slots": 3
 		}
 	},