Skip to content

Commit

Permalink
planksandstones
Browse files Browse the repository at this point in the history
  • Loading branch information
NPC1314 committed Dec 14, 2024
1 parent 694709a commit 24c9b9e
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 1 deletion.
16 changes: 16 additions & 0 deletions code/game/objects/items/rogueitems/natural/stones.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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("<span class='info'>[user] chisels the stone into a block.</span>")
if(do_after(user, 3 SECONDS))
new /obj/item/natural/stoneblock(get_turf(src.loc))
qdel(src)
return
else
..()

Expand Down Expand Up @@ -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("<span class='info'>[user] chisels the rock into blocks.</span>")
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
Expand Down
33 changes: 33 additions & 0 deletions code/game/objects/items/rogueitems/natural/wood.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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("<span class='notice'>[user] makes a crude plank from [src].</span>")
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("<span class='notice'>[user] makes a crude plank from [src].</span>")
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("<span class='notice'>[user] makes a crude plank from [src].</span>")
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

..()

Check failure on line 89 in code/game/objects/items/rogueitems/natural/wood.dm

View workflow job for this annotation

GitHub Actions / Run Linters

possible unreachable code here

/obj/item/grown/log/tree/stick
seed = null
name = "stick"
Expand Down
10 changes: 10 additions & 0 deletions code/modules/roguetown/roguecrafting/structure.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/roguetown/roguejobs/craftsman/tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified icons/roguetown/items/crafting.dmi
Binary file not shown.

0 comments on commit 24c9b9e

Please sign in to comment.