cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into whocodesthecodemen

Browse Source 
Conflicts:
	code/modules/admin/verbs/pray.dm
This commit is contained in:
Jordie0608
2015-06-16 17:24:20 +10:00
parent 34fb8cc8bc 841765e4f4
commit 0bf6f09969
197 changed files with 1950 additions and 1023 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/admin/topic.dm
View File

@@ -1337,7 +1337,7 @@
sleep(5)
M.loc = pick(tdomeobserve)
spawn(50)
M << "<span class='adminnotice'> You have been sent to the Thunderdome.</span>"
M << "<span class='adminnotice'>You have been sent to the Thunderdome.</span>"
log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Observer.)")
message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Observer.)")