From cc79346c3b70881d655a80224c14d4deda51c0bf Mon Sep 17 00:00:00 2001 From: Ater Ignis Date: Fri, 16 Nov 2012 16:02:36 +0400 Subject: [PATCH] forgot one row --- baystation12.dme | 2 +- code/modules/mob/living/carbon/human/life.dm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/baystation12.dme b/baystation12.dme index 1c5182a856f..5ab7609868a 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -237,6 +237,7 @@ #define FILE_DIR "icons/mecha" #define FILE_DIR "icons/misc" #define FILE_DIR "icons/mob" +#define FILE_DIR "icons/mob/human_races" #define FILE_DIR "icons/obj" #define FILE_DIR "icons/obj/assemblies" #define FILE_DIR "icons/obj/atmospherics" @@ -252,7 +253,6 @@ #define FILE_DIR "icons/vending_icons" #define FILE_DIR "interface" #define FILE_DIR "maps" -#define FILE_DIR "maps/backup" #define FILE_DIR "maps/RandomZLevels" #define FILE_DIR "sound" #define FILE_DIR "sound/AI" diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 851ab7e435a..599b262c2bc 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1475,6 +1475,7 @@ if(!machine.check_eye(src)) reset_view(null) else if(!(remoteview_target && mRemote in mutations && remoteview_target.stat==CONSCIOUS) && !client.adminobs) + remoteview_target = null reset_view(null) return 1