cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 06:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Atmos fixes

Browse Source
This commit is contained in:
Markolie
2015-09-22 05:15:05 +02:00
parent 91e1d7a516
commit df8209afe6
23 changed files with 116 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
-1
View File
@@ -3,7 +3,6 @@
// Uses no power but can not transfer gases from a low pressure area to a high pressure area
icon = 'icons/atmos/passive_gate.dmi'
icon_state = "map"
level = 1
name = "passive gate"
desc = "A one-way air valve that does not require power"
code/ATMOSPHERICS/components/binary_devices/pump.dm
+1 -2
View File
@@ -15,8 +15,7 @@ Thus, the two variables affect pump operation are set in New():
/obj/machinery/atmospherics/binary/pump
icon = 'icons/atmos/pump.dmi'
icon_state = "map_off"
level = 1
name = "gas pump"
desc = "A pump"
code/ATMOSPHERICS/components/binary_devices/valve.dm
-2
View File
@@ -6,8 +6,6 @@
desc = "A pipe valve"
can_unwrench = 1
level = 1
var/open = 0
code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
-1
View File
@@ -15,7 +15,6 @@ Thus, the two variables affect pump operation are set in New():
/obj/machinery/atmospherics/binary/volume_pump
icon = 'icons/atmos/volume_pump.dmi'
icon_state = "map_off"
level = 1
name = "volumetric gas pump"
desc = "A volumetric pump"
code/ATMOSPHERICS/components/omni_devices/omni_base.dm
-1
View File
@@ -7,7 +7,6 @@
icon_state = "base"
use_power = 1
initialize_directions = 0
level = 1
can_unwrench = 1
code/ATMOSPHERICS/components/trinary_devices/filter.dm
+1 -3
View File
@@ -1,8 +1,6 @@
/obj/machinery/atmospherics/trinary/filter
icon = 'icons/atmos/filter.dmi'
icon_state = "map"
density = 0
level = 1
can_unwrench = 1
@@ -26,7 +24,7 @@ Filter types:
var/frequency = 0
var/datum/radio_frequency/radio_connection
/obj/machinery/atmospherics/trinary/mixer/flipped
/obj/machinery/atmospherics/trinary/filter/flipped
icon_state = "mmap"
flipped = 1
code/ATMOSPHERICS/components/trinary_devices/mixer.dm
-2
View File
@@ -1,8 +1,6 @@
/obj/machinery/atmospherics/trinary/mixer
icon = 'icons/atmos/mixer.dmi'
icon_state = "map"
density = 0
level = 1
can_unwrench = 1
code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
+27 -9
View File
@@ -21,15 +21,28 @@
/obj/machinery/atmospherics/trinary/New()
..()
switch(dir)
if(NORTH)
initialize_directions = EAST|NORTH|SOUTH
if(SOUTH)
initialize_directions = SOUTH|WEST|NORTH
if(EAST)
initialize_directions = EAST|WEST|SOUTH
if(WEST)
initialize_directions = WEST|NORTH|EAST
if(!flipped)
switch(dir)
if(NORTH)
initialize_directions = EAST|NORTH|SOUTH
if(SOUTH)
initialize_directions = SOUTH|WEST|NORTH
if(EAST)
initialize_directions = EAST|WEST|SOUTH
if(WEST)
initialize_directions = WEST|NORTH|EAST
else
switch(dir)
if(NORTH)
initialize_directions = SOUTH|NORTH|WEST
if(SOUTH)
initialize_directions = NORTH|SOUTH|EAST
if(EAST)
initialize_directions = WEST|EAST|NORTH
if(WEST)
initialize_directions = EAST|WEST|SOUTH
air1 = new
air2 = new
air3 = new
@@ -65,6 +78,10 @@
//Node 2 is filtered output
//Node 3 is rest output
//If we flip the filter, 1 and 3 shall exchange positions
if(can_unwrench) // Overridden here to avoid having to snowflake the flipped/icon_state on the construction
qdel(stored)
stored = new(src, make_from = src)
var/node1_connect = turn(dir, -180)
var/node2_connect = turn(dir, -90)
@@ -72,6 +89,7 @@
if(flipped)
node1_connect = turn(node1_connect, 180)
node2_connect = turn(node2_connect, 180)
node3_connect = turn(node3_connect, 180)
for(var/obj/machinery/atmospherics/target in get_step(src,node1_connect))
code/ATMOSPHERICS/components/trinary_devices/tvalve.dm
+27 -5
View File
@@ -10,19 +10,29 @@
can_unwrench = 1
level = 1
var/state = TVALVE_STATE_STRAIGHT
/obj/machinery/atmospherics/trinary/tvalve/bypass
icon_state = "map_tvalve1"
state = TVALVE_STATE_SIDE
/obj/machinery/atmospherics/trinary/tvalve/flipped
icon_state = "map_tvalvem0"
flipped = 1
/obj/machinery/atmospherics/trinary/tvalve/flipped/bypass
icon_state = "map_tvalvem1"
flipped = 1
state = TVALVE_STATE_SIDE
/obj/machinery/atmospherics/trinary/tvalve/update_icon(animation)
var/flipstate = ""
if(flipped)
flipstate = "m"
if(animation)
flick("tvalve[src.state][!src.state]",src)
flick("tvalve[flipstate][src.state][!src.state]",src)
else
icon_state = "tvalve[state]"
icon_state = "tvalve[flipstate][state]"
/obj/machinery/atmospherics/trinary/tvalve/update_underlays()
if(..())
@@ -32,7 +42,10 @@
return
add_underlay(T, node1, turn(dir, -180))
add_underlay(T, node2, turn(dir, -90))
if(flipped)
add_underlay(T, node2, turn(dir, 90))
else
add_underlay(T, node2, turn(dir, -90))
add_underlay(T, node3, dir)
@@ -93,6 +106,15 @@
/obj/machinery/atmospherics/trinary/tvalve/digital/bypass
icon_state = "map_tvalve1"
state = TVALVE_STATE_SIDE
/obj/machinery/atmospherics/trinary/tvalve/digital/flipped
icon_state = "map_tvalvem0"
flipped = 1
/obj/machinery/atmospherics/trinary/tvalve/digital/flipped/bypass
icon_state = "map_tvalvem1"
flipped = 1
state = TVALVE_STATE_SIDE
/obj/machinery/atmospherics/trinary/tvalve/digital/power_change()
var/old_stat = stat
code/ATMOSPHERICS/components/unary_devices/heat_source.dm
-2
View File
@@ -1,6 +1,4 @@
/obj/machinery/atmospherics/unary/heat_reservoir
//currently the same code as cold_sink but anticipating process() changes
icon = 'icons/obj/atmospherics/cold_sink.dmi'
icon_state = "intact_off"
density = 1
code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm
-2
View File
@@ -22,8 +22,6 @@
var/datum/radio_frequency/radio_connection
Mtoollink = 1
settagwhitelist = list("id_tag")
level = 1
/obj/machinery/atmospherics/unary/outlet_injector/on
on = 1
code/ATMOSPHERICS/components/unary_devices/portables_connector.dm
-2
View File
@@ -11,8 +11,6 @@
var/obj/machinery/portable_atmospherics/connected_device
var/on = 0
use_power = 0
level = 1
/obj/machinery/atmospherics/unary/portables_connector/Destroy()
if(connected_device)
code/ATMOSPHERICS/components/unary_devices/tank.dm
-1
View File
@@ -7,7 +7,6 @@
var/volume = 10000 //in liters, 1 meters by 1 meters by 2 meters ~tweaked it a little to simulate a pressure tank without needing to recode them yet
level = 1
density = 1
/obj/machinery/atmospherics/unary/tank/update_underlays()
code/ATMOSPHERICS/components/unary_devices/thermal_plate.dm
+1 -4
View File
@@ -1,16 +1,13 @@
#define RADIATION_CAPACITY 30000 //Radiation isn't particularly effective (TODO BALANCE)
/obj/machinery/atmospherics/unary/thermal_plate
//Based off Heat Reservoir and Space Heater
//Transfers heat between a pipe system and environment, based on which has a greater thermal energy concentration
icon = 'icons/obj/atmospherics/cold_sink.dmi'
icon_state = "off"
level = 1
can_unwrench = 1
name = "Thermal Transfer Plate"
name = "thermal tansfer plate"
desc = "Transfers heat to and from an area"
/obj/machinery/atmospherics/unary/thermal_plate/update_icon()
code/ATMOSPHERICS/components/unary_devices/vent_pump.dm
+1 -2
View File
@@ -7,14 +7,13 @@
icon = 'icons/atmos/vent_pump.dmi'
icon_state = "map_vent"
name = "Air Vent"
name = "air vent"
desc = "Has a valve and pump attached to it"
use_power = 1
can_unwrench = 1
var/area/initial_loc
level = 1
var/area_uid
var/id_tag = null
code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
+1 -2
View File
@@ -4,14 +4,13 @@
req_one_access_txt = "24;10"
name = "Air Scrubber"
name = "air scrubber"
desc = "Has a valve and pump attached to it"
use_power = 1
idle_power_usage = 10
active_power_usage = 60
level = 1
can_unwrench = 1
var/area/initial_loc