Merge remote-tracking branch 'upstream/master'

Imaginos16 · Jun 21, 2024 · d695fae · d695fae
2 parents 19961bb + f279123
commit d695fae
Show file tree

Hide file tree

Showing 184 changed files with 7,953 additions and 2,725 deletions.
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
@@ -437,7 +437,6 @@
 /obj/item/clothing/under/rank/cargo/miner,
 /obj/item/clothing/suit/hooded/wintercoat/miner,
 /obj/item/clothing/shoes/winterboots,
-/obj/item/card/id/mining,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood,
 /area/ruin/powered)

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm b/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm
@@ -2068,7 +2068,7 @@
 "sa" = (
 /obj/effect/turf_decal/rechargefloor,
 /obj/effect/turf_decal/industrial/warning/dust,
-/obj/effect/spawner/lootdrop/whiteship_cere_ripley,
+/obj/effect/spawner/lootdrop/ripley,
 /turf/open/floor/plasteel/mono/dark,
 /area/ruin/rockplanet/shippingdockwarehouse)
 "sc" = (

diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm
@@ -95,7 +95,7 @@
 /area/ruin/powered)
 "fq" = (
 /obj/structure/table,
-/obj/item/ammo_box/c45_speedloader,
+/obj/item/ammo_box/a44roum_speedloader,
 /turf/open/floor/plasteel/mono/white,
 /area/ruin/powered)
 "fJ" = (

diff --git a/_maps/configs/srm_elder.json b/_maps/configs/srm_elder.json
@@ -22,17 +22,30 @@
 			"officer": true,
 			"slots": 1
 		},
+		"Hunter Colligne": {
+			"outfit": "/datum/outfit/job/roumain/hop",
+			"officer": true,
+			"slots": 1
+		},
 		"Hunter Doctor": {
 			"outfit": "/datum/outfit/job/roumain/doctor",
 			"slots": 1
 		},
+		"Machinist": {
+			"outfit": "/datum/outfit/job/roumain/engineer",
+			"slots": 1
+		},
 		"Hunter": {
 			"outfit": "/datum/outfit/job/roumain/security",
 			"slots": 3
 		},
+		"Flamebearer": {
+			"outfit": "/datum/outfit/job/roumain/flamebearer",
+			"slots": 1
+		},
 		"Shadow": {
 			"outfit": "/datum/outfit/job/roumain/assistant",
-			"slots": 3
+			"slots": 2
 		}
 	},
 	"enabled": true