Merge pull request #14731 from WanderingFox95/WanderingFox95-Efink

The E-Fink (Yes, really)
This commit is contained in:
silicons
2021-05-18 17:08:58 -06:00
committed by GitHub
11 changed files with 91 additions and 0 deletions
+36
View File
@@ -100,6 +100,42 @@
"<span class='suicide'>[user] is slitting [user.p_their()] stomach open with the [src.name]! It looks like [user.p_theyre()] trying to commit seppuku.</span>"))
return (BRUTELOSS)
/obj/item/kitchen/efink
name = "E-Fink"
icon_state = "efink"
desc = "The E-Fink is a product by Mending Solutions Inc. Unfortunately it can only mend sliced meat, fruits and dough back to their original state. Unbutchering is not possible."
flags_1 = CONDUCT_1
force = 10
w_class = WEIGHT_CLASS_SMALL
throwforce = 10
hitsound = 'sound/weapons/bladesliceb.ogg'
throw_speed = 3
throw_range = 6
custom_materials = list(/datum/material/iron=12000)
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
sharpness = SHARP_POINTY
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
var/bayonet = FALSE //Can this be attached to a gun?
wound_bonus = -5
bare_wound_bonus = 10
custom_price = PRICE_NORMAL
/obj/item/kitchen/efink/Initialize()
. = ..()
AddComponent(/datum/component/butchering, 80 - force, 100, force - 10) //bonus chance increases depending on force
/obj/item/kitchen/efink/attack(mob/living/carbon/M, mob/living/carbon/user)
if(user.zone_selected == BODY_ZONE_PRECISE_EYES)
return eyestab(M,user)
else
return ..()
/obj/item/kitchen/efink/suicide_act(mob/user)
user.visible_message(pick("<span class='suicide'>[user] is slitting [user.p_their()] wrists with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.</span>", \
"<span class='suicide'>[user] is slitting [user.p_their()] throat with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.</span>", \
"<span class='suicide'>[user] is slitting [user.p_their()] stomach open with the [src.name]! It looks like [user.p_theyre()] trying to commit seppuku.</span>"))
return (BRUTELOSS)
/obj/item/kitchen/knife/ritual
name = "ritual knife"
desc = "The unearthly energies that once powered this blade are now dormant."
@@ -3,6 +3,15 @@
////////////////////////////////////////////////BREAD////////////////////////////////////////////////
/datum/crafting_recipe/food/bread
name = "Bread"
reqs = list(
/obj/item/reagent_containers/food/snacks/breadslice/plain = 5,
)
tools = list(/obj/item/kitchen/efink)
result = /obj/item/reagent_containers/food/snacks/store/bread/plain
subcategory = CAT_BREAD
/datum/crafting_recipe/food/banananutbread
name = "Banana nut bread"
reqs = list(
@@ -66,6 +66,16 @@
////////////////////////////////////////////////MISC RECIPE's////////////////////////////////////////////////
/datum/crafting_recipe/food/meatslab
name = "Meat Slab"
reqs = list(
/obj/item/reagent_containers/food/snacks/meat/rawcutlet = 3,
)
tools = list(/obj/item/kitchen/efink)
result = /obj/item/reagent_containers/food/snacks/meat/slab
subcategory = CAT_MEAT
/datum/crafting_recipe/food/ribs
name = "BBQ Ribs"
reqs = list(
@@ -47,6 +47,24 @@
/////////////////////////////////MISC/////////////////////////////////////
/datum/crafting_recipe/food/dough
name = "Dough"
reqs = list(
/obj/item/reagent_containers/food/snacks/doughslice = 3,
)
tools = list(/obj/item/kitchen/efink)
result = /obj/item/reagent_containers/food/snacks/flatdough
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/Pineapple
name = "Pineapple"
reqs = list(
/obj/item/reagent_containers/food/snacks/pineappleslice = 3,
)
tools = list(/obj/item/kitchen/efink)
result = /obj/item/reagent_containers/food/snacks/grown/pineapple
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/beans
name = "Beans"
time = 40
@@ -194,6 +194,15 @@
////////////////////////////////////////////OTHER////////////////////////////////////////////
/datum/crafting_recipe/food/piedough
name = "Pie Dough"
reqs = list(
/obj/item/reagent_containers/food/snacks/rawpastrybase = 3,
)
tools = list(/obj/item/kitchen/efink)
result = /obj/item/reagent_containers/food/snacks/piedough
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/chococornet
name = "Choco cornet"
reqs = list(
@@ -13,6 +13,14 @@
build_path = /obj/item/kitchen/knife
category = list("initial","Dinnerware")
/datum/design/efink
name = "E-Fink"
id = "efink"
build_type = AUTOLATHE | NO_PUBLIC_LATHE
materials = list(/datum/material/iron = 12000)
build_path = /obj/item/kitchen/efink
category = list("initial","Dinnerware")
/datum/design/fork
name = "Fork"
id = "fork"
+1
View File
@@ -7,6 +7,7 @@
/obj/item/storage/bag/tray = 8,
/obj/item/kitchen/fork = 6,
/obj/item/kitchen/knife = 6,
/obj/item/kitchen/efink = 2,
/obj/item/kitchen/rollingpin = 4,
/obj/item/kitchen/unrollingpin = 4,
/obj/item/reagent_containers/food/drinks/drinkingglass = 8,
Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.