Merge pull request #10849 from Ghommie/Ghommie-cit547

Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
This commit is contained in:
kevinz000
2020-02-04 03:39:14 -07:00
committed by GitHub
55 changed files with 203 additions and 193 deletions
@@ -111,8 +111,8 @@
preserved(TRUE)
owner.visible_message("<span class='notice'>[src] stabilizes as it's inserted.</span>")
/obj/item/organ/regenerative_core/Remove(mob/living/carbon/M, special = 0)
if(!inert && !special)
/obj/item/organ/regenerative_core/Remove(special = FALSE)
if(!inert && !special && !QDELETED(owner))
owner.visible_message("<span class='notice'>[src] rapidly decays as it's removed.</span>")
go_inert()
return ..()