Merge pull request #10705 from kevinz000/revert_poojawa_blood_1

Cleanup/Partial revert of RGB blood ""rework""
This commit is contained in:
Ghom
2020-02-02 19:08:57 +01:00
committed by GitHub
24 changed files with 75 additions and 99 deletions
-9
View File
@@ -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."