Merge pull request #868 from CeladonSS13/beta-dev

#14 Перенос обновлений с Beta на Alpha сервер
CeladonSS13 · Jul 27, 2024 · 862f036 · 862f036
2 parents 60d99f2 + 5016814
commit 862f036
Show file tree

Hide file tree

Showing 388 changed files with 7,917 additions and 4,056 deletions.
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/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/_mod_celadon/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/_mod_celadon/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/_mod_celadon/RandomRuins/SpaceRuins/singularity_lab.dmm b/_maps/_mod_celadon/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/_mod_celadon/configs/elysium_aldaama.json b/_maps/_mod_celadon/configs/elysium_aldaama.json
@@ -19,16 +19,16 @@
 	"limit": 1,
 	"job_slots": {
 		"Caid": {
-			"outfit": "/datum/outfit/job/independent/assistant",
+			"outfit": "/datum/outfit/job/elysium/captain",
 			"officer": true,
 			"slots": 1
 		},
 		"Ahisa`i": {
-			"outfit": "/datum/outfit/job/independent/assistant",
+			"outfit": "/datum/outfit/job/elysium/assistant",
 			"slots": 3
 		},
 		"Mukatell": {
-			"outfit": "/datum/outfit/job/independent/assistant",
+			"outfit": "/datum/outfit/job/elysium/security",
 			"slots" : 2
 		}
 	},

diff --git a/_maps/_mod_celadon/configs/elysium_homa.json b/_maps/_mod_celadon/configs/elysium_homa.json
@@ -16,21 +16,17 @@
 	],
 	"limit": 1,
 	"job_slots": {
-		"Captain": {
-			"outfit": "/datum/outfit/job/independent/assistant",
+		"Caid": {
+			"outfit": "/datum/outfit/job/elysium/captain",
 			"officer": true,
 			"slots": 1
 		},
-		"Ship Engineer-Miner": {
-			"outfit": "/datum/outfit/job/independent/assistant",
+		"Mukatell": {
+			"outfit": "/datum/outfit/job/elysium/security",
 			"slots": 2
 		},
-		"Ship's Doctor": {
-			"outfit": "/datum/outfit/job/independent/assistant",
-			"slots": 1
-		},
-		"Scribe": {
-			"outfit": "/datum/outfit/job/independent/assistant",
+		"Ahisa`i": {
+			"outfit": "/datum/outfit/job/elysium/assistant",
 			"slots" : 2
 		}
 	},

diff --git a/_maps/_mod_celadon/configs/elysium_iron_maiden.json b/_maps/_mod_celadon/configs/elysium_iron_maiden.json
@@ -17,16 +17,16 @@
 	"limit": 1,
 	"job_slots": {
 		"Caid": {
-			"outfit": "/datum/outfit/job/independent/assistant",
+			"outfit": "/datum/outfit/job/elysium/captain",
 			"officer": true,
 			"slots": 1
 		},
 		"Ahisa`i": {
-			"outfit": "/datum/outfit/job/independent/assistant",
+			"outfit": "/datum/outfit/job/elysium/assistant",
 			"slots": 3
 		},
 		"Mukatell": {
-			"outfit": "/datum/outfit/job/independent/assistant",
+			"outfit": "/datum/outfit/job/elysium/security",
 			"slots": 2
 		}
 		},

diff --git a/_maps/_mod_celadon/configs/elysium_kondor.json b/_maps/_mod_celadon/configs/elysium_kondor.json
@@ -16,16 +16,16 @@
 "limit": 2,
 "job_slots": {
 	"Каид": {
-		"outfit": "/datum/outfit/job/independent/assistant",
+		"outfit": "/datum/outfit/job/elysium/captain",
 		"officer": true,
 		"slots": 1
 	},
 	"Ахиса'и": {
-		"outfit": "/datum/outfit/job/independent/assistant",
+		"outfit": "/datum/outfit/job/elysium/assistant",
 		"slots": 1
 	},
 	"Мукатэлл": {
-		"outfit": "/datum/outfit/job/independent/assistant",
+		"outfit": "/datum/outfit/job/elysium/security",
 		"slots" : 2
 	}
 },