cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

dsquad and SST to 45 (#26705)

Browse Source
This commit is contained in:
Daylight
2024-09-13 17:43:29 +00:00
committed by GitHub
parent a71424d5b1
commit a1e250ca10
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/deathsquad.dm
+2 -2
View File
@@ -70,10 +70,10 @@ GLOBAL_VAR_INIT(deathsquad_sent, FALSE)
var/list/commando_ghosts = list()
if(alert("Would you like to custom pick your Deathsquad?", null, "Yes", "No") == "Yes")
var/image/source = image('icons/obj/cardboard_cutout.dmi', "cutout_deathsquad")
commando_ghosts = pollCandidatesWithVeto(src, usr, commando_number, "Join the DeathSquad?", null, 21, 60 SECONDS, TRUE, GLOB.role_playtime_requirements[ROLE_DEATHSQUAD], TRUE, FALSE, source = source)
commando_ghosts = pollCandidatesWithVeto(src, usr, commando_number, "Join the DeathSquad?", null, 21, 45 SECONDS, TRUE, GLOB.role_playtime_requirements[ROLE_DEATHSQUAD], TRUE, FALSE, source = source)
else
var/image/source = image('icons/obj/cardboard_cutout.dmi', "cutout_deathsquad")
commando_ghosts = SSghost_spawns.poll_candidates("Join the Deathsquad?", null, GLOB.responseteam_age, 60 SECONDS, TRUE, GLOB.role_playtime_requirements[ROLE_DEATHSQUAD], TRUE, FALSE, source = source)
commando_ghosts = SSghost_spawns.poll_candidates("Join the Deathsquad?", null, GLOB.responseteam_age, 45 SECONDS, TRUE, GLOB.role_playtime_requirements[ROLE_DEATHSQUAD], TRUE, FALSE, source = source)
if(length(commando_ghosts) > commando_number)
commando_ghosts.Cut(commando_number + 1) //cuts the ghost candidates down to the amount requested
if(!length(commando_ghosts))
code/modules/admin/verbs/striketeam_syndicate.dm
+1 -1
View File
@@ -46,7 +46,7 @@ GLOBAL_VAR_INIT(sent_syndicate_strike_team, 0)
// Find ghosts willing to be SST
var/image/I = new('icons/obj/cardboard_cutout.dmi', "cutout_commando")
var/list/commando_ghosts = pollCandidatesWithVeto(src, usr, SYNDICATE_COMMANDOS_POSSIBLE, "Join the Syndicate Strike Team?", null, 21, 60 SECONDS, TRUE, GLOB.role_playtime_requirements[ROLE_DEATHSQUAD], TRUE, FALSE, source = I)
var/list/commando_ghosts = pollCandidatesWithVeto(src, usr, SYNDICATE_COMMANDOS_POSSIBLE, "Join the Syndicate Strike Team?", null, 21, 45 SECONDS, TRUE, GLOB.role_playtime_requirements[ROLE_DEATHSQUAD], TRUE, FALSE, source = I)
if(!length(commando_ghosts))
to_chat(usr, "<span class='userdanger'>Nobody volunteered to join the SST.</span>")
return