cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

Browse Source 
Conflicts:
	code/modules/admin/verbs/adminsay.dm
This commit is contained in:
Zuhayr
2015-08-26 03:09:11 +09:30
parent 11356833a4 2a38a18c4c
commit f4d27e8b1c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/jobs/job/security.dm
View File

@@ -86,7 +86,7 @@
department = "Security" department = "Security"
department_flag = ENGSEC department_flag = ENGSEC
faction = "Station" faction = "Station"
total_positions = 1 total_positions = 2
spawn_positions = 2 spawn_positions = 2
supervisors = "the head of security" supervisors = "the head of security"
selection_color = "#ffeeee" selection_color = "#ffeeee"

4
code/modules/admin/verbs/adminsay.dm
View File

@@ -7,7 +7,7 @@
msg = sanitize(msg) msg = sanitize(msg)
if(!msg) return if(!msg) return
log_admin("[key_name(src)] : [msg]") log_admin("ADMIN: [key_name(src)] : [msg]")
if(check_rights(R_ADMIN,0)) if(check_rights(R_ADMIN,0))
for(var/client/C in admins) for(var/client/C in admins)
@@ -33,6 +33,6 @@
if(check_rights(R_ADMIN, 0)) if(check_rights(R_ADMIN, 0))
sender_name = "<span class='admin'>[sender_name]</span>" sender_name = "<span class='admin'>[sender_name]</span>"
for(var/client/C in admins) for(var/client/C in admins)
C << "<span class='mod_channel'>" + create_text_tag("mod", "MOD:", C) + " <span class='name'>[sender_name]</span>([admin_jump_link(mob, C.holder)]): <span class='message'>[msg]</span></span>" C << "<span class='mod_channel'>" + create_text_tag("mod", "MOD:", C) + " <span class='name'>[key_name(usr, 1)]</span>([admin_jump_link(mob, C.holder)]): <span class='message'>[msg]</span></span>"
feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!