pickup pickup pickup pickup 100% pickup

code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

@@ -80,6 +80,9 @@ God bless America.
 		I.reagents.trans_to(src, I.reagents.total_volume)
 		qdel(I)
 		return
+	if(istype(I,/obj/item/clothing/head/mob_holder))
+		to_chat(user, "<span class='warning'>This does not fit in the fryer.</span>") // TODO: Deepfrying instakills mobs, spawns a whole deep-fried mob. 
+		return
 	if(!reagents.has_reagent("cooking_oil"))
 		to_chat(user, "<span class='warning'>[src] has no cooking oil to fry with!</span>")
 		return

code/modules/mob/living/carbon/carbon.dm

@@ -162,19 +162,29 @@
 	var/atom/movable/thrown_thing
 	var/obj/item/I = src.get_active_held_item()
 
-	if(!I)
-		if(pulling && isliving(pulling) && grab_state >= GRAB_AGGRESSIVE)
-			var/mob/living/throwable_mob = pulling
-			if(!throwable_mob.buckled)
-				thrown_thing = throwable_mob
-				stop_pulling()
-				if(HAS_TRAIT(src, TRAIT_PACIFISM))
-					to_chat(src, "<span class='notice'>You gently let go of [throwable_mob].</span>")
-				adjustStaminaLossBuffered(25)//CIT CHANGE - throwing an entire person shall be very tiring
-				var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors
-				var/turf/end_T = get_turf(target)
-				if(start_T && end_T)
-					log_combat(src, throwable_mob, "thrown", addition="grab from tile in [AREACOORD(start_T)] towards tile at [AREACOORD(end_T)]")
+	var/mob/living/throwable_mob
+
+	if(istype(I, /obj/item/clothing/head/mob_holder))
+		var/obj/item/clothing/head/mob_holder/holder = I
+		if(holder.held_mob)
+			throwable_mob = holder.held_mob
+			holder.release()
+
+	if(!I || throwable_mob)
+		if(!throwable_mob && pulling && isliving(pulling) && grab_state >= GRAB_AGGRESSIVE)
+			throwable_mob = pulling
+
+		if(!throwable_mob.buckled)
+			thrown_thing = throwable_mob
+			stop_pulling()
+			if(HAS_TRAIT(src, TRAIT_PACIFISM))
+				to_chat(src, "<span class='notice'>You gently let go of [throwable_mob].</span>")
+			var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors
+			var/turf/end_T = get_turf(target)
+			if(start_T && end_T)
+				var/start_T_descriptor = "<font color='#6b5d00'>tile at [start_T.x], [start_T.y], [start_T.z] in area [get_area(start_T)]</font>"
+				var/end_T_descriptor = "<font color='#6b4400'>tile at [end_T.x], [end_T.y], [end_T.z] in area [get_area(end_T)]</font>"
+				log_combat(src, throwable_mob, "thrown", addition="from [start_T_descriptor] with the target [end_T_descriptor]")
 
 	else if(!CHECK_BITFIELD(I.item_flags, ABSTRACT) && !HAS_TRAIT(I, TRAIT_NODROP))
 		thrown_thing = I

code/modules/mob/living/carbon/examine.dm

@@ -16,6 +16,8 @@
 		msg += "[t_He] [t_is] wearing [wear_mask.get_examine_string(user)] on [t_his] face.\n"
 	if (wear_neck)
 		msg += "[t_He] [t_is] wearing [wear_neck.get_examine_string(user)] around [t_his] neck.\n"
+	if(can_be_held)
+		msg += "[t_He] looks small enough to be picked up with <b>Alt+Click</b>!\n"
 
 	for(var/obj/item/I in held_items)
 		if(!(I.item_flags & ABSTRACT))
@@ -111,4 +113,4 @@
 	msg += "*---------*</span>"
 
 	to_chat(user, msg)
-	return msg
+	return msg

code/modules/mob/living/carbon/monkey/combat.dm

@@ -132,6 +132,10 @@
 						pickupTarget = null
 						pickupTimer = 0
 					else if(ismob(pickupTarget.loc)) // in someones hand
+						if(istype(pickupTarget, /obj/item/clothing/head/mob_holder/))
+							var/obj/item/clothing/head/mob_holder/h = pickupTarget
+							if(h && h.held_mob==src)
+								return//dont let them pickpocket themselves
 						var/mob/M = pickupTarget.loc
 						if(!pickpocketing)
 							pickpocketing = TRUE

code/modules/mob/living/carbon/monkey/monkey.dm

