Merge remote-tracking branch 'upstream/master'

code/modules/modular_computers/file_system/programs/budgetordering.dm

@@ -104,7 +104,7 @@
 			continue
 		data["supplies"][P.group]["packs"] += list(list(
 			"name" = P.name,
-			"cost" = P.cost,
+			"cost" = P.get_cost(),
 			"id" = pack,
 			"desc" = P.desc || P.name, // If there is a description, use it. Otherwise use the pack's name.
 			"goody" = P.goody,
@@ -131,7 +131,7 @@
 	for(var/datum/supply_order/SO in SSshuttle.shoppinglist)
 		data["cart"] += list(list(
 			"object" = SO.pack.name,
-			"cost" = SO.pack.cost,
+			"cost" = SO.pack.get_cost(),
 			"id" = SO.id,
 			"orderer" = SO.orderer,
 			"paid" = !isnull(SO.paying_account) //paid by requester
@@ -141,7 +141,7 @@
 	for(var/datum/supply_order/SO in SSshuttle.requestlist)
 		data["requests"] += list(list(
 			"object" = SO.pack.name,
-			"cost" = SO.pack.cost,
+			"cost" = SO.pack.get_cost(),
 			"orderer" = SO.orderer,
 			"reason" = SO.reason,
 			"id" = SO.id

code/modules/modular_computers/file_system/programs/signaler.dm

@@ -15,40 +15,29 @@
 	/// Radio connection datum used by signalers.
 	var/datum/radio_frequency/radio_connection
 
-/datum/computer_file/program/signaler/run_program(mob/living/user)
-	. = ..()
-	if (!.)
-		return
-	if(!computer?.get_modular_computer_part(MC_SIGNALER)) //Giving a clue to users why the program is spitting out zeros.
-		to_chat(user, span_warning("\The [computer] flashes an error: \"hardware\\signal_hardware\\startup.bin -- file not found\"."))
-
+/datum/computer_file/program/signaler/New()
+	set_frequency(signal_frequency)
+	return ..()
 
 /datum/computer_file/program/signaler/ui_data(mob/user)
 	var/list/data = get_header_data()
-	var/obj/item/computer_hardware/radio_card/sensor = computer?.get_modular_computer_part(MC_SIGNALER)
-	if(sensor?.check_functionality())
-		data["frequency"] = signal_frequency
-		data["code"] = signal_code
-		data["minFrequency"] = MIN_FREE_FREQ
-		data["maxFrequency"] = MAX_FREE_FREQ
+	data["frequency"] = signal_frequency
+	data["code"] = signal_code
+	data["minFrequency"] = MIN_FREE_FREQ
+	data["maxFrequency"] = MAX_FREE_FREQ
 	return data
 
 /datum/computer_file/program/signaler/ui_act(action, list/params)
 	. = ..()
 	if(.)
 		return
-	var/obj/item/computer_hardware/radio_card/sensor = computer?.get_modular_computer_part(MC_SIGNALER)
-	if(!(sensor?.check_functionality()))
-		playsound(src, 'sound/machines/scanbuzz.ogg', 100, FALSE)
-		return
 	switch(action)
 		if("signal")
 			INVOKE_ASYNC(src, .proc/signal)
 			. = TRUE
 		if("freq")
-			signal_frequency = unformat_frequency(params["freq"])
-			signal_frequency = sanitize_frequency(signal_frequency, TRUE)
-			set_frequency(signal_frequency)
+			var/new_signal_frequency = sanitize_frequency(unformat_frequency(params["freq"]), TRUE)
+			set_frequency(new_signal_frequency)
 			. = TRUE
 		if("code")
 			signal_code = text2num(params["code"])