Constant fix.

This commit is contained in:
PsiOmegaDelta
2015-09-19 20:54:43 +02:00
parent fa6799ec3a
commit 59f7b889d4
+29 -29
View File
@@ -1,12 +1,12 @@
//update_state
#define UPSTATE_CELL_IN 1
#define UPSTATE_OPENED1 2
#define UPSTATE_OPENED2 4
#define UPSTATE_MAINT 8
#define UPSTATE_BROKE 16
#define UPSTATE_BLUESCREEN 32
#define UPSTATE_WIREEXP 64
#define UPSTATE_ALLGOOD 128
#define UPDATE_CELL_IN 1
#define UPDATE_OPENED1 2
#define UPDATE_OPENED2 4
#define UPDATE_MAINT 8
#define UPDATE_BROKE 16
#define UPDATE_BLUESCREEN 32
#define UPDATE_WIREEXP 64
#define UPDATE_ALLGOOD 128
//update_overlay
#define APC_UPOVERLAY_CHARGEING0 1
@@ -288,25 +288,25 @@
return
if(update & 1) // Updating the icon state
if(update_state & UPSTATE_ALLGOOD)
if(update_state & UPDATE_ALLGOOD)
icon_state = "apc0"
else if(update_state & (UPSTATE_OPENED1|UPSTATE_OPENED2))
else if(update_state & (UPDATE_OPENED1|UPDATE_OPENED2))
var/basestate = "apc[ cell ? "2" : "1" ]"
if(update_state & UPSTATE_OPENED1)
if(update_state & (UPSTATE_MAINT|UPSTATE_BROKE))
if(update_state & UPDATE_OPENED1)
if(update_state & (UPDATE_MAINT|UPDATE_BROKE))
icon_state = "apcmaint" //disabled APC cannot hold cell
else
icon_state = basestate
else if(update_state & UPSTATE_OPENED2)
else if(update_state & UPDATE_OPENED2)
icon_state = "[basestate]-nocover"
else if(update_state & UPSTATE_BROKE)
else if(update_state & UPDATE_BROKE)
icon_state = "apc-b"
else if(update_state & UPSTATE_BLUESCREEN)
else if(update_state & UPDATE_BLUESCREEN)
icon_state = "apcemag"
else if(update_state & UPSTATE_WIREEXP)
else if(update_state & UPDATE_WIREEXP)
icon_state = "apcewires"
if(!(update_state & UPSTATE_ALLGOOD))
if(!(update_state & UPDATE_ALLGOOD))
if(overlays.len)
overlays = 0
return
@@ -314,7 +314,7 @@
if(update & 2)
if(overlays.len)
overlays.len = 0
if(!(stat & (BROKEN|MAINT)) && update_state & UPSTATE_ALLGOOD)
if(!(stat & (BROKEN|MAINT)) && update_state & UPDATE_ALLGOOD)
overlays += status_overlays_lock[locked+1]
overlays += status_overlays_charging[charging+1]
if(operating)
@@ -323,9 +323,9 @@
overlays += status_overlays_environ[environ+1]
if(update & 3)
if(update_state & UPSTATE_BLUESCREEN)
if(update_state & UPDATE_BLUESCREEN)
set_light(l_range = 2, l_power = 0.5, l_color = "#0000FF")
else if(!(stat & (BROKEN|MAINT)) && update_state & UPSTATE_ALLGOOD)
else if(!(stat & (BROKEN|MAINT)) && update_state & UPDATE_ALLGOOD)
var/color
switch(charging)
if(0)
@@ -346,27 +346,27 @@
update_overlay = 0
if(cell)
update_state |= UPSTATE_CELL_IN
update_state |= UPDATE_CELL_IN
if(stat & BROKEN)
update_state |= UPSTATE_BROKE
update_state |= UPDATE_BROKE
if(stat & MAINT)
update_state |= UPSTATE_MAINT
update_state |= UPDATE_MAINT
if(opened)
if(opened==1)
update_state |= UPSTATE_OPENED1
update_state |= UPDATE_OPENED1
if(opened==2)
update_state |= UPSTATE_OPENED2
update_state |= UPDATE_OPENED2
else if(emagged || hacker)
update_state |= UPSTATE_BLUESCREEN
update_state |= UPDATE_BLUESCREEN
else if(wiresexposed)
update_state |= UPSTATE_WIREEXP
update_state |= UPDATE_WIREEXP
if(update_state <= 1)
update_state |= UPSTATE_ALLGOOD
update_state |= UPDATE_ALLGOOD
if(operating)
update_overlay |= APC_UPOVERLAY_OPERATING
if(update_state & UPSTATE_ALLGOOD)
if(update_state & UPDATE_ALLGOOD)
if(locked)
update_overlay |= APC_UPOVERLAY_LOCKED