From 57db2206233df04195558ac8dc40e7521ac5bbcb Mon Sep 17 00:00:00 2001 From: chuga-git <98280110+chuga-git@users.noreply.github.com> Date: Fri, 3 May 2024 22:07:59 -0500 Subject: [PATCH] cant_discount -> can_discount (#25366) --- code/datums/uplink_items/uplink_general.dm | 12 ++++++------ code/datums/uplink_items/uplink_nuclear.dm | 12 ++++++------ code/datums/uplink_items/uplink_special.dm | 2 +- code/datums/uplink_items/uplink_traitor.dm | 16 ++++++++-------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/code/datums/uplink_items/uplink_general.dm b/code/datums/uplink_items/uplink_general.dm index 21bea123b93..a58bbf324dd 100644 --- a/code/datums/uplink_items/uplink_general.dm +++ b/code/datums/uplink_items/uplink_general.dm @@ -26,7 +26,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) uplink_items[I.category] = list() uplink_items[I.category] += I - if(I.limited_stock < 0 && !I.cant_discount && I.item && I.cost > 5) + if(I.limited_stock < 0 && I.can_discount && I.item && I.cost > 5) sales_items += I for(var/datum/uplink_item/I in last) @@ -79,7 +79,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /// This makes an item on the uplink only show up to the specified species var/list/species = null var/surplus = 100 //Chance of being included in the surplus crate (when pick() selects it) - var/cant_discount = FALSE + var/can_discount = TRUE var/limited_stock = -1 // Can you only buy so many? -1 allows for infinite purchases var/hijack_only = FALSE //can this item be purchased only during hijackings? var/refundable = FALSE @@ -379,7 +379,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) reference = "SKD" item = /obj/item/melee/knuckleduster/syndie cost = 10 - cant_discount = TRUE + can_discount = FALSE // GRENADES AND EXPLOSIVES @@ -751,7 +751,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cost = 10 surplus = 0 hijack_only = TRUE //This is an item only useful for a hijack traitor, as such, it should only be available in those scenarios. - cant_discount = TRUE + can_discount = FALSE /datum/uplink_item/device_tools/advpinpointer name = "Advanced Pinpointer" @@ -887,7 +887,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) reference = "BABA" item = /obj/item/toy/syndicateballoon cost = 100 - cant_discount = TRUE + can_discount = FALSE /datum/uplink_item/badass/bomber name = "Syndicate Bomber Jacket" @@ -906,7 +906,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /datum/uplink_item/bundles_TC category = "Bundles and Telecrystals" surplus = 0 - cant_discount = TRUE + can_discount = FALSE /datum/uplink_item/bundles_TC/telecrystal name = "Raw Telecrystal" diff --git a/code/datums/uplink_items/uplink_nuclear.dm b/code/datums/uplink_items/uplink_nuclear.dm index 5fbd96465e2..bb9fd71fe62 100644 --- a/code/datums/uplink_items/uplink_nuclear.dm +++ b/code/datums/uplink_items/uplink_nuclear.dm @@ -120,7 +120,7 @@ refund_path = /obj/item/antag_spawner/nuke_ops cost = 100 refundable = TRUE - cant_discount = TRUE + can_discount = FALSE /datum/uplink_item/support/reinforcement/assault_borg name = "Syndicate Assault Cyborg" @@ -347,7 +347,7 @@ reference = "C4B" item = /obj/item/storage/backpack/duffel/syndie/c4 cost = 40 //20% discount! - cant_discount = TRUE + can_discount = FALSE uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) /datum/uplink_item/explosives/breaching_charge @@ -366,7 +366,7 @@ reference = "X4B" item = /obj/item/storage/backpack/duffel/syndie/x4 cost = 20 - cant_discount = TRUE + can_discount = FALSE uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) /datum/uplink_item/explosives/grenadier @@ -643,7 +643,7 @@ cost = 55 excludefrom = list(UPLINK_TYPE_TRAITOR, UPLINK_TYPE_SIT) surplus = 0 - cant_discount = TRUE + can_discount = FALSE hijack_only = FALSE /datum/uplink_item/explosives/emp_bomb/nuke @@ -651,7 +651,7 @@ cost = 50 excludefrom = list(UPLINK_TYPE_TRAITOR, UPLINK_TYPE_SIT) surplus = 0 - cant_discount = TRUE + can_discount = FALSE /datum/uplink_item/explosives/atmosfiregrenades/nuke reference = "NAPG" @@ -659,7 +659,7 @@ cost = 60 excludefrom = list(UPLINK_TYPE_TRAITOR, UPLINK_TYPE_SIT) surplus = 0 - cant_discount = TRUE + can_discount = FALSE /datum/uplink_item/stealthy_tools/chameleon/nuke reference = "NCHAM" diff --git a/code/datums/uplink_items/uplink_special.dm b/code/datums/uplink_items/uplink_special.dm index ae5e97944dc..c98f3a1ed6e 100644 --- a/code/datums/uplink_items/uplink_special.dm +++ b/code/datums/uplink_items/uplink_special.dm @@ -1,7 +1,7 @@ /// This uplink catagory is for uplink items avalible by special circumstances. Think station traits, or if some event rolling in a round gave traitors special items, or an objective. /datum/uplink_item/special category = "Special Offers" - cant_discount = TRUE + can_discount = FALSE surplus = 0 excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST, UPLINK_TYPE_TRAITOR, UPLINK_TYPE_SIT) diff --git a/code/datums/uplink_items/uplink_traitor.dm b/code/datums/uplink_items/uplink_traitor.dm index ff2cdec2b6d..99ce40fe217 100644 --- a/code/datums/uplink_items/uplink_traitor.dm +++ b/code/datums/uplink_items/uplink_traitor.dm @@ -4,7 +4,7 @@ /datum/uplink_item/jobspecific category = "Job Specific Tools" - cant_discount = TRUE + can_discount = FALSE excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) // Stops the job specific category appearing for nukies //Clown @@ -333,7 +333,7 @@ /datum/uplink_item/species_restricted category = "Species Specific Gear" - cant_discount = TRUE + can_discount = FALSE excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) // Stops the job specific category appearing for nukies //skrell @@ -420,7 +420,7 @@ refund_path = /obj/item/guardiancreator/tech/choose refundable = TRUE surplus = 0 // This being refundable makes this a big no no in my mind. - cant_discount = TRUE + can_discount = FALSE /datum/uplink_item/stealthy_weapons/martialarts name = "Martial Arts Scroll" @@ -431,7 +431,7 @@ item = /obj/item/sleeping_carp_scroll cost = 65 excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) - cant_discount = TRUE + can_discount = FALSE /datum/uplink_item/stealthy_weapons/bearserk name = "Bearserker Pelt" @@ -548,7 +548,7 @@ cost = 70 excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) surplus = 0 - cant_discount = TRUE + can_discount = FALSE /datum/uplink_item/cyber_implants/sensory_enhancer name = "Qani-Laaca Sensory Computer Autoimplanter" @@ -659,7 +659,7 @@ cost = 40 excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) surplus = 0 - cant_discount = TRUE + can_discount = FALSE hijack_only = TRUE /datum/uplink_item/explosives/emp_bomb @@ -671,7 +671,7 @@ cost = 40 excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) surplus = 0 - cant_discount = TRUE + can_discount = FALSE /datum/uplink_item/explosives/emp_bomb/New() ..() @@ -687,7 +687,7 @@ cost = 50 excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) surplus = 0 - cant_discount = TRUE + can_discount = FALSE /datum/uplink_item/stealthy_tools/chameleon name = "Chameleon Kit"