Skip to content

Commit

Permalink
my friend plank and some tools (#931)
Browse files Browse the repository at this point in the history
* tools

* nolog

* Update weapons.dm

* Update tools.dm

* Update items.dm

* Update items.dm

* Update items.dm

* stuff

* Update carpenter.dm

* Update Lmason.dm

* Update tools.dm

* Update carpenter.dm

* Update tools.dm

* sz

* wood

* buyable

* Update tools.dm

* finishing touch

* additions

* Update turfs.dm

* woodflor

* fixed

* Update tools.dm

* Update tools.dm

* Update mason.dm

* Update tools.dm

* Update tools.dm

* stonesaw

* Update tools.dm

* Update crafting.dmi

* Update items.dm

* Update items.dm

* Update items.dm

* capitalized

* last touch

* Update structure.dm

* Update roguechair.dm

* Update items.dm

* Update items.dm

* Update structure.dm

---------

Co-authored-by: NPC1314 <110836368+NPC1314@users.noreply.github.com>
  • Loading branch information
cornercube and NPC1314 authored Dec 14, 2024
1 parent 188c2cc commit e17800b
Show file tree
Hide file tree
Showing 15 changed files with 445 additions and 28 deletions.
2 changes: 1 addition & 1 deletion code/game/objects/items/rogueitems/natural/stones.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/obj/item/natural/stone
name = "stone"
desc = "A piece of rough ground stone."
desc = "A piece of rough ground stone. It could be chiseled into a shape more conducive to construction. "
icon_state = "stone1"
gripped_intents = null
dropshrink = 0.75
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/rogueitems/natural/wood.dm
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

/obj/item/grown/log/tree/small
name = "small log"
desc = "A smaller log that came from a larger log. Suitable for building."
desc = "A smaller log that came from a larger log. With a saw, you could turn it into wooden planks."
icon_state = "logsmall"
attacked_sound = 'sound/misc/woodhit.ogg'
max_integrity = 30
Expand Down
8 changes: 5 additions & 3 deletions code/game/objects/structures/beds_chairs/roguechair.dm
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@
buckle_lying = 90
pixel_y = 5
sleepy = 2
debris = list(/obj/item/grown/log/tree/small = 1)
debris = list(/obj/item/natural/plank = 1)


// ------------ GOOD BEDS ----------------------
Expand All @@ -316,7 +316,7 @@
max_buckled_mobs = 2
pixel_y = 0
sleepy = 3
debris = list(/obj/item/grown/log/tree/small = 2)
debris = list(/obj/item/natural/plank)
/// The mob who buckled to this bed second, to avoid other mobs getting pixel-shifted before they unbuckle.
var/mob/living/goldilocks

Expand All @@ -342,7 +342,7 @@
icon_state = "double_wool"
pixel_y = 0
sleepy = 2
debris = list(/obj/item/grown/log/tree/small = 2)
debris = list(/obj/item/natural/plank = 2)


// ------------ ACCEPTABLE BEDS ----------------------
Expand All @@ -354,6 +354,7 @@
/obj/structure/bed/rogue/mediocre
icon_state = "shitbed2"
sleepy = 1
debris = list(/obj/item/grown/log/tree/small = 1)

// Inhumen boss bed. Sleeping on a bear! Kinda comfy, sort of
/obj/structure/bed/rogue/bear
Expand All @@ -370,6 +371,7 @@
name = "uncomfortable bed"
icon_state = "shitbed"
sleepy = 0.5
debris = list(/obj/item/grown/log/tree/small = 1)

/obj/structure/bed/rogue/sleepingbag
name = "sleepcloth"
Expand Down
11 changes: 11 additions & 0 deletions code/modules/cargo/packsrogue/tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,17 @@
cost = 15
contains = /obj/item/rogueweapon/hoe

/datum/supply_pack/rogue/tools/handsaw
name = "handsaw"
cost = 12
contains = /obj/item/rogueweapon/handsaw

/datum/supply_pack/rogue/tools/chisel
name = "chisel"
cost = 12
contains = list(/obj/item/rogueweapon/chisel,
/obj/item/rogueweapon/chisel)

/datum/supply_pack/rogue/tools/bottle
name = "Glass Bottle"
cost = 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
beltr = /obj/item/storage/belt/rogue/pouch/coins/poor
beltl = /obj/item/rogueweapon/hammer/claw
backl = /obj/item/storage/backpack/rogue/backpack
backpack_contents = list(/obj/item/flint = 1, /obj/item/rogueweapon/knife/villager = 1)
backpack_contents = list(/obj/item/flint = 1, /obj/item/rogueweapon/knife/villager = 1, /obj/item/rogueweapon/handsaw = 1. )

H.change_stat("strength", 1)
H.change_stat("intelligence", 1)
H.change_stat("constitution", 1)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
beltl = /obj/item/rogueweapon/pick
backr = /obj/item/rogueweapon/axe/steel
backl = /obj/item/storage/backpack/rogue/backpack
backpack_contents = list(/obj/item/rogueweapon/chisel)
H.change_stat("strength", 1)
H.change_stat("intelligence", 2)
H.change_stat("endurance", 2)
Expand Down
3 changes: 2 additions & 1 deletion code/modules/jobs/job_types/roguetown/serfs/mason.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@
beltr = /obj/item/storage/belt/rogue/pouch/coins/mid
beltl = /obj/item/rogueweapon/hammer/claw
backl = /obj/item/storage/backpack/rogue/backpack
r_hand = /obj/item/rogueweapon/chisel
id = /obj/item/clothing/ring/silver/makers_guild
backpack_contents = list(/obj/item/flint = 1, /obj/item/flashlight/flare/torch/lantern = 1, /obj/item/rogueweapon/knife/villager = 1)
backpack_contents = list(/obj/item/roguekey/mason = 1, /obj/item/flint = 1, /obj/item/flashlight/flare/torch/lantern = 1, /obj/item/rogueweapon/knife/villager = 1, /obj/item/keyring = 1, /obj/item/rogueweapon/handsaw=1)

H.change_stat("strength", 1)
H.change_stat("intelligence", 1)
Expand Down
61 changes: 60 additions & 1 deletion code/modules/roguetown/roguecrafting/items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,66 @@
/obj/item/natural/fibers = 2)
craftdiff = 1

