Merge pull request #865 from molnizz/cringe18

Add: Elysium outfit
CeladonSS13 · Jul 26, 2024 · ab110d1 · ab110d1
2 parents a5438c3 + f4d3015
commit ab110d1
Show file tree

Hide file tree

Showing 16 changed files with 170 additions and 78 deletions.
diff --git a/_maps/_mod_celadon/configs/elysium_aldaama.json b/_maps/_mod_celadon/configs/elysium_aldaama.json
@@ -19,7 +19,7 @@
 	"limit": 1,
 	"job_slots": {
 		"Caid": {
-			"outfit": "/datum/outfit/job/elysium/assistant",
+			"outfit": "/datum/outfit/job/elysium/captain",
 			"officer": true,
 			"slots": 1
 		},
@@ -28,7 +28,7 @@
 			"slots": 3
 		},
 		"Mukatell": {
-			"outfit": "/datum/outfit/job/elysium/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,20 +16,16 @@
 	],
 	"limit": 1,
 	"job_slots": {
-		"Captain": {
-			"outfit": "/datum/outfit/job/elysium/assistant",
+		"Caid": {
+			"outfit": "/datum/outfit/job/elysium/captain",
 			"officer": true,
 			"slots": 1
 		},
-		"Ship Engineer-Miner": {
-			"outfit": "/datum/outfit/job/elysium/assistant",
+		"Mukatell": {
+			"outfit": "/datum/outfit/job/elysium/security",
 			"slots": 2
 		},
-		"Ship's Doctor": {
-			"outfit": "/datum/outfit/job/elysium/assistant",
-			"slots": 1
-		},
-		"Scribe": {
+		"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,7 +17,7 @@
 	"limit": 1,
 	"job_slots": {
 		"Caid": {
-			"outfit": "/datum/outfit/job/elysium/assistant",
+			"outfit": "/datum/outfit/job/elysium/captain",
 			"officer": true,
 			"slots": 1
 		},
@@ -26,7 +26,7 @@
 			"slots": 3
 		},
 		"Mukatell": {
-			"outfit": "/datum/outfit/job/elysium/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,7 +16,7 @@
 "limit": 2,
 "job_slots": {
 	"Каид": {
-		"outfit": "/datum/outfit/job/elysium/assistant",
+		"outfit": "/datum/outfit/job/elysium/captain",
 		"officer": true,
 		"slots": 1
 	},
@@ -25,7 +25,7 @@
 		"slots": 1
 	},
 	"Мукатэлл": {
-		"outfit": "/datum/outfit/job/elysium/assistant",
+		"outfit": "/datum/outfit/job/elysium/security",
 		"slots" : 2
 	}
 },

diff --git a/_maps/_mod_celadon/outpost/nanotrasen_asteroid.dmm b/_maps/_mod_celadon/outpost/nanotrasen_asteroid.dmm
@@ -227,7 +227,8 @@
 /obj/effect/turf_decal/spline/fancy/opaque/black,
 /obj/machinery/firealarm/directional/north,
 /obj/item/banner/elysium{
-	pixel_x = 5
+	pixel_x = 5;
+	anchored = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/outpost/hallway/fore)
@@ -2677,7 +2678,8 @@
 /obj/effect/turf_decal/spline/fancy/opaque/black,
 /obj/item/radio/intercom/directional/north,
 /obj/item/banner/elysium{
-	pixel_x = 3
+	pixel_x = 3;
+	anchored = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/outpost/hallway/fore)
@@ -6617,7 +6619,8 @@
 	dir = 8
 	},
 /obj/item/banner/elysium{
-	pixel_x = 6
+	pixel_x = 6;
+	anchored = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/outpost/operations)
@@ -6832,7 +6835,8 @@
 	dir = 4
 	},
 /obj/item/banner/elysium{
-	pixel_x = 2
+	pixel_x = 2;
+	anchored = 1
 	},
 /turf/open/floor/concrete/tiles,
 /area/outpost/crew/garden)
@@ -9047,7 +9051,8 @@
 	dir = 4
 	},
 /obj/item/banner/elysium{
-	pixel_x = 2
+	pixel_x = 2;
+	anchored = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/outpost/operations)
@@ -14150,7 +14155,8 @@
 	dir = 1
 	},
 /obj/item/banner/elysium{
-	pixel_x = 6
+	pixel_x = 6;
+	anchored = 1
 	},
 /turf/open/floor/concrete/tiles,
 /area/outpost/crew/garden)

