From 201cf2c66b8b81dca2a9357d04d2698f329e687d Mon Sep 17 00:00:00 2001 From: Leo Date: Mon, 16 Oct 2017 19:23:07 -0200 Subject: [PATCH 1/2] Merge pull request #31771 from tgstation/Cyberboss-patch-5 Fixes atmos machinery examine --- code/modules/atmospherics/machinery/atmosmachinery.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm index ce68eecdc9..f941e2b7d4 100644 --- a/code/modules/atmospherics/machinery/atmosmachinery.dm +++ b/code/modules/atmospherics/machinery/atmosmachinery.dm @@ -34,10 +34,12 @@ Pipelines + Other Objects -> Pipe network var/device_type = 0 var/list/obj/machinery/atmospherics/nodes -/obj/machinery/atmospherics/examine(mob/living/user) +/obj/machinery/atmospherics/examine(mob/user) ..() - if(is_type_in_list(src, GLOB.ventcrawl_machinery) && user.ventcrawler) - to_chat(user, "Alt-click to crawl through it.") + if(is_type_in_list(src, GLOB.ventcrawl_machinery) && isliving(user)) + var/mob/living/L = user + if(L.ventcrawler) + to_chat(L, "Alt-click to crawl through it.") /obj/machinery/atmospherics/New(loc, process = TRUE) nodes = new(device_type)