diff --git a/code/modules/modular_computers/computers/subtypes/dev_laptop.dm b/code/modules/modular_computers/computers/subtypes/dev_laptop.dm index 156d67525b..846759c8ad 100644 --- a/code/modules/modular_computers/computers/subtypes/dev_laptop.dm +++ b/code/modules/modular_computers/computers/subtypes/dev_laptop.dm @@ -4,7 +4,7 @@ desc = "A portable computer." hardware_flag = PROGRAM_LAPTOP icon_state_unpowered = "laptop-open" - icon = 'icons/obj/modular_laptop.dmi' + icon = 'icons/obj/modular_laptop_vr.dmi' //VOREStation Edit icon_state = "laptop-open" icon_state_screensaver = "standby" base_idle_power_usage = 25 diff --git a/code/modules/modular_computers/computers/subtypes/preset_laptop.dm b/code/modules/modular_computers/computers/subtypes/preset_laptop.dm index 905df24590..929e72a166 100644 --- a/code/modules/modular_computers/computers/subtypes/preset_laptop.dm +++ b/code/modules/modular_computers/computers/subtypes/preset_laptop.dm @@ -46,23 +46,3 @@ card_slot = new/obj/item/weapon/computer_hardware/card_slot(src) battery_module = new/obj/item/weapon/computer_hardware/battery_module/super(src) battery_module.charge_to_full() - -//VOREStation Add Start -/obj/item/modular_computer/laptop/preset/custom_loadout/rugged - name = "rugged laptop computer" - desc = "A rugged portable computer." - icon = 'icons/obj/modular_laptop_vr.dmi' - max_damage = 300 - broken_damage = 200 - -/obj/item/modular_computer/laptop/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/advanced(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/super(src) - battery_module.charge_to_full() -//VOREStation Add End \ No newline at end of file diff --git a/code/modules/modular_computers/computers/subtypes/preset_laptop_vr.dm b/code/modules/modular_computers/computers/subtypes/preset_laptop_vr.dm new file mode 100644 index 0000000000..5f7b2025b0 --- /dev/null +++ b/code/modules/modular_computers/computers/subtypes/preset_laptop_vr.dm @@ -0,0 +1,48 @@ +//Rugged laptop +/obj/item/modular_computer/laptop/preset/custom_loadout/rugged + name = "rugged laptop computer" + desc = "A rugged portable computer." + icon_state_unpowered = "ruggedplus-open" + icon_state = "ruggedplus-open" + icon_state_closed = "ruggedplus-closed" + + max_damage = 300 + broken_damage = 200 + +/obj/item/modular_computer/laptop/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/advanced(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/super(src) + battery_module.charge_to_full() + +//Fancy Schmancy - this is defined in normal file, just swapping the icon +/obj/item/modular_computer/laptop/preset/custom_loadout/elite + name = "elite laptop computer" + desc = "Fancy shcmancy laptop." + icon_state_unpowered = "elite-open" + icon_state = "elite-open" + icon_state_closed = "elite-closed" + +//Alien/Human hybrid tech +/obj/item/modular_computer/laptop/preset/custom_loadout/hybrid + name = "hybrid laptop computer" + desc = "Weird glowy alien/human crossover tech." + icon_state_unpowered = "hybrid-open" + icon_state = "hybrid-open" + icon_state_closed = "hybrid-closed" + +/obj/item/modular_computer/laptop/preset/custom_loadout/hybrid/install_default_hardware() + ..() + processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/photonic(src) + tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/super(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_laptop_vr.dmi b/icons/obj/modular_laptop_vr.dmi index 6dc2af2d01..4294fa4370 100644 Binary files a/icons/obj/modular_laptop_vr.dmi and b/icons/obj/modular_laptop_vr.dmi differ diff --git a/vorestation.dme b/vorestation.dme index 1f342cf866..a5387f6134 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2687,6 +2687,7 @@ #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_laptop_vr.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"