shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304)

Browse Source
This commit is contained in:
CitadelStationBot
2018-02-05 04:23:09 -06:00
committed by Poojawa
parent 03b33075e5
commit 9e229691cc
73 changed files with 196 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/abductor.dm
+1 -1
View File
@@ -12,7 +12,7 @@
fakeable = FALSE //Nothing to fake here
/datum/round_event/ghost_role/abductor/spawn_role()
var/list/mob/dead/observer/candidates = get_candidates("abductor", null, ROLE_ABDUCTOR)
var/list/mob/dead/observer/candidates = get_candidates(ROLE_ABDUCTOR, null, ROLE_ABDUCTOR)
if(candidates.len < 2)
return NOT_ENOUGH_PLAYERS
code/modules/events/alien_infestation.dm
+1 -1
View File
@@ -51,7 +51,7 @@
message_admins("An event attempted to spawn an alien but no suitable vents were found. Shutting down.")
return MAP_ERROR
var/list/candidates = get_candidates("alien", null, ROLE_ALIEN)
var/list/candidates = get_candidates(ROLE_ALIEN, null, ROLE_ALIEN)
if(!candidates.len)
return NOT_ENOUGH_PLAYERS
code/modules/events/blob.dm
+1 -1
View File
@@ -19,7 +19,7 @@
/datum/round_event/ghost_role/blob/spawn_role()
if(!GLOB.blobstart.len)
return MAP_ERROR
var/list/candidates = get_candidates("blob", null, ROLE_BLOB)
var/list/candidates = get_candidates(ROLE_BLOB, null, ROLE_BLOB)
if(!candidates.len)
return NOT_ENOUGH_PLAYERS
var/mob/dead/observer/new_blob = pick(candidates)
code/modules/events/devil.dm
+3 -3
View File
@@ -19,7 +19,7 @@
return MAP_ERROR
//selecting a candidate player
var/list/candidates = get_candidates("devil", null, ROLE_DEVIL)
var/list/candidates = get_candidates(ROLE_DEVIL, null, ROLE_DEVIL)
if(!candidates.len)
return NOT_ENOUGH_PLAYERS
@@ -53,7 +53,7 @@
/proc/create_devil_mind(key)
var/datum/mind/Mind = new /datum/mind(key)
Mind.assigned_role = "devil"
Mind.special_role = "devil"
Mind.assigned_role = ROLE_DEVIL
Mind.special_role = ROLE_DEVIL
SSticker.mode.devils |= Mind
return Mind
code/modules/events/holiday/xmas.dm
+2 -3
View File
@@ -75,10 +75,9 @@
/datum/round_event/santa/start()
var/list/candidates = pollGhostCandidates("Santa is coming to town! Do you want to be Santa?", poll_time=150)
if(LAZYLEN(candidates))
var/mob/dead/observer/Z = pick(candidates)
var/client/C = pick(candidates)
santa = new /mob/living/carbon/human(pick(GLOB.blobstart))
santa.key = Z.key
qdel(Z)
santa.key = C.key
santa.equipOutfit(/datum/outfit/santa)
santa.update_icons()
code/modules/events/nightmare.dm
+1 -1
View File
@@ -10,7 +10,7 @@
fakeable = FALSE
/datum/round_event/ghost_role/nightmare/spawn_role()
var/list/candidates = get_candidates("alien", null, ROLE_ALIEN)
var/list/candidates = get_candidates(ROLE_ALIEN, null, ROLE_ALIEN)
if(!candidates.len)
return NOT_ENOUGH_PLAYERS
code/modules/events/operative.dm
+1 -1
View File
@@ -10,7 +10,7 @@
fakeable = FALSE
/datum/round_event/ghost_role/operative/spawn_role()
var/list/candidates = get_candidates("operative", null, ROLE_OPERATIVE)
var/list/candidates = get_candidates(ROLE_OPERATIVE, null, ROLE_OPERATIVE)
if(!candidates.len)
return NOT_ENOUGH_PLAYERS