April sync (#360)
* Maps and things no code/icons * helpers defines globalvars * Onclick world.dm orphaned_procs * subsystems Round vote and shuttle autocall done here too * datums * Game folder * Admin - chatter modules * clothing - mining * modular computers - zambies * client * mob level 1 * mob stage 2 + simple_animal * silicons n brains * mob stage 3 + Alien/Monkey * human mobs * icons updated * some sounds * emitter y u no commit * update tgstation.dme * compile fixes * travis fixes Also removes Fast digest mode, because reasons. * tweaks for travis Mentors are broke again Also fixes Sizeray guns * oxygen loss fix for vore code. * removes unused code * some code updates * bulk fixes * further fixes * outside things * whoops. * Maint bar ported * GLOBs.
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
|
||||
/datum/round_event/ghost_role/devil/spawn_role()
|
||||
//selecting a spawn_loc
|
||||
var/list/spawn_locs = latejoin
|
||||
var/list/spawn_locs = GLOB.latejoin
|
||||
var/spawn_loc = pick(spawn_locs)
|
||||
if(!spawn_loc)
|
||||
return MAP_ERROR
|
||||
@@ -32,8 +32,8 @@
|
||||
|
||||
var/mob/living/carbon/human/devil = create_event_devil(spawn_loc)
|
||||
Mind.transfer_to(devil)
|
||||
ticker.mode.finalize_devil(Mind, FALSE)
|
||||
ticker.mode.add_devil_objectives(src, 2)
|
||||
SSticker.mode.finalize_devil(Mind, FALSE)
|
||||
SSticker.mode.add_devil_objectives(src, 2)
|
||||
Mind.announceDevilLaws()
|
||||
Mind.announce_objectives()
|
||||
|
||||
@@ -58,5 +58,5 @@
|
||||
var/datum/mind/Mind = new /datum/mind(key)
|
||||
Mind.assigned_role = "devil"
|
||||
Mind.special_role = "devil"
|
||||
ticker.mode.devils |= Mind
|
||||
SSticker.mode.devils |= Mind
|
||||
return Mind
|
||||
|
||||
Reference in New Issue
Block a user