Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur

Conflicts:
	code/game/objects/structures/grille.dm
	icons/effects/beam.dmi

code/modules/spells/spell_types/barnyard.dm

@@ -47,4 +47,4 @@
 	target.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1)
 	playsound(get_turf(target), mSounds[randM], 50, 1)
 
-	target.flash_eyes()
+	target.flash_act()

code/modules/spells/spell_types/charge.dm

@@ -14,7 +14,7 @@
 
 /obj/effect/proc_holder/spell/targeted/charge/cast(list/targets,mob/user = usr)
 	for(var/mob/living/L in targets)
-		var/list/hand_items = list(L.get_active_hand(),L.get_inactive_hand())
+		var/list/hand_items = list(L.get_active_held_item(),L.get_inactive_held_item())
 		var/charged_item = null
 		var/burnt_out = 0
 

code/modules/spells/spell_types/infinite_guns.dm

@@ -20,3 +20,4 @@
 		C.drop_item()
 		var/obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted/GUN = new
 		C.put_in_hands(GUN)
+		C.swap_hand(C.get_held_index_of_item(GUN))

code/modules/spells/spell_types/lichdom.dm

@@ -43,7 +43,7 @@
 	for(var/mob/M in targets)
 		var/list/hand_items = list()
 		if(iscarbon(M))
-			hand_items = list(M.get_active_hand(),M.get_inactive_hand())
+			hand_items = list(M.get_active_held_item(),M.get_inactive_held_item())
 
 		if(marked_item && !stat_allowed) //sanity, shouldn't happen without badminry
 			marked_item = null
@@ -92,7 +92,8 @@
 					var/mob/living/carbon/C = old_body
 					for(var/obj/item/W in C)
 						C.unEquip(W)
-					for(var/obj/item/organ/I in C.internal_organs)
+					for(var/X in C.internal_organs)
+						var/obj/item/organ/I = X
 						I.Remove(C)
 						I.forceMove(body_turf)
 				var/wheres_wizdo = dir2text(get_dir(body_turf, item_turf))

code/modules/spells/spell_types/summonitem.dm

@@ -17,8 +17,7 @@
 
 /obj/effect/proc_holder/spell/targeted/summonitem/cast(list/targets,mob/user = usr)
 	for(var/mob/living/L in targets)
-		var/list/hand_items = list(L.get_active_hand(),L.get_inactive_hand())
-		var/butterfingers = 0
+		var/list/hand_items = list(L.get_active_held_item(),L.get_inactive_held_item())
 		var/message
 
 		if(!marked_item) //linking item to the spell
@@ -93,17 +92,7 @@
 
 			if(item_to_retrive.loc)
 				item_to_retrive.loc.visible_message("<span class='warning'>The [item_to_retrive.name] suddenly disappears!</span>")
-
-
-			if(L.hand) //left active hand
-				if(!L.equip_to_slot_if_possible(item_to_retrive, slot_l_hand, 0, 1, 1))
-					if(!L.equip_to_slot_if_possible(item_to_retrive, slot_r_hand, 0, 1, 1))
-						butterfingers = 1
-			else			//right active hand
-				if(!L.equip_to_slot_if_possible(item_to_retrive, slot_r_hand, 0, 1, 1))
-					if(!L.equip_to_slot_if_possible(item_to_retrive, slot_l_hand, 0, 1, 1))
-						butterfingers = 1
-			if(butterfingers)
+			if(!L.put_in_hands(item_to_retrive))
 				item_to_retrive.loc = L.loc
 				item_to_retrive.loc.visible_message("<span class='caution'>The [item_to_retrive.name] suddenly appears!</span>")
 				playsound(get_turf(L),"sound/magic/SummonItems_generic.ogg",50,1)

code/modules/spells/spell_types/touch_attacks.dm

@@ -24,17 +24,8 @@
 		sleep(1)
 
 /obj/effect/proc_holder/spell/targeted/touch/proc/ChargeHand(mob/living/carbon/user)
-	var/hand_handled = 1
 	attached_hand = new hand_path(src)
-	if(user.hand) 	//left active hand
-		if(!user.equip_to_slot_if_possible(attached_hand, slot_l_hand, 0, 1, 1))
-			if(!user.equip_to_slot_if_possible(attached_hand, slot_r_hand, 0, 1, 1))
-				hand_handled = 0
-	else			//right active hand
-		if(!user.equip_to_slot_if_possible(attached_hand, slot_r_hand, 0, 1, 1))
-			if(!user.equip_to_slot_if_possible(attached_hand, slot_l_hand, 0, 1, 1))
-				hand_handled = 0
-	if(!hand_handled)
+	if(!user.put_in_hands(attached_hand))
 		qdel(attached_hand)
 		charge_counter = charge_max
 		attached_hand = null