From 11295edea0c8daecc47b9cf8fd376e70abee12d9 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 10 Jan 2022 18:50:33 +0100 Subject: [PATCH] [MIRROR] Blowing kisses at the supermatter crystal will now power it. [MDB IGNORE] (#10565) * Blowing kisses at the supermatter crystal will now power it. (#63858) * Pipe direction fix. (#1) * Test * Test * Forgot to do this thing. * Okay * Why did I do that? * Arghh * Not sure how that got here. * Revert "Pipe direction fix. (#1)" (#2) This reverts commit 7ffd5b598f9bd598f67f6ba3219079f3c03e2ac4. * Smart pipes direction fix. Hi * Revert "Pipe direction fix. (#1)" (#4) * Gaming * Flushed * Okay * Changes a number. Co-authored-by: 170141183460469231731687303715884105727 <58013024+170141183460469231731687303715884105727@ users.noreply.github.com> * Blowing kisses at the supermatter crystal will now power it. Co-authored-by: Pickle-Coding <58013024+Pickle-Coding@users.noreply.github.com> Co-authored-by: 170141183460469231731687303715884105727 <58013024+170141183460469231731687303715884105727@ users.noreply.github.com> --- code/modules/power/supermatter/supermatter.dm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 9ce7abbedb8..3b97cc1797e 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -870,13 +870,22 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) /obj/machinery/power/supermatter_crystal/bullet_act(obj/projectile/projectile) var/turf/local_turf = loc + var/kiss_power = 0 + switch(projectile.type) + if(/obj/projectile/kiss) + kiss_power = 60 + if(/obj/projectile/kiss/death) + kiss_power = 20000 if(!istype(local_turf)) return FALSE if(!istype(projectile.firer, /obj/machinery/power/emitter) && power_changes) investigate_log("has been hit by [projectile] fired by [key_name(projectile.firer)]", INVESTIGATE_SUPERMATTER) - if(projectile.flag != BULLET) + if(projectile.flag != BULLET || kiss_power) + if(kiss_power) + psyCoeff = 1 + psy_overlay = TRUE if(power_changes) //This needs to be here I swear - power += projectile.damage * bullet_energy + power += projectile.damage * bullet_energy + kiss_power if(!has_been_powered) investigate_log("has been powered for the first time.", INVESTIGATE_SUPERMATTER) message_admins("[src] has been powered for the first time [ADMIN_JMP(src)].")