Merge remote-tracking branch 'upstream/master'

This commit is contained in:
BongaTheProto
2022-09-18 23:40:20 -05:00
62 changed files with 1769 additions and 43 deletions
@@ -37,6 +37,7 @@
hard_drive.store_file(new/datum/computer_file/program/power_monitor())
hard_drive.store_file(new/datum/computer_file/program/alarm_monitor())
hard_drive.store_file(new/datum/computer_file/program/supermatter_monitor())
hard_drive.store_file(new/datum/computer_file/program/nuclear_monitor())
// ===== RESEARCH CONSOLE =====
/obj/machinery/modular_computer/console/preset/research