Merge branch 'master' into littlefunfixes

code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm

@@ -108,7 +108,7 @@
 	attack_edge = 1
 	attacktext = list("slashed")
 
-	loot_list = list(/obj/item/weapon/melee/energy/sword/red = 100, /obj/item/weapon/shield/energy = 100)
+	loot_list = list(/obj/item/weapon/melee/energy/sword = 100, /obj/item/weapon/shield/energy = 100)
 
 // They have a shield, so they try to block
 /mob/living/simple_mob/humanoid/merc/melee/sword/attackby(var/obj/item/O as obj, var/mob/user as mob)

code/modules/mob/update_icons.dm

@@ -90,3 +90,4 @@
 
 /mob/proc/update_targeted()
 	return
+

code/modules/resleeving/machines.dm

@@ -85,7 +85,7 @@
 		H.add_modifier(modifier_type)
 
 	//Apply damage
-	H.adjustCloneLoss((H.getMaxHealth() - config.health_threshold_dead)*0.75)
+	H.adjustCloneLoss((H.getMaxHealth() - config.health_threshold_dead)*-0.75)
 	H.Paralyse(4)
 	H.updatehealth()