@@ -15,6 +15,7 @@
 	bodyparts = list(/obj/item/bodypart/chest/monkey, /obj/item/bodypart/head/monkey, /obj/item/bodypart/l_arm/monkey,
 					 /obj/item/bodypart/r_arm/monkey, /obj/item/bodypart/r_leg/monkey, /obj/item/bodypart/l_leg/monkey)
 	hud_type = /datum/hud/monkey
+	can_be_held = "monkey"
 
 /mob/living/carbon/monkey/Initialize(mapload, cubespawned=FALSE, mob/spawner)
 	verbs += /mob/living/proc/mob_sleep
@@ -45,6 +46,10 @@
 	SSmobs.cubemonkeys -= src
 	return ..()
 
+/mob/living/carbon/monkey/generate_mob_holder()
+	var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, "monkey", 'icons/mob/animals_held.dmi', 'icons/mob/animals_held_lh.dmi', 'icons/mob/animals_held_rh.dmi', TRUE)
+	return holder
+
 /mob/living/carbon/monkey/create_internal_organs()
 	internal_organs += new /obj/item/organ/appendix
 	internal_organs += new /obj/item/organ/lungs

code/modules/mob/living/inhand_holder.dm

@@ -5,80 +5,118 @@
 	desc = "Yell at coderbrush."
 	icon = null
 	icon_state = ""
-	item_flags = DROPDEL
 	var/mob/living/held_mob
-	var/can_head = TRUE
-	var/destroying = FALSE
+	var/can_head = FALSE
+	w_class = WEIGHT_CLASS_BULKY
 
-/obj/item/clothing/head/mob_holder/Initialize(mapload, mob/living/M, _worn_state, head_icon, lh_icon, rh_icon, _can_head = TRUE)
+/obj/item/clothing/head/mob_holder/Initialize(mapload, mob/living/M, _worn_state, alt_worn, lh_icon, rh_icon, _can_head_override = FALSE)
 	. = ..()
-	can_head = _can_head
-	if(head_icon)
-		alternate_worn_icon = head_icon
+
+	if(M)
+		M.setDir(SOUTH)
+		held_mob = M
+		M.forceMove(src)
+		appearance = M.appearance
+		name = M.name
+		desc = M.desc
+
+	if(_can_head_override)
+		can_head = _can_head_override
+	if(alt_worn)
+		alternate_worn_icon = alt_worn
 	if(_worn_state)
 		item_state = _worn_state
+		icon_state = _worn_state
 	if(lh_icon)
 		lefthand_file = lh_icon
 	if(rh_icon)
 		righthand_file = rh_icon
 	if(!can_head)
 		slot_flags = NONE
-	deposit(M)
 
 /obj/item/clothing/head/mob_holder/Destroy()
-	destroying = TRUE
 	if(held_mob)
-		release(FALSE)
+		release()
 	return ..()
 
-/obj/item/clothing/head/mob_holder/proc/deposit(mob/living/L)
-	if(!istype(L))
-		return FALSE
-	L.setDir(SOUTH)
-	update_visuals(L)
-	held_mob = L
-	L.forceMove(src)
-	name = L.name
-	desc = L.desc
-	return TRUE
+/obj/item/clothing/head/mob_holder/dropped()
+	..()
+	if(isturf(loc))//don't release on soft-drops
+		release()
 
-/obj/item/clothing/head/mob_holder/proc/update_visuals(mob/living/L)
-	appearance = L.appearance
-
-/obj/item/clothing/head/mob_holder/proc/release(del_on_release = TRUE)
-	if(!held_mob)
-		if(del_on_release && !destroying)
-			qdel(src)
-		return FALSE
+/obj/item/clothing/head/mob_holder/proc/release()
 	if(isliving(loc))
 		var/mob/living/L = loc
-		to_chat(L, "<span class='warning'>[held_mob] wriggles free!</span>")
 		L.dropItemToGround(src)
-	held_mob.forceMove(get_turf(held_mob))
-	held_mob.reset_perspective()
-	held_mob.setDir(SOUTH)
-	held_mob.visible_message("<span class='warning'>[held_mob] uncurls!</span>")
-	held_mob = null
-	if(del_on_release && !destroying)
-		qdel(src)
-	return TRUE
+	if(held_mob)
+		var/mob/living/m = held_mob
+		m.forceMove(get_turf(m))
+		m.reset_perspective()
+		m.setDir(SOUTH)
+		held_mob = null
+	qdel(src)
 
 /obj/item/clothing/head/mob_holder/relaymove(mob/user)
