Skip to content

The Great Hunt: Finally able to be truthfully to your religion #5823

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.

Sign up for GitHub

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

Open
Spitegremlin wants to merge 7 commits into
base: main
Choose a base branch
from
+345 −79
Open

The Great Hunt: Finally able to be truthfully to your religion #5823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
af96fba
Overall editting on uses for bone and sinew
Spitegremlin Mar 25, 2026
b6c1ec2
Fixed some minor stuff, or reversed them
Spitegremlin Mar 26, 2026
a5478d3
Merge branch 'main' into NewBoneAndSinewStuff
Spitegremlin Mar 26, 2026
397d026
Fixed error
Spitegremlin Mar 26, 2026
c247707
Merge branch 'NewBoneAndSinewStuff' of https://github.com/Spitegremli…
Spitegremlin Mar 26, 2026
dd25d47
Fixed another error i caused
Spitegremlin Mar 26, 2026
4da5c43
Update code/game/objects/items/natural/clothfibersthorn.dm
Spitegremlin Mar 28, 2026
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
14 changes: 14 additions & 0 deletions code/datums/components/container_craft/recipes/cooking_pot/soups.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,17 @@

/datum/container_craft/cooking/cheese_soup/wedge
requirements = list(/obj/item/reagent_containers/food/snacks/cheese_wedge = 1)

/datum/container_craft/cooking/bone_broth
name = "Bone Broth"
created_reagent = /datum/reagent/consumable/soup/bone
requirements = list(/obj/item/alch/sinew = 1)
max_optionals = 2
optional_wildcard_requirements = list(
/obj/item/alch/bone = 2
)
finished_smell = /datum/pollutant/food/bone_broth
crafting_time = 40 SECONDS

/datum/container_craft/cooking/bone_broth/real_bone
requirements = list(/obj/item/alch/bone = 1)
4 changes: 4 additions & 0 deletions code/datums/pollutants/foods.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,10 @@
name = "borowiki stew"
scent = "borowiki stew"

/datum/pollutant/food/bone_broth
name = "bone broth"
scent = "bone broth"

/datum/pollutant/food/cheese_soup
name = "cheese soup"
scent = "cheese soup"
Expand Down
41 changes: 39 additions & 2 deletions code/game/objects/items/natural/clothfibersthorn.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,23 @@
list("From Threshing Chaff.", /obj/item/natural/chaff/wheat)
)

/obj/item/natural/animalfibers
Copy link
Copy Markdown
Collaborator

@CheffieGithub CheffieGithub Mar 28, 2026

Choose a reason for hiding this comment

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

This has no source? you should just call this sinew and replace sinew with it I don't think alch has anything on it anymore

Copy link
Copy Markdown
Author

@Spitegremlin Spitegremlin Mar 28, 2026

Choose a reason for hiding this comment

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

what do you mean by replace sinew with it? I dont mind just renaming animalfibers to sinew because it wouldnt affect anything, just dont get what you mean by that part

Copy link
Copy Markdown
Collaborator

@CheffieGithub CheffieGithub Mar 28, 2026

Choose a reason for hiding this comment

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

replace /obj/item/alch/sinew with /obj/item/natural/animalfibers(sinew)

name = "sinew fiber"
desc = "Sinew fiber. Made from butchered animals sinew, commonly used by hunters for leatherworking and bowcrafting."
icon_state = "fibers"
possible_item_intents = list(/datum/intent/use)
force = 0
throwforce = 0
color = "#EEEADE"
firefuel = 2 MINUTES
resistance_flags = FLAMMABLE
slot_flags = ITEM_SLOT_MOUTH
max_integrity = 20
muteinmouth = TRUE
w_class = WEIGHT_CLASS_TINY
spitoutmouth = FALSE
bundletype = /obj/item/natural/bundle/animalfibers

/obj/item/natural/silk
name = "silk"
icon_state = "fibers"
Expand Down Expand Up @@ -113,6 +130,26 @@
amount = maxamount
update_bundle()

/obj/item/natural/bundle/animalfibers
name = "sinew fiber bundle"
desc = "Sinewy fibers, tightly bound together."
icon_state = "fibersroll1"
possible_item_intents = list(/datum/intent/use)
force = 0
throwforce = 0
maxamount = 9
color = "#EEEADE"
firemod = 2 MINUTES
resistance_flags = FLAMMABLE
slot_flags = ITEM_SLOT_MOUTH
max_integrity = 20
muteinmouth = TRUE
w_class = WEIGHT_CLASS_TINY
spitoutmouth = FALSE
stacktype = /obj/item/natural/animalfibers
icon1step = 3
icon2step = 6

