From 2bb959da4c258c20df46646d2c9b279f70d88f50 Mon Sep 17 00:00:00 2001 From: Panter Date: Fri, 30 Aug 2019 21:05:27 +0200 Subject: [PATCH] Fixed inconsistencies in Requests Consoles names and department types. (#6923) 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 --- code/game/jobs/access_datum.dm | 2 +- code/game/machinery/computer/message.dm | 14 +++--- code/game/machinery/requests_console.dm | 6 +-- code/modules/admin/verbs/debug.dm | 2 +- code/modules/admin/verbs/mapping.dm | 2 +- config/example/access levels.txt | 2 +- config/example/tips.txt | 2 +- .../CodePanter-requests-consoles-fixes.yml | 43 +++++++++++++++++++ maps/aurora/aurora-3_sublevel.dmm | 9 ++-- maps/aurora/aurora-4_mainlevel.dmm | 10 ++--- maps/aurora/aurora-5_interstitial.dmm | 2 + maps/aurora/aurora-6_surface.dmm | 2 + ...est_console.tmpl => requests_console.tmpl} | 2 +- 13 files changed, 73 insertions(+), 25 deletions(-) create mode 100644 html/changelogs/CodePanter-requests-consoles-fixes.yml rename nano/templates/{request_console.tmpl => requests_console.tmpl} (99%) diff --git a/code/game/jobs/access_datum.dm b/code/game/jobs/access_datum.dm index bc382e7ee40..a43eaa1f0c0 100644 --- a/code/game/jobs/access_datum.dm +++ b/code/game/jobs/access_datum.dm @@ -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" diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index c8b1bd5631f..98cce67a6fc 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -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 += "
ERROR: Server not found!
" else dat += "
[++i]. View Message Logs
" - dat += "
[++i]. View Request Console Logs
" + dat += "
[++i]. View Requests Console Logs
" dat += "
[++i]. Clear Message Logs
" - dat += "
[++i]. Clear Request Console Logs
" + dat += "
[++i]. Clear Requests Console Logs
" dat += "
[++i]. Set Custom Key
" dat += "
[++i]. Send Admin Message
" dat += "
[++i]. Modify Spam Filter
" @@ -220,7 +220,7 @@ [custommessage]"} dat += "
Send
" - //Request Console Logs + //Requests Console Logs if(4) var/index = 0 @@ -340,7 +340,7 @@ if(auth) src.linkedServer.pda_msgs = list() message = "NOTICE: Logs cleared." - //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 = "NOTICE: Log Deleted!" - //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 diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index beff9d12e32..811880feb0d 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -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() diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index a541fe45f03..d6e8efe8ded 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -337,7 +337,7 @@ for(var/areatype in areas_without_air_alarm) to_world("* [areatype]") - to_world("AREAS WITHOUT A REQUEST CONSOLE:") + to_world("AREAS WITHOUT A REQUESTS CONSOLE:") for(var/areatype in areas_without_RC) to_world("* [areatype]") diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index f8702555bef..5e789237a7a 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -1,7 +1,7 @@ //- Are all the floors with or without air, as they should be? (regular or airless) //- Does the area have an APC? //- Does the area have an Air Alarm? -//- Does the area have a Request Console? +//- Does the area have a Requests Console? //- Does the area have lights? //- Does the area have a light switch? //- Does the area have enough intercoms? diff --git a/config/example/access levels.txt b/config/example/access levels.txt index 2cc0678831b..69eb6d7ad42 100644 --- a/config/example/access levels.txt +++ b/config/example/access levels.txt @@ -74,6 +74,6 @@ access_xenobiology = 55 access_ce = 56 access_hop = 57 access_hos = 58 -access_RC_announce = 59 //Request console announcements +access_RC_announce = 59 //Requests console announcements access_keycard_auth = 60 //Used for events which require at least two people to confirm them access_tcomsat = 61 // has access to the entire telecomms satellite / machinery \ No newline at end of file diff --git a/config/example/tips.txt b/config/example/tips.txt index 0bdd136b1bc..d331e04e926 100644 --- a/config/example/tips.txt +++ b/config/example/tips.txt @@ -171,5 +171,5 @@ As a Vampire, if you start going hungry for blood don't expect to stay hidden fo You can use . (period) instead of : to speak into a radio. The radio key .i will allow you to speak into a nearby intercom, .r will speak into a radio in your right hand, and .l will speak into your left. The microphone does not need to be enabled for this to work. Your ID card's access determines what departmental channels you can set intercoms to. -You can fax papers between request consoles by attacking the console with a paper. Make sure the paper tray is closed first! +You can fax papers between requests consoles by attacking the console with a paper. Make sure the paper tray is closed first! No wall or window is 100% impervious to heat. diff --git a/html/changelogs/CodePanter-requests-consoles-fixes.yml b/html/changelogs/CodePanter-requests-consoles-fixes.yml new file mode 100644 index 00000000000..f08f005358f --- /dev/null +++ b/html/changelogs/CodePanter-requests-consoles-fixes.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: CodePanter + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixed inconsistent 'Request Console' names and changed them to 'Requests Console'." + - bugfix: "Renamed three improperly named Requests Consoles." + - bugfix: "Set more appropriate Department Types for four Requests Consoles." diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index 735ba4b3211..b8614a9623c 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -12753,7 +12753,7 @@ /obj/machinery/requests_console{ department = "Xenoarcheology"; departmentType = 2; - name = "Xenoarcheology Request Console"; + name = "Xenoarcheology Requests Console"; pixel_x = -32; pixel_y = 0 }, @@ -17046,7 +17046,7 @@ /obj/machinery/requests_console{ department = "Test Range"; departmentType = 2; - name = "Test Range Request Console"; + name = "Test Range Requests Console"; pixel_x = 0; pixel_y = 32 }, @@ -20430,7 +20430,7 @@ "aOc" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/requests_console{ - department = "Medical Bay"; + department = "Autopsy Laboratory"; departmentType = 1; pixel_x = 0; pixel_y = -30 @@ -31206,7 +31206,7 @@ /obj/machinery/requests_console{ department = "Xenobotany"; departmentType = 2; - name = "Xenobotany Request Console"; + name = "Xenobotany Requests Console"; pixel_x = 0; pixel_y = 30 }, @@ -33983,6 +33983,7 @@ "uui" = ( /obj/structure/table/reinforced, /obj/machinery/requests_console{ + department = "Quarantine Ward"; pixel_y = 32 }, /turf/simulated/floor/tiled/white, diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index c5b94cd892c..5885c594a76 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -39385,8 +39385,8 @@ dir = 6 }, /obj/machinery/requests_console{ - department = "Psychiatrist's Desk"; - departmentType = 1; + department = "Main Medical Storage"; + departmentType = 2; pixel_x = 32; pixel_y = 0 }, @@ -43996,7 +43996,7 @@ /obj/machinery/requests_console{ department = "Research and Development"; departmentType = 2; - name = "Research and Development Request Console"; + name = "Research and Development Requests Console"; pixel_x = 0; pixel_y = 30 }, @@ -51857,7 +51857,7 @@ /obj/machinery/requests_console{ department = "Research and Development"; departmentType = 2; - name = "Research and Development Request Console"; + name = "Research and Development Requests Console"; pixel_x = 0; pixel_y = -30 }, @@ -51872,7 +51872,7 @@ /obj/machinery/requests_console{ department = "Telescience Lab"; departmentType = 2; - name = "Telescience Request Console"; + name = "Telescience Requests Console"; pixel_x = -32; pixel_y = 0 }, diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm index a8e0c6458f7..6296912cb98 100644 --- a/maps/aurora/aurora-5_interstitial.dmm +++ b/maps/aurora/aurora-5_interstitial.dmm @@ -5762,6 +5762,7 @@ "kz" = ( /obj/machinery/requests_console{ department = "Psychiatry"; + departmentType = 1; pixel_x = 32; pixel_y = 0 }, @@ -6267,6 +6268,7 @@ /obj/structure/table/wood, /obj/machinery/requests_console{ department = "Psychiatry"; + departmentType = 1; pixel_x = 0; pixel_y = 32 }, diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index cbf0424b701..4cd5b340167 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -9533,6 +9533,8 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/machinery/requests_console{ + department = "Primary Tool Storage"; + departmentType = 2; pixel_x = -32 }, /obj/random/tech_supply, diff --git a/nano/templates/request_console.tmpl b/nano/templates/requests_console.tmpl similarity index 99% rename from nano/templates/request_console.tmpl rename to nano/templates/requests_console.tmpl index 2a5ff71ded2..cd31b66294d 100644 --- a/nano/templates/request_console.tmpl +++ b/nano/templates/requests_console.tmpl @@ -1,5 +1,5 @@