Modular Computer Cleanup (#8790)

- rscadd: "Incompatible applications are no longer downloaded via the presets."
  - tweak: "Reduced/Adapted the size of various applications."
  - tweak: "The investigations / generic wristbounds are now enrolled aswell."
  - tweak: "Selecting a unenrolled device in the loadout no longer gives you the advanced version of it."
  - tweak: "Adapts the modular computer news browser to work with our news system"

code/modules/modular_computers/computers/modular_computer/core.dm

@@ -63,6 +63,8 @@
 	if(enrolled)
 		var/programs = get_preset_programs(_app_preset_type)
 		for(var/datum/computer_file/program/prog in programs)
+			if(!prog.is_supported_by_hardware(hardware_flag, FALSE))
+				return
 			hard_drive.store_file(prog)
 
 /obj/item/modular_computer/Initialize()

code/modules/modular_computers/computers/modular_computer/interaction.dm

@@ -123,7 +123,7 @@
 		if(!hard_drive)
 			to_chat(user, SPAN_WARNING("You cannot reset a device that has no hard drive."))
 			return
-		enrolled = FALSE
+		enrolled = 0
 		hard_drive.reset_drive()
 		visible_message("\icon[src.icon] <b>[src]</b> pings, <span class='notice'>\"Enrollment status reset! Have a NanoTrasen day.\"</span>")
 	if(istype(W, /obj/item/card/id)) // ID Card, try to insert it.
@@ -212,4 +212,4 @@
 
 /obj/item/modular_computer/GetID()
 	if(card_slot.stored_card)
-		return card_slot.stored_card
+		return card_slot.stored_card

code/modules/modular_computers/computers/modular_computer/variables.dm

@@ -17,7 +17,7 @@
 	var/apc_powered = FALSE									// Set automatically. Whether the computer used APC power last tick.
 	var/base_active_power_usage = 50						// Power usage when the computer is open (screen is active) and can be interacted with. Remember hardware can use power too.
 	var/base_idle_power_usage = 5							// Power usage when the computer is idle and screen is off (currently only applies to laptops)
-	var/enrolled = FALSE									// Weather the computer is enrolled in the company device management or not. 0 - unconfigured 1 - enrolled (work device) 2 - unenrolled (private device)
+	var/enrolled = 0									// Weather the computer is enrolled in the company device management or not. 0 - unconfigured 1 - enrolled (work device) 2 - unenrolled (private device)
 	var/_app_preset_type									// Used for specifying the software preset of the console
 	var/ambience_last_played								// Last time sound was played
 
@@ -65,4 +65,4 @@
 
 	var/listener/listener	//Listener needed for things
 
-	charge_failure_message = " does not have a battery installed."
+	charge_failure_message = " does not have a battery installed."

code/modules/modular_computers/computers/subtypes/preset_console.dm

@@ -24,29 +24,29 @@
 /obj/item/modular_computer/console/preset/engineering
 	name = "engineering console"
 	_app_preset_type = /datum/modular_computer_app_presets/engineering
-	enrolled = TRUE
+	enrolled = 1
 
 /obj/item/modular_computer/console/preset/engineering/ce
 	name = "engineering console"
 	_app_preset_type = /datum/modular_computer_app_presets/engineering/ce
-	enrolled = TRUE
+	enrolled = 1
 
 // Medical
 /obj/item/modular_computer/console/preset/medical
 	name = "medical console"
 	_app_preset_type = /datum/modular_computer_app_presets/medical
-	enrolled = TRUE
+	enrolled = 1
 
 /obj/item/modular_computer/console/preset/medical/cmo
 	name = "medical console"
 	_app_preset_type = /datum/modular_computer_app_presets/medical/cmo
-	enrolled = TRUE
+	enrolled = 1
 
 // Research
 /obj/item/modular_computer/console/preset/research
 	name = "research console"
 	_app_preset_type = /datum/modular_computer_app_presets/research
-	enrolled = TRUE
+	enrolled = 1
 
 /obj/item/modular_computer/console/preset/research/install_default_hardware()
 	..()
@@ -56,7 +56,7 @@
 /obj/item/modular_computer/console/preset/command
 	name = "command console"
 	_app_preset_type = /datum/modular_computer_app_presets/command
-	enrolled = TRUE
+	enrolled = 1
 
 /obj/item/modular_computer/console/preset/command/install_default_hardware()
 	..()
@@ -68,40 +68,40 @@
 /obj/item/modular_computer/console/preset/command/captain
 	name = "captain's console"
 	_app_preset_type = /datum/modular_computer_app_presets/captain
-	enrolled = TRUE
+	enrolled = 1
 
 /obj/item/modular_computer/console/preset/command/hop
 	name = "command console"
 	_app_preset_type = /datum/modular_computer_app_presets/command/hop
-	enrolled = TRUE
+	enrolled = 1
 
 // Security
 /obj/item/modular_computer/console/preset/security
 	name = "security console"
 	_app_preset_type = /datum/modular_computer_app_presets/security
-	enrolled = TRUE
+	enrolled = 1
 
 /obj/item/modular_computer/console/preset/security/investigations
 	name = "investigations console"
 	_app_preset_type = /datum/modular_computer_app_presets/security/investigations
-	enrolled = TRUE
+	enrolled = 1
 
 /obj/item/modular_computer/console/preset/security/hos
 	name = "head of security's console"
 	_app_preset_type = /datum/modular_computer_app_presets/security/hos
-	enrolled = TRUE
+	enrolled = 1
 
 // Civilian
 /obj/item/modular_computer/console/preset/civilian
 	name = "civilian console"
 	_app_preset_type = /datum/modular_computer_app_presets/civilian
-	enrolled = TRUE
+	enrolled = 1
 
 // Supply
 /obj/item/modular_computer/console/preset/supply
 	name = "supply console"
 	_app_preset_type = /datum/modular_computer_app_presets/supply
-	enrolled = TRUE
+	enrolled = 1
 
 /obj/item/modular_computer/console/preset/supply/install_default_hardware()
 	..()
@@ -148,4 +148,4 @@
 // AI
 /obj/item/modular_computer/console/preset/ai
 	_app_preset_type = /datum/modular_computer_app_presets/ai
-	enrolled = 2
+	enrolled = 2

code/modules/modular_computers/computers/subtypes/preset_laptop.dm

@@ -22,7 +22,7 @@
 	name = "engineering laptop"
 	desc = "A portable computer belonging to the engineering department. It appears to have been used as a door stop at one point or another."
 	_app_preset_type = /datum/modular_computer_app_presets/engineering
-	enrolled = TRUE
+	enrolled = 1
 
 /obj/item/modular_computer/laptop/preset/engineering/ce
 	name = "chief engineer's laptop"
@@ -34,7 +34,7 @@
 	name = "medical laptop"
 	desc = "A portable computer belonging to the medical department."
 	_app_preset_type = /datum/modular_computer_app_presets/medical
-	enrolled = TRUE
+	enrolled = 1
 
 /obj/item/modular_computer/laptop/preset/medical/cmo
 	name = "chief medical officer's laptop"
@@ -46,7 +46,7 @@
 	name = "research laptop"
 	desc = "A portable computer belonging to the research department."
 	_app_preset_type = /datum/modular_computer_app_presets/research
-	enrolled = TRUE
+	enrolled = 1
 
 /obj/item/modular_computer/laptop/preset/research/install_default_hardware()
 	..()
@@ -61,7 +61,7 @@
 /obj/item/modular_computer/laptop/preset/command
 	name = "command laptop"
 	_app_preset_type = /datum/modular_computer_app_presets/command
-	enrolled = TRUE
+	enrolled = 1
 
 /obj/item/modular_computer/laptop/preset/command/hop
 	name = "head of personnel's laptop"
@@ -86,7 +86,7 @@
 	name = "security laptop"
 	desc = "A portable computer belonging to the security department."
 	_app_preset_type = /datum/modular_computer_app_presets/security
-	enrolled = TRUE
+	enrolled = 1
 
 /obj/item/modular_computer/laptop/preset/security/hos
 	name = "head of security's laptop"
@@ -96,18 +96,18 @@
 // Civilian
 /obj/item/modular_computer/laptop/preset/civilian
 	_app_preset_type = /datum/modular_computer_app_presets/civilian
-	enrolled = TRUE
+	enrolled = 1
 
 // Supply
 /obj/item/modular_computer/laptop/preset/supply
 	name = "supply laptop"
 	desc = "A portable computer belonging to cargo."
 	_app_preset_type = /datum/modular_computer_app_presets/supply
-	enrolled = TRUE
+	enrolled = 1
 
 // Representative
 /obj/item/modular_computer/laptop/preset/representative
 	name = "representative's laptop"
 	desc = "A portable computer belonging to the representative's office."
 	_app_preset_type = /datum/modular_computer_app_presets/representative
-	enrolled = TRUE
+	enrolled = 1

code/modules/modular_computers/computers/subtypes/preset_tablet.dm

@@ -20,4 +20,4 @@
 // Cargo Delivery
 /obj/item/modular_computer/tablet/preset/custom_loadout/advanced/cargo_delivery
 	_app_preset_type = /datum/modular_computer_app_presets/cargo_delivery
-	enrolled = TRUE
+	enrolled = 1

code/modules/modular_computers/computers/subtypes/preset_telescreen.dm

@@ -7,8 +7,8 @@
 
 /obj/item/modular_computer/telescreen/preset/generic
 	_app_preset_type = /datum/modular_computer_app_presets/wall_generic
-	enrolled = TRUE
+	enrolled = 1
 
 /obj/item/modular_computer/telescreen/preset/trashcompactor
 	_app_preset_type = /datum/modular_computer_app_presets/trashcompactor
-	enrolled = TRUE
+	enrolled = 1

code/modules/modular_computers/computers/subtypes/preset_wristbound.dm

@@ -6,6 +6,9 @@
 	battery_module = new /obj/item/computer_hardware/battery_module/nano(src)
 	battery_module.charge_to_full()
 
+/obj/item/modular_computer/wristbound/preset/cheap/generic
+	_app_preset_type = /datum/modular_computer_app_presets/civilian
+
 /obj/item/modular_computer/wristbound/preset/advanced/install_default_hardware()
 	..()
 	processor_unit = new /obj/item/computer_hardware/processor_unit/small(src)
@@ -19,35 +22,36 @@
 /obj/item/modular_computer/wristbound/preset/advanced/cargo
 	icon_state = "wristbound_supply"
 	_app_preset_type = /datum/modular_computer_app_presets/cargo_delivery
-	enrolled = TRUE
+	enrolled = 1
 
 /obj/item/modular_computer/wristbound/preset/advanced/engineering
 	icon_state = "wristbound_engineering"
 	_app_preset_type = /datum/modular_computer_app_presets/engineering
-	enrolled = TRUE
+	enrolled = 1
 
 /obj/item/modular_computer/wristbound/preset/advanced/medical
 	icon_state = "wristbound_medical"
 	_app_preset_type = /datum/modular_computer_app_presets/medical
-	enrolled = TRUE
+	enrolled = 1
 
 /obj/item/modular_computer/wristbound/preset/advanced/security
 	icon_state = "wristbound_security"
 	_app_preset_type = /datum/modular_computer_app_presets/security
-	enrolled = TRUE
+	enrolled = 1
 
 /obj/item/modular_computer/wristbound/preset/advanced/security/investigations
 	_app_preset_type = /datum/modular_computer_app_presets/security/investigations
+	enrolled = 1
 
 /obj/item/modular_computer/wristbound/preset/advanced/research
 	icon_state = "wristbound_science"
 	_app_preset_type = /datum/modular_computer_app_presets/research
-	enrolled = TRUE
+	enrolled = 1
 
 /obj/item/modular_computer/wristbound/preset/advanced/command
 	icon_state = "wristbound_command"
 	_app_preset_type = /datum/modular_computer_app_presets/command
-	enrolled = TRUE
+	enrolled = 1
 
 /obj/item/modular_computer/wristbound/preset/advanced/command/ce
 	_app_preset_type = /datum/modular_computer_app_presets/engineering/ce
@@ -72,4 +76,4 @@
 
 /obj/item/modular_computer/wristbound/preset/advanced/representative
 	_app_preset_type = /datum/modular_computer_app_presets/representative
-	enrolled = TRUE
+	enrolled = 1