From 3bf5c482cec5642e6ab475d7b3ba43b8d04823b5 Mon Sep 17 00:00:00 2001 From: AzuleUtama <44248086+AzuleUtama@users.noreply.github.com> Date: Fri, 23 Nov 2018 12:03:59 +0000 Subject: [PATCH] Small changes and merged with master following some recent additions to uplink items Keeping it updated alongside master. --- code/datums/uplink_item.dm | 3 ++- code/game/objects/items/devices/uplinks.dm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 772a8068764..8c800af488a 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -47,7 +47,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) A.name += " ([round(((initial(A.cost)-A.cost)/initial(A.cost))*100)]% off!)" A.job = null // If you get a job specific item selected, actually lets you buy it in the discount section A.reference = "DIS[newreference]" - A.desc += " Only [A.limited_stock] in stock. Normally costs [initial(A.cost)] TC. All sales final" + A.desc += " Limit of [A.limited_stock] per uplink. Normally costs [initial(A.cost)] TC." A.item = I.item newreference++ @@ -1355,6 +1355,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) item = /obj/item/implanter/uplink cost = 14 surplus = 0 + cant_discount = TRUE /datum/uplink_item/implants/storage name = "Storage Implant" diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 680da478243..fac5c01cf94 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -137,7 +137,7 @@ var/list/world_uplinks = list() if(!UI) return if(UI.limited_stock == 0) - to_chat(usr, "You have redeemed this discount already!") + to_chat(usr, "You have redeemed this discount already.") return UI.buy(src,usr) if(UI.limited_stock > 0) // only decrement it if it's actually limited