Alarm system tweaks

This commit is contained in:
Markolie
2015-08-02 19:20:37 +02:00
parent 73e94b5dc4
commit be9ea0b540
8 changed files with 12 additions and 28 deletions
+3 -15
View File
@@ -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()
+2 -2
View File
@@ -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)
@@ -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
@@ -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)
+1 -1
View File
@@ -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...
@@ -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
+1 -1
View File
@@ -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
+2 -4
View File
@@ -272,11 +272,9 @@ div.notice {
width: 69%;
}
+.itemLabelWidest {
float: left;
.itemLabelWidest {
width: 100%;
color: #e9c183;
+}
}
.itemContentWide {
float: left;