Revert "Merge remote-tracking branch 'upstream/master'"

This reverts commit 135608551f, reversing changes made to ce7e9ac452.
2019-11-24 03:04:13 +00:00
parent c8b206a4cf
commit 1509d9d183
186 changed files with 405 additions and 764 deletions
@@ -212,6 +212,7 @@ obj/item/organ/heart/cybernetic/upgraded/on_life()
 		ramount += regen_amount

 /obj/item/organ/heart/cybernetic/upgraded/proc/used_dose()
+	. = ..()
 	addtimer(VARSET_CALLBACK(src, dose_available, TRUE), 5 MINUTES)
 	ramount = 0

@@ -1,3 +1,6 @@
+#define STANDARD_ORGAN_THRESHOLD 100
+#define STANDARD_ORGAN_HEALING 0.001
+
 /obj/item/organ
 	name = "organ"
 	icon = 'icons/obj/surgery.dmi'