From f3df4e67bd368282b91ec438999eca66b8b26c98 Mon Sep 17 00:00:00 2001 From: phil235 Date: Sun, 14 Dec 2014 19:18:13 +0100 Subject: [PATCH] Fixes monkey being able to ventcrawl if stunned after the ventcrawl action is initiated. Also changes ventcrawl messages to use visible_message() and audible_message(). --- code/ATMOSPHERICS/components/unary/vent_pump.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm index d1f7f9c1e23..a03cc9b3656 100644 --- a/code/ATMOSPHERICS/components/unary/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm @@ -345,9 +345,10 @@ return var/obj/selection = input(L,"Select a destination.", "Duct System") as null|anything in sortList(vents) - if(!selection) return + if(!selection) + return - if(!Adjacent(L)) + if(!Adjacent(L) || L.stat || L.lying || !L.ventcrawler || welded) return if(iscarbon(L) && L.ventcrawler < 2) // lesser ventcrawlers can't bring items for(var/obj/item/carried_item in L.contents) @@ -359,11 +360,10 @@ if(!target_vent) return - for(var/mob/O in viewers(L, null)) - O.show_message(text("[L] scrambles into the ventilation ducts!"), 1) + L.visible_message("[L] scrambles into the ventilation ducts!", \ + "You scramble into the ventilation ducts.") - for(var/mob/O in hearers(target_vent,null)) - O.show_message("You hear something squeezing through the ventilation ducts.",2) + target_vent.audible_message("You hear something squeezing through the ventilation ducts.") if(target_vent.welded) //the vent can be welded while they scrolled through the list. target_vent = src