-Telecoms now has its own style of doors, to be more visibly unique from Space Station 13

-Added new Create Classified Report button for admins. It's a more discreet way for Centcom to communicate with the heads of staff without announcing it to the entire crew.
-Uncommented admin notices for cyborg lockdowns/releases

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4091 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
ericgfwong@hotmail.com
2012-07-16 19:44:05 +00:00
parent 6d9e3400ec
commit 627e5e295d
8 changed files with 1898 additions and 1854 deletions

View File

@@ -113,6 +113,9 @@
if(emagged) if(emagged)
message_admins("[key_name_admin(usr)] overrided the holodeck's safeties") message_admins("[key_name_admin(usr)] overrided the holodeck's safeties")
log_game("[key_name(usr)] overrided the holodeck's safeties") log_game("[key_name(usr)] overrided the holodeck's safeties")
else
message_admins("[key_name_admin(usr)] restored the holodeck's safeties")
log_game("[key_name(usr)] restored the holodeck's safeties")
src.add_fingerprint(usr) src.add_fingerprint(usr)
src.updateUsrDialog() src.updateUsrDialog()

View File

@@ -182,7 +182,7 @@
var/choice = input("Are you certain you wish to [R.canmove ? "lock down" : "release"] [R.name]?") in list("Confirm", "Abort") var/choice = input("Are you certain you wish to [R.canmove ? "lock down" : "release"] [R.name]?") in list("Confirm", "Abort")
if(choice == "Confirm") if(choice == "Confirm")
if(R && istype(R)) if(R && istype(R))
// message_admins("\blue [key_name_admin(usr)] [R.canmove ? "locked down" : "released"] [R.name]!") message_admins("\blue [key_name_admin(usr)] [R.canmove ? "locked down" : "released"] [R.name]!")
log_game("[key_name(usr)] [R.canmove ? "locked down" : "released"] [R.name]!") log_game("[key_name(usr)] [R.canmove ? "locked down" : "released"] [R.name]!")
R.canmove = !R.canmove R.canmove = !R.canmove
if (R.lockcharge) if (R.lockcharge)

View File

@@ -1136,6 +1136,8 @@ About the new airlock wires panel:
if(5) new/obj/structure/door_assembly/door_assembly_mai( src.loc ) if(5) new/obj/structure/door_assembly/door_assembly_mai( src.loc )
if(6) new/obj/structure/door_assembly/door_assembly_ext( src.loc ) if(6) new/obj/structure/door_assembly/door_assembly_ext( src.loc )
if(7) new/obj/structure/door_assembly/door_assembly_glass( src.loc ) if(7) new/obj/structure/door_assembly/door_assembly_glass( src.loc )
if(12) new/obj/structure/door_assembly/door_assembly_hatch( src.loc )
if(13) new/obj/structure/door_assembly/door_assembly_mhatch( src.loc )
if(14) new/obj/structure/door_assembly/door_assembly_com/glass( src.loc ) if(14) new/obj/structure/door_assembly/door_assembly_com/glass( src.loc )
if(15) new/obj/structure/door_assembly/door_assembly_eng/glass( src.loc ) if(15) new/obj/structure/door_assembly/door_assembly_eng/glass( src.loc )
if(16) new/obj/structure/door_assembly/door_assembly_sec/glass( src.loc ) if(16) new/obj/structure/door_assembly/door_assembly_sec/glass( src.loc )

View File

@@ -155,8 +155,17 @@ obj/structure/door_assembly
state = 1 state = 1
glass = 0 glass = 0
door_assembly_hatch
name = "Airtight Hatch Assembly"
icon_state = "door_as_hatch1"
airlock_type = /obj/machinery/door/airlock/hatch
anchored = 1
density = 1
state = 1
glass = 0
door_assembly_mhatch door_assembly_mhatch
name = "Airtight Maintenance Hatch Assembly" name = "Maintenance Hatch Assembly"
icon_state = "door_as_mhatch1" icon_state = "door_as_mhatch1"
airlock_type = /obj/machinery/door/airlock/maintenance_hatch airlock_type = /obj/machinery/door/airlock/maintenance_hatch
anchored = 1 anchored = 1

View File

@@ -152,6 +152,7 @@
verbs += /obj/admins/proc/restart //restart verbs += /obj/admins/proc/restart //restart
verbs += /client/proc/cmd_admin_check_contents verbs += /client/proc/cmd_admin_check_contents
verbs += /client/proc/cmd_admin_create_centcom_report verbs += /client/proc/cmd_admin_create_centcom_report
verbs += /client/proc/cmd_admin_classified_centcom_report
verbs += /client/proc/toggle_hear_deadcast verbs += /client/proc/toggle_hear_deadcast
verbs += /client/proc/toggle_hear_radio verbs += /client/proc/toggle_hear_radio
verbs += /client/proc/deadmin_self verbs += /client/proc/deadmin_self
@@ -365,6 +366,7 @@
verbs -= /client/proc/stealth verbs -= /client/proc/stealth
verbs -= /client/proc/cmd_admin_check_contents verbs -= /client/proc/cmd_admin_check_contents
verbs -= /client/proc/cmd_admin_create_centcom_report verbs -= /client/proc/cmd_admin_create_centcom_report
verbs -= /client/proc/cmd_admin_classified_centcom_report
verbs -= /client/proc/deadchat //toggles deadchat verbs -= /client/proc/deadchat //toggles deadchat
//verbs -= /client/proc/cmd_admin_mute --was never used (according to stats trackind) - use show player panel --erro //verbs -= /client/proc/cmd_admin_mute --was never used (according to stats trackind) - use show player panel --erro
verbs -= /client/proc/cmd_admin_pm_context verbs -= /client/proc/cmd_admin_pm_context

View File

@@ -571,6 +571,30 @@ Traitors and the like can also be revived with the previous role mostly intact.
message_admins("[key_name_admin(src)] has created a command report", 1) message_admins("[key_name_admin(src)] has created a command report", 1)
feedback_add_details("admin_verb","CCR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","CCR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_classified_centcom_report()
set category = "Special Verbs"
set name = "Create Classified Report"
if(!holder)
src << "Only administrators may use this command."
return
var/input = input(usr, "What do you want to say to the command staff?", "What?", "") as message|null
if(!input)
return
for (var/obj/machinery/computer/communications/C in machines)
if(! (C.stat & (BROKEN|NOPOWER) ) )
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc )
P.name = "paper- '[command_name()] Update.'"
P.info = input
C.messagetitle.Add("[command_name()] Update")
C.messagetext.Add(P.info)
command_alert("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message");
world << sound('commandreport.ogg')
log_admin("[key_name(src)] has created a classified command report: [input]")
message_admins("[key_name_admin(src)] has created a classified command report", 1)
feedback_add_details("admin_verb","CCCR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_delete(atom/O as obj|mob|turf in world) /client/proc/cmd_admin_delete(atom/O as obj|mob|turf in world)
set category = "Admin" set category = "Admin"
set name = "Delete" set name = "Delete"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 33 KiB

File diff suppressed because it is too large Load Diff