From f1e30a54fba3987b2209ff601d3d18920d41159f Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Wed, 22 Apr 2020 19:29:51 -0400 Subject: [PATCH] Maybe prevent morphs from ending the world --- .../simple_mob/subtypes/vore/morph/morph.dm | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm index 185dab8994..376f18354e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm @@ -60,6 +60,10 @@ verbs += /mob/living/proc/ventcrawl return ..() +/mob/living/simple_mob/vore/hostile/morph/Destroy() + form = null + return ..() + /mob/living/simple_mob/vore/hostile/morph/proc/allowed(atom/movable/A) return !is_type_in_typecache(A, blacklist_typecache) && (isobj(A) || ismob(A)) @@ -93,20 +97,16 @@ form = target visible_message("[src] suddenly twists and changes shape, becoming a copy of [target]!") - var/mutable_appearance/ma = new(target) - ma.verbs = verbs - ma.alpha = max(ma.alpha, 150) //fucking chameleons - ma.transform = initial(target.transform) //will this ever be non-null? - - //copy_overlays(target, TRUE) //Overlays should be a part of ma, no? + name = target.name + desc = target.desc + icon = target.icon + icon_state = target.icon_state + alpha = max(target.alpha, 150) + copy_overlays(target, TRUE) our_size_multiplier = size_multiplier - ma.pixel_x = initial(target.pixel_x) - ma.pixel_y = initial(target.pixel_y) - - //MA changes end - appearance = ma - //Non-MA changes + pixel_x = initial(target.pixel_x) + pixel_y = initial(target.pixel_y) density = target.density @@ -158,7 +158,6 @@ density = initial(density) cut_overlays(TRUE) //ALL of zem - overlays.Cut() //Annoying. ANNOYING. maptext = null