Merge remote-tracking branch 'upstream/master'

code/modules/admin/admin.dm

@@ -2152,7 +2152,7 @@
 		feedback_set_details("round_end","[time2text(world.realtime)]")
 		if(blackbox)
 			blackbox.save_all_data_to_sql()
-
+		//send2irc(world.url,"Server Rebooting!")
 		sleep(50)
 		world.Reboot()
 

code/modules/mob/mob.dm

@@ -678,7 +678,7 @@
 		world.update_status()
 
 	..()
-
+	makejson()
 	if (join_motd)
 		src << "<div class=\"motd\">[join_motd]</div>"
 
@@ -696,6 +696,7 @@
 	spawn(0)
 		if(holder)
 			del(holder)
+	makejson()
 	return ..()
 
 /mob/proc/can_use_hands()