bugfix:immortal slime cant moving,impant disappear

ss220-space · Nov 4, 2023 · c76d556 · c76d556
1 parent be16bb4
commit c76d556
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/code/game/objects/items/weapons/anomaly_extract.dm b/code/game/objects/items/weapons/anomaly_extract.dm
@@ -93,7 +93,8 @@
 
 /obj/effect/proc_holder/spell/slime_degradation/proc/slime_transform(mob/living/carbon/human/user)
 	for(var/obj/item/I in user)
-		user.drop_item_ground(I, force = TRUE)
+		if(!istype(I, /obj/item/implant))
+			user.drop_item_ground(I, force = TRUE)
 
 	var/mob/living/simple_animal/slime/invalid/slimeme = new /mob/living/simple_animal/slime/invalid(user.loc, "red", new /datum/slime_age/adult, 1200,  user, src)
 
@@ -106,9 +107,9 @@
 	slimeme.status_flags |= GODMODE
 	user.status_flags |= GODMODE
 	slimeme.canmove = FALSE
-	user.forceMove(slimeme)
 	user.mind.transfer_to(slimeme)
 	slimeme.update_sight()
+	user.forceMove(null)
 
 	new /obj/effect/temp_visual/wizard(get_turf(user))
 
@@ -156,6 +157,7 @@
 		stack_trace("Spell or original_body was qdeled during the [src] work.")
 		return
 
+	original_body.notransform = FALSE
 	original_body.status_flags &= ~GODMODE
 	original_body.canmove = TRUE
 	is_transformed = FALSE

diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -512,7 +512,8 @@
 /mob/living/simple_animal/slime/invalid/Initialize(mapload, new_colour = "grey", age_state_new = new /datum/slime_age/baby, new_set_nutrition = 700, mob/living/carbon/human/slimeman, obj/effect/proc_holder/spell/slime_degradation/slime_spell)
 	..()
 	for(var/datum/action/innate/slime/A in actions)
-		A.Remove(src)
+		if(!istype(A,/datum/action/innate/slime/feed))
+			A.Remove(src)
 	if(slimeman)
 		sman = slimeman
 	if(slime_spell)