From a831982d22f66bcd7d6a70d83c96e4f806ef4e8c Mon Sep 17 00:00:00 2001
From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com>
Date: Tue, 19 Sep 2023 04:38:15 +0800
Subject: [PATCH] Cigarettes Glitch Fix (#17361)

Fixes #17280
---
 .../objects/items/weapons/storage/fancy.dm    |  4 +-
 html/changelogs/wezzy_cigfixesdailo.yml       | 41 +++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/wezzy_cigfixesdailo.yml

diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index c048fb161be..3d34e91cb67 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -327,11 +327,11 @@
 	if(!opened)
 		to_chat(user, SPAN_NOTICE("\The [src] is closed."))
 		return
-	if(use_check(M))
+	if(!use_check(M))
 		to_chat(usr, SPAN_WARNING("[M.name] is in no condition to handle items!"))
 		return
 	if(target_zone == BP_MOUTH && contents.len > 0)
-		var/obj/item/clothing/mask/smokable/cigarette/W = new cigarette_to_spawn(src)
+		var/obj/item/clothing/mask/smokable/cigarette/W = new cigarette_to_spawn(M)
 		if(!istype(W) || M.wear_mask)
 			to_chat(user, SPAN_NOTICE("\The [M.wear_mask] is in the way."))
 			if(M != user)
diff --git a/html/changelogs/wezzy_cigfixesdailo.yml b/html/changelogs/wezzy_cigfixesdailo.yml
new file mode 100644
index 00000000000..bdc8c305745
--- /dev/null
+++ b/html/changelogs/wezzy_cigfixesdailo.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: Wowzewow (Wezzy)
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Fixes the infinite cigarette glitch and being unable to accept them from other people."