Merge branch 'master' into ship_and_stuff

# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm

code/game/objects/items/devices/uplink_random_lists.dm

@@ -74,6 +74,7 @@ var/datum/uplink_random_selection/default_uplink_selection = new/datum/uplink_ra
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/implants/imp_explosive)
 
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/medical/sinpockets, reselect_propbability = 20)
+	items += new/datum/uplink_random_item(/datum/uplink_item/item/medical/lunchbox, reselect_propbability = 20)
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/medical/surgery, reselect_propbability = 10)
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/medical/combat, reselect_propbability = 10)
 

code/game/objects/items/holomenu.dm

@@ -64,6 +64,13 @@
 		else
 			to_chat(user, SPAN_WARNING("Access denied."))
 		return
+	if(istype(I, /obj/item/paper) && allowed(user))
+		var/obj/item/paper/P = I
+		to_chat(user, SPAN_NOTICE("You scan \the [I.name] into \the [name]."))
+		menu_text = P.info
+		menu_text = replacetext(menu_text, "color=black>", "color=white>")
+		update_icon()
+		return
 	return ..()
 
 /obj/item/holomenu/examine(mob/user, distance)

code/game/objects/items/toys.dm

@@ -294,10 +294,37 @@
 	icon = 'icons/obj/singularity.dmi'
 	icon_state = "singularity_s1"
 
+/*
+ * Comic books
+ */
+/obj/item/toy/comic
+	name = "comic book"
+	desc = "A magazine presenting a fictional story through a sequence of images. Perfect for those long, boring shifts."
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "comic"
+	item_state = "comic"
+
+/obj/item/toy/comic/inspector
+	name = "inspector 404 manga"
+	desc = "Inspector 404 follows the adventures of the titular I404, a shell inspector from Konyang. This issue, #67, follows the \
+	404, also known as Kyung-Sun's quest to bring down the corrupt Superintendent Hayashi."
+	icon_state = "comicinspector"
+	item_state = "comicinspector"
+
+/obj/item/toy/comic/stormman
+	name = "stormman manga"
+	desc = "Stormman, often stylized as STORMMAN! is one of Konyang's most beloved anime series, following a masked superhero named Stormman \
+	who has the power to harness the weather to defend his homeworld while keeping his secret identity. Since its release, all kinds of merchandise \
+	have been made, including a conversion of the show to a paperback manga."
+	icon_state = "comicstormman"
+	item_state = "comicstormman"
+
+
 /*
  * Toy crossbow
  */
 
+
 /obj/item/toy/crossbow
 	name = "foam dart crossbow"
 	desc = "A weapon favored by many overactive children. Ages 8 and up."

code/game/objects/items/weapons/cards_ids.dm

@@ -95,7 +95,7 @@ var/const/NO_EMAG_ACT = -50
 
 	var/list/access = list()
 	var/registered_name = "Unknown" // The name registered_name on the card
-	var/mob/living/carbon/human/mob
+	var/datum/weakref/mob_id
 	slot_flags = SLOT_ID
 
 	var/age = "\[UNSET\]"
@@ -125,7 +125,6 @@ var/const/NO_EMAG_ACT = -50
 	var/iff_faction = IFF_DEFAULT
 
 /obj/item/card/id/Destroy()
-	mob = null
 	return ..()
 
 /obj/item/card/id/examine(mob/user)
@@ -173,7 +172,7 @@ var/const/NO_EMAG_ACT = -50
 	id_card.age 				= age
 	id_card.citizenship			= citizenship
 	id_card.religion 			= SSrecords.get_religion_record_name(religion)
-	id_card.mob					= src
+	id_card.mob_id				= WEAKREF(src)
 	id_card.employer_faction    = employer_faction
 
 /obj/item/card/id/proc/dat()
@@ -203,7 +202,7 @@ var/const/NO_EMAG_ACT = -50
 				to_chat(user, "<span class='warning'>You cannot imprint [src] while wearing \the [H.gloves].</span>")
 				return
 			else
-				mob = H
+				mob_id = WEAKREF(H)
 				blood_type = H.dna.b_type
 				dna_hash = H.dna.unique_enzymes
 				fingerprint_hash = md5(H.dna.uni_identity)
@@ -266,7 +265,7 @@ var/const/NO_EMAG_ACT = -50
 					to_chat(user, "<span class='warning'>They don't have any hands.</span>")
 					return 1
 				user.visible_message("[user] imprints [src] with \the [H]'s biometrics.")
-				mob = H
+				mob_id = WEAKREF(H)
 				blood_type = H.dna.b_type
 				dna_hash = H.dna.unique_enzymes
 				fingerprint_hash = md5(H.dna.uni_identity)

code/game/objects/items/weapons/ecigs.dm

@@ -3,6 +3,10 @@
 	desc = "A battery powered cigarette."
 	icon = 'icons/obj/ecig.dmi'
 	contained_sprite = TRUE
+	item_icons = null // Needs to nuke this because Contained Sprites and all
+	sprite_sheets = null // This as well
+	icon_auto_adapt = TRUE
+	icon_supported_species_tags = list("una", "taj")
 	var/active = FALSE
 	var/obj/item/cell/cig_cell
 	var/cell_type = /obj/item/cell/crap/cig

code/game/objects/items/weapons/storage/wallets.dm

@@ -90,6 +90,20 @@
 	else
 		return ..()
 
+
+/obj/item/storage/wallet/AltClick(mob/user)
+	if (user != loc || user.incapacitated() || !ishuman(user))
+		return ..()
+
+	var/obj/item/card/id/id = GetID()
+	if (istype(id))
+		remove_from_storage(id)
+		user.put_in_hands(id)
+		return
+
+	return ..()
+
+
 /obj/item/storage/wallet/random/fill()
 	..()
 	var/item1_type = pick(                \