Add: Faction on ship (#856)

* ADD: Faction on ship * FFF * Меняем родителя для оутфитов элизиума * Update nanotrasen_ice.dmm Signed-off-by: Molnia <[email protected]> * Update README.md Signed-off-by: Molnia <[email protected]> * Дефайн перемещаю * Resolve conflict * Finaly * Update README.md Написал название модпака Signed-off-by: MrCat15352 <[email protected]> --------- Signed-off-by: Molnia <[email protected]> Signed-off-by: MrCat15352 <[email protected]> Co-authored-by: MrCat15352 <[email protected]>
CeladonSS13 · Jul 24, 2024 · 6580ba7 · 6580ba7
1 parent 4b1c72c
commit 6580ba7
Show file tree

Hide file tree

Showing 27 changed files with 287 additions and 67 deletions.
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/assistant",
 			"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/assistant",
 			"slots" : 2
 		}
 	},

diff --git a/_maps/_mod_celadon/configs/elysium_homa.json b/_maps/_mod_celadon/configs/elysium_homa.json
@@ -17,20 +17,20 @@
 	"limit": 1,
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/independent/assistant",
+			"outfit": "/datum/outfit/job/elysium/assistant",
 			"officer": true,
 			"slots": 1
 		},
 		"Ship Engineer-Miner": {
-			"outfit": "/datum/outfit/job/independent/assistant",
+			"outfit": "/datum/outfit/job/elysium/assistant",
 			"slots": 2
 		},
 		"Ship's Doctor": {
-			"outfit": "/datum/outfit/job/independent/assistant",
+			"outfit": "/datum/outfit/job/elysium/assistant",
 			"slots": 1
 		},
 		"Scribe": {
-			"outfit": "/datum/outfit/job/independent/assistant",
+			"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/assistant",
 			"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/assistant",
 			"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/assistant",
 		"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/assistant",
 		"slots" : 2
 	}
 },