-	release()
+	to_chat(user, "<span class='warning'>You must resist in order to escape!</span>")
+	return
 
 /obj/item/clothing/head/mob_holder/container_resist()
+	if(isliving(loc))
+		var/mob/living/L = loc
+		visible_message("<span class='warning'>[src] escapes [L]!</span>")
 	release()
 
-/obj/item/clothing/head/mob_holder/drone/deposit(mob/living/L)
-	. = ..()
-	if(!isdrone(L))
-		qdel(src)
-	name = "drone (hiding)"
-	desc = "This drone is scared and has curled up into a ball!"
+/mob/living/proc/mob_pickup(mob/living/L)
+	var/obj/item/clothing/head/mob_holder/holder = generate_mob_holder()
+	if(!holder)
+		return
+	drop_all_held_items()
+	L.put_in_hands(holder)
+	return
 
-/obj/item/clothing/head/mob_holder/drone/update_visuals(mob/living/L)
-	var/mob/living/simple_animal/drone/D = L
-	if(!D)
-		return ..()
-	icon = 'icons/mob/drone.dmi'
-	icon_state = "[D.visualAppearence]_hat"
+/mob/living/proc/mob_try_pickup(mob/living/user)
+	if(!ishuman(user) || !src.Adjacent(user) || user.incapacitated() || !can_be_held)
+		return FALSE
+	if(user.get_active_held_item())
+		to_chat(user, "<span class='warning'>Your hands are full!</span>")
+		return FALSE
+	if(buckled)
+		to_chat(user, "<span class='warning'>[src] is buckled to something!</span>")
+		return FALSE
+	if(src == user)
+		to_chat(user, "<span class='warning'>You can't pick yourself up.</span>")
+		return FALSE
+	visible_message("<span class='warning'>[user] starts picking up [src].</span>", \
+					"<span class='userdanger'>[user] starts picking you up!</span>")
+	if(!do_after(user, 20, target = src))
+		return FALSE
+
+	if(user.get_active_held_item()||buckled)
+		return FALSE
+
+	visible_message("<span class='warning'>[user] picks up [src]!</span>", \
+					"<span class='userdanger'>[user] picks you up!</span>")
+	to_chat(user, "<span class='notice'>You pick [src] up.</span>")
+	mob_pickup(user)
+	return TRUE
+
+/mob/living/AltClick(mob/user)
+	mob_try_pickup(user)
+	..()
+
+
+// I didn't define these for mobs, because you shouldn't be able to breathe out of mobs and using their loc isn't always the logical thing to do.
+/obj/item/clothing/head/mob_holder/return_air()
+	var/atom/location = loc
+	if(location)
+		return location.loc.return_air(args)
+
+/obj/item/clothing/head/mob_holder/assume_air(datum/gas_mixture/env)
+	var/atom/location = loc
+	if(location)
+		return location.loc.assume_air(env)
+
+/obj/item/clothing/head/mob_holder/remove_air(amount)
+	var/atom/location = loc
+	if(location)
+		return location.loc.remove_air(amount)

code/modules/mob/living/living.dm

@@ -40,6 +40,11 @@
 	QDEL_LIST(diseases)
 	return ..()
 
+/mob/living/proc/generate_mob_holder()
+	..()
+	var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, (istext(can_be_held) ? can_be_held : ""), 'icons/mob/animals_held.dmi', 'icons/mob/animals_held_lh.dmi', 'icons/mob/animals_held_rh.dmi')
+	return holder
+
 /mob/living/proc/OpenCraftingMenu()
 	return
 

code/modules/mob/living/simple_animal/friendly/cat.dm

@@ -31,7 +31,7 @@
 	var/mob/living/simple_animal/mouse/movement_target
 	gold_core_spawnable = FRIENDLY_SPAWN
 	collar_type = "cat"
-
+	can_be_held = "cat2"
 	do_footstep = TRUE
 
 /mob/living/simple_animal/pet/cat/Initialize()
@@ -80,6 +80,7 @@
 	pass_flags = PASSMOB
 	mob_size = MOB_SIZE_SMALL
 	collar_type = "kitten"
+	can_be_held = "cat"
 
 //RUNTIME IS ALIVE! SQUEEEEEEEE~
 /mob/living/simple_animal/pet/cat/Runtime
@@ -262,6 +263,7 @@
 	attacked_sound = 'sound/items/eatfood.ogg'
 	deathmessage = "loses its false life and collapses!"
 	death_sound = "bodyfall"
