things with stuff (#6233)

* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already

code/modules/research/server.dm

@@ -80,13 +80,6 @@
 				env.merge(removed)
 				air_update_turf()
 
-/obj/machinery/rnd/server/attack_hand(mob/user as mob) // I guess only exists to stop ninjas or hell does it even work I dunno.  See also ninja gloves.
-	if (disabled)
-		return
-	if (shocked)
-		shock(user,50)
-	return
-
 /proc/fix_noid_research_servers()
 	var/list/no_id_servers = list()
 	var/list/server_ids = list()
@@ -138,10 +131,8 @@
 	updateUsrDialog()
 	return
 
-/obj/machinery/computer/rdservercontrol/attack_hand(mob/user)
-	if(..())
-		return
-	user.set_machine(src)
+/obj/machinery/computer/rdservercontrol/ui_interact(mob/user)
+	. = ..()
 	var/dat = ""
 
 	switch(screen)
@@ -149,8 +140,7 @@
 			dat += "Connected Servers:<BR><BR>"
 
 			for(var/obj/machinery/rnd/server/S in GLOB.machines)
-				dat += "[S.name] || "
-				dat += "<BR>"
+				dat += "[S.name]<BR>"
 
 		//Mining status here