From 14148e9d8fc7896ed6b36bf25d7fe0d93c83bf80 Mon Sep 17 00:00:00 2001 From: hal9000PR Date: Sun, 28 Mar 2021 14:58:35 +0100 Subject: [PATCH 1/2] adds the supermatter dusting interaction --- code/modules/power/supermatter/supermatter.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index aa4ae90d380..f8e0884ae78 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -752,6 +752,12 @@ suspicion = "last touched by [AM.fingerprintslast]" message_admins("[src] has consumed [AM], [suspicion] [ADMIN_JMP(src)].") investigate_log("has consumed [AM] - [suspicion].", "supermatter") + if(istype(AM, /obj/machinery/power/supermatter_crystal)) + power += 5000//releases A LOT of power + matter_power += 500000 + damage += 180//drops the integrety by 20% + AM.visible_message("[AM] smacks into [src], rapidly flashes into pure energy. The energy inside [src] begins superradiance scattering!", null,\ + "You hear a loud crack as you are washed with a wave of heat.") qdel(AM) if(!iseffect(AM) && power_changes) matter_power += 200 From f0fcb334cce7cede8ee58e8a40c84b19fa827b4d Mon Sep 17 00:00:00 2001 From: hal9000PR <69320440+hal9000PR@users.noreply.github.com> Date: Sun, 28 Mar 2021 16:03:18 +0100 Subject: [PATCH 2/2] grammar Co-authored-by: Sean Williams <06sean@gmail.com> --- code/modules/power/supermatter/supermatter.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index f8e0884ae78..975a468ce66 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -756,8 +756,8 @@ power += 5000//releases A LOT of power matter_power += 500000 damage += 180//drops the integrety by 20% - AM.visible_message("[AM] smacks into [src], rapidly flashes into pure energy. The energy inside [src] begins superradiance scattering!", null,\ - "You hear a loud crack as you are washed with a wave of heat.") + AM.visible_message("[AM] smacks into [src], rapidly flashing blasts of pure energy. The energy inside [src] undergoes superradiance scattering!", null,\ + "You hear a loud crack as a wave of heat washes over you.") qdel(AM) if(!iseffect(AM) && power_changes) matter_power += 200