cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38451 from AutomaticFrenzy/patch/antag-nullspace

Browse Source 
Fix some nullspacing bugs with antag spawners
This commit is contained in:
Jordan Brown
2018-06-14 15:27:19 -04:00
committed by yogstation13-bot
parent aff95b99af
commit 78af4ad125
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/antagonists/_common/antag_spawner.dm
View File

@@ -58,6 +58,8 @@
return return
var/list/candidates = pollCandidatesForMob("Do you want to play as a wizard's [href_list["school"]] apprentice?", ROLE_WIZARD, null, ROLE_WIZARD, 150, src) var/list/candidates = pollCandidatesForMob("Do you want to play as a wizard's [href_list["school"]] apprentice?", ROLE_WIZARD, null, ROLE_WIZARD, 150, src)
if(LAZYLEN(candidates)) if(LAZYLEN(candidates))
if(QDELETED(src))
return
if(used) if(used)
to_chat(H, "You already used this contract!") to_chat(H, "You already used this contract!")
return return
@@ -121,7 +123,7 @@
to_chat(user, "<span class='notice'>You activate [src] and wait for confirmation.</span>") to_chat(user, "<span class='notice'>You activate [src] and wait for confirmation.</span>")
var/list/nuke_candidates = pollGhostCandidates("Do you want to play as a syndicate [borg_to_spawn ? "[lowertext(borg_to_spawn)] cyborg":"operative"]?", ROLE_OPERATIVE, null, ROLE_OPERATIVE, 150, POLL_IGNORE_SYNDICATE) var/list/nuke_candidates = pollGhostCandidates("Do you want to play as a syndicate [borg_to_spawn ? "[lowertext(borg_to_spawn)] cyborg":"operative"]?", ROLE_OPERATIVE, null, ROLE_OPERATIVE, 150, POLL_IGNORE_SYNDICATE)
if(LAZYLEN(nuke_candidates)) if(LAZYLEN(nuke_candidates))
if(!(check_usability(user))) if(QDELETED(src) || !check_usability(user))
return return
used = TRUE used = TRUE
var/mob/dead/observer/G = pick(nuke_candidates) var/mob/dead/observer/G = pick(nuke_candidates)
@@ -235,7 +237,7 @@
return return
var/list/candidates = pollCandidatesForMob("Do you want to play as a [initial(demon_type.name)]?", ROLE_ALIEN, null, ROLE_ALIEN, 50, src) var/list/candidates = pollCandidatesForMob("Do you want to play as a [initial(demon_type.name)]?", ROLE_ALIEN, null, ROLE_ALIEN, 50, src)
if(LAZYLEN(candidates)) if(LAZYLEN(candidates))
if(used) if(used || QDELETED(src))
return return
used = TRUE used = TRUE
var/mob/dead/observer/C = pick(candidates) var/mob/dead/observer/C = pick(candidates)