From 9948a63fe6a8aeb0a7dd03dea5b5a81a30836d50 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 23 Mar 2021 15:23:23 -0400 Subject: [PATCH 1/2] Fixes Technomancer Illusion Technomancer Illusion now properly copies carbonmob appearances --- code/game/gamemodes/technomancer/spells/illusion.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/gamemodes/technomancer/spells/illusion.dm b/code/game/gamemodes/technomancer/spells/illusion.dm index 7405c43520..2d33f6e926 100644 --- a/code/game/gamemodes/technomancer/spells/illusion.dm +++ b/code/game/gamemodes/technomancer/spells/illusion.dm @@ -33,6 +33,7 @@ if(pay_energy(500)) illusion = new(T) illusion.copy_appearance(copied) + illusion.copy_overlays(copied, TRUE) to_chat(user, "An illusion of \the [copied] is made on \the [T].") user << 'sound/effects/pop.ogg' return 1 From f0cd058d26501e7ee2ababe5ce151481bc0ea538 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 23 Mar 2021 15:44:41 -0400 Subject: [PATCH 2/2] Fixes two more bugs. --- code/game/gamemodes/technomancer/instability.dm | 1 + .../modules/mob/living/simple_mob/subtypes/illusion/illusion.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/technomancer/instability.dm b/code/game/gamemodes/technomancer/instability.dm index 6dc3f2d52b..8b4e1f2767 100644 --- a/code/game/gamemodes/technomancer/instability.dm +++ b/code/game/gamemodes/technomancer/instability.dm @@ -273,6 +273,7 @@ var/outgoing_instability = (amount) * ( 1 / (radius**2) ) L.receive_radiated_instability(outgoing_instability) + src.adjust_instability(-outgoing_instability) //This should prevent feedback loops // This should only be used for EXTERNAL sources of instability, such as from someone or something glowing. /mob/living/proc/receive_radiated_instability(amount) diff --git a/code/modules/mob/living/simple_mob/subtypes/illusion/illusion.dm b/code/modules/mob/living/simple_mob/subtypes/illusion/illusion.dm index 69486a061d..b20bdbb4cd 100644 --- a/code/modules/mob/living/simple_mob/subtypes/illusion/illusion.dm +++ b/code/modules/mob/living/simple_mob/subtypes/illusion/illusion.dm @@ -33,7 +33,7 @@ appearance = thing_to_copy.appearance copying = thing_to_copy density = thing_to_copy.density // So you can't bump into objects that aren't supposed to be dense. - catalogue_data = thing_to_copy.catalogue_data.Copy() + catalogue_data = thing_to_copy.get_catalogue_data() catalogue_delay = thing_to_copy.catalogue_delay return TRUE