diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 58b6c358fc7..31bd9ef6355 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -282,3 +282,21 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \ ..() new /obj/item/stack/sheet/leather(drop_location(), amount) qdel(src) + +/obj/item/stack/sheet/animalhide/carp + name = "carp scales" + desc = "The scaly skin of a space carp. It looks quite beatiful when detached from the foul creature who once wore it." + singular_name = "carp scales" + icon_state = "sheet-carp" + inhand_icon_state = "sheet-carp" + merge_type = /obj/item/stack/sheet/animalhide/carp + +GLOBAL_LIST_INIT(carp_recipes, list ( \ + new/datum/stack_recipe("carp costume", /obj/item/clothing/suit/hooded/carp_costume, 4), \ + new/datum/stack_recipe("carp mask", /obj/item/clothing/mask/gas/carp, 1), \ + new/datum/stack_recipe("carpskin chair", /obj/structure/chair/comfy/carp, 2), \ + )) + +/obj/item/stack/sheet/animalhide/carp/get_main_recipes() + . = ..() + . += GLOB.carp_recipes diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 9d3b3256724..956e9c14e4f 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -230,6 +230,15 @@ overlays_from_child_procs = list(image('icons/obj/chairs.dmi', loc, "echair_over", pixel_x = -1)) . = ..() +/obj/structure/chair/comfy/carp + name = "carpskin chair" + desc = "A luxurious chair, the many purple scales reflect the light in a most pleasing manner." + icon_state = "carp_chair" + buildstacktype = /obj/item/stack/sheet/animalhide/carp + +/obj/structure/chair/comfy/carp/GetArmrest() + return mutable_appearance('icons/obj/chairs.dmi', "carp_chair_armrest") + /obj/structure/chair/office anchored = FALSE buildstackamount = 5 diff --git a/code/modules/cargo/exports/sheets.dm b/code/modules/cargo/exports/sheets.dm index 33714ee7525..34c0b7f6a33 100644 --- a/code/modules/cargo/exports/sheets.dm +++ b/code/modules/cargo/exports/sheets.dm @@ -50,6 +50,11 @@ unit_name = "alien hide" export_types = list(/obj/item/stack/sheet/animalhide/xeno) +/datum/export/stack/skin/carp + cost = CARGO_CRATE_VALUE * 0.5 + unit_name = "carp skin" + export_types = list(/obj/item/stack/sheet/animalhide/carp) + /datum/export/stack/licenseplate cost = CARGO_CRATE_VALUE * 0.125 unit_name = "license plate" diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index c567d3e0e08..7b47716e271 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -13,7 +13,7 @@ ai_controller = /datum/ai_controller/hostile_friend speak_chance = 0 turns_per_move = 5 - butcher_results = list(/obj/item/food/fishmeat/carp = 2) + butcher_results = list(/obj/item/food/fishmeat/carp = 2, /obj/item/stack/sheet/animalhide/carp = 1) response_help_continuous = "pets" response_help_simple = "pet" response_disarm_continuous = "gently pushes aside" @@ -167,7 +167,7 @@ obj_damage = 80 melee_damage_lower = 20 melee_damage_upper = 20 - + butcher_results = list(/obj/item/food/fishmeat/carp = 2, /obj/item/stack/sheet/animalhide/carp = 3) var/regen_cooldown = 0 /mob/living/simple_animal/hostile/carp/megacarp/Initialize(mapload) diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi index e290d3586f9..b02e46c9ff6 100644 Binary files a/icons/obj/chairs.dmi and b/icons/obj/chairs.dmi differ diff --git a/icons/obj/stack_objects.dmi b/icons/obj/stack_objects.dmi index e739ad63c7b..40ff7668cdb 100644 Binary files a/icons/obj/stack_objects.dmi and b/icons/obj/stack_objects.dmi differ