From 9df13a2a9a0b657f749461b316ac7f9d17c02336 Mon Sep 17 00:00:00 2001 From: bgobandit Date: Thu, 6 Aug 2015 18:14:05 -0400 Subject: [PATCH 1/2] Mobs can no longer ventcrawl while buckled to a pipe, nor can they attempt to ventcrawl in handcuffs. --- code/ATMOSPHERICS/atmospherics.dm | 3 +++ code/modules/mob/living/ventcrawling.dm | 3 +++ 2 files changed, 6 insertions(+) diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm index 55c3a043756..1f590ab2d4d 100644 --- a/code/ATMOSPHERICS/atmospherics.dm +++ b/code/ATMOSPHERICS/atmospherics.dm @@ -203,6 +203,9 @@ Pipelines + Other Objects -> Pipe network if(!(direction & initialize_directions)) //cant go this way. return + if(buckled_mob) // fixes buckle ventcrawl edgecase fuck bug + return + var/obj/machinery/atmospherics/target_move = findConnecting(direction) if(target_move) if(is_type_in_list(target_move, ventcrawl_machinery) && target_move.can_crawl_through()) diff --git a/code/modules/mob/living/ventcrawling.dm b/code/modules/mob/living/ventcrawling.dm index d0b506f1a12..c0531581a36 100644 --- a/code/modules/mob/living/ventcrawling.dm +++ b/code/modules/mob/living/ventcrawling.dm @@ -12,6 +12,9 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/components/unary if(lying) src << "You can't vent crawl while you're stunned!" return + if(restrained()) + src << "You can't vent crawl while you're restrained!" + return var/obj/machinery/atmospherics/components/unary/vent_found From 08ec6a90e19f993c59ee5a451029c892da093f70 Mon Sep 17 00:00:00 2001 From: bgobandit Date: Thu, 6 Aug 2015 18:21:06 -0400 Subject: [PATCH 2/2] h o n k --- code/ATMOSPHERICS/atmospherics.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm index 1f590ab2d4d..bdaafcfde61 100644 --- a/code/ATMOSPHERICS/atmospherics.dm +++ b/code/ATMOSPHERICS/atmospherics.dm @@ -203,7 +203,7 @@ Pipelines + Other Objects -> Pipe network if(!(direction & initialize_directions)) //cant go this way. return - if(buckled_mob) // fixes buckle ventcrawl edgecase fuck bug + if(buckled_mob == user) // fixes buckle ventcrawl edgecase fuck bug return var/obj/machinery/atmospherics/target_move = findConnecting(direction)