Merge pull request #8815 from Atermonera/badassery_runtimes

Fix runtimes with uplink random item selections
PolarisSS13 · Nov 3, 2022 · 263f84d · 263f84d
2 parents 2a42eca + bfd5208
commit 263f84d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/code/datums/uplink/badassery.dm b/code/datums/uplink/badassery.dm
@@ -32,8 +32,13 @@
 	name = "Random Items"
 	desc = "Buys you as many random items you can afford. Convenient packaging NOT included."
 
-/datum/uplink_item/item/badassery/random_many/cost(obj/item/uplink/U, var/telecrystals)
-	return max(1, telecrystals)
+/datum/uplink_item/item/badassery/random_many/cost(obj/item/uplink/U, mob/M)
+	if(istype(M))
+		return max(1, M.mind?.tcrystals)
+	if(istype(M, /datum/mind))
+		var/datum/mind/m = M
+		return max(1, m.tcrystals)
+	return max(1, M)
 
 /datum/uplink_item/item/badassery/random_many/get_goods(var/obj/item/uplink/U, var/loc, var/mob/M)
 	var/list/bought_items = list()

diff --git a/code/datums/uplink/uplink_items.dm b/code/datums/uplink/uplink_items.dm
@@ -186,7 +186,7 @@ var/global/datum/uplink/uplink = new()
 		if(!I)
 			break
 		bought_items += I
-		remaining_TC -= I.cost(remaining_TC, U)
+		remaining_TC -= I.cost(U, remaining_TC)
 
 	return bought_items
 
@@ -198,6 +198,6 @@ var/global/datum/uplink/uplink = new()
 		if(!I)
 			break
 		bought_items += I
-		remaining_TC -= I.cost(remaining_TC, U)
+		remaining_TC -= I.cost(U, remaining_TC)
 
 	return bought_items