Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into sql

Conflicts:
	code/controllers/configuration.dm
	config/example/config.txt

code/game/objects/structures/displaycase.dm

@@ -309,3 +309,5 @@ var/global/list/captain_display_cases = list()
 				"You gently run your hands over \the [src] in appreciation of its contents.", \
 				"You hear someone streaking glass with their greasy hands.")
 
+#undef DISPLAYCASE_FRAME_CIRCUIT
+#undef DISPLAYCASE_FRAME_SCREWDRIVER

code/game/objects/structures/musician.dm

@@ -22,7 +22,8 @@
 
 /datum/song/Destroy()
 	instrumentObj = null
-	return ..()
+	..()
+	return QDEL_HINT_QUEUE
 
 // note is a number from 1-7 for A-G
 // acc is either "b", "n", or "#"

code/game/objects/structures/tables_racks.dm

@@ -945,4 +945,16 @@
 
 /obj/structure/rack/proc/healthcheck()
 	if(health <= 0)
-		destroy()
+		destroy()
+
+/obj/structure/rack/skeletal_bar
+	name = "skeletal minibar"
+	desc = "Made with the skulls of the fallen."
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "minibar"
+
+/obj/structure/rack/skeletal_bar/left
+	icon_state = "minibar_left"
+
+/obj/structure/rack/skeletal_bar/right
+	icon_state = "minibar_right"