porting in bones and dismemberment

code/game/objects/items/item.dm

@@ -127,9 +127,25 @@
 		user.next_move = world.time + 2
 
 	if (user.hand)
-		user.l_hand = src
+		if(ishuman(user))
+			var/datum/organ/external/temp = user:organs["l_hand"]
+			if(!temp.destroyed)
+				user.l_hand = src
+			else
+				user << "\blue You pick \the [src] up with your ha- wait a minute."
+				return
+		else
+			user.l_hand = src
 	else
-		user.r_hand = src
+		if(ishuman(user))
+			var/datum/organ/external/temp = user:organs["r_hand"]
+			if(!temp.destroyed)
+				user.r_hand = src
+			else
+				user << "\blue You pick \the [src] up with your ha- wait a minute."
+				return
+		else
+			user.r_hand = src
 	src.loc = user
 	src.layer = 20
 	add_fingerprint(user)

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

@@ -57,6 +57,30 @@ MEDICAL
 
 		if (affecting.heal_damage(src.heal_brute, src.heal_burn))
 			H.UpdateDamageIcon()
+
+		if(H.bloodloss > 0 && heal_brute > 0)		// fix wounds too if bruise pack
+			var/stoped = 0
+			for(var/datum/organ/external/wound/W in affecting.wounds)
+				if(W.bleeding)
+					W.stopbleeding()
+					stoped = 0
+					break
+			if(!stoped)
+				// user << "There is no bleeding wound at [t]" //code no longer in a dedicated obj, thus this doesn't really matter
+				return
+			if (user)
+				if (M != user)
+					for (var/mob/O in viewers(H, null))
+						O.show_message("\red [H] has been bandaged with [src] by [user]", 1)
+				else
+					var/t_himself = "itself"
+					if (user.gender == MALE)
+						t_himself = "himself"
+					else if (user.gender == FEMALE)
+						t_himself = "herself"
+					for (var/mob/O in viewers(H, null))
+						O.show_message("\red [H] bandaged [t_himself] with [src]", 1)
+
 		M.updatehealth()
 	else
 		M.heal_organ_damage((src.heal_brute/2), (src.heal_burn/2))

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

@@ -33,6 +33,7 @@ STUN BATON
 		else
 			icon_state = "sword[color]"
 		w_class = 4
+		slash = 1
 		playsound(user, 'saberon.ogg', 50, 1)
 		user << "\blue [src] is now active."
 	else
@@ -42,6 +43,7 @@ STUN BATON
 		else
 			icon_state = "sword0"
 		w_class = 2
+		slash = 0
 		playsound(user, 'saberoff.ogg', 50, 1)
 		user << "\blue [src] can now be concealed."
 	add_fingerprint(user)

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

@@ -290,6 +290,7 @@ WELDINGTOOOL
 	icon_state = "cutters"
 	flags = FPRINT | TABLEPASS| CONDUCT
 	force = 6.0
+	slash = 1
 	throw_speed = 2
 	throw_range = 9
 	w_class = 2.0