Adds the ability to jam cigarettes into the filter slot of a gas mask

code/game/objects/items/cigs_lighters.dm

@@ -321,9 +321,38 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		return
 	var/to_smoke = smoke_all ? (reagents.total_volume * (dragtime / smoketime)) : REAGENTS_METABOLISM
 	var/mob/living/carbon/smoker = loc
-	if(!istype(smoker) || src != smoker.wear_mask)
-		reagents.remove_any(to_smoke)
-		return
+	// These checks are a bit messy but at least they're fairly readable
+	// Check if the smoker is a mob
+	if(!istype(smoker))
+		// If not, check if it's a gas mask
+		if(!istype(smoker, /obj/item/clothing/mask/gas))
+			reagents.remove_any(to_smoke)
+			return
+		// If it is, check if that mask is on a mob
+		if(!istype(smoker.loc, /mob/living/carbon))
+			reagents.remove_any(to_smoke)
+			return
+		// If it is, check if that mob is actually wearing the mask
+		var/mob/living/carbon/mask_holder = smoker.loc
+		if(!mask_holder.wear_mask == smoker)
+			reagents.remove_any(to_smoke)
+			return
+
+		// Update smoker to the wearer of the mask
+		smoker = smoker.loc
+
+	// Check if the smoker is actually wearing the cig
+	if(src != smoker.wear_mask)
+		// If they're not, check if the mask is a gas mask
+		if(istype(smoker.wear_mask, /obj/item/clothing/mask/gas))
+			// If it is, check if the cig is being held by that gas mask
+			var/obj/item/clothing/mask/gas/mask = smoker.wear_mask
+			if(src != mask.cig)
+				reagents.remove_any(to_smoke)
+				return
+		else
+			reagents.remove_any(to_smoke)
+			return
 
 	reagents.expose(smoker, INGEST, min(to_smoke / reagents.total_volume, 1))
 	var/obj/item/organ/internal/lungs/lungs = smoker.get_organ_slot(ORGAN_SLOT_LUNGS)

code/modules/clothing/masks/gasmask.dm

@@ -26,10 +26,19 @@ GLOBAL_LIST_INIT(clown_mask_options, list(
 	var/starting_filter_type = /obj/item/gas_filter
 	///Does the mask have an FOV?
 	var/has_fov = TRUE
+	///Cigarette in the mask
+	var/obj/item/clothing/mask/cigarette/cig
 
 /datum/armor/mask_gas
 	bio = 100
 
+/obj/item/clothing/mask/gas/worn_overlays(mutable_appearance/standing, isinhands)
+	. = ..()
+	if(!isinhands && cig)
+		. += cig.build_worn_icon(default_layer = FACEMASK_LAYER, default_icon_file = 'icons/mob/clothing/mask.dmi')
+	else
+		cut_overlays()
+
 /obj/item/clothing/mask/gas/Initialize(mapload)
 	. = ..()
 	init_fov()
@@ -45,15 +54,73 @@ GLOBAL_LIST_INIT(clown_mask_options, list(
 	QDEL_LAZYLIST(gas_filters)
 	return..()
 
+/obj/item/clothing/mask/gas/equipped(mob/equipee, slot)
+	if(cig)
+		cig.equipped(equipee, slot)
+	return ..()
+
+/obj/item/clothing/mask/gas/adjustmask(mob/living/carbon/user)
+	if(cig)
+		user.visible_message(
+				span_warning("You need to remove [cig] before you can adjust the mask")
+		)
+		return
+	return ..()
+
+
 /obj/item/clothing/mask/gas/examine(mob/user)
 	. = ..()
-	if(max_filters > 0)
+	if(cig)
+		. += "<span class='notice'>There is a [cig.name] jammed into the filter slot</span>"
+	if(max_filters > 0 && !cig)
 		. += "<span class='notice'>[src] has [max_filters] slot\s for filters.</span>"
 	if(LAZYLEN(gas_filters) > 0)
 		. += "<span class='notice'>Currently there [LAZYLEN(gas_filters) == 1 ? "is" : "are"] [LAZYLEN(gas_filters)] filter\s with [get_filter_durability()]% durability.</span>"
 		. += "<span class='notice'>The filters can be removed by right-clicking with an empty hand on [src].</span>"
 
+/obj/item/clothing/mask/gas/proc/on_cig_destroyed()
+	SIGNAL_HANDLER
+	if(cig)
+		cig = null
+		if(istype(src.loc, /mob))
+			var/mob/wearer = src.loc
+			wearer.update_worn_mask()
+
 /obj/item/clothing/mask/gas/attackby(obj/item/tool, mob/user)
+	if(istype(tool, /obj/item/clothing/mask/cigarette))
+		var/valid_wearer = istype(src.loc, /mob)
+
+		if(flags_cover & MASKCOVERSMOUTH)
+			user.visible_message(
+				span_warning("You can't do that while the mask's mouth is covered")
+			)
+			return ..()
+
+		if(max_filters <= 0 || cig)
+			user.visible_message(
+				span_warning("There's nowhere for that to fit")
+			)
+			return ..()
+		if(has_filter)
+			user.visible_message(
+				span_warning("You can't fit that in while there are filters in the mask")
+			)
+			return ..()
+
+		cig = tool
+		if(valid_wearer)
+			cig.equipped(src.loc, ITEM_SLOT_MASK)
+		RegisterSignal(cig, COMSIG_QDELETING, PROC_REF(on_cig_destroyed))
+		cig.forceMove(src)
+		var/mob/wearer = src.loc
+		wearer.update_worn_mask()
+		return TRUE
+
+	if(cig)
+		var/c = cig.attackby(tool, user)
+		var/mob/wearer = src.loc
+		wearer.update_worn_mask()
+		return c
 	if(!istype(tool, /obj/item/gas_filter))
 		return ..()
 	if(LAZYLEN(gas_filters) >= max_filters)
@@ -64,7 +131,20 @@ GLOBAL_LIST_INIT(clown_mask_options, list(
 	has_filter = TRUE
 	return TRUE
 
+/obj/item/clothing/mask/gas/equipped(mob/M, slot)
+	. = ..()
+	if(cig)
+		cig.equipped(M, slot)
+
 /obj/item/clothing/mask/gas/attack_hand_secondary(mob/user, list/modifiers)
+	if(cig)
+		user.put_in_hands(cig)
+		UnregisterSignal(cig, COMSIG_QDELETING)
+		cig = null
+		if(istype(src.loc, /mob))
+			var/mob/wearer = src.loc
+			wearer.update_worn_mask()
+		return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
 	if(!has_filter || !max_filters)
 		return SECONDARY_ATTACK_CONTINUE_CHAIN
 	for(var/i in 1 to max_filters)