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

2026-07-17 18:13:34 +01:00 · 2019-04-22 18:52:55 +02:00
parent d9d975a91f a3bd9e1bb4
commit c4dc5ecd3d
68 changed files with 310 additions and 123 deletions
@@ -11,7 +11,8 @@ Pipelines + Other Objects -> Pipe network
 GLOBAL_DATUM_INIT(pipe_icon_manager, /datum/pipe_icon_manager, new())
 /obj/machinery/atmospherics
 	anchored = 1
-	layer = 2.4 //under wires with their 2.44
+	layer = GAS_PIPE_HIDDEN_LAYER  //under wires
+	plane = FLOOR_PLANE	
 	idle_power_usage = 0
 	active_power_usage = 0
 	power_channel = ENVIRON
@@ -61,10 +62,14 @@ GLOBAL_DATUM_INIT(pipe_icon_manager, /datum/pipe_icon_manager, new())

 // Icons/overlays/underlays
 /obj/machinery/atmospherics/update_icon()
-	return null
+	var/turf/T = loc
+	if(level == 2 || !T.intact)
+		plane = GAME_PLANE
+	else
+		plane = FLOOR_PLANE	

 /obj/machinery/atmospherics/proc/update_pipe_image()
-	pipe_image = image(src, loc, layer = 20, dir = dir) //the 20 puts it above Byond's darkness (not its opacity view)
+	pipe_image = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir) //the 20 puts it above Byond's darkness (not its opacity view)
 	pipe_image.plane = HUD_PLANE

 /obj/machinery/atmospherics/proc/check_icon_cache(var/safety = 0)
@@ -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)
@@ -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

@@ -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()
@@ -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
@@ -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
@@ -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
@@ -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

@@ -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
@@ -17,6 +17,8 @@
 	flipped = 1

 /obj/machinery/atmospherics/trinary/mixer/update_icon(safety = 0)
+	..()
+	
 	if(flipped)
 		icon_state = "m"
 	else
@@ -135,6 +135,7 @@

 /obj/machinery/atmospherics/trinary/tvalve/digital/update_icon()
 	..()
+	
 	if(!powered())
 		icon_state = "tvalvenopower"

@@ -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)
@@ -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
@@ -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)
@@ -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)
@@ -38,6 +38,8 @@
 	return ..()

 /obj/machinery/atmospherics/unary/outlet_injector/update_icon()
+	..()
+	
 	if(!powered())
 		icon_state = "off"
 	else
@@ -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()
 	..()

@@ -18,6 +18,7 @@
 	return ..()

 /obj/machinery/atmospherics/unary/portables_connector/update_icon()
+	..()
 	icon_state = "connector"

 /obj/machinery/atmospherics/unary/portables_connector/update_underlays()
@@ -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()
@@ -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

@@ -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

@@ -55,6 +55,8 @@
 		node.update_underlays()

 /obj/machinery/atmospherics/pipe/cap/update_icon(var/safety = 0)
+	..()
+	
 	if(!check_icon_cache())
 		return

@@ -116,6 +116,8 @@
 		node3.update_underlays()

 /obj/machinery/atmospherics/pipe/manifold/update_icon(var/safety = 0)
+	..()
+	
 	if(!check_icon_cache())
 		return

@@ -90,6 +90,8 @@
 		node4.update_underlays()

 /obj/machinery/atmospherics/pipe/manifold4w/update_icon(var/safety = 0)
+	..()
+	
 	if(!check_icon_cache())
 		return

@@ -137,6 +137,8 @@
 		node2.update_underlays()

 /obj/machinery/atmospherics/pipe/simple/update_icon(var/safety = 0)
+	..()
+	
 	if(!check_icon_cache())
 		return

@@ -28,6 +28,8 @@
 	icon_state = "map_universal"

 /obj/machinery/atmospherics/pipe/simple/hidden/universal/update_icon(var/safety = 0)
+	..()
+	
 	if(!check_icon_cache())
 		return

@@ -39,6 +39,8 @@
 	icon_state = "map_universal"

 /obj/machinery/atmospherics/pipe/simple/visible/universal/update_icon(var/safety = 0)
+	..()
+	
 	if(!check_icon_cache())
 		return