Merge pull request #11215 from Mewchild/MC-AIQoL

Small changes to AI Core

code/game/machinery/jukebox.dm

@@ -178,7 +178,7 @@
 
 /obj/machinery/media/jukebox/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state)
 	var/list/data = ..()
-	
+
 	data["playing"] = playing
 	data["loop_mode"] = loop_mode
 	data["volume"] = volume
@@ -326,17 +326,23 @@
 		start_stop_song()
 	updateDialog()
 
+//Pre-hacked Jukebox, has the full sond list unlocked
+/obj/machinery/media/jukebox/hacked
+	name = "DRM free space jukebox"
+	desc = "Filled with songs both past and present! Unlocked for your convenience!"
+	hacked = 1
+
 // Ghostly jukebox for adminbuse
 /obj/machinery/media/jukebox/ghost
 	name = "ghost jukebox"
 	desc = "A jukebox from the nether-realms! Spooky."
-	
+
 	plane = PLANE_GHOSTS
 	invisibility = INVISIBILITY_OBSERVER
 	alpha = 127
-	
+
 	icon_state = "jukebox2-virtual"
-	
+
 	density = FALSE
 	hacked = TRUE
 
@@ -347,7 +353,7 @@
 
 // Just junk to make it sneaky - I wish a lot more stuff was on /obj/machinery/media instead of /jukebox so I could use that.
 /obj/machinery/media/jukebox/ghost/is_incorporeal()
-	return TRUE	
+	return TRUE
 /obj/machinery/media/jukebox/ghost/audible_message(message, deaf_message, hearing_distance, radio_message, runemessage)
 	return
 /obj/machinery/media/jukebox/ghost/visible_message(message, blind_message, list/exclude_mobs, range, runemessage)
@@ -359,7 +365,7 @@
 /obj/machinery/media/jukebox/ghost/attack_hand(var/mob/user as mob)
 	return
 /obj/machinery/media/jukebox/ghost/update_use_power(new_use_power)
-	return	
+	return
 /obj/machinery/media/jukebox/ghost/power_change()
 	return
 /obj/machinery/media/jukebox/ghost/emp_act(severity)
@@ -367,7 +373,7 @@
 /obj/machinery/media/jukebox/ghost/emag_act(remaining_charges, mob/user)
 	return
 /obj/machinery/media/jukebox/ghost/explode()
-	return	
+	return
 /obj/machinery/media/jukebox/ghost/update_icon()
 	if(playing)
 		animate(src, alpha = 200, time = 5, loop = -1)
@@ -393,16 +399,16 @@
 	var/client/C = usr.client
 	if(!check_rights(R_FUN|R_ADMIN))
 		return
-	
+
 	// Required
 	var/url = input(C, "REQUIRED: Provide URL for track", "Track URL") as text|null
 	if(!url)
 		return
-	
+
 	var/title = input(C, "REQUIRED: Provide title for track", "Track Title") as text|null
 	if(!title)
 		return
-	
+
 	var/duration = input(C, "REQUIRED: Provide duration for track (in deciseconds, aka seconds*10)", "Track Duration") as num|null
 	if(!duration)
 		return
@@ -411,12 +417,12 @@
 	var/artist = input(C, "Optional: Provide artist for track", "Track Artist") as text|null
 	if(isnull(artist)) // Cancel rather than empty string
 		return
-	
+
 	// So they're obvious and grouped
 	var/genre = "! Admin Loaded !"
-	
+
 	custom_tracks += new /datum/track(url, title, duration, artist, genre)
-	
+
 /obj/machinery/media/jukebox/ghost/proc/manual_track_remove()
 	var/client/C = usr.client
 	if(!check_rights(R_FUN|R_ADMIN))
@@ -425,13 +431,13 @@
 	var/track = input(C, "Input track title or URL to remove (must be exact)", "Remove Track") as text|null
 	if(!track)
 		return
-	
+
 	for(var/datum/track/T in custom_tracks)
 		if(T.title == track || T.url == track)
 			custom_tracks -= T
 			qdel(T)
 			return
-	
+
 	to_chat(C, "<span class='warning>Couldn't find a track matching the specified parameters.</span>")
 
 /obj/machinery/media/jukebox/ghost/vv_get_dropdown()

maps/tether/tether-02-surface2.dmm

@@ -32808,6 +32808,7 @@
 /obj/effect/floor_decal/techfloor{
 	dir = 4
 	},
+/obj/machinery/holoplant,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/ai)
 "cRq" = (
@@ -32977,6 +32978,10 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
+"eZx" = (
+/obj/machinery/holoplant,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/ai)
 "eZG" = (
 /obj/machinery/camera/network/command,
 /obj/effect/floor_decal/techfloor{
@@ -33337,6 +33342,13 @@
 	},
 /turf/simulated/floor/wood,
 /area/tether/surfacebase/reading_room)
+"jUQ" = (
+/obj/effect/floor_decal/techfloor{
+	dir = 8
+	},
+/obj/machinery/holoplant,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/ai)
 "jWK" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
@@ -34040,6 +34052,7 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/ai_upload)
 "qSJ" = (
+/obj/machinery/media/jukebox/hacked,
 /turf/simulated/floor/tiled/techmaint,
 /area/ai)
 "qUf" = (
@@ -49092,11 +49105,11 @@ adt
 pBU
 rlN
 srN
-rlN
+eZx
 kiL
 pAF
 fyj
-rXR
+jUQ
 kEC
 rlN
 pBU