diff --git a/code/game/objects/items/rogueitems/natural/stones.dm b/code/game/objects/items/rogueitems/natural/stones.dm index 3d8fdd3280..06bf1011e9 100644 --- a/code/game/objects/items/rogueitems/natural/stones.dm +++ b/code/game/objects/items/rogueitems/natural/stones.dm @@ -33,6 +33,13 @@ var/turf/front = get_step(user,user.dir) S.set_up(1, 1, front) S.start() + if(istype(W, /obj/item/rogueweapon/chisel)) + playsound(src.loc, pick('sound/items/stonestone.ogg'), 100) + user.visible_message("[user] chisels the stone into a block.") + if(do_after(user, 3 SECONDS)) + new /obj/item/natural/stoneblock(get_turf(src.loc)) + qdel(src) + return else ..() @@ -110,6 +117,15 @@ S.set_up(1, 1, front) S.start() return + if(istype(W, /obj/item/rogueweapon/chisel)) + playsound(src.loc, pick('sound/items/stonestone.ogg'), 100) + user.visible_message("[user] chisels the rock into blocks.") + if(do_after(user, 9 SECONDS)) + new /obj/item/natural/stoneblock(get_turf(src.loc)) + new /obj/item/natural/stoneblock(get_turf(src.loc)) + new /obj/item/natural/stoneblock(get_turf(src.loc)) + qdel(src) + return ..() //begin ore loot rocks diff --git a/code/game/objects/items/rogueitems/natural/wood.dm b/code/game/objects/items/rogueitems/natural/wood.dm index 327d3f4c82..2d0662f488 100644 --- a/code/game/objects/items/rogueitems/natural/wood.dm +++ b/code/game/objects/items/rogueitems/natural/wood.dm @@ -55,6 +55,39 @@ w_class = WEIGHT_CLASS_BULKY smeltresult = /obj/item/rogueore/coal +/obj/item/grown/log/tree/small/attackby(obj/item/I, mob/living/user, params) // remake to use /datum/intent/axe/cut or TO DO never do maybe + user.changeNext_move(CLICK_CD_MELEE) + if(istype(I, /obj/item/rogueweapon/axe)) + playsound(get_turf(src.loc), 'sound/items/wood_sharpen.ogg', 100) + if(do_after(user, 10 SECONDS)) + user.visible_message("[user] makes a crude plank from [src].") + var/obj/item/natural/plank/S = new /obj/item/natural/plank(get_turf(src.loc)) + if(user.is_holding(src)) + user.dropItemToGround(src) + user.put_in_hands(S) + qdel(src) + if(istype(I, /obj/item/rogueweapon/polearm/halberd/bardiche)) + playsound(get_turf(src.loc), 'sound/items/wood_sharpen.ogg', 100) + if(do_after(user, 10 SECONDS)) + user.visible_message("[user] makes a crude plank from [src].") + var/obj/item/natural/plank/S = new /obj/item/natural/plank(get_turf(src.loc)) + if(user.is_holding(src)) + user.dropItemToGround(src) + user.put_in_hands(S) + qdel(src) + if(istype(I, /obj/item/rogueweapon/handsaw)) + playsound(get_turf(src.loc), 'sound/items/wood_sharpen.ogg', 100) + if(do_after(user, 2 SECONDS)) + user.visible_message("[user] makes a crude plank from [src].") + var/obj/item/natural/plank/S = new /obj/item/natural/plank(get_turf(src.loc)) + if(user.is_holding(src)) + user.dropItemToGround(src) + user.put_in_hands(S) + qdel(src) + return + + ..() + /obj/item/grown/log/tree/stick seed = null name = "stick" diff --git a/code/modules/roguetown/roguecrafting/structure.dm b/code/modules/roguetown/roguecrafting/structure.dm index 916d3541bb..3da5058716 100644 --- a/code/modules/roguetown/roguecrafting/structure.dm +++ b/code/modules/roguetown/roguecrafting/structure.dm @@ -484,6 +484,16 @@ craftsound = null craftdiff = 2 +/datum/crafting_recipe/roguetown/structure/smelter_block + name = "ore furnace" + result = /obj/machinery/light/rogue/smelter + reqs = list(/obj/item/natural/stoneblock = 4, + /obj/item/rogueore/coal = 1) + verbage = "build" + verbage_tp = "builds" + craftsound = null + craftdiff = 2 + /datum/crafting_recipe/roguetown/structure/forge name = "forge" result = /obj/machinery/light/rogue/forge diff --git a/code/modules/roguetown/roguejobs/craftsman/tools.dm b/code/modules/roguetown/roguejobs/craftsman/tools.dm index f41477b4a6..faacef18df 100644 --- a/code/modules/roguetown/roguejobs/craftsman/tools.dm +++ b/code/modules/roguetown/roguejobs/craftsman/tools.dm @@ -141,7 +141,7 @@ icon = 'icons/roguetown/items/crafting.dmi' icon_state = "stoneblock" gripped_intents = null - dropshrink = 0.75 +// dropshrink = 0.9 possible_item_intents = list(INTENT_GENERIC) force = 12 throwforce = 20 //brick is valid weapon diff --git a/icons/roguetown/items/crafting.dmi b/icons/roguetown/items/crafting.dmi index 1fb342ebdb..ab3e979e52 100644 Binary files a/icons/roguetown/items/crafting.dmi and b/icons/roguetown/items/crafting.dmi differ