cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-03 14:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/modules/mob/mob.dm
This commit is contained in:
PsiOmega
2015-04-03 09:33:05 +02:00
parent ec80cd8340 224cccac68
commit 8e55ad8114
25 changed files with 742 additions and 668 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/admin/admin_verbs.dm
View File

@@ -869,7 +869,8 @@ var/list/admin_verbs_mentor = list(
var/job = input("Please select job slot to free", "Free job slot") as null|anything in jobs
if (job)
job_master.FreeRole(job)
return
message_admins("A job slot for [job] has been opened by [key_name_admin(usr)]")
return
/client/proc/toggleattacklogs()
set name = "Toggle Attack Log Messages"