cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 02:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ports icons for Vents & Scrubbers (#18117)

Browse Source 
* pipes and holopad

* deconflict

* return all ye crusty holopads

* le merge conflicts

* farewell ye bonny lass

* adds frames for other things too
This commit is contained in:
S34N
2022-07-08 20:51:08 +01:00
committed by GitHub
parent dd4506f794
commit 17495c99f7
7 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
+2 -3
View File
@@ -84,9 +84,6 @@
if(!istype(T))
return
if(T.intact && node1 && node2 && node1.level == 1 && node2.level == 1 && istype(node1, /obj/machinery/atmospherics/pipe) && istype(node2, /obj/machinery/atmospherics/pipe))
vent_icon += "h"
if(!powered())
vent_icon += "off"
else
@@ -111,6 +108,8 @@
add_underlay(T, node2, dir, node2.icon_connect_type)
else
add_underlay(T, node2, dir)
var/icon/frame = icon('icons/atmos/vent_pump.dmi', "frame")
underlays += frame
/obj/machinery/atmospherics/binary/dp_vent_pump/process_atmos()
..()
code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm
+2
View File
@@ -67,3 +67,5 @@
if(!istype(T))
return
add_underlay(T, node, dir)
var/icon/frame = icon('icons/atmos/vent_pump.dmi', "frame")
underlays += frame
code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+3 -4
View File
@@ -94,9 +94,6 @@
if(!istype(T))
return
if(T.intact && node && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe))
vent_icon += "h"
if(welded)
vent_icon += "weld"
else if(!powered())
@@ -104,7 +101,7 @@
else
vent_icon += "[on ? "[pump_direction ? "out" : "in"]" : "off"]"
overlays += SSair.icon_manager.get_atmos_icon("device", , , vent_icon)
overlays += SSair.icon_manager.get_atmos_icon("device", state = vent_icon)
update_pipe_image()
@@ -121,6 +118,8 @@
add_underlay(T, node, dir, node.icon_connect_type)
else
add_underlay(T,, dir)
var/icon/frame = icon('icons/atmos/vent_pump.dmi', "frame")
underlays += frame
/obj/machinery/atmospherics/unary/vent_pump/hide()
update_icon()
code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
+9 -2
View File
@@ -1,6 +1,6 @@
/obj/machinery/atmospherics/unary/vent_scrubber
icon = 'icons/atmos/vent_scrubber.dmi'
icon_state = "map_scrubber"
icon_state = "map_scrubber_off"
req_one_access_txt = "24;10"
@@ -40,6 +40,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on
on = TRUE
icon_state = "map_scrubber"
/obj/machinery/atmospherics/unary/vent_scrubber/New()
..()
@@ -115,10 +116,13 @@
scrubber_icon += "off"
else
scrubber_icon += "[on ? "[scrubbing ? "on" : "in"]" : "off"]"
if(on && widenet)
scrubber_icon += "_expanded"
if(welded)
scrubber_icon = "scrubberweld"
overlays += SSair.icon_manager.get_atmos_icon("device", , , scrubber_icon)
overlays += SSair.icon_manager.get_atmos_icon("device", state = scrubber_icon)
update_pipe_image()
/obj/machinery/atmospherics/unary/vent_scrubber/update_underlays()
@@ -134,6 +138,9 @@
add_underlay(T, node, dir, node.icon_connect_type)
else
add_underlay(T,, dir)
var/icon/frame = icon('icons/atmos/vent_scrubber.dmi', "frame")
underlays += frame
/obj/machinery/atmospherics/unary/vent_scrubber/set_frequency(new_frequency)
SSradio.remove_object(src, frequency)