From acfcb5cbd7e3dbd60467d7d3d91aebfc02e5defb Mon Sep 17 00:00:00 2001 From: wesoda25 <37246588+wesoda25@users.noreply.github.com> Date: Fri, 23 Aug 2019 20:11:37 -0400 Subject: [PATCH] Removes Cigars from Smoker Spawn Pool (#45883) * smokesmoke * ooob * Update negative.dm --- code/datums/mood_events/drug_events.dm | 2 +- code/datums/traits/negative.dm | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/code/datums/mood_events/drug_events.dm b/code/datums/mood_events/drug_events.dm index 95219b79a8e..15102a0cfe8 100644 --- a/code/datums/mood_events/drug_events.dm +++ b/code/datums/mood_events/drug_events.dm @@ -11,7 +11,7 @@ description = "I hate that brand of cigarettes.\n" mood_change = -2 timeout = 6 MINUTES - + /datum/mood_event/overdose mood_change = -8 timeout = 5 MINUTES diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index c03f297e3ff..1aa0bf2cbd9 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -519,10 +519,7 @@ /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, - /obj/item/storage/fancy/cigarettes/cigars, - /obj/item/storage/fancy/cigarettes/cigars/cohiba, - /obj/item/storage/fancy/cigarettes/cigars/havana) + /obj/item/storage/fancy/cigarettes/cigpack_carp) . = ..() /datum/quirk/junkie/smoker/announce_drugs()