diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 9763eeda..287f8157 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -780,7 +780,13 @@ GLOBAL_LIST_INIT(shadoww_recipes, list ( \
new/datum/stack_recipe("Shadow wood floor tile", /obj/item/stack/tile/shadoww, 1, 4, 20), \
new/datum/stack_recipe("Shadow wood table frame", /obj/structure/table_frame/shadoww, 2, time = 10), \
null, \
- new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/shadoww, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("Shadow wood chair", /obj/structure/chair/shadoww, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
+ null, \
+ new/datum/stack_recipe("Shadow wood barricade", /obj/structure/barricade/shadoww, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
+ null, \
+ new/datum/stack_recipe("Dog bed", /obj/structure/bed/shadowwdogbed, 10, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("Dresser", /obj/structure/shadowwdresser, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("shadow wood crate", /obj/structure/closet/crate/shadoww, 6, time = 50, one_per_turf = TRUE, on_floor = TRUE),\
null, \
))
@@ -812,7 +818,13 @@ GLOBAL_LIST_INIT(gmushroom_recipes, list ( \
new/datum/stack_recipe("Mushroom floor tile", /obj/item/stack/tile/gmushroom, 1, 4, 20), \
new/datum/stack_recipe("Mushroom table frame", /obj/structure/table_frame/gmushroom, 2, time = 10), \
null, \
- new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/gmushroom, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("Mushroom chair", /obj/structure/chair/gmushroom, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
+ null, \
+ new/datum/stack_recipe("Mushroom barricade", /obj/structure/barricade/gmushroom, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
+ null, \
+ new/datum/stack_recipe("Dog bed", /obj/structure/bed/gmushroomdogbed, 10, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("Dresser", /obj/structure/gmushroomdresser, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("Mushroom crate", /obj/structure/closet/crate/gmushroom, 6, time = 50, one_per_turf = TRUE, on_floor = TRUE),\
null, \
))
@@ -844,7 +856,13 @@ GLOBAL_LIST_INIT(plaswood_recipes, list ( \
new/datum/stack_recipe("Plaswood floor tile", /obj/item/stack/tile/plaswood, 1, 4, 20), \
new/datum/stack_recipe("Plaswood table frame", /obj/structure/table_frame/plaswood, 2, time = 10), \
null, \
- new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/plaswood, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("Plaswood chair", /obj/structure/chair/plaswood, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
+ null, \
+ new/datum/stack_recipe("Plaswood barricade", /obj/structure/barricade/plaswood, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
+ null, \
+ new/datum/stack_recipe("Dog bed", /obj/structure/bed/plaswooddogbed, 10, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("Dresser", /obj/structure/plaswooddresser, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("Plaswood crate", /obj/structure/closet/crate/plaswood, 6, time = 50, one_per_turf = TRUE, on_floor = TRUE),\
null, \
))
diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm
index e7faf1e6..50874c39 100644
--- a/code/game/objects/structures/beds_chairs/bed.dm
+++ b/code/game/objects/structures/beds_chairs/bed.dm
@@ -210,3 +210,30 @@
name = "resting contraption"
desc = "This looks similar to contraptions from Earth. Could aliens be stealing our technology?"
icon_state = "abed"
+
+/obj/structure/bed/shadowwdogbed
+ name = "dog bed"
+ icon_state = "shadowwdogbed"
+ desc = "A comfy-looking dog bed. You can even strap your pet in, in case the gravity turns off."
+ anchored = FALSE
+ buildstacktype = /obj/item/stack/sheet/mineral/shadoww
+ buildstackamount = 10
+ var/mob/living/owner = null
+
+/obj/structure/bed/plaswooddogbed
+ name = "dog bed"
+ icon_state = "plaswooddogbed"
+ desc = "A comfy-looking dog bed. You can even strap your pet in, in case the gravity turns off."
+ anchored = FALSE
+ buildstacktype = /obj/item/stack/sheet/mineral/plaswood
+ buildstackamount = 10
+ var/mob/living/owner = null
+
+/obj/structure/bed/gmushroomdogbed
+ name = "dog bed"
+ icon_state = "gmushroomdogbed"
+ desc = "A comfy-looking dog bed. You can even strap your pet in, in case the gravity turns off."
+ anchored = FALSE
+ buildstacktype = /obj/item/stack/sheet/mineral/gmushroom
+ buildstackamount = 10
+ var/mob/living/owner = null
\ No newline at end of file
diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index 256aa783..077cc5d5 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -171,6 +171,36 @@
icon_state = "wooden_chair_wings"
item_chair = /obj/item/chair/wood/wings
+/obj/structure/chair/shadoww
+ icon_state = "shadoww_chair"
+ name = "shadow wood chair"
+ desc = "Fashionable dark."
+ resistance_flags = FLAMMABLE
+ max_integrity = 70
+ buildstacktype = /obj/item/stack/sheet/mineral/shadoww
+ buildstackamount = 3
+ item_chair = /obj/item/chair/shadoww
+
+/obj/structure/chair/plaswood
+ icon_state = "plaswood_chair"
+ name = "plaswood chair"
+ desc = "Hard but confortable to sit."
+ resistance_flags = FLAMMABLE | ACID_PROOF
+ max_integrity = 90
+ buildstacktype = /obj/item/stack/sheet/mineral/plaswood
+ buildstackamount = 3
+ item_chair = /obj/item/chair/plaswood
+
+/obj/structure/chair/gmushroom
+ icon_state = "gmushroom_chair"
+ name = "mushroom chair"
+ desc = "You don't need to worry about losing your seat in case of fire!"
+ resistance_flags = FIRE_PROOF
+ max_integrity = 70
+ buildstacktype = /obj/item/stack/sheet/mineral/gmushroom
+ buildstackamount = 3
+ item_chair = /obj/item/chair/gmushroom
+
/obj/structure/chair/comfy
name = "comfy chair"
desc = "It looks comfy."
@@ -517,6 +547,39 @@
icon_state = "wooden_chair_wings_toppled"
origin_type = /obj/structure/chair/wood/wings
+/obj/item/chair/shadoww
+ name = "shadow wood chair"
+ icon_state = "shadoww_chair_toppled"
+ item_state = "shadowwchair"
+ resistance_flags = FLAMMABLE
+ max_integrity = 70
+ hitsound = 'sound/weapons/genhit1.ogg'
+ origin_type = /obj/structure/chair/shadoww
+ materials = null
+ break_chance = 50
+
+/obj/item/chair/plaswood
+ name = "plaswood chair"
+ icon_state = "plaswood_chair_toppled"
+ item_state = "plaswoodchair"
+ resistance_flags = FLAMMABLE | ACID_PROOF
+ max_integrity = 90
+ hitsound = 'sound/weapons/genhit1.ogg'
+ origin_type = /obj/structure/chair/plaswood
+ materials = null
+ break_chance = 70
+
+/obj/item/chair/gmushroom
+ name = "mushroom chair"
+ icon_state = "gmushroom_chair_toppled"
+ item_state = "gmushroomchair"
+ resistance_flags = FIRE_PROOF
+ max_integrity = 70
+ hitsound = 'sound/weapons/genhit1.ogg'
+ origin_type = /obj/structure/chair/gmushroom
+ materials = null
+ break_chance = 50
+
/obj/structure/chair/old
name = "strange chair"
desc = "You sit in this. Either by will or force. Looks REALLY uncomfortable."
diff --git a/code/game/objects/structures/crates_lockers/crates/wooden.dm b/code/game/objects/structures/crates_lockers/crates/wooden.dm
index 09d17678..bbd11828 100644
--- a/code/game/objects/structures/crates_lockers/crates/wooden.dm
+++ b/code/game/objects/structures/crates_lockers/crates/wooden.dm
@@ -15,4 +15,25 @@
new /obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter(src)
new /obj/item/pneumatic_cannon/pie(src)
new /obj/item/reagent_containers/food/snacks/pie/cream(src)
- new /obj/item/storage/crayons(src)
\ No newline at end of file
+ new /obj/item/storage/crayons(src)
+
+/obj/structure/closet/crate/shadoww
+ name = "shadown wood crate"
+ desc = "Works just as well as a metal one."
+ material_drop = /obj/item/stack/sheet/mineral/shadoww
+ material_drop_amount = 6
+ icon_state = "shadoww"
+
+/obj/structure/closet/crate/plaswood
+ name = "plaswood crate"
+ desc = "Works just as well as a metal one."
+ material_drop = /obj/item/stack/sheet/mineral/plaswood
+ material_drop_amount = 6
+ icon_state = "plaswood"
+
+/obj/structure/closet/crate/gmushroom
+ name = "mushroom crate"
+ desc = "Works just as well as a metal one."
+ material_drop = /obj/item/stack/sheet/mineral/gmushroom
+ material_drop_amount = 6
+ icon_state = "gmushroom"
\ No newline at end of file
diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm
index b850b79c..0065a1e4 100644
--- a/code/game/objects/structures/dresser.dm
+++ b/code/game/objects/structures/dresser.dm
@@ -80,3 +80,252 @@
if(!n_color || !H.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
return default_color
return sanitize_hexcolor(n_color)
+
+/obj/structure/gmushroomdresser
+ name = "dresser"
+ desc = "A nicely-crafted mushroom dresser. It's filled with lots of undies."
+ icon = 'icons/obj/stationobjs.dmi'
+ icon_state = "gmushroomdresser"
+ density = TRUE
+ anchored = TRUE
+
+/obj/structure/gmushroomdresser/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/wrench))
+ to_chat(user, "You begin to [anchored ? "unwrench" : "wrench"] [src].")
+ if(I.use_tool(src, user, 20, volume=50))
+ to_chat(user, "You successfully [anchored ? "unwrench" : "wrench"] [src].")
+ setAnchored(!anchored)
+ else
+ return ..()
+
+/obj/structure/gmushroomdresser/deconstruct(disassembled = TRUE)
+ new /obj/item/stack/sheet/mineral/gmushroom(drop_location(), 10)
+ qdel(src)
+
+/obj/structure/gmushroomdresser/attack_hand(mob/user)
+ . = ..()
+ if(. || !ishuman(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+ return
+ var/mob/living/carbon/human/H = user
+
+ if(H.dna && H.dna.species && (NO_UNDERWEAR in H.dna.species.species_traits))
+ to_chat(H, "You are not capable of wearing underwear.")
+ return
+
+ var/list/undergarment_choices = list("Underwear", "Underwear Color", "Undershirt", "Undershirt Color", "Socks", "Socks Color")
+ if(!UNDIE_COLORABLE(GLOB.underwear_list[H.underwear]))
+ undergarment_choices -= "Underwear Color"
+ if(!UNDIE_COLORABLE(GLOB.undershirt_list[H.undershirt]))
+ undergarment_choices -= "Undershirt Color"
+ if(!UNDIE_COLORABLE(GLOB.socks_list[H.socks]))
+ undergarment_choices -= "Socks Color"
+
+ var/choice = input(H, "Underwear, Undershirt, or Socks?", "Changing") as null|anything in undergarment_choices
+ if(!H.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+ return
+ var/dye_undie = FALSE
+ var/dye_shirt = FALSE
+ var/dye_socks = FALSE
+ switch(choice)
+ if("Underwear")
+ var/new_undies = input(H, "Select your underwear", "Changing") as null|anything in GLOB.underwear_list
+ if(H.underwear)
+ H.underwear = new_undies
+ H.saved_underwear = new_undies
+ var/datum/sprite_accessory/underwear/bottom/B = GLOB.underwear_list[new_undies]
+ dye_undie = B?.has_color
+ if("Undershirt")
+ var/new_undershirt = input(H, "Select your undershirt", "Changing") as null|anything in GLOB.undershirt_list
+ if(new_undershirt)
+ H.undershirt = new_undershirt
+ H.saved_undershirt = new_undershirt
+ var/datum/sprite_accessory/underwear/top/T = GLOB.undershirt_list[new_undershirt]
+ dye_shirt = T?.has_color
+ if("Socks")
+ var/new_socks = input(H, "Select your socks", "Changing") as null|anything in GLOB.socks_list
+ if(new_socks)
+ H.socks = new_socks
+ H.saved_socks = new_socks
+ var/datum/sprite_accessory/underwear/socks/S = GLOB.socks_list[new_socks]
+ dye_socks = S?.has_color
+ if(dye_undie || choice == "Underwear Color")
+ H.undie_color = recolor_undergarment(H, "underwear", H.undie_color)
+ if(dye_shirt || choice == "Undershirt Color")
+ H.shirt_color = recolor_undergarment(H, "undershirt", H.shirt_color)
+ if(dye_socks || choice == "Socks Color")
+ H.socks_color = recolor_undergarment(H, "socks", H.socks_color)
+
+ add_fingerprint(H)
+ H.update_body()
+
+/obj/structure/gmushroomdresser/proc/recolor_undergarment(mob/living/carbon/human/H, garment_type = "underwear", default_color)
+ var/n_color = input(H, "Choose your [garment_type]'\s color.", "Character Preference", default_color) as color|null
+ if(!n_color || !H.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+ return default_color
+ return sanitize_hexcolor(n_color)
+
+/obj/structure/plaswooddresser
+ name = "dresser"
+ desc = "A nicely-crafted plaswood dresser. It's filled with lots of undies."
+ icon = 'icons/obj/stationobjs.dmi'
+ icon_state = "plaswooddresser"
+ density = TRUE
+ anchored = TRUE
+
+/obj/structure/plaswooddresser/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/wrench))
+ to_chat(user, "You begin to [anchored ? "unwrench" : "wrench"] [src].")
+ if(I.use_tool(src, user, 20, volume=50))
+ to_chat(user, "You successfully [anchored ? "unwrench" : "wrench"] [src].")
+ setAnchored(!anchored)
+ else
+ return ..()
+
+/obj/structure/plaswooddresser/deconstruct(disassembled = TRUE)
+ new /obj/item/stack/sheet/mineral/plaswood(drop_location(), 10)
+ qdel(src)
+
+/obj/structure/plaswooddresser/attack_hand(mob/user)
+ . = ..()
+ if(. || !ishuman(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+ return
+ var/mob/living/carbon/human/H = user
+
+ if(H.dna && H.dna.species && (NO_UNDERWEAR in H.dna.species.species_traits))
+ to_chat(H, "You are not capable of wearing underwear.")
+ return
+
+ var/list/undergarment_choices = list("Underwear", "Underwear Color", "Undershirt", "Undershirt Color", "Socks", "Socks Color")
+ if(!UNDIE_COLORABLE(GLOB.underwear_list[H.underwear]))
+ undergarment_choices -= "Underwear Color"
+ if(!UNDIE_COLORABLE(GLOB.undershirt_list[H.undershirt]))
+ undergarment_choices -= "Undershirt Color"
+ if(!UNDIE_COLORABLE(GLOB.socks_list[H.socks]))
+ undergarment_choices -= "Socks Color"
+
+ var/choice = input(H, "Underwear, Undershirt, or Socks?", "Changing") as null|anything in undergarment_choices
+ if(!H.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+ return
+ var/dye_undie = FALSE
+ var/dye_shirt = FALSE
+ var/dye_socks = FALSE
+ switch(choice)
+ if("Underwear")
+ var/new_undies = input(H, "Select your underwear", "Changing") as null|anything in GLOB.underwear_list
+ if(H.underwear)
+ H.underwear = new_undies
+ H.saved_underwear = new_undies
+ var/datum/sprite_accessory/underwear/bottom/B = GLOB.underwear_list[new_undies]
+ dye_undie = B?.has_color
+ if("Undershirt")
+ var/new_undershirt = input(H, "Select your undershirt", "Changing") as null|anything in GLOB.undershirt_list
+ if(new_undershirt)
+ H.undershirt = new_undershirt
+ H.saved_undershirt = new_undershirt
+ var/datum/sprite_accessory/underwear/top/T = GLOB.undershirt_list[new_undershirt]
+ dye_shirt = T?.has_color
+ if("Socks")
+ var/new_socks = input(H, "Select your socks", "Changing") as null|anything in GLOB.socks_list
+ if(new_socks)
+ H.socks = new_socks
+ H.saved_socks = new_socks
+ var/datum/sprite_accessory/underwear/socks/S = GLOB.socks_list[new_socks]
+ dye_socks = S?.has_color
+ if(dye_undie || choice == "Underwear Color")
+ H.undie_color = recolor_undergarment(H, "underwear", H.undie_color)
+ if(dye_shirt || choice == "Undershirt Color")
+ H.shirt_color = recolor_undergarment(H, "undershirt", H.shirt_color)
+ if(dye_socks || choice == "Socks Color")
+ H.socks_color = recolor_undergarment(H, "socks", H.socks_color)
+
+ add_fingerprint(H)
+ H.update_body()
+
+/obj/structure/plaswooddresser/proc/recolor_undergarment(mob/living/carbon/human/H, garment_type = "underwear", default_color)
+ var/n_color = input(H, "Choose your [garment_type]'\s color.", "Character Preference", default_color) as color|null
+ if(!n_color || !H.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+ return default_color
+ return sanitize_hexcolor(n_color)
+
+/obj/structure/shadowwdresser
+ name = "dresser"
+ desc = "A nicely-crafted shadow wood dresser. It's filled with lots of undies."
+ icon = 'icons/obj/stationobjs.dmi'
+ icon_state = "shadowwdresser"
+ density = TRUE
+ anchored = TRUE
+
+/obj/structure/shadowwdresser/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/wrench))
+ to_chat(user, "You begin to [anchored ? "unwrench" : "wrench"] [src].")
+ if(I.use_tool(src, user, 20, volume=50))
+ to_chat(user, "You successfully [anchored ? "unwrench" : "wrench"] [src].")
+ setAnchored(!anchored)
+ else
+ return ..()
+
+/obj/structure/shadowwdresser/deconstruct(disassembled = TRUE)
+ new /obj/item/stack/sheet/mineral/shadoww(drop_location(), 10)
+ qdel(src)
+
+/obj/structure/shadowwdresser/attack_hand(mob/user)
+ . = ..()
+ if(. || !ishuman(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+ return
+ var/mob/living/carbon/human/H = user
+
+ if(H.dna && H.dna.species && (NO_UNDERWEAR in H.dna.species.species_traits))
+ to_chat(H, "You are not capable of wearing underwear.")
+ return
+
+ var/list/undergarment_choices = list("Underwear", "Underwear Color", "Undershirt", "Undershirt Color", "Socks", "Socks Color")
+ if(!UNDIE_COLORABLE(GLOB.underwear_list[H.underwear]))
+ undergarment_choices -= "Underwear Color"
+ if(!UNDIE_COLORABLE(GLOB.undershirt_list[H.undershirt]))
+ undergarment_choices -= "Undershirt Color"
+ if(!UNDIE_COLORABLE(GLOB.socks_list[H.socks]))
+ undergarment_choices -= "Socks Color"
+
+ var/choice = input(H, "Underwear, Undershirt, or Socks?", "Changing") as null|anything in undergarment_choices
+ if(!H.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+ return
+ var/dye_undie = FALSE
+ var/dye_shirt = FALSE
+ var/dye_socks = FALSE
+ switch(choice)
+ if("Underwear")
+ var/new_undies = input(H, "Select your underwear", "Changing") as null|anything in GLOB.underwear_list
+ if(H.underwear)
+ H.underwear = new_undies
+ H.saved_underwear = new_undies
+ var/datum/sprite_accessory/underwear/bottom/B = GLOB.underwear_list[new_undies]
+ dye_undie = B?.has_color
+ if("Undershirt")
+ var/new_undershirt = input(H, "Select your undershirt", "Changing") as null|anything in GLOB.undershirt_list
+ if(new_undershirt)
+ H.undershirt = new_undershirt
+ H.saved_undershirt = new_undershirt
+ var/datum/sprite_accessory/underwear/top/T = GLOB.undershirt_list[new_undershirt]
+ dye_shirt = T?.has_color
+ if("Socks")
+ var/new_socks = input(H, "Select your socks", "Changing") as null|anything in GLOB.socks_list
+ if(new_socks)
+ H.socks = new_socks
+ H.saved_socks = new_socks
+ var/datum/sprite_accessory/underwear/socks/S = GLOB.socks_list[new_socks]
+ dye_socks = S?.has_color
+ if(dye_undie || choice == "Underwear Color")
+ H.undie_color = recolor_undergarment(H, "underwear", H.undie_color)
+ if(dye_shirt || choice == "Undershirt Color")
+ H.shirt_color = recolor_undergarment(H, "undershirt", H.shirt_color)
+ if(dye_socks || choice == "Socks Color")
+ H.socks_color = recolor_undergarment(H, "socks", H.socks_color)
+
+ add_fingerprint(H)
+ H.update_body()
+
+/obj/structure/shadowwdresser/proc/recolor_undergarment(mob/living/carbon/human/H, garment_type = "underwear", default_color)
+ var/n_color = input(H, "Choose your [garment_type]'\s color.", "Character Preference", default_color) as color|null
+ if(!n_color || !H.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+ return default_color
+ return sanitize_hexcolor(n_color)
\ No newline at end of file
diff --git a/code/modules/cargo/bounties/assistant.dm b/code/modules/cargo/bounties/assistant.dm
index 493ac4ac..5601dfe4 100644
--- a/code/modules/cargo/bounties/assistant.dm
+++ b/code/modules/cargo/bounties/assistant.dm
@@ -215,3 +215,24 @@
description = "Commander Jackson is looking for a fine addition to her exotic weapons collection. She will reward you handsomely for either a Cat or Liz o' Nine Tails."
reward = 4000
wanted_types = list(/obj/item/melee/chainofcommand/tailwhip)
+
+/datum/bounty/item/assistant/shadow_wood_chair
+ name = "Shadow Wood Chairs"
+ description = "Commander Mat is unhappy with his chair. He claims it hurts his back. Ship some shadow wood chairs to humor him."
+ reward = 1000
+ required_count = 5
+ wanted_types = list(/obj/structure/chair/shadoww)
+
+/datum/bounty/item/assistant/mushroom_chair
+ name = "Mushroom Chairs"
+ description = "Commander Rat is unhappy with his chair. He claims it hurts his back. Ship some mushroom chairs to humor him."
+ reward = 1500
+ required_count = 5
+ wanted_types = list(/obj/structure/chair/gmushroom)
+
+/datum/bounty/item/assistant/plaswood_chair
+ name = "Plaswood Chairs"
+ description = "Commander Cat is unhappy with his chair. He claims it hurts his back. Ship some plaswood chairs to humor him."
+ reward = 2250
+ required_count = 5
+ wanted_types = list(/obj/structure/chair/plaswood)
diff --git a/icons/mob/inhands/misc/chairs_lefthand.dmi b/icons/mob/inhands/misc/chairs_lefthand.dmi
index 7377787a..f81c187e 100644
Binary files a/icons/mob/inhands/misc/chairs_lefthand.dmi and b/icons/mob/inhands/misc/chairs_lefthand.dmi differ
diff --git a/icons/mob/inhands/misc/chairs_righthand.dmi b/icons/mob/inhands/misc/chairs_righthand.dmi
index f04962de..dc17e80d 100644
Binary files a/icons/mob/inhands/misc/chairs_righthand.dmi and b/icons/mob/inhands/misc/chairs_righthand.dmi differ
diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi
index 5636857e..90e1d9f8 100644
Binary files a/icons/obj/chairs.dmi and b/icons/obj/chairs.dmi differ
diff --git a/icons/obj/crates.dmi b/icons/obj/crates.dmi
index 4165719a..d8cc92e1 100644
Binary files a/icons/obj/crates.dmi and b/icons/obj/crates.dmi differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index 834785ee..8db0f073 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index 67c1a59c..f7a26f80 100644
Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ
diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm
index e693f1c2..062ed470 100644
--- a/modular_citadel/code/modules/client/loadout/suit.dm
+++ b/modular_citadel/code/modules/client/loadout/suit.dm
@@ -213,3 +213,8 @@
name = "Black Suit Jacket"
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/toggle/lawyer/black
+
+/datum/gear/nemes
+ name = "Pharoah tunic"
+ category = SLOT_WEAR_SUIT
+ path = /obj/item/clothing/suit/nemes