shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10998 from Ghommie/Ghommie-cit569

Browse Source 
Something about the in operator and spaceDMM version update.
This commit is contained in:
kevinz000
2020-02-15 12:17:37 -07:00
committed by GitHub
parent ee9b38017e c34714cb90
commit 7ee04aa608
36 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/game.dm
+1 -1
View File
@@ -436,7 +436,7 @@
var/list/result = list()
for(var/m in group)
var/mob/M = m
if(!M.key || !M.client || (ignore_category && GLOB.poll_ignore[ignore_category] && M.ckey in GLOB.poll_ignore[ignore_category]))
if(!M.key || !M.client || (ignore_category && GLOB.poll_ignore[ignore_category] && (M.ckey in GLOB.poll_ignore[ignore_category])))
continue
if(be_special_flag)
if(!(M.client.prefs) || !(be_special_flag in M.client.prefs.be_special))
code/__HELPERS/mobs.dm
+1 -1
View File
@@ -529,7 +529,7 @@ GLOBAL_LIST_EMPTY(species_list)
continue
if(M.stat != DEAD && !override)
continue
if(speaker_key && speaker_key in prefs.ignoring)
if(speaker_key && (speaker_key in prefs.ignoring))
continue
switch(message_type)