From 8947709afd6e598233624bac5c7215676d424f04 Mon Sep 17 00:00:00 2001 From: Markolie Date: Sat, 12 Sep 2015 18:30:39 +0200 Subject: [PATCH] Fixes --- code/game/machinery/alarm.dm | 4 ++-- code/modules/mob/dead/observer/observer.dm | 14 +++----------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 960b57edacd..d65fb9b3c7d 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -978,9 +978,9 @@ var/max_temperature = min(selected.max1 - T0C, MAX_TEMPERATURE) var/min_temperature = max(selected.min1 - T0C, MIN_TEMPERATURE) var/input_temperature = input("What temperature would you like the system to maintain? (Capped between [min_temperature]C and [max_temperature]C)", "Thermostat Controls") as num|null - if(input_temperature==null || ..(href, href_list, nowindow, state)) + if(isnull(input_temperature) || ..(href, href_list, nowindow, state)) return - if(!input_temperature || input_temperature > max_temperature || input_temperature < min_temperature) + if(input_temperature > max_temperature || input_temperature < min_temperature) usr << "Temperature must be between [min_temperature]C and [max_temperature]C" else target_temperature = input_temperature + T0C diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 17e67c89b8a..f3e9de12dab 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -142,18 +142,10 @@ Works together with spawning an observer, noted above. var/client/C = U.client for(var/mob/living/carbon/human/target in target_list) C.images += target.hud_list[SPECIALROLE_HUD] - C.images += target.hud_list[NATIONS_HUD] + C.images += target.hud_list[NATIONS_HUD] // ??? THE SNOWFLAKE IS KILLING ME + for(var/mob/living/silicon/target in target_list) + C.images += target.hud_list[SPECIALROLE_HUD] - -/* - else//If the silicon mob has no law datum, no inherent laws, or a law zero, add them to the hud. - var/mob/living/silicon/silicon_target = target - if(!silicon_target.laws||(silicon_target.laws&&(silicon_target.laws.zeroth||!silicon_target.laws.inherent.len))||silicon_target.mind.special_role=="traitor") - if(isrobot(silicon_target))//Different icons for robutts and AI. - U.client.images += image(tempHud,silicon_target,"hudmalborg") - else - U.client.images += image(tempHud,silicon_target,"hudmalai") -*/ return 1 /mob/proc/ghostize(var/flags = GHOST_CAN_REENTER)