From 7cb604e02bd04e2e240587f118ae4e53a46090a2 Mon Sep 17 00:00:00 2001 From: Stakks Date: Wed, 18 Jul 2018 16:28:45 -0500 Subject: [PATCH] Antimatter Fixes Fixes the antimatter engine not powering up Fixes the eject all for plasma in the protolathe --- code/modules/power/antimatter/control.dm | 5 ++++- code/modules/research/rdconsole.dm | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm index e511f279db32d..ebf19c0d51727 100644 --- a/code/modules/power/antimatter/control.dm +++ b/code/modules/power/antimatter/control.dm @@ -154,6 +154,7 @@ "You secure the anchor bolts to the floor.", \ "You hear a ratchet") src.anchored = 1 + power_change() connect_to_network() else if(!linked_shielding.len > 0) playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) @@ -275,7 +276,9 @@ /obj/machinery/power/am_control_unit/interact(mob/user) - if((get_dist(src, user) > 1) || (stat & (BROKEN|NOPOWER))) + if(stat & (BROKEN|NOPOWER)) + return + if((get_dist(src, user) > 1)) if(!istype(user, /mob/living/silicon/ai)) user.unset_machine() user << browse(null, "window=AMcontrol") diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 9d7b7a1d22f9c..c398af9eda08b 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -941,7 +941,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "* [linked_lathe.plasma_amount] of Solid Plasma: " if(linked_lathe.plasma_amount >= 2000) dat += "Eject " if(linked_lathe.plasma_amount >= 10000) dat += "5x " - if(linked_lathe.plasma_amount >= 2000) dat += "All" + if(linked_lathe.plasma_amount >= 2000) dat += "All" dat += "
" //Uranium dat += "* [linked_lathe.uranium_amount] of Uranium: "