From 7042d4fb777376c9d366c272b8165b1b9c14d4e0 Mon Sep 17 00:00:00 2001 From: datlo Date: Fri, 10 May 2019 14:42:26 +0100 Subject: [PATCH 1/2] Fix ghosts being asked the wrong nukie role MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #11492 mixed up which players gets which role. The role being selected is the role that the player using the spawner will play, so the role that the ghost gets is the other one. 🆑 fix: Ghosts will no longer get the wrong role offered when a nukie spawns a borg and will properly be informed whether they will spawn as a nuke ops or a syndi cyborg. /🆑 --- code/modules/antagonists/_common/antag_spawner.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index d92e5ffa86f..fa605cb627b 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -32,7 +32,7 @@ return FALSE if(checking) to_chat(user, "The device is already connecting to Syndicate command. Please wait.") - return FALSE + return FALSE return TRUE /obj/item/antag_spawner/nuke_ops/attack_self(mob/user) @@ -110,10 +110,10 @@ if(switch_roles_choice == "Syndicate Cyborg") switch_roles = TRUE - rolename = "Syndicate [borg_to_spawn]" + rolename = initial(rolename) else switch_roles = FALSE - rolename = initial(rolename) + rolename = "Syndicate [borg_to_spawn]" return TRUE From 5dbc319fa90cb772c204f9039fb843dd7404dc59 Mon Sep 17 00:00:00 2001 From: datlo Date: Fri, 10 May 2019 15:07:46 +0100 Subject: [PATCH 2/2] add cyborg to the role name --- code/modules/antagonists/_common/antag_spawner.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index fa605cb627b..c0fc8f66fb5 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -113,7 +113,7 @@ rolename = initial(rolename) else switch_roles = FALSE - rolename = "Syndicate [borg_to_spawn]" + rolename = "Syndicate [borg_to_spawn] Cyborg" return TRUE