Fixed two bugs with the cyber implant bundle, ammo bag and cyber bundle no longer discountable

This commit is contained in:
AzuleUtama
2019-03-04 19:40:23 +00:00
parent eb468c9b0e
commit a5cd29f17b
2 changed files with 7 additions and 2 deletions
+5 -1
View File
@@ -642,6 +642,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
item = /obj/item/storage/backpack/duffel/syndie/ammo/loaded
cost = 10 //bulk buyer's discount. Very useful if you're buying a mech and dont have TC left to buy people non-shotgun guns
gamemodes = list(/datum/game_mode/nuclear)
cant_discount = TRUE
/datum/uplink_item/ammo/bullslug
name = "Bulldog - 12g Slug Magazine"
@@ -1461,10 +1462,11 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
category = "Cybernetic Implants"
surplus = 0
gamemodes = list(/datum/game_mode/nuclear)
var/cyber_bundle = FALSE
/datum/uplink_item/cyber_implants/spawn_item(turf/loc, obj/item/uplink/U)
if(item)
if(findtext(item, /obj/item/organ/internal/cyberimp))
if(findtext(item, /obj/item/organ/internal/cyberimp) && !cyber_bundle)
U.uses -= max(cost, 0)
U.used_TC += cost
feedback_add_details("traitor_uplink_items_bought", name) //this one and the line before copypasted because snowflaek code
@@ -1508,6 +1510,8 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
reference = "CIB"
item = /obj/item/storage/box/cyber_implants/bundle
cost = 40
cyber_bundle = TRUE
cant_discount = TRUE
// POINTLESS BADASSERY