Merge remote-tracking branch 'origin/master' into TGUI-3.0

2020-06-30 02:30:29 +03:00
parent d7e30f9ae5 3c4a288ecc
commit 20245f7319
243 changed files with 3206 additions and 2152 deletions
@@ -111,9 +111,6 @@
 		go_inert()
 	return ..()

-/obj/item/organ/regenerative_core/prepare_eat()
-	return null
-
 /*************************Legion core********************/
 /obj/item/organ/regenerative_core/legion
 	desc = "A strange rock that crackles with power. It can be used to heal completely, but it will rapidly decay into uselessness."