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

Merge pull request #2015 from Neerti/12/16/2015_newwizard

Browse Source 
Dry-dock phase for Technomancer
This commit is contained in:
Yoshax
2016-07-10 03:43:35 +01:00
committed by GitHub
parent bd306efd6a 9e67df09f0
commit e28c4361f7
122 changed files with 8414 additions and 2989 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/_helpers/game.dm
View File

@@ -156,7 +156,7 @@
// It will keep doing this until it checks every content possible. This will fix any problems with mobs, that are inside objects,
// being unable to hear people due to being in a box within a bag.
/proc/recursive_content_check(var/atom/O, var/list/L = list(), var/recursion_limit = 3, var/client_check = 1, var/sight_check = 1, var/include_mobs = 1, var/include_objects = 1)
/proc/recursive_content_check(var/atom/O, var/list/L = list(), var/recursion_limit = 3, var/client_check = 1, var/sight_check = 1, var/include_mobs = 1, var/include_objects = 1, var/ignore_show_messages = 0)
if(!recursion_limit)
return L
@@ -176,7 +176,7 @@
else if(istype(I,/obj/))
var/obj/check_obj = I
if(check_obj.show_messages)
if(ignore_show_messages || check_obj.show_messages)
if(!sight_check || isInSight(I, O))
L |= recursive_content_check(I, L, recursion_limit - 1, client_check, sight_check, include_mobs, include_objects)
if(include_objects)