Merge pull request #1552 from tigercat2000/ithinkibrokegrabs

Number of grab fixes, other minor fixes related.

code/modules/mob/living/carbon/alien/humanoid/inventory.dm

@@ -1,6 +1,6 @@
 //unequip
-/mob/living/carbon/alien/humanoid/unEquip(obj/item/I as obj)
-	. = ..()
+/mob/living/carbon/alien/humanoid/unEquip(var/obj/item/I, var/force)
+	. = ..(I, force)
 	if(!. || !I)
 		return
 

code/modules/mob/living/carbon/alien/humanoid/update_icons.dm

@@ -45,8 +45,8 @@
 		icon_state = "alien[caste]_leap"
 		pixel_x = -32
 		pixel_y = -32
-	else
-		icon = initial(icon)
+	else if(icon == 'icons/mob/alienleap.dmi' && icon_state == "alien[caste]_leap" && pixel_x == -32 && pixel_y == -32)
+		icon = initial(icon)// ^ this looks odd, but in theory it will prevent the icon and pixel_xy from being reset unless it needs to be
 		pixel_x = initial(pixel_x)
 		pixel_y = initial(pixel_y)
 

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

@@ -7,20 +7,7 @@
 		if ("help")
 			visible_message(text("\blue [M] caresses [src] with its scythe like arm."))
 		if ("grab")
-			if(M == src || anchored)
-				return
-			if (w_uniform)
-				w_uniform.add_fingerprint(M)
-			var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src)
-
-			M.put_in_active_hand(G)
-
-			grabbed_by += G
-			G.synch()
-			LAssailant = M
-
-			playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-			visible_message(text("\red [] has grabbed [] passively!", M, src))
+			grabbedby(M)
 
 		if("harm")
 			M.do_attack_animation(src)

code/modules/mob/mob_grab.dm

@@ -27,8 +27,13 @@
 	w_class = 5.0
 
 
-/obj/item/weapon/grab/New(mob/user, mob/victim)
+/obj/item/weapon/grab/New(var/mob/user, var/mob/victim)
 	..()
+
+	//Okay, first off, some fucking sanity checking. No user, or no victim, or they are not mobs, no grab.
+	if(!istype(user) || !istype(victim))
+		return
+
 	loc = user
 	assailant = user
 	affecting = victim
@@ -52,8 +57,25 @@
 				G.dancing = 1
 				G.adjust_position()
 				dancing = 1
+
+	clean_grabbed_by(assailant, affecting)
 	adjust_position()
 
+/obj/item/weapon/grab/proc/clean_grabbed_by(var/mob/user, var/mob/victim) //Cleans up any nulls in the grabbed_by list.
+	if(istype(user))
+
+		for(var/entry in user.grabbed_by)
+			if(isnull(entry) || !istype(entry, /obj/item/weapon/grab)) //the isnull() here is probably redundant- but it might outperform istype, who knows. Better safe than sorry.
+				user.grabbed_by -= entry
+
+	if(istype(victim))
+
+		for(var/entry in victim.grabbed_by)
+			if(isnull(entry) || !istype(entry, /obj/item/weapon/grab))
+				victim.grabbed_by -= entry
+
+	return 1
+
 //Used by throw code to hand over the mob, instead of throwing the grab. The grab is then deleted by the throw code.
 /obj/item/weapon/grab/proc/get_mob_if_throwable()
 	if(affecting && assailant.Adjacent(affecting))
@@ -73,7 +95,7 @@
 
 
 /obj/item/weapon/grab/process()
-	confirm()
+	if(!confirm())	return //If the confirm fails, the grab is about to be deleted. That means it shouldn't continue processing.
 
 	if(assailant.client)
 		if(!hud)	return //this somehow can runtime under the right circumstances