Merge remote-tracking branch 'upstream/master' into fairylights

code/game/objects/structures/artstuff.dm

@@ -77,11 +77,11 @@
 	ui_interact(user)
 
 /obj/item/canvas/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-										datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+										datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
 
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "canvas", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, ui_key, "Canvas", name, ui_x, ui_y, master_ui, state)
 		ui.set_autoupdate(FALSE)
 		ui.open()
 
@@ -273,16 +273,16 @@
 	if(persistence_id)
 		. += "<span class='notice'>Any painting placed here will be archived at the end of the shift.</span>"
 	if(current_canvas)
-		ui_interact(user, state = GLOB.physical_obscured_state)
+		ui_interact(user, state = GLOB.tgui_physical_obscured_state)
 		. += "<span class='notice'>Use wirecutters to remove the painting.</span>"
 
 //Hyperstation UI hotwire code ahead. No, I'm not particularly proud of this but if it works, it works.
 /obj/structure/sign/painting/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-										datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+										datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
 
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "canvas", name, current_canvas.ui_x, current_canvas.ui_y, master_ui, state)
+		ui = new(user, src, ui_key, "Canvas", name, current_canvas.ui_x, current_canvas.ui_y, master_ui, state)
 		ui.set_autoupdate(FALSE)
 		ui.open()
 

code/game/objects/structures/beds_chairs/chair.dm

@@ -558,9 +558,52 @@
 	item_state = "stoolbrass_bar"
 	origin_type = /obj/structure/chair/stool/bar/bronze
 
-/////////////////////////////////
-//End of Brass & Bronze stools!//
-/////////////////////////////////
+////////////////////////////////////////////////////
+
+//////////////////////////
+//	   Golden Seats  	//
+//////////////////////////
+/obj/structure/chair/throne
+	name = "throne"
+	desc = "A magnificent chair for the most magnificent people."
+	icon_state = "throne"
+	max_integrity = 250
+	buildstacktype = /obj/item/stack/sheet/mineral/gold
+	buildstackamount = 5
+	item_chair = null
+	color = "#ffffff"
+	var/mutable_appearance/armrest
+
+/obj/structure/chair/throne/proc/GetArmrest()
+	return mutable_appearance('icons/obj/chairs.dmi', "throne-arm")
+
+/obj/structure/chair/throne/Destroy()
+	QDEL_NULL(armrest)
+	return ..()
+
+/obj/structure/chair/throne/post_buckle_mob(mob/living/M)
+	. = ..()
+	update_armrest()
+
+/obj/structure/chair/throne/proc/update_armrest()
+	if(has_buckled_mobs())
+		add_overlay(armrest)
+	else
+		cut_overlay(armrest)
+
+/obj/structure/chair/throne/post_unbuckle_mob()
+	. = ..()
+	update_armrest()
+
+/obj/structure/chair/throne/Initialize()
+
+	armrest = GetArmrest()
+	armrest.layer = ABOVE_MOB_LAYER
+	return ..()
+
+
+////////////////////////////////////////////////////
+
 
 /obj/item/chair/stool/narsie_act()
 	return //sturdy enough to ignore a god

code/game/objects/structures/tank_dispenser.dm

@@ -68,10 +68,10 @@
 	update_icon()
 
 /obj/structure/tank_dispenser/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-										datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
+										datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_physical_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "tank_dispenser", name, 275, 103, master_ui, state)
+		ui = new(user, src, ui_key, "TankDispenser", name, 275, 103, master_ui, state)
 		ui.open()
 
 /obj/structure/tank_dispenser/attack_robot(mob/user)