Merge pull request #118 from Quad-City-Ballers/master

Antimatter engine Fixes
BigSlice · Jul 19, 2018 · 7326d62 · 7326d62
2 parents 2e5df34 + 7cb604e
commit 7326d62
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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 += "<A href='?src=\ref[src];lathe_ejectsheet=plasma;lathe_ejectsheet_amt=1'>Eject</A> "
 			if(linked_lathe.plasma_amount >= 10000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=plasma;lathe_ejectsheet_amt=5'>5x</A> "
-			if(linked_lathe.plasma_amount >= 2000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=plasmalathe_ejectsheet_amt=50'>All</A>"
+			if(linked_lathe.plasma_amount >= 2000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=plasma;lathe_ejectsheet_amt=50'>All</A>"
 			dat += "<BR>"
 			//Uranium
 			dat += "* [linked_lathe.uranium_amount] of Uranium: "