wj-spawn

cmss13-devs · Jul 31, 2023 · 8500c16 · 8500c16
1 parent dd643a8
commit 8500c16
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 61 deletions.
diff --git a/code/_globalvars/lists/mapping_globals.dm b/code/_globalvars/lists/mapping_globals.dm
@@ -27,6 +27,7 @@ GLOBAL_LIST_EMPTY(latewhiskey)
 
 GLOBAL_LIST_EMPTY(latejoin)
 GLOBAL_LIST_EMPTY(latejoin_by_squad)
+GLOBAL_LIST_EMPTY(latejoin_by_job)
 
 GLOBAL_LIST_EMPTY(zombie_landmarks)
 

diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm
@@ -288,6 +288,8 @@
 			join_turf = get_turf(pick(GLOB.spawns_by_job[type]))
 		else if(assigned_squad && GLOB.latejoin_by_squad[assigned_squad])
 			join_turf = get_turf(pick(GLOB.latejoin_by_squad[assigned_squad]))
+		else if(GLOB.latejoin_by_job[title])
+			join_turf = get_turf(pick(GLOB.latejoin_by_job[title]))
 		else
 			join_turf = get_turf(pick(GLOB.latejoin))
 		human.forceMove(join_turf)

diff --git a/code/game/jobs/role_authority.dm b/code/game/jobs/role_authority.dm
@@ -553,6 +553,8 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
 		var/turf/late_join_turf
 		if(GLOB.latejoin_by_squad[assigned_squad])
 			late_join_turf = get_turf(pick(GLOB.latejoin_by_squad[assigned_squad]))
+		else if(GLOB.latejoin_by_job[J.title])
+			late_join_turf = get_turf(pick(GLOB.latejoin_by_job[J.title]))
 		else
 			late_join_turf = get_turf(pick(GLOB.latejoin))
 		H.forceMove(late_join_turf)

diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm
@@ -378,6 +378,8 @@
 	name = "late join"
 	icon_state = "x2"
 	var/squad
+	/// What job should latejoin on this landmark
+	var/job
 
 /obj/effect/landmark/late_join/alpha
 	name = "alpha late join"
@@ -396,16 +398,24 @@
 	squad = SQUAD_MARINE_4
 
 
+/obj/effect/landmark/late_join/working_joe
+	name = "working joe late join"
+	job = JOB_WORKING_JOE
+
 /obj/effect/landmark/late_join/Initialize(mapload, ...)
 	. = ..()
 	if(squad)
 		LAZYADD(GLOB.latejoin_by_squad[squad], src)
+	else if(job)
+		LAZYADD(GLOB.latejoin_by_job[job], src)
 	else
 		GLOB.latejoin += src
 
 /obj/effect/landmark/late_join/Destroy()
 	if(squad)
 		LAZYREMOVE(GLOB.latejoin_by_squad[squad], src)
+	else if(job)
+		LAZYADD(GLOB.latejoin_by_job[job], src)
 	else
 		GLOB.latejoin -= src
 	return ..()

diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -23201,32 +23201,13 @@
 	},
 /area/almayer/shipboard/brig/lobby)
 "bRo" = (
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	id = "ARES StairsLower";
-	name = "\improper ARES Core Shutters";
-	plane = -7
-	},
-/obj/effect/step_trigger/ares_alert/public{
-	alert_id = "AresStairs";
-	alert_message = "Caution: Movement detected in ARES Core.";
-	cooldown_duration = 1200
-	},
-/obj/effect/step_trigger/ares_alert/public{
-	alert_id = "AresStairs";
-	alert_message = "Caution: Movement detected in ARES Core.";
-	cooldown_duration = 1200
-	},
-/obj/structure/machinery/door/poddoor/almayer/blended/white/open{
-	closed_layer = 3.2;
-	id = "ARES Emergency";
-	layer = 3.2;
-	name = "ARES Emergency Lockdown";
-	needs_power = 0;
-	open_layer = 1.9;
-	plane = -7
+/obj/effect/landmark/late_join/working_joe,
+/obj/effect/landmark/start/working_joe,
+/obj/structure/machinery/light{
+	dir = 8
 	},
 /turf/open/floor/almayer/no_build{
-	icon_state = "test_floor4"
+	icon_state = "ai_floors"
 	},
 /area/almayer/command/airoom)
 "bRr" = (
@@ -23928,7 +23909,6 @@
 	},
 /area/almayer/squads/delta)
 "bUx" = (
-/obj/effect/landmark/start/working_joe,
 /obj/structure/machinery/light/small{
 	dir = 8
 	},
@@ -37850,19 +37830,13 @@
 /turf/open/floor/almayer,
 /area/almayer/hull/upper_hull/u_f_p)
 "gAe" = (
-/obj/structure/filingcabinet{
-	density = 0;
-	pixel_x = -8;
-	pixel_y = 18
-	},
-/obj/structure/filingcabinet{
-	density = 0;
-	pixel_x = 8;
-	pixel_y = 18
+/obj/structure/machinery/door_control{
+	id = "ARES JoeCryo";
+	name = "Working Joe Cryogenics Lockdown";
+	pixel_x = 24;
+	pixel_y = 8;
+	req_one_access_txt = "19;200;90;91;92"
 	},
-/obj/item/folder/white,
-/obj/item/folder/white,
-/obj/item/folder/white,
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
 	},
@@ -51367,7 +51341,6 @@
 	},
 /area/almayer/living/pilotbunks)
 "mLE" = (
-/obj/effect/landmark/start/working_joe,
 /turf/open/floor/plating,
 /area/almayer/command/airoom)
 "mLF" = (
@@ -58149,6 +58122,16 @@
 	icon_state = "silvercorner"
 	},
 /area/almayer/command/computerlab)
