cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-07-19 12:12:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8815 from Atermonera/badassery_runtimes

Browse Source 
Fix runtimes with uplink random item selections
This commit is contained in:
Spookerton
2022-11-03 12:29:56 +00:00
committed by GitHub
parent 2a42eca561 bfd520844d
commit 263f84d655
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/uplink/badassery.dm
+7 -2
View File
@@ -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()
code/datums/uplink/uplink_items.dm
+2 -2
View File
@@ -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