diff --git a/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm b/_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm
@@ -676,7 +676,6 @@
 /obj/item/clothing/suit/space/elysm/junk,
 /obj/item/clothing/head/space/elysm/space_helm,
 /obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/bandana/black,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/cargo)
 "ye" = (

diff --git a/_maps/_mod_celadon/shuttles/solfed/solfed_saber.dmm b/_maps/_mod_celadon/shuttles/solfed/solfed_saber.dmm
@@ -49,7 +49,8 @@
 	pixel_y = -4
 	},
 /obj/item/banner/elysium{
-	pixel_x = 4
+	pixel_x = 4;
+	anchored = 1
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /turf/open/floor/plasteel/dark,
@@ -382,7 +383,8 @@
 	},
 /obj/item/banner/elysium{
 	pixel_x = 4;
-	morale_cooldown = 50000
+	morale_cooldown = 50000;
+	anchored = 1
 	},
 /obj/effect/turf_decal/steeldecal/steel_decals1,
 /turf/open/floor/plasteel/mono/dark,
@@ -3061,7 +3063,8 @@
 "xY" = (
 /obj/item/banner/elysium{
 	pixel_x = 4;
-	morale_cooldown = 50000
+	morale_cooldown = 50000;
+	anchored = 1
 	},
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 9
@@ -3489,7 +3492,8 @@
 "Bs" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/item/banner/solfed{
-	morale_cooldown = 50000
+	morale_cooldown = 50000;
+	anchored = 1
 	},
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/office)
@@ -3934,7 +3938,8 @@
 "Ei" = (
 /obj/item/banner/elysium{
 	pixel_x = 4;
-	morale_cooldown = 4000
+	morale_cooldown = 4000;
+	anchored = 1
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/box/red,
@@ -4012,7 +4017,8 @@
 	},
 /obj/machinery/light/directional/north,
 /obj/item/banner/solfed{
-	morale_cooldown = 50000
+	morale_cooldown = 50000;
+	anchored = 1
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/wood/walnut,
@@ -4287,7 +4293,8 @@
 	},
 /obj/item/banner/elysium{
 	pixel_x = 4;
-	morale_cooldown = 50000
+	morale_cooldown = 50000;
+	anchored = 1
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
@@ -4766,7 +4773,8 @@
 	dir = 5
 	},
 /obj/item/banner/solfed{
-	morale_cooldown = 50000
+	morale_cooldown = 50000;
+	anchored = 1
 	},
 /turf/open/floor/carpet/green,
 /area/ship/security/range)
