From 8f82644d0f8d354bc8379128082ff6bd2649854f Mon Sep 17 00:00:00 2001
From: ikarrus <ericgfwong@hotmail.com>
Date: Mon, 15 Sep 2014 09:18:12 -0600
Subject: [PATCH] All Nuke Ops are told the code when spawned

So they don't have to rely on some sheet of paper.
---
 code/datums/mind.dm                    |  4 ++++
 code/game/gamemodes/nuclear/nuclear.dm | 25 ++++++++++++-------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index ca1608ef30a..ce9d2325ad2 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -1018,6 +1018,10 @@
 
 		ticker.mode.equip_syndicate(current)
 
+		if (nuke_code)
+			store_memory("<B>Syndicate Nuclear Bomb Code</B>: [nuke_code]", 0, 0)
+			current << "The nuclear authorization code is: <B>[nuke_code]</B>"
+
 		if (leader)
 			ticker.mode.prepare_syndicate_leader(src,nuke_code)
 		else
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index 666fe48651a..3f98e8f1ee2 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -116,6 +116,10 @@
 		greet_syndicate(synd_mind)
 		equip_syndicate(synd_mind.current)
 
+		if (nuke_code)
+			synd_mind.store_memory("<B>Syndicate Nuclear Bomb Code</B>: [nuke_code]", 0, 0)
+			synd_mind.current << "The nuclear authorization code is: <B>[nuke_code]</B>"
+
 		if(!leader_selected)
 			prepare_syndicate_leader(synd_mind, nuke_code)
 			leader_selected = 1
@@ -144,26 +148,21 @@
 	synd_mind.current << "<B>You are the Syndicate [leader_title] for this mission. You are responsible for the distribution of telecrystals and your ID is the only one who can open the launch bay doors.</B>"
 	synd_mind.current << "<B>If you feel you are not up to this task, give your ID to another operative.</B>"
 
+	var/list/foundIDs = synd_mind.current.search_contents_for(/obj/item/weapon/card/id)
+	if(foundIDs.len)
+		for(var/obj/item/weapon/card/id/ID in foundIDs)
+			ID.access += access_syndicate_leader
+	else
+		message_admins("Warning: Nuke Ops spawned without access to leave their spawn area!")
+
 	if (nuke_code)
-		synd_mind.store_memory("<B>Syndicate Nuclear Bomb Code</B>: [nuke_code]", 0, 0)
-		synd_mind.current << "The nuclear authorization code is: <B>[nuke_code]</B>"
-
-		var/list/foundIDs = synd_mind.current.search_contents_for(/obj/item/weapon/card/id)
-
-		if(foundIDs.len)
-			for(var/obj/item/weapon/card/id/ID in foundIDs)
-				ID.access += access_syndicate_leader
-		else
-			message_admins("Warning: Nuke Ops spawned without access to leave their spawn area!")
-
 		var/obj/item/weapon/paper/P = new
 		P.info = "The nuclear authorization code is: <b>[nuke_code]</b>"
 		P.name = "nuclear bomb code"
 		var/mob/living/carbon/human/H = synd_mind.current
 		P.loc = H.loc
-		H.equip_to_slot_or_del(P, slot_r_store, 0)
+		H.equip_to_slot_or_del(P, slot_r_hand, 0)
 		H.update_icons()
-
 	else
 		nuke_code = "code will be provided later"
 	return