From 096bdbf766b5b31e927ffd5383e00d27f45a5a1e Mon Sep 17 00:00:00 2001 From: yogstation13-bot Date: Sun, 19 May 2019 21:32:24 +0200 Subject: [PATCH] [MIRROR] 0 TC uplinks and real names for reinforcements (#5412) * 0 TC uplinks and real names for reinforcements #44025 --- code/game/gamemodes/nuclear/nuclear.dm | 3 ++- code/modules/antagonists/nukeop/nukeop.dm | 13 ++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 69fc359c018a..d8920b128cb3 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -137,6 +137,7 @@ command_radio = TRUE /datum/outfit/syndicate/no_crystals + name = "Syndicate Operative - Reinforcement" tc = 0 /datum/outfit/syndicate/post_equip(mob/living/carbon/human/H) @@ -146,7 +147,7 @@ if(command_radio) R.command = TRUE - if(tc) + if(ispath(uplink_type, /obj/item/uplink/nuclear) || tc) // /obj/item/uplink/nuclear understands 0 tc var/obj/item/U = new uplink_type(H, H.key, tc) H.equip_to_slot_or_del(U, SLOT_IN_BACKPACK) diff --git a/code/modules/antagonists/nukeop/nukeop.dm b/code/modules/antagonists/nukeop/nukeop.dm index b391a1c7a103..4ef37c33e64d 100644 --- a/code/modules/antagonists/nukeop/nukeop.dm +++ b/code/modules/antagonists/nukeop/nukeop.dm @@ -75,9 +75,16 @@ /datum/antagonist/nukeop/proc/give_alias() if(nuke_team && nuke_team.syndicate_name) - var/number = 1 - number = nuke_team.members.Find(owner) - owner.current.real_name = "[nuke_team.syndicate_name] Operative #[number]" + var/mob/living/carbon/human/H = owner.current + if(istype(H)) // Reinforcements get a real name + var/chosen_name = H.dna.species.random_name(H.gender,0,nuke_team.syndicate_name) + H.fully_replace_character_name(H.real_name,chosen_name) + else + var/number = 1 + number = nuke_team.members.Find(owner) + owner.current.real_name = "[nuke_team.syndicate_name] Operative #[number]" + + /datum/antagonist/nukeop/proc/memorize_code() if(nuke_team && nuke_team.tracked_nuke && nuke_team.memorized_code)