diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm index 7f2fe6a01d..417fd96c85 100644 --- a/code/game/objects/items/kitchen.dm +++ b/code/game/objects/items/kitchen.dm @@ -248,6 +248,24 @@ /obj/item/kitchen/rollingpin/suicide_act(mob/living/carbon/user) user.visible_message("[user] begins flattening [user.p_their()] head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") return BRUTELOSS + +/obj/item/kitchen/unrollingpin + name = "unrolling pin" + desc = "For when you accidentally flattened something." + icon_state = "unrolling_pin" + force = 8 + throwforce = 5 + throw_speed = 3 + throw_range = 7 + w_class = WEIGHT_CLASS_NORMAL + custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 1.5) + attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") + custom_price = PRICE_ALMOST_CHEAP + +/obj/item/kitchen/unrollingpin/suicide_act(mob/living/carbon/user) + user.visible_message("[user] begins unflattening [user.p_their()] head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + return BRUTELOSS + /* Trays moved to /obj/item/storage/bag */ /obj/item/kitchen/knife/scimitar diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 3f84844743..ffcd15c39e 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -248,6 +248,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ null, \ new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 20), \ new/datum/stack_recipe("rolling pin", /obj/item/kitchen/rollingpin, 2, time = 30), \ + new/datum/stack_recipe("unrolling pin", /obj/item/kitchen/unrollingpin, 2, time = 30), \ new/datum/stack_recipe("wooden bucket", /obj/item/reagent_containers/glass/bucket/wood, 2, time = 30), \ new/datum/stack_recipe("painting frame", /obj/item/wallframe/painting, 1, time = 10),\ new/datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), \ diff --git a/code/modules/food_and_drinks/food/snacks/dough.dm b/code/modules/food_and_drinks/food/snacks/dough.dm index e071fb3df7..10b8c946fc 100644 --- a/code/modules/food_and_drinks/food/snacks/dough.dm +++ b/code/modules/food_and_drinks/food/snacks/dough.dm @@ -26,6 +26,17 @@ else ..() +/obj/item/reagent_containers/food/snacks/flatdough/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/kitchen/unrollingpin)) + if(isturf(loc)) + new /obj/item/reagent_containers/food/snacks/dough(loc) + to_chat(user, "You unflatten [src].") + qdel(src) + else + to_chat(user, "You need to put [src] on a surface to undo the rolling!") + else + ..() + // sliceable into 3xdoughslices /obj/item/reagent_containers/food/snacks/flatdough @@ -98,6 +109,17 @@ else ..() +/obj/item/reagent_containers/food/snacks/piedough/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/kitchen/unrollingpin)) + if(isturf(loc)) + new /obj/item/reagent_containers/food/snacks/cakebatter(loc) + to_chat(user, "You unflatten [src].") + qdel(src) + else + to_chat(user, "You need to put [src] on a surface to undo the rolling!") + else + ..() + /obj/item/reagent_containers/food/snacks/piedough name = "pie dough" desc = "Cook it to get a pie." diff --git a/code/modules/vending/dinnerware.dm b/code/modules/vending/dinnerware.dm index b78af9c46b..c5b85ed61c 100644 --- a/code/modules/vending/dinnerware.dm +++ b/code/modules/vending/dinnerware.dm @@ -8,6 +8,7 @@ /obj/item/kitchen/fork = 6, /obj/item/kitchen/knife = 6, /obj/item/kitchen/rollingpin = 4, + /obj/item/kitchen/unrollingpin = 4, /obj/item/reagent_containers/food/drinks/drinkingglass = 8, /obj/item/clothing/suit/apron/chef = 2, /obj/item/storage/box/cups = 2, diff --git a/icons/mob/inhands/equipment/kitchen_lefthand.dmi b/icons/mob/inhands/equipment/kitchen_lefthand.dmi index 93cd988cff..bd3e1f779f 100644 Binary files a/icons/mob/inhands/equipment/kitchen_lefthand.dmi and b/icons/mob/inhands/equipment/kitchen_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/kitchen_righthand.dmi b/icons/mob/inhands/equipment/kitchen_righthand.dmi index 075b4c2033..9e9f21b0f5 100644 Binary files a/icons/mob/inhands/equipment/kitchen_righthand.dmi and b/icons/mob/inhands/equipment/kitchen_righthand.dmi differ diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi index 31312ac9a1..9a4af82449 100644 Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