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

Merge branch 'master' into upstream-merge-32188

Browse Source
This commit is contained in:
deathride58
2017-11-18 05:31:42 +00:00
committed by GitHub
parent bc1f65b381 9e78bcd8f9
commit eeba86e27e
109 changed files with 452 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/debug.dm
+1 -1
View File
@@ -741,7 +741,7 @@ GLOBAL_PROTECT(LastAdminCalledProc)
if("Mobs")
to_chat(usr, jointext(GLOB.mob_list,","))
if("Living Mobs")
to_chat(usr, jointext(GLOB.living_mob_list,","))
to_chat(usr, jointext(GLOB.alive_mob_list,","))
if("Dead Mobs")
to_chat(usr, jointext(GLOB.dead_mob_list,","))
if("Clients")
code/modules/admin/verbs/randomverbs.dm
+2 -2
View File
@@ -1006,7 +1006,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
if(confirm != "Yes")
return
for(var/mob/living/carbon/human/H in GLOB.mob_list)
for(var/mob/living/carbon/human/H in GLOB.carbon_list)
new /obj/item/organ/zombie_infection(H)
message_admins("[key_name_admin(usr)] added a latent zombie infection to all humans.")
@@ -1043,7 +1043,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
if(confirm != "Yes")
return
var/list/mobs = shuffle(GLOB.living_mob_list.Copy()) // might change while iterating
var/list/mobs = shuffle(GLOB.alive_mob_list.Copy()) // might change while iterating
var/who_did_it = key_name_admin(usr)
message_admins("[key_name_admin(usr)] started polymorphed all living mobs.")