Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
This commit is contained in:
@@ -58,6 +58,10 @@
|
||||
if (CONFIG_GET(flag/log_game))
|
||||
WRITE_LOG(GLOB.world_game_log, "GAME: [text]")
|
||||
|
||||
/proc/log_virus(text)
|
||||
if (CONFIG_GET(flag/log_virus))
|
||||
WRITE_LOG(GLOB.world_virus_log, "VIRUS: [text]")
|
||||
|
||||
/proc/log_access(text)
|
||||
if (CONFIG_GET(flag/log_access))
|
||||
WRITE_LOG(GLOB.world_game_log, "ACCESS: [text]")
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
for(var/file in args)
|
||||
src << browse_rsc(file)
|
||||
|
||||
/client/proc/browse_files(root="data/logs/", max_iterations=10, list/valid_extensions=list("txt","log","htm", "html"))
|
||||
/client/proc/browse_files(root="data/logs/", max_iterations=10, list/valid_extensions=list("txt","log","htm", "html", "md"))
|
||||
var/path = root
|
||||
|
||||
for(var/i=0, i<max_iterations, i++)
|
||||
|
||||
@@ -159,6 +159,44 @@
|
||||
processing_list.Cut(1, 2)
|
||||
processing_list += A.contents
|
||||
|
||||
/** recursive_organ_check
|
||||
* inputs: O (object to start with)
|
||||
* outputs:
|
||||
* description: A pseudo-recursive loop based off of the recursive mob check, this check looks for any organs held
|
||||
* within 'O', toggling their frozen flag. This check excludes items held within other safe organ
|
||||
* storage units, so that only the lowest level of container dictates whether we do or don't decompose
|
||||
*/
|
||||
/proc/recursive_organ_check(atom/O)
|
||||
|
||||
var/list/processing_list = list(O)
|
||||
var/list/processed_list = list()
|
||||
var/index = 1
|
||||
var/obj/item/organ/found_organ
|
||||
|
||||
while(index <= length(processing_list))
|
||||
|
||||
var/atom/A = processing_list[index]
|
||||
|
||||
if(istype(A, /obj/item/organ))
|
||||
found_organ = A
|
||||
found_organ.organ_flags ^= ORGAN_FROZEN
|
||||
|
||||
else if(istype(A, /mob/living/carbon))
|
||||
var/mob/living/carbon/Q = A
|
||||
for(var/organ in Q.internal_organs)
|
||||
found_organ = organ
|
||||
found_organ.organ_flags ^= ORGAN_FROZEN
|
||||
|
||||
for(var/atom/B in A) //objects held within other objects are added to the processing list, unless that object is something that can hold organs safely
|
||||
if(!processed_list[B] && !istype(B, /obj/structure/closet/crate/freezer) && !istype(B, /obj/structure/closet/secure_closet/freezer))
|
||||
processing_list+= B
|
||||
|
||||
index++
|
||||
processed_list[A] = A
|
||||
|
||||
return
|
||||
|
||||
|
||||
// Better recursive loop, technically sort of not actually recursive cause that shit is retarded, enjoy.
|
||||
//No need for a recursive limit either
|
||||
/proc/recursive_mob_check(atom/O,client_check=1,sight_check=1,include_radio=1)
|
||||
|
||||
Reference in New Issue
Block a user