fixes merge conflict

This commit is contained in:
Kyep
2020-09-15 15:34:50 -07:00
109 changed files with 4716 additions and 4071 deletions
@@ -62,7 +62,6 @@
/obj/machinery/modular_computer/console/preset/command/install_programs()
var/obj/item/computer_hardware/hard_drive/hard_drive = cpu.all_components[MC_HDD]
hard_drive.store_file(new/datum/computer_file/program/chatclient())
hard_drive.store_file(new/datum/computer_file/program/comm())
// ===== CIVILIAN CONSOLE =====
/obj/machinery/modular_computer/console/preset/civilian