/datum/crafting_recipe/roguetown/plankaxe
name = "crude wooden plank"
result = list(/obj/item/natural/plank)
reqs = list(/obj/item/grown/log/tree/small = 1)
tools = list(/obj/item/rogueweapon/axe)
skillcraft = /datum/skill/craft/carpentry
craftdiff = 1
verbage = "cut"
verbage_tp = "cuts"

/datum/crafting_recipe/roguetown/plank
name = "wooden plank"
result = list(/obj/item/natural/plank,/obj/item/natural/plank)
reqs = list(/obj/item/grown/log/tree/small = 1)
tools = list(/obj/item/rogueweapon/handsaw)
skillcraft = /datum/skill/craft/carpentry
craftdiff = 1
verbage = "saw"
verbage_tp = "saws"

/datum/crafting_recipe/roguetown/plankshort
name = "short wooden plank"
result = list(/obj/item/natural/plankshort, /obj/item/natural/plankshort)
reqs = list(/obj/item/natural/plank = 1)
tools = list(/obj/item/rogueweapon/handsaw)
skillcraft = /datum/skill/craft/carpentry
craftdiff = 1
verbage = "saw"
verbage_tp = "saws"

/datum/crafting_recipe/roguetown/stoneblock
name = "stone block"
result = list(/obj/item/natural/stoneblock, /obj/item/natural/stoneblock)
reqs = list(/obj/item/natural/stone = 1)
tools = list(/obj/item/rogueweapon/chisel)
skillcraft = /datum/skill/craft/masonry
craftdiff = 1
verbage = "chisel"
verbage_tp = "chisels"

/datum/crafting_recipe/roguetown/stoneblocprimitive
name = "crude stone block"
result = list(/obj/item/natural/stoneblock)
reqs = list(/obj/item/natural/stone = 1)
tools = list(/obj/item/natural/stone)
skillcraft = /datum/skill/craft/masonry
craftdiff = 1
verbage = "bash"
verbage_tp = "bashes"

/datum/crafting_recipe/roguetown/stonesaw
name = "crude saw"
result = /obj/item/rogueweapon/handsaw/crude
reqs = list(/obj/item/natural/stone = 2, /obj/item/alch/bone = 1)
tools = /obj/item/rogueweapon/knife
craftdiff = 1
verbage = "hew"
verbage_tp = "hews"
craftdiff = 1

/*========= MISCELLANY ==========*/

/datum/crafting_recipe/roguetown/pestle
Expand All @@ -265,7 +325,6 @@
tools = list(/obj/item/rogueweapon/knife/hunting)
verbage = "crafts"
skillcraft = /datum/skill/craft/masonry
craftdiff = 1

