-Multiple fixes for machinery not correctly updating their icons when depowered.

-Gave request consoles an off sprite.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5421 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
giacomand@gmail.com
2012-12-30 02:20:03 +00:00
parent d99e8264e2
commit b9bb759cd8
17 changed files with 58 additions and 13 deletions

View File

@@ -12,7 +12,6 @@ Pipelines + Other Objects -> Pipe network
obj/machinery/atmospherics obj/machinery/atmospherics
anchored = 1 anchored = 1
use_power = 0
idle_power_usage = 0 idle_power_usage = 0
active_power_usage = 0 active_power_usage = 0
power_channel = ENVIRON power_channel = ENVIRON

View File

@@ -1,6 +1,7 @@
obj/machinery/atmospherics/binary obj/machinery/atmospherics/binary
dir = SOUTH dir = SOUTH
initialize_directions = SOUTH|NORTH initialize_directions = SOUTH|NORTH
use_power = 1
var/datum/gas_mixture/air1 var/datum/gas_mixture/air1
var/datum/gas_mixture/air2 var/datum/gas_mixture/air2

View File

@@ -15,7 +15,9 @@ obj/machinery/atmospherics/binary/passive_gate
var/datum/radio_frequency/radio_connection var/datum/radio_frequency/radio_connection
update_icon() update_icon()
if(node1&&node2) if(stat & NOPOWER)
icon_state = "intact_off"
else if(node1 && node2)
icon_state = "intact_[on?("on"):("off")]" icon_state = "intact_[on?("on"):("off")]"
else else
if(node1) if(node1)
@@ -24,8 +26,6 @@ obj/machinery/atmospherics/binary/passive_gate
icon_state = "exposed_2_off" icon_state = "exposed_2_off"
else else
icon_state = "exposed_3_off" icon_state = "exposed_3_off"
on = 0
return return
process() process()

View File

@@ -31,7 +31,9 @@ obj/machinery/atmospherics/binary/pump
icon_state = "intact_on" icon_state = "intact_on"
update_icon() update_icon()
if(node1&&node2) if(stat & NOPOWER)
icon_state = "intact_off"
else if(node1 && node2)
icon_state = "intact_[on?("on"):("off")]" icon_state = "intact_[on?("on"):("off")]"
else else
if(node1) if(node1)

View File

@@ -31,7 +31,9 @@ obj/machinery/atmospherics/binary/volume_pump
icon_state = "intact_on" icon_state = "intact_on"
update_icon() update_icon()
if(node1&&node2) if(stat & NOPOWER)
icon_state = "intact_off"
else if(node1 && node2)
icon_state = "intact_[on?("on"):("off")]" icon_state = "intact_[on?("on"):("off")]"
else else
if(node1) if(node1)

View File

@@ -15,7 +15,7 @@
var/datum/pipe_network/network var/datum/pipe_network/network
var/on = 0 var/on = 0
use_power = 0
level = 0 level = 0

View File

@@ -39,16 +39,21 @@ Filter types:
..() ..()
update_icon() update_icon()
if(node2 && node3 && node1) if(stat & NOPOWER)
icon_state = "intact_off"
else if(node2 && node3 && node1)
icon_state = "intact_[on?("on"):("off")]" icon_state = "intact_[on?("on"):("off")]"
else else
icon_state = "hintact_off" icon_state = "intact_off"
on = 0 on = 0
return return
New() power_change()
var/old_stat = stat
..() ..()
if(old_stat != stat)
update_icon()
process() process()
..() ..()

View File

@@ -16,7 +16,9 @@ obj/machinery/atmospherics/trinary/mixer
//node 3 is the outlet, nodes 1 & 2 are intakes //node 3 is the outlet, nodes 1 & 2 are intakes
update_icon() update_icon()
if(node2 && node3 && node1) if(stat & NOPOWER)
icon_state = "intact_off"
else if(node2 && node3 && node1)
icon_state = "intact_[on?("on"):("off")]" icon_state = "intact_[on?("on"):("off")]"
else else
icon_state = "intact_off" icon_state = "intact_off"
@@ -24,6 +26,12 @@ obj/machinery/atmospherics/trinary/mixer
return return
power_change()
var/old_stat = stat
..()
if(old_stat != stat)
update_icon()
New() New()
..() ..()
air3.volume = 300 air3.volume = 300

View File

