From a36ec06fc2cb037870ef680fe99eee31fea6efbe Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Fri, 1 Apr 2016 14:20:17 -0700 Subject: [PATCH] First 510 merge fixes --- code/modules/mob/living/life.dm | 2 +- paradise.dme | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index 1b71e7eddd2..ebbda839e52 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -193,7 +193,7 @@ return if(blinded || eye_blind) overlay_fullscreen("blind", /obj/screen/fullscreen/blind) - //throw_laert("blind", /obj/screen/alert/blind) + //throw_alert("blind", /obj/screen/alert/blind) else clear_fullscreen("blind") //clear_alert("blind") diff --git a/paradise.dme b/paradise.dme index 765fb6f0b93..3770d786f1a 100644 --- a/paradise.dme +++ b/paradise.dme @@ -174,7 +174,6 @@ #include "code\controllers\Processes\ticker.dm" #include "code\controllers\Processes\timer.dm" #include "code\controllers\Processes\vote.dm" -#include "code\controllers\ProcessScheduler\core\_stubs.dm" #include "code\controllers\ProcessScheduler\core\process.dm" #include "code\controllers\ProcessScheduler\core\processScheduler.dm" #include "code\datums\ai_law_sets.dm"