mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 08:08:49 +01:00
Merge pull request #14894 from MrStonedOne/patch-131
Partial revert of 14756 (Pipes don't transport air across time and space
This commit is contained in:
@@ -277,27 +277,9 @@ Pipelines + Other Objects -> Pipe network
|
||||
/obj/machinery/atmospherics/proc/returnPipenets()
|
||||
return list()
|
||||
|
||||
/obj/machinery/atmospherics/onShuttleMove()
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
|
||||
for(DEVICE_TYPE_LOOP)
|
||||
dealWithShuttleStuff(I)
|
||||
atmosinit() //we've moved, so what once was next to us may not be
|
||||
build_network()
|
||||
|
||||
/obj/machinery/atmospherics/proc/dealWithShuttleStuff(I)
|
||||
var/obj/machinery/atmospherics/node = NODE_I
|
||||
var/turf/node_turf = get_turf(node)
|
||||
var/turf/self_turf = get_turf(src)
|
||||
if(node_turf.loc != self_turf.loc) //shuttles are area based, so this means the node is not on the shuttle with us
|
||||
node.disconnect(src)
|
||||
NODE_I = null
|
||||
|
||||
/obj/machinery/atmospherics/update_remote_sight(mob/user)
|
||||
user.sight |= (SEE_TURFS|BLIND)
|
||||
|
||||
//Used for certain children of obj/machinery/atmospherics to not show pipe vision when mob is inside it.
|
||||
/obj/machinery/atmospherics/proc/can_see_pipes()
|
||||
return 1
|
||||
return 1
|
||||
|
||||
@@ -160,10 +160,6 @@ Helpers
|
||||
for(DEVICE_TYPE_LOOP)
|
||||
. += returnPipenet(NODE_I)
|
||||
|
||||
/obj/machinery/atmospherics/components/dealWithShuttleStuff(I)
|
||||
..()
|
||||
nullifyPipenet(PARENT_I)
|
||||
|
||||
/*
|
||||
UI Stuff
|
||||
*/
|
||||
@@ -172,4 +168,5 @@ UI Stuff
|
||||
if(allowed(user))
|
||||
return ..()
|
||||
user << "<span class='danger'>Access denied.</span>"
|
||||
return UI_CLOSE
|
||||
return UI_CLOSE
|
||||
|
||||
|
||||
Reference in New Issue
Block a user