/datum/crafting_recipe/roguetown/mortar
name = "stone mortar"
Expand Down
24 changes: 12 additions & 12 deletions code/modules/roguetown/roguecrafting/structure.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
/datum/crafting_recipe/roguetown/structure/dye_bin_luxury
name = "luxury dye bin"
result = /obj/machinery/dye_bin
reqs = list(/obj/item/grown/log/tree/small = 1,
reqs = list(/obj/item/natural/plank = 2,,
/obj/item/reagent_containers/food/snacks/produce/fyritius = 3,
/obj/item/reagent_containers/food/snacks/produce/pear = 3,
/obj/item/reagent_containers/food/snacks/produce/sunflower = 3,)
Expand All @@ -52,7 +52,7 @@
/datum/crafting_recipe/roguetown/structure/chair
name = "wooden chair"
result = /obj/item/chair/rogue/crafted
reqs = list(/obj/item/grown/log/tree/small = 1)
reqs = list(/obj/item/natural/plank = 2)
verbage = "carpent"
verbage_tp = "carpents"
craftsound = 'sound/foley/Building-01.ogg'
Expand Down Expand Up @@ -82,7 +82,7 @@
/datum/crafting_recipe/roguetown/structure/table
name = "wooden table"
result = /obj/structure/table/wood/crafted
reqs = list(/obj/item/grown/log/tree/small = 1)
reqs = list(/obj/item/natural/plank = 2)
verbage = "carpent"
verbage_tp = "carpents"
craftsound = 'sound/foley/Building-01.ogg'
Expand Down Expand Up @@ -130,7 +130,7 @@
/datum/crafting_recipe/roguetown/structure/closet
name = "closet"
result = /obj/structure/closet/crate/roguecloset/crafted
reqs = list(/obj/item/grown/log/tree/small = 2)
reqs = list(/obj/item/natural/plank = 2)
verbage = "construct"
verbage_tp = "constructs"
craftsound = 'sound/foley/Building-01.ogg'
Expand All @@ -143,7 +143,7 @@
/datum/crafting_recipe/roguetown/structure/coffin
name = "wooden coffin"
result = /obj/structure/closet/crate/coffin
reqs = list(/obj/item/grown/log/tree/small = 2)
reqs = list(/obj/item/natural/plank=3)
verbage = "construct"
verbage_tp = "constructs"
skillcraft = /datum/skill/craft/carpentry
Expand Down Expand Up @@ -231,7 +231,7 @@
/datum/crafting_recipe/roguetown/structure/barrel
name = "wooden barrel"
result = /obj/structure/fermenting_barrel/crafted
reqs = list(/obj/item/grown/log/tree/small = 1)
reqs = list(/obj/item/natural/plank=2)
verbage = "construct"
verbage_tp = "makes"
craftsound = 'sound/foley/Building-01.ogg'
Expand Down Expand Up @@ -274,7 +274,7 @@
/datum/crafting_recipe/roguetown/structure/nicebed
name = "nice bed"
result = /obj/structure/bed/rogue
reqs = list(/obj/item/grown/log/tree/small = 1,
reqs = list(/obj/item/natural/plank=2,
/obj/item/natural/cloth = 1)
tools = list(/obj/item/needle)
verbage = "carpent"
Expand All @@ -286,7 +286,7 @@
/datum/crafting_recipe/roguetown/structure/door
name = "wooden door"
result = /obj/structure/mineral_door/wood/deadbolt
reqs = list(/obj/item/grown/log/tree/small = 2)
reqs = list(/obj/item/natural/plank=2)
verbage = "carpent"
verbage_tp = "carpents"
craftsound = 'sound/foley/Building-01.ogg'
Expand Down Expand Up @@ -332,7 +332,7 @@
/datum/crafting_recipe/roguetown/structure/window
name = "solid window"
result = /obj/structure/roguewindow/solid
reqs = list(/obj/item/grown/log/tree/small = 1,
reqs = list(/obj/item/natural/plank = 1,
/obj/item/natural/glass = 1)
craftsound = 'sound/foley/Building-01.ogg'
skillcraft = /datum/skill/craft/masonry
Expand All @@ -341,7 +341,7 @@
/datum/crafting_recipe/roguetown/structure/windowopen
name = "openable window"
result = /obj/structure/roguewindow/openclose
reqs = list(/obj/item/grown/log/tree/small = 1,
reqs = list(/obj/item/natural/plank = 1,
/obj/item/natural/glass = 1,
/obj/item/ingot/iron = 1)
craftsound = 'sound/foley/Building-01.ogg'
Expand All @@ -351,7 +351,7 @@
/datum/crafting_recipe/roguetown/structure/windowstained
name = "stained glass window (silver)"
result = /obj/structure/roguewindow/stained
reqs = list(/obj/item/natural/stone = 3,
reqs = list(/obj/item/natural/stoneblock = 3,
/obj/item/natural/glass = 2,
/obj/item/ingot/silver = 1)
skillcraft = /datum/skill/craft/masonry
Expand Down Expand Up @@ -487,7 +487,7 @@
/datum/crafting_recipe/roguetown/structure/forge
name = "forge"
result = /obj/machinery/light/rogue/forge
reqs = list(/obj/item/natural/stone = 4,
reqs = list(/obj/item/natural/stoneblock = 4,
/obj/item/rogueore/coal = 1)

verbage = "build"
Expand Down
Loading

0 comments on commit e17800b

Please sign in to comment.