cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Implant pads will no longer be stuck inside your pocket. Fixes Issue 1058.

Browse Source 
- 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
This commit is contained in:
giacomand@gmail.com
2013-01-18 10:51:41 +00:00
parent f873b86b35
commit 35fbc6b1c7
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/gamemodes/cult/cult.dm
View File

@@ -280,7 +280,7 @@
if(objectives.Find("eldergod")) if(objectives.Find("eldergod"))
cult_fail += eldergod //1 by default, 0 if the elder god has been summoned at least once cult_fail += eldergod //1 by default, 0 if the elder god has been summoned at least once
if(objectives.Find("sacrifice")) 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++ cult_fail++
return cult_fail //if any objectives aren't met, failure return cult_fail //if any objectives aren't met, failure

7
code/game/objects/items/weapons/implants/implantpad.dm
View File

@@ -34,12 +34,7 @@
src.add_fingerprint(user) src.add_fingerprint(user)
update() update()
else else
if (user.contents.Find(src)) return ..()
spawn( 0 )
src.attack_self(user)
return
else
return ..()
return return