From be9ea0b5404ceaecdaa4c92d40b1cf8641d8bc4c Mon Sep 17 00:00:00 2001 From: Markolie Date: Sun, 2 Aug 2015 19:20:37 +0200 Subject: [PATCH] Alarm system tweaks --- code/game/area/areas.dm | 18 +++--------------- code/game/machinery/computer/atmos_alert.dm | 4 ++-- code/game/machinery/computer/atmos_control.dm | 2 +- code/game/machinery/computer/station_alert.dm | 5 ++--- code/modules/mob/living/silicon/ai/ai.dm | 2 +- .../mob/living/silicon/robot/robot_modules.dm | 1 - code/modules/mob/living/silicon/silicon.dm | 2 +- nano/css/shared.css | 6 ++---- 8 files changed, 12 insertions(+), 28 deletions(-) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 83c9924fe43..dbd33c9ca64 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -99,26 +99,14 @@ fire = 1 //used for firedoor checks updateicon() mouse_opacity = 0 - for(var/obj/machinery/door/firedoor/D in all_doors) - if(!D.blocked) - if(D.operating) - D.nextstate = CLOSED - else if(!D.density) - spawn() - D.close() + air_doors_close() /area/proc/fire_reset() if (fire) fire = 0 //used for firedoor checks updateicon() mouse_opacity = 0 - for(var/obj/machinery/door/firedoor/D in all_doors) - if(!D.blocked) - if(D.operating) - D.nextstate = OPEN - else if(D.density) - spawn(0) - D.open() + air_doors_open() /area/proc/readyalert() if(!eject) @@ -162,7 +150,7 @@ D.nextstate = OPEN else if(D.density) spawn(0) - D.open() + D.open() return /area/proc/updateicon() diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index cb43587eb56..2ef07f0eac4 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -10,7 +10,7 @@ var/global/list/minor_air_alarms = list() circuit = "/obj/item/weapon/circuitboard/atmos_alert" icon_keyboard = "atmos_key" icon_screen = "alert:0" - light_color = "#e6ffff" + light_color = LIGHT_COLOR_CYAN /obj/machinery/computer/atmos_alert/New() ..() @@ -18,7 +18,7 @@ var/global/list/minor_air_alarms = list() /obj/machinery/computer/atmos_alert/Destroy() atmosphere_alarm.unregister(src) - ..() + return ..() /obj/machinery/computer/atmos_alert/attack_hand(mob/user) ui_interact(user) diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index c57cccc16f7..3c0b46e6813 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/computer.dmi' icon_keyboard = "atmos_key" icon_screen = "tank" - light_color = "#00b000" + light_color = LIGHT_COLOR_GREEN density = 1 anchored = 1.0 circuit = /obj/item/weapon/circuitboard/atmoscontrol diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index e9b887ce0b3..c16cc38f1d2 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -4,6 +4,7 @@ desc = "Used to access the station's automated alert system." icon_keyboard = "tech_key" icon_screen = "alert:0" + light_color = LIGHT_COLOR_CYAN circuit = /obj/item/weapon/circuitboard/stationalert_engineering var/datum/nano_module/alarm_monitor/alarm_monitor var/monitor_type = /datum/nano_module/alarm_monitor/engineering @@ -24,21 +25,19 @@ /obj/machinery/computer/station_alert/Destroy() alarm_monitor.unregister(src) qdel(alarm_monitor) - ..() + return ..() /obj/machinery/computer/station_alert/attack_ai(mob/user) add_fingerprint(user) if(stat & (BROKEN|NOPOWER)) return interact(user) - return /obj/machinery/computer/station_alert/attack_hand(mob/user) add_fingerprint(user) if(stat & (BROKEN|NOPOWER)) return interact(user) - return /obj/machinery/computer/station_alert/interact(mob/user) alarm_monitor.ui_interact(user) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 0253d32cc88..7c78b5ce604 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -23,7 +23,7 @@ var/list/ai_verbs_default = list( /mob/living/silicon/ai/proc/toggle_acceleration, /mob/living/silicon/ai/proc/toggle_camera_light, /mob/living/silicon/ai/proc/botcall, - /mob/living/silicon/ai/proc/change_arrival_message, + /mob/living/silicon/ai/proc/change_arrival_message ) //Not sure why this is necessary... diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 1bf11d310ee..13780588e7f 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -30,7 +30,6 @@ src.modules += new /obj/item/device/flash/cyborg(src) src.emag = new /obj/item/toy/sword(src) src.emag.name = "Placeholder Emag Item" - return /obj/item/weapon/robot_module/proc/respawn_consumable(var/mob/living/silicon/robot/R) if(!stacktypes || !stacktypes.len) return diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 5d8c6c7ef03..d7657f44cc6 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -35,7 +35,7 @@ /mob/living/silicon/Destroy() for(var/datum/alarm_handler/AH in alarm_manager.all_handlers) AH.unregister(src) - ..() + return ..() /mob/living/silicon/proc/show_laws() return diff --git a/nano/css/shared.css b/nano/css/shared.css index a4e2e37e485..861fd9e165c 100644 --- a/nano/css/shared.css +++ b/nano/css/shared.css @@ -272,11 +272,9 @@ div.notice { width: 69%; } -+.itemLabelWidest { - float: left; +.itemLabelWidest { width: 100%; - color: #e9c183; -+} +} .itemContentWide { float: left;