diff --git a/_maps/_mod_celadon/outpost/indie_space.dmm b/_maps/_mod_celadon/outpost/indie_space.dmm
@@ -1080,9 +1080,6 @@
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable/yellow,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/camera/autoname{
-	dir = 10
-	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /obj/effect/turf_decal/corner/opaque/black{
 	dir = 5
@@ -3885,6 +3882,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/machinery/camera/autoname{
+	dir = 10
+	},
 /turf/open/floor/plasteel/tech,
 /area/outpost/hallway/port)
 "yk" = (

diff --git a/_maps/_mod_celadon/shuttles/elysium/elysium_homa.dmm b/_maps/_mod_celadon/shuttles/elysium/elysium_homa.dmm
@@ -909,10 +909,10 @@
 /turf/open/floor/plating,
 /area/ship/hallway/central)
 "ys" = (
-/obj/item/circuitboard/computer/cargo/express,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/item/circuitboard/computer/cargo,
 /turf/open/floor/carpet/green,
 /area/ship/bridge)
 "yE" = (

diff --git a/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm b/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm
@@ -367,7 +367,6 @@
 /obj/structure/frame/computer{
 	dir = 8
 	},
-/obj/item/circuitboard/computer/cargo/express,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "oZ" = (
@@ -599,6 +598,7 @@
 	dir = 9
 	},
 /obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/item/circuitboard/computer/cargo,
 /turf/open/floor/plating,
 /area/ship/bridge)
 "wb" = (
@@ -619,7 +619,8 @@
 /obj/structure/fluff/clockwork/alloy_shards,
 /obj/effect/decal/cleanable/dirt/dust,
 /mob/living/simple_animal/hostile/retaliate/goose{
-	name = "Khasir"
+	name = "Khasir";
+	faction = list("playerElysium")
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
@@ -757,7 +758,9 @@
 "yX" = (
 /obj/structure/catwalk,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/porta_turret,
+/obj/machinery/porta_turret{
+	faction = list("playerElysium","turret")
+	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "zc" = (
@@ -1107,7 +1110,9 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/cryo)
 "MP" = (
-/obj/machinery/porta_turret,
+/obj/machinery/porta_turret{
+	faction = list("playerElysium","turret")
+	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "MV" = (

diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm
@@ -1433,7 +1433,7 @@
 "qJ" = (
 /obj/machinery/porta_turret/ship/ballistic{
 	dir = 9;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -2136,7 +2136,7 @@
 "xh" = (
 /obj/machinery/porta_turret/ship/ballistic{
 	dir = 5;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -3003,7 +3003,7 @@
 "Hu" = (
 /obj/machinery/porta_turret/ship/ballistic{
 	dir = 6;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -3282,7 +3282,7 @@
 "Ll" = (
 /obj/machinery/porta_turret/ship/ballistic{
 	dir = 5;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -3531,7 +3531,7 @@
 "Oa" = (
 /obj/machinery/porta_turret/ship/ballistic{
 	dir = 6;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -3817,7 +3817,7 @@
 "QZ" = (
 /obj/machinery/porta_turret/ship/ballistic{
 	dir = 10;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)

diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm
@@ -305,7 +305,7 @@
 "cM" = (
 /obj/machinery/porta_turret/ship/ballistic{
 	dir = 5;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -464,7 +464,7 @@
 "ej" = (
 /obj/machinery/porta_turret/ship/ballistic{
 	dir = 6;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)

diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm
@@ -700,7 +700,9 @@
 "yX" = (
 /obj/structure/catwalk,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/porta_turret,
+/obj/machinery/porta_turret{
+	faction = list("playerInteq","turret")
+	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "zc" = (
@@ -989,7 +991,8 @@
 /area/ship/crew/cryo)
 "LV" = (
 /obj/machinery/porta_turret{
-	density = 0
+	density = 0;
+	faction = list("playerInteq","turret")
 	},
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
@@ -1070,7 +1073,9 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/cryo)
 "MP" = (
-/obj/machinery/porta_turret,
+/obj/machinery/porta_turret{
+	faction = list("playerInteq","turret")
+	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "MV" = (

diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm
@@ -5302,7 +5302,8 @@
 /area/ship/engineering/engine)
 "Ek" = (
 /obj/machinery/porta_turret/ship/weak{
-	dir = 5
+	dir = 5;
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -5337,7 +5338,8 @@
 /area/ship/crew/dorm)
 "Ez" = (
 /obj/machinery/porta_turret/ship/weak{
-	dir = 9
+	dir = 9;
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -6098,7 +6100,8 @@
 /area/ship/cargo/starboard)
 "JL" = (
 /obj/machinery/porta_turret/ship/weak{
-	dir = 6
+	dir = 6;
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)

diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_vaquero.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_vaquero.dmm
@@ -1288,7 +1288,7 @@
 "vd" = (
 /obj/machinery/porta_turret/ship/weak{
 	dir = 5;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /obj/docking_port/mobile{
 	dir = 2;
@@ -1436,7 +1436,7 @@
 "xX" = (
 /obj/machinery/porta_turret/ship/weak{
 	dir = 6;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -1595,7 +1595,7 @@
 "zP" = (
 /obj/machinery/porta_turret/ship/weak{
 	dir = 6;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -2885,7 +2885,7 @@
 "Td" = (
 /obj/machinery/porta_turret/ship/weak{
 	dir = 5;
-	faction = list("turret")
+	faction = list("playerInteq","turret")
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)

diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm
@@ -1800,7 +1800,8 @@
 /area/ship/cargo)
 "EW" = (
 /obj/machinery/porta_turret/ship/ballistic{
-	dir = 9
+	dir = 9;
+	faction = list("playerNanotrasen","turret")
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
@@ -1893,7 +1894,8 @@
 /area/ship/engineering)
 "Gu" = (
 /obj/machinery/porta_turret/ship/ballistic{
-	dir = 5
+	dir = 5;
+	faction = list("playerNanotrasen","turret")
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
@@ -2805,7 +2807,8 @@
 /area/ship/hallway/central)
 "YT" = (
 /obj/machinery/porta_turret/ship/ballistic{
-	dir = 10
+	dir = 10;
+	faction = list("playerNanotrasen","turret")
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)

diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_delta.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_delta.dmm
@@ -1268,7 +1268,8 @@
 /area/ship/engineering)
 "jH" = (
 /obj/machinery/porta_turret/ship/weak{
-	dir = 9
+	dir = 9;
+	faction = list("playerNanotrasen","turret")
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
@@ -2679,7 +2680,8 @@
 /area/ship/science/robotics)
 "WG" = (
 /obj/machinery/porta_turret/ship/weak{
-	dir = 4
+	dir = 4;
+	faction = list("playerNanotrasen","turret")
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
@@ -2798,7 +2800,8 @@
 /area/ship/science/robotics)
 "YZ" = (
 /obj/machinery/porta_turret/ship/weak{
-	dir = 10
+	dir = 10;
+	faction = list("playerNanotrasen","turret")
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)