From 6b4d8ec0b33c467c546dda09647dfd9fed45d537 Mon Sep 17 00:00:00 2001 From: Krausus Date: Thu, 14 May 2015 07:23:26 -0400 Subject: [PATCH] Fixes medical item runtime and a line git ate That line was pretty important, git. Why, git. --- code/game/gamemodes/nuclear/pinpointer.dm | 1 + code/game/objects/items/stacks/medical.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index fd37ab28159..9b7a5eabf9f 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -366,6 +366,7 @@ for(var/mob/living/carbon/M in mob_list) if(M.mind in ticker.mode.syndicates) nearest_op = M + if(!nearest_op) // There are simply no operatives left to point to active = 0 icon_state = "pinoff" diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 884bf6ebb8a..979330345cc 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -28,7 +28,7 @@ if(!M.can_inject(user, 1)) return 1 - if(affecting.status & ORGAN_ROBOT) + if(affecting && (affecting.status & ORGAN_ROBOT)) user << "This can't be used on a robotic limb." return 1