cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 07:33:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed nukie borg ghost poll incorrectly showing operative icon (#20418)

Browse Source 
* proper icons in prompt

* fixed chat role name too
This commit is contained in:
S34N
2023-02-27 16:49:01 +00:00
committed by GitHub
parent 8eccdfcb19
commit 4928d8432c
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/_common/antag_spawner.dm
+22 -4
View File
@@ -19,6 +19,11 @@
var/borg_to_spawn
var/checking = FALSE
var/rolename = "Syndicate Operative"
var/image/poll_icon
/obj/item/antag_spawner/nuke_ops/Initialize(mapload)
. = ..()
poll_icon = image(icon = 'icons/mob/simple_human.dmi', icon_state = "syndicate_space_sword")
/obj/item/antag_spawner/nuke_ops/proc/before_candidate_search(user)
return TRUE
@@ -46,8 +51,7 @@
checking = TRUE
to_chat(user, "<span class='notice'>You activate [src] and wait for confirmation.</span>")
var/image/I = new('icons/mob/simple_human.dmi', "syndicate_space_sword")
var/list/nuke_candidates = SSghost_spawns.poll_candidates("Do you want to play as a [rolename]?", ROLE_OPERATIVE, TRUE, 15 SECONDS, source = I)
var/list/nuke_candidates = SSghost_spawns.poll_candidates("Do you want to play as a [rolename]?", ROLE_OPERATIVE, TRUE, 15 SECONDS, source = poll_icon)
if(length(nuke_candidates))
checking = FALSE
if(QDELETED(src) || !check_usability(user))
@@ -95,14 +99,29 @@
/obj/item/antag_spawner/nuke_ops/borg_tele/assault
name = "syndicate assault cyborg teleporter"
borg_to_spawn = "Assault"
rolename = "Syndicate Assault Cyborg"
/obj/item/antag_spawner/nuke_ops/borg_tele/assault/Initialize(mapload)
. = ..()
poll_icon = image(icon = 'icons/mob/robots.dmi', icon_state = "syndie-bloodhound-preview")
/obj/item/antag_spawner/nuke_ops/borg_tele/medical
name = "syndicate medical teleporter"
borg_to_spawn = "Medical"
rolename = "Syndicate Medical Cyborg"
/obj/item/antag_spawner/nuke_ops/borg_tele/medical/Initialize(mapload)
. = ..()
poll_icon = image(icon = 'icons/mob/robots.dmi', icon_state = "syndi-medi")
/obj/item/antag_spawner/nuke_ops/borg_tele/saboteur
name = "syndicate saboteur teleporter"
borg_to_spawn = "Saboteur"
rolename = "Syndicate Saboteur Cyborg"
/obj/item/antag_spawner/nuke_ops/borg_tele/saboteur/Initialize(mapload)
. = ..()
poll_icon = image(icon = 'icons/mob/robots.dmi', icon_state = "syndi-engi-preview")
/obj/item/antag_spawner/nuke_ops/borg_tele/before_candidate_search(mob/user)
var/switch_roles_choice = input("Would you like to continue playing as an operative or take over as the cyborg? If you play as the cyborg, another player will control your old self.", "Play As") as null|anything in list("Nuclear Operative", "Syndicate Cyborg")
@@ -111,10 +130,9 @@
if(switch_roles_choice == "Syndicate Cyborg")
switch_roles = TRUE
rolename = initial(rolename)
rolename = "Syndicate Operative"
else
switch_roles = FALSE
rolename = "Syndicate [borg_to_spawn] Cyborg"
return TRUE