/obj/item/natural/bundle/silk
name = "silken weave"
icon_state = "fibersroll1"
Expand Down Expand Up @@ -179,13 +216,13 @@
icon3 = "stickbundle3"

/obj/item/natural/bowstring
name = "fibre bowstring"
name = "bowstring"
desc = "A simple cord of bowstring."
icon_state = "fibers"
possible_item_intents = list(/datum/intent/use)
force = 0
throwforce = 0
color = COLOR_BEIGE
color = "#EEEADE"
firefuel = 5 MINUTES
resistance_flags = FLAMMABLE
slot_flags = ITEM_SLOT_MOUTH
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/plate.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@
playsound(src, 'sound/foley/break_clay.ogg', 90, TRUE)
qdel(src)


/obj/item/plate/copper
name = "copper platter"
desc = "A platter made from a sheet of copper. Known to impart a metallic taste when eating certain foods."
Expand Down
28 changes: 28 additions & 0 deletions code/game/objects/items/weapons/melee/axes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@
force_wielded = DAMAGE_BAD_AXE_WIELD
wdefense = MEDIOCRE_PARRY
wlength = WLENGTH_SHORT
anvilrepair = /datum/attribute/skill/craft/crafting
max_blade_int = 100
max_integrity = INTEGRITY_WORST
minstr = 8
Expand All @@ -360,6 +361,33 @@
return list("shrink" = 0.3,"sx" = -2,"sy" = -5,"nx" = 4,"ny" = -5,"wx" = 0,"wy" = -5,"ex" = 2,"ey" = -5,"nturn" = 0,"sturn" = 0,"wturn" = 0,"eturn" = 0,"nflip" = 0,"sflip" = 0,"wflip" = 0,"eflip" = 0,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0)
return ..()

/obj/item/weapon/axe/trollboneaxe
name = "troll-horn bone axe"
desc = "A rough axe made of bones, strengthed with an troll's horn."
icon_state = "boneaxe"
force = DAMAGE_BAD_AXE
force_wielded = DAMAGE_BAD_AXE_WIELD
wdefense = MEDIOCRE_PARRY
wlength = WLENGTH_SHORT
anvilrepair = /datum/attribute/skill/craft/crafting
max_blade_int = 150
max_integrity = INTEGRITY_WORST + 50
minstr = 8

smeltresult = /obj/item/fertilizer/ash
pickup_sound = 'sound/foley/equip/rummaging-03.ogg'

/obj/item/weapon/axe/trollboneaxe/getonmobprop(tag)
if(tag)
switch(tag)
if("gen")
return list("shrink" = 0.5,"sx" = -9,"sy" = -8,"nx" = 9,"ny" = -7,"wx" = -7,"wy" = -8,"ex" = 3,"ey" = -8,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0,"nturn" = 90,"sturn" = -90,"wturn" = -90,"eturn" = 90,"nflip" = 0,"sflip" = 8,"wflip" = 8,"eflip" = 0)
if("wielded")
return list("shrink" = 0.6,"sx" = 3,"sy" = -7,"nx" = -6,"ny" = -3,"wx" = 3,"wy" = -4,"ex" = 4,"ey" = -3,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0,"nturn" = -44,"sturn" = 45,"wturn" = 47,"eturn" = 33,"nflip" = 8,"sflip" = 0,"wflip" = 0,"eflip" = 0)
if("onbelt")
return list("shrink" = 0.3,"sx" = -2,"sy" = -5,"nx" = 4,"ny" = -5,"wx" = 0,"wy" = -5,"ex" = 2,"ey" = -5,"nturn" = 0,"sturn" = 0,"wturn" = 0,"eturn" = 0,"nflip" = 0,"sflip" = 0,"wflip" = 0,"eflip" = 0,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0)
return ..()

//................ Great Axe ............... //
/obj/item/weapon/greataxe
name = "greataxe"
Expand Down
124 changes: 96 additions & 28 deletions code/game/objects/items/weapons/melee/polearms.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,33 +146,6 @@
max_blade_int = 200
melting_material = /datum/material/steel

/obj/item/weapon/polearm/spear/assegai
name = "iron assegai"
desc = "A long throwing spear originating from the east."
icon = 'icons/roguetown/weapons/64/polearms.dmi'
icon_state = "assegai_iron"
force = DAMAGE_SPEAR
force_wielded = DAMAGE_SPEARPLUS + 2
throwforce = DAMAGE_SPEAR_WIELD
wbalance = GOOD_PARRY
wlength = WLENGTH_LONG
minstr = 6

