From ed69858ed78da96bcbae1527d30dd2c0b2a5401b Mon Sep 17 00:00:00 2001 From: BumbertoEko <118741303+BumbertoEko@users.noreply.github.com> Date: Tue, 10 Sep 2024 20:37:59 +0300 Subject: [PATCH] Mimes french kiss now activates the SM (#85011) ## About The Pull Request Before if you blew a kiss at the sm as a mime it did nothing and crashed into it now it activates the sm like a normal kiss ## Why It's Good For The Game if your a mime setting up a sm and there is no power you can activate it using your kiss ## Changelog :cl: fix: Mimes french kisses now activate the sm /:cl: --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> --- .../modules/power/supermatter/supermatter_hit_procs.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/power/supermatter/supermatter_hit_procs.dm b/code/modules/power/supermatter/supermatter_hit_procs.dm index 6f01b5ff7e3..57c86303a0a 100644 --- a/code/modules/power/supermatter/supermatter_hit_procs.dm +++ b/code/modules/power/supermatter/supermatter_hit_procs.dm @@ -13,11 +13,11 @@ return NONE var/kiss_power = 0 - switch(projectile.type) - if(/obj/projectile/kiss) - kiss_power = 60 - if(/obj/projectile/kiss/death) - kiss_power = 20000 + if (istype(projectile, /obj/projectile/kiss/death)) + kiss_power = 20000 + else if (istype(projectile, /obj/projectile/kiss)) + kiss_power = 60 + if(!istype(projectile.firer, /obj/machinery/power/emitter)) investigate_log("has been hit by [projectile] fired by [key_name(projectile.firer)]", INVESTIGATE_ENGINE)