cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27829 from Skyrat-SS13/upstream-merge-83378

Browse Source 
[MIRROR] Fix smoker quirk preferences
This commit is contained in:
SpaceLoveSs13
2024-05-23 23:05:58 +05:30
committed by GitHub
parent f47c7dc815 02510f8e4d
commit cddfeb7597
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_globalvars/lists/quirks.dm
+1 -1
View File
@@ -47,7 +47,7 @@ GLOBAL_LIST_INIT(possible_junkie_addictions, setup_junkie_addictions(list(
)))
///Options for the Smoker quirk to choose from
GLOBAL_LIST_INIT(possible_smoker_addictions, setup_junkie_addictions(list(
GLOBAL_LIST_INIT(possible_smoker_addictions, setup_smoker_addictions(list(
/obj/item/storage/fancy/cigarettes,
/obj/item/storage/fancy/cigarettes/cigpack_midori,
/obj/item/storage/fancy/cigarettes/cigpack_uplift,
code/modules/client/preferences/addict.dm
+6
View File
@@ -4,6 +4,12 @@
. -= addiction
.[addiction::name] = addiction
/proc/setup_smoker_addictions(list/possible_addictions)
. = possible_addictions
for(var/obj/item/storage/addiction as anything in .)
. -= addiction
.[format_text(addiction::name)] = addiction // Format text to remove \improper used in cigarette packs
/datum/preference/choiced/junkie
category = PREFERENCE_CATEGORY_MANUALLY_RENDERED
savefile_key = "junkie"