diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
index f7de10c2a9f..547711c9c17 100644
--- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
@@ -169,23 +169,23 @@
pump_direction = 1
if("set_input_pressure" in signal.data)
- input_pressure_min = between(
- 0,
+ input_pressure_min = Clamp(
text2num(signal.data["set_input_pressure"]),
+ 0,
ONE_ATMOSPHERE*50
)
if("set_output_pressure" in signal.data)
- output_pressure_max = between(
- 0,
+ output_pressure_max = Clamp(
text2num(signal.data["set_output_pressure"]),
+ 0,
ONE_ATMOSPHERE*50
)
if("set_external_pressure" in signal.data)
- external_pressure_bound = between(
- 0,
+ external_pressure_bound = Clamp(
text2num(signal.data["set_external_pressure"]),
+ 0,
ONE_ATMOSPHERE*50
)
diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
index a126928e2da..1185463bb7c 100644
--- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
@@ -113,9 +113,9 @@ obj/machinery/atmospherics/binary/passive_gate
on = !on
if("set_output_pressure" in signal.data)
- target_pressure = between(
- 0,
+ target_pressure = Clamp(
text2num(signal.data["set_output_pressure"]),
+ 0,
ONE_ATMOSPHERE*50
)
diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm
index e4d62469ad2..0fdabe08c8b 100644
--- a/code/ATMOSPHERICS/components/binary_devices/pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm
@@ -128,9 +128,9 @@ obj/machinery/atmospherics/binary/pump
on = !on
if("set_output_pressure" in signal.data)
- target_pressure = between(
- 0,
+ target_pressure = Clamp(
text2num(signal.data["set_output_pressure"]),
+ 0,
ONE_ATMOSPHERE*50
)
diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
index e2dddfa97c1..65a51c3dbf0 100644
--- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
@@ -126,9 +126,9 @@ obj/machinery/atmospherics/binary/volume_pump
on = !on
if("set_transfer_rate" in signal.data)
- transfer_rate = between(
- 0,
+ transfer_rate = Clamp(
text2num(signal.data["set_transfer_rate"]),
+ 0,
air1.volume
)
diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
index 116e69893ec..a4aba30228c 100644
--- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm
+++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
@@ -16,7 +16,7 @@ obj/machinery/atmospherics/trinary/filter
/*
Filter types:
-1: Nothing
- 0: Carbon Molecules: Plasma Toxin, Oxygen Agent B
+ 0: Plasma: Plasma Toxin, Oxygen Agent B
1: Oxygen: Oxygen ONLY
2: Nitrogen: Nitrogen ONLY
3: Carbon Dioxide: Carbon Dioxide ONLY
@@ -85,7 +85,7 @@ Filter types:
filtered_out.temperature = removed.temperature
switch(filter_type)
- if(0) //removing hydrocarbons
+ if(0) //removing plasma
filtered_out.toxins = removed.toxins
removed.toxins = 0
@@ -172,7 +172,7 @@ obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) // -- TLE
var/current_filter_type
switch(filter_type)
if(0)
- current_filter_type = "Carbon Molecules"
+ current_filter_type = "Plasma"
if(1)
current_filter_type = "Oxygen"
if(2)
@@ -190,7 +190,7 @@ obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) // -- TLE
Power: [on?"On":"Off"]
Filtering: [current_filter_type]
Atmospheric Readings| [entry] | [functions] | |
| [M.real_name][M.client ? "" : " (logged out)"][M.stat == 2 ? " (DEAD)" : ""] | " dat += "PM | " - var/turf/mob_loc = get_turf_loc(M) + var/turf/mob_loc = get_turf(M) dat += "[mob_loc.loc] |
| Head not found! |
| Name | Position |
|---|---|
| [] | [] |
| [] | [] |
Atmospheric Scan:Remaining Available Memory: [src.ram]
Trunks available for checkout
"
@@ -370,7 +370,7 @@
/mob/living/silicon/pai/proc/CheckDNA(mob/living/carbon/M, mob/living/silicon/pai/P)
var/answer = input(M, "[P] is requesting a DNA sample from you. Will you allow it to confirm your identity?", "[P] Check DNA", "No") in list("Yes", "No")
if(answer == "Yes")
- var/turf/T = get_turf_or_move(P.loc)
+ var/turf/T = get_turf(P.loc)
for (var/mob/v in viewers(T))
v.show_message("\blue [M] presses \his thumb against [P].", 3, "\blue [P] makes a sharp clicking sound as it extracts DNA material from [M].", 2)
if(!check_dna_integrity(M))
@@ -531,7 +531,7 @@
/mob/living/silicon/pai/proc/softwareAtmo()
var/dat = "
|
- Coders: TLE, NEO, Errorage, muskets, veryinky, Skie, Noise, Numbers, Agouri, Noka, Urist McDorf, Uhangi, Darem, Mport, rastaf0, Doohl, Superxpdude, Rockdtben, ConstantA, Petethegoat, Kor, Polymorph, Carn, Nodrak, Donkie, Sieve, Giacom, Ikarrus, trubble_bass. + Current Project Maintainers: -Click Here- + Coders: -Click Here- (Also: TLE, muskets, veryinky, Skie, Noise, Numbers, Noka, Urist McDorf, Uhangi, Darem, Mport, ConstantA, Polymorph, Donkie, trubble_bass) Spriters: Agouri, Cheridan, Cruazy Guest, Deeaych, Deuryn, Matty406, Microwave, ShiftyEyesShady, Skie, Uhangi, Veyveyr, Petethegoat, Kor, Ricotez, Ausops, TankNut, Pewtershmitz, Firecage Sounds: Skie, Lasty/Vinyl - Thanks to: Baystation 12, CDK Station devs, GoonStation devs, the original SpaceStation developers and Invisty for the title image + Main Testers: Tenebrosity + Thanks to: Baystation 12, CDK Station devs, FacepunchStation, GoonStation devs, the original SpaceStation developers and Invisty for the title image. Have a bug to report? Visit our Issue Tracker. Please ensure that the bug has not already been reported and use the template provided. |
@@ -47,9 +49,66 @@ Stuff which is in development and not yet visible to players or just code relate
(ie. code improvements for expandability, etc.) should not be listed here. They
should be listed in the changelog upon commit tho. Thanks. -->
-
-
-