From 35fbc6b1c72aba76517d5fa74e3b9101ceb2fd2c Mon Sep 17 00:00:00 2001 From: "giacomand@gmail.com" Date: Fri, 18 Jan 2013 10:51:41 +0000 Subject: [PATCH] - Implant pads will no longer be stuck inside your pocket. Fixes Issue 1058. - The free objective for cultists will be an automatic success. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5573 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/gamemodes/cult/cult.dm | 2 +- code/game/objects/items/weapons/implants/implantpad.dm | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index f973540303..ecd28fbb9c 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -280,7 +280,7 @@ if(objectives.Find("eldergod")) cult_fail += eldergod //1 by default, 0 if the elder god has been summoned at least once if(objectives.Find("sacrifice")) - if(!sacrificed.Find(sacrifice_target)) //if the target has been sacrificed, ignore this step. otherwise, add 1 to cult_fail + if(sacrifice_target && !sacrificed.Find(sacrifice_target)) //if the target has been sacrificed, ignore this step. otherwise, add 1 to cult_fail cult_fail++ return cult_fail //if any objectives aren't met, failure diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm index f3f0032cd6..476ed726cd 100644 --- a/code/game/objects/items/weapons/implants/implantpad.dm +++ b/code/game/objects/items/weapons/implants/implantpad.dm @@ -34,12 +34,7 @@ src.add_fingerprint(user) update() else - if (user.contents.Find(src)) - spawn( 0 ) - src.attack_self(user) - return - else - return ..() + return ..() return