cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

delet conflicts

Browse Source
This commit is contained in:
Novacat
2019-05-09 13:42:09 -04:00
committed by GitHub
parent 445923d699
commit 0b8648a0b1
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/modular_computers/computers/subtypes/preset_laptop.dm
View File

@@ -31,10 +31,6 @@
battery_module = new/obj/item/weapon/computer_hardware/battery_module/advanced(src)
battery_module.charge_to_full()
<<<<<<< HEAD
//VOREstation Add Begin
=======
>>>>>>> b3a875b... Merge pull request #6158 from Novacat/nova-alerts
/obj/item/modular_computer/laptop/preset/custom_loadout/elite/install_default_hardware()
..()
processor_unit = new/obj/item/weapon/computer_hardware/processor_unit(src)
@@ -45,7 +41,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()
<<<<<<< HEAD
//VOREstation Add End
=======
>>>>>>> b3a875b... Merge pull request #6158 from Novacat/nova-alerts