Merge branch 'master' into crates

code/datums/organs/organ_external.dm

@@ -214,6 +214,7 @@
 
 	proc/bandage()
 		var/rval = 0
+		src.status &= ~ORGAN_BLEEDING
 		for(var/datum/wound/W in wounds)
 			if(W.internal) continue
 			rval |= !W.bandaged
@@ -355,7 +356,7 @@
 					H = new /obj/item/weapon/organ/head(owner.loc, owner)
 					if(ishuman(owner))
 						if(owner.gender == FEMALE)
-							H.icon_state = "head_f_l"
+							H.icon_state = "head_f"
 						H.overlays += owner.generate_head_icon()
 					H:transfer_identity(owner)
 					H.pixel_x = -10
@@ -425,8 +426,22 @@
 				else
 					H.icon_state = initial(H.icon_state)+"_l"
 
-			var/lol = pick(cardinal)
-			step(H,lol)
+			if(status & ORGAN_ROBOT)
+				del H
+				switch(body_part)
+					if(LEG_RIGHT)
+						H = new /obj/item/robot_parts/r_leg(owner.loc)
+					if(LEG_LEFT)
+						H = new /obj/item/robot_parts/l_leg(owner.loc)
+					if(ARM_RIGHT)
+						H = new /obj/item/robot_parts/r_arm(owner.loc)
+					if(ARM_LEFT)
+						H = new /obj/item/robot_parts/l_arm(owner.loc)
+
+			if(H)
+				var/lol = pick(cardinal)
+				step(H,lol)
+				
 			destspawn = 1
 			if(status & ORGAN_ROBOT)
 				owner.visible_message("\red \The [owner]'s [display_name] explodes violently!",\
@@ -513,10 +528,15 @@
 	proc/emp_act(severity)
 		if(!(status & ORGAN_ROBOT))
 			return
-		if(prob(30*severity))
+		var/probability = 30
+		var/damage = 15
+		if(severity == 2)
+			probability = 1
+			damage = 3
+		if(prob(probability))
 			droplimb(1)
 		else
-			take_damage(4(4-severity), 0, 1, used_weapon = "EMP")
+			take_damage(damage, 0, 1, used_weapon = "EMP")
 
 	proc/getDisplayName()
 		switch(name)
@@ -681,7 +701,7 @@ obj/item/weapon/organ/New(loc, mob/living/carbon/human/H)
 
 obj/item/weapon/organ/head
 	name = "head"
-	icon_state = "head_m_l"
+	icon_state = "head_m"
 	var/mob/living/carbon/brain/brainmob
 	var/brain_op_stage = 0