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

Further tweaks to my tweak, it is now working as intended with no unintended side-effects.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@179 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
n3ophyt3@gmail.com
2010-09-26 20:22:55 +00:00
parent b5f007b897
commit f7cc37e445
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/defines/procs/helpers.dm
View File

@@ -584,13 +584,7 @@
var/list/mob_list = list() var/list/mob_list = list()
for(var/mob/living/silicon/ai/M in world) for(var/mob/living/silicon/ai/M in world)
if(ticker) mob_list.Add(M)
if(ticker.mode == "AI malfunction")
var/datum/game_mode/malfunction/malf = ticker.mode
for (var/datum/mind/B in malf.malf_ai)
if (M.mind == B)
else mob_list.Add(M)
else mob_list.Add(M)
for(var/mob/living/silicon/robot/M in world) for(var/mob/living/silicon/robot/M in world)
mob_list.Add(M) mob_list.Add(M)
for(var/mob/living/carbon/human/M in world) for(var/mob/living/carbon/human/M in world)

14
code/modules/mob/mob.dm
View File

@@ -1323,7 +1323,7 @@
names.Add(name) names.Add(name)
namecounts[name] = 1 namecounts[name] = 1
creatures[name] = B creatures[name] = B
/*
for (var/mob/living/silicon/decoy/D in world) for (var/mob/living/silicon/decoy/D in world)
var/name = "[D.name]" var/name = "[D.name]"
if (name in names) if (name in names)
@@ -1333,7 +1333,7 @@
names.Add(name) names.Add(name)
namecounts[name] = 1 namecounts[name] = 1
creatures[name] = D creatures[name] = D
*/
@@ -1365,6 +1365,16 @@
src.reset_view(null) src.reset_view(null)
client.adminobs = 0 client.adminobs = 0
else else
if(ticker)
// world << "there's a ticker"
if(ticker.mode.name == "AI malfunction")
// world << "ticker says its malf"
var/datum/game_mode/malfunction/malf = ticker.mode
for (var/datum/mind/B in malf.malf_ai)
// world << "comparing [B.current] to [eye]"
if (B.current == eye)
for (var/mob/living/silicon/decoy/D in world)
eye = D
if (eye) if (eye)
src.client.eye = eye src.client.eye = eye
else else