Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev

Conflicts:
	html/changelog.html

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/WorkInProgress/kilakk/fax.dm

@@ -109,10 +109,13 @@ var/list/alldepartments = list("Central Command")
 
 	if(href_list["remove"])
 		if(tofax)
-			tofax.loc = usr.loc
-			usr.put_in_hands(tofax)
-			usr << "<span class='notice'>You take the paper out of \the [src].</span>"
-			tofax = null
+			if(!ishuman(usr))
+				usr << "<span class='warning'>You can't do it.</span>"
+			else
+				tofax.loc = usr.loc
+				usr.put_in_hands(tofax)
+				usr << "<span class='notice'>You take the paper out of \the [src].</span>"
+				tofax = null
 
 	if(href_list["scan"])
 		if (scan)