From 4a8e7d9b0461e3bcd8db038ed5cc835375d1a128 Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Mon, 2 Dec 2013 10:47:27 -0600 Subject: [PATCH 1/4] Changelog fix, putting Yinadale's stuff up top. Hopefully done in a manner in which there shouldn't be any conflicts. --- html/changelog.html | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) 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:

From 65d62026b0134e6682014a7b360946d7bfb4eb95 Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Tue, 3 Dec 2013 13:53:52 -0500 Subject: [PATCH 2/4] Fixes #2355 --- code/modules/power/apc.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) )) From 254bba5e1a6feeaf4925200d8542dbc0709553ee Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Tue, 3 Dec 2013 17:24:29 -0600 Subject: [PATCH 3/4] Bugfix: AI's will no longer disintegrate if they click the supermatter. While hilarious this is a terrible bug. --- code/WorkInProgress/Yinadele/Supermatter.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/WorkInProgress/Yinadele/Supermatter.dm b/code/WorkInProgress/Yinadele/Supermatter.dm index 39759ff494..7761a12110 100644 --- a/code/WorkInProgress/Yinadele/Supermatter.dm +++ b/code/WorkInProgress/Yinadele/Supermatter.dm @@ -204,6 +204,9 @@ /obj/machinery/power/supermatter/attack_hand(mob/user as mob) + if(isAI(user)) + user << "You attempt to interface with the control circuits but find they are not connected to your network." + return 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.",\ "You reach out and touch \the [src], everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"",\ "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.") From 94f8ccfddd10c9366acc037c722c80bdccf0d61b Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Tue, 3 Dec 2013 18:50:19 -0600 Subject: [PATCH 4/4] Bugfix: AI no longer dies if touching the supermatter, using attack_ai instead of a isAI() check. --- code/WorkInProgress/Yinadele/Supermatter.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/WorkInProgress/Yinadele/Supermatter.dm b/code/WorkInProgress/Yinadele/Supermatter.dm index 7761a12110..aba28a7d5b 100644 --- a/code/WorkInProgress/Yinadele/Supermatter.dm +++ b/code/WorkInProgress/Yinadele/Supermatter.dm @@ -202,11 +202,11 @@ /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) - if(isAI(user)) - user << "You attempt to interface with the control circuits but find they are not connected to your network." - return 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.",\ "You reach out and touch \the [src], everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"",\ "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.")