@@ -1,6 +1,7 @@
obj/machinery/atmospherics/trinary obj/machinery/atmospherics/trinary
dir = SOUTH dir = SOUTH
initialize_directions = SOUTH|NORTH|WEST initialize_directions = SOUTH|NORTH|WEST
use_power = 1
var/datum/gas_mixture/air1 var/datum/gas_mixture/air1
var/datum/gas_mixture/air2 var/datum/gas_mixture/air2

View File

@@ -2,6 +2,7 @@
icon = 'icons/obj/atmospherics/cold_sink.dmi' icon = 'icons/obj/atmospherics/cold_sink.dmi'
icon_state = "intact_off" icon_state = "intact_off"
density = 1 density = 1
use_power = 1
name = "Cold Sink" name = "Cold Sink"
desc = "Cools gas when connected to pipe network" desc = "Cools gas when connected to pipe network"

View File

@@ -4,6 +4,7 @@
icon = 'icons/obj/atmospherics/cold_sink.dmi' icon = 'icons/obj/atmospherics/cold_sink.dmi'
icon_state = "intact_off" icon_state = "intact_off"
density = 1 density = 1
use_power = 1
name = "Heat Reservoir" name = "Heat Reservoir"
desc = "Heats gas when connected to pipe network" desc = "Heats gas when connected to pipe network"

View File

@@ -1,6 +1,7 @@
/obj/machinery/atmospherics/unary/outlet_injector /obj/machinery/atmospherics/unary/outlet_injector
icon = 'icons/obj/atmospherics/outlet_injector.dmi' icon = 'icons/obj/atmospherics/outlet_injector.dmi'
icon_state = "off" icon_state = "off"
use_power = 1
name = "Air Injector" name = "Air Injector"
desc = "Has a valve and pump attached to it" desc = "Has a valve and pump attached to it"
@@ -18,7 +19,7 @@
update_icon() update_icon()
if(node) if(node)
if(on) if(on && !(stat & NOPOWER))
icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]on" icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]on"
else else
icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]off" icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]off"
@@ -28,11 +29,18 @@
return return
power_change()
var/old_stat = stat
..()
if(old_stat != stat)
update_icon()
process() process()
..() ..()
injecting = 0 injecting = 0
if(!on) if(!on || stat & NOPOWER)
return 0 return 0
if(air_contents.temperature > 0) if(air_contents.temperature > 0)

View File

@@ -4,6 +4,7 @@
name = "Air Vent" name = "Air Vent"
desc = "Has a valve and pump attached to it" desc = "Has a valve and pump attached to it"
use_power = 1
var/area/initial_loc var/area/initial_loc
level = 1 level = 1

View File

@@ -4,6 +4,7 @@
name = "Air Scrubber" name = "Air Scrubber"
desc = "Has a valve and pump attached to it" desc = "Has a valve and pump attached to it"
use_power = 1
level = 1 level = 1

View File

@@ -7,6 +7,7 @@ obj/machinery/atmospherics/pipe
force = 20 force = 20
layer = 2.4 //under wires with their 2.44 layer = 2.4 //under wires with their 2.44
use_power = 0
var/alert_pressure = 80*ONE_ATMOSPHERE var/alert_pressure = 80*ONE_ATMOSPHERE
//minimum pressure before check_pressure(...) should be called //minimum pressure before check_pressure(...) should be called

View File

@@ -56,6 +56,18 @@ var/list/obj/machinery/requests_console/allConsoles = list()
var/priority = -1 ; //Priority of the message being sent var/priority = -1 ; //Priority of the message being sent
luminosity = 0 luminosity = 0
/obj/machinery/requests_console/power_change()
..()
update_icon()
/obj/machinery/requests_console/update_icon()
if(stat & NOPOWER)
if(icon_state != "req_comp_off")
icon_state = "req_comp_off"
else
if(icon_state == "req_comp_off")
icon_state = "req_comp0"
/obj/machinery/requests_console/New() /obj/machinery/requests_console/New()
name = "[department] Requests Console" name = "[department] Requests Console"
allConsoles += src allConsoles += src
@@ -95,6 +107,8 @@ var/list/obj/machinery/requests_console/allConsoles = list()
/obj/machinery/requests_console/attack_hand(user as mob) /obj/machinery/requests_console/attack_hand(user as mob)
if(..(user))
return
var/dat var/dat
dat = text("<HEAD><TITLE>Requests Console</TITLE></HEAD><H3>[department] Requests Console</H3>") dat = text("<HEAD><TITLE>Requests Console</TITLE></HEAD><H3>[department] Requests Console</H3>")
if(!open) if(!open)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 18 KiB