Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

my friend plank and some tools #931

Merged
merged 70 commits into from
Dec 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
3fbc1cb
tools
cornercube Oct 12, 2024
d5d8b9b
Merge branch 'Darkrp-community:main' into planked
cornercube Oct 12, 2024
bcc37e7
nolog
cornercube Oct 12, 2024
c8e2b50
Update weapons.dm
cornercube Oct 15, 2024
5498062
Update tools.dm
cornercube Oct 21, 2024
3e19141
Update items.dm
cornercube Oct 25, 2024
8786d5f
Merge branch 'main' into planked
cornercube Oct 28, 2024
7d59a4d
Merge branch 'main' into planked
cornercube Oct 28, 2024
408add9
Update items.dm
cornercube Oct 28, 2024
d7456eb
Update items.dm
cornercube Oct 28, 2024
fd10a41
stuff
cornercube Oct 30, 2024
9f04855
Update carpenter.dm
cornercube Nov 3, 2024
8236ae7
Update Lmason.dm
cornercube Nov 3, 2024
5df92ba
Update tools.dm
cornercube Nov 3, 2024
b9e99d1
Merge branch 'main' into planked
cornercube Nov 12, 2024
368c225
Update carpenter.dm
cornercube Nov 12, 2024
3c330ff
Update tools.dm
cornercube Nov 12, 2024
765b0e8
Merge branch 'main' into planked
cornercube Nov 13, 2024
511a44f
Merge branch 'main' into planked
cornercube Nov 14, 2024
f9a05c8
sz
cornercube Nov 14, 2024
582d862
wood
cornercube Nov 14, 2024
712884d
buyable
cornercube Nov 14, 2024
5209e18
Update tools.dm
cornercube Nov 14, 2024
4d7a4d1
Merge branch 'main' into planked
cornercube Nov 15, 2024
ae3e9a5
finishing touch
cornercube Nov 18, 2024
86b67a1
Merge remote-tracking branch 'upstream/main' into planked
cornercube Nov 20, 2024
277a4df
additions
cornercube Nov 20, 2024
5fb954a
Update turfs.dm
cornercube Nov 20, 2024
2fd7ad8
woodflor
cornercube Nov 20, 2024
0935fc7
Merge branch 'planked' of https://github.com/cornercube/OpenKeep into…
cornercube Nov 20, 2024
ac6d863
Merge branch 'main' into planked
cornercube Nov 21, 2024
cb3d579
Merge branch 'main' into planked
NPC1314 Nov 21, 2024
bee8ab9
Merge branch 'planked' of https://github.com/cornercube/OpenKeep into…
cornercube Nov 22, 2024
9639ec6
fixed
cornercube Nov 22, 2024
8b4aa85
Update tools.dm
cornercube Nov 22, 2024
f631882
Update tools.dm
cornercube Nov 22, 2024
71bba6b
Merge branch 'main' into planked
cornercube Nov 22, 2024
57fa759
Update mason.dm
cornercube Nov 22, 2024
e47149c
Merge branch 'planked' of https://github.com/cornercube/OpenKeep into…
cornercube Nov 22, 2024
f5b304b
Update tools.dm
cornercube Nov 22, 2024
e90e9e4
Merge branch 'main' into planked
cornercube Nov 23, 2024
4de4777
Merge branch 'main' into planked
NPC1314 Nov 23, 2024
c071c39
Merge branch 'main' into planked
NPC1314 Nov 24, 2024
e631bb0
Update tools.dm
cornercube Nov 24, 2024
0be3001
stonesaw
cornercube Nov 24, 2024
616282b
Merge branch 'main' into planked
cornercube Nov 24, 2024
d62fc37
Update tools.dm
cornercube Nov 24, 2024
0d05fa1
Merge branch 'planked' of https://github.com/cornercube/OpenKeep into…
cornercube Nov 24, 2024
08a8902
Update crafting.dmi
cornercube Nov 24, 2024
c5e0cfe
Update items.dm
cornercube Nov 24, 2024
06f62a9
Merge branch 'main' into planked
cornercube Nov 26, 2024
204e691
Update items.dm
cornercube Nov 26, 2024
927e428
Update items.dm
cornercube Nov 26, 2024
908366c
capitalized
cornercube Nov 27, 2024
a772839
Merge branch 'main' into planked
cornercube Nov 27, 2024
af53bd8
last touch
cornercube Nov 28, 2024
787213b
Merge branch 'main' into planked
cornercube Nov 28, 2024
ea450d1
Merge branch 'main' into planked
cornercube Nov 29, 2024
696a039
Merge branch 'main' into planked
cornercube Dec 1, 2024
a79e2a7
Merge branch 'main' into planked
NPC1314 Dec 2, 2024
5b41b33
Merge branch 'main' into planked
NPC1314 Dec 2, 2024
4feead0
Update structure.dm
cornercube Dec 3, 2024
6d45df6
Merge branch 'main' into planked
cornercube Dec 5, 2024
a2cc971
Update roguechair.dm
cornercube Dec 5, 2024
744821c
Merge branch 'main' into planked
NPC1314 Dec 6, 2024
da64857
Merge branch 'main' into planked
cornercube Dec 9, 2024
730648e
Update items.dm
cornercube Dec 9, 2024
14c3688
Update items.dm
cornercube Dec 9, 2024
d21dd5f
Update structure.dm
cornercube Dec 9, 2024
44639d3
Merge branch 'main' into planked
NPC1314 Dec 14, 2024
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
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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two chisels?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, they are smaller items compared to the handsaw, so figured you could get more than one like with daggers


/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
Loading