WIP air alarms

2025-12-10 10:21:11 +00:00 · 2012-06-09 00:55:09 -07:00
parent 94cd09fe4c
commit f953f78d73
9 changed files with 907 additions and 1140 deletions
--- a/code/ATMOSPHERICS/components/unary/vent_pump.dm
+++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm
@@ -12,6 +12,7 @@

 	var/on = 0
 	var/pump_direction = 1 //0 = siphoning, 1 = releasing
+	var/pump_speed = 1 //Used to adjust speed for siphons

 	var/external_pressure_bound = ONE_ATMOSPHERE
 	var/internal_pressure_bound = 0
@@ -38,13 +39,13 @@
 			assign_uid()
 			id_tag = num2text(uid)
 		if(ticker && ticker.current_state == 3)//if the game is running
-			src.initialize()
-			src.broadcast_status()
+			initialize()
+			broadcast_status()
 		..()

 	high_volume
 		name = "Large Air Vent"
-		power_channel = EQUIP
+
 		New()
 			..()
 			air_contents.volume = 1000
@@ -69,7 +70,7 @@
 			return
 		if (!node)
 			on = 0
-		//broadcast_status() // from now air alarm/control computer should request update purposely --rastaf0
+
 		if(!on)
 			return 0

@@ -89,7 +90,7 @@

 			if(pressure_delta > 0)
 				if(air_contents.temperature > 0)
-					var/transfer_moles = pressure_delta*environment.volume/(air_contents.temperature * R_IDEAL_GAS_EQUATION)
+					var/transfer_moles = pressure_delta*environment.volume*environment.group_multiplier*pump_speed/(air_contents.temperature * R_IDEAL_GAS_EQUATION)

 					var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)

@@ -107,7 +108,7 @@

 			if(pressure_delta > 0)
 				if(environment.temperature > 0)
-					var/transfer_moles = pressure_delta*air_contents.volume/(environment.temperature * R_IDEAL_GAS_EQUATION)
+					var/transfer_moles = pressure_delta*air_contents.volume*air_contents.group_multiplier*pump_speed/(environment.temperature * R_IDEAL_GAS_EQUATION)

 					var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
 					if (isnull(removed)) //in space
@@ -120,49 +121,39 @@

 		return 1

+
+
 	//Radio remote control

-	proc
-		set_frequency(new_frequency)
-			radio_controller.remove_object(src, frequency)
-			frequency = new_frequency
-			if(frequency)
-				radio_connection = radio_controller.add_object(src, frequency,radio_filter_in)
+	proc/broadcast_status()
+		var/datum/signal/signal = new
+		signal.transmission_method = 1 //radio signal
+		signal.source = src

-		broadcast_status()
-			if(!radio_connection)
-				return 0
+		signal.data = list(
+			"area" = src.area_uid,
+			"tag" = src.id_tag,
+			"device" = "AVP",
+			"power" = on,
+			"direction" = pump_direction?("release"):("siphon"),
+			"checks" = pressure_checks,
+			"internal" = internal_pressure_bound,
+			"external" = external_pressure_bound,
+			"timestamp" = world.time,
+			"sigtype" = "status",
+			"setting" = pump_speed
+		)

-			var/datum/signal/signal = new
-			signal.transmission_method = 1 //radio signal
-			signal.source = src
+		var/area/alarm_area = get_area(src)
+		if(alarm_area.master.master_air_alarm && alarm_area.master.master_air_alarm.master_is_operating())
+			receive_signal(signal)
+		else
+			for(var/area/A in alarm_area.related)
+				for(var/obj/machinery/alarm/AA in A)
+					receive_signal(signal)

-			signal.data = list(
-				"area" = src.area_uid,
-				"tag" = src.id_tag,
-				"device" = "AVP",
-				"power" = on,
-				"direction" = pump_direction?("release"):("siphon"),
-				"checks" = pressure_checks,
-				"internal" = internal_pressure_bound,
-				"external" = external_pressure_bound,
-				"timestamp" = world.time,
-				"sigtype" = "status"
-			)
+		return 1

-			radio_connection.post_signal(src, signal, radio_filter_out)
-
-			return 1
-
-
-	initialize()
-		..()
-
-		//some vents work his own spesial way
-		radio_filter_in = frequency==1439?(RADIO_FROM_AIRALARM):null
-		radio_filter_out = frequency==1439?(RADIO_TO_AIRALARM):null
-		if(frequency)
-			set_frequency(frequency)

 	receive_signal(datum/signal/signal)
 		if(stat & (NOPOWER|BROKEN))
@@ -195,32 +186,16 @@
 			pump_direction = text2num(signal.data["direction"])

 		if("set_internal_pressure" in signal.data)
-			internal_pressure_bound = between(
-				0,
-				text2num(signal.data["set_internal_pressure"]),
-				ONE_ATMOSPHERE*50
-			)
+			internal_pressure_bound = between(0, text2num(signal.data["set_internal_pressure"]), ONE_ATMOSPHERE*50)

 		if("set_external_pressure" in signal.data)
-			external_pressure_bound = between(
-				0,
-				text2num(signal.data["set_external_pressure"]),
-				ONE_ATMOSPHERE*50
-			)
+			external_pressure_bound = between(0, text2num(signal.data["set_external_pressure"]), ONE_ATMOSPHERE*50)

 		if("adjust_internal_pressure" in signal.data)
-			internal_pressure_bound = between(
-				0,
-				internal_pressure_bound + text2num(signal.data["adjust_internal_pressure"]),
-				ONE_ATMOSPHERE*50
-			)
+			internal_pressure_bound = between(0, text2num(signal.data["adjust_internal_pressure"]), ONE_ATMOSPHERE*50)

 		if("adjust_external_pressure" in signal.data)
-			external_pressure_bound = between(
-				0,
-				external_pressure_bound + text2num(signal.data["adjust_external_pressure"]),
-				ONE_ATMOSPHERE*50
-			)
+			external_pressure_bound = between(0, text2num(signal.data["adjust_external_pressure"]), ONE_ATMOSPHERE*50)

 		if("init" in signal.data)
 			name = signal.data["init"]
@@ -231,6 +206,9 @@
 				broadcast_status()
 			return //do not update_icon

+		if("setting" in signal.data)
+			pump_speed = text2num(signal.data["setting"])
+
 			//log_admin("DEBUG \[[world.timeofday]\]: vent_pump/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
 		spawn(2)
 			broadcast_status()
@@ -272,6 +250,7 @@
 			else
 				user << "\blue You need more welding fuel to complete this task."
 				return 1
+
 	examine()
 		set src in oview(1)
 		..()
--- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
+++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
@@ -16,6 +16,7 @@
 	var/scrub_CO2 = 1
 	var/scrub_Toxins = 0
 	var/scrub_N2O = 0
+	var/scrub_rate = 1

 	var/volume_rate = 120
 	var/panic = 0 //is this scrubber panicked?
@@ -32,8 +33,8 @@
 			assign_uid()
 			id_tag = num2text(uid)
 		if(ticker && ticker.current_state == 3)//if the game is running
-			src.initialize()
-			src.broadcast_status()
+			initialize()
+			broadcast_status()
 		..()

 	update_icon()
@@ -46,42 +47,33 @@
 			icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]off"
 		return

-	proc
-		set_frequency(new_frequency)
-			radio_controller.remove_object(src, frequency)
-			frequency = new_frequency
-			radio_connection = radio_controller.add_object(src, frequency, radio_filter_in)
+	proc/broadcast_status()
+		var/datum/signal/signal = new
+		signal.transmission_method = 1 //radio signal
+		signal.source = src
+		signal.data = list(
+			"area" = area_uid,
+			"tag" = id_tag,
+			"device" = "AScr",
+			"timestamp" = world.time,
+			"power" = on,
+			"scrubbing" = scrubbing,
+			"panic" = panic,
+			"filter_co2" = scrub_CO2,
+			"filter_toxins" = scrub_Toxins,
+			"filter_n2o" = scrub_N2O,
+			"sigtype" = "status",
+			"setting" = scrub_rate
+		)
+		var/area/alarm_area = get_area(src)
+		if(alarm_area.master.master_air_alarm && alarm_area.master.master_air_alarm.master_is_operating())
+			receive_signal(signal)
+		else
+			for(var/area/A in alarm_area.related)
+				for(var/obj/machinery/alarm/AA in A)
+					receive_signal(signal)

-		broadcast_status()
-			if(!radio_connection)
-				return 0
-
-			var/datum/signal/signal = new
-			signal.transmission_method = 1 //radio signal
-			signal.source = src
-			signal.data = list(
-				"area" = area_uid,
-				"tag" = id_tag,
-				"device" = "AScr",
-				"timestamp" = world.time,
-				"power" = on,
-				"scrubbing" = scrubbing,
-				"panic" = panic,
-				"filter_co2" = scrub_CO2,
-				"filter_toxins" = scrub_Toxins,
-				"filter_n2o" = scrub_N2O,
-				"sigtype" = "status"
-			)
-			radio_connection.post_signal(src, signal, radio_filter_out)
-
-			return 1
-
-	initialize()
-		..()
-		radio_filter_in = frequency==initial(frequency)?(RADIO_FROM_AIRALARM):null
-		radio_filter_out = frequency==initial(frequency)?(RADIO_TO_AIRALARM):null
-		if (frequency)
-			set_frequency(frequency)
+		return 1

 	process()
 		..()
@@ -93,12 +85,11 @@
 		if(!on)
 			return 0

-
 		var/datum/gas_mixture/environment = loc.return_air()

 		if(scrubbing)
 			if((environment.toxins>0) || (environment.carbon_dioxide>0) || (environment.trace_gases.len>0))
-				var/transfer_moles = min(1, volume_rate/environment.volume)*environment.total_moles
+				var/transfer_moles = min(1, volume_rate*scrub_rate/environment.volume)*environment.total_moles

 				//Take a gas sample
 				var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
@@ -136,7 +127,7 @@
 			if (air_contents.return_pressure()>=50*ONE_ATMOSPHERE)
 				return

-			var/transfer_moles = environment.total_moles*(volume_rate/environment.volume)
+			var/transfer_moles = environment.total_moles*(volume_rate*scrub_rate/environment.volume)

 			var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)

@@ -218,6 +209,9 @@
 				broadcast_status()
 			return //do not update_icon

+		if("setting" in signal.data)
+			scrub_rate = text2num(signal.data["setting"])
+
 //			log_admin("DEBUG \[[world.timeofday]\]: vent_scrubber/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
 		spawn(2)
 			broadcast_status()