From 4b3484c3a94bd347e57e4604d2f19c31c4daa7a6 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Wed, 29 Nov 2023 16:33:22 +0000 Subject: [PATCH] changes --- code/__DEFINES/vendors.dm | 8 ++++---- code/game/machinery/vending/cm_vending.dm | 14 +++++--------- .../vending/vendor_types/crew/synthetic.dm | 2 +- code/game/objects/items/devices/coins.dm | 7 ++++++- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/code/__DEFINES/vendors.dm b/code/__DEFINES/vendors.dm index c6030e4e97f8..eeec210a56c3 100644 --- a/code/__DEFINES/vendors.dm +++ b/code/__DEFINES/vendors.dm @@ -69,8 +69,8 @@ #define VEND_LOAD_AMMO_BOXES (1<<9) // Redemption Tokens -#define TOKEN_ENGINEER "Engineer" -#define TOKEN_SPEC "Specialist" -#define TOKEN_SYNTH "Synthetic" +#define VEND_TOKEN_ENGINEER "Engineer" +#define VEND_TOKEN_SPEC "Specialist" +#define VEND_TOKEN_SYNTH "Synthetic" /// Token invalid/unrecognised. -#define TOKEN_VOID "Void" +#define VEND_TOKEN_VOID "Void" diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm index f1c8538bb023..c537d9de5a79 100644 --- a/code/game/machinery/vending/cm_vending.dm +++ b/code/game/machinery/vending/cm_vending.dm @@ -449,21 +449,17 @@ GLOBAL_LIST_EMPTY(vending_products) redeem_token(attacking_item, user) /obj/structure/machinery/cm_vending/proc/get_token_type(obj/item/coin/marine/token) - if(istype(token, /obj/item/coin/marine/engineer)) - return TOKEN_ENGINEER - if(istype(token, /obj/item/coin/marine/specialist)) - return TOKEN_SPEC - if(istype(token, /obj/item/coin/marine/synth)) - return TOKEN_SYNTH - return TOKEN_VOID + if(!istype(token)) + return VEND_TOKEN_VOID + return token.token_type /obj/structure/machinery/cm_vending/proc/redeem_token(obj/item/token, mob/user) var/reward_typepath switch(get_token_type(token)) - if(TOKEN_VOID) + if(VEND_TOKEN_VOID) to_chat(user, SPAN_WARNING("ERROR: TOKEN NOT RECOGNISED.")) return FALSE - if(TOKEN_SPEC) + if(VEND_TOKEN_SPEC) reward_typepath = /obj/item/spec_kit/rifleman else to_chat(user, SPAN_WARNING("ERROR: INCORRECT TOKEN.")) diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm index 9f23c723f249..9b506046137f 100644 --- a/code/game/machinery/vending/vendor_types/crew/synthetic.dm +++ b/code/game/machinery/vending/vendor_types/crew/synthetic.dm @@ -336,7 +336,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list( vendor_role = list(JOB_SYNTH) /obj/structure/machinery/cm_vending/own_points/experimental_tools/redeem_token(obj/item/token, mob/user) - if(get_token_type(token) == TOKEN_SYNTH) + if(get_token_type(token) == VEND_TOKEN_SYNTH) if(user.drop_inv_item_to_loc(token, src)) available_points = 30 available_points_to_display = available_points diff --git a/code/game/objects/items/devices/coins.dm b/code/game/objects/items/devices/coins.dm index e5b0ce369aa3..6c00364642da 100644 --- a/code/game/objects/items/devices/coins.dm +++ b/code/game/objects/items/devices/coins.dm @@ -121,6 +121,9 @@ name = "marine equipment token" desc = "I wonder what it does?" icon_state = "coin_copper" + black_market_value = 0 + /// What is the token for? + var/token_type = VEND_TOKEN_VOID /obj/item/coin/marine/attackby(obj/item/W as obj, mob/user as mob) //To remove attaching a string functionality return @@ -129,14 +132,16 @@ name = "marine engineer support token" desc = "Insert this into an engineer vendor in order to access a support weapon." icon_state = "coin_gold" + token_type = VEND_TOKEN_ENGINEER /obj/item/coin/marine/specialist name = "marine specialist weapon token" desc = "Insert this into a USCM equipment vendor in order to access a single highly dangerous weapon." icon_state = "coin_diamond" + token_type = VEND_TOKEN_SPEC /obj/item/coin/marine/synth name = "synthetic experimental tool redemption token" desc = "Insert this into a synthetic experimental tools vendor in order to access a variety of experimental support tools." icon_state = "coin_synth" - black_market_value = 0 + token_type = VEND_TOKEN_SYNTH