From 28b58b16104875ef83652dd22b233f259a9f10a9 Mon Sep 17 00:00:00 2001 From: Leland Kemble <70413276+lelandkemble@users.noreply.github.com> Date: Wed, 13 May 2026 18:58:38 -0400 Subject: [PATCH] Junkies get the drug addiction they have in their preferences (#96044) ## About The Pull Request `add()` runs before `add_unique()`, and `add()` includes randomization of `reagent_type` in lieu of an already defined one. `add_to_holder()` runs before both, so that's where the pref will be read. --- code/datums/quirks/negative_quirks/addict.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/datums/quirks/negative_quirks/addict.dm b/code/datums/quirks/negative_quirks/addict.dm index 8f2dcc2590c..556452bc360 100644 --- a/code/datums/quirks/negative_quirks/addict.dm +++ b/code/datums/quirks/negative_quirks/addict.dm @@ -95,11 +95,11 @@ associated_typepath = /datum/quirk/item_quirk/addict/junkie customization_options = list(/datum/preference/choiced/junkie) -/datum/quirk/item_quirk/addict/junkie/add_unique(client/client_source) - - var/addiction = client_source?.prefs.read_preference(/datum/preference/choiced/junkie) - if(addiction && (addiction != "Random")) - reagent_type = GLOB.possible_junkie_addictions[addiction] +/datum/quirk/item_quirk/addict/junkie/add_to_holder(mob/living/new_holder, quirk_transfer = FALSE, client/client_source, unique = TRUE, announce = TRUE) + if(!quirk_transfer) + var/addiction = client_source?.prefs.read_preference(/datum/preference/choiced/junkie) + if(addiction && (addiction != "Random")) + reagent_type = GLOB.possible_junkie_addictions[addiction] return ..() /datum/quirk/item_quirk/addict/remove()