diff --git a/code/game/objects/items/tools/chisel.dm b/code/game/objects/items/tools/chisel.dm index 47121b450e7..0344967f54c 100644 --- a/code/game/objects/items/tools/chisel.dm +++ b/code/game/objects/items/tools/chisel.dm @@ -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 diff --git a/code/game/objects/items/tools/hammer.dm b/code/game/objects/items/tools/hammer.dm index f4ef393c683..ee96a52bc8f 100644 --- a/code/game/objects/items/tools/hammer.dm +++ b/code/game/objects/items/tools/hammer.dm @@ -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." diff --git a/code/modules/crafting/quality_of_crafting/natural_items.dm b/code/modules/crafting/quality_of_crafting/natural_items.dm index 45023dacb23..5a5a8e477d3 100644 --- a/code/modules/crafting/quality_of_crafting/natural_items.dm +++ b/code/modules/crafting/quality_of_crafting/natural_items.dm @@ -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( diff --git a/icons/roguetown/mob/monster/greyhound.dmi b/icons/roguetown/mob/monster/greyhound.dmi new file mode 100644 index 00000000000..4aae60b71b8 Binary files /dev/null and b/icons/roguetown/mob/monster/greyhound.dmi differ diff --git a/icons/roguetown/weapons/tools.dmi b/icons/roguetown/weapons/tools.dmi index f69b31b9eb3..5cb848d4d1c 100644 Binary files a/icons/roguetown/weapons/tools.dmi and b/icons/roguetown/weapons/tools.dmi differ