TGS Test Merge (#6088)

Citadel-Station-13 · Oct 20, 2023 · be3ce8f · be3ce8f
2 parents d0d6939 + 8171c1f
commit be3ce8f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -547,13 +547,23 @@
 
 //Apidean Chairs!
 /obj/structure/bed/chair/apidean
+	name = "\improper Apidean throne"
+	desc = "This waxy chair is designed to allow creatures with insectoid abdomens to lounge comfortably."
+	icon_state = "bee-throne"
+	base_icon = "bee-throne"
+	picked_up_item = null
+
+/obj/structure/bed/chair/apidean/Initialize(mapload, new_material)
+	. = ..(mapload, "wax", null)
+
+/obj/structure/bed/chair/apidean_throne
 	name = "\improper Apidean throne"
 	desc = "This waxy chair is designed to allow creatures with insectoid abdomens to lounge comfortably. Typically reserved for the Apidean upper class."
 	icon_state = "queenthrone"
 	base_icon = "queenthrone"
 	picked_up_item = null
 
-/obj/structure/bed/chair/apidean/Initialize(mapload, new_material)
+/obj/structure/bed/chair/apidean_throne/Initialize(mapload, new_material)
 	. = ..(mapload, "wax", null)
 
 //Wax Stools for Bees! I've put it here because it shouldn't inherit stool properties.

diff --git a/code/modules/materials/definitions/misc/wax.dm b/code/modules/materials/definitions/misc/wax.dm
@@ -34,8 +34,13 @@
 		cost = 1,
 	)
 	. += create_stack_recipe_datum(
-		name = "royal throne",
+		name = "apidean chair",
 		product = /obj/structure/bed/chair/apidean,
+		cost = 5,
+	)
+	. += create_stack_recipe_datum(
+		name = "apidean throne",
+		product = /obj/structure/bed/chair/apidean_throne,
 		cost = 10,
 		time = 2 SECONDS,
 	)

diff --git a/icons/clothing/suit/armor/utilitarian.dmi b/icons/clothing/suit/armor/utilitarian.dmi
diff --git a/icons/obj/furniture_vr.dmi b/icons/obj/furniture_vr.dmi