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

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

Browse Source 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station.dm
#	icons/mob/screen_alert.dmi
This commit is contained in:
Markolie
2017-01-11 23:11:29 +01:00
parent 0adc370d55 2069ea0457
commit f85e8fe551
97 changed files with 1104 additions and 845 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spiders.dm
+1 -1
View File
@@ -201,7 +201,7 @@
if(player_spiders && !selecting_player)
selecting_player = 1
spawn()
var/list/candidates = pollCandidates("Do you want to play as a spider?", ROLE_ALIEN, 1)
var/list/candidates = pollCandidates("Do you want to play as a spider?", ROLE_GSPIDER, 1)
if(candidates.len)
var/mob/C = pick(candidates)