Merge remote-tracking branch 'upstream/master' into Surgery

code/modules/surgery/bodyparts/bodyparts.dm

@@ -836,7 +836,7 @@
 	px_x = 2
 	px_y = 12
 	max_stamina_damage = 50
-	stam_heal_tick = 2
+	stam_heal_tick = 4
 
 /obj/item/bodypart/r_leg/is_disabled()
 	if(HAS_TRAIT(owner, TRAIT_PARALYSIS_R_LEG))

code/modules/surgery/bodyparts/helpers.dm

@@ -17,7 +17,6 @@
 			return L
 	return FALSE
 
-
 /mob/proc/has_left_hand(check_disabled = TRUE)
 	return TRUE
 
@@ -45,8 +44,6 @@
 /mob/living/carbon/alien/larva/has_right_hand()
 	return TRUE
 
-
-
 /mob/proc/has_left_leg()
 	return TRUE
 
@@ -67,7 +64,6 @@
 	else
 		return FALSE
 
-
 //Limb numbers
 /mob/proc/get_num_arms(check_disabled = TRUE)
 	return 2

code/modules/surgery/organs/heart.dm

@@ -221,11 +221,6 @@ obj/item/organ/heart/cybernetic/upgraded/on_life()
 	addtimer(VARSET_CALLBACK(src, dose_available, TRUE), 5 MINUTES)
 	ramount = 0
 
-/obj/item/organ/heart/ipc
-	name = "IPC heart"
-	desc = "An electronic pump that regulates hydraulic functions, the electronics have EMP shielding."
-	icon_state = "heart-c"
-
 /obj/item/organ/heart/ipc
 	name = "IPC heart"
 	desc = "An electronic pump that regulates hydraulic functions, they have an auto-restart after EMPs."