+	can_be_held = "cak"
 
 /mob/living/simple_animal/pet/cat/cak/CheckParts(list/parts)
 	..()

code/modules/mob/living/simple_animal/friendly/dog.dm

@@ -15,7 +15,7 @@
 	turns_per_move = 10
 
 	do_footstep = TRUE
-
+	can_be_held = TRUE
 //Corgis and pugs are now under one dog subtype
 
 /mob/living/simple_animal/pet/dog/corgi
@@ -35,6 +35,7 @@
 	var/obj/item/inventory_back
 	var/shaved = FALSE
 	var/nofur = FALSE 		//Corgis that have risen past the material plane of existence.
+	can_be_held = "corgi"
 
 /mob/living/simple_animal/pet/dog/corgi/Destroy()
 	QDEL_NULL(inventory_head)
@@ -63,6 +64,7 @@
 	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/pug = 3)
 	gold_core_spawnable = FRIENDLY_SPAWN
 	collar_type = "pug"
+	can_be_held = "pug"
 
 /mob/living/simple_animal/pet/dog/corgi/exoticcorgi
 	name = "Exotic Corgi"
@@ -360,6 +362,7 @@
 		icon_dead = "old_corgi_dead"
 		desc = "At a ripe old age of [record_age] Ian's not as spry as he used to be, but he'll always be the HoP's beloved corgi." //RIP
 		turns_per_move = 20
+		can_be_held = "old_corgi"
 
 /mob/living/simple_animal/pet/dog/corgi/Ian/Life()
 	if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)
@@ -582,6 +585,7 @@
 	unsuitable_atmos_damage = 0
 	minbodytemp = TCMB
 	maxbodytemp = T0C + 40
+	can_be_held = "void_puppy"
 
 /mob/living/simple_animal/pet/dog/corgi/puppy/void/Process_Spacemove(movement_dir = 0)
 	return 1	//Void puppies can navigate space.
@@ -603,6 +607,7 @@
 	response_harm   = "kicks"
 	var/turns_since_scan = 0
 	var/puppies = 0
+	can_be_held = "lisa"
 
 //Lisa already has a cute bow!
 /mob/living/simple_animal/pet/dog/corgi/Lisa/Topic(href, href_list)

code/modules/mob/living/simple_animal/friendly/drone/_drone.dm

@@ -274,3 +274,7 @@
 
 /mob/living/simple_animal/drone/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, tesla_shock = 0, illusion = 0, stun = TRUE)
 	return 0 //So they don't die trying to fix wiring
+
+/mob/living/simple_animal/drone/generate_mob_holder()
+	var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, "[visualAppearence]_hat", null, null, null, TRUE)
+	return holder

code/modules/mob/living/simple_animal/friendly/drone/interaction.dm

@@ -29,28 +29,11 @@
 				if("Nothing")
 					return
 
-//ATTACK HAND IGNORING PARENT RETURN VALUE
+//picky up the drone c:
 /mob/living/simple_animal/drone/attack_hand(mob/user)
-	if(ishuman(user))
-		if(stat == DEAD || status_flags & GODMODE || !can_be_held)
-			..()
-			return
-		if(user.get_active_held_item())
-			to_chat(user, "<span class='warning'>Your hands are full!</span>")
-			return
-		visible_message("<span class='warning'>[user] starts picking up [src].</span>", \
-						"<span class='userdanger'>[user] starts picking you up!</span>")
-		if(!do_after(user, 20, target = src))
-			return
-		visible_message("<span class='warning'>[user] picks up [src]!</span>", \
-						"<span class='userdanger'>[user] picks you up!</span>")
-		if(buckled)
-			to_chat(user, "<span class='warning'>[src] is buckled to [buckled] and cannot be picked up!</span>")
-			return
-		to_chat(user, "<span class='notice'>You pick [src] up.</span>")
-		drop_all_held_items()
-		var/obj/item/clothing/head/mob_holder/drone/DH = new(get_turf(src), src)
-		user.put_in_hands(DH)
+	..()
+	if(user.a_intent=="help")
+		mob_try_pickup(user)
 
 /mob/living/simple_animal/drone/proc/try_reactivate(mob/living/user)
 	var/mob/dead/observer/G = get_ghost()

code/modules/mob/living/simple_animal/friendly/fox.dm

@@ -18,7 +18,7 @@
 	response_disarm = "gently pushes aside"
 	response_harm = "kicks"
 	gold_core_spawnable = FRIENDLY_SPAWN
