cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-25 06:07:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update

Browse Source 
# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved
This commit is contained in:
izac112
2020-01-31 18:23:50 +01:00
parent 1892d7be7e d336d3e558
commit 933385020f
171 changed files with 53648 additions and 5640 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/computers/subtypes/preset_console.dm
+1
View File
@@ -4,6 +4,7 @@
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/wired(src)
nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src)
// Engineering
/obj/item/modular_computer/console/preset/engineering/install_default_programs()