Merge branch 'master' of https://github.com/Baystation12/Baystation12 into investigate_fix

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 << "<span class = \"warning\">You attempt to interface with the control circuits but find they are not connected to your network.  Maybe in a future firmware update.</span>"
+
 
 /obj/machinery/power/supermatter/attack_hand(mob/user as mob)
 	user.visible_message("<span class=\"warning\">\The [user] reaches out and touches \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.</span>",\

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) ))

html/changelog.html

@@ -35,7 +35,7 @@ Header Section
 <table align='center' class="top">
 	<tr>
 		<td valign='top'>
-			<font size='2'><b>Code:</b> 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<br></font>
+			<font size='2'><b>Code:</b> 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<br></font>
 			<font size='2'><b>Sprites:</b> Apple_Master, Arcalane, Chinsky, CompactNinja, Deus Dactyl, Erthilo, Flashkirby, Miniature, Searif, Xenone, faux<br></font>
 			<font size='2'><b>Sounds:</b> Aryn<br></font>
 			<font size='2'><b>Thanks To:</b> /tg/ station, Goonstation, Animus Station, Daedalus, and original Spacestation 13 devs. Skibiliano for the IRC bot.</font>
@@ -56,23 +56,10 @@ should be listed in the changelog upon commit though. Thanks. -->
 
 <!-- DO NOT REMOVE, MOVE, OR COPY THIS COMMENT! THIS MUST BE THE LAST NON-EMPTY LINE BEFORE THE LOGS #ADDTOCHANGELOGMARKER# -->
 
-
-<div class='commit sansserif'>
-	<h2 class='date'>23 November 2013</h2>
-	<h3 class='author'>Ccomp5950 updated:</h3>
-	<ul class='changes bgimages16'>
-		<li class='bugfix'>Players are now no longer able to commit suicide with a lasertag gun, and will feel silly for doing so.</li>
-		<li class='bugfix'>Ghosts hit with the cult book shall now actually become visible.</li>
-		<li class='bugfix'>The powercells spawned with Exosuits will now properly be named to not confuse bearded roboticists.</li>
-		<li class='bugfix'>Blindfolded players will now no longer require eye surgery to repair their sight, removing the blindfold will be sufficient.</li>
-		<li class='rscadd'>Atmospheric Technicians will now have access to Exterior airlocks.</li>
-	</ul>
-</div>
 
 <div class='commit sansserif'>
 	<h2 class='date'>24 November 2013</h2>
 	<h3 class='author'>Yinadele updated:</h3>
-	<ul class='changes bgimages16'>
 	<ul class='changes bgimages16'>
 		<li class='experiment'>Supermatter engine added! Please treat your new engine gently, and report any strangeness!</li>
 		<li class='tweak'>Rebalanced events so people don't explode into appendicitis or have their organs constantly explode.</li>
@@ -90,6 +77,18 @@ should be listed in the changelog upon commit though. Thanks. -->
 		<li class='experiment'>Please wait warmly, new features planned for next merge!</li>
 	</ul>
 </div>
+
+<div class='commit sansserif'>
+        <h2 class='date'>23 November 2013</h2>
+        <h3 class='author'>Ccomp5950 updated:</h3>
+        <ul class='changes bgimages16'>
+                <li class='bugfix'>Players are now no longer able to commit suicide with a lasertag gun, and will feel silly for doing so.</li>
+                <li class='bugfix'>Ghosts hit with the cult book shall now actually become visible.</li>
+                <li class='bugfix'>The powercells spawned with Exosuits will now properly be named to not confuse bearded roboticists.</li>
+                <li class='bugfix'>Blindfolded players will now no longer require eye surgery to repair their sight, removing the blindfold will be sufficient.</li>
+                <li class='rscadd'>Atmospheric Technicians will now have access to Exterior airlocks.</li>		
+        </ul>
+</div>
 
 <div class='commit sansserif'>
 	<h2 class='date'>29 October 2013</h2>