diff --git a/code/__DEFINES/modular_computer.dm b/code/__DEFINES/modular_computer.dm index f44b1572644..00959279a47 100644 --- a/code/__DEFINES/modular_computer.dm +++ b/code/__DEFINES/modular_computer.dm @@ -3,7 +3,6 @@ //Modular computer part defines #define MC_CARD "CARD" #define MC_CARD2 "CARD2" -#define MC_CELL "CELL" //NTNet stuff, for modular computers // NTNet module-configuration values. Do not change these. If you need to add another use larger number (5..6..7 etc) diff --git a/code/modules/cargo/exports/parts.dm b/code/modules/cargo/exports/parts.dm index dcf20dd219a..64e7215591b 100644 --- a/code/modules/cargo/exports/parts.dm +++ b/code/modules/cargo/exports/parts.dm @@ -16,47 +16,6 @@ export_types = list(/obj/item/circuitboard/computer/solar_control) // Computer and Tablet Parts -//Batteries - -/datum/export/modular_part/battery/advanced - cost = CARGO_CRATE_VALUE * 0.6 - unit_name = "advanced computer battery" - export_types = list(/obj/item/stock_parts/cell/computer/advanced) - include_subtypes = FALSE - -/datum/export/modular_part/battery/super - cost = CARGO_CRATE_VALUE * 0.8 - unit_name = "super computer battery" - export_types = list(/obj/item/stock_parts/cell/computer/super) - include_subtypes = FALSE - -/datum/export/modular_part/battery/micro - cost = CARGO_CRATE_VALUE * 0.2 - unit_name = "micro computer battery" - export_types = list(/obj/item/stock_parts/cell/computer/micro) - include_subtypes = FALSE - -/datum/export/modular_part/battery/nano - cost = CARGO_CRATE_VALUE * 0.1 - unit_name = "nano computer battery" - export_types = list(/obj/item/stock_parts/cell/computer/nano) - include_subtypes = FALSE - -/datum/export/modular_part/battery/standard - cost = CARGO_CRATE_VALUE * 0.4 - unit_name = "computer battery" - export_types = list(/obj/item/stock_parts/cell/computer) - include_subtypes = TRUE - -//Other Power Parts -/datum/export/modular_part/controller - cost = CARGO_CRATE_VALUE * 0.1 - unit_name = "power cell controller" - export_types = list(/obj/item/computer_hardware/battery) - include_subtypes = TRUE - -//Miscellaneous Parts - /datum/export/modular_part/idcard cost = CARGO_CRATE_VALUE * 0.2 unit_name = "computer ID card slot" diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index 02280921a02..dd7a3b16a8e 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -14,9 +14,11 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar armor = list(MELEE = 0, BULLET = 20, LASER = 20, ENERGY = 100, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0) light_system = MOVABLE_LIGHT_DIRECTIONAL + ///The power cell the computer uses to run on. + var/obj/item/stock_parts/cell/internal_cell = /obj/item/stock_parts/cell + ///The disk in this PDA. If set, this will be inserted on Initialize. var/obj/item/computer_disk/inserted_disk - ///The amount of storage space the computer starts with. var/max_capacity = 128 ///The amount of storage space we've got filled @@ -62,7 +64,7 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar ///The last recorded amount of power used. var/last_power_usage = 0 ///Power usage when the computer is open (screen is active) and can be interacted with. Remember hardware can use power too. - var/base_active_power_usage = 50 + var/base_active_power_usage = 75 ///Power usage when the computer is idle and screen is off (currently only applies to laptops) var/base_idle_power_usage = 5 @@ -131,6 +133,8 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar add_item_action(/datum/action/item_action/toggle_computer_light) if(inserted_disk) inserted_disk = new inserted_disk(src) + if(internal_cell) + internal_cell = new internal_cell(src) update_appearance() register_context() @@ -193,6 +197,9 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar /obj/item/modular_computer/proc/play_ping() playsound(loc, 'sound/machines/ping.ogg', get_clamped_volume(), FALSE, -1) +/obj/item/modular_computer/get_cell() + return internal_cell + /obj/item/modular_computer/AltClick(mob/user) ..() if(issilicon(user)) @@ -438,6 +445,12 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar . += mutable_appearance(init_icon, "bsod") . += mutable_appearance(init_icon, "broken") +/obj/item/modular_computer/Exited(atom/movable/gone, direction) + if(internal_cell == gone) + internal_cell = null + if(enabled && !use_power()) + shutdown_computer() + return ..() // On-click handling. Turns on the computer if it's off and opens the GUI. /obj/item/modular_computer/interact(mob/user) @@ -549,12 +562,10 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar var/list/data = list() data["PC_device_theme"] = device_theme + data["PC_showbatteryicon"] = !!internal_cell - var/obj/item/computer_hardware/battery/battery_module = all_components[MC_CELL] - - data["PC_showbatteryicon"] = !!battery_module - if(battery_module && battery_module.battery) - switch(battery_module.battery.percent()) + if(internal_cell) + switch(internal_cell.percent()) if(80 to 200) // 100 should be maximal but just in case.. data["PC_batteryicon"] = "batt_100.gif" if(60 to 80) @@ -567,7 +578,7 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar data["PC_batteryicon"] = "batt_20.gif" else data["PC_batteryicon"] = "batt_5.gif" - data["PC_batterypercent"] = "[round(battery_module.battery.percent())]%" + data["PC_batterypercent"] = "[round(internal_cell.percent())]%" else data["PC_batteryicon"] = "batt_5.gif" data["PC_batterypercent"] = "N/C" @@ -752,6 +763,18 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar balloon_alert(user, "inserted pai") return + if(istype(attacking_item, /obj/item/stock_parts/cell)) + if(ismachinery(loc)) + return + if(internal_cell) + to_chat(user, span_warning("You try to connect \the [attacking_item] to \the [src], but its connectors are occupied.")) + return + if(user && !user.transferItemToLoc(attacking_item, src)) + return + internal_cell = attacking_item + to_chat(user, span_notice("You plug \the [attacking_item] to \the [src].")) + return + // Check if any Applications need it for(var/datum/computer_file/item_holding_app as anything in stored_files) if(item_holding_app.try_insert(attacking_item, user)) @@ -821,7 +844,10 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar var/choice = tgui_input_list(user, "Component to uninstall", "Computer maintenance", sort_list(component_names)) if(isnull(choice)) - return + if(internal_cell) + user.put_in_hands(internal_cell) + to_chat(user, span_notice("You detach \the [internal_cell] from \the [src].")) + return TOOL_ACT_TOOLTYPE_SUCCESS if(!Adjacent(user)) return diff --git a/code/modules/modular_computers/computers/item/computer_power.dm b/code/modules/modular_computers/computers/item/computer_power.dm index db15f14c5dc..9543e955c8a 100644 --- a/code/modules/modular_computers/computers/item/computer_power.dm +++ b/code/modules/modular_computers/computers/item/computer_power.dm @@ -2,33 +2,25 @@ /obj/item/modular_computer/proc/use_power(amount = 0) if(check_power_override()) return TRUE - if(ismachinery(loc)) var/obj/machinery/machine_holder = loc if(machine_holder.powered()) machine_holder.use_power(amount) return TRUE - var/obj/item/computer_hardware/battery/battery_module = all_components[MC_CELL] - if(battery_module && battery_module.battery && battery_module.battery.charge) - var/obj/item/stock_parts/cell/cell = battery_module.battery - if(cell.use(amount JOULES)) - return TRUE - else // Discharge the cell anyway. - cell.use(min(amount JOULES, cell.charge)) - return FALSE - return FALSE + if(!internal_cell || !internal_cell.charge) + return FALSE + + if(!internal_cell.use(amount JOULES)) + internal_cell.use(min(amount JOULES, internal_cell.charge)) //drain it anyways. + return FALSE + return TRUE /obj/item/modular_computer/proc/give_power(amount) - var/obj/item/computer_hardware/battery/battery_module = all_components[MC_CELL] - if(battery_module?.battery) - return battery_module.battery.give(amount) + if(internal_cell) + return internal_cell.give(amount) return 0 -/obj/item/modular_computer/get_cell() - var/obj/item/computer_hardware/battery/battery_module = all_components[MC_CELL] - return battery_module?.get_cell() - // Used in following function to reduce copypaste /obj/item/modular_computer/proc/power_failure() if(enabled) // Shut down the computer diff --git a/code/modules/modular_computers/computers/item/laptop_presets.dm b/code/modules/modular_computers/computers/item/laptop_presets.dm index 097b62af72b..1eebf9f2387 100644 --- a/code/modules/modular_computers/computers/item/laptop_presets.dm +++ b/code/modules/modular_computers/computers/item/laptop_presets.dm @@ -1,7 +1,3 @@ -/obj/item/modular_computer/laptop/preset/Initialize(mapload) - . = ..() - install_component(new /obj/item/computer_hardware/battery(src, /obj/item/stock_parts/cell/computer)) - /obj/item/modular_computer/laptop/preset/civilian desc = "A low-end laptop often used for personal recreation." starting_programs = list( diff --git a/code/modules/modular_computers/computers/item/processor.dm b/code/modules/modular_computers/computers/item/processor.dm index 4d86b248e0e..c5854074126 100644 --- a/code/modules/modular_computers/computers/item/processor.dm +++ b/code/modules/modular_computers/computers/item/processor.dm @@ -25,6 +25,7 @@ // Obtain reference to machinery computer machinery_computer = loc machinery_computer.cpu = src + internal_cell = machinery_computer.internal_cell hardware_flag = machinery_computer.hardware_flag max_hardware_size = machinery_computer.max_hardware_size steel_sheet_cost = machinery_computer.steel_sheet_cost diff --git a/code/modules/modular_computers/computers/item/tablet.dm b/code/modules/modular_computers/computers/item/tablet.dm index 8b449a5b32b..3f18cac7138 100644 --- a/code/modules/modular_computers/computers/item/tablet.dm +++ b/code/modules/modular_computers/computers/item/tablet.dm @@ -429,5 +429,4 @@ /obj/item/modular_computer/tablet/pda/Initialize(mapload) . = ..() - install_component(new /obj/item/computer_hardware/battery(src, /obj/item/stock_parts/cell/computer)) install_component(new /obj/item/computer_hardware/card_slot) diff --git a/code/modules/modular_computers/computers/item/tablet_presets.dm b/code/modules/modular_computers/computers/item/tablet_presets.dm index 88bacfeb714..207899a8a34 100644 --- a/code/modules/modular_computers/computers/item/tablet_presets.dm +++ b/code/modules/modular_computers/computers/item/tablet_presets.dm @@ -4,7 +4,3 @@ /datum/computer_file/program/ntnetdownload/syndicate, /datum/computer_file/program/radar/fission360, ) - -/obj/item/modular_computer/tablet/nukeops/Initialize(mapload) - . = ..() - install_component(new /obj/item/computer_hardware/battery(src, /obj/item/stock_parts/cell/computer)) diff --git a/code/modules/modular_computers/computers/machinery/console_presets.dm b/code/modules/modular_computers/computers/machinery/console_presets.dm index b5fbfe1b9bc..c2431a194dc 100644 --- a/code/modules/modular_computers/computers/machinery/console_presets.dm +++ b/code/modules/modular_computers/computers/machinery/console_presets.dm @@ -1,7 +1,6 @@ /obj/machinery/modular_computer/console/preset // Can be changed to give devices specific hardware var/_has_second_id_slot = FALSE - var/_has_battery = FALSE ///List of programs the computer starts with, given on Initialize. var/list/datum/computer_file/starting_programs = list() @@ -13,8 +12,6 @@ cpu.install_component(new /obj/item/computer_hardware/card_slot) if(_has_second_id_slot) cpu.install_component(new /obj/item/computer_hardware/card_slot/secondary) - if(_has_battery) - cpu.install_component(new /obj/item/computer_hardware/battery(cpu, /obj/item/stock_parts/cell/computer/super)) for(var/programs in starting_programs) var/datum/computer_file/program/program_type = new programs cpu.store_file(program_type) diff --git a/code/modules/modular_computers/computers/machinery/modular_computer.dm b/code/modules/modular_computers/computers/machinery/modular_computer.dm index 63b315fc18b..6991d85e587 100644 --- a/code/modules/modular_computers/computers/machinery/modular_computer.dm +++ b/code/modules/modular_computers/computers/machinery/modular_computer.dm @@ -11,6 +11,8 @@ icon_state = null idle_power_usage = BASE_MACHINE_IDLE_CONSUMPTION * 0.05 + ///The power cell, null by default as we use the APC we're in + var/internal_cell = null ///A flag that describes this device type var/hardware_flag = NONE ///Power usage during last tick diff --git a/code/modules/modular_computers/computers/machinery/modular_console.dm b/code/modules/modular_computers/computers/machinery/modular_console.dm index eb5930313b2..706b0476963 100644 --- a/code/modules/modular_computers/computers/machinery/modular_console.dm +++ b/code/modules/modular_computers/computers/machinery/modular_console.dm @@ -20,10 +20,6 @@ /obj/machinery/modular_computer/console/Initialize(mapload) . = ..() - var/obj/item/computer_hardware/battery/battery_module = cpu.all_components[MC_CELL] - if(battery_module) - qdel(battery_module) - if(cpu) cpu.screen_on = TRUE update_appearance() diff --git a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm index 318f34daf32..8c1dde8e425 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm @@ -28,10 +28,9 @@ computer.visible_message(span_notice("\The [computer]'s screen brightly flashes and loud electrical buzzing is heard.")) computer.enabled = FALSE computer.update_appearance() - var/obj/item/computer_hardware/battery/battery_module = computer.all_components[MC_CELL] computer.take_damage(25, BRUTE, 0, 0) - if(battery_module && prob(25)) - qdel(battery_module) + if(computer.internal_cell && prob(25)) + QDEL_NULL(computer.internal_cell) computer.visible_message(span_notice("\The [computer]'s battery explodes in rain of sparks.")) var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread spark_system.start() diff --git a/code/modules/modular_computers/file_system/programs/configurator.dm b/code/modules/modular_computers/file_system/programs/configurator.dm index eaa00800883..d7d57ea66c1 100644 --- a/code/modules/modular_computers/file_system/programs/configurator.dm +++ b/code/modules/modular_computers/file_system/programs/configurator.dm @@ -19,20 +19,17 @@ if(!computer) return 0 - var/obj/item/computer_hardware/battery/battery_module = computer.all_components[MC_CELL] - var/list/data = get_header_data() data["disk_size"] = computer.max_capacity data["disk_used"] = computer.used_capacity data["power_usage"] = computer.last_power_usage - data["battery_exists"] = battery_module ? 1 : 0 - if(battery_module?.battery) - data["battery_rating"] = battery_module.battery.maxcharge - data["battery_percent"] = round(battery_module.battery.percent()) - - if(battery_module?.battery) - data["battery"] = list("max" = battery_module.battery.maxcharge, "charge" = round(battery_module.battery.charge)) + data["battery"] = null + if(computer.internal_cell) + data["battery"] = list( + "max" = computer.internal_cell.maxcharge, + "charge" = round(computer.internal_cell.charge), + ) var/list/all_entries[0] for(var/I in computer.all_components) @@ -42,8 +39,8 @@ "desc" = H.desc, "enabled" = H.enabled, "critical" = H.critical, - "powerusage" = H.power_usage - ))) + "powerusage" = H.power_usage, + ))) data["hardware"] = all_entries return data diff --git a/code/modules/modular_computers/hardware/battery_module.dm b/code/modules/modular_computers/hardware/battery_module.dm deleted file mode 100644 index fccfdc23289..00000000000 --- a/code/modules/modular_computers/hardware/battery_module.dm +++ /dev/null @@ -1,98 +0,0 @@ -/obj/item/computer_hardware/battery - name = "power cell controller" - desc = "A charge controller for standard power cells, used in all kinds of modular computers." - icon_state = "cell_con" - critical = 1 - malfunction_probability = 1 - device_type = MC_CELL - var/obj/item/stock_parts/cell/battery - -/obj/item/computer_hardware/battery/get_cell() - return battery - -/obj/item/computer_hardware/battery/Initialize(mapload, battery_type) - . = ..() - if(battery_type) - battery = new battery_type(src) - -/obj/item/computer_hardware/battery/Destroy() - if(battery) - QDEL_NULL(battery) - return ..() - -///What happens when the battery is removed (or deleted) from the module, through try_eject() or not. -/obj/item/computer_hardware/battery/Exited(atom/movable/gone, direction) - if(battery == gone) - battery = null - if(holder?.enabled && !holder.use_power()) - holder.shutdown_computer() - return ..() - -/obj/item/computer_hardware/battery/try_insert(obj/item/I, mob/living/user = null) - if(!holder) - return FALSE - - if(!istype(I, /obj/item/stock_parts/cell)) - return FALSE - - if(battery) - to_chat(user, span_warning("You try to connect \the [I] to \the [src], but its connectors are occupied.")) - return FALSE - - if(I.w_class > holder.max_hardware_size) - to_chat(user, span_warning("This power cell is too large for \the [holder]!")) - return FALSE - - if(user && !user.transferItemToLoc(I, src)) - return FALSE - - battery = I - to_chat(user, span_notice("You connect \the [I] to \the [src].")) - - return TRUE - -/obj/item/computer_hardware/battery/try_eject(mob/living/user, forced = FALSE) - if(!battery) - to_chat(user, span_warning("There is no power cell connected to \the [src].")) - return FALSE - else - if(user) - user.put_in_hands(battery) - to_chat(user, span_notice("You detach \the [battery] from \the [src].")) - else - battery.forceMove(drop_location()) - return TRUE - -/obj/item/stock_parts/cell/computer - name = "standard battery" - desc = "A standard power cell, commonly seen in high-end portable microcomputers or low-end laptops." - icon = 'icons/obj/module.dmi' - icon_state = "cell_mini" - w_class = WEIGHT_CLASS_TINY - maxcharge = 750 - -/obj/item/stock_parts/cell/computer/advanced - name = "advanced battery" - desc = "An advanced power cell, often used in most laptops. It is too large to be fitted into smaller devices." - icon_state = "cell" - w_class = WEIGHT_CLASS_SMALL - maxcharge = 1500 - -/obj/item/stock_parts/cell/computer/super - name = "super battery" - desc = "An advanced power cell, often used in high-end laptops." - icon_state = "cell" - w_class = WEIGHT_CLASS_SMALL - maxcharge = 2000 - -/obj/item/stock_parts/cell/computer/micro - name = "micro battery" - desc = "A small power cell, commonly seen in most portable microcomputers." - icon_state = "cell_micro" - maxcharge = 500 - -/obj/item/stock_parts/cell/computer/nano - name = "nano battery" - desc = "A tiny power cell, commonly seen in low-end portable microcomputers." - icon_state = "cell_micro" - maxcharge = 300 diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm index 0704ad20260..2bb1a8b2e00 100644 --- a/code/modules/modular_computers/laptop_vendor.dm +++ b/code/modules/modular_computers/laptop_vendor.dm @@ -19,7 +19,6 @@ var/credits = 0 // Device loadout - var/dev_battery = 1 // 1: Default, 2: Upgraded, 3: Advanced var/dev_card = 0 // 0: None, 1: Standard // Removes all traces of old order and allows you to begin configuration from scratch. @@ -32,32 +31,16 @@ if(fabricated_tablet) qdel(fabricated_tablet) fabricated_tablet = null - dev_battery = 1 dev_card = 0 // Recalculates the price and optionally even fabricates the device. /obj/machinery/lapvend/proc/fabricate_and_recalc_price(fabricate = FALSE) total_price = 0 if(devtype == 1) // Laptop, generally cheaper to make it accessible for most station roles - var/obj/item/computer_hardware/battery/battery_module = null if(fabricate) fabricated_laptop = new /obj/item/modular_computer/laptop/buildable(src) fabricated_laptop.install_component(new /obj/item/computer_hardware/card_slot) - fabricated_laptop.install_component(new /obj/item/computer_hardware/battery) - battery_module = fabricated_laptop.all_components[MC_CELL] total_price = 99 - switch(dev_battery) - if(1) // Basic(750C) - if(fabricate) - battery_module.try_insert(new /obj/item/stock_parts/cell/computer) - if(2) // Upgraded(1100C) - if(fabricate) - battery_module.try_insert(new /obj/item/stock_parts/cell/computer/advanced) - total_price += 199 - if(3) // Advanced(1500C) - if(fabricate) - battery_module.try_insert(new /obj/item/stock_parts/cell/computer/super) - total_price += 499 if(dev_card) total_price += 199 if(fabricate) @@ -65,25 +48,10 @@ return total_price else if(devtype == 2) // Tablet, more expensive, not everyone could probably afford this. - var/obj/item/computer_hardware/battery/battery_module = null if(fabricate) fabricated_tablet = new(src) - fabricated_tablet.install_component(new /obj/item/computer_hardware/battery) fabricated_tablet.install_component(new/obj/item/computer_hardware/card_slot) - battery_module = fabricated_tablet.all_components[MC_CELL] total_price = 199 - switch(dev_battery) - if(1) // Basic(300C) - if(fabricate) - battery_module.try_insert(new /obj/item/stock_parts/cell/computer/nano) - if(2) // Upgraded(500C) - if(fabricate) - battery_module.try_insert(new /obj/item/stock_parts/cell/computer/micro) - total_price += 199 - if(3) // Advanced(750C) - if(fabricate) - battery_module.try_insert(new /obj/item/stock_parts/cell/computer) - total_price += 499 if(dev_card) total_price += 199 if(fabricate) @@ -91,10 +59,6 @@ return total_price return FALSE - - - - /obj/machinery/lapvend/ui_act(action, params) . = ..() if(.) @@ -121,10 +85,6 @@ state = 2 // Wait for ID swipe for payment processing fabricate_and_recalc_price(FALSE) return TRUE - if("hw_battery") - dev_battery = text2num(params["battery"]) - fabricate_and_recalc_price(FALSE) - return TRUE if("hw_card") dev_card = text2num(params["card"]) fabricate_and_recalc_price(FALSE) @@ -185,7 +145,6 @@ data["state"] = state if(state == 1) data["devtype"] = devtype - data["hw_battery"] = dev_battery data["hw_card"] = dev_card if(state == 1 || state == 2) data["totalprice"] = total_price diff --git a/code/modules/research/designs/computer_part_designs.dm b/code/modules/research/designs/computer_part_designs.dm index e02f2728846..a643740d5b7 100644 --- a/code/modules/research/designs/computer_part_designs.dm +++ b/code/modules/research/designs/computer_part_designs.dm @@ -13,73 +13,6 @@ ) departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING -// Batteries -/datum/design/battery/controller - name = "Power Cell Controller" - id = "bat_control" - build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 400) - build_path = /obj/item/computer_hardware/battery - category = list( - RND_CATEGORY_MODULAR_COMPUTERS + RND_SUBCATEGORY_MODULAR_COMPUTERS_PARTS - ) - departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING - -/datum/design/battery/normal - name = "Battery Module" - id = "bat_normal" - build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 400) - build_path = /obj/item/stock_parts/cell/computer - category = list( - RND_CATEGORY_MODULAR_COMPUTERS + RND_SUBCATEGORY_MODULAR_COMPUTERS_PARTS - ) - departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING - -/datum/design/battery/advanced - name = "Advanced Battery Module" - id = "bat_advanced" - build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 800) - build_path = /obj/item/stock_parts/cell/computer/advanced - category = list( - RND_CATEGORY_MODULAR_COMPUTERS + RND_SUBCATEGORY_MODULAR_COMPUTERS_PARTS - ) - departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING - -/datum/design/battery/super - name = "Super Battery Module" - id = "bat_super" - build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 1600) - build_path = /obj/item/stock_parts/cell/computer/super - category = list( - RND_CATEGORY_MODULAR_COMPUTERS + RND_SUBCATEGORY_MODULAR_COMPUTERS_PARTS - ) - departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING - -/datum/design/battery/nano - name = "Nano Battery Module" - id = "bat_nano" - build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 200) - build_path = /obj/item/stock_parts/cell/computer/nano - category = list( - RND_CATEGORY_MODULAR_COMPUTERS + RND_SUBCATEGORY_MODULAR_COMPUTERS_PARTS - ) - departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING - -/datum/design/battery/micro - name = "Micro Battery Module" - id = "bat_micro" - build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 400) - build_path = /obj/item/stock_parts/cell/computer/micro - category = list( - RND_CATEGORY_MODULAR_COMPUTERS + RND_SUBCATEGORY_MODULAR_COMPUTERS_PARTS - ) - departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING - // Data disks /datum/design/portabledrive/basic name = "Data Disk" diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 392859fe4cd..5d6e4c0f2f0 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -1186,12 +1186,6 @@ description = "How computer hardware is made." prereq_ids = list("comptech") design_ids = list( - "bat_advanced", - "bat_control", - "bat_micro", - "bat_nano", - "bat_normal", - "bat_super", "cardslot", "portadrive_advanced", "portadrive_basic", diff --git a/code/modules/vending/modularpc.dm b/code/modules/vending/modularpc.dm index cffb3cdb3a0..bbbe966d009 100644 --- a/code/modules/vending/modularpc.dm +++ b/code/modules/vending/modularpc.dm @@ -9,10 +9,8 @@ vend_reply = "Game on!" products = list( /obj/item/computer_disk = 8, - /obj/item/computer_hardware/battery = 8, /obj/item/modular_computer/laptop = 4, /obj/item/modular_computer/tablet = 4, - /obj/item/stock_parts/cell/computer = 8, ) premium = list( /obj/item/computer_hardware/card_slot = 2, diff --git a/modular_skyrat/modules/contractor/code/items/tablet.dm b/modular_skyrat/modules/contractor/code/items/tablet.dm index 5e0c24ca8a5..b937f0f487f 100644 --- a/modular_skyrat/modules/contractor/code/items/tablet.dm +++ b/modular_skyrat/modules/contractor/code/items/tablet.dm @@ -15,7 +15,6 @@ active_program = uplink uplink.program_state = PROGRAM_STATE_ACTIVE - install_component(new /obj/item/computer_hardware/battery(src, /obj/item/stock_parts/cell/computer)) install_component(new /obj/item/computer_hardware/card_slot) /obj/item/modular_computer/tablet/syndicate_contract_uplink/preset/uplink/Destroy() diff --git a/tgstation.dme b/tgstation.dme index 89d2f3c3343..9b31be5f9b9 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4009,7 +4009,6 @@ #include "code\modules\modular_computers\file_system\programs\antagonist\dos.dm" #include "code\modules\modular_computers\file_system\programs\antagonist\revelation.dm" #include "code\modules\modular_computers\hardware\_hardware.dm" -#include "code\modules\modular_computers\hardware\battery_module.dm" #include "code\modules\modular_computers\hardware\card_slot.dm" #include "code\modules\modular_computers\NTNet\NTNRC\conversation.dm" #include "code\modules\movespeed\_movespeed_modifier.dm" diff --git a/tgui/packages/tgui/interfaces/ComputerFabricator.js b/tgui/packages/tgui/interfaces/ComputerFabricator.js index 4f26bde527c..7db9e66cab0 100644 --- a/tgui/packages/tgui/interfaces/ComputerFabricator.js +++ b/tgui/packages/tgui/interfaces/ComputerFabricator.js @@ -88,51 +88,6 @@ const CfStep2 = (props, context) => { }> - - - - Battery: - - - -