diff --git a/code/WorkInProgress/Yinadele/Supermatter.dm b/code/WorkInProgress/Yinadele/Supermatter.dm index 39759ff494..aba28a7d5b 100644 --- a/code/WorkInProgress/Yinadele/Supermatter.dm +++ b/code/WorkInProgress/Yinadele/Supermatter.dm @@ -202,6 +202,9 @@ /obj/machinery/power/supermatter/attack_robot(mob/user as mob) return attack_hand(user) +/obj/machinery/power/supermatter/attack_ai(mob/user as mob) + user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update." + /obj/machinery/power/supermatter/attack_hand(mob/user as mob) user.visible_message("\The [user] reaches out and touches \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.",\ diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 599d251723..bb3bbcdb3d 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -800,7 +800,8 @@ if(!can_use(usr, 1)) return src.add_fingerprint(usr) - usr.set_machine(src) + if(usingUI) // If we set their machine and they're not using the UI, it'll cause the UI to pop up. + usr.set_machine(src) if (href_list["apcwires"]) var/t1 = text2num(href_list["apcwires"]) if (!( istype(usr.get_active_hand(), /obj/item/weapon/wirecutters) )) diff --git a/html/changelog.html b/html/changelog.html index 1a33e6090e..0b546f4072 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -35,7 +35,7 @@ Header Section
- Code: Abi79, Aryn, Cael_Aislinn, Ccomp5950,Chinsky, cib, CompactNinja, DopeGhoti, Erthilo, Hawk_v3, Head, Ispil, Lexusjjss, Melonstorm, Miniature, Mloc, NerdyBoy1104, SkyMarshal, Snapshot, Spectre, Strumpetplaya, Sunfall, Tastyfish, Uristqwerty
 + Code: Abi79, Aryn, Cael_Aislinn,Ccomp5950 ,Chinsky, cib, CompactNinja, DopeGhoti, Erthilo, Hawk_v3, Head, Ispil, Lexusjjss, Melonstorm, Miniature, Mloc, NerdyBoy1104, SkyMarshal, Snapshot, Spectre, Strumpetplaya, Sunfall, Tastyfish, Uristqwerty
 Sprites: Apple_Master, Arcalane, Chinsky, CompactNinja, Deus Dactyl, Erthilo, Flashkirby, Miniature, Searif, Xenone, faux
 Sounds: Aryn
 Thanks To: /tg/ station, Goonstation, Animus Station, Daedalus, and original Spacestation 13 devs. Skibiliano for the IRC bot. @@ -56,23 +56,10 @@ should be listed in the changelog upon commit though. Thanks. --> -
-

23 November 2013

-

Ccomp5950 updated:

-
    -
  • Players are now no longer able to commit suicide with a lasertag gun, and will feel silly for doing so.
    • -
  • Ghosts hit with the cult book shall now actually become visible.
    • -
  • The powercells spawned with Exosuits will now properly be named to not confuse bearded roboticists.
    • -
  • Blindfolded players will now no longer require eye surgery to repair their sight, removing the blindfold will be sufficient.
    • -
  • Atmospheric Technicians will now have access to Exterior airlocks.
    • -
-
-

24 November 2013

Yinadele updated:

    -
  • Supermatter engine added! Please treat your new engine gently, and report any strangeness!
  • Rebalanced events so people don't explode into appendicitis or have their organs constantly explode.
  • Vending machines have had bottled water, iced tea, and grape soda added.
    • @@ -90,6 +77,18 @@ should be listed in the changelog upon commit though. Thanks. -->
+
+

23 November 2013

+

Ccomp5950 updated:

+
    +
  • Players are now no longer able to commit suicide with a lasertag gun, and will feel silly for doing so.
    • +
  • Ghosts hit with the cult book shall now actually become visible.
    • +
  • The powercells spawned with Exosuits will now properly be named to not confuse bearded roboticists.
    • +
  • Blindfolded players will now no longer require eye surgery to repair their sight, removing the blindfold will be sufficient.
    • +
  • Atmospheric Technicians will now have access to Exterior airlocks.
    • +
+
+

29 October 2013

Cael_Aislinn updated: