From 0338574f3285a0ca4f57037e845c0144e5377076 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 23 Feb 2020 13:31:58 -0500 Subject: [PATCH] Adds 3 additional tablet types Rugged, elite, and hybrid, like the laptop PR --- .../computers/subtypes/preset_tablet_vr.dm | 53 ++++++++++++++++++ icons/obj/modular_tablet_vr.dmi | Bin 0 -> 10215 bytes vorestation.dme | 1 + 3 files changed, 54 insertions(+) create mode 100644 code/modules/modular_computers/computers/subtypes/preset_tablet_vr.dm create mode 100644 icons/obj/modular_tablet_vr.dmi diff --git a/code/modules/modular_computers/computers/subtypes/preset_tablet_vr.dm b/code/modules/modular_computers/computers/subtypes/preset_tablet_vr.dm new file mode 100644 index 00000000000..3bbc7a396ba --- /dev/null +++ b/code/modules/modular_computers/computers/subtypes/preset_tablet_vr.dm @@ -0,0 +1,53 @@ +/obj/item/modular_computer/tablet/preset/custom_loadout/rugged + name = "rugged tablet computer" + desc = "A rugged tablet computer." + icon = 'icons/obj/modular_tablet_vr.dmi' + icon_state = "rugged" + icon_state_unpowered = "rugged" + max_damage = 300 + broken_damage = 200 + +/obj/item/modular_computer/tablet/preset/custom_loadout/rugged/install_default_hardware() + ..() + processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src) + tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/small(src) + network_card = new/obj/item/weapon/computer_hardware/network_card(src) + battery_module = new/obj/item/weapon/computer_hardware/battery_module/micro(src) + battery_module.charge_to_full() + +/obj/item/modular_computer/tablet/preset/custom_loadout/elite + name = "elite tablet computer" + desc = "A more expensive tablet computer." + icon = 'icons/obj/modular_tablet_vr.dmi' + icon_state = "elite" + icon_state_unpowered = "elite" + +/obj/item/modular_computer/tablet/preset/custom_loadout/elite/install_default_hardware() + ..() + processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src) + tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/small(src) + network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(src) + nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src) + card_slot = new/obj/item/weapon/computer_hardware/card_slot(src) + battery_module = new/obj/item/weapon/computer_hardware/battery_module(src) + battery_module.charge_to_full() + +/obj/item/modular_computer/tablet/preset/custom_loadout/hybrid + name = "hybrid tablet computer" + desc = "A human/alien hybrid tech tablet computer." + icon = 'icons/obj/modular_tablet_vr.dmi' + icon_state = "hybrid" + icon_state_unpowered = "hybrid" + +/obj/item/modular_computer/tablet/preset/custom_loadout/hybrid/install_default_hardware() + ..() + processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/photonic/small(src) + tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/small(src) + network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(src) + nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src) + card_slot = new/obj/item/weapon/computer_hardware/card_slot(src) + battery_module = new/obj/item/weapon/computer_hardware/battery_module/lambda(src) + battery_module.charge_to_full() diff --git a/icons/obj/modular_tablet_vr.dmi b/icons/obj/modular_tablet_vr.dmi new file mode 100644 index 0000000000000000000000000000000000000000..7127857d6aeaeecb6b598cefb456149cf880001f GIT binary patch literal 10215 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 WJ8ta^in1^80fyI2^=hs;M*c7F_$p`s literal 0 HcmV?d00001 diff --git a/vorestation.dme b/vorestation.dme index 06497c5ca3b..14e2a3d53e9 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2676,6 +2676,7 @@ #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_tablet_vr.dm" #include "code\modules\modular_computers\computers\subtypes\preset_telescreen.dm" #include "code\modules\modular_computers\file_system\computer_file.dm" #include "code\modules\modular_computers\file_system\data.dm"