@@ -6038,7 +6046,8 @@
 	dir = 4
 	},
 /obj/item/banner/solfed{
-	morale_cooldown = 50000
+	morale_cooldown = 50000;
+	anchored = 1
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
@@ -6293,7 +6302,8 @@
 "XM" = (
 /obj/item/banner/elysium{
 	pixel_x = 4;
-	morale_cooldown = 50000
+	morale_cooldown = 50000;
+	anchored = 1
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/effect/turf_decal/spline/fancy/wood{

diff --git a/mod_celadon/_storge_icons/_storge_icons.dme b/mod_celadon/_storge_icons/_storge_icons.dme
@@ -4,3 +4,12 @@
 #include "_storge_icons.dm"
 
 #endif
+// BEGIN_INTERNALS
+// END_INTERNALS
+// BEGIN_FILE_DIR
+#define FILE_DIR .
+// END_FILE_DIR
+// BEGIN_PREFERENCES
+// END_PREFERENCES
+// BEGIN_INCLUDE
+// END_INCLUDE
diff --git a/mod_celadon/_storge_icons/icons/obj/elysium_card.dmi b/mod_celadon/_storge_icons/icons/obj/elysium_card.dmi
diff --git a/mod_celadon/faction/code/faction.dm b/mod_celadon/faction/code/faction.dm
@@ -1,44 +1,7 @@
 //	Syndicate
 /datum/outfit/job/syndicate/post_equip(mob/living/carbon/human/H, visualsOnly)
- 	. = ..()
- 	H.faction |= list(FACTION_PLAYER_SYNDICATE,FACTION_ANTAG_SYNDICATE)
-
-//	Elysium
-/datum/outfit/job/elysium/assistant
-	name = "Elysium - Assistant"
-	job_icon = "captain"
-	jobtype = /datum/job/captain
-
-	uniform = /obj/item/clothing/under/utility
-	shoes = /obj/item/clothing/shoes/sneakers/black
-	box = /obj/item/storage/box/survival
-	id = /obj/item/card/id/silver
-
-/datum/outfit/job/elysium/proc/get_elysium_access(mob/living/carbon/human/H)
-	var/obj/item/storage/wallet/W = null
-	for (var/obj/item/O in H.contents)
-		if (istype(O, /obj/item/storage/wallet))
-			W = O
-			break
-	if (W)
-		var/obj/item/card/id/I = null
-		for (var/obj/item/O in W.contents)
-			if (istype(O, /obj/item/card/id/silver))
-				I = O
-				break
-		if (I)
-			I.access = list(ACCESS_MAINT_TUNNELS)
-			I.update_label()
-		W.combined_access = list()
-		for (var/obj/item/card/id/card in W.contents)
-			W.combined_access |= card.access
-
-/datum/outfit/job/elysium/assistant/post_equip(mob/living/carbon/human/H)
 	. = ..()
-	get_elysium_access(H)
-
-/datum/outfit/job/elysium/post_equip(mob/living/carbon/human/H)
-	H.faction |= list(FACTION_PLAYER_ELYSIUM)
+	H.faction |= list(FACTION_PLAYER_SYNDICATE,FACTION_ANTAG_SYNDICATE)
 
 //	Nanotrasen
 /datum/outfit/job/nanotrasen/post_equip(mob/living/carbon/human/H, visualsOnly)

diff --git a/mod_celadon/solgov_outfit/code/solgov_outfit.dm b/mod_celadon/solgov_outfit/code/solgov_outfit.dm
@@ -3,7 +3,6 @@
 //										//
 
 /datum/outfit/job/solgov/proc/get_solfed_captain_access(mob/living/carbon/human/H)
-	H.faction |= list(FACTION_PLAYER_SOLGOV)
 	var/obj/item/storage/wallet/W = null
 	for (var/obj/item/O in H.contents)
 		if (istype(O, /obj/item/storage/wallet))
@@ -23,7 +22,6 @@
 			W.combined_access |= card.access
 
 /datum/outfit/job/solgov/proc/get_solfed_overseer_access(mob/living/carbon/human/H)
-	H.faction |= list(FACTION_PLAYER_SOLGOV)
 	var/obj/item/storage/wallet/W = null
 	for (var/obj/item/O in H.contents)
 		if (istype(O, /obj/item/storage/wallet))
@@ -43,7 +41,6 @@
 			W.combined_access |= card.access
 
 /datum/outfit/job/solgov/proc/get_solfed_sonnensoldner_access(mob/living/carbon/human/H)
-	H.faction |= list(FACTION_PLAYER_SOLGOV)
 	var/obj/item/storage/wallet/W = null
 	for (var/obj/item/O in H.contents)
 		if (istype(O, /obj/item/storage/wallet))
@@ -63,7 +60,6 @@
 			W.combined_access |= card.access
 
 /datum/outfit/job/solgov/proc/get_solfed_engineer_access(mob/living/carbon/human/H)
-	H.faction |= list(FACTION_PLAYER_SOLGOV)
 	var/obj/item/storage/wallet/W = null
 	for (var/obj/item/O in H.contents)
 		if (istype(O, /obj/item/storage/wallet))

diff --git a/mod_celadon/stuff_elysium/_stuff_elysium.dme b/mod_celadon/stuff_elysium/_stuff_elysium.dme
@@ -12,6 +12,7 @@
 #include "code/outfits.dm"
 #include "code/shoes.dm"
 #include "code/belt.dm"
+#include "code/outfit_ship/elysium.dm"
 
 #endif