"
@@ -444,7 +411,7 @@
else if(!taped)
. += "
Continue Alternative Treatment: Apply surgical tape directly to injured limb to begin bone regeneration. Note, this is both excruciatingly painful and slow.\n"
else
- . += "
Note: Bone regeneration in effect. Bone is [round((regen_points_current*100)/regen_points_needed,0.1)]% regenerated.\n"
+ . += "
Note: Bone regeneration in effect. Bone is [round(regen_points_current*100/regen_points_needed)]% regenerated.\n"
if(limb.body_zone == BODY_ZONE_HEAD)
. += "Cranial Trauma Detected: Patient will suffer random bouts of [severity == WOUND_SEVERITY_SEVERE ? "mild" : "severe"] brain traumas until bone is repaired."
diff --git a/code/datums/wounds/burns.dm b/code/datums/wounds/burns.dm
index 6a6629a0c9..0d66ee4cfb 100644
--- a/code/datums/wounds/burns.dm
+++ b/code/datums/wounds/burns.dm
@@ -1,14 +1,14 @@
-
// TODO: well, a lot really, but specifically I want to add potential fusing of clothing/equipment on the affected area, and limb infections, though those may go in body part code
/datum/wound/burn
a_or_from = "from"
- wound_type = WOUND_LIST_BURN
+ wound_type = WOUND_BURN
processes = TRUE
- sound_effect = 'sound/effects/sizzle1.ogg'
+ sound_effect = 'sound/effects/wounds/sizzle1.ogg'
+ wound_flags = (FLESH_WOUND | ACCEPTS_GAUZE)
- treatable_by = list(/obj/item/stack/medical/gauze, /obj/item/stack/medical/ointment, /obj/item/stack/medical/mesh) // sterilizer and alcohol will require reagent treatments, coming soon
+ treatable_by = list(/obj/item/stack/medical/ointment, /obj/item/stack/medical/mesh) // sterilizer and alcohol will require reagent treatments, coming soon
// Flesh damage vars
/// How much damage to our flesh we currently have. Once both this and infestation reach 0, the wound is considered healed
@@ -27,8 +27,6 @@
/// Once we reach infestation beyond WOUND_INFESTATION_SEPSIS, we get this many warnings before the limb is completely paralyzed (you'd have to ignore a really bad burn for a really long time for this to happen)
var/strikes_to_lose_limb = 3
- /// The current bandage we have for this wound (maybe move bandages to the limb?)
- var/obj/item/stack/current_bandage
/datum/wound/burn/handle_process()
. = ..()
@@ -47,15 +45,11 @@
sanitization += 0.3
flesh_healing += 0.5
- if(current_bandage)
- current_bandage.absorption_capacity -= WOUND_BURN_SANITIZATION_RATE
- if(current_bandage.absorption_capacity <= 0)
- victim.visible_message("
Pus soaks through \the [current_bandage] on [victim]'s [limb.name].", "
Pus soaks through \the [current_bandage] on your [limb.name].", vision_distance=COMBAT_MESSAGE_RANGE)
- QDEL_NULL(current_bandage)
- treat_priority = TRUE
+ if(limb.current_gauze)
+ limb.seep_gauze(WOUND_BURN_SANITIZATION_RATE)
if(flesh_healing > 0)
- var/bandage_factor = (current_bandage ? current_bandage.splint_factor : 1)
+ var/bandage_factor = (limb.current_gauze ? limb.current_gauze.splint_factor : 1)
flesh_damage = max(0, flesh_damage - 1)
flesh_healing = max(0, flesh_healing - bandage_factor) // good bandages multiply the length of flesh healing
@@ -67,7 +61,7 @@
// sanitization is checked after the clearing check but before the rest, because we freeze the effects of infection while we have sanitization
if(sanitization > 0)
- var/bandage_factor = (current_bandage ? current_bandage.splint_factor : 1)
+ var/bandage_factor = (limb.current_gauze ? limb.current_gauze.splint_factor : 1)
infestation = max(0, infestation - WOUND_BURN_SANITIZATION_RATE)
sanitization = max(0, sanitization - (WOUND_BURN_SANITIZATION_RATE * bandage_factor))
return
@@ -122,10 +116,10 @@
if(strikes_to_lose_limb <= 0)
return "
[victim.p_their(TRUE)] [limb.name] is completely dead and unrecognizable as organic."
- var/condition = ""
- if(current_bandage)
+ var/list/condition = list("[victim.p_their(TRUE)] [limb.name] [examine_desc]")
+ if(limb.current_gauze)
var/bandage_condition
- switch(current_bandage.absorption_capacity)
+ switch(limb.current_gauze.absorption_capacity)
if(0 to 1.25)
bandage_condition = "nearly ruined "
if(1.25 to 2.75)
@@ -135,7 +129,7 @@
if(4 to INFINITY)
bandage_condition = "clean "
- condition += " underneath a dressing of [bandage_condition] [current_bandage.name]"
+ condition += " underneath a dressing of [bandage_condition] [limb.current_gauze.name]"
else
switch(infestation)
if(WOUND_INFECTION_MODERATE to WOUND_INFECTION_SEVERE)
@@ -149,7 +143,7 @@
else
condition += "!"
- return "
[victim.p_their(TRUE)] [limb.name] [examine_desc][condition]"
+ return "
[condition.Join()]"
/datum/wound/burn/get_scanner_description(mob/user)
if(strikes_to_lose_limb == 0)
@@ -186,7 +180,7 @@
/// if someone is using ointment on our burns
/datum/wound/burn/proc/ointment(obj/item/stack/medical/ointment/I, mob/user)
user.visible_message("
[user] begins applying [I] to [victim]'s [limb.name]...", "
You begin applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.name]...")
- if(!do_after(user, (user == victim ? I.self_delay : I.other_delay), target = victim))
+ if(!do_after(user, (user == victim ? I.self_delay : I.other_delay), extra_checks = CALLBACK(src, .proc/still_exists)))
return
limb.heal_damage(I.heal_brute, I.heal_burn)
@@ -200,36 +194,6 @@
else
try_treating(I, user)
-/// for use in the burn dressing surgery since we don't want to make them do another do_after obviously
-/datum/wound/burn/proc/force_bandage(obj/item/stack/medical/gauze/I, mob/user)
- QDEL_NULL(current_bandage)
- current_bandage = new I.type(limb)
- current_bandage.amount = 1
- treat_priority = FALSE
- sanitization += I.sanitization
- I.use(1)
-
-/// if someone is wrapping gauze on our burns
-/datum/wound/burn/proc/bandage(obj/item/stack/medical/gauze/I, mob/user)
- if(current_bandage)
- if(current_bandage.absorption_capacity > I.absorption_capacity + 1)
- to_chat(user, "
The [current_bandage] on [victim]'s [limb.name] is still in better condition than your [I.name]!")
- return
- user.visible_message("
[user] begins to redress the burns on [victim]'s [limb.name] with [I]...", "
You begin redressing the burns on [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...")
- else
- user.visible_message("
[user] begins to dress the burns on [victim]'s [limb.name] with [I]...", "
You begin dressing the burns on [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...")
-
- if(!do_after(user, (user == victim ? I.self_delay : I.other_delay), target=victim, extra_checks = CALLBACK(src, .proc/still_exists)))
- return
-
- user.visible_message("
[user] applies [I] to [victim].", "
You apply [I] to [user == victim ? "your" : "[victim]'s"] [limb.name].")
- QDEL_NULL(current_bandage)
- current_bandage = new I.type(limb)
- current_bandage.amount = 1
- treat_priority = FALSE
- sanitization += I.sanitization
- I.use(1)
-
/// if someone is using mesh on our burns
/datum/wound/burn/proc/mesh(obj/item/stack/medical/mesh/I, mob/user)
user.visible_message("
[user] begins wrapping [victim]'s [limb.name] with [I]...", "
You begin wrapping [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...")
@@ -249,7 +213,7 @@
/// Paramedic UV penlights
/datum/wound/burn/proc/uv(obj/item/flashlight/pen/paramedic/I, mob/user)
- if(I.uv_cooldown > world.time)
+ if(!COOLDOWN_FINISHED(I, uv_cooldown))
to_chat(user, "
[I] is still recharging!")
return
if(infestation <= 0 || infestation < sanitization)
@@ -258,20 +222,29 @@
user.visible_message("
[user] flashes the burns on [victim]'s [limb] with [I].", "
You flash the burns on [user == victim ? "your" : "[victim]'s"] [limb.name] with [I].", vision_distance=COMBAT_MESSAGE_RANGE)
sanitization += I.uv_power
- I.uv_cooldown = world.time + I.uv_cooldown_length
+ COOLDOWN_START(I, uv_cooldown, I.uv_cooldown_length)
/datum/wound/burn/treat(obj/item/I, mob/user)
- if(istype(I, /obj/item/stack/medical/gauze))
- bandage(I, user)
- else if(istype(I, /obj/item/stack/medical/ointment))
+ if(istype(I, /obj/item/stack/medical/ointment))
ointment(I, user)
else if(istype(I, /obj/item/stack/medical/mesh))
mesh(I, user)
else if(istype(I, /obj/item/flashlight/pen/paramedic))
uv(I, user)
-/// basic support for instabitaluri/synthflesh healing flesh damage, more chem support in the future
-/datum/wound/burn/proc/regenerate_flesh(amount)
+// people complained about burns not healing on stasis beds, so in addition to checking if it's cured, they also get the special ability to very slowly heal on stasis beds if they have the healing effects stored
+/datum/wound/burn/on_stasis()
+ . = ..()
+ if(flesh_healing > 0)
+ flesh_damage = max(0, flesh_damage - 0.2)
+ if((flesh_damage <= 0) && (infestation <= 1))
+ to_chat(victim, "
The burns on your [limb.name] have cleared up!")
+ qdel(src)
+ return
+ if(sanitization > 0)
+ infestation = max(0, infestation - WOUND_BURN_SANITIZATION_RATE * 0.2)
+
+/datum/wound/burn/on_synthflesh(amount)
flesh_healing += amount * 0.5 // 20u patch will heal 10 flesh standard
// we don't even care about first degree burns, straight to second
@@ -287,7 +260,7 @@
threshold_penalty = 30 // burns cause significant decrease in limb integrity compared to other wounds
status_effect_type = /datum/status_effect/wound/burn/moderate
flesh_damage = 5
- scarring_descriptions = list("small amoeba-shaped skinmarks", "a faded streak of depressed skin")
+ scar_keyword = "burnmoderate"
/datum/wound/burn/severe
name = "Third Degree Burns"
@@ -300,10 +273,10 @@
threshold_minimum = 80
threshold_penalty = 40
status_effect_type = /datum/status_effect/wound/burn/severe
- treatable_by = list(/obj/item/flashlight/pen/paramedic, /obj/item/stack/medical/gauze, /obj/item/stack/medical/ointment, /obj/item/stack/medical/mesh)
+ treatable_by = list(/obj/item/flashlight/pen/paramedic, /obj/item/stack/medical/ointment, /obj/item/stack/medical/mesh)
infestation_rate = 0.05 // appx 13 minutes to reach sepsis without any treatment
flesh_damage = 12.5
- scarring_descriptions = list("a large, jagged patch of faded skin", "random spots of shiny, smooth skin", "spots of taut, leathery skin")
+ scar_keyword = "burnsevere"
/datum/wound/burn/critical
name = "Catastrophic Burns"
@@ -313,11 +286,11 @@
occur_text = "vaporizes as flesh, bone, and fat melt together in a horrifying mess"
severity = WOUND_SEVERITY_CRITICAL
damage_mulitplier_penalty = 1.3
- sound_effect = 'sound/effects/sizzle2.ogg'
+ sound_effect = 'sound/effects/wounds/sizzle2.ogg'
threshold_minimum = 140
threshold_penalty = 80
status_effect_type = /datum/status_effect/wound/burn/critical
- treatable_by = list(/obj/item/flashlight/pen/paramedic, /obj/item/stack/medical/gauze, /obj/item/stack/medical/ointment, /obj/item/stack/medical/mesh)
+ treatable_by = list(/obj/item/flashlight/pen/paramedic, /obj/item/stack/medical/ointment, /obj/item/stack/medical/mesh)
infestation_rate = 0.15 // appx 4.33 minutes to reach sepsis without any treatment
flesh_damage = 20
- scarring_descriptions = list("massive, disfiguring keloid scars", "several long streaks of badly discolored and malformed skin", "unmistakeable splotches of dead tissue from serious burns")
+ scar_keyword = "burncritical"
diff --git a/code/datums/wounds/loss.dm b/code/datums/wounds/loss.dm
new file mode 100644
index 0000000000..6c5e536fb2
--- /dev/null
+++ b/code/datums/wounds/loss.dm
@@ -0,0 +1,41 @@
+/datum/wound/loss
+ name = "Dismembered"
+ desc = "oof ouch!!"
+
+ sound_effect = 'sound/effects/dismember.ogg'
+ severity = WOUND_SEVERITY_LOSS
+ threshold_minimum = 180
+ status_effect_type = null
+ scar_keyword = "dismember"
+ wound_flags = null
+
+/// Our special proc for our special dismembering, the wounding type only matters for what text we have
+/datum/wound/loss/proc/apply_dismember(obj/item/bodypart/dismembered_part, wounding_type=WOUND_SLASH)
+ if(!istype(dismembered_part) || !dismembered_part.owner || !(dismembered_part.body_zone in viable_zones) || isalien(dismembered_part.owner) || !dismembered_part.can_dismember())
+ qdel(src)
+ return
+
+ already_scarred = TRUE // so we don't scar a limb we don't have. If I add different levels of amputation desc, do it here
+
+ switch(wounding_type)
+ if(WOUND_BLUNT)
+ occur_text = "is shattered through the last bone holding it together, severing it completely!"
+ if(WOUND_SLASH)
+ occur_text = "is slashed through the last tissue holding it together, severing it completely!"
+ if(WOUND_PIERCE)
+ occur_text = "is pierced through the last tissue holding it together, severing it completely!"
+ if(WOUND_BURN)
+ occur_text = "is completely incinerated, falling to dust!"
+
+ victim = dismembered_part.owner
+
+ var/msg = "
[victim]'s [dismembered_part.name] [occur_text]!"
+
+ victim.visible_message(msg, "
Your [dismembered_part.name] [occur_text]!")
+
+ limb = dismembered_part
+ severity = WOUND_SEVERITY_LOSS
+ second_wind()
+ log_wound(victim, src)
+ dismembered_part.dismember(wounding_type == WOUND_BURN ? BURN : BRUTE)
+ qdel(src)
diff --git a/code/datums/wounds/pierce.dm b/code/datums/wounds/pierce.dm
new file mode 100644
index 0000000000..3182c334bf
--- /dev/null
+++ b/code/datums/wounds/pierce.dm
@@ -0,0 +1,170 @@
+/*
+ Pierce
+*/
+
+/datum/wound/pierce
+ sound_effect = 'sound/weapons/slice.ogg'
+ processes = TRUE
+ wound_type = WOUND_PIERCE
+ treatable_by = list(/obj/item/stack/medical/suture)
+ treatable_tool = TOOL_CAUTERY
+ base_treat_time = 3 SECONDS
+ wound_flags = (FLESH_WOUND | ACCEPTS_GAUZE)
+
+ /// How much blood we start losing when this wound is first applied
+ var/initial_flow
+ /// If gauzed, what percent of the internal bleeding actually clots of the total absorption rate
+ var/gauzed_clot_rate
+
+ /// When hit on this bodypart, we have this chance of losing some blood + the incoming damage
+ var/internal_bleeding_chance
+ /// If we let off blood when hit, the max blood lost is this * the incoming damage
+ var/internal_bleeding_coefficient
+
+/datum/wound/pierce/wound_injury(datum/wound/old_wound)
+ blood_flow = initial_flow
+
+/datum/wound/pierce/receive_damage(wounding_type, wounding_dmg, wound_bonus)
+ if(victim.stat == DEAD || wounding_dmg < 5)
+ return
+ if(victim.blood_volume && prob(internal_bleeding_chance + wounding_dmg))
+ if(limb.current_gauze && limb.current_gauze.splint_factor)
+ wounding_dmg *= (1 - limb.current_gauze.splint_factor)
+ var/blood_bled = rand(1, wounding_dmg * internal_bleeding_coefficient) // 12 brute toolbox can cause up to 15/18/21 bloodloss on mod/sev/crit
+ switch(blood_bled)
+ if(1 to 6)
+ victim.bleed(blood_bled, TRUE)
+ if(7 to 13)
+ victim.visible_message("
Blood droplets fly from the hole in [victim]'s [limb.name].", "
You cough up a bit of blood from the blow to your [limb.name].", vision_distance=COMBAT_MESSAGE_RANGE)
+ victim.bleed(blood_bled, TRUE)
+ if(14 to 19)
+ victim.visible_message("
A small stream of blood spurts from the hole in [victim]'s [limb.name]!", "
You spit out a string of blood from the blow to your [limb.name]!", vision_distance=COMBAT_MESSAGE_RANGE)
+ new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir)
+ victim.bleed(blood_bled)
+ if(20 to INFINITY)
+ victim.visible_message("
A spray of blood streams from the gash in [victim]'s [limb.name]!", "
You choke up on a spray of blood from the blow to your [limb.name]!", vision_distance=COMBAT_MESSAGE_RANGE)
+ victim.bleed(blood_bled)
+ new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir)
+ victim.add_splatter_floor(get_step(victim.loc, victim.dir))
+
+/datum/wound/pierce/handle_process()
+ blood_flow = min(blood_flow, WOUND_SLASH_MAX_BLOODFLOW)
+
+ if(victim.bodytemperature < (BODYTEMP_NORMAL - 10))
+ blood_flow -= 0.2
+ if(prob(5))
+ to_chat(victim, "
You feel the [lowertext(name)] in your [limb.name] firming up from the cold!")
+
+ if(victim.reagents?.has_reagent(/datum/reagent/toxin/heparin))
+ blood_flow += 0.5 // old herapin used to just add +2 bleed stacks per tick, this adds 0.5 bleed flow to all open cuts which is probably even stronger as long as you can cut them first
+
+ if(limb.current_gauze)
+ blood_flow -= limb.current_gauze.absorption_rate * gauzed_clot_rate
+ limb.current_gauze.absorption_capacity -= limb.current_gauze.absorption_rate
+
+ if(blood_flow <= 0)
+ qdel(src)
+
+/datum/wound/pierce/on_stasis()
+ . = ..()
+ if(blood_flow <= 0)
+ qdel(src)
+
+/datum/wound/pierce/treat(obj/item/I, mob/user)
+ if(istype(I, /obj/item/stack/medical/suture))
+ suture(I, user)
+ else if(I.tool_behaviour == TOOL_CAUTERY || I.get_temperature() > 300)
+ tool_cauterize(I, user)
+
+/datum/wound/pierce/on_xadone(power)
+ . = ..()
+ blood_flow -= 0.03 * power // i think it's like a minimum of 3 power, so .09 blood_flow reduction per tick is pretty good for 0 effort
+
+/datum/wound/pierce/on_synthflesh(power)
+ . = ..()
+ blood_flow -= 0.05 * power // 20u * 0.05 = -1 blood flow, less than with slashes but still good considering smaller bleed rates
+
+/// If someone is using a suture to close this cut
+/datum/wound/pierce/proc/suture(obj/item/stack/medical/suture/I, mob/user)
+ var/self_penalty_mult = (user == victim ? 1.4 : 1)
+ user.visible_message("
[user] begins stitching [victim]'s [limb.name] with [I]...", "
You begin stitching [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...")
+ if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists)))
+ return
+ user.visible_message("
[user] stitches up some of the bleeding on [victim].", "
You stitch up some of the bleeding on [user == victim ? "yourself" : "[victim]"].")
+ var/blood_sutured = I.stop_bleeding / self_penalty_mult * 0.5
+ blood_flow -= blood_sutured
+ limb.heal_damage(I.heal_brute, I.heal_burn)
+
+ if(blood_flow > 0)
+ try_treating(I, user)
+ else
+ to_chat(user, "
You successfully close the hole in [user == victim ? "your" : "[victim]'s"] [limb.name].")
+
+/// If someone is using either a cautery tool or something with heat to cauterize this pierce
+/datum/wound/pierce/proc/tool_cauterize(obj/item/I, mob/user)
+ var/self_penalty_mult = (user == victim ? 1.5 : 1)
+ user.visible_message("
[user] begins cauterizing [victim]'s [limb.name] with [I]...", "
You begin cauterizing [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...")
+ if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists)))
+ return
+
+ user.visible_message("
[user] cauterizes some of the bleeding on [victim].", "
You cauterize some of the bleeding on [victim].")
+ limb.receive_damage(burn = 2 + severity, wound_bonus = CANT_WOUND)
+ if(prob(30))
+ victim.emote("scream")
+ var/blood_cauterized = (0.6 / self_penalty_mult) * 0.5
+ blood_flow -= blood_cauterized
+
+ if(blood_flow > 0)
+ try_treating(I, user)
+
+/datum/wound/pierce/moderate
+ name = "Minor Breakage"
+ desc = "Patient's skin has been broken open, causing severe bruising and minor internal bleeding in affected area."
+ treat_text = "Treat affected site with bandaging or exposure to extreme cold. In dire cases, brief exposure to vacuum may suffice." // space is cold in ss13, so it's like an ice pack!
+ examine_desc = "has a small, circular hole, gently bleeding"
+ occur_text = "spurts out a thin stream of blood"
+ sound_effect = 'sound/effects/wounds/pierce1.ogg'
+ severity = WOUND_SEVERITY_MODERATE
+ initial_flow = 1.5
+ gauzed_clot_rate = 0.8
+ internal_bleeding_chance = 30
+ internal_bleeding_coefficient = 1.25
+ threshold_minimum = 30
+ threshold_penalty = 15
+ status_effect_type = /datum/status_effect/wound/pierce/moderate
+ scar_keyword = "piercemoderate"
+
+/datum/wound/pierce/severe
+ name = "Open Puncture"
+ desc = "Patient's internal tissue is penetrated, causing sizeable internal bleeding and reduced limb stability."
+ treat_text = "Repair punctures in skin by suture or cautery, extreme cold may also work."
+ examine_desc = "is pierced clear through, with bits of tissue obscuring the open hole"
+ occur_text = "looses a violent spray of blood, revealing a pierced wound"
+ sound_effect = 'sound/effects/wounds/pierce2.ogg'
+ severity = WOUND_SEVERITY_SEVERE
+ initial_flow = 2.25
+ gauzed_clot_rate = 0.6
+ internal_bleeding_chance = 60
+ internal_bleeding_coefficient = 1.5
+ threshold_minimum = 50
+ threshold_penalty = 25
+ status_effect_type = /datum/status_effect/wound/pierce/severe
+ scar_keyword = "piercesevere"
+
+/datum/wound/pierce/critical
+ name = "Ruptured Cavity"
+ desc = "Patient's internal tissue and circulatory system is shredded, causing significant internal bleeding and damage to internal organs."
+ treat_text = "Surgical repair of puncture wound, followed by supervised resanguination."
+ examine_desc = "is ripped clear through, barely held together by exposed bone"
+ occur_text = "blasts apart, sending chunks of viscera flying in all directions"
+ sound_effect = 'sound/effects/wounds/pierce3.ogg'
+ severity = WOUND_SEVERITY_CRITICAL
+ initial_flow = 3
+ gauzed_clot_rate = 0.4
+ internal_bleeding_chance = 80
+ internal_bleeding_coefficient = 1.75
+ threshold_minimum = 100
+ threshold_penalty = 40
+ status_effect_type = /datum/status_effect/wound/pierce/critical
+ scar_keyword = "piercecritical"
+ wound_flags = (FLESH_WOUND | ACCEPTS_GAUZE | MANGLES_FLESH)
diff --git a/code/datums/wounds/cuts.dm b/code/datums/wounds/slash.dm
similarity index 60%
rename from code/datums/wounds/cuts.dm
rename to code/datums/wounds/slash.dm
index 0ab3bbd5f8..5254fc3e73 100644
--- a/code/datums/wounds/cuts.dm
+++ b/code/datums/wounds/slash.dm
@@ -1,17 +1,16 @@
-
/*
Cuts
*/
-/datum/wound/brute/cut
+/datum/wound/slash
sound_effect = 'sound/weapons/slice.ogg'
processes = TRUE
- wound_type = WOUND_LIST_CUT
- treatable_by = list(/obj/item/stack/medical/suture, /obj/item/stack/medical/gauze)
+ wound_type = WOUND_SLASH
+ treatable_by = list(/obj/item/stack/medical/suture)
treatable_by_grabbed = list(/obj/item/gun/energy/laser)
treatable_tool = TOOL_CAUTERY
- treat_priority = TRUE
base_treat_time = 3 SECONDS
+ wound_flags = (FLESH_WOUND | ACCEPTS_GAUZE)
/// How much blood we start losing when this wound is first applied
var/initial_flow
@@ -27,75 +26,82 @@
var/max_per_type
/// The maximum flow we've had so far
var/highest_flow
- /// How much flow we've already cauterized
- var/cauterized
- /// How much flow we've already sutured
- var/sutured
- /// The current bandage we have for this wound (maybe move bandages to the limb?)
- var/obj/item/stack/current_bandage
/// A bad system I'm using to track the worst scar we earned (since we can demote, we want the biggest our wound has been, not what it was when it was cured (probably moderate))
var/datum/scar/highest_scar
-/datum/wound/brute/cut/wound_injury(datum/wound/brute/cut/old_wound = null)
+/datum/wound/slash/wound_injury(datum/wound/slash/old_wound = null)
blood_flow = initial_flow
if(old_wound)
blood_flow = max(old_wound.blood_flow, initial_flow)
if(old_wound.severity > severity && old_wound.highest_scar)
highest_scar = old_wound.highest_scar
old_wound.highest_scar = null
- if(old_wound.current_bandage)
- current_bandage = old_wound.current_bandage
- old_wound.current_bandage = null
if(!highest_scar)
highest_scar = new
highest_scar.generate(limb, src, add_to_scars=FALSE)
-/datum/wound/brute/cut/remove_wound(ignore_limb, replaced)
+/datum/wound/slash/remove_wound(ignore_limb, replaced)
if(!replaced && highest_scar)
already_scarred = TRUE
highest_scar.lazy_attach(limb)
return ..()
-/datum/wound/brute/cut/get_examine_description(mob/user)
- if(!current_bandage)
+/datum/wound/slash/get_examine_description(mob/user)
+ if(!limb.current_gauze)
return ..()
- var/bandage_condition = ""
+ var/list/msg = list("The cuts on [victim.p_their()] [limb.name] are wrapped with")
// how much life we have left in these bandages
- switch(current_bandage.absorption_capacity)
+ switch(limb.current_gauze.absorption_capacity)
if(0 to 1.25)
- bandage_condition = "nearly ruined "
+ msg += "nearly ruined "
if(1.25 to 2.75)
- bandage_condition = "badly worn "
+ msg += "badly worn "
if(2.75 to 4)
- bandage_condition = "slightly bloodied "
+ msg += "slightly bloodied "
if(4 to INFINITY)
- bandage_condition = "clean "
- return "
The cuts on [victim.p_their()] [limb.name] are wrapped with [bandage_condition] [current_bandage.name]!"
+ msg += "clean "
+ msg += "[limb.current_gauze.name]!"
-/datum/wound/brute/cut/receive_damage(wounding_type, wounding_dmg, wound_bonus)
- if(victim.stat != DEAD && wounding_type == WOUND_SHARP) // can't stab dead bodies to make it bleed faster this way
+ return "
[msg.Join()]"
+
+/datum/wound/slash/receive_damage(wounding_type, wounding_dmg, wound_bonus)
+ if(victim.stat != DEAD && wounding_type == WOUND_SLASH) // can't stab dead bodies to make it bleed faster this way
blood_flow += 0.05 * wounding_dmg
-/datum/wound/brute/cut/handle_process()
- blood_flow = min(blood_flow, WOUND_CUT_MAX_BLOODFLOW)
+/datum/wound/slash/drag_bleed_amount()
+ // say we have 3 severe cuts with 3 blood flow each, pretty reasonable
+ // compare with being at 100 brute damage before, where you bled (brute/100 * 2), = 2 blood per tile
+ var/bleed_amt = min(blood_flow * 0.1, 1) // 3 * 3 * 0.1 = 0.9 blood total, less than before! the share here is .3 blood of course.
- if(victim.reagents && victim.reagents.has_reagent(/datum/reagent/toxin/heparin))
+ if(limb.current_gauze) // gauze stops all bleeding from dragging on this limb, but wears the gauze out quicker
+ limb.seep_gauze(bleed_amt * 0.33)
+ return
+
+ return bleed_amt
+
+/datum/wound/slash/handle_process()
+ if(victim.stat == DEAD)
+ blood_flow -= max(clot_rate, WOUND_SLASH_DEAD_CLOT_MIN)
+ if(blood_flow < minimum_flow)
+ if(demotes_to)
+ replace_wound(demotes_to)
+ return
+ qdel(src)
+ return
+
+ blood_flow = min(blood_flow, WOUND_SLASH_MAX_BLOODFLOW)
+
+ if(victim.reagents?.has_reagent(/datum/reagent/toxin/heparin))
blood_flow += 0.5 // old herapin used to just add +2 bleed stacks per tick, this adds 0.5 bleed flow to all open cuts which is probably even stronger as long as you can cut them first
- else if(victim.reagents && victim.reagents.has_reagent(/datum/reagent/medicine/coagulant))
- blood_flow -= 0.25
- if(current_bandage)
+ if(limb.current_gauze)
if(clot_rate > 0)
blood_flow -= clot_rate
- blood_flow -= current_bandage.absorption_rate
- current_bandage.absorption_capacity -= current_bandage.absorption_rate
- if(current_bandage.absorption_capacity < 0)
- victim.visible_message("
Blood soaks through \the [current_bandage] on [victim]'s [limb.name].", "
Blood soaks through \the [current_bandage] on your [limb.name].", vision_distance=COMBAT_MESSAGE_RANGE)
- QDEL_NULL(current_bandage)
- treat_priority = TRUE
+ blood_flow -= limb.current_gauze.absorption_rate
+ limb.seep_gauze(limb.current_gauze.absorption_rate)
else
blood_flow -= clot_rate
@@ -109,41 +115,57 @@
to_chat(victim, "
The cut on your [limb.name] has stopped bleeding!")
qdel(src)
+
+/datum/wound/slash/on_stasis()
+ if(blood_flow >= minimum_flow)
+ return
+ if(demotes_to)
+ replace_wound(demotes_to)
+ return
+ qdel(src)
+
/* BEWARE, THE BELOW NONSENSE IS MADNESS. bones.dm looks more like what I have in mind and is sufficiently clean, don't pay attention to this messiness */
-/datum/wound/brute/cut/check_grab_treatments(obj/item/I, mob/user)
+/datum/wound/slash/check_grab_treatments(obj/item/I, mob/user)
if(istype(I, /obj/item/gun/energy/laser))
return TRUE
-/datum/wound/brute/cut/treat(obj/item/I, mob/user)
+/datum/wound/slash/treat(obj/item/I, mob/user)
if(istype(I, /obj/item/gun/energy/laser))
las_cauterize(I, user)
else if(I.tool_behaviour == TOOL_CAUTERY || I.get_temperature() > 300)
tool_cauterize(I, user)
- else if(istype(I, /obj/item/stack/medical/gauze))
- bandage(I, user)
else if(istype(I, /obj/item/stack/medical/suture))
suture(I, user)
-/datum/wound/brute/cut/try_handling(mob/living/carbon/human/user)
+/datum/wound/slash/try_handling(mob/living/carbon/human/user)
if(user.pulling != victim || user.zone_selected != limb.body_zone || user.a_intent == INTENT_GRAB)
return FALSE
- if(!iscatperson(user))
- return FALSE
-
- if(!(user.client?.prefs.vore_flags & LICKABLE))
+ if(!isfelinid(user))
return FALSE
lick_wounds(user)
return TRUE
/// if a felinid is licking this cut to reduce bleeding
-/datum/wound/brute/cut/proc/lick_wounds(mob/living/carbon/human/user)
+/datum/wound/slash/proc/lick_wounds(mob/living/carbon/human/user)
if(INTERACTING_WITH(user, victim))
to_chat(user, "
You're already interacting with [victim]!")
return
+ if(user.is_mouth_covered())
+ to_chat(user, "
Your mouth is covered, you can't lick [victim]'s wounds!")
+ return
+
+ if(!user.getorganslot(ORGAN_SLOT_TONGUE))
+ to_chat(user, "
You can't lick wounds without a tongue!") // f in chat
+ return
+
+ // transmission is one way patient -> felinid since google said cat saliva is antiseptic or whatever, and also because felinids are already risking getting beaten for this even without people suspecting they're spreading a deathvirus
+ for(var/datum/disease/D in victim.diseases)
+ user.ForceContractDisease(D)
+
user.visible_message("
[user] begins licking the wounds on [victim]'s [limb.name].", "
You begin licking the wounds on [victim]'s [limb.name]...", ignored_mobs=victim)
to_chat(victim, "
[user] begins to lick the wounds on your [limb.name].You successfully lower the severity of [victim]'s cuts.")
-/datum/wound/brute/cut/on_xadone(power)
+/datum/wound/slash/on_xadone(power)
. = ..()
blood_flow -= 0.03 * power // i think it's like a minimum of 3 power, so .09 blood_flow reduction per tick is pretty good for 0 effort
+/datum/wound/slash/on_synthflesh(power)
+ . = ..()
+ blood_flow -= 0.075 * power // 20u * 0.075 = -1.5 blood flow, pretty good for how little effort it is
+
/// If someone's putting a laser gun up to our cut to cauterize it
-/datum/wound/brute/cut/proc/las_cauterize(obj/item/gun/energy/laser/lasgun, mob/user)
+/datum/wound/slash/proc/las_cauterize(obj/item/gun/energy/laser/lasgun, mob/user)
var/self_penalty_mult = (user == victim ? 1.25 : 1)
user.visible_message("
[user] begins aiming [lasgun] directly at [victim]'s [limb.name]...", "
You begin aiming [lasgun] directly at [user == victim ? "your" : "[victim]'s"] [limb.name]...")
if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists)))
@@ -175,11 +201,10 @@
return
victim.emote("scream")
blood_flow -= damage / (5 * self_penalty_mult) // 20 / 5 = 4 bloodflow removed, p good
- cauterized += damage / (5 * self_penalty_mult)
victim.visible_message("
The cuts on [victim]'s [limb.name] scar over!")
/// If someone is using either a cautery tool or something with heat to cauterize this cut
-/datum/wound/brute/cut/proc/tool_cauterize(obj/item/I, mob/user)
+/datum/wound/slash/proc/tool_cauterize(obj/item/I, mob/user)
var/self_penalty_mult = (user == victim ? 1.5 : 1)
user.visible_message("
[user] begins cauterizing [victim]'s [limb.name] with [I]...", "
You begin cauterizing [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...")
if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists)))
@@ -191,7 +216,6 @@
victim.emote("scream")
var/blood_cauterized = (0.6 / self_penalty_mult)
blood_flow -= blood_cauterized
- cauterized += blood_cauterized
if(blood_flow > minimum_flow)
try_treating(I, user)
@@ -199,15 +223,15 @@
to_chat(user, "
You successfully lower the severity of [user == victim ? "your" : "[victim]'s"] cuts.")
/// If someone is using a suture to close this cut
-/datum/wound/brute/cut/proc/suture(obj/item/stack/medical/suture/I, mob/user)
+/datum/wound/slash/proc/suture(obj/item/stack/medical/suture/I, mob/user)
var/self_penalty_mult = (user == victim ? 1.4 : 1)
user.visible_message("
[user] begins stitching [victim]'s [limb.name] with [I]...", "
You begin stitching [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...")
+
if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists)))
return
user.visible_message("
[user] stitches up some of the bleeding on [victim].", "
You stitch up some of the bleeding on [user == victim ? "yourself" : "[victim]"].")
var/blood_sutured = I.stop_bleeding / self_penalty_mult
blood_flow -= blood_sutured
- sutured += blood_sutured
limb.heal_damage(I.heal_brute, I.heal_burn)
if(blood_flow > minimum_flow)
@@ -215,51 +239,31 @@
else if(demotes_to)
to_chat(user, "
You successfully lower the severity of [user == victim ? "your" : "[victim]'s"] cuts.")
-/// If someone is using gauze on this cut
-/datum/wound/brute/cut/proc/bandage(obj/item/stack/I, mob/user)
- if(current_bandage)
- if(current_bandage.absorption_capacity > I.absorption_capacity + 1)
- to_chat(user, "
The [current_bandage] on [victim]'s [limb.name] is still in better condition than your [I.name]!")
- return
- else
- user.visible_message("
[user] begins rewrapping the cuts on [victim]'s [limb.name] with [I]...", "
You begin rewrapping the cuts on [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...")
- else
- user.visible_message("
[user] begins wrapping the cuts on [victim]'s [limb.name] with [I]...", "
You begin wrapping the cuts on [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...")
- if(!do_after(user, base_treat_time, target=victim, extra_checks = CALLBACK(src, .proc/still_exists)))
- return
- user.visible_message("
[user] applies [I] to [victim]'s [limb.name].", "
You bandage some of the bleeding on [user == victim ? "yourself" : "[victim]"].")
- QDEL_NULL(current_bandage)
- current_bandage = new I.type(limb)
- current_bandage.amount = 1
- treat_priority = FALSE
- I.use(1)
-
-
-/datum/wound/brute/cut/moderate
+/datum/wound/slash/moderate
name = "Rough Abrasion"
desc = "Patient's skin has been badly scraped, generating moderate blood loss."
treat_text = "Application of clean bandages or first-aid grade sutures, followed by food and rest."
examine_desc = "has an open cut"
occur_text = "is cut open, slowly leaking blood"
- sound_effect = 'sound/effects/blood1.ogg'
+ sound_effect = 'sound/effects/wounds/blood1.ogg'
severity = WOUND_SEVERITY_MODERATE
initial_flow = 2
minimum_flow = 0.5
max_per_type = 3
- clot_rate = 0.15
+ clot_rate = 0.12
threshold_minimum = 20
threshold_penalty = 10
- status_effect_type = /datum/status_effect/wound/cut/moderate
- scarring_descriptions = list("light, faded lines", "minor cut marks", "a small faded slit", "a series of small scars")
+ status_effect_type = /datum/status_effect/wound/slash/moderate
+ scar_keyword = "slashmoderate"
-/datum/wound/brute/cut/severe
+/datum/wound/slash/severe
name = "Open Laceration"
desc = "Patient's skin is ripped clean open, allowing significant blood loss."
treat_text = "Speedy application of first-aid grade sutures and clean bandages, followed by vitals monitoring to ensure recovery."
examine_desc = "has a severe cut"
occur_text = "is ripped open, veins spurting blood"
- sound_effect = 'sound/effects/blood2.ogg'
+ sound_effect = 'sound/effects/wounds/blood2.ogg'
severity = WOUND_SEVERITY_SEVERE
initial_flow = 3.25
minimum_flow = 2.75
@@ -267,17 +271,17 @@
max_per_type = 4
threshold_minimum = 50
threshold_penalty = 25
- demotes_to = /datum/wound/brute/cut/moderate
- status_effect_type = /datum/status_effect/wound/cut/severe
- scarring_descriptions = list("a twisted line of faded gashes", "a gnarled sickle-shaped slice scar", "a long-faded puncture wound")
+ demotes_to = /datum/wound/slash/moderate
+ status_effect_type = /datum/status_effect/wound/slash/severe
+ scar_keyword = "slashsevere"
-/datum/wound/brute/cut/critical
+/datum/wound/slash/critical
name = "Weeping Avulsion"
desc = "Patient's skin is completely torn open, along with significant loss of tissue. Extreme blood loss will lead to quick death without intervention."
treat_text = "Immediate bandaging and either suturing or cauterization, followed by supervised resanguination."
- examine_desc = "is spurting blood at an alarming rate"
+ examine_desc = "is carved down to the bone, spraying blood wildly"
occur_text = "is torn open, spraying blood wildly"
- sound_effect = 'sound/effects/blood3.ogg'
+ sound_effect = 'sound/effects/wounds/blood3.ogg'
severity = WOUND_SEVERITY_CRITICAL
initial_flow = 4.25
minimum_flow = 4
@@ -285,25 +289,7 @@
max_per_type = 5
threshold_minimum = 80
threshold_penalty = 40
- demotes_to = /datum/wound/brute/cut/severe
- status_effect_type = /datum/status_effect/wound/cut/critical
- scarring_descriptions = list("a winding path of very badly healed scar tissue", "a series of peaks and valleys along a gruesome line of cut scar tissue", "a grotesque snake of indentations and stitching scars")
-
-// TODO: see about moving dismemberment over to this, i'll have to add judging dismembering power/wound potential wrt item size i guess
-/datum/wound/brute/cut/loss
- name = "Dismembered"
- desc = "oof ouch!!"
- occur_text = "is violently dismembered!"
- sound_effect = 'sound/effects/dismember.ogg'
- viable_zones = list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
- severity = WOUND_SEVERITY_LOSS
- threshold_minimum = 180
- status_effect_type = null
-
-/datum/wound/brute/cut/loss/apply_wound(obj/item/bodypart/L, silent, datum/wound/brute/cut/old_wound, smited = FALSE)
- if(!L.dismemberable)
- qdel(src)
- return
-
- L.dismember()
- qdel(src)
+ demotes_to = /datum/wound/slash/severe
+ status_effect_type = /datum/status_effect/wound/slash/critical
+ scar_keyword = "slashcritical"
+ wound_flags = (FLESH_WOUND | ACCEPTS_GAUZE | MANGLES_FLESH)
diff --git a/code/game/gamemodes/clown_ops/clown_weapons.dm b/code/game/gamemodes/clown_ops/clown_weapons.dm
index afa3dbfeaa..a27cb02ea8 100644
--- a/code/game/gamemodes/clown_ops/clown_weapons.dm
+++ b/code/game/gamemodes/clown_ops/clown_weapons.dm
@@ -62,7 +62,7 @@
hitsound = null
attack_verb_on = list("slipped")
clumsy_check = FALSE
- sharpness = IS_BLUNT
+ sharpness = SHARP_NONE
sword_color = "yellow"
heat = 0
light_color = "#ffff00"
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index fd1a8690df..52623a9262 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -345,7 +345,8 @@
L.visible_message("
[src] closes on [L], crushing [L.p_them()]!", "
[src] closes on you and crushes you!")
if(iscarbon(L))
var/mob/living/carbon/C = L
- for(var/datum/wound/W in C.all_wounds)
+ for(var/i in C.all_wounds) // should probably replace with signal
+ var/datum/wound/W = i
W.crush(DOOR_CRUSH_DAMAGE)
if(isalien(L)) //For xenos
L.adjustBruteLoss(DOOR_CRUSH_DAMAGE * 1.5) //Xenos go into crit after aproximately the same amount of crushes as humans.
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index a3bbf95413..d4c8b32a6b 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -108,12 +108,12 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
mouse_drag_pointer = MOUSE_ACTIVE_POINTER //the icon to indicate this object is being dragged
- var/list/embedding = NONE
+ var/list/embedding
var/flags_cover = 0 //for flags such as GLASSESCOVERSEYES
var/heat = 0
- ///All items with sharpness of IS_SHARP or higher will automatically get the butchering component.
- var/sharpness = IS_BLUNT
+ ///All items with sharpness of SHARP_EDGED or higher will automatically get the butchering component.
+ var/sharpness = SHARP_NONE
var/tool_behaviour = NONE
var/toolspeed = 1
@@ -211,7 +211,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
if(GLOB.rpg_loot_items)
AddComponent(/datum/component/fantasy)
- if(sharpness) //give sharp objects butchering functionality, for consistency
+ if(sharpness && force > 5) //give sharp objects butchering functionality, for consistency
AddComponent(/datum/component/butchering, 80 * toolspeed)
/obj/item/proc/check_allowed_items(atom/target, not_inside, target_self)
@@ -1097,7 +1097,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
/obj/item/proc/updateEmbedding()
- if(!islist(embedding) || !LAZYLEN(embedding))
+ if(!LAZYLEN(embedding))
return
AddElement(/datum/element/embed,\
diff --git a/code/game/objects/items/chainsaw.dm b/code/game/objects/items/chainsaw.dm
index f382aa1ed3..ebb26fab93 100644
--- a/code/game/objects/items/chainsaw.dm
+++ b/code/game/objects/items/chainsaw.dm
@@ -16,7 +16,7 @@
custom_materials = list(/datum/material/iron=13000)
attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
hitsound = "swing_hit"
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
actions_types = list(/datum/action/item_action/startchainsaw)
tool_behaviour = TOOL_SAW
toolspeed = 0.5
@@ -71,10 +71,6 @@
/obj/item/chainsaw/update_icon_state()
icon_state = "chainsaw_[on ? "on" : "off"]"
-/obj/item/chainsaw/get_dismemberment_chance()
- if(wielded)
- . = ..()
-
/obj/item/chainsaw/doomslayer
name = "THE GREAT COMMUNICATOR"
desc = "
VRRRRRRR!!!"
diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm
index 08460993ee..9db9449fcb 100644
--- a/code/game/objects/items/dualsaber.dm
+++ b/code/game/objects/items/dualsaber.dm
@@ -105,7 +105,7 @@
to_chat(user, "
You lack the grace to wield this!")
return COMPONENT_TWOHANDED_BLOCK_WIELD
wielded = TRUE
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
w_class = w_class_on
total_mass = total_mass_on
hitsound = 'sound/weapons/blade1.ogg'
diff --git a/code/game/objects/items/fireaxe.dm b/code/game/objects/items/fireaxe.dm
index 7cb22d5eb0..6fb7b89262 100644
--- a/code/game/objects/items/fireaxe.dm
+++ b/code/game/objects/items/fireaxe.dm
@@ -13,11 +13,12 @@
slot_flags = ITEM_SLOT_BACK
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
max_integrity = 200
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
resistance_flags = FIRE_PROOF
- wound_bonus = -20
+ wound_bonus = -15
+ bare_wound_bonus = 20
var/wielded = FALSE // track wielded status on item
/obj/item/fireaxe/Initialize()
diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
index 691b4c4228..58146be20f 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -352,7 +352,7 @@
w_class = WEIGHT_CLASS_HUGE
slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_BELT
block_chance = 30
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
@@ -452,7 +452,7 @@
w_class = WEIGHT_CLASS_BULKY
armour_penetration = 35
slot_flags = ITEM_SLOT_BACK
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
attack_verb = list("chopped", "sliced", "cut", "reaped")
/obj/item/nullrod/scythe/Initialize()
@@ -575,7 +575,7 @@
righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi'
w_class = WEIGHT_CLASS_HUGE
item_flags = ABSTRACT
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
hitsound = 'sound/weapons/chainsawhit.ogg'
total_mass = TOTAL_MASS_HAND_REPLACEMENT
@@ -594,7 +594,7 @@
name = "clown dagger"
desc = "Used for absolutely hilarious sacrifices."
hitsound = 'sound/items/bikehorn.ogg'
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
/obj/item/nullrod/pride_hammer
@@ -645,7 +645,7 @@
throw_speed = 4
throw_range = 7
throwforce = 30
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
attack_verb = list("enlightened", "redpilled")
/obj/item/nullrod/armblade
@@ -657,7 +657,7 @@
righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi'
item_flags = ABSTRACT
w_class = WEIGHT_CLASS_HUGE
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
wound_bonus = -20
bare_wound_bonus = 25
total_mass = TOTAL_MASS_HAND_REPLACEMENT
@@ -699,7 +699,7 @@
force = 15
block_chance = 40
slot_flags = ITEM_SLOT_BACK
- sharpness = IS_BLUNT
+ sharpness = SHARP_NONE
hitsound = "swing_hit"
attack_verb = list("smashed", "slammed", "whacked", "thwacked")
icon = 'icons/obj/items_and_weapons.dmi'
@@ -754,7 +754,7 @@
name = "arrhythmic knife"
w_class = WEIGHT_CLASS_HUGE
desc = "They say fear is the true mind killer, but stabbing them in the head works too. Honour compels you to not sheathe it once drawn."
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
slot_flags = null
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
@@ -782,7 +782,7 @@
desc = "Holding this makes you look absolutely devilish."
attack_verb = list("poked", "impaled", "pierced", "jabbed")
hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
/obj/item/nullrod/egyptian
name = "egyptian staff"
diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm
index 8f274c04aa..e7cf8defc9 100644
--- a/code/game/objects/items/kitchen.dm
+++ b/code/game/objects/items/kitchen.dm
@@ -18,7 +18,7 @@
name = "fork"
desc = "Pointy."
icon_state = "fork"
- force = 5
+ force = 4
w_class = WEIGHT_CLASS_TINY
throwforce = 0
throw_speed = 3
@@ -28,6 +28,7 @@
attack_verb = list("attacked", "stabbed", "poked")
hitsound = 'sound/weapons/bladeslice.ogg'
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
+ sharpness = SHARP_POINTY
var/datum/reagent/forkload //used to eat omelette
/obj/item/kitchen/fork/suicide_act(mob/living/carbon/user)
@@ -61,7 +62,7 @@
throw_speed = 4
throw_range = 6
embedding = list("pain_mult" = 2, "embed_chance" = 100, "fall_chance" = 0, "embed_chance_turf_mod" = 15)
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
/obj/item/kitchen/knife
name = "kitchen knife"
@@ -76,7 +77,7 @@
throw_range = 6
custom_materials = list(/datum/material/iron=12000)
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- sharpness = IS_SHARP_ACCURATE
+ sharpness = SHARP_POINTY
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
var/bayonet = FALSE //Can this be attached to a gun?
wound_bonus = -5
diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm
index 20960da7c6..5e102a502e 100644
--- a/code/game/objects/items/melee/energy.dm
+++ b/code/game/objects/items/melee/energy.dm
@@ -102,7 +102,7 @@
attack_verb_off = list("tapped", "poked")
throw_speed = 3
throw_range = 5
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
embedding = list("embed_chance" = 75, "impact_pain_mult" = 10)
armour_penetration = 35
item_flags = NEEDS_PERMIT | ITEM_CAN_PARRY
@@ -174,7 +174,7 @@
sword_color = null //stops icon from breaking when turned on.
hitcost = 75 //Costs more than a standard cyborg esword
w_class = WEIGHT_CLASS_NORMAL
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
light_color = "#40ceff"
tool_behaviour = TOOL_SAW
toolspeed = 0.7
@@ -249,7 +249,7 @@
throw_range = 1
w_class = WEIGHT_CLASS_BULKY//So you can't hide it in your pocket or some such.
var/datum/effect_system/spark_spread/spark_system
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
//Most of the other special functions are handled in their own files. aka special snowflake code so kewl
/obj/item/melee/transforming/energy/blade/Initialize()
@@ -285,7 +285,7 @@
attack_verb_off = list("tapped", "poked")
throw_speed = 3
throw_range = 5
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
embedding = list("embedded_pain_multiplier" = 6, "embed_chance" = 20, "embedded_fall_chance" = 60)
armour_penetration = 10
block_chance = 35
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index ee24579e9a..3b312fe047 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -44,7 +44,7 @@
throwforce = 10
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "impaled", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
total_mass = TOTAL_MASS_HAND_REPLACEMENT
/obj/item/melee/synthetic_arm_blade/Initialize()
@@ -64,7 +64,7 @@
throwforce = 15
w_class = WEIGHT_CLASS_BULKY
armour_penetration = 75
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
attack_verb = list("slashed", "cut")
hitsound = 'sound/weapons/rapierhit.ogg'
custom_materials = list(/datum/material/iron = 1000)
@@ -168,7 +168,7 @@
flags_1 = CONDUCT_1
obj_flags = UNIQUE_RENAME
w_class = WEIGHT_CLASS_BULKY
- sharpness = IS_SHARP_ACCURATE //It cant be sharpend cook -_-
+ sharpness = SHARP_POINTY //It cant be sharpend cook -_-
attack_verb = list("stabs", "punctures", "pierces", "pokes")
hitsound = 'sound/weapons/rapierhit.ogg'
total_mass = 0.4
diff --git a/code/game/objects/items/melee/transforming.dm b/code/game/objects/items/melee/transforming.dm
index 386a6e9acc..fbdb19bd1c 100644
--- a/code/game/objects/items/melee/transforming.dm
+++ b/code/game/objects/items/melee/transforming.dm
@@ -1,5 +1,5 @@
/obj/item/melee/transforming
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
var/active = FALSE
var/force_on = 30 //force when active
var/faction_bonus_force = 0 //Bonus force dealt against certain factions
diff --git a/code/game/objects/items/pitchfork.dm b/code/game/objects/items/pitchfork.dm
index 49d0b64498..b296e2d0cb 100644
--- a/code/game/objects/items/pitchfork.dm
+++ b/code/game/objects/items/pitchfork.dm
@@ -9,7 +9,7 @@
w_class = WEIGHT_CLASS_BULKY
attack_verb = list("attacked", "impaled", "pierced")
hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
max_integrity = 200
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
resistance_flags = FIRE_PROOF
diff --git a/code/game/objects/items/sharpener.dm b/code/game/objects/items/sharpener.dm
index 6bf0b27fb4..fc19e61cd6 100644
--- a/code/game/objects/items/sharpener.dm
+++ b/code/game/objects/items/sharpener.dm
@@ -39,7 +39,7 @@
I.force = clamp(I.force + increment, 0, max)
user.visible_message("
[user] sharpens [I] with [src]!", "
You sharpen [I], making it much more deadly than before.")
- I.sharpness = IS_SHARP_ACCURATE
+ I.sharpness = SHARP_POINTY
I.throwforce = clamp(I.throwforce + increment, 0, max)
I.name = "[prefix] [I.name]"
name = "worn out [name]"
diff --git a/code/game/objects/items/shrapnel.dm b/code/game/objects/items/shrapnel.dm
index b74b0563b7..906c474aa8 100644
--- a/code/game/objects/items/shrapnel.dm
+++ b/code/game/objects/items/shrapnel.dm
@@ -7,13 +7,13 @@
icon_state = "large"
w_class = WEIGHT_CLASS_TINY
item_flags = DROPDEL
- sharpness = TRUE
+ sharpness = SHARP_EDGED
/obj/item/shrapnel/stingball // stingbang grenades
name = "stingball"
embedding = list(embed_chance=90, fall_chance=3, jostle_chance=7, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.7, pain_mult=5, jostle_pain_mult=6, rip_time=15, embed_chance_turf_mod=-100)
icon_state = "tiny"
- sharpness = FALSE
+ sharpness = SHARP_NONE
/obj/item/shrapnel/bullet // bullets
name = "bullet"
@@ -30,24 +30,25 @@
/obj/item/projectile/bullet/shrapnel
name = "flying shrapnel shard"
- damage = 8
- range = 10
+ damage = 14
+ range = 20
armour_penetration = -30
dismemberment = 5
ricochets_max = 2
- ricochet_chance = 40
+ ricochet_chance = 70
shrapnel_type = /obj/item/shrapnel
ricochet_incidence_leeway = 60
- sharpness = TRUE
- wound_bonus = 30
+ sharpness = SHARP_EDGED
+ wound_bonus = 40
/obj/item/projectile/bullet/shrapnel/mega
name = "flying shrapnel hunk"
- range = 25
- dismemberment = 10
- ricochets_max = 4
- ricochet_chance = 90
- ricochet_decay_chance = 0.9
+ range = 45
+ dismemberment = 15
+ ricochets_max = 6
+ ricochet_chance = 130
+ ricochet_incidence_leeway = 0
+ ricochet_delay_chance = 0.9
/obj/item/projectile/bullet/pellet/stingball
name = "stingball pellet"
@@ -71,10 +72,10 @@
name = "breakbang pellet"
damage = 10
wound_bonus = 40
- sharpness = FALSE
+ sharpness = SHARP_NONE
/obj/item/projectile/bullet/pellet/stingball/shred
name = "shredbang pellet"
damage = 10
wound_bonus = 30
- sharpness = TRUE
+ sharpness = SHARP_EDGED
diff --git a/code/game/objects/items/spear.dm b/code/game/objects/items/spear.dm
index 41cb68559b..f40c774551 100644
--- a/code/game/objects/items/spear.dm
+++ b/code/game/objects/items/spear.dm
@@ -15,14 +15,14 @@
custom_materials = list(/datum/material/iron=1150, /datum/material/glass=2075)
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
max_integrity = 200
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
var/obj/item/grenade/explosive = null
var/war_cry = "AAAAARGH!!!"
var/icon_prefix = "spearglass"
var/wielded = FALSE // track wielded status on item
- wound_bonus = -25
+ wound_bonus = -15
bare_wound_bonus = 15
/obj/item/spear/Initialize()
@@ -179,7 +179,7 @@
custom_materials = null
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
icon_prefix = "bone_spear"
/obj/item/spear/bonespear/ComponentInitialize()
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index b358608ee4..cf70776a16 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -132,11 +132,34 @@
// gauze is only relevant for wounds, which are handled in the wounds themselves
/obj/item/stack/medical/gauze/try_heal(mob/living/M, mob/user, silent)
var/obj/item/bodypart/limb = M.get_bodypart(check_zone(user.zone_selected))
- if(limb)
- if(limb.brute_dam > 40)
- to_chat(user, "
The bleeding on [user==M ? "your" : "[M]'s"] [limb.name] is from bruising, and cannot be treated with [src]!")
- else
- to_chat(user, "
There's no bleeding on [user==M ? "your" : "[M]'s"] [limb.name]")
+ if(!limb)
+ to_chat(user, "
There's nothing there to bandage!")
+ return
+ if(!LAZYLEN(limb.wounds))
+ to_chat(user, "
There's no wounds that require bandaging on [user==M ? "your" : "[M]'s"] [limb.name]!") // good problem to have imo
+ return
+
+ var/gauzeable_wound = FALSE
+ for(var/i in limb.wounds)
+ var/datum/wound/woundies = i
+ if(woundies.wound_flags & ACCEPTS_GAUZE)
+ gauzeable_wound = TRUE
+ break
+ if(!gauzeable_wound)
+ to_chat(user, "
There's no wounds that require bandaging on [user==M ? "your" : "[M]'s"] [limb.name]!") // good problem to have imo
+ return
+
+ if(limb.current_gauze && (limb.current_gauze.absorption_capacity * 0.8 > absorption_capacity)) // ignore if our new wrap is < 20% better than the current one, so someone doesn't bandage it 5 times in a row
+ to_chat(user, "
The bandage currently on [user==M ? "your" : "[M]'s"] [limb.name] is still in good condition!")
+ return
+
+ user.visible_message("
[user] begins wrapping the wounds on [M]'s [limb.name] with [src]...", "
You begin wrapping the wounds on [user == M ? "your" : "[M]'s"] [limb.name] with [src]...")
+
+ if(!do_after(user, (user == M ? self_delay : other_delay), target=M))
+ return
+
+ user.visible_message("
[user] applies [src] to [M]'s [limb.name].", "
You bandage the wounds on [user == M ? "yourself" : "[M]'s"] [limb.name].")
+ limb.apply_gauze(src)
/obj/item/stack/medical/gauze/attackby(obj/item/I, mob/user, params)
if(I.tool_behaviour == TOOL_WIRECUTTER || I.get_sharpness())
@@ -378,9 +401,9 @@
C.emote("scream")
for(var/i in C.bodyparts)
var/obj/item/bodypart/bone = i
- var/datum/wound/brute/bone/severe/oof_ouch = new
+ var/datum/wound/blunt/severe/oof_ouch = new
oof_ouch.apply_wound(bone)
- var/datum/wound/brute/bone/critical/oof_OUCH = new
+ var/datum/wound/blunt/critical/oof_OUCH = new
oof_OUCH.apply_wound(bone)
for(var/i in C.bodyparts)
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index d4baea2487..29b4dea6d8 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -289,7 +289,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
resistance_flags = ACID_PROOF
armor = list("melee" = 100, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 100)
max_integrity = 40
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
var/icon_prefix
embedding = list("embed_chance" = 65)
diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm
index 9560f7fab3..1f2a65321d 100644
--- a/code/game/objects/items/tools/weldingtool.dm
+++ b/code/game/objects/items/tools/weldingtool.dm
@@ -33,6 +33,8 @@
heat = 3800
tool_behaviour = TOOL_WELDER
toolspeed = 1
+ wound_bonus = 10
+ bare_wound_bonus = 15
/obj/item/weldingtool/Initialize()
. = ..()
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index fe2e0df2eb..029a02b9f9 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -447,7 +447,7 @@
block_parry_data = null
attack_verb = list("attacked", "struck", "hit")
total_mass_on = TOTAL_MASS_TOY_SWORD
- sharpness = IS_BLUNT
+ sharpness = SHARP_NONE
/obj/item/dualsaber/toy/ComponentInitialize()
AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=0, wieldsound='sound/weapons/saberon.ogg', unwieldsound='sound/weapons/saberoff.ogg')
@@ -466,7 +466,7 @@
attack_verb = list("attacked", "struck", "hit")
total_mass_on = TOTAL_MASS_TOY_SWORD
slowdown_wielded = 0
- sharpness = IS_BLUNT
+ sharpness = SHARP_NONE
/obj/item/dualsaber/hypereutactic/toy/ComponentInitialize()
AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=0, wieldsound='sound/weapons/saberon.ogg', unwieldsound='sound/weapons/saberoff.ogg')
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 56737cd1a9..0f6be3cf60 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -65,7 +65,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
block_chance = 50
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
max_integrity = 200
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
@@ -231,7 +231,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
block_chance = 50
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
max_integrity = 200
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
@@ -297,13 +297,13 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
force = 2
- throwforce = 20 //This is never used on mobs since this has a 100% embed chance.
+ throwforce = 10 //This is never used on mobs since this has a 100% embed chance.
throw_speed = 4
embedding = list("pain_mult" = 4, "embed_chance" = 100, "fall_chance" = 0, "embed_chance_turf_mod" = 15)
armour_penetration = 40
w_class = WEIGHT_CLASS_SMALL
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
custom_materials = list(/datum/material/iron=500, /datum/material/glass=500)
resistance_flags = FIRE_PROOF
@@ -316,7 +316,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/throwing_star/toy
name = "toy throwing star"
desc = "An aerodynamic disc strapped with adhesive for sticking to people, good for playing pranks and getting yourself killed by security."
- sharpness = IS_BLUNT
+ sharpness = SHARP_NONE
force = 0
throwforce = 0
embedding = list("pain_mult" = 0, "jostle_pain_mult" = 0, "embed_chance" = 100, "fall_chance" = 0)
@@ -353,7 +353,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
icon_state = extended_icon_state
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
else
force = initial(force)
w_class = WEIGHT_CLASS_SMALL
@@ -361,7 +361,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
icon_state = retracted_icon_state
attack_verb = list("stubbed", "poked")
hitsound = 'sound/weapons/genhit.ogg'
- sharpness = IS_BLUNT
+ sharpness = SHARP_NONE
/obj/item/switchblade/suicide_act(mob/user)
user.visible_message("
[user] is slitting [user.p_their()] own throat with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
@@ -462,7 +462,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
throwforce = 0
throw_range = 0
throw_speed = 0
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
hitsound = 'sound/weapons/chainsawhit.ogg'
total_mass = TOTAL_MASS_HAND_REPLACEMENT
@@ -860,7 +860,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
block_chance = 40
throwforce = 20
throw_speed = 4
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
attack_verb = list("cut", "sliced", "diced")
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index df63cf93e6..8661682424 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -125,18 +125,45 @@
dismantle_wall(1)
return
-/turf/closed/wall/attack_hulk(mob/user, does_attack_animation = 0)
- ..(user, 1)
+/turf/closed/wall/attack_hulk(mob/living/carbon/user)
+ ..()
+ var/obj/item/bodypart/arm = user.hand_bodyparts[user.active_hand_index]
+ if(!arm)
+ return
+ if(arm.disabled)
+ return
if(prob(hardness))
- playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1)
+ playsound(src, 'sound/effects/meteorimpact.ogg', 100, TRUE)
user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced = "hulk")
+ hulk_recoil(arm, user)
dismantle_wall(1)
+
else
- playsound(src, 'sound/effects/bang.ogg', 50, 1)
+ playsound(src, 'sound/effects/bang.ogg', 50, TRUE)
add_dent(WALL_DENT_HIT)
- to_chat(user, text("
You punch the wall."))
+ user.visible_message("
[user] smashes \the [src]!", \
+ "
You smash \the [src]!", \
+ "
You hear a booming smash!")
return TRUE
+/**
+ *Deals damage back to the hulk's arm.
+ *
+ *When a hulk manages to break a wall using their hulk smash, this deals back damage to the arm used.
+ *This is in its own proc just to be easily overridden by other wall types. Default allows for three
+ *smashed walls per arm. Also, we use CANT_WOUND here because wounds are random. Wounds are applied
+ *by hulk code based on arm damage and checked when we call break_an_arm().
+ *Arguments:
+ **arg1 is the arm to deal damage to.
+ **arg2 is the hulk
+ */
+/turf/closed/wall/proc/hulk_recoil(obj/item/bodypart/arm, mob/living/carbon/human/hulkman, var/damage = 20)
+ arm.receive_damage(brute = damage, blocked = 0, wound_bonus = CANT_WOUND)
+ var/datum/mutation/human/hulk/smasher = locate(/datum/mutation/human/hulk) in hulkman.dna.mutations
+ if(!smasher || !damage) //sanity check but also snow and wood walls deal no recoil damage, so no arm breaky
+ return
+ smasher.break_an_arm(arm)
+
/turf/closed/wall/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
. = ..()
if(.)
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index d0dc3c789e..5eb1ede525 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -1282,8 +1282,8 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
ADMIN_PUNISHMENT_ROD,
ADMIN_PUNISHMENT_PICKLE,
ADMIN_PUNISHMENT_FRY,
- ADMIN_PUNISHMENT_CRACK,
- ADMIN_PUNISHMENT_BLEED,
+ ADMIN_PUNISHMENT_CRACK,
+ ADMIN_PUNISHMENT_BLEED,
ADMIN_PUNISHMENT_SCARIFY)
@@ -1368,16 +1368,18 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
to_chat(usr,"
This must be used on a carbon mob.", confidential = TRUE)
return
var/mob/living/carbon/C = target
- for(var/obj/item/bodypart/squish_part in C.bodyparts)
- var/type_wound = pick(list(/datum/wound/brute/bone/critical, /datum/wound/brute/bone/severe, /datum/wound/brute/bone/critical, /datum/wound/brute/bone/severe, /datum/wound/brute/bone/moderate))
+ for(var/i in C.bodyparts)
+ var/obj/item/bodypart/squish_part = i
+ var/type_wound = pick(list(/datum/wound/blunt/critical, /datum/wound/blunt/severe, /datum/wound/blunt/critical, /datum/wound/blunt/severe, /datum/wound/blunt/moderate))
squish_part.force_wound_upwards(type_wound, smited=TRUE)
if(ADMIN_PUNISHMENT_BLEED)
if(!iscarbon(target))
to_chat(usr,"
This must be used on a carbon mob.", confidential = TRUE)
return
var/mob/living/carbon/C = target
- for(var/obj/item/bodypart/slice_part in C.bodyparts)
- var/type_wound = pick(list(/datum/wound/brute/cut/severe, /datum/wound/brute/cut/moderate))
+ for(var/i in C.bodyparts)
+ var/obj/item/bodypart/slice_part = i
+ var/type_wound = pick(list(/datum/wound/slash/severe, /datum/wound/slash/moderate))
slice_part.force_wound_upwards(type_wound, smited=TRUE)
type_wound = pick(list(/datum/wound/brute/cut/critical, /datum/wound/brute/cut/severe, /datum/wound/brute/cut/moderate))
slice_part.force_wound_upwards(type_wound, smited=TRUE)
@@ -1387,9 +1389,53 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
if(!iscarbon(target))
to_chat(usr,"
This must be used on a carbon mob.", confidential = TRUE)
return
- var/mob/living/carbon/C = target
- C.generate_fake_scars(rand(1, 4))
- to_chat(C, "
You feel your body grow jaded and torn...")
+ var/mob/living/carbon/dude = target
+ dude.generate_fake_scars(rand(1, 4))
+ to_chat(dude, "
You feel your body grow jaded and torn...")
+ if(ADMIN_PUNISHMENT_PERFORATE)
+ if(!iscarbon(target))
+ to_chat(usr,"
This must be used on a carbon mob.", confidential = TRUE)
+ return
+
+ var/list/how_fucked_is_this_dude = list("A little", "A lot", "So fucking much", "FUCK THIS DUDE")
+ var/hatred = input("How much do you hate this guy?") in how_fucked_is_this_dude
+ var/repetitions
+ var/shots_per_limb_per_rep = 2
+ var/damage
+ switch(hatred)
+ if("A little")
+ repetitions = 1
+ damage = 5
+ if("A lot")
+ repetitions = 2
+
+ damage = 8
+ if("So fucking much")
+ repetitions = 3
+ damage = 10
+ if("FUCK THIS DUDE")
+ repetitions = 4
+ damage = 10
+
+ var/mob/living/carbon/dude = target
+ var/list/open_adj_turfs = get_adjacent_open_turfs(dude)
+ var/list/wound_bonuses = list(15, 70, 110, 250)
+
+ var/delay_per_shot = 1
+ var/delay_counter = 1
+
+ dude.Immobilize(5 SECONDS)
+ for(var/wound_bonus_rep in 1 to repetitions)
+ for(var/i in dude.bodyparts)
+ var/obj/item/bodypart/slice_part = i
+ var/shots_this_limb = 0
+ for(var/t in shuffle(open_adj_turfs))
+ var/turf/iter_turf = t
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/firing_squad, dude, iter_turf, slice_part.body_zone, wound_bonuses[wound_bonus_rep], damage), delay_counter)
+ delay_counter += delay_per_shot
+ shots_this_limb++
+ if(shots_this_limb > shots_per_limb_per_rep)
+ break
if(ADMIN_PUNISHMENT_PICKLE)
target.turn_into_pickle()
if(ADMIN_PUNISHMENT_FRY)
@@ -1397,6 +1443,31 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
punish_log(target, punishment)
+/**
+ * firing_squad is a proc for the :B:erforate smite to shoot each individual bullet at them, so that we can add actual delays without sleep() nonsense
+ *
+ * Hilariously, if you drag someone away mid smite, the bullets will still chase after them from the original spot, possibly hitting other people. Too funny to fix imo
+ *
+ * Arguments:
+ * * target- guy we're shooting obviously
+ * * source_turf- where the bullet begins, preferably on a turf next to the target
+ * * body_zone- which bodypart we're aiming for, if there is one there
+ * * wound_bonus- the wounding power we're assigning to the bullet, since we don't care about the base one
+ * * damage- the damage we're assigning to the bullet, since we don't care about the base one
+ */
+/proc/firing_squad(mob/living/carbon/target, turf/source_turf, body_zone, wound_bonus, damage)
+ if(!target.get_bodypart(body_zone))
+ return
+ playsound(target, 'sound/weapons/gun/revolver/shot.ogg', 100)
+ var/obj/projectile/bullet/smite/divine_wrath = new(source_turf)
+ divine_wrath.damage = damage
+ divine_wrath.wound_bonus = wound_bonus
+ divine_wrath.original = target
+ divine_wrath.def_zone = body_zone
+ divine_wrath.spread = 0
+ divine_wrath.preparePixelProjectile(target, source_turf)
+ divine_wrath.fire()
+
/client/proc/punish_log(var/whom, var/punishment)
var/msg = "[key_name_admin(usr)] punished [key_name_admin(whom)] with [punishment]."
message_admins(msg)
diff --git a/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm b/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm
index 9301d0c239..b32237b7fb 100644
--- a/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm
+++ b/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm
@@ -361,9 +361,9 @@
torture_time -= I.force / 4
torture_dmg_brute += I.force / 4
//torture_dmg_burn += I.
- if(I.sharpness == IS_SHARP)
+ if(I.sharpness == SHARP_EDGED)
torture_time -= 1
- else if(I.sharpness == IS_SHARP_ACCURATE)
+ else if(I.sharpness == SHARP_POINTY)
torture_time -= 2
if(istype(I, /obj/item/weldingtool))
var/obj/item/weldingtool/welder = I
diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm
index 7d50374e96..24288be078 100644
--- a/code/modules/antagonists/changeling/powers/mutations.dm
+++ b/code/modules/antagonists/changeling/powers/mutations.dm
@@ -164,7 +164,7 @@
armour_penetration = 20
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
wound_bonus = -60
bare_wound_bonus = 20
var/can_drop = FALSE
diff --git a/code/modules/antagonists/changeling/powers/regenerate.dm b/code/modules/antagonists/changeling/powers/regenerate.dm
index bcebd8c62e..a88422e7eb 100644
--- a/code/modules/antagonists/changeling/powers/regenerate.dm
+++ b/code/modules/antagonists/changeling/powers/regenerate.dm
@@ -30,8 +30,8 @@
C.regenerate_limbs(1)
C.regenerate_organs()
for(var/i in C.all_wounds)
- var/datum/wound/W = i
- W.remove_wound()
+ var/datum/wound/iter_wound = i
+ iter_wound.remove_wound()
if(!user.getorganslot(ORGAN_SLOT_BRAIN))
var/obj/item/organ/brain/B
if(C.has_dna() && C.dna.species.mutant_brain)
diff --git a/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm b/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm
index 234f0445e0..9af1c54170 100644
--- a/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm
+++ b/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm
@@ -8,7 +8,7 @@
force = 15 //Extra damage is dealt to targets in attack()
throwforce = 25
armour_penetration = 10
- sharpness = IS_SHARP_ACCURATE
+ sharpness = SHARP_POINTY
attack_verb = list("stabbed", "poked", "slashed")
hitsound = 'sound/weapons/bladeslice.ogg'
w_class = WEIGHT_CLASS_BULKY
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index 4e9d40d91c..1b1c461dbc 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -53,7 +53,7 @@
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
flags_1 = CONDUCT_1
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
w_class = WEIGHT_CLASS_BULKY
force = 30 // whoever balanced this got beat in the head by a bible too many times good lord
throwforce = 10
@@ -114,7 +114,7 @@
armour_penetration = 45
throw_speed = 1
throw_range = 3
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
light_color = "#ff0000"
attack_verb = list("cleaved", "slashed", "torn", "hacked", "ripped", "diced", "carved")
icon_state = "cultbastard"
@@ -708,7 +708,7 @@
armour_penetration = 30
block_chance = 30
attack_verb = list("attacked", "impaled", "stabbed", "torn", "gored")
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
hitsound = 'sound/weapons/bladeslice.ogg'
var/datum/action/innate/cult/spear/spear_act
var/wielded = FALSE // track wielded status on item
diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm
index 35a674fb0e..3ae9cfcfb0 100644
--- a/code/modules/antagonists/slaughter/slaughter.dm
+++ b/code/modules/antagonists/slaughter/slaughter.dm
@@ -38,7 +38,7 @@
melee_damage_upper = 22.5
wound_bonus = -10
bare_wound_bonus = 0
- sharpness = TRUE
+ sharpness = SHARP_EDGED
see_in_dark = 8
blood_volume = 0 //No bleeding on getting shot, for skeddadles
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm
index 2701a2d006..d8a8e9a1be 100644
--- a/code/modules/antagonists/wizard/equipment/artefact.dm
+++ b/code/modules/antagonists/wizard/equipment/artefact.dm
@@ -259,7 +259,7 @@
to_chat(target, "
You suddenly feel very hot")
target.adjust_bodytemperature(50)
GiveHint(target)
- else if(is_pointed(I))
+ else if(I.get_sharpness() == SHARP_POINTY)
to_chat(target, "
You feel a stabbing pain in [parse_zone(user.zone_selected)]!")
target.DefaultCombatKnockdown(40)
GiveHint(target)
diff --git a/code/modules/cargo/packs/goodies.dm b/code/modules/cargo/packs/goodies.dm
index 2ff02d0473..86a7c73a34 100644
--- a/code/modules/cargo/packs/goodies.dm
+++ b/code/modules/cargo/packs/goodies.dm
@@ -81,3 +81,9 @@
desc = "Contains one hellgun, an old pattern of laser gun infamous for its ability to horribly disfigure targets with burns. Technically violates the Space Geneva Convention when used on humanoids."
cost = 1500
contains = list(/obj/item/gun/energy/laser/hellgun)
+
+/datum/supply_pack/goody/medipen_twopak
+ name = "Medipen Two-Pak"
+ desc = "Contains one standard epinephrine medipen and one standard emergency first-aid kit medipen. For when you want to prepare for the worst."
+ cost = 500
+ contains = list(/obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/hypospray/medipen/ekit)
diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm
index 5eacc2f583..ce66fc52d5 100644
--- a/code/modules/cargo/packs/medical.dm
+++ b/code/modules/cargo/packs/medical.dm
@@ -218,3 +218,18 @@
/obj/item/storage/box/beakers)
crate_name = "virus containment unit crate"
crate_type = /obj/structure/closet/crate/secure/plasma
+
+/datum/supply_pack/medical/medipen_variety
+ name = "Medipen Variety-Pak"
+ desc = "Contains eight different medipens in three different varieties, to assist in quickly treating seriously injured patients."
+ cost = 2000
+ contains = list(/obj/item/reagent_containers/hypospray/medipen/,
+ /obj/item/reagent_containers/hypospray/medipen/,
+ /obj/item/reagent_containers/hypospray/medipen/ekit,
+ /obj/item/reagent_containers/hypospray/medipen/ekit,
+ /obj/item/reagent_containers/hypospray/medipen/ekit,
+ /obj/item/reagent_containers/hypospray/medipen/blood_loss,
+ /obj/item/reagent_containers/hypospray/medipen/blood_loss,
+ /obj/item/reagent_containers/hypospray/medipen/blood_loss
+
+ crate_name = "medipen crate"
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 75e914ea68..c0107ebd9f 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -832,7 +832,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "
Socks Color: Change"
dat += "
Backpack:[backbag]"
dat += "
Jumpsuit:[jumpsuit_style]"
- if(CAN_SCAR in pref_species.species_traits)
+ if((HAS_FLESH in pref_species.species_traits) || (HAS_BONE in pref_species.species_traits))
dat += "
Temporal Scarring:[(persistent_scars) ? "Enabled" : "Disabled"]"
dat += "
Clear scar slots"
dat += "
Uplink Location:[uplink_spawn_loc]"
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index 01effea6f2..350a577fb1 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -96,7 +96,7 @@
throw_speed = 4
attack_verb = list("sliced")
hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
/obj/item/clothing/glasses/meson/eyepatch
name = "eyepatch mesons"
@@ -180,7 +180,7 @@
throw_speed = 4
attack_verb = list("sliced")
hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
vision_correction = 1
glass_colour_type = /datum/client_colour/glass_colour/lightgreen
@@ -237,7 +237,7 @@
throw_speed = 4
attack_verb = list("sliced")
hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
/obj/item/clothing/glasses/sunglasses/garb/supergarb
name = "black giga gar glasses"
@@ -257,7 +257,7 @@
throw_speed = 4
attack_verb = list("sliced")
hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
glass_colour_type = /datum/client_colour/glass_colour/orange
/obj/item/clothing/glasses/sunglasses/gar/supergar
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index c745cd74f0..9ca98b0bca 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -70,7 +70,7 @@
flash_protect = -2
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
glass_colour_type = /datum/client_colour/glass_colour/green
-
+
/obj/item/clothing/glasses/hud/health/night/syndicate
name = "combat night vision health scanner HUD"
desc = "An advanced shielded medical heads-up display that allows soldiers to approximate how much lead poisoning their allies have suffered in complete darkness."
@@ -221,7 +221,7 @@
throw_speed = 4
attack_verb = list("sliced")
hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
/obj/item/clothing/glasses/hud/security/sunglasses/gars/supergars
name = "giga HUD gar glasses"
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index b61743729f..cf7dbc7462 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -8,7 +8,7 @@
equip_delay_other = 40
max_integrity = 250
resistance_flags = NONE
- armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 15)
+ armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 10)
/obj/item/clothing/suit/armor/Initialize()
@@ -58,7 +58,7 @@
icon_state = "hos"
item_state = "greatcoat"
body_parts_covered = CHEST|GROIN|ARMS|LEGS
- armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90, "wound" = 20)
+ armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90, "wound" = 10)
cold_protection = CHEST|GROIN|LEGS|ARMS
heat_protection = CHEST|GROIN|LEGS|ARMS
strip_delay = 80
@@ -148,7 +148,7 @@
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
- armor = list("melee" = 50, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80, "wound" = 30)
+ armor = list("melee" = 50, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80, "wound" = 20)
blocks_shove_knockdown = TRUE
strip_delay = 80
equip_delay_other = 60
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index d87eb8fbc0..e31a9704df 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -87,7 +87,7 @@
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("stabbed", "slashed", "attacked")
var/icon/broken_outline = icon('icons/obj/drinks.dmi', "broken")
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
/obj/item/broken_bottle/Initialize()
. = ..()
diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index adb8e47c94..45b64fbece 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -247,21 +247,9 @@ All foods are distributed among various categories. Use common sense.
to_chat(user, "
You cannot slice [src] here! You need a table or at least a tray.")
return FALSE
- var/slices_lost = 0
- if (accuracy >= IS_SHARP_ACCURATE)
- user.visible_message( \
- "[user] slices [src].", \
- "
You slice [src]." \
- )
- else
- user.visible_message( \
- "[user] inaccurately slices [src] with [W]!", \
- "
You inaccurately slice [src] with your [W]!" \
- )
- slices_lost = rand(1,min(1,round(slices_num/2)))
-
+ user.visible_message("[user] slices [src].", "
You slice [src].")
var/reagents_per_slice = reagents.total_volume/slices_num
- for(var/i=1 to (slices_num-slices_lost))
+ for(var/i=1 to slices_num)
var/obj/item/reagent_containers/food/snacks/slice = new slice_path (loc)
initialize_slice(slice, reagents_per_slice)
qdel(src)
diff --git a/code/modules/goonchat/browserassets/css/browserOutput.css b/code/modules/goonchat/browserassets/css/browserOutput.css
index 93c733391e..2669a3634a 100644
--- a/code/modules/goonchat/browserassets/css/browserOutput.css
+++ b/code/modules/goonchat/browserassets/css/browserOutput.css
@@ -303,7 +303,10 @@ h1.alert, h2.alert {color: #000000;}
.passive {color: #660000;}
.userdanger {color: #ff0000; font-weight: bold; font-size: 185%;}
+.bolddanger {color: #c51e1e;font-weight: bold;}
.danger {color: #ff0000;}
+.tinydanger {color: #c51e1e; font-size: 85%;}
+.smalldanger {color: #c51e1e; font-size: 90%;}
.warning {color: #ff0000; font-style: italic;}
.alertwarning {color: #FF0000; font-weight: bold}
.boldwarning {color: #ff0000; font-style: italic; font-weight: bold}
@@ -313,8 +316,9 @@ h1.alert, h2.alert {color: #000000;}
.rose {color: #ff5050;}
.info {color: #0000CC;}
.notice {color: #000099;}
-.tinynotice {color: #6685f5; font-style: italic; font-size: 85%;}
-.smallnotice {color: #6685f5; font-style: italic; font-size: 90%;}
+.tinynotice {color: #6685f5; font-style: italic; font-size: 85%;}
+.smallnotice {color: #6685f5; font-size: 90%;}
+.smallnoticeital {color: #6685f5; font-style: italic; font-size: 90%;}
.boldnotice {color: #000099; font-weight: bold;}
.adminnotice {color: #0000ff;}
.adminhelp {color: #ff0000; font-weight: bold;}
diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
index 9b5983c8e9..abf6632939 100644
--- a/code/modules/hydroponics/hydroitemdefines.dm
+++ b/code/modules/hydroponics/hydroitemdefines.dm
@@ -82,7 +82,7 @@
custom_materials = list(/datum/material/iron = 15000)
attack_verb = list("chopped", "torn", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
/obj/item/hatchet/Initialize()
. = ..()
diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm
index 745c46b131..ab1d7a3d2e 100644
--- a/code/modules/mining/equipment/kinetic_crusher.dm
+++ b/code/modules/mining/equipment/kinetic_crusher.dm
@@ -17,7 +17,7 @@
custom_materials = list(/datum/material/iron=1150, /datum/material/glass=2075)
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("smashed", "crushed", "cleaved", "chopped", "pulped")
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
actions_types = list(/datum/action/item_action/toggle_light)
var/list/trophies = list()
var/charged = TRUE
diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm
index 50a3dec9dd..27259ce812 100644
--- a/code/modules/mining/equipment/mining_tools.dm
+++ b/code/modules/mining/equipment/mining_tools.dm
@@ -143,7 +143,7 @@
w_class = WEIGHT_CLASS_NORMAL
custom_materials = list(/datum/material/iron=350)
attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
/obj/item/shovel/Initialize()
. = ..()
@@ -181,4 +181,4 @@
w_class = WEIGHT_CLASS_NORMAL
toolspeed = 0.7
attack_verb = list("slashed", "impaled", "stabbed", "sliced")
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index bfdb731869..8a7ae3ab39 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -659,7 +659,7 @@
hitsound = 'sound/weapons/bladeslice.ogg'
hitsound_on = 'sound/weapons/bladeslice.ogg'
w_class = WEIGHT_CLASS_BULKY
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
faction_bonus_force = 30
nemesis_factions = list("mining", "boss")
var/transform_cooldown
@@ -765,7 +765,7 @@
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
flags_1 = CONDUCT_1
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
w_class = WEIGHT_CLASS_BULKY
force = 1
throwforce = 1
diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm
index d3dbfac8c8..42d4a78433 100644
--- a/code/modules/mob/living/bloodcrawl.dm
+++ b/code/modules/mob/living/bloodcrawl.dm
@@ -73,7 +73,7 @@
if(victim.stat == CONSCIOUS)
src.visible_message("
[victim] kicks free of the blood pool just before entering it!", null, "
You hear splashing and struggling.")
- else if(victim.reagents && victim.reagents.has_reagent(/datum/reagent/consumable/ethanol/demonsblood))
+ else if(victim.reagents?.has_reagent(/datum/reagent/consumable/ethanol/demonsblood, needs_metabolizing = TRUE))
visible_message("
Something prevents [victim] from entering the pool!", "
A strange force is blocking [victim] from entering!", "
You hear a splash and a thud.")
else
victim.forceMove(src)
@@ -104,7 +104,7 @@
if(!victim)
return FALSE
- if(victim.reagents && victim.reagents.has_reagent(/datum/reagent/consumable/ethanol/devilskiss))
+ if(victim.reagents?.has_reagent(/datum/reagent/consumable/ethanol/devilskiss, needs_metabolizing = TRUE))
to_chat(src, "
AAH! THEIR FLESH! IT BURNS!")
adjustBruteLoss(25) //I can't use adjustHealth() here because bloodcrawl affects /mob/living and adjustHealth() only affects simple mobs
var/found_bloodpool = FALSE
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 4b7e27656b..33d6f09c5a 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -92,17 +92,8 @@
if(!all_wounds || !(user.a_intent == INTENT_HELP || user == src))
return ..()
- // The following priority/nonpriority searching is so that if we have two wounds on a limb that use the same item for treatment (gauze can bandage cuts AND splint broken bones),
- // we prefer whichever wound is not already treated (ignore the splinted broken bone for the open cut). If there's no priority wounds that this can treat, go through the
- // non-priority ones randomly.
- var/list/nonpriority_wounds = list()
- for(var/datum/wound/W in shuffle(all_wounds))
- if(!W.treat_priority)
- nonpriority_wounds += W
- else if(W.treat_priority && W.try_treating(I, user))
- return 1
-
- for(var/datum/wound/W in shuffle(nonpriority_wounds))
+ for(var/i in shuffle(all_wounds))
+ var/datum/wound/W = i
if(W.try_treating(I, user))
return 1
@@ -1225,16 +1216,16 @@
/**
* generate_fake_scars()- for when you want to scar someone, but you don't want to hurt them first. These scars don't count for temporal scarring (hence, fake)
*
- * If you want a specific wound scar, pass that wound type as the second arg, otherwise you can pass a list like WOUND_LIST_CUT to generate a random cut scar.
+ * If you want a specific wound scar, pass that wound type as the second arg, otherwise you can pass a list like WOUND_LIST_SLASH to generate a random cut scar.
*
* Arguments:
* * num_scars- A number for how many scars you want to add
- * * forced_type- Which wound or category of wounds you want to choose from, WOUND_LIST_BONE, WOUND_LIST_CUT, or WOUND_LIST_BURN (or some combination). If passed a list, picks randomly from the listed wounds. Defaults to all 3 types
+ * * forced_type- Which wound or category of wounds you want to choose from, WOUND_LIST_BLUNT, WOUND_LIST_SLASH, or WOUND_LIST_BURN (or some combination). If passed a list, picks randomly from the listed wounds. Defaults to all 3 types
*/
/mob/living/carbon/proc/generate_fake_scars(num_scars, forced_type)
for(var/i in 1 to num_scars)
- var/datum/scar/S = new
- var/obj/item/bodypart/BP = pick(bodyparts)
+ var/datum/scar/scaries = new
+ var/obj/item/bodypart/scar_part = pick(bodyparts)
var/wound_type
if(forced_type)
@@ -1243,9 +1234,17 @@
else
wound_type = forced_type
else
- wound_type = pick(WOUND_LIST_BONE + WOUND_LIST_CUT + WOUND_LIST_BURN)
+ wound_type = pick(GLOB.global_all_wound_types)
- var/datum/wound/W = new wound_type
- S.generate(BP, W)
- S.fake = TRUE
- QDEL_NULL(W)
+ var/datum/wound/phantom_wound = new wound_type
+ scaries.generate(scar_part, phantom_wound)
+ scaries.fake = TRUE
+ QDEL_NULL(phantom_wound)
+
+/**
+ * get_biological_state is a helper used to see what kind of wounds we roll for. By default we just assume carbons (read:monkeys) are flesh and bone, but humans rely on their species datums
+ *
+ * go look at the species def for more info [/datum/species/proc/get_biological_state]
+ */
+/mob/living/carbon/proc/get_biological_state()
+ return BIO_FLESH_BONE
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 196cec849d..66a0b7869d 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -76,7 +76,7 @@
if(!affecting) //missing limb? we select the first bodypart (you can never have zero, because of chest)
affecting = bodyparts[1]
SEND_SIGNAL(I, COMSIG_ITEM_ATTACK_ZONE, src, user, affecting)
- send_item_attack_message(I, user, affecting.name, totitemdamage)
+ send_item_attack_message(I, user, affecting.name, affecting, totitemdamage)
I.do_stagger_action(src, user, totitemdamage)
if(I.force)
apply_damage(totitemdamage, I.damtype, affecting, wound_bonus = I.wound_bonus, bare_wound_bonus = I.bare_wound_bonus, sharpness = I.get_sharpness()) //CIT CHANGE - replaces I.force with totitemdamage
@@ -100,12 +100,6 @@
head.add_mob_blood(src)
update_inv_head()
- //dismemberment
- var/probability = I.get_dismemberment_chance(affecting)
- if(prob(probability))
- if(affecting.dismember(I.damtype))
- I.add_mob_blood(src)
- playsound(get_turf(src), I.get_dismember_sound(), 80, 1)
return TRUE //successful attack
/mob/living/carbon/attack_drone(mob/living/simple_animal/drone/user)
@@ -132,9 +126,10 @@
if(S.next_step(user, act_intent))
return TRUE
- for(var/datum/wound/W in all_wounds)
+ for(var/i in all_wounds)
+ var/datum/wound/W = i
if(W.try_handling(user))
- return 1
+ return TRUE
/mob/living/carbon/attack_paw(mob/living/carbon/monkey/M)
@@ -151,14 +146,14 @@
if(M.a_intent == INTENT_HELP)
help_shake_act(M)
- return 0
+ return FALSE
. = ..()
if(.) //successful monkey bite.
for(var/thing in M.diseases)
var/datum/disease/D = thing
ForceContractDisease(D)
- return 1
+ return TRUE
/mob/living/carbon/attack_slime(mob/living/simple_animal/slime/M)
@@ -400,7 +395,7 @@
to_chat(src, "
Your eyes are really starting to hurt. This can't be good for you!")
if(has_bane(BANE_LIGHT))
mind.disrupt_spells(-500)
- return 1
+ return TRUE
else if(damage == 0) // just enough protection
if(prob(20))
to_chat(src, "
Something bright flashes in the corner of your vision!")
@@ -475,3 +470,35 @@
var/obj/item/bodypart/limb = get_bodypart(zone)
if(!limb)
return
+
+/mob/living/carbon/send_item_attack_message(obj/item/I, mob/living/user, hit_area, obj/item/bodypart/hit_bodypart, totitemdamage)
+ var/message_verb = "attacked"
+ if(length(I.attack_verb))
+ message_verb = "[pick(I.attack_verb)]"
+ else if(!I.force)
+ return
+
+ var/extra_wound_details = ""
+ if(I.damtype == BRUTE && hit_bodypart.can_dismember())
+ var/mangled_state = hit_bodypart.get_mangled_state()
+ var/bio_state = get_biological_state()
+ if(mangled_state == BODYPART_MANGLED_BOTH)
+ extra_wound_details = ", threatening to sever it entirely"
+ else if((mangled_state == BODYPART_MANGLED_FLESH && I.get_sharpness()) || (mangled_state & BODYPART_MANGLED_BONE && bio_state == BIO_JUST_BONE))
+ extra_wound_details = ", [I.get_sharpness() == SHARP_EDGED ? "slicing" : "piercing"] through to the bone"
+ else if((mangled_state == BODYPART_MANGLED_BONE && I.get_sharpness()) || (mangled_state & BODYPART_MANGLED_FLESH && bio_state == BIO_JUST_FLESH))
+ extra_wound_details = ", [I.get_sharpness() == SHARP_EDGED ? "slicing" : "piercing"] at the remaining tissue"
+
+ var/message_hit_area = ""
+ if(hit_area)
+ message_hit_area = " in the [hit_area]"
+ var/attack_message = "[src] is [message_verb][message_hit_area] with [I][extra_wound_details]!"
+ var/attack_message_local = "You're [message_verb][message_hit_area] with [I][extra_wound_details]!"
+ if(user in viewers(src, null))
+ attack_message = "[user] [message_verb] [src][message_hit_area] with [I][extra_wound_details]!"
+ attack_message_local = "[user] [message_verb] you[message_hit_area] with [I][extra_wound_details]!"
+ if(user == src)
+ attack_message_local = "You [message_verb] yourself[message_hit_area] with [I][extra_wound_details]"
+ visible_message("
[attack_message]",\
+ "
[attack_message_local]", null, COMBAT_MESSAGE_RANGE)
+ return TRUE
diff --git a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm
index ddf1019f2a..5c5a1d6d52 100644
--- a/code/modules/mob/living/carbon/damage_procs.dm
+++ b/code/modules/mob/living/carbon/damage_procs.dm
@@ -1,6 +1,6 @@
-/mob/living/carbon/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = FALSE)
+/mob/living/carbon/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = SHARP_NONE)
SEND_SIGNAL(src, COMSIG_MOB_APPLY_DAMGE, damage, damagetype, def_zone)
var/hit_percent = (100-blocked)/100
if(!forced && hit_percent <= 0)
@@ -202,7 +202,7 @@
//Damages ONE bodypart randomly selected from damagable ones.
//It automatically updates damage overlays if necessary
//It automatically updates health status
-/mob/living/carbon/take_bodypart_damage(brute = 0, burn = 0, stamina = 0, updating_health = TRUE, required_status, check_armor = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = FALSE)
+/mob/living/carbon/take_bodypart_damage(brute = 0, burn = 0, stamina = 0, updating_health = TRUE, required_status, check_armor = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = SHARP_NONE)
var/list/obj/item/bodypart/parts = get_damageable_bodyparts()
if(!parts.len)
return
diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm
index be046a3713..5eabae16f7 100644
--- a/code/modules/mob/living/carbon/examine.dm
+++ b/code/modules/mob/living/carbon/examine.dm
@@ -44,7 +44,8 @@
msg += "
[t_He] [t_has] \a [icon2html(I, user)] [I] stuck to [t_his] [BP.name]!\n"
else
msg += "
[t_He] [t_has] \a [icon2html(I, user)] [I] embedded in [t_his] [BP.name]!\n"
- for(var/datum/wound/W in BP.wounds)
+ for(var/i in BP.wounds)
+ var/datum/wound/W = i
msg += "[W.get_examine_description(user)]\n"
for(var/X in disabled)
@@ -109,7 +110,7 @@
switch(scar_severity)
if(1 to 2)
- msg += "
[t_He] [t_has] visible scarring, you can look again to take a closer look...\n"
+ msg += "
[t_He] [t_has] visible scarring, you can look again to take a closer look...\n"
if(3 to 4)
msg += "
[t_He] [t_has] several bad scars, you can look again to take a closer look...\n"
if(5 to 6)
diff --git a/code/modules/mob/living/carbon/human/damage_procs.dm b/code/modules/mob/living/carbon/human/damage_procs.dm
index 5cd00b7e6a..04ec1196fd 100644
--- a/code/modules/mob/living/carbon/human/damage_procs.dm
+++ b/code/modules/mob/living/carbon/human/damage_procs.dm
@@ -1,5 +1,5 @@
// depending on the species, it will run the corresponding apply_damage code there
-/mob/living/carbon/human/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = FALSE)
+/mob/living/carbon/human/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = SHARP_NONE)
return dna.species.apply_damage(damage, damagetype, def_zone, blocked, src, forced, spread_damage, wound_bonus, bare_wound_bonus, sharpness)
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 285134201f..1fbc098e42 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -163,8 +163,9 @@
msg += "
[t_He] [t_has] \a [icon2html(I, user)] [I] stuck to [t_his] [BP.name]!\n"
else
msg += "
[t_He] [t_has] \a [icon2html(I, user)] [I] embedded in [t_his] [BP.name]!\n"
- for(var/datum/wound/W in BP.wounds)
- msg += "[W.get_examine_description(user)]\n"
+ for(var/i in BP.wounds)
+ var/datum/wound/iter_wound = i
+ msg += "[iter_wound.get_examine_description(user)]\n"
for(var/X in disabled)
var/obj/item/bodypart/BP = X
@@ -270,7 +271,12 @@
bleeding_limbs += BP
var/num_bleeds = LAZYLEN(bleeding_limbs)
- var/bleed_text = "
[t_He] [t_is] bleeding from [t_his]"
+ var/list/bleed_text
+ if(appears_dead)
+ bleed_text = list("Blood is visible in [t_his] open")
+ else
+ bleed_text = list("[t_He] [t_is] bleeding from [t_his]")
+
switch(num_bleeds)
if(1 to 2)
bleed_text += " [bleeding_limbs[1].name][num_bleeds == 2 ? " and [bleeding_limbs[2].name]" : ""]"
@@ -280,8 +286,15 @@
bleed_text += " [BP.name],"
bleed_text += " and [bleeding_limbs[num_bleeds].name]"
- bleed_text += "!\n"
- msg += bleed_text
+
+ if(appears_dead)
+ bleed_text += ", but it has pooled and is not flowing.\n"
+ else
+ if(reagents.has_reagent(/datum/reagent/toxin/heparin, needs_metabolizing = TRUE))
+ bleed_text += " incredibly quickly"
+
+ bleed_text += "!\n"
+ msg += bleed_text.Join()
if(reagents.has_reagent(/datum/reagent/teslium))
msg += "[t_He] [t_is] emitting a gentle blue glow!\n"
@@ -365,7 +378,7 @@
switch(scar_severity)
if(1 to 2)
- msg += "
[t_He] [t_has] visible scarring, you can look again to take a closer look...\n"
+ msg += "
[t_He] [t_has] visible scarring, you can look again to take a closer look...\n"
if(3 to 4)
msg += "
[t_He] [t_has] several bad scars, you can look again to take a closer look...\n"
if(5 to 6)
diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm
index 8672c0e83d..af95b9e1b7 100644
--- a/code/modules/mob/living/carbon/human/human_helpers.dm
+++ b/code/modules/mob/living/carbon/human/human_helpers.dm
@@ -154,19 +154,29 @@
/// For use formatting all of the scars this human has for saving for persistent scarring
/mob/living/carbon/human/proc/format_scars()
- if(!all_scars)
+ var/list/missing_bodyparts = get_missing_limbs()
+ if(!all_scars && !length(missing_bodyparts))
return
var/scars = ""
+ for(var/i in missing_bodyparts)
+ var/datum/scar/scaries = new
+ scars += "[scaries.format_amputated(i)]"
for(var/i in all_scars)
- var/datum/scar/S = i
- scars += "[S.format()];"
+ var/datum/scar/scaries = i
+ scars += "[scaries.format()];"
return scars
/// Takes a single scar from the persistent scar loader and recreates it from the saved data
/mob/living/carbon/human/proc/load_scar(scar_line)
var/list/scar_data = splittext(scar_line, "|")
- if(LAZYLEN(scar_data) != 4)
+ if(LAZYLEN(scar_data) != SCAR_SAVE_LENGTH)
return // invalid, should delete
- var/obj/item/bodypart/BP = get_bodypart("[scar_data[SCAR_SAVE_ZONE]]")
- var/datum/scar/S = new
- return S.load(BP, scar_data[SCAR_SAVE_DESC], scar_data[SCAR_SAVE_PRECISE_LOCATION], text2num(scar_data[SCAR_SAVE_SEVERITY]))
+ var/version = text2num(scar_data[SCAR_SAVE_VERS])
+ if(!version || version < SCAR_CURRENT_VERSION) // get rid of old scars
+ return
+ var/obj/item/bodypart/the_part = get_bodypart("[scar_data[SCAR_SAVE_ZONE]]")
+ var/datum/scar/scaries = new
+ return scaries.load(the_part, scar_data[SCAR_SAVE_VERS], scar_data[SCAR_SAVE_DESC], scar_data[SCAR_SAVE_PRECISE_LOCATION], text2num(scar_data[SCAR_SAVE_SEVERITY]))
+
+/mob/living/carbon/human/get_biological_state()
+ return dna.species.get_biological_state()
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index ba6fde421d..84d1f5a270 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -73,7 +73,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
var/datum/outfit/outfit_important_for_life // A path to an outfit that is important for species life e.g. plasmaman outfit
// species-only traits. Can be found in DNA.dm
- var/list/species_traits = list(CAN_SCAR) //by default they can scar unless set to something else
+ var/list/species_traits = list(HAS_FLESH,HAS_BONE) //by default they can scar and have bones/flesh unless set to something else
// generic traits tied to having the species
var/list/inherent_traits = list()
var/inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID
@@ -1743,20 +1743,13 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
apply_damage(totitemdamage * weakness, I.damtype, def_zone, armor_block, H, wound_bonus = Iwound_bonus, bare_wound_bonus = I.bare_wound_bonus, sharpness = I.get_sharpness())
- H.send_item_attack_message(I, user, hit_area, totitemdamage)
+ H.send_item_attack_message(I, user, hit_area, affecting, totitemdamage)
I.do_stagger_action(H, user, totitemdamage)
if(!totitemdamage)
return 0 //item force is zero
- //dismemberment
- var/probability = I.get_dismemberment_chance(affecting)
- if(prob(probability) || (HAS_TRAIT(H, TRAIT_EASYDISMEMBER) && prob(probability))) //try twice
- if(affecting.dismember(I.damtype))
- I.add_mob_blood(H)
- playsound(get_turf(H), I.get_dismember_sound(), 80, 1)
-
var/bloody = 0
if(((I.damtype == BRUTE) && I.force && prob(25 + (I.force * 2))))
if(affecting.status == BODYPART_ORGANIC)
@@ -1956,7 +1949,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
append_message += ", causing them to drop [target_held_item]"
log_combat(user, target, "shoved", append_message)
-/datum/species/proc/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked, mob/living/carbon/human/H, forced = FALSE, spread_damage = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = FALSE)
+/datum/species/proc/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked, mob/living/carbon/human/H, forced = FALSE, spread_damage = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = SHARP_NONE)
SEND_SIGNAL(H, COMSIG_MOB_APPLY_DAMGE, damage, damagetype, def_zone, wound_bonus, bare_wound_bonus, sharpness) // make sure putting wound_bonus here doesn't screw up other signals or uses for this signal
var/hit_percent = (100-(blocked+armor))/100
hit_percent = (hit_percent * (100-H.physiology.damage_resistance))/100
@@ -2032,6 +2025,25 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
// called before a projectile hit
return
+/**
+
+
+
+ * The human species version of [/mob/living/carbon/proc/get_biological_state]. Depends on the HAS_FLESH and HAS_BONE species traits, having bones lets you have bone wounds, having flesh lets you have burn, slash, and piercing wounds
+
+
+
+ */
+
+
+
+/datum/species/proc/get_biological_state(mob/living/carbon/human/H)
+ . = BIO_INORGANIC
+ if(HAS_FLESH in species_traits)
+ . |= BIO_JUST_FLESH
+ if(HAS_BONE in species_traits)
+ . |= BIO_JUST_BONE
+
/////////////
//BREATHING//
/////////////
diff --git a/code/modules/mob/living/carbon/human/species_types/abductors.dm b/code/modules/mob/living/carbon/human/species_types/abductors.dm
index 409781efb2..9036aa10ec 100644
--- a/code/modules/mob/living/carbon/human/species_types/abductors.dm
+++ b/code/modules/mob/living/carbon/human/species_types/abductors.dm
@@ -3,7 +3,7 @@
id = "abductor"
say_mod = "gibbers"
sexes = FALSE
- species_traits = list(NOBLOOD,NOEYES,NOGENITALS,NOAROUSAL,CAN_SCAR)
+ species_traits = list(NOBLOOD,NOEYES,NOGENITALS,NOAROUSAL,HAS_FLESH,HAS_BONE)
inherent_traits = list(TRAIT_VIRUSIMMUNE,TRAIT_CHUNKYFINGERS,TRAIT_NOHUNGER,TRAIT_NOBREATH)
mutanttongue = /obj/item/organ/tongue/abductor
diff --git a/code/modules/mob/living/carbon/human/species_types/angel.dm b/code/modules/mob/living/carbon/human/species_types/angel.dm
index 2d43c9964e..81c016ec96 100644
--- a/code/modules/mob/living/carbon/human/species_types/angel.dm
+++ b/code/modules/mob/living/carbon/human/species_types/angel.dm
@@ -2,7 +2,7 @@
name = "Angel"
id = "angel"
default_color = "FFFFFF"
- species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,CAN_SCAR)
+ species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,HAS_FLESH,HAS_BONE)
mutant_bodyparts = list("tail_human" = "None", "ears" = "None", "wings" = "Angel")
use_skintones = USE_SKINTONES_GRAYSCALE_CUSTOM
no_equip = list(SLOT_BACK)
diff --git a/code/modules/mob/living/carbon/human/species_types/bugmen.dm b/code/modules/mob/living/carbon/human/species_types/bugmen.dm
index a51dadb523..fb52d10be4 100644
--- a/code/modules/mob/living/carbon/human/species_types/bugmen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/bugmen.dm
@@ -3,7 +3,7 @@
id = "insect"
say_mod = "chitters"
default_color = "00FF00"
- species_traits = list(LIPS,EYECOLOR,HAIR,FACEHAIR,MUTCOLORS,HORNCOLOR,WINGCOLOR,CAN_SCAR)
+ species_traits = list(LIPS,EYECOLOR,HAIR,FACEHAIR,MUTCOLORS,HORNCOLOR,WINGCOLOR,HAS_FLESH,HAS_BONE)
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG
mutant_bodyparts = list("mcolor" = "FFFFFF","mcolor2" = "FFFFFF","mcolor3" = "FFFFFF", "mam_tail" = "None", "mam_ears" = "None",
"insect_wings" = "None", "insect_fluff" = "None", "mam_snouts" = "None", "taur" = "None", "insect_markings" = "None")
diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm
index 4e5aa57b0a..29341646a0 100644
--- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm
+++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm
@@ -2,8 +2,8 @@
name = "Dullahan"
id = "dullahan"
default_color = "FFFFFF"
- species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS)
- inherent_traits = list(TRAIT_NOHUNGER,TRAIT_NOBREATH,CAN_SCAR)
+ species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,HAS_FLESH,HAS_BONE)
+ inherent_traits = list(TRAIT_NOHUNGER,TRAIT_NOBREATH)
mutant_bodyparts = list("tail_human" = "None", "ears" = "None", "deco_wings" = "None")
use_skintones = USE_SKINTONES_GRAYSCALE_CUSTOM
mutant_brain = /obj/item/organ/brain/dullahan
diff --git a/code/modules/mob/living/carbon/human/species_types/dwarves.dm b/code/modules/mob/living/carbon/human/species_types/dwarves.dm
index 009dba7707..3c1d877543 100644
--- a/code/modules/mob/living/carbon/human/species_types/dwarves.dm
+++ b/code/modules/mob/living/carbon/human/species_types/dwarves.dm
@@ -6,7 +6,7 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) //
name = "Dwarf"
id = "dwarf" //Also called Homo sapiens pumilionis
default_color = "FFFFFF"
- species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,CAN_SCAR)
+ species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,HAS_FLESH,HAS_BONE)
inherent_traits = list(TRAIT_DWARF,TRAIT_SNOB)
limbs_id = "human"
use_skintones = USE_SKINTONES_GRAYSCALE_CUSTOM
diff --git a/code/modules/mob/living/carbon/human/species_types/flypeople.dm b/code/modules/mob/living/carbon/human/species_types/flypeople.dm
index c3ec8b42ea..ca5b683134 100644
--- a/code/modules/mob/living/carbon/human/species_types/flypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/flypeople.dm
@@ -2,7 +2,7 @@
name = "Anthromorphic Fly"
id = "fly"
say_mod = "buzzes"
- species_traits = list(NOEYES,CAN_SCAR)
+ species_traits = list(NOEYES,HAS_FLESH,HAS_BONE)
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG
mutanttongue = /obj/item/organ/tongue/fly
mutantliver = /obj/item/organ/liver/fly
diff --git a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
index d87b0c074c..f4713f3005 100644
--- a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
@@ -3,7 +3,7 @@
id = "mammal"
default_color = "4B4B4B"
icon_limbs = DEFAULT_BODYPART_ICON_CITADEL
- species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,HORNCOLOR,WINGCOLOR,CAN_SCAR)
+ species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,HORNCOLOR,WINGCOLOR,HAS_FLESH,HAS_BONE)
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BEAST
mutant_bodyparts = list("mcolor" = "FFFFFF","mcolor2" = "FFFFFF","mcolor3" = "FFFFFF", "mam_snouts" = "Husky", "mam_tail" = "Husky", "mam_ears" = "Husky", "deco_wings" = "None",
"mam_body_markings" = "Husky", "taur" = "None", "horns" = "None", "legs" = "Plantigrade", "meat_type" = "Mammalian")
@@ -55,7 +55,7 @@
say_mod = "hisses"
default_color = "00FF00"
icon_limbs = DEFAULT_BODYPART_ICON_CITADEL
- species_traits = list(MUTCOLORS,EYECOLOR,LIPS,CAN_SCAR)
+ species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAS_FLESH,HAS_BONE)
mutant_bodyparts = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard", "mam_body_markings" = "Xeno","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None", "legs" = "Digitigrade")
attack_verb = "slash"
attack_sound = 'sound/weapons/slash.ogg'
diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm
index b164fb1ba0..40f65968bf 100644
--- a/code/modules/mob/living/carbon/human/species_types/humans.dm
+++ b/code/modules/mob/living/carbon/human/species_types/humans.dm
@@ -3,7 +3,7 @@
id = "human"
default_color = "FFFFFF"
- species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,MUTCOLORS_PARTSONLY,WINGCOLOR,CAN_SCAR)
+ species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,MUTCOLORS_PARTSONLY,WINGCOLOR,HAS_FLESH,HAS_BONE)
mutant_bodyparts = list("mcolor" = "FFFFFF", "mcolor2" = "FFFFFF","mcolor3" = "FFFFFF","tail_human" = "None", "ears" = "None", "taur" = "None", "deco_wings" = "None")
use_skintones = USE_SKINTONES_GRAYSCALE_CUSTOM
skinned_type = /obj/item/stack/sheet/animalhide/human
diff --git a/code/modules/mob/living/carbon/human/species_types/ipc.dm b/code/modules/mob/living/carbon/human/species_types/ipc.dm
index 96efaebd74..411defdcaf 100644
--- a/code/modules/mob/living/carbon/human/species_types/ipc.dm
+++ b/code/modules/mob/living/carbon/human/species_types/ipc.dm
@@ -6,7 +6,7 @@
icon_limbs = DEFAULT_BODYPART_ICON_CITADEL
blacklisted = 0
sexes = 0
- species_traits = list(MUTCOLORS,NOEYES,NOTRANSSTING)
+ species_traits = list(MUTCOLORS,NOEYES,NOTRANSSTING,HAS_FLESH,HAS_BONE)
inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID
mutant_bodyparts = list("ipc_screen" = "Blank", "ipc_antenna" = "None")
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index e97db7aced..b18f5522dd 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -4,7 +4,7 @@
id = "jelly"
default_color = "00FF90"
say_mod = "chirps"
- species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,WINGCOLOR)
+ species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,WINGCOLOR,HAS_FLESH,HAS_BONE)
mutantlungs = /obj/item/organ/lungs/slime
mutant_heart = /obj/item/organ/heart/slime
mutant_bodyparts = list("mcolor" = "FFFFFF", "mam_tail" = "None", "mam_ears" = "None", "mam_snouts" = "None", "taur" = "None", "deco_wings" = "None")
diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
index a424969175..960dd0c3d3 100644
--- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
@@ -4,7 +4,7 @@
id = "lizard"
say_mod = "hisses"
default_color = "00FF00"
- species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,LIPS,HORNCOLOR,WINGCOLOR,CAN_SCAR)
+ species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,LIPS,HORNCOLOR,WINGCOLOR,HAS_FLESH,HAS_BONE)
mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings", "legs", "taur", "deco_wings")
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_REPTILE
mutanttongue = /obj/item/organ/tongue/lizard
diff --git a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm
index 8e8c65b15e..ecb27a06b5 100644
--- a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm
@@ -8,7 +8,7 @@
nojumpsuit = TRUE
say_mod = "poofs" //what does a mushroom sound like
- species_traits = list(MUTCOLORS, NOEYES, NO_UNDERWEAR,NOGENITALS,NOAROUSAL,CAN_SCAR)
+ species_traits = list(MUTCOLORS, NOEYES, NO_UNDERWEAR,NOGENITALS,NOAROUSAL,HAS_FLESH,HAS_BONE)
inherent_traits = list(TRAIT_NOBREATH)
speedmod = 1.5 //faster than golems but not by much
diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
index 91d3135ae1..2d9e2ccfc3 100644
--- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
@@ -4,7 +4,7 @@
say_mod = "rattles"
sexes = 0
meat = /obj/item/stack/sheet/mineral/plasma
- species_traits = list(NOBLOOD,NOTRANSSTING,NOGENITALS)
+ species_traits = list(NOBLOOD,NOTRANSSTING,NOGENITALS,HAS_BONE)
inherent_traits = list(TRAIT_RESISTCOLD,TRAIT_RADIMMUNE,TRAIT_NOHUNGER,TRAIT_CALCIUM_HEALER)
inherent_biotypes = MOB_HUMANOID|MOB_MINERAL
mutantlungs = /obj/item/organ/lungs/plasmaman
diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
index 4806d4a6a1..758fdf71ee 100644
--- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
@@ -3,7 +3,7 @@
name = "Anthromorphic Plant"
id = "pod"
default_color = "59CE00"
- species_traits = list(MUTCOLORS,EYECOLOR,CAN_SCAR)
+ species_traits = list(MUTCOLORS,EYECOLOR,CAN_SCAR,HAS_FLESH,HAS_BONE)
attack_verb = "slash"
attack_sound = 'sound/weapons/slice.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
index 2776c6d919..610bf37f9a 100644
--- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
@@ -9,8 +9,8 @@
blacklisted = 1
ignored_by = list(/mob/living/simple_animal/hostile/faithless)
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/shadow
- species_traits = list(NOBLOOD,NOEYES,CAN_SCAR)
- inherent_traits = list(TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE,TRAIT_NOBREATH,CAN_SCAR)
+ species_traits = list(NOBLOOD,NOEYES,HAS_FLESH,HAS_BONE)
+ inherent_traits = list(TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE,TRAIT_NOBREATH)
dangerous_existence = 1
mutanteyes = /obj/item/organ/eyes/night_vision
@@ -164,7 +164,7 @@
righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi'
item_flags = ABSTRACT | DROPDEL
w_class = WEIGHT_CLASS_HUGE
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
total_mass = TOTAL_MASS_HAND_REPLACEMENT
/obj/item/light_eater/Initialize()
diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm
index 78efddf70d..86451875d2 100644
--- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm
+++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm
@@ -5,7 +5,7 @@
blacklisted = 0
sexes = 0
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton
- species_traits = list(NOBLOOD,NOGENITALS,NOAROUSAL)
+ species_traits = list(NOBLOOD,NOGENITALS,NOAROUSAL,HAS_BONE)
inherent_traits = list(TRAIT_NOBREATH,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT,TRAIT_FAKEDEATH, TRAIT_CALCIUM_HEALER)
inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID
mutanttongue = /obj/item/organ/tongue/bone
diff --git a/code/modules/mob/living/carbon/human/species_types/synthliz.dm b/code/modules/mob/living/carbon/human/species_types/synthliz.dm
index af2e83ee0f..146fd37187 100644
--- a/code/modules/mob/living/carbon/human/species_types/synthliz.dm
+++ b/code/modules/mob/living/carbon/human/species_types/synthliz.dm
@@ -4,7 +4,7 @@
icon_limbs = DEFAULT_BODYPART_ICON_CITADEL
say_mod = "beeps"
default_color = "00FF00"
- species_traits = list(MUTCOLORS,NOTRANSSTING,EYECOLOR,LIPS,HAIR)
+ species_traits = list(MUTCOLORS,NOTRANSSTING,EYECOLOR,LIPS,HAIR,HAS_FLESH,HAS_BONE)
inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID
mutant_bodyparts = list("ipc_antenna" = "Synthetic Lizard - Antennae","mam_tail" = "Synthetic Lizard", "mam_snouts" = "Synthetic Lizard - Snout", "legs" = "Digitigrade", "mam_body_markings" = "Synthetic Lizard - Plates", "taur" = "None")
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm
index 9c9220132c..9341622dfa 100644
--- a/code/modules/mob/living/carbon/human/species_types/vampire.dm
+++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm
@@ -2,7 +2,7 @@
name = "Vampire"
id = "vampire"
default_color = "FFFFFF"
- species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,DRINKSBLOOD)
+ species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,DRINKSBLOOD,HAS_FLESH,HAS_BONE)
inherent_traits = list(TRAIT_NOHUNGER,TRAIT_NOBREATH)
inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID
mutant_bodyparts = list("mcolor" = "FFFFFF", "tail_human" = "None", "ears" = "None", "deco_wings" = "None")
diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm
index ab0838c873..1c745c0366 100644
--- a/code/modules/mob/living/carbon/human/species_types/zombies.dm
+++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm
@@ -8,7 +8,7 @@
sexes = 0
blacklisted = 1
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/zombie
- species_traits = list(NOBLOOD,NOZOMBIE,NOTRANSSTING,CAN_SCAR)
+ species_traits = list(NOBLOOD,NOZOMBIE,NOTRANSSTING,HAS_FLESH,HAS_BONE)
inherent_traits = list(TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT,TRAIT_NOBREATH,TRAIT_NODEATH,TRAIT_FAKEDEATH)
inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID
mutanttongue = /obj/item/organ/tongue/zombie
@@ -44,7 +44,7 @@
/datum/species/zombie/infectious/spec_stun(mob/living/carbon/human/H,amount)
. = min(20, amount)
-/datum/species/zombie/infectious/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked, mob/living/carbon/human/H, forced = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = FALSE)
+/datum/species/zombie/infectious/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked, mob/living/carbon/human/H, forced = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = SHARP_NONE)
. = ..()
if(.)
regen_cooldown = world.time + REGENERATION_DELAY
@@ -62,9 +62,9 @@
C.heal_overall_damage(heal_amt,heal_amt)
C.adjustToxLoss(-heal_amt)
for(var/i in C.all_wounds)
- var/datum/wound/W = i
- if(prob(4-W.severity))
- W.remove_wound()
+ var/datum/wound/iter_wound = i
+ if(prob(4-iter_wound.severity))
+ iter_wound.remove_wound()
if(!C.InCritical() && prob(4))
playsound(C, pick(spooks), 50, TRUE, 10)
diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm
index 012808647e..47c9062148 100644
--- a/code/modules/mob/living/damage_procs.dm
+++ b/code/modules/mob/living/damage_procs.dm
@@ -14,7 +14,7 @@
*
* Returns TRUE if damage applied
*/
-/mob/living/proc/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = FALSE)
+/mob/living/proc/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = SHARP_NONE)
var/hit_percent = (100-blocked)/100
if(!damage || (hit_percent <= 0))
return 0
@@ -245,7 +245,7 @@
update_stamina()
// damage ONE external organ, organ gets randomly selected from damaged ones.
-/mob/living/proc/take_bodypart_damage(brute = 0, burn = 0, stamina = 0, updating_health = TRUE, required_status, check_armor = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = FALSE)
+/mob/living/proc/take_bodypart_damage(brute = 0, burn = 0, stamina = 0, updating_health = TRUE, required_status, check_armor = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = SHARP_NONE)
adjustBruteLoss(brute, FALSE) //zero as argument for no instant health update
adjustFireLoss(burn, FALSE)
adjustStaminaLoss(stamina, FALSE)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 9850afc1a3..f7bb9cda90 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -605,41 +605,55 @@
SEND_SIGNAL(item, COMSIG_ITEM_WEARERCROSSED, AM)
/mob/living/proc/makeTrail(turf/target_turf, turf/start, direction)
- if(!has_gravity())
+ if(!has_gravity() || !isturf(start) || !blood_volume)
return
- var/blood_exists = FALSE
+ var/blood_exists = locate(/obj/effect/decal/cleanable/trail_holder) in start
- for(var/obj/effect/decal/cleanable/trail_holder/C in start) //checks for blood splatter already on the floor
- blood_exists = TRUE
- if(isturf(start))
- var/trail_type = getTrail()
- if(trail_type)
- var/brute_ratio = round(getBruteLoss() / maxHealth, 0.1)
- if(blood_volume && blood_volume > max((BLOOD_VOLUME_NORMAL*blood_ratio)*(1 - brute_ratio * 0.25), 0))//don't leave trail if blood volume below a threshold
- blood_volume = max(blood_volume - max(1, brute_ratio * 2), 0) //that depends on our brute damage.
- var/newdir = get_dir(target_turf, start)
- if(newdir != direction)
- newdir = newdir | direction
- if(newdir == 3) //N + S
- newdir = NORTH
- else if(newdir == 12) //E + W
- newdir = EAST
- if((newdir in GLOB.cardinals) && (prob(50)))
- newdir = turn(get_dir(target_turf, start), 180)
- if(!blood_exists)
- new /obj/effect/decal/cleanable/trail_holder(start, get_static_viruses())
+ var/trail_type = getTrail()
+ if(!trail_type)
+ return
- for(var/obj/effect/decal/cleanable/trail_holder/TH in start)
- if((!(newdir in TH.existing_dirs) || trail_type == "trails_1" || trail_type == "trails_2") && TH.existing_dirs.len <= 16) //maximum amount of overlays is 16 (all light & heavy directions filled)
- TH.existing_dirs += newdir
- TH.add_overlay(image('icons/effects/blood.dmi', trail_type, dir = newdir))
- TH.transfer_mob_blood_dna(src)
+ var/brute_ratio = round(getBruteLoss() / maxHealth, 0.1)
+ if(blood_volume < max(BLOOD_VOLUME_NORMAL*(1 - brute_ratio * 0.25), 0))//don't leave trail if blood volume below a threshold
+ return
+
+ var/bleed_amount = bleedDragAmount()
+ blood_volume = max(blood_volume - bleed_amount, 0) //that depends on our brute damage.
+ var/newdir = get_dir(target_turf, start)
+ if(newdir != direction)
+ newdir = newdir | direction
+ if(newdir == (NORTH|SOUTH))
+ newdir = NORTH
+ else if(newdir == (EAST|WEST))
+ newdir = EAST
+ if((newdir in GLOB.cardinals) && (prob(50)))
+ newdir = turn(get_dir(target_turf, start), 180)
+ if(!blood_exists)
+ new /obj/effect/decal/cleanable/trail_holder(start, get_static_viruses())
+
+ for(var/obj/effect/decal/cleanable/trail_holder/TH in start)
+ if((!(newdir in TH.existing_dirs) || trail_type == "trails_1" || trail_type == "trails_2") && TH.existing_dirs.len <= 16) //maximum amount of overlays is 16 (all light & heavy directions filled)
+ TH.existing_dirs += newdir
+ TH.add_overlay(image('icons/effects/blood.dmi', trail_type, dir = newdir))
+ TH.transfer_mob_blood_dna(src)
/mob/living/carbon/human/makeTrail(turf/T)
if((NOBLOOD in dna.species.species_traits) || !is_bleeding() || bleedsuppress)
return
..()
+///Returns how much blood we're losing from being dragged a tile, from [mob/living/proc/makeTrail]
+/mob/living/proc/bleedDragAmount()
+ var/brute_ratio = round(getBruteLoss() / maxHealth, 0.1)
+ return max(1, brute_ratio * 2)
+
+/mob/living/carbon/bleedDragAmount()
+ var/bleed_amount = 0
+ for(var/i in all_wounds)
+ var/datum/wound/iter_wound = i
+ bleed_amount += iter_wound.drag_bleed_amount()
+ return bleed_amount
+
/mob/living/proc/getTrail()
if(getBruteLoss() < 300)
return pick("ltrails_1", "ltrails_2")
diff --git a/code/modules/mob/living/silicon/damage_procs.dm b/code/modules/mob/living/silicon/damage_procs.dm
index b89f249c80..7530630d74 100644
--- a/code/modules/mob/living/silicon/damage_procs.dm
+++ b/code/modules/mob/living/silicon/damage_procs.dm
@@ -1,5 +1,5 @@
-/mob/living/silicon/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = FALSE)
+/mob/living/silicon/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = SHARP_NONE)
var/hit_percent = (100-blocked)/100
if(!damage || (!forced && hit_percent <= 0))
return 0
diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index dc3c90cc64..30f469ec7f 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -33,7 +33,7 @@
melee_damage_upper = 15
wound_bonus = -5
bare_wound_bonus = 10 // BEAR wound bonus am i right
- sharpness = TRUE
+ sharpness = SHARP_EDGED
attack_verb_continuous = "claws"
attack_verb_simple = "claw"
attack_sound = 'sound/weapons/bladeslice.ogg'
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
index 4ea8a3c5dc..fd37bb26aa 100644
--- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
@@ -79,7 +79,7 @@
melee_damage_upper = 15
wound_bonus = -10
bare_wound_bonus = 20
- sharpness = TRUE
+ sharpness = SHARP_EDGED
icon_state = "syndicate_knife"
icon_living = "syndicate_knife"
loot = list(/obj/effect/gibspawner/human)
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 1102559aca..706bcc46f5 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -145,7 +145,7 @@
//How much bare wounding power it has
var/bare_wound_bonus = 0
//If the attacks from this are sharp
- var/sharpness = FALSE
+ var/sharpness = SHARP_NONE
/mob/living/simple_animal/Initialize()
. = ..()
diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm
index e6d53d914f..00cfa94893 100644
--- a/code/modules/ninja/energy_katana.dm
+++ b/code/modules/ninja/energy_katana.dm
@@ -14,7 +14,7 @@
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
block_chance = 50
slot_flags = ITEM_SLOT_BELT
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
max_integrity = 200
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
var/datum/effect_system/spark_spread/spark_system
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 08252d4e05..77ff8e9d8d 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -84,7 +84,7 @@
throw_speed = 4
colour = "crimson"
custom_materials = list(/datum/material/gold = 750)
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
resistance_flags = FIRE_PROOF
unique_reskin = list("Oak" = "pen-fountain-o",
"Gold" = "pen-fountain-g",
@@ -180,7 +180,7 @@
*/
/obj/item/pen/edagger
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") //these wont show up if the pen is off
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
var/on = FALSE
embedding = list(embed_chance = EMBED_CHANCE)
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 6489920b98..20e847326e 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -125,7 +125,7 @@
flags_1 = CONDUCT_1
attack_verb = list("attacked", "slashed", "cut", "sliced")
force = 12
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
inaccuracy_modifier = 0.25
can_charge = 0
diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm
index b23b059d89..6ebdc5e7b8 100644
--- a/code/modules/projectiles/guns/magic/staff.dm
+++ b/code/modules/projectiles/guns/magic/staff.dm
@@ -83,7 +83,7 @@
force = 20
armour_penetration = 75
block_chance = 50
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
max_charges = 4
/obj/item/gun/magic/staff/spellblade/Initialize()
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 1e1559fc6a..199842d8e2 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -156,7 +156,7 @@
wound_bonus = CANT_WOUND
/// For telling whether we want to roll for bone breaking or lacerations if we're bothering with wounds
- sharpness = FALSE
+ sharpness = SHARP_NONE
/obj/item/projectile/Initialize()
. = ..()
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 6a081f9b03..bc0030afc3 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -8,4 +8,4 @@
flag = "bullet"
hitsound_wall = "ricochet"
impact_effect_type = /obj/effect/temp_visual/impact_effect
- sharpness = TRUE
\ No newline at end of file
+ sharpness = SHARP_EDGED
\ No newline at end of file
diff --git a/code/modules/projectiles/projectile/bullets/revolver.dm b/code/modules/projectiles/projectile/bullets/revolver.dm
index c793e9f95e..c61ce57c1d 100644
--- a/code/modules/projectiles/projectile/bullets/revolver.dm
+++ b/code/modules/projectiles/projectile/bullets/revolver.dm
@@ -20,7 +20,7 @@
ricochet_auto_aim_angle = 10
ricochet_auto_aim_range = 3
wound_bonus = -35
- sharpness = TRUE
+ sharpness = SHARP_EDGED
/obj/item/projectile/bullet/c38/match
name = ".38 Match bullet"
diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm
index 6e4a72aff0..cc98331004 100644
--- a/code/modules/projectiles/projectile/bullets/shotgun.dm
+++ b/code/modules/projectiles/projectile/bullets/shotgun.dm
@@ -4,12 +4,12 @@
/obj/item/projectile/bullet/shotgun_slug/executioner
name = "executioner slug" // admin only, can dismember limbs
- sharpness = TRUE
+ sharpness = SHARP_EDGED
wound_bonus = 0
/obj/item/projectile/bullet/shotgun_slug/pulverizer
name = "pulverizer slug" // admin only, can crush bones
- sharpness = FALSE
+ sharpness = SHARP_NONE
wound_bonus = 0
/obj/item/projectile/bullet/shotgun_beanbag
@@ -17,7 +17,7 @@
damage = 10
stamina = 70
wound_bonus = 20
- sharpness = FALSE
+ sharpness = SHARP_NONE
/obj/item/projectile/bullet/incendiary/shotgun
name = "incendiary slug"
diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index 0c3de579b6..d76f6af165 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -217,6 +217,9 @@
/datum/reagent/consumable/milk/on_mob_life(mob/living/carbon/M)
if(HAS_TRAIT(M, TRAIT_CALCIUM_HEALER))
M.heal_bodypart_damage(1.5,0, 0)
+ for(var/i in M.all_wounds)
+ var/datum/wound/iter_wound = i
+ iter_wound.on_xadone(2)
. = 1
else
if(M.getBruteLoss() && prob(20))
diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm
index 07c80322ae..bcf1bc8e0a 100644
--- a/code/modules/surgery/bodyparts/_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/_bodyparts.dm
@@ -171,7 +171,7 @@
//Applies brute and burn damage to the organ. Returns 1 if the damage-icon states changed at all.
//Damage will not exceed max_damage using this proc
//Cannot apply negative damage
-/obj/item/bodypart/proc/receive_damage(brute = 0, burn = 0, stamina = 0, blocked = 0, updating_health = TRUE, required_status = null, wound_bonus = 0, bare_wound_bonus = 0, sharpness = FALSE) // maybe separate BRUTE_SHARP and BRUTE_OTHER eventually somehow hmm
+/obj/item/bodypart/proc/receive_damage(brute = 0, burn = 0, stamina = 0, blocked = 0, updating_health = TRUE, required_status = null, wound_bonus = 0, bare_wound_bonus = 0, sharpness = SHARP_NONE) // maybe separate BRUTE_SHARP and BRUTE_OTHER eventually somehow hmm
if(owner && (owner.status_flags & GODMODE))
return FALSE //godmode
var/dmg_mlt = CONFIG_GET(number/damage_multiplier)
@@ -260,9 +260,9 @@
switch(woundtype)
if(WOUND_SHARP)
- wounds_checking = WOUND_LIST_CUT
+ wounds_checking = WOUND_LIST_SLASH
if(WOUND_BRUTE)
- wounds_checking = WOUND_LIST_BONE
+ wounds_checking = WOUND_LIST_BLUNT
if(WOUND_BURN)
wounds_checking = WOUND_LIST_BURN
diff --git a/code/modules/surgery/bone_mending.dm b/code/modules/surgery/bone_mending.dm
index 81d9fa8d97..0c0083575b 100644
--- a/code/modules/surgery/bone_mending.dm
+++ b/code/modules/surgery/bone_mending.dm
@@ -8,7 +8,7 @@
target_mobtypes = list(/mob/living/carbon/human)
possible_locs = list(BODY_ZONE_R_ARM,BODY_ZONE_L_ARM,BODY_ZONE_R_LEG,BODY_ZONE_L_LEG,BODY_ZONE_CHEST,BODY_ZONE_HEAD)
requires_real_bodypart = TRUE
- targetable_wound = /datum/wound/brute/bone/severe
+ targetable_wound = /datum/wound/blunt/severe
/datum/surgery/repair_bone_hairline/can_start(mob/living/user, mob/living/carbon/target)
if(..())
@@ -23,7 +23,7 @@
target_mobtypes = list(/mob/living/carbon/human)
possible_locs = list(BODY_ZONE_R_ARM,BODY_ZONE_L_ARM,BODY_ZONE_R_LEG,BODY_ZONE_L_LEG,BODY_ZONE_CHEST,BODY_ZONE_HEAD)
requires_real_bodypart = TRUE
- targetable_wound = /datum/wound/brute/bone/critical
+ targetable_wound = /datum/wound/blunt/critical
/datum/surgery/repair_bone_compound/can_start(mob/living/user, mob/living/carbon/target)
if(..())
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index 150016f570..4546be22d7 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -163,7 +163,7 @@
item_flags = SURGICAL_TOOL
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP_ACCURATE
+ sharpness = SHARP_POINTY
tool_behaviour = TOOL_SCALPEL
toolspeed = 1
bare_wound_bonus = 20
@@ -181,7 +181,7 @@
force = 16
toolspeed = 0.7
light_color = LIGHT_COLOR_GREEN
- sharpness = IS_SHARP_ACCURATE
+ sharpness = SHARP_POINTY
/obj/item/scalpel/advanced/Initialize()
. = ..()
@@ -221,7 +221,7 @@
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
toolspeed = 0.5
hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP_ACCURATE
+ sharpness = SHARP_POINTY
/obj/item/scalpel/suicide_act(mob/user)
user.visible_message("
[user] is slitting [user.p_their()] [pick("wrists", "throat", "stomach")] with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
@@ -245,7 +245,7 @@
throw_range = 5
custom_materials = list(/datum/material/iron=10000, /datum/material/glass=6000)
attack_verb = list("attacked", "slashed", "sawed", "cut")
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
tool_behaviour = TOOL_SAW
toolspeed = 1
wound_bonus = 10
@@ -272,7 +272,7 @@
custom_materials = list(/datum/material/iron=10000, /datum/material/glass=6000)
toolspeed = 0.5
attack_verb = list("attacked", "slashed", "sawed", "cut")
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
/obj/item/surgical_drapes
name = "surgical drapes"
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index a7b9b6a298..040f3ce487 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -530,8 +530,8 @@ GLOBAL_LIST_EMPTY(vending_products)
for(var/i in C.bodyparts)
var/obj/item/bodypart/squish_part = i
if(squish_part.is_organic_limb())
- //var/type_wound = pick(WOUND_LIST_BONE)
- var/type_wound = pick(list(/datum/wound/brute/bone/critical, /datum/wound/brute/bone/severe, /datum/wound/brute/bone/critical, /datum/wound/brute/bone/severe, /datum/wound/brute/bone/moderate))
+ //var/type_wound = pick(WOUND_LIST_BLUNT)
+ var/type_wound = pick(list(/datum/wound/blunt/critical, /datum/wound/blunt/severe, /datum/wound/blunt/critical, /datum/wound/blunt/severe, /datum/wound/blunt/moderate))
squish_part.force_wound_upwards(type_wound)
else
squish_part.receive_damage(brute=30)
diff --git a/code/modules/zombie/items.dm b/code/modules/zombie/items.dm
index 7038e9df7c..2b02e0e26e 100644
--- a/code/modules/zombie/items.dm
+++ b/code/modules/zombie/items.dm
@@ -12,10 +12,10 @@
var/icon_right = "bloodhand_right"
hitsound = 'sound/hallucinations/growl1.ogg'
force = 18
- sharpness = IS_SHARP_ACCURATE //it's a claw, they're sharp.
+ sharpness = SHARP_POINTY //it's a claw, they're sharp.
damtype = "brute"
total_mass = TOTAL_MASS_HAND_REPLACEMENT
- sharpness = IS_SHARP
+ sharpness = SHARP_EDGED
wound_bonus = -30
bare_wound_bonus = 15
diff --git a/tgstation.dme b/tgstation.dme
index 6b3bf6eb88..2a7156f043 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -353,7 +353,6 @@
#include "code\datums\ai_laws.dm"
#include "code\datums\armor.dm"
#include "code\datums\beam.dm"
-#include "code\datums\beepsky_fashion.dm"
#include "code\datums\browser.dm"
#include "code\datums\callback.dm"
#include "code\datums\chatmessage.dm"
From 8360bb1a7f52b651edf1bfefdd93a64dd792be96 Mon Sep 17 00:00:00 2001
From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Fri, 24 Jul 2020 23:44:57 +0100
Subject: [PATCH 006/186] section 2
---
code/modules/cargo/packs/medical.dm | 2 +-
code/modules/hydroponics/grown/banana.dm | 6 +
code/modules/mob/living/living_defense.dm | 15 +-
.../ninja/suit/n_suit_verbs/ninja_stars.dm | 2 +-
code/modules/paperwork/pen.dm | 1 +
.../projectiles/boxes_magazines/ammo_boxes.dm | 2 +-
code/modules/projectiles/gun.dm | 3 +-
code/modules/projectiles/projectile.dm | 36 ++-
.../modules/projectiles/projectile/bullets.dm | 10 +-
.../projectiles/projectile/bullets/lmg.dm | 10 +-
.../projectiles/projectile/bullets/pistol.dm | 2 +
.../projectile/bullets/revolver.dm | 16 +-
.../projectiles/projectile/bullets/rifle.dm | 3 +
.../projectiles/projectile/bullets/shotgun.dm | 23 +-
.../projectiles/projectile/bullets/smg.dm | 6 +
.../chemistry/reagents/drink_reagents.dm | 21 +-
.../chemistry/reagents/medicine_reagents.dm | 69 ++++-
.../chemistry/reagents/other_reagents.dm | 8 +
.../reagents/chemistry/recipes/medicine.dm | 12 +
.../reagents/reagent_containers/hypospray.dm | 2 +-
.../reagents/reagent_containers/syringes.dm | 1 +
code/modules/surgery/bodyparts/_bodyparts.dm | 253 ++++++++++++++----
.../surgery/bodyparts/dismemberment.dm | 61 ++++-
code/modules/surgery/bodyparts/head.dm | 3 +-
code/modules/surgery/bodyparts/parts.dm | 2 +-
code/modules/surgery/burn_dressing.dm | 3 +-
code/modules/surgery/repair_puncture.dm | 108 ++++++++
code/modules/vending/_vending.dm | 3 +-
interface/stylesheet.dm | 7 +-
sound/effects/{ => wounds}/blood1.ogg | Bin
sound/effects/{ => wounds}/blood2.ogg | Bin
sound/effects/{ => wounds}/blood3.ogg | Bin
sound/effects/{ => wounds}/crack1.ogg | Bin
sound/effects/{ => wounds}/crack2.ogg | Bin
sound/effects/wounds/crackandbleed.ogg | Bin 0 -> 15662 bytes
sound/effects/wounds/pierce1.ogg | Bin 0 -> 8726 bytes
sound/effects/wounds/pierce2.ogg | Bin 0 -> 17779 bytes
sound/effects/wounds/pierce3.ogg | Bin 0 -> 19758 bytes
sound/effects/{ => wounds}/sizzle1.ogg | Bin
sound/effects/{ => wounds}/sizzle2.ogg | Bin
strings/wounds/bone_scar_desc.json | 26 ++
strings/wounds/flesh_scar_desc.json | 86 ++++++
strings/wounds/scar_loc.json | 52 ++++
tgstation.dme | 5 +-
44 files changed, 760 insertions(+), 99 deletions(-)
create mode 100644 code/modules/surgery/repair_puncture.dm
rename sound/effects/{ => wounds}/blood1.ogg (100%)
rename sound/effects/{ => wounds}/blood2.ogg (100%)
rename sound/effects/{ => wounds}/blood3.ogg (100%)
rename sound/effects/{ => wounds}/crack1.ogg (100%)
rename sound/effects/{ => wounds}/crack2.ogg (100%)
create mode 100644 sound/effects/wounds/crackandbleed.ogg
create mode 100644 sound/effects/wounds/pierce1.ogg
create mode 100644 sound/effects/wounds/pierce2.ogg
create mode 100644 sound/effects/wounds/pierce3.ogg
rename sound/effects/{ => wounds}/sizzle1.ogg (100%)
rename sound/effects/{ => wounds}/sizzle2.ogg (100%)
create mode 100644 strings/wounds/bone_scar_desc.json
create mode 100644 strings/wounds/flesh_scar_desc.json
create mode 100644 strings/wounds/scar_loc.json
diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm
index ce66fc52d5..6a4165f840 100644
--- a/code/modules/cargo/packs/medical.dm
+++ b/code/modules/cargo/packs/medical.dm
@@ -230,6 +230,6 @@
/obj/item/reagent_containers/hypospray/medipen/ekit,
/obj/item/reagent_containers/hypospray/medipen/blood_loss,
/obj/item/reagent_containers/hypospray/medipen/blood_loss,
- /obj/item/reagent_containers/hypospray/medipen/blood_loss
+ /obj/item/reagent_containers/hypospray/medipen/blood_loss)
crate_name = "medipen crate"
diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm
index 0411a80443..81318f8fe1 100644
--- a/code/modules/hydroponics/grown/banana.dm
+++ b/code/modules/hydroponics/grown/banana.dm
@@ -27,6 +27,12 @@
juice_results = list(/datum/reagent/consumable/banana = 0)
distill_reagent = /datum/reagent/consumable/ethanol/bananahonk
+/obj/item/reagent_containers/food/snacks/grown/banana/generate_trash(atom/location)
+ . = ..()
+ var/obj/item/grown/bananapeel/peel = .
+ if(istype(peel))
+ peel.grind_results = list(/datum/reagent/consumable/banana_peel = seed.potency * 0.2)
+
/obj/item/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user)
user.visible_message("
[user] is aiming [src] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!")
playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1)
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index e24e9641bf..bc88a048ea 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -85,7 +85,7 @@
totaldamage = block_calculate_resultant_damage(totaldamage, returnlist)
var/armor = run_armor_check(def_zone, P.flag, null, null, P.armour_penetration, null)
if(!P.nodamage)
- apply_damage(totaldamage, P.damage_type, def_zone, armor, wound_bonus=P.wound_bonus, bare_wound_bonus=P.bare_wound_bonus, sharpness=P.sharpness)
+ apply_damage(totaldamage, P.damage_type, def_zone, armor, wound_bonus = P.wound_bonus, bare_wound_bonus = P.bare_wound_bonus, sharpness = P.sharpness)
if(P.dismemberment)
check_projectile_dismemberment(P, def_zone)
var/missing = 100 - final_percent
@@ -135,12 +135,13 @@
dtype = I.damtype
if(!blocked)
- visible_message("
[src] has been hit by [I].", \
- "
You have been hit by [I].")
- var/armor = run_armor_check(impacting_zone, "melee", "Your armor has protected your [parse_zone(impacting_zone)].", "Your armor has softened hit to your [parse_zone(impacting_zone)].",I.armour_penetration)
- apply_damage(total_damage, dtype, impacting_zone, armor, sharpness=I.sharpness)
- if(I.thrownby)
- log_combat(I.thrownby, src, "threw and hit", I)
+ if(!nosell_hit)
+ visible_message("
[src] is hit by [I]!", \
+ "
You're hit by [I]!")
+ if(!I.throwforce)
+ return
+ var/armor = run_armor_check(zone, "melee", "Your armor has protected your [parse_zone(zone)].", "Your armor has softened hit to your [parse_zone(zone)].",I.armour_penetration)
+ apply_damage(I.throwforce, dtype, zone, armor, sharpness=I.get_sharpness(), wound_bonus=(nosell_hit * CANT_WOUND))
else
return 1
else
diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm
index 508722ecf2..57faad9493 100644
--- a/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm
@@ -14,5 +14,5 @@
/obj/item/throwing_star/ninja
name = "ninja throwing star"
- throwforce = 30
+ throwforce = 20
embedding = list("pain_mult" = 6, "embed_chance" = 100, "fall_chance" = 0, "embed_chance_turf_mod" = 15)
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 77ff8e9d8d..997ada6b21 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -28,6 +28,7 @@
var/degrees = 0
var/font = PEN_FONT
embedding = list()
+ sharpness = SHARP_POINTY
/obj/item/pen/suicide_act(mob/user)
user.visible_message("
[user] is scribbling numbers all over [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit sudoku...")
diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
index e4674f4f4c..987efc0404 100644
--- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
+++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
@@ -47,7 +47,7 @@
/obj/item/ammo_box/c38/dumdum
name = "speed loader (.38 DumDum)"
- desc = "Designed to quickly reload revolvers. DumDum bullets shatter on impact and shred the target's innards, likely getting caught inside."
+ desc = "Designed to quickly reload revolvers. These rounds expand on impact, allowing them to shred the target and cause massive bleeding. Very weak against armor and distant targets."
ammo_type = /obj/item/ammo_casing/c38/dumdum
/obj/item/ammo_box/c38/match
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index f34343debd..679f80dcc1 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -186,7 +186,8 @@
return
if(iscarbon(target))
var/mob/living/carbon/C = target
- for(var/datum/wound/W in C.all_wounds)
+ for(var/i in C.all_wounds)
+ var/datum/wound/W = i
if(W.try_treating(src, user))
return // another coward cured!
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 199842d8e2..cb9a758e3f 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -149,19 +149,28 @@
var/temporary_unstoppable_movement = FALSE
- ///If defined, on hit we create an item of this type then call hitby() on the hit target with this
+ ///If defined, on hit we create an item of this type then call hitby() on the hit target with this, mainly used for embedding items (bullets) in targets
var/shrapnel_type
///If TRUE, hit mobs even if they're on the floor and not our target
var/hit_stunned_targets = FALSE
wound_bonus = CANT_WOUND
+ ///How much we want to drop both wound_bonus and bare_wound_bonus (to a minimum of 0 for the latter) per tile, for falloff purposes
+ var/wound_falloff_tile
+ ///How much we want to drop the embed_chance value, if we can embed, per tile, for falloff purposes
+ var/embed_falloff_tile
/// For telling whether we want to roll for bone breaking or lacerations if we're bothering with wounds
sharpness = SHARP_NONE
+ ///If we have a shrapnel_type defined, these embedding stats will be passed to the spawned shrapnel type, which will roll for embedding on the target
+ var/list/embedding
+
/obj/item/projectile/Initialize()
. = ..()
permutated = list()
decayedRange = range
+ if(embedding)
+ updateEmbedding()
/**
* Artificially modified to be called at around every world.icon_size pixels of movement.
@@ -169,6 +178,11 @@
*/
/obj/item/projectile/proc/Range()
range--
+ if(wound_bonus != CANT_WOUND)
+ wound_bonus += wound_falloff_tile
+ bare_wound_bonus = max(0, bare_wound_bonus + wound_falloff_tile)
+ if(embedding)
+ embedding["embed_chance"] += embed_falloff_tile
if(range <= 0 && loc)
on_range()
@@ -815,6 +829,26 @@
/obj/item/projectile/experience_pressure_difference()
return
+///Like [/obj/item/proc/updateEmbedding] but for projectiles instead, call this when you want to add embedding or update the stats on the embedding element
+/obj/projectile/proc/updateEmbedding()
+ if(!shrapnel_type || !LAZYLEN(embedding))
+ return
+
+ AddElement(/datum/element/embed,\
+ embed_chance = (!isnull(embedding["embed_chance"]) ? embedding["embed_chance"] : EMBED_CHANCE),\
+ fall_chance = (!isnull(embedding["fall_chance"]) ? embedding["fall_chance"] : EMBEDDED_ITEM_FALLOUT),\
+ pain_chance = (!isnull(embedding["pain_chance"]) ? embedding["pain_chance"] : EMBEDDED_PAIN_CHANCE),\
+ pain_mult = (!isnull(embedding["pain_mult"]) ? embedding["pain_mult"] : EMBEDDED_PAIN_MULTIPLIER),\
+ remove_pain_mult = (!isnull(embedding["remove_pain_mult"]) ? embedding["remove_pain_mult"] : EMBEDDED_UNSAFE_REMOVAL_PAIN_MULTIPLIER),\
+ rip_time = (!isnull(embedding["rip_time"]) ? embedding["rip_time"] : EMBEDDED_UNSAFE_REMOVAL_TIME),\
+ ignore_throwspeed_threshold = (!isnull(embedding["ignore_throwspeed_threshold"]) ? embedding["ignore_throwspeed_threshold"] : FALSE),\
+ impact_pain_mult = (!isnull(embedding["impact_pain_mult"]) ? embedding["impact_pain_mult"] : EMBEDDED_IMPACT_PAIN_MULTIPLIER),\
+ jostle_chance = (!isnull(embedding["jostle_chance"]) ? embedding["jostle_chance"] : EMBEDDED_JOSTLE_CHANCE),\
+ jostle_pain_mult = (!isnull(embedding["jostle_pain_mult"]) ? embedding["jostle_pain_mult"] : EMBEDDED_JOSTLE_PAIN_MULTIPLIER),\
+ pain_stam_pct = (!isnull(embedding["pain_stam_pct"]) ? embedding["pain_stam_pct"] : EMBEDDED_PAIN_STAM_PCT),\
+ projectile_payload = shrapnel_type)
+ return TRUE
+
/////// MISC HELPERS ////////
/// Is this atom reflectable with ""standardized"" reflection methods like you know eshields and deswords and similar
/proc/is_energy_reflectable_projectile(atom/A)
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index bc0030afc3..9fb7e83577 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -8,4 +8,12 @@
flag = "bullet"
hitsound_wall = "ricochet"
impact_effect_type = /obj/effect/temp_visual/impact_effect
- sharpness = SHARP_EDGED
\ No newline at end of file
+ sharpness = SHARP_POINTY
+ shrapnel_type = /obj/item/shrapnel/bullet
+ embedding = list(embed_chance=15, fall_chance=2, jostle_chance=0, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.5, pain_mult=3, rip_time=10)
+ wound_falloff_tile = -5
+ embed_falloff_tile = -5
+
+/obj/projectile/bullet/smite
+ name = "divine retribution"
+ damage = 10
diff --git a/code/modules/projectiles/projectile/bullets/lmg.dm b/code/modules/projectiles/projectile/bullets/lmg.dm
index 2ea1fe7c9a..e3eff6dcb0 100644
--- a/code/modules/projectiles/projectile/bullets/lmg.dm
+++ b/code/modules/projectiles/projectile/bullets/lmg.dm
@@ -25,8 +25,10 @@
/obj/item/projectile/bullet/mm195x129
name = "1.95x129mm bullet"
- damage = 45
+ damage = 40
armour_penetration = 5
+ wound_bonus = -50
+ wound_falloff_tile = 0
/obj/item/projectile/bullet/mm195x129_ap
name = "1.95x129mm armor-piercing bullet"
@@ -35,8 +37,12 @@
/obj/item/projectile/bullet/mm195x129_hp
name = "1.95x129mm hollow-point bullet"
- damage = 60
+ damage = 50
armour_penetration = -60
+ sharpness = SHARP_EDGED
+ wound_bonus = -40
+ bare_wound_bonus = 30
+ wound_falloff_tile = -8
/obj/item/projectile/bullet/incendiary/mm195x129
name = "1.95x129mm incendiary bullet"
diff --git a/code/modules/projectiles/projectile/bullets/pistol.dm b/code/modules/projectiles/projectile/bullets/pistol.dm
index 38c9c9f7d9..23a749415c 100644
--- a/code/modules/projectiles/projectile/bullets/pistol.dm
+++ b/code/modules/projectiles/projectile/bullets/pistol.dm
@@ -3,11 +3,13 @@
/obj/item/projectile/bullet/c9mm
name = "9mm bullet"
damage = 20
+ embedding = list(embed_chance=15, fall_chance=3, jostle_chance=4, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10)
/obj/item/projectile/bullet/c9mm_ap
name = "9mm armor-piercing bullet"
damage = 15
armour_penetration = 40
+ embedding = null
/obj/item/projectile/bullet/incendiary/c9mm
name = "9mm incendiary bullet"
diff --git a/code/modules/projectiles/projectile/bullets/revolver.dm b/code/modules/projectiles/projectile/bullets/revolver.dm
index c61ce57c1d..95d43ba1ce 100644
--- a/code/modules/projectiles/projectile/bullets/revolver.dm
+++ b/code/modules/projectiles/projectile/bullets/revolver.dm
@@ -19,8 +19,9 @@
ricochet_chance = 50
ricochet_auto_aim_angle = 10
ricochet_auto_aim_range = 3
- wound_bonus = -35
- sharpness = SHARP_EDGED
+ wound_bonus = -20
+ bare_wound_bonus = 10
+ embedding = list(embed_chance=15, fall_chance=2, jostle_chance=2, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=3, jostle_pain_mult=5, rip_time=10)
/obj/item/projectile/bullet/c38/match
name = ".38 Match bullet"
@@ -43,13 +44,21 @@
ricochet_chance = 130
ricochet_decay_damage = 0.8
shrapnel_type = NONE
+ sharpness = SHARP_NONE
+ embedding = null
+// premium .38 ammo from cargo, weak against armor, lower base damage, but excellent at embedding and causing slice wounds at close range
/obj/item/projectile/bullet/c38/dumdum
name = ".38 DumDum bullet"
damage = 15
armour_penetration = -30
ricochets_max = 0
- shrapnel_type = /obj/item/shrapnel/bullet/c38/dumdum
+ sharpness = SHARP_EDGED
+ wound_bonus = 20
+ bare_wound_bonus = 20
+ embedding = list(embed_chance=75, fall_chance=3, jostle_chance=4, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10)
+ wound_falloff_tile = -5
+ embed_falloff_tile = -15
/obj/item/projectile/bullet/c38/rubber
name = ".38 rubber bullet"
@@ -102,6 +111,7 @@
/obj/item/projectile/bullet/a357
name = ".357 bullet"
damage = 60
+ wound_bonus = -70
/obj/item/projectile/bullet/a357/ap
name = ".357 armor-piercing bullet"
diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm
index ae1611cb00..ce30f5e787 100644
--- a/code/modules/projectiles/projectile/bullets/rifle.dm
+++ b/code/modules/projectiles/projectile/bullets/rifle.dm
@@ -3,12 +3,15 @@
/obj/item/projectile/bullet/a556
name = "5.56mm bullet"
damage = 35
+ wound_bonus = -40
// 7.62 (Nagant Rifle)
/obj/item/projectile/bullet/a762
name = "7.62 bullet"
damage = 60
+ wound_bonus = -35
+ wound_falloff_tile = 0
/obj/item/projectile/bullet/a762_enchanted
name = "enchanted 7.62 bullet"
diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm
index cc98331004..69f976d213 100644
--- a/code/modules/projectiles/projectile/bullets/shotgun.dm
+++ b/code/modules/projectiles/projectile/bullets/shotgun.dm
@@ -1,16 +1,18 @@
/obj/item/projectile/bullet/shotgun_slug
name = "12g shotgun slug"
- damage = 60
+ damage = 50
+ sharpness = SHARP_POINTY
+ wound_bonus = 0
/obj/item/projectile/bullet/shotgun_slug/executioner
name = "executioner slug" // admin only, can dismember limbs
sharpness = SHARP_EDGED
- wound_bonus = 0
+ wound_bonus = 80
/obj/item/projectile/bullet/shotgun_slug/pulverizer
name = "pulverizer slug" // admin only, can crush bones
sharpness = SHARP_NONE
- wound_bonus = 0
+ wound_bonus = 80
/obj/item/projectile/bullet/shotgun_beanbag
name = "beanbag slug"
@@ -18,6 +20,7 @@
stamina = 70
wound_bonus = 20
sharpness = SHARP_NONE
+ embedding = null
/obj/item/projectile/bullet/incendiary/shotgun
name = "incendiary slug"
@@ -83,18 +86,22 @@
return BULLET_ACT_HIT
/obj/item/projectile/bullet/pellet
- var/tile_dropoff = 0.75
+ var/tile_dropoff = 0.45
var/tile_dropoff_s = 1.25
/obj/item/projectile/bullet/pellet/shotgun_buckshot
name = "buckshot pellet"
- damage = 12.5
- wound_bonus = -10
+ damage = 7.5
+ wound_bonus = 5
+ bare_wound_bonus = 5
+ wound_falloff_tile = -2.5 // low damage + additional dropoff will already curb wounding potential anything past point blank
/obj/item/projectile/bullet/pellet/shotgun_rubbershot
name = "rubbershot pellet"
damage = 2
stamina = 15
+ sharpness = SHARP_NONE
+ embedding = null
/obj/item/projectile/bullet/pellet/Range()
..()
@@ -106,8 +113,10 @@
qdel(src)
/obj/item/projectile/bullet/pellet/shotgun_improvised
- tile_dropoff = 0.55 //Come on it does 6 damage don't be like that.
+ tile_dropoff = 0.35 //Come on it does 6 damage don't be like that.
damage = 6
+ wound_bonus = 0
+ bare_wound_bonus = 7.5
/obj/item/projectile/bullet/pellet/shotgun_improvised/Initialize()
. = ..()
diff --git a/code/modules/projectiles/projectile/bullets/smg.dm b/code/modules/projectiles/projectile/bullets/smg.dm
index eb4c8e9776..5c9d5b92a3 100644
--- a/code/modules/projectiles/projectile/bullets/smg.dm
+++ b/code/modules/projectiles/projectile/bullets/smg.dm
@@ -3,6 +3,8 @@
/obj/item/projectile/bullet/c45
name = ".45 bullet"
damage = 30
+ wound_bonus = -10
+ wound_falloff_tile = -10
/obj/item/projectile/bullet/c45_cleaning
name = ".45 bullet"
@@ -51,11 +53,15 @@
/obj/item/projectile/bullet/c46x30mm
name = "4.6x30mm bullet"
damage = 15
+ wound_bonus = -5
+ bare_wound_bonus = 5
+ embed_falloff_tile = -4
/obj/item/projectile/bullet/c46x30mm_ap
name = "4.6x30mm armor-piercing bullet"
damage = 12.5
armour_penetration = 40
+ embedding = null
/obj/item/projectile/bullet/incendiary/c46x30mm
name = "4.6x30mm incendiary bullet"
diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index d76f6af165..6b933ce759 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -1016,4 +1016,23 @@
if(M.getToxLoss() && prob(30))
M.adjustToxLoss(-1, 0)
..()
- . = TRUE
\ No newline at end of file
+ . = TRUE
+
+// i googled "natural coagulant" and a couple of results came up for banana peels, so after precisely 30 more seconds of research, i now dub grinding banana peels good for your blood
+/datum/reagent/consumable/banana_peel
+ name = "Pulped Banana Peel"
+ description = "Okay, so you put a banana peel in a grinder... Why, exactly?"
+ color = "#863333" // rgb: 175, 175, 0
+ reagent_state = SOLID
+ taste_description = "stringy, bitter pulp"
+ glass_name = "glass of banana peel pulp"
+ glass_desc = "Okay, so you put a banana peel in a grinder... Why, exactly?"
+
+/datum/reagent/consumable/baked_banana_peel
+ name = "Baked Banana Peel Powder"
+ description = "You took a banana peel... pulped it... baked it... Where are you going with this?"
+ color = "#863333" // rgb: 175, 175, 0
+ reagent_state = SOLID
+ taste_description = "bitter powder"
+ glass_name = "glass of banana peel powder"
+ description = "You took a banana peel... pulped it... baked it... Where are you going with this?"
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 050b1f29b5..60f86283c0 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -145,8 +145,8 @@
M.adjustToxLoss(-power, 0, TRUE) //heals TOXINLOVERs
M.adjustCloneLoss(-power, 0)
for(var/i in M.all_wounds)
- var/datum/wound/W = i
- W.on_xadone(power)
+ var/datum/wound/iter_wound = i
+ iter_wound.on_xadone(power)
REMOVE_TRAIT(M, TRAIT_DISFIGURED, TRAIT_GENERIC) //fixes common causes for disfiguration
. = 1
metabolization_rate = REAGENTS_METABOLISM * (0.00001 * (M.bodytemperature ** 2) + 0.5)
@@ -196,8 +196,8 @@
M.adjustToxLoss(-power, 0, TRUE)
M.adjustCloneLoss(-power, 0)
for(var/i in M.all_wounds)
- var/datum/wound/W = i
- W.on_xadone(power)
+ var/datum/wound/iter_wound = i
+ iter_wound.on_xadone(power)
REMOVE_TRAIT(M, TRAIT_DISFIGURED, TRAIT_GENERIC)
. = 1
..()
@@ -365,7 +365,7 @@
/datum/reagent/medicine/salglu_solution
name = "Saline-Glucose Solution"
- description = "Has a 33% chance per metabolism cycle to heal brute and burn damage. Can be used as a temporary blood substitute."
+ description = "Has a 33% chance per metabolism cycle to heal brute and burn damage. Can be used as a temporary blood substitute, as well as slowly speeding blood regeneration."
reagent_state = LIQUID
color = "#DCDCDC"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
@@ -373,6 +373,7 @@
taste_description = "sweetness and salt"
var/last_added = 0
var/maximum_reachable = BLOOD_VOLUME_NORMAL - 10 //So that normal blood regeneration can continue with salglu active
+ var/extra_regen = 0.25 // in addition to acting as temporary blood, also add this much to their actual blood per tick
pH = 5.5
/datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/carbon/M)
@@ -385,7 +386,7 @@
var/amount_to_add = min(M.blood_volume, volume*5)
var/new_blood_level = min(M.blood_volume + amount_to_add, maximum_reachable)
last_added = new_blood_level - M.blood_volume
- M.blood_volume = new_blood_level
+ M.blood_volume = new_blood_level + extra_regen
if(prob(33))
M.adjustBruteLoss(-0.5*REM, 0)
M.adjustFireLoss(-0.5*REM, 0)
@@ -471,8 +472,9 @@
else if(method in list(PATCH, TOUCH))
M.adjustBruteLoss(-1 * reac_volume)
M.adjustFireLoss(-1 * reac_volume)
- for(var/datum/wound/burn/burn_wound in C.all_wounds)
- burn_wound.regenerate_flesh(reac_volume)
+ for(var/i in carbies.all_wounds)
+ var/datum/wound/iter_wound = i
+ iter_wound.on_synthflesh(reac_volume)
if(show_message)
to_chat(M, "
You feel your burns and bruises healing! It stings like hell!")
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
@@ -1592,10 +1594,57 @@
to_chat(C, "[pick(GLOB.wisdoms)]") //give them a random wisdom
..()
-// handled in cut wounds process
+// helps bleeding wounds clot faster
/datum/reagent/medicine/coagulant
name = "Sanguirite"
- description = "A coagulant used to help open cuts clot faster."
+ description = "A proprietary coagulant used to help bleeding wounds clot faster."
reagent_state = LIQUID
color = "#bb2424"
metabolization_rate = 0.25 * REAGENTS_METABOLISM
+
+overdose_threshold = 20
+ /// How much base clotting we do per bleeding wound, multiplied by the below number for each bleeding wound
+ var/clot_rate = 0.25
+ /// If we have multiple bleeding wounds, we count the number of bleeding wounds, then multiply the clot rate by this^(n) before applying it to each cut, so more cuts = less clotting per cut (though still more total clotting)
+ var/clot_coeff_per_wound = 0.9
+
+/datum/reagent/medicine/coagulant/on_mob_life(mob/living/carbon/M)
+ . = ..()
+ if(!M.blood_volume || !M.all_wounds)
+ return
+
+ var/effective_clot_rate = clot_rate
+
+ for(var/i in M.all_wounds)
+ var/datum/wound/iter_wound = i
+ if(iter_wound.blood_flow)
+ effective_clot_rate *= clot_coeff_per_wound
+
+ for(var/i in M.all_wounds)
+ var/datum/wound/iter_wound = i
+ iter_wound.blood_flow = max(0, iter_wound.blood_flow - effective_clot_rate)
+
+/datum/reagent/medicine/coagulant/overdose_process(mob/living/M)
+ . = ..()
+ if(!M.blood_volume)
+ return
+
+ if(prob(15))
+ M.losebreath += rand(2,4)
+ M.adjustOxyLoss(rand(1,3))
+ if(prob(30))
+ to_chat(M, "
You can feel your blood clotting up in your veins!")
+ else if(prob(10))
+ to_chat(M, "
You feel like your blood has stopped moving!")
+ if(prob(50))
+ var/obj/item/organ/lungs/our_lungs = M.getorganslot(ORGAN_SLOT_LUNGS)
+ our_lungs.applyOrganDamage(1)
+ else
+ var/obj/item/organ/heart/our_heart = M.getorganslot(ORGAN_SLOT_HEART)
+ our_heart.applyOrganDamage(1)
+
+// can be synthesized on station rather than bought. made by grinding a banana peel, heating it up, then mixing the banana peel powder with salglu
+/datum/reagent/medicine/coagulant/weak
+ name = "Synthi-Sanguirite"
+ description = "A synthetic coagulant used to help bleeding wounds clot faster. Not quite as effective as name brand Sanguirite, especially on patients with lots of cuts."
+ clot_coeff_per_wound = 0.8
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 5c5821381e..5b6418779b 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -244,6 +244,11 @@
glass_desc = "The father of all refreshments."
shot_glass_icon_state = "shotglassclear"
+/datum/reagent/water/on_mob_life(mob/living/carbon/M)
+ . = ..()
+ if(M.blood_volume)
+ M.blood_volume += 0.1 // water is good for you!
+
/*
* Water reaction to turf
*/
@@ -334,6 +339,8 @@
return ..()
/datum/reagent/water/holywater/on_mob_life(mob/living/carbon/M)
+ if(M.blood_volume)
+ M.blood_volume += 0.1 // water is good for you!
if(!data)
data = list("misc" = 1)
data["misc"]++
@@ -2304,6 +2311,7 @@
metabolization_rate = 0.75 * REAGENTS_METABOLISM // 5u (WOUND_DETERMINATION_CRITICAL) will last for ~17 ticks
/// Whether we've had at least WOUND_DETERMINATION_SEVERE (2.5u) of determination at any given time. No damage slowdown immunity or indication we're having a second wind if it's just a single moderate wound
var/significant = FALSE
+ self_consuming = TRUE
/datum/reagent/determination/on_mob_end_metabolize(mob/living/carbon/M)
if(significant)
diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm
index e591daeb8e..bb9a951cac 100644
--- a/code/modules/reagents/chemistry/recipes/medicine.dm
+++ b/code/modules/reagents/chemistry/recipes/medicine.dm
@@ -50,6 +50,18 @@
results = list(/datum/reagent/medicine/salglu_solution = 3)
required_reagents = list(/datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/water = 1, /datum/reagent/consumable/sugar = 1)
+/datum/chemical_reaction/baked_banana_peel
+ results = list(/datum/reagent/consumable/baked_banana_peel = 1)
+ required_temp = 413.15 // if it's good enough for caramel it's good enough for this
+ required_reagents = list(/datum/reagent/consumable/banana_peel = 1)
+ mix_message = "The pulp dries up and takes on a powdery state!"
+ mob_react = FALSE
+
+/datum/chemical_reaction/coagulant_weak
+ results = list(/datum/reagent/medicine/coagulant/weak = 3)
+ required_reagents = list(/datum/reagent/medicine/salglu_solution = 2, /datum/reagent/consumable/baked_banana_peel = 1)
+ mob_react = FALSE
+
/datum/chemical_reaction/mine_salve
name = "Miner's Salve"
id = /datum/reagent/medicine/mine_salve
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 7dcf996cab..f37210ad1c 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -135,7 +135,7 @@
/obj/item/reagent_containers/hypospray/medipen/ekit
name = "emergency first-aid autoinjector"
- desc = "An epinephrine medipen with trace amounts of coagulants and antibiotics to help stabilize bad cuts and burns."
+ desc = "An epinephrine medipen with extra coagulant and antibiotics to help stabilize bad cuts and burns."
volume = 15
amount_per_transfer_from_this = 15
list_reagents = list(/datum/reagent/medicine/epinephrine = 12, /datum/reagent/medicine/coagulant = 2.5, /datum/reagent/medicine/spaceacillin = 0.5)
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 4ab1470667..4b73ebde4a 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -16,6 +16,7 @@
custom_materials = list(/datum/material/iron=10, /datum/material/glass=20)
reagent_flags = TRANSPARENT
custom_price = PRICE_CHEAP_AS_FREE
+ sharpness = SHARP_POINTY
/obj/item/reagent_containers/syringe/Initialize()
. = ..()
diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm
index bcf1bc8e0a..c79f50c03c 100644
--- a/code/modules/surgery/bodyparts/_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/_bodyparts.dm
@@ -86,12 +86,12 @@
/// A hat won't cover your face, but a shirt covering your chest will cover your... you know, chest
var/scars_covered_by_clothes = TRUE
- /// Descriptions for the locations on the limb for scars to be assigned, just cosmetic
- var/list/specific_locations = list("general area")
/// So we know if we need to scream if this limb hits max damage
var/last_maxed
/// How much generic bleedstacks we have on this bodypart
var/generic_bleedstacks
+ /// If we have a gauze wrapping currently applied (not including splints)
+ var/obj/item/stack/current_gauze
/obj/item/bodypart/examine(mob/user)
. = ..()
@@ -151,8 +151,20 @@
var/turf/T = get_turf(src)
if(status != BODYPART_ROBOTIC)
playsound(T, 'sound/misc/splort.ogg', 50, 1, -1)
- for(var/obj/item/I in src)
- I.forceMove(T)
+ if(current_gauze)
+ QDEL_NULL(current_gauze)
+ for(var/obj/item/organ/drop_organ in get_organs())
+ drop_organ.transfer_to_limb(src, owner)
+
+///since organs aren't actually stored in the bodypart themselves while attached to a person, we have to query the owner for what we should have
+/obj/item/bodypart/proc/get_organs()
+ if(!owner)
+ return
+ . = list()
+ for(var/i in owner.internal_organs) //internal organs inside the dismembered limb are dropped.
+ var/obj/item/organ/organ_check = i
+ if(check_zone(organ_check.zone) == body_zone)
+ . += organ_check
/obj/item/bodypart/proc/consider_processing()
if(stamina_dam > DAMAGE_PRECISION)
@@ -192,16 +204,64 @@
if(ALIEN_BODYPART,LARVA_BODYPART) //aliens take some additional burn //nothing can burn with so much snowflake code around
burn *= 1.2
- var/wounding_type = (brute > burn ? WOUND_BRUTE : WOUND_BURN)
+ /*
+ // START WOUND HANDLING
+ */
+
+ // what kind of wounds we're gonna roll for, take the greater between brute and burn, then if it's brute, we subdivide based on sharpness
+ var/wounding_type = (brute > burn ? WOUND_BLUNT : WOUND_BURN)
var/wounding_dmg = max(brute, burn)
- if(wounding_type == WOUND_BRUTE && sharpness)
- wounding_type = WOUND_SHARP
- // i know this is effectively the same check as above but i don't know if those can null the damage by rounding and want to be safe
- if(owner && wounding_dmg > 4 && wound_bonus != CANT_WOUND)
- // if you want to make tox wounds or some other type, this will need to be expanded and made more modular
- // handle all our wounding stuff
+ var/mangled_state = get_mangled_state()
+ var/bio_state = owner.get_biological_state()
+ var/easy_dismember = HAS_TRAIT(owner, TRAIT_EASYDISMEMBER) // if we have easydismember, we don't reduce damage when redirecting damage to different types (slashing weapons on mangled/skinless limbs attack at 100% instead of 50%)
+
+ if(wounding_type == WOUND_BLUNT)
+ if(sharpness == SHARP_EDGED)
+ wounding_type = WOUND_SLASH
+ else if(sharpness == SHARP_POINTY)
+ wounding_type = WOUND_PIERCE
+
+ //Handling for bone only/flesh only(none right now)/flesh and bone targets
+ switch(bio_state)
+ // if we're bone only, all cutting attacks go straight to the bone
+ if(BIO_JUST_BONE)
+ if(wounding_type == WOUND_SLASH)
+ wounding_type = WOUND_BLUNT
+ wounding_dmg *= (easy_dismember ? 1 : 0.5)
+ else if(wounding_type == WOUND_PIERCE)
+ wounding_type = WOUND_BLUNT
+ wounding_dmg *= (easy_dismember ? 1 : 0.75)
+ if((mangled_state & BODYPART_MANGLED_BONE) && try_dismember(wounding_type, wounding_dmg, wound_bonus, bare_wound_bonus))
+ return
+ // note that there's no handling for BIO_JUST_FLESH since we don't have any that are that right now (slimepeople maybe someday)
+ // standard humanoids
+ if(BIO_FLESH_BONE)
+ // if we've already mangled the skin (critical slash or piercing wound), then the bone is exposed, and we can damage it with sharp weapons at a reduced rate
+ // So a big sharp weapon is still all you need to destroy a limb
+ if(mangled_state == BODYPART_MANGLED_FLESH && sharpness)
+ playsound(src, "sound/effects/wounds/crackandbleed.ogg", 100)
+ if(wounding_type == WOUND_SLASH && !easy_dismember)
+ wounding_dmg *= 0.5 // edged weapons pass along 50% of their wounding damage to the bone since the power is spread out over a larger area
+ if(wounding_type == WOUND_PIERCE && !easy_dismember)
+ wounding_dmg *= 0.75 // piercing weapons pass along 75% of their wounding damage to the bone since it's more concentrated
+ wounding_type = WOUND_BLUNT
+ else if(mangled_state == BODYPART_MANGLED_BOTH && try_dismember(wounding_type, wounding_dmg, wound_bonus, bare_wound_bonus))
+ return
+
+ // now we have our wounding_type and are ready to carry on with wounds and dealing the actual damage
+ if(owner && wounding_dmg >= WOUND_MINIMUM_DAMAGE && wound_bonus != CANT_WOUND)
check_wounding(wounding_type, wounding_dmg, wound_bonus, bare_wound_bonus)
+ for(var/i in wounds)
+ var/datum/wound/iter_wound = i
+ iter_wound.receive_damage(wounding_type, wounding_dmg, wound_bonus)
+
+ /*
+ // END WOUND HANDLING
+ */
+
+ //back to our regularly scheduled program, we now actually apply damage if there's room below limb damage cap
+
var/can_inflict = max_damage - get_damage()
var/total_damage = brute + burn
@@ -213,10 +273,6 @@
if(can_inflict <= 0)
return FALSE
- for(var/i in wounds)
- var/datum/wound/W = i
- W.receive_damage(wounding_type, wounding_dmg, wound_bonus)
-
brute_dam += brute
burn_dam += burn
@@ -236,14 +292,58 @@
update_disabled()
return update_bodypart_damage_state()
+/// Allows us to roll for and apply a wound without actually dealing damage. Used for aggregate wounding power with pellet clouds
+/obj/item/bodypart/proc/painless_wound_roll(wounding_type, phantom_wounding_dmg, wound_bonus, bare_wound_bonus, sharpness=SHARP_NONE)
+ if(!owner || phantom_wounding_dmg <= WOUND_MINIMUM_DAMAGE || wound_bonus == CANT_WOUND)
+ return
+
+ var/mangled_state = get_mangled_state()
+ var/bio_state = owner.get_biological_state()
+ var/easy_dismember = HAS_TRAIT(owner, TRAIT_EASYDISMEMBER) // if we have easydismember, we don't reduce damage when redirecting damage to different types (slashing weapons on mangled/skinless limbs attack at 100% instead of 50%)
+
+ if(wounding_type == WOUND_BLUNT)
+ if(sharpness == SHARP_EDGED)
+ wounding_type = WOUND_SLASH
+ else if(sharpness == SHARP_POINTY)
+ wounding_type = WOUND_PIERCE
+
+ //Handling for bone only/flesh only(none right now)/flesh and bone targets
+ switch(bio_state)
+ // if we're bone only, all cutting attacks go straight to the bone
+ if(BIO_JUST_BONE)
+ if(wounding_type == WOUND_SLASH)
+ wounding_type = WOUND_BLUNT
+ phantom_wounding_dmg *= (easy_dismember ? 1 : 0.5)
+ else if(wounding_type == WOUND_PIERCE)
+ wounding_type = WOUND_BLUNT
+ phantom_wounding_dmg *= (easy_dismember ? 1 : 0.75)
+ if((mangled_state & BODYPART_MANGLED_BONE) && try_dismember(wounding_type, phantom_wounding_dmg, wound_bonus, bare_wound_bonus))
+ return
+ // note that there's no handling for BIO_JUST_FLESH since we don't have any that are that right now (slimepeople maybe someday)
+ // standard humanoids
+ if(BIO_FLESH_BONE)
+ // if we've already mangled the skin (critical slash or piercing wound), then the bone is exposed, and we can damage it with sharp weapons at a reduced rate
+ // So a big sharp weapon is still all you need to destroy a limb
+ if(mangled_state == BODYPART_MANGLED_FLESH && sharpness)
+ playsound(src, "sound/effects/wounds/crackandbleed.ogg", 100)
+ if(wounding_type == WOUND_SLASH && !easy_dismember)
+ phantom_wounding_dmg *= 0.5 // edged weapons pass along 50% of their wounding damage to the bone since the power is spread out over a larger area
+ if(wounding_type == WOUND_PIERCE && !easy_dismember)
+ phantom_wounding_dmg *= 0.75 // piercing weapons pass along 75% of their wounding damage to the bone since it's more concentrated
+ wounding_type = WOUND_BLUNT
+ else if(mangled_state == BODYPART_MANGLED_BOTH && try_dismember(wounding_type, phantom_wounding_dmg, wound_bonus, bare_wound_bonus))
+ return
+
+ check_wounding(wounding_type, phantom_wounding_dmg, wound_bonus, bare_wound_bonus)
+
/**
* check_wounding() is where we handle rolling for, selecting, and applying a wound if we meet the criteria
*
- * We generate a "score" for how woundable the attack was based on the damage and other factors discussed in [check_wounding_mods()], then go down the list from most severe to least severe wounds in that category.
+ * We generate a "score" for how woundable the attack was based on the damage and other factors discussed in [/obj/item/bodypart/proc/check_wounding_mods], then go down the list from most severe to least severe wounds in that category.
* We can promote a wound from a lesser to a higher severity this way, but we give up if we have a wound of the given type and fail to roll a higher severity, so no sidegrades/downgrades
*
* Arguments:
- * * woundtype- Either WOUND_SHARP, WOUND_BRUTE, or WOUND_BURN based on the attack type.
+ * * woundtype- Either WOUND_BLUNT, WOUND_SLASH, WOUND_PIERCE, or WOUND_BURN based on the attack type.
* * damage- How much damage is tied to this attack, since wounding potential scales with damage in an attack (see: WOUND_DAMAGE_EXPONENT)
* * wound_bonus- The wound_bonus of an attack
* * bare_wound_bonus- The bare_wound_bonus of an attack
@@ -252,19 +352,24 @@
// actually roll wounds if applicable
if(HAS_TRAIT(owner, TRAIT_EASYLIMBDISABLE))
damage *= 1.5
+ else
+ damage = min(damage, WOUND_MAX_CONSIDERED_DAMAGE)
var/base_roll = rand(1, round(damage ** WOUND_DAMAGE_EXPONENT))
var/injury_roll = base_roll
injury_roll += check_woundings_mods(woundtype, damage, wound_bonus, bare_wound_bonus)
- var/list/wounds_checking
+ var/list/wounds_checking = GLOB.global_wound_types[woundtype]
- switch(woundtype)
- if(WOUND_SHARP)
- wounds_checking = WOUND_LIST_SLASH
- if(WOUND_BRUTE)
- wounds_checking = WOUND_LIST_BLUNT
- if(WOUND_BURN)
- wounds_checking = WOUND_LIST_BURN
+ // quick re-check to see if bare_wound_bonus applies, for the benefit of log_wound(), see about getting the check from check_woundings_mods() somehow
+ if(ishuman(owner))
+ var/mob/living/carbon/human/human_wearer = owner
+ var/list/clothing = human_wearer.clothingonpart(src)
+ for(var/i in clothing)
+ var/obj/item/clothing/clothes_check = i
+ // unlike normal armor checks, we tabluate these piece-by-piece manually so we can also pass on appropriate damage the clothing's limbs if necessary
+ if(clothes_check.armor.getRating("wound"))
+ bare_wound_bonus = 0
+ break
//cycle through the wounds of the relevant category from the most severe down
for(var/PW in wounds_checking)
@@ -279,21 +384,22 @@
replaced_wound = existing_wound
if(initial(possible_wound.threshold_minimum) < injury_roll)
+ var/datum/wound/new_wound
if(replaced_wound)
- var/datum/wound/new_wound = replaced_wound.replace_wound(possible_wound)
- log_wound(owner, new_wound, damage, wound_bonus, bare_wound_bonus, base_roll)
+ new_wound = replaced_wound.replace_wound(possible_wound)
+ log_wound(owner, new_wound, damage, wound_bonus, bare_wound_bonus, base_roll) // dismembering wounds are logged in the apply_wound() for loss wounds since they delete themselves immediately, these will be immediately returned
else
- var/datum/wound/new_wound = new possible_wound
+ new_wound = new possible_wound
new_wound.apply_wound(src)
log_wound(owner, new_wound, damage, wound_bonus, bare_wound_bonus, base_roll)
- return
+ return new_wound
// try forcing a specific wound, but only if there isn't already a wound of that severity or greater for that type on this bodypart
/obj/item/bodypart/proc/force_wound_upwards(specific_woundtype, smited = FALSE)
var/datum/wound/potential_wound = specific_woundtype
for(var/i in wounds)
var/datum/wound/existing_wound = i
- if(existing_wound.type in (initial(potential_wound.wound_type)))
+ if(existing_wound.wound_type == initial(potential_wound.wound_type))
if(existing_wound.severity < initial(potential_wound.severity)) // we only try if the existing one is inferior to the one we're trying to force
existing_wound.replace_wound(potential_wound, smited)
return
@@ -301,12 +407,20 @@
var/datum/wound/new_wound = new potential_wound
new_wound.apply_wound(src, smited = smited)
+/**
+ * check_wounding_mods() is where we handle the various modifiers of a wound roll
+ *
+ * A short list of things we consider: any armor a human target may be wearing, and if they have no wound armor on the limb, if we have a bare_wound_bonus to apply, plus the plain wound_bonus
+ * We also flick through all of the wounds we currently have on this limb and add their threshold penalties, so that having lots of bad wounds makes you more liable to get hurt worse
+ * Lastly, we add the inherent wound_resistance variable the bodypart has (heads and chests are slightly harder to wound), and a small bonus if the limb is already disabled
+ *
+ * Arguments:
+ * * It's the same ones on [receive_damage]
+ */
/obj/item/bodypart/proc/check_woundings_mods(wounding_type, damage, wound_bonus, bare_wound_bonus)
var/armor_ablation = 0
var/injury_mod = 0
- //var/bwb = 0
-
if(owner && ishuman(owner))
var/mob/living/carbon/human/H = owner
var/list/clothing = H.clothingonpart(src)
@@ -314,7 +428,7 @@
var/obj/item/clothing/C = c
// unlike normal armor checks, we tabluate these piece-by-piece manually so we can also pass on appropriate damage the clothing's limbs if necessary
armor_ablation += C.armor.getRating("wound")
- if(wounding_type == WOUND_SHARP)
+ if(wounding_type == WOUND_SLASH)
C.take_damage_zone(body_zone, damage, BRUTE, armour_penetration)
else if(wounding_type == WOUND_BURN && damage >= 10) // lazy way to block freezing from shredding clothes without adding another var onto apply_damage()
C.take_damage_zone(body_zone, damage, BURN, armour_penetration)
@@ -330,7 +444,7 @@
injury_mod += W.threshold_penalty
var/part_mod = -wound_resistance
- if(is_disabled())
+ if(get_damage(TRUE) >= max_damage)
part_mod += disabled_wound_penalty
injury_mod += part_mod
@@ -383,11 +497,11 @@
return BODYPART_DISABLED_WOUND
if(can_dismember() && !HAS_TRAIT(owner, TRAIT_NODISMEMBER))
. = disabled //inertia, to avoid limbs healing 0.1 damage and being re-enabled
- if((get_damage(TRUE) >= max_damage) || (HAS_TRAIT(owner, TRAIT_EASYLIMBDISABLE) && (get_damage(TRUE) >= (max_damage * 0.6)))) //Easy limb disable disables the limb at 40% health instead of 0%
+ if(get_damage(TRUE) >= max_damage * (HAS_TRAIT(owner, TRAIT_EASYLIMBDISABLE) ? 0.6 : 1)) //Easy limb disable disables the limb at 40% health instead of 0%
if(!last_maxed)
owner.emote("scream")
last_maxed = TRUE
- if(!is_organic_limb())
+ if(!is_organic_limb() || stamina_dam >= max_damage)
return BODYPART_DISABLED_DAMAGE
else if(disabled && (get_damage(TRUE) <= (max_damage * 0.8))) // reenabled at 80% now instead of 50% as of wounds update
last_maxed = FALSE
@@ -741,17 +855,29 @@
/obj/item/bodypart/proc/get_wound_type(checking_type)
if(isnull(wounds))
return
- for(var/thing in wounds)
- var/datum/wound/W = thing
- if(istype(W, checking_type))
- return W
+ for(var/i in wounds)
+ if(istype(i, checking_type))
+ return i
-/// very rough start for updating efficiency and other stats on a body part whenever a wound is gained/lost
-/obj/item/bodypart/proc/update_wounds()
+/**
+ * update_wounds() is called whenever a wound is gained or lost on this bodypart, as well as if there's a change of some kind on a bone wound possibly changing disabled status
+ *
+ * Covers tabulating the damage multipliers we have from wounds (burn specifically), as well as deleting our gauze wrapping if we don't have any wounds that can use bandaging
+ *
+ * Arguments:
+ * * replaced- If true, this is being called from the remove_wound() of a wound that's being replaced, so the bandage that already existed is still relevant, but the new wound hasn't been added yet
+ */
+/obj/item/bodypart/proc/update_wounds(replaced = FALSE)
var/dam_mul = 1 //initial(wound_damage_multiplier)
// we can only have one wound per type, but remember there's multiple types
- for(var/datum/wound/W in wounds)
- dam_mul *= W.damage_mulitplier_penalty
+ // we can (normally) only have one wound per type, but remember there's multiple types (smites like :B:loodless can generate multiple cuts on a limb)
+ for(var/i in wounds)
+ var/datum/wound/iter_wound = i
+ dam_mul *= iter_wound.damage_mulitplier_penalty
+
+ if(!LAZYLEN(wounds) && current_gauze && !replaced)
+ owner.visible_message("
\The [current_gauze] on [owner]'s [name] fall away.", "
The [current_gauze] on your [name] fall away.")
+ QDEL_NULL(current_gauze)
wound_damage_multiplier = dam_mul
update_disabled()
@@ -761,8 +887,6 @@
var/bleed_rate = 0
if(generic_bleedstacks > 0)
bleed_rate++
- if(brute_dam >= 40)
- bleed_rate += (brute_dam * 0.008)
//We want an accurate reading of .len
listclearnulls(embedded_objects)
@@ -773,5 +897,40 @@
for(var/thing in wounds)
var/datum/wound/W = thing
bleed_rate += W.blood_flow
-
+ if(owner.mobility_flags & ~MOBILITY_STAND)
+ bleed_rate *= 0.75
return bleed_rate
+
+/**
+ * apply_gauze() is used to- well, apply gauze to a bodypart
+ *
+ * As of the Wounds 2 PR, all bleeding is now bodypart based rather than the old bleedstacks system, and 90% of standard bleeding comes from flesh wounds (the exception is embedded weapons).
+ * The same way bleeding is totaled up by bodyparts, gauze now applies to all wounds on the same part. Thus, having a slash wound, a pierce wound, and a broken bone wound would have the gauze
+ * applying blood staunching to the first two wounds, while also acting as a sling for the third one. Once enough blood has been absorbed or all wounds with the ACCEPTS_GAUZE flag have been cleared,
+ * the gauze falls off.
+ *
+ * Arguments:
+ * * gauze- Just the gauze stack we're taking a sheet from to apply here
+ */
+/obj/item/bodypart/proc/apply_gauze(obj/item/stack/gauze)
+ if(!istype(gauze) || !gauze.absorption_capacity)
+ return
+ QDEL_NULL(current_gauze)
+ current_gauze = new gauze.type(src, 1)
+ gauze.use(1)
+
+/**
+ * seep_gauze() is for when a gauze wrapping absorbs blood or pus from wounds, lowering its absorption capacity.
+ *
+ * The passed amount of seepage is deducted from the bandage's absorption capacity, and if we reach a negative absorption capacity, the bandages fall off and we're left with nothing.
+ *
+ * Arguments:
+ * * seep_amt - How much absorption capacity we're removing from our current bandages (think, how much blood or pus are we soaking up this tick?)
+ */
+/obj/item/bodypart/proc/seep_gauze(seep_amt = 0)
+ if(!current_gauze)
+ return
+ current_gauze.absorption_capacity -= seep_amt
+ if(current_gauze.absorption_capacity < 0)
+ owner.visible_message("
\The [current_gauze] on [owner]'s [name] fall away in rags.", "
\The [current_gauze] on your [name] fall away in rags.", vision_distance=COMBAT_MESSAGE_RANGE)
+ QDEL_NULL(current_gauze)
diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm
index 2ce6ca8862..fa003e3f3c 100644
--- a/code/modules/surgery/bodyparts/dismemberment.dm
+++ b/code/modules/surgery/bodyparts/dismemberment.dm
@@ -4,7 +4,7 @@
return TRUE
//Dismember a limb
-/obj/item/bodypart/proc/dismember(dam_type = BRUTE)
+/obj/item/bodypart/proc/dismember(dam_type = BRUTE, silent=TRUE)
if(!owner)
return FALSE
var/mob/living/carbon/C = owner
@@ -16,7 +16,8 @@
return FALSE
var/obj/item/bodypart/affecting = C.get_bodypart(BODY_ZONE_CHEST)
affecting.receive_damage(clamp(brute_dam/2 * affecting.body_damage_coeff, 15, 50), clamp(burn_dam/2 * affecting.body_damage_coeff, 0, 50), wound_bonus=CANT_WOUND) //Damage the chest based on limb's existing damage
- C.visible_message("
[C]'s [src.name] has been violently dismembered!")
+ if(!silent)
+ C.visible_message("
[C]'s [name] is violently dismembered!")
C.emote("scream")
SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "dismembered", /datum/mood_event/dismembered)
drop_limb()
@@ -30,6 +31,7 @@
burn()
return TRUE
add_mob_blood(C)
+ C.bleed(rand(20, 40))
var/direction = pick(GLOB.cardinals)
var/t_range = rand(2,max(throw_range/2, 2))
var/turf/target_turf = get_turf(src)
@@ -80,8 +82,6 @@
if(organ_spilled)
C.visible_message("
[C]'s internal organs spill out onto the floor!")
-
-
//limb removal. The "special" argument is used for swapping a limb with a new one without the effects of losing a limb kicking in.
/obj/item/bodypart/proc/drop_limb(special, dismembered)
if(!owner)
@@ -153,7 +153,52 @@
forceMove(Tsec)
+/**
+ * get_mangled_state() is relevant for flesh and bone bodyparts, and returns whether this bodypart has mangled skin, mangled bone, or both (or neither i guess)
+ *
+ * Dismemberment for flesh and bone requires the victim to have the skin on their bodypart destroyed (either a critical cut or piercing wound), and at least a hairline fracture
+ * (severe bone), at which point we can start rolling for dismembering. The attack must also deal at least 10 damage, and must be a brute attack of some kind (sorry for now, cakehat, maybe later)
+ *
+ * Returns: BODYPART_MANGLED_NONE if we're fine, BODYPART_MANGLED_FLESH if our skin is broken, BODYPART_MANGLED_BONE if our bone is broken, or BODYPART_MANGLED_BOTH if both are broken and we're up for dismembering
+ */
+/obj/item/bodypart/proc/get_mangled_state()
+ . = BODYPART_MANGLED_NONE
+ for(var/i in wounds)
+ var/datum/wound/iter_wound = i
+ if((iter_wound.wound_flags & MANGLES_BONE))
+ . |= BODYPART_MANGLED_BONE
+ if((iter_wound.wound_flags & MANGLES_FLESH))
+ . |= BODYPART_MANGLED_FLESH
+
+/**
+ * try_dismember() is used, once we've confirmed that a flesh and bone bodypart has both the skin and bone mangled, to actually roll for it
+ *
+ * Mangling is described in the above proc, [/obj/item/bodypart/proc/get_mangled_state()]. This simply makes the roll for whether we actually dismember or not
+ * using how damaged the limb already is, and how much damage this blow was for. If we have a critical bone wound instead of just a severe, we add +10% to the roll.
+ * Lastly, we choose which kind of dismember we want based on the wounding type we hit with. Note we don't care about all the normal mods or armor for this
+ *
+ * Arguments:
+ * * wounding_type: Either WOUND_BLUNT, WOUND_SLASH, or WOUND_PIERCE, basically only matters for the dismember message
+ * * wounding_dmg: The damage of the strike that prompted this roll, higher damage = higher chance
+ * * wound_bonus: Not actually used right now, but maybe someday
+ * * bare_wound_bonus: ditto above
+ */
+/obj/item/bodypart/proc/try_dismember(wounding_type, wounding_dmg, wound_bonus, bare_wound_bonus)
+ if(wounding_dmg < DISMEMBER_MINIMUM_DAMAGE)
+ return
+
+ var/base_chance = wounding_dmg + (get_damage() / max_damage * 50) // how much damage we dealt with this blow, + 50% of the damage percentage we already had on this bodypart
+ if(locate(/datum/wound/blunt/critical) in wounds) // we only require a severe bone break, but if there's a critical bone break, we'll add 10% more
+ base_chance += 10
+
+ if(!prob(base_chance))
+ return
+
+ var/datum/wound/loss/dismembering = new
+ dismembering.apply_dismember(src, wounding_type)
+
+ return TRUE
//when a limb is dropped, the internal organs are removed from the mob and put into the limb
/obj/item/organ/proc/transfer_to_limb(obj/item/bodypart/LB, mob/living/carbon/C)
@@ -378,7 +423,7 @@
/mob/living/carbon/regenerate_limb(limb_zone, noheal)
var/obj/item/bodypart/L
if(get_bodypart(limb_zone))
- return 0
+ return FALSE
L = newBodyPart(limb_zone, 0, 0)
if(L)
if(!noheal)
@@ -386,6 +431,8 @@
L.burn_dam = 0
L.brutestate = 0
L.burnstate = 0
-
+ var/datum/scar/scaries = new
+ var/datum/wound/loss/phantom_loss = new // stolen valor, really
+ scaries.generate(L, phantom_loss)
L.attach_limb(src, 1)
- return 1
+ return TRUE
diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm
index a67f16b934..13b1140527 100644
--- a/code/modules/surgery/bodyparts/head.dm
+++ b/code/modules/surgery/bodyparts/head.dm
@@ -36,11 +36,10 @@
var/custom_head
wound_resistance = 10
- specific_locations = list("left eyebrow", "cheekbone", "neck", "throat", "jawline", "entire face")
scars_covered_by_clothes = FALSE
/obj/item/bodypart/head/can_dismember(obj/item/I)
- if(!((owner.stat == DEAD) || owner.InFullCritical()))
+ if(owner && !((owner.stat == DEAD) || owner.InFullCritical()))
return FALSE
return ..()
diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm
index a18b31e4c1..5a887ee6b7 100644
--- a/code/modules/surgery/bodyparts/parts.dm
+++ b/code/modules/surgery/bodyparts/parts.dm
@@ -12,7 +12,7 @@
var/obj/item/cavity_item
/obj/item/bodypart/chest/can_dismember(obj/item/I)
- if(!((owner.stat == DEAD) || owner.InFullCritical()))
+ if(!((owner.stat == DEAD) || owner.InFullCritical()) || !get_organs())
return FALSE
return ..()
diff --git a/code/modules/surgery/burn_dressing.dm b/code/modules/surgery/burn_dressing.dm
index 1688f7b5d1..8bfa52d245 100644
--- a/code/modules/surgery/burn_dressing.dm
+++ b/code/modules/surgery/burn_dressing.dm
@@ -94,7 +94,8 @@
log_combat(user, target, "dressed burns in", addition="INTENT: [uppertext(user.a_intent)]")
burn_wound.sanitization += 3
burn_wound.flesh_healing += 5
- burn_wound.force_bandage(tool)
+ var/obj/item/bodypart/the_part = target.get_bodypart(target_zone)
+ the_part.apply_gauze(tool)
else
to_chat(user, "
[target] has no burns there!")
return ..()
diff --git a/code/modules/surgery/repair_puncture.dm b/code/modules/surgery/repair_puncture.dm
new file mode 100644
index 0000000000..12aefefc82
--- /dev/null
+++ b/code/modules/surgery/repair_puncture.dm
@@ -0,0 +1,108 @@
+
+/////BURN FIXING SURGERIES//////
+
+//the step numbers of each of these two, we only currently use the first to switch back and forth due to advancing after finishing steps anyway
+#define REALIGN_INNARDS 1
+#define WELD_VEINS 2
+
+///// Repair puncture wounds
+/datum/surgery/repair_puncture
+ name = "Repair puncture"
+ steps = list(/datum/surgery_step/incise, /datum/surgery_step/repair_innards, /datum/surgery_step/seal_veins, /datum/surgery_step/close) // repeat between steps 2 and 3 until healed
+ target_mobtypes = list(/mob/living/carbon)
+ possible_locs = list(BODY_ZONE_R_ARM,BODY_ZONE_L_ARM,BODY_ZONE_R_LEG,BODY_ZONE_L_LEG,BODY_ZONE_CHEST,BODY_ZONE_HEAD)
+ requires_real_bodypart = TRUE
+ targetable_wound = /datum/wound/pierce
+
+/datum/surgery/repair_puncture/can_start(mob/living/user, mob/living/carbon/target)
+ . = ..()
+ if(.)
+ var/obj/item/bodypart/targeted_bodypart = target.get_bodypart(user.zone_selected)
+ var/datum/wound/burn/pierce_wound = targeted_bodypart.get_wound_type(targetable_wound)
+ return(pierce_wound && pierce_wound.blood_flow > 0)
+
+//SURGERY STEPS
+
+///// realign the blood vessels so we can reweld them
+/datum/surgery_step/repair_innards
+ name = "realign blood vessels"
+ implements = list(TOOL_HEMOSTAT = 100, TOOL_SCALPEL = 85, TOOL_WIRECUTTER = 40)
+ time = 3 SECONDS
+
+/datum/surgery_step/repair_innards/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ var/datum/wound/pierce/pierce_wound = surgery.operated_wound
+ if(!pierce_wound)
+ user.visible_message("
[user] looks for [target]'s [parse_zone(user.zone_selected)].", "
You look for [target]'s [parse_zone(user.zone_selected)]...")
+ return
+
+ if(pierce_wound.blood_flow <= 0)
+ to_chat(user, "
[target]'s [parse_zone(user.zone_selected)] has no puncture to repair!")
+ surgery.status++
+ return
+
+ display_results(user, target, "
You begin to realign the torn blood vessels in [target]'s [parse_zone(user.zone_selected)]...",
+ "
[user] begins to realign the torn blood vessels in [target]'s [parse_zone(user.zone_selected)] with [tool].",
+ "
[user] begins to realign the torn blood vessels in [target]'s [parse_zone(user.zone_selected)].")
+
+/datum/surgery_step/repair_innards/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
+ var/datum/wound/pierce/pierce_wound = surgery.operated_wound
+ if(!pierce_wound)
+ to_chat(user, "
[target] has no puncture wound there!")
+ return ..()
+
+ display_results(user, target, "
You successfully realign some of the blood vessels in [target]'s [parse_zone(target_zone)].",
+ "
[user] successfully realigns some of the blood vessels in [target]'s [parse_zone(target_zone)] with [tool]!",
+ "
[user] successfully realigns some of the blood vessels in [target]'s [parse_zone(target_zone)]!")
+ log_combat(user, target, "excised infected flesh in", addition="INTENT: [uppertext(user.a_intent)]")
+ surgery.operated_bodypart.receive_damage(brute=3, wound_bonus=CANT_WOUND)
+ pierce_wound.blood_flow -= 0.25
+ return ..()
+
+/datum/surgery_step/repair_innards/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, var/fail_prob = 0)
+ . = ..()
+ display_results(user, target, "
You jerk apart some of the blood vessels in [target]'s [parse_zone(target_zone)].",
+ "
[user] jerks apart some of the blood vessels in [target]'s [parse_zone(target_zone)] with [tool]!",
+ "
[user] jerk apart some of the blood vessels in [target]'s [parse_zone(target_zone)]!")
+ surgery.operated_bodypart.receive_damage(brute=rand(4,8), sharpness=SHARP_EDGED, wound_bonus = 10)
+
+///// Sealing the vessels back together
+/datum/surgery_step/seal_veins
+ name = "weld veins" // if your doctor says they're going to weld your blood vessels back together, you're either A) on SS13, or B) in grave mortal peril
+ implements = list(TOOL_CAUTERY = 100, /obj/item/gun/energy/laser = 90, TOOL_WELDER = 70, /obj/item = 30)
+ time = 4 SECONDS
+
+/datum/surgery_step/seal_veins/tool_check(mob/user, obj/item/tool)
+ if(implement_type == TOOL_WELDER || implement_type == /obj/item)
+ return tool.get_temperature()
+
+ return TRUE
+
+/datum/surgery_step/seal_veins/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ var/datum/wound/pierce/pierce_wound = surgery.operated_wound
+ if(!pierce_wound)
+ user.visible_message("
[user] looks for [target]'s [parse_zone(user.zone_selected)].", "
You look for [target]'s [parse_zone(user.zone_selected)]...")
+ return
+ display_results(user, target, "
You begin to meld some of the split blood vessels in [target]'s [parse_zone(user.zone_selected)]...",
+ "
[user] begins to meld some of the split blood vessels in [target]'s [parse_zone(user.zone_selected)] with [tool].",
+ "
[user] begins to meld some of the split blood vessels in [target]'s [parse_zone(user.zone_selected)].")
+
+/datum/surgery_step/seal_veins/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
+ var/datum/wound/pierce/pierce_wound = surgery.operated_wound
+ if(!pierce_wound)
+ to_chat(user, "
[target] has no puncture there!")
+ return ..()
+
+ display_results(user, target, "
You successfully meld some of the split blood vessels in [target]'s [parse_zone(target_zone)] with [tool].",
+ "
[user] successfully melds some of the split blood vessels in [target]'s [parse_zone(target_zone)] with [tool]!",
+ "
[user] successfully melds some of the split blood vessels in [target]'s [parse_zone(target_zone)]!")
+ log_combat(user, target, "dressed burns in", addition="INTENT: [uppertext(user.a_intent)]")
+ pierce_wound.blood_flow -= 0.5
+ if(pierce_wound.blood_flow > 0)
+ surgery.status = REALIGN_INNARDS
+ to_chat(user, "
There still seems to be misaligned blood vessels to finish...")
+ else
+ to_chat(user, "
You've repaired all the internal damage in [target]'s [parse_zone(target_zone)]!")
+ return ..()
+
+#undef REALIGN_INNARDS
+#undef WELD_VEINS
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index 040f3ce487..7a5356ce06 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -530,8 +530,7 @@ GLOBAL_LIST_EMPTY(vending_products)
for(var/i in C.bodyparts)
var/obj/item/bodypart/squish_part = i
if(squish_part.is_organic_limb())
- //var/type_wound = pick(WOUND_LIST_BLUNT)
- var/type_wound = pick(list(/datum/wound/blunt/critical, /datum/wound/blunt/severe, /datum/wound/blunt/critical, /datum/wound/blunt/severe, /datum/wound/blunt/moderate))
+ var/type_wound = pick(list(/datum/wound/blunt/critical, /datum/wound/blunt/severe, /datum/wound/blunt/moderate))
squish_part.force_wound_upwards(type_wound)
else
squish_part.receive_damage(brute=30)
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index 9f3d8911ec..9c35ddb75f 100644
--- a/interface/stylesheet.dm
+++ b/interface/stylesheet.dm
@@ -66,7 +66,9 @@ h1.alert, h2.alert {color: #000000;}
.passive {color: #660000;}
.userdanger {color: #ff0000; font-weight: bold; font-size: 3;}
-.danger {color: #ff0000;}
+.danger {color: #ff0000; font-weight: bold;}
+.tinydanger {color: #ff0000; font-size: 85%;}
+.smalldanger {color: #ff0000; font-size: 90%;}
.warning {color: #ff0000; font-style: italic;}
.boldwarning {color: #ff0000; font-style: italic; font-weight: bold}
.announce {color: #228b22; font-weight: bold;}
@@ -75,6 +77,9 @@ h1.alert, h2.alert {color: #000000;}
.rose {color: #ff5050;}
.info {color: #0000CC;}
.notice {color: #000099;}
+.tinynotice {color: #000099; font-size: 85%;}
+.smallnotice {color: #000099; font-size: 90%;}
+.smallnoticeital {color: #000099; font-style: italic; font-size: 90%;}
.boldnotice {color: #000099; font-weight: bold;}
.adminnotice {color: #0000ff;}
.adminhelp {color: #ff0000; font-weight: bold;}
diff --git a/sound/effects/blood1.ogg b/sound/effects/wounds/blood1.ogg
similarity index 100%
rename from sound/effects/blood1.ogg
rename to sound/effects/wounds/blood1.ogg
diff --git a/sound/effects/blood2.ogg b/sound/effects/wounds/blood2.ogg
similarity index 100%
rename from sound/effects/blood2.ogg
rename to sound/effects/wounds/blood2.ogg
diff --git a/sound/effects/blood3.ogg b/sound/effects/wounds/blood3.ogg
similarity index 100%
rename from sound/effects/blood3.ogg
rename to sound/effects/wounds/blood3.ogg
diff --git a/sound/effects/crack1.ogg b/sound/effects/wounds/crack1.ogg
similarity index 100%
rename from sound/effects/crack1.ogg
rename to sound/effects/wounds/crack1.ogg
diff --git a/sound/effects/crack2.ogg b/sound/effects/wounds/crack2.ogg
similarity index 100%
rename from sound/effects/crack2.ogg
rename to sound/effects/wounds/crack2.ogg
diff --git a/sound/effects/wounds/crackandbleed.ogg b/sound/effects/wounds/crackandbleed.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..ea07f13d482087be78a525d993bf912626925e46
GIT binary patch
literal 15662
zcmeIZcT|&4wh^$H3@`{bOe-Mq$<*+SONqHRl0Nm=}kaD6vWU$
zdhZB=pn?c0V&?|^z30B?th?4dYu)qLx4v1E$;_TTdq1;h@0mS2PYkbIF$KWDKdD&d
zZ)L6&EeGNU1zz)YboV<3feEeupnL}XskDF$k4OGTIv#o4bGTOE!J>ckUy>@-UsB=}
z3`=((Hz`BkD@ZSQM~goUkUB_NX&G5*S?M!K5kv2*?moUQelA!2MUM$GQa)xTSarP%
z<_0*tiJCMB`j?g{PTc|ozyN?CppWP#j3t=^02}}cs?TPG_CGsZ2@NaPVhbf5*Ve1G
z#zII>D7D>ZW!#~I6qp}U&Y2wmAOJxWmhHQWd-v>+pKFuZm|LvxxE2{BoyHZZmcC%U
zjY?g@y;IxbhcQ|~DS`knFcgu^L>m?PuR^pW(=k@GG}G~gXc@2HkW3#kf=T&JajFrH
zR
UR`;!nlG
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�U|E2pS-PVJnM8WxMioIfus
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
S<^2F2lVd6ny$diMr~d^L?J`vW
literal 0
HcmV?d00001
diff --git a/sound/effects/wounds/pierce1.ogg b/sound/effects/wounds/pierce1.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..cd7b7c39610214fd14ae4e6bb2e267f9f91fb3b7
GIT binary patch
literal 8726
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
literal 0
HcmV?d00001
diff --git a/sound/effects/wounds/pierce2.ogg b/sound/effects/wounds/pierce2.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..4977cab299f273a74f00de7c2f7425e04c150ede
GIT binary patch
literal 17779
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