From a470659ff4d233d6f949995b4d459c18f617093e Mon Sep 17 00:00:00 2001
From: Blundir <100090741+Blundir@users.noreply.github.com>
Date: Mon, 4 Nov 2024 15:14:55 +0200
Subject: [PATCH] init

---
 code/game/jobs/job/command/cic/captain.dm   | 12 +-----------
 code/game/jobs/job/command/cic/executive.dm |  4 ++++
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/code/game/jobs/job/command/cic/captain.dm b/code/game/jobs/job/command/cic/captain.dm
index 30fa455beeee..4fae09ce808b 100644
--- a/code/game/jobs/job/command/cic/captain.dm
+++ b/code/game/jobs/job/command/cic/captain.dm
@@ -32,7 +32,7 @@
 		return get_desired_status(player.prefs.commander_status, WHITELIST_NORMAL)
 
 /datum/job/command/commander/announce_entry_message(mob/living/carbon/human/H)
-	addtimer(CALLBACK(src, PROC_REF(do_announce_entry_message), H), 1.5 SECONDS)
+	addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(all_hands_on_deck), "Attention all hands, [H.get_paygrade(0)] [H.real_name] on deck!"), 1.5 SECONDS)
 	return ..()
 
 /datum/job/command/commander/generate_entry_conditions(mob/living/M, whitelist_status)
@@ -44,16 +44,6 @@
 	SIGNAL_HANDLER
 	GLOB.marine_leaders -= JOB_CO
 
-/datum/job/command/commander/proc/do_announce_entry_message(mob/living/carbon/human/H)
-		all_hands_on_deck("Attention all hands, [H.get_paygrade(0)] [H.real_name] on deck!")
-	//for(var/i in GLOB.co_secure_boxes)
-		//var/obj/structure/closet/secure_closet/securecom/S = i
-		//var/loc_to_spawn = S.opened ? get_turf(S) : S
-		//var/obj/item/weapon/gun/rifle/m46c/I = new(loc_to_spawn)
-		//new /obj/item/clothing/suit/storage/marine/MP/CO(loc_to_spawn)
-		//new /obj/item/clothing/head/helmet/marine/CO(loc_to_spawn)
-		//I.name_after_co(H, I)
-
 /obj/effect/landmark/start/captain
 	name = JOB_CO
 	icon_state = "co_spawn"
diff --git a/code/game/jobs/job/command/cic/executive.dm b/code/game/jobs/job/command/cic/executive.dm
index f03c384bbb86..9f2135f5ee52 100644
--- a/code/game/jobs/job/command/cic/executive.dm
+++ b/code/game/jobs/job/command/cic/executive.dm
@@ -22,6 +22,10 @@ AddTimelock(/datum/job/command/executive, list(
 	JOB_SQUAD_LEADER = 10 HOURS,
 ))
 
+/datum/job/command/executive/announce_entry_message(mob/living/carbon/human/H)
+	addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(all_hands_on_deck), "Attention all hands, [H.get_paygrade(0)] [H.real_name] on deck!"), 1.5 SECONDS)
+	return ..()
+
 /obj/effect/landmark/start/executive
 	name = JOB_XO
 	icon_state = "xo_spawn"