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

Merge branch 'ambientocclusion' of https://github.com/Markolie/Paradise into lighting

Browse Source
This commit is contained in:
Mark van Alphen
2019-04-22 18:52:55 +02:00
parent d9d975a91f a3bd9e1bb4
commit c4dc5ecd3d
68 changed files with 310 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/components/binary_devices/circulator.dm
+2
View File
@@ -112,6 +112,8 @@
..()
/obj/machinery/atmospherics/binary/circulator/update_icon()
..()
if(stat & (BROKEN|NOPOWER))
icon_state = "circ[side]-p"
else if(last_pressure_delta > 0)
code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
+2
View File
@@ -71,6 +71,8 @@
add_underlay(T, node2, dir)
/obj/machinery/atmospherics/binary/dp_vent_pump/update_icon(var/safety = 0)
..()
if(!check_icon_cache())
return
code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+1
View File
@@ -28,6 +28,7 @@
return ..()
/obj/machinery/atmospherics/binary/passive_gate/update_icon()
..()
icon_state = "[on ? "on" : "off"]"
/obj/machinery/atmospherics/binary/passive_gate/update_underlays()
code/ATMOSPHERICS/components/binary_devices/pump.dm
+2
View File
@@ -39,6 +39,8 @@ Thus, the two variables affect pump operation are set in New():
on = 1
/obj/machinery/atmospherics/binary/pump/update_icon()
..()
if(!powered())
icon_state = "off"
else
code/ATMOSPHERICS/components/binary_devices/valve.dm
+2
View File
@@ -16,6 +16,8 @@
icon_state = "map_valve1"
/obj/machinery/atmospherics/binary/valve/update_icon(animation)
..()
if(animation)
flick("valve[src.open][!src.open]",src)
else
code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
+2
View File
@@ -43,6 +43,8 @@ Thus, the two variables affect pump operation are set in New():
set_frequency(frequency)
/obj/machinery/atmospherics/binary/volume_pump/update_icon()
..()
if(!powered())
icon_state = "off"
else
code/ATMOSPHERICS/components/omni_devices/omni_base.dm
+2 -2
View File
@@ -72,6 +72,8 @@
update_ports()
/obj/machinery/atmospherics/omni/update_icon()
..()
if(stat & NOPOWER)
overlays = overlays_off
on = 0
@@ -83,8 +85,6 @@
underlays = underlays_current
return
/obj/machinery/atmospherics/omni/proc/error_check()
return
code/ATMOSPHERICS/components/trinary_devices/filter.dm
+2
View File
@@ -40,6 +40,8 @@ Filter types:
radio_connection = SSradio.add_object(src, frequency, RADIO_ATMOSIA)
/obj/machinery/atmospherics/trinary/filter/update_icon()
..()
if(flipped)
icon_state = "m"
else
code/ATMOSPHERICS/components/trinary_devices/mixer.dm
+2
View File
@@ -17,6 +17,8 @@
flipped = 1
/obj/machinery/atmospherics/trinary/mixer/update_icon(safety = 0)
..()
if(flipped)
icon_state = "m"
else
code/ATMOSPHERICS/components/trinary_devices/tvalve.dm
+1
View File
@@ -135,6 +135,7 @@
/obj/machinery/atmospherics/trinary/tvalve/digital/update_icon()
..()
if(!powered())
icon_state = "tvalvenopower"
code/ATMOSPHERICS/components/unary_devices/cold_sink.dm
+2 -2
View File
@@ -13,6 +13,8 @@
var/current_heat_capacity = 50000 //totally random
/obj/machinery/atmospherics/unary/cold_sink/update_icon()
..()
if(node)
icon_state = "intact_[on?("on"):("off")]"
else
@@ -20,8 +22,6 @@
on = 0
return
/obj/machinery/atmospherics/unary/cold_sink/process_atmos()
..()
if(!on)
code/ATMOSPHERICS/components/unary_devices/generator_input.dm
+2 -2
View File
@@ -9,12 +9,12 @@
var/update_cycle
/obj/machinery/atmospherics/unary/generator_input/update_icon()
..()
if(node)
icon_state = "intact"
else
icon_state = "exposed"
return
/obj/machinery/atmospherics/unary/generator_input/proc/return_exchange_air()
return air_contents
code/ATMOSPHERICS/components/unary_devices/heat_exchanger.dm
+2 -2
View File
@@ -13,13 +13,13 @@
burn_state = LAVA_PROOF
/obj/machinery/atmospherics/unary/heat_exchanger/update_icon()
..()
if(node)
icon_state = "intact"
else
icon_state = "exposed"
return
/obj/machinery/atmospherics/unary/heat_exchanger/atmos_init()
if(!partner)
var/partner_connect = turn(dir,180)
code/ATMOSPHERICS/components/unary_devices/heat_source.dm
+2 -2
View File
@@ -13,6 +13,8 @@
var/current_heat_capacity = 50000 //totally random
/obj/machinery/atmospherics/unary/heat_reservoir/update_icon()
..()
if(node)
icon_state = "intact_[on?("on"):("off")]"
else
@@ -20,8 +22,6 @@
on = 0
return
/obj/machinery/atmospherics/unary/heat_reservoir/process_atmos()
..()
if(!on)
code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm
+2
View File
@@ -38,6 +38,8 @@
return ..()
/obj/machinery/atmospherics/unary/outlet_injector/update_icon()
..()
if(!powered())
icon_state = "off"
else
code/ATMOSPHERICS/components/unary_devices/oxygen_generator.dm
+2 -2
View File
@@ -14,6 +14,8 @@
var/oxygen_content = 10
/obj/machinery/atmospherics/unary/oxygen_generator/update_icon()
..()
if(node)
icon_state = "intact_[on?("on"):("off")]"
else
@@ -21,8 +23,6 @@
on = 0
return
/obj/machinery/atmospherics/unary/oxygen_generator/New()
..()
code/ATMOSPHERICS/components/unary_devices/portables_connector.dm
+1
View File
@@ -18,6 +18,7 @@
return ..()
/obj/machinery/atmospherics/unary/portables_connector/update_icon()
..()
icon_state = "connector"
/obj/machinery/atmospherics/unary/portables_connector/update_underlays()
code/ATMOSPHERICS/components/unary_devices/thermal_plate.dm
+4 -2
View File
@@ -11,10 +11,12 @@
desc = "Transfers heat to and from an area"
/obj/machinery/atmospherics/unary/thermal_plate/update_icon()
var/prefix=""
..()
var/prefix = ""
//var/suffix="_idle" // Also available: _heat, _cool
if(level == 1 && istype(loc, /turf/simulated))
prefix="h"
prefix = "h"
icon_state = "[prefix]off"
/obj/machinery/atmospherics/unary/thermal_plate/process_atmos()
code/ATMOSPHERICS/components/unary_devices/vent_pump.dm
+4
View File
@@ -77,6 +77,10 @@
air_contents.volume = 1000
/obj/machinery/atmospherics/unary/vent_pump/update_icon(var/safety = 0)
..()
plane = FLOOR_PLANE
if(!check_icon_cache())
return
code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
+4
View File
@@ -91,6 +91,10 @@
return 1
/obj/machinery/atmospherics/unary/vent_scrubber/update_icon(var/safety = 0)
..()
plane = FLOOR_PLANE
if(!check_icon_cache())
return