From ec3f079788c722e231013122b7b79c42402380e0 Mon Sep 17 00:00:00 2001
From: Bjarl <94164348+Bjarl@users.noreply.github.com>
Date: Wed, 1 Nov 2023 12:26:42 -0400
Subject: [PATCH 1/9] *blows a puff off my cigar* Groovy
---
code/_globalvars/lists/flavor_misc.dm | 14 +++++++++
code/controllers/subsystem/traumas.dm | 4 +--
code/datums/mood_events/drug_events.dm | 6 ++--
code/datums/traits/negative.dm | 33 ++++++++++++++++-----
code/game/objects/items/storage/fancy.dm | 10 +++----
code/modules/client/preferences.dm | 10 +++++++
code/modules/client/preferences_savefile.dm | 2 ++
7 files changed, 62 insertions(+), 17 deletions(-)
diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index aca090086487..ac202ecc5ce3 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -188,6 +188,20 @@ GLOBAL_LIST_INIT(exowearlist, list(PREF_NOEXOWEAR, PREF_EXOWEAR, PREF_ALTEXOWEAR
#define UPLINK_PEN "Pen" //like a real spy!
GLOBAL_LIST_INIT(uplink_spawn_loc_list, list(UPLINK_PDA, UPLINK_RADIO, UPLINK_PEN))
+//favorite cigarette brand
+#define PREF_CIG_SPACE "Space Cigarettes"
+#define PREF_CIG_DROMEDARY "DromedaryCo"
+#define PREF_CIG_UPLIFT "Uplift Smooth"
+#define PREF_CIG_ROBUST "Robust"
+#define PREF_CIG_ROBUSTGOLD "Robust Gold"
+#define PREF_CIG_CARP "Carp Classic"
+#define PREF_CIG_MIDORI "Midori Taboko"
+#define PREF_CIGAR "Cigars"
+#define PREF_CIGAR_SOLAR "Solarian Cigars"
+#define PREF_CIGAR_COHIBA "Cohiba Cigars"
+
+GLOBAL_LIST_INIT(valid_smoke_types, sortList(list(PREF_CIG_SPACE, PREF_CIG_DROMEDARY, PREF_CIG_UPLIFT, PREF_CIG_ROBUST, PREF_CIG_ROBUSTGOLD, PREF_CIG_CARP, PREF_CIG_MIDORI, PREF_CIGAR, PREF_CIGAR_SOLAR, PREF_CIGAR_COHIBA)))
+
//Female Uniforms
GLOBAL_LIST_EMPTY(female_clothing_icons)
//Alternate species icons
diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm
index ab220b4382b4..c193e64e946e 100644
--- a/code/controllers/subsystem/traumas.dm
+++ b/code/controllers/subsystem/traumas.dm
@@ -90,10 +90,10 @@ SUBSYSTEM_DEF(traumas)
/obj/item/clothing/under/rank/command/captain, /obj/item/clothing/under/rank/security/head_of_security,
/obj/item/clothing/under/rank/engineering/chief_engineer, /obj/item/clothing/under/rank/medical/chief_medical_officer,
/obj/item/clothing/under/rank/command/head_of_personnel, /obj/item/clothing/under/rank/rnd/research_director,
- /obj/item/clothing/under/rank/security/head_of_security/alt,//WS Edit - Better security jumpsuit sprites
+ /obj/item/clothing/under/rank/security/head_of_security/alt,
/obj/item/clothing/under/rank/rnd/research_director/alt, /obj/item/clothing/under/rank/rnd/research_director/turtleneck,
/obj/item/clothing/under/rank/command/captain/parade, /obj/item/clothing/under/rank/security/head_of_security/parade,
- /obj/item/clothing/under/rank/security/head_of_security/parade/female, //WS Edit - Better Command Uniforms
+ /obj/item/clothing/under/rank/security/head_of_security/parade/female,
/obj/item/clothing/head/helmet/abductor, /obj/item/clothing/suit/armor/abductor/vest, /obj/item/melee/baton/abductor,
/obj/item/storage/belt/military/abductor, /obj/item/gun/energy/alien, /obj/item/abductor/silencer,
/obj/item/abductor/gizmo, /obj/item/clothing/under/rank/centcom/official,
diff --git a/code/datums/mood_events/drug_events.dm b/code/datums/mood_events/drug_events.dm
index 6af401e8b009..028973c5c839 100644
--- a/code/datums/mood_events/drug_events.dm
+++ b/code/datums/mood_events/drug_events.dm
@@ -4,12 +4,12 @@
/datum/mood_event/smoked
description = "I have had a smoke recently.\n"
- mood_change = 2
+ mood_change = 1
timeout = 6 MINUTES
/datum/mood_event/wrong_brand
- description = "I hate that brand of cigarettes.\n"
- mood_change = -2
+ description = "That brand of cigarette just doesn't hit right.\n"
+ mood_change = -1
timeout = 6 MINUTES
/datum/mood_event/overdose
diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index c8e3b582511d..dd04f47c2e55 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -589,19 +589,38 @@
reagent_type = /datum/reagent/drug/nicotine
accessory_type = /obj/item/lighter/greyscale
+//I fucking hate prefscode
+
/datum/quirk/junkie/smoker/on_spawn()
- drug_container_type = pick(/obj/item/storage/fancy/cigarettes,
- /obj/item/storage/fancy/cigarettes/cigpack_midori,
- /obj/item/storage/fancy/cigarettes/cigpack_uplift,
- /obj/item/storage/fancy/cigarettes/cigpack_robust,
- /obj/item/storage/fancy/cigarettes/cigpack_robustgold,
- /obj/item/storage/fancy/cigarettes/cigpack_carp)
+ var/mob/living/carbon/human/H = quirk_holder
+ switch (H.client?.prefs.preferred_smoke_brand)
+ if (PREF_CIG_SPACE)
+ drug_container_type = /obj/item/storage/fancy/cigarettes
+ if (PREF_CIG_DROMEDARY)
+ drug_container_type = /obj/item/storage/fancy/cigarettes/dromedaryco
+ if (PREF_CIG_UPLIFT)
+ drug_container_type = /obj/item/storage/fancy/cigarettes/cigpack_uplift
+ if (PREF_CIG_ROBUST)
+ drug_container_type = /obj/item/storage/fancy/cigarettes/cigpack_robust
+ if (PREF_CIG_ROBUSTGOLD)
+ drug_container_type = /obj/item/storage/fancy/cigarettes/cigpack_robustgold
+ if (PREF_CIG_CARP)
+ drug_container_type= /obj/item/storage/fancy/cigarettes/cigpack_carp
+ if (PREF_CIG_MIDORI)
+ drug_container_type = /obj/item/storage/fancy/cigarettes/cigpack_midori
+ if (PREF_CIGAR)
+ drug_container_type = /obj/item/storage/fancy/cigarettes/cigars
+ if (PREF_CIGAR_SOLAR)
+ drug_container_type = /obj/item/storage/fancy/cigarettes/cigars/havana
+ if (PREF_CIGAR_COHIBA)
+ drug_container_type = /obj/item/storage/fancy/cigarettes/cigars/cohiba
+ else
+ CRASH("Someone had an improper cigarette pref on loading")
. = ..()
/datum/quirk/junkie/smoker/announce_drugs()
to_chat(quirk_holder, "There is a [initial(drug_container_type.name)] [where_drug], and a lighter [where_accessory]. Make sure you get your favorite brand when you run out.")
-
/datum/quirk/junkie/smoker/on_process()
. = ..()
var/mob/living/carbon/human/H = quirk_holder
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index 58f10b2ccd8d..471306cde192 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -163,7 +163,7 @@
////////////
/obj/item/storage/fancy/cigarettes
name = "\improper Space Cigarettes packet"
- desc = "The most popular brand of cigarettes, sponsors of the Space Olympics."
+ desc = "The most popular brand of cigarettes on the Frontier."
icon = 'icons/obj/cigarettes.dmi'
base_icon_state = "cig"
icon_state = "cig"
@@ -273,14 +273,14 @@
/obj/item/storage/fancy/cigarettes/cigpack_carp
name = "\improper Carp Classic packet"
- desc = "Since 2313."
+ desc = "Since 207 FS."
icon_state = "carp"
base_icon_state = "carp"
spawn_type = /obj/item/clothing/mask/cigarette/carp
/obj/item/storage/fancy/cigarettes/cigpack_syndicate
name = "cigarette packet"
- desc = "An obscure brand of cigarettes."
+ desc = "A semi-obscure brand of cigarettes, favored by interstellar miners."
icon_state = "syndie"
base_icon_state = "syndie"
spawn_type = /obj/item/clothing/mask/cigarette/syndicate
@@ -329,7 +329,7 @@
/obj/item/storage/fancy/cigarettes/cigpack_mindbreaker
name = "\improper Leary's Delight packet"
- desc = "Banned in over 36 galaxies."
+ desc = "Banned in over 36 Sectors."
icon_state = "shadyjim"
base_icon_state = "shadyjim"
spawn_type = /obj/item/clothing/mask/cigarette/rollie/mindbreaker
@@ -442,7 +442,7 @@
/obj/item/storage/fancy/cigarettes/cigars/havana
name = "\improper premium Havanian cigar case"
- desc = "A case of classy Havanian cigars."
+ desc = "Even after centuries of Solarian export, Havana smooth is only found in proper terran cigars."
icon_state = "cohibacase"
base_icon_state = "cohibacase"
spawn_type = /obj/item/clothing/mask/cigarette/cigar/havana
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 69ea5e634cda..d37c8bbb0868 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -152,6 +152,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
)
var/fbp = FALSE
var/phobia = "spiders"
+ var/preferred_smoke_brand = PREF_CIG_SPACE
var/list/alt_titles_preferences = list()
var/list/custom_names = list()
var/preferred_ai_core_display = "Blue"
@@ -824,6 +825,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "[phobia]
"
+ if("Smoker" in all_quirks)
+ dat += "Cigarette Brand"
+
+ dat += "[preferred_smoke_brand]
"
+
if("body_size" in pref_species.default_features)
if(!mutant_category)
dat += APPEARANCE_CATEGORY_COLUMN
@@ -2035,6 +2041,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/phobiaType = input(user, "What are you scared of?", "Character Preference", phobia) as null|anything in SStraumas.phobia_types
if(phobiaType)
phobia = phobiaType
+ if("preferred_smoke_brand")
+ var/smokeBrand = input(user, "What cigarettes are your favorite?", "Character Preference", preferred_smoke_brand) as null|anything in GLOB.valid_smoke_types
+ if(smokeBrand)
+ preferred_smoke_brand = smokeBrand
if ("max_chat_length")
var/desiredlength = input(user, "Choose the max character length of shown Runechat messages. Valid range is 1 to [CHAT_MESSAGE_MAX_LENGTH] (default: [initial(max_chat_length)]))", "Character Preference", max_chat_length) as null|num
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index b08ba8588f69..571a02be938c 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -402,6 +402,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
READ_FILE(S["jumpsuit_style"], jumpsuit_style)
READ_FILE(S["uplink_loc"], uplink_spawn_loc)
READ_FILE(S["phobia"], phobia)
+ READ_FILE(S["preferred_smoke_brand"], preferred_smoke_brand)
READ_FILE(S["randomise"], randomise)
READ_FILE(S["body_size"], features["body_size"])
READ_FILE(S["prosthetic_limbs"], prosthetic_limbs)
@@ -588,6 +589,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["uplink_loc"] , uplink_spawn_loc)
WRITE_FILE(S["randomise"] , randomise)
WRITE_FILE(S["species"] , pref_species.id)
+ WRITE_FILE(S["preferred_smoke_brand"] , preferred_smoke_brand)
WRITE_FILE(S["phobia"] , phobia)
WRITE_FILE(S["body_size"] , features["body_size"])
WRITE_FILE(S["prosthetic_limbs"] , prosthetic_limbs)
From aec21b895894900647d52f484d3e7c0e26868d63 Mon Sep 17 00:00:00 2001
From: Bjarl <94164348+Bjarl@users.noreply.github.com>
Date: Wed, 1 Nov 2023 12:29:37 -0400
Subject: [PATCH 2/9] poorly advised balance change
---
code/modules/reagents/chemistry/holder.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index f62a3a32035d..86f4e05226e4 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -389,7 +389,7 @@
for(var/addiction in cached_addictions)
var/datum/reagent/A = addiction
if(istype(R, A))
- A.addiction_stage = -15 // you're satisfied for a good while.
+ A.addiction_stage = -30 // you're satisfied for a good while.
need_mob_update += R.on_mob_life(C)
if(can_overdose)
From 289165d714aa8f96e90f21b71cf8d79c26008b46 Mon Sep 17 00:00:00 2001
From: Bjarl <94164348+Bjarl@users.noreply.github.com>
Date: Wed, 1 Nov 2023 12:47:07 -0400
Subject: [PATCH 3/9] more flavor
---
code/_globalvars/lists/flavor_misc.dm | 18 ++++++++++--------
code/datums/traits/negative.dm | 9 +++++++++
code/game/objects/items/cigs_lighters.dm | 20 ++++++++++----------
3 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index ac202ecc5ce3..b6b16634f0ff 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -190,17 +190,19 @@ GLOBAL_LIST_INIT(uplink_spawn_loc_list, list(UPLINK_PDA, UPLINK_RADIO, UPLINK_PE
//favorite cigarette brand
#define PREF_CIG_SPACE "Space Cigarettes"
-#define PREF_CIG_DROMEDARY "DromedaryCo"
-#define PREF_CIG_UPLIFT "Uplift Smooth"
-#define PREF_CIG_ROBUST "Robust"
-#define PREF_CIG_ROBUSTGOLD "Robust Gold"
-#define PREF_CIG_CARP "Carp Classic"
-#define PREF_CIG_MIDORI "Midori Taboko"
-#define PREF_CIGAR "Cigars"
+#define PREF_CIG_DROMEDARY "DromedaryCo Cigarettes"
+#define PREF_CIG_UPLIFT "Uplift Smooth Cigarettes"
+#define PREF_CIG_ROBUST "Robust Cigarettes"
+#define PREF_CIG_ROBUSTGOLD "Robust Gold Cigarettes"
+#define PREF_CIG_CARP "Carp Classic Cigarettes"
+#define PREF_CIG_MIDORI "Midori Taboko Rollies"
+#define PREF_CIGAR "Premium Cigars"
#define PREF_CIGAR_SOLAR "Solarian Cigars"
#define PREF_CIGAR_COHIBA "Cohiba Cigars"
+#define PREF_VAPE "Vape Pen"
+#define PREF_PIPE "Fancy Pipe"
-GLOBAL_LIST_INIT(valid_smoke_types, sortList(list(PREF_CIG_SPACE, PREF_CIG_DROMEDARY, PREF_CIG_UPLIFT, PREF_CIG_ROBUST, PREF_CIG_ROBUSTGOLD, PREF_CIG_CARP, PREF_CIG_MIDORI, PREF_CIGAR, PREF_CIGAR_SOLAR, PREF_CIGAR_COHIBA)))
+GLOBAL_LIST_INIT(valid_smoke_types, sortList(list(PREF_CIG_SPACE, PREF_CIG_DROMEDARY, PREF_CIG_UPLIFT, PREF_CIG_ROBUST, PREF_CIG_ROBUSTGOLD, PREF_CIG_CARP, PREF_CIG_MIDORI, PREF_CIGAR, PREF_CIGAR_SOLAR, PREF_CIGAR_COHIBA, PREF_VAPE, PREF_PIPE)))
//Female Uniforms
GLOBAL_LIST_EMPTY(female_clothing_icons)
diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index dd04f47c2e55..4dbeed786e38 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -610,10 +610,19 @@
drug_container_type = /obj/item/storage/fancy/cigarettes/cigpack_midori
if (PREF_CIGAR)
drug_container_type = /obj/item/storage/fancy/cigarettes/cigars
+ accessory_type = /obj/item/storage/box/matches
if (PREF_CIGAR_SOLAR)
drug_container_type = /obj/item/storage/fancy/cigarettes/cigars/havana
+ accessory_type = /obj/item/storage/box/matches
if (PREF_CIGAR_COHIBA)
drug_container_type = /obj/item/storage/fancy/cigarettes/cigars/cohiba
+ accessory_type = /obj/item/storage/box/matches
+ if (PREF_VAPE)
+ drug_container_type = /obj/item/clothing/mask/vape
+ accessory_type =
+ if (PREF_PIPE)
+ drug_container_type = /obj/item/clothing/mask/cigarette/pipe
+ accessory_type = /obj/item/storage/box/matches
else
CRASH("Someone had an improper cigarette pref on loading")
. = ..()
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index 44857142e4db..72e92e61baba 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -754,7 +754,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
overlay_state = "slime"
grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/medicine/pyroxadone = 5)
-/obj/item/lighter/clockwork //WS edit: Clockwork Zippo, by Tergius. PR #395
+/obj/item/lighter/clockwork
name = "bronze zippo"
desc = "A zippo plated with brass. I mean bronze. Has a neat red flame!"
icon = 'icons/obj/cigarettes.dmi'
@@ -867,11 +867,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM
to_chat(user, "You open the cap on [src].")
reagents.flags |= OPENCONTAINER
if(obj_flags & EMAGGED)
- add_overlay("[overlayname]open_high") //WS edit - lightable e-cigarettes
+ add_overlay("[overlayname]open_high")
else if(super)
- add_overlay("[overlayname]open_med") //WS edit - lightable e-cigarettes
+ add_overlay("[overlayname]open_med")
else
- add_overlay("[overlayname]open_low") //WS edit - lightable e-cigarettes
+ add_overlay("[overlayname]open_low")
else
screw = FALSE
to_chat(user, "You close the cap on [src].")
@@ -884,12 +884,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM
cut_overlays()
super = 1
to_chat(user, "You increase the voltage of [src].")
- add_overlay("[overlayname]open_med") //WS edit - lightable e-cigarettes
+ add_overlay("[overlayname]open_med")
else
cut_overlays()
super = 0
to_chat(user, "You decrease the voltage of [src].")
- add_overlay("[overlayname]open_low") //WS edit - lightable e-cigarettes
+ add_overlay("[overlayname]open_low")
if(screw && (obj_flags & EMAGGED))
to_chat(user, "[src] can't be modified!")
@@ -922,7 +922,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
STOP_PROCESSING(SSobj, src)
src.update_icon_state()
user.update_inv_wear_mask()
- user.update_inv_hands() //EndWS edit - Lightable e-cigarettes
+ user.update_inv_hands()
/obj/item/clothing/mask/vape/emag_act(mob/user)// I WON'T REGRET WRITTING THIS, SURLY.
@@ -932,7 +932,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
obj_flags |= EMAGGED
super = 0
to_chat(user, "You maximize the voltage of [src].")
- add_overlay("[overlayname]open_high") //WS edit - lightable e-cigarettes
+ add_overlay("[overlayname]open_high")
var/datum/effect_system/spark_spread/sp = new /datum/effect_system/spark_spread //for effect
sp.set_up(5, 1, src)
sp.start()
@@ -948,7 +948,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/vape/equipped(mob/user, slot)
. = ..()
- if(slot == ITEM_SLOT_MASK) //BeginWS edit - Lightable e-cigarettes
+ if(slot == ITEM_SLOT_MASK)
if(on)
if(!screw)
to_chat(user, "You start puffing on \the [src].")
@@ -956,7 +956,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
else //it will not start if the vape is opened.
to_chat(user, "You need to close the cap first!")
else
- to_chat(user, "You need to turn on \the [src] first!") //EndWS edit - Lightable e-cigarettes
+ to_chat(user, "You need to turn on \the [src] first!")
/obj/item/clothing/mask/vape/dropped(mob/user)
. = ..()
From 60640c7784681a4d03aaac5e7e107791de0254c8 Mon Sep 17 00:00:00 2001
From: Bjarl <94164348+Bjarl@users.noreply.github.com>
Date: Wed, 1 Nov 2023 12:48:48 -0400
Subject: [PATCH 4/9] Update negative.dm
---
code/datums/traits/negative.dm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index 4dbeed786e38..97f1ab3724fd 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -635,6 +635,8 @@
var/mob/living/carbon/human/H = quirk_holder
var/obj/item/I = H.get_item_by_slot(ITEM_SLOT_MASK)
if (istype(I, /obj/item/clothing/mask/cigarette))
+ if( I == drug_container_type )
+ return
var/obj/item/storage/fancy/cigarettes/C = drug_container_type
if(istype(I, initial(C.spawn_type)))
SEND_SIGNAL(quirk_holder, COMSIG_CLEAR_MOOD_EVENT, "wrong_cigs")
From 4b4178c77d5b035fa837c28e39ae100cb3a7cc6b Mon Sep 17 00:00:00 2001
From: Bjarl <94164348+Bjarl@users.noreply.github.com>
Date: Wed, 1 Nov 2023 12:49:32 -0400
Subject: [PATCH 5/9] Update negative.dm
---
code/datums/traits/negative.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index 97f1ab3724fd..6f888576a38a 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -619,7 +619,7 @@
accessory_type = /obj/item/storage/box/matches
if (PREF_VAPE)
drug_container_type = /obj/item/clothing/mask/vape
- accessory_type =
+ accessory_type = null
if (PREF_PIPE)
drug_container_type = /obj/item/clothing/mask/cigarette/pipe
accessory_type = /obj/item/storage/box/matches
From 58b9ce3df79e09bcdfd8f43416f21217804441c9 Mon Sep 17 00:00:00 2001
From: Bjarl <94164348+Bjarl@users.noreply.github.com>
Date: Wed, 1 Nov 2023 12:54:47 -0400
Subject: [PATCH 6/9] Update negative.dm
---
code/datums/traits/negative.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index 6f888576a38a..322d43313c08 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -628,7 +628,7 @@
. = ..()
/datum/quirk/junkie/smoker/announce_drugs()
- to_chat(quirk_holder, "There is a [initial(drug_container_type.name)] [where_drug], and a lighter [where_accessory]. Make sure you get your favorite brand when you run out.")
+ to_chat(quirk_holder, "There is a [initial(drug_container_type.name)] [where_drug], and a [accessory_type.name] [where_accessory]. Make sure you get your favorite brand when you run out.")
/datum/quirk/junkie/smoker/on_process()
. = ..()
From 7e12ceeb642bb2c230ca24c4249fcc28282183e1 Mon Sep 17 00:00:00 2001
From: Bjarl <94164348+Bjarl@users.noreply.github.com>
Date: Wed, 1 Nov 2023 13:02:39 -0400
Subject: [PATCH 7/9] a
---
code/datums/traits/negative.dm | 2 +-
code/modules/client/preferences.dm | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index 322d43313c08..a7c8d06613e2 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -628,7 +628,7 @@
. = ..()
/datum/quirk/junkie/smoker/announce_drugs()
- to_chat(quirk_holder, "There is a [initial(drug_container_type.name)] [where_drug], and a [accessory_type.name] [where_accessory]. Make sure you get your favorite brand when you run out.")
+ to_chat(quirk_holder, "There is a [initial(drug_container_type.name)] [where_drug], and a [initial(accessory_type.name)] [where_accessory]. Make sure you get your favorite brand when you run out.")
/datum/quirk/junkie/smoker/on_process()
. = ..()
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index d37c8bbb0868..43d971f0fb4e 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -826,7 +826,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "[phobia]
"
if("Smoker" in all_quirks)
- dat += "Cigarette Brand"
+ dat += "Smoker"
dat += "[preferred_smoke_brand]
"
From ba92d3db32d19f761fc06ad1ae25d3c4c70d7fc8 Mon Sep 17 00:00:00 2001
From: Bjarl <94164348+Bjarl@users.noreply.github.com>
Date: Wed, 1 Nov 2023 13:10:10 -0400
Subject: [PATCH 8/9] lint + flavor
---
code/datums/traits/negative.dm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index a7c8d06613e2..1ec36479ac4f 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -628,6 +628,9 @@
. = ..()
/datum/quirk/junkie/smoker/announce_drugs()
+ if(accessory_type == null)
+ to_chat(quirk_holder, "There is a [initial(drug_container_type.name)] [where_drug], Make sure you get a refill soon.")
+ return
to_chat(quirk_holder, "There is a [initial(drug_container_type.name)] [where_drug], and a [initial(accessory_type.name)] [where_accessory]. Make sure you get your favorite brand when you run out.")
/datum/quirk/junkie/smoker/on_process()
@@ -635,7 +638,7 @@
var/mob/living/carbon/human/H = quirk_holder
var/obj/item/I = H.get_item_by_slot(ITEM_SLOT_MASK)
if (istype(I, /obj/item/clothing/mask/cigarette))
- if( I == drug_container_type )
+ if(I == drug_container_type)
return
var/obj/item/storage/fancy/cigarettes/C = drug_container_type
if(istype(I, initial(C.spawn_type)))
From 75581677043711bca9715aa7aae8c476ea353df4 Mon Sep 17 00:00:00 2001
From: FalloutFalcon
Date: Tue, 7 May 2024 19:47:20 -0500
Subject: [PATCH 9/9] right header
---
code/modules/client/preferences.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 2beb998f3edf..6bc2af4da967 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -841,7 +841,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "[phobia]
"
if("Smoker" in all_quirks)
- dat += "