Merge pull request #10705 from kevinz000/revert_poojawa_blood_1

Cleanup/Partial revert of RGB blood ""rework""
2020-02-02 19:08:57 +01:00
parent 601f41b7f7 ee533da3d7
commit 6f66d76680
24 changed files with 75 additions and 99 deletions
@@ -773,8 +773,6 @@
 	px_y = 12
 	stam_heal_tick = 4
 	max_stamina_damage = 50
-	var/blood_state = BLOOD_STATE_NOT_BLOODY
-	var/list/bloody_legs = list(BLOOD_STATE_BLOOD = 0, BLOOD_STATE_OIL = 0, BLOOD_STATE_NOT_BLOODY = 0)

 /obj/item/bodypart/l_leg/is_disabled()
 	if(HAS_TRAIT(owner, TRAIT_PARALYSIS_L_LEG))
@@ -833,8 +831,6 @@
 	px_y = 12
 	max_stamina_damage = 50
 	stam_heal_tick = 4
-	var/blood_state = BLOOD_STATE_NOT_BLOODY
-	var/list/bloody_legs = list(BLOOD_STATE_BLOOD = 0, BLOOD_STATE_OIL = 0, BLOOD_STATE_NOT_BLOODY = 0)

 /obj/item/bodypart/r_leg/is_disabled()
 	if(HAS_TRAIT(owner, TRAIT_PARALYSIS_R_LEG))
@@ -17,7 +17,6 @@
 			return L
 	return FALSE

-
 /mob/proc/has_left_hand(check_disabled = TRUE)
 	return TRUE

@@ -29,7 +28,7 @@
 	return FALSE

 /mob/living/carbon/alien/larva/has_left_hand()
-	return 1
+	return TRUE


 /mob/proc/has_right_hand(check_disabled = TRUE)
@@ -43,9 +42,7 @@
 	return FALSE

 /mob/living/carbon/alien/larva/has_right_hand()
-	return 1
-
-
+	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
@@ -220,21 +220,12 @@ 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, they have an auto-restart after EMPs."
 	icon_state = "heart-c"
 	organ_flags = ORGAN_SYNTHETIC

-/obj/item/organ/heart/ipc/emp_act()
-	. = ..()
-	if(. & EMP_PROTECT_SELF)
-		return
-	Stop()
-	addtimer(CALLBACK(src, .proc/Restart), 10)
-
 /obj/item/organ/heart/freedom
 	name = "heart of freedom"
 	desc = "This heart pumps with the passion to give... something freedom."