+"pTt" = (
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+	id = "ARES JoeCryo";
+	name = "\improper ARES Core Shutters";
+	plane = -7
+	},
+/turf/open/floor/almayer/no_build{
+	icon_state = "test_floor4"
+	},
+/area/almayer/command/airoom)
 "pTM" = (
 /obj/structure/sign/safety/water{
 	pixel_x = 8;
@@ -64769,8 +64752,8 @@
 /area/almayer/living/briefing)
 "sTV" = (
 /obj/structure/machinery/power/apc/almayer/hardened{
-	dir = 1;
-	cell_type = /obj/item/cell/hyper
+	cell_type = /obj/item/cell/hyper;
+	dir = 1
 	},
 /turf/open/floor/plating,
 /area/almayer/command/airoom)
@@ -70072,12 +70055,19 @@
 	},
 /area/almayer/hull/lower_hull/l_m_p)
 "vhe" = (
-/obj/structure/prop/server_equipment/yutani_server{
+/obj/structure/filingcabinet{
 	density = 0;
-	desc = "A powerful server tower housing various AI functions.";
-	name = "server tower";
-	pixel_y = 16
+	pixel_x = -8;
+	pixel_y = 18
 	},
+/obj/structure/filingcabinet{
+	density = 0;
+	pixel_x = 8;
+	pixel_y = 18
+	},
+/obj/item/folder/white,
+/obj/item/folder/white,
+/obj/item/folder/white,
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
 	},
@@ -73245,6 +73235,20 @@
 	icon_state = "bluefull"
 	},
 /area/almayer/command/cichallway)
+"wyv" = (
+/obj/structure/machinery/door_control{
+	id = "ARES JoeCryo";
+	name = "Working Joe Cryogenics Lockdown";
+	pixel_x = -24;
+	pixel_y = -8;
+	req_one_access_txt = "19;200;90;91;92"
+	},
+/obj/effect/landmark/late_join/working_joe,
+/obj/effect/landmark/start/working_joe,
+/turf/open/floor/almayer/no_build{
+	icon_state = "ai_floors"
+	},
+/area/almayer/command/airoom)
 "wyK" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
@@ -74803,12 +74807,12 @@
 	pixel_y = 32
 	},
 /obj/item/folded_tent/big{
-	pixel_y = 10;
-	pixel_x = -6
+	pixel_x = -6;
+	pixel_y = 10
 	},
 /obj/item/storage/box/mousetraps{
-	pixel_y = 12;
-	pixel_x = 3
+	pixel_x = 3;
+	pixel_y = 12
 	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -76803,8 +76807,8 @@
 /obj/effect/spawner/random/toolbox,
 /obj/structure/machinery/computer/working_joe{
 	dir = 4;
-	pixel_y = 14;
-	pixel_x = -17
+	pixel_x = -17;
+	pixel_y = 14
 	},
 /turf/open/floor/almayer{
 	dir = 10;
@@ -77349,6 +77353,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/squads/delta)
+"ylg" = (
+/obj/structure/machinery/cryopod,
+/turf/open/floor/almayer/no_build{
+	icon_state = "ai_floors"
+	},
+/area/almayer/command/airoom)
 "ylm" = (
 /obj/structure/machinery/door/firedoor/border_only/almayer,
 /obj/structure/disposalpipe/segment{
@@ -135554,7 +135564,7 @@ pYi
 fMl
 gUN
 bLv
-bRo
+wkM
 xvM
 osy
 cBm
@@ -136560,10 +136570,10 @@ lmz
 lmz
 lmz
 lmz
-lmz
-lmz
-lmz
 daz
+bRo
+wyv
+pTt
 gAe
 rCi
 gba
@@ -136763,9 +136773,9 @@ lmz
 lmz
 lmz
 lmz
-lmz
-lmz
-lmz
+daz
+ylg
+ylg
 daz
 daz
 daz
@@ -136966,10 +136976,10 @@ bdH
 bdH
 lmz
 lmz
-lmz
-lmz
-lmz
-lmz
+daz
+daz
+daz
+daz
 lmz
 lmz
 lmz