mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 08:37:43 +01:00
57624ca1e2
## About The Pull Request This is a big one so please bear with me, wounds are complicated ### Max Potential Wound Rolls We've decreased the max contributed damage to wound rolls from 35 to 25. This results, after the exponent, a max possible wound roll of 1 to 91 before any modifiers (assuming the attack, after armor, is 25 or above). The minimum value to wound is still 5. ### Wound Escalation Penalties Most wounds were contributing significant numbers per wound type to the potential for a new wound to occur. Getting wounded once meant you were getting wound a lot, but actually getting past that first wounding may be the tricky part. We have significantly reigned in the wound penalty that having a wound contributes, and instead utilize the series wound penalty to allow same type wounds to escalate themselves faster as a priority. Having wounds still makes you more wound vulnerable, just not to such an extreme degree. The priority here for what wounds matter most for contributing to overall wounding vulnerability is ``Infected BURNS > BURNS > SLASH|PIERCE > BLUNT.`` ### Wound Armor Wound armor, unlike all other kinds of armor, was used as a additive value to the wound roll modifiers rather than a multiplicative value. We have reworked how wound armor is determined by changing how wound modifiers are calculated. Firstly, we're passing our entire injury roll into the ``check_woundings_mod()`` proc, as we're not treating this as a proc that just adds values anymore. Secondly, bare wound bonus only applies if there is no potential wound protection from any source, as expected. But it comes last in the calculations. Thirdly, wound protection is applied to the injury roll last, after wound bonuses from the attack, wound bonuses from other wounds and wound bonuses from a disabled limb are applied. This does not include serial wound bonuses, which are determined outside of this proc. Wound protection comes from two sources. Clothing and limb wound resistance. Your chest and head have an amount of wound resistance so long as they are not mangled in any fashion. Being mangled means having either a hairline fracture or a weeping avulsion wound. Wound protection reduces the final injury roll by a percentage. Say our roll is 50, and we have effectively 50% wound protection. The final roll would be 25. ### ~~Wound Armor on Clothing~~ Reverted ~~Most clothing have had their wound armor values changed. As a loose rule, I used the highest of melee or bomb armor, except where that value was 100, in which case I used the lowest instead. I'm basing this decision on how embeds are calculated, which is attack type agnostic.~~ ~~Some armor have inconsistent values because they are alternative armors to an existing armor type or are hyperspecialized armor. Ablative, bulletproof and security vests all share a value of 35, despite the former two not having decent melee or bomb armor.~~ ~~Some clothing missing wound armor that should have had them now have wound armor.~~ ~~This may need a bit of scrutiny in case one or two seem weirdly high. Some have maybe become too low. Its a bit hard to say.~~ ### The ``bare_wound_bonus`` variable I changed it to ``exposed_wound_bonus`` to better represent when it applies. You can be naked and still not be affected by this bonus if the limb has wound resistance. ## Why It's Good For The Game I'm not promising anything with this PR, but this is an attempt to sanity check the values on wounds so that we're not seeing what the data that determined the removal of beheading presented. An extreme over-representation of tier 3 wounds. ~~And, from that, maybe I can argue for beheadings coming back. That's my goal. I think beheadings happened so much because the numbers were in need of work.~~ Well okay I just wanna make wounds a bit more workable actually more than I want beheadings. Why is it that tier 3 wounds were so over-represented? Because wounds will often force more severe wounds of other types by merit of any wounds existing at all on a limb. Having **_a_** wound makes you more wound prone for any kind of wound, and not just making you more likely to suffer a more severe type of the same wound. The threshold mechanic was intended to simulate making a wound worse, but oddly just made a limb broadly more prone to getting worse from any kind of attack to such a degree that future wound rolls of different types were often going to start at the threshold necessary to be a tier 3 wound. Dismemberment, mind you, requires you to suffer a flesh wound while you have a bone wound of tier 2 or higher (with tier 3 giving a bonus to this). You can do this readily via just a sharp weapon, because having a mangled limb causes the wound to turn into a bone wound. Technically, this is meant to be less likely as the effective damage for this wound is halved. But the wound bonus from having a flesh wound was almost always significant enough to kick your new bone wound up to a tier 3. In other words; its not surprising that you saw so many beheadings, because the system wanted to behead you as fast as it possibly can thanks to all these escalating values. Wound armor was only applied as a flat reduction on the roll. The average for wound armor was 10. After receiving a single wound, you can expect wound rolls to reach upwards of 100, even if the actual damage roll was not particularly high, due to wound stacking bonuses form being wounded. This meant that wounds, if they happened, came thick and fast after the first, regardless of what your protection might be to wounds. It was just a matter of getting past the initial bump. This is why effects that forced wounds were so powerful. They basically made a given limb more prone to taking a wound without having to deal with the protection problem first. Finally, this is just a broad flaw with the system that is not its fault. It is actually a problem that isn't a problem. Most people in the game are not wearing helmets that protect their head. So most people are going to suffer from a higher proclivity of being wounded if people are aiming for the head. There is this...kind of cargo cult belief that aiming for the head means you do more damage, or can stun someone if you're lucky or what have you. It's entirely nonsense, but it has a grain of truth in that people rarely wear, or even have access too, headwear that provides wound protection or any protection at all. People have jumpsuits, which are universally wound protected, but that isn't true of the head. Look, the point is, they're not aiming at the head because it is usually less armored, its for other reasons but it just so happens to become true due to wounds and how wounds roll their type. To soften this issue, I've decided to treat wound resistance as armor until the limb suffers a tier 3 wound. This way, hits to the head MAY not necessarily escalate to tier 3 instantly as they would on live even from relatively low power weapons. Some weapons have very low force, but have extreme bare wound bonuses. This should be less likely after this change. I doubt this will necessarily make high damage high wound weapons like energy swords any less prone to cutting you clean open, but it might thanks to the reduction to contributed damage to the injury roll. The system is now _a bit more random_. ## Changelog 🆑 balance: Wounds do not make you as vulnerable to suffering wounds of all types as before. Instead, wounds make you more vulnerable to suffering worse versions of themselves as a priority. balance: Wound armor is now more impactful when protecting you from wounds when you have already been wounded. balance: Your head and chest are more difficult to wound until they have been mangled; either from suffering from a weeping avulsion or a hairline fracture. code: Changed the variable for bare_wound_bonus to exposed_wound_bonus to better explain what that variable is doing. /🆑 --------- Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
338 lines
12 KiB
Plaintext
338 lines
12 KiB
Plaintext
// Knife Template, should not appear in game normaly //
|
|
/obj/item/knife
|
|
name = "knife"
|
|
icon = 'icons/obj/service/kitchen.dmi'
|
|
icon_state = "knife"
|
|
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
|
|
inhand_icon_state = "knife"
|
|
worn_icon_state = "knife"
|
|
icon_angle = -90
|
|
desc = "The original knife, it is said that all other knives are only copies of this one."
|
|
obj_flags = CONDUCTS_ELECTRICITY
|
|
force = 10
|
|
demolition_mod = 0.75
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
throwforce = 10
|
|
hitsound = 'sound/items/weapons/bladeslice.ogg'
|
|
throw_speed = 3
|
|
throw_range = 6
|
|
custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 6)
|
|
attack_verb_continuous = list("slashes", "slices", "tears", "lacerates", "rips", "dices", "cuts")
|
|
attack_verb_simple = list("slash", "slice", "tear", "lacerate", "rip", "dice", "cut")
|
|
sharpness = SHARP_EDGED
|
|
armor_type = /datum/armor/item_knife
|
|
wound_bonus = 5
|
|
exposed_wound_bonus = 15
|
|
tool_behaviour = TOOL_KNIFE
|
|
var/list/alt_continuous = list("stabs", "pierces", "shanks")
|
|
var/list/alt_simple = list("stab", "pierce", "shank")
|
|
|
|
/datum/armor/item_knife
|
|
fire = 50
|
|
acid = 50
|
|
|
|
/obj/item/knife/Initialize(mapload)
|
|
. = ..()
|
|
AddElement(/datum/element/eyestab)
|
|
set_butchering()
|
|
alt_continuous = string_list(alt_continuous)
|
|
alt_simple = string_list(alt_simple)
|
|
make_stabby()
|
|
|
|
///Adds the butchering component, used to override stats for special cases
|
|
/obj/item/knife/proc/set_butchering()
|
|
AddComponent(/datum/component/butchering, \
|
|
speed = 8 SECONDS - force, \
|
|
effectiveness = 100, \
|
|
bonus_modifier = force - 10, \
|
|
)
|
|
//bonus chance increases depending on force
|
|
|
|
///Adds alt sharpness component, used for overrides
|
|
/obj/item/knife/proc/make_stabby()
|
|
AddComponent(/datum/component/alternative_sharpness, SHARP_POINTY, alt_continuous, alt_simple)
|
|
|
|
/obj/item/knife/suicide_act(mob/living/user)
|
|
user.visible_message(pick(span_suicide("[user] is slitting [user.p_their()] wrists with \the [src]! It looks like [user.p_theyre()] trying to commit suicide."), \
|
|
span_suicide("[user] is slitting [user.p_their()] throat with \the [src]! It looks like [user.p_theyre()] trying to commit suicide."), \
|
|
span_suicide("[user] is slitting [user.p_their()] stomach open with \the [src]! It looks like [user.p_theyre()] trying to commit seppuku.")))
|
|
return BRUTELOSS
|
|
|
|
/obj/item/knife/ritual
|
|
name = "ritual knife"
|
|
desc = "The unearthly energies that once powered this blade are now dormant."
|
|
icon = 'icons/obj/weapons/khopesh.dmi'
|
|
icon_state = "bone_blade"
|
|
inhand_icon_state = "bone_blade"
|
|
worn_icon_state = "bone_blade"
|
|
icon_angle = -45
|
|
lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
|
|
inhand_x_dimension = 64
|
|
inhand_y_dimension = 64
|
|
item_flags = CRUEL_IMPLEMENT //maybe they want to use it in surgery
|
|
force = 15
|
|
throwforce = 15
|
|
wound_bonus = 20
|
|
w_class = WEIGHT_CLASS_NORMAL
|
|
|
|
/obj/item/knife/bloodletter
|
|
name = "bloodletter"
|
|
desc = "An occult looking dagger that is cold to the touch. Somehow, the flawless orb on the pommel is made entirely of liquid blood."
|
|
icon = 'icons/obj/weapons/khopesh.dmi'
|
|
icon_state = "bloodletter"
|
|
worn_icon_state = "render"
|
|
icon_angle = -45
|
|
w_class = WEIGHT_CLASS_NORMAL
|
|
/// Bleed stacks applied when an organic mob target is hit
|
|
var/bleed_stacks_per_hit = 3
|
|
|
|
/obj/item/knife/bloodletter/afterattack(atom/target, mob/user, list/modifiers, list/attack_modifiers)
|
|
if(!isliving(target))
|
|
return
|
|
var/mob/living/M = target
|
|
if(!(M.mob_biotypes & MOB_ORGANIC))
|
|
return
|
|
var/datum/status_effect/stacking/saw_bleed/bloodletting/B = M.has_status_effect(/datum/status_effect/stacking/saw_bleed/bloodletting)
|
|
if(!B)
|
|
M.apply_status_effect(/datum/status_effect/stacking/saw_bleed/bloodletting, bleed_stacks_per_hit)
|
|
else
|
|
B.add_stacks(bleed_stacks_per_hit)
|
|
|
|
/obj/item/knife/butcher
|
|
name = "butcher's cleaver"
|
|
desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown by-products."
|
|
icon_state = "butch"
|
|
inhand_icon_state = "butch"
|
|
icon_angle = -45
|
|
obj_flags = CONDUCTS_ELECTRICITY
|
|
force = 15
|
|
throwforce = 10
|
|
custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 6)
|
|
attack_verb_continuous = list("slices", "dices", "chops", "cubes", "minces", "juliennes", "chiffonades", "batonnets")
|
|
attack_verb_simple = list("slice", "dice", "chop", "cube", "mince", "julienne", "chiffonade", "batonnet")
|
|
w_class = WEIGHT_CLASS_NORMAL
|
|
custom_price = PAYCHECK_CREW * 5
|
|
wound_bonus = 15
|
|
|
|
/obj/item/knife/butcher/make_stabby()
|
|
return
|
|
|
|
/obj/item/knife/hunting
|
|
name = "hunting knife"
|
|
desc = "Despite its name, it's mainly used for cutting meat from dead prey rather than actual hunting."
|
|
icon = 'icons/obj/weapons/stabby.dmi'
|
|
inhand_icon_state = "huntingknife"
|
|
icon_state = "huntingknife"
|
|
icon_angle = 180
|
|
wound_bonus = 10
|
|
|
|
/obj/item/knife/hunting/set_butchering()
|
|
AddComponent(/datum/component/butchering, \
|
|
speed = 8 SECONDS - force, \
|
|
effectiveness = 100, \
|
|
bonus_modifier = force + 10, \
|
|
)
|
|
|
|
/obj/item/knife/hunting/make_stabby()
|
|
return
|
|
|
|
/obj/item/knife/combat
|
|
name = "combat knife"
|
|
desc = "A military combat utility survival knife."
|
|
icon = 'icons/obj/weapons/stabby.dmi'
|
|
icon_state = "buckknife"
|
|
worn_icon_state = "buckknife"
|
|
icon_angle = -45
|
|
embed_type = /datum/embedding/combat_knife
|
|
force = 20
|
|
throwforce = 20
|
|
attack_verb_continuous = list("slashes", "stabs", "slices", "tears", "lacerates", "rips", "cuts")
|
|
attack_verb_simple = list("slash", "stab", "slice", "tear", "lacerate", "rip", "cut")
|
|
slot_flags = ITEM_SLOT_MASK
|
|
|
|
/datum/embedding/combat_knife
|
|
pain_mult = 4
|
|
embed_chance = 65
|
|
fall_chance = 10
|
|
ignore_throwspeed_threshold = TRUE
|
|
|
|
/obj/item/knife/combat/Initialize(mapload)
|
|
. = ..()
|
|
AddComponent(/datum/component/knockoff, 90, list(BODY_ZONE_PRECISE_MOUTH), slot_flags) //90% to knock off when wearing a mask
|
|
|
|
/obj/item/knife/combat/make_stabby()
|
|
AddComponent(/datum/component/alternative_sharpness, SHARP_POINTY, alt_continuous, alt_simple, -5)
|
|
|
|
/obj/item/knife/combat/dropped(mob/living/user, slot)
|
|
. = ..()
|
|
if(user.get_item_by_slot(ITEM_SLOT_MASK) == src && !user.has_status_effect(/datum/status_effect/choke) && prob(20))
|
|
user.apply_damage(5, BRUTE, BODY_ZONE_HEAD)
|
|
playsound(user, 'sound/items/weapons/slice.ogg', 50, TRUE)
|
|
user.visible_message(span_danger("[user] accidentally cuts [user.p_them()]self while pulling [src] out of [user.p_them()] teeth! What a doofus!"), span_userdanger("You accidentally cut your mouth with [src]!"))
|
|
|
|
/obj/item/knife/combat/equipped(mob/living/user, slot, initial = FALSE)
|
|
. = ..()
|
|
if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(20))
|
|
if(user.get_item_by_slot(ITEM_SLOT_MASK) == src)
|
|
user.apply_status_effect(/datum/status_effect/choke, src)
|
|
user.visible_message(span_danger("[user] accidentally swallows [src]!"))
|
|
playsound(user, 'sound/items/eatfood.ogg', 100, TRUE)
|
|
|
|
/obj/item/knife/combat/survival
|
|
name = "survival knife"
|
|
desc = "A hunting grade survival knife."
|
|
icon_state = "survivalknife"
|
|
worn_icon_state = "survivalknife"
|
|
embed_type = /datum/embedding/combat_knife/weak
|
|
force = 15
|
|
throwforce = 15
|
|
|
|
/obj/item/knife/combat/root
|
|
name = "cahn'root dagger"
|
|
desc = "A root dagger, deceptively sharp. Perfect to hide and stab someone with, or make a couple and throw them at enemies."
|
|
icon_state = "rootdagger"
|
|
worn_icon_state = "root_dagger"
|
|
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
|
|
inhand_icon_state = "rootshiv"
|
|
embed_type = /datum/embedding/combat_knife/weak
|
|
force = 15
|
|
throwforce = 15
|
|
|
|
/obj/item/knife/combat/bone
|
|
name = "bone dagger"
|
|
desc = "A sharpened bone. The bare minimum in survival."
|
|
inhand_icon_state = "bone_dagger"
|
|
icon_state = "bone_dagger"
|
|
worn_icon_state = "bone_dagger"
|
|
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
|
|
embed_type = /datum/embedding/combat_knife/weak
|
|
obj_flags = parent_type::obj_flags & ~CONDUCTS_ELECTRICITY
|
|
force = 15
|
|
throwforce = 15
|
|
custom_materials = null
|
|
|
|
/datum/embedding/combat_knife/weak
|
|
embed_chance = 35
|
|
|
|
/obj/item/knife/combat/cyborg
|
|
name = "cyborg knife"
|
|
desc = "A cyborg-mounted plasteel knife. Extremely sharp and durable."
|
|
icon = 'icons/obj/items_cyborg.dmi'
|
|
icon_state = "knife_cyborg"
|
|
worn_icon_state = "knife_cyborg" //error sprite - this shouldn't have been dropped
|
|
slot_flags = NONE //you can't put this in your mouth
|
|
|
|
/obj/item/knife/shiv
|
|
name = "glass shiv"
|
|
desc = "A makeshift glass shiv."
|
|
icon = 'icons/obj/weapons/stabby.dmi'
|
|
icon_state = "shiv"
|
|
inhand_icon_state = "shiv"
|
|
icon_angle = -65
|
|
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
|
|
obj_flags = parent_type::obj_flags & ~CONDUCTS_ELECTRICITY
|
|
force = 8
|
|
throwforce = 12
|
|
attack_verb_continuous = list("shanks", "shivs")
|
|
attack_verb_simple = list("shank", "shiv")
|
|
armor_type = /datum/armor/none
|
|
custom_materials = list(/datum/material/glass = SMALL_MATERIAL_AMOUNT * 4)
|
|
|
|
/obj/item/knife/shiv/make_stabby()
|
|
AddComponent(/datum/component/alternative_sharpness, SHARP_POINTY, alt_continuous, alt_simple, -3)
|
|
|
|
/obj/item/knife/shiv/plasma
|
|
name = "plasma shiv"
|
|
desc = "A makeshift plasma glass shiv."
|
|
icon_state = "plasmashiv"
|
|
inhand_icon_state = "plasmashiv"
|
|
force = 9
|
|
throwforce = 13
|
|
armor_type = /datum/armor/shiv_plasma
|
|
custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT *4, /datum/material/plasma=SMALL_MATERIAL_AMOUNT * 2)
|
|
|
|
/datum/armor/shiv_plasma
|
|
melee = 25
|
|
bullet = 25
|
|
laser = 25
|
|
energy = 25
|
|
bomb = 25
|
|
fire = 50
|
|
acid = 50
|
|
|
|
/obj/item/knife/shiv/titanium
|
|
name = "titanium shiv"
|
|
desc = "A makeshift titanium-infused glass shiv."
|
|
icon_state = "titaniumshiv"
|
|
inhand_icon_state = "titaniumshiv"
|
|
throwforce = 14
|
|
throw_range = 7
|
|
wound_bonus = 10
|
|
armor_type = /datum/armor/shiv_titanium
|
|
custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT * 4, /datum/material/titanium=SMALL_MATERIAL_AMOUNT * 2)
|
|
|
|
/datum/armor/shiv_titanium
|
|
melee = 25
|
|
bullet = 25
|
|
laser = 25
|
|
energy = 25
|
|
bomb = 25
|
|
fire = 50
|
|
acid = 50
|
|
|
|
/obj/item/knife/shiv/plastitanium
|
|
name = "plastitanium shiv"
|
|
desc = "A makeshift titanium-infused plasma glass shiv."
|
|
icon_state = "plastitaniumshiv"
|
|
inhand_icon_state = "plastitaniumshiv"
|
|
force = 10
|
|
throwforce = 15
|
|
throw_speed = 4
|
|
throw_range = 8
|
|
wound_bonus = 10
|
|
exposed_wound_bonus = 20
|
|
armor_type = /datum/armor/shiv_plastitanium
|
|
custom_materials = list(/datum/material/glass= SMALL_MATERIAL_AMOUNT * 4, /datum/material/alloy/plastitanium= SMALL_MATERIAL_AMOUNT * 2)
|
|
|
|
/datum/armor/shiv_plastitanium
|
|
melee = 50
|
|
bullet = 50
|
|
laser = 50
|
|
energy = 50
|
|
bomb = 50
|
|
fire = 75
|
|
acid = 75
|
|
|
|
/obj/item/knife/shiv/carrot
|
|
name = "carrot shiv"
|
|
desc = "Unlike other carrots, you should probably keep this far away from your eyes."
|
|
icon_state = "carrotshiv"
|
|
inhand_icon_state = "carrotshiv"
|
|
icon_angle = -45
|
|
custom_materials = null
|
|
|
|
/obj/item/knife/shiv/carrot/suicide_act(mob/living/carbon/user)
|
|
user.visible_message(span_suicide("[user] forcefully drives \the [src] into [user.p_their()] eye! It looks like [user.p_theyre()] trying to commit suicide!"))
|
|
return BRUTELOSS
|
|
|
|
/obj/item/knife/shiv/parsnip
|
|
name = "parsnip shiv"
|
|
desc = "Truly putting 'snip' in the 'parsnip', and it's not sub-par either!"
|
|
icon_state = "parsnipshiv"
|
|
inhand_icon_state = "parsnipshiv"
|
|
icon_angle = -45
|
|
custom_materials = null
|
|
|
|
/obj/item/knife/shiv/root
|
|
name = "cahn'root shiv"
|
|
desc = "A root sharpened into a shiv. A root source of someone's stab wounds soon, most likely."
|
|
icon_state = "rootshiv"
|
|
inhand_icon_state = "rootshiv"
|
|
icon_angle = -45
|
|
custom_materials = null
|