cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added debug information (to the log with ooc and all that, feel free to make it actually make an error) for when the scrubber and distro atmos loops are directly linked at round start, fixed a thing where someone left multiple pipes with the same dir in a brig cell, causing pipes to freak the hell out

Browse Source
This commit is contained in:
Miniature
2012-02-26 02:35:58 +10:30
parent 0df0b9bf5e
commit caafe64e68
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/ATMOSPHERICS/pipes.dm
View File

@@ -253,11 +253,19 @@ obj/machinery/atmospherics/pipe
name="Scrubbers pipe" name="Scrubbers pipe"
color="red" color="red"
icon_state = "" icon_state = ""
initialize()
..()
if(istype(node1, /obj/machinery/atmospherics/pipe/simple/supply) || istype(node1, /obj/machinery/atmospherics/pipe/simple/supply))
log_admin("Warning, scrubber pipeline connected to supply pipeline at [x], [y], [z]!")
simple/supply simple/supply
name="Air supply pipe" name="Air supply pipe"
color="blue" color="blue"
icon_state = "" icon_state = ""
initialize()
..()
if(istype(node1, /obj/machinery/atmospherics/pipe/simple/scrubbers) || istype(node1, /obj/machinery/atmospherics/pipe/simple/scrubbers))
log_admin("Warning, supply pipeline connected to scrubber pipeline at [x], [y], [z]!")
simple/supplymain simple/supplymain
name="Main air supply pipe" name="Main air supply pipe"

6
maps/tgstation.2.0.8.dmm
View File

@@ -505,8 +505,8 @@
"ajK" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Secure Gate"; name = "Security Blast Door"; opacity = 0},/obj/structure/cable,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/security/brig) "ajK" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Secure Gate"; name = "Security Blast Door"; opacity = 0},/obj/structure/cable,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/security/brig)
"ajL" = (/obj/structure/stool/bed,/obj/machinery/camera{c_tag = "Secure Cell 1"; dir = 4; name = "Security Camera"; network = "Security"},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor{icon_state = "dark"},/area/security/brig) "ajL" = (/obj/structure/stool/bed,/obj/machinery/camera{c_tag = "Secure Cell 1"; dir = 4; name = "Security Camera"; network = "Security"},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor{icon_state = "dark"},/area/security/brig)
"ajM" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{icon_state = "dark"},/area/security/brig) "ajM" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{icon_state = "dark"},/area/security/brig)
"ajN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/security/brig) "ajN" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/security/brig)
"ajO" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable,/turf/simulated/floor/plating,/area/security/brig) "ajO" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable,/turf/simulated/floor/plating,/area/security/brig)
"ajP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = -1},/turf/simulated/floor,/area/security/brig) "ajP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = -1},/turf/simulated/floor,/area/security/brig)
"ajQ" = (/obj/structure/table,/obj/item/weapon/book/manual/security_space_law,/obj/item/clothing/glasses/sunglasses,/turf/simulated/floor,/area/security/brig) "ajQ" = (/obj/structure/table,/obj/item/weapon/book/manual/security_space_law,/obj/item/clothing/glasses/sunglasses,/turf/simulated/floor,/area/security/brig)
"ajR" = (/obj/structure/table,/obj/item/device/radio,/turf/simulated/floor,/area/security/brig) "ajR" = (/obj/structure/table,/obj/item/device/radio,/turf/simulated/floor,/area/security/brig)
@@ -523,7 +523,7 @@
"akc" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/solar{id = "auxsolareast"; name = "Port Auxiliary Solar Array"},/turf/simulated/floor/airless{icon_state = "solarpanel"},/area/solar/auxport) "akc" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/solar{id = "auxsolareast"; name = "Port Auxiliary Solar Array"},/turf/simulated/floor/airless{icon_state = "solarpanel"},/area/solar/auxport)
"akd" = (/obj/structure/cable,/turf/simulated/floor/plating/airless,/area/solar/auxport) "akd" = (/obj/structure/cable,/turf/simulated/floor/plating/airless,/area/solar/auxport)
"ake" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Secure Gate"; name = "Security Blast Door"; opacity = 0},/obj/structure/cable,/turf/simulated/floor/plating,/area/security/brig) "ake" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Secure Gate"; name = "Security Blast Door"; opacity = 0},/obj/structure/cable,/turf/simulated/floor/plating,/area/security/brig)
"akf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "SC1"; name = "Secure Cell 1 Blast Door"; opacity = 0},/obj/machinery/door/airlock/glass/glass_security{name = "Secure Holding Cell 1"; req_access_txt = "1"},/turf/simulated/floor{icon_state = "red"; dir = 8},/area/security/brig) "akf" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "SC1"; name = "Secure Cell 1 Blast Door"; opacity = 0},/obj/machinery/door/airlock/glass/glass_security{name = "Secure Holding Cell 1"; req_access_txt = "1"},/turf/simulated/floor{icon_state = "red"; dir = 8},/area/security/brig)
"akg" = (/obj/structure/table,/obj/item/device/flash,/turf/simulated/floor,/area/security/brig) "akg" = (/obj/structure/table,/obj/item/device/flash,/turf/simulated/floor,/area/security/brig)
"akh" = (/obj/structure/table,/obj/item/weapon/crowbar,/turf/simulated/floor,/area/security/brig) "akh" = (/obj/structure/table,/obj/item/weapon/crowbar,/turf/simulated/floor,/area/security/brig)
"aki" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 4; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "redcorner"; dir = 1},/area/hallway/primary/fore) "aki" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 4; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "redcorner"; dir = 1},/area/hallway/primary/fore)