From a28eb4a75e2983794c8388ed0c817bd8a07a2fb3 Mon Sep 17 00:00:00 2001 From: Ferner Date: Sun, 3 Nov 2019 08:26:20 +0100 Subject: [PATCH] Mapping and stuff --- aurorastation.dme | 1 + .../computers/subtypes/dev_laptop.dm | 2 + .../computers/subtypes/preset_console.dm | 18 + .../computers/subtypes/preset_laptop.dm | 107 +++++ .../file_system/programs/app_presets.dm | 134 ++++++- .../file_system/programs/generic/records.dm | 6 +- maps/aurora/aurora-1_centcomm.dmm | 58 ++- maps/aurora/aurora-3_sublevel.dmm | 16 +- maps/aurora/aurora-4_mainlevel.dmm | 375 +++++++++--------- maps/aurora/aurora-5_interstitial.dmm | 36 +- maps/aurora/aurora-6_surface.dmm | 22 +- maps/exodus/exodus-1_station.dmm | 163 +++----- maps/exodus/exodus-2_centcomm.dmm | 34 +- maps/exodus/exodus-3_telecomms.dmm | 2 +- maps/space_ruins/derelict.dmm | 8 +- maps/space_ruins/scrapheap.dmm | 2 - 16 files changed, 567 insertions(+), 417 deletions(-) create mode 100644 code/modules/modular_computers/computers/subtypes/preset_laptop.dm diff --git a/aurorastation.dme b/aurorastation.dme index 0d89166d90a..e7057b917ce 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1943,6 +1943,7 @@ #include "code\modules\modular_computers\computers\subtypes\dev_tablet.dm" #include "code\modules\modular_computers\computers\subtypes\dev_telescreen.dm" #include "code\modules\modular_computers\computers\subtypes\preset_console.dm" +#include "code\modules\modular_computers\computers\subtypes\preset_laptop.dm" #include "code\modules\modular_computers\computers\subtypes\preset_tablet.dm" #include "code\modules\modular_computers\computers\subtypes\preset_telescreen.dm" #include "code\modules\modular_computers\file_system\computer_file.dm" diff --git a/code/modules/modular_computers/computers/subtypes/dev_laptop.dm b/code/modules/modular_computers/computers/subtypes/dev_laptop.dm index 718564ad06a..f7101178076 100644 --- a/code/modules/modular_computers/computers/subtypes/dev_laptop.dm +++ b/code/modules/modular_computers/computers/subtypes/dev_laptop.dm @@ -7,6 +7,8 @@ icon = 'icons/obj/modular_laptop.dmi' icon_state = "laptop-open" icon_state_broken = "laptop-broken" + randpixel = 6 + center_of_mass = list("x"=14, "y"=10) base_idle_power_usage = 25 base_active_power_usage = 200 max_hardware_size = 2 diff --git a/code/modules/modular_computers/computers/subtypes/preset_console.dm b/code/modules/modular_computers/computers/subtypes/preset_console.dm index 05ebdd6f717..5ae01140de1 100644 --- a/code/modules/modular_computers/computers/subtypes/preset_console.dm +++ b/code/modules/modular_computers/computers/subtypes/preset_console.dm @@ -22,16 +22,19 @@ // Engineering /obj/item/modular_computer/console/preset/engineering/ + name = "engineering console" _app_preset_name = "engineering" enrolled = 1 // Medical /obj/item/modular_computer/console/preset/medical/ + name = "medical console" _app_preset_name = "medical" enrolled = 1 // Research /obj/item/modular_computer/console/preset/research/ + name = "research console" _app_preset_name = "research" enrolled = 1 @@ -41,6 +44,7 @@ // Command /obj/item/modular_computer/console/preset/command/ + name = "command console" _app_preset_name = "command" enrolled = 1 @@ -52,6 +56,7 @@ card_slot = new/obj/item/weapon/computer_hardware/card_slot(src) /obj/item/modular_computer/console/preset/captain/ + name = "captain's console" _app_preset_name = "captain" enrolled = 1 @@ -64,16 +69,29 @@ // Security /obj/item/modular_computer/console/preset/security/ + name = "security console" _app_preset_name = "security" enrolled = 1 +/obj/item/modular_computer/console/preset/security/investigations + name = "investigations console" + _app_preset_name = "security_inv" + enrolled = 1 + +/obj/item/modular_computer/console/preset/security/hos + name = "head of security's console" + _app_preset_name = "security_head" + enrolled = 1 + // Civilian /obj/item/modular_computer/console/preset/civilian/ + name = "civilian console" _app_preset_name = "civilian" enrolled = 1 // Supply /obj/item/modular_computer/console/preset/supply/ + name = "supply console" _app_preset_name = "supply" enrolled = 1 diff --git a/code/modules/modular_computers/computers/subtypes/preset_laptop.dm b/code/modules/modular_computers/computers/subtypes/preset_laptop.dm new file mode 100644 index 00000000000..18861d48ccf --- /dev/null +++ b/code/modules/modular_computers/computers/subtypes/preset_laptop.dm @@ -0,0 +1,107 @@ +/obj/item/modular_computer/laptop/preset + anchored = 0 + screen_on = 0 + icon_state = "laptop-closed" + +/obj/item/modular_computer/laptop/preset/install_default_hardware() + ..() + processor_unit = new/obj/item/weapon/computer_hardware/processor_unit(src) + hard_drive = new/obj/item/weapon/computer_hardware/hard_drive(src) + network_card = new/obj/item/weapon/computer_hardware/network_card(src) + battery_module = new/obj/item/weapon/computer_hardware/battery_module(src) + battery_module.charge_to_full() + nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src) + nano_printer.max_paper = 10 + nano_printer.stored_paper = 5 + +/obj/item/modular_computer/laptop/preset/install_default_programs() + ..() + +// Engineering +/obj/item/modular_computer/laptop/preset/engineering/ + name = "engineering laptop" + desc = "A portable computer belonging to the engineering department. It appears to have been used as a door stop at one point or another." + _app_preset_name = "engineering" + enrolled = 1 + +/obj/item/modular_computer/laptop/preset/engineering/ce/ + name = "chief engineer's laptop" + desc = "A portable computer belonging to the chief engineer." + _app_preset_name = "engineering_head" + +// Medical +/obj/item/modular_computer/laptop/preset/medical/ + name = "medical laptop" + desc = "A portable computer belonging to the medical department." + _app_preset_name = "medical" + enrolled = 1 + +/obj/item/modular_computer/laptop/preset/medical/cmo/ + name = "chief medical officer's laptop" + desc = "A portable computer belonging to the chief medical officer." + _app_preset_name = "medical_head" + +// Research +/obj/item/modular_computer/laptop/preset/research/ + name = "research laptop" + desc = "A portable computer belonging to the research department." + _app_preset_name = "research" + enrolled = 1 + +/obj/item/modular_computer/laptop/preset/research/install_default_hardware() + ..() + ai_slot = new/obj/item/weapon/computer_hardware/ai_slot(src) + +/obj/item/modular_computer/laptop/preset/research/rd/ + name = "research director's laptop" + desc = "A portable computer belonging to the research director. The edges are stained and partially melted." + _app_preset_name = "research_head" + +// Command +/obj/item/modular_computer/laptop/preset/command/ + name = "command laptop" + _app_preset_name = "command" + enrolled = 1 + +/obj/item/modular_computer/laptop/preset/command/hop/ + name = "head of personnel's laptop" + desc = "A portable computer beloning to the head of personnel. The fan is filled with dog hair." + _app_preset_name = "command_hop" + +/obj/item/modular_computer/laptop/preset/command/captain/ + name = "captain's laptop" + desc = "A portable computer belonging to the captain." + _app_preset_name = "captain" + +// Security +/obj/item/modular_computer/laptop/preset/security/ + name = "security laptop" + desc = "A portable computer belonging to the security department." + _app_preset_name = "security" + enrolled = 1 + +/obj/item/modular_computer/laptop/preset/security/hos/ + name = "head of security's laptop" + desc = "A portable computer belonging to the head of security. It smells faintly of gunpowder." + _app_preset_name = "security_head" + +// Civilian +/obj/item/modular_computer/laptop/preset/civilian/ + _app_preset_name = "civilian" + enrolled = 1 + +// Supply +/obj/item/modular_computer/laptop/preset/supply/ + name = "supply laptop" + desc = "A portable computer belonging to cargo." + _app_preset_name = "supply" + enrolled = 1 + +// Representative +/obj/item/modular_computer/laptop/preset/representative/ + name = "representative's laptop" + desc = "A portable computer belonging to the representative's office." + _app_preset_name = "representative" + enrolled = 1 + + diff --git a/code/modules/modular_computers/file_system/programs/app_presets.dm b/code/modules/modular_computers/file_system/programs/app_presets.dm index e24c991eadc..f1a899b35a9 100644 --- a/code/modules/modular_computers/file_system/programs/app_presets.dm +++ b/code/modules/modular_computers/file_system/programs/app_presets.dm @@ -37,6 +37,28 @@ ) return _prg_list +/datum/modular_computer_app_presets/engineering/ce + name = "engineering_head" + display_name = "Engineering - CE" + description = "Contains the most common engineering programs and command software." + available = 0 + +/datum/modular_computer_app_presets/engineering/ce/return_install_programs() + var/list/_prg_list = list( + new/datum/computer_file/program/filemanager(), + new/datum/computer_file/program/chatclient(), + new/datum/computer_file/program/civilian/cargoorder(), + new/datum/computer_file/program/power_monitor(), + new/datum/computer_file/program/alarm_monitor(), + new/datum/computer_file/program/atmos_control(), + new/datum/computer_file/program/rcon_console(), + new/datum/computer_file/program/camera_monitor(), + new/datum/computer_file/program/lighting_control(), + new/datum/computer_file/program/comm(), + new/datum/computer_file/program/records/employment() + ) + return _prg_list + /datum/modular_computer_app_presets/medical name = "medical" display_name = "Medical" @@ -52,6 +74,23 @@ ) return _prg_list +/datum/modular_computer_app_presets/medical/cmo + name = "medical_head" + display_name = "Medical - CMO" + description = "Contains the most common medical programs and command software." + available = 0 +/datum/modular_computer_app_presets/medical/cmo/return_install_programs() + var/list/_prg_list = list( + new/datum/computer_file/program/filemanager(), + new/datum/computer_file/program/chatclient(), + new/datum/computer_file/program/civilian/cargoorder(), + new/datum/computer_file/program/suit_sensors(), + new/datum/computer_file/program/comm(), + new/datum/computer_file/program/records/employment(), + new/datum/computer_file/program/records/medical() + ) + return _prg_list + /datum/modular_computer_app_presets/research name = "research" display_name = "Research" @@ -68,6 +107,24 @@ ) return _prg_list +/datum/modular_computer_app_presets/research/rd + name = "research_head" + display_name = "Research - RD" + description = "Contains the most common research programs and command software." + available = 0 +/datum/modular_computer_app_presets/research/return_install_programs() + var/list/_prg_list = list( + new/datum/computer_file/program/filemanager(), + new/datum/computer_file/program/chatclient(), + new/datum/computer_file/program/civilian/cargoorder(), + new/datum/computer_file/program/ntnetmonitor(), + new/datum/computer_file/program/aidiag(), + new/datum/computer_file/program/exosuit_monitor(), + new/datum/computer_file/program/comm(1), + new/datum/computer_file/program/records/employment() + ) + return _prg_list + /datum/modular_computer_app_presets/command name = "command" display_name = "Command" @@ -84,6 +141,24 @@ ) return _prg_list +/datum/modular_computer_app_presets/command/hop + name = "command_hop" + display_name = "Command - HoP" + description = "Contains the most common command programs." + available = 0 +/datum/modular_computer_app_presets/command/hop/return_install_programs() + var/list/_prg_list = list( + new/datum/computer_file/program/filemanager(), + new/datum/computer_file/program/chatclient(), + new/datum/computer_file/program/civilian/cargoorder(), + new/datum/computer_file/program/civilian/cargocontrol(), + new/datum/computer_file/program/card_mod(), + new/datum/computer_file/program/comm(), + new/datum/computer_file/program/records/employment(), + new/datum/computer_file/program/records/security() + ) + return _prg_list + /datum/modular_computer_app_presets/captain name = "captain" display_name = "Captain" @@ -94,7 +169,7 @@ new/datum/computer_file/program/filemanager(), new/datum/computer_file/program/chatclient(), new/datum/computer_file/program/card_mod(), - new/datum/computer_file/program/comm(1,1), + new/datum/computer_file/program/comm(1), new/datum/computer_file/program/camera_monitor(), new/datum/computer_file/program/digitalwarrant(), new/datum/computer_file/program/civilian/cargocontrol(), @@ -103,7 +178,6 @@ new/datum/computer_file/program/records/employment(), new/datum/computer_file/program/records/medical(), new/datum/computer_file/program/records/security() - ) return _prg_list @@ -120,7 +194,44 @@ new/datum/computer_file/program/camera_monitor(), new/datum/computer_file/program/comm(), new/datum/computer_file/program/digitalwarrant(), - new/datum/computer_file/program/records/security() + new/datum/computer_file/program/records/security(), + new/datum/computer_file/program/records/employment() + ) + return _prg_list + +/datum/modular_computer_app_presets/security/investigations + name = "security_inv" + display_name = "Security - Investigations" + description = "Contains the most common security and forensics programs." + available = 0 +/datum/modular_computer_app_presets/security/return_install_programs() + var/list/_prg_list = list( + new/datum/computer_file/program/filemanager(), + new/datum/computer_file/program/chatclient(), + new/datum/computer_file/program/camera_monitor(), + new/datum/computer_file/program/digitalwarrant(), + new/datum/computer_file/program/records/security(), + new/datum/computer_file/program/records/employment(), + new/datum/computer_file/program/records/medical() + ) + return _prg_list + +/datum/modular_computer_app_presets/security/hos + name = "security_head" + display_name = "Security - HoS" + description = "Contains the most common security programs and command software." + available = 0 +/datum/modular_computer_app_presets/security/hos/return_install_programs() + var/list/_prg_list = list( + new/datum/computer_file/program/filemanager(), + new/datum/computer_file/program/chatclient(), + new/datum/computer_file/program/civilian/cargoorder(), + new/datum/computer_file/program/camera_monitor(), + new/datum/computer_file/program/comm(), + new/datum/computer_file/program/digitalwarrant(), + new/datum/computer_file/program/records/security(), + new/datum/computer_file/program/comm(1), + new/datum/computer_file/program/records/employment() ) return _prg_list @@ -135,7 +246,7 @@ new/datum/computer_file/program/chatclient(), new/datum/computer_file/program/civilian/cargoorder(), new/datum/computer_file/program/game/arcade(), - new/datum/computer_file/program/game/sudoku() + new/datum/computer_file/program/game/sudoku() ) return _prg_list @@ -167,6 +278,21 @@ ) return _prg_list +/datum/modular_computer_app_presets/representative + name = "representative" + display_name = "Representative" + description = "Contains software intended for representatives." + available = 0 +/datum/modular_computer_app_presets/representative/return_install_programs() + var/list/_prg_list = list( + new/datum/computer_file/program/filemanager(), + new/datum/computer_file/program/chatclient(), + new/datum/computer_file/program/game/sudoku(), + new/datum/computer_file/program/civilian/cargoorder(), + new/datum/computer_file/program/records/employment() + ) + return _prg_list + /datum/modular_computer_app_presets/wall_generic name = "wallgeneric" display_name = "Wall - Generic" diff --git a/code/modules/modular_computers/file_system/programs/generic/records.dm b/code/modules/modular_computers/file_system/programs/generic/records.dm index 3445121586a..22fbc606b9a 100644 --- a/code/modules/modular_computers/file_system/programs/generic/records.dm +++ b/code/modules/modular_computers/file_system/programs/generic/records.dm @@ -42,6 +42,7 @@ records_type = RECORD_MEDICAL | RECORD_VIRUS edit_type = RECORD_MEDICAL default_screen = "medical" + program_icon_state = "medcomp" /datum/computer_file/program/records/security filename = "secrec" @@ -56,6 +57,8 @@ records_type = RECORD_SECURITY edit_type = RECORD_SECURITY default_screen = "security" + program_icon_state = "security" + color = LIGHT_COLOR_RED /datum/computer_file/program/records/employment filename = "emprec" @@ -63,12 +66,13 @@ extended_desc = "Used to view, edit and maintain employment records." record_prefix = "Employment " - required_access_run = list(access_heads) + required_access_run = list(access_security, access_forensics_lockers, access_lawyer, access_hop) required_access_download = access_heads available_on_ntnet = 1 records_type = RECORD_GENERAL | RECORD_SECURITY edit_type = RECORD_GENERAL + color = LIGHT_COLOR_GREEN /datum/computer_file/program/records/New() . = ..() diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index 3deb1f2b624..d5b30c87388 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -7049,7 +7049,7 @@ /turf/simulated/shuttle/wall/dark, /area/shuttle/administration/centcom) "aqH" = ( -/obj/machinery/computer/records/security, +/obj/item/modular_computer/console/preset/security, /turf/simulated/shuttle/floor{ icon_state = "floor6" }, @@ -7075,12 +7075,6 @@ icon_state = "floor6" }, /area/shuttle/administration/centcom) -"aqL" = ( -/obj/machinery/computer/records/medical, -/turf/simulated/shuttle/floor{ - icon_state = "floor6" - }, -/area/shuttle/administration/centcom) "aqM" = ( /turf/unsimulated/floor{ icon_state = "warnplate"; @@ -11540,7 +11534,7 @@ }, /area/centcom/control) "aAd" = ( -/obj/machinery/computer/records/medical, +/obj/item/modular_computer/console/preset/medical, /turf/unsimulated/floor{ icon_state = "floor" }, @@ -11787,7 +11781,7 @@ }, /area/centcom/control) "aAD" = ( -/obj/machinery/computer/records/security, +/obj/item/modular_computer/console/preset/security, /turf/unsimulated/floor{ icon_state = "floor" }, @@ -12680,7 +12674,7 @@ /turf/unsimulated/floor, /area/centcom/holding) "aCn" = ( -/obj/machinery/computer/records/security, +/obj/item/modular_computer/console/preset/security, /turf/unsimulated/floor{ dir = 8; icon_state = "red" @@ -13191,11 +13185,11 @@ }, /area/centcom/holding) "aDz" = ( -/obj/machinery/computer/records/security, /obj/machinery/camera/network/crescent{ c_tag = "Crescent Arrivals North"; dir = 8 }, +/obj/item/modular_computer/console/preset/security, /turf/unsimulated/floor{ icon_state = "floor" }, @@ -13259,23 +13253,18 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/computer/records/employment{ - icon_state = "medlaptop"; - pixel_x = 3; - pixel_y = 4 - }, /obj/structure/window/reinforced, +/obj/item/weapon/paper_bin{ + pixel_x = 1; + pixel_y = 9 + }, +/obj/item/weapon/pen, /turf/unsimulated/floor{ icon_state = "floor" }, /area/centcom/holding) "aDI" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ - pixel_x = 1; - pixel_y = 9 - }, -/obj/item/weapon/pen, /obj/machinery/door/window/southright{ name = "Arrivals Processing"; req_access = list(101) @@ -13919,7 +13908,6 @@ /turf/simulated/floor/holofloor/wood, /area/holodeck/source_battlemonsters) "aFn" = ( -/obj/machinery/computer/records/medical, /obj/structure/window/reinforced{ dir = 4 }, @@ -13927,6 +13915,7 @@ icon_state = "spline_plain"; dir = 4 }, +/obj/item/modular_computer/console/preset/medical, /turf/simulated/shuttle/floor{ icon_state = "floor3" }, @@ -13982,7 +13971,6 @@ }, /area/shuttle/escape/centcom) "aFt" = ( -/obj/machinery/computer/records/security, /obj/structure/window/reinforced{ dir = 8 }, @@ -13990,6 +13978,7 @@ icon_state = "spline_plain"; dir = 8 }, +/obj/item/modular_computer/console/preset/security, /turf/simulated/shuttle/floor{ icon_state = "floor3" }, @@ -19355,7 +19344,7 @@ }, /area/centcom/spawning) "aQT" = ( -/obj/machinery/computer/records/security, +/obj/item/modular_computer/console/preset/security, /turf/unsimulated/floor{ icon_state = "floor" }, @@ -21624,7 +21613,7 @@ }, /area/shuttle/escape/centcom) "aVZ" = ( -/obj/machinery/computer/records/security, +/obj/item/modular_computer/console/preset/security, /turf/unsimulated/floor{ icon_state = "floor" }, @@ -21829,7 +21818,7 @@ }, /area/centcom/checkpoint/aft) "aWz" = ( -/obj/machinery/computer/records/security, +/obj/item/modular_computer/console/preset/security, /turf/unsimulated/floor{ icon_state = "floor" }, @@ -24488,6 +24477,12 @@ }, /turf/simulated/floor/tiled, /area/centcom/ferry) +"dUY" = ( +/obj/structure/table/wood, +/turf/unsimulated/floor{ + icon_state = "floor" + }, +/area/centcom/ferry) "dYm" = ( /turf/space/transit/east/shuttlespace_ew6, /area/shuttle/distress/transit) @@ -24993,13 +24988,6 @@ icon_state = "floor" }, /area/centcom/checkpoint/fore) -"iIs" = ( -/obj/structure/table/wood, -/obj/machinery/computer/records/employment, -/turf/unsimulated/floor{ - icon_state = "floor" - }, -/area/centcom/ferry) "iKp" = ( /obj/machinery/light{ dir = 8; @@ -54987,8 +54975,8 @@ aaM aaM aaM hHP -iIs gXE +dUY otY hHP aaM @@ -58793,7 +58781,7 @@ apV aqd aqt aqC -aqL +aqH aqT aqU arp diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index a20649b7498..99e91fd3f6e 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -14213,7 +14213,6 @@ /obj/effect/floor_decal/corner/lime/full{ dir = 4 }, -/obj/structure/closet/l3closet/virology, /obj/machinery/button/remote/blast_door{ id = "quarantine_processing_shutters"; name = "Desk Lockdown"; @@ -14221,6 +14220,7 @@ pixel_y = -25; req_access = list(66) }, +/obj/item/modular_computer/console/preset/medical, /turf/simulated/floor/tiled/white, /area/medical/quarantineaccess) "aBx" = ( @@ -29360,18 +29360,17 @@ /turf/simulated/floor/plating, /area/medical/patient_wing_post2) "gut" = ( -/obj/structure/table/standard, /obj/machinery/light{ dir = 8; icon_state = "tube1"; pixel_y = 0 }, /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/computer/records/medical/laptop, /obj/machinery/light_switch{ pixel_x = -22; pixel_y = 8 }, +/obj/item/modular_computer/console/preset/medical, /turf/simulated/floor/tiled/white, /area/medical/patient_wing_post1) "gyi" = ( @@ -29936,8 +29935,6 @@ /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, /obj/structure/window/reinforced, -/obj/structure/table/standard, -/obj/machinery/computer/records/medical/laptop, /obj/item/device/radio{ anchored = 1; broadcasting = 0; @@ -29958,6 +29955,7 @@ name = "Quarantine Processing Shutters"; opacity = 0 }, +/obj/structure/table/standard, /turf/simulated/floor/tiled/dark, /area/medical/quarantineaccess) "iIQ" = ( @@ -30279,8 +30277,7 @@ /area/medical/patient_wing_post2) "jkR" = ( /obj/effect/floor_decal/corner/white/diagonal, -/obj/structure/table/standard, -/obj/machinery/computer/records/medical/laptop, +/obj/item/modular_computer/console/preset/medical, /turf/simulated/floor/tiled, /area/medical/patient_wing_post2) "jlY" = ( @@ -30426,7 +30423,6 @@ /area/engineering/backup_SMES) "jMg" = ( /obj/structure/table/standard, -/obj/machinery/computer/records/medical/laptop, /obj/effect/floor_decal/corner/lime/full{ icon_state = "corner_white_full"; dir = 1 @@ -30437,6 +30433,7 @@ pixel_x = 24; req_one_access = list(24,11,55) }, +/obj/item/weapon/hand_labeler, /turf/simulated/floor/tiled/white, /area/medical/virologytesting) "jMR" = ( @@ -33078,8 +33075,6 @@ /turf/simulated/floor/tiled/white, /area/outpost/research/hallway) "rCf" = ( -/obj/structure/table/standard, -/obj/item/weapon/hand_labeler, /obj/effect/floor_decal/corner/lime/full{ dir = 4 }, @@ -33088,6 +33083,7 @@ name = "Station Intercom (General)"; pixel_x = 27 }, +/obj/item/modular_computer/console/preset/medical, /turf/simulated/floor/tiled/white, /area/medical/virologytesting) "rDB" = ( diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index dd2d2a4ac59..ee6a905c2de 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -6649,7 +6649,7 @@ icon_state = "rwindow"; dir = 8 }, -/obj/item/device/radio/phone, +/obj/item/weapon/handcuffs, /turf/simulated/floor/tiled/dark, /area/security/security_office) "amX" = ( @@ -7083,7 +7083,6 @@ /turf/simulated/floor/tiled/dark, /area/security/security_office) "aob" = ( -/obj/item/weapon/handcuffs, /obj/structure/table/standard, /obj/structure/window/reinforced{ dir = 1 @@ -7091,6 +7090,12 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/item/modular_computer/laptop/preset/security{ + desc = "A portable computer belonging to the security department. A note on its side says: 'Make sure it's back in the office after every shift or there'll be hell to pay!'"; + name = "worn security laptop"; + pixel_x = -3; + pixel_y = -4 + }, /turf/simulated/floor/tiled/dark, /area/security/security_office) "aoc" = ( @@ -8061,7 +8066,6 @@ }, /obj/structure/table/reinforced, /obj/item/weapon/wrench, -/obj/item/device/multitool, /turf/simulated/floor/tiled, /area/bridge) "apJ" = ( @@ -8089,7 +8093,7 @@ dir = 5 }, /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/device/multitool, /turf/simulated/floor/tiled, /area/bridge) "apL" = ( @@ -8739,7 +8743,7 @@ icon_state = "corner_white"; dir = 9 }, -/obj/machinery/computer/records/medical/laptop, +/obj/item/weapon/storage/firstaid/regular, /turf/simulated/floor/tiled, /area/bridge) "aqW" = ( @@ -9572,7 +9576,6 @@ /turf/simulated/floor/tiled, /area/bridge) "aso" = ( -/obj/machinery/computer/records/medical, /obj/effect/floor_decal/corner/lime{ dir = 6 }, @@ -9580,6 +9583,7 @@ icon_state = "corner_white"; dir = 9 }, +/obj/item/modular_computer/console/preset/medical, /turf/simulated/floor/tiled, /area/bridge) "asp" = ( @@ -10550,12 +10554,12 @@ icon_state = "corner_white"; dir = 9 }, -/obj/item/modular_computer/console/preset/medical, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/item/modular_computer/console/preset/command, /turf/simulated/floor/tiled, /area/bridge) "atI" = ( @@ -13466,18 +13470,6 @@ }, /turf/simulated/floor/plating, /area/bridge) -"ayD" = ( -/obj/machinery/computer/records/security, -/obj/effect/floor_decal/corner/blue{ - icon_state = "corner_white"; - dir = 9 - }, -/obj/effect/floor_decal/corner/blue{ - icon_state = "corner_white"; - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/bridge) "ayE" = ( /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; @@ -14878,7 +14870,7 @@ icon_state = "corner_white"; dir = 6 }, -/obj/machinery/computer/records/security, +/obj/item/modular_computer/console/preset/security, /turf/simulated/floor/tiled, /area/security/brig) "aBb" = ( @@ -15123,12 +15115,7 @@ /area/lawoffice) "aBu" = ( /obj/structure/table/wood, -/obj/machinery/computer/records/employment{ - density = 0; - icon_state = "medlaptop"; - pixel_y = 4; - req_one_access = list(19,38) - }, +/obj/item/weapon/clipboard, /turf/simulated/floor/carpet, /area/lawoffice) "aBv" = ( @@ -16276,14 +16263,12 @@ /area/crew_quarters/captain) "aDw" = ( /obj/structure/table/wood, -/obj/machinery/computer/records/employment{ - icon_state = "medlaptop" - }, /obj/structure/cable/green{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/item/modular_computer/laptop/preset/command/captain, /turf/simulated/floor/carpet, /area/crew_quarters/captain) "aDx" = ( @@ -16939,7 +16924,8 @@ /turf/simulated/floor/tiled/dark, /area/security/warden) "aEx" = ( -/obj/machinery/computer/records/security, +/obj/structure/table/standard, +/obj/item/weapon/book/manual/wiki/security_space_law, /turf/simulated/floor/tiled/dark, /area/security/warden) "aEy" = ( @@ -18394,6 +18380,10 @@ dir = 4; icon_state = "tube1" }, +/obj/structure/noticeboard{ + pixel_x = 32; + pixel_y = 0 + }, /turf/simulated/floor/carpet, /area/lawoffice) "aGO" = ( @@ -20029,7 +20019,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/suit_cycler/hos, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) "aJx" = ( @@ -20140,7 +20129,6 @@ /turf/simulated/floor/plating, /area/security/brig) "aJF" = ( -/obj/machinery/computer/records/security, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -20154,6 +20142,7 @@ /obj/effect/floor_decal/corner/blue/full{ dir = 8 }, +/obj/item/modular_computer/console/preset/security, /turf/simulated/floor/tiled, /area/security/brig) "aJG" = ( @@ -20249,7 +20238,6 @@ /area/security/warden) "aJN" = ( /obj/structure/table/standard, -/obj/item/weapon/book/manual/wiki/security_space_law, /obj/item/device/eftpos{ eftpos_name = "Brig EFTPOS scanner" }, @@ -20435,13 +20423,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) -"aKc" = ( -/obj/machinery/computer/guestpass{ - pixel_x = 1; - pixel_y = 30 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) "aKd" = ( /obj/machinery/alarm{ pixel_y = 23 @@ -21108,7 +21089,6 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "aLp" = ( -/obj/structure/filingcabinet, /obj/machinery/recharger/wallcharger{ pixel_x = -24; pixel_y = 0 @@ -21117,6 +21097,7 @@ pixel_x = -23; pixel_y = -7 }, +/obj/machinery/suit_cycler/hos, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) "aLq" = ( @@ -22262,7 +22243,6 @@ /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "aNe" = ( -/obj/machinery/computer/records/security, /obj/structure/sign/goldenplaque{ pixel_x = -32 }, @@ -22275,38 +22255,13 @@ c_tag = "Security - Head of Security's Office"; dir = 4 }, +/obj/structure/filingcabinet, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) "aNf" = ( /obj/structure/bed/chair/comfy/red{ dir = 4 }, -/obj/machinery/button/remote/blast_door{ - id = "Security Lockdown"; - name = "Security Lockdown"; - pixel_x = 38; - pixel_y = 38; - req_access = list(58) - }, -/obj/machinery/button/remote/airlock{ - id = "HoSdoor"; - name = "Office Door"; - pixel_x = 27; - pixel_y = 38 - }, -/obj/machinery/button/windowtint{ - id = "HoS Windows"; - pixel_x = 26; - pixel_y = 28; - req_access = list(58) - }, -/obj/machinery/button/remote/blast_door{ - id = "armoury"; - name = "Armoury Shutters"; - pixel_x = 38; - pixel_y = 28; - req_access = list(58) - }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "aNg" = ( @@ -22620,6 +22575,10 @@ dir = 1 }, /obj/machinery/light, +/obj/machinery/computer/guestpass{ + pixel_x = 0; + pixel_y = -28 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "aNO" = ( @@ -23226,14 +23185,9 @@ /obj/machinery/keycard_auth{ pixel_x = -28 }, -/obj/item/modular_computer/console/preset/security, +/obj/item/modular_computer/console/preset/security/hos, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) -"aOS" = ( -/obj/structure/table/wood, -/obj/machinery/computer/records/employment, -/turf/simulated/floor/carpet, -/area/crew_quarters/heads/hos) "aOT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet, @@ -24030,8 +23984,9 @@ /area/crew_quarters/heads/chief) "aQg" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/modular_computer/laptop/preset/engineering/ce{ + pixel_x = 4 + }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/chief) "aQh" = ( @@ -24041,7 +23996,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/computer/records/employment, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, /turf/simulated/floor/carpet, /area/crew_quarters/heads/chief) "aQi" = ( @@ -25883,7 +25839,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/chief) "aTj" = ( -/obj/item/modular_computer/console/preset/engineering, /obj/machinery/light_switch{ pixel_y = -28 }, @@ -26713,7 +26668,8 @@ /turf/simulated/floor/plating, /area/crew_quarters/heads/hop) "aUy" = ( -/obj/machinery/computer/records/security, +/obj/structure/table/reinforced, +/obj/item/weapon/hand_labeler, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "aUz" = ( @@ -27442,7 +27398,8 @@ /area/hallway/primary/starboard) "aVG" = ( /obj/structure/table/reinforced, -/obj/machinery/computer/records/employment, +/obj/item/stack/packageWrap, +/obj/item/device/destTagger, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "aVH" = ( @@ -30034,6 +29991,10 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/light_switch{ + pixel_x = 26; + pixel_y = 26 + }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "aZY" = ( @@ -30518,20 +30479,40 @@ /area/crew_quarters/heads/hop) "bba" = ( /obj/structure/table/wood, -/obj/machinery/computer/records/employment, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 1 + }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "bbb" = ( /obj/structure/filingcabinet/chestdrawer, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 1 + }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "bbc" = ( /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "bbd" = ( -/obj/machinery/light_switch{ - pixel_x = 32 +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/window/brigdoor{ + base_state = "rightsecure"; + dir = 8; + icon_state = "rightsecure"; + req_access = list(57) + }, +/obj/machinery/light{ + dir = 4; + icon_state = "tube1"; + pixel_x = 0 }, +/mob/living/simple_animal/corgi/Ian, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "bbe" = ( @@ -31376,35 +31357,12 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "bcz" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/window/brigdoor{ - base_state = "rightsecure"; - dir = 8; - icon_state = "rightsecure"; - req_access = list(57) +/obj/machinery/atm{ + pixel_x = 28 }, -/mob/living/simple_animal/corgi/Ian, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "bcA" = ( -/obj/machinery/camera/network/command{ - c_tag = "Bridge - Restroom"; - dir = 4 - }, -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 - }, /obj/machinery/light_switch{ pixel_x = -5; pixel_y = 24 @@ -32183,8 +32141,6 @@ /area/crew_quarters/heads/hop) "bea" = ( /obj/structure/table/wood, -/obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, /obj/structure/sign/nosmoking_2{ pixel_y = -32 }, @@ -32213,7 +32169,8 @@ pixel_x = 0; pixel_y = -36 }, -/obj/machinery/account_database, +/obj/structure/table/wood, +/obj/item/modular_computer/laptop/preset/command/hop, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "bec" = ( @@ -32221,17 +32178,20 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "bed" = ( -/obj/machinery/computer/security/mining, -/obj/machinery/atm{ - pixel_x = 32 - }, /obj/item/weapon/storage/secure/safe{ pixel_x = 5; pixel_y = -28 }, +/obj/machinery/account_database, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "bee" = ( +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22; + pixel_y = 0 + }, /turf/simulated/floor/tiled/freezer, /area/bridge/meeting_room) "bef" = ( @@ -32456,18 +32416,10 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/secure_data{ - pixel_x = -2; - pixel_y = 2 - }, /obj/item/weapon/circuitboard/security{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/skills{ - pixel_x = 4; - pixel_y = -3 - }, /turf/simulated/floor/plating, /area/storage/tech) "beB" = ( @@ -32835,8 +32787,7 @@ /turf/simulated/floor/tiled/white, /area/medical/icu) "bff" = ( -/obj/structure/table/standard, -/obj/machinery/computer/records/medical/laptop, +/obj/item/modular_computer/console/preset/medical, /turf/simulated/floor/carpet/blue, /area/medical/exam_room{ name = "\improper Medical - Exam Room 2" @@ -34080,10 +34031,6 @@ }, /obj/item/weapon/circuitboard/clonescanner, /obj/item/weapon/circuitboard/clonepod, -/obj/item/weapon/circuitboard/med_data{ - pixel_x = 3; - pixel_y = -3 - }, /turf/simulated/floor/plating, /area/storage/tech) "bhk" = ( @@ -34342,11 +34289,10 @@ dir = 8 }, /obj/effect/floor_decal/corner/white/diagonal, -/obj/structure/table/standard, -/obj/machinery/computer/records/medical/laptop, /obj/structure/sign/nosmoking_1{ pixel_y = 32 }, +/obj/item/modular_computer/console/preset/medical, /turf/simulated/floor/tiled, /area/medical/reception) "bhE" = ( @@ -34387,12 +34333,14 @@ /area/medical/pharmacy) "bhG" = ( /obj/structure/table/standard, -/obj/machinery/computer/records/medical/laptop, /obj/machinery/firealarm/south, /obj/effect/floor_decal/corner/beige{ icon_state = "corner_white"; dir = 10 }, +/obj/item/modular_computer/laptop/preset/medical{ + desc = "A portable computer belonging to the medical department. It's covered in chemical stains." + }, /turf/simulated/floor/tiled/white, /area/medical/pharmacy) "bhH" = ( @@ -35396,19 +35344,19 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "bjq" = ( -/obj/item/modular_computer/console/preset/medical, /obj/effect/floor_decal/corner/paleblue{ icon_state = "corner_white"; dir = 5 }, +/obj/structure/flora/pottedplant/random, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "bjr" = ( -/obj/machinery/computer/records/medical, /obj/effect/floor_decal/corner/paleblue{ icon_state = "corner_white"; dir = 5 }, +/obj/item/modular_computer/console/preset/medical, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "bjs" = ( @@ -36048,8 +35996,8 @@ /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/button/windowtint{ id = "CMO"; - pixel_x = 16; - pixel_y = -28; + pixel_x = 14; + pixel_y = -26; req_access = list(40) }, /obj/machinery/button/remote/blast_door{ @@ -36819,7 +36767,6 @@ /area/crew_quarters/heads/cmo) "blH" = ( /obj/structure/table/glass, -/obj/machinery/computer/records/employment, /obj/effect/floor_decal/corner/paleblue{ icon_state = "corner_white"; dir = 6 @@ -36829,6 +36776,10 @@ icon_state = "tube1"; pixel_x = 0 }, +/obj/item/modular_computer/laptop/preset/medical/cmo{ + pixel_x = 2; + pixel_y = 6 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "blI" = ( @@ -39336,22 +39287,22 @@ /turf/simulated/floor/tiled, /area/medical/reception) "bpw" = ( -/obj/structure/table/standard, /obj/effect/floor_decal/corner/white/diagonal, -/obj/machinery/button/remote/blast_door{ - id = "entrance_shutters"; - name = "Entrance Shutters Control"; - pixel_x = 0; - pixel_y = -6; - req_access = list(66) - }, +/obj/structure/table/standard, /obj/machinery/button/remote/airlock{ id = "main_door"; name = "Triage Door Control"; - pixel_x = 0; + pixel_x = 6; pixel_y = 6; req_access = list(66) }, +/obj/machinery/button/remote/blast_door{ + id = "entrance_shutters"; + name = "Entrance Shutters Control"; + pixel_x = 6; + pixel_y = -3; + req_access = list(66) + }, /turf/simulated/floor/tiled, /area/medical/reception) "bpx" = ( @@ -39474,8 +39425,7 @@ name = "\improper Medical - Exam Room 1" }) "bpH" = ( -/obj/machinery/computer/records/medical/laptop, -/obj/structure/table/standard, +/obj/item/modular_computer/console/preset/medical, /turf/simulated/floor/carpet/blue, /area/medical/exam_room{ name = "\improper Medical - Exam Room 1" @@ -40030,8 +39980,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/white/diagonal, -/obj/structure/table/standard, -/obj/machinery/computer/records/medical/laptop, +/obj/item/modular_computer/console/preset/medical, /turf/simulated/floor/tiled, /area/medical/reception) "bqC" = ( @@ -40044,28 +39993,25 @@ }, /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ - pixel_x = -1; - pixel_y = 7 - }, /turf/simulated/floor/tiled, /area/medical/reception) "bqD" = ( /obj/effect/floor_decal/corner/white/diagonal, -/obj/machinery/computer/crew, /obj/structure/window/reinforced, +/obj/structure/table/standard, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, /turf/simulated/floor/tiled, /area/medical/reception) "bqE" = ( /obj/structure/window/reinforced, /obj/effect/floor_decal/corner/white/diagonal, -/obj/structure/table/standard, -/obj/machinery/computer/records/medical/laptop, /obj/machinery/light{ dir = 4; icon_state = "tube1"; pixel_x = 0 }, +/obj/item/modular_computer/console/preset/medical, /turf/simulated/floor/tiled, /area/medical/reception) "bqF" = ( @@ -44853,7 +44799,6 @@ /turf/simulated/floor/tiled/white, /area/medical/genetics_cloning) "bya" = ( -/obj/machinery/computer/records/medical, /obj/machinery/light_switch{ pixel_x = 24; pixel_y = 8 @@ -44862,6 +44807,7 @@ icon_state = "corner_white"; dir = 6 }, +/obj/item/modular_computer/console/preset/medical, /turf/simulated/floor/tiled/white, /area/medical/genetics_cloning) "byb" = ( @@ -45681,9 +45627,7 @@ "bzC" = ( /obj/structure/table/standard, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/device/eftpos{ - eftpos_name = "Research EFTPOS scanner" - }, +/obj/item/modular_computer/laptop/preset/research/rd, /turf/simulated/floor/carpet/blue, /area/rnd/rdoffice) "bzD" = ( @@ -46639,8 +46583,8 @@ /area/rnd/rdoffice) "bBz" = ( /obj/structure/table/standard, -/obj/machinery/computer/records/employment{ - icon_state = "medlaptop" +/obj/item/device/eftpos{ + eftpos_name = "Research EFTPOS scanner" }, /turf/simulated/floor/carpet/blue, /area/rnd/rdoffice) @@ -65039,13 +64983,6 @@ /obj/machinery/portable_atmospherics/canister/empty, /turf/simulated/floor/plating, /area/maintenance/engineering) -"iap" = ( -/obj/machinery/alarm{ - pixel_y = 28 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) "ifx" = ( /turf/simulated/floor/tiled/white, /area/medical/main_storage) @@ -66070,6 +66007,11 @@ }, /turf/simulated/floor/plating, /area/maintenance/medbay) +"lVt" = ( +/obj/structure/table/wood, +/obj/item/modular_computer/laptop/preset/security/hos, +/turf/simulated/floor/carpet, +/area/crew_quarters/heads/hos) "lVA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -66107,13 +66049,6 @@ /area/maintenance/vault) "maP" = ( /obj/structure/table/wood, -/obj/machinery/computer/records/employment{ - density = 0; - icon_state = "medlaptop"; - pixel_x = 1; - pixel_y = 6; - req_one_access = list(19,38) - }, /obj/machinery/button/remote/airlock{ id = "rep_office"; name = "Office Door Control"; @@ -66129,6 +66064,10 @@ req_access = list(38); specialfunctions = 4 }, +/obj/item/modular_computer/laptop/preset/representative{ + pixel_x = 1; + pixel_y = 8 + }, /turf/simulated/floor/carpet, /area/lawoffice) "mbc" = ( @@ -66953,6 +66892,35 @@ }, /turf/simulated/floor/plating, /area/maintenance/medbay) +"oCY" = ( +/obj/machinery/button/windowtint{ + id = "HoS Windows"; + pixel_x = 26; + pixel_y = -4; + req_access = list(58) + }, +/obj/machinery/button/remote/blast_door{ + id = "armoury"; + name = "Armoury Shutters"; + pixel_x = 38; + pixel_y = -4; + req_access = list(58) + }, +/obj/machinery/button/remote/blast_door{ + id = "Security Lockdown"; + name = "Security Lockdown"; + pixel_x = 38; + pixel_y = 6; + req_access = list(58) + }, +/obj/machinery/button/remote/airlock{ + id = "HoSdoor"; + name = "Office Door"; + pixel_x = 27; + pixel_y = 6 + }, +/turf/simulated/floor/carpet, +/area/crew_quarters/heads/hos) "oDA" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -67183,6 +67151,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/medbay) +"phY" = ( +/obj/effect/floor_decal/corner/blue{ + icon_state = "corner_white"; + dir = 9 + }, +/obj/effect/floor_decal/corner/blue{ + icon_state = "corner_white"; + dir = 6 + }, +/obj/item/modular_computer/console/preset/command, +/turf/simulated/floor/tiled, +/area/bridge) "pie" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -67592,6 +67572,19 @@ }, /turf/simulated/floor/plating, /area/maintenance/medbay) +"qtr" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) "qtu" = ( /obj/structure/cable{ d1 = 4; @@ -67621,6 +67614,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/medbay) +"quz" = ( +/obj/structure/flora/pottedplant/random, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/hop) "qvD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /obj/machinery/meter{ @@ -69846,10 +69843,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/structure/noticeboard{ - pixel_x = 0; - pixel_y = 32 - }, /turf/simulated/floor/wood, /area/lawoffice) "wOo" = ( @@ -95960,7 +95953,7 @@ aIc aJt aLq aNf -aLq +oCY aQC aIa amK @@ -96215,9 +96208,9 @@ aEf aGc aId aJt -aLr +lVt aNg -aOS +aLr aQD aIa amK @@ -107015,7 +107008,7 @@ aNF awK aSD aNS -aNS +qtr aXb aYs aZL @@ -107265,7 +107258,7 @@ atr atr atr atr -aKc +awK aLO aNG aPt @@ -107522,7 +107515,7 @@ aCV oQU aGI atr -iap +aWW gfO aNH azX @@ -108550,7 +108543,7 @@ aCW pcx aGM atr -aKf +awK fiA awK aPv @@ -110092,7 +110085,7 @@ aiN aiN aiN avf -awK +aKf aLT aNO avd @@ -111644,7 +111637,7 @@ aUv aVF aXm aPC -aYC +quz baY bcv bdY @@ -114453,8 +114446,8 @@ aqP ash atx avi +phY awM -ayD aAa aBx aBx diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm index 35554ca4f92..b5ce9497a61 100644 --- a/maps/aurora/aurora-5_interstitial.dmm +++ b/maps/aurora/aurora-5_interstitial.dmm @@ -2496,11 +2496,8 @@ /turf/simulated/floor/plating, /area/security/detectives_office) "eD" = ( -/obj/machinery/computer/records/medical, -/turf/simulated/floor/lino, -/area/security/detectives_office) -"eE" = ( -/obj/machinery/computer/records/security, +/obj/structure/bookcase, +/obj/item/weapon/book/manual/wiki/security_space_law, /turf/simulated/floor/lino, /area/security/detectives_office) "eF" = ( @@ -2516,7 +2513,7 @@ /turf/simulated/floor/carpet, /area/security/detectives_office) "eH" = ( -/obj/machinery/computer/security, +/obj/item/modular_computer/console/preset/security/investigations, /turf/simulated/floor/carpet, /area/security/detectives_office) "eI" = ( @@ -2624,10 +2621,6 @@ }, /turf/simulated/floor/plating, /area/security/detectives_office) -"eP" = ( -/obj/item/weapon/stool/padded, -/turf/simulated/floor/lino, -/area/security/detectives_office) "eQ" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/lino, @@ -3017,7 +3010,6 @@ "fJ" = ( /obj/structure/window/reinforced, /obj/structure/closet/secure_closet/detective, -/obj/item/weapon/book/manual/wiki/security_space_law, /turf/simulated/floor/lino, /area/security/detectives_office) "fK" = ( @@ -4474,7 +4466,6 @@ /area/security/training) "im" = ( /obj/structure/table/standard, -/obj/machinery/computer/records/medical/laptop, /turf/simulated/floor/tiled/dark{ name = "cooled dark floor"; temperature = 278 @@ -5228,7 +5219,6 @@ /area/medical/psych) "jH" = ( /obj/structure/table/standard, -/obj/machinery/computer/records/medical/laptop, /obj/effect/floor_decal/corner/green/full{ icon_state = "corner_white_full"; dir = 1 @@ -5236,6 +5226,7 @@ /obj/machinery/alarm{ pixel_y = 24 }, +/obj/item/weapon/book/manual/psych, /turf/simulated/floor/tiled/white, /area/medical/psych) "jI" = ( @@ -5378,7 +5369,6 @@ pixel_x = -1; pixel_y = 7 }, -/obj/item/weapon/book/manual/psych, /obj/effect/floor_decal/corner/green/full{ icon_state = "corner_white_full"; dir = 4 @@ -5387,11 +5377,11 @@ /area/medical/psych) "jT" = ( /obj/structure/table/standard, -/obj/machinery/computer/records/medical/laptop, /obj/effect/floor_decal/corner/green{ icon_state = "corner_white_full"; dir = 8 }, +/obj/item/weapon/book/manual/psych, /turf/simulated/floor/tiled/white, /area/medical/psych) "jU" = ( @@ -5633,7 +5623,6 @@ pixel_y = 7 }, /obj/structure/table/standard, -/obj/item/weapon/book/manual/psych, /obj/effect/floor_decal/corner/green/diagonal, /turf/simulated/floor/tiled/white, /area/medical/psych) @@ -6302,7 +6291,7 @@ pixel_y = 32 }, /obj/structure/table/wood, -/obj/machinery/computer/records/medical/laptop, +/obj/item/modular_computer/laptop/preset/medical, /turf/simulated/floor/carpet, /area/medical/psych) "lx" = ( @@ -7210,11 +7199,11 @@ /turf/simulated/floor/airless, /area/maintenance/interstitial_construction_site) "pO" = ( -/obj/structure/filingcabinet/chestdrawer, /obj/effect/floor_decal/corner/pink{ icon_state = "corner_white"; dir = 5 }, +/obj/item/modular_computer/console/preset/medical, /turf/simulated/floor/tiled/white, /area/medical/virology) "pQ" = ( @@ -7302,7 +7291,6 @@ /area/medical/virology) "qu" = ( /obj/structure/table/standard, -/obj/machinery/computer/records/medical/laptop, /obj/effect/floor_decal/corner/pink{ icon_state = "corner_white"; dir = 9 @@ -9906,7 +9894,7 @@ /area/maintenance/interstitial_main) "JI" = ( /obj/structure/bed/chair/office/dark{ - dir = 1 + dir = 8 }, /turf/simulated/floor/tiled, /area/security/forensics_office) @@ -10976,13 +10964,13 @@ icon_state = "corner_white"; dir = 9 }, -/obj/machinery/computer/records/security, /obj/machinery/requests_console{ department = "Forensic Technician"; departmentType = 5; pixel_x = -32; pixel_y = 0 }, +/obj/structure/table/standard, /turf/simulated/floor/tiled, /area/security/forensics_office) "Pm" = ( @@ -11738,7 +11726,7 @@ icon_state = "corner_white"; dir = 9 }, -/obj/machinery/computer/records/medical, +/obj/item/modular_computer/console/preset/security/investigations, /turf/simulated/floor/tiled, /area/security/forensics_office) "Uq" = ( @@ -47329,7 +47317,7 @@ ef eo eu eD -eP +fo fa fk fr @@ -47585,7 +47573,7 @@ dW eg ep ev -eE +fo eQ fb fl diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index 607f4c71fa6..b4389ee3442 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -6247,10 +6247,6 @@ /turf/simulated/floor/plating, /area/security/checkpoint2) "lq" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/records/employment{ - icon_state = "medlaptop" - }, /obj/structure/window/reinforced{ dir = 1 }, @@ -6261,6 +6257,7 @@ icon_state = "corner_white"; dir = 9 }, +/obj/item/modular_computer/console/preset/security, /turf/simulated/floor/tiled, /area/security/checkpoint2) "lr" = ( @@ -6317,10 +6314,6 @@ /turf/simulated/floor/tiled, /area/security/checkpoint2) "lu" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/records/employment{ - icon_state = "medlaptop" - }, /obj/structure/window/reinforced{ dir = 1 }, @@ -6333,6 +6326,7 @@ icon_state = "corner_white"; dir = 6 }, +/obj/item/modular_computer/console/preset/security, /turf/simulated/floor/tiled, /area/security/checkpoint2) "lv" = ( @@ -6611,8 +6605,6 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/obj/item/weapon/crowbar, -/obj/item/device/flash, /obj/structure/cable/green{ d2 = 4; icon_state = "0-4" @@ -6626,7 +6618,6 @@ /turf/simulated/floor/tiled, /area/security/checkpoint2) "lW" = ( -/obj/machinery/computer/records/security, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -6635,6 +6626,9 @@ /obj/effect/floor_decal/corner/blue{ dir = 10 }, +/obj/structure/table/reinforced, +/obj/item/weapon/crowbar, +/obj/item/device/flash, /turf/simulated/floor/tiled, /area/security/checkpoint2) "lX" = ( @@ -6651,10 +6645,12 @@ /turf/simulated/floor/tiled, /area/security/checkpoint2) "lY" = ( -/obj/machinery/computer/records/security, /obj/effect/floor_decal/corner/blue{ dir = 10 }, +/obj/structure/table/reinforced, +/obj/item/weapon/crowbar, +/obj/item/device/flash, /turf/simulated/floor/tiled, /area/security/checkpoint2) "lZ" = ( @@ -6662,8 +6658,6 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/obj/item/weapon/crowbar, -/obj/item/device/flash, /obj/effect/floor_decal/corner/blue/full{ icon_state = "corner_white_full"; dir = 4 diff --git a/maps/exodus/exodus-1_station.dmm b/maps/exodus/exodus-1_station.dmm index 4847ba0dd7e..49ab6196d4d 100644 --- a/maps/exodus/exodus-1_station.dmm +++ b/maps/exodus/exodus-1_station.dmm @@ -1479,11 +1479,11 @@ /turf/simulated/floor/plating, /area/security/main) "acK" = ( -/obj/machinery/computer/records/security, /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; dir = 8 }, +/obj/machinery/computer/station_alert/security, /turf/simulated/floor/tiled, /area/security/main) "acL" = ( @@ -1498,10 +1498,9 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/turf/simulated/floor/tiled, -/area/security/main) -"acN" = ( -/obj/machinery/computer/station_alert/security, +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/security/main) "acO" = ( @@ -1652,14 +1651,14 @@ /turf/simulated/floor/tiled, /area/security/main) "add" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; dir = 8 }, +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/security/main) "ade" = ( @@ -4386,9 +4385,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/computer/records/employment{ - pixel_y = 4 - }, +/obj/item/modular_computer/laptop/preset/security/hos, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "aih" = ( @@ -4580,10 +4577,10 @@ /turf/simulated/floor/tiled, /area/security/brig) "aiC" = ( -/obj/machinery/computer/records/security, /obj/structure/window/reinforced{ dir = 8 }, +/obj/item/modular_computer/console/preset/security, /turf/simulated/floor/tiled/dark, /area/security/warden) "aiD" = ( @@ -4906,7 +4903,6 @@ /turf/simulated/floor/tiled, /area/security/brig) "ajf" = ( -/obj/machinery/computer/records/security, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -4914,6 +4910,7 @@ dir = 9; pixel_y = 0 }, +/obj/item/modular_computer/console/preset/security, /turf/simulated/floor/tiled, /area/security/brig) "ajg" = ( @@ -4928,7 +4925,7 @@ pixel_x = 0; pixel_y = -30 }, -/obj/item/modular_computer/console/preset/security, +/obj/structure/table/standard, /turf/simulated/floor/tiled/dark, /area/security/warden) "ajh" = ( @@ -5084,10 +5081,6 @@ /obj/item/modular_computer/console/preset/security, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) -"ajv" = ( -/obj/machinery/computer/records/security, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/heads/hos) "ajw" = ( /obj/machinery/light_switch{ pixel_y = -25 @@ -6299,7 +6292,6 @@ /turf/simulated/floor/tiled, /area/security/forensics_office) "als" = ( -/obj/machinery/computer/records/medical, /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; dir = 6 @@ -6309,6 +6301,7 @@ pixel_x = 28; pixel_y = 12 }, +/obj/item/modular_computer/console/preset/security/investigations, /turf/simulated/floor/tiled, /area/security/forensics_office) "alu" = ( @@ -6506,11 +6499,11 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/computer/records/security, /obj/effect/floor_decal/corner/blue/full{ icon_state = "corner_white_full"; dir = 8 }, +/obj/item/modular_computer/console/preset/security, /turf/simulated/floor/tiled, /area/security/brig) "alN" = ( @@ -6723,7 +6716,6 @@ /turf/simulated/floor/tiled, /area/security/forensics_office) "amd" = ( -/obj/machinery/computer/records/security, /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; dir = 6 @@ -7006,11 +6998,7 @@ /turf/simulated/wall, /area/lawoffice) "amG" = ( -/obj/machinery/computer/records/medical, -/turf/simulated/floor/lino, -/area/security/detectives_office) -"amH" = ( -/obj/machinery/computer/records/security, +/obj/item/modular_computer/console/preset/security/investigations, /turf/simulated/floor/lino, /area/security/detectives_office) "amI" = ( @@ -15904,11 +15892,9 @@ /obj/effect/floor_decal/corner/blue{ dir = 5 }, -/obj/item/modular_computer/console/preset/security, /turf/simulated/floor/tiled/dark, /area/security/checkpoint2) "aDC" = ( -/obj/item/modular_computer/console/preset/command, /obj/machinery/status_display{ density = 0; layer = 4; @@ -15918,13 +15904,14 @@ /obj/effect/floor_decal/corner/blue{ dir = 5 }, +/obj/item/modular_computer/console/preset/security, /turf/simulated/floor/tiled/dark, /area/security/checkpoint2) "aDD" = ( -/obj/machinery/computer/records/security, /obj/effect/floor_decal/corner/blue{ dir = 5 }, +/obj/item/modular_computer/console/preset/command, /turf/simulated/floor/tiled/dark, /area/security/checkpoint2) "aDE" = ( @@ -17455,12 +17442,11 @@ /area/security/checkpoint2) "aGs" = ( /obj/structure/table/reinforced, -/obj/machinery/computer/records/employment{ - icon_state = "medlaptop" - }, /obj/effect/floor_decal/corner/blue{ dir = 10 }, +/obj/item/device/flash, +/obj/item/weapon/crowbar, /turf/simulated/floor/tiled/dark, /area/security/checkpoint2) "aGt" = ( @@ -17486,8 +17472,6 @@ /turf/simulated/floor/tiled/dark, /area/security/checkpoint2) "aGv" = ( -/obj/item/weapon/crowbar, -/obj/item/device/flash, /obj/item/device/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -29 @@ -24630,7 +24614,7 @@ icon_state = "corner_white"; dir = 5 }, -/obj/machinery/computer/records/security, +/obj/item/modular_computer/console/preset/security, /turf/simulated/floor/tiled, /area/bridge) "aTR" = ( @@ -25289,16 +25273,6 @@ }, /turf/simulated/floor/wood, /area/journalistoffice) -"aVj" = ( -/obj/structure/table/wood, -/obj/machinery/computer/records/employment{ - density = 0; - icon_state = "medlaptop"; - pixel_y = 4; - req_one_access = list(19,38) - }, -/turf/simulated/floor/carpet, -/area/lawoffice) "aVk" = ( /obj/machinery/alarm{ dir = 4; @@ -26341,18 +26315,15 @@ /area/lawoffice) "aWZ" = ( /obj/structure/table/wood, -/obj/machinery/computer/records/employment{ - density = 0; - icon_state = "medlaptop"; - pixel_x = 1; - pixel_y = 6; - req_one_access = list(19,38) - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/item/modular_computer/laptop/preset/representative{ + pixel_x = 2; + pixel_y = 4 + }, /turf/simulated/floor/carpet, /area/lawoffice) "aXa" = ( @@ -26456,15 +26427,15 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/machinery/computer/records/medical/laptop, +/obj/item/modular_computer/laptop/preset/command, /turf/simulated/floor/tiled, /area/bridge) "aXl" = ( -/obj/machinery/computer/records/medical, /obj/effect/floor_decal/corner/lime{ icon_state = "corner_white"; dir = 5 }, +/obj/item/modular_computer/console/preset/medical, /turf/simulated/floor/tiled, /area/bridge) "aXm" = ( @@ -26473,7 +26444,6 @@ dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/modular_computer/console/preset/medical, /obj/effect/floor_decal/corner/lime/full{ icon_state = "corner_white_full"; dir = 1 @@ -34374,10 +34344,10 @@ /area/crew_quarters/captain) "blF" = ( /obj/structure/table/wood, -/obj/machinery/computer/records/employment{ - icon_state = "medlaptop" - }, /obj/item/weapon/hand_tele, +/obj/item/modular_computer/laptop/preset/command/captain{ + pixel_x = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "blG" = ( @@ -38223,7 +38193,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/computer/records/medical/laptop, /obj/structure/table/standard{ name = "plastic table frame" }, @@ -39231,7 +39200,6 @@ /turf/simulated/floor/tiled, /area/medical/exam_room) "buu" = ( -/obj/machinery/computer/records/medical/laptop, /obj/item/device/radio/intercom{ dir = 1; name = "Station Intercom (General)"; @@ -39247,6 +39215,7 @@ icon_state = "corner_white_diagonal"; dir = 4 }, +/obj/item/modular_computer/laptop/preset/medical, /turf/simulated/floor/tiled, /area/medical/exam_room) "buv" = ( @@ -39964,9 +39933,6 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_three) "bvB" = ( -/obj/machinery/computer/records/employment{ - icon_state = "medlaptop" - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -39985,6 +39951,7 @@ icon_state = "corner_white_full"; dir = 8 }, +/obj/item/modular_computer/laptop/preset/command/hop, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "bvC" = ( @@ -40229,7 +40196,7 @@ /area/medical/psych) "bvX" = ( /obj/structure/table/standard, -/obj/machinery/computer/records/medical/laptop, +/obj/item/weapon/book/manual/psych, /turf/simulated/floor/tiled/white, /area/medical/psych) "bvY" = ( @@ -44351,7 +44318,6 @@ pixel_x = -1; pixel_y = 7 }, -/obj/item/weapon/book/manual/psych, /turf/simulated/floor/tiled/white, /area/medical/psych) "bCZ" = ( @@ -45819,7 +45785,7 @@ /area/medical/psych) "bFN" = ( /obj/structure/table/wood, -/obj/machinery/computer/records/medical/laptop, +/obj/item/modular_computer/laptop/preset/medical, /turf/simulated/floor/carpet/blue, /area/medical/psych) "bFO" = ( @@ -46836,13 +46802,11 @@ /area/rnd/research) "bHt" = ( /obj/structure/table/standard, -/obj/machinery/computer/records/employment{ - icon_state = "medlaptop" - }, /obj/effect/floor_decal/corner/white/diagonal{ icon_state = "corner_white_diagonal"; dir = 4 }, +/obj/item/modular_computer/laptop/preset/research/rd, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hor) "bHu" = ( @@ -51632,9 +51596,6 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "bPT" = ( -/obj/machinery/computer/records/employment{ - pixel_y = 4 - }, /obj/item/device/megaphone, /obj/structure/table/glass, /turf/simulated/floor/tiled/white, @@ -51659,12 +51620,11 @@ icon_state = "alarm0"; pixel_x = 24 }, -/obj/machinery/computer/records/medical/laptop{ - pixel_x = 3; - pixel_y = 4 - }, /obj/structure/table/glass, /obj/effect/floor_decal/corner/paleblue, +/obj/item/modular_computer/laptop/preset/medical/cmo{ + pixel_y = 4 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "bPW" = ( @@ -53348,11 +53308,13 @@ name = "Station Intercom (General)"; pixel_x = -27 }, -/obj/structure/bed/chair/office/dark, /obj/effect/floor_decal/corner/pink{ icon_state = "corner_white"; dir = 9 }, +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/patient_a) "bSX" = ( @@ -53383,11 +53345,13 @@ name = "Station Intercom (General)"; pixel_x = -27 }, -/obj/structure/bed/chair/office/dark, /obj/effect/floor_decal/corner/pink{ icon_state = "corner_white"; dir = 9 }, +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/patient_b) "bTa" = ( @@ -53729,10 +53693,6 @@ /obj/item/weapon/circuitboard/clonescanner, /obj/item/weapon/circuitboard/clonepod, /obj/item/weapon/circuitboard/scan_consolenew, -/obj/item/weapon/circuitboard/med_data{ - pixel_x = 3; - pixel_y = -3 - }, /turf/simulated/floor/plating, /area/storage/tech) "bTM" = ( @@ -53740,18 +53700,10 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/secure_data{ - pixel_x = -2; - pixel_y = 2 - }, /obj/item/weapon/circuitboard/security{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/skills{ - pixel_x = 4; - pixel_y = -3 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/storage/tech) @@ -54097,7 +54049,6 @@ /area/medical/psych) "bUl" = ( /obj/structure/table/standard, -/obj/machinery/computer/records/medical/laptop, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -54139,7 +54090,6 @@ /area/medical/patient_a) "bUo" = ( /obj/structure/table/standard, -/obj/machinery/computer/records/medical/laptop, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -56928,9 +56878,7 @@ pixel_x = 0; pixel_y = 27 }, -/obj/machinery/computer/records/employment{ - icon_state = "medlaptop" - }, +/obj/item/modular_computer/laptop/preset/engineering/ce, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "bZq" = ( @@ -59563,11 +59511,6 @@ /obj/machinery/newscaster{ pixel_x = 30 }, -/obj/structure/table/standard, -/obj/machinery/computer/records/medical/laptop{ - pixel_x = 3; - pixel_y = 4 - }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing_hallway) "ceh" = ( @@ -65190,8 +65133,8 @@ /turf/simulated/floor/tiled/white, /area/medical/surgery) "cou" = ( -/obj/machinery/computer/records/medical, /obj/machinery/light, +/obj/item/modular_computer/console/preset/medical, /turf/simulated/floor/tiled/white, /area/medical/surgery) "cov" = ( @@ -65209,8 +65152,8 @@ /turf/simulated/floor/plating, /area/engineering/storage) "cow" = ( -/obj/machinery/computer/records/medical, /obj/machinery/light, +/obj/item/modular_computer/console/preset/medical, /turf/simulated/floor/tiled/white, /area/medical/surgery2) "cox" = ( @@ -70585,9 +70528,8 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "cyk" = ( -/obj/machinery/computer/records/medical/laptop, /obj/structure/disposalpipe/segment, -/obj/structure/table/glass, +/obj/item/modular_computer/console/preset/medical, /turf/simulated/floor/tiled/white, /area/medical/virology) "cyl" = ( @@ -77891,8 +77833,7 @@ /turf/simulated/floor/plating, /area/hallway/secondary/exit) "eeJ" = ( -/obj/structure/table/standard, -/obj/machinery/computer/records/medical/laptop, +/obj/item/modular_computer/console/preset/security/investigations, /turf/simulated/floor/tiled/dark{ name = "cooled dark floor"; temperature = 278 @@ -102157,7 +102098,7 @@ klG ftj aVk aWT -aVj +aWU upr bbY bdA @@ -110347,7 +110288,7 @@ ajT akx alk alW -amH +xXA anq anX aoS @@ -111884,7 +111825,7 @@ agS ahu aie agR -aju +agR agy akC aln @@ -112127,7 +112068,7 @@ aaV aaw abF ach -acN +acO acO adw adM @@ -112141,7 +112082,7 @@ agT ahv aif aiK -ajv +aju agy akD alq diff --git a/maps/exodus/exodus-2_centcomm.dmm b/maps/exodus/exodus-2_centcomm.dmm index d2fc9519c74..9cee7093840 100644 --- a/maps/exodus/exodus-2_centcomm.dmm +++ b/maps/exodus/exodus-2_centcomm.dmm @@ -3754,7 +3754,7 @@ }, /area/centcom/evac) "akM" = ( -/obj/machinery/computer/records/security, +/obj/structure/computerframe, /turf/unsimulated/floor{ icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4" @@ -8582,7 +8582,6 @@ }, /area/centcom/living) "azf" = ( -/obj/machinery/computer/records/medical, /obj/structure/window/reinforced{ dir = 4 }, @@ -8590,6 +8589,7 @@ icon_state = "spline_plain"; dir = 4 }, +/obj/item/modular_computer/console/preset/medical, /turf/simulated/shuttle/floor{ icon_state = "floor3" }, @@ -13930,12 +13930,12 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/computer/records/employment{ - icon_state = "medlaptop"; - pixel_x = 3; - pixel_y = 4 - }, /obj/structure/window/reinforced, +/obj/item/weapon/paper_bin{ + pixel_x = 1; + pixel_y = 9 + }, +/obj/item/weapon/pen, /turf/unsimulated/floor{ icon_state = "floor" }, @@ -14237,7 +14237,7 @@ }, /area/centcom/holding) "aPi" = ( -/obj/machinery/computer/records/security, +/obj/item/modular_computer/console/preset/security, /turf/unsimulated/floor{ dir = 8; icon_state = "red" @@ -14661,11 +14661,6 @@ /area/centcom/spawning) "aQh" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ - pixel_x = 1; - pixel_y = 9 - }, -/obj/item/weapon/pen, /obj/machinery/door/window/southright{ name = "Arrivals Processing"; req_access = list(101) @@ -15905,11 +15900,11 @@ }, /area/centcom/holding) "aSU" = ( -/obj/machinery/computer/records/security, /obj/machinery/camera/network/crescent{ c_tag = "Crescent Arrivals North"; dir = 8 }, +/obj/item/modular_computer/console/preset/security, /turf/unsimulated/floor{ icon_state = "floor" }, @@ -16373,7 +16368,7 @@ }, /area/centcom/control) "aTT" = ( -/obj/machinery/computer/records/security, +/obj/item/modular_computer/console/preset/security, /turf/unsimulated/floor{ icon_state = "floor" }, @@ -17981,7 +17976,7 @@ }, /area/centcom/control) "aXp" = ( -/obj/machinery/computer/records/medical, +/obj/item/modular_computer/console/preset/medical, /turf/unsimulated/floor{ icon_state = "floor" }, @@ -19722,7 +19717,6 @@ /area/tdome) "egp" = ( /obj/structure/table/wood, -/obj/machinery/computer/records/employment, /turf/unsimulated/floor{ icon_state = "floor" }, @@ -20011,7 +20005,7 @@ }, /area/centcom/legion) "fok" = ( -/obj/machinery/computer/records/security, +/obj/item/modular_computer/console/preset/security, /turf/unsimulated/floor{ icon_state = "floor" }, @@ -21559,7 +21553,6 @@ /turf/simulated/floor/tiled/dark, /area/centcom/legion) "lQh" = ( -/obj/machinery/computer/records/security, /obj/structure/window/reinforced{ dir = 8 }, @@ -21567,6 +21560,7 @@ icon_state = "spline_plain"; dir = 8 }, +/obj/item/modular_computer/console/preset/security, /turf/simulated/shuttle/floor{ icon_state = "floor3" }, @@ -22959,7 +22953,7 @@ }, /area/space) "tcD" = ( -/obj/machinery/computer/records/security, +/obj/item/modular_computer/console/preset/security, /turf/unsimulated/floor{ icon_state = "floor" }, diff --git a/maps/exodus/exodus-3_telecomms.dmm b/maps/exodus/exodus-3_telecomms.dmm index 421b98d9d59..f64e6fe9ba4 100644 --- a/maps/exodus/exodus-3_telecomms.dmm +++ b/maps/exodus/exodus-3_telecomms.dmm @@ -28,7 +28,7 @@ /turf/template_noop, /area/derelict/ship) "an" = ( -/obj/machinery/computer/records/medical, +/obj/structure/computerframe, /turf/simulated/shuttle/floor{ icon_state = "floor3" }, diff --git a/maps/space_ruins/derelict.dmm b/maps/space_ruins/derelict.dmm index a9cfaa0e489..2e1b4d1c380 100644 --- a/maps/space_ruins/derelict.dmm +++ b/maps/space_ruins/derelict.dmm @@ -5694,7 +5694,7 @@ /area/derelict/hallway/southeast) "rm" = ( /obj/structure/table/wood, -/obj/machinery/computer/records/medical/laptop, +/obj/structure/computerframe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood, /area/derelict/hallway/southeast) @@ -6382,7 +6382,7 @@ /area/derelict/hallway/southeast) "ta" = ( /obj/structure/table/standard, -/obj/machinery/computer/records/medical/laptop, +/obj/structure/computerframe, /obj/machinery/light{ icon_state = "tube1"; dir = 4 @@ -6568,7 +6568,7 @@ /area/template_noop) "tA" = ( /obj/structure/table/standard, -/obj/machinery/computer/records/employment, +/obj/structure/computerframe, /turf/simulated/floor/carpet/blue, /area/derelict/hallway/southeast) "tB" = ( @@ -7542,7 +7542,7 @@ /area/derelict/hallway/southwest) "vO" = ( /obj/structure/table/standard, -/obj/machinery/computer/records/employment, +/obj/structure/computerframe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/derelict/hallway/southeast) diff --git a/maps/space_ruins/scrapheap.dmm b/maps/space_ruins/scrapheap.dmm index 805051a6fca..60bfa5482a7 100644 --- a/maps/space_ruins/scrapheap.dmm +++ b/maps/space_ruins/scrapheap.dmm @@ -8939,7 +8939,6 @@ icon_state = "cabinet_closed" }, /obj/item/weapon/gun/energy/blaster, -/obj/item/weapon/card/id/legion, /obj/item/weapon/shield/energy/legion, /obj/item/weapon/melee/whip, /obj/item/weapon/melee/telebaton, @@ -10060,7 +10059,6 @@ icon_state = "cabinet_closed" }, /obj/item/weapon/gun/energy/blaster, -/obj/item/weapon/card/id/legion, /obj/item/weapon/shield/energy/legion, /obj/machinery/light/small, /turf/simulated/floor/carpet,