cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactors the latejoin list

Browse Source
This commit is contained in:
CitadelStationBot
2017-06-04 15:08:35 -05:00
parent 94405f5176
commit e8663bee81
15 changed files with 86 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/events/devil.dm
View File

@@ -14,9 +14,7 @@
/datum/round_event/ghost_role/devil/spawn_role()
//selecting a spawn_loc
var/list/spawn_locs = GLOB.latejoin
var/spawn_loc = pick(spawn_locs)
if(!spawn_loc)
if(!SSjob.latejoin_trackers.len)
return MAP_ERROR
//selecting a candidate player
@@ -45,6 +43,8 @@
/proc/create_event_devil(spawn_loc)
var/mob/living/carbon/human/new_devil = new(spawn_loc)
if(!spawn_loc)
SSjob.SendToLateJoin(new_devil)
var/datum/preferences/A = new() //Randomize appearance for the devil.
A.copy_to(new_devil)
new_devil.dna.update_dna_identity()

10
code/modules/events/devil.dm.rej Normal file
View File

@@ -0,0 +1,10 @@
diff a/code/modules/events/devil.dm b/code/modules/events/devil.dm (rejected hunks)
@@ -30,7 +28,7 @@
var/datum/mind/Mind = create_devil_mind(key)
Mind.active = 1
- var/mob/living/carbon/human/devil = create_event_devil(spawn_loc)
+ var/mob/living/carbon/human/devil = create_event_devil()
Mind.transfer_to(devil)
SSticker.mode.finalize_devil(Mind, FALSE)
SSticker.mode.add_devil_objectives(src, 2)