Merge pull request #9126 from Jordie0608/doesrussellsteapotapplytorussellsteapot

Fixes #9035, atmos locker sprite and misc logging bug
This commit is contained in:
phil235
2015-05-08 16:24:21 +02:00
4 changed files with 6 additions and 6 deletions
+3 -3
View File
@@ -1800,6 +1800,9 @@
if(delete_mobs == "Cancel")
return
log_admin("[key_name(usr)] reset the thunderdome to default with delete_mobs==[delete_mobs].", 1)
message_admins("<span class='adminnotice'>[key_name_admin(usr)] reset the thunderdome to default with delete_mobs==[delete_mobs].</span>")
var/area/thunderdome = locate(/area/tdome/arena)
if(delete_mobs == "Yes")
for(var/mob/living/mob in thunderdome)
@@ -1811,9 +1814,6 @@
var/area/template = locate(/area/tdome/arena_source)
template.copy_contents_to(thunderdome)
log_admin("[key_name(usr)] reset the thunderdome to default with delete_mobs==[delete_mobs].", 1)
message_admins("<span class='adminnotice'>[key_name_admin(usr)] reset the thunderdome to default with delete_mobs==[delete_mobs].</span>")
if("monkey")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","M")