[READY]Adds picking up corgis and pAIs!

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

@@ -32,6 +32,7 @@
 	var/obj/item/inventory_back
 	var/nofur = 0 		//Corgis that have risen past the material plane of existence.
 	gold_core_spawnable = FRIENDLY_SPAWN
+	can_be_held = TRUE
 
 /mob/living/simple_animal/pet/dog/pug
 	name = "\improper pug"
@@ -121,7 +122,12 @@
 	..()
 	update_corgi_fluff()
 
-
+/mob/living/simple_animal/pet/dog/corgi/mob_pickup(mob/living/L)
+	var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, "corgi", null, 'icons/mob/pets_held_lh.dmi', 'icons/mob/pets_held_rh.dmi', FALSE)
+	if(!L.put_in_hands(holder))
+		qdel(holder)
+	else
+		L.visible_message("<span class='warning'>[L] scoops up [src]!</span>")
 
 /mob/living/simple_animal/pet/dog/corgi/Topic(href, href_list)
 	if(usr.stat)

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

@@ -49,6 +49,7 @@
 	dextrous = TRUE
 	dextrous_hud_type = /datum/hud/dextrous/drone
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
+	can_be_held = TRUE
 	var/staticChoice = "static"
 	var/list/staticChoices = list("static", "blank", "letter", "animal")
 	var/picked = FALSE //Have we picked our visual appearence (+ colour if applicable)
@@ -67,7 +68,6 @@
 	var/seeStatic = 1 //Whether we see static instead of mobs
 	var/visualAppearence = MAINTDRONE //What we appear as
 	var/hacked = FALSE //If we have laws to destroy the station
-	var/can_be_held = TRUE //if assholes can pick us up
 	var/flavortext = \
 	"\n<big><span class='warning'>DO NOT INTERFERE WITH THE ROUND AS A DRONE OR YOU WILL BE DRONE BANNED</span></big>\n"+\
 	"<span class='notify'>Drones are a ghost role that are allowed to fix the station and build things. Interfering with the round as a drone is against the rules.</span>\n"+\

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

@@ -4,8 +4,6 @@
 //DRONES AS ITEMS//
 ///////////////////
 //Drone shells
-//Drones as hats
-
 
 //DRONE SHELL
 /obj/item/drone_shell
@@ -62,45 +60,3 @@
 	D.admin_spawned = admin_spawned
 	D.key = user.key
 	qdel(src)
-
-
-//DRONE HOLDER
-/obj/item/clothing/head/drone_holder//Only exists in someones hand.or on their head
-	name = "drone (hiding)"
-	desc = "This drone is scared and has curled up into a ball."
-	icon = 'icons/mob/drone.dmi'
-	icon_state = "drone_maint_hat"
-	var/mob/living/simple_animal/drone/drone //stored drone
-
-/obj/item/clothing/head/drone_holder/proc/uncurl()
-	if(!drone)
-		return
-
-	if(isliving(loc))
-		var/mob/living/L = loc
-		to_chat(L, "<span class='warning'>[drone] is trying to escape!</span>")
-		if(!do_after(drone, 50, target = L))
-			return
-		L.dropItemToGround(src)
-
-	contents -= drone
-	drone.forceMove(drop_location())
-	drone.reset_perspective()
-	drone.setDir(SOUTH )//Looks better
-	drone.visible_message("<span class='warning'>[drone] uncurls!</span>")
-	drone = null
-	qdel(src)
-
-
-/obj/item/clothing/head/drone_holder/relaymove()
-	uncurl()
-
-/obj/item/clothing/head/drone_holder/container_resist(mob/living/user)
-	uncurl()
-
-
-/obj/item/clothing/head/drone_holder/proc/updateVisualAppearence(mob/living/simple_animal/drone/D)
-	if(!D)
-		return
-	icon_state = "[D.visualAppearence]_hat"
-	. = icon_state

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

@@ -29,7 +29,6 @@
 				if("Nothing")
 					return
 
-
 /mob/living/simple_animal/drone/attack_hand(mob/user)
 	if(ishuman(user))
 		if(stat == DEAD || status_flags & GODMODE || !can_be_held)
@@ -49,11 +48,8 @@
 			return
 		to_chat(user, "<span class='notice'>You pick [src] up.</span>")
 		drop_all_held_items()
-		var/obj/item/clothing/head/drone_holder/DH = new /obj/item/clothing/head/drone_holder(src)
-		DH.updateVisualAppearence(src)
-		DH.drone = src
+		var/obj/item/clothing/head/mob_holder/drone/DH = new(get_turf(src), src)
 		user.put_in_hands(DH)
-		forceMove(DH)
 
 /mob/living/simple_animal/drone/proc/try_reactivate(mob/living/user)
 	var/mob/dead/observer/G = get_ghost()