cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 09:31:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed inconsistencies in Requests Consoles names and department types. (#6923)

Browse Source 
As reported here #6909 there were a few Requests Consoles that didn't have correct Department names.
This pull request fixes that, sets proper Department Types for a few Request Consoles and also makes the Requests Consoles' names more consistent in general by adding the 's' to 'Requests' everywhere.

Fixes #6909
This commit is contained in:
Panter
2019-08-30 21:05:27 +02:00
committed by Erki
parent 50279385cf
commit 2bb959da4c
13 changed files with 73 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/jobs/access_datum.dm
View File

@@ -341,7 +341,7 @@
desc = "Head of Security"
region = ACCESS_REGION_SECURITY
/var/const/access_RC_announce = 59 //Request console announcements
/var/const/access_RC_announce = 59 //Requests console announcements
/datum/access/RC_announce
id = access_RC_announce
desc = "RC Announcements"

14
code/game/machinery/computer/message.dm
View File

@@ -2,7 +2,7 @@
/obj/machinery/computer/message_monitor
name = "messaging monitor console"
desc = "Used to access and maintain data on messaging servers. Allows you to view PDA and request console messages."
desc = "Used to access and maintain data on messaging servers. Allows you to view PDA and requests console messages."
icon_screen = "comm_logs"
light_color = "#00b000"
var/hack_icon = "error"
@@ -122,9 +122,9 @@
dat += "<dd><A>&#09;ERROR: Server not found!</A><br></dd>"
else
dat += "<dd><A href='?src=\ref[src];view=1'>&#09;[++i]. View Message Logs </a><br></dd>"
dat += "<dd><A href='?src=\ref[src];viewr=1'>&#09;[++i]. View Request Console Logs </a></br></dd>"
dat += "<dd><A href='?src=\ref[src];viewr=1'>&#09;[++i]. View Requests Console Logs </a></br></dd>"
dat += "<dd><A href='?src=\ref[src];clear=1'>&#09;[++i]. Clear Message Logs</a><br></dd>"
dat += "<dd><A href='?src=\ref[src];clearr=1'>&#09;[++i]. Clear Request Console Logs</a><br></dd>"
dat += "<dd><A href='?src=\ref[src];clearr=1'>&#09;[++i]. Clear Requests Console Logs</a><br></dd>"
dat += "<dd><A href='?src=\ref[src];pass=1'>&#09;[++i]. Set Custom Key</a><br></dd>"
dat += "<dd><A href='?src=\ref[src];msg=1'>&#09;[++i]. Send Admin Message</a><br></dd>"
dat += "<dd><A href='?src=\ref[src];spam=1'>&#09;[++i]. Modify Spam Filter</a><br></dd>"
@@ -220,7 +220,7 @@
<td width='300px'>[custommessage]</td></tr>"}
dat += "</table><br><center><A href='?src=\ref[src];select=Send'>Send</a></center>"
//Request Console Logs
//Requests Console Logs
if(4)
var/index = 0
@@ -340,7 +340,7 @@
if(auth)
src.linkedServer.pda_msgs = list()
message = "<span class='notice'>NOTICE: Logs cleared.</span>"
//Clears the request console logs - KEY REQUIRED
//Clears the requests console logs - KEY REQUIRED
if (href_list["clearr"])
if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN)))
message = noserver
@@ -387,7 +387,7 @@
else //if(istype(href_list["delete"], /datum/data_pda_msg))
src.linkedServer.pda_msgs -= locate(href_list["delete"])
message = "<span class='notice'>NOTICE: Log Deleted!</span>"
//Delete the request console log.
//Delete the requests console log.
if (href_list["deleter"])
//Are they on the view logs screen?
if(screen == 4)
@@ -476,7 +476,7 @@
//Finally..
ResetMessage()
//Request Console Logs - KEY REQUIRED
//Requests Console Logs - KEY REQUIRED
if(href_list["viewr"])
if(src.linkedServer == null || (src.linkedServer.stat & (NOPOWER|BROKEN)))
message = noserver

6
code/game/machinery/requests_console.dm
View File

@@ -1,12 +1,12 @@
/******************** Requests Console ********************/
/** Originally written by errorage, updated by: Carn, needs more work though. I just added some security fixes */
//Request Console Department Types
//Requests Console Department Types
#define RC_ASSIST 1 //Request Assistance
#define RC_SUPPLY 2 //Request Supplies
#define RC_INFO 4 //Relay Info
//Request Console Screens
//Requests Console Screens
#define RCS_MAINMENU 0 // Main menu
#define RCS_RQASSIST 1 // Request supplies
#define RCS_RQSUPPLY 2 // Request assistance
@@ -173,7 +173,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
if (!ui)
ui = new(user, src, ui_key, "request_console.tmpl", "[department] Request Console", 520, 410)
ui = new(user, src, ui_key, "requests_console.tmpl", "[department] Requests Console", 520, 410)
ui.set_initial_data(data)
ui.open()