From a2f1e9f47f8bc2e741b3b0a579412aaf98331d71 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Mon, 11 Jun 2018 23:13:11 -0400 Subject: [PATCH] Update _status_effects.dm --- .../research/xenobiology/crossbreeding/_status_effects.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm index 7a7b928e28..97112c148a 100644 --- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm +++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm @@ -760,11 +760,6 @@ datum/status_effect/stabilized/blue/on_remove() var/mob/living/simple_animal/familiar /datum/status_effect/stabilized/gold/tick() -<<<<<<< HEAD - if(!familiar) - familiar = create_random_mob(get_turf(owner.loc), FRIENDLY_SPAWN) - familiar.del_on_death = TRUE -======= var/obj/item/slimecross/stabilized/gold/linked = linked_extract if(QDELETED(familiar)) familiar = new linked.mob_type(get_turf(owner.loc)) @@ -777,7 +772,6 @@ datum/status_effect/stabilized/blue/on_remove() else if(familiar.mind) linked.saved_mind = familiar.mind ->>>>>>> b2e9fe8... Fixes and Upgrades Stabilized Gold Extracts (#38394) return ..() /datum/status_effect/stabilized/gold/on_remove()