[MIRROR] Fixes hole in ventcrawl logic [MDB IGNORE] (#143)

* Fixes hole in ventcrawl logic (#79027) --------- Co-authored-by: san7890 <[email protected]>
Fluffy-Frontier · Oct 19, 2023 · 397fbde · 397fbde
1 parent 845e99e
commit 397fbde
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/code/modules/mob/living/ventcrawling.dm b/code/modules/mob/living/ventcrawling.dm
@@ -61,7 +61,10 @@
 			return
 		if(!do_after(src, 1 SECONDS, target = ventcrawl_target))
 			return
-		visible_message(span_notice("[src] scrambles out from the ventilation ducts!"),span_notice("You scramble out from the ventilation ducts."))
+		if(ventcrawl_target.welded) // in case it got welded during our sleep
+			to_chat(src, span_warning("You can't crawl around a welded vent!"))
+			return
+		visible_message(span_notice("[src] scrambles out from the ventilation ducts!"), span_notice("You scramble out from the ventilation ducts."))
 		forceMove(ventcrawl_target.loc)
 		REMOVE_TRAIT(src, TRAIT_MOVE_VENTCRAWLING, VENTCRAWLING_TRAIT)
 		update_pipe_vision()
@@ -76,8 +79,11 @@
 				return
 			if(has_client && isnull(client))
 				return
+			if(ventcrawl_target.welded) // in case it got welded during our sleep
+				to_chat(src, span_warning("You can't crawl around a welded vent!"))
+				return
 			ventcrawl_target.flick_overlay_static(image('icons/effects/vent_indicator.dmi', "insert", ABOVE_MOB_LAYER), 1 SECONDS)
-			visible_message(span_notice("[src] scrambles into the ventilation ducts!"),span_notice("You climb into the ventilation ducts."))
+			visible_message(span_notice("[src] scrambles into the ventilation ducts!"), span_notice("You climb into the ventilation ducts."))
 			move_into_vent(ventcrawl_target)
 		else
 			to_chat(src, span_warning("This ventilation duct is not connected to anything!"))