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

Merge pull request #14137 from dearmochi/ghost-spawns-fixes

Browse Source 
Adds chat message when polling for candidates, fixes blob offspring alert and preferences being ignored
This commit is contained in:
AffectedArc07
2020-08-26 20:38:29 +01:00
committed by GitHub
parent 89f1e9c4a2 a0278345f0
commit 04a02eaed4
9 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+1 -1
View File
@@ -3576,7 +3576,7 @@
return
var/datum/outfit/O = hunter_outfits[dresscode]
message_admins("[key_name_admin(mob)] is sending a ([dresscode]) to [killthem ? "assassinate" : "protect"] [key_name_admin(H)]...")
var/mutable_appearance/source = new('icons/obj/cardboard_cutout.dmi', "cutout_traitor")
var/image/source = image('icons/obj/cardboard_cutout.dmi', "cutout_traitor")
var/list/candidates = SSghost_spawns.poll_candidates("Play as a [killthem ? "murderous" : "protective"] [dresscode]?", ROLE_TRAITOR, TRUE, source = source)
if(!candidates.len)
to_chat(usr, "<span class='warning'>ERROR: Could not create eventmob. No valid candidates.</span>")
code/modules/admin/verbs/striketeam.dm
+1 -1
View File
@@ -37,7 +37,7 @@ GLOBAL_VAR_INIT(sent_strike_team, 0)
break
// Find ghosts willing to be DS
var/mutable_appearance/source = new('icons/obj/cardboard_cutout.dmi', "cutout_deathsquad")
var/image/source = image('icons/obj/cardboard_cutout.dmi', "cutout_deathsquad")
var/list/commando_ghosts = pollCandidatesWithVeto(src, usr, COMMANDOS_POSSIBLE, "Join the DeathSquad?",, 21, 60 SECONDS, TRUE, GLOB.role_playtime_requirements[ROLE_DEATHSQUAD], TRUE, FALSE, source = source)
if(!commando_ghosts.len)
to_chat(usr, "<span class='userdanger'>Nobody volunteered to join the DeathSquad.</span>")