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

Fixes several midround antag assignments not asking ghosts first

Browse Source
This commit is contained in:
Tastyfish
2016-03-07 03:03:45 -05:00
parent 422a2e6ed4
commit 0e0225b1ee
20 changed files with 291 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spiders.dm
+10 -8
View File
@@ -111,6 +111,7 @@
var/player_spiders = 0
var/faction = list()
var/master_commander = null
var/selecting_player = 0
/obj/effect/spider/spiderling/New()
pixel_x = rand(6,-6)
@@ -197,15 +198,16 @@
var/mob/living/simple_animal/hostile/poison/giant_spider/S = new grow_as(src.loc)
S.faction = faction
S.master_commander = master_commander
if(player_spiders)
var/list/candidates = get_candidates(ROLE_ALIEN, ALIEN_AFK_BRACKET)
var/client/C = null
if(player_spiders && !selecting_player)
selecting_player = 1
spawn()
var/list/candidates = pollCandidates("Do you want to play as a spider?", ROLE_ALIEN, 1)
if(candidates.len)
C = pick(candidates)
S.key = C.key
if(master_commander)
S << "<span class='userdanger'>You are a spider who is loyal to [master_commander], obey [master_commander]'s every order and assist them in completing their goals at any cost.</span>"
if(candidates.len)
var/mob/C = pick(candidates)
S.key = C.key
if(master_commander)
S << "<span class='userdanger'>You are a spider who is loyal to [master_commander], obey [master_commander]'s every order and assist them in completing their goals at any cost.</span>"
qdel(src)
/obj/effect/decal/cleanable/spiderling_remains