diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 1b5a2148ce2..788421b62e1 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -560,13 +560,16 @@ GLOBAL_LIST_INIT(soil_recipes, list ( ////////////////////////////// GLOBAL_LIST_INIT(cult_recipes, list ( + new /datum/stack_recipe_list("furniture ", list( + new /datum/stack_recipe("runed metal chair", /obj/structure/chair/comfy/cult, 2, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe/cult("runed metal table frame", /obj/structure/table_frame/cult, 1, time = 0.5 SECONDS, one_per_turf = TRUE, cult_structure = TRUE), + )), new /datum/stack_recipe/cult("runed door (stuns non-cultists)", /obj/machinery/door/airlock/cult, 3, time = 5 SECONDS, one_per_turf = TRUE, on_floor = TRUE, cult_structure = TRUE), new /datum/stack_recipe/cult("runed girder (used to make cult walls)", /obj/structure/girder/cult, 1, time = 1 SECONDS, one_per_turf = TRUE, on_floor = TRUE, cult_structure = TRUE), new /datum/stack_recipe/cult("pylon (heals nearby cultists)", /obj/structure/cult/functional/pylon, 4, time = 4 SECONDS, one_per_turf = TRUE, on_floor = TRUE, cult_structure = TRUE), new /datum/stack_recipe/cult("forge (crafts shielded robes, flagellant's robes, and mirror shields)", /obj/structure/cult/functional/forge, 3, time = 4 SECONDS, one_per_turf = TRUE, on_floor = TRUE, cult_structure = TRUE), new /datum/stack_recipe/cult("archives (crafts zealot's blindfolds, shuttle curse orbs, veil shifters, reality sunderers, and blank tarot cards)", /obj/structure/cult/functional/archives, 3, time = 4 SECONDS, one_per_turf = TRUE, on_floor = TRUE, cult_structure = TRUE), new /datum/stack_recipe/cult("altar (crafts eldritch whetstones, construct shells, and flasks of unholy water)", /obj/structure/cult/functional/altar, 3, time = 4 SECONDS, one_per_turf = TRUE, on_floor = TRUE, cult_structure = TRUE), - new /datum/stack_recipe/cult("runed table frame", /obj/structure/table_frame/cult, 1, time = 0.5 SECONDS, one_per_turf = TRUE, cult_structure = TRUE), )) /obj/item/stack/sheet/runed_metal diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 5e6eae29ff8..1523fa3547b 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -31,8 +31,8 @@ /obj/structure/chair/narsie_act() if(prob(20)) - var/obj/structure/chair/wood/W = new/obj/structure/chair/wood(get_turf(src)) - W.setDir(dir) + var/obj/structure/chair/comfy/cult/C = new /obj/structure/chair/comfy/cult(get_turf(src)) + C.setDir(dir) qdel(src) /obj/structure/chair/item_interaction(mob/living/user, obj/item/W, list/modifiers) @@ -153,9 +153,6 @@ buildstacktype = /obj/item/stack/sheet/wood item_chair = /obj/item/chair/wood -/obj/structure/chair/wood/narsie_act() - return - /obj/structure/chair/wood/wings icon_state = "wooden_chair_wings" item_chair = /obj/item/chair/wood/wings @@ -662,9 +659,6 @@ materials = null break_chance = 50 -/obj/item/chair/wood/narsie_act() - return - /obj/item/chair/wood/wings icon_state = "wooden_chair_wings_toppled" origin_type = /obj/structure/chair/wood/wings @@ -708,3 +702,19 @@ user.visible_message("[user] stops [src]'s uncontrollable spinning.", \ "You grab [src] and stop its wild spinning.") STOP_PROCESSING(SSfastprocess, src) + +/obj/structure/chair/comfy/cult + name = "runed metal chair" + desc = "A cold metal throne engraved with indecipherable symbols. Studying them causes your head to pound." + icon_state = "cult_chair" + max_integrity = 150 + buildstacktype = /obj/item/stack/sheet/runed_metal + resistance_flags = FIRE_PROOF | ACID_PROOF + +/obj/structure/chair/comfy/cult/narsie_act() + return + +/obj/structure/chair/comfy/cult/no_metal + name = "runed stone chair" + desc = "A cold stone throne engraved with indecipherable symbols. Studying them causes your head to pound." + buildstacktype = null diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi index a2aeabc8da1..4b3c62feb79 100644 Binary files a/icons/obj/chairs.dmi and b/icons/obj/chairs.dmi differ