-
+	can_be_held = "fox"
 	do_footstep = TRUE
 
 //Captain fox

code/modules/mob/living/simple_animal/friendly/lizard.dm

@@ -23,6 +23,7 @@
 	obj_damage = 0
 	environment_smash = ENVIRONMENT_SMASH_NONE
 	var/static/list/edibles = typecacheof(list(/mob/living/simple_animal/butterfly, /mob/living/simple_animal/cockroach)) //list of atoms, however turfs won't affect AI, but will affect consumption.
+	can_be_held = "lizard" //you can hold lizards now.
 
 /mob/living/simple_animal/hostile/lizard/CanAttack(atom/the_target)//Can we actually attack a possible target?
 	if(see_invisible < the_target.invisibility)//Target's invisible to us, forget it
@@ -39,3 +40,7 @@
 		return TRUE
 	else
 		return ..()
+
+/mob/living/simple_animal/hostile/lizard/generate_mob_holder()
+	var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, "lizard", 'icons/mob/animals_held.dmi', 'icons/mob/animals_held_lh.dmi', 'icons/mob/animals_held_rh.dmi', TRUE)
+	return holder

code/modules/mob/living/simple_animal/friendly/mouse.dm

@@ -25,6 +25,7 @@
 	var/body_color //brown, gray and white, leave blank for random
 	gold_core_spawnable = FRIENDLY_SPAWN
 	var/chew_probability = 1
+	can_be_held = TRUE
 
 /mob/living/simple_animal/mouse/Initialize()
 	. = ..()
@@ -34,7 +35,7 @@
 	icon_state = "mouse_[body_color]"
 	icon_living = "mouse_[body_color]"
 	icon_dead = "mouse_[body_color]_dead"
-
+	can_be_held = "mouse_[body_color]"
 
 /mob/living/simple_animal/mouse/proc/splat()
 	src.health = 0
@@ -87,14 +88,17 @@
 /mob/living/simple_animal/mouse/white
 	body_color = "white"
 	icon_state = "mouse_white"
+	can_be_held = "mouse_white"
 
 /mob/living/simple_animal/mouse/gray
 	body_color = "gray"
 	icon_state = "mouse_gray"
+	can_be_held = "mouse_gray"
 
 /mob/living/simple_animal/mouse/brown
 	body_color = "brown"
 	icon_state = "mouse_brown"
+	can_be_held = "mouse_brown"
 
 //TOM IS ALIVE! SQUEEEEEEEE~K :)
 /mob/living/simple_animal/mouse/brown/Tom
@@ -118,3 +122,8 @@
 
 /obj/item/reagent_containers/food/snacks/deadmouse/on_grind()
 	reagents.clear_reagents()
+
+/mob/living/simple_animal/mouse/generate_mob_holder()
+	var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, (istext(can_be_held) ? can_be_held : ""), 'icons/mob/animals_held.dmi', 'icons/mob/animals_held_lh.dmi', 'icons/mob/animals_held_rh.dmi')
+	holder.w_class = WEIGHT_CLASS_TINY
+	return holder

code/modules/mob/living/simple_animal/friendly/sloth.dm

@@ -22,7 +22,7 @@
 	maxHealth = 50
 	speed = 10
 	glide_size = 2
-
+	can_be_held = "sloth" //finally oranges can be held
 	do_footstep = TRUE
 
 

code/modules/recycling/disposal/bin.dm

@@ -102,9 +102,17 @@
 		return ..()
 
 /obj/machinery/disposal/proc/place_item_in_disposal(obj/item/I, mob/user)
-	I.forceMove(src)
-	user.visible_message("[user.name] places \the [I] into \the [src].", "<span class='notice'>You place \the [I] into \the [src].</span>")
-
+	if(istype(I, /obj/item/clothing/head/mob_holder))
+		var/obj/item/clothing/head/mob_holder/H = I
+		var/mob/living/m = H.held_mob
+		H.release()
+		if(m)
+			user.start_pulling(m, 1)
+			stuff_mob_in(m,user)
+		return//you don't want this going into disposals ever
+	if(user.temporarilyRemoveItemFromInventory(I)) //double-checks never hurt
+		I.forceMove(src)
+		user.visible_message("[user.name] places \the [I] into \the [src].", "<span class='notice'>You place \the [I] into \the [src].</span>")
 //mouse drop another mob or self
 /obj/machinery/disposal/MouseDrop_T(mob/living/target, mob/living/user)
 	if(istype(target))