From 5c5dd02d0ed94593340d7d13b071b64c455c8725 Mon Sep 17 00:00:00 2001 From: nmajask Date: Sun, 14 Nov 2021 23:24:49 -0500 Subject: [PATCH 1/2] *scream why cant I code --- .../modular_computers/computers/machinery/console_presets.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/modular_computers/computers/machinery/console_presets.dm b/code/modules/modular_computers/computers/machinery/console_presets.dm index d4c9783ef4b5..dec7d3d0949b 100644 --- a/code/modules/modular_computers/computers/machinery/console_presets.dm +++ b/code/modules/modular_computers/computers/machinery/console_presets.dm @@ -122,6 +122,7 @@ desc = "A stationary computer. This one comes preloaded with bureaucratic programs." /obj/machinery/modular_computer/console/preset/command/hop/install_programs() + . = ..() var/obj/item/computer_hardware/hard_drive/hard_drive = cpu.all_components[MC_HDD] hard_drive.store_file(new/datum/computer_file/program/job_management()) hard_drive.store_file(new/datum/computer_file/program/crew_manifest()) @@ -134,6 +135,7 @@ desc = "A stationary computer. This one comes preloaded with security programs." /obj/machinery/modular_computer/console/preset/command/hos/install_programs() + . = ..() var/obj/item/computer_hardware/hard_drive/hard_drive = cpu.all_components[MC_HDD] hard_drive.store_file(new/datum/computer_file/program/secureye()) @@ -143,6 +145,7 @@ desc = "A stationary computer. This one comes preloaded with engineering programs." /obj/machinery/modular_computer/console/preset/command/ce/install_programs() + . = ..() var/obj/item/computer_hardware/hard_drive/hard_drive = cpu.all_components[MC_HDD] hard_drive.store_file(new/datum/computer_file/program/power_monitor()) hard_drive.store_file(new/datum/computer_file/program/alarm_monitor()) @@ -156,6 +159,7 @@ _has_ai = TRUE /obj/machinery/modular_computer/console/preset/command/rd/install_programs() + . = ..() var/obj/item/computer_hardware/hard_drive/hard_drive = cpu.all_components[MC_HDD] hard_drive.store_file(new/datum/computer_file/program/ntnetmonitor()) hard_drive.store_file(new/datum/computer_file/program/aidiag()) @@ -168,6 +172,7 @@ /* /obj/machinery/modular_computer/console/preset/command/cmo/install_programs() + . = ..() var/obj/item/computer_hardware/hard_drive/hard_drive = cpu.all_components[MC_HDD] */ From f9ef3f5c5cb0a8f807778c56675ca6252a94a779 Mon Sep 17 00:00:00 2001 From: nmajask Date: Mon, 15 Nov 2021 02:11:11 -0500 Subject: [PATCH 2/2] Why did this not exist originally *scream --- .../computers/machinery/modular_computer.dm | 3 +++ .../modular_computers/computers/machinery/modular_console.dm | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/modular_computers/computers/machinery/modular_computer.dm b/code/modules/modular_computers/computers/machinery/modular_computer.dm index 0af703169ba0..1c0a524bddda 100644 --- a/code/modules/modular_computers/computers/machinery/modular_computer.dm +++ b/code/modules/modular_computers/computers/machinery/modular_computer.dm @@ -25,6 +25,9 @@ var/base_active_power_usage = 100 // Power usage when the computer is open (screen is active) and can be interacted with. Remember hardware can use power too. var/base_idle_power_usage = 10 // Power usage when the computer is idle and screen is off (currently only applies to laptops) + var/list/expansion_bays /// Lazy List of extra hardware slots that can be used modularly. + var/max_bays = 0 /// Number of total expansion bays this computer has available. + var/obj/item/modular_computer/processor/cpu = null // CPU that handles most logic while this type only handles power and other specific things. /obj/machinery/modular_computer/Initialize() diff --git a/code/modules/modular_computers/computers/machinery/modular_console.dm b/code/modules/modular_computers/computers/machinery/modular_console.dm index 9685d02560b1..367696aa0339 100644 --- a/code/modules/modular_computers/computers/machinery/modular_console.dm +++ b/code/modules/modular_computers/computers/machinery/modular_console.dm @@ -11,7 +11,8 @@ density = TRUE base_idle_power_usage = 100 base_active_power_usage = 500 - max_hardware_size = 4 + max_hardware_size = WEIGHT_CLASS_BULKY + max_bays = 5 steel_sheet_cost = 10 light_strength = 2 max_integrity = 300 @@ -79,4 +80,4 @@ var/obj/structure/window/W = locate() in T if(istype(T, /turf/closed/wall) || W) pixel_x = offet_matrix[1] - pixel_y = offet_matrix[2] \ No newline at end of file + pixel_y = offet_matrix[2]