cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-21 07:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into map-development

Browse Source 
# Conflicts:
#	baystation12.dme
#	code/game/objects/random/random.dm
#	code/game/turfs/turf_changing.dm
#	code/modules/mining/ore.dm
#	code/modules/mob/living/silicon/robot/robot_modules.dm
This commit is contained in:
skull132
2017-05-01 01:07:56 +03:00
parent c03666340a c197ce34fc
commit a5848c2802
336 changed files with 4668 additions and 3389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/modular_computers/computers/modular_computer/core.dm
View File

@@ -35,11 +35,8 @@
check_update_ui_need()
/obj/item/modular_computer/proc/get_preset_programs(var/app_preset_name)
log_debug("=== Searchng for matching preset")
for (var/datum/modular_computer_app_presets/prs in ntnet_global.available_software_presets)
log_debug("comparing preset [prs.name]")
if(prs.name == app_preset_name)
log_debug("preset matched")
return prs.return_install_programs()
// Used to perform preset-specific hardware changes.
@@ -49,10 +46,8 @@
// Used to install preset-specific programs
/obj/item/modular_computer/proc/install_default_programs()
if(enrolled)
log_debug("=== Calling install programs for preset [_app_preset_name]")
var/programs = get_preset_programs(_app_preset_name)
for (var/datum/computer_file/program/prog in programs)
log_debug("Installing prog [prog.filename]")
hard_drive.store_file(prog)
/obj/item/modular_computer/New()