Skip to content

Commit

Permalink
Antimatter Fixes
Browse files Browse the repository at this point in the history
Fixes the antimatter engine not powering up
Fixes the eject all for plasma in the protolathe
  • Loading branch information
Stakks committed Jul 18, 2018
1 parent 384c127 commit 7cb604e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion code/modules/power/antimatter/control.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion code/modules/research/rdconsole.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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: "
Expand Down

0 comments on commit 7cb604e

Please sign in to comment.