diff --git a/code/ATMOSPHERICS/components/valve.dm b/code/ATMOSPHERICS/components/valve.dm index 17d76457c2..b564e6422b 100644 --- a/code/ATMOSPHERICS/components/valve.dm +++ b/code/ATMOSPHERICS/components/valve.dm @@ -9,6 +9,7 @@ obj/machinery/atmospherics/valve initialize_directions = SOUTH|NORTH var/open = 0 + var/openDuringInit = 0 var/obj/machinery/atmospherics/node1 var/obj/machinery/atmospherics/node2 @@ -169,6 +170,9 @@ obj/machinery/atmospherics/valve if(target.initialize_directions & get_dir(target,src)) node2 = target break + if(openDuringInit) + open() + openDuringInit = 0 /* var/connect_directions switch(dir) diff --git a/maps/tgstation.2.0.9.dmm b/maps/tgstation.2.0.9.dmm index b7591adc96..a8e327c8a3 100644 --- a/maps/tgstation.2.0.9.dmm +++ b/maps/tgstation.2.0.9.dmm @@ -5436,17 +5436,17 @@ "caB" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 4; icon_state = "manifold-b-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor,/area/engine/break_room) "caC" = (/turf/simulated/wall/r_wall,/area/engine/break_room) "caD" = (/obj/machinery/portable_atmospherics/scrubber,/obj/machinery/light,/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/atmos) -"caE" = (/obj/machinery/atmospherics/valve/digital{name = "Nitrogen Outlet Valve"},/turf/simulated/floor{icon_state = "red"; dir = 10},/area/atmos) +"caE" = (/obj/machinery/atmospherics/valve/digital{name = "Nitrogen Outlet Valve"; openDuringInit = 1},/turf/simulated/floor{icon_state = "red"; dir = 10},/area/atmos) "caF" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "n2_in"; name = "Nitrogen Supply Control"; output_tag = "n2_out"; sensors = list("n2_sensor" = "Tank")},/turf/simulated/floor{icon_state = "red"},/area/atmos) "caG" = (/obj/machinery/atmospherics/pipe/simple{color = "green"; icon_state = "intact-g"; level = 2},/obj/machinery/meter,/turf/simulated/floor{icon_state = "red"; dir = 6},/area/atmos) "caH" = (/obj/machinery/light,/turf/simulated/floor,/area/atmos) -"caI" = (/obj/machinery/atmospherics/valve/digital{name = "Oxygen Outlet Valve"},/turf/simulated/floor{icon_state = "blue"; dir = 10},/area/atmos) +"caI" = (/obj/machinery/atmospherics/valve/digital{name = "Oxygen Outlet Valve"; openDuringInit = 1},/turf/simulated/floor{icon_state = "blue"; dir = 10},/area/atmos) "caJ" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "o2_in"; name = "Oxygen Supply Control"; output_tag = "o2_out"; sensors = list("o2_sensor" = "Tank")},/turf/simulated/floor{dir = 0; icon_state = "blue"},/area/atmos) "caK" = (/obj/machinery/atmospherics/pipe/simple{color = "green"; icon_state = "intact-g"; level = 2},/obj/machinery/meter,/turf/simulated/floor{icon_state = "blue"; dir = 6},/area/atmos) "caL" = (/obj/machinery/atmospherics/pipe/simple{color = "cyan"; dir = 5; icon_state = "intact-c"; level = 2},/obj/machinery/light,/turf/simulated/floor,/area/atmos) "caM" = (/obj/machinery/atmospherics/pipe/simple{color = "cyan"; dir = 10; icon_state = "intact-c"; initialize_directions = 10; level = 2},/obj/machinery/meter{frequency = 1443; id = "mair_meter"},/turf/simulated/floor{icon_state = "arrival"; dir = 10},/area/atmos) "caN" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1443; input_tag = "air_in"; name = "Mixed Air Supply Control"; output_tag = "air_out"; pressure_setting = 2000; sensors = list("air_sensor" = "Tank")},/turf/simulated/floor{icon_state = "arrival"},/area/atmos) -"caO" = (/obj/machinery/camera{c_tag = "Atmospherics South East"; dir = 1},/obj/machinery/atmospherics/valve/digital{name = "Mixed Air Outlet Valve"},/turf/simulated/floor{icon_state = "arrival"; dir = 6},/area/atmos) +"caO" = (/obj/machinery/camera{c_tag = "Atmospherics South East"; dir = 1},/obj/machinery/atmospherics/valve/digital{name = "Mixed Air Outlet Valve"; openDuringInit = 1},/turf/simulated/floor{icon_state = "arrival"; dir = 6},/area/atmos) "caP" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/unary/outlet_injector{dir = 4; icon_state = "on"; on = 1; pixel_y = 1},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) "caQ" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/binary/pump{dir = 8; icon_state = "intact_on"; on = 1},/obj/machinery/access_button{command = "cycle_exterior"; master_tag = "incinerator_access_control"; name = "Incinerator airlock control"; pixel_x = -24; pixel_y = 8},/obj/machinery/light,/obj/effect/sign/fire{pixel_y = -32},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) "caR" = (/obj/machinery/atmospherics/pipe/simple/insulated{icon_state = "intact"; dir = 4},/obj/machinery/meter,/obj/machinery/embedded_controller/radio/access_controller{exterior_door_tag = "incinerator_airlock_exterior"; id_tag = "incinerator_access_control"; interior_door_tag = "incinerator_airlock_interior"; name = "Incinerator Access Console"; pixel_y = -26; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/incinerator) diff --git a/tgstation.dme b/tgstation.dme index 31a11f2e34..39b1bcbe67 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -189,9 +189,7 @@ #define FILE_DIR "icons/vending_icons" #define FILE_DIR "interface" #define FILE_DIR "maps" -#define FILE_DIR "maps/backup" #define FILE_DIR "maps/RandomZLevels" -#define FILE_DIR "Redirector" #define FILE_DIR "sound" #define FILE_DIR "sound/AI" #define FILE_DIR "sound/ambience" @@ -204,6 +202,8 @@ #define FILE_DIR "sound/piano" #define FILE_DIR "sound/voice" #define FILE_DIR "sound/weapons" +#define FILE_DIR "tools" +#define FILE_DIR "tools/Redirector" // END_FILE_DIR // BEGIN_PREFERENCES