Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions code/datums/craft/recipes/weapon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,15 @@
list(CRAFT_MATERIAL, 1, MATERIAL_STEEL)
)

/datum/craft_recipe/weapon/jager_knife
name = "jager knife"
result = /obj/item/tool/knife/jager
steps = list(
list(/obj/item/stack/rods, 2,),
list(/obj/item/reagent_containers/food/snacks/meat/roachmeat/jager_claw, "time" = 10),
list(/obj/item/stack/cable_coil, 2, "time" = 10),
)

/datum/craft_recipe/weapon/hook
name = "steel meathook"
result = /obj/item/tool/knife/hook
Expand Down Expand Up @@ -278,6 +287,19 @@
list(QUALITY_WELDING, 10, "time" = 30),
list(QUALITY_HAMMERING, 5, 10))

/datum/craft_recipe/weapon/jager_spear
name = "jager spear"
result = /obj/item/tool/spear/jager
steps = list(
list(/obj/item/stack/rods, 2, "time" = 30),
list(QUALITY_WELDING, 10, "time" = 30),
list(/obj/item/stack/cable_coil, 2, "time" = 10),
list(CRAFT_MATERIAL, 2, MATERIAL_STEEL, "time" = 10),
list(QUALITY_WELDING, 10, "time" = 30),
list(/obj/item/reagent_containers/food/snacks/meat/roachmeat/jager_claw, "time" = 10),
list(QUALITY_ADHESIVE, 15, 70)
)

/datum/craft_recipe/weapon/bone
name = "bone club"
result = /obj/item/tool/hammer/mace/makeshift/baseballbat/bone
Expand Down
21 changes: 21 additions & 0 deletions code/game/objects/items/weapons/tools/knives.dm
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,15 @@
tool_qualities = list(QUALITY_CUTTING = 20, QUALITY_WIRE_CUTTING = 10, QUALITY_SCREW_DRIVING = 15)
rarity_value = 20

/obj/item/tool/knife/jager
name = "jager knife"
desc = "A jager claw, wrapped to a metal rod."
icon = 'icons/obj/weapons.dmi'
icon_state = "knife_jager"
item_state = "knife_jager"
force = WEAPON_FORCE_PAINFUL
matter = list(MATERIAL_BIOMATTER = 5)

/obj/item/tool/knife/hook
name = "meat hook"
desc = "A sharp, metal hook what sticks into things."
Expand Down Expand Up @@ -412,6 +421,18 @@
if(istype(target))
target.apply_effect(rand(60, 65), IRRADIATE)

/obj/item/tool/spear/jager
name = "jager spear"
desc = "A jager claw tied to a crude metal shaft. It'll serve well enough."
icon_state = "spear_jager"
item_state = "spear_jager"
wielded_icon = "spear_jager_wielded"
force = WEAPON_FORCE_DANGEROUS
throwforce = WEAPON_FORCE_ROBUST
armor_divisor = ARMOR_PEN_DEEP
tool_qualities = list(QUALITY_CUTTING = 10, QUALITY_WIRE_CUTTING = 5, QUALITY_SCREW_DRIVING = 5)
matter = list(MATERIAL_BIOMATTER = 10)

/obj/item/tool/spear/makeshift_halberd
name = "makeshift halberd"
desc = "Slap a heavy blade on some rods duct-taped together and call it a day."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
attacktext = list("slashed", "rended", "diced")


butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/roachmeat/jager = list(4, BUTCHER_DIFFICULT))
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/roachmeat/jager_claw = list(2, BUTCHER_DIFFICULT), /obj/item/reagent_containers/food/snacks/meat/roachmeat/jager = list(4, BUTCHER_DIFFICULT))
rarity_value = 11.25

// Armor related variables - jager jacket
Expand Down
8 changes: 8 additions & 0 deletions code/modules/reagents/reagent_containers/food/snacks/meat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,14 @@
desc = "A slab of sickly-green bubbling meat cut from a jager roach. You swear you can see it still twitching. Delicious!"
preloaded_reagents = list("protein" = 6, "blattedin" = 6, "gewaltine" = 8, "diplopterum" = 2)

/obj/item/reagent_containers/food/snacks/meat/roachmeat/jager_claw
name = "Jager claw"
desc = "A claw from a jager roach. Delicious!"
icon_state = "meat_jagerclaw"
slice_path = /obj/item/reagent_containers/food/snacks/meat/crab
slices_num = 1
preloaded_reagents = list("protein" = 6, "blattedin" = 6, "gewaltine" = 8, "diplopterum" = 2)

/obj/item/reagent_containers/food/snacks/meat/roachmeat/kraftwerk
name = "kraftwerk meat"
desc = "A slab of sickly-green meat cut from a kraftwerk roach, bursting with nanite activity. Delicious!"
Expand Down
Binary file modified icons/mob/inhands/weapons/polearms_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/weapons/polearms_righthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/weapons/swords_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/weapons/swords_righthand.dmi
Binary file not shown.
Binary file modified icons/obj/food.dmi
Binary file not shown.
Binary file modified icons/obj/weapons.dmi
Binary file not shown.
Loading