Skip to content
Open
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
9 changes: 9 additions & 0 deletions code/game/objects/items/tools/chisel.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,17 @@
melting_material = /datum/material/iron
toolspeed = 1.1

/obj/item/weapon/chisel/stone
name = "flint chisel"
icon_state = "stonechisel"
icon = 'icons/roguetown/weapons/tools.dmi'
smeltresult = /obj/item/natural/stone
toolspeed = 1

/obj/item/weapon/chisel/bronze
name = "bronze chisel"
icon_state = "bchisel"
icon = 'icons/roguetown/weapons/tools.dmi'
smeltresult = /obj/item/ingot/bronze
melting_material = /datum/material/bronze
toolspeed = 1.2
Expand Down
21 changes: 21 additions & 0 deletions code/game/objects/items/tools/hammer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,27 @@
no_spark = TRUE
item_weight = 1.12 KILOGRAMS

/obj/item/weapon/hammer/stone
name = "stone hammer"
desc = "A simple, if crude and primitive hammer."
icon_state = "stonehammer"
icon = 'icons/roguetown/weapons/tools.dmi'
force = DAMAGE_HAMMER - 4
max_integrity = INTEGRITY_POOR
melting_material = /obj/item/natural/stone
toolspeed = 1
no_spark = TRUE
item_weight = 1.1 KILOGRAMS

/obj/item/weapon/hammer/stone/rock
name = "hammerstone"
desc = "A simple rock, rounded and turned almost into a proper tool."
icon_state = "hammerstone"
force = DAMAGE_HAMMER - 6
max_integrity = INTEGRITY_WORST
toolspeed = 0.8
item_weight = 0.8 KILOGRAMS

/obj/item/weapon/hammer/sledgehammer
name = "sledgehammer"
desc = "It's almost asking to be put to work."
Expand Down
31 changes: 31 additions & 0 deletions code/modules/crafting/quality_of_crafting/natural_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,37 @@
attacked_atom = /obj/item/natural/stone
output = /obj/item/reagent_containers/glass/bucket/pot

/datum/repeatable_crafting_recipe/survival/stone_hammer
name = "stone hammer"
requirements = list(
/obj/item/natural/stone = 2,
/obj/item/grown/log/tree/stick = 1,
)

starting_atom = /obj/item/natural/stone
attacked_atom = /obj/item/grown/log/tree/stick
output = /obj/item/weapon/hammer/stone

/datum/repeatable_crafting_recipe/survival/stone_hammer/rock
name = "hammerstone"
requirements = list(
/obj/item/natural/stone = 2,
)

starting_atom = /obj/item/natural/stone
attacked_atom = /obj/item/natural/stone
output = /obj/item/weapon/hammer/stone/rock

/datum/repeatable_crafting_recipe/survival/stone_chisel
name = "flint chisel"
requirements = list(
/obj/item/natural/stone = 2,
)

starting_atom = /obj/item/natural/stone
attacked_atom = /obj/item/natural/stone
output = /obj/item/weapon/chisel/stone

/datum/repeatable_crafting_recipe/survival/flint
name = "flint"
requirements = list(
Expand Down
Binary file added icons/roguetown/mob/monster/greyhound.dmi
Binary file not shown.
Binary file modified icons/roguetown/weapons/tools.dmi
Binary file not shown.
Loading