Skip to content

Commit

Permalink
Head Office upgrades and other things (#4947)
Browse files Browse the repository at this point in the history
* Updates Head offices, Preset computers, Request Consoles, and Areas

* Update

* Adds air alarms to bridge hallway

* Fixes bug in consoles

* CRO office no longer has a three table pileup under the Von Krabby Patty

* Removes the CRO's prisoner management console, gives a filing cabinet

* Fixes space tile!

* More fixe

* Moves a vent

* Moves the WO's lamp away from their rig
  • Loading branch information
SingingSpock authored Jan 24, 2024
1 parent a484e9f commit a74ce66
Show file tree
Hide file tree
Showing 5 changed files with 1,238 additions and 1,097 deletions.
57 changes: 56 additions & 1 deletion code/game/machinery/requests_console.dm
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
/obj/machinery/requests_console/New()
..()

announcement.title = "[department] announcement"
announcement.title = "[department] Announcement"
announcement.newscast = 1

name = "[department] Requests Console"
Expand Down Expand Up @@ -234,3 +234,58 @@ var/list/obj/machinery/requests_console/allConsoles = list()
announcement.announcer = ""
if(mainmenu)
screen = RCS_MAINMENU

/obj/machinery/requests_console/preset
name = ""
department = ""
departmentType = ""
announcementConsole = 0
//Todo: presets and mapping for more non-command RCs

/obj/machinery/requests_console/preset/steward
name = "Steward Request Console"
department = "Steward's Office"
departmentType = RC_INFO

/obj/machinery/requests_console/preset/command //General type for command RCs, used in Bridge
name = "Control Room Request Console"
department = "Control Room"
announcementConsole = 1 //Heads can make announcements
departmentType = RC_ASSIST|RC_INFO

/obj/machinery/requests_console/preset/command/premier
name = "Premier Request Console"
department = "Premier's Desk"

/obj/machinery/requests_console/preset/command/ceo
name = "CEO Request Console"
department = "Chief Executive Officer's Desk"
departmentType = RC_ASSIST|RC_SUPPLY|RC_INFO //CEO should be able to get supply requests

/obj/machinery/requests_console/preset/command/cbo
name = "CBO Request Console"
department = "Chief Biological Overseer's Desk"

/obj/machinery/requests_console/preset/command/cro
name = "CRO Request Console"
department = "Chief Research Overseer's Desk"

/obj/machinery/requests_console/preset/command/bc
name = "Commander Request Console"
department = "Blackshield Commander's Desk"

/obj/machinery/requests_console/preset/command/wo
name = "WO Request Console"
department = "Warrant Officer's Desk"

/obj/machinery/requests_console/preset/command/prime
name = "Prime Request Console"
department = "Prime's Desk"

/obj/machinery/requests_console/preset/command/gm
name = "GM Request Console"
department = "Guild Master's Desk"

/obj/machinery/requests_console/preset/command/foreman
name = "Foreman Request Console"
department = "Foreman's Desk"
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@
// Command
/obj/item/modular_computer/console/preset/command/install_default_hardware()
..()
processor_unit = new/obj/item/computer_hardware/processor_unit/adv(src)
tesla_link = new/obj/item/computer_hardware/tesla_link(src)
hard_drive = new/obj/item/computer_hardware/hard_drive/advanced(src)
scanner = new /obj/item/computer_hardware/scanner/paper(src)
printer = new/obj/item/computer_hardware/printer(src)
card_slot = new/obj/item/computer_hardware/card_slot(src)

Expand All @@ -129,6 +133,7 @@
hard_drive.store_file(new/datum/computer_file/program/reports())
hard_drive.store_file(new/datum/computer_file/program/comm())
hard_drive.store_file(new/datum/computer_file/program/card_mod())
hard_drive.store_file(new/datum/computer_file/program/tax())

//First Officer
/obj/item/modular_computer/console/preset/command/access/install_default_programs()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
..()
processor_unit = new/obj/item/computer_hardware/processor_unit/small(src)
tesla_link = new/obj/item/computer_hardware/tesla_link(src)
hard_drive = new/obj/item/computer_hardware/hard_drive/small(src)
hard_drive = new/obj/item/computer_hardware/hard_drive/small/adv(src)
network_card = new/obj/item/computer_hardware/network_card/advanced(src)
printer = new/obj/item/computer_hardware/printer(src)
card_slot = new/obj/item/computer_hardware/card_slot(src)
Expand All @@ -31,9 +31,9 @@

/obj/item/modular_computer/tablet/lease/preset/command/install_default_hardware()
..()
processor_unit = new/obj/item/computer_hardware/processor_unit/small(src)
processor_unit = new/obj/item/computer_hardware/processor_unit/adv/small(src)
tesla_link = new/obj/item/computer_hardware/tesla_link(src)
hard_drive = new/obj/item/computer_hardware/hard_drive(src)
hard_drive = new/obj/item/computer_hardware/hard_drive/small/adv(src)
network_card = new/obj/item/computer_hardware/network_card/advanced(src)
printer = new/obj/item/computer_hardware/printer(src)
card_slot = new/obj/item/computer_hardware/card_slot(src)
Expand All @@ -48,6 +48,7 @@
hard_drive.store_file(new/datum/computer_file/program/newsbrowser())
hard_drive.store_file(new/datum/computer_file/program/camera_monitor())
hard_drive.store_file(new/datum/computer_file/program/records())
hard_drive.store_file(new/datum/computer_file/program/tax())

/obj/item/modular_computer/tablet/lease/preset/medical/install_default_hardware()
..()
Expand Down Expand Up @@ -108,4 +109,4 @@
/obj/item/modular_computer/tablet/moebius/preset/install_default_programs()
..()
hard_drive.store_file(new/datum/computer_file/program/suit_sensors())
hard_drive.store_file(new/datum/computer_file/program/chem_catalog())
hard_drive.store_file(new/datum/computer_file/program/chem_catalog())
4 changes: 4 additions & 0 deletions maps/__Nadezhda/area/_Nadezhda_areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,10 @@
name = "\improper Control Room"
icon_state = "bridge"

/area/nadezhda/command/hallway
name = "\improper Command Hallway"
icon_state = "bridge"

/area/nadezhda/command/meeting_room
name = "\improper Heads of Staff Meeting Room"
icon_state = "bridge"
Expand Down
Loading

0 comments on commit a74ce66

Please sign in to comment.