diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 23aba34169..7c9c4a2448 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -1,6 +1,22 @@
/******************** Requests Console ********************/
/** Originally written by errorage, updated by: Carn, needs more work though. I just added some security fixes */
+//Request Console Department Types
+#define RC_ASSIST 1 //Request Assistance
+#define RC_SUPPLY 2 //Request Supplies
+#define RC_INFO 4 //Relay Info
+
+//Request Console Screens
+#define RCS_RQASSIST 1 // Request supplies
+#define RCS_RQSUPPLY 2 // Request assistance
+#define RCS_SENDINFO 3 // Relay information
+#define RCS_SENTPASS 4 // Message sent successfully
+#define RCS_SENTFAIL 5 // Message sent unsuccessfully
+#define RCS_VIEWMSGS 6 // View messages
+#define RCS_MESSAUTH 7 // Authentication before sending
+#define RCS_ANNOUNCE 8 // Send announcement
+#define RCS_MAINMENU 9 // Main menu
+
var/req_console_assistance = list()
var/req_console_supplies = list()
var/req_console_information = list()
@@ -14,32 +30,13 @@ var/list/obj/machinery/requests_console/allConsoles = list()
icon_state = "req_comp0"
var/department = "Unknown" //The list of all departments on the station (Determined from this variable on each unit) Set this to the same thing if you want several consoles in one department
var/list/messages = list() //List of all messages
- var/departmentType = 0
- // 0 = none (not listed, can only repeplied to)
- // 1 = assistance
- // 2 = supplies
- // 3 = info
- // 4 = ass + sup //Erro goddamn you just HAD to shorten "assistance" down to "ass"
- // 5 = ass + info
- // 6 = sup + info
- // 7 = ass + sup + info
+ var/departmentType = 0 //Bitflag. Zero is reply-only. Map currently uses raw numbers instead of defines.
var/newmessagepriority = 0
// 0 = no new message
// 1 = normal priority
// 2 = high priority
// 3 = extreme priority - not implemented, will probably require some hacking... everything needs to have a hidden feature in this game.
- var/screen = 0
- // 0 = main menu,
- // 1 = req. assistance,
- // 2 = req. supplies
- // 3 = relay information
- // 4 = write msg - not used
- // 5 = choose priority - not used
- // 6 = sent successfully
- // 7 = sent unsuccessfully
- // 8 = view messages
- // 9 = authentication before sending
- // 10 = send announcement
+ var/screen = RCS_MAINMENU
var/silent = 0 // set to 1 for it not to beep all the time
// var/hackState = 0
// 0 = not hacked
@@ -77,49 +74,26 @@ var/list/obj/machinery/requests_console/allConsoles = list()
name = "[department] Requests Console"
allConsoles += src
- //req_console_departments += department
- switch(departmentType)
- if(1)
- req_console_assistance |= department
- if(2)
- req_console_supplies |= department
- if(3)
- req_console_information |= department
- if(4)
- req_console_assistance |= department
- req_console_supplies |= department
- if(5)
- req_console_assistance |= department
- req_console_information |= department
- if(6)
- req_console_supplies |= department
- req_console_information |= department
- if(7)
- req_console_assistance |= department
- req_console_supplies |= department
- req_console_information |= department
+ if (departmentType & RC_ASSIST)
+ req_console_assistance |= department
+ if (departmentType & RC_SUPPLY)
+ req_console_supplies |= department
+ if (departmentType & RC_INFO)
+ req_console_information |= department
/obj/machinery/requests_console/Destroy()
allConsoles -= src
- switch(departmentType)
- if(1)
- req_console_assistance -= department
- if(2)
- req_console_supplies -= department
- if(3)
- req_console_information -= department
- if(4)
- req_console_assistance -= department
- req_console_supplies -= department
- if(5)
- req_console_assistance -= department
- req_console_information -= department
- if(6)
- req_console_supplies -= department
- req_console_information -= department
- if(7)
+ var/lastDeptRC = 1
+ for (var/obj/machinery/requests_console/Console in allConsoles)
+ if (Console.department == department)
+ lastDeptRC = 0
+ break
+ if(lastDeptRC)
+ if (departmentType & RC_ASSIST)
req_console_assistance -= department
+ if (departmentType & RC_SUPPLY)
req_console_supplies -= department
+ if (departmentType & RC_INFO)
req_console_information -= department
..()
@@ -130,7 +104,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
dat = text("Requests Console[department] Requests Console
")
if(!open)
switch(screen)
- if(1) //req. assistance
+ if(RCS_RQASSIST) //req. assistance
dat += text("Which department do you need assistance from?
")
for(var/dpt in req_console_assistance)
if (dpt != department)
@@ -139,9 +113,9 @@ var/list/obj/machinery/requests_console/allConsoles = list()
// if (hackState == 1)
// dat += text(" or EXTREME)")
dat += text(")
")
- dat += text("
Back
")
+ dat += text("
Back
")
- if(2) //req. supplies
+ if(RCS_RQSUPPLY) //req. supplies
dat += text("Which department do you need supplies from?
")
for(var/dpt in req_console_supplies)
if (dpt != department)
@@ -150,9 +124,9 @@ var/list/obj/machinery/requests_console/allConsoles = list()
// if (hackState == 1)
// dat += text(" or EXTREME)")
dat += text(")
")
- dat += text("
Back
")
+ dat += text("
Back
")
- if(3) //relay information
+ if(RCS_SENDINFO) //relay information
dat += text("Which department would you like to send information to?
")
for(var/dpt in req_console_information)
if (dpt != department)
@@ -161,17 +135,17 @@ var/list/obj/machinery/requests_console/allConsoles = list()
// if (hackState == 1)
// dat += text(" or EXTREME)")
dat += text(")
")
- dat += text("
Back
")
+ dat += text("
Back
")
- if(6) //sent successfully
+ if(RCS_SENTPASS) //sent successfully
dat += text("Message sent
")
- dat += text("Continue
")
+ dat += text("Continue
")
- if(7) //unsuccessful; not sent
+ if(RCS_SENTFAIL) //unsuccessful; not sent
dat += text("An error occurred.
")
- dat += text("Continue
")
+ dat += text("Continue
")
- if(8) //view messages
+ if(RCS_VIEWMSGS) //view messages
for (var/obj/machinery/requests_console/Console in allConsoles)
if (Console.department == department)
Console.newmessagepriority = 0
@@ -181,18 +155,18 @@ var/list/obj/machinery/requests_console/allConsoles = list()
icon_state = "req_comp0"
for(var/msg in messages)
dat += text("[msg]
")
- dat += text("Back to main menu
")
+ dat += text("Back to main menu
")
- if(9) //authentication before sending
+ if(RCS_MESSAUTH) //authentication before sending
dat += text("Message Authentication
")
dat += text("Message for [dpt]: [message]
")
dat += text("You may authenticate your message now by scanning your ID or your stamp
")
dat += text("Validated by: [msgVerified]
");
dat += text("Stamped by: [msgStamped]
");
dat += text("Send
");
- dat += text("
Back
")
+ dat += text("
Back
")
- if(10) //send announcement
+ if(RCS_ANNOUNCE) //send announcement
dat += text("Station wide announcement
")
if(announceAuth)
dat += text("Authentication accepted
")
@@ -201,22 +175,22 @@ var/list/obj/machinery/requests_console/allConsoles = list()
dat += text("Message: [message] Write
")
if (announceAuth && message)
dat += text("Announce
");
- dat += text("
Back
")
+ dat += text("
Back
")
else //main menu
- screen = 0
+ screen = RCS_MAINMENU
reset_announce()
if (newmessagepriority == 1)
dat += text("There are new messages
")
if (newmessagepriority == 2)
dat += text("NEW PRIORITY MESSAGES
")
- dat += text("View Messages
")
+ dat += text("View Messages
")
- dat += text("Request Assistance
")
- dat += text("Request Supplies
")
- dat += text("Relay Anonymous Information
")
+ dat += text("Request Assistance
")
+ dat += text("Request Supplies
")
+ dat += text("Relay Anonymous Information
")
if(announcementConsole)
- dat += text("Send station-wide announcement
")
+ dat += text("Send station-wide announcement
")
if (silent)
dat += text("Speaker OFF")
else
@@ -237,7 +211,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
var/new_message = sanitize(input("Write your message:", "Awaiting Input", ""))
if(new_message)
message = new_message
- screen = 9
+ screen = RCS_MESSAUTH
switch(href_list["priority"])
if("2") priority = 2
else priority = -1
@@ -245,7 +219,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
dpt = "";
msgVerified = ""
msgStamped = ""
- screen = 0
+ screen = RCS_MAINMENU
priority = -1
if(href_list["writeAnnouncement"])
@@ -257,107 +231,41 @@ var/list/obj/machinery/requests_console/allConsoles = list()
else priority = -1
else
reset_announce()
- screen = 0
+ screen = RCS_MAINMENU
if(href_list["sendAnnouncement"])
if(!announcementConsole) return
announcement.Announce(message, msg_sanitized = 1)
reset_announce()
- screen = 0
+ screen = RCS_MAINMENU
if( href_list["department"] && message )
var/log_msg = message
- var/sending = message
- sending += "
"
- if (msgVerified)
- sending += msgVerified
- sending += "
"
- if (msgStamped)
- sending += msgStamped
- sending += "
"
- screen = 7 //if it's successful, this will get overrwritten (7 = unsufccessfull, 6 = successfull)
- if (sending)
- var/pass = 0
- for (var/obj/machinery/message_server/MS in world)
- if(!MS.active) continue
- MS.send_rc_message(href_list["department"],department,log_msg,msgStamped,msgVerified,priority)
- pass = 1
-
- if(pass)
-
- for (var/obj/machinery/requests_console/Console in allConsoles)
- if (ckey(Console.department) == ckey(href_list["department"]))
-
- switch(priority)
- if("2") //High priority
- if(Console.newmessagepriority < 2)
- Console.newmessagepriority = 2
- Console.icon_state = "req_comp2"
- if(!Console.silent)
- playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1)
- for (var/mob/O in hearers(5, Console.loc))
- O.show_message(text("\icon[Console] *The Requests Console beeps: 'PRIORITY Alert in [department]'"))
- Console.messages += "High Priority message from [department]
[sending]"
-
- // if("3") //Not implemanted, but will be //Removed as it doesn't look like anybody intends on implimenting it ~Carn
- // if(Console.newmessagepriority < 3)
- // Console.newmessagepriority = 3
- // Console.icon_state = "req_comp3"
- // if(!Console.silent)
- // playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1)
- // for (var/mob/O in hearers(7, Console.loc))
- // O.show_message(text("\icon[Console] *The Requests Console yells: 'EXTREME PRIORITY alert in [department]'"))
- // Console.messages += "Extreme Priority message from [ckey(department)]
[message]"
-
- else // Normal priority
- if(Console.newmessagepriority < 1)
- Console.newmessagepriority = 1
- Console.icon_state = "req_comp1"
- if(!Console.silent)
- playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1)
- for (var/mob/O in hearers(4, Console.loc))
- O.show_message(text("\icon[Console] *The Requests Console beeps: 'Message from [department]'"))
- Console.messages += "Message from [department]
[message]"
-
- screen = 6
- Console.set_light(2)
- messages += "Message sent to [dpt]
[message]"
- else
- for (var/mob/O in hearers(4, src.loc))
- O.show_message(text("\icon[src] *The Requests Console beeps: 'NOTICE: No server detected!'"))
+ var/pass = 0
+ screen = RCS_SENTFAIL
+ for (var/obj/machinery/message_server/MS in world)
+ if(!MS.active) continue
+ MS.send_rc_message(href_list["department"],department,log_msg,msgStamped,msgVerified,priority)
+ pass = 1
+ if(pass)
+ screen = RCS_SENTPASS
+ messages += "Message sent to [dpt]
[message]"
+ else
+ audible_message(text("\icon[src] *The Requests Console beeps: 'NOTICE: No server detected!'"),,4)
//Handle screen switching
- switch(text2num(href_list["setScreen"]))
- if(null) //skip
- if(1) //req. assistance
- screen = 1
- if(2) //req. supplies
- screen = 2
- if(3) //relay information
- screen = 3
-// if(4) //write message
-// screen = 4
- if(5) //choose priority
- screen = 5
- if(6) //sent successfully
- screen = 6
- if(7) //unsuccessfull; not sent
- screen = 7
- if(8) //view messages
- screen = 8
- if(9) //authentication
- screen = 9
- if(10) //send announcement
- if(!announcementConsole) return
- screen = 10
- else //main menu
+ var/tempScreen = text2num(href_list["setScreen"])
+ if(tempScreen)
+ if(tempScreen == RCS_ANNOUNCE && !announcementConsole)
+ return
+ if(tempScreen == RCS_MAINMENU)
dpt = ""
msgVerified = ""
msgStamped = ""
message = ""
priority = -1
- screen = 0
+ screen = tempScreen
//Handle silencing the console
switch( href_list["setSilent"] )
@@ -393,21 +301,21 @@ var/list/obj/machinery/requests_console/allConsoles = list()
user << "You can't do much with that."*/
if (istype(O, /obj/item/weapon/card/id))
- if(screen == 9)
+ if(screen == RCS_MESSAUTH)
var/obj/item/weapon/card/id/T = O
msgVerified = text("Verified by [T.registered_name] ([T.assignment])")
updateUsrDialog()
- if(screen == 10)
+ if(screen == RCS_ANNOUNCE)
var/obj/item/weapon/card/id/ID = O
if (access_RC_announce in ID.GetAccess())
announceAuth = 1
announcement.announcer = ID.assignment ? "[ID.assignment] [ID.registered_name]" : ID.registered_name
else
reset_announce()
- user << "\red You are not authorized to send announcements."
+ user << " You are not authorized to send announcements."
updateUsrDialog()
if (istype(O, /obj/item/weapon/stamp))
- if(screen == 9)
+ if(screen == RCS_MESSAUTH)
var/obj/item/weapon/stamp/T = O
msgStamped = text("Stamped with the [T.name]")
updateUsrDialog()
@@ -417,3 +325,13 @@ var/list/obj/machinery/requests_console/allConsoles = list()
announceAuth = 0
message = ""
announcement.announcer = ""
+
+#undef RCS_RQASSIST
+#undef RCS_RQSUPPLY
+#undef RCS_SENDINFO
+#undef RCS_SENTPASS
+#undef RCS_SENTFAIL
+#undef RCS_VIEWMSGS
+#undef RCS_MESSAUTH
+#undef RCS_ANNOUNCE
+#undef RCS_MAINMENU
diff --git a/code/modules/events/money_hacker.dm b/code/modules/events/money_hacker.dm
index 5fbc323a29..07d18c2746 100644
--- a/code/modules/events/money_hacker.dm
+++ b/code/modules/events/money_hacker.dm
@@ -19,30 +19,11 @@
without intervention this attack will succeed in approximately 10 minutes. Required intervention: temporary suspension of affected accounts until the attack has ceased. \
Notifications will be sent as updates occur.
"
var/my_department = "[station_name()] firewall subroutines"
- var/sending = message + "Message dispatched by [my_department]."
-
- var/pass = 0
+
for(var/obj/machinery/message_server/MS in world)
if(!MS.active) continue
- // /obj/machinery/message_server/proc/send_rc_message(var/recipient = "",var/sender = "",var/message = "",var/stamp = "", var/id_auth = "", var/priority = 1)
- MS.send_rc_message("Engineering/Security/Bridge", my_department, message, "", "", 2)
- pass = 1
-
- if(pass)
- var/keyed_dpt1 = ckey("Engineering")
- var/keyed_dpt2 = ckey("Security")
- var/keyed_dpt3 = ckey("Bridge")
- for (var/obj/machinery/requests_console/Console in allConsoles)
- var/keyed_department = ckey(Console.department)
- if(keyed_department == keyed_dpt1 || keyed_department == keyed_dpt2 || keyed_department == keyed_dpt3)
- if(Console.newmessagepriority < 2)
- Console.newmessagepriority = 2
- Console.icon_state = "req_comp2"
- if(!Console.silent)
- playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1)
- for (var/mob/O in hearers(5, Console.loc))
- O.show_message(text("\icon[Console] *The Requests Console beeps: 'PRIORITY Alert in [my_department]'"))
- Console.messages += "High Priority message from [my_department]
[sending]"
+ MS.send_rc_message("Head of Personnel's Desk", my_department, message, "", "", 2)
+
/datum/event/money_hacker/tick()
if(world.time >= end_time)
@@ -80,27 +61,7 @@
message = "The attack has ceased, the affected accounts can now be brought online."
var/my_department = "[station_name()] firewall subroutines"
- var/sending = message + "Message dispatched by [my_department]."
- var/pass = 0
for(var/obj/machinery/message_server/MS in world)
if(!MS.active) continue
- // /obj/machinery/message_server/proc/send_rc_message(var/recipient = "",var/sender = "",var/message = "",var/stamp = "", var/id_auth = "", var/priority = 1)
- MS.send_rc_message("Engineering/Security/Bridge", my_department, message, "", "", 2)
- pass = 1
-
- if(pass)
- var/keyed_dpt1 = ckey("Engineering")
- var/keyed_dpt2 = ckey("Security")
- var/keyed_dpt3 = ckey("Bridge")
- for (var/obj/machinery/requests_console/Console in allConsoles)
- var/keyed_department = ckey(Console.department)
- if(keyed_department == keyed_dpt1 || keyed_department == keyed_dpt2 || keyed_department == keyed_dpt3)
- if(Console.newmessagepriority < 2)
- Console.newmessagepriority = 2
- Console.icon_state = "req_comp2"
- if(!Console.silent)
- playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1)
- for (var/mob/O in hearers(5, Console.loc))
- O.show_message(text("\icon[Console] *The Requests Console beeps: 'PRIORITY Alert in [my_department]'"))
- Console.messages += "High Priority message from [my_department]
[sending]"
+ MS.send_rc_message("Head of Personnel's Desk", my_department, message, "", "", 2)
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index aa1e1a52e4..7e3ec70149 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -108,6 +108,34 @@ var/global/list/obj/machinery/message_server/message_servers = list()
/obj/machinery/message_server/proc/send_rc_message(var/recipient = "",var/sender = "",var/message = "",var/stamp = "", var/id_auth = "", var/priority = 1)
rc_msgs += new/datum/data_rc_msg(recipient,sender,message,stamp,id_auth)
+ var/authmsg = "[message]
"
+ if (id_auth)
+ authmsg += "[id_auth]
"
+ if (stamp)
+ authmsg += "[stamp]
"
+ for (var/obj/machinery/requests_console/Console in allConsoles)
+ if (ckey(Console.department) == ckey(recipient))
+ if(Console.newmessagepriority < priority)
+ Console.newmessagepriority = priority
+ Console.icon_state = "req_comp[priority]"
+ switch(priority)
+ if(2)
+ if(!Console.silent)
+ playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1)
+ Console.audible_message(text("\icon[Console] *The Requests Console beeps: 'PRIORITY Alert in [sender]'"),,5)
+ Console.messages += "High Priority message from [sender]
[authmsg]"
+ if(3)
+ if(!Console.silent)
+ playsound(Console.loc, 'sound/machines/twobeep.ogg', 70, 1)
+ Console.audible_message(text("\icon[Console] *The Requests Console yells: 'EXTREME PRIORITY alert in [sender]'"),,7)
+ Console.messages += "Extreme Priority message from [sender]
[authmsg]"
+ else
+ if(!Console.silent)
+ playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1)
+ Console.audible_message(text("\icon[Console] *The Requests Console beeps: 'Message from [sender]'"),,4)
+ Console.messages += "Message from [sender]
[authmsg]"
+ Console.set_light(2)
+
/obj/machinery/message_server/attack_hand(user as mob)
// user << "\blue There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentCom delays."
diff --git a/maps/exodus-1.dmm b/maps/exodus-1.dmm
index 4882c36de0..951bb80cdf 100644
--- a/maps/exodus-1.dmm
+++ b/maps/exodus-1.dmm
@@ -6059,7 +6059,7 @@
"cmA" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/construction)
"cmB" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/obj/machinery/light_switch{pixel_x = -27; pixel_y = 0},/obj/machinery/airlock_sensor/airlock_exterior{id_tag = "eng_al_ext_snsr"; layer = 3.3; master_tag = "engine_room_airlock"; pixel_y = -22; req_access = list(10)},/obj/structure/table/standard,/obj/item/weapon/book/manual/supermatter_engine,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/turf/simulated/floor,/area/engineering/engine_airlock)
"cmC" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{dir = 4; icon_state = "intact"; tag = "icon-intact-f (EAST)"},/turf/simulated/floor,/area/engineering/foyer)
-"cmD" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{dir = 4; icon_state = "intact"; tag = "icon-intact-f (EAST)"},/obj/machinery/requests_console{announcementConsole = 0; department = "Engineering"; departmentType = 4; name = "Engineering RC"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor,/area/engineering/foyer)
+"cmD" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{dir = 4; icon_state = "intact"; tag = "icon-intact-f (EAST)"},/obj/machinery/requests_console{announcementConsole = 0; department = "Engineering"; departmentType = 3; name = "Engineering RC"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor,/area/engineering/foyer)
"cmE" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{dir = 4; icon_state = "intact"; tag = "icon-intact-f (EAST)"},/obj/machinery/computer/guestpass{pixel_y = -28},/turf/simulated/floor,/area/engineering/foyer)
"cmF" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{dir = 9; icon_state = "intact"; tag = "icon-intact-f (NORTHWEST)"},/turf/simulated/floor,/area/engineering/foyer)
"cmG" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/turf/simulated/floor{icon_state = "hydrofloor"},/area/rnd/xenobiology/xenoflora)
@@ -6127,7 +6127,7 @@
"cnQ" = (/obj/machinery/door/firedoor/border_only{dir = 1; name = "Engineering Firelock"},/obj/machinery/door/airlock/glass_engineering{name = "Engineering Locker Room"; req_one_access = list(11,24)},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/engineering/locker_room)
"cnR" = (/turf/simulated/wall/r_wall,/area/engineering/locker_room)
"cnS" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plating{dir = 4; icon_state = "warnplatecorner"},/area/maintenance/engineering)
-"cnT" = (/obj/structure/table/standard,/obj/item/device/t_scanner,/obj/item/device/multitool{pixel_x = 5},/obj/item/device/radio/headset/headset_eng,/obj/item/weapon/cartridge/atmos,/obj/item/weapon/cartridge/atmos,/obj/item/device/pipe_painter,/obj/machinery/requests_console{department = "Atmospherics"; departmentType = 4; name = "Atmos RC"; pixel_x = 0; pixel_y = 28},/turf/simulated/floor,/area/engineering/atmos)
+"cnT" = (/obj/structure/table/standard,/obj/item/device/t_scanner,/obj/item/device/multitool{pixel_x = 5},/obj/item/device/radio/headset/headset_eng,/obj/item/weapon/cartridge/atmos,/obj/item/weapon/cartridge/atmos,/obj/item/device/pipe_painter,/obj/machinery/requests_console{department = "Atmospherics"; departmentType = 3; name = "Atmos RC"; pixel_x = 0; pixel_y = 28},/turf/simulated/floor,/area/engineering/atmos)
"cnU" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/obj/structure/sign/deathsposal{pixel_x = 32},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/incinerator)
"cnV" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/syringes,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "white"},/area/rnd/xenobiology)
"cnW" = (/obj/machinery/computer/med_data,/obj/machinery/light,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery)
@@ -6711,7 +6711,7 @@
"czc" = (/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/rnd/xenobiology)
"czd" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only{dir = 2},/turf/simulated/floor/plating,/area/rnd/xenobiology)
"cze" = (/obj/structure/table/standard,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/turf/simulated/floor,/area/engineering/locker_room)
-"czf" = (/obj/machinery/requests_console{announcementConsole = 0; department = "Engineering"; departmentType = 4; name = "Engineering RC"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor,/area/engineering/workshop)
+"czf" = (/obj/machinery/requests_console{announcementConsole = 0; department = "Engineering"; departmentType = 3; name = "Engineering RC"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor,/area/engineering/workshop)
"czg" = (/obj/structure/closet/emcloset,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
"czh" = (/obj/structure/bed/chair{dir = 8},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/maintenance/engi_shuttle)
"czi" = (/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating/airless,/area/solar/port)