From 7c1d8f9d1c66ac8d52354d68b74ac159d0c7ae3c Mon Sep 17 00:00:00 2001
From: Vi3trice <80771500+Vi3trice@users.noreply.github.com>
Date: Thu, 20 Oct 2022 14:32:51 -0400
Subject: [PATCH] Get it together (#19444)

---
 code/modules/atmospherics/machinery/pipes/pipe.dm | 5 +++++
 code/modules/mob/living/carbon/carbon.dm          | 5 ++++-
 code/modules/mob/living/logout.dm                 | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/code/modules/atmospherics/machinery/pipes/pipe.dm b/code/modules/atmospherics/machinery/pipes/pipe.dm
index 70972f8b050..cf8ec102506 100644
--- a/code/modules/atmospherics/machinery/pipes/pipe.dm
+++ b/code/modules/atmospherics/machinery/pipes/pipe.dm
@@ -38,6 +38,11 @@
 		qdel(parent)
 	parent = null
 
+/obj/machinery/atmospherics/pipe/returnPipenet(obj/machinery/atmospherics/A)
+	if(A)
+		return // It's called by a moving mob that's already in the pipenet
+	return parent
+
 /obj/machinery/atmospherics/pipe/detailed_examine()
 	return "This pipe, and all other pipes, can be connected or disconnected by a wrench. The internal pressure of the pipe must \
 			be below 300 kPa to do this. More pipes can be obtained from the pipe dispenser.<br> \
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 767ba85ecbb..3d178da80e0 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -548,7 +548,10 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
 	return
 
 /mob/living/update_pipe_vision(obj/machinery/atmospherics/target_move)
-	if(pipes_shown.len && !(target_move))
+	if(!client) 
+		pipes_shown.Cut()
+		return
+	if(length(pipes_shown) && !target_move)
 		if(!is_ventcrawling(src))
 			remove_ventcrawl()
 	else
diff --git a/code/modules/mob/living/logout.dm b/code/modules/mob/living/logout.dm
index fa0d6f4e456..142d3f9f600 100644
--- a/code/modules/mob/living/logout.dm
+++ b/code/modules/mob/living/logout.dm
@@ -3,6 +3,7 @@
 	if(ranged_ability && client)
 		ranged_ability.remove_mousepointer(client)
 	..()
+	update_pipe_vision()
 	if(mind)
 		if(!key) //key and mind have become seperated. I believe this is for when a staff member aghosts.
 			mind.active = FALSE	//This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body.