diff --git a/code/modules/client/preference_setup/loadout/loadout_smoking.dm b/code/modules/client/preference_setup/loadout/loadout_smoking.dm
index f54279066d..2599cf1f35 100644
--- a/code/modules/client/preference_setup/loadout/loadout_smoking.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_smoking.dm
@@ -17,3 +17,19 @@
 /datum/gear/ashtray
 	display_name = "ashtray, plastic"
 	path = /obj/item/weapon/material/ashtray/plastic
+
+/datum/gear/cigar
+	display_name = "cigar"
+	path = /obj/item/clothing/mask/smokable/cigarette/cigar
+
+/datum/gear/cigarettes
+	display_name = "cigarette selection"
+	path = /obj/item/weapon/storage/fancy/cigarettes
+
+/datum/gear/cigarettes/New()
+	..()
+	var/list/cigarettes = list()
+	for(var/cigarette in (typesof(/obj/item/weapon/storage/fancy/cigarettes) - typesof(/obj/item/weapon/storage/fancy/cigarettes/killthroat)))
+		var/obj/item/weapon/storage/fancy/cigarettes/cigarette_brand = cigarette
+		cigarettes[initial(cigarette_brand.name)] = cigarette_brand
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cigarettes))
\ No newline at end of file