gripsprite = FALSE
throw_speed = 2
embedding = list("embedded_pain_multiplier" = 3, "embed_chance" = 50, "embedded_fall_chance" = 0, "embedded_ignore_throwspeed_threshold" = 1)

/obj/item/weapon/polearm/spear/assegai/steel
name = "steel assegai"
icon = 'icons/roguetown/weapons/64/polearms.dmi'
icon_state = "assegai_steel"
force = DAMAGE_SPEARPLUS
force_wielded = DAMAGE_SPEAR_WIELD - 3
wbalance = GREAT_PARRY
max_blade_int = 200

gripsprite = FALSE
melting_material = /datum/material/steel

//................ Psydonian Spear ............... //
/obj/item/weapon/polearm/spear/psydon
Expand Down Expand Up @@ -261,6 +234,34 @@
sellprice = 5

//................ Javelin ............... //
/obj/item/weapon/polearm/spear/assegai
name = "iron assegai"
desc = "A long throwing spear originating from the east."
icon = 'icons/roguetown/weapons/64/polearms.dmi'
icon_state = "assegai_iron"
force = DAMAGE_SPEAR
force_wielded = DAMAGE_SPEARPLUS + 2
throwforce = DAMAGE_SPEAR_WIELD
wbalance = GOOD_PARRY
wlength = WLENGTH_LONG
minstr = 6

gripsprite = FALSE
throw_speed = 2
embedding = list("embedded_pain_multiplier" = 3, "embed_chance" = 50, "embedded_fall_chance" = 0, "embedded_ignore_throwspeed_threshold" = 1)

/obj/item/weapon/polearm/spear/assegai/steel
name = "steel assegai"
icon = 'icons/roguetown/weapons/64/polearms.dmi'
icon_state = "assegai_steel"
force = DAMAGE_SPEARPLUS
force_wielded = DAMAGE_SPEAR_WIELD - 3
wbalance = GREAT_PARRY
max_blade_int = 200

gripsprite = FALSE
melting_material = /datum/material/steel

/obj/item/weapon/polearm/spear/stone/copper
name = "javelin"
desc = "Made for throwing, long out of favor and using inferior metals, it still can kill when the aim is true."
Expand All @@ -275,7 +276,7 @@
sellprice = 15
throw_speed = 3
embedding = list("embedded_pain_multiplier" = 4, "embed_chance" = 50, "embedded_fall_chance" = 0, "embedded_ignore_throwspeed_threshold" = 1)

d
/obj/item/weapon/polearm/spear/stone/copper/getonmobprop(tag)
. = ..()
if(tag)
Expand All @@ -285,6 +286,52 @@
if("wielded")
return list("shrink" = 0.7,"sx" = 5,"sy" = -3,"nx" = -5,"ny" = -2,"wx" = -5,"wy" = -1,"ex" = 3,"ey" = -2,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0,"nturn" = 7,"sturn" = -7,"wturn" = 16,"eturn" = -22,"nflip" = 8,"sflip" = 0,"wflip" = 8,"eflip" = 0)

/obj/item/weapon/polearm/spear/bone
name = "bone javelin"
desc = "Made by the tribes of the wilds for hunting, this spear has will eventually kill your prey, if aim remains true."
icon_state = "bspear"
throwforce = DAMAGE_SPEAR_WIELD
max_blade_int = 60
max_integrity = INTEGRITY_POOR
minstr = 6
anvilrepair = /datum/attribute/skill/craft/crafting
dropshrink = 0.9
sellprice = 5
throw_speed = 4
embedding = list("embedded_pain_multiplier" = 4, "embed_chance" = 50, "embedded_fall_chance" = 0, "embedded_ignore_throwspeed_threshold" = 1)

/obj/item/weapon/polearm/spear/bone/getonmobprop(tag)
. = ..()
if(tag)
switch(tag)
if("gen")
return list("shrink" = 0.7,"sx" = -7,"sy" = 2,"nx" = 7,"ny" = 3,"wx" = -2,"wy" = 1,"ex" = 1,"ey" = 1,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0,"nturn" = -38,"sturn" = 37,"wturn" = 30,"eturn" = -30,"nflip" = 0,"sflip" = 8,"wflip" = 8,"eflip" = 0)
if("wielded")
return list("shrink" = 0.7,"sx" = 5,"sy" = -3,"nx" = -5,"ny" = -2,"wx" = -5,"wy" = -1,"ex" = 3,"ey" = -2,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0,"nturn" = 7,"sturn" = -7,"wturn" = 16,"eturn" = -22,"nflip" = 8,"sflip" = 0,"wflip" = 8,"eflip" = 0)

/obj/item/weapon/polearm/spear/trollbone
name = "troll-horn bone javelin"
desc = "Made by the tribes of the wilds for hunting, and strengthed with a troll's horn, this spear has will outlast your prey, if aim remains true."
icon_state = "bspear"
throwforce = DAMAGE_SPEAR_WIELD
max_blade_int = 60
max_integrity = INTEGRITY_POOR
minstr = 6
anvilrepair = /datum/attribute/skill/craft/crafting
dropshrink = 0.9
sellprice = 5
throw_speed = 4
embedding = list("embedded_pain_multiplier" = 4, "embed_chance" = 50, "embedded_fall_chance" = 0, "embedded_ignore_throwspeed_threshold" = 1)

/obj/item/weapon/polearm/spear/trollbone/getonmobprop(tag)
. = ..()
if(tag)
switch(tag)
if("gen")
return list("shrink" = 0.7,"sx" = -7,"sy" = 2,"nx" = 7,"ny" = 3,"wx" = -2,"wy" = 1,"ex" = 1,"ey" = 1,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0,"nturn" = -38,"sturn" = 37,"wturn" = 30,"eturn" = -30,"nflip" = 0,"sflip" = 8,"wflip" = 8,"eflip" = 0)
if("wielded")
return list("shrink" = 0.7,"sx" = 5,"sy" = -3,"nx" = -5,"ny" = -2,"wx" = -5,"wy" = -1,"ex" = 3,"ey" = -2,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0,"nturn" = 7,"sturn" = -7,"wturn" = 16,"eturn" = -22,"nflip" = 8,"sflip" = 0,"wflip" = 8,"eflip" = 0)


//................ Halberd ............... //
/obj/item/weapon/polearm/halberd
Expand Down Expand Up @@ -586,6 +633,7 @@
force = DAMAGE_SPEARPLUS
force_wielded = DAMAGE_SPEAR_WIELD - 3
throwforce = DAMAGE_SPEARPLUS + 2
anvilrepair = /datum/attribute/skill/craft/crafting
max_blade_int = 75
max_integrity = INTEGRITY_WORST * 0.8
minstr = 6
Expand All @@ -597,6 +645,26 @@
w_class = WEIGHT_CLASS_BULKY
melting_material = null

/obj/item/weapon/polearm/spear/trollbonespear
name = "troll-horn bone spear"
desc = "A spear made of bones, strengthed with an troll's horn."
// icon_state = "bonespear"
icon_state = "stonespear_sk"
force = DAMAGE_SPEARPLUS
force_wielded = DAMAGE_SPEAR_WIELD - 3
throwforce = DAMAGE_SPEARPLUS + 2
anvilrepair = /datum/attribute/skill/craft/crafting
max_blade_int = 125
max_integrity = INTEGRITY_WORST * 0.8 + 50
minstr = 6

inhand_x_dimension = 64
inhand_y_dimension = 64
bigboy = TRUE
gripsprite = TRUE
w_class = WEIGHT_CLASS_BULKY
melting_material = null

/obj/item/weapon/polearm/spear/naginata
name = "naginata"
desc = "A traditional eastern polearm, combining the reach of a spear with the cutting power of a curved blade. Due to the brittle quality of certain eastern bladesmithing, weaponsmiths have adapted its blade to be easily replaceable when broken by a peg upon the end of the shaft."
Expand Down
15 changes: 15 additions & 0 deletions code/game/objects/items/weapons/ranged/ammo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,21 @@
damage = ARROW_DAMAGE-2
woundclass = BCLASS_STAB

//................ Bone Arrow ............... //
/obj/item/ammo_casing/caseless/arrow/bone
name = "bone arrow"
desc = "A fletched projectile with a bone tip."
icon_state = "bonearrow"
projectile_type = /obj/projectile/bullet/reusable/arrow/bone //weaker projectile
max_integrity = 15

/obj/projectile/bullet/reusable/arrow/bone
ammo_type = /obj/item/ammo_casing/caseless/arrow/bone
embedchance = 95
armor_penetration = 15
damage = ARROW_DAMAGE
woundclass = BCLASS_STAB

//................ Poison Arrow ............... //
/obj/item/ammo_casing/caseless/arrow/poison
name = "poison arrow"
Expand Down
Loading
Loading