cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 06:22:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Door bolt lights and alarming emergency shutters now glow.

Browse Source
This commit is contained in:
PsiOmegaDelta
2015-12-30 20:32:14 +01:00
parent 8edf5cebc5
commit 6ff99e2bd7
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__defines/misc.dm
+2
View File
@@ -68,6 +68,7 @@
#define COLOR_GRAY "#808080"
#define COLOR_BLACK "#000000"
#define COLOR_RED "#ff0000"
#define COLOR_RED_LIGHT "#ff3333"
#define COLOR_MAROON "#800000"
#define COLOR_YELLOW "#ffff00"
#define COLOR_OLIVE "#808000"
@@ -94,6 +95,7 @@
#define COLOR_PALE_RED_GRAY "#cc9090"
#define COLOR_PALE_PURPLE_GRAY "#bda2ba"
#define COLOR_PURPLE_GRAY "#a2819e"
#define COLOR_SUN "#ec8b2f"
// Shuttles.
code/game/machinery/alarm.dm
+4 -4
View File
@@ -321,7 +321,7 @@
new_color = "#03A728"
if (1)
icon_state = "alarm2" //yes, alarm2 is yellow alarm
new_color = "#EC8B2F"
new_color = COLOR_SUN
if (2)
icon_state = "alarm1"
new_color = "#DA0205"
@@ -901,13 +901,13 @@ FIRE ALARM
else
if(!src.detecting)
icon_state = "fire1"
set_light(l_range = 4, l_power = 2, l_color = "#ff0000")
set_light(l_range = 4, l_power = 2, l_color = COLOR_RED)
else
icon_state = "fire0"
switch(seclevel)
if("green") set_light(l_range = 2, l_power = 0.5, l_color = "#00ff00")
if("green") set_light(l_range = 2, l_power = 0.5, l_color = COLOR_LIME)
if("blue") set_light(l_range = 2, l_power = 0.5, l_color = "#1024A9")
if("red") set_light(l_range = 4, l_power = 2, l_color = "#ff0000")
if("red") set_light(l_range = 4, l_power = 2, l_color = COLOR_RED)
if("delta") set_light(l_range = 4, l_power = 2, l_color = "#FF6633")
src.overlays += image('icons/obj/monitors.dmi', "overlay_[seclevel]")
code/game/machinery/doors/airlock.dm
+2
View File
@@ -486,10 +486,12 @@ About the new airlock wires panel:
/obj/machinery/door/airlock/update_icon()
set_light(0)
if(overlays) overlays.Cut()
if(density)
if(locked && lights && src.arePowerSystemsOn())
icon_state = "door_locked"
set_light(1.5, 0.5, COLOR_RED_LIGHT)
else
icon_state = "door_closed"
if(p_open || welded)
code/game/machinery/doors/firedoor.dm
+8 -1
View File
@@ -363,6 +363,9 @@
/obj/machinery/door/firedoor/update_icon()
overlays.Cut()
set_light(0)
var/do_set_light = FALSE
if(density)
icon_state = "door_closed"
if(hatch_open)
@@ -371,17 +374,21 @@
overlays += "welded"
if(pdiff_alert)
overlays += "palert"
do_set_light = TRUE
if(dir_alerts)
for(var/d=1;d<=4;d++)
var/cdir = cardinal[d]
for(var/i=1;i<=ALERT_STATES.len;i++)
if(dir_alerts[d] & (1<<(i-1)))
overlays += new/icon(icon,"alert_[ALERT_STATES[i]]", dir=cdir)
do_set_light = TRUE
else
icon_state = "door_open"
if(blocked)
overlays += "welded_open"
return
if(do_set_light)
set_light(1.5, 0.5, COLOR_SUN)
//These are playing merry hell on ZAS. Sorry fellas :(