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

Atmos now starts with nitrous oxide in storage tank.

Browse Source 
Radio was optimized even more. Still have some reserves.
Restored admin verb "Radio Report". It shows some signs of errors on the map, but I am too tired to fix it now.
Optimized player login (that "400000 calls of new_player/Move" bug).
Various optimizations and fixes in radio code.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1046 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
rastaf.zero@gmail.com
2011-02-15 00:28:00 +00:00
parent 04586604d4
commit 2b96770d61
27 changed files with 341 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
+6 -5
View File
@@ -110,7 +110,7 @@
radio_controller.remove_object(src, frequency)
frequency = new_frequency
if(frequency)
radio_connection = radio_controller.add_object(src, frequency)
radio_connection = radio_controller.add_object(src, frequency, filter = RADIO_ATMOSIA)
broadcast_status()
if(!radio_connection)
@@ -129,7 +129,7 @@
signal.data["output"] = output_pressure_max
signal.data["external"] = external_pressure_bound
radio_connection.post_signal(src, signal)
radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
return 1
@@ -143,7 +143,7 @@
set_frequency(frequency)
receive_signal(datum/signal/signal)
if(signal.data["tag"] && (signal.data["tag"] != id))
if(!signal.data["tag"] || (signal.data["tag"] != id))
return 0
switch(signal.data["command"])
@@ -193,6 +193,7 @@
external_pressure_bound = number
if(signal.data["tag"])
spawn(5) broadcast_status()
//if(signal.data["tag"])
spawn(5)
broadcast_status()
update_icon()
code/ATMOSPHERICS/components/binary_devices/pump.dm
+5 -5
View File
@@ -77,7 +77,7 @@ obj/machinery/atmospherics/binary/pump
radio_controller.remove_object(src, frequency)
frequency = new_frequency
if(frequency)
radio_connection = radio_controller.add_object(src, frequency)
radio_connection = radio_controller.add_object(src, frequency, filter = RADIO_ATMOSIA)
broadcast_status()
if(!radio_connection)
@@ -92,7 +92,7 @@ obj/machinery/atmospherics/binary/pump
signal.data["power"] = on
signal.data["target_output"] = target_pressure
radio_connection.post_signal(src, signal)
radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
return 1
interact(mob/user as mob)
@@ -114,7 +114,7 @@ obj/machinery/atmospherics/binary/pump
set_frequency(frequency)
receive_signal(datum/signal/signal)
if(signal.data["tag"] && (signal.data["tag"] != id))
if(!signal.data["tag"] || (signal.data["tag"] != id))
return 0
switch(signal.data["command"])
@@ -132,8 +132,8 @@ obj/machinery/atmospherics/binary/pump
number = min(max(number, 0), ONE_ATMOSPHERE*50)
target_pressure = number
broadcast_status()
spawn(5)
broadcast_status()
update_icon()
return
code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
+3 -3
View File
@@ -89,7 +89,7 @@ obj/machinery/atmospherics/binary/volume_pump
set_frequency(frequency)
receive_signal(datum/signal/signal)
if(signal.data["tag"] && (signal.data["tag"] != id))
if(!signal.data["tag"] || (signal.data["tag"] != id))
return 0
switch(signal.data["command"])
@@ -108,6 +108,6 @@ obj/machinery/atmospherics/binary/volume_pump
transfer_rate = number
if(signal.data["tag"])
spawn(5) broadcast_status()
spawn(5)
broadcast_status()
update_icon()
code/ATMOSPHERICS/components/filter.dm
+1 -1
View File
@@ -45,7 +45,7 @@ Filter types:
radio_controller.remove_object(src, frequency)
frequency = new_frequency
if(frequency)
radio_connection = radio_controller.add_object(src, frequency)
radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
New()
..()
code/ATMOSPHERICS/components/unary/outlet_injector.dm
+10 -3
View File
@@ -95,7 +95,7 @@
set_frequency(frequency)
receive_signal(datum/signal/signal)
if(signal.data["tag"] && (signal.data["tag"] != id))
if(!signal.data["tag"] || (signal.data["tag"] != id) || !signal.data["command"])
return 0
switch(signal.data["command"])
@@ -110,6 +110,7 @@
if("inject")
spawn inject()
return
if("set_volume_rate")
var/number = text2num(signal.data["parameter"])
@@ -117,8 +118,14 @@
volume_rate = number
if(signal.data["tag"])
spawn(5) broadcast_status()
if("status")
//broadcast_status
else
log_admin("DEBUG \[[world.timeofday]\]: outlet_injector/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
return
spawn(5)
broadcast_status()
update_icon()
hide(var/i) //to make the little pipe section invisible, the icon changes.
code/ATMOSPHERICS/components/unary/vent_pump.dm
+27 -16
View File
@@ -7,7 +7,7 @@
level = 1
var/area_uid
var/id = null
var/id_tag = null
var/on = 0
var/pump_direction = 1 //0 = siphoning, 1 = releasing
@@ -33,7 +33,9 @@
if (A.master)
A = A.master
area_uid = A.uid
id = "\ref[src]"
if (!id_tag)
assign_uid()
id_tag = num2text(uid)
..()
high_volume
@@ -127,15 +129,17 @@
signal.transmission_method = 1 //radio signal
signal.source = src
signal.data["area"] = src.area_uid
signal.data["tag"] = src.id
signal.data["device"] = "AVP"
signal.data["power"] = on?("on"):("off")
signal.data["direction"] = pump_direction?("release"):("siphon")
signal.data["checks"] = pressure_checks
signal.data["internal"] = internal_pressure_bound
signal.data["external"] = external_pressure_bound
signal.data["timestamp"] = air_master.current_cycle
signal.data = list(
"area" = src.area_uid,
"tag" = src.id_tag,
"device" = "AVP",
"power" = on?("on"):("off"),
"direction" = pump_direction?("release"):("siphon"),
"checks" = pressure_checks,
"internal" = internal_pressure_bound,
"external" = external_pressure_bound,
"timestamp" = air_master.current_cycle,
)
radio_connection.post_signal(src, signal, radio_filter_out)
@@ -153,7 +157,8 @@
update_icon()
receive_signal(datum/signal/signal)
if(!signal.data["tag"] || (signal.data["tag"] != id))
//log_admin("DEBUG \[[world.timeofday]\]: /obj/machinery/atmospherics/unary/vent_pump/receive_signal([signal.debug_print()])")
if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || !signal.data["command"])
return 0
switch(signal.data["command"])
@@ -203,11 +208,17 @@
if("init")
name = signal.data["parameter"]
return
if(signal.data["tag"])
spawn(2)
broadcast_status()
update_icon()
if("status")
//broadcast_status
else
log_admin("DEBUG \[[world.timeofday]\]: vent_pump/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
return
spawn(2)
broadcast_status()
update_icon()
return
hide(var/i) //to make the little pipe section invisible, the icon changes.
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
+28 -17
View File
@@ -28,7 +28,9 @@
if (A.master)
A = A.master
area_uid = A.uid
id_tag = "\ref[src]"
if (!id_tag)
assign_uid()
id_tag = num2text(uid)
..()
update_icon()
@@ -54,16 +56,18 @@
var/datum/signal/signal = new
signal.transmission_method = 1 //radio signal
signal.source = src
signal.data["area"] = area_uid
signal.data["tag"] = id_tag
signal.data["device"] = "AScr"
signal.data["timestamp"] = air_master.current_cycle
signal.data["on"] = on
signal.data["scrubbing"] = scrubbing
signal.data["panic"] = panic
signal.data["filter_co2"] = scrub_CO2
signal.data["filter_toxins"] = scrub_Toxins
signal.data["filter_n2o"] = scrub_N2O
signal.data = list(
"area" = area_uid,
"tag" = id_tag,
"device" = "AScr",
"timestamp" = air_master.current_cycle,
"on" = on,
"scrubbing" = scrubbing,
"panic" = panic,
"filter_co2" = scrub_CO2,
"filter_toxins" = scrub_Toxins,
"filter_n2o" = scrub_N2O,
)
radio_connection.post_signal(src, signal, radio_filter_out)
return 1
@@ -154,8 +158,8 @@
*/
receive_signal(datum/signal/signal)
if(!signal.data["tag"] || (signal.data["tag"] != id_tag))
return ..()
if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || !signal.data["command"])
return 0
switch(signal.data["command"])
if("toggle_power")
@@ -179,10 +183,17 @@
volume_rate = initial(volume_rate)
if("init")
name = signal.data["parameter"]
if(signal.data["tag"])
spawn(2)
broadcast_status()
update_icon()
return
if("status")
//broadcast_status
else
log_admin("DEBUG \[[world.timeofday]\]: vent_scrubber/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
return
spawn(2)
broadcast_status()
update_icon()
return
power_change()
code/ATMOSPHERICS/components/valve.dm
+2 -2
View File
@@ -265,7 +265,7 @@ obj/machinery/atmospherics/valve
radio_controller.remove_object(src, frequency)
frequency = new_frequency
if(frequency)
radio_connection = radio_controller.add_object(src, frequency)
radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
var/frequency = 0
var/id = null
@@ -277,7 +277,7 @@ obj/machinery/atmospherics/valve
set_frequency(frequency)
receive_signal(datum/signal/signal)
if(signal.data["tag"] && (signal.data["tag"] != id))
if(!signal.data["tag"] || (signal.data["tag"] != id))
return 0
switch(signal.data["command"])