Atmos update tweaks

- Updated pump and volume pump icons
- Reverted air scrubber icon
- Fixed passive gate icon
- Updated pipe_item sprites
- Fixed an oversight in the pipe color check
- Cleaned up the map
This commit is contained in:
Loganbacca
2014-07-16 21:37:43 +12:00
committed by Mloc-Hibernia
parent e05b5c0bfb
commit fb6c928c4d
11 changed files with 774 additions and 779 deletions

View File

@@ -22,6 +22,8 @@ var/global/list/pipe_colors = list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_
return "[C]" return "[C]"
/proc/pipe_color_check(var/color) /proc/pipe_color_check(var/color)
if(!color)
return 1
for(var/C in pipe_colors) for(var/C in pipe_colors)
if(color == pipe_colors[C]) if(color == pipe_colors[C])
return 1 return 1

View File

@@ -9,7 +9,6 @@ Pipes -> Pipelines
Pipelines + Other Objects -> Pipe network Pipelines + Other Objects -> Pipe network
*/ */
/obj/machinery/atmospherics /obj/machinery/atmospherics
anchored = 1 anchored = 1
idle_power_usage = 0 idle_power_usage = 0

View File

@@ -14,7 +14,7 @@ Thus, the two variables affect pump operation are set in New():
/obj/machinery/atmospherics/binary/pump /obj/machinery/atmospherics/binary/pump
icon = 'icons/atmos/pump.dmi' icon = 'icons/atmos/pump.dmi'
icon_state = "map" icon_state = "map_off"
level = 1 level = 1
name = "Gas pump" name = "Gas pump"
@@ -34,6 +34,7 @@ Thus, the two variables affect pump operation are set in New():
target_pressure = 15000000 target_pressure = 15000000
/obj/machinery/atmospherics/binary/pump/on /obj/machinery/atmospherics/binary/pump/on
icon_state = "map_on"
on = 1 on = 1
/obj/machinery/atmospherics/binary/pump/update_icon() /obj/machinery/atmospherics/binary/pump/update_icon()

View File

@@ -14,7 +14,7 @@ Thus, the two variables affect pump operation are set in New():
/obj/machinery/atmospherics/binary/volume_pump /obj/machinery/atmospherics/binary/volume_pump
icon = 'icons/atmos/volume_pump.dmi' icon = 'icons/atmos/volume_pump.dmi'
icon_state = "map" icon_state = "map_off"
level = 1 level = 1
name = "Volumetric gas pump" name = "Volumetric gas pump"
@@ -29,6 +29,7 @@ Thus, the two variables affect pump operation are set in New():
/obj/machinery/atmospherics/binary/volume_pump/on /obj/machinery/atmospherics/binary/volume_pump/on
on = 1 on = 1
icon_state = "map_on"
/obj/machinery/atmospherics/binary/volume_pump/update_icon() /obj/machinery/atmospherics/binary/volume_pump/update_icon()
if(!powered()) if(!powered())

View File

@@ -52,9 +52,6 @@
if(!istype(T)) if(!istype(T))
return return
if(T.intact && node && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe))
scrubber_icon += "h"
if(!powered()) if(!powered())
scrubber_icon += "off" scrubber_icon += "off"
else else

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

File diff suppressed because it is too large Load Diff