shelve that for later

code/datums/supply_packs/black_market.dm

@@ -608,7 +608,7 @@ Primarily made up of things that would be best utilized, well, shipside. Recreat
 		/obj/item/storage/box/packet/hefa/toy,
 		/obj/item/toy/inflatable_duck,
 		/obj/item/toy/beach_ball,
-		/obj/item/toy/farwadoll,
+		/obj/item/toy/plush/farwa,
 		/obj/item/toy/waterflower,
 		/obj/item/toy/spinningtoy,
 		/obj/item/storage/box/snappops,

code/game/objects/items/props/helmetgarb.dm

@@ -37,6 +37,11 @@
 	desc = "The more you fire these, the more you're reminded that a fragmentation grenade is probably more effective at fulfilling the same purpose. Say, aren't these supposed to eject from your gun?"
 	icon_state = "spent_flech"
 
+/obj/item/prop/helmetgarb/cartridge
+	name = "cartridge"
+	desc = "This is the bullet from a Type 71 Pulse Rifle. It is deformed from impact against an armored surface. It's been reduced to a lucky keepsake now."
+	icon_state = "cartridge"
+
 /obj/item/prop/helmetgarb/prescription_bottle
 	name = "prescription medication"
 	desc = "Anti-anxiety meds? Amphetamines? The cure for Sudden Sleep Disorder? The label can't be read, leaving the now absent contents forever a mystery. The cap is screwed on tighter than any ID lock."
@@ -515,3 +520,60 @@
 	desc = "This patch is all that remains of the Chaplaincy of the USS Almayer, along with the Chaplains themselves. Both no longer exist as a result of losses suffered during Operation Tychon Tackle."
 	icon_state = "chaplain_patch"
 	flags_obj = OBJ_NO_HELMET_BAND
+
+/obj/item/prop/helmetgarb/family_photo
+	name = "family photo"
+	desc = ""
+	icon = 'icons/obj/items/items.dmi'
+	icon_state = "photo"
+	///The human who spawns with the photo
+	var/mob/living/carbon/human/owner
+	///Text written on the back
+	var/scribble
+
+/obj/item/prop/helmetgarb/family_photo/post_loadout_spawn(mob/living/carbon/human/user)
+	. = ..()
+	owner = user
+
+/obj/item/prop/helmetgarb/family_photo/get_examine_text(mob/user)
+	. = ..()
+	if(scribble)
+		. += "\"[scribble]\" is written on the back of the photo."
+	if(user == owner)
+		. += "A photo of you and your family."
+		return
+	if(user.faction == owner?.faction)
+		. += "A photo of [owner] and their family."
+		return
+	. += "A photo of a family you do not know."
+
+/obj/item/prop/helmetgarb/family_photo/attackby(obj/item/attacking_item, mob/user)
+	if(HAS_TRAIT(attacking_item, TRAIT_TOOL_PEN) || istype(attacking_item, /obj/item/toy/crayon))
+		if(scribble)
+			to_chat(user, SPAN_NOTICE("[src] has already been written on."))
+			return
+		var/new_text = copytext(strip_html(tgui_input_text(user, "What would you like to write on the back of [src]?", "Photo Writing")), 1, 128)
+
+		if(!loc == user)
+			to_chat(user, SPAN_NOTICE("You need to be holding [src] to write on it."))
+			return
+		if(!user.stat == CONSCIOUS)
+			to_chat(user, SPAN_NOTICE("You cannot write on [src] in this state."))
+			return
+		scribble = new_text
+		playsound(src, "paper_writing", 15, TRUE)
+	..()
+
+/obj/item/prop/helmetgarb/compass
+	name = "compass"
+	desc = "It always faces north. Are you sure it is not broken?"
+	icon = 'icons/obj/items/items.dmi'
+	icon_state = "compass"
+	w_class = SIZE_SMALL
+
+/obj/item/prop/helmetgarb/bug_spray
+	name = "insect repellent"
+	desc = "A store-brand insect repellent, to keep any variety of pest or mosquito away from you."
+	icon = 'icons/obj/items/spray.dmi'
+	icon_state = "pestspray"
+	w_class = SIZE_SMALL

code/game/objects/items/tools/flame_tools.dm

@@ -642,7 +642,42 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	icon_off = "cobpipeoff"
 	smoketime = 800 SECONDS
 
+/obj/item/clothing/mask/electronic_cigarette
+	name = "electronic cigarette"
+	desc = "An electronic cigarette from the company that made Lucky Strikes, that contains no nicotine after complaints about the consequences."
+	icon_state = "cigoff"
+	item_state = "cigoff"
+	w_class = SIZE_SMALL
+	flags_equip_slot = SLOT_EAR|SLOT_FACE
+	var/icon_on = "cigon"
+	var/icon_off = "cigoff"
+	var/enabled = FALSE
+
+/obj/item/clothing/mask/electronic_cigarette/Initialize(mapload, ...)
+	. = ..()
+	if(enabled)
+		icon_state = icon_on
+		item_state = icon_on
 
+/obj/item/clothing/mask/electronic_cigarette/attack_self(mob/user)
+	. = ..()
+	to_chat(user, SPAN_NOTICE("You [enabled ? "disable" : "enable"] [src]."))
+	if(enabled)
+		icon_state = icon_off
+		item_state = icon_off
+		enabled = FALSE
+		return
+	icon_state = icon_on
+	item_state = icon_on
+	enabled = TRUE
+
+/obj/item/clothing/mask/electronic_cigarette/cigar
+	name = "electronic cigar"
+	desc = "An electronic cigarette designed to look like a cigar, for those who care about health and style."
+	icon_state = "cigar_off"
+	item_state = "cigar_off"
+	icon_on = "cigar_on"
+	icon_off = "cigar_off"
 
 /////////
 //ZIPPO//

code/game/objects/items/tools/misc_tools.dm

@@ -286,15 +286,9 @@
 	var/current_colour_index = 1
 	var/owner = "hard to read text"
 
-/obj/item/tool/pen/fountain/Initialize(mapload, mob/living/carbon/human/user)
+/obj/item/tool/pen/fountain/post_loadout_spawn(mob/living/carbon/human/user)
 	. = ..()
-	var/turf/current_turf = get_turf(src)
-	var/mob/living/carbon/human/new_owner = locate() in current_turf
-	if(new_owner)
-		owner = new_owner.real_name
-	var/obj/structure/machinery/cryopod/new_owners_pod = locate() in current_turf
-	if(new_owners_pod)
-		owner = new_owners_pod.occupant?.real_name
+	owner = user
 
 /obj/item/tool/pen/fountain/get_examine_text(mob/user)
 	. = ..()