From 90f91e0b20eb3d1c321fdf0ec733fac9d4c8a623 Mon Sep 17 00:00:00 2001 From: thgvr Date: Sun, 25 May 2025 04:21:09 -0700 Subject: [PATCH 1/3] Initial Wounds Commit --- code/__DEFINES/DNA.dm | 26 +- code/__DEFINES/admin.dm | 8 +- code/__DEFINES/combat.dm | 44 +- code/__DEFINES/dcs/signals/signals.dm | 45 +- code/__DEFINES/is_helpers.dm | 8 - code/__DEFINES/maths.dm | 8 + code/__DEFINES/misc.dm | 39 +- code/__DEFINES/mobs.dm | 12 +- code/__DEFINES/obj_flags.dm | 6 + code/__DEFINES/skills.dm | 11 +- code/__DEFINES/status_effects.dm | 4 + code/__DEFINES/tools.dm | 2 + code/__DEFINES/traits.dm | 11 + code/__DEFINES/wounds.dm | 149 +++++ code/__HELPERS/_logging.dm | 4 + code/__HELPERS/pronouns.dm | 67 +++ code/__HELPERS/type2type.dm | 16 + code/_globalvars/lists/mobs.dm | 2 +- code/_globalvars/traits.dm | 4 +- code/_onclick/item_attack.dm | 36 +- code/datums/armor.dm | 30 +- code/datums/brain_damage/magic.dm | 2 +- code/datums/components/bandage.dm | 60 -- code/datums/components/butchering.dm | 32 +- code/datums/components/caltrop.dm | 2 +- .../components/crafting/recipes/misc.dm | 25 +- code/datums/components/embedded.dm | 386 ++++-------- code/datums/components/explodable.dm | 4 +- code/datums/components/fantasy/_fantasy.dm | 4 + code/datums/components/gunpoint.dm | 68 ++- code/datums/components/pellet_cloud.dm | 93 ++- code/datums/components/riding.dm | 3 + code/datums/components/tackle.dm | 69 ++- code/datums/components/taped.dm | 2 +- code/datums/elements/embed.dm | 80 +-- code/datums/elements/kneecapping.dm | 99 ++++ code/datums/martial/sleeping_carp.dm | 15 +- code/datums/mutations/actions.dm | 19 +- code/datums/mutations/body.dm | 4 +- code/datums/status_effects/debuffs.dm | 13 +- code/datums/status_effects/wound_effects.dm | 232 ++++++++ code/datums/traits/negative/frail.dm | 6 +- code/datums/wounds/_wounds.dm | 378 ++++++++++++ code/datums/wounds/bones.dm | 496 ++++++++++++++++ code/datums/wounds/burns.dm | 292 ++++++++++ code/datums/wounds/dismember.dm | 54 ++ code/datums/wounds/muscle.dm | 197 +++++++ code/datums/wounds/pierce.dm | 195 +++++++ code/datums/wounds/slash.dm | 265 +++++++++ code/game/atoms.dm | 37 +- .../game/gamemodes/clown_ops/clown_weapons.dm | 4 +- code/game/machinery/_machinery.dm | 2 +- code/game/machinery/deployable.dm | 4 +- code/game/machinery/doors/door.dm | 3 +- code/game/machinery/medical_kiosk.dm | 2 +- .../machinery/porta_turret/portable_turret.dm | 2 +- code/game/machinery/suit_storage_unit.dm | 6 - code/game/objects/items.dm | 32 +- .../game/objects/items/attachments/bayonet.dm | 2 +- .../items/attachments/energy_bayonet.dm | 4 +- code/game/objects/items/devices/flashlight.dm | 14 +- code/game/objects/items/devices/scanners.dm | 82 ++- .../objects/items/grenades/antigravity.dm | 2 +- .../objects/items/grenades/chem_grenade.dm | 10 +- .../objects/items/grenades/clusterbuster.dm | 4 +- .../objects/items/grenades/discogrenade.dm | 4 +- code/game/objects/items/grenades/emgrenade.dm | 2 +- code/game/objects/items/grenades/festive.dm | 4 +- code/game/objects/items/grenades/flashbang.dm | 6 +- .../game/objects/items/grenades/ghettobomb.dm | 2 +- code/game/objects/items/grenades/grenade.dm | 2 +- code/game/objects/items/grenades/hypno.dm | 2 +- code/game/objects/items/grenades/plastic.dm | 2 +- code/game/objects/items/grenades/smokebomb.dm | 2 +- .../objects/items/grenades/spawnergrenade.dm | 2 +- .../objects/items/grenades/syndieminibomb.dm | 6 +- code/game/objects/items/latexballoon.dm | 2 +- code/game/objects/items/melee/axe.dm | 4 +- code/game/objects/items/melee/blunt.dm | 2 +- code/game/objects/items/melee/chainsaw.dm | 8 +- code/game/objects/items/melee/dualenergy.dm | 4 +- code/game/objects/items/melee/energy.dm | 12 +- code/game/objects/items/melee/knife.dm | 11 +- code/game/objects/items/melee/melee.dm | 18 +- code/game/objects/items/melee/spear.dm | 10 +- code/game/objects/items/melee/stunbaton.dm | 2 + code/game/objects/items/melee/sword.dm | 11 +- code/game/objects/items/melee/trickweapon.dm | 2 +- code/game/objects/items/sharpener.dm | 3 +- code/game/objects/items/shrapnel.dm | 97 ++- code/game/objects/items/stacks/medical.dm | 516 +++++++++------- .../game/objects/items/stacks/sheets/glass.dm | 2 +- code/game/objects/items/stacks/stack.dm | 1 + code/game/objects/items/stacks/tape.dm | 17 +- code/game/objects/items/storage/backpack.dm | 3 +- code/game/objects/items/storage/firstaid.dm | 4 +- code/game/objects/items/tools/weldingtool.dm | 3 + code/game/objects/objs.dm | 9 +- code/game/objects/structures.dm | 2 +- .../crates_lockers/closets/cardboardbox.dm | 2 +- code/game/objects/structures/guillotine.dm | 2 +- code/game/objects/structures/tables_racks.dm | 28 +- code/game/objects/structures/window.dm | 6 +- code/modules/admin/verbs/randomverbs.dm | 146 ++++- .../changeling/powers/mutations.dm | 7 +- .../changeling/powers/regenerate.dm | 3 + .../antagonists/wizard/equipment/artefact.dm | 4 - .../components/unary_devices/cryo.dm | 35 +- code/modules/clothing/clothing.dm | 253 ++++++-- code/modules/clothing/glasses/_glasses.dm | 2 +- code/modules/clothing/gloves/_gloves.dm | 2 +- code/modules/clothing/head/_head.dm | 2 +- code/modules/clothing/head/hardhat.dm | 3 +- code/modules/clothing/head/helmet.dm | 2 +- code/modules/clothing/masks/_masks.dm | 2 +- .../modules/clothing/outfits/factions/clip.dm | 2 +- .../clothing/outfits/factions/inteq.dm | 2 +- .../clothing/outfits/factions/syndicate.dm | 6 +- code/modules/clothing/shoes/_shoes.dm | 2 +- code/modules/clothing/spacesuits/hardsuit.dm | 4 +- code/modules/clothing/suits/_suits.dm | 3 +- code/modules/clothing/suits/armor.dm | 2 +- code/modules/clothing/under/_under.dm | 3 +- .../food_and_drinks/drinks/drinks/bottle.dm | 2 +- code/modules/food_and_drinks/food/snacks.dm | 17 +- .../kitchen_machinery/cutting_board.dm | 2 +- code/modules/hydroponics/grown/citrus.dm | 2 +- code/modules/hydroponics/grown/misc.dm | 2 +- code/modules/hydroponics/grown/nettle.dm | 1 + code/modules/hydroponics/hydroitemdefines.dm | 2 +- code/modules/jobs/job_types/brig_physician.dm | 2 +- .../jobs/job_types/chief_medical_officer.dm | 2 +- code/modules/jobs/job_types/medical_doctor.dm | 6 +- code/modules/jobs/job_types/paramedic.dm | 2 +- .../modules/mining/equipment/angle_grinder.dm | 6 +- .../mining/equipment/kinetic_crusher.dm | 4 +- code/modules/mining/equipment/mining_tools.dm | 6 +- code/modules/mining/equipment/trophies.dm | 4 +- code/modules/mob/inventory.dm | 46 +- .../modules/mob/living/basic/basic_defense.dm | 2 +- .../mob/living/basic/space_fauna/bear/bear.dm | 6 +- code/modules/mob/living/blood.dm | 196 ++++--- code/modules/mob/living/bloodcrawl.dm | 4 +- code/modules/mob/living/brain/brain_item.dm | 5 +- .../carbon/alien/humanoid/humanoid_defense.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 107 +++- .../mob/living/carbon/carbon_defense.dm | 182 +++++- .../mob/living/carbon/carbon_defines.dm | 12 +- .../modules/mob/living/carbon/damage_procs.dm | 95 +-- code/modules/mob/living/carbon/examine.dm | 95 ++- .../mob/living/carbon/human/damage_procs.dm | 4 +- .../mob/living/carbon/human/examine.dm | 130 +++-- code/modules/mob/living/carbon/human/human.dm | 43 +- .../mob/living/carbon/human/human_defense.dm | 70 ++- .../mob/living/carbon/human/human_defines.dm | 4 +- code/modules/mob/living/carbon/human/life.dm | 30 +- .../mob/living/carbon/human/species.dm | 34 +- .../living/carbon/human/species_types/IPC.dm | 2 +- .../carbon/human/species_types/abductors.dm | 2 +- .../carbon/human/species_types/android.dm | 2 +- .../carbon/human/species_types/ethereal.dm | 2 +- .../carbon/human/species_types/flypeople.dm | 2 +- .../carbon/human/species_types/humans.dm | 2 +- .../carbon/human/species_types/jellypeople.dm | 2 +- .../carbon/human/species_types/kepori.dm | 2 +- .../human/species_types/lizardpeople.dm | 2 +- .../carbon/human/species_types/mothmen.dm | 2 +- .../carbon/human/species_types/plasmamen.dm | 41 +- .../human/species_types/shadowpeople.dm | 2 +- .../carbon/human/species_types/skeletons.dm | 4 +- .../carbon/human/species_types/snail.dm | 2 +- .../living/carbon/human/species_types/vox.dm | 2 +- code/modules/mob/living/carbon/life.dm | 6 + .../modules/mob/living/carbon/status_procs.dm | 12 - .../modules/mob/living/carbon/update_icons.dm | 21 + code/modules/mob/living/damage_procs.dm | 13 +- code/modules/mob/living/life.dm | 5 + code/modules/mob/living/living.dm | 76 ++- code/modules/mob/living/living_defense.dm | 30 +- .../mob/living/silicon/damage_procs.dm | 2 +- .../mob/living/silicon/robot/robot_modules.dm | 6 +- .../living/simple_animal/animal_defense.dm | 2 +- .../mob/living/simple_animal/bot/medbot.dm | 2 +- .../mob/living/simple_animal/hostile/carp.dm | 1 + .../simple_animal/hostile/giant_spider.dm | 1 + .../living/simple_animal/hostile/hostile.dm | 2 +- .../simple_animal/hostile/human/syndicate.dm | 3 + .../hostile/mining_mobs/antlion.dm | 1 + .../hostile/mining_mobs/brimdemon.dm | 1 + .../simple_animal/hostile/mining_mobs/wolf.dm | 1 + .../mob/living/simple_animal/hostile/tree.dm | 1 + .../mob/living/simple_animal/simple_animal.dm | 9 + code/modules/movespeed/modifiers/misc.dm | 6 + code/modules/paperwork/pen.dm | 4 +- code/modules/projectiles/gun.dm | 9 +- .../projectiles/guns/energy/special.dm | 2 +- code/modules/projectiles/projectile.dm | 47 +- code/modules/projectiles/projectile/beams.dm | 2 + .../modules/projectiles/projectile/bullets.dm | 10 + .../projectiles/projectile/bullets/pistol.dm | 1 + .../projectile/bullets/revolver.dm | 5 + .../projectiles/projectile/bullets/rifle.dm | 1 + .../projectiles/projectile/bullets/smg.dm | 3 + .../reagents/cat2_medicine_reagents.dm | 3 + .../chemistry/reagents/medicine_reagents.dm | 101 +++- .../chemistry/reagents/other_reagents.dm | 60 +- .../chemistry/reagents/toxin_reagents.dm | 16 +- .../reagents/chemistry/recipes/others.dm | 11 + .../reagents/reagent_containers/hypospray.dm | 18 +- .../reagents/reagent_containers/syringes.dm | 1 + .../research/designs/autolathe_designs.dm | 18 + code/modules/research/techweb/all_nodes.dm | 2 +- .../ruins/objects_and_mobs/ash_walker_den.dm | 2 +- code/modules/spells/spell_types/shapeshift.dm | 4 +- .../bioware/ligament_reinforcement.dm | 4 +- .../modules/surgery/bodyparts/bodypart_aid.dm | 237 ++++++++ code/modules/surgery/bodyparts/bodyparts.dm | 550 +++++++++++++----- .../surgery/bodyparts/dismemberment.dm | 132 +++-- code/modules/surgery/bodyparts/head.dm | 5 +- code/modules/surgery/bodyparts/helpers.dm | 25 - code/modules/surgery/bodyparts/parts.dm | 5 +- code/modules/surgery/bone_repair.dm | 2 +- code/modules/surgery/coronary_bypass.dm | 6 +- code/modules/surgery/debride.dm | 138 +++++ .../surgery/experimental_dissection.dm | 4 +- code/modules/surgery/hairline_fracture.dm | 53 ++ code/modules/surgery/healing.dm | 168 +++++- code/modules/surgery/mechanical.dm | 87 --- code/modules/surgery/organic_steps.dm | 8 +- code/modules/surgery/organs/vocal_cords.dm | 6 - code/modules/surgery/repair_puncture.dm | 108 ++++ code/modules/surgery/surgery.dm | 7 + code/modules/surgery/surgery_helpers.dm | 8 +- code/modules/surgery/tools.dm | 24 +- code/modules/unit_tests/_unit_tests.dm | 1 + code/modules/unit_tests/medical_wounds.dm | 87 +++ code/modules/vending/_vending.dm | 41 +- code/modules/vending/medical_wall.dm | 64 +- code/modules/vending/robotics.dm | 1 + code/modules/zombie/items.dm | 3 + icons/mob/bandage_overlays.dmi | Bin 0 -> 2368 bytes icons/obj/surgery.dmi | Bin 40176 -> 45134 bytes interface/stylesheet.dm | 6 + shiptest.dme | 16 +- sound/effects/butcher.ogg | Bin 0 -> 9666 bytes sound/effects/wounds/blood1.ogg | Bin 0 -> 12388 bytes sound/effects/wounds/blood2.ogg | Bin 0 -> 20136 bytes sound/effects/wounds/blood3.ogg | Bin 0 -> 13657 bytes sound/effects/wounds/crack1.ogg | Bin 0 -> 7950 bytes sound/effects/wounds/crack2.ogg | Bin 0 -> 15346 bytes sound/effects/wounds/crackandbleed.ogg | Bin 0 -> 15662 bytes sound/effects/wounds/dismember.ogg | Bin 0 -> 15382 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 0 -> 52702 bytes sound/effects/wounds/sizzle2.ogg | Bin 0 -> 28436 bytes sound/weapons/guillotine.ogg | Bin 0 -> 27777 bytes 258 files changed, 6572 insertions(+), 2080 deletions(-) create mode 100644 code/__DEFINES/wounds.dm delete mode 100644 code/datums/components/bandage.dm create mode 100644 code/datums/elements/kneecapping.dm create mode 100644 code/datums/status_effects/wound_effects.dm create mode 100644 code/datums/wounds/_wounds.dm create mode 100644 code/datums/wounds/bones.dm create mode 100644 code/datums/wounds/burns.dm create mode 100644 code/datums/wounds/dismember.dm create mode 100644 code/datums/wounds/muscle.dm create mode 100644 code/datums/wounds/pierce.dm create mode 100644 code/datums/wounds/slash.dm create mode 100644 code/modules/surgery/bodyparts/bodypart_aid.dm create mode 100644 code/modules/surgery/debride.dm create mode 100644 code/modules/surgery/hairline_fracture.dm create mode 100644 code/modules/surgery/repair_puncture.dm create mode 100644 code/modules/unit_tests/medical_wounds.dm create mode 100644 icons/mob/bandage_overlays.dmi create mode 100644 sound/effects/butcher.ogg create mode 100644 sound/effects/wounds/blood1.ogg create mode 100644 sound/effects/wounds/blood2.ogg create mode 100644 sound/effects/wounds/blood3.ogg create mode 100644 sound/effects/wounds/crack1.ogg create mode 100644 sound/effects/wounds/crack2.ogg create mode 100644 sound/effects/wounds/crackandbleed.ogg create mode 100644 sound/effects/wounds/dismember.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 create mode 100644 sound/effects/wounds/sizzle1.ogg create mode 100644 sound/effects/wounds/sizzle2.ogg create mode 100644 sound/weapons/guillotine.ogg diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index da2563e25464..3851b86d6f28 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -99,7 +99,8 @@ #define TR_KEEPORGANS (1<<8) #define TR_KEEPSTUNS (1<<9) #define TR_KEEPREAGENTS (1<<10) -#define TR_KEEPAI (1<<11) +#define TR_KEEPSTAMINADAMAGE (1<<11) +#define TR_KEEPAI (1<<12) //species traits for mutantraces #define MUTCOLORS 1 @@ -127,10 +128,16 @@ #define REVIVESBYHEALING 21 // Will revive on heal when healing and total HP > 0. #define NOHUSK 22 // Can't be husked. #define NOMOUTH 23 -#define NOSOCKS 24 // You cannot wear sock -#define NO_BONES 25 //! You don't have any bones for breaking -#define MUTCOLORS_SECONDARY 26 //! A second mutant colour for other things -#define SKINCOLORS 27 //Human skintones +#define NOSOCKS 24 +///A second mutant colour for other things +#define MUTCOLORS_SECONDARY 25 +///Human skintones +#define SKINCOLORS 26 +///Used for determining which wounds are applicable to this species. +///if we have flesh (can suffer slash/piercing/burn wounds, requires they don't have NOBLOOD) +#define HAS_FLESH 27 +///if we have bones (can suffer bone wounds) +#define HAS_BONE 28 //organ slots #define ORGAN_SLOT_BRAIN "brain" @@ -161,17 +168,18 @@ //organ defines #define STANDARD_ORGAN_THRESHOLD 100 -#define STANDARD_ORGAN_HEALING 0.001 +#define STANDARD_ORGAN_HEALING 0.003 //Organs fail in around ~30 minutes -#define STANDARD_ORGAN_DECAY 0.00111 -//Vital organs (brain, heart) fail in around ~45 minutes -#define STANDARD_VITAL_ORGAN_DECAY 0.00074 +#define STANDARD_ORGAN_DECAY 0.00050 +//Vital organs (brain, heart) fail in quite a long time +#define STANDARD_VITAL_ORGAN_DECAY 0.00035 //used for the can_chromosome var on mutations #define CHROMOSOME_NEVER 0 #define CHROMOSOME_NONE 1 #define CHROMOSOME_USED 2 +//used for mob's genetic gender (mainly just for pronouns, members of sexed species with plural gender refer to their body_type for the actual sprites, which is not genetic) #define G_MALE 1 #define G_FEMALE 2 #define G_PLURAL 3 diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm index 01c40f4e6468..76619e7baf42 100644 --- a/code/__DEFINES/admin.dm +++ b/code/__DEFINES/admin.dm @@ -75,7 +75,6 @@ /// Only pass it a string key, the verb being used. #define BLACKBOX_LOG_ADMIN_VERB(the_verb) SSblackbox.record_feedback("tally", "admin_verb", 1, the_verb) -#define ADMIN_PUNISHMENT_BREAK_BONES "Break all bones" #define ADMIN_PUNISHMENT_LIGHTNING "Lightning bolt" #define ADMIN_PUNISHMENT_BRAINDAMAGE "Brain damage" #define ADMIN_PUNISHMENT_GIB "Gib" @@ -85,8 +84,11 @@ #define ADMIN_PUNISHMENT_SUPPLYPOD "Supply Pod" #define ADMIN_PUNISHMENT_MAZING "Puzzle" #define ADMIN_PUNISHMENT_IMMERSE "Fully Immerse" -#define ADMIN_PUNISHMENT_NYA "Neko" -#define ADMIN_PUNISHMENT_PIE "Cream Pie" +#define ADMIN_PUNISHMENT_NUGGET "Nugget" +#define ADMIN_PUNISHMENT_CRACK ":B:oneless" +#define ADMIN_PUNISHMENT_BLEED ":B:loodless" +#define ADMIN_PUNISHMENT_PERFORATE ":B:erforate" +#define ADMIN_PUNISHMENT_SHOES "Knot Shoes" #define AHELP_ACTIVE 1 #define AHELP_CLOSED 2 diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 0e5d9588f6a8..d98e2ea80a56 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -148,21 +148,33 @@ #define SHOVE_SLOWDOWN_STRENGTH 0.85 //multiplier //Shove disarming item list GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(/obj/item/gun))) + //Combat object defines + //Embedded objects -#define EMBEDDED_PAIN_CHANCE 15 //Chance for embedded objects to cause pain (damage user) -#define EMBEDDED_ITEM_FALLOUT 5 //Chance for embedded object to fall out (causing pain but removing the object) -#define EMBED_CHANCE 45 //Chance for an object to embed into somebody when thrown (if it's sharp) -#define EMBEDDED_PAIN_MULTIPLIER 2 //Coefficient of multiplication for the damage the item does while embedded (this*item.w_class) -#define EMBEDDED_FALL_PAIN_MULTIPLIER 5 //Coefficient of multiplication for the damage the item does when it falls out (this*item.w_class) -#define EMBEDDED_IMPACT_PAIN_MULTIPLIER 4 //Coefficient of multiplication for the damage the item does when it first embeds (this*item.w_class) -#define EMBED_THROWSPEED_THRESHOLD 4 //The minimum value of an item's throw_speed for it to embed (Unless it has embedded_ignore_throwspeed_threshold set to 1) -#define EMBEDDED_UNSAFE_REMOVAL_PAIN_MULTIPLIER 8 //Coefficient of multiplication for the damage the item does when removed without a surgery (this*item.w_class) -#define EMBEDDED_UNSAFE_REMOVAL_TIME 30 //A Time in ticks, total removal time = (this*item.w_class) -#define EMBEDDED_JOSTLE_CHANCE 5 //Chance for embedded objects to cause pain every time they move (jostle) -#define EMBEDDED_JOSTLE_PAIN_MULTIPLIER 1 //Coefficient of multiplication for the damage the item does while -#define EMBEDDED_PAIN_STAM_PCT 0.0 //This percentage of all pain will be dealt as stam damage rather than brute (0-1) -#define EMBED_CHANCE_TURF_MOD -15 //You are this many percentage points less likely to embed into a turf (good for things glass shards and spears vs walls) + +///Chance for embedded objects to cause pain (damage user) +#define EMBEDDED_PAIN_CHANCE 15 +///Chance for embedded object to fall out (causing pain but removing the object) +#define EMBEDDED_ITEM_FALLOUT 5 +///Chance for an object to embed into somebody when thrown +#define EMBED_CHANCE 45 +///Coefficient of multiplication for the damage the item does while embedded (this*item.w_class) +#define EMBEDDED_PAIN_MULTIPLIER 2 +///Coefficient of multiplication for the damage the item does when it first embeds (this*item.w_class) +#define EMBEDDED_IMPACT_PAIN_MULTIPLIER 4 +///The minimum value of an item's throw_speed for it to embed (Unless it has embedded_ignore_throwspeed_threshold set to 1) +#define EMBED_THROWSPEED_THRESHOLD 4 +///Coefficient of multiplication for the damage the item does when it falls out or is removed without a surgery (this*item.w_class) +#define EMBEDDED_UNSAFE_REMOVAL_PAIN_MULTIPLIER 6 +///A Time in ticks, total removal time = (this*item.w_class) +#define EMBEDDED_UNSAFE_REMOVAL_TIME 30 +///Chance for embedded objects to cause pain every time they move (jostle) +#define EMBEDDED_JOSTLE_CHANCE 5 +///Coefficient of multiplication for the damage the item does while +#define EMBEDDED_JOSTLE_PAIN_MULTIPLIER 1 +///This percentage of all pain will be dealt as stam damage rather than brute (0-1) +#define EMBEDDED_PAIN_STAM_PCT 0.0 #define EMBED_HARMLESS list("pain_mult" = 0, "jostle_pain_mult" = 0, "ignore_throwspeed_threshold" = TRUE) #define EMBED_HARMLESS_SUPERIOR list("pain_mult" = 0, "jostle_pain_mult" = 0, "ignore_throwspeed_threshold" = TRUE, "embed_chance" = 100, "fall_chance" = 0.1) @@ -170,9 +182,9 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(/obj/item/gun))) #define EMBED_POINTY_SUPERIOR list("embed_chance" = 100, "ignore_throwspeed_threshold" = TRUE) //Object/Item sharpness -#define IS_BLUNT 0 -#define IS_SHARP 1 -#define IS_SHARP_ACCURATE 2 +#define SHARP_NONE 0 +#define SHARP_EDGED 1 +#define SHARP_POINTY 2 #define EXPLODE_NONE 0 //Don't even ask me why we need this. #define EXPLODE_DEVASTATE 1 diff --git a/code/__DEFINES/dcs/signals/signals.dm b/code/__DEFINES/dcs/signals/signals.dm index 5e32afdb8f8c..30c356ef8c92 100644 --- a/code/__DEFINES/dcs/signals/signals.dm +++ b/code/__DEFINES/dcs/signals/signals.dm @@ -459,7 +459,7 @@ ///from base of /obj/item/attack(): (mob/living, mob/living, params) #define COMSIG_ITEM_POST_ATTACK "item_post_attack" // called only if the attack was executed ///from base of /mob/living/proc/apply_damage(): (damage, damagetype, def_zone) -#define COMSIG_MOB_APPLY_DAMGE "mob_apply_damage" +#define COMSIG_MOB_APPLY_DAMAGE "mob_apply_damage" ///from base of obj/item/afterattack(): (atom/target, mob/user, proximity_flag, click_parameters) #define COMSIG_MOB_ITEM_AFTERATTACK "mob_item_afterattack" ///from base of obj/item/attack_qdeleted(): (atom/target, mob/user, proxiumity_flag, click_parameters) @@ -501,6 +501,8 @@ ///from base of mob/swap_hand(): (obj/item/currently_held_item) #define COMSIG_MOB_SWAPPING_HANDS "mob_swapping_hands" #define COMPONENT_BLOCK_SWAP (1<<0) +///from /obj/structure/door/crush(): (mob/living/crushed, /obj/machinery/door/crushing_door) +#define COMSIG_LIVING_DOORCRUSHED "living_doorcrush" /// from base of mob/swap_hand(): () /// Performed after the hands are swapped. #define COMSIG_MOB_SWAP_HANDS "mob_swap_hands" @@ -528,9 +530,6 @@ #define COMSIG_LIVING_REVIVE "living_revive" ///from base of /mob/living/regenerate_limbs(): (noheal, excluded_limbs) #define COMSIG_LIVING_REGENERATE_LIMBS "living_regen_limbs" -///from base of /obj/item/bodypart/proc/attach_limb(): (new_limb, special) allows you to fail limb attachment -#define COMSIG_LIVING_ATTACH_LIMB "living_attach_limb" - #define COMPONENT_NO_ATTACH 1 ///from base of /obj/item/bodypart/proc/drop_limb(): (special) #define COMSIG_LIVING_DROP_LIMB "living_drop_limb" ///from base of mob/living/set_buckled(): (new_buckled) @@ -617,6 +616,18 @@ ///called when removing a given item from a mob, from mob/living/carbon/remove_embedded_object(mob/living/carbon/target, /obj/item) #define COMSIG_CARBON_EMBED_REMOVAL "item_embed_remove_safe" +// /mob/living/carbon physiology signals +#define COMSIG_CARBON_GAIN_WOUND "carbon_gain_wound" //from /datum/wound/proc/apply_wound() (/mob/living/carbon/C, /datum/wound/W, /obj/item/bodypart/L) +#define COMSIG_CARBON_LOSE_WOUND "carbon_lose_wound" //from /datum/wound/proc/remove_wound() (/mob/living/carbon/C, /datum/wound/W, /obj/item/bodypart/L) +///from base of /obj/item/bodypart/proc/attach_limb(): (new_limb, special) allows you to fail limb attachment +#define COMSIG_CARBON_ATTACH_LIMB "carbon_attach_limb" + #define COMPONENT_NO_ATTACH (1<<0) +#define COMSIG_CARBON_REMOVE_LIMB "carbon_remove_limb" //from base of /obj/item/bodypart/proc/drop_limb(special, dismembered) +#define COMSIG_BODYPART_GAUZED "bodypart_gauzed" // from /datum/bodypart_aid/gauze/New() //When a gauze is applied +#define COMSIG_BODYPART_GAUZE_DESTROYED "bodypart_degauzed" // from /datum/bodypart_aid/gauze/Destroy() //When a gauze is removed +#define COMSIG_BODYPART_SPLINTED "bodypart_splinted" // from /datum/bodypart_aid/splint/New() //When a splint is applied +#define COMSIG_BODYPART_SPLINT_DESTROYED "bodypart_desplinted" // from /datum/bodypart_aid/gauze/Destroy() //When a splint is removed + /// Admin helps /// From /datum/admin_help/RemoveActive(). /// Fired when an adminhelp is made inactive either due to closing or resolving. @@ -641,16 +652,24 @@ // /obj/item/gun signals #define COMSIG_MOB_FIRED_GUN "mob_fired_gun" //called in /obj/item/gun/process_fire (user, target, params, zone_override) -// /obj/projectile signals (sent to the firer) -#define COMSIG_PROJECTILE_SELF_ON_HIT "projectile_self_on_hit" // from base of /obj/projectile/proc/on_hit(): (atom/movable/firer, atom/target, Angle) -#define COMSIG_PROJECTILE_ON_HIT "projectile_on_hit" // from base of /obj/projectile/proc/on_hit(): (atom/movable/firer, atom/target, Angle) -#define COMSIG_PROJECTILE_BEFORE_FIRE "projectile_before_fire" // from base of /obj/projectile/proc/fire(): (obj/projectile, atom/original_target) -#define COMSIG_PROJECTILE_FIRE "projectile_fire" // from the base of /obj/projectile/proc/fire(): () -#define COMSIG_PROJECTILE_PREHIT "com_proj_prehit" // sent to targets during the process_hit proc of projectiles -#define COMSIG_PROJECTILE_RANGE_OUT "projectile_range_out" // sent to targets during the process_hit proc of projectiles -#define COMSIG_EMBED_TRY_FORCE "item_try_embed" // sent when trying to force an embed (mainly for projectiles, only used in the embed element) +///from base of /obj/projectile/proc/on_hit(), like COMSIG_PROJECTILE_ON_HIT but on the projectile itself and with the hit limb (if any): (atom/movable/firer, atom/target, Angle, hit_limb) +#define COMSIG_PROJECTILE_SELF_ON_HIT "projectile_self_on_hit" +///from base of /obj/projectile/proc/on_hit(): (atom/movable/firer, atom/target, Angle) +#define COMSIG_PROJECTILE_ON_HIT "projectile_on_hit" +///from base of /obj/projectile/proc/fire(): (obj/projectile, atom/original_target) +#define COMSIG_PROJECTILE_BEFORE_FIRE "projectile_before_fire" +///from the base of /obj/projectile/proc/fire(): () +#define COMSIG_PROJECTILE_FIRE "projectile_fire" +///sent to targets during the process_hit proc of projectiles +#define COMSIG_PROJECTILE_PREHIT "com_proj_prehit" +///sent to targets during the process_hit proc of projectiles +#define COMSIG_PROJECTILE_RANGE_OUT "projectile_range_out" +///from [/obj/item/proc/tryEmbed] sent when trying to force an embed (mainly for projectiles and eating glass) +#define COMSIG_EMBED_TRY_FORCE "item_try_embed" #define COMPONENT_EMBED_SUCCESS (1<<1) -#define COMSIG_PELLET_CLOUD_INIT "pellet_cloud_init" // sent to targets during the process_hit proc of projectiles + +///sent to targets during the process_hit proc of projectiles +#define COMSIG_PELLET_CLOUD_INIT "pellet_cloud_init" // /obj/mecha signals #define COMSIG_MECHA_ACTION_ACTIVATE "mecha_action_activate" //sent from mecha action buttons to the mecha they're linked to diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index fa3ec4278af8..3d7ca243bdbd 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -189,14 +189,6 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list( #define iscash(A) (istype(A, /obj/item/coin) || istype(A, /obj/item/spacecash) || istype(A, /obj/item/holochip)) -GLOBAL_LIST_INIT(pointed_types, typecacheof(list( - /obj/item/pen, - /obj/item/screwdriver, - /obj/item/reagent_containers/syringe, - /obj/item/kitchen/fork))) - -#define is_pointed(W) (is_type_in_typecache(W, GLOB.pointed_types)) - #define isbodypart(A) (istype(A, /obj/item/bodypart)) #define isprojectile(A) (istype(A, /obj/projectile)) diff --git a/code/__DEFINES/maths.dm b/code/__DEFINES/maths.dm index 98488fed806f..7f42f644d1e4 100644 --- a/code/__DEFINES/maths.dm +++ b/code/__DEFINES/maths.dm @@ -238,6 +238,14 @@ #define TILES_TO_PIXELS(tiles) (tiles * PIXELS) // ) +/// Converts a probability/second chance to probability/delta_time chance +/// For example, if you want an event to happen with a 10% per second chance, but your proc only runs every 5 seconds, do `if(prob(100*DT_PROB_RATE(0.1, 5)))` +#define DT_PROB_RATE(prob_per_second, delta_time) (1 - (1 - (prob_per_second)) ** (delta_time)) + +/// Like DT_PROB_RATE but easier to use, simply put `if(DT_PROB(10, 5))` +#define DT_PROB(prob_per_second_percent, delta_time) (prob(100*DT_PROB_RATE((prob_per_second_percent)/100, (delta_time)))) +// ) + /* This proc makes the input taper off above cap. But there's no absolute cutoff. Chunks of the input value above cap, are reduced more and more with each successive one and added to the output diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 384b7fcc46c7..bcf0ea5772a7 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -9,25 +9,26 @@ #define FRONT_MUTATIONS_LAYER 24 //mutations that should appear above body, body_adj and bodyparts layer (e.g. laser eyes) #define DAMAGE_LAYER 23 //damage indicators (cuts and burns) #define UNIFORM_LAYER 22 -#define ID_LAYER 21 //lmao at the idiot who put both ids and hands on the same layer -#define BODYPARTS_HIGH_LAYER 20 -#define GLOVES_LAYER 19 -#define SHOES_LAYER 18 -#define EARS_LAYER 17 -#define SPLINT_LAYER 16 -#define SUIT_LAYER 15 -#define GLASSES_LAYER 14 -#define BELT_LAYER 13 //Possible make this an overlay of somethign required to wear a belt? -#define SUIT_STORE_LAYER 12 -#define NECK_LAYER 11 -#define BACK_LAYER 10 -#define HAIR_LAYER 9 //TODO: make part of head layer? -#define FACEMASK_LAYER 8 -#define HEAD_LAYER 7 -#define HANDCUFF_LAYER 6 -#define LEGCUFF_LAYER 5 -#define HANDS_LAYER 4 -#define BODY_FRONT_LAYER 3 +#define BANDAGE_LAYER 21 //For bandages and splints +#define ID_LAYER 20 //lmao at the idiot who put both ids and hands on the same layer +#define BODYPARTS_HIGH_LAYER 19 +#define GLOVES_LAYER 18 +#define SHOES_LAYER 17 +#define EARS_LAYER 16 +#define SPLINT_LAYER 15 +#define SUIT_LAYER 14 +#define GLASSES_LAYER 13 +#define BELT_LAYER 12 //Possible make this an overlay of somethign required to wear a belt? +#define SUIT_STORE_LAYER 11 +#define NECK_LAYER 10 +#define BACK_LAYER 9 +#define HAIR_LAYER 8 //TODO: make part of head layer? +#define FACEMASK_LAYER 7 +#define HEAD_LAYER 6 +#define HANDCUFF_LAYER 5 +#define LEGCUFF_LAYER 4 +#define HANDS_LAYER 3 +#define BODY_FRONT_LAYER 2 #define FIRE_LAYER 1 //If you're on fire #define TOTAL_LAYERS 31 //KEEP THIS UP-TO-DATE OR SHIT WILL BREAK ;_; diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 999455ee48e9..926fa03414c3 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -28,13 +28,6 @@ #define BLOOD_VOLUME_BAD 224 #define BLOOD_VOLUME_SURVIVE 122 -// Bloodloss -#define BLOOD_LOSS_MAXIMUM 30 -#define BLOOD_LOSS_DAMAGE_MAXIMUM 2 -#define BLOOD_LOSS_DAMAGE_BASE 0.013 -#define BLOOD_CAUTERIZATION_RATIO 10 -#define BLOOD_CAUTERIZATION_DAMAGE_RATIO 300 - //Sizes of mobs, used by mob/living/var/mob_size #define MOB_SIZE_TINY 0 #define MOB_SIZE_SMALL 1 @@ -194,8 +187,9 @@ #define TRAUMA_RESILIENCE_BASIC 1 //Curable with chems #define TRAUMA_RESILIENCE_SURGERY 2 //Curable with brain surgery #define TRAUMA_RESILIENCE_LOBOTOMY 3 //Curable with lobotomy -#define TRAUMA_RESILIENCE_MAGIC 4 //Curable only with magic -#define TRAUMA_RESILIENCE_ABSOLUTE 5 //This is here to stay +#define TRAUMA_RESILIENCE_WOUND 4 //Curable by healing the head wound +#define TRAUMA_RESILIENCE_MAGIC 5 //Curable only with magic +#define TRAUMA_RESILIENCE_ABSOLUTE 6 //This is here to stay //Limit of traumas for each resilience tier #define TRAUMA_LIMIT_BASIC 3 diff --git a/code/__DEFINES/obj_flags.dm b/code/__DEFINES/obj_flags.dm index b41e147ee6a4..805cf1c2eb71 100644 --- a/code/__DEFINES/obj_flags.dm +++ b/code/__DEFINES/obj_flags.dm @@ -36,6 +36,7 @@ #define SURGICAL_TOOL (1<<12) //Tool commonly used for surgery: won't attack targets in an active surgical operation on help intent (in case of mistakes) #define EYE_STAB (1<<13) /// Item can be used to eyestab #define NO_PIXEL_RANDOM_DROP (1<<14) //if dropped, it wont have a randomized pixel_x/pixel_y +#define HAND_ITEM (1<<15) /// If an item is just your hand (circled hand, slapper) and shouldn't block things like riding // Flags for the clothing_flags var on /obj/item/clothing @@ -65,6 +66,11 @@ #define ORGAN_EDIBLE (1<<5) //is a snack? :D #define ORGAN_SYNTHETIC_EMP (1<<6) //Synthetic organ affected by an EMP. Deteriorates over time. +/// Integrity defines for clothing (not flags but close enough) +#define CLOTHING_PRISTINE 0 // We have no damage on the clothing +#define CLOTHING_DAMAGED 1 // There's some damage on the clothing but it still has at least one functioning bodypart and can be equipped +#define CLOTHING_SHREDDED 2 // The clothing is useless and cannot be equipped unless repaired first + /// Flags for the pod_flags var on /obj/structure/closet/supplypod #define FIRST_SOUNDS (1<<0) // If it shouldn't play sounds the first time it lands, used for reverse mode diff --git a/code/__DEFINES/skills.dm b/code/__DEFINES/skills.dm index 2e00e0cd66be..5cbd70dc5a11 100644 --- a/code/__DEFINES/skills.dm +++ b/code/__DEFINES/skills.dm @@ -11,8 +11,17 @@ #define SKILL_LVL 1 #define SKILL_EXP 2 +// Level experience requirements +#define SKILL_EXP_NONE 0 +#define SKILL_EXP_NOVICE 100 +#define SKILL_EXP_APPRENTICE 250 +#define SKILL_EXP_JOURNEYMAN 500 +#define SKILL_EXP_EXPERT 900 +#define SKILL_EXP_MASTER 1500 +#define SKILL_EXP_LEGENDARY 2500 + //Allows us to get EXP from level, or level from EXP -#define SKILL_EXP_LIST list(0, 100, 250, 500, 900, 1500, 2500) +#define SKILL_EXP_LIST list(SKILL_EXP_NONE, SKILL_EXP_NOVICE, SKILL_EXP_APPRENTICE, SKILL_EXP_JOURNEYMAN, SKILL_EXP_EXPERT, SKILL_EXP_MASTER, SKILL_EXP_LEGENDARY) //Skill modifier types #define SKILL_SPEED_MODIFIER "skill_speed_modifier"//ideally added/subtracted in speed calculations to make you do stuff faster diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm index e0b4e2aed38e..a43955d5da68 100644 --- a/code/__DEFINES/status_effects.dm +++ b/code/__DEFINES/status_effects.dm @@ -34,6 +34,8 @@ #define STATUS_EFFECT_ANTIMAGIC /datum/status_effect/antimagic //grants antimagic (and reapplies if lost) for the duration +#define STATUS_EFFECT_DETERMINED /datum/status_effect/determined //currently in a combat high from being seriously wounded + ///////////// // DEBUFFS // ///////////// @@ -95,6 +97,8 @@ #define STATUS_EFFECT_FAKE_VIRUS /datum/status_effect/fake_virus //gives you fluff messages for cough, sneeze, headache, etc but without an actual virus +#define STATUS_EFFECT_LIMP /datum/status_effect/limp //For when you have a busted leg (or two!) and want additional slowdown when walking on that leg + #define STATUS_EFFECT_METAB_FROZEN /datum/status_effect/metab_frozen // Affected cannot process chems //Incapacitated status effect flags diff --git a/code/__DEFINES/tools.dm b/code/__DEFINES/tools.dm index eb2696c0afbb..e42fbedb6c66 100644 --- a/code/__DEFINES/tools.dm +++ b/code/__DEFINES/tools.dm @@ -13,10 +13,12 @@ #define TOOL_CAUTERY "cautery" #define TOOL_DRILL "drill" #define TOOL_SCALPEL "scalpel" +#define TOOL_BONESET "bonesetter" #define TOOL_SAW "saw" #define TOOL_KNIFE "knife" //luv me kuh-nyfe #define TOOL_DECONSTRUCT "deconstruct" + // If delay between the start and the end of tool operation is less than MIN_TOOL_SOUND_DELAY, // tool sound is only played when op is started. If not, it's played twice. #define MIN_TOOL_SOUND_DELAY 20 diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index cc5b79548d09..79be3f85626a 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -216,6 +216,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_PARALYSIS_R_ARM "para-r-arm" #define TRAIT_PARALYSIS_L_LEG "para-l-leg" #define TRAIT_PARALYSIS_R_LEG "para-r-leg" +#define TRAIT_EASILY_WOUNDED "easy_limb_wound" +#define TRAIT_HARDLY_WOUNDED "hard_limb_wound" +#define TRAIT_NEVER_WOUNDED "never_wounded" #define TRAIT_CANNOT_OPEN_PRESENTS "cannot-open-presents" #define TRAIT_PRESENT_VISION "present-vision" #define TRAIT_DISK_VERIFIER "disk-verifier" @@ -287,6 +290,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai //non-mob traits /// Used for limb-based paralysis, where replacing the limb will fix it. #define TRAIT_PARALYSIS "paralysis" +/// Used for limbs. +#define TRAIT_DISABLED_BY_WOUND "disabled-by-wound" /// Is this atom being actively shocked? Used to prevent repeated shocks. #define TRAIT_BEING_SHOCKED "shocked" /// Granted by prismwine, reflects lasers @@ -457,6 +462,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define PAI_FOLDED "pai-folded" /// Trait applied to brain mobs when they lack external aid for locomotion, such as being inside a mech. #define BRAIN_UNAIDED "brain-unaided" + /// Trait granted by [/obj/item/clothing/head/helmet/space/hardsuit/berserker] #define BERSERK_TRAIT "berserk_trait" /// Currently fishing @@ -469,6 +475,11 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define BEAUTY_ELEMENT_TRAIT "beauty_element" #define MOOD_COMPONENT_TRAIT "mood_component" +#define TRAIT_CANT_RIDE "cant_ride" +#define TRAIT_BLOODY_MESS "bloody_mess" //from heparin, makes open bleeding wounds rapidly spill more blood +#define TRAIT_COAGULATING "coagulating" //from coagulant reagents, this doesn't affect the bleeding itself but does affect the bleed warning messages +#define TRAIT_NOBLEED "nobleed" //This carbon doesn't bleed + // mobility flag traits // IN THE FUTURE, IT WOULD BE NICE TO DO SOMETHING SIMILAR TO https://github.com/tgstation/tgstation/pull/48923/files (ofcourse not nearly the same because I have my.. thoughts on it) // BUT FOR NOW, THESE ARE HOOKED TO DO update_mobility() VIA COMSIG IN living_mobility.dm diff --git a/code/__DEFINES/wounds.dm b/code/__DEFINES/wounds.dm new file mode 100644 index 000000000000..ff4c2346e6f3 --- /dev/null +++ b/code/__DEFINES/wounds.dm @@ -0,0 +1,149 @@ + +// ~wound damage/rolling defines +/// the cornerstone of the wound threshold system, your base wound roll for any attack is rand(1, damage^this), after armor reduces said damage. See [/obj/item/bodypart/proc/check_wounding] +#define WOUND_DAMAGE_EXPONENT 1.4 +/// any damage dealt over this is ignored for damage rolls unless the target has the frail quirk (35^1.4=145, for reference) +#define WOUND_MAX_CONSIDERED_DAMAGE 35 +/// an attack must do this much damage after armor in order to roll for being a wound (so pressure damage/being on fire doesn't proc it) +#define WOUND_MINIMUM_DAMAGE 5 +/// an attack must do this much damage after armor in order to be eliigible to dismember a suitably mushed bodypart +#define DISMEMBER_MINIMUM_DAMAGE 10 +/// If an attack rolls this high with their wound (including mods), we try to outright dismember the limb. Note 250 is high enough that with a perfect max roll of 145 (see max cons'd damage), you'd need +100 in mods to do this +#define WOUND_DISMEMBER_OUTRIGHT_THRESH 250 +/// set wound_bonus on an item or attack to this to disable checking wounding for the attack +#define CANT_WOUND -100 + +// ~wound severities +/// for jokey/meme wounds like stubbed toe, no standard messages/sounds or second winds +#define WOUND_SEVERITY_TRIVIAL 0 +#define WOUND_SEVERITY_MODERATE 1 +#define WOUND_SEVERITY_SEVERE 2 +#define WOUND_SEVERITY_CRITICAL 3 +/// outright dismemberment of limb +#define WOUND_SEVERITY_LOSS 4 + + +// ~wound categories +/// any brute weapon/attack that doesn't have sharpness. rolls for blunt bone wounds +#define WOUND_BLUNT 1 +/// any brute weapon/attack with sharpness = SHARP_EDGED. rolls for slash wounds +#define WOUND_SLASH 2 +/// any brute weapon/attack with sharpness = SHARP_POINTY. rolls for piercing wounds +#define WOUND_PIERCE 3 +/// any concentrated burn attack (lasers really). rolls for burning wounds +#define WOUND_BURN 4 +/// any brute attacks, rolled on a chance +#define WOUND_MUSCLE 5 + + +// ~determination second wind defines +// How much determination reagent to add each time someone gains a new wound in [/datum/wound/proc/second_wind] +#define WOUND_DETERMINATION_MODERATE 1 +#define WOUND_DETERMINATION_SEVERE 2.5 +#define WOUND_DETERMINATION_CRITICAL 5 +#define WOUND_DETERMINATION_LOSS 7.5 +/// the max amount of determination you can have +#define WOUND_DETERMINATION_MAX 10 + +/// While someone has determination in their system, their bleed rate is slightly reduced +#define WOUND_DETERMINATION_BLEED_MOD 0.85 + +// ~wound global lists +// list in order of highest severity to lowest +GLOBAL_LIST_INIT(global_wound_types, list(WOUND_BLUNT = list(/datum/wound/blunt/critical, /datum/wound/blunt/severe, /datum/wound/blunt/moderate), + WOUND_SLASH = list(/datum/wound/slash/critical, /datum/wound/slash/critical, /datum/wound/slash/moderate), + WOUND_PIERCE = list(/datum/wound/pierce/critical, /datum/wound/pierce/severe, /datum/wound/pierce/moderate), + WOUND_BURN = list(/datum/wound/burn/critical, /datum/wound/burn/severe, /datum/wound/burn/moderate), + WOUND_MUSCLE = list(/datum/wound/muscle/severe, /datum/wound/muscle/moderate) + )) + +// every single type of wound that can be rolled naturally, in case you need to pull a random one +GLOBAL_LIST_INIT(global_all_wound_types, list(/datum/wound/blunt/critical, /datum/wound/blunt/severe, /datum/wound/blunt/moderate, + /datum/wound/slash/critical, /datum/wound/slash/critical, /datum/wound/slash/moderate, + /datum/wound/pierce/critical, /datum/wound/pierce/severe, /datum/wound/pierce/moderate, + /datum/wound/burn/critical, /datum/wound/burn/severe, /datum/wound/burn/moderate, + /datum/wound/muscle/severe, /datum/wound/muscle/moderate)) + + +// ~burn wound infection defines +// Thresholds for infection for burn wounds, once infestation hits each threshold, things get steadily worse +/// below this has no ill effects from infection +#define WOUND_INFECTION_MODERATE 4 +/// then below here, you ooze some pus and suffer minor tox damage, but nothing serious +#define WOUND_INFECTION_SEVERE 8 +/// then below here, your limb occasionally locks up from damage and infection and briefly becomes disabled. Things are getting really bad +#define WOUND_INFECTION_CRITICAL 12 +/// below here, your skin is almost entirely falling off and your limb locks up more frequently. You are within a stone's throw of septic paralysis and losing the limb +#define WOUND_INFECTION_SEPTIC 20 +// above WOUND_INFECTION_SEPTIC, your limb is completely putrid and you start rolling to lose the entire limb by way of paralyzation. After 3 failed rolls (~4-5% each probably), the limb is paralyzed + + +// ~random wound balance defines +/// how quickly sanitization removes infestation and decays per tick +#define WOUND_BURN_SANITIZATION_RATE 0.15 +/// how much blood you can lose per tick per slash max. 8 is a LOT of blood for one cut so don't worry about hitting it easily +#define WOUND_SLASH_MAX_BLOODFLOW 8 +/// dead people don't bleed, but they can clot! this is the minimum amount of clotting per tick on dead people, so even critical cuts will slowly clot in dead people +#define WOUND_SLASH_DEAD_CLOT_MIN 0.05 +/// if we suffer a bone wound to the head that creates brain traumas, the timer for the trauma cycle is +/- by this percent (0-100) +#define WOUND_BONE_HEAD_TIME_VARIANCE 20 +/// Chance to roll a muscle wound from brute damage +#define MUSCLE_WOUND_CHANCE 35 + + + +// ~mangling defines +// With the wounds pt. 2 update, general dismemberment now requires 2 things for a limb to be dismemberable (bone only creatures just need the second): +// 1. Skin is mangled: A critical slash or pierce wound on that limb +// 2. Bone is mangled: At least a severe bone wound on that limb +// see [/obj/item/bodypart/proc/get_mangled_state] for more information +#define BODYPART_MANGLED_NONE 0 +#define BODYPART_MANGLED_BONE 1 +#define BODYPART_MANGLED_FLESH 2 +#define BODYPART_MANGLED_BOTH 3 + + +// ~biology defines +// What kind of biology we have, and what wounds we can suffer, mostly relies on the HAS_FLESH and HAS_BONE species traits on human species +/// golems and androids, cannot suffer any wounds +#define BIO_INORGANIC 0 +/// skeletons and plasmemes, can only suffer bone wounds, only needs mangled bone to be able to dismember +#define BIO_JUST_BONE 1 +/// nothing right now, maybe slimepeople in the future, can only suffer slashing, piercing, and burn wounds +#define BIO_JUST_FLESH 2 +/// standard humanoids, can suffer all wounds, needs mangled bone and flesh to dismember. conveniently, what you get when you combine BIO_JUST_BONE and BIO_JUST_FLESH +#define BIO_FLESH_BONE 3 + + +// ~wound flag defines +/// If this wound requires having the HAS_FLESH flag for humanoids +#define FLESH_WOUND (1<<0) +/// If this wound requires having the HAS_BONE flag for humanaoids +#define BONE_WOUND (1<<1) +/// If having this wound counts as mangled flesh for dismemberment +#define MANGLES_FLESH (1<<2) +/// If having this wound counts as mangled bone for dismemberment +#define MANGLES_BONE (1<<3) +/// If this wound marks the limb as being allowed to have gauze applied +#define ACCEPTS_GAUZE (1<<4) +/// If this wound marks the limb as being allowed to have splints applied +#define ACCEPTS_SPLINT (1<<5) + +/// When a wound is staining the gauze with blood +#define GAUZE_STAIN_BLOOD 1 +/// When a wound is staining the gauze with pus +#define GAUZE_STAIN_PUS 2 + +// ~blood_flow rates of change, these are used by [/datum/wound/proc/get_bleed_rate_of_change] from [/mob/living/carbon/proc/bleed_warn] to let the player know if their bleeding is getting better/worse/the same +/// Our wound is clotting and will eventually stop bleeding if this continues +#define BLOOD_FLOW_DECREASING -1 +/// Our wound is bleeding but is holding steady at the same rate. +#define BLOOD_FLOW_STEADY 0 +/// Our wound is bleeding and actively getting worse, like if we're a critical slash or if we're afflicted with heparin +#define BLOOD_FLOW_INCREASING 1 + +/// How often can we annoy the player about their bleeding? This duration is extended if it's not serious bleeding +#define BLEEDING_MESSAGE_BASE_CD 10 SECONDS + +/// Skeletons and other BIO_ONLY_BONE creatures respond much better to bone gel and can have severe and critical bone wounds healed by bone gel alone. The duration it takes to heal is also multiplied by this, lucky them! +#define WOUND_BONE_BIO_BONE_GEL_MULT 0.25 diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm index 4120b41877ff..c2be05dac2dc 100644 --- a/code/__HELPERS/_logging.dm +++ b/code/__HELPERS/_logging.dm @@ -116,6 +116,10 @@ if (CONFIG_GET(flag/log_attack)) WRITE_LOG(GLOB.world_attack_log, "ATTACK: [text]") +/proc/log_wounded(text) + if (CONFIG_GET(flag/log_attack)) + WRITE_LOG(GLOB.world_attack_log, "WOUND: [text]") + /proc/log_econ(text) if (CONFIG_GET(flag/log_econ)) WRITE_LOG(GLOB.world_attack_log, "MONEY: [text]") diff --git a/code/__HELPERS/pronouns.dm b/code/__HELPERS/pronouns.dm index bfe09ba370c8..00de95a2dfbe 100644 --- a/code/__HELPERS/pronouns.dm +++ b/code/__HELPERS/pronouns.dm @@ -262,3 +262,70 @@ if((ITEM_SLOT_ICLOTHING in obscured) && skipface) temp_gender = PLURAL return ..() + +//clothing need special handling due to pairs of items, ie gloves vs a singular glove, shoes, ect. +/obj/item/clothing/p_they(capitalized, temp_gender) + temp_gender ||= gender + . = "it" + if(temp_gender == PLURAL) + . = "they" + if(capitalized) + . = capitalize(.) + +/obj/item/clothing/p_their(capitalized, temp_gender) + if(!temp_gender) + temp_gender = gender + . = "its" + if(temp_gender == PLURAL) + . = "their" + if(capitalized) + . = capitalize(.) + +/obj/item/clothing/p_them(capitalized, temp_gender) + if(!temp_gender) + temp_gender = gender + . = "it" + if(temp_gender == PLURAL) + . = "them" + if(capitalized) + . = capitalize(.) + +/obj/item/clothing/p_have(temp_gender) + if(!temp_gender) + temp_gender = gender + . = "has" + if(temp_gender == PLURAL) + . = "have" + +/obj/item/clothing/p_are(temp_gender) + if(!temp_gender) + temp_gender = gender + . = "is" + if(temp_gender == PLURAL) + . = "are" + +/obj/item/clothing/p_were(temp_gender) + if(!temp_gender) + temp_gender = gender + . = "was" + if(temp_gender == PLURAL) + . = "were" + +/obj/item/clothing/p_do(temp_gender) + if(!temp_gender) + temp_gender = gender + . = "does" + if(temp_gender == PLURAL) + . = "do" + +/obj/item/clothing/p_s(temp_gender) + if(!temp_gender) + temp_gender = gender + if(temp_gender != PLURAL) + . = "s" + +/obj/item/clothing/p_es(temp_gender) + if(!temp_gender) + temp_gender = gender + if(temp_gender != PLURAL) + . = "es" diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index 3770b4e847ad..a2131d9d3c6c 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -275,6 +275,22 @@ GLOBAL_LIST_INIT(modulo_angle_to_dir, list(NORTH,NORTHEAST,EAST,SOUTHEAST,SOUTH, return (a+(b-a)*((2/3)-hue)*6) return a +/// For finding out what body parts a body zone covers, the inverse of the below basically +/proc/zone2body_parts_covered(def_zone) + switch(def_zone) + if(BODY_ZONE_CHEST) + return list(CHEST, GROIN) + if(BODY_ZONE_HEAD) + return list(HEAD) + if(BODY_ZONE_L_ARM) + return list(ARM_LEFT, HAND_LEFT) + if(BODY_ZONE_R_ARM) + return list(ARM_RIGHT, HAND_RIGHT) + if(BODY_ZONE_L_LEG) + return list(LEG_LEFT, FOOT_LEFT) + if(BODY_ZONE_R_LEG) + return list(LEG_RIGHT, FOOT_RIGHT) + //Turns a Body_parts_covered bitfield into a list of organ/limb names. //(I challenge you to find a use for this) /proc/body_parts_covered2organ_names(bpc) diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm index 2d371313d1dd..30fe48136dee 100644 --- a/code/_globalvars/lists/mobs.dm +++ b/code/_globalvars/lists/mobs.dm @@ -28,7 +28,7 @@ GLOBAL_LIST_EMPTY(joined_player_list) //all clients that have joined the game a GLOBAL_LIST_EMPTY(new_player_list) //all /mob/dead/new_player, in theory all should have clients and those that don't are in the process of spawning and get deleted when done. GLOBAL_LIST_EMPTY(pre_setup_antags) //minds that have been picked as antag by the gamemode. removed as antag datums are set. GLOBAL_LIST_EMPTY(silicon_mobs) //all silicon mobs -GLOBAL_LIST_EMPTY(mob_living_list) //all instances of /mob/living and subtypes +GLOBAL_LIST_EMPTY(mob_living_list) //all instances of /mob/living and subtypes GLOBAL_LIST_EMPTY(carbon_list) //all instances of /mob/living/carbon and subtypes, notably does not contain brains or simple animals GLOBAL_LIST_EMPTY(human_list) //all instances of /mob/living/carbon/human and subtypes GLOBAL_LIST_EMPTY(ai_list) diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm index 3a0d7f02132b..4ddc2f6803f5 100644 --- a/code/_globalvars/traits.dm +++ b/code/_globalvars/traits.dm @@ -59,7 +59,8 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_EASYDISMEMBER" = TRAIT_EASYDISMEMBER, "TRAIT_LIMBATTACHMENT" = TRAIT_LIMBATTACHMENT, "TRAIT_NOLIMBDISABLE" = TRAIT_NOLIMBDISABLE, - "TRAIT_EASYLIMBDISABLE" = TRAIT_EASYLIMBDISABLE, + "TRAIT_EASILY_WOUNDED" = TRAIT_EASILY_WOUNDED, + "TRAIT_HARDLY_WOUNDED" = TRAIT_HARDLY_WOUNDED, "TRAIT_TOXINLOVER" = TRAIT_TOXINLOVER, "TRAIT_NOBREATH" = TRAIT_NOBREATH, "TRAIT_ANTIMAGIC" = TRAIT_ANTIMAGIC, @@ -137,6 +138,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_ALLBREAK" = TRAIT_ALLBREAK, "TRAIT_BADTOUCH" = TRAIT_BADTOUCH, "TRAIT_HOLDABLE" = TRAIT_HOLDABLE, + "TRAIT_NOBLEED" = TRAIT_NOBLEED, "TRAIT_SCOOPABLE" = TRAIT_SCOOPABLE, "TRAIT_ANXIOUS" = TRAIT_ANXIOUS, "TRAIT_KISS_OF_DEATH" = TRAIT_KISS_OF_DEATH, diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index a6d1d7bf2ff1..7e2b25cca0a2 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -168,17 +168,23 @@ log_combat(user, src, "attacked", attacking_item) /mob/living/attacked_by(obj/item/attacking_item, mob/living/user) - var/armor_value = run_armor_check(attack_flag = "melee", armour_penetration = attacking_item.armour_penetration) //WS Edit - Simplemobs can have armor + var/armor_value = run_armor_check(attack_flag = "melee", armour_penetration = attacking_item.armour_penetration) + send_item_attack_message(attacking_item, user) + if(!attacking_item.force) return FALSE - apply_damage(attacking_item.force, attacking_item.damtype, blocked = armor_value, sharpness = attacking_item.get_sharpness()) //Bone break modifier = item force + + apply_damage(attacking_item.force, attacking_item.damtype, blocked = armor_value) + if(attacking_item.damtype == BRUTE && prob(33)) attacking_item.add_mob_blood(src) var/turf/location = get_turf(src) add_splatter_floor(location) + if(get_dist(user, src) <= 1) //people with TK won't get smeared with blood user.add_mob_blood(src) + return TRUE //successful attack /mob/living/simple_animal/attacked_by(obj/item/I, mob/living/user) @@ -218,23 +224,27 @@ else return clamp(w_class * 6, 10, 100) // Multiply the item's weight class by 6, then clamp the value between 10 and 100 -/mob/living/proc/send_item_attack_message(obj/item/I, mob/living/user, hit_area) +/mob/living/proc/send_item_attack_message(obj/item/attacking_item, mob/living/user, hit_area, obj/item/bodypart/hit_bodypart) var/message_verb = "attacked" - if(I.attack_verb && I.attack_verb.len) + if(length(attacking_item.attack_verb.len)) message_verb = "[pick(I.attack_verb)]" - else if(!I.force) + else if(!attacking_item.force) return + 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]!" - var/attack_message_local = "You're [message_verb][message_hit_area] with [I]!" + + var/attack_message = "[src] is [message_verb][message_hit_area] with [attacking_item]!" + var/attack_message_local = "You're [message_verb][message_hit_area] with [attacking_item]!" if(user in viewers(src, null)) - attack_message = "[user] [message_verb] [src][message_hit_area] with [I]!" - attack_message_local = "[user] [message_verb] you[message_hit_area] with [I]!" + attack_message = "[user] [message_verb] [src][message_hit_area] with [attacking_item]!" + attack_message_local = "[user] [message_verb] you[message_hit_area] with [attacking_item]!" + if(user == src) - attack_message_local = "You [message_verb] yourself[message_hit_area] with [I]" - visible_message(span_danger("[attack_message]"),\ - span_userdanger("[attack_message_local]"), null, COMBAT_MESSAGE_RANGE) - return 1 + attack_message_local = "You [message_verb] yourself[message_hit_area] with [attacking_item]" + visible_message( + span_danger("[attack_message]"), + span_userdanger("[attack_message_local]"), null, COMBAT_MESSAGE_RANGE,) + return 1 diff --git a/code/datums/armor.dm b/code/datums/armor.dm index e1946773c5bb..d4c49a5502b9 100644 --- a/code/datums/armor.dm +++ b/code/datums/armor.dm @@ -1,9 +1,9 @@ -#define ARMORID "armor-[melee]-[bullet]-[laser]-[energy]-[bomb]-[bio]-[rad]-[fire]-[acid]-[magic]" +#define ARMORID "armor-[melee]-[bullet]-[laser]-[energy]-[bomb]-[bio]-[rad]-[fire]-[acid]-[magic]-[wound]" -/proc/getArmor(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0, magic = 0) +/proc/getArmor(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0, magic = 0, wound = 0) . = locate(ARMORID) if (!.) - . = new /datum/armor(melee, bullet, laser, energy, bomb, bio, rad, fire, acid, magic) + . = new /datum/armor(melee, bullet, laser, energy, bomb, bio, rad, fire, acid, magic, wound) /datum/armor datum_flags = DF_USE_TAG @@ -17,8 +17,9 @@ var/fire var/acid var/magic + var/wound -/datum/armor/New(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0, magic = 0) +/datum/armor/New(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0, magic = 0, wound = 0) src.melee = melee src.bullet = bullet src.laser = laser @@ -29,9 +30,10 @@ src.fire = fire src.acid = acid src.magic = magic + src.wound = wound tag = ARMORID -/datum/armor/proc/modifyRating(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0, magic = 0) +/datum/armor/proc/modifyRating(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0, magic = 0, wound = 0) return getArmor( src.melee+melee, src.bullet+bullet, @@ -42,7 +44,8 @@ src.rad+rad, src.fire+fire, src.acid+acid, - src.magic+magic + src.magic+magic, + src.wound+wound ) /datum/armor/proc/modifyAllRatings(modifier = 0) @@ -56,7 +59,8 @@ rad+modifier, fire+modifier, acid+modifier, - magic+modifier + magic+modifier, + wound+modifier ) /datum/armor/proc/setRating(melee, bullet, laser, energy, bomb, bio, rad, fire, acid, magic) @@ -70,7 +74,8 @@ (isnull(rad) ? src.rad : rad), (isnull(fire) ? src.fire : fire), (isnull(acid) ? src.acid : acid), - (isnull(magic) ? src.magic : magic) + (isnull(magic) ? src.magic : magic), + (isnull(wound) ? src.wound : wound) ) /datum/armor/proc/getRating(rating) @@ -87,7 +92,8 @@ "rad" = rad, "fire" = fire, "acid" = acid, - "magic" = magic + "magic" = magic, + "wound" = wound ) /datum/armor/proc/attachArmor(datum/armor/AA) @@ -101,7 +107,8 @@ rad+AA.rad, fire+AA.fire, acid+AA.acid, - magic+AA.magic + magic+AA.magic, + wound+AA.wound ) /datum/armor/proc/detachArmor(datum/armor/AA) @@ -115,7 +122,8 @@ rad-AA.rad, fire-AA.fire, acid-AA.acid, - magic-AA.magic + magic-AA.magic, + wound-AA.wound ) /datum/armor/vv_edit_var(var_name, var_value) diff --git a/code/datums/brain_damage/magic.dm b/code/datums/brain_damage/magic.dm index 1542685d5254..80d262cfc929 100644 --- a/code/datums/brain_damage/magic.dm +++ b/code/datums/brain_damage/magic.dm @@ -94,7 +94,7 @@ if(get_dist(owner, stalker) <= 1) playsound(owner, 'sound/magic/demon_attack1.ogg', 50) owner.visible_message(span_warning("[owner] is torn apart by invisible claws!"), span_userdanger("Ghostly claws tear your body apart!")) - owner.take_bodypart_damage(rand(20, 45)) + owner.take_bodypart_damage(rand(20, 45), wound_bonus = CANT_WOUND) else if(prob(50)) stalker.forceMove(get_step_towards(stalker, owner)) if(get_dist(owner, stalker) <= 8) diff --git a/code/datums/components/bandage.dm b/code/datums/components/bandage.dm deleted file mode 100644 index 05a31ec4ee32..000000000000 --- a/code/datums/components/bandage.dm +++ /dev/null @@ -1,60 +0,0 @@ -#define TREATMENT_DAMAGE_MOD 2 - -/datum/component/bandage - /// How fast do we stop bleeding? - var/bleed_reduction = 0 - /// How many healing ticks will this bandage apply? Reduced by incoming damage and current bleeding - var/lifespan = 300 - var/bandage_name = "gauze" - /// The person this bandage is applied to - var/mob/living/mummy - -/datum/component/bandage/Initialize(_bleed_reduction, _lifespan, _bandage_name) - if(!istype(parent, /obj/item/bodypart)) - return COMPONENT_INCOMPATIBLE - var/obj/item/bodypart/BP = parent - mummy = BP.owner - if(!mummy) - return COMPONENT_INCOMPATIBLE - if(_bleed_reduction) - bleed_reduction = _bleed_reduction - if(_lifespan) - lifespan = _lifespan - if(_bandage_name) - bandage_name = _bandage_name - RegisterSignal(mummy, COMSIG_MOB_APPLY_DAMGE, PROC_REF(check_damage)) - RegisterSignal(mummy, COMSIG_MOB_LIFE, PROC_REF(bandage_effects)) - RegisterSignal(parent, COMSIG_LIVING_DROP_LIMB, PROC_REF(drop_bandage)) - -/// Checks if damage to the owner is applied to this limb and reduces lifespan (perforated bandages dont work as well) -/datum/component/bandage/proc/check_damage(attacker, damage, damagetype = BRUTE, def_zone = null) - SIGNAL_HANDLER - - if(parent != mummy.get_bodypart(check_zone(def_zone))) - return - lifespan -= damage / 100 * initial(lifespan) * TREATMENT_DAMAGE_MOD //take incoming damage as a % of durability - if(lifespan <= 0) - drop_bandage() - -/// Handles healing effects and passive lifespan usage -/datum/component/bandage/proc/bandage_effects() - SIGNAL_HANDLER - - var/obj/item/bodypart/heal_target = parent - lifespan-- - heal_target.adjust_bleeding(-bleed_reduction) - if(lifespan <= 0 || !heal_target.bleeding) //remove treatment once it's no longer able to treat - drop_bandage(TRUE) - -/// Handles deleting the component when the bandage runs out of lifespan or finishes healing. Special = bandage didn't get torn off -/datum/component/bandage/proc/drop_bandage(special = FALSE) - SIGNAL_HANDLER - - var/obj/item/bodypart/BP = parent - if(special) - to_chat(mummy, span_notice("The [bandage_name] on your [parse_zone(BP.body_zone)] has [BP.bleeding ? "done what it can" : "stopped the bleeding"].")) - else - to_chat(mummy, span_warning("The [bandage_name] on your [parse_zone(BP.body_zone)] is damaged beyond use!")) - qdel(src) - -#undef TREATMENT_DAMAGE_MOD diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm index e7c88d615e75..660398d55b6c 100644 --- a/code/datums/components/butchering.dm +++ b/code/datums/components/butchering.dm @@ -6,7 +6,7 @@ /// Percentage increase to bonus item chance var/bonus_modifier = 0 /// Sound played when butchering - var/butcher_sound = 'sound/weapons/slice.ogg' + var/butcher_sound = 'sound/effects/butcher.ogg' /// Whether or not this component can be used to butcher currently. Used to temporarily disable butchering var/butchering_enabled = TRUE /// Whether or not this component is compatible with blunt tools. @@ -56,18 +56,27 @@ /datum/component/butchering/proc/startNeckSlice(obj/item/source, mob/living/carbon/human/H, mob/living/user) if(DOING_INTERACTION_WITH_TARGET(user, H)) - to_chat(user, "You're already interacting with [H]!") + to_chat(user, span_warning("You're already interacting with [H]!")) return - user.visible_message(span_danger("[user] is slitting [H]'s throat!"), \ - span_danger("You start slicing [H]'s throat!"), \ - span_hear("You hear a cutting noise!"), ignored_mobs = H) - H.show_message(span_userdanger("Your throat is being slit by [user]!"), MSG_VISUAL, \ - "Something is cutting into your neck!", NONE) + user.visible_message( + span_danger("[user] is slitting [H]'s throat!"), + span_danger("You start slicing [H]'s throat!"), + span_hear("You hear a sickening slash!"), ignored_mobs = H, + ) + + H.show_message( + span_userdanger("Your throat is being slit by [user]!"), + MSG_VISUAL, + span_userdanger("Something is cutting into your neck!"), + NONE + ) + log_combat(user, H, "starts slicing the throat of") playsound(H.loc, butcher_sound, 50, TRUE, -1) if(do_after(user, clamp(500 / source.force, 30, 100), H) && H.Adjacent(source)) + if(H.has_status_effect(/datum/status_effect/neck_slice)) user.show_message(span_warning("[H]'s neck has already been already cut, you can't make the bleeding any worse!"), MSG_VISUAL, \ span_warning("Their neck has already been already cut, you can't make the bleeding any worse!")) @@ -82,8 +91,13 @@ H.visible_message(span_danger("[user] slits [H]'s throat!"), \ span_userdanger("[user] slits your throat...")) log_combat(user, H, "finishes slicing the throat of") - H.apply_damage(source.force, BRUTE, BODY_ZONE_HEAD) - throat_in_question.adjust_bleeding(20) + + H.apply_damage(source.force, BRUTE, BODY_ZONE_HEAD, wound_bonus = CANT_WOUND) + + var/obj/item/bodypart/slit_throat = H.get_bodypart(BODY_ZONE_HEAD) + if(slit_throat) + var/datum/wound/slash/critical/screaming_through_a_slit_throat = new + screaming_through_a_slit_throat.apply_wound(slit_throat) H.apply_status_effect(/datum/status_effect/neck_slice) /datum/component/butchering/proc/Butcher(mob/living/butcher, mob/living/meat) diff --git a/code/datums/components/caltrop.dm b/code/datums/components/caltrop.dm index 36398224e697..bcc703c7e4b1 100644 --- a/code/datums/components/caltrop.dm +++ b/code/datums/components/caltrop.dm @@ -100,7 +100,7 @@ ) cooldown = world.time - H.apply_damage(damage, BRUTE, picked_def_zone) + H.apply_damage(damage, BRUTE, picked_def_zone, wound_bonus = CANT_WOUND) if(!haslightstep) H.Paralyze(60) //EndWS edit - caltrops don't paralyze people with light step if(H.pulledby) //WS Edit Begin - Being pulled over caltrops is logged diff --git a/code/datums/components/crafting/recipes/misc.dm b/code/datums/components/crafting/recipes/misc.dm index 728f18603adc..44a2a5103c95 100644 --- a/code/datums/components/crafting/recipes/misc.dm +++ b/code/datums/components/crafting/recipes/misc.dm @@ -141,14 +141,24 @@ result = /obj/item/reagent_containers/glass/filter category = CAT_MISC -/datum/crafting_recipe/splint - name = "Makeshift Splint" +/datum/crafting_recipe/tribalsplint + name = "Tribal Splint" + result = /obj/item/stack/medical/splint/tribal + time = 30 reqs = list( - /obj/item/stack/rods = 2, - /obj/item/stack/sheet/cotton/cloth = 4) - result = /obj/item/stack/medical/splint/ghetto - category = CAT_MISC + /obj/item/stack/sheet/bone = 2, + /obj/item/stack/sheet/sinew = 1 + ) + category = CAT_PRIMAL +/datum/crafting_recipe/improvsplint + name = "Improvised Splint" + result = /obj/item/stack/medical/splint/improvised + time = 30 + reqs = list( + /obj/item/stack/sheet/mineral/wood = 2, + /obj/item/stack/sheet/cotton/cloth = 2, + ) /datum/crafting_recipe/replacement_structure name = "Structure Repair Kit" @@ -156,7 +166,8 @@ reqs = list( /obj/item/stack/rods = 3, /obj/item/stack/sheet/mineral/titanium = 1, - /obj/item/stack/cable_coil = 2) + /obj/item/stack/cable_coil = 2 + ) result = /obj/item/stack/medical/structure category = CAT_MISC diff --git a/code/datums/components/embedded.dm b/code/datums/components/embedded.dm index 357d7dee8be4..47138a8c338d 100644 --- a/code/datums/components/embedded.dm +++ b/code/datums/components/embedded.dm @@ -3,16 +3,11 @@ and when it impacts and meets the requirements to stick into something, it instantiates an embedded component. Once the item falls out, the component is destroyed, while the element survives to embed another day. - There are 2 different things that can be embedded presently: carbons, and closed turfs (see: walls) - - Carbon embedding has all the classical embedding behavior, and tracks more events and signals. The main behaviors and hooks to look for are: -- Every process tick, there is a chance to randomly proc pain, controlled by pain_chance. There may also be a chance for the object to fall out randomly, per fall_chance -- Every time the mob moves, there is a chance to proc jostling pain, controlled by jostle_chance (and only 50% as likely if the mob is walking or crawling) -- Various signals hooking into carbon topic() and the embed removal surgery in order to handle removals. - - Turf embedding is much simpler. All we do here is draw an overlay of the item's inhand on the turf, hide the item, and create an HTML link in the turf's inspect - that allows you to rip the item out. There's nothing dynamic about this, so far less checks. - In addition, there are 2 cases of embedding: embedding, and sticking @@ -24,12 +19,10 @@ Stickables differ from embeds in the following ways: -- Text descriptors use phrasing like "X is stuck to Y" rather than "X is embedded in Y" -- There is no slicing sound on impact - -- All damage checks and bloodloss are skipped for carbons - -- Pointy objects create sparks when embedding into a turf + -- All damage checks and bloodloss are skipped */ - /datum/component/embedded dupe_mode = COMPONENT_DUPE_ALLOWED var/obj/item/bodypart/limb @@ -47,11 +40,9 @@ var/jostle_chance var/jostle_pain_mult var/pain_stam_pct - var/embed_chance_turf_mod ///if both our pain multiplier and jostle pain multiplier are 0, we're harmless and can omit most of the damage related stuff var/harmful - var/mutable_appearance/overlay /datum/component/embedded/Initialize(obj/item/I, datum/thrownthing/throwingdatum, @@ -66,14 +57,14 @@ ignore_throwspeed_threshold = FALSE, jostle_chance = EMBEDDED_JOSTLE_CHANCE, jostle_pain_mult = EMBEDDED_JOSTLE_PAIN_MULTIPLIER, - pain_stam_pct = EMBEDDED_PAIN_STAM_PCT, - embed_chance_turf_mod = EMBED_CHANCE_TURF_MOD) + pain_stam_pct = EMBEDDED_PAIN_STAM_PCT) - if((!iscarbon(parent) && !isclosedturf(parent)) || !isitem(I)) + if(!iscarbon(parent) || !isitem(I)) return COMPONENT_INCOMPATIBLE if(part) limb = part + src.embed_chance = embed_chance src.fall_chance = fall_chance src.pain_chance = pain_chance @@ -85,105 +76,116 @@ src.jostle_chance = jostle_chance src.jostle_pain_mult = jostle_pain_mult src.pain_stam_pct = pain_stam_pct - src.embed_chance_turf_mod = embed_chance_turf_mod - src.weapon = I if(!weapon.isEmbedHarmless()) harmful = TRUE - if(iscarbon(parent)) - initCarbon() - else if(isclosedturf(parent)) - initTurf(throwingdatum) + weapon.embedded(parent) + START_PROCESSING(SSdcs, src) + var/mob/living/carbon/victim = parent -/datum/component/embedded/RegisterWithParent() - if(iscarbon(parent)) - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(jostleCheck)) - RegisterSignal(parent, COMSIG_CARBON_EMBED_RIP, PROC_REF(ripOutCarbon)) - RegisterSignal(parent, COMSIG_CARBON_EMBED_REMOVAL, PROC_REF(safeRemoveCarbon)) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(check_tweeze)) - else if(isclosedturf(parent)) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examineTurf)) - RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(itemMoved)) + limb.embedded_objects |= weapon // on the inside... on the inside... + weapon.forceMove(victim) + RegisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING), .proc/weaponDeleted) + victim.visible_message( + span_danger("[weapon] [harmful ? "embeds" : "sticks"] itself [harmful ? "in" : "to"] [victim]'s [limb.name]!"), + span_userdanger("[weapon] [harmful ? "embeds" : "sticks"] itself [harmful ? "in" : "to"] your [limb.name]!"), + ) -/datum/component/embedded/UnregisterFromParent() - UnregisterSignal(parent, list(COMSIG_MOVABLE_MOVED, COMSIG_CARBON_EMBED_RIP, COMSIG_CARBON_EMBED_REMOVAL, COMSIG_PARENT_EXAMINE, COMSIG_PARENT_ATTACKBY)) + var/damage = weapon.throwforce + if(harmful) + victim.throw_alert("embeddedobject", /atom/movable/screen/alert/embeddedobject) + playsound(victim,'sound/weapons/bladeslice.ogg', 40) + weapon.add_mob_blood(victim)//it embedded itself in you, of course it's bloody! + damage += weapon.w_class * impact_pain_mult + SEND_SIGNAL(victim, COMSIG_ADD_MOOD_EVENT, "embedded", /datum/mood_event/embedded) -/datum/component/embedded/process(seconds_per_tick) - if(iscarbon(parent)) - processCarbon(seconds_per_tick) + if(damage > 0) + var/armor = victim.run_armor_check(limb.body_zone, "melee", "Your armor has protected your [limb.name].", "Your armor has softened a hit to your [limb.name].",I.armour_penetration) + limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage, blocked=armor, wound_bonus = I.wound_bonus, bare_wound_bonus = I.bare_wound_bonus, sharpness = I.get_sharpness()) /datum/component/embedded/Destroy() + var/mob/living/carbon/victim = parent + if(victim && !victim.has_embedded_objects()) + victim.clear_alert("embeddedobject") + SEND_SIGNAL(victim, COMSIG_CLEAR_MOOD_EVENT, "embedded") if(weapon) UnregisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING)) - if(overlay) - var/atom/A = parent - UnregisterSignal(A,COMSIG_ATOM_UPDATE_OVERLAYS) - qdel(overlay) - + weapon = null + limb = null return ..() -//////////////////////////////////////// -/////////////HUMAN PROCS//////////////// -//////////////////////////////////////// +/datum/component/embedded/RegisterWithParent() + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(jostleCheck)) + RegisterSignal(parent, COMSIG_CARBON_EMBED_RIP, PROC_REF(ripOutCarbon)) + RegisterSignal(parent, COMSIG_CARBON_EMBED_REMOVAL, PROC_REF(safeRemoveCarbon)) -/// Set up an instance of embedding for a carbon. This is basically an extension of Initialize() so not much to say -/datum/component/embedded/proc/initCarbon() - START_PROCESSING(SSdcs, src) +/datum/component/embedded/UnregisterFromParent() + UnregisterSignal(parent, list(COMSIG_MOVABLE_MOVED, COMSIG_CARBON_EMBED_RIP, COMSIG_CARBON_EMBED_REMOVAL)) + +/datum/component/embedded/process() var/mob/living/carbon/victim = parent - if(!istype(limb)) - limb = pick(victim.bodyparts) - limb.embedded_objects |= weapon // on the inside... on the inside... - weapon.forceMove(victim) - RegisterSignals(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING), PROC_REF(byeItemCarbon)) + if(!victim || !limb) // in case the victim and/or their limbs exploded (say, due to a sticky bomb) + weapon.forceMove(get_turf(weapon)) + qdel(src) + return + + if(victim.stat == DEAD) + return + + var/damage = weapon.w_class * pain_mult + var/pain_chance_current = pain_chance + if(pain_stam_pct && HAS_TRAIT_FROM(victim, TRAIT_INCAPACITATED, STAMINA)) //if it's a less-lethal embed, give them a break if they're already stamcritted + pain_chance_current *= 0.2 + damage *= 0.5 + else if(victim.mobility_flags & ~MOBILITY_STAND) + pain_chance_current *= 0.2 + + if(harmful && prob(pain_chance_current)) + limb.receive_damage(brute = (1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage, wound_bonus = CANT_WOUND) + to_chat(victim, span_userdanger("[weapon] embedded in your [limb.name] hurts!")) + + var/fall_chance_current = fall_chance + if(victim.mobility_flags & ~MOBILITY_STAND) + fall_chance_current *= 0.2 + + if(prob(fall_chance_current)) + fallOut() + +//////////////////////////////////////// +////////////BEHAVIOR PROCS////////////// +//////////////////////////////////////// - if(harmful) - victim.visible_message(span_danger("[weapon] embeds itself in [victim]'s [limb.name]!"),ignored_mobs=victim) - to_chat(victim, span_userdanger("[weapon] embeds itself in your [limb.name]!")) - victim.throw_alert("embeddedobject", /atom/movable/screen/alert/embeddedobject) - playsound(victim,'sound/weapons/bladeslice.ogg', 40) - weapon.add_mob_blood(victim)//it embedded itself in you, of course it's bloody! - var/damage = weapon.w_class * impact_pain_mult - limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage) - SEND_SIGNAL(victim, COMSIG_ADD_MOOD_EVENT, "embedded", /datum/mood_event/embedded) - else - victim.visible_message(span_danger("[weapon] sticks itself to [victim]'s [limb.name]!"),ignored_mobs=victim) - to_chat(victim, span_userdanger("[weapon] sticks itself to your [limb.name]!")) /// Called every time a carbon with a harmful embed moves, rolling a chance for the item to cause pain. The chance is halved if the carbon is crawling or walking. /datum/component/embedded/proc/jostleCheck() SIGNAL_HANDLER var/mob/living/carbon/victim = parent - var/chance = jostle_chance if(victim.m_intent == MOVE_INTENT_WALK || victim.body_position == LYING_DOWN) chance *= 0.5 if(harmful && prob(chance)) var/damage = weapon.w_class * jostle_pain_mult - limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage) - if(HAS_TRAIT(victim, TRAIT_ANALGESIA)) - to_chat(victim, span_notice("[weapon] embedded in your [limb.name] shifts around.")) - return + limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage, wound_bonus = CANT_WOUND) to_chat(victim, span_userdanger("[weapon] embedded in your [limb.name] jostles and stings!")) /// Called when then item randomly falls out of a carbon. This handles the damage and descriptors, then calls safe_remove() -/datum/component/embedded/proc/fallOutCarbon() +/datum/component/embedded/proc/fallOut() var/mob/living/carbon/victim = parent if(harmful) var/damage = weapon.w_class * remove_pain_mult - limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage) - victim.visible_message(span_danger("[weapon] falls out of [victim.name]'s [limb.name]!"), ignored_mobs=victim) - to_chat(victim, span_userdanger("[weapon] falls out of your [limb.name]!")) - else - victim.visible_message(span_danger("[weapon] falls off of [victim.name]'s [limb.name]!"), ignored_mobs=victim) - to_chat(victim, span_userdanger("[weapon] falls off of your [limb.name]!")) + limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage, wound_bonus = CANT_WOUND) + victim.visible_message( + span_danger("[weapon] falls [harmful ? "out" : "off"] of [victim.name]'s [limb.name]!"), + span_userdanger("[weapon] falls [harmful ? "out" : "off"] of your [limb.name]!"), + ) safeRemoveCarbon() @@ -196,237 +198,59 @@ var/mob/living/carbon/victim = parent var/time_taken = rip_time * weapon.w_class - INVOKE_ASYNC(src, PROC_REF(complete_rip_out), victim, I, limb, time_taken) + INVOKE_ASYNC(src, .proc/complete_rip_out, victim, I, limb, time_taken) /// everything async that ripOut used to do /datum/component/embedded/proc/complete_rip_out(mob/living/carbon/victim, obj/item/I, obj/item/bodypart/limb, time_taken) - victim.visible_message(span_warning("[victim] attempts to remove [weapon] from [victim.p_their()] [limb.name]."),span_notice("You attempt to remove [weapon] from your [limb.name]... (It will take [DisplayTimeText(time_taken)].)")) - if(do_after(victim, time_taken, target = victim)) - if(!weapon || !limb || weapon.loc != victim || !(weapon in limb.embedded_objects)) - qdel(src) - return - - if(harmful) - var/damage = weapon.w_class * remove_pain_mult - limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage) //It hurts to rip it out, get surgery you dingus. - victim.force_scream() - victim.visible_message(span_notice("[victim] successfully rips [weapon] out of [victim.p_their()] [limb.name]!"), span_notice("You successfully remove [weapon] from your [limb.name].")) - else - victim.visible_message(span_notice("[victim] successfully rips [weapon] off of [victim.p_their()] [limb.name]!"), span_notice("You successfully remove [weapon] from your [limb.name].")) + victim.visible_message( + span_warning("[victim] attempts to remove [weapon] from [victim.p_their()] [limb.name]."), + span_notice("You attempt to remove [weapon] from your [limb.name]... (It will take [DisplayTimeText(time_taken)].)"), + ) - safeRemoveCarbon(TRUE) + if(!do_after(victim, time_taken, target = victim)) + return + if(!weapon || !limb || weapon.loc != victim || !(weapon in limb.embedded_objects)) + qdel(src) + return + + if(harmful) + var/damage = weapon.w_class * remove_pain_mult + limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage, sharpness=SHARP_EDGED) //It hurts to rip it out, get surgery you dingus. unlike the others, this CAN wound + increase slash bloodflow + victim.emote("scream") + + victim.visible_message( + span_notice("[victim] successfully rips [weapon] [harmful ? "out" : "off"] of [victim.p_their()] [limb.name]!"), + span_notice("You successfully remove [weapon] from your [limb.name]."), + ) + safeRemoveCarbon(TRUE) /// This proc handles the final step and actual removal of an embedded/stuck item from a carbon, whether or not it was actually removed safely. /// Pass TRUE for to_hands if we want it to go to the victim's hands when they pull it out -/datum/component/embedded/proc/safeRemoveCarbon(mob/to_hands) +/datum/component/embedded/proc/safeRemoveCarbon(to_hands) SIGNAL_HANDLER var/mob/living/carbon/victim = parent limb.embedded_objects -= weapon + UnregisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING)) // have to do it here otherwise we trigger weaponDeleted() - UnregisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING)) // have to unhook these here so they don't also register as having disappeared - - if(!weapon) - if(!victim.has_embedded_objects()) - victim.clear_alert("embeddedobject") - SEND_SIGNAL(victim, COMSIG_CLEAR_MOOD_EVENT, "embedded") - qdel(src) - return - - if(weapon.unembedded()) // if it deleted itself - weapon = null - if(!victim.has_embedded_objects()) - victim.clear_alert("embeddedobject") - SEND_SIGNAL(victim, COMSIG_CLEAR_MOOD_EVENT, "embedded") - qdel(src) - return - - if(to_hands) - INVOKE_ASYNC(to_hands, TYPE_PROC_REF(/mob, put_in_hands), weapon) - else - weapon.forceMove(get_turf(victim)) + if(!weapon.unembedded()) // if it hasn't deleted itself due to drop del + UnregisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING)) + if(to_hands) + INVOKE_ASYNC(victim, /mob.proc/put_in_hands, weapon) + else + weapon.forceMove(get_turf(victim)) - if(!victim.has_embedded_objects()) - victim.clear_alert("embeddedobject") - SEND_SIGNAL(victim, COMSIG_CLEAR_MOOD_EVENT, "embedded") qdel(src) - /// Something deleted or moved our weapon while it was embedded, how rude! -/datum/component/embedded/proc/byeItemCarbon() +/datum/component/embedded/proc/weaponDeleted() SIGNAL_HANDLER var/mob/living/carbon/victim = parent limb.embedded_objects -= weapon - UnregisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING)) if(victim) to_chat(victim, span_userdanger("\The [weapon] that was embedded in your [limb.name] disappears!")) - if(!victim.has_embedded_objects()) - victim.clear_alert("embeddedobject") - SEND_SIGNAL(victim, COMSIG_CLEAR_MOOD_EVENT, "embedded") - weapon = null - qdel(src) - - -/// Items embedded/stuck to carbons both check whether they randomly fall out (if applicable), as well as if the target mob and limb still exists. -/// Items harmfully embedded in carbons have an additional check for random pain (if applicable) -/datum/component/embedded/proc/processCarbon(seconds_per_tick) - var/mob/living/carbon/victim = parent - - if(!victim || !limb) // in case the victim and/or their limbs exploded (say, due to a sticky bomb) - weapon.forceMove(get_turf(weapon)) - qdel(src) - - if(victim.stat == DEAD) - return - - var/damage = weapon.w_class * pain_mult - var/chance = SPT_PROB_RATE(pain_chance / 100, seconds_per_tick) * 100 - if(pain_stam_pct && HAS_TRAIT_FROM(victim, TRAIT_INCAPACITATED, STAMINA)) //if it's a less-lethal embed, give them a break if they're already stamcritted - chance *= 0.3 - damage *= 0.7 - - if(harmful && prob(chance)) - limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage) - to_chat(victim, span_userdanger("[weapon] embedded in your [limb.name] hurts!")) - - var/fall_chance_current = SPT_PROB_RATE(fall_chance / 100, seconds_per_tick) * 100 - - if(prob(fall_chance_current)) - fallOutCarbon() - -/// The signal for listening to see if someone is using a hemostat on us to pluck out this object -/datum/component/embedded/proc/check_tweeze(mob/living/carbon/victim, obj/item/possible_tweezers, mob/user) - SIGNAL_HANDLER - - if(!istype(victim) || possible_tweezers.tool_behaviour != TOOL_HEMOSTAT || user.zone_selected != limb.body_zone) - return - - if(weapon != limb.embedded_objects[1]) // just pluck the first one, since we can't easily coordinate with other embedded components affecting this limb who is highest priority - return - - if(ishuman(victim)) // check to see if the limb is actually exposed - var/mob/living/carbon/human/victim_human = victim - if(!victim_human.can_inject(user, TRUE, limb.body_zone)) - return TRUE - - INVOKE_ASYNC(src, PROC_REF(tweeze_pluck), possible_tweezers, user) - return COMPONENT_NO_AFTERATTACK - -/// The actual action for pulling out an embedded object with a hemostat -/datum/component/embedded/proc/tweeze_pluck(obj/item/possible_tweezers, mob/user) - var/mob/living/carbon/victim = parent - - var/self_pluck = (user == victim) - - if(self_pluck) - user.visible_message( - span_warning("[user] begins plucking [weapon] from [user.p_their()] [limb.name]"), - span_notice("You start plucking [weapon] from your [limb.name]..."), - vision_distance=COMBAT_MESSAGE_RANGE, - ignored_mobs=victim - ) - else - user.visible_message( - span_warning("[user] begins plucking [weapon] from [victim]'s [limb.name]"), - span_notice("You start plucking [weapon] from [victim]'s [limb.name]..."), - vision_distance=COMBAT_MESSAGE_RANGE, - ignored_mobs=victim - ) - to_chat(victim, span_warning("[user] begins plucking [weapon] from your [limb.name]...")) - - var/pluck_time = 1.5 SECONDS * weapon.w_class * (self_pluck ? 2 : 1) - if(!do_after(user, pluck_time, victim)) - if(self_pluck) - to_chat(user, span_warning("You fail to pluck [weapon] from your [limb.name].")) - else - to_chat(user, span_warning("You fail to pluck [weapon] from [victim]'s [limb.name].")) - to_chat(victim, span_warning("[user] fails to pluck [weapon] from your [limb.name].")) - return - - to_chat(user, span_warning("You successfully pluck [weapon] from [victim]'s [limb.name].")) - to_chat(victim, span_warning("[user] plucks [weapon] from your [limb.name].")) - safeRemoveCarbon(user) - -//////////////////////////////////////// -//////////////TURF PROCS//////////////// -//////////////////////////////////////// - -/// Turfs are much lower maintenance, since we don't care if they're in pain, but since they don't bleed or scream, we draw an overlay to show their status. -/// The only difference pointy/sticky items make here is text descriptors and pointy objects making a spark shower on impact. -/datum/component/embedded/proc/initTurf(datum/thrownthing/throwingdatum) - var/turf/closed/hit = parent - - // we can't store the item IN the turf (cause turfs are just kinda... there), so we fake it by making the item invisible and bailing if it moves due to a blast - weapon.forceMove(hit) - weapon.invisibility = INVISIBILITY_ABSTRACT - RegisterSignal(weapon, COMSIG_MOVABLE_MOVED, PROC_REF(itemMoved)) - - var/pixelX = rand(-2, 2) - var/pixelY = rand(-1, 3) // bias this upwards since in-hands are usually on the lower end of the sprite - - switch(throwingdatum.init_dir) - if(NORTH) - pixelY -= 2 - if(SOUTH) - pixelY += 2 - if(WEST) - pixelX += 2 - if(EAST) - pixelX -= 2 - - if(throwingdatum.init_dir in list(NORTH, WEST, NORTHWEST, SOUTHWEST)) - overlay = mutable_appearance(icon=weapon.righthand_file,icon_state=weapon.item_state) - else - overlay = mutable_appearance(icon=weapon.lefthand_file,icon_state=weapon.item_state) - - var/matrix/M = matrix() - M.Translate(pixelX, pixelY) - overlay.transform = M - RegisterSignal(hit,COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(apply_overlay)) - hit.update_appearance() - - if(harmful) - hit.visible_message(span_danger("[weapon] embeds itself in [hit]!")) - playsound(hit,'sound/weapons/bladeslice.ogg', 70) - - var/datum/effect_system/spark_spread/sparks = new - sparks.set_up(1, 1, parent) - sparks.attach(parent) - sparks.start() - else - hit.visible_message(span_danger("[weapon] sticks itself to [hit]!")) - -/datum/component/embedded/proc/apply_overlay(atom/source, list/overlay_list) - overlay_list += overlay - -/datum/component/embedded/proc/examineTurf(datum/source, mob/user, list/examine_list) - if(harmful) - examine_list += "\t There is \a [weapon] embedded in [parent]!" - else - examine_list += "\t There is \a [weapon] stuck to [parent]!" - - -/// Someone is ripping out the item from the turf by hand -/datum/component/embedded/Topic(datum/source, href_list) - var/mob/living/us = usr - if(in_range(us, parent) && locate(href_list["embedded_object"]) == weapon) - if(harmful) - us.visible_message(span_notice("[us] begins unwedging [weapon] from [parent]."), span_notice("You begin unwedging [weapon] from [parent]...")) - else - us.visible_message(span_notice("[us] begins unsticking [weapon] from [parent]."), span_notice("You begin unsticking [weapon] from [parent]...")) - - if(do_after(us, 30, target = parent)) - us.put_in_hands(weapon) - weapon.unembedded() - qdel(src) - -/// This proc handles if something knocked the invisible item loose from the turf somehow (probably an explosion). Just make it visible and say it fell loose, then get outta here. -/datum/component/embedded/proc/itemMoved() - weapon.invisibility = initial(weapon.invisibility) - weapon.visible_message(span_notice("[weapon] falls loose from [parent].")) - weapon.unembedded() qdel(src) diff --git a/code/datums/components/explodable.dm b/code/datums/components/explodable.dm index 708e1b58bf1e..d8752f173091 100644 --- a/code/datums/components/explodable.dm +++ b/code/datums/components/explodable.dm @@ -71,12 +71,12 @@ /datum/component/explodable/proc/on_equip(datum/source, mob/equipper, slot) SIGNAL_HANDLER - RegisterSignal(equipper, COMSIG_MOB_APPLY_DAMGE, PROC_REF(explodable_attack_zone), TRUE) + RegisterSignal(equipper, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(explodable_attack_zone), TRUE) /datum/component/explodable/proc/on_drop(datum/source, mob/user) SIGNAL_HANDLER - UnregisterSignal(user, COMSIG_MOB_APPLY_DAMGE) + UnregisterSignal(user, COMSIG_MOB_APPLY_DAMAGE) /// Checks if we're hitting the zone this component is covering /datum/component/explodable/proc/is_hitting_zone(def_zone) diff --git a/code/datums/components/fantasy/_fantasy.dm b/code/datums/components/fantasy/_fantasy.dm index 171486019cc5..136ba7d720b9 100644 --- a/code/datums/components/fantasy/_fantasy.dm +++ b/code/datums/components/fantasy/_fantasy.dm @@ -91,6 +91,8 @@ master.force = max(0, master.force + quality) master.throwforce = max(0, master.throwforce + quality) master.armor = master.armor?.modifyAllRatings(quality) + master.wound_bonus += quality + master.bare_wound_bonus += quality var/newName = originalName for(var/i in affixes) @@ -121,6 +123,8 @@ master.force = max(0, master.force - quality) master.throwforce = max(0, master.throwforce - quality) master.armor = master.armor?.modifyAllRatings(-quality) + master.wound_bonus -= quality + master.bare_wound_bonus -= quality master.name = originalName diff --git a/code/datums/components/gunpoint.dm b/code/datums/components/gunpoint.dm index 12616b112e90..0d90dbba2907 100644 --- a/code/datums/components/gunpoint.dm +++ b/code/datums/components/gunpoint.dm @@ -1,8 +1,16 @@ +/// How many tiles around the target the shooter can roam without losing their shot #define GUNPOINT_SHOOTER_STRAY_RANGE 2 -#define GUNPOINT_DELAY_STAGE_2 25 -#define GUNPOINT_DELAY_STAGE_3 75 // cumulative with past stages, so 100 deciseconds +/// How long it takes from the gunpoint is initiated to reach stage 2 +#define GUNPOINT_DELAY_STAGE_2 2.5 SECONDS +/// How long it takes from stage 2 starting to move up to stage 3 +#define GUNPOINT_DELAY_STAGE_3 7.5 SECONDS +/// If the projectile doesn't have a wound_bonus of CANT_WOUND, we add (this * the stage mult) to their wound_bonus and bare_wound_bonus upon triggering +#define GUNPOINT_BASE_WOUND_BONUS 5 +/// How much the damage and wound bonus mod is multiplied when you're on stage 1 #define GUNPOINT_MULT_STAGE_1 1 +/// As above, for stage 2 #define GUNPOINT_MULT_STAGE_2 2 +/// As above, for stage 3 #define GUNPOINT_MULT_STAGE_3 2.5 @@ -54,37 +62,40 @@ /datum/component/gunpoint/RegisterWithParent() RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(check_deescalate)) - RegisterSignal(parent, COMSIG_MOB_APPLY_DAMGE, PROC_REF(flinch)) + RegisterSignal(parent, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(flinch)) RegisterSignal(parent, COMSIG_MOB_ATTACK_HAND, PROC_REF(check_shove)) RegisterSignals(parent, list(COMSIG_LIVING_START_PULL, COMSIG_MOVABLE_BUMP), PROC_REF(check_bump)) /datum/component/gunpoint/UnregisterFromParent() UnregisterSignal(parent, COMSIG_MOVABLE_MOVED) - UnregisterSignal(parent, COMSIG_MOB_APPLY_DAMGE) + UnregisterSignal(parent, COMSIG_MOB_APPLY_DAMAGE) UnregisterSignal(parent, COMSIG_MOB_ATTACK_HAND) UnregisterSignal(parent, list(COMSIG_LIVING_START_PULL, COMSIG_MOVABLE_BUMP)) +///If the shooter bumps the target, cancel the holdup to avoid cheesing and forcing the charged shot /datum/component/gunpoint/proc/check_bump(atom/B, atom/A) SIGNAL_HANDLER - var/mob/living/T = A - if(T && T == target) - var/mob/living/shooter = parent - shooter.visible_message(span_danger("[shooter] bumps into [target] and fumbles [shooter.p_their()] aim!"), \ - span_danger("You bump into [target] and fumble your aim!"), target) - to_chat(target, span_userdanger("[shooter] bumps into you and fumbles [shooter.p_their()] aim!")) - qdel(src) + if(A != target) + return + var/mob/living/shooter = parent + shooter.visible_message(span_danger("[shooter] bumps into [target] and fumbles [shooter.p_their()] aim!"), \ + span_danger("You bump into [target] and fumble your aim!"), target) + to_chat(target, span_userdanger("[shooter] bumps into you and fumbles [shooter.p_their()] aim!")) + qdel(src) +///If the shooter shoves or grabs the target, cancel the holdup to avoid cheesing and forcing the charged shot /datum/component/gunpoint/proc/check_shove(mob/living/carbon/shooter, mob/shooter_again, mob/living/T) SIGNAL_HANDLER - if(T == target && (shooter.a_intent == INTENT_DISARM || shooter.a_intent == INTENT_GRAB)) - shooter.visible_message(span_danger("[shooter] bumps into [target] and fumbles [shooter.p_their()] aim!"), \ - span_danger("You bump into [target] and fumble your aim!"), target) - to_chat(target, span_userdanger("[shooter] bumps into you and fumbles [shooter.p_their()] aim!")) - qdel(src) + if(T != target || shooter.a_intent == INTENT_DISARM || shooter.a_intent == INTENT_GRAB) + return + shooter.visible_message(span_danger("[shooter] bumps into [target] and fumbles [shooter.p_their()] aim!"), \ + span_danger("You bump into [target] and fumble your aim!"), target) + to_chat(target, span_userdanger("[shooter] bumps into you and fumbles [shooter.p_their()] aim!")) + qdel(src) -// if you're gonna try to break away from a holdup, better to do it right away +///Update the damage multiplier for whatever stage we're entering into /datum/component/gunpoint/proc/update_stage(new_stage) stage = new_stage if(stage == 2) @@ -97,19 +108,25 @@ to_chat(target, span_userdanger("[parent] has fully steadied [weapon] on you!")) damage_mult = GUNPOINT_MULT_STAGE_3 +///Cancel the holdup if the shooter moves out of sight or out of range of the target /datum/component/gunpoint/proc/check_deescalate() SIGNAL_HANDLER if(!can_see(parent, target, GUNPOINT_SHOOTER_STRAY_RANGE - 1)) cancel() +///Bang bang, we're firing a charged shot off /datum/component/gunpoint/proc/trigger_reaction() SIGNAL_HANDLER INVOKE_ASYNC(src, PROC_REF(async_trigger_reaction)) /datum/component/gunpoint/proc/async_trigger_reaction() + var/mob/living/shooter = parent + shooter.remove_status_effect(STATUS_EFFECT_HOLDUP) // try doing these before the trigger gets pulled since the target (or shooter even) may not exist after pulling the trigger, dig? + target.remove_status_effect(STATUS_EFFECT_HELDUP) SEND_SIGNAL(target, COMSIG_CLEAR_MOOD_EVENT, "gunpoint") + if(point_of_no_return) return point_of_no_return = TRUE @@ -125,10 +142,20 @@ if(weapon.chambered && weapon.chambered.BB) weapon.chambered.BB.damage *= damage_mult + if(weapon.chambered.BB.wound_bonus != CANT_WOUND) + weapon.chambered.BB.wound_bonus += damage_mult * GUNPOINT_BASE_WOUND_BONUS + weapon.chambered.BB.bare_wound_bonus += damage_mult * GUNPOINT_BASE_WOUND_BONUS + + var/fired = weapon.process_fire(target, shooter) + if(!fired && weapon.chambered?.BB) + weapon.chambered.BB.damage /= damage_mult + if(weapon.chambered.BB.wound_bonus != CANT_WOUND) + weapon.chambered.BB.wound_bonus -= damage_mult * GUNPOINT_BASE_WOUND_BONUS + weapon.chambered.BB.bare_wound_bonus -= damage_mult * GUNPOINT_BASE_WOUND_BONUS - weapon.pre_fire(target, shooter) qdel(src) +///Shooter canceled their shot, either by dropping/equipping their weapon, leaving sight/range, or clicking on the alert /datum/component/gunpoint/proc/cancel() SIGNAL_HANDLER @@ -139,11 +166,14 @@ SEND_SIGNAL(target, COMSIG_CLEAR_MOOD_EVENT, "gunpoint") qdel(src) +///If the shooter is hit by an attack, they have a 50% chance to flinch and fire. If it hit the arm holding the trigger, it's an 80% chance to fire instead /datum/component/gunpoint/proc/flinch(attacker, damage, damagetype, def_zone) SIGNAL_HANDLER - var/mob/living/shooter = parent + if(attacker == shooter) + return // somehow this wasn't checked for months but no one tried punching themselves to initiate the shot, amazing + var/flinch_chance = 50 var/gun_hand = LEFT_HANDS diff --git a/code/datums/components/pellet_cloud.dm b/code/datums/components/pellet_cloud.dm index 39275d92aaa8..25f455e19b35 100644 --- a/code/datums/components/pellet_cloud.dm +++ b/code/datums/components/pellet_cloud.dm @@ -1,3 +1,7 @@ +// the following defines are used for [/datum/component/pellet_cloud/var/list/wound_info_by_part] to store the damage, wound_bonus, and bw_bonus for each bodypart hit +#define CLOUD_POSITION_DAMAGE 1 +#define CLOUD_POSITION_W_BONUS 2 +#define CLOUD_POSITION_BW_BONUS 3 //This component is used when you want to create a bunch of shrapnel or projectiles (say, shrapnel from a fragmentation grenade, or buckshot from a shotgun) from a central point, //without necessarily printing a separate message for every single impact. This component should be instantiated right when you need it (like the moment of firing), then activated @@ -28,6 +32,10 @@ var/list/pellets = list() /// An associated list with the atom hit as the key and how many pellets they've eaten for the value, for printing aggregate messages var/list/targets_hit = list() + + /// Another associated list for hit bodyparts on carbons so we can track how much wounding potential we have for each bodypart + var/list/wound_info_by_part = list() + /// LAZY LIST. For grenades, any /mob/living's the grenade is moved onto, see [/datum/component/pellet_cloud/proc/handle_martyrs()] var/list/bodies /// For grenades, tracking people who die covering a grenade for achievement purposes, see [/datum/component/pellet_cloud/proc/handle_martyrs()] @@ -64,6 +72,7 @@ purple_hearts = null pellets = null targets_hit = null + wound_info_by_part = null LAZYNULL(bodies) return ..() @@ -97,8 +106,10 @@ if(!zone_override) zone_override = shooter.zone_selected - // things like mouth executions and gunpoints can multiply the damage of projectiles, so this makes sure those effects are applied to each pellet instead of just one + // things like mouth executions and gunpoints can multiply the damage and wounds of projectiles, so this makes sure those effects are applied to each pellet instead of just one var/original_damage = shell.BB.damage + var/original_wb = shell.BB.wound_bonus + var/original_bwb = shell.BB.bare_wound_bonus for(var/i in 1 to num_pellets) shell.ready_proj(target, user, SUPPRESSED_VERY, zone_override, fired_from) @@ -111,36 +122,43 @@ RegisterSignal(shell.BB, COMSIG_PROJECTILE_SELF_ON_HIT, PROC_REF(pellet_hit)) RegisterSignals(shell.BB, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PARENT_QDELETING), PROC_REF(pellet_range)) shell.BB.damage = original_damage + shell.BB.wound_bonus = original_wb + shell.BB.bare_wound_bonus = original_bwb pellets += shell.BB + var/turf/current_loc = get_turf(fired_from) - if (!istype(target_loc) || !istype(current_loc) || !(shell.BB)) + if(!istype(target_loc) || !istype(current_loc) || !(shell.BB)) return + INVOKE_ASYNC(shell, TYPE_PROC_REF(/obj/item/ammo_casing, throw_proj), target, target_loc, shooter, params, spread, fired_from) if(i != num_pellets) shell.newshot() -//create_blast_pellets() is for when we have a central point we want to shred the surroundings of with a ring of shrapnel, namely frag grenades and landmines. - -//Note that grenades have extra handling for someone throwing themselves/being thrown on top of it, see [/datum/component/pellet_cloud/proc/handle_martyrs] -//Landmines just have a small check for [/obj/item/mine/pressure/explosive/shrapnel/var/shred_triggerer], and spawn extra shrapnel for them if so - -//Arguments: -////O- Our parent, the thing making the shrapnel obviously (grenade or landmine) -////punishable_triggerer- For grenade lances or people who step on the landmines (if we shred the triggerer), we spawn extra shrapnel for them in addition to the normal spread -// +/** + * create_blast_pellets() is for when we have a central point we want to shred the surroundings of with a ring of shrapnel, namely frag grenades and landmines. + * + * Note that grenades have extra handling for someone throwing themselves/being thrown on top of it, see [/datum/component/pellet_cloud/proc/handle_martyrs] + * Landmines just have a small check for [/obj/effect/mine/shrapnel/var/shred_triggerer], and spawn extra shrapnel for them if so + * + * Arguments: + * * O- Our parent, the thing making the shrapnel obviously (grenade or landmine) + * * punishable_triggerer- For grenade lances or people who step on the landmines (if we shred the triggerer), we spawn extra shrapnel for them in addition to the normal spread + */ /datum/component/pellet_cloud/proc/create_blast_pellets(obj/O, mob/living/punishable_triggerer) + SIGNAL_HANDLER + var/atom/A = parent if(isgrenade(parent)) // handle_martyrs can reduce the radius and thus the number of pellets we produce if someone dives on top of a frag grenade - handle_martyrs(punishable_triggerer) // note that we can modify radius in this proc + INVOKE_ASYNC(src, PROC_REF(handle_martyrs), punishable_triggerer) // note that we can modify radius in this proc else if(istype(parent, /obj/item/mine/pressure/explosive)) var/obj/item/mine/pressure/explosive/triggered_mine = parent if(triggered_mine.shred_triggerer && istype(punishable_triggerer)) // free shrapnel for the idiot who stepped on it if we're a mine that shreds the triggerer pellet_delta += radius // so they don't count against the later total if(punishable_triggerer.loc == triggered_mine.loc)//only trigger this if they're actually on the tile for(var/i in 1 to radius) - pew(punishable_triggerer, TRUE) + INVOKE_ASYNC(src, PROC_REF(pew), punishable_triggerer, TRUE) if(radius < 1) return @@ -150,7 +168,7 @@ for(var/T in all_the_turfs_were_gonna_lacerate) var/turf/shootat_turf = T - pew(shootat_turf) + INVOKE_ASYNC(src, PROC_REF(pew), shootat_turf) // handle_martyrs() is used for grenades that shoot shrapnel to check if anyone threw themselves/were thrown on top of the grenade, thus absorbing a good chunk of the shrapnel @@ -162,6 +180,8 @@ // Note we track anyone who's alive and client'd when they get shredded in var/list/purple_hearts, for achievement checking later /datum/component/pellet_cloud/proc/handle_martyrs(mob/living/punishable_triggerer) + SIGNAL_HANDLER + var/magnitude_absorbed var/list/martyrs = list() @@ -209,15 +229,31 @@ break ///One of our pellets hit something, record what it was and check if we're done (terminated == num_pellets) -/datum/component/pellet_cloud/proc/pellet_hit(obj/projectile/P, atom/movable/firer, atom/target, Angle) +/datum/component/pellet_cloud/proc/pellet_hit(obj/projectile/P, atom/movable/firer, atom/target, Angle, hit_zone) SIGNAL_HANDLER pellets -= P terminated++ hits++ + var/obj/item/bodypart/hit_part + if(iscarbon(target) && hit_zone) + var/mob/living/carbon/hit_carbon = target + hit_part = hit_carbon.get_bodypart(hit_zone) + if(hit_part) + target = hit_part + if(P.wound_bonus != CANT_WOUND) // handle wounding + // unfortunately, due to how pellet clouds handle finalizing only after every pellet is accounted for, that also means there might be a short delay in dealing wounds if one pellet goes wide + // while buckshot may reach a target or miss it all in one tick, we also have to account for possible ricochets that may take a bit longer to hit the target + if(isnull(wound_info_by_part[hit_part])) + wound_info_by_part[hit_part] = list(0, 0, 0) + wound_info_by_part[hit_part][CLOUD_POSITION_DAMAGE] += P.damage // these account for decay + wound_info_by_part[hit_part][CLOUD_POSITION_W_BONUS] += P.wound_bonus + wound_info_by_part[hit_part][CLOUD_POSITION_BW_BONUS] += P.bare_wound_bonus + P.wound_bonus = CANT_WOUND // actual wounding will be handled aggregate + targets_hit[target]++ if(targets_hit[target] == 1) - RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(on_target_qdel), override=TRUE) + RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/on_target_qdel, override=TRUE) UnregisterSignal(P, list(COMSIG_PARENT_QDELETING, COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PROJECTILE_SELF_ON_HIT)) if(terminated == num_pellets) finalize() @@ -248,6 +284,7 @@ RegisterSignals(P, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PARENT_QDELETING), PROC_REF(pellet_range)) pellets += P P.fire() + if(landmine_victim) P.process_hit(get_turf(target), target) @@ -259,12 +296,24 @@ for(var/atom/target in targets_hit) var/num_hits = targets_hit[target] UnregisterSignal(target, COMSIG_PARENT_QDELETING) + var/obj/item/bodypart/hit_part + if(isbodypart(target)) + hit_part = target + target = hit_part.owner + if(wound_info_by_part[hit_part] && (initial(P.damage_type) == BRUTE || initial(P.damage_type) == BURN)) // so a cloud of disablers that deal stamina don't inadvertently end up causing burn wounds) + var/damage_dealt = wound_info_by_part[hit_part][CLOUD_POSITION_DAMAGE] + var/w_bonus = wound_info_by_part[hit_part][CLOUD_POSITION_W_BONUS] + var/bw_bonus = wound_info_by_part[hit_part][CLOUD_POSITION_BW_BONUS] + var/wound_type = (initial(P.damage_type) == BRUTE) ? WOUND_BLUNT : WOUND_BURN // sharpness is handled in the wound rolling + wound_info_by_part[hit_part] = null + hit_part.painless_wound_roll(wound_type, damage_dealt, w_bonus, bw_bonus, initial(P.sharpness)) + if(num_hits > 1) - target.visible_message(span_danger("[target] is hit by [num_hits] [proj_name]s!"), null, null, COMBAT_MESSAGE_RANGE, target) - to_chat(target, span_userdanger("You're hit by [num_hits] [proj_name]s!")) + target.visible_message(span_danger("[target] is hit by [num_hits] [proj_name]s[hit_part ? " in the [hit_part.name]" : ""]!"), null, null, COMBAT_MESSAGE_RANGE, target) + to_chat(target, span_userdanger("You're hit by [num_hits] [proj_name]s[hit_part ? " in the [hit_part.name]" : ""]!")) else - target.visible_message(span_danger("[target] is hit by a [proj_name]!"), null, null, COMBAT_MESSAGE_RANGE, target) - to_chat(target, span_userdanger("You're hit by \a [proj_name]\s!")) + target.visible_message(span_danger("[target] is hit by a [proj_name][hit_part ? " in the [hit_part.name]" : ""]!"), null, null, COMBAT_MESSAGE_RANGE, target) + to_chat(target, span_userdanger("You're hit by a [proj_name][hit_part ? " in the [hit_part.name]" : ""]!")) for(var/M in purple_hearts) var/mob/living/martyr = M @@ -328,3 +377,7 @@ targets_hit -= target LAZYREMOVE(bodies, target) LAZYREMOVE(purple_hearts, target) + +#undef CLOUD_POSITION_DAMAGE +#undef CLOUD_POSITION_W_BONUS +#undef CLOUD_POSITION_BW_BONUS diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm index 1c4c811ceded..26b73353c15b 100644 --- a/code/datums/components/riding.dm +++ b/code/datums/components/riding.dm @@ -346,6 +346,9 @@ else inhand.rider = riding_target_override inhand.parent = AM + for(var/obj/item/I in user.held_items) // yes i know this sucks but these are ABSTRACT++ dumbness and i'm not adding a whole new flag for these two meme items + if((I.obj_flags & HAND_ITEM)) + qdel(I) if(user.put_in_hands(inhand, TRUE)) amount_equipped++ else diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index 2da24ee1ac4d..a9a40958b3eb 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -1,8 +1,7 @@ -#define MAX_TABLE_MESSES 8 // how many things can we knock off a table at once? +/// how many things can we knock off a table at once by diving into it? +#define MAX_TABLE_MESSES 12 /** - *#tackle.dm - * * For when you want to throw a person at something and have fun stuff happen * * This component is made for carbon mobs (really, humans), and allows its parent to throw themselves and perform tackles. This is done by enabling throw mode, then clicking on your @@ -10,7 +9,7 @@ * roll to see how badly you just messed yourself up. If, along your journey, you hit a table, you'll slam onto it and send up to MAX_TABLE_MESSES (8) /obj/items on the table flying, * and take a bit of extra damage and stun for each thing launched. * - * There are 2 """skill rolls""" involved here, which are handled and explained in sack() and rollTackle() (for roll 1, carbons), and splat() (for roll 2, walls and solid objects) + * There are 2 separate """skill rolls""" involved here, which are handled and explained in [rollTackle()][/datum/component/tackler/proc/rollTackle] (for roll 1, carbons), and [splat()][/datum/component/tackler/proc/splat] (for roll 2, walls and solid objects) */ /datum/component/tackler dupe_mode = COMPONENT_DUPE_UNIQUE @@ -151,6 +150,7 @@ tackle = null return + user.toggle_throw_mode() if(!iscarbon(hit)) if(hit.density) INVOKE_ASYNC(src, PROC_REF(splat), user, hit) @@ -173,7 +173,7 @@ user.Paralyze(30) var/obj/item/bodypart/head/hed = user.get_bodypart(BODY_ZONE_HEAD) if(hed) - hed.receive_damage(brute=20, updating_health=TRUE) + hed.receive_damage(brute=15, updating_health=TRUE, wound_bonus = CANT_WOUND) user.gain_trauma(/datum/brain_trauma/mild/concussion) if(-4 to -2) // glancing blow at best @@ -183,7 +183,7 @@ user.Knockdown(30) if(ishuman(target) && !T.has_movespeed_modifier(/datum/movespeed_modifier/shove)) T.add_movespeed_modifier(/datum/movespeed_modifier/shove) // maybe define a slightly more severe/longer slowdown for this - addtimer(CALLBACK(T, TYPE_PROC_REF(/mob/living/carbon, clear_shove_slowdown)), SHOVE_SLOWDOWN_LENGTH) + addtimer(CALLBACK(T, TYPE_PROC_REF(/mob/living/carbon, clear_shove_slowdown)), SHOVE_SLOWDOWN_LENGTH * 2) if(-1 to 0) // decent hit, both parties are about equally inconvenienced user.visible_message(span_warning("[user] lands a passable tackle on [target], sending them both tumbling!"), span_userdanger("You land a passable tackle on [target], sending you both tumbling!"), target) @@ -268,6 +268,13 @@ if(HAS_TRAIT(target, TRAIT_SCOOPABLE)) defense_mod -= 1 + var/leg_wounds = 0 // -1 defense per 2 leg wounds + for(var/i in target.all_wounds) + var/datum/wound/iterwound = i + if((iterwound.limb.body_zone in list(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))) + leg_wounds++ + defense_mod -= round(leg_wounds * 0.5) + if(ishuman(target)) var/mob/living/carbon/human/T = target @@ -329,11 +336,12 @@ * * Clumsy: +6 * * Effects: Below are the outcomes based off your roll, in order of increasing severity - * * 1-63: Knocked down for a few seconds and a bit of brute and stamina damage - * * 64-83: Knocked silly, gain some confusion as well as the above - * * 84-93: Cranial trauma, get a concussion and more confusion, plus more damage - * * 94-98: Knocked unconscious, significant chance to get a random mild brain trauma, as well as a fair amount of damage - * * 99-100: Break your spinal cord, get paralyzed, take a bunch of damage too. Very unlucky! + * * 1-67: Knocked down for a few seconds and a bit of brute and stamina damage + * * 68-85: Knocked silly, gain some confusion as well as the above + * * 86-92: Cranial trauma, get a concussion and more confusion, plus more damage + * * 93-96: Knocked unconscious, get a random mild brain trauma, as well as a fair amount of damage + * * 97-98: Massive head damage, probably crack your skull open, random mild brain trauma + * * 99-Infinity: Break your spinal cord, get paralyzed, take a bunch of damage too. Very unlucky! */ /datum/component/tackler/proc/splat(mob/living/carbon/user, atom/hit) if(istype(hit, /obj/machinery/vending)) // before we do anything else- @@ -348,7 +356,7 @@ return var/oopsie_mod = 0 - var/danger_zone = (speed - 1) * 15 // for every extra speed we have over 1, take away 15 of the safest chance + var/danger_zone = (speed - 1) * 13 // for every extra speed we have over 1, take away 13 of the safest chance danger_zone = max(min(danger_zone, 100), 1) if(ishuman(user)) @@ -372,28 +380,41 @@ if(99 to INFINITY) // can you imagine standing around minding your own business when all of the sudden some guy fucking launches himself into a wall at full speed and irreparably paralyzes himself? user.visible_message(span_danger("[user] slams face-first into [hit] at an awkward angle, severing [user.p_their()] spinal column with a sickening crack! Holy shit!"), span_userdanger("You slam face-first into [hit] at an awkward angle, severing your spinal column with a sickening crack! Holy shit!")) + + var/obj/item/bodypart/head/hed = user.get_bodypart(BODY_ZONE_HEAD) + if(hed) + hed.receive_damage(brute = 40, updating_health = FALSE, wound_bonus = 40) + else + user.adjustBruteLoss(40, updating_health = FALSE) + user.adjustStaminaLoss(30) - user.apply_damage(30, BRUTE, BODY_ZONE_HEAD) playsound(user, 'sound/effects/blobattack.ogg', 60, TRUE) playsound(user, 'sound/effects/splat.ogg', 70, TRUE) + playsound(user, 'sound/effects/wounds/crack2.ogg', 70, TRUE) user.force_scream() user.gain_trauma(/datum/brain_trauma/severe/paralysis/paraplegic) // oopsie indeed! shake_camera(user, 7, 7) user.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash) user.clear_fullscreen("flash", 4.5) - if(94 to 98) + if(97 to 98) user.visible_message(span_danger("[user] slams face-first into [hit] with a concerning squish, immediately going limp!"), span_userdanger("You slam face-first into [hit], and immediately lose consciousness!")) + + var/obj/item/bodypart/head/hed = user.get_bodypart(BODY_ZONE_HEAD) + if(hed) + hed.receive_damage(brute=30, updating_health=FALSE, wound_bonus = 25) + else + user.adjustBruteLoss(40, updating_health=FALSE) user.adjustStaminaLoss(30) - user.apply_damage(30, BRUTE, BODY_ZONE_HEAD) - user.Unconscious(100) user.gain_trauma_type(BRAIN_TRAUMA_MILD) - user.playsound_local(get_turf(user), 'sound/weapons/flashbang.ogg', 100, TRUE, 8) - shake_camera(user, 6, 6) + playsound(user, 'sound/effects/blobattack.ogg', 60, TRUE) + playsound(user, 'sound/effects/splat.ogg', 70, TRUE) + user.emote("gurgle") + shake_camera(user, 7, 7) user.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash) - user.clear_fullscreen("flash", 3.5) + user.clear_fullscreen("flash", 4.5) - if(84 to 93) + if(93 to 96) user.visible_message(span_danger("[user] slams head-first into [hit], suffering major cranial trauma!"), span_userdanger("You slam head-first into [hit], and the world explodes around you!")) user.adjustStaminaLoss(30) user.apply_damage(30, BRUTE, BODY_ZONE_HEAD) @@ -406,7 +427,7 @@ user.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash) user.clear_fullscreen("flash", 2.5) - if(64 to 83) + if(68 to 85) user.visible_message(span_danger("[user] slams hard into [hit], knocking [user.p_them()] senseless!"), span_userdanger("You slam hard into [hit], knocking yourself senseless!")) user.adjustStaminaLoss(30) user.apply_damage(10, BRUTE, ran_zone(BODY_ZONE_HEAD)) @@ -414,7 +435,7 @@ user.Knockdown(30) shake_camera(user, 3, 4) - if(1 to 63) + if(1 to 67) user.visible_message(span_danger("[user] slams into [hit]!"), span_userdanger("You slam into [hit]!")) user.adjustStaminaLoss(20) user.apply_damage(10, BRUTE, ran_zone(BODY_ZONE_HEAD)) @@ -450,8 +471,8 @@ user.visible_message(span_danger("[user] slams into [W] like a bug, then slowly slides off it!"), span_userdanger("You slam into [W] like a bug, then slowly slide off it!")) user.Paralyze(10) user.Knockdown(30) - W.take_damage(20 * speed) - user.adjustStaminaLoss(10 * speed) + W.take_damage(30 * speed) + user.adjustStaminaLoss(10 * speed, updating_health = FALSE) user.adjustBruteLoss(5 * speed) /datum/component/tackler/proc/delayedSmash(obj/structure/window/W) diff --git a/code/datums/components/taped.dm b/code/datums/components/taped.dm index 33a7e4681f5a..8e2001ebf016 100644 --- a/code/datums/components/taped.dm +++ b/code/datums/components/taped.dm @@ -50,7 +50,7 @@ /datum/component/taped/proc/tape_rip(datum/source, obj/item/attacker, mob/user) var/obj/item/I = attacker - if(!I.tool_behaviour == TOOL_WIRECUTTER || !I.sharpness >= IS_SHARP) + if(!I.tool_behaviour == TOOL_WIRECUTTER || !I.sharpness >= SHARP_EDGED) return playsound(parent, 'sound/items/poster_ripped.ogg', 30, TRUE, -2) user.visible_message(span_notice("[user] cuts and tears [taped_name] off \the [parent]."), span_notice("You finish peeling away all the [taped_name] from \the [parent].")) diff --git a/code/datums/elements/embed.dm b/code/datums/elements/embed.dm index 1d20293bf585..179ba9685929 100644 --- a/code/datums/elements/embed.dm +++ b/code/datums/elements/embed.dm @@ -1,5 +1,5 @@ /* - The presence of this element allows an item (or a projectile carrying an item) to embed itself in a human or turf when it is thrown into a target (whether by hand, gun, or explosive wave) with either + The presence of this element allows an item (or a projectile carrying an item) to embed itself in a carbon when it is thrown into a target (whether by hand, gun, or explosive wave) with either at least 4 throwspeed (EMBED_THROWSPEED_THRESHOLD) or ignore_throwspeed_threshold set to TRUE. Items meant to be used as shrapnel for projectiles should have ignore_throwspeed_threshold set to true. Whether we're dealing with a direct /obj/item (throwing a knife at someone) or an /obj/projectile with a shrapnel_type, how we handle things plays out the same, with one extra step separating them. @@ -9,8 +9,6 @@ Otherwise non-embeddable or stickable items can be made embeddable/stickable through wizard events/sticky tape/admin memes. */ -#define STANDARD_WALL_HARDNESS 40 - /datum/element/embed element_flags = ELEMENT_BESPOKE id_arg_index = 2 @@ -31,16 +29,14 @@ var/payload_type var/embed_chance_turf_mod -/datum/element/embed/Attach(datum/target, embed_chance, fall_chance, pain_chance, pain_mult, remove_pain_mult, impact_pain_mult, rip_time, ignore_throwspeed_threshold, jostle_chance, jostle_pain_mult, pain_stam_pct, embed_chance_turf_mod, projectile_payload=/obj/item/shard) +/datum/element/embed/Attach(datum/target, embed_chance, fall_chance, pain_chance, pain_mult, remove_pain_mult, impact_pain_mult, rip_time, ignore_throwspeed_threshold, jostle_chance, jostle_pain_mult, pain_stam_pct, projectile_payload=/obj/item/shard) . = ..() if(!isitem(target) && !isprojectile(target)) return ELEMENT_INCOMPATIBLE if(isitem(target)) - RegisterSignal(target, COMSIG_MOVABLE_IMPACT_ZONE, PROC_REF(checkEmbedMob)) - RegisterSignal(target, COMSIG_MOVABLE_IMPACT, PROC_REF(checkEmbedOther)) - RegisterSignal(target, COMSIG_ELEMENT_ATTACH, PROC_REF(severancePackage)) + RegisterSignal(target, COMSIG_MOVABLE_IMPACT_ZONE, PROC_REF(checkEmbed)) RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(examined)) RegisterSignal(target, COMSIG_EMBED_TRY_FORCE, PROC_REF(tryForceEmbed)) RegisterSignal(target, COMSIG_ITEM_DISABLE_EMBED, PROC_REF(detachFromWeapon)) @@ -56,7 +52,6 @@ src.jostle_chance = jostle_chance src.jostle_pain_mult = jostle_pain_mult src.pain_stam_pct = pain_stam_pct - src.embed_chance_turf_mod = embed_chance_turf_mod initialized = TRUE else payload_type = projectile_payload @@ -68,11 +63,11 @@ if(isitem(target)) UnregisterSignal(target, list(COMSIG_MOVABLE_IMPACT_ZONE, COMSIG_ELEMENT_ATTACH, COMSIG_MOVABLE_IMPACT, COMSIG_PARENT_EXAMINE, COMSIG_EMBED_TRY_FORCE, COMSIG_ITEM_DISABLE_EMBED)) else - UnregisterSignal(target, list(COMSIG_PROJECTILE_SELF_ON_HIT)) + UnregisterSignal(target, list(COMSIG_PROJECTILE_SELF_ON_HIT, COMSIG_ELEMENT_ATTACH)) /// Checking to see if we're gonna embed into a human -/datum/element/embed/proc/checkEmbedMob(obj/item/weapon, mob/living/carbon/victim, hit_zone, datum/thrownthing/throwingdatum, forced=FALSE) +/datum/element/embed/proc/checkEmbed(obj/item/weapon, mob/living/carbon/victim, hit_zone, datum/thrownthing/throwingdatum, forced=FALSE) SIGNAL_HANDLER if(!istype(victim) || HAS_TRAIT(victim, TRAIT_PIERCEIMMUNE)) @@ -81,7 +76,7 @@ var/actual_chance = embed_chance if(!weapon.isEmbedHarmless()) // all the armor in the world won't save you from a kick me sign - var/armor = max(victim.run_armor_check(hit_zone, "bullet", silent = TRUE), victim.run_armor_check(hit_zone, "bomb", silent = TRUE)) // we'll be nice and take the better of bullet and bomb armor + var/armor = max(victim.run_armor_check(hit_zone, "bullet", silent = TRUE), victim.run_armor_check(hit_zone, "bomb", silent = TRUE)) * 0.5 // we'll be nice and take the better of bullet and bomb armor, halved if(armor) // we only care about armor penetration if there's actually armor to penetrate var/pen_mod = -armor + weapon.armour_penetration // even a little bit of armor can make a big difference for shrapnel with large negative armor pen @@ -109,42 +104,7 @@ ignore_throwspeed_threshold = ignore_throwspeed_threshold,\ jostle_chance = jostle_chance,\ jostle_pain_mult = jostle_pain_mult,\ - pain_stam_pct = pain_stam_pct,\ - embed_chance_turf_mod = embed_chance_turf_mod) - - return TRUE - -/// We need the hit_zone if we're embedding into a human, so this proc only handles if we're embedding into a turf -/datum/element/embed/proc/checkEmbedOther(obj/item/weapon, turf/closed/hit, datum/thrownthing/throwingdatum, forced=FALSE) - if(!istype(hit)) - return - - var/chance = embed_chance + embed_chance_turf_mod - if(iswallturf(hit)) - var/turf/closed/wall/W = hit - chance += 2 * (W.hardness - STANDARD_WALL_HARDNESS) - - if(!forced && chance <= 0 || embed_chance_turf_mod <= -100) - return - - var/pass = ((((throwingdatum ? throwingdatum.speed : weapon.throw_speed) >= EMBED_THROWSPEED_THRESHOLD) || ignore_throwspeed_threshold) && prob(chance)) - if(!pass) - return - - hit.AddComponent(/datum/component/embedded,\ - weapon,\ - throwingdatum,\ - embed_chance = embed_chance,\ - fall_chance = fall_chance,\ - pain_chance = pain_chance,\ - pain_mult = pain_mult,\ - remove_pain_mult = remove_pain_mult,\ - rip_time = rip_time,\ - ignore_throwspeed_threshold = ignore_throwspeed_threshold,\ - jostle_chance = jostle_chance,\ - jostle_pain_mult = jostle_pain_mult,\ - pain_stam_pct = pain_stam_pct,\ - embed_chance_turf_mod = embed_chance_turf_mod) + pain_stam_pct = pain_stam_pct) return TRUE @@ -173,8 +133,8 @@ /** * checkEmbedProjectile() is what we get when a projectile with a defined shrapnel_type impacts a target. * - * If we hit a valid target (carbon or closed turf), we create the shrapnel_type object and immediately call tryEmbed() on it, targeting what we impacted. That will lead - * it to call tryForceEmbed() on its own embed element (it's out of our hands here, our projectile is done), where it will run through all the checks it needs to. + * If we hit a valid target, we create the shrapnel_type object and immediately call tryEmbed() on it, targeting what we impacted. That will lead + * it to call tryForceEmbed() on its own embed element (it's out of our hands here, our projectile is done), where it will run through all the checks it needs to. */ /datum/element/embed/proc/checkEmbedProjectile(obj/projectile/P, atom/movable/firer, atom/hit, angle, hit_zone) SIGNAL_HANDLER @@ -184,24 +144,27 @@ return // we don't care var/obj/item/payload = new payload_type(get_turf(hit)) + if(istype(payload, /obj/item/shrapnel/bullet)) + payload.name = P.name + payload.embedding = P.embedding + payload.updateEmbedding() + var/mob/living/carbon/C = hit var/obj/item/bodypart/limb = C.get_bodypart(hit_zone) - if(!limb) - limb = C.get_bodypart() + limb ||= C.get_bodypart() - if(!payload.tryEmbed(limb)) - payload.failedEmbed() + payload.tryEmbed(limb) Detach(P) /** * tryForceEmbed() is called here when we fire COMSIG_EMBED_TRY_FORCE from [/obj/item/proc/tryEmbed]. Mostly, this means we're a piece of shrapnel from a projectile that just impacted something, and we're trying to embed in it. * - * The reason for this extra mucking about is avoiding having to do an extra hitby(), and annoying the target by impacting them once with the projectile, then again with the shrapnel (which likely represents said bullet), and possibly - * AGAIN if we actually embed. This way, we save on at least one message. Runs the standard embed checks on the mob/turf. + * The reason for this extra mucking about is avoiding having to do an extra hitby(), and annoying the target by impacting them once with the projectile, then again with the shrapnel, and possibly + * AGAIN if we actually embed. This way, we save on at least one message. * * Arguments: - * * I- what we're trying to embed, obviously - * * target- what we're trying to shish-kabob, either a bodypart, a carbon, or a closed turf + * * I- the item we're trying to insert into the target + * * target- what we're trying to shish-kabob, either a bodypart or a carbon * * hit_zone- if our target is a carbon, try to hit them in this zone, if we don't have one, pick a random one. If our target is a bodypart, we already know where we're hitting. * * forced- if we want this to succeed 100% */ @@ -224,5 +187,4 @@ hit_zone = limb.body_zone C = limb.owner - if(C) - return checkEmbedMob(I, C, hit_zone, forced=TRUE) + return checkEmbed(I, C, hit_zone, forced=TRUE) diff --git a/code/datums/elements/kneecapping.dm b/code/datums/elements/kneecapping.dm new file mode 100644 index 000000000000..c4cb980252a3 --- /dev/null +++ b/code/datums/elements/kneecapping.dm @@ -0,0 +1,99 @@ +/** + * Kneecapping element replaces the item's disarm attack with an aimed attack at the kneecaps under certain circumstances. + * + * Element is incompatible with non-items. Requires the parent item to have a force equal to or greater than WOUND_MINIMUM_DAMAGE. + * Also requires that the parent can actually get past pre_attack without the attack chain cancelling. + * + * Kneecapping attacks have a wounding bonus between severe and critical+10 wound thresholds. Without some serious wound protecting + * armour this all but guarantees a wound of some sort. The attack is directed specifically at a limb and the limb takes the damage. + * + * Requires the attacker to be aiming for either leg zone, which will be targetted specifically. They will than have a 3-second long + * do_after before executing the attack. + * + * Kneecapping requires the target to either be on the floor, immobilised or buckled to something. And also to have an appropriate leg. + * + * Passing all the checks will cancel the entire attack chain. + */ +/datum/element/kneecapping + element_flags = ELEMENT_DETACH + +/datum/element/kneecapping/Attach(datum/target) + if(!isitem(target)) + stack_trace("Kneecapping element added to non-item object: \[[target]\]") + return ELEMENT_INCOMPATIBLE + + var/obj/item/target_item = target + + if(target_item.force < WOUND_MINIMUM_DAMAGE) + stack_trace("Kneecapping element added to item with too little force to wound: \[[target]\]") + return ELEMENT_INCOMPATIBLE + + . = ..() + + if(. == ELEMENT_INCOMPATIBLE) + return + + RegisterSignal(target, COMSIG_ITEM_ATTACK , .proc/try_kneecap_target) + +/datum/element/kneecapping/Detach(datum/target) + UnregisterSignal(target, COMSIG_ITEM_ATTACK) + + return ..() + +/** + * Signal handler for COMSIG_ITEM_ATTACK. Does checks for pacifism, zones and target state before either returning nothing + * if the special attack could not be attempted, performing the ordinary attack procs instead - Or cancelling the attack chain if + * the attack can be started. + */ +/datum/element/kneecapping/proc/try_kneecap_target(obj/item/source, mob/living/carbon/target, mob/attacker, params) + SIGNAL_HANDLER + if(!(attacker.a_intent == "disarm")) + return + + if((attacker.zone_selected != BODY_ZONE_L_LEG) && (attacker.zone_selected != BODY_ZONE_R_LEG)) + return + + if(HAS_TRAIT(attacker, TRAIT_PACIFISM)) + return + + if(!iscarbon(target)) + return + + if(!target.buckled && !HAS_TRAIT(target, TRAIT_FLOORED) && !HAS_TRAIT(target, TRAIT_IMMOBILIZED)) + return + + var/obj/item/bodypart/leg = target.get_bodypart(attacker.zone_selected) + + if(!leg) + return + + . = COMPONENT_ITEM_NO_ATTACK + + INVOKE_ASYNC(src, .proc/do_kneecap_target, source, leg, target, attacker) + +/** + * After a short do_after, attacker applies damage to the given leg with a significant wounding bonus, applying the weapon's force as damage. + */ +/datum/element/kneecapping/proc/do_kneecap_target(obj/item/weapon, obj/item/bodypart/leg, mob/living/carbon/target, mob/attacker) + if(LAZYACCESS(attacker.do_afters, weapon)) + return + + attacker.visible_message( + span_warning("[attacker] carefully aims [attacker.p_their()] [weapon] for a swing at [target]'s kneecaps"), + span_danger("You carefully aim \the [weapon] for a swing at [target]'s kneecaps!"), + ) + log_combat(attacker, target, "started aiming a swing to break the kneecaps of", weapon) + + if(do_after(attacker, SECONDS, target)) + attacker.visible_message( + span_warning("[attacker] swings [attacker.p_their()] [weapon] at [target]'s kneecaps!"), + span_danger("You swing \the [weapon] at [target]'s kneecaps!"), + ) + + var/datum/wound/blunt/severe/severe_wound_type = /datum/wound/blunt/severe + var/datum/wound/blunt/critical/critical_wound_type = /datum/wound/blunt/critical + leg.receive_damage(brute = weapon.force, wound_bonus = rand(initial(severe_wound_type.threshold_minimum), initial(critical_wound_type.threshold_minimum) + 10)) + log_combat(attacker, target, "broke the kneecaps of", weapon) + target.update_damage_overlays() + attacker.do_attack_animation(target, used_item = weapon) + playsound(source = get_turf(weapon), soundin = weapon.hitsound, vol = weapon.get_clamped_volume(), vary = TRUE) diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index f5ed58daa1ff..bd4d11a72be2 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -54,7 +54,7 @@ playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, TRUE, -1) var/atom/throw_target = get_edge_target_turf(D, A.dir) D.throw_at(throw_target, 7, 14, A) - D.apply_damage(15, A.dna.species.attack_type, BODY_ZONE_CHEST) + D.apply_damage(15, A.dna.species.attack_type, BODY_ZONE_CHEST, wound_bonus = CANT_WOUND) log_combat(A, D, "launchkicked (Sleeping Carp)") return @@ -63,13 +63,13 @@ A.do_attack_animation(D, ATTACK_EFFECT_KICK) playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, TRUE, -1) if(D.body_position == STANDING_UP) - D.apply_damage(10, A.dna.species.attack_type, BODY_ZONE_HEAD) + D.apply_damage(10, A.dna.species.attack_type, BODY_ZONE_HEAD, wound_bonus = CANT_WOUND) D.apply_damage(40, STAMINA, BODY_ZONE_HEAD) D.Knockdown(40) D.visible_message(span_warning("[A] kicks [D] in the head, sending them face first into the floor!"), \ span_userdanger("You are kicked in the head by [A], sending you crashing to the floor!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A) else - D.apply_damage(5, A.dna.species.attack_type, BODY_ZONE_HEAD) + D.apply_damage(5, A.dna.species.attack_type, BODY_ZONE_HEAD, wound_bonus = CANT_WOUND) D.apply_damage(40, STAMINA, BODY_ZONE_HEAD) D.drop_all_held_items() D.visible_message(span_warning("[A] kicks [D] in the head!"), \ @@ -94,7 +94,7 @@ D.visible_message(span_danger("[A] [atk_verb] [D]!"), \ span_userdanger("[A] [atk_verb]s you!"), null, null, A) to_chat(A, span_danger("You [atk_verb] [D]!")) - D.apply_damage(rand(10,15), BRUTE, affecting) + D.apply_damage(rand(10,15), BRUTE, affecting, wound_bonus = CANT_WOUND) playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, TRUE, -1) log_combat(A, D, "punched (Sleeping Carp)") return TRUE @@ -129,8 +129,7 @@ if(!.) return ADD_TRAIT(H, TRAIT_NOGUNS, SLEEPING_CARP_TRAIT) - ADD_TRAIT(H, TRAIT_PIERCEIMMUNE, SLEEPING_CARP_TRAIT) - ADD_TRAIT(H, TRAIT_STUNRESISTANCE, SLEEPING_CARP_TRAIT) + ADD_TRAIT(H, TRAIT_HARDLY_WOUNDED, SLEEPING_CARP_TRAIT) ADD_TRAIT(H, TRAIT_NODISMEMBER, SLEEPING_CARP_TRAIT) H.physiology.brute_mod *= 0.4 //brute is really not gonna cut it H.physiology.burn_mod *= 0.7 //burn is distinctly more useful against them than brute but they're still resistant @@ -145,8 +144,7 @@ /datum/martial_art/the_sleeping_carp/on_remove(mob/living/carbon/human/H) . = ..() REMOVE_TRAIT(H, TRAIT_NOGUNS, SLEEPING_CARP_TRAIT) - REMOVE_TRAIT(H, TRAIT_PIERCEIMMUNE, SLEEPING_CARP_TRAIT) - REMOVE_TRAIT(H, TRAIT_STUNRESISTANCE, SLEEPING_CARP_TRAIT) + REMOVE_TRAIT(H, TRAIT_HARDLY_WOUNDED, SLEEPING_CARP_TRAIT) REMOVE_TRAIT(H, TRAIT_NODISMEMBER, SLEEPING_CARP_TRAIT) H.physiology.brute_mod = initial(H.physiology.brute_mod) H.physiology.burn_mod = initial(H.physiology.burn_mod) @@ -158,6 +156,7 @@ H.faction -= "carp" //:( +/// Verb added to humans who learn the art of the sleeping carp. /mob/living/carbon/human/proc/sleeping_carp_help() set name = "Recall Teachings" set desc = "Remember the martial techniques of the Sleeping Carp clan." diff --git a/code/datums/mutations/actions.dm b/code/datums/mutations/actions.dm index 0c76ddc941dc..a293fb31e47a 100644 --- a/code/datums/mutations/actions.dm +++ b/code/datums/mutations/actions.dm @@ -214,9 +214,11 @@ throw_speed = 4 embedding = list("embedded_pain_multiplier" = 4, "embed_chance" = 100, "embedded_fall_chance" = 0, "embedded_ignore_throwspeed_threshold" = TRUE) w_class = WEIGHT_CLASS_SMALL - sharpness = IS_SHARP + sharpness = SHARP_POINTY custom_materials = list(/datum/material/biomass = 500) var/mob/living/carbon/human/fired_by + /// if we missed our target + var/missed = TRUE /obj/item/hardened_spike/Initialize(mapload, firedby) . = ..() @@ -224,13 +226,12 @@ addtimer(CALLBACK(src, PROC_REF(checkembedded)), 5 SECONDS) /obj/item/hardened_spike/proc/checkembedded() - if(ishuman(loc)) - var/mob/living/carbon/human/embedtest = loc - for(var/l in embedtest.bodyparts) - var/obj/item/bodypart/limb = l - if(src in limb.embedded_objects) - return limb - unembedded() + if(missed) + unembedded() + +/obj/item/hardened_spike/embedded(atom/target) + if(isbodypart(target)) + missed = FALSE /obj/item/hardened_spike/unembedded() var/turf/T = get_turf(src) @@ -266,7 +267,7 @@ var/been_places = FALSE var/datum/action/innate/send_chems/chems -/obj/item/hardened_spike/chem/embedded(mob/living/carbon/human/embedded_mob) +/obj/item/hardened_spike/chem/embedded(atom/embedded_target) if(been_places) return been_places = TRUE diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm index 766ba98bd5e6..84f7d05daaf6 100644 --- a/code/datums/mutations/body.dm +++ b/code/datums/mutations/body.dm @@ -484,13 +484,13 @@ head.drop_organs() qdel(head) owner.regenerate_icons() - RegisterSignal(owner, COMSIG_LIVING_ATTACH_LIMB, PROC_REF(abortattachment)) + RegisterSignal(owner, COMSIG_CARBON_ATTACH_LIMB, PROC_REF(abortattachment)) /datum/mutation/human/headless/on_losing() . = ..() if(.) return TRUE - UnregisterSignal(owner, COMSIG_LIVING_ATTACH_LIMB) + UnregisterSignal(owner, COMSIG_CARBON_ATTACH_LIMB) var/successful = owner.regenerate_limb(BODY_ZONE_HEAD, noheal = TRUE) //noheal needs to be TRUE to prevent weird adding and removing mutation healing if(!successful) stack_trace("HARS mutation head regeneration failed! (usually caused by headless syndrome having a head)") diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 015f86803855..78176b2eebb6 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -322,9 +322,18 @@ /datum/status_effect/neck_slice/tick() var/mob/living/carbon/human/H = owner - var/obj/item/bodypart/throat_in_question = H.get_bodypart(BODY_ZONE_HEAD) - if(H.stat == DEAD || throat_in_question?.bleeding <= 8) + var/obj/item/bodypart/throat = H.get_bodypart(BODY_ZONE_HEAD) + if(H.stat == DEAD || !throat) H.remove_status_effect(/datum/status_effect/neck_slice) + + var/still_bleeding = FALSE + for(var/datum/wound/W as anything in throat.wounds) + if(W.wound_type == WOUND_SLASH && W.severity > WOUND_SEVERITY_MODERATE) + still_bleeding = TRUE + break + if(!still_bleeding) + H.remove_status_effect(/datum/status_effect/neck_slice) + if(prob(10)) H.emote(pick("gasp", "gag", "choke")) diff --git a/code/datums/status_effects/wound_effects.dm b/code/datums/status_effects/wound_effects.dm new file mode 100644 index 000000000000..2d13516b1ca6 --- /dev/null +++ b/code/datums/status_effects/wound_effects.dm @@ -0,0 +1,232 @@ + +// The shattered remnants of your broken limbs fill you with determination! +/atom/movable/screen/alert/status_effect/determined + name = "Determined" + desc = "The serious wounds you've sustained have put your body into fight-or-flight mode! Now's the time to look for an exit!" + icon_state = "regenerative_core" + +/datum/status_effect/determined + id = "determined" + alert_type = /atom/movable/screen/alert/status_effect/determined + +/datum/status_effect/determined/on_apply() + . = ..() + owner.visible_message( + span_danger("[owner]'s body tenses up noticeably, gritting against [owner.p_their()] pain!"), + span_notice("Your senses sharpen as your body tenses up from the wounds you've sustained!"), + vision_distance = COMBAT_MESSAGE_RANGE, + ) + if(ishuman(owner)) + var/mob/living/carbon/human/human_owner = owner + human_owner.physiology.bleed_mod *= WOUND_DETERMINATION_BLEED_MOD + +/datum/status_effect/determined/on_remove() + owner.visible_message( + span_danger("[owner]'s body slackens noticeably!"), + span_warning("Your adrenaline rush dies off, and the pain from your wounds come aching back in..."), + vision_distance = COMBAT_MESSAGE_RANGE, + ) + if(ishuman(owner)) + var/mob/living/carbon/human/human_owner = owner + human_owner.physiology.bleed_mod /= WOUND_DETERMINATION_BLEED_MOD + return ..() + +/datum/status_effect/limp + id = "limp" + status_type = STATUS_EFFECT_REPLACE + tick_interval = 0 + alert_type = /atom/movable/screen/alert/status_effect/limp + var/msg_stage = 0//so you dont get the most intense messages immediately + /// The left leg of the limping person + var/obj/item/bodypart/leg/left/left + /// The right leg of the limping person + var/obj/item/bodypart/leg/right/right + /// Which leg we're limping with next + var/obj/item/bodypart/next_leg + /// How many deciseconds we limp for on the left leg + var/slowdown_left = 0 + /// How many deciseconds we limp for on the right leg + var/slowdown_right = 0 + /// The chance we limp with the left leg each step it takes + var/limp_chance_left = 0 + /// The chance we limp with the right leg each step it takes + var/limp_chance_right = 0 + +/datum/status_effect/limp/on_apply() + if(!iscarbon(owner)) + return FALSE + var/mob/living/carbon/C = owner + left = C.get_bodypart(BODY_ZONE_L_LEG) + right = C.get_bodypart(BODY_ZONE_R_LEG) + update_limp() + RegisterSignal(C, COMSIG_MOVABLE_MOVED, .proc/check_step) + RegisterSignal(C, list(COMSIG_CARBON_GAIN_WOUND, COMSIG_CARBON_LOSE_WOUND, COMSIG_CARBON_ATTACH_LIMB, COMSIG_CARBON_REMOVE_LIMB), .proc/update_limp) + return TRUE + +/datum/status_effect/limp/on_remove() + UnregisterSignal(owner, list(COMSIG_MOVABLE_MOVED, COMSIG_CARBON_GAIN_WOUND, COMSIG_CARBON_LOSE_WOUND, COMSIG_CARBON_ATTACH_LIMB, COMSIG_CARBON_REMOVE_LIMB)) + +/atom/movable/screen/alert/status_effect/limp + name = "Limping" + desc = "One or more of your legs has been wounded, slowing down steps with that leg! Get it fixed, or at least in a sling of gauze!" + +/datum/status_effect/limp/proc/check_step(mob/whocares, OldLoc, Dir, forced) + SIGNAL_HANDLER + + if(!owner.client || owner.body_position == LYING_DOWN || !owner.has_gravity() || (owner.movement_type & FLYING) || forced || owner.buckled) + return + + // less limping while we have determination still + var/determined_mod = owner.has_status_effect(STATUS_EFFECT_DETERMINED) ? 0.5 : 1 + + if(next_leg == left) + if(prob(limp_chance_left * determined_mod)) + owner.client.move_delay += slowdown_left * determined_mod + next_leg = right + else + if(prob(limp_chance_right * determined_mod)) + owner.client.move_delay += slowdown_right * determined_mod + next_leg = left + +/datum/status_effect/limp/proc/update_limp() + SIGNAL_HANDLER + + var/mob/living/carbon/C = owner + left = C.get_bodypart(BODY_ZONE_L_LEG) + right = C.get_bodypart(BODY_ZONE_R_LEG) + + if(!left && !right) + C.remove_status_effect(src) + return + + slowdown_left = 0 + slowdown_right = 0 + limp_chance_left = 0 + limp_chance_right = 0 + +// technically you can have multiple wounds causing limps on the same limb, even if practically only bone wounds cause it in normal gameplay + if(left) + for(var/datum/wound/W as anything in left.wounds) + slowdown_left += W.limp_slowdown + limp_chance_left = max(limp_chance_left, W.limp_chance) + + if(right) + for(var/datum/wound/W as anything in right.wounds) + + slowdown_right += W.limp_slowdown + limp_chance_right = max(limp_chance_right, W.limp_chance) + + // this handles losing your leg with the limp and the other one being in good shape as well + if(!slowdown_left && !slowdown_right) + C.remove_status_effect(src) + return + + +///////////////////////// +//////// WOUNDS ///////// +///////////////////////// + +// wound alert +/atom/movable/screen/alert/status_effect/wound + name = "Wounded" + desc = "Your body has sustained serious damage, click here to inspect yourself." + +/atom/movable/screen/alert/status_effect/wound/Click() + var/mob/living/carbon/C = usr + C.check_self_for_injuries() + +// wound status effect base +/datum/status_effect/wound + id = "wound" + status_type = STATUS_EFFECT_MULTIPLE + var/obj/item/bodypart/linked_limb + var/datum/wound/linked_wound + alert_type = NONE + +/datum/status_effect/wound/on_creation(mob/living/new_owner, incoming_wound) + . = ..() + linked_wound = incoming_wound + linked_limb = linked_wound.limb + +/datum/status_effect/wound/on_remove() + linked_wound = null + linked_limb = null + UnregisterSignal(owner, COMSIG_CARBON_LOSE_WOUND) + +/datum/status_effect/wound/on_apply() + if(!iscarbon(owner)) + return FALSE + RegisterSignal(owner, COMSIG_CARBON_LOSE_WOUND, .proc/check_remove) + return TRUE + +/// check if the wound getting removed is the wound we're tied to +/datum/status_effect/wound/proc/check_remove(mob/living/L, datum/wound/W) + SIGNAL_HANDLER + + if(W == linked_wound) + qdel(src) + +// bones +/datum/status_effect/wound/blunt + +/datum/status_effect/wound/blunt/on_apply() + . = ..() + RegisterSignal(owner, COMSIG_MOB_SWAP_HANDS, .proc/on_swap_hands) + on_swap_hands() + +/datum/status_effect/wound/blunt/on_remove() + . = ..() + UnregisterSignal(owner, COMSIG_MOB_SWAP_HANDS) + var/mob/living/carbon/wound_owner = owner + wound_owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/blunt_wound) + +/datum/status_effect/wound/blunt/proc/on_swap_hands() + SIGNAL_HANDLER + + var/mob/living/carbon/wound_owner = owner + if(wound_owner.get_active_hand() == linked_limb) + wound_owner.add_movespeed_modifier(/datum/movespeed_modifier/status_effect/blunt_wound, (linked_wound.interaction_efficiency_penalty - 1)) + else + wound_owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/blunt_wound) + +/datum/status_effect/wound/blunt/nextmove_modifier() + var/mob/living/carbon/C = owner + + if(C.get_active_hand() == linked_limb) + return linked_wound.interaction_efficiency_penalty + + return 1 + +// blunt +/datum/status_effect/wound/blunt/moderate + id = "disjoint" +/datum/status_effect/wound/blunt/severe + id = "hairline" +/datum/status_effect/wound/blunt/critical + id = "compound" +// slash +/datum/status_effect/wound/slash/moderate + id = "abrasion" +/datum/status_effect/wound/slash/severe + id = "laceration" +/datum/status_effect/wound/slash/critical + id = "avulsion" +// pierce +/datum/status_effect/wound/pierce/moderate + id = "breakage" +/datum/status_effect/wound/pierce/severe + id = "puncture" +/datum/status_effect/wound/pierce/critical + id = "rupture" +// burns +/datum/status_effect/wound/burn/moderate + id = "seconddeg" +/datum/status_effect/wound/burn/severe + id = "thirddeg" +/datum/status_effect/wound/burn/critical + id = "fourthdeg" +// muscle +/datum/status_effect/wound/muscle/moderate + id = "torn muscle" +/datum/status_effect/wound/muscle/severe + id = "ruptured tendon" diff --git a/code/datums/traits/negative/frail.dm b/code/datums/traits/negative/frail.dm index 2ceaadad5e11..7ef2514ed7f3 100644 --- a/code/datums/traits/negative/frail.dm +++ b/code/datums/traits/negative/frail.dm @@ -1,8 +1,8 @@ /datum/quirk/frail name = "Frail" - desc = "Your bones might as well be made of glass! Your limbs can take less damage before they become disabled." + desc = "You have skin of paper and bones of glass! You suffer wounds much more easily than most." value = -2 - mob_traits = list(TRAIT_EASYLIMBDISABLE) + mob_traits = TRAIT_EASILY_WOUNDED gain_text = span_danger("You feel frail.") lose_text = span_notice("You feel sturdy again.") - medical_record_text = "Patient has unusually frail bones, recommend calcium-rich diet." + medical_record_text = "Patient is absurdly easy to injure. Please take all due dilligence to avoid possible malpractice suits." diff --git a/code/datums/wounds/_wounds.dm b/code/datums/wounds/_wounds.dm new file mode 100644 index 000000000000..2564e919d76f --- /dev/null +++ b/code/datums/wounds/_wounds.dm @@ -0,0 +1,378 @@ +/* + Wounds are specific medical complications that can arise and be applied to (currently) carbons, with a focus on humans. All of the code for and related to this is heavily WIP, + and the documentation will be slanted towards explaining what each part/piece is leading up to, until such a time as I finish the core implementations. The original design doc + can be found at https://hackmd.io/@Ryll/r1lb4SOwU + + Wounds are datums that operate like a mix of diseases, brain traumas, and components, and are applied to a /obj/item/bodypart (preferably attached to a carbon) when they take large spikes of damage + or under other certain conditions (thrown hard against a wall, sustained exposure to plasma fire, etc). Wounds are categorized by the three following criteria: + 1. Severity: Either MODERATE, SEVERE, or CRITICAL. See the hackmd for more details + 2. Viable zones: What body parts the wound is applicable to. Generic wounds like broken bones and severe burns can apply to every zone, but you may want to add special wounds for certain limbs + like a twisted ankle for legs only, or open air exposure of the organs for particularly gruesome chest wounds. Wounds should be able to function for every zone they are marked viable for. + 3. Damage type: Currently either BRUTE or BURN. Again, see the hackmd for a breakdown of my plans for each type. + + When a body part suffers enough damage to get a wound, the severity (determined by a roll or something, worse damage leading to worse wounds), affected limb, and damage type sustained are factored into + deciding what specific wound will be applied. I'd like to have a few different types of wounds for at least some of the choices, but I'm just doing rough generals for now. Expect polishing +*/ + +/datum/wound + /// What it's named + var/name = "Wound" + /// The description shown on the scanners + var/desc = "" + /// The basic treatment suggested by health analyzers + var/treat_text = "" + /// What the limb looks like on a cursory examine + var/examine_desc = "is badly hurt" + + /// needed for "your arm has a compound fracture" vs "your arm has some third degree burns" + var/a_or_from = "a" + /// The visible message when this happens + var/occur_text = "" + /// This sound will be played upon the wound being applied + var/sound_effect + + /// Either WOUND_SEVERITY_TRIVIAL (meme wounds like stubbed toe), WOUND_SEVERITY_MODERATE, WOUND_SEVERITY_SEVERE, or WOUND_SEVERITY_CRITICAL (or maybe WOUND_SEVERITY_LOSS) + var/severity = WOUND_SEVERITY_MODERATE + /// The list of wounds it belongs in, WOUND_LIST_BLUNT, WOUND_LIST_SLASH, or WOUND_LIST_BURN + var/wound_type + + /// What body zones can we affect + var/list/viable_zones = list(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) + /// Who owns the body part that we're wounding + var/mob/living/carbon/victim = null + /// The bodypart we're parented to + var/obj/item/bodypart/limb = null + + /// Specific items such as bandages or sutures that can try directly treating this wound + var/list/treatable_by + /// Specific items such as bandages or sutures that can try directly treating this wound only if the user has the victim in an aggressive grab or higher + var/list/treatable_by_grabbed + /// Tools with the specified tool flag will also be able to try directly treating this wound + var/treatable_tool + /// How long it will take to treat this wound with a standard effective tool, assuming it doesn't need surgery + var/base_treat_time = 5 SECONDS + + /// Using this limb in a do_after interaction will multiply the length by this duration (arms) + var/interaction_efficiency_penalty = 1 + /// Incoming damage on this limb will be multiplied by this, to simulate tenderness and vulnerability (mostly burns). + var/damage_mulitplier_penalty = 1 + /// If set and this wound is applied to a leg, we take this many deciseconds extra per step on this leg + var/limp_slowdown + /// If this wound has a limp_slowdown and is applied to a leg, it has this chance to limp each step + var/limp_chance + /// How much we're contributing to this limb's bleed_rate + var/blood_flow + + /// The minimum we need to roll on [/obj/item/bodypart/proc/check_wounding] to begin suffering this wound, see check_wounding_mods() for more + var/threshold_minimum + /// How much having this wound will add to all future check_wounding() rolls on this limb, to allow progression to worse injuries with repeated damage + var/threshold_penalty + /// If we need to process each life tick + var/processes = FALSE + + /// If having this wound makes currently makes the parent bodypart unusable + var/disabling + + /// What status effect we assign on application + var/status_effect_type + /// The status effect we're linked to + var/datum/status_effect/linked_status_effect + /// If we're operating on this wound and it gets healed, we'll nix the surgery too + var/datum/surgery/attached_surgery + /// if you're a lazy git and just throw them in cryo, the wound will go away after accumulating severity * 25 power + var/cryo_progress + + /// What kind of scars this wound will create description wise once healed + var/scar_keyword = "generic" + /// If we've already tried scarring while removing (since remove_wound calls qdel, and qdel calls remove wound, .....) TODO: make this cleaner + var/already_scarred = FALSE + /// If we forced this wound through badmin smite, we won't count it towards the round totals + var/from_smite + + /// What flags apply to this wound + var/wound_flags = (FLESH_WOUND | BONE_WOUND | ACCEPTS_GAUZE) + +/datum/wound/Destroy() + if(attached_surgery) + QDEL_NULL(attached_surgery) + if(limb?.wounds && (src in limb.wounds)) // destroy can call remove_wound() and remove_wound() calls qdel, so we check to make sure there's anything to remove first + remove_wound() + set_limb(null) + victim = null + return ..() + +/** + * apply_wound() is used once a wound type is instantiated to assign it to a bodypart, and actually come into play. + * + * + * Arguments: + * * L: The bodypart we're wounding, we don't care about the person, we can get them through the limb + * * silent: Not actually necessary I don't think, was originally used for demoting wounds so they wouldn't make new messages, but I believe old_wound took over that, I may remove this shortly + * * old_wound: If our new wound is a replacement for one of the same time (promotion or demotion), we can reference the old one just before it's removed to copy over necessary vars + * * smited- If this is a smite, we don't care about this wound for stat tracking purposes (not yet implemented) + */ +/datum/wound/proc/apply_wound(obj/item/bodypart/L, silent = FALSE, datum/wound/old_wound = null, smited = FALSE) + if(!istype(L) || !L.owner || !(L.body_zone in viable_zones) || !IS_ORGANIC_LIMB(L) || HAS_TRAIT(L.owner, TRAIT_NEVER_WOUNDED)) + qdel(src) + return + + if(ishuman(L.owner)) + var/mob/living/carbon/human/H = L.owner + if(((wound_flags & BONE_WOUND) && !(HAS_BONE in H.dna.species.species_traits)) || ((wound_flags & FLESH_WOUND) && !(HAS_FLESH in H.dna.species.species_traits))) + qdel(src) + return + + // we accept promotions and demotions, but no point in redundancy. This should have already been checked wherever the wound was rolled and applied for (see: bodypart damage code), but we do an extra check + // in case we ever directly add wounds + for(var/i in L.wounds) + var/datum/wound/preexisting_wound = i + if((preexisting_wound.type == type) && (preexisting_wound != old_wound)) + qdel(src) + return + + victim = L.owner + set_limb(L) + LAZYADD(victim.all_wounds, src) + LAZYADD(limb.wounds, src) + limb.update_wounds() + if(status_effect_type) + linked_status_effect = victim.apply_status_effect(status_effect_type, src) + SEND_SIGNAL(victim, COMSIG_CARBON_GAIN_WOUND, src, limb) + if(!victim.alerts["wound"]) // only one alert is shared between all of the wounds + victim.throw_alert("wound", /atom/movable/screen/alert/status_effect/wound) + + var/demoted + if(old_wound) + demoted = (severity <= old_wound.severity) + + if(severity == WOUND_SEVERITY_TRIVIAL) + return + + if(!(silent || demoted)) + var/msg = "[victim]'s [limb.name] [occur_text]!" + var/vis_dist = COMBAT_MESSAGE_RANGE + + if(severity != WOUND_SEVERITY_MODERATE) + msg = "[msg]" + vis_dist = DEFAULT_MESSAGE_RANGE + + victim.visible_message(msg, "Your [limb.name] [occur_text]!", vision_distance = vis_dist) + if(sound_effect) + playsound(L.owner, sound_effect, 70 + 20 * severity, TRUE) + + if(!demoted) + wound_injury(old_wound) + second_wind() + +/// Remove the wound from whatever it's afflicting, and cleans up whateverstatus effects it had or modifiers it had on interaction times. ignore_limb is used for detachments where we only want to forget the victim +/datum/wound/proc/remove_wound(ignore_limb, replaced = FALSE) + //TODO: have better way to tell if we're getting removed without replacement (full heal) scar stuff + set_disabling(FALSE) + if(victim) + LAZYREMOVE(victim.all_wounds, src) + if(!victim.all_wounds) + victim.clear_alert("wound") + SEND_SIGNAL(victim, COMSIG_CARBON_LOSE_WOUND, src, limb) + if(limb && !ignore_limb) + LAZYREMOVE(limb.wounds, src) + limb.update_wounds(replaced) + +/** + * replace_wound() is used when you want to replace the current wound with a new wound, presumably of the same category, just of a different severity (either up or down counts) + * + * This proc actually instantiates the new wound based off the specific type path passed, then returns the new instantiated wound datum. + * + * Arguments: + * * new_type- The TYPE PATH of the wound you want to replace this, like /datum/wound/slash/severe + * * smited- If this is a smite, we don't care about this wound for stat tracking purposes (not yet implemented) + */ +/datum/wound/proc/replace_wound(new_type, smited = FALSE) + var/datum/wound/new_wound = new new_type + already_scarred = TRUE + remove_wound(replaced=TRUE) + new_wound.apply_wound(limb, old_wound = src, smited = smited) + . = new_wound + qdel(src) + +/// The immediate negative effects faced as a result of the wound +/datum/wound/proc/wound_injury(datum/wound/old_wound = null) + return + + +/// Proc called to change the variable `limb` and react to the event. +/datum/wound/proc/set_limb(new_value) + if(limb == new_value) + return FALSE //Limb can either be a reference to something or `null`. Returning the number variable makes it clear no change was made. + . = limb + limb = new_value + if(. && disabling) + var/obj/item/bodypart/old_limb = . + REMOVE_TRAIT(old_limb, TRAIT_PARALYSIS, src) + REMOVE_TRAIT(old_limb, TRAIT_DISABLED_BY_WOUND, src) + if(limb) + if(disabling) + ADD_TRAIT(limb, TRAIT_PARALYSIS, src) + ADD_TRAIT(limb, TRAIT_DISABLED_BY_WOUND, src) + + +/// Proc called to change the variable `disabling` and react to the event. +/datum/wound/proc/set_disabling(new_value) + if(disabling == new_value) + return + . = disabling + disabling = new_value + if(disabling) + if(!. && limb) //Gained disabling. + ADD_TRAIT(limb, TRAIT_PARALYSIS, src) + ADD_TRAIT(limb, TRAIT_DISABLED_BY_WOUND, src) + else if(. && limb) //Lost disabling. + REMOVE_TRAIT(limb, TRAIT_PARALYSIS, src) + REMOVE_TRAIT(limb, TRAIT_DISABLED_BY_WOUND, src) + if(limb?.can_be_disabled) + limb.update_disabled() + + +/// Additional beneficial effects when the wound is gained, in case you want to give a temporary boost to allow the victim to try an escape or last stand +/datum/wound/proc/second_wind() + switch(severity) + if(WOUND_SEVERITY_MODERATE) + victim.reagents.add_reagent(/datum/reagent/determination, WOUND_DETERMINATION_MODERATE) + if(WOUND_SEVERITY_SEVERE) + victim.reagents.add_reagent(/datum/reagent/determination, WOUND_DETERMINATION_SEVERE) + if(WOUND_SEVERITY_CRITICAL) + victim.reagents.add_reagent(/datum/reagent/determination, WOUND_DETERMINATION_CRITICAL) + if(WOUND_SEVERITY_LOSS) + victim.reagents.add_reagent(/datum/reagent/determination, WOUND_DETERMINATION_LOSS) + +/** + * try_treating() is an intercept run from [/mob/living/carbon/proc/attackby] right after surgeries but before anything else. Return TRUE here if the item is something that is relevant to treatment to take over the interaction. + * + * This proc leads into [/datum/wound/proc/treat] and probably shouldn't be added onto in children types. You can specify what items or tools you want to be intercepted + * with var/list/treatable_by and var/treatable_tool, then if an item fulfills one of those requirements and our wound claims it first, it goes over to treat() and treat_self(). + * + * Arguments: + * * I: The item we're trying to use + * * user: The mob trying to use it on us + */ +/datum/wound/proc/try_treating(obj/item/I, mob/user) + // first we weed out if we're not dealing with our wound's bodypart, or if it might be an attack + if(QDELETED(I) || limb.body_zone != user.zone_selected || (I.force && user.a_intent != INTENT_HELP)) + return FALSE + + var/allowed = FALSE + + // check if we have a valid treatable tool + if(I.tool_behaviour == treatable_tool) + allowed = TRUE + else if(treatable_tool == TOOL_CAUTERY && I.get_temperature() && user == victim) // allow improvised cauterization on yourself without an aggro grab + allowed = TRUE + // failing that, see if we're aggro grabbing them and if we have an item that works for aggro grabs only + else if(user.pulling == victim && user.grab_state >= GRAB_AGGRESSIVE && check_grab_treatments(I, user)) + allowed = TRUE + // failing THAT, we check if we have a generally allowed item + else + for(var/allowed_type in treatable_by) + if(istype(I, allowed_type)) + allowed = TRUE + break + + // if none of those apply, we return false to avoid interrupting + if(!allowed) + return FALSE + + // next we check if the bodypart in actually accessible (not under thick clothing). We skip the species trait check since skellies + // & such may need to use bone gel but may be wearing a space suit for..... whatever reason a skeleton would wear a space suit for + if(ishuman(victim)) + var/mob/living/carbon/human/victim_human = victim + if(!victim_human.can_inject(user, TRUE, ignore_species = TRUE)) + return TRUE + + // lastly, treat them + treat(I, user) + return TRUE + +/// Return TRUE if we have an item that can only be used while aggro grabbed (unhanded aggro grab treatments go in [/datum/wound/proc/try_handling]). Treatment is still is handled in [/datum/wound/proc/treat] +/datum/wound/proc/check_grab_treatments(obj/item/I, mob/user) + return FALSE + +/// Like try_treating() but for unhanded interactions from humans, used by joint dislocations for manual bodypart chiropractice for example. Ignores thick material checks since you can pop an arm into place through a thick suit unlike using sutures +/datum/wound/proc/try_handling(mob/living/carbon/human/user) + return FALSE + +/// Someone is using something that might be used for treating the wound on this limb +/datum/wound/proc/treat(obj/item/I, mob/user) + return + +/// If var/processing is TRUE, this is run on each life tick +/datum/wound/proc/handle_process() + return + +/// For use in do_after callback checks +/datum/wound/proc/still_exists() + return (!QDELETED(src) && limb) + +/// When our parent bodypart is hurt +/datum/wound/proc/receive_damage(wounding_type, wounding_dmg, wound_bonus) + return + +/// Called from cryoxadone and pyroxadone when they're proc'ing. Wounds will slowly be fixed separately from other methods when these are in effect. crappy name but eh +/datum/wound/proc/on_xadone(power) + cryo_progress += power + if(cryo_progress > 33 * severity) + qdel(src) + +/// When synthflesh is applied to the victim, we call this. No sense in setting up an entire chem reaction system for wounds when we only care for a few chems. Probably will change in the future +/datum/wound/proc/on_synthflesh(power) + return + +/// Called when the patient is undergoing stasis, so that having fully treated a wound doesn't make you sit there helplessly until you think to unbuckle them +/datum/wound/proc/on_stasis() + return + +/// Used when we're being dragged while bleeding, the value we return is how much bloodloss this wound causes from being dragged. Since it's a proc, you can let bandages soak some of the blood +/datum/wound/proc/drag_bleed_amount() + return + +/** + * get_bleed_rate_of_change() is used in [/mob/living/carbon/proc/bleed_warn] to gauge whether this wound (if bleeding) is becoming worse, better, or staying the same over time + * + * Returns BLOOD_FLOW_STEADY if we're not bleeding or there's no change (like piercing), BLOOD_FLOW_DECREASING if we're clotting (non-critical slashes, gauzed, coagulant, etc), BLOOD_FLOW_INCREASING if we're opening up (crit slashes/heparin) + */ +/datum/wound/proc/get_bleed_rate_of_change() + if(blood_flow && HAS_TRAIT(victim, TRAIT_BLOODY_MESS)) + return BLOOD_FLOW_INCREASING + return BLOOD_FLOW_STEADY + +/** + * get_examine_description() is used in carbon/examine and human/examine to show the status of this wound. Useful if you need to show some status like the wound being splinted or bandaged. + * + * Return the full string line you want to show, note that we're already dealing with the 'warning' span at this point, and that \n is already appended for you in the place this is called from + * + * Arguments: + * * mob/user: The user examining the wound's owner, if that matters + */ +/datum/wound/proc/get_examine_description(mob/user) + . = "[victim.p_their(TRUE)] [limb.name] [examine_desc]" + . = severity <= WOUND_SEVERITY_MODERATE ? "[.]." : "[.]!" + +/datum/wound/proc/get_scanner_description(mob/user) + return "Type: [name]\nSeverity: [severity_text()]\nDescription: [desc]\nRecommended Treatment: [treat_text]" + +/datum/wound/proc/severity_text() + switch(severity) + if(WOUND_SEVERITY_TRIVIAL) + return "Trivial" + if(WOUND_SEVERITY_MODERATE) + return "Moderate" + if(WOUND_SEVERITY_SEVERE) + return "Severe" + if(WOUND_SEVERITY_CRITICAL) + return "Critical" + +/// Whether we should show an interactable topic in examines of the wound. href_list["wound_topic"] +/datum/wound/proc/show_wound_topic(mob/user) + return FALSE + +/// Gets the name of the wound with any interactable topic if possible +/datum/wound/proc/get_topic_name(mob/user) + return show_wound_topic(user) ? "[lowertext(name)]" : lowertext(name) diff --git a/code/datums/wounds/bones.dm b/code/datums/wounds/bones.dm new file mode 100644 index 000000000000..d71846fa1a3a --- /dev/null +++ b/code/datums/wounds/bones.dm @@ -0,0 +1,496 @@ + +/* + Blunt/Bone wounds +*/ +// TODO: well, a lot really, but i'd kill to get overlays and a bonebreaking effect like Blitz: The League, similar to electric shock skeletons + +/datum/wound/blunt + name = "Blunt (Bone) Wound" + sound_effect = 'sound/effects/wounds/crack1.ogg' + wound_type = WOUND_BLUNT + wound_flags = (BONE_WOUND | ACCEPTS_SPLINT) + + /// Have we been bone gel'd? + var/gelled + /// Have we been taped? + var/taped + /// If we did the gel + surgical tape healing method for fractures, how many ticks does it take to heal by default + var/regen_ticks_needed + /// Our current counter for gel + surgical tape regeneration + var/regen_ticks_current + /// If we suffer severe head booboos, we can get brain traumas tied to them + var/datum/brain_trauma/active_trauma + /// What brain trauma group, if any, we can draw from for head wounds + var/brain_trauma_group + /// If we deal brain traumas, when is the next one due? + var/next_trauma_cycle + /// How long do we wait +/- 20% for the next trauma? + var/trauma_cycle_cooldown + /// If this is a chest wound and this is set, we have this chance to cough up blood when hit in the chest + var/internal_bleeding_chance = 0 + +/* + Overwriting of base procs +*/ +/datum/wound/blunt/wound_injury(datum/wound/old_wound = null) + // hook into gaining/losing gauze so crit bone wounds can re-enable/disable depending if they're slung or not + RegisterSignal(limb, list(COMSIG_BODYPART_SPLINTED, COMSIG_BODYPART_SPLINT_DESTROYED), .proc/update_inefficiencies) + + if(limb.body_zone == BODY_ZONE_HEAD && brain_trauma_group) + processes = TRUE + active_trauma = victim.gain_trauma_type(brain_trauma_group, TRAUMA_RESILIENCE_WOUND) + next_trauma_cycle = world.time + (rand(100-WOUND_BONE_HEAD_TIME_VARIANCE, 100+WOUND_BONE_HEAD_TIME_VARIANCE) * 0.01 * trauma_cycle_cooldown) + + RegisterSignal(victim, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, .proc/attack_with_hurt_hand) + if(limb.held_index && victim.get_item_for_held_index(limb.held_index) && (disabling || prob(30 * severity))) + var/obj/item/I = victim.get_item_for_held_index(limb.held_index) + if(istype(I, /obj/item/offhand)) + I = victim.get_inactive_held_item() + + if(I && victim.dropItemToGround(I)) + victim.visible_message("[victim] drops [I] in shock!", "The force on your [limb.name] causes you to drop [I]!", vision_distance=COMBAT_MESSAGE_RANGE) + + update_inefficiencies() + +/datum/wound/blunt/remove_wound(ignore_limb, replaced) + limp_slowdown = 0 + limp_chance = 0 + QDEL_NULL(active_trauma) + if(limb) + UnregisterSignal(limb, list(COMSIG_BODYPART_GAUZED, COMSIG_BODYPART_GAUZE_DESTROYED)) + if(victim) + UnregisterSignal(victim, COMSIG_HUMAN_EARLY_UNARMED_ATTACK) + return ..() + +/datum/wound/blunt/handle_process(delta_time, times_fired) + . = ..() + if(limb.body_zone == BODY_ZONE_HEAD && brain_trauma_group && world.time > next_trauma_cycle) + if(active_trauma) + QDEL_NULL(active_trauma) + else + active_trauma = victim.gain_trauma_type(brain_trauma_group, TRAUMA_RESILIENCE_WOUND) + next_trauma_cycle = world.time + (rand(100-WOUND_BONE_HEAD_TIME_VARIANCE, 100+WOUND_BONE_HEAD_TIME_VARIANCE) * 0.01 * trauma_cycle_cooldown) + + var/is_bone_creature = victim.get_biological_state() == BIO_JUST_BONE + if(!gelled || (!taped && !is_bone_creature)) + return + + regen_ticks_current++ + if(victim.body_position == LYING_DOWN) + if(prob(50)) + regen_ticks_current += 1 + if(victim.IsSleeping() && prob(50)) + regen_ticks_current += 1 + + if(!is_bone_creature && DT_PROB(severity * 1.5, delta_time)) + victim.take_bodypart_damage(rand(1, severity * 2), stamina=rand(2, severity * 2.5), wound_bonus=CANT_WOUND) + if(prob(33)) + to_chat(victim, "You feel a sharp pain in your body as your bones are reforming!") + + if(regen_ticks_current > regen_ticks_needed) + if(!victim || !limb) + qdel(src) + return + to_chat(victim, "Your [limb.name] has recovered from its [name]!") + remove_wound() + +/// If we're a human who's punching something with a broken arm, we might hurt ourselves doing so +/datum/wound/blunt/proc/attack_with_hurt_hand(mob/M, atom/target, proximity) + SIGNAL_HANDLER + + if(victim.get_active_hand() != limb || victim.a_intent == INTENT_HELP || !ismob(target) || severity <= WOUND_SEVERITY_MODERATE) + return + + // With a severe or critical wound, you have a 15% or 30% chance to proc pain on hit + if(prob((severity - 1) * 15)) + // And you have a 70% or 50% chance to actually land the blow, respectively + if(prob(70 - 20 * (severity - 1))) + to_chat(victim, "The fracture in your [limb.name] shoots with pain as you strike [target]!") + limb.receive_damage(brute=rand(1,5)) + else + victim.visible_message("[victim] weakly strikes [target] with [victim.p_their()] broken [limb.name], recoiling from pain!", \ + "You fail to strike [target] as the fracture in your [limb.name] lights up in unbearable pain!", vision_distance=COMBAT_MESSAGE_RANGE) + INVOKE_ASYNC(victim, /mob.proc/emote, "scream") + victim.Stun(0.5 SECONDS) + limb.receive_damage(brute=rand(3,7)) + return COMPONENT_NO_ATTACK_HAND + + +/datum/wound/blunt/receive_damage(wounding_type, wounding_dmg, wound_bonus) + if(!victim || wounding_dmg < WOUND_MINIMUM_DAMAGE) + return + if(ishuman(victim)) + var/mob/living/carbon/human/human_victim = victim + if(NOBLOOD in human_victim.dna?.species.species_traits) + return + + if(limb.body_zone == BODY_ZONE_CHEST && victim.blood_volume && prob(internal_bleeding_chance + wounding_dmg)) + var/blood_bled = rand(1, wounding_dmg * (severity == WOUND_SEVERITY_CRITICAL ? 2 : 1.5)) // 12 brute toolbox can cause up to 18/24 bleeding with a severe/critical chest wound + switch(blood_bled) + if(1 to 6) + victim.bleed(blood_bled, TRUE) + if(7 to 13) + victim.visible_message("[victim] coughs up a bit of blood from the blow to [victim.p_their()] chest.", "You cough up a bit of blood from the blow to your chest.", vision_distance=COMBAT_MESSAGE_RANGE) + victim.bleed(blood_bled, TRUE) + if(14 to 19) + victim.visible_message("[victim] spits out a string of blood from the blow to [victim.p_their()] chest!", "You spit out a string of blood from the blow to your chest!", 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("[victim] chokes up a spray of blood from the blow to [victim.p_their()] chest!", "You choke up on a spray of blood from the blow to your chest!", 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/blunt/get_examine_description(mob/user) + if(!limb.current_splint && !gelled && !taped) + return ..() + + var/list/msg = list() + if(!limb.current_splint) + msg += "[victim.p_their(TRUE)] [limb.name] [examine_desc]" + else + var/sling_condition = "" + // how much life we have left in these bandages + switch(limb.current_splint.sling_condition) + if(0 to 1.25) + sling_condition = "just barely" + if(1.25 to 2.75) + sling_condition = "loosely" + if(2.75 to 4) + sling_condition = "mostly" + if(4 to INFINITY) + sling_condition = "tightly" + + msg += "[victim.p_their(TRUE)] [limb.name] is [sling_condition] fastened with a [limb.current_splint.name]" + + if(taped) + msg += ", and appears to be reforming itself under some surgical tape!" + else if(gelled) + msg += ", with fizzing flecks of blue bone gel sparking off the bone!" + else + msg += "!" + return "[msg.Join()]" + +/* + New common procs for /datum/wound/blunt/ +*/ + +/datum/wound/blunt/proc/update_inefficiencies() + SIGNAL_HANDLER + + if(limb.body_zone in list(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) + if(limb.current_splint?.splint_factor) + limp_slowdown = initial(limp_slowdown) * limb.current_splint.splint_factor + limp_chance = initial(limp_chance) * limb.current_splint.splint_factor + else + limp_slowdown = initial(limp_slowdown) + limp_chance = initial(limp_chance) + victim.apply_status_effect(STATUS_EFFECT_LIMP) + else if(limb.body_zone in list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) + if(limb.current_splint?.splint_factor) + interaction_efficiency_penalty = 1 + ((interaction_efficiency_penalty - 1) * limb.current_splint.splint_factor) + else + interaction_efficiency_penalty = interaction_efficiency_penalty + interaction_efficiency_penalty = initial(interaction_efficiency_penalty) + + if(initial(disabling)) + if(limb.current_splint && limb.current_splint.helps_disabled) + set_disabling(FALSE) + else + set_disabling(TRUE) + + limb.update_wounds() + +/// Joint Dislocation (Moderate Blunt) +/datum/wound/blunt/moderate + name = "Joint Dislocation" + desc = "Patient's bone has been unset from socket, causing pain and reduced motor function." + treat_text = "Recommended application of bonesetter to affected limb, though manual relocation by applying an aggressive grab to the patient and helpfully interacting with afflicted limb may suffice." + examine_desc = "is awkwardly janked out of place" + occur_text = "janks violently and becomes unseated" + severity = WOUND_SEVERITY_MODERATE + viable_zones = list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) + interaction_efficiency_penalty = 1.3 + limp_slowdown = 3 + limp_chance = 50 + threshold_minimum = 35 + threshold_penalty = 15 + treatable_tool = TOOL_BONESET + wound_flags = (BONE_WOUND) + status_effect_type = /datum/status_effect/wound/blunt/moderate + scar_keyword = "bluntmoderate" + +/datum/wound/blunt/moderate/Destroy() + if(victim) + UnregisterSignal(victim, COMSIG_LIVING_DOORCRUSHED) + return ..() + +/datum/wound/blunt/moderate/wound_injury(datum/wound/old_wound) + . = ..() + RegisterSignal(victim, COMSIG_LIVING_DOORCRUSHED, .proc/door_crush) + +/// Getting smushed in an airlock/firelock is a last-ditch attempt to try relocating your limb +/datum/wound/blunt/moderate/proc/door_crush() + if(prob(40)) + victim.visible_message("[victim]'s dislocated [limb.name] pops back into place!", "Your dislocated [limb.name] pops back into place! Ow!") + remove_wound() + +/datum/wound/blunt/moderate/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(user.grab_state == GRAB_PASSIVE) + to_chat(user, "You must have [victim] in an aggressive grab to manipulate [victim.p_their()] [lowertext(name)]!") + return TRUE + + if(user.grab_state >= GRAB_AGGRESSIVE) + user.visible_message("[user] begins twisting and straining [victim]'s dislocated [limb.name]!", "You begin twisting and straining [victim]'s dislocated [limb.name]...", ignored_mobs=victim) + to_chat(victim, "[user] begins twisting and straining your dislocated [limb.name]!") + if(user.a_intent == INTENT_HELP) + chiropractice(user) + else + malpractice(user) + return TRUE + +/// If someone is snapping our dislocated joint back into place by hand with an aggro grab and help intent +/datum/wound/blunt/moderate/proc/chiropractice(mob/living/carbon/human/user) + var/time = base_treat_time + + if(!do_after(user, time, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + return + + if(prob(65)) + user.visible_message("[user] snaps [victim]'s dislocated [limb.name] back into place!", "You snap [victim]'s dislocated [limb.name] back into place!", ignored_mobs=victim) + to_chat(victim, "[user] snaps your dislocated [limb.name] back into place!") + victim.emote("scream") + limb.receive_damage(brute=20, wound_bonus=CANT_WOUND) + qdel(src) + else + user.visible_message("[user] wrenches [victim]'s dislocated [limb.name] around painfully!", "You wrench [victim]'s dislocated [limb.name] around painfully!", ignored_mobs=victim) + to_chat(victim, "[user] wrenches your dislocated [limb.name] around painfully!") + limb.receive_damage(brute=10, wound_bonus=CANT_WOUND) + chiropractice(user) + +/// If someone is snapping our dislocated joint into a fracture by hand with an aggro grab and harm or disarm intent +/datum/wound/blunt/moderate/proc/malpractice(mob/living/carbon/human/user) + var/time = base_treat_time + + if(!do_after(user, time, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + return + + if(prob(65)) + user.visible_message("[user] snaps [victim]'s dislocated [limb.name] with a sickening crack!", "You snap [victim]'s dislocated [limb.name] with a sickening crack!", ignored_mobs=victim) + to_chat(victim, "[user] snaps your dislocated [limb.name] with a sickening crack!") + victim.emote("scream") + limb.receive_damage(brute=25, wound_bonus=30) + else + user.visible_message("[user] wrenches [victim]'s dislocated [limb.name] around painfully!", "You wrench [victim]'s dislocated [limb.name] around painfully!", ignored_mobs=victim) + to_chat(victim, "[user] wrenches your dislocated [limb.name] around painfully!") + limb.receive_damage(brute=10, wound_bonus=CANT_WOUND) + malpractice(user) + + +/datum/wound/blunt/moderate/treat(obj/item/I, mob/user) + if(victim == user) + victim.visible_message("[user] begins resetting [victim.p_their()] [limb.name] with [I].", "You begin resetting your [limb.name] with [I]...") + else + user.visible_message("[user] begins resetting [victim]'s [limb.name] with [I].", "You begin resetting [victim]'s [limb.name] with [I]...") + + if(!do_after(user, base_treat_time * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, .proc/still_exists))) + return + + if(victim == user) + limb.receive_damage(brute=15, wound_bonus=CANT_WOUND) + victim.visible_message("[user] finishes resetting [victim.p_their()] [limb.name]!", "You reset your [limb.name]!") + else + limb.receive_damage(brute=10, wound_bonus=CANT_WOUND) + user.visible_message("[user] finishes resetting [victim]'s [limb.name]!", "You finish resetting [victim]'s [limb.name]!", ignored_mobs=victim) + to_chat(victim, "[user] resets your [limb.name]!") + + victim.emote("scream") + qdel(src) + +/* + Severe (Hairline Fracture) +*/ + +/datum/wound/blunt/severe + name = "Hairline Fracture" + desc = "Patient's bone has suffered a crack in the foundation, causing serious pain and reduced limb functionality." + treat_text = "Recommended light surgical application of bone gel, though a sling of medical gauze will prevent worsening situation." + examine_desc = "appears grotesquely swollen, jagged bumps hinting at chips in the bone" + occur_text = "sprays chips of bone and develops a nasty looking bruise" + + severity = WOUND_SEVERITY_SEVERE + interaction_efficiency_penalty = 2 + limp_slowdown = 6 + limp_chance = 60 + threshold_minimum = 60 + threshold_penalty = 30 + treatable_by = list(/obj/item/stack/sticky_tape/surgical, /obj/item/stack/medical/bone_gel) + status_effect_type = /datum/status_effect/wound/blunt/severe + scar_keyword = "bluntsevere" + brain_trauma_group = BRAIN_TRAUMA_MILD + trauma_cycle_cooldown = 1.5 MINUTES + internal_bleeding_chance = 40 + wound_flags = (BONE_WOUND | ACCEPTS_SPLINT | MANGLES_BONE) + regen_ticks_needed = 120 // ticks every 2 seconds, 240 seconds, so roughly 4 minutes default + +/// Compound Fracture (Critical Blunt) +/datum/wound/blunt/critical + name = "Compound Fracture" + desc = "Patient's bones have suffered multiple gruesome fractures, causing significant pain and near uselessness of limb." + treat_text = "Immediate binding of affected limb, followed by surgical intervention ASAP." + examine_desc = "is thoroughly pulped and cracked, exposing shards of bone to open air" + occur_text = "cracks apart, exposing broken bones to open air" + + severity = WOUND_SEVERITY_CRITICAL + interaction_efficiency_penalty = 2.5 + limp_slowdown = 7 + limp_chance = 70 + limp_slowdown = 9 + sound_effect = 'sound/effects/wounds/crack2.ogg' + threshold_minimum = 115 + threshold_penalty = 50 + disabling = TRUE + treatable_by = list(/obj/item/stack/sticky_tape/surgical, /obj/item/stack/medical/bone_gel) + status_effect_type = /datum/status_effect/wound/blunt/critical + scar_keyword = "bluntcritical" + brain_trauma_group = BRAIN_TRAUMA_SEVERE + trauma_cycle_cooldown = 2.5 MINUTES + internal_bleeding_chance = 60 + wound_flags = (BONE_WOUND | ACCEPTS_SPLINT | MANGLES_BONE) + regen_ticks_needed = 240 // ticks every 2 seconds, 480 seconds, so roughly 8 minutes default + +// doesn't make much sense for "a" bone to stick out of your head +/datum/wound/blunt/critical/apply_wound(obj/item/bodypart/L, silent, datum/wound/old_wound, smited) + if(L.body_zone == BODY_ZONE_HEAD) + occur_text = "splits open, exposing a bare, cracked skull through the flesh and blood" + examine_desc = "has an unsettling indent, with bits of skull poking out" + . = ..() + +/// if someone is using bone gel on our wound +/datum/wound/blunt/proc/gel(obj/item/stack/medical/bone_gel/I, mob/user) + // skellies get treated nicer with bone gel since their "reattach dismembered limbs by hand" ability sucks when it's still critically wounded + if(victim.get_biological_state() == BIO_JUST_BONE) + skelly_gel(I, user) + return + if(gelled) + to_chat(user, "[user == victim ? "Your" : "[victim]'s"] [limb.name] is already coated with bone gel!") + return + + user.visible_message("[user] begins hastily applying [I] to [victim]'s' [limb.name]...", "You begin hastily applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.name], disregarding the warning label...") + + if(!do_after(user, base_treat_time * 1.5 * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, .proc/still_exists))) + return + + I.use(1) + victim.emote("scream") + if(user != victim) + user.visible_message("[user] finishes applying [I] to [victim]'s [limb.name], emitting a fizzing noise!", "You finish applying [I] to [victim]'s [limb.name]!", ignored_mobs=victim) + to_chat(victim, "[user] finishes applying [I] to your [limb.name], and you can feel the bones exploding with pain as they begin melting and reforming!") + else + var/painkiller_bonus = 0 + if(victim.drunkenness > 10) + painkiller_bonus += 10 + if(victim.reagents.has_reagent(/datum/reagent/medicine/morphine)) + painkiller_bonus += 20 + if(victim.reagents.has_reagent(/datum/reagent/determination)) + painkiller_bonus += 10 + if(victim.reagents.has_reagent(/datum/reagent/consumable/ethanol/painkiller)) + painkiller_bonus += 15 + if(victim.reagents.has_reagent(/datum/reagent/medicine/mine_salve)) + painkiller_bonus += 20 + + if(prob(25 + (20 * (severity - 2)) - painkiller_bonus)) // 25%/45% chance to fail self-applying with severe and critical wounds, modded by painkillers + victim.visible_message("[victim] fails to finish applying [I] to [victim.p_their()] [limb.name], passing out from the pain!", "You pass out from the pain of applying [I] to your [limb.name] before you can finish!") + victim.AdjustUnconscious(5 SECONDS) + return + victim.visible_message("[victim] finishes applying [I] to [victim.p_their()] [limb.name], grimacing from the pain!", "You finish applying [I] to your [limb.name], and your bones explode in pain!") + + limb.receive_damage(25, stamina=100, wound_bonus=CANT_WOUND) + gelled = TRUE + +/// skellies are less averse to bone gel, since they're literally all bone +/datum/wound/blunt/proc/skelly_gel(obj/item/stack/medical/bone_gel/I, mob/user) + if(victim.get_biological_state() != BIO_JUST_BONE) + return // poser + + if(gelled) + to_chat(user, "[user == victim ? "Your" : "[victim]'s"] [limb.name] is already coated with bone gel!") + return + + 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, base_treat_time * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, .proc/still_exists))) + return + + I.use(1) + if(user != victim) + user.visible_message("[user] finishes applying [I] to [victim]'s [limb.name], emitting a fizzing noise!", "You finish applying [I] to [victim]'s [limb.name]!", ignored_mobs=victim) + to_chat(victim, "[user] finishes applying [I] to your [limb.name], and you feel a funny fizzy tickling as they begin to reform!") + else + victim.visible_message("[victim] finishes applying [I] to [victim.p_their()] [limb.name], emitting a funny fizzing sound!", "You finish applying [I] to your [limb.name], and feel a funny fizzy tickling as the bone begins to reform!") + + gelled = TRUE + processes = TRUE + +/// if someone is using surgical tape on our wound +/datum/wound/blunt/proc/tape(obj/item/stack/sticky_tape/surgical/I, mob/user) + if(!gelled) + to_chat(user, "[user == victim ? "Your" : "[victim]'s"] [limb.name] must be coated with bone gel to perform this emergency operation!") + return + if(taped) + to_chat(user, "[user == victim ? "Your" : "[victim]'s"] [limb.name] is already wrapped in [I.name] and reforming!") + return + + 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, base_treat_time * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, .proc/still_exists))) + return + + if(victim == user) + regen_ticks_needed *= 1.5 + + I.use(1) + if(user != victim) + user.visible_message("[user] finishes applying [I] to [victim]'s [limb.name], emitting a fizzing noise!", "You finish applying [I] to [victim]'s [limb.name]!", ignored_mobs=victim) + to_chat(victim, "[user] finishes applying [I] to your [limb.name], you immediately begin to feel your bones start to reform!") + else + victim.visible_message("[victim] finishes applying [I] to [victim.p_their()] [limb.name], !", "You finish applying [I] to your [limb.name], and you immediately begin to feel your bones start to reform!") + + taped = TRUE + processes = TRUE + +/datum/wound/blunt/treat(obj/item/I, mob/user) + if(istype(I, /obj/item/stack/medical/bone_gel)) + gel(I, user) + else if(istype(I, /obj/item/stack/sticky_tape/surgical)) + tape(I, user) + +/datum/wound/blunt/get_scanner_description(mob/user) + . = ..() + + . += "
" + + if(severity > WOUND_SEVERITY_MODERATE) + if(victim.get_biological_state() == BIO_JUST_BONE) + if(!gelled) + . += "Recommended Treatment: Apply bone gel directly to injured limb. Creatures of pure bone don't seem to mind bone gel application nearly as much as fleshed individuals. Surgical tape will also be unnecessary.\n" + else + . += "Note: Bone regeneration in effect. Bone is [round(regen_ticks_current*100/regen_ticks_needed)]% regenerated.\n" + else + if(!gelled) + . += "Alternative Treatment: Apply bone gel directly to injured limb, then apply surgical tape to begin bone regeneration. This is both excruciatingly painful and slow, and only recommended in dire circumstances.\n" + 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, though sleep or laying down will speed recovery.\n" + else + . += "Note: Bone regeneration in effect. Bone is [round(regen_ticks_current*100/regen_ticks_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." + else if(limb.body_zone == BODY_ZONE_CHEST && victim.blood_volume) + . += "Ribcage Trauma Detected: Further trauma to chest is likely to worsen internal bleeding until bone is repaired." + . += "
" diff --git a/code/datums/wounds/burns.dm b/code/datums/wounds/burns.dm new file mode 100644 index 000000000000..651090c62b23 --- /dev/null +++ b/code/datums/wounds/burns.dm @@ -0,0 +1,292 @@ + +/* + Burn wounds +*/ + +// 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 + name = "Burn Wound" + a_or_from = "from" + wound_type = WOUND_BURN + processes = TRUE + sound_effect = 'sound/effects/wounds/sizzle1.ogg' + wound_flags = (FLESH_WOUND | ACCEPTS_GAUZE) + + 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 + var/flesh_damage = 5 + /// Our current counter for how much flesh regeneration we have stacked from regenerative mesh/synthflesh/whatever, decrements each tick and lowers flesh_damage + var/flesh_healing = 0 + + // Infestation vars (only for severe and critical) + /// How quickly infection breeds on this burn if we don't have disinfectant + var/infestation_rate = 0 + /// Our current level of infection + var/infestation = 0 + /// Our current level of sanitization/anti-infection, from disinfectants/alcohol/UV lights. While positive, totally pauses and slowly reverses infestation effects each tick + var/sanitization = 0 + + /// 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 + + +/datum/wound/burn/handle_process() + . = ..() + if(strikes_to_lose_limb == 0) // we've already hit sepsis, nothing more to do + victim.adjustToxLoss(0.5) + if(prob(1)) + victim.visible_message("The infection on the remnants of [victim]'s [limb.name] shift and bubble nauseatingly!", "You can feel the infection on the remnants of your [limb.name] coursing through your veins!", vision_distance = COMBAT_MESSAGE_RANGE) + return + + if(victim.reagents) + if(victim.reagents.has_reagent(/datum/reagent/medicine/spaceacillin)) + sanitization += 0.9 + if(victim.reagents.has_reagent(/datum/reagent/space_cleaner/sterilizine/)) + sanitization += 0.9 + if(victim.reagents.has_reagent(/datum/reagent/medicine/mine_salve)) + sanitization += 0.3 + flesh_healing += 0.5 + + var/bandage_factor = 1 + if(limb.current_gauze && limb.current_gauze.seep_gauze(WOUND_BURN_SANITIZATION_RATE, GAUZE_STAIN_PUS)) + bandage_factor = limb.current_gauze.sanitisation_factor + + if(flesh_healing > 0) // good bandages multiply the length of flesh healing + flesh_damage = max(0, flesh_damage - 1) + flesh_healing = max(0, flesh_healing - bandage_factor) + + // if we have little/no infection, the limb doesn't have much burn damage, and our nutrition is good, heal some flesh + if(infestation <= WOUND_INFECTION_MODERATE && (limb.burn_dam < 5) && (victim.nutrition >= NUTRITION_LEVEL_FED)) + flesh_healing += 0.2 + + // here's the check to see if we're cleared up + if((flesh_damage <= 0) && (infestation <= WOUND_INFECTION_MODERATE)) + to_chat(victim, "The burns on your [limb.name] have cleared up!") + qdel(src) + return + + // sanitization is checked after the clearing check but before the actual ill-effects, because we freeze the effects of infection while we have sanitization + if(sanitization > 0) + infestation = max(0, infestation - WOUND_BURN_SANITIZATION_RATE) + sanitization = max(0, sanitization - (WOUND_BURN_SANITIZATION_RATE * bandage_factor)) + return + + infestation += infestation_rate + + switch(infestation) + if(0 to WOUND_INFECTION_MODERATE) + if(WOUND_INFECTION_MODERATE to WOUND_INFECTION_SEVERE) + if(prob(30)) + victim.adjustToxLoss(0.2) + if(prob(6)) + to_chat(victim, "The blisters on your [limb.name] ooze a strange pus...") + if(WOUND_INFECTION_SEVERE to WOUND_INFECTION_CRITICAL) + if(!disabling && prob(2)) + to_chat(victim, "Your [limb.name] completely locks up, as you struggle for control against the infection!") + set_disabling(TRUE) + else if(disabling && prob(8)) + to_chat(victim, "You regain sensation in your [limb.name], but it's still in terrible shape!") + set_disabling(FALSE) + else if(prob(20)) + victim.adjustToxLoss(0.5) + if(WOUND_INFECTION_CRITICAL to WOUND_INFECTION_SEPTIC) + if(!disabling && prob(3)) + to_chat(victim, "You suddenly lose all sensation of the festering infection in your [limb.name]!") + set_disabling(TRUE) + else if(disabling && prob(3)) + to_chat(victim, "You can barely feel your [limb.name] again, and you have to strain to retain motor control!") + set_disabling(FALSE) + else if(prob(1)) + to_chat(victim, "You contemplate life without your [limb.name]...") + victim.adjustToxLoss(0.75) + else if(prob(4)) + victim.adjustToxLoss(1) + if(WOUND_INFECTION_SEPTIC to INFINITY) + if(prob(infestation)) + switch(strikes_to_lose_limb) + if(3 to INFINITY) + to_chat(victim, "The skin on your [limb.name] is literally dripping off, you feel awful!") + if(2) + to_chat(victim, "The infection in your [limb.name] is literally dripping off, you feel horrible!") + if(1) + to_chat(victim, "Infection has just about completely claimed your [limb.name]!") + if(0) + to_chat(victim, "The last of the nerve endings in your [limb.name] wither away, as the infection completely paralyzes your joint connector.") + threshold_penalty = 120 // piss easy to destroy + var/datum/brain_trauma/severe/paralysis/sepsis = new (limb.body_zone) + victim.gain_trauma(sepsis) + strikes_to_lose_limb-- + +/datum/wound/burn/get_examine_description(mob/user) + if(strikes_to_lose_limb <= 0) + return "[victim.p_their(TRUE)] [limb.name] has locked up completely and is non-functional." + + var/list/condition = list("[victim.p_their(TRUE)] [limb.name] [examine_desc]") + if(limb.current_gauze) + var/bandage_condition + switch(limb.current_gauze.absorption_capacity) + if(0 to 1.25) + bandage_condition = "nearly ruined" + if(1.25 to 2.75) + bandage_condition = "badly worn" + if(2.75 to 4) + bandage_condition = "slightly stained" + if(4 to INFINITY) + bandage_condition = "clean" + + condition += " underneath a dressing of [bandage_condition] [limb.current_gauze.name]" + else + switch(infestation) + if(WOUND_INFECTION_MODERATE to WOUND_INFECTION_SEVERE) + condition += ", with early signs of infection." + if(WOUND_INFECTION_SEVERE to WOUND_INFECTION_CRITICAL) + condition += ", with growing clouds of infection." + if(WOUND_INFECTION_CRITICAL to WOUND_INFECTION_SEPTIC) + condition += ", with streaks of rotten infection!" + if(WOUND_INFECTION_SEPTIC to INFINITY) + return "[victim.p_their(TRUE)] [limb.name] is a mess of charred skin and infected rot!" + else + condition += "!" + + return "[condition.Join()]" + +/datum/wound/burn/get_scanner_description(mob/user) + if(strikes_to_lose_limb == 0) + var/oopsie = "Type: [name]\nSeverity: [severity_text()]" + oopsie += "
Infection Level: The bodypart has suffered complete sepsis and must be removed. Amputate or augment limb immediately.
" + return oopsie + + . = ..() + . += "
" + + if(infestation <= sanitization && flesh_damage <= flesh_healing) + . += "No further treatment required: Burns will heal shortly." + else + switch(infestation) + if(WOUND_INFECTION_MODERATE to WOUND_INFECTION_SEVERE) + . += "Infection Level: Moderate\n" + if(WOUND_INFECTION_SEVERE to WOUND_INFECTION_CRITICAL) + . += "Infection Level: Severe\n" + if(WOUND_INFECTION_CRITICAL to WOUND_INFECTION_SEPTIC) + . += "Infection Level: CRITICAL\n" + if(WOUND_INFECTION_SEPTIC to INFINITY) + . += "Infection Level: LOSS IMMINENT\n" + if(infestation > sanitization) + . += "\tSurgical debridement, antibiotics/sterilizers, or regenerative mesh will rid infection. Paramedic UV penlights are also effective.\n" + + if(flesh_damage > 0) + . += "Flesh damage detected: Application of ointment, regenerative mesh, Synthflesh, or ingestion of \"Miner's Salve\" will repair damaged flesh. Good nutrition, rest, and keeping the wound clean can also slowly repair flesh.\n" + . += "
" + +/* + new burn common procs +*/ + +/// if someone is using ointment or mesh on our burns +/datum/wound/burn/proc/ointmentmesh(obj/item/stack/medical/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 (I.amount <= 0) + return + 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) + user.visible_message("[user] applies [I] to [victim].", "You apply [I] to [user == victim ? "your" : "[victim]'s"] [limb.name].") + I.use(1) + sanitization += I.sanitization + flesh_healing += I.flesh_regeneration + + if((infestation <= 0 || sanitization >= infestation) && (flesh_damage <= 0 || flesh_healing > flesh_damage)) + to_chat(user, "You've done all you can with [I], now you must wait for the flesh on [victim]'s [limb.name] to recover.") + else + try_treating(I, user) + +/// Paramedic UV penlights +/datum/wound/burn/proc/uv(obj/item/flashlight/pen/paramedic/I, mob/user) + if(!COOLDOWN_FINISHED(I, uv_cooldown)) + to_chat(user, "[I] is still recharging!") + return + if(infestation <= 0 || infestation < sanitization) + to_chat(user, "There's no infection to treat on [victim]'s [limb.name]!") + return + + 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 + 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/ointment)) + ointmentmesh(I, user) + else if(istype(I, /obj/item/stack/medical/mesh)) + var/obj/item/stack/medical/mesh/mesh_check = I + if(!mesh_check.is_open) + to_chat(user, "You need to open [mesh_check] first.") + return + ointmentmesh(mesh_check, user) + else if(istype(I, /obj/item/flashlight/pen/paramedic)) + uv(I, user) + +// 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 +/datum/wound/burn/moderate + name = "Second Degree Burns" + desc = "Patient is suffering considerable burns with mild skin penetration, weakening limb integrity and increased burning sensations." + treat_text = "Recommended application of topical ointment or regenerative mesh to affected region." + examine_desc = "is badly burned and breaking out in blisters" + occur_text = "breaks out with violent red burns" + severity = WOUND_SEVERITY_MODERATE + damage_mulitplier_penalty = 1.1 + threshold_minimum = 40 + 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 + scar_keyword = "burnmoderate" + +/datum/wound/burn/severe + name = "Third Degree Burns" + desc = "Patient is suffering extreme burns with full skin penetration, creating serious risk of infection and greatly reduced limb integrity." + treat_text = "Recommended immediate disinfection and excision of any infected skin, followed by bandaging and ointment." + examine_desc = "appears seriously charred, with aggressive red splotches" + occur_text = "chars rapidly, exposing ruined tissue and spreading angry red burns" + severity = WOUND_SEVERITY_SEVERE + damage_mulitplier_penalty = 1.2 + 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/ointment, /obj/item/stack/medical/mesh) + infestation_rate = 0.07 // appx 9 minutes to reach sepsis without any treatment + flesh_damage = 12.5 + scar_keyword = "burnsevere" + +/datum/wound/burn/critical + name = "Catastrophic Burns" + desc = "Patient is suffering near complete loss of tissue and significantly charred muscle and bone, creating life-threatening risk of infection and negligible limb integrity." + treat_text = "Immediate surgical debriding of any infected skin, followed by potent tissue regeneration formula and bandaging." + examine_desc = "is a ruined mess of blanched bone, melted fat, and charred tissue" + 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/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/ointment, /obj/item/stack/medical/mesh) + infestation_rate = 0.15 // appx 4.33 minutes to reach sepsis without any treatment + flesh_damage = 20 + scar_keyword = "burncritical" diff --git a/code/datums/wounds/dismember.dm b/code/datums/wounds/dismember.dm new file mode 100644 index 000000000000..17ffa7cec836 --- /dev/null +++ b/code/datums/wounds/dismember.dm @@ -0,0 +1,54 @@ + +/datum/wound/loss + name = "Dismemberment Wound" + desc = "oof ouch!!" + + sound_effect = 'sound/effects/dismember.ogg' + severity = WOUND_SEVERITY_LOSS + threshold_minimum = WOUND_DISMEMBER_OUTRIGHT_THRESH // not actually used since dismembering is handled differently, but may as well assign it since we got it + status_effect_type = null + scar_keyword = "dismember" + wound_flags = null + already_scarred = TRUE // We manually assign scars for dismembers through endround missing limbs and aheals + +/// 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, outright = FALSE) + 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 + + victim = dismembered_part.owner + + if(dismembered_part.body_zone == BODY_ZONE_CHEST) + occur_text = "is split open, causing [victim.p_their()] internals organs to spill out!" + else if(outright) + switch(wounding_type) + if(WOUND_BLUNT) + occur_text = "is outright smashed to a gross pulp, severing it completely!" + if(WOUND_SLASH) + occur_text = "is outright slashed off, severing it completely!" + if(WOUND_PIERCE) + occur_text = "is outright blasted apart, severing it completely!" + if(WOUND_BURN) + occur_text = "is outright incinerated, falling to dust!" + else + 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!" + + var/msg = "[victim]'s [dismembered_part.name] [occur_text]!" + + victim.visible_message(msg, "Your [dismembered_part.name] [occur_text]!") + + set_limb(dismembered_part) + second_wind() + log_wound(victim, src) + dismembered_part.dismember(wounding_type == WOUND_BURN ? BURN : BRUTE) + qdel(src) + return TRUE diff --git a/code/datums/wounds/muscle.dm b/code/datums/wounds/muscle.dm new file mode 100644 index 000000000000..0b63aa3a8795 --- /dev/null +++ b/code/datums/wounds/muscle.dm @@ -0,0 +1,197 @@ + +/* + Muscle wounds. There is a chance to roll a muscle wound instead of others while doing brute damage +*/ + +/datum/wound/muscle + name = "Muscle Wound" + sound_effect = 'sound/effects/wounds/blood1.ogg' + wound_type = WOUND_MUSCLE + wound_flags = (FLESH_WOUND | ACCEPTS_SPLINT) + viable_zones = list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) + processes = TRUE + /// How much do we need to regen. Will regen faster if we're splinted and or laying down + var/regen_ticks_needed + /// Our current counter for healing + var/regen_ticks_current = 0 + +/* + Overwriting of base procs +*/ +/datum/wound/muscle/wound_injury(datum/wound/old_wound = null) + // hook into gaining/losing gauze so crit muscle wounds can re-enable/disable depending if they're slung or not + RegisterSignal(limb, list(COMSIG_BODYPART_SPLINTED, COMSIG_BODYPART_SPLINT_DESTROYED), .proc/update_inefficiencies) + + RegisterSignal(victim, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, .proc/attack_with_hurt_hand) + if(limb.held_index && victim.get_item_for_held_index(limb.held_index) && (disabling || prob(30 * severity))) + var/obj/item/I = victim.get_item_for_held_index(limb.held_index) + if(istype(I, /obj/item/offhand)) + I = victim.get_inactive_held_item() + + if(I && victim.dropItemToGround(I)) + victim.visible_message("[victim] drops [I] in shock!", "The force on your [limb.name] causes you to drop [I]!", vision_distance=COMBAT_MESSAGE_RANGE) + + update_inefficiencies() + +/datum/wound/muscle/remove_wound(ignore_limb, replaced) + limp_slowdown = 0 + if(limb) + UnregisterSignal(limb, list(COMSIG_BODYPART_GAUZED, COMSIG_BODYPART_GAUZE_DESTROYED)) + if(victim) + UnregisterSignal(victim, COMSIG_HUMAN_EARLY_UNARMED_ATTACK) + return ..() + +/datum/wound/muscle/handle_process() + . = ..() + + regen_ticks_current++ + if(victim.body_position == LYING_DOWN) + if(prob(50)) + regen_ticks_current += 0.5 + if(victim.IsSleeping()) + regen_ticks_current += 0.5 + + if(limb.current_splint) + regen_ticks_current += (1-limb.current_splint.splint_factor) + + if(regen_ticks_current > regen_ticks_needed) + if(!victim || !limb) + qdel(src) + return + to_chat(victim, "Your [limb.name] has regenerated its muscle!") + remove_wound() + +/// If we're a human who's punching something with a broken arm, we might hurt ourselves doing so +/datum/wound/muscle/proc/attack_with_hurt_hand(mob/M, atom/target, proximity) + SIGNAL_HANDLER + + if(victim.get_active_hand() != limb || victim.a_intent == INTENT_HELP || !ismob(target) || severity <= WOUND_SEVERITY_MODERATE) + return + + // 15% of 30% chance to proc pain on hit + if(prob(severity * 15)) + // And you have a 70% or 50% chance to actually land the blow, respectively + if(prob(70 - 20 * severity)) + to_chat(victim, "The damaged muscle in your [limb.name] shoots with pain as you strike [target]!") + limb.receive_damage(brute=rand(1,5)) + else + victim.visible_message("[victim] weakly strikes [target] with [victim.p_their()] swollen [limb.name], recoiling from pain!", \ + "You fail to strike [target] as the fracture in your [limb.name] lights up in unbearable pain!", vision_distance=COMBAT_MESSAGE_RANGE) + INVOKE_ASYNC(victim, /mob.proc/emote, "scream") + victim.Stun(0.5 SECONDS) + limb.receive_damage(brute=rand(3,7)) + return COMPONENT_ITEM_NO_ATTACK + +/datum/wound/muscle/get_examine_description(mob/user) + if(!limb.current_splint) + return ..() + + var/list/msg = list() + if(!limb.current_splint) + msg += "[victim.p_their(TRUE)] [limb.name] [examine_desc]" + else + var/sling_condition = "" + // how much life we have left in these bandages + switch(limb.current_splint.sling_condition) + if(0 to 1.25) + sling_condition = "just barely" + if(1.25 to 2.75) + sling_condition = "loosely" + if(2.75 to 4) + sling_condition = "mostly" + if(4 to INFINITY) + sling_condition = "tightly" + + msg += "[victim.p_their(TRUE)] [limb.name] is [sling_condition] fastened with a [limb.current_splint.name]!" + + return "[msg.Join()]" + +/* + Common procs mostly copied from bone wounds, as their behaviour is very similar +*/ + +/datum/wound/muscle/proc/update_inefficiencies() + if(limb.body_zone in list(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) + if(limb.current_splint) + limp_slowdown = initial(limp_slowdown) * limb.current_splint.splint_factor + else + limp_slowdown = initial(limp_slowdown) + victim.apply_status_effect(STATUS_EFFECT_LIMP) + else if(limb.body_zone in list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) + if(limb.current_splint) + interaction_efficiency_penalty = 1 + ((interaction_efficiency_penalty - 1) * limb.current_splint.splint_factor) + else + interaction_efficiency_penalty = interaction_efficiency_penalty + + if(initial(disabling)) + if(limb.current_splint && limb.current_splint.helps_disabled) + set_disabling(FALSE) + else + set_disabling(TRUE) + + limb.update_wounds() + +/// Moderate (Muscle Tear) +/datum/wound/muscle/moderate + name = "Muscle Tear" + desc = "Patient's muscle has torn, causing serious pain and reduced limb functionality." + treat_text = "Recommended rest and sleep, or splinting the limb." + examine_desc = "appears unnaturallly red and swollen" + occur_text = "swells up, it's skin turning red" + severity = WOUND_SEVERITY_MODERATE + interaction_efficiency_penalty = 1.5 + limp_slowdown = 2 + threshold_minimum = 35 + threshold_penalty = 15 + status_effect_type = /datum/status_effect/wound/muscle/moderate + regen_ticks_needed = 90 + +/* + Severe (Ruptured Tendon) +*/ + +/datum/wound/muscle/severe + name = "Ruptured Tendon" + sound_effect = 'sound/effects/wounds/blood2.ogg' + desc = "Patient's tendon has been severed, causing significant pain and near uselessness of limb." + treat_text = "Recommended rest and sleep aswell as splinting the limb." + examine_desc = "is limp and awkwardly twitching, skin swollen and red" + occur_text = "twists in pain and goes limp, it's tendon ruptured" + severity = WOUND_SEVERITY_SEVERE + interaction_efficiency_penalty = 2 + limp_slowdown = 5 + threshold_minimum = 80 + threshold_penalty = 35 + disabling = TRUE + status_effect_type = /datum/status_effect/wound/muscle/severe + regen_ticks_needed = 150 + +/datum/status_effect/wound/muscle + +/datum/status_effect/wound/muscle/on_apply() + . = ..() + RegisterSignal(owner, COMSIG_MOB_SWAP_HANDS, .proc/on_swap_hands) + on_swap_hands() + +/datum/status_effect/wound/muscle/on_remove() + . = ..() + UnregisterSignal(owner, COMSIG_MOB_SWAP_HANDS) + var/mob/living/carbon/wound_owner = owner + wound_owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/muscle_wound) + +/datum/status_effect/wound/muscle/proc/on_swap_hands() + SIGNAL_HANDLER + + var/mob/living/carbon/wound_owner = owner + if(wound_owner.get_active_hand() == linked_limb) + wound_owner.add_movespeed_modifier(/datum/movespeed_modifier/status_effect/muscle_wound, (linked_wound.interaction_efficiency_penalty - 1)) + else + wound_owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/muscle_wound) + +/datum/status_effect/wound/muscle/nextmove_modifier() + var/mob/living/carbon/C = owner + + if(C.get_active_hand() == linked_limb) + return linked_wound.interaction_efficiency_penalty + + return 1 diff --git a/code/datums/wounds/pierce.dm b/code/datums/wounds/pierce.dm new file mode 100644 index 000000000000..8bec5e337ae2 --- /dev/null +++ b/code/datums/wounds/pierce.dm @@ -0,0 +1,195 @@ + +/* + Piercing wounds +*/ + +/datum/wound/pierce + name = "Piercing Wound" + 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 | ACCEPTS_SPLINT) + + /// 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/show_wound_topic(mob/user) + return (user == victim && blood_flow) + +/datum/wound/pierce/Topic(href, href_list) + . = ..() + if(href_list["wound_topic"]) + if(!usr == victim) + return + victim.self_grasp_bleeding_limb(limb) + +/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_splint?.splint_factor) + wounding_dmg *= (1 - limb.current_splint.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/get_bleed_rate_of_change() + if(HAS_TRAIT(victim, TRAIT_BLOODY_MESS)) + return BLOOD_FLOW_INCREASING + if(limb.current_gauze && limb.current_gauze.seep_gauze(limb.current_gauze.absorption_rate, GAUZE_STAIN_BLOOD)) + return BLOOD_FLOW_DECREASING + return BLOOD_FLOW_STEADY + +/datum/wound/pierce/handle_process() + blood_flow = min(blood_flow, WOUND_SLASH_MAX_BLOODFLOW) + + if(victim.bodytemperature < (victim.get_body_temp_normal(FALSE) - 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(HAS_TRAIT(victim, TRAIT_BLOODY_MESS)) + blood_flow += 0.5 // old heparin 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 + + if(blood_flow <= 0) + qdel(src) + +/datum/wound/pierce/on_stasis() + . = ..() + if(blood_flow <= 0) + qdel(src) + +/datum/wound/pierce/check_grab_treatments(obj/item/I, mob/user) + if(I.get_temperature()) // if we're using something hot but not a cautery, we need to be aggro grabbing them first, so we don't try treating someone we're eswording + return TRUE + +/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()) + 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 puncture +/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 + blood_flow -= blood_sutured + limb.heal_damage(I.heal_brute, I.heal_burn) + I.use(1) + + 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/improv_penalty_mult = (I.tool_behaviour == TOOL_CAUTERY ? 1 : 1.25) // 25% longer and less effective if you don't use a real cautery + var/self_penalty_mult = (user == victim ? 1.5 : 1) // 50% longer and less effective if you do it to yourself + + 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 * improv_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 * improv_penalty_mult)) + 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 = 20 + 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 = 35 + 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 = 50 + 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/slash.dm b/code/datums/wounds/slash.dm new file mode 100644 index 000000000000..0468d737a1f1 --- /dev/null +++ b/code/datums/wounds/slash.dm @@ -0,0 +1,265 @@ + +/* + Slashing wounds +*/ + +/datum/wound/slash + name = "Slashing (Cut) Wound" + sound_effect = 'sound/weapons/slice.ogg' + processes = TRUE + 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 + 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 + /// When we have less than this amount of flow, either from treatment or clotting, we demote to a lower cut or are healed of the wound + var/minimum_flow + /// How much our blood_flow will naturally decrease per tick, not only do larger cuts bleed more blood faster, they clot slower (higher number = clot quicker, negative = opening up) + var/clot_rate + + /// Once the blood flow drops below minimum_flow, we demote it to this type of wound. If there's none, we're all better + var/demotes_to + + /// The maximum flow we've had so far + var/highest_flow + + /// 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/slash/show_wound_topic(mob/user) + return (user == victim && blood_flow) + +/datum/wound/slash/Topic(href, href_list) + . = ..() + if(href_list["wound_topic"]) + if(!usr == victim) + return + victim.self_grasp_bleeding_limb(limb) + +/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) + +/datum/wound/slash/remove_wound(ignore_limb, replaced) + if(!replaced && highest_scar) + already_scarred = TRUE + highest_scar.lazy_attach(limb) + return ..() + +/datum/wound/slash/get_examine_description(mob/user) + if(!limb.current_gauze) + return ..() + + 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(limb.current_gauze.absorption_capacity) + if(0 to 1.25) + msg += "nearly ruined" + if(1.25 to 2.75) + msg += "badly worn" + if(2.75 to 4) + msg += "slightly bloodied" + if(4 to INFINITY) + msg += "clean" + msg += " [limb.current_gauze.name]!" + + return "[msg.Join()]" + +/datum/wound/slash/receive_damage(wounding_type, wounding_dmg, wound_bonus) + if(victim.stat != DEAD && wound_bonus != CANT_WOUND && wounding_type == WOUND_SLASH) // can't stab dead bodies to make it bleed faster this way + blood_flow += 0.05 * wounding_dmg + +/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(limb.current_gauze && limb.current_gauze.seep_gauze(bleed_amt * 0.33, GAUZE_STAIN_BLOOD)) // gauze stops all bleeding from dragging on this limb, but wears the gauze out quicker + return + + return bleed_amt + +/datum/wound/slash/get_bleed_rate_of_change() + if(HAS_TRAIT(victim, TRAIT_BLOODY_MESS)) + return BLOOD_FLOW_INCREASING + if(limb.current_gauze || clot_rate > 0) + return BLOOD_FLOW_DECREASING + if(clot_rate < 0) + return BLOOD_FLOW_INCREASING + +/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(HAS_TRAIT(victim, TRAIT_BLOODY_MESS)) + blood_flow += 0.5 // old heparin 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) + if(clot_rate > 0) + blood_flow -= clot_rate + if(limb.current_gauze && limb.current_gauze.seep_gauze(limb.current_gauze.absorption_rate, GAUZE_STAIN_BLOOD)) + blood_flow -= limb.current_gauze.absorption_rate + else + blood_flow -= clot_rate + + if(blood_flow > highest_flow) + highest_flow = blood_flow + + if(blood_flow < minimum_flow) + if(demotes_to) + replace_wound(demotes_to) + else + 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/slash/check_grab_treatments(obj/item/I, mob/user) + if(istype(I, /obj/item/gun/energy/laser)) + return TRUE + if(I.get_temperature()) // if we're using something hot but not a cautery, we need to be aggro grabbing them first, so we don't try treating someone we're eswording + return TRUE + +/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()) + tool_cauterize(I, user) + else if(istype(I, /obj/item/stack/medical/suture)) + suture(I, user) + +/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/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))) + return + var/damage = lasgun.chambered.BB.damage + lasgun.chambered.BB.wound_bonus -= 30 + lasgun.chambered.BB.damage *= self_penalty_mult + if(!lasgun.process_fire(victim, victim, TRUE, null, limb.body_zone)) + return + victim.emote("scream") + blood_flow -= damage / (5 * self_penalty_mult) // 20 / 5 = 4 bloodflow removed, p good + 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/slash/proc/tool_cauterize(obj/item/I, mob/user) + var/improv_penalty_mult = (I.tool_behaviour == TOOL_CAUTERY ? 1 : 1.25) // 25% longer and less effective if you don't use a real cautery + var/self_penalty_mult = (user == victim ? 1.5 : 1) // 50% longer and less effective if you do it to yourself + + 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 * improv_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 * improv_penalty_mult)) + blood_flow -= blood_cauterized + + if(blood_flow > minimum_flow) + try_treating(I, user) + else if(demotes_to) + 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/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 + limb.heal_damage(I.heal_brute, I.heal_burn) + I.use(1) + + if(blood_flow > minimum_flow) + try_treating(I, user) + else if(demotes_to) + to_chat(user, "You successfully lower the severity of [user == victim ? "your" : "[victim]'s"] cuts.") + + +/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/wounds/blood1.ogg' + severity = WOUND_SEVERITY_MODERATE + initial_flow = 2 + minimum_flow = 0.5 + clot_rate = 0.12 + threshold_minimum = 20 + threshold_penalty = 10 + status_effect_type = /datum/status_effect/wound/slash/moderate + scar_keyword = "slashmoderate" + +/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/wounds/blood2.ogg' + severity = WOUND_SEVERITY_SEVERE + initial_flow = 3.25 + minimum_flow = 2.75 + clot_rate = 0.06 + threshold_minimum = 50 + threshold_penalty = 25 + demotes_to = /datum/wound/slash/moderate + status_effect_type = /datum/status_effect/wound/slash/severe + scar_keyword = "slashsevere" + +/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 carved down to the bone, spraying blood wildly" + occur_text = "is torn open, spraying blood wildly" + sound_effect = 'sound/effects/wounds/blood3.ogg' + severity = WOUND_SEVERITY_CRITICAL + initial_flow = 4.25 + minimum_flow = 4 + clot_rate = -0.05 // critical cuts actively get worse instead of better + threshold_minimum = 80 + threshold_penalty = 40 + 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/atoms.dm b/code/game/atoms.dm index 027c34178441..0f68f28d84e6 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -22,9 +22,9 @@ var/flags_ricochet = NONE ///When a projectile tries to ricochet off this atom, the projectile ricochet chance is multiplied by this - var/ricochet_chance_mod = 1 + var/receive_ricochet_chance_mod = 1 ///When a projectile ricochets off this atom, it deals the normal damage * this modifier to this atom - var/ricochet_damage_mod = 0.33 + var/receive_ricochet_damage_coeff = 0.33 ///Reagents holder var/datum/reagents/reagents = null @@ -1744,3 +1744,36 @@ /atom/proc/InitializeAIController() if(ai_controller) ai_controller = new ai_controller(src) + +/** + * log_wound() is for when someone is *attacked* and suffers a wound. Note that this only captures wounds from damage, so smites/forced wounds aren't logged, as well as demotions like cuts scabbing over + * + * Note that this has no info on the attack that dealt the wound: information about where damage came from isn't passed to the bodypart's damaged proc. When in doubt, check the attack log for attacks at that same time + * TODO later: Add logging for healed wounds, though that will require some rewriting of healing code to prevent admin heals from spamming the logs. Not high priority + * + * Arguments: + * * victim- The guy who got wounded + * * suffered_wound- The wound, already applied, that we're logging. It has to already be attached so we can get the limb from it + * * dealt_damage- How much damage is associated with the attack that dealt with this wound. + * * dealt_wound_bonus- The wound_bonus, if one was specified, of the wounding attack + * * dealt_bare_wound_bonus- The bare_wound_bonus, if one was specified *and applied*, of the wounding attack. Not shown if armor was present + * * base_roll- Base wounding ability of an attack is a random number from 1 to (dealt_damage ** WOUND_DAMAGE_EXPONENT). This is the number that was rolled in there, before mods + */ +/proc/log_wound(atom/victim, datum/wound/suffered_wound, dealt_damage, dealt_wound_bonus, dealt_bare_wound_bonus, base_roll) + if(QDELETED(victim) || !suffered_wound) + return + var/message = "has suffered: [suffered_wound][suffered_wound.limb ? " to [suffered_wound.limb.name]" : null]"// maybe indicate if it's a promote/demote? + + if(dealt_damage) + message += " | Damage: [dealt_damage]" + // The base roll is useful since it can show how lucky someone got with the given attack. For example, dealing a cut + if(base_roll) + message += " (rolled [base_roll]/[dealt_damage ** WOUND_DAMAGE_EXPONENT])" + + if(dealt_wound_bonus) + message += " | WB: [dealt_wound_bonus]" + + if(dealt_bare_wound_bonus) + message += " | BWB: [dealt_bare_wound_bonus]" + + victim.log_message(message, LOG_ATTACK, color="blue") diff --git a/code/game/gamemodes/clown_ops/clown_weapons.dm b/code/game/gamemodes/clown_ops/clown_weapons.dm index 41f78346b829..44e9a1cd825c 100644 --- a/code/game/gamemodes/clown_ops/clown_weapons.dm +++ b/code/game/gamemodes/clown_ops/clown_weapons.dm @@ -21,7 +21,7 @@ active_throwforce = 0 hitsound = null attack_verb_on = list("slipped") - sharpness = IS_BLUNT + sharpness = SHARP_NONE sword_color = "yellow" heat = 0 light_color = COLOR_YELLOW @@ -159,7 +159,7 @@ icon_state = "moustacheg" clumsy_check = GRENADE_NONCLUMSY_FUMBLE -/obj/item/grenade/chem_grenade/teargas/moustache/prime() +/obj/item/grenade/chem_grenade/teargas/moustache/prime(mob/living/lanced_by) var/myloc = get_turf(src) . = ..() for(var/mob/living/carbon/M in view(6, myloc)) diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 0c6b6fe5b810..0c677ed6a120 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -90,7 +90,7 @@ Class Procs: max_integrity = 200 layer = BELOW_OBJ_LAYER //keeps shit coming out of the machine from ending up underneath it. flags_ricochet = RICOCHET_HARD - ricochet_chance_mod = 0.3 + receive_ricochet_chance_mod = 0.3 anchored = TRUE interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND | INTERACT_ATOM_UI_INTERACT diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 06cb38b21074..86d879f8acd6 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -195,7 +195,7 @@ to_chat(user, span_notice("[src] is now in [mode] mode.")) -/obj/item/grenade/barrier/prime() +/obj/item/grenade/barrier/prime(mob/living/lanced_by) . = ..() new /obj/structure/barricade/security(get_turf(src.loc)) switch(mode) @@ -215,7 +215,7 @@ var/turf/target_turf2 = get_step(src, WEST) if(!target_turf2.is_blocked_turf()) new /obj/structure/barricade/security(target_turf2) - qdel(src) + resolve() /obj/item/grenade/barrier/ui_action_click(mob/user) toggle_mode(user) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 4fee94c5c24e..c0079df011f5 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -13,7 +13,7 @@ armor = list("melee" = 30, "bullet" = 30, "laser" = 20, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 70) CanAtmosPass = ATMOS_PASS_DENSITY flags_1 = PREVENT_CLICK_UNDER_1 - ricochet_chance_mod = 0.8 + receive_ricochet_chance_mod = 0.8 damage_deflection = 10 interaction_flags_atom = INTERACT_ATOM_UI_INTERACT @@ -393,6 +393,7 @@ /obj/machinery/door/proc/crush() for(var/mob/living/L in get_turf(src)) L.visible_message(span_warning("[src] closes on [L], crushing [L.p_them()]!"), span_userdanger("[src] closes on you and crushes you!")) + SEND_SIGNAL(L, COMSIG_LIVING_DOORCRUSHED, src) 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. L.manual_emote("roar") diff --git a/code/game/machinery/medical_kiosk.dm b/code/game/machinery/medical_kiosk.dm index 7bbc42b0838c..ead1455306b3 100644 --- a/code/game/machinery/medical_kiosk.dm +++ b/code/game/machinery/medical_kiosk.dm @@ -172,7 +172,7 @@ sickness_data = "\nName: [D.name].\nType: [D.spread_text].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure_text]" if(altPatient.has_dna()) //Blood levels Information - if(LAZYLEN(altPatient.get_bleeding_parts())) + if(altPatient.is_bleeding()) bleed_status = "Patient is currently bleeding!" if(blood_percent <= 80) blood_warning = " Patient has low blood levels. Seek a large meal, or iron supplements." diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 815875541312..492b93a847fb 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -592,7 +592,7 @@ COOLDOWN_START(src, reaction_cooldown, reaction_time) if(ishuman(target) || target.client) - target.do_alert_animation(target) + target.do_alert_animation() return TRUE diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index ec881be01255..44c432f46cf3 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -493,12 +493,6 @@ else visible_message(span_warning("[src]'s door slides open, barraging you with the nauseating smell of charred flesh.")) mob_occupant.radiation = 0 - if(iscarbon(mob_occupant)) - var/mob/living/carbon/bacon = mob_occupant - for(var/obj/item/bodypart/grilling as anything in bacon.get_bleeding_parts(TRUE)) - if(!grilling.can_bandage()) - continue - grilling.apply_bandage(0.005, 600, "cauterization") playsound(src, 'sound/machines/airlocks/standard/close.ogg', 25, TRUE) var/list/things_to_clear = list() //Done this way since using GetAllContents on the SSU itself would include circuitry and such. if(suit) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 4d610c04862c..63e3d3ff7aea 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -171,13 +171,13 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb mouse_drag_pointer = MOUSE_ACTIVE_POINTER ///Does it embed and if yes, what kind of embed - var/list/embedding = NONE + var/list/embedding ///for flags such as [GLASSESCOVERSEYES] var/flags_cover = 0 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 ///How a tool acts when you use it on something, such as wirecutters cutting wires while multitools measure power var/tool_behaviour = NONE @@ -863,11 +863,6 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb /obj/item/proc/get_sharpness() return sharpness -/obj/item/proc/get_dismemberment_chance(obj/item/bodypart/affecting) - if(affecting.can_dismember(src)) - if((sharpness || damtype == BURN || (damtype == BRUTE && (affecting.owner.dna && affecting.owner.dna.species && (TRAIT_EASYDISMEMBER in affecting.owner.dna.species.species_traits)))) && w_class >= WEIGHT_CLASS_NORMAL && force >= 10) - . = force * (affecting.get_damage() / affecting.max_damage) - /obj/item/proc/get_dismember_sound() if(damtype == BURN) . = 'sound/weapons/sear.ogg' @@ -1136,7 +1131,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb // if w_volume is 0 you fucked up. return w_volume || AUTO_SCALE_VOLUME(w_class) -/obj/item/proc/embedded(mob/living/carbon/human/embedded_mob) +/obj/item/proc/embedded(atom/embedded_target) return /obj/item/proc/unembedded() @@ -1156,11 +1151,10 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb if(embedding) return !isnull(embedding["pain_mult"]) && !isnull(embedding["jostle_pain_mult"]) && embedding["pain_mult"] == 0 && embedding["jostle_pain_mult"] == 0 -///In case we want to do something special (like self delete) upon failing to embed in something, return true +///In case we want to do something special (like self delete) upon failing to embed in something /obj/item/proc/failedEmbed() if(item_flags & DROPDEL) - QDEL_NULL(src) - return TRUE + qdel(src) ///Called by the carbon throw_item() proc. Returns null if the item negates the throw, or a reference to the thing to suffer the throw else. /obj/item/proc/on_thrown(mob/living/carbon/user, atom/target) @@ -1177,18 +1171,21 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb * * Really, this is used mostly with projectiles with shrapnel payloads, from [/datum/element/embed/proc/checkEmbedProjectile], and called on said shrapnel. Mostly acts as an intermediate between different embed elements. * + * Returns TRUE if it embedded successfully, nothing otherwise + * * Arguments: - * * target- Either a body part, a carbon, or a closed turf. What are we hitting? - * * forced- Do we want this to go through 100%? + * * target - Either a body part or a carbon. What are we hitting? + * * forced - Do we want this to go through 100%? */ /obj/item/proc/tryEmbed(atom/target, forced=FALSE, silent=FALSE) if(!isbodypart(target) && !iscarbon(target)) return + if(!forced && !LAZYLEN(embedding)) - return + return NONE if(SEND_SIGNAL(src, COMSIG_EMBED_TRY_FORCE, target, forced, silent)) - return TRUE + return COMPONENT_EMBED_SUCCESS failedEmbed() ///For when you want to disable an item's embedding capabilities (like transforming weapons and such), this proc will detach any active embed elements from it. @@ -1212,8 +1209,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb 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),\ - embed_chance_turf_mod = (!isnull(embedding["embed_chance_turf_mod"]) ? embedding["embed_chance_turf_mod"] : EMBED_CHANCE_TURF_MOD)) + pain_stam_pct = (!isnull(embedding["pain_stam_pct"]) ? embedding["pain_stam_pct"] : EMBEDDED_PAIN_STAM_PCT)) return TRUE // Update icons if this is being carried by a mob diff --git a/code/game/objects/items/attachments/bayonet.dm b/code/game/objects/items/attachments/bayonet.dm index 9e9deb969750..516053b1e4b7 100644 --- a/code/game/objects/items/attachments/bayonet.dm +++ b/code/game/objects/items/attachments/bayonet.dm @@ -8,7 +8,7 @@ drop_sound = 'sound/items/handling/knife3_drop.ogg' hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - sharpness = IS_SHARP_ACCURATE + sharpness = SHARP_POINTY slot = ATTACHMENT_SLOT_MUZZLE pixel_shift_x = 1 diff --git a/code/game/objects/items/attachments/energy_bayonet.dm b/code/game/objects/items/attachments/energy_bayonet.dm index 82d206d428ba..ef0f38bff097 100644 --- a/code/game/objects/items/attachments/energy_bayonet.dm +++ b/code/game/objects/items/attachments/energy_bayonet.dm @@ -8,7 +8,7 @@ drop_sound = 'sound/items/handling/knife3_drop.ogg' hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - sharpness = IS_BLUNT + sharpness = SHARP_NONE slot = ATTACHMENT_SLOT_MUZZLE attach_features_flags = ATTACH_TOGGLE | ATTACH_REMOVABLE_HAND @@ -36,7 +36,7 @@ . = ..() set_light_on(toggled) update_icon() - sharpness = toggled ? IS_SHARP_ACCURATE : IS_BLUNT + sharpness = toggled ? SHARP_POINTY : SHARP_NONE force = toggled ? 19 : 3 throwforce = toggled ? 14 : 2 diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index a17160a90bcc..6c965dd65ac2 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -185,9 +185,21 @@ var/T = get_turf(target) if(locate(/mob/living) in T) new /obj/effect/temp_visual/medical_holosign(T,user) //produce a holographic glow - holo_cooldown = world.time + 100 + holo_cooldown = world.time + 10 SECONDS return +// see: [/datum/wound/burn/proc/uv()] +/obj/item/flashlight/pen/paramedic + name = "paramedic penlight" + desc = "A high-powered UV penlight intended to help stave off infection in the field on serious burned patients. Probably really bad to look into." + icon_state = "penlight_surgical" + /// Our current UV cooldown + var/uv_cooldown = 0 + /// How long between UV fryings + var/uv_cooldown_length = 30 SECONDS + /// How much sanitization to apply to the burn wound + var/uv_power = 1 + /obj/effect/temp_visual/medical_holosign name = "medical holosign" desc = "A small holographic glow that indicates a medic is coming to treat a patient." diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 1c4e24e993ce..3affa4a5c789 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -13,8 +13,8 @@ GENE SCANNER // Describes the two modes of scanning available for health analyzers #define SCANMODE_HEALTH 0 #define SCANMODE_CHEMICAL 1 -#define SCANNER_CONDENSED 0 -#define SCANNER_VERBOSE 1 +#define SCANMODE_WOUND 2 +#define SCANNER_VERBOSE 3 /obj/item/t_scanner name = "\improper T-ray scanner" @@ -102,15 +102,20 @@ GENE SCANNER /obj/item/healthanalyzer/attack_self(mob/user) playsound(get_turf(user), 'sound/machines/click.ogg', 50, TRUE) - scanmode = !scanmode - if(scanmode == 1) - balloon_alert(user, "scanning reagents") - icon_state = reagentmode - item_state = reagentmodeinhand - else - balloon_alert(user, "scanning health") - icon_state = healthmode - item_state = healthmodeinhand + scanmode = (scanmode + 1) % 3 + switch(scanmode) + if(SCANMODE_HEALTH) + to_chat(user, span_notice("You switch the health analyzer to check physical health.")) + icon_state = healthmode + item_state = healthmodeinhand + if(SCANMODE_CHEMICAL) + to_chat(user, span_notice("You switch the health analyzer to scan chemical contents.")) + icon_state = reagentmode + item_state = reagentmodeinhand + if(SCANMODE_WOUND) + to_chat(user, span_notice("You switch the health analyzer to report extra info on wounds.")) + icon_state = healthmode + item_state = healthmodeinhand /obj/item/healthanalyzer/attack(mob/living/M, mob/living/carbon/human/user) flick("[icon_state]-anim", src) //makes it so that it plays the scan animation upon scanning, including clumsy scanning @@ -131,12 +136,13 @@ GENE SCANNER if(scanmode == SCANMODE_HEALTH) healthscan(user, M, mode, advanced) - else + else if(scanmode == SCANMODE_CHEMICAL) chemscan(user, M) + else + woundscan(user, M, src) add_fingerprint(user) - // Used by the PDA medical scanner too /proc/healthscan(mob/user, mob/living/M, mode = SCANNER_VERBOSE, advanced = FALSE, see_all_quirks = FALSE) if(isliving(user) && (user.incapacitated())) @@ -161,34 +167,51 @@ GENE SCANNER if(H.undergoing_cardiac_arrest() && H.stat != DEAD) render_list += "[span_alert("Subject suffering from heart attack: Apply defibrillation or other electric shock immediately!")]\n" - //WS begin - Borers if(iscarbon(M)) var/mob/living/carbon/C = M if(C.has_brain_worms() && (!C.reagents.has_reagent(/datum/reagent/medicine/spaceacillin) || advanced)) render_list += "[span_danger("Foreign organism detected in subject's cranium. Recommended treatment: Dosage of sucrose solution and removal of object via surgery.")]\n" - //WS end render_list += "[span_info("Analyzing results for [M]:")]\nOverall status: [mob_status]\n" // Damage descriptions if(brute_loss > 10) render_list += "[brute_loss > 50 ? "Severe" : "Minor"] tissue damage detected.\n" + if(fire_loss > 10) render_list += "[fire_loss > 50 ? "Severe" : "Minor"] burn damage detected.\n" + if(oxy_loss > 10) render_list += "[span_alert("[oxy_loss > 50 ? "Severe" : "Minor"] oxygen deprivation detected.")]\n" + if(tox_loss > 10) render_list += "[tox_loss > 50 ? "Severe" : "Minor"] amount of toxin damage detected.\n" + if(M.getStaminaLoss()) render_list += "Subject appears to be suffering from fatigue.\n" if(advanced) render_list += "Fatigue Level: [M.getStaminaLoss()]%.\n" - if (M.getCloneLoss()) + + if(M.getCloneLoss()) render_list += "Subject appears to have [M.getCloneLoss() > 30 ? "Severe" : "Minor"] cellular damage.\n" if(advanced) render_list += "Cellular Damage Level: [M.getCloneLoss()].\n" - if (!M.getorgan(/obj/item/organ/brain)) + + if(!M.getorganslot(ORGAN_SLOT_BRAIN)) // brain not added to carbon/human check because it's funny to get to bully simple mobs render_list += "Subject lacks a brain.\n" + + if(ishuman(M)) + var/mob/living/carbon/human/the_dude = M + var/datum/species/the_dudes_species = the_dude.dna.species + if(!(NOBLOOD in the_dudes_species.species_traits) && !the_dude.getorganslot(ORGAN_SLOT_HEART)) + render_list += "Subject lacks a heart.\n" + if(!(TRAIT_NOBREATH in the_dudes_species.species_traits) && !the_dude.getorganslot(ORGAN_SLOT_LUNGS)) + render_list += "Subject lacks lungs.\n" + if(!(TRAIT_NOMETABOLISM in the_dudes_species.species_traits) && !the_dude.getorganslot(ORGAN_SLOT_LIVER)) + render_list += "Subject lacks a liver.\n" + if(!(NOSTOMACH in the_dudes_species.species_traits) && !the_dude.getorganslot(ORGAN_SLOT_STOMACH)) + render_list += "Subject lacks a stomach.\n" + if(iscarbon(M)) var/mob/living/carbon/C = M if(LAZYLEN(C.get_traumas())) @@ -200,6 +223,8 @@ GENE SCANNER trauma_desc += "severe " if(TRAUMA_RESILIENCE_LOBOTOMY) trauma_desc += "deep-rooted " + if(TRAUMA_RESILIENCE_WOUND) + trauma_desc += "fracture-derived " if(TRAUMA_RESILIENCE_MAGIC, TRAUMA_RESILIENCE_ABSOLUTE) trauma_desc += "permanent " trauma_desc += B.scan_desc @@ -207,10 +232,11 @@ GENE SCANNER render_list += "Cerebral traumas detected: subject appears to be suffering from [english_list(trauma_text)].\n" if(C.roundstart_quirks.len) render_list += "Subject has the following physiological traits: [C.get_trait_string(see_all=see_all_quirks)].\n" + if(advanced) render_list += "Brain Activity Level: [(200 - M.getOrganLoss(ORGAN_SLOT_BRAIN))/2]%.\n" - if (M.radiation) + if(M.radiation) render_list += "Subject is irradiated.\n" if(advanced) render_list += "Radiation Level: [M.radiation]%.\n" @@ -311,15 +337,10 @@ GENE SCANNER if(advanced && H.has_dna()) render_list += "Genetic Stability: [H.dna.stability]%.\n" - var/list/broken_stuff = list() var/list/damaged_structure = list() for(var/obj/item/bodypart/B in H.bodyparts) - if(B.bone_status >= BONE_FLAG_BROKEN) // Checks if bone is broken or splinted - broken_stuff += B.plaintext_zone if(B.integrity_loss) damaged_structure += B.plaintext_zone - if(broken_stuff.len) - render_list += "\t[span_alert("Bone fractures detected. Subject's [english_list(broken_stuff)] [broken_stuff.len > 1 ? "require" : "requires"] surgical treatment!")]\n" if(damaged_structure.len) render_list+= "\t[span_alert("Structure rod damage detected. Subject's [english_list(damaged_structure)] [damaged_structure.len > 1 ? "rod require" : "rods requires"] replacement!")]\n" @@ -347,6 +368,16 @@ GENE SCANNER var/tdelta = round(world.time - M.timeofdeath) render_list += "Subject died [DisplayTimeText(tdelta)] ago.\n" +// Wounds + if(iscarbon(M)) + var/mob/living/carbon/C = M + var/list/wounded_parts = C.get_wounded_bodyparts() + for(var/obj/item/bodypart/wounded_part as anything in wounded_parts) + render_list += "Warning: Physical trauma[LAZYLEN(wounded_part.wounds) > 1? "s" : ""] detected in [wounded_part.name]" + for(var/datum/wound/W as anything in wounded_part.wounds) + render_list += "
Type: [W.name]\nSeverity: [W.severity_text()]\nRecommended Treatment: [W.treat_text]
\n" // less lines than in woundscan() so we don't overload people trying to get basic med info + render_list += "" + for(var/thing in M.diseases) var/datum/disease/D = thing if(!(D.visibility_flags & HIDDEN_SCANNER)) @@ -361,7 +392,7 @@ GENE SCANNER if(blood_id) if(ishuman(C)) var/mob/living/carbon/human/H = C - if(LAZYLEN(H.get_bleeding_parts())) + if(H.is_bleeding()) render_list += "Subject is bleeding!\n" var/blood_percent = round((C.blood_volume / BLOOD_VOLUME_NORMAL)*100) var/blood_type = C.dna.blood_type.name @@ -457,6 +488,8 @@ GENE SCANNER . = ..() . += span_notice("Alt-click [src] to activate the barometer function.") + + /obj/item/analyzer/attack_self(mob/user) add_fingerprint(user) @@ -834,5 +867,6 @@ GENE SCANNER #undef SCANMODE_HEALTH #undef SCANMODE_CHEMICAL +#undef SCANMODE_WOUND #undef SCANNER_CONDENSED #undef SCANNER_VERBOSE diff --git a/code/game/objects/items/grenades/antigravity.dm b/code/game/objects/items/grenades/antigravity.dm index 1c3bc9d5034c..589443242045 100644 --- a/code/game/objects/items/grenades/antigravity.dm +++ b/code/game/objects/items/grenades/antigravity.dm @@ -7,7 +7,7 @@ var/forced_value = 0 var/duration = 300 -/obj/item/grenade/antigravity/prime() +/obj/item/grenade/antigravity/prime(mob/living/lanced_by) . = ..() update_mob() diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm index a33258ad92a4..7456173ab693 100644 --- a/code/game/objects/items/grenades/chem_grenade.dm +++ b/code/game/objects/items/grenades/chem_grenade.dm @@ -174,7 +174,7 @@ active = TRUE addtimer(CALLBACK(src, PROC_REF(prime)), isnull(delayoverride)? det_time : delayoverride) -/obj/item/grenade/chem_grenade/prime() +/obj/item/grenade/chem_grenade/prime(mob/living/lanced_by) if(stage != GRENADE_READY) return @@ -194,12 +194,12 @@ stage_change(GRENADE_EMPTY) active = FALSE return -// logs from custom assemblies priming are handled by the wire component + //logs from custom assemblies priming are handled by the wire component log_game("A grenade detonated at [AREACOORD(detonation_turf)]") update_mob() - qdel(src) + resolve() //Large chem grenades accept slime cores and use the appropriately. /obj/item/grenade/chem_grenade/large @@ -213,7 +213,7 @@ ignition_temp = 25 // Large grenades are slightly more effective at setting off heat-sensitive mixtures than smaller grenades. threatscale = 1.1 // 10% more effective. -/obj/item/grenade/chem_grenade/large/prime() +/obj/item/grenade/chem_grenade/large/prime(mob/living/lanced_by) if(stage != GRENADE_READY) return @@ -252,7 +252,7 @@ to_chat(user, span_notice("The new value is out of bounds. Minimum spread is 5 units, maximum is 100 units.")) ..() -/obj/item/grenade/chem_grenade/adv_release/prime() +/obj/item/grenade/chem_grenade/prime(mob/living/lanced_by) if(stage != GRENADE_READY) return diff --git a/code/game/objects/items/grenades/clusterbuster.dm b/code/game/objects/items/grenades/clusterbuster.dm index b9ad8730b652..8913ae13621e 100644 --- a/code/game/objects/items/grenades/clusterbuster.dm +++ b/code/game/objects/items/grenades/clusterbuster.dm @@ -14,7 +14,7 @@ var/max_spawned = 8 var/segment_chance = 35 -/obj/item/grenade/clusterbuster/prime() +/obj/item/grenade/clusterbuster/prime(mob/living/lanced_by) . = ..() update_mob() var/numspawned = rand(min_spawned,max_spawned) @@ -60,7 +60,7 @@ step_away(src,loc) addtimer(CALLBACK(src, PROC_REF(prime)), rand(15,60)) -/obj/item/grenade/clusterbuster/segment/prime() +/obj/item/grenade/clusterbuster/segment/prime(mob/living/lanced_by) new payload_spawner(drop_location(), payload, rand(min_spawned,max_spawned)) playsound(src, prime_sound, 75, TRUE, -3) resolve() diff --git a/code/game/objects/items/grenades/discogrenade.dm b/code/game/objects/items/grenades/discogrenade.dm index 6c425056cf5f..5341805c8d2d 100644 --- a/code/game/objects/items/grenades/discogrenade.dm +++ b/code/game/objects/items/grenades/discogrenade.dm @@ -28,7 +28,7 @@ for(var/i in 1 to 6) new /obj/item/grenade/discogrenade/subgrenade(current_turf, TRUE) - qdel(src) + resolve() ////////////////////// // Sub grenades // @@ -74,7 +74,7 @@ for(var/mob/living/carbon/human/victim in hearers(4, src)) forcedance(get_turf(victim), victim) - qdel(src) + resolve() /obj/item/grenade/discogrenade/subgrenade/proc/randomiseLightColor() remove_atom_colour(TEMPORARY_COLOUR_PRIORITY) diff --git a/code/game/objects/items/grenades/emgrenade.dm b/code/game/objects/items/grenades/emgrenade.dm index 8cc4e4bea620..b604552187b9 100644 --- a/code/game/objects/items/grenades/emgrenade.dm +++ b/code/game/objects/items/grenades/emgrenade.dm @@ -4,7 +4,7 @@ icon_state = "emp" item_state = "emp" -/obj/item/grenade/empgrenade/prime() +/obj/item/grenade/empgrenade/prime(mob/living/lanced_by) . = ..() update_mob() for(var/obj/machinery/light/L in range(10, src)) diff --git a/code/game/objects/items/grenades/festive.dm b/code/game/objects/items/grenades/festive.dm index 26126c7fe8c3..0b1190468ee4 100644 --- a/code/game/objects/items/grenades/festive.dm +++ b/code/game/objects/items/grenades/festive.dm @@ -109,11 +109,9 @@ icon_state = initial(icon_state) + "_active" addtimer(CALLBACK(src, PROC_REF(prime)), isnull(delayoverride)? det_time : delayoverride) -/obj/item/grenade/firecracker/prime() +/obj/item/grenade/firecracker/prime(mob/living/lanced_by) . = ..() update_mob() var/explosion_loc = get_turf(src) resolve() explosion(explosion_loc,-1,-1,2) - - diff --git a/code/game/objects/items/grenades/flashbang.dm b/code/game/objects/items/grenades/flashbang.dm index a3b7af1d01cb..a27e65ed58bc 100644 --- a/code/game/objects/items/grenades/flashbang.dm +++ b/code/game/objects/items/grenades/flashbang.dm @@ -6,7 +6,7 @@ righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' var/flashbang_range = 7 //how many tiles away the mob will be stunned. -/obj/item/grenade/flashbang/prime() +/obj/item/grenade/flashbang/prime(mob/living/lanced_by) . = ..() update_mob() var/flashbang_turf = get_turf(src) @@ -57,7 +57,7 @@ shrapnel_type = /obj/projectile/bullet/pellet/stingball/mega shrapnel_radius = 12 -/obj/item/grenade/stingbang/prime() +/obj/item/grenade/stingbang/prime(mob/living/lanced_by) if(iscarbon(loc)) var/mob/living/carbon/C = loc var/obj/item/bodypart/B = C.get_holding_bodypart_of_item(src) @@ -116,7 +116,7 @@ rots++ user.changeNext_move(CLICK_CD_RAPID) -/obj/item/grenade/primer/prime() +/obj/item/grenade/primer/prime(mob/living/lanced_by) shrapnel_radius = round(rots / rots_per_mag) . = ..() resolve() diff --git a/code/game/objects/items/grenades/ghettobomb.dm b/code/game/objects/items/grenades/ghettobomb.dm index e95cca3239c7..9951f9b1cc1e 100644 --- a/code/game/objects/items/grenades/ghettobomb.dm +++ b/code/game/objects/items/grenades/ghettobomb.dm @@ -63,7 +63,7 @@ cut_overlay("improvised_grenade_filled") preprime(user, null, FALSE) -/obj/item/grenade/iedcasing/prime() //Blowing that can up +/obj/item/grenade/iedcasing/prime(mob/living/lanced_by) //Blowing that can up . = ..() update_mob() explosion(src.loc,-1,-1,2, flame_range = 4) // small explosion, plus a very large fireball. diff --git a/code/game/objects/items/grenades/grenade.dm b/code/game/objects/items/grenades/grenade.dm index 402de2601626..dced38b5f731 100644 --- a/code/game/objects/items/grenades/grenade.dm +++ b/code/game/objects/items/grenades/grenade.dm @@ -97,7 +97,7 @@ SEND_SIGNAL(src, COMSIG_GRENADE_ARMED, det_time, delayoverride) addtimer(CALLBACK(src, PROC_REF(prime)), isnull(delayoverride)? det_time : delayoverride) -/obj/item/grenade/proc/prime() +/obj/item/grenade/proc/prime(mob/living/lanced_by) if(shrapnel_type && shrapnel_radius && !shrapnel_initialized) // add a second check for adding the component in case whatever triggered the grenade went straight to prime (badminnery for example) shrapnel_initialized = TRUE AddComponent(/datum/component/pellet_cloud, projectile_type=shrapnel_type, magnitude=shrapnel_radius) diff --git a/code/game/objects/items/grenades/hypno.dm b/code/game/objects/items/grenades/hypno.dm index 150506f4ae0f..eafd2da99300 100644 --- a/code/game/objects/items/grenades/hypno.dm +++ b/code/game/objects/items/grenades/hypno.dm @@ -7,7 +7,7 @@ righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' var/flashbang_range = 7 -/obj/item/grenade/hypnotic/prime() +/obj/item/grenade/hypnotic/prime(mob/living/lanced_by) . = ..() update_mob() var/flashbang_turf = get_turf(src) diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm index 4cfa5bcc8828..5b4697537252 100644 --- a/code/game/objects/items/grenades/plastic.dm +++ b/code/game/objects/items/grenades/plastic.dm @@ -40,7 +40,7 @@ else return ..() -/obj/item/grenade/c4/prime() +/obj/item/grenade/c4/prime(mob/living/lanced_by) if(QDELETED(src)) return diff --git a/code/game/objects/items/grenades/smokebomb.dm b/code/game/objects/items/grenades/smokebomb.dm index c29a00a83901..a3fa0c3c7081 100644 --- a/code/game/objects/items/grenades/smokebomb.dm +++ b/code/game/objects/items/grenades/smokebomb.dm @@ -7,7 +7,7 @@ slot_flags = ITEM_SLOT_BELT ///Here we generate some smoke and also damage blobs??? for some reason. Honestly not sure why we do that. -/obj/item/grenade/smokebomb/prime() +/obj/item/grenade/smokebomb/prime(mob/living/lanced_by) . = ..() update_mob() playsound(src, 'sound/effects/smoke.ogg', 50, TRUE, -3) diff --git a/code/game/objects/items/grenades/spawnergrenade.dm b/code/game/objects/items/grenades/spawnergrenade.dm index 098a3c57bff3..31f2d1fd19b1 100644 --- a/code/game/objects/items/grenades/spawnergrenade.dm +++ b/code/game/objects/items/grenades/spawnergrenade.dm @@ -7,7 +7,7 @@ var/spawner_type = null // must be an object path var/deliveryamt = 1 // amount of type to deliver -/obj/item/grenade/spawnergrenade/prime() // Prime now just handles the two loops that query for people in lockers and people who can see it. +/obj/item/grenade/spawnergrenade/prime(mob/living/lanced_by)// Prime now just handles the two loops that query for people in lockers and people who can see it. . = ..() update_mob() if(spawner_type && deliveryamt) diff --git a/code/game/objects/items/grenades/syndieminibomb.dm b/code/game/objects/items/grenades/syndieminibomb.dm index d820ada940e9..cf608c7f5dc1 100644 --- a/code/game/objects/items/grenades/syndieminibomb.dm +++ b/code/game/objects/items/grenades/syndieminibomb.dm @@ -9,7 +9,7 @@ ex_light = 4 ex_flame = 2 -/obj/item/grenade/syndieminibomb/prime() +/obj/item/grenade/syndieminibomb/prime(mob/living/lanced_by) . = ..() update_mob() resolve() @@ -38,7 +38,7 @@ shrapnel_type = /obj/projectile/bullet/shrapnel/mega shrapnel_radius = 12 -/obj/item/grenade/frag/prime() +/obj/item/grenade/frag/prime(mob/living/lanced_by) . = ..() update_mob() resolve() @@ -53,7 +53,7 @@ var/rad_damage = 350 var/stamina_damage = 30 -/obj/item/grenade/gluon/prime() +/obj/item/grenade/gluon/prime(mob/living/lanced_by) . = ..() update_mob() playsound(loc, 'sound/effects/empulse.ogg', 50, TRUE) diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm index 8bdd65977ec1..5e70e485be03 100644 --- a/code/game/objects/items/latexballoon.dm +++ b/code/game/objects/items/latexballoon.dm @@ -54,5 +54,5 @@ var/obj/item/tank/T = W blow(T, user) return - if (W.get_sharpness() || W.get_temperature() || is_pointed(W)) + if (W.get_sharpness() || W.get_temperature()) burst() diff --git a/code/game/objects/items/melee/axe.dm b/code/game/objects/items/melee/axe.dm index 37bdcd34f572..fd6e246ceeb9 100644 --- a/code/game/objects/items/melee/axe.dm +++ b/code/game/objects/items/melee/axe.dm @@ -12,10 +12,12 @@ attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") hitsound = list('sound/weapons/melee/heavyaxe_hit1.ogg', 'sound/weapons/melee/heavyaxe_hit2.ogg') pickup_sound = 'sound/weapons/melee/heavy_pickup.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 = -15 + bare_wound_bonus = 20 species_exception = list(/datum/species/kepori) var/force_wielded = 25 diff --git a/code/game/objects/items/melee/blunt.dm b/code/game/objects/items/melee/blunt.dm index 6fa70c299cd6..9df10ea9ad6a 100644 --- a/code/game/objects/items/melee/blunt.dm +++ b/code/game/objects/items/melee/blunt.dm @@ -10,7 +10,7 @@ throwforce = 15 armour_penetration = 40 demolition_mod = 2 - sharpness = IS_BLUNT + sharpness = SHARP_NONE w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK attack_cooldown = 12 diff --git a/code/game/objects/items/melee/chainsaw.dm b/code/game/objects/items/melee/chainsaw.dm index 49b31969860e..25f207d44769 100644 --- a/code/game/objects/items/melee/chainsaw.dm +++ b/code/game/objects/items/melee/chainsaw.dm @@ -17,9 +17,9 @@ throw_range = 4 custom_materials = list(/datum/material/iron=13000) attack_cooldown = HEAVY_WEAPON_CD - attack_verb = list("sawed", "torn", "cut", "chopped", "diced") + attack_verb = list("sawed", "tore", "lacerated", "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 @@ -50,10 +50,6 @@ var/datum/action/A = X A.UpdateButtonIcon() -/obj/item/chainsaw/get_dismemberment_chance() - if(HAS_TRAIT(src, TRAIT_WIELDED)) - . = ..() - /obj/item/chainsaw/doomslayer name = "THE GREAT COMMUNICATOR" desc = span_warning("VRRRRRRR!!!") diff --git a/code/game/objects/items/melee/dualenergy.dm b/code/game/objects/items/melee/dualenergy.dm index 3f94c3eb7c35..97d5ff3955d5 100644 --- a/code/game/objects/items/melee/dualenergy.dm +++ b/code/game/objects/items/melee/dualenergy.dm @@ -14,6 +14,8 @@ max_integrity = 200 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70) resistance_flags = FIRE_PROOF + wound_bonus = -10 + bare_wound_bonus = 20 var/active_w_class = WEIGHT_CLASS_BULKY var/two_hand_force = 34 var/sword_color = "green" @@ -53,7 +55,7 @@ /obj/item/melee/duelenergy/proc/on_wield(obj/item/source, mob/living/carbon/user) SIGNAL_HANDLER - sharpness = IS_SHARP + sharpness = SHARP_EDGED w_class = active_w_class hitsound = 'sound/weapons/blade1.ogg' START_PROCESSING(SSobj, src) diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index 1f7bfa8281b6..f0f885ddfa77 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -1,5 +1,5 @@ /obj/item/melee/energy - sharpness = IS_SHARP + sharpness = SHARP_EDGED w_class = WEIGHT_CLASS_SMALL attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") icon = 'icons/obj/weapon/energy.dmi' @@ -20,7 +20,7 @@ /// Throwforce while active. var/active_throwforce = 20 /// Sharpness while active. - var/active_sharpness = IS_SHARP + var/active_sharpness = SHARP_EDGED /// Hitsound played attacking while active. var/active_hitsound = 'sound/weapons/blade1.ogg' /// Weight class while active. @@ -132,7 +132,7 @@ attack_verb = 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 block_chance = 50 @@ -166,7 +166,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 = LIGHT_COLOR_LIGHT_CYAN tool_behaviour = TOOL_SAW toolspeed = 0.7 //faster as a saw @@ -259,7 +259,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/energy/blade/Initialize() @@ -287,7 +287,7 @@ icon_state = "plasmasword" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' - sharpness = IS_SHARP + sharpness = SHARP_EDGED armour_penetration = 200 block_chance = 0 force = 0 diff --git a/code/game/objects/items/melee/knife.dm b/code/game/objects/items/melee/knife.dm index 6ca8caaeeaf8..3332f5375d3e 100644 --- a/code/game/objects/items/melee/knife.dm +++ b/code/game/objects/items/melee/knife.dm @@ -17,7 +17,8 @@ custom_materials = list(/datum/material/iron=12000) attack_cooldown = LIGHT_WEAPON_CD attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - sharpness = IS_SHARP_ACCURATE + sharpness = SHARP_POINTY + wound_bonus = 15 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) item_flags = EYE_STAB tool_behaviour = TOOL_KNIFE @@ -47,7 +48,7 @@ throw_range = 5 custom_materials = list(/datum/material/plastic = 100) attack_verb = list("prodded", "whiffed","scratched", "poked") - sharpness = IS_SHARP + sharpness = SHARP_EDGED custom_price = 50 var/break_chance = 25 @@ -74,7 +75,7 @@ throw_range = 6 custom_materials = list(/datum/material/iron=4000) attack_verb = list("prodded", "whiffed","rolled", "poked") - sharpness = IS_SHARP + sharpness = SHARP_EDGED /obj/item/melee/knife/butcher name = "butcher's cleaver" @@ -169,7 +170,7 @@ flags_1 = CONDUCT_1 force = 3 w_class = WEIGHT_CLASS_SMALL - sharpness = IS_BLUNT + sharpness = SHARP_NONE throwforce = 5 throw_speed = 3 throw_range = 6 @@ -185,7 +186,7 @@ force_on = 20, \ throwforce_on = 23, \ throw_speed_on = 4, \ - sharpness_on = IS_SHARP, \ + sharpness_on = SHARP_EDGED, \ hitsound_on = 'sound/weapons/bladeslice.ogg', \ w_class_on = WEIGHT_CLASS_NORMAL, \ attack_verb_on = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut"), \ diff --git a/code/game/objects/items/melee/melee.dm b/code/game/objects/items/melee/melee.dm index 13103db5d95f..818b0ab1460e 100644 --- a/code/game/objects/items/melee/melee.dm +++ b/code/game/objects/items/melee/melee.dm @@ -40,7 +40,7 @@ throwforce = 10 hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - sharpness = IS_SHARP + sharpness = SHARP_EDGED /obj/item/melee/synthetic_arm_blade/Initialize() . = ..() @@ -94,6 +94,7 @@ item_state = "baseball_bat" force = 12 throwforce = 12 + wound_bonus = -10 attack_verb = list("beat", "smacked") custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 3.5) w_class = WEIGHT_CLASS_HUGE @@ -101,6 +102,10 @@ var/homerun_ready = FALSE var/homerun_able = FALSE +obj/item/melee/baseball_bat/Initialize() + . = ..() + AddElement(/datum/element/kneecapping) + /obj/item/melee/baseball_bat/homerun name = "home run bat" desc = "This thing looks dangerous... Dangerously good at baseball, that is." @@ -132,7 +137,8 @@ homerun_ready = 0 return else if(!target.anchored) - target.throw_at(throw_target, rand(1,2), 2, user, gentle = TRUE) + var/whack_speed = (prob(60) ? 1 : 3) + target.throw_at(throw_target, rand(1,2), whack_speed, user, gentle = TRUE) /obj/item/melee/baseball_bat/ablative name = "metal baseball bat" @@ -245,7 +251,7 @@ 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 @@ -258,7 +264,7 @@ /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) @@ -287,8 +293,8 @@ throwforce = 0 throw_range = 0 throw_speed = 0 - sharpness = IS_SHARP - attack_verb = list("sawed", "torn", "cut", "chopped", "diced") + sharpness = SHARP_EDGED + attack_verb = list("sawed", "tore", "lacerated", "cut", "chopped", "diced") hitsound = 'sound/weapons/chainsawhit.ogg' tool_behaviour = TOOL_SAW toolspeed = 1 diff --git a/code/game/objects/items/melee/spear.dm b/code/game/objects/items/melee/spear.dm index 8bfbac637248..f127205de74e 100644 --- a/code/game/objects/items/melee/spear.dm +++ b/code/game/objects/items/melee/spear.dm @@ -11,12 +11,14 @@ slot_flags = ITEM_SLOT_BACK throwforce = 20 throw_speed = 4 - embedding = list("impact_pain_mult" = 3) + embedding = list("impact_pain_mult" = 2, "remove_pain_mult" = 4, "jostle_chance" = 2.5) armour_penetration = 10 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 + attack_verb = list("attacked", "poked", "jabbed", "tore", "lacerated", "gored") + sharpness = SHARP_EDGED + wound_bonus = -15 + bare_wound_bonus = 15 max_integrity = 200 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30) species_exception = list(/datum/species/kepori) @@ -114,5 +116,5 @@ if(HAS_TRAIT(src, TRAIT_WIELDED)) user.say("[war_cry]", forced="spear warcry") explosive.forceMove(AM) - explosive.prime() + explosive.prime(lanced_by=user) qdel(src) diff --git a/code/game/objects/items/melee/stunbaton.dm b/code/game/objects/items/melee/stunbaton.dm index 05808e3338b7..2049af634227 100644 --- a/code/game/objects/items/melee/stunbaton.dm +++ b/code/game/objects/items/melee/stunbaton.dm @@ -344,6 +344,7 @@ righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' slot_flags = ITEM_SLOT_BELT force = 12 //9 hit crit + wound_bonus = 15 w_class = WEIGHT_CLASS_NORMAL var/cooldown_check = 0 // Used interally, you don't want to modify @@ -364,6 +365,7 @@ var/active_force // Damage when on - not stunning var/force_off // Damage when off - not stunning var/weight_class_on // What is the new size class when turned on + // Description for trying to stun when still on cooldown. /obj/item/melee/classic_baton/proc/get_wait_description() diff --git a/code/game/objects/items/melee/sword.dm b/code/game/objects/items/melee/sword.dm index 159f6c7b54ec..1ef5c1744aa4 100644 --- a/code/game/objects/items/melee/sword.dm +++ b/code/game/objects/items/melee/sword.dm @@ -10,7 +10,7 @@ w_class = WEIGHT_CLASS_BULKY block_chance = 10 attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - sharpness = IS_SHARP + sharpness = SHARP_EDGED armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) resistance_flags = FIRE_PROOF demolition_mod = 0.75 @@ -133,7 +133,7 @@ throwforce = 10 armour_penetration = 25 slot_flags = ITEM_SLOT_BELT - attack_verb = list("sawed", "torn", "cut", "chopped", "diced") + attack_verb = list("sawed", "tore", "lacerated", "cut", "chopped", "diced") hitsound = 'sound/weapons/chainsawhit.ogg' tool_behaviour = TOOL_SAW toolspeed = 1.5 //slower than a real saw @@ -147,9 +147,12 @@ throwforce = 10 block_chance = 60 armour_penetration = 75 + wound_bonus = 10 + bare_wound_bonus = 25 attack_verb = list("slashed", "cut") hitsound = 'sound/weapons/rapierhit.ogg' custom_materials = list(/datum/material/iron = 1000) + /obj/item/melee/sword/sabre/on_enter_storage(datum/component/storage/concrete/S) var/obj/item/storage/belt/sabre/B = S.real_location() @@ -363,7 +366,7 @@ force = 20 throwforce = 20 throw_speed = 4 - sharpness = IS_SHARP + sharpness = SHARP_EDGED attack_verb = list("cut", "sliced", "diced") slot_flags = ITEM_SLOT_BACK hitsound = 'sound/weapons/bladeslice.ogg' @@ -397,7 +400,7 @@ icon_state = "weeb_blade" item_state = "weeb_blade" slot_flags = ITEM_SLOT_BACK - sharpness = IS_SHARP_ACCURATE + sharpness = SHARP_POINTY force = 25 throw_speed = 4 throw_range = 5 diff --git a/code/game/objects/items/melee/trickweapon.dm b/code/game/objects/items/melee/trickweapon.dm index af574085a158..91eb37f0781b 100644 --- a/code/game/objects/items/melee/trickweapon.dm +++ b/code/game/objects/items/melee/trickweapon.dm @@ -15,7 +15,7 @@ slot_flags = ITEM_SLOT_BELT attack_verb = list("attacked", "sawed", "sliced", "torn", "ripped", "diced", "cut") hitsound = 'sound/weapons/bladeslice.ogg' - sharpness = IS_SHARP + sharpness = SHARP_EDGED var/transform_cooldown var/swiping = FALSE diff --git a/code/game/objects/items/sharpener.dm b/code/game/objects/items/sharpener.dm index cc8db92e337c..ae65d8935443 100644 --- a/code/game/objects/items/sharpener.dm +++ b/code/game/objects/items/sharpener.dm @@ -37,9 +37,10 @@ return if(!(signal_out & COMPONENT_BLOCK_SHARPEN_APPLIED)) I.force = clamp(I.force + increment, 0, max) + I.wound_bonus = I.wound_bonus + increment user.visible_message(span_notice("[user] sharpens [I] with [src]!"), span_notice("You sharpen [I], making it much more deadly than before.")) playsound(src, 'sound/items/unsheath.ogg', 25, TRUE) - 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 e67072191298..ecf716e5a902 100644 --- a/code/game/objects/items/shrapnel.dm +++ b/code/game/objects/items/shrapnel.dm @@ -1,21 +1,20 @@ /obj/item/shrapnel // frag grenades name = "shrapnel shard" - embedding = list(embed_chance=70, ignore_throwspeed_threshold=TRUE, fall_chance=2, embed_chance_turf_mod=-100) custom_materials = list(/datum/material/iron=50) armour_penetration = -20 icon = 'icons/obj/shards.dmi' icon_state = "large" w_class = WEIGHT_CLASS_TINY item_flags = DROPDEL + sharpness = SHARP_EDGED /obj/item/shrapnel/hot name = "molten slag" - embedding = list(embed_chance=70, ignore_throwspeed_threshold=TRUE, fall_chance=2, embed_chance_turf_mod=-100) damtype = BURN + sharpness = SHARP_NONE /obj/item/shrapnel/stingball name = "clump of ballistic gel" - embedding = list(embed_chance=15, fall_chance=2, jostle_chance=7, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.8, pain_mult=3, jostle_pain_mult=5, rip_time=15, embed_chance_turf_mod=-100) icon_state = "tiny" /obj/item/shrapnel/bullet // bullets @@ -23,56 +22,22 @@ icon = 'icons/obj/ammunition/ammo_bullets.dmi' icon_state = "pistol-brass" item_flags = NONE - -/obj/item/shrapnel/bullet/c38 // .38 round - name = "\improper .38 bullet" - -/obj/item/shrapnel/bullet/c38/dumdum // .38 DumDum round - name = "\improper .38 prism bullet" - embedding = list(embed_chance=70, fall_chance=7, jostle_chance=7, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10, embed_chance_turf_mod=-100) - -/obj/item/shrapnel/bullet/tracker - name = "\improper bullet tracker" - embedding = list(embed_chance=100, fall_chance=0, jostle_chance=1, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=1, jostle_pain_mult=2, rip_time=100, embed_chance_turf_mod=-100) - var/lifespan = 3000 - var/gps_tag = "*TRAC" - var/timer_id - -/obj/item/shrapnel/bullet/tracker/Initialize() - . = ..() - timer_id = QDEL_IN(src, lifespan) - AddComponent(/datum/component/gps/item, gps_tag) - -/obj/item/shrapnel/bullet/tracker/Destroy() - deltimer(timer_id) - return ..() - -/obj/item/shrapnel/bullet/tracker/c38 - name = ".38 Tracker" - -/obj/item/shrapnel/bullet/tracker/a8_50r - name = "8x50mm Tracker" - -/obj/item/shrapnel/bullet/tracker/a858 - name = "8x58mm Tracker" - -/obj/item/shrapnel/bullet/tracker/a75clip - name = "7.5x64mm Tracker" - -/obj/item/shrapnel/bullet/tracker/a308 - name = ".308 Tracker" + embedding = null /obj/projectile/bullet/shrapnel name = "flying shrapnel shard" - damage = 10 - range = 10 + damage = 15 + range = 15 armour_penetration = -5 - dismemberment = 25 + dismemberment = 5 ricochets_max = 2 - ricochet_chance = 40 + ricochet_chance = 60 shrapnel_type = /obj/item/shrapnel ricochet_incidence_leeway = 60 hit_stunned_targets = TRUE + sharpness = SHARP_EDGED + wound_bonus = 30 + embedding = list(embed_chance=70, ignore_throwspeed_threshold=TRUE, fall_chance=1) /obj/projectile/bullet/shrapnel/Initialize() . = ..() @@ -88,10 +53,11 @@ /obj/projectile/bullet/shrapnel/mega damage = 20 name = "flying shrapnel hunk" - range = 25 - dismemberment = 35 - ricochets_max = 4 - ricochet_chance = 90 + range = 45 + dismemberment = 15 + ricochets_max = 6 + ricochet_chance = 130 + ricochet_incidence_leeway = 0 ricochet_decay_chance = 0.9 /obj/projectile/bullet/shrapnel/hot @@ -136,8 +102,9 @@ ricochet_auto_aim_angle = 10 ricochet_auto_aim_range = 2 ricochet_incidence_leeway = 0 - knockdown = 20 + embed_falloff_tile = -2 shrapnel_type = /obj/item/shrapnel/stingball + embedding = list(embed_chance=55, fall_chance=2, jostle_chance=7, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.7, pain_mult=3, jostle_pain_mult=3, rip_time=15) /obj/projectile/bullet/pellet/stingball/mega name = "megastingball pellet" @@ -147,6 +114,36 @@ /obj/projectile/bullet/pellet/stingball/on_ricochet(atom/A) hit_stunned_targets = TRUE // ducking will save you from the first wave, but not the rebounds +// Tracking rounds +/obj/item/shrapnel/bullet/tracker + name = "\improper bullet tracker" + var/lifespan = 3000 + var/gps_tag = "*TRAC" + var/timer_id + +/obj/item/shrapnel/bullet/tracker/Initialize() + . = ..() + timer_id = QDEL_IN(src, lifespan) + AddComponent(/datum/component/gps/item, gps_tag) + +/obj/item/shrapnel/bullet/tracker/Destroy() + deltimer(timer_id) + return ..() + +/obj/item/shrapnel/bullet/tracker/c38 + name = ".38 Tracker" + +/obj/item/shrapnel/bullet/tracker/a8_50r + name = "8x50mm Tracker" + +/obj/item/shrapnel/bullet/tracker/a858 + name = "8x58mm Tracker" + +/obj/item/shrapnel/bullet/tracker/a75clip + name = "7.5x64mm Tracker" + +/obj/item/shrapnel/bullet/tracker/a308 + name = ".308 Tracker" //claymore shrapnel stuff// //2 small bursts- one that harasses people passing by a bit aways, one that brutalizes point-blank targets. diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 464c554852a7..767235056b83 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -12,96 +12,128 @@ max_integrity = 40 novariants = FALSE item_flags = NOBLUDGEON + merge_type = /obj/item/stack/medical + var/heals_organic = TRUE var/heals_inorganic = FALSE - var/splint_fracture = FALSE - var/restore_integrity = 0 - var/failure_chance - var/self_delay = 50 + var/restore_integrity = + + /// How long it takes to apply it to yourself + var/self_delay = 5 SECONDS + /// How long it takes to apply it to someone else var/other_delay = 0 + /// If we've still got more and the patient is still hurt, should we keep going automatically? var/repeating = FALSE + /// How much medical XP is given per use? var/experience_given = 1 ///Sound/Sounds to play when this is applied var/apply_sounds + /// How much brute we heal per application. This is the only number that matters for simplemobs + var/heal_brute + /// How much burn we heal per application + var/heal_burn + /// How much we reduce bleeding per application on cut wounds + var/stop_bleeding + /// How much sanitization to apply to burn wounds on application + var/sanitization + /// How much we add to flesh_healing for burn wounds on application + var/flesh_regeneration + /// This is a multiplier used to speed up burn recoveries + var/burn_cleanliness_bonus + ///Sound/Sounds to play when this is applied + var/apply_sounds -/obj/item/stack/medical/attack(mob/living/target, mob/user) +/obj/item/stack/medical/attack(mob/living/patient, mob/user) . = ..() - try_heal(target, user) - + try_heal(patient, user) -/obj/item/stack/medical/proc/try_heal(mob/living/target, mob/user, silent = FALSE) - if(!target.can_inject(user, TRUE)) +/// In which we print the message that we're starting to heal someone, then we try healing them. Does the do_after whether or not it can actually succeed on a targeted mob +/obj/item/stack/medical/proc/try_heal(mob/living/patient, mob/user, silent = FALSE) + if(!patient.can_inject(user, TRUE)) return - if(target == user) + + if(patient == user) playsound(src, islist(apply_sounds) ? pick(apply_sounds) : apply_sounds, 25) if(!silent) - user.visible_message(span_notice("[user] starts to apply \the [src] on [user.p_them()]self..."), span_notice("You begin applying \the [src] on yourself...")) - if(!do_after(user, self_delay, target, extra_checks=CALLBACK(target, TYPE_PROC_REF(/mob/living, can_inject), user, TRUE))) + user.visible_message( + span_notice("[user] starts to apply [src] on [user.p_them()]self..."), + span_notice("You begin applying [src] on yourself..."), + ) + if(!do_after(user, self_delay, patient, extra_checks = CALLBACK(patient, TYPE_PROC_REF(/mob/living, can_inject), user, TRUE))) return else if(other_delay) playsound(src, islist(apply_sounds) ? pick(apply_sounds) : apply_sounds, 25) if(!silent) - user.visible_message(span_notice("[user] starts to apply \the [src] on [target]."), span_notice("You begin applying \the [src] on [target]...")) - if(!do_after(user, other_delay, target, extra_checks=CALLBACK(target, TYPE_PROC_REF(/mob/living, can_inject), user, TRUE))) + user.visible_message( + span_notice("[user] starts to apply [src] on [patient]."), + span_notice("You begin applying [src] on [patient]..."), + ) + if(!do_after(user, other_delay, patient, extra_checks = CALLBACK(patient, TYPE_PROC_REF(/mob/living, can_inject), user, TRUE))) return - - if(heal(target, user)) + if(heal(patient, user)) playsound(src, islist(apply_sounds) ? pick(apply_sounds) : apply_sounds, 25) user?.mind.adjust_experience(/datum/skill/healing, experience_given) - log_combat(user, target, "healed", src.name) + log_combat(user, patient, "healed", src.name) use(1) if(repeating && amount > 0) - try_heal(target, user, TRUE) + try_heal(patient, user, TRUE) -/obj/item/stack/medical/proc/heal(mob/living/target, mob/user) - return +/obj/item/stack/medical/proc/heal(mob/living/patient, mob/user) + if(patient.stat == DEAD) + to_chat(user, span_warning("[patient] is dead! You can not help [patient.p_them()].")) + + if(isanimal(patient) && heal_brute) // only brute can heal + var/mob/living/simple_animal/critter = patient + + if(!critter.healable) + to_chat(user, span_warning("You cannot use [src] on [patient]!")) + return FALSE + else if(critter.health == critter.maxHealth) + to_chat(user, span_notice("[patient] is at full health.")) + return FALSE + user.visible_message( + span_green("[user] applies [src] on [patient]."), + span_green("You apply [src] on [patient]."), + ) + patient.heal_bodypart_damage((heal_brute * 0.5)) + return TRUE + if(iscarbon(patient)) + return heal_carbon(patient, user, heal_brute, heal_burn) + to_chat(user, span_warning("You can't heal [patient] with [src]!")) + +/// The healing effects on a carbon patient. Since we have extra details for dealing with bodyparts, we get our own fancy proc. Still returns TRUE on success and FALSE on fail /obj/item/stack/medical/proc/heal_carbon(mob/living/carbon/C, mob/user, brute, burn, integrity = 0) var/obj/item/bodypart/affecting = C.get_bodypart(check_zone(user.zone_selected)) + if(!affecting) //Missing limb? to_chat(user, span_warning("[C] doesn't have \a [parse_zone(user.zone_selected)]!")) - return - if(!heals_inorganic && !IS_ORGANIC_LIMB(affecting)) + return FALSE + + if(!heals_inorganic && !IS_ORGANIC_LIMB(affecting)) //does it work on robotic limbs? to_chat(user, span_warning("\The [src] won't work on a robotic limb!")) - return - if(!heals_organic && IS_ORGANIC_LIMB(affecting)) - to_chat(user, span_warning("\The [src] won't work on an organic limb!")) - return + return FALSE - //WS begin - failure chance - if(prob(failure_chance)) - user.visible_message(span_warning("[user] tries to apply \the [src] on [C]'s [affecting.name], but fails!"), "You try to apply \the [src] on on [C]'s [affecting.name], but fail!") + if(!heals_organic && IS_ORGANIC_LIMB(affecting)) //does it work on organic limbs? + to_chat(user, span_warning("\The [src] won't work on an organic limb!")) return - //WS end - var/successful_heal = FALSE //Has this item healed anywhere it could? if(affecting.brute_dam && brute || affecting.burn_dam && burn) - var/brute2heal = brute - var/burn2heal = burn - var/skill_mod = user?.mind?.get_skill_modifier(/datum/skill/healing, SKILL_SPEED_MODIFIER) - if(skill_mod) - brute2heal *= (2-skill_mod) - burn2heal *= (2-skill_mod) - if(affecting.heal_damage(brute2heal, burn2heal)) + user.visible_message( + span_green("[user] applies [src] on [C]'s [affecting.name]"), + span_green("You apply [src] on [C]'s [affecting.name]."), + ) + var/previous_damage = affecting.get_damage() + if(affecting.heal_damage(brute, burn)) C.update_damage_overlays() - successful_heal = TRUE - - - //WS Begin - Splints - if(splint_fracture) //Check if it's a splint and the bone is broken - if(affecting.bone_status == BONE_FLAG_SPLINTED) // Check if it isn't already splinted - to_chat(user, span_warning("[C]'s [affecting.name] is already splinted!")) - else if(!(affecting.bone_status == BONE_FLAG_BROKEN)) // Check if it's actually broken - to_chat(user, span_warning("[C]'s [affecting.name] isn't broken!")) - else - affecting.bone_status = BONE_FLAG_SPLINTED - // C.update_inv_splints() something breaks - successful_heal = TRUE - //WS End + post_heal_effects(max(previous_damage - affecting.get_damage(), 0), C, user) + return TRUE + to_chat(user, span_warning("[C]'s [affecting.name] can not be healed with [src]!")) + return FALSE - if (restore_integrity) + if(restore_integrity) if(affecting.integrity_loss == 0) to_chat(user, span_warning("[C]'s [affecting.name] has no integrity damage!")) else @@ -115,12 +147,14 @@ // C.update_inv_splints() something breaks successful_heal = TRUE - - if (successful_heal) + if(successful_heal) user.visible_message(span_green("[user] applies \the [src] on [C]'s [affecting.name]."), span_green("You apply \the [src] on [C]'s [affecting.name].")) return TRUE to_chat(user, span_warning("[C]'s [affecting.name] can not be healed with \the [src]!")) +///Override this proc for special post heal effects. +/obj/item/stack/medical/proc/post_heal_effects(amount_healed, mob/living/carbon/healed_mob, mob/user) + return /obj/item/stack/medical/bruise_pack name = "bruise pack" @@ -130,57 +164,67 @@ lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' apply_sounds = list('sound/effects/rip1.ogg', 'sound/effects/rip2.ogg') - var/heal_brute = 40 - self_delay = 20 - grind_results = list(/datum/reagent/medicine/styptic_powder = 10) - -/obj/item/stack/medical/bruise_pack/heal(mob/living/target, mob/user) - if(isanimal(target)) - var/mob/living/simple_animal/critter = target - if (!(critter.healable)) - to_chat(user, span_warning("You cannot use \the [src] on [target]!")) - return FALSE - else if (critter.health == critter.maxHealth) - to_chat(user, span_notice("[target] is at full health.")) - return FALSE - user.visible_message(span_green("[user] applies \the [src] on [target]."), span_green("You apply \the [src] on [target].")) - target.heal_bodypart_damage((heal_brute/2)) - return TRUE - if(iscarbon(target)) - return heal_carbon(target, user, heal_brute, 0) - to_chat(user, span_warning("You can't heal [target] with the \the [src]!")) - + self_delay = 4 SECONDS + other_delay = 2 SECONDS + grind_results = list(/datum/reagent/medicine/c2/libital = 10) + merge_type = /obj/item/stack/medical/bruise_pack + /obj/item/stack/medical/gauze name = "medical gauze" - desc = "A roll of elastic cloth that is extremely effective at stopping bleeding and slowly heals wounds." + desc = "A roll of elastic cloth, perfect for stabilizing all kinds of slashes, punctures and burns. " gender = PLURAL singular_name = "medical gauze" icon_state = "gauze" apply_sounds = list('sound/effects/rip1.ogg', 'sound/effects/rip2.ogg') - var/bleed_reduction = 0.02 - var/lifespan = 150 - self_delay = 20 + self_delay = 5 SECONDS + other_delay = 2 SECONDS max_amount = 12 + amount = 6 grind_results = list(/datum/reagent/cellulose = 2) custom_price = 50 + burn_cleanliness_bonus = 0.35 + merge_type = /obj/item/stack/medical/gauze + var/gauze_type = /datum/bodypart_aid/gauze -/obj/item/stack/medical/gauze/twelve - amount = 12 +// 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)) -/obj/item/stack/medical/gauze/five - amount = 5 + if(!limb) + to_chat(user, span_notice("There's nothing there to bandage!")) + return -/obj/item/stack/medical/gauze/heal(mob/living/target, mob/user) - if(iscarbon(target)) - var/mob/living/carbon/C = target - var/obj/item/bodypart/BP = C.get_bodypart(check_zone(user.zone_selected)) - if(!BP) - to_chat(user, span_warning("[C] doesn't have \a [parse_zone(user.zone_selected)]!")) - return - if(BP.can_bandage(user)) - BP.apply_bandage(bleed_reduction, lifespan, name) - user.visible_message(span_notice("[user] wraps [C]'s [parse_zone(BP.body_zone)] with [src]."), span_notice("You wrap [C]'s [parse_zone(check_zone(user.zone_selected))] with [src]."), span_hear("You hear ruffling cloth.")) - return TRUE + if(!LAZYLEN(limb.wounds)) + to_chat(user, span_notice("There's no wounds that require bandaging on [user==M ? "your" : "[M]'s"] [limb.name]!")) + 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, span_notice("There's no wounds that require bandaging on [user==M ? "your" : "[M]'s"] [limb.name]!")) + return + + if(limb.current_gauze) + to_chat(user, span_warning("[user==M ? "Your" : "[M]'s"] [limb.name] is already bandaged!")) + + user.visible_message( + span_warning("[user] begins wrapping the wounds on [M]'s [limb.name] with [src]..."), + span_warning("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( + span_green("[user] applies [src] to [M]'s [limb.name]."), + span_green("You bandage the wounds on [user == M ? "your" : "[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()) @@ -200,94 +244,86 @@ /obj/item/stack/medical/gauze/improvised name = "improvised gauze" singular_name = "improvised gauze" - desc = "A roll of cloth roughly cut from something that can stop bleeding and slowly heal wounds." - bleed_reduction = 0.005 + desc = "A roll of cloth roughly cut from something that does a decent job of stabilizing wounds, but less efficiently so than real medical gauze." + self_delay = 6 SECONDS + other_delay = 3 SECONDS + burn_cleanliness_bonus = 0.7 + merge_type = /obj/item/stack/medical/gauze/improvised + gauze_type = /datum/bodypart_aid/gauze/improvised /obj/item/stack/medical/gauze/cyborg custom_materials = null is_cyborg = 1 cost = 250 -/obj/item/stack/medical/ointment - name = "ointment" - desc = "Used to treat those nasty burn wounds." - gender = PLURAL - singular_name = "ointment" - icon_state = "ointment" - lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' - apply_sounds = 'sound/effects/ointment.ogg' - var/heal_burn = 40 - self_delay = 20 - grind_results = list(/datum/reagent/medicine/silver_sulfadiazine = 10) +/obj/item/stack/medical/gauze/twelve + amount = 12 -/obj/item/stack/medical/ointment/heal(mob/living/target, mob/user) - if(iscarbon(target)) - return heal_carbon(target, user, 0, heal_burn) - to_chat(user, span_warning("You can't heal [target] with the \the [src]!")) +/obj/item/stack/medical/gauze/five + amount = 5 /obj/item/stack/medical/suture name = "suture" - desc = "Sterile sutures used to seal up cuts and lacerations." + desc = "Basic sterile sutures used to seal up cuts and lacerations and stop bleeding." gender = PLURAL singular_name = "suture" icon_state = "suture" - self_delay = 30 - other_delay = 10 - amount = 15 - max_amount = 15 + self_delay = 3 SECONDS + other_delay = 1 SECONDS + amount = 10 + max_amount = 10 repeating = TRUE - var/heal_brute = 10 + heal_brute = 10 + stop_bleeding = 0.6 grind_results = list(/datum/reagent/medicine/spaceacillin = 2) + merge_type = /obj/item/stack/medical/suture /obj/item/stack/medical/suture/five amount = 5 -/obj/item/stack/medical/suture/medicated - name = "medicated suture" - icon_state = "suture_purp" - desc = "A suture infused with drugs that speed up wound healing of the treated laceration." - heal_brute = 15 - grind_results = list(/datum/reagent/medicine/polypyr = 2) - -/obj/item/stack/medical/suture/heal(mob/living/target, mob/user) - . = ..() - if(iscarbon(target)) - return heal_carbon(target, user, heal_brute, 0) - if(isanimal(target)) - var/mob/living/simple_animal/critter = target - if (!(critter.healable)) - to_chat(user, span_warning("You cannot use \the [src] on [target]!")) - return FALSE - else if (critter.health == critter.maxHealth) - to_chat(user, span_notice("[target] is at full health.")) - return FALSE - user.visible_message(span_green("[user] applies \the [src] on [target]."), span_green("You apply \the [src] on [target].")) - target.heal_bodypart_damage(heal_brute) - return TRUE +/obj/item/stack/medical/ointment + name = "ointment" + desc = "Basic burn ointment, rated effective for second degree burns with proper bandaging, though it's still an effective stabilizer for worse burns. Not terribly good at outright healing burns though." + gender = PLURAL + singular_name = "ointment" + icon_state = "ointment" + lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' + amount = 8 + max_amount = 8 + self_delay = 4 SECONDS + other_delay = 2 SECONDS - to_chat(user, span_warning("You can't heal [target] with the \the [src]!")) + heal_burn = 5 + flesh_regeneration = 2.5 + sanitization = 0.25 + grind_results = list(/datum/reagent/medicine/C2/lenturi = 10) + merge_type = /obj/item/stack/medical/ointment /obj/item/stack/medical/mesh name = "regenerative mesh" desc = "A bacteriostatic mesh used to dress burns." gender = PLURAL - singular_name = "regenerative mesh" + singular_name = "mesh piece" icon_state = "regen_mesh" - self_delay = 30 - other_delay = 10 + self_delay = 3 SECONDS + other_delay = 1 SECONDS amount = 15 + heal_burn = 10 max_amount = 15 repeating = TRUE - var/heal_burn = 10 + sanitization = 0.75 + flesh_regeneration = 3 + var/is_open = TRUE ///This var determines if the sterile packaging of the mesh has been opened. grind_results = list(/datum/reagent/medicine/spaceacillin = 2) + merge_type = /obj/item/stack/medical/mesh -/obj/item/stack/medical/mesh/Initialize() +/obj/item/stack/medical/mesh/Initialize(mapload, new_amount, merge = TRUE, list/mat_override=null, mat_amt=1) . = ..() if(amount == max_amount) //only seal full mesh packs is_open = FALSE - update_appearance() + update_icon() /obj/item/stack/medical/mesh/five amount = 5 @@ -297,30 +333,23 @@ return ..() icon_state = "regen_mesh_closed" -/obj/item/stack/medical/mesh/heal(mob/living/target, mob/user) - . = ..() - if(iscarbon(target)) - return heal_carbon(target, user, 0, heal_burn) - to_chat(user, span_warning("You can't heal [target] with the \the [src]!")) - - /obj/item/stack/medical/mesh/try_heal(mob/living/target, mob/user, silent = FALSE) if(!is_open) to_chat(user, span_warning("You need to open [src] first.")) return - . = ..() + return ..() /obj/item/stack/medical/mesh/AltClick(mob/living/user) if(!is_open) to_chat(user, span_warning("You need to open [src] first.")) return - . = ..() + return ..() /obj/item/stack/medical/mesh/attack_hand(mob/user) if(!is_open && user.get_inactive_held_item() == src) to_chat(user, span_warning("You need to open [src] first.")) return - . = ..() + return ..() /obj/item/stack/medical/mesh/attack_self(mob/user) if(!is_open) @@ -329,108 +358,158 @@ update_appearance() playsound(src, 'sound/items/poster_ripped.ogg', 20, TRUE) return - . = ..() + return ..() /obj/item/stack/medical/mesh/advanced name = "advanced regenerative mesh" desc = "An advanced mesh made with aloe extracts and sterilizing chemicals, used to treat burns." gender = PLURAL - singular_name = "advanced regenerative mesh" icon_state = "aloe_mesh" heal_burn = 15 + sanitization = 1.25 + flesh_regeneration = 3.5 grind_results = list(/datum/reagent/consumable/aloejuice = 1) + merge_type = /obj/item/stack/medical/mesh/advanced /obj/item/stack/medical/mesh/advanced/update_icon_state() - if(is_open) + if(!is_open) + icon_state = "aloe_mesh_closed" + else return ..() - icon_state = "aloe_mesh_closed" /obj/item/stack/medical/aloe name = "aloe cream" - desc = "A healing paste you can apply on wounds." + desc = "A healing paste for minor cuts and burns." + gender = PLURAL + singular_name = "aloe cream" icon_state = "aloe_paste" apply_sounds = 'sound/effects/ointment.ogg' - self_delay = 20 - other_delay = 10 + self_delay = 2 SECONDS + other_delay = 1 SECONDS novariants = TRUE amount = 20 max_amount = 20 - var/heal = 3 + repeating = TRUE + heal_brute = 3 + heal_burn = 3 grind_results = list(/datum/reagent/consumable/aloejuice = 1) + merge_type = /obj/item/stack/medical/aloe -/obj/item/stack/medical/aloe/heal(mob/living/target, mob/user) - . = ..() - if(iscarbon(target)) - return heal_carbon(target, user, heal, heal) - if(isanimal(target)) - var/mob/living/simple_animal/critter = target - if (!(critter.healable)) - to_chat(user, span_warning("You cannot use \the [src] on [target]!")) - return FALSE - else if (critter.health == critter.maxHealth) - to_chat(user, span_notice("[target] is at full health.")) - return FALSE - user.visible_message(span_green("[user] applies \the [src] on [target]."), span_green("You apply \the [src] on [target].")) - target.heal_bodypart_damage(heal, heal) - return TRUE - - to_chat(user, span_warning("You can't heal [target] with the \the [src]!")) +/obj/item/stack/medical/bone_gel + name = "bone gel" + singular_name = "bone gel" + desc = "A potent medical gel that, when applied to a damaged bone in a proper surgical setting, triggers an intense melding reaction to repair the wound. Can be directly applied alongside surgical sticky tape to a broken bone in dire circumstances, though this is very harmful to the patient and not recommended." + icon = 'icons/obj/surgery.dmi' + icon_state = "bone-gel" + lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' - /* - The idea is for these medical devices to work like a hybrid of the old brute packs and tend wounds, - they heal a little at a time, have reduced healing density and does not allow for rapid healing while in combat. - However they provice graunular control of where the healing is directed, this makes them better for curing work-related cuts and scrapes. + amount = 1 + self_delay = 20 + grind_results = list(/datum/reagent/calcium = 10, /datum/reagent/carbon = 10) + novariants = TRUE + merge_type = /obj/item/stack/medical/bone_gel - The interesting limb targeting mechanic is retained and i still believe they will be a viable choice, especially when healing others in the field. - */ +/obj/item/stack/medical/bone_gel/attack(mob/living/M, mob/user) + to_chat(user, span_warning("Bone gel can only be used on fractured limbs!")) + return -// SPLINTS -/obj/item/stack/medical/splint +/obj/item/stack/medical/bone_gel/four amount = 4 - name = "splints" - desc = "Used to secure limbs following a fracture." - gender = PLURAL - singular_name = "splint" - icon = 'icons/obj/items.dmi' - icon_state = "splint" - apply_sounds = list('sound/effects/rip1.ogg', 'sound/effects/rip2.ogg') - self_delay = 40 - other_delay = 15 - splint_fracture = TRUE - custom_price = 50 - -/obj/item/stack/medical/splint/heal(mob/living/target, mob/user) - . = ..() - if(iscarbon(target)) - return heal_carbon(target, user) - to_chat(user, span_warning("You can't splint [target]'s limb' with the \the [src]!")) - -/obj/item/stack/medical/splint/ghetto //slightly shittier, but gets the job done - name = "makeshift splints" - desc = "Used to secure limbs following a fracture. This one is made out of simple materials." - amount = 2 - self_delay = 50 - other_delay = 20 - failure_chance = 20 /obj/item/stack/medical/bruise_pack/herb name = "ashen herbal pack" singular_name = "ashen herbal pack" icon_state = "hbrutepack" desc = "Thereputic herbs designed to treat bruises." - heal_brute = 15 /obj/item/stack/medical/ointment/herb name = "burn ointment slurry" singular_name = "burn ointment slurry" icon_state = "hointment" desc = "Herb slurry meant to treat burns." - heal_burn = 15 +// SPLINTS +/obj/item/stack/medical/splint + name = "splints" + desc = "Used to secure limbs following a fracture." + gender = PLURAL + singular_name = "splint" + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "splint" + apply_sounds = list('sound/effects/rip1.ogg', 'sound/effects/rip2.ogg') + self_delay = 5 SECONDS + other_delay = 2 SECONDS + max_amount = 12 + amount = 6 + grind_results = list(/datum/reagent/carbon = 2) + merge_type = /obj/item/stack/medical/splint + var/splint_type = /datum/bodypart_aid/splint + +/obj/item/stack/medical/splint/try_heal(mob/living/M, mob/user, silent) + var/obj/item/bodypart/limb = M.get_bodypart(check_zone(user.zone_selected)) + if(!limb) + to_chat(user, span_notice("There's nothing there to bandage!")) + return + + if(!LAZYLEN(limb.wounds)) + to_chat(user, span_notice("There's no wounds that require bandaging on [user==M ? "your" : "[M]'s"] [limb.name]!")) + return + + var/splintable_wound = FALSE + for(var/i in limb.wounds) + var/datum/wound/woundies = i + if(woundies.wound_flags & ACCEPTS_SPLINT) + splintable_wound = TRUE + break + + if(!splintable_wound) + to_chat(user, span_notice("There's no wounds that require splinting on [user==M ? "your" : "[M]'s"] [limb.name]!")) + return + + if(limb.current_splint) + to_chat(user, span_warning("[user==M ? "Your" : "[M]'s"] [limb.name] is already fastened in a splint!")) + return + user.visible_message( + span_warning("[user] begins fastening [M]'s [limb.name] with [src]..."), + span_warning("You begin to fasten [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( + span_green("[user] applies [src] to [M]'s [limb.name]."), + span_green("You splint [user == M ? "your" : "[M]'s"] [limb.name]."), + ) + limb.apply_splint(src) + +/obj/item/stack/medical/splint/twelve + amount = 12 + +/obj/item/stack/medical/splint/tribal + name = "tribal splint" + desc = "Bone fastened with sinew, used to keep injured limbs rigid, surprisingly effective." + singular_name = "tribal splint" + icon_state = "splint_tribal" + amount = 1 + splint_type = /datum/bodypart_aid/splint/tribal + merge_type = /obj/item/stack/medical/splint/tribal + +/obj/item/stack/medical/splint/improvised + name = "improvised splint" + desc = "Crudely made out splints with wood and some cotton sling, you doubt this will be any good." + singular_name = "improvised splint" + icon_state = "splint_improv" + amount = 1 + splint_type = /datum/bodypart_aid/splint/improvised + merge_type = /obj/item/stack/medical/splint/improvised + +//Structural rods /obj/item/stack/medical/structure name = "replacement structural rods" desc = "Steel rods and cable with adjustable titanium fasteners, for quickly repairing structural damage to robotic limbs." @@ -446,11 +525,8 @@ heals_organic = FALSE restore_integrity = TRUE - /obj/item/stack/medical/structure/heal(mob/living/target, mob/user) . = ..() if(iscarbon(target)) return heal_carbon(target, user, integrity = 150) to_chat(user, span_warning("You can't repair [target]'s limb' with the \the [src]!")) - - diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index f25d282b202b..ec3a70b1f4f1 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -277,7 +277,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 var/obj/item/stack/sheet/weld_material = /obj/item/stack/sheet/glass embedding = list("embed_chance" = 65) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index e6de77939ef0..cac867cab9a5 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -13,6 +13,7 @@ icon = 'icons/obj/stack_objects.dmi' gender = PLURAL material_modifier = 0.01 + max_integrity = 100 var/list/datum/stack_recipe/recipes var/singular_name var/amount = 1 diff --git a/code/game/objects/items/stacks/tape.dm b/code/game/objects/items/stacks/tape.dm index 310c19f527af..b66002e4fcd1 100644 --- a/code/game/objects/items/stacks/tape.dm +++ b/code/game/objects/items/stacks/tape.dm @@ -12,6 +12,8 @@ max_amount = 5 resistance_flags = FLAMMABLE grind_results = list(/datum/reagent/cellulose = 5) + w_class = WEIGHT_CLASS_TINY + full_w_class = WEIGHT_CLASS_SMALL var/list/conferred_embed = EMBED_HARMLESS var/overwrite_existing = FALSE @@ -68,9 +70,17 @@ prefix = "super pointy" conferred_embed = EMBED_POINTY_SUPERIOR +/obj/item/stack/sticky_tape/surgical + name = "surgical tape" + singular_name = "surgical tape" + desc = "Made for patching broken bones back together alongside bone gel, not for playing pranks." + //icon_state = "tape_spikes" + prefix = "surgical" + conferred_embed = list("embed_chance" = 30, "pain_mult" = 0, "jostle_pain_mult" = 0, "ignore_throwspeed_threshold" = TRUE) + custom_price = 500 + /obj/item/stack/tape name = "packaging tape" - singular_name = "tape strip" desc = "Sticks things together with minimal effort." icon = 'icons/obj/tapes.dmi' icon_state = "tape" @@ -81,7 +91,6 @@ usesound = 'sound/items/tape.ogg' var/lifespan = 300 - var/bleed_reduction = 0.002 var/nonorganic_heal = 5 var/self_delay = 30 //! Also used for the tapecuff delay var/other_delay = 10 @@ -180,10 +189,6 @@ if(affecting.heal_damage(nonorganic_heal)) C.update_damage_overlays() return TRUE - if(affecting.can_bandage(user)) - affecting.apply_bandage(bleed_reduction, lifespan, name) - to_chat(user, span_notice("You tape up [C]'s [parse_zone(affecting.body_zone)]!")) - return TRUE to_chat(user, span_warning("[src] can't patch what [C] has...")) /obj/item/stack/tape/proc/apply_gag(mob/living/carbon/target, mob/user) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 4fc452f4f584..3f7b836fd8c0 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -449,7 +449,8 @@ new /obj/item/surgicaldrill(src) new /obj/item/cautery(src) new /obj/item/clothing/mask/surgical(src) - new /obj/item/razor(src) + new /obj/item/bonesetter(src) + new /obj/item/stack/sticky_tape/surgical(src) /obj/item/storage/backpack/duffelbag/sec name = "security duffel bag" diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index f35b51a7b434..d37260a7065e 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -81,6 +81,7 @@ /obj/item/clothing/mask/breath/medical, /obj/item/scalpel, /obj/item/circular_saw, + /obj/item/bonesetter, /obj/item/surgicaldrill, /obj/item/retractor, /obj/item/cautery, @@ -100,7 +101,8 @@ /obj/item/implant, /obj/item/implanter, /obj/item/pinpointer/crew, - /obj/item/holosign_creator/medical + /obj/item/holosign_creator/medical, + /obj/item/stack/sticky_tape, //surgical tape )) /obj/item/storage/firstaid/medical/PopulateContents() diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index c4d30bd0095a..efdd6b44d1dd 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -41,6 +41,9 @@ var/deac_sound = 'sound/items/welderdeactivate.ogg' var/start_full = TRUE wall_decon_damage = 50 + wound_bonus = 10 + bare_wound_bonus = 15 + /obj/item/weldingtool/empty start_full = FALSE diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 4e9d63984a20..7a0e697332bd 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -10,6 +10,11 @@ var/damtype = BRUTE var/force = 0 + /// How good a given object is at causing wounds on carbons. Higher values equal better shots at creating serious wounds. + var/wound_bonus = 0 + /// If this attacks a human with no wound armor on the affected body part, add this to the wound mod. Some attacks may be significantly worse at wounding if there's even a slight layer of armor to absorb some of it vs bare flesh + var/bare_wound_bonus = 0 + var/datum/armor/armor var/obj_integrity //defaults to max_integrity var/max_integrity = 500 @@ -371,8 +376,8 @@ /obj/handle_ricochet(obj/projectile/P) . = ..() - if(. && ricochet_damage_mod) - take_damage(P.damage * ricochet_damage_mod, P.damage_type, P.flag, 0, turn(P.dir, 180), P.armour_penetration) // pass along ricochet_damage_mod damage to the structure for the ricochet + if(. && receive_ricochet_damage_coeff) + take_damage(P.damage * receive_ricochet_damage_coeff, P.damage_type, P.flag, 0, turn(P.dir, 180), P.armour_penetration) // pass along receive_ricochet_damage_coeff damage to the structure for the ricochet /obj/update_overlays() . = ..() diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 0373f8539690..5ba7003d201d 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -5,7 +5,7 @@ interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND | INTERACT_ATOM_UI_INTERACT layer = BELOW_OBJ_LAYER flags_ricochet = RICOCHET_HARD - ricochet_chance_mod = 0.5 + receive_ricochet_chance_mod = 0.5 hitsound_type = PROJECTILE_HITSOUND_METAL diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index 902b501c27c7..24bfce355b66 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -59,7 +59,7 @@ if(!L.stat) if(!L.incapacitated(ignore_restraints = 1)) L.face_atom(src) - L.do_alert_animation(L) + L.do_alert_animation() playsound(loc, 'sound/machines/chime.ogg', 50, FALSE, -5) /// Does the MGS ! animation diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm index 498bbbdc209f..8a4a182e188b 100644 --- a/code/game/objects/structures/guillotine.dm +++ b/code/game/objects/structures/guillotine.dm @@ -124,7 +124,7 @@ if (QDELETED(head)) return - playsound(src, 'sound/weapons/bladeslice.ogg', 100, TRUE) + playsound(src, 'sound/weapons/guillotine.ogg', 100, TRUE) if (blade_sharpness >= GUILLOTINE_DECAP_MIN_SHARP || head.brute_dam >= 100) head.dismember() log_combat(user, H, "beheaded", src) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 4ba77de6307b..5735cff80b1a 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -77,7 +77,7 @@ to_chat(user, span_warning("You need a better grip to do that!")) return if(user.grab_state >= GRAB_NECK) - tableheadsmash(user, pushed_mob) + tablelimbsmash(user, pushed_mob) else tablepush(user, pushed_mob) if(user.a_intent == INTENT_HELP) @@ -147,18 +147,28 @@ log_combat(user, pushed_mob, "tabled", null, "onto [src]") SEND_SIGNAL(pushed_mob, COMSIG_ADD_MOOD_EVENT, "table", /datum/mood_event/table) -/obj/structure/table/proc/tableheadsmash(mob/living/user, mob/living/pushed_mob) +/obj/structure/table/proc/tablelimbsmash(mob/living/user, mob/living/pushed_mob) pushed_mob.Knockdown(30) - pushed_mob.apply_damage(30, BRUTE, BODY_ZONE_HEAD) - pushed_mob.apply_damage(40, STAMINA) + + var/obj/item/bodypart/banged_limb = pushed_mob.get_bodypart(user.zone_selected) || pushed_mob.get_bodypart(BODY_ZONE_HEAD) + var/extra_wound = 0 + if(HAS_TRAIT(user, TRAIT_HULK)) + extra_wound = 20 + banged_limb.receive_damage(30, wound_bonus = extra_wound) + pushed_mob.apply_damage(60, STAMINA) + take_damage(50) if(user.mind?.martial_art.smashes_tables && user.mind?.martial_art.can_use(user)) deconstruct(FALSE) - playsound(pushed_mob, 'sound/effects/bang.ogg', 90, TRUE) - pushed_mob.visible_message(span_danger("[user] smashes [pushed_mob]'s head against \the [src]!"), - span_userdanger("[user] smashes your head against \the [src]")) + + playsound(pushed_mob, 'sound/effects/tablelimbsmash.ogg', 90, TRUE) + pushed_mob.visible_message( + span_danger("[user] smashes [pushed_mob]'s [banged_limb.name] against \the [src]!"), + span_userdanger("[user] smashes your [banged_limb.name] against \the [src]"), + span_userdanger("You hear a loud bang!"), + ) log_combat(user, pushed_mob, "head slammed", null, "against [src]") - SEND_SIGNAL(pushed_mob, COMSIG_ADD_MOOD_EVENT, "table", /datum/mood_event/table_headsmash) + SEND_SIGNAL(pushed_mob, COMSIG_ADD_MOOD_EVENT, "table", /datum/mood_event/table_limbsmash, banged_limb) /obj/structure/table/attackby(obj/item/I, mob/user, params) var/list/modifiers = params2list(params) @@ -195,7 +205,7 @@ switch(user.a_intent) if(INTENT_HARM) user.unbuckle_mob(carried_mob) - tableheadsmash(user, carried_mob) + tablelimbsmash(user, carried_mob) if(INTENT_HELP) var/tableplace_delay = 3.5 SECONDS var/skills_space = "" diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index e229d89d6c75..92dc767ad692 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -29,7 +29,7 @@ var/hitsound = 'sound/effects/Glasshit.ogg' var/decon_time = 3 SECONDS flags_ricochet = RICOCHET_HARD - ricochet_chance_mod = 0.4 + receive_ricochet_chance_mod = 0.4 hitsound_type = PROJECTILE_HITSOUND_GLASS @@ -414,7 +414,7 @@ state = RWINDOW_SECURE glass_type = /obj/item/stack/sheet/rglass rad_insulation = RAD_HEAVY_INSULATION - ricochet_chance_mod = 0.8 + receive_ricochet_chance_mod = 0.8 decon_time = 6 SECONDS //this is shitcode but all of construction is shitcode and needs a refactor, it works for now @@ -737,7 +737,7 @@ explosion_block = 3 glass_type = /obj/item/stack/sheet/titaniumglass glass_amount = 2 - ricochet_chance_mod = 0.9 + receive_ricochet_chance_mod = 0.9 /obj/structure/window/reinforced/fulltile/shuttle/narsie_act() add_atom_colour("#3C3434", FIXED_COLOUR_PRIORITY) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 14ab9efb7f0e..4a50f82f9c7e 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1082,18 +1082,28 @@ if(!check_rights(R_ADMIN) || !check_rights(R_FUN)) return - var/list/punishment_list = list(ADMIN_PUNISHMENT_BREAK_BONES, ADMIN_PUNISHMENT_LIGHTNING, ADMIN_PUNISHMENT_BRAINDAMAGE, ADMIN_PUNISHMENT_GIB, ADMIN_PUNISHMENT_BSA, ADMIN_PUNISHMENT_FIREBALL, ADMIN_PUNISHMENT_SUPPLYPOD_QUICK, ADMIN_PUNISHMENT_SUPPLYPOD, ADMIN_PUNISHMENT_MAZING, ADMIN_PUNISHMENT_IMMERSE, ADMIN_PUNISHMENT_NYA, ADMIN_PUNISHMENT_PIE) + var/list/punishment_list = list( + ADMIN_PUNISHMENT_LIGHTNING, + ADMIN_PUNISHMENT_BRAINDAMAGE, + ADMIN_PUNISHMENT_GIB, + ADMIN_PUNISHMENT_BSA, + ADMIN_PUNISHMENT_FIREBALL, + ADMIN_PUNISHMENT_SUPPLYPOD_QUICK, + ADMIN_PUNISHMENT_SUPPLYPOD, + ADMIN_PUNISHMENT_MAZING, + ADMIN_PUNISHMENT_NUGGET, + ADMIN_PUNISHMENT_CRACK, + ADMIN_PUNISHMENT_BLEED, + ADMIN_PUNISHMENT_PERFORATE, + ADMIN_PUNISHMENT_SHOES, + ) - var/punishment = input("Choose a punishment", "DIVINE SMITING") as null|anything in sortList(punishment_list) + var/punishment = input("Choose a punishment", "mods kill this guy") as null|anything in sortList(punishment_list) if(QDELETED(target) || !punishment) return switch(punishment) - if(ADMIN_PUNISHMENT_BREAK_BONES) - if(iscarbon(target)) - var/mob/living/carbon/C = target - C.break_all_bones() if(ADMIN_PUNISHMENT_LIGHTNING) var/turf/T = get_step(get_step(target, NORTH), NORTH) T.Beam(target, icon_state="lightning[rand(1,12)]", time = 5) @@ -1102,23 +1112,28 @@ var/mob/living/carbon/human/H = target H.electrocution_animation(40) to_chat(target, span_userdanger("The gods have punished you for your sins!"), confidential = TRUE) + if(ADMIN_PUNISHMENT_BRAINDAMAGE) target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 199, 199) + if(ADMIN_PUNISHMENT_GIB) target.gib(FALSE) + if(ADMIN_PUNISHMENT_BSA) bluespace_artillery(target) + if(ADMIN_PUNISHMENT_FIREBALL) new /obj/effect/temp_visual/target(get_turf(target)) + if(ADMIN_PUNISHMENT_SUPPLYPOD_QUICK) var/target_path = input(usr,"Enter typepath of an atom you'd like to send with the pod (type \"empty\" to send an empty pod):" ,"Typepath","/obj/item/reagent_containers/food/snacks/grown/harebell") as null|text var/obj/structure/closet/supplypod/centcompod/pod = new() pod.damage = 40 pod.explosionSize = list(0,0,0,2) pod.effectStun = TRUE - if (isnull(target_path)) //The user pressed "Cancel" + if(isnull(target_path)) //The user pressed "Cancel" return - if (target_path != "empty")//if you didn't type empty, we want to load the pod with a delivery + if(target_path != "empty")//if you didn't type empty, we want to load the pod with a delivery var/delivery = text2path(target_path) if(!ispath(delivery)) delivery = pick_closest_path(target_path) @@ -1127,6 +1142,7 @@ return new delivery(pod) new /obj/effect/pod_landingzone(get_turf(target), pod) + if(ADMIN_PUNISHMENT_SUPPLYPOD) var/datum/centcom_podlauncher/plaunch = new(usr) if(!holder) @@ -1140,23 +1156,123 @@ plaunch.temp_pod.effectStun = TRUE plaunch.ui_interact(usr) return //We return here because punish_log() is handled by the centcom_podlauncher datum + if(ADMIN_PUNISHMENT_MAZING) if(!puzzle_imprison(target)) to_chat(usr,span_warning("Imprisonment failed!"), confidential = TRUE) return - if(ADMIN_PUNISHMENT_IMMERSE) - immerse_player(target) - if(ADMIN_PUNISHMENT_NYA) + + if(ADMIN_PUNISHMENT_NUGGET) + if(!iscarbon(target)) + to_chat(usr, span_warning("This must be used on a carbon mob."), confidential = TRUE) + return + var/mob/living/carbon/C = target + var/timer = 2 SECONDS + for(var/obj/item/bodypart/thing in C.bodyparts) + if(thing.body_part == HEAD || thing.body_part == CHEST) + continue + addtimer(CALLBACK(thing, /obj/item/bodypart/.proc/dismember), timer) + addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, C, 'sound/effects/cartoon_pop.ogg', 70), timer) + addtimer(CALLBACK(C, /mob/living/.proc/spin, 4, 1), timer - 0.4 SECONDS) + timer += 2 SECONDS + + if(ADMIN_PUNISHMENT_CRACK) + if(!iscarbon(target)) + to_chat(usr, span_warning("This must be used on a carbon mob."), confidential = TRUE) + return + var/mob/living/carbon/C = target + for(var/i in C.bodyparts) + var/obj/item/bodypart/squish_part = i + var/type_wound = pick(list(/datum/wound/blunt/severe, /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, span_warning("This must be used on a carbon mob."), confidential = TRUE) + return + var/mob/living/carbon/C = target + for(var/i in C.bodyparts) + var/obj/item/bodypart/slice_part = i + var/type_wound = pick(list(/datum/wound/slash/critical, /datum/wound/slash/moderate)) + slice_part.force_wound_upwards(type_wound, smited=TRUE) + type_wound = pick(list(/datum/wound/slash/critical, /datum/wound/slash/moderate)) + slice_part.force_wound_upwards(type_wound, smited=TRUE) + type_wound = pick(list(/datum/wound/slash/critical, /datum/wound/slash/moderate)) + slice_part.force_wound_upwards(type_wound, smited=TRUE) + + + if(ADMIN_PUNISHMENT_PERFORATE) if(!iscarbon(target)) - to_chat(usr,span_warning("This must be used on a carbon mob.")) + to_chat(usr, span_warning("This must be used on a carbon mob."), confidential = TRUE) return - to_chat(target, span_userdanger("You do nyat feew vewy good!"), confidential = TRUE) + + 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/obj/item/organ/tongue/uwuspeak/tonje = new - tonje.Insert(dude, TRUE, FALSE) + 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 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(whom, punishment) var/msg = "[key_name_admin(usr)] punished [key_name_admin(whom)] with [punishment]." message_admins(msg) diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index 253731d34a66..2527de3b7ac3 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -160,8 +160,11 @@ throw_range = 0 throw_speed = 0 hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - sharpness = IS_SHARP + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut") + sharpness = SHARP_EDGED + wound_bonus = -20 + bare_wound_bonus = 20 + sharpness = SHARP_EDGED var/can_drop = FALSE var/fake = FALSE diff --git a/code/modules/antagonists/changeling/powers/regenerate.dm b/code/modules/antagonists/changeling/powers/regenerate.dm index 6294ced5f248..a87a41e2bbcb 100644 --- a/code/modules/antagonists/changeling/powers/regenerate.dm +++ b/code/modules/antagonists/changeling/powers/regenerate.dm @@ -34,6 +34,9 @@ B.decoy_override = TRUE B.Insert(C) C.regenerate_organs() + for(var/i in C.all_wounds) + var/datum/wound/iter_wound = i + iter_wound.remove_wound() if(ishuman(user)) var/mob/living/carbon/human/H = user H.restore_blood() diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index 579b56e6b874..481ad8e42235 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -266,10 +266,6 @@ to_chat(target, span_userdanger("You suddenly feel very hot!")) target.adjust_bodytemperature(10) GiveHint(target) - else if(is_pointed(I)) - to_chat(target, span_userdanger("You feel a stabbing pain in [parse_zone(user.zone_selected)]!")) - target.Paralyze(40) - GiveHint(target) else if(istype(I, /obj/item/bikehorn)) to_chat(target, span_userdanger("HONK")) SEND_SOUND(target, 'sound/items/airhorn.ogg') diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index f57171aee15a..38b753153ed2 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -35,6 +35,8 @@ var/escape_in_progress = FALSE var/message_cooldown var/breakout_time = 300 + ///Cryo will continue to treat people with 0 damage but existing wounds, but will sound off when damage healing is done in case doctors want to directly treat the wounds instead + var/treating_wounds = FALSE /obj/machinery/atmospherics/components/unary/cryo_cell/Initialize() @@ -188,16 +190,28 @@ if(mob_occupant.stat == DEAD) // We don't bother with dead people. return - if(mob_occupant.health >= mob_occupant.getMaxHealth()) // Don't bother with fully healed people. - on = FALSE - update_appearance() - playsound(src, 'sound/machines/cryo_warning.ogg', volume) // Bug the doctors. - var/msg = "Patient fully restored." - if(autoeject) // Eject if configured. - msg += " Auto ejecting patient now." - open_machine() - radio.talk_into(src, msg, radio_channel) - return + if(mob_occupant.get_organic_health() >= mob_occupant.getMaxHealth()) // Don't bother with fully healed people. + if(iscarbon(mob_occupant)) + var/mob/living/carbon/C = mob_occupant + if(C.all_wounds) + if(!treating_wounds) // if we have wounds and haven't already alerted the doctors we're only dealing with the wounds, let them know + treating_wounds = TRUE + playsound(src, 'sound/machines/cryo_warning.ogg', volume) // Bug the doctors. + var/msg = "Patient vitals fully recovered, continuing automated wound treatment." + radio.talk_into(src, msg, radio_channel) + else // otherwise if we were only treating wounds and now we don't have any, turn off treating_wounds so we can boot 'em out + treating_wounds = FALSE + + if(!treating_wounds) + on = FALSE + update_icon() + playsound(src, 'sound/machines/cryo_warning.ogg', volume) // Bug the doctors. + var/msg = "Patient fully restored." + if(autoeject) // Eject if configured. + msg += " Auto ejecting patient now." + open_machine() + radio.talk_into(src, msg, radio_channel) + return var/datum/gas_mixture/air1 = airs[1] @@ -262,6 +276,7 @@ ..() /obj/machinery/atmospherics/components/unary/cryo_cell/close_machine(mob/living/carbon/user) + treating_wounds = FALSE if((isnull(user) || istype(user)) && state_open && !panel_open) flick("pod-close-anim", src) ..(user) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 024200045c35..22c1deb9ad0b 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -27,11 +27,13 @@ var/active_sound = null var/toggle_cooldown = null var/cooldown = 0 + var/clothing_flags = NONE var/cuttable = FALSE //If you can cut the clothing with anything sharp var/clothamnt = 0 //How much cloth - var/clothing_flags = NONE + /// What items can be consumed to repair this clothing (must by an /obj/item/stack) + var/repairable_by = /obj/item/stack/sheet/cotton/cloth var/can_be_bloody = TRUE @@ -48,6 +50,13 @@ /// If this can be eaten by a moth var/moth_edible = TRUE + /// How much clothing damage has been dealt to each of the limbs of the clothing, assuming it covers more than one limb + var/list/damage_by_parts + /// How much integrity is in a specific limb before that limb is disabled (for use in [/obj/item/clothing/proc/take_damage_zone], and only if we cover multiple zones.) Set to 0 to disable shredding. + var/limb_integrity = 0 + /// How many zones (body parts, not precise) we have disabled so far, for naming purposes + var/zones_disabled + // Not used yet /// Trait modification, lazylist of traits to add/take away, on equipment/drop in the correct slot var/list/clothing_traits @@ -92,10 +101,13 @@ /obj/item/clothing/attack(mob/M, mob/user, def_zone) if(user.a_intent != INTENT_HARM && moth_edible && ismoth(M)) - var/obj/item/reagent_containers/food/snacks/clothing/clothing_as_food = new - clothing_as_food.name = name - if(clothing_as_food.attack(M, user, def_zone)) - take_damage(15, sound_effect=FALSE) + if(damaged_clothes == CLOTHING_SHREDDED) + to_chat(user, span_notice("[src] seem[p_s()] pretty torn apart... [p_they(TRUE)] probably wouldn't be too tasty.")) + return + var/obj/item/reagent_containers/food/snacks/clothing/clothing_as_food = new + clothing_as_food.name = name + if(clothing_as_food.attack(M, user, def_zone)) + take_damage(15, sound_effect=FALSE) qdel(clothing_as_food) else return ..() @@ -112,35 +124,136 @@ user.put_in_hands(cloth) qdel(src) - if(damaged_clothes && istype(tool, /obj/item/stack/sheet/cotton/cloth)) - var/obj/item/stack/sheet/cotton/cloth/cloth = tool - if(!cloth.use(1)) - to_chat(user, span_notice("You fail to fix the damage on [src].")) - return TRUE - update_clothes_damaged_state(FALSE) - obj_integrity = max_integrity - to_chat(user, span_notice("You fix the damage on [src] with [cloth].")) - return TRUE + if(damaged_clothes && istype(tool, repairable_by)) + var/obj/item/stack/S = tool + switch(damaged_clothes) + if(CLOTHING_DAMAGED) + S.use(1) + repair(user, params) + if(CLOTHING_SHREDDED) + if(S.amount < 3) + to_chat(user, span_warning("You require 3 [S.name] to repair [src].")) + return + to_chat(user, span_notice("You begin fixing the damage to [src] with [S]...")) + if(do_after(user, 6 SECONDS, TRUE, src)) + if(S.use(3)) + repair(user, params) + return 1 + return ..() + +/// Set the clothing's integrity back to 100%, remove all damage to bodyparts, and generally fix it up +/obj/item/clothing/proc/repair(mob/user, params) + update_clothes_damaged_state(CLOTHING_PRISTINE) + obj_integrity = max_integrity + name = initial(name) // remove "tattered" or "shredded" if there's a prefix + body_parts_covered = initial(body_parts_covered) + slot_flags = initial(slot_flags) + damage_by_parts = null + if(user) + UnregisterSignal(user, COMSIG_MOVABLE_MOVED) + to_chat(user, span_notice(">You fix the damage on [src].")) + + +/** + * take_damage_zone() is used for dealing damage to specific bodyparts on a worn piece of clothing, meant to be called from [/obj/item/bodypart/proc/check_woundings_mods()] + * + * This proc only matters when a bodypart that this clothing is covering is harmed by a direct attack (being on fire or in space need not apply), and only if this clothing covers + * more than one bodypart to begin with. No point in tracking damage by zone for a hat, and I'm not cruel enough to let you fully break them in a few shots. + * Also if limb_integrity is 0, then this clothing doesn't have bodypart damage enabled so skip it. + * + * Arguments: + * * def_zone: The bodypart zone in question + * * damage_amount: Incoming damage + * * damage_type: BRUTE or BURN + * * armour_penetration: If the attack had armour_penetration + */ +/obj/item/clothing/proc/take_damage_zone(def_zone, damage_amount, damage_type, armour_penetration) + if(!def_zone || !limb_integrity || (initial(body_parts_covered) in GLOB.bitflags)) // the second check sees if we only cover one bodypart anyway and don't need to bother with this + return + var/list/covered_limbs = body_parts_covered2organ_names(body_parts_covered) // what do we actually cover? + if(!(def_zone in covered_limbs)) + return + + var/damage_dealt = take_damage(damage_amount * 0.1, damage_type, armour_penetration, FALSE) * 10 // only deal 10% of the damage to the general integrity damage, then multiply it by 10 so we know how much to deal to limb + LAZYINITLIST(damage_by_parts) + damage_by_parts[def_zone] += damage_dealt + if(damage_by_parts[def_zone] > limb_integrity) + disable_zone(def_zone, damage_type) + +/** + * disable_zone() is used to disable a given bodypart's protection on our clothing item, mainly from [/obj/item/clothing/proc/take_damage_zone()] + * + * This proc disables all protection on the specified bodypart for this piece of clothing: it'll be as if it doesn't cover it at all anymore (because it won't!) + * If every possible bodypart has been disabled on the clothing, we put it out of commission entirely and mark it as shredded, whereby it will have to be repaired in + * order to equip it again. Also note we only consider it damaged if there's more than one bodypart disabled. + * + * Arguments: + * * def_zone: The bodypart zone we're disabling + * * damage_type: Only really relevant for the verb for describing the breaking, and maybe obj_destruction() + */ +/obj/item/clothing/proc/disable_zone(def_zone, damage_type) + var/list/covered_limbs = body_parts_covered2organ_names(body_parts_covered) + if(!(def_zone in covered_limbs)) + return + + var/zone_name = parse_zone(def_zone) + var/break_verb = ((damage_type == BRUTE) ? "torn" : "burned") + + if(iscarbon(loc)) + var/mob/living/carbon/C = loc + C.visible_message( + span_danger("The [zone_name] on [C]'s [src.name] is [break_verb] away!"), + span_userdanger("The [zone_name] on your [src.name] is [break_verb] away!"), + vision_distance = COMBAT_MESSAGE_RANGE, + ) + RegisterSignal(C, COMSIG_MOVABLE_MOVED, PROC_REF(bristle)) + + zones_disabled++ + for(var/i in zone2body_parts_covered(def_zone)) + body_parts_covered &= ~i + + if(body_parts_covered == NONE) // if there are no more parts to break then the whole thing is kaput + obj_destruction((damage_type == BRUTE ? "melee" : "laser")) // melee/laser is good enough since this only procs from direct attacks anyway and not from fire/bombs + return + + switch(zones_disabled) + if(1) + name = "damaged [initial(name)]" + if(2) + name = "mangy [initial(name)]" + if(3 to INFINITY) // take better care of your shit, dude + name = "tattered [initial(name)]" + + update_clothes_damaged_state(CLOTHING_DAMAGED) + +/obj/item/clothing/Destroy() + user_vars_remembered = null //Oh god somebody put REFERENCES in here? not to worry, we'll clean it up return ..() /obj/item/clothing/dropped(mob/user) ..() if(!istype(user)) return - for(var/trait in clothing_traits) - REMOVE_CLOTHING_TRAIT(user, trait) - if(wearer?.resolve()) - wearer = null + UnregisterSignal(user, COMSIG_MOVABLE_MOVED) + if(LAZYLEN(user_vars_remembered)) + for(var/variable in user_vars_remembered) + if(variable in user.vars) + if(user.vars[variable] == user_vars_to_edit[variable]) //Is it still what we set it to? (if not we best not change it) + user.vars[variable] = user_vars_remembered[variable] + user_vars_remembered = initial(user_vars_remembered) // Effectively this sets it to null. /obj/item/clothing/equipped(mob/user, slot) ..() - if (!istype(user)) + if(!istype(user)) return if(slot_flags & slot) //Was equipped to a valid slot for this item? - for(var/trait in clothing_traits) - ADD_CLOTHING_TRAIT(user, trait) - if(!wearer?.resolve()) - wearer = WEAKREF(user) + if(iscarbon(user) && LAZYLEN(zones_disabled)) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/bristle) + if(LAZYLEN(user_vars_to_edit)) + for(var/variable in user_vars_to_edit) + if(variable in user.vars) + LAZYSET(user_vars_remembered, variable, user.vars[variable]) + user.vv_edit_var(variable, user_vars_to_edit[variable]) /** * Inserts a trait (or multiple traits) into the clothing traits list @@ -178,6 +291,10 @@ /obj/item/clothing/examine(mob/user) . = ..() + if(damaged_clothes == CLOTHING_SHREDDED) + . += "[p_theyre(TRUE)] completely shredded and require[p_s()] mending before [p_they()] can be worn again!" + return + switch (max_heat_protection_temperature) if (400 to 1000) . += "[src] offers the wearer limited protection from fire." @@ -185,8 +302,18 @@ . += "[src] offers the wearer some protection from fire." if (1601 to 35000) . += "[src] offers the wearer robust protection from fire." - if(damaged_clothes) - . += span_warning("It looks damaged!") + + for(var/zone in damage_by_parts) + var/pct_damage_part = damage_by_parts[zone] / limb_integrity * 100 + var/zone_name = parse_zone(zone) + switch(pct_damage_part) + if(100 to INFINITY) + . += span_warning("The [zone_name] is useless and requires mending!") + if(60 to 99) + . += span_warning("The [zone_name] is heavily shredded!") + if(30 to 59) + . += span_danger("The [zone_name] is partially shredded") + var/datum/component/storage/pockets = GetComponent(/datum/component/storage) if(pockets) var/list/how_cool_are_your_threads = list("") @@ -287,26 +414,26 @@ return . /obj/item/clothing/obj_break(damage_flag) - if(!damaged_clothes) - update_clothes_damaged_state(TRUE) - if(ismob(loc)) //It's not important enough to warrant a message if nobody's wearing it - var/mob/M = loc - to_chat(M, span_warning("Your [name] starts to fall apart!")) + update_clothes_damaged_state(CLOTHING_DAMAGED) + + if(isliving(loc)) //It's not important enough to warrant a message if it's not on someone + var/mob/living/M = loc + if(src in M.get_equipped_items(FALSE)) + to_chat(M, span_warning("Your [name] start[p_s()] to fall apart!")) + else + to_chat(M, span_warning("[src] start[p_s()] to fall apart!")) //This mostly exists so subtypes can call appriopriate update icon calls on the wearer. -/obj/item/clothing/proc/update_clothes_damaged_state(damaging = TRUE) - if(damaging) - damaged_clothes = 1 - else - damaged_clothes = 0 +/obj/item/clothing/proc/update_clothes_damaged_state() + return /obj/item/clothing/update_overlays() . = ..() + var/index = "[REF(initial(icon))]-[initial(icon_state)]" + var/static/list/damaged_clothes_icons = list() if(!damaged_clothes) return - var/index = "[REF(initial(icon))]-[initial(icon_state)]" - var/static/list/damaged_clothes_icons = list() var/icon/damaged_clothes_icon = damaged_clothes_icons[index] if(!damaged_clothes_icon) damaged_clothes_icon = icon(initial(icon), initial(icon_state), , 1) //we only want to apply damaged effect to the initial icon_state for each object @@ -315,15 +442,6 @@ damaged_clothes_icon = fcopy_rsc(damaged_clothes_icon) damaged_clothes_icons[index] = damaged_clothes_icon . += damaged_clothes_icon -/* -* SEE_SELF // can see self, no matter what -* SEE_MOBS // can see all mobs, no matter what -* SEE_OBJS // can see all objs, no matter what -* SEE_TURFS // can see all turfs (and areas), no matter what -* SEE_PIXELS// if an object is located on an unlit area, but some of its pixels are -* // in a lit area (via pixel_x,y or smooth movement), can see those pixels -* BLIND // can't see anything -*/ /obj/item/proc/generate_species_clothing(file2use, state2use, layer, datum/species/mob_species) if(!icon_exists(file2use, state2use)) @@ -507,17 +625,28 @@ adjusted = ROLLED_STYLE return adjusted else // we are, toggle stuff back to normal - switch(style) + switch(style) // this is hellish please rework it if(ALT_STYLE) if(!alt_covers_chest) body_parts_covered |= CHEST | ARMS - adjusted = NORMAL_STYLE + if(!LAZYLEN(damage_by_parts)) + return adjusted + for(var/zone in list(BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) // ugly check to make sure we don't reenable protection on a disabled part + if(damage_by_parts[zone] > limb_integrity) + for(var/part in zone2body_parts_covered(zone)) + body_parts_covered &= part return adjusted else adjusted = NORMAL_STYLE return adjusted if(ROLLED_STYLE) body_parts_covered |= ARMS + if(!LAZYLEN(damage_by_parts)) + return adjusted + for(var/zone in list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) // ugly check to make sure we don't reenable protection on a disabled part + if(damage_by_parts[zone] > limb_integrity) + for(var/part in zone2body_parts_covered(zone)) + body_parts_covered &= part adjusted = NORMAL_STYLE return adjusted @@ -573,9 +702,37 @@ //so the shred survives potential turf change from the explosion. addtimer(CALLBACK_NEW(/obj/effect/decal/cleanable/shreds, list(T, name)), 1) deconstruct(FALSE) + else if(!(damage_flag in list("acid", "fire"))) + body_parts_covered = NONE + slot_flags = NONE + update_clothes_damaged_state(CLOTHING_SHREDDED) + + if(isliving(loc)) + var/mob/living/M = loc + if(src in M.get_equipped_items(FALSE)) //make sure they were wearing it and not attacking the item in their hands / eating it if they were a moth. + M.visible_message( + span_danger("[M]'s [src.name] fall[p_s()] off, [p_theyre()] completely shredded!"), + span_userdanger("Your [src.name] fall[p_s()] off, [p_theyre()] completely shredded!"), + vision_distance = COMBAT_MESSAGE_RANGE, + ) + M.dropItemToGround(src) + else + M.visible_message( + span_danger("[src] fall[p_s()] apart, completely shredded!"), + vision_distance = COMBAT_MESSAGE_RANGE, + ) + + name = "shredded [initial(name)]" // change the name -after- the message, not before. else ..() +/// If we're a clothing with at least 1 shredded/disabled zone, give the wearer a periodic heads up letting them know their clothes are damaged +/obj/item/clothing/proc/bristle(mob/living/L) + if(!istype(L)) + return + if(prob(0.1)) + to_chat(L, span_warning("The damaged threads on your [src.name] chafe!")) + ///sets up the proper bloody overlay for a clothing object, using species data /obj/item/clothing/proc/setup_blood_overlay() var/overlay_file = 'icons/effects/blood.dmi' diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index c90d41595bc9..7f4dbdc44b87 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -34,7 +34,7 @@ /obj/item/clothing/glasses/examine(mob/user) . = ..() if(glass_colour_type && ishuman(user)) - . += span_notice("Alt-click to toggle its colors.") + . += span_notice("Alt-click to toggle [p_their()] colors.") /obj/item/clothing/glasses/visor_toggling() ..() diff --git a/code/modules/clothing/gloves/_gloves.dm b/code/modules/clothing/gloves/_gloves.dm index 5de024a9c42d..2c3ce6727365 100644 --- a/code/modules/clothing/gloves/_gloves.dm +++ b/code/modules/clothing/gloves/_gloves.dm @@ -40,7 +40,7 @@ . += setup_blood_overlay() -/obj/item/clothing/gloves/update_clothes_damaged_state(damaging = TRUE) +/obj/item/clothing/gloves/update_clothes_damaged_state(damaged_state = CLOTHING_DAMAGED) ..() if(ismob(loc)) var/mob/M = loc diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm index cb5fb89ddc41..fe836e10fbcd 100644 --- a/code/modules/clothing/head/_head.dm +++ b/code/modules/clothing/head/_head.dm @@ -75,7 +75,7 @@ if(HAS_BLOOD_DNA(src)) . += setup_blood_overlay() -/obj/item/clothing/head/update_clothes_damaged_state(damaging = TRUE) +/obj/item/clothing/head/update_clothes_damaged_state(damaged_state = CLOTHING_DAMAGED) ..() if(ismob(loc)) var/mob/M = loc diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 9bb64578b116..349ab401d406 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -20,8 +20,7 @@ icon_state = "hardhat_yellow" light_color = "#FFCC66" light_power = 0.8 - armor = list("melee" = 15, "bullet" = 5, "laser" = 20, "energy" = 10, "bomb" = 20, "bio" = 10, "rad" = 20, "fire" = 100, "acid" = 50) // surprisingly robust against head trauma - flags_inv = 0 + armor = list("melee" = 15, "bullet" = 5, "laser" = 20, "energy" = 10, "bomb" = 20, "bio" = 10, "rad" = 20, "fire" = 100, "acid" = 50, "wound" = 20) actions_types = list(/datum/action/item_action/toggle_helmet_light) clothing_flags = SNUG_FIT resistance_flags = FIRE_PROOF diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 805db951ae5c..efea313bf5c2 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -6,7 +6,7 @@ icon_state = "helmet" item_state = "helmet" var/flashlight_state = "helmet_flight_overlay" - armor = list("melee" = 35, "bullet" = 35, "laser" = 35,"energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + armor = list("melee" = 35, "bullet" = 35, "laser" = 35,"energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 20) cold_protection = HEAD min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT heat_protection = HEAD diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm index 64a6cc10d6f1..fb02606a9e17 100644 --- a/code/modules/clothing/masks/_masks.dm +++ b/code/modules/clothing/masks/_masks.dm @@ -41,7 +41,7 @@ if(HAS_BLOOD_DNA(src)) . += setup_blood_overlay() -/obj/item/clothing/mask/update_clothes_damaged_state(damaging = TRUE) +/obj/item/clothing/mask/update_clothes_damaged_state(damaged_state = CLOTHING_DAMAGED) ..() if(ismob(loc)) var/mob/M = loc diff --git a/code/modules/clothing/outfits/factions/clip.dm b/code/modules/clothing/outfits/factions/clip.dm index a1d5430c35c0..ac7a846474fc 100644 --- a/code/modules/clothing/outfits/factions/clip.dm +++ b/code/modules/clothing/outfits/factions/clip.dm @@ -128,7 +128,7 @@ shoes = /obj/item/clothing/shoes/sneakers/white suit = /obj/item/clothing/suit/toggle/labcoat gloves = /obj/item/clothing/gloves/color/latex/nitrile/clip - suit_store = /obj/item/flashlight/pen + suit_store = /obj/item/flashlight/pen/paramedic backpack = /obj/item/storage/backpack/medic satchel = /obj/item/storage/backpack/satchel/med diff --git a/code/modules/clothing/outfits/factions/inteq.dm b/code/modules/clothing/outfits/factions/inteq.dm index 5e1c2eacdb44..737e01dca600 100644 --- a/code/modules/clothing/outfits/factions/inteq.dm +++ b/code/modules/clothing/outfits/factions/inteq.dm @@ -112,7 +112,7 @@ belt = /obj/item/storage/belt/medical/webbing/paramedic ears = /obj/item/radio/headset/headset_medsec/alt - suit_store = /obj/item/flashlight/pen + suit_store = /obj/item/flashlight/pen/paramedic backpack_contents = list(/obj/item/roller=1) /datum/outfit/job/inteq/paramedic/empty diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm index 61d3ed1fca9c..e173971b7906 100644 --- a/code/modules/clothing/outfits/factions/syndicate.dm +++ b/code/modules/clothing/outfits/factions/syndicate.dm @@ -468,7 +468,7 @@ head = /obj/item/clothing/head/beret/cmo/cybersun suit = /obj/item/clothing/suit/toggle/labcoat/raincoat l_hand = /obj/item/storage/firstaid/medical - suit_store = /obj/item/flashlight/pen + suit_store = /obj/item/flashlight/pen/paramedic backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1) box = /obj/item/storage/box/survival/medical @@ -484,7 +484,7 @@ suit = /obj/item/clothing/suit/toggle/labcoat/suns/cmo l_hand = /obj/item/storage/firstaid/medical r_hand = /obj/item/storage/belt/sabre/suns/cmo - suit_store = /obj/item/flashlight/pen + suit_store = /obj/item/flashlight/pen/paramedic backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1) gloves = /obj/item/clothing/gloves/color/latex/nitrile/suns glasses = /obj/item/clothing/glasses/hud/health/suns @@ -750,7 +750,7 @@ gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil belt = /obj/item/storage/belt/medical/paramedic id = /obj/item/card/id - suit_store = /obj/item/flashlight/pen + suit_store = /obj/item/flashlight/pen/paramedic backpack_contents = list(/obj/item/roller=1) pda_slot = ITEM_SLOT_LPOCKET box = /obj/item/storage/box/survival/medical diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm index 179ecc6fad8f..a40e68694fd7 100644 --- a/code/modules/clothing/shoes/_shoes.dm +++ b/code/modules/clothing/shoes/_shoes.dm @@ -79,7 +79,7 @@ . = ..() -/obj/item/clothing/shoes/update_clothes_damaged_state(damaging = TRUE) +/obj/item/clothing/shoes/update_clothes_damaged_state(damaged_state = CLOTHING_DAMAGED) ..() if(ismob(loc)) var/mob/M = loc diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index e7b92bb66cda..e04a4349e953 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -5,7 +5,7 @@ icon_state = "hardsuit0-engineering" item_state = "eng_helm" max_integrity = 300 - armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 50, "acid" = 75) + armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 50, "acid" = 75, "wound" = 15) light_system = MOVABLE_LIGHT_DIRECTIONAL light_range = 4 light_power = 1 @@ -110,7 +110,7 @@ icon_state = "hardsuit-engineering" item_state = "eng_hardsuit" max_integrity = 300 - armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 50, "acid" = 75) + armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 50, "acid" = 75, "wound" = 15) allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/t_scanner, /obj/item/construction/rcd, /obj/item/pipe_dispenser) siemens_coefficient = 0.5 var/obj/item/clothing/head/helmet/space/hardsuit/helmet diff --git a/code/modules/clothing/suits/_suits.dm b/code/modules/clothing/suits/_suits.dm index 75497fca5a7b..323e78c7632a 100644 --- a/code/modules/clothing/suits/_suits.dm +++ b/code/modules/clothing/suits/_suits.dm @@ -12,6 +12,7 @@ blood_overlay_type = "suit" var/togglename = null var/suittoggled = FALSE + limb_integrity = 0 // disabled for most exo-suits pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo //WS Edit - Exowear Pockets greyscale_colors = list(list(13, 16), list(10, 18), list(13, 21)) greyscale_icon_state = "coat" @@ -42,7 +43,7 @@ if(A.above_suit) . += U.accessory_overlay -/obj/item/clothing/suit/update_clothes_damaged_state(damaging = TRUE) +/obj/item/clothing/suit/update_clothes_damaged_state(damaged_state = CLOTHING_DAMAGED) ..() if(ismob(loc)) var/mob/M = loc diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 2250241ee21a..e8993331c62f 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -11,7 +11,7 @@ equip_delay_other = 40 max_integrity = 250 resistance_flags = NONE - armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 10) greyscale_colors = list(list(18, 19), list(13, 18), list(20, 15)) greyscale_icon_state = "armor" diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm index 1e0467269ff8..1af257629561 100644 --- a/code/modules/clothing/under/_under.dm +++ b/code/modules/clothing/under/_under.dm @@ -11,6 +11,7 @@ equip_sound = 'sound/items/equip/jumpsuit_equip.ogg' drop_sound = 'sound/items/handling/cloth_drop.ogg' pickup_sound = 'sound/items/handling/cloth_pickup.ogg' + limb_integrity = 30 cuttable = TRUE clothamnt = 3 greyscale_colors = list(list(15, 17), list(10, 19), list(15, 10)) @@ -64,7 +65,7 @@ if(!attach_accessory(I, user)) return ..() -/obj/item/clothing/under/update_clothes_damaged_state(damaging = TRUE) +/obj/item/clothing/under/update_clothes_damaged_state(damaged_state = CLOTHING_DAMAGED) ..() if(ismob(loc)) var/mob/M = loc diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index f9c60815224d..110551049bab 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -116,7 +116,7 @@ item_state = "beer" hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("stabbed", "slashed", "attacked") - sharpness = IS_SHARP + sharpness = SHARP_EDGED var/static/icon/broken_outline = icon('icons/obj/drinks/drinks.dmi', "broken") /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 6d84b142f03a..1247ad1a09e7 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -227,7 +227,7 @@ All foods are distributed among various categories. Use common sense. /obj/item/reagent_containers/food/snacks/proc/slice(accuracy, obj/item/W, mob/user) if((slices_num <= 0 || !slices_num) || !slice_path) //is the food sliceable? return FALSE - + //who wrote this fucking proc? if ( \ !isturf(src.loc) || \ !(locate(/obj/structure/table) in src.loc) && \ @@ -237,21 +237,10 @@ All foods are distributed among various categories. Use common sense. to_chat(user, span_warning("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].", \ - span_notice("You slice [src].") \ - ) - else - user.visible_message( \ - "[user] inaccurately slices [src] with [W]!", \ - span_notice("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 in 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/food_and_drinks/kitchen_machinery/cutting_board.dm b/code/modules/food_and_drinks/kitchen_machinery/cutting_board.dm index 122f163ec7f7..ed72703b956f 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/cutting_board.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/cutting_board.dm @@ -108,7 +108,7 @@ if(user.a_intent == INTENT_HARM) return ..() - if(attacking_item.sharpness >= IS_SHARP_ACCURATE) + if(attacking_item.sharpness >= SHARP_POINTY) if(!length(contents)) balloon_alert(user, "nothing to process") return diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm index f09e1ede549e..cea0992b99f7 100644 --- a/code/modules/hydroponics/grown/citrus.dm +++ b/code/modules/hydroponics/grown/citrus.dm @@ -140,7 +140,7 @@ /obj/item/reagent_containers/food/snacks/grown/firelemon/ex_act(severity) qdel(src) //Ensuring that it's deleted by its own explosion -/obj/item/reagent_containers/food/snacks/grown/firelemon/proc/prime() +/obj/item/reagent_containers/food/snacks/grown/firelemon/proc/prime(mob/living/lanced_by) switch(seed.potency) //Combustible lemons are alot like IEDs, lots of flame, very little bang. if(0 to 30) update_mob() diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm index 91bb782c1154..36caf09adcf8 100644 --- a/code/modules/hydroponics/grown/misc.dm +++ b/code/modules/hydroponics/grown/misc.dm @@ -209,7 +209,7 @@ /obj/item/reagent_containers/food/snacks/grown/cherry_bomb/ex_act(severity) qdel(src) //Ensuring that it's deleted by its own explosion. Also prevents mass chain reaction with piles of cherry bombs -/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/prime() +/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/prime(mob/living/lanced_by) icon_state = "cherry_bomb_lit" playsound(src, 'sound/effects/fuse.ogg', seed.potency, FALSE) reagents.chem_temp = 1000 //Sets off the gunpowder diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm index 3fa14561b8d1..d02689658291 100644 --- a/code/modules/hydroponics/grown/nettle.dm +++ b/code/modules/hydroponics/grown/nettle.dm @@ -67,5 +67,6 @@ icon_state = "deathnettle" force = 30 throwforce = 15 + wound_bonus = CANT_WOUND wine_power = 50 wine_flavor = "burning rage" //WS edit: new wine flavors diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 5cac30d6f6ed..b684156d0bd9 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -88,7 +88,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/jobs/job_types/brig_physician.dm b/code/modules/jobs/job_types/brig_physician.dm index 124c1ec791df..29be9d9e2209 100644 --- a/code/modules/jobs/job_types/brig_physician.dm +++ b/code/modules/jobs/job_types/brig_physician.dm @@ -24,7 +24,7 @@ suit = /obj/item/clothing/suit/toggle/labcoat/brig_phys alt_suit = /obj/item/clothing/suit/armor/vest/security/brig_phys dcoat = /obj/item/clothing/suit/hooded/wintercoat/security - suit_store = /obj/item/flashlight/pen + suit_store = /obj/item/flashlight/pen/paramedic l_hand = /obj/item/storage/firstaid/regular head = /obj/item/clothing/head/soft/sec/brig_phys implants = list(/obj/item/implant/mindshield) diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm index d09b9ee6aa50..7dd60d467cdd 100644 --- a/code/modules/jobs/job_types/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/chief_medical_officer.dm @@ -32,7 +32,7 @@ alt_suit = /obj/item/clothing/suit/toggle/labcoat/mad //WS Edit - Alt-Job Titles dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical //WS Edit - Alt Uniforms l_hand = /obj/item/storage/firstaid/medical - suit_store = /obj/item/flashlight/pen + suit_store = /obj/item/flashlight/pen/paramedic backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1) backpack = /obj/item/storage/backpack/medic diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index f1eb3c028696..604a84e19ebb 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -17,13 +17,13 @@ belt = /obj/item/pda/medical ears = /obj/item/radio/headset/headset_med uniform = /obj/item/clothing/under/rank/medical/doctor - alt_uniform = /obj/item/clothing/under/rank/medical/doctor/blue //WS Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/medical/doctor/blue shoes = /obj/item/clothing/shoes/sneakers/white suit = /obj/item/clothing/suit/toggle/labcoat alt_suit = /obj/item/clothing/suit/apron/surgical - dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical //WS Edit - Alt Uniforms + dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical l_hand = /obj/item/storage/firstaid/medical - suit_store = /obj/item/flashlight/pen + suit_store = /obj/item/flashlight/pen/paramedic backpack = /obj/item/storage/backpack/medic satchel = /obj/item/storage/backpack/satchel/med diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm index 35d353ac6b52..4cfa9c396f5f 100644 --- a/code/modules/jobs/job_types/paramedic.dm +++ b/code/modules/jobs/job_types/paramedic.dm @@ -26,7 +26,7 @@ belt = /obj/item/storage/belt/medical/paramedic id = /obj/item/card/id l_pocket = /obj/item/pda/medical - suit_store = /obj/item/flashlight/pen + suit_store = /obj/item/flashlight/pen/paramedic backpack_contents = list(/obj/item/roller=1) pda_slot = ITEM_SLOT_LPOCKET diff --git a/code/modules/mining/equipment/angle_grinder.dm b/code/modules/mining/equipment/angle_grinder.dm index 79ed57ad2bad..3f7ac0c77b1b 100644 --- a/code/modules/mining/equipment/angle_grinder.dm +++ b/code/modules/mining/equipment/angle_grinder.dm @@ -78,7 +78,7 @@ tool_behaviour = TOOL_DECONSTRUCT wielded = TRUE - sharpness = IS_SHARP + sharpness = SHARP_EDGED icon_state = "[initial(item_state)]-wield" item_state = "[initial(item_state)]-wield" @@ -92,10 +92,6 @@ icon_state = initial(icon_state) item_state = initial(item_state) -/obj/item/gear_handle/anglegrinder/get_dismemberment_chance() - if(wielded) - . = ..() - /obj/item/gear_handle/anglegrinder/use_tool(atom/target, mob/living/user, delay, amount=1, volume=0, datum/callback/extra_checks) if(adv) target.add_overlay(GLOB.advanced_cutting_effect) diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 48219ac840b9..539a3067bee7 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) obj_flags = UNIQUE_RENAME light_system = MOVABLE_LIGHT @@ -191,7 +191,7 @@ custom_materials = list(/datum/material/titanium=5000, /datum/material/iron=2075) hitsound = 'sound/weapons/blade1.ogg' attack_verb = list("sliced", "bisected", "diced", "chopped", "filleted") - sharpness = IS_SHARP + sharpness = SHARP_EDGED obj_flags = UNIQUE_RENAME light_color = "#fb6767" light_system = MOVABLE_LIGHT diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index fd71c59618f6..aeb5f3a06249 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -164,7 +164,7 @@ w_class = WEIGHT_CLASS_NORMAL custom_materials = list(/datum/material/iron=50) attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked") - sharpness = IS_SHARP + sharpness = SHARP_EDGED /obj/item/shovel/Initialize() . = ..() @@ -193,7 +193,7 @@ w_class = WEIGHT_CLASS_NORMAL toolspeed = 0.6 attack_verb = list("slashed", "impaled", "stabbed", "sliced") - sharpness = IS_SHARP + sharpness = SHARP_EDGED /obj/item/shovel/spoon name = "comically large spoon" @@ -203,4 +203,4 @@ throwforce = 2 toolspeed = 0.8 attack_verb = list("bashed", "bludgeoned", "spooned", "scooped") - sharpness = IS_BLUNT + sharpness = SHARP_NONE diff --git a/code/modules/mining/equipment/trophies.dm b/code/modules/mining/equipment/trophies.dm index d3ffa84e030d..bc8477a9d555 100644 --- a/code/modules/mining/equipment/trophies.dm +++ b/code/modules/mining/equipment/trophies.dm @@ -93,7 +93,7 @@ force = 10 throwforce = 15 throw_speed = 4 - sharpness = IS_SHARP + sharpness = SHARP_EDGED attack_verb = list("cut", "sliced", "diced") hitsound = 'sound/weapons/bladeslice.ogg' @@ -105,7 +105,7 @@ force = 15 throwforce = 20 throw_speed = 4 - sharpness = IS_SHARP + sharpness = SHARP_EDGED attack_verb = list("cut", "braised", "singed") hitsound = 'sound/weapons/bladeslice.ogg' diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index ac5bfc7c6a13..ff3d66bca71f 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -148,26 +148,34 @@ return FALSE return !held_items[hand_index] + /mob/proc/put_in_hand(obj/item/I, hand_index, forced = FALSE, ignore_anim = TRUE) - if(forced || can_put_in_hand(I, hand_index)) - if(!ignore_anim) - I.do_pickup_animation(src) - if(hand_index == null) - return FALSE - if(get_item_for_held_index(hand_index) != null) - dropItemToGround(get_item_for_held_index(hand_index), force = TRUE) - I.forceMove(src) - held_items[hand_index] = I - I.layer = ABOVE_HUD_LAYER - I.plane = ABOVE_HUD_PLANE - I.equipped(src, ITEM_SLOT_HANDS) - if(I.pulledby) - I.pulledby.stop_pulling() - update_inv_hands() - I.pixel_x = I.base_pixel_x - I.pixel_y = I.base_pixel_y - return hand_index || TRUE - return FALSE + if(hand_index == null || (!forced && !can_put_in_hand(I, hand_index))) + return FALSE + + if(isturf(I.loc) && !ignore_anim) + I.do_pickup_animation(src) + + if(get_item_for_held_index(hand_index) != null) + dropItemToGround(get_item_for_held_index(hand_index), force = TRUE) + + I.forceMove(src) + held_items[hand_index] = I + I.layer = ABOVE_HUD_LAYER + I.plane = ABOVE_HUD_PLANE + I.equipped(src, ITEM_SLOT_HANDS) + + if(QDELETED(I)) // this is here because some ABSTRACT items like slappers and circle hands could be moved from hand to hand then delete, which meant you'd have a null in your hand until you cleared it (say, by dropping it) + held_items[hand_index] = null + return FALSE + + if(I.pulledby) + I.pulledby.stop_pulling() + + update_inv_hands() + I.pixel_x = I.base_pixel_x //pixel shifting + I.pixel_y = I.base_pixel_y + return hand_index //Puts the item into the first available left hand if possible and calls all necessary triggers/updates. returns 1 on success. /mob/proc/put_in_l_hand(obj/item/I) diff --git a/code/modules/mob/living/basic/basic_defense.dm b/code/modules/mob/living/basic/basic_defense.dm index 6ce1752643d0..79027d4ffff6 100644 --- a/code/modules/mob/living/basic/basic_defense.dm +++ b/code/modules/mob/living/basic/basic_defense.dm @@ -51,7 +51,7 @@ visible_message(span_danger("[user] punches [src]!"), \ span_userdanger("You're punched by [user]!"), null, COMBAT_MESSAGE_RANGE, user) to_chat(user, span_danger("You punch [src]!")) - adjustBruteLoss(15) + apply_damage(15, BRUTE, wound_bonus=10) /mob/living/basic/attack_paw(mob/living/carbon/human/user, list/modifiers) if(..()) //successful monkey bite. diff --git a/code/modules/mob/living/basic/space_fauna/bear/bear.dm b/code/modules/mob/living/basic/space_fauna/bear/bear.dm index 9c061e65014e..0c963cfc9680 100644 --- a/code/modules/mob/living/basic/space_fauna/bear/bear.dm +++ b/code/modules/mob/living/basic/space_fauna/bear/bear.dm @@ -21,9 +21,11 @@ speed = 0 obj_damage = 60 - melee_damage_lower = 15 + melee_damage_lower = 15 // i know it's like half what it used to be, but bears cause bleeding like crazy now so it works out melee_damage_upper = 15 - sharpness = IS_SHARP + wound_bonus = -5 + bare_wound_bonus = 10 // BEAR wound bonus am i right + sharpness = SHARP_EDGED attack_verb_continuous = "claws" attack_verb_simple = "claw" attack_sound = 'sound/weapons/bladeslice.ogg' diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm index 5c176348844f..90d064291ced 100644 --- a/code/modules/mob/living/blood.dm +++ b/code/modules/mob/living/blood.dm @@ -1,25 +1,12 @@ #define BLOOD_DRIP_RATE_MOD 90 //Greater number means creating blood drips more often while bleeding -/**************************************************** - BLOOD SYSTEM -****************************************************/ - -/mob/living/carbon/monkey/handle_blood() - if(bodytemperature >= TCRYO && !(HAS_TRAIT(src, TRAIT_HUSK))) //cryosleep or husked people do not pump the blood. - //Blood regeneration if there is some space - if(blood_volume < BLOOD_VOLUME_NORMAL) - blood_volume += 0.1 // regenerate blood VERY slowly - if(blood_volume < BLOOD_VOLUME_OKAY) - adjustOxyLoss(round((BLOOD_VOLUME_NORMAL - blood_volume) * 0.02, 1)) - // Takes care blood loss and regeneration /mob/living/carbon/human/handle_blood() - if(NOBLOOD in dna.species.species_traits) + if(NOBLOOD in dna.species.species_traits || HAS_TRAIT(src, TRAIT_NOBLEED) || (HAS_TRAIT(src, TRAIT_FAKEDEATH))) return if(bodytemperature >= TCRYO && !(HAS_TRAIT(src, TRAIT_HUSK))) //cryosleep or husked people do not pump the blood. - //Blood regeneration if there is some space if(blood_volume < BLOOD_VOLUME_NORMAL && !HAS_TRAIT(src, TRAIT_NOHUNGER)) var/nutrition_ratio = 0 @@ -34,10 +21,13 @@ nutrition_ratio = 0.8 else nutrition_ratio = 1 + if(satiety > 80) nutrition_ratio *= 1.25 + adjust_nutrition(-nutrition_ratio * HUNGER_FACTOR) blood_volume = min(BLOOD_VOLUME_NORMAL, blood_volume + 0.5 * nutrition_ratio) + if(blood_volume < BLOOD_VOLUME_NORMAL && HAS_TRAIT(src, TRAIT_NOHUNGER)) //blood regen for non eaters blood_volume = min(BLOOD_VOLUME_NORMAL, blood_volume + 0.5 * 1.25) //assumes best nutrition conditions for non eaters because they don't eat @@ -51,14 +41,11 @@ if(BLOOD_VOLUME_MAXIMUM to BLOOD_VOLUME_EXCESS) if(prob(10)) to_chat(src, span_warning("You feel terribly bloated.")) - if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE) - if(prob(1)) to_chat(src, span_warning("You feel [word].")) if(oxyloss < 20) adjustOxyLoss(round((BLOOD_VOLUME_NORMAL - blood_volume) * 0.02, 1)) - if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY) if(eye_blurry < 50) adjust_blurriness(5) @@ -66,7 +53,6 @@ adjustOxyLoss(round((BLOOD_VOLUME_NORMAL - blood_volume) * 0.02, 1)) else adjustOxyLoss(round((BLOOD_VOLUME_NORMAL - blood_volume) * 0.01, 1)) - if(prob(15)) Unconscious(rand(2 SECONDS,6 SECONDS)) to_chat(src, span_warning("You feel very [word].")) @@ -81,69 +67,124 @@ if(!HAS_TRAIT(src, TRAIT_NODEATH)) death() + var/temp_bleed = 0 //Bleeding out - var/limb_bleed = 0 for(var/obj/item/bodypart/BP as anything in bodyparts) - if(BP.GetComponent(/datum/component/bandage)) - continue - //We want an accurate reading of .len - listclearnulls(BP.embedded_objects) - for(var/obj/item/embeddies in BP.embedded_objects) - if(!embeddies.isEmbedHarmless()) - BP.adjust_bleeding(0.1, BLOOD_LOSS_DAMAGE_MAXIMUM) - limb_bleed += BP.bleeding - - var/message_cooldown = 5 SECONDS - var/bleeeding_wording -// var/bleed_change_wording - switch(limb_bleed) - if(0 to 0.5) - bleeeding_wording = "You hear droplets of blood drip down." - message_cooldown *= 2.5 - if(0.5 to 1) - bleeeding_wording = "You feel your blood flow quietly to the floor." - message_cooldown *= 2 - if(1 to 2) - bleeeding_wording = "The flow of blood leaving your body onto the ground is worrying..." - message_cooldown *= 1.7 - if(2 to 4) - bleeeding_wording = "You're losing blood very fast, which is freaking you out!" - message_cooldown *= 1.5 - if(4 to INFINITY) - bleeeding_wording = "Your heartbeat beats unstably fast as you lose a massive amount of blood!!" - - if(limb_bleed && !bleedsuppress && !HAS_TRAIT(src, TRAIT_FAKEDEATH)) - bleed(limb_bleed) - - if(!blood_particle) - blood_particle = new(src, /particles/droplets/blood, PARTICLE_ATTACH_MOB) - blood_particle.particles.color = dna.blood_type.color //mouthful - blood_particle.particles.spawning = (limb_bleed/2) - blood_particle.particles.count = (round(clamp((limb_bleed * 2), 1, INFINITY))) - - if(COOLDOWN_FINISHED(src, bloodloss_message) && bleeeding_wording) - to_chat(src, span_warning("[bleeeding_wording]")) - COOLDOWN_START(src, bloodloss_message, message_cooldown) - else - if(blood_particle) - QDEL_NULL(blood_particle) + temp_bleed += BP.get_bleed_rate() + BP.generic_bleedstacks = max(0, BP.generic_bleedstacks - 1) + + if(temp_bleed) + bleed(temp_bleed) + bleed_warn(temp_bleed) + + //wounds todo: add this effect to bleed wounds instead of this + // if(!blood_particle) + // blood_particle = new(src, /particles/droplets/blood, PARTICLE_ATTACH_MOB) + // blood_particle.particles.color = dna.blood_type.color //mouthful + // blood_particle.particles.spawning = (limb_bleed/2) + // blood_particle.particles.count = (round(clamp((limb_bleed * 2), 1, INFINITY))) + + // if(COOLDOWN_FINISHED(src, bloodloss_message) && bleeeding_wording) + // to_chat(src, span_warning("[bleeeding_wording]")) + // COOLDOWN_START(src, bloodloss_message, message_cooldown) + // else + // if(blood_particle) + // QDEL_NULL(blood_particle) //Makes a blood drop, leaking amt units of blood from the mob /mob/living/carbon/proc/bleed(amt) - if(blood_volume) - blood_volume = max(blood_volume - amt, 0) - if (prob(sqrt(amt)*BLOOD_DRIP_RATE_MOD)) - if(isturf(src.loc) && !isgroundlessturf(src.loc)) //Blood loss still happens in locker, floor stays clean - if(amt >= 2) - add_splatter_floor(src.loc, amt = amt) - else - add_splatter_floor(src.loc, TRUE, amt) + if(!blood_volume) + return + + //Blood loss still happens in locker, floor stays clean + if(isturf(loc) && prob(sqrt(amt)*BLOOD_DRIP_RATE_MOD) && !isgroundlessturf(src.loc)) + add_splatter_floor(loc, (amt >= 10)) /mob/living/carbon/human/bleed(amt) amt *= physiology.bleed_mod if(!(NOBLOOD in dna.species.species_traits)) ..() +/// A helper to see how much blood we're losing per tick +/mob/living/carbon/proc/get_bleed_rate() + if(!blood_volume) + return + var/bleed_amt = 0 + for(var/X in bodyparts) + var/obj/item/bodypart/iter_bodypart = X + bleed_amt += iter_bodypart.get_bleed_rate() + return bleed_amt + +/mob/living/carbon/human/get_bleed_rate() + if((NOBLOOD in dna.species.species_traits)) + return + . = ..() + . *= physiology.bleed_mod + + +/** + * bleed_warn() is used to for carbons with an active client to occasionally receive messages warning them about their bleeding status (if applicable) + * + * Arguments: + * * bleed_amt- When we run this from [/mob/living/carbon/human/proc/handle_blood] we already know how much blood we're losing this tick, so we can skip tallying it again with this + * * forced- + */ +/mob/living/carbon/proc/bleed_warn(bleed_amt = 0, forced = FALSE) + if(!blood_volume || !client) + return + if(!COOLDOWN_FINISHED(src, bleeding_message_cd) && !forced) + return + + if(!bleed_amt) // if we weren't provided the amount of blood we lost this tick in the args + bleed_amt = get_bleed_rate() + + var/bleeding_severity = "" + var/next_cooldown = BLEEDING_MESSAGE_BASE_CD + + switch(bleed_amt) + if(-INFINITY to 0) + return + if(0 to 1) + bleeding_severity = "You feel light trickles of blood across your skin" + next_cooldown *= 2.5 + if(1 to 3) + bleeding_severity = "You feel a small stream of blood running across your body" + next_cooldown *= 2 + if(3 to 5) + bleeding_severity = "You skin feels clammy from the flow of blood leaving your body" + next_cooldown *= 1.7 + if(5 to 7) + bleeding_severity = "Your body grows more and more numb as blood streams out" + next_cooldown *= 1.5 + if(7 to INFINITY) + bleeding_severity = "Your heartbeat thrashes wildly trying to keep up with your bloodloss" + + var/rate_of_change = ", but it's getting better." // if there's no wounds actively getting bloodier or maintaining the same flow, we must be getting better! + if(HAS_TRAIT(src, TRAIT_COAGULATING)) // if we have coagulant, we're getting better quick + rate_of_change = ", but it's clotting up quickly!" + else + // flick through our wounds to see if there are any bleeding ones getting worse or holding flow (maybe move this to handle_blood and cache it so we don't need to cycle through the wounds so much) + for(var/i in all_wounds) + var/datum/wound/iter_wound = i + if(!iter_wound.blood_flow) + continue + var/iter_wound_roc = iter_wound.get_bleed_rate_of_change() + switch(iter_wound_roc) + if(BLOOD_FLOW_INCREASING) // assume the worst, if one wound is getting bloodier, we focus on that + rate_of_change = ", and it's getting worse!" + break + if(BLOOD_FLOW_STEADY) // our best case now is that our bleeding isn't getting worse + rate_of_change = ", and it's holding steady." + if(BLOOD_FLOW_DECREASING) // this only matters if none of the wounds fit the above two cases, included here for completeness + continue + + to_chat(src, "[bleeding_severity][rate_of_change]") + COOLDOWN_START(src, bleeding_message_cd, next_cooldown) + +/mob/living/carbon/human/bleed_warn(bleed_amt = 0, forced = FALSE) + if(!(NOBLOOD in dna.species.species_traits)) + return ..() + /** * This proc is a helper for spraying blood for things like slashing/piercing wounds and dismemberment. * @@ -164,14 +205,14 @@ var/turf/targ = get_ranged_target_turf(src, splatter_direction, splatter_strength) INVOKE_ASYNC(our_splatter, TYPE_PROC_REF(/obj/effect/decal/cleanable/blood/hitsplatter, fly_towards), targ, splatter_strength) - /mob/living/proc/restore_blood() blood_volume = initial(blood_volume) -/mob/living/carbon/human/restore_blood() +/mob/living/carbon/restore_blood() blood_volume = BLOOD_VOLUME_NORMAL - for(var/obj/item/bodypart/BP as anything in get_bleeding_parts()) - BP.bleeding = 0 + for(var/i in bodyparts) + var/obj/item/bodypart/BP = i + BP.generic_bleedstacks = 0 /**************************************************** BLOOD TRANSFERS @@ -232,7 +273,7 @@ blood_data["viruses"] += D.Copy() blood_data["blood_DNA"] = dna.unique_enzymes - if(disease_resistances && disease_resistances.len) + if(LAZYLEN(disease_resistances)) blood_data["resistances"] = disease_resistances.Copy() var/list/temp_chem = list() for(var/datum/reagent/R in reagents.reagent_list) @@ -266,10 +307,6 @@ if(blood_volume) return /datum/reagent/blood -/mob/living/carbon/monkey/get_blood_id() - if(!(HAS_TRAIT(src, TRAIT_HUSK))) - return /datum/reagent/blood - /mob/living/carbon/human/get_blood_id() if(HAS_TRAIT(src, TRAIT_HUSK)) return @@ -332,7 +369,6 @@ if(QDELETED(B)) //Give it up return - B.bloodiness = min((B.bloodiness + BLOOD_AMOUNT_PER_DECAL), BLOOD_POOL_MAX) B.transfer_mob_blood_dna(src) //give blood info to the blood decal. if(temp_blood_DNA) B.add_blood_DNA(temp_blood_DNA) diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm index 18e6b4bfaeee..720c11422088 100644 --- a/code/modules/mob/living/bloodcrawl.dm +++ b/code/modules/mob/living/bloodcrawl.dm @@ -74,7 +74,7 @@ if(victim.stat == CONSCIOUS) visible_message(span_warning("[victim] kicks free of the blood pool just before entering it!"), null, span_notice("You hear splashing and struggling.")) - else if(victim.reagents && victim.reagents.has_reagent(/datum/reagent/consumable/ethanol/demonsblood, needs_metabolizing = TRUE)) + else if(victim.reagents?.has_reagent(/datum/reagent/consumable/ethanol/demonsblood, needs_metabolizing = TRUE)) visible_message(span_warning("Something prevents [victim] from entering the pool!"), span_warning("A strange force is blocking [victim] from entering!"), span_notice("You hear a splash and a thud.")) else victim.forceMove(src) @@ -107,7 +107,7 @@ if(!victim) return FALSE - if(victim.reagents && victim.reagents.has_reagent(/datum/reagent/consumable/ethanol/devilskiss, needs_metabolizing = TRUE)) + if(victim.reagents?.has_reagent(/datum/reagent/consumable/ethanol/devilskiss, needs_metabolizing = TRUE)) to_chat(src, span_warning("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/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index c98c000b27af..5873f9bb3732 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -337,6 +337,8 @@ max_traumas = TRAUMA_LIMIT_BASIC if(TRAUMA_RESILIENCE_SURGERY) max_traumas = TRAUMA_LIMIT_SURGERY + if(TRAUMA_RESILIENCE_WOUND) + max_traumas = TRAUMA_LIMIT_WOUND if(TRAUMA_RESILIENCE_LOBOTOMY) max_traumas = TRAUMA_LIMIT_LOBOTOMY if(TRAUMA_RESILIENCE_MAGIC) @@ -399,8 +401,7 @@ return var/trauma_type = pick(possible_traumas) - gain_trauma(trauma_type, resilience, natural_gain) - + return gain_trauma(trauma_type, resilience, natural_gain) //Cure a random trauma of a certain resilience level /obj/item/organ/brain/proc/cure_trauma_type(brain_trauma_type = /datum/brain_trauma, resilience = TRAUMA_RESILIENCE_BASIC) var/list/traumas = get_traumas_type(brain_trauma_type, resilience) diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm index 9046c7bb7c68..e9c72cff1e43 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm @@ -2,7 +2,7 @@ . = ..() if(!.) return - adjustBruteLoss(15) + apply_damage(15, BRUTE, wound_bonus=10) var/hitverb = "hit" if(mob_size < MOB_SIZE_LARGE) safe_throw_at(get_edge_target_turf(src, get_dir(user, src)), 2, 1, user) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index af5b4eac0522..5e7571c354ad 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -14,6 +14,10 @@ internal_organs_slot.Cut() QDEL_LIST(bodyparts) QDEL_LIST(implants) + for(var/wound in all_wounds) // these LAZYREMOVE themselves when deleted so no need to remove the list here + qdel(wound) + for(var/scar in all_scars) + qdel(scar) remove_from_all_data_huds() QDEL_NULL(dna) GLOB.carbon_list -= src @@ -59,27 +63,46 @@ else mode() // Activate held item +/mob/living/carbon/attackby(obj/item/I, mob/user, params) + if(!all_wounds || !(user.a_intent == INTENT_HELP || user == src)) + return ..() + + for(var/i in shuffle(all_wounds)) + var/datum/wound/W = i + if(W.try_treating(I, user)) + return 1 + + return ..() /mob/living/carbon/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) . = ..() var/hurt = TRUE + var/extra_speed = 0 + + if(throwingdatum.thrower != src) + extra_speed = min(max(0, throwingdatum.speed - initial(throw_speed)), 3) + if(istype(throwingdatum, /datum/thrownthing)) hurt = !throwingdatum.gentle + if(hit_atom.density && isturf(hit_atom)) if(hurt) Paralyze(20) - take_bodypart_damage(10,check_armor = TRUE) + take_bodypart_damage(10 + 5 * extra_speed, check_armor = TRUE, wound_bonus = extra_speed * 5) + if(iscarbon(hit_atom) && hit_atom != src) var/mob/living/carbon/victim = hit_atom if(victim.movement_type & FLYING) return if(hurt) - victim.take_bodypart_damage(10,check_armor = TRUE) - take_bodypart_damage(10,check_armor = TRUE) + victim.take_bodypart_damage(10 + 5 * extra_speed, check_armor = TRUE, wound_bonus = extra_speed * 5) + take_bodypart_damage(10 + 5 * extra_speed, check_armor = TRUE, wound_bonus = extra_speed * 5) victim.Paralyze(20) Paralyze(20) - visible_message(span_danger("[src] crashes into [victim], knocking them both over!"),\ - span_userdanger("You violently crash into [victim]!")) + visible_message( + span_danger("[src] crashes into [victim] [extra_speed ? "really hard" : ""], knocking them both over!"), + span_userdanger("You violently crash into [victim] [extra_speed ? "extra hard" : ""]!"), + ) playsound(src,'sound/weapons/punch1.ogg',50,TRUE) @@ -142,11 +165,17 @@ log_combat(src, thrown_thing, "thrown", addition="grab from tile in [AREACOORD(start_T)] towards tile at [AREACOORD(end_T)]") do_attack_animation(target, no_effect = 1) playsound(loc, 'sound/weapons/punchmiss.ogg', 50, TRUE, -1) - visible_message(span_danger("[src] throws [thrown_thing]."), \ - span_danger("You throw [thrown_thing].")) - log_message("has thrown [thrown_thing]", LOG_ATTACK) + + var/power_throw = 0 + if(pulling && grab_state >= GRAB_NECK) + power_throw++ + visible_message( + span_danger("[src] throws [thrown_thing][power_throw ? " really hard!" : "."]"), + span_danger("You throw [thrown_thing][power_throw ? " really hard!" : "."]"), + ) + log_message("has thrown [thrown_thing] [power_throw ? "really hard" : ""]", LOG_ATTACK) newtonian_move(get_dir(target, src)) - thrown_thing.safe_throw_at(target, thrown_thing.throw_range, thrown_thing.throw_speed, src, null, null, null, move_force) + thrown_thing.safe_throw_at(target, thrown_thing.throw_range, thrown_thing.throw_speed + power_throw, src, null, null, null, move_force) /mob/living/carbon/proc/canBeHandcuffed() @@ -847,6 +876,9 @@ var/datum/disease/D = thing if(D.severity != DISEASE_SEVERITY_POSITIVE) D.cure(FALSE) + for(var/thing in all_wounds) + var/datum/wound/W = thing + W.remove_wound() if(admin_revive) regenerate_limbs() regenerate_organs() @@ -970,12 +1002,15 @@ if(SANITY_NEUTRAL to INFINITY) . *= 0.90 + for(var/i in status_effects) + var/datum/status_effect/S = i + . *= S.interact_speed_modifier() + /mob/living/carbon/proc/create_internal_organs() for(var/X in internal_organs) var/obj/item/organ/I = X I.Insert(src) - /mob/living/carbon/vv_get_dropdown() . = ..() VV_DROPDOWN_OPTION("", "---------") @@ -1174,6 +1209,50 @@ update_inv_gloves() . = TRUE +/// if any of our bodyparts are bleeding +/mob/living/carbon/proc/is_bleeding() + for(var/i in bodyparts) + var/obj/item/bodypart/BP = i + if(BP.get_bleed_rate()) + return TRUE + +/// get our total bleedrate +/mob/living/carbon/proc/get_total_bleed_rate() + var/total_bleed_rate = 0 + for(var/i in bodyparts) + var/obj/item/bodypart/BP = i + total_bleed_rate += BP.get_bleed_rate() + + return total_bleed_rate + +/** + * 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_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_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/scaries = new + var/obj/item/bodypart/scar_part = pick(bodyparts) + + var/wound_type + if(forced_type) + if(islist(forced_type)) + wound_type = pick(forced_type) + else + wound_type = forced_type + else + wound_type = pick(GLOB.global_all_wound_types) + + var/datum/wound/phantom_wound = new wound_type + scaries.generate(scar_part, phantom_wound) + scaries.fake = TRUE + QDEL_NULL(phantom_wound) + /mob/living/carbon/proc/update_flavor_text_feature(new_text) if(!dna) return @@ -1202,6 +1281,14 @@ /mob/living/carbon/is_face_visible() return !(wear_mask?.flags_inv & HIDEFACE) && !(head?.flags_inv & HIDEFACE) +/** + * 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() //todo: silicon wounds for ipcs + return BIO_FLESH_BONE + /// Modifies the handcuffed value if a different value is passed, returning FALSE otherwise. The variable should only be changed through this proc. /mob/living/carbon/proc/set_handcuffed(new_value) if(handcuffed == new_value) diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 48916ff05e00..cf182a9f5919 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -8,19 +8,19 @@ if(user.a_intent != INTENT_HELP || !W.get_temperature() || !BP.can_bandage()) //this will also catch low damage synthetic welding return ..() . = TRUE - var/heal_time = 2 SECONDS - playsound(user, 'sound/surgery/cautery1.ogg', 20) - balloon_alert(user, "cauterizing...") - if(src == user && !painless) - heal_time *= 2 //oof ouch owie - user.visible_message(span_nicegreen("[user] holds [W] up to [user == src ? "their" : "[src]'s"] [parse_zone(BP.body_zone)], trying to slow [p_their()] bleeding..."), span_nicegreen("You hold [W] up to [user == src ? "your" : "[src]'s"] [parse_zone(BP.body_zone)], trying to slow [user == src ? "your" : p_their()] bleeding...")) - if(do_after(user, heal_time, target = src)) - playsound(user, 'sound/surgery/cautery2.ogg', 20) - BP.apply_bandage(0.005, W.get_temperature()/BLOOD_CAUTERIZATION_RATIO, "cauterization") //not particularly fast, this is the "I really would prefer not to be bleeding right now" option - BP.receive_damage(burn = W.get_temperature()/BLOOD_CAUTERIZATION_DAMAGE_RATIO) //my body is a MACHINE that turns BLEEDING into BURN DAMAGE - user.visible_message(span_nicegreen("[user] cauterizes the bleeding on [user == src ? "their" : "[src]'s"] [parse_zone(BP.body_zone)]!"), span_nicegreen("You cauterize the bleeding on [user == src ? "your" : "[src]'s"] [parse_zone(BP.body_zone)]!")) - else - to_chat(user, span_warning("You were interrupted!")) + // var/heal_time = 2 SECONDS //todo: rethink/fix cautery + // playsound(user, 'sound/surgery/cautery1.ogg', 20) + // balloon_alert(user, "cauterizing...") + // if(src == user && !painless) + // heal_time *= 2 //oof ouch owie + // user.visible_message(span_nicegreen("[user] holds [W] up to [user == src ? "their" : "[src]'s"] [parse_zone(BP.body_zone)], trying to slow [p_their()] bleeding..."), span_nicegreen("You hold [W] up to [user == src ? "your" : "[src]'s"] [parse_zone(BP.body_zone)], trying to slow [user == src ? "your" : p_their()] bleeding...")) + // if(do_after(user, heal_time, target = src)) + // playsound(user, 'sound/surgery/cautery2.ogg', 20) + // BP.apply_bandage(0.005, W.get_temperature()/BLOOD_CAUTERIZATION_RATIO, "cauterization") //not particularly fast, this is the "I really would prefer not to be bleeding right now" option + // BP.receive_damage(burn = W.get_temperature()/BLOOD_CAUTERIZATION_DAMAGE_RATIO) //my body is a MACHINE that turns BLEEDING into BURN DAMAGE + // user.visible_message(span_nicegreen("[user] cauterizes the bleeding on [user == src ? "their" : "[src]'s"] [parse_zone(BP.body_zone)]!"), span_nicegreen("You cauterize the bleeding on [user == src ? "your" : "[src]'s"] [parse_zone(BP.body_zone)]!")) + // else + // to_chat(user, span_warning("You were interrupted!")) /mob/living/carbon/get_eye_protection() . = ..() @@ -100,12 +100,14 @@ if(body_position == LYING_DOWN) // half as likely to hit a different zone if they're on the ground zone_hit_chance += 10 affecting = get_bodypart(ran_zone(user.zone_selected, zone_hit_chance)) + 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, parse_zone(affecting.body_zone)) + send_item_attack_message(I, user, affecting.name, parse_zone(affecting.body_zone)) + if(I.force) - apply_damage(I.force, I.damtype, affecting) + apply_damage(I.force, I.damtype, affecting, wound_bonus = I.wound_bonus, bare_wound_bonus = I.bare_wound_bonus, sharpness = I.get_sharpness()) if(I.damtype == BRUTE && (IS_ORGANIC_LIMB(affecting))) if(prob(33)) I.add_mob_blood(src) @@ -123,15 +125,44 @@ if(head) 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, TRUE) return TRUE //successful attack +/mob/living/carbon/send_item_attack_message(obj/item/I, mob/living/user, hit_area, obj/item/bodypart/hit_bodypart) + 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( + span_danger("[attack_message]"), + span_userdanger("[attack_message_local]"), null, COMBAT_MESSAGE_RANGE, + ) + return TRUE + /mob/living/carbon/attack_drone(mob/living/simple_animal/drone/user) return //so we don't call the carbon's attack_hand(). @@ -159,8 +190,12 @@ if(D.spread_flags & DISEASE_SPREAD_CONTACT_SKIN) ContactContractDisease(D) - return 0 + for(var/i in all_wounds) + var/datum/wound/W = i + if(W.try_handling(user)) + return TRUE + return FALSE /mob/living/carbon/attack_paw(mob/living/carbon/monkey/M) @@ -177,13 +212,13 @@ 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) @@ -667,22 +702,115 @@ if(istype(ears) && !ears.deaf) . = TRUE +/mob/living/carbon/proc/get_interaction_efficiency(zone) + var/obj/item/bodypart/limb = get_bodypart(zone) + if(!limb) + return + +/mob/living/carbon/get_organic_health() + . = health + for (var/_limb in bodyparts) + var/obj/item/bodypart/limb = _limb + if (limb.bodytype != BODYPART_ORGANIC) + . += (limb.brute_dam * limb.body_damage_coeff) + (limb.burn_dam * limb.body_damage_coeff) + +/mob/living/carbon/grabbedby(mob/living/carbon/user, supress_message = FALSE) + if(user != src) + return ..() + + var/obj/item/bodypart/grasped_part = get_bodypart(zone_selected) + self_grasp_bleeding_limb(grasped_part, supress_message) + +/mob/living/carbon/proc/self_grasp_bleeding_limb(obj/item/bodypart/grasped_part, supress_message = FALSE) + if(!grasped_part?.get_bleed_rate()) + return + + var/starting_hand_index = active_hand_index + if(starting_hand_index == grasped_part.held_index) + to_chat(src, span_danger("You can't grasp your [grasped_part.name] with itself!")) + return + + to_chat(src, span_warning("You try grasping at your [grasped_part.name], trying to stop the bleeding...")) + if(!do_after(src, 1.5 SECONDS)) + to_chat(src, span_danger("You fail to grasp your [grasped_part.name].")) + return + + var/obj/item/self_grasp/grasp = new + if(starting_hand_index != active_hand_index || !put_in_active_hand(grasp)) + to_chat(src, span_danger("You fail to grasp your [grasped_part.name].")) + QDEL_NULL(grasp) + return + grasp.grasp_limb(grasped_part) + +/// an abstract item representing you holding your own limb to staunch the bleeding, see [/mob/living/carbon/proc/grabbedby] will probably need to find somewhere else to put this. +/obj/item/self_grasp + name = "self-grasp" + desc = "Sometimes all you can do is slow the bleeding." + icon_state = "latexballon" + item_state = "nothing" + force = 0 + throwforce = 0 + slowdown = 1 + item_flags = DROPDEL | ABSTRACT | NOBLUDGEON | SLOWS_WHILE_IN_HAND | HAND_ITEM + /// The bodypart we're staunching bleeding on, which also has a reference to us in [/obj/item/bodypart/var/grasped_by] + var/obj/item/bodypart/grasped_part + /// The carbon who owns all of this mess + var/mob/living/carbon/user + +/obj/item/self_grasp/Destroy() + if(user) + to_chat(user, span_warning("You stop holding onto your[grasped_part ? " [grasped_part.name]" : "self"].")) + UnregisterSignal(user, COMSIG_PARENT_QDELETING) + + if(grasped_part) + UnregisterSignal(grasped_part, list(COMSIG_CARBON_REMOVE_LIMB, COMSIG_PARENT_QDELETING)) + grasped_part.grasped_by = null + + grasped_part = null + user = null + return ..() + +/// The limb or the whole damn person we were grasping got deleted or dismembered, so we don't care anymore +/obj/item/self_grasp/proc/qdel_void() + qdel(src) + +/// We've already cleared that the bodypart in question is bleeding in [the place we create this][/mob/living/carbon/proc/grabbedby], so set up the connections +/obj/item/self_grasp/proc/grasp_limb(obj/item/bodypart/grasping_part) + user = grasping_part.owner + if(!istype(user)) + stack_trace("[src] attempted to try_grasp() with [istype(user, /datum) ? user.type : isnull(user) ? "null" : user] user") + qdel(src) + return + + grasped_part = grasping_part + grasped_part.grasped_by = src + RegisterSignal(user, COMSIG_PARENT_QDELETING, .proc/qdel_void) + RegisterSignal(grasped_part, list(COMSIG_CARBON_REMOVE_LIMB, COMSIG_PARENT_QDELETING), .proc/qdel_void) + + user.visible_message( + span_danger("[user] grasps at [user.p_their()] [grasped_part.name], trying to stop the bleeding."), + span_notice("You grab hold of your [grasped_part.name] tightly."), + vision_distance=COMBAT_MESSAGE_RANGE, + ) + playsound(get_turf(src), 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) + return TRUE /mob/living/carbon/adjustOxyLoss(amount, updating_health = TRUE, forced = FALSE) . = ..() if(isnull(.)) return + if(. <= 50) if(getOxyLoss() > 50) ADD_TRAIT(src, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT) else if(getOxyLoss() <= 50) REMOVE_TRAIT(src, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT) - /mob/living/carbon/setOxyLoss(amount, updating_health = TRUE, forced = FALSE) . = ..() if(isnull(.)) return + if(. <= 50) if(getOxyLoss() > 50) ADD_TRAIT(src, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT) @@ -700,6 +828,8 @@ recoil_camera(src, clamp((P.damage-armor)/4,0.5,10), clamp((P.damage-armor)/4,0.5,10), P.damage/8, P.Angle) apply_effects(P.stun, P.knockdown, P.unconscious, P.irradiate, P.slur, P.stutter, P.eyeblur, P.drowsy, armor, P.stamina, P.jitter, P.paralyze, P.immobilize) + if(P.dismemberment) check_projectile_dismemberment(P, def_zone) + return on_hit_state ? BULLET_ACT_HIT : BULLET_ACT_BLOCK diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index 8925483e9036..b154f41b0f84 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -71,7 +71,8 @@ var/obj/halitem var/hal_screwyhud = SCREWYHUD_NONE var/next_hallucination = 0 - var/cpr_time = 1 ///CPR cooldown. + /// CPR cooldown. + var/cpr_time = 1 var/damageoverlaytemp = 0 var/drunkenness = 0 ///Overall drunkenness @@ -85,13 +86,18 @@ /// Timer id of any transformation var/transformation_timer - /// WS edit - moth dust when hugging + /// All of the wounds a carbon has afflicted throughout their limbs + var/list/all_wounds + + /// Levels of moth dust var/mothdust - ///List of quirk cooldowns to track + /// List of quirk cooldowns to track var/list/quirk_cooldown = list() /// Timer to remove the dream_sequence timer when the mob is deleted var/dream_timer /// Can other carbons be shoved into this one to make it fall? var/can_be_shoved_into = FALSE + + COOLDOWN_DECLARE(bleeding_message_cd) diff --git a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm index 2f0159a4a756..2f25794c720e 100644 --- a/code/modules/mob/living/carbon/damage_procs.dm +++ b/code/modules/mob/living/carbon/damage_procs.dm @@ -1,7 +1,7 @@ -/mob/living/carbon/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, sharpness = FALSE) - SEND_SIGNAL(src, COMSIG_MOB_APPLY_DAMGE, damage, damagetype, def_zone) +/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_DAMAGE, damage, damagetype, def_zone) var/hit_percent = (100-blocked)/100 if(!damage || (!forced && hit_percent <= 0)) return 0 @@ -21,26 +21,31 @@ switch(damagetype) if(BRUTE) if(BP) - if(BP.receive_damage(damage_amount, 0, sharpness = sharpness)) + if(BP.receive_damage(damage_amount, 0, wound_bonus = wound_bonus, bare_wound_bonus = bare_wound_bonus, sharpness = sharpness)) update_damage_overlays() else //no bodypart, we deal damage with a more general method. adjustBruteLoss(damage_amount, forced = forced) if(stat <= HARD_CRIT) shake_animation(damage_amount) + if(BURN) if(BP) - if(BP.receive_damage(0, damage_amount, sharpness = sharpness)) + if(BP.receive_damage(0, damage_amount, wound_bonus = wound_bonus, bare_wound_bonus = bare_wound_bonus, sharpness = sharpness)) update_damage_overlays() else adjustFireLoss(damage_amount, forced = forced) if(stat <= HARD_CRIT) shake_animation(damage_amount) + if(TOX) adjustToxLoss(damage_amount, forced = forced) + if(OXY) adjustOxyLoss(damage_amount, forced = forced) + if(CLONE) adjustCloneLoss(damage_amount, forced = forced) + if(STAMINA) if(BP) if(BP.receive_damage(0, 0, damage_amount)) @@ -182,6 +187,15 @@ parts += BP return parts +///Returns a list of bodyparts with wounds (in case someone has a wound on an otherwise fully healed limb) +/mob/living/carbon/proc/get_wounded_bodyparts(brute = FALSE, burn = FALSE, stamina = FALSE, status) + var/list/obj/item/bodypart/parts = list() + for(var/X in bodyparts) + var/obj/item/bodypart/BP = X + if(LAZYLEN(BP.wounds)) + parts += BP + return parts + /** * Heals ONE bodypart randomly selected from damaged ones. * @@ -207,12 +221,12 @@ * * 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) +/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(required_status) if(!parts.len) return var/obj/item/bodypart/picked = pick(parts) - if(picked.receive_damage(brute, burn, stamina, check_armor ? run_armor_check(picked, (brute ? "melee" : burn ? "fire" : stamina ? "bullet" : null)) : FALSE)) + if(picked.receive_damage(brute, burn, stamina,check_armor ? run_armor_check(picked, (brute ? "melee" : burn ? "fire" : stamina ? "bullet" : null)) : FALSE, wound_bonus = wound_bonus, bare_wound_bonus = bare_wound_bonus, sharpness = sharpness)) update_damage_overlays() ///Fix integrity in MANY bodyparts, in random order @@ -269,7 +283,7 @@ var/stamina_was = picked.stamina_dam - update |= picked.receive_damage(brute_per_part, burn_per_part, stamina_per_part, FALSE, required_status) + update |= picked.receive_damage(brute_per_part, burn_per_part, stamina_per_part, FALSE, required_status, wound_bonus = CANT_WOUND) brute = round(brute - (picked.brute_dam - brute_was), DAMAGE_PRECISION) burn = round(burn - (picked.burn_dam - burn_was), DAMAGE_PRECISION) @@ -278,71 +292,8 @@ parts -= picked if(updating_health) updatehealth() + if(update) update_damage_overlays() - update_stamina() - -/// Gets a list of bleeding bodyparts, argument ignore_staunched = are we actively bleeding (no treatment) -/mob/living/carbon/proc/get_bleeding_parts(ignore_staunched = FALSE) - var/list/obj/item/bodypart/parts = list() - for(var/obj/item/bodypart/BP as anything in bodyparts) - if(BP.bleeding && (!ignore_staunched || !BP.GetComponent(/datum/component/bandage))) - parts += BP - return parts - -/// Gets a list of bandaged parts -/mob/living/carbon/proc/get_bandaged_parts() - var/list/obj/item/bodypart/parts = list() - for(var/obj/item/bodypart/BP as anything in bodyparts) - if(BP.GetComponent(/datum/component/bandage)) - parts += BP - return parts -/// Apply bleeding to one random bodypart. -/mob/living/carbon/proc/cause_bleeding(amt) - if(amt <= 0) - return - var/list/obj/item/bodypart/parts = bodyparts.Copy() - if(!length(parts)) - return - var/obj/item/bodypart/part_in_question = pick(parts) - part_in_question.adjust_bleeding(amt) - -/// Heal bleeding from one random bodypart -/mob/living/carbon/proc/heal_bleeding(amt) - if(amt <= 0) - return - var/list/obj/item/bodypart/parts = get_bleeding_parts() - if(!length(parts)) - return - var/obj/item/bodypart/part_in_question = pick(parts) - part_in_question.adjust_bleeding(-amt) - var/bleed_calc = part_in_question.bleeding - return min(bleed_calc - part_in_question.bleeding, 0) - -/// Apply bleeding to all bodyparts -/mob/living/carbon/proc/cause_overall_bleeding(amt) - if(amt <= 0) - return - var/list/obj/item/bodypart/parts = bodyparts.Copy() - while(length(parts)) - var/obj/item/bodypart/part_in_question = pick(parts) - if(part_in_question.is_pseudopart) - parts -= part_in_question - continue - var/amount_to_take = min(part_in_question.bleeding, amt / length(parts)) - part_in_question.adjust_bleeding(amount_to_take) - amt -= amount_to_take - parts -= part_in_question - -/// Heal bleeding from all bodyparts -/mob/living/carbon/proc/heal_overall_bleeding(amt) - if(amt <= 0) - return - var/list/obj/item/bodypart/parts = get_bleeding_parts() - while(length(parts)) - var/obj/item/bodypart/part_in_question = pick(parts) - var/amount_to_take = min(part_in_question.bleeding, amt / length(parts)) - part_in_question.adjust_bleeding(-amount_to_take) - amt -= amount_to_take - parts -= part_in_question + update_stamina() diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index 063ff2396b8a..76fd7e0ca3e9 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -9,9 +9,9 @@ . = list("This is [icon2html(src, user)] \a [src]!") var/list/obscured = check_obscured_slots() - if (handcuffed) + if(handcuffed) . += span_warning("[t_He] [t_is] [icon2html(handcuffed, user)] handcuffed!") - if (head) + if(head) . += "[t_He] [t_is] wearing [head.get_examine_string(user)] on [t_his] head. " if(wear_mask && !(ITEM_SLOT_MASK in obscured)) . += "[t_He] [t_is] wearing [wear_mask.get_examine_string(user)] on [t_his] face." @@ -22,10 +22,11 @@ if(!(I.item_flags & ABSTRACT)) . += "[t_He] [t_is] holding [I.get_examine_string(user)] in [t_his] [get_held_index_name(get_held_index_of_item(I))]." - if (back) + if(back) . += "[t_He] [t_has] [back.get_examine_string(user)] on [t_his] back." + var/appears_dead = 0 - if (stat == DEAD) + if(stat == DEAD) appears_dead = 1 if(getorgan(/obj/item/organ/brain)) . += span_deadsay("[t_He] [t_is] limp and unresponsive, with no signs of life.") @@ -39,11 +40,16 @@ if(BP.bodypart_disabled) disabled += BP missing -= BP.body_zone + for(var/obj/item/I in BP.embedded_objects) if(I.isEmbedHarmless()) - msg += "[t_He] [t_has] \a [icon2html(I, user)] [I] stuck to [t_his] [BP.name]!\n" + msg += "[t_He] [t_has] [icon2html(I, user)] \a [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" + msg += "[t_He] [t_has] [icon2html(I, user)] \a [I] embedded in [t_his] [BP.name]!\n" + + for(var/i in BP.wounds) + var/datum/wound/W = i + msg += "[W.get_examine_description(user)]\n" for(var/X in disabled) var/obj/item/bodypart/BP = X @@ -142,3 +148,80 @@ . += "" SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .) + +/mob/living/carbon/examine_more(mob/user) + var/msg = list("You examine [src] closer, and note the following...") + var/t_His = p_their(TRUE) + var/t_He = p_they(TRUE) + var/t_Has = p_have() + + var/any_bodypart_damage = FALSE + for(var/X in bodyparts) + var/obj/item/bodypart/LB = X + if(LB.is_pseudopart) + continue + var/limb_max_damage = LB.max_damage + var/status = "" + var/brutedamage = round(LB.brute_dam/limb_max_damage*100) + var/burndamage = round(LB.burn_dam/limb_max_damage*100) + switch(brutedamage) + if(20 to 35) + status = LB.light_brute_msg + if(36 to 65) + status = LB.medium_brute_msg + if(66 to 100) + status += LB.heavy_brute_msg + + if(burndamage >= 20 && status) + status += "and " + switch(burndamage) + if(20 to 35) + status += LB.light_burn_msg + if(36 to 65) + status += LB.medium_burn_msg + if(66 to 100) + status += LB.heavy_burn_msg + + if(status) + any_bodypart_damage = TRUE + msg += "\t[t_His] [LB.name] is [status]." + + for(var/thing in LB.wounds) + any_bodypart_damage = TRUE + var/datum/wound/W = thing + switch(W.severity) + if(WOUND_SEVERITY_TRIVIAL) + msg += "\t[t_His] [LB.name] is suffering [W.a_or_from] [W.get_topic_name(user)]." + if(WOUND_SEVERITY_MODERATE) + msg += "\t[t_His] [LB.name] is suffering [W.a_or_from] [W.get_topic_name(user)]!" + if(WOUND_SEVERITY_SEVERE) + msg += "\t[t_His] [LB.name] is suffering [W.a_or_from] [W.get_topic_name(user)]!" + if(WOUND_SEVERITY_CRITICAL) + msg += "\t[t_His] [LB.name] is suffering [W.a_or_from] [W.get_topic_name(user)]!!" + if(LB.current_gauze) + var/datum/bodypart_aid/current_gauze = LB.current_gauze + msg += "\t[t_His] [LB.name] is [current_gauze.desc_prefix] with [current_gauze.get_description()]." + if(LB.current_splint) + var/datum/bodypart_aid/current_splint = LB.current_splint + msg += "\t[t_His] [LB.name] is [current_splint.desc_prefix] with [current_splint.get_description()]." + + if(!any_bodypart_damage) + msg += "\t[t_He] [t_Has] no significantly damaged bodyparts." + + var/list/visible_scars + if(all_scars) + for(var/i in all_scars) + var/datum/scar/S = i + if(S.is_visible(user)) + LAZYADD(visible_scars, S) + + if(!visible_scars) + msg |= "\t[t_He] [t_Has] no visible scars." + else + for(var/i in visible_scars) + var/datum/scar/S = i + var/scar_text = S.get_examine_description(user) + if(scar_text) + msg += "[scar_text]" + + return msg diff --git a/code/modules/mob/living/carbon/human/damage_procs.dm b/code/modules/mob/living/carbon/human/damage_procs.dm index 1b558e2a5fa9..64266720c533 100644 --- a/code/modules/mob/living/carbon/human/damage_procs.dm +++ b/code/modules/mob/living/carbon/human/damage_procs.dm @@ -1,7 +1,7 @@ /// 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, sharpness = FALSE) //WS Edit - Breakable Bones - return dna.species.apply_damage(damage, damagetype, def_zone, blocked, src, forced, spread_damage, sharpness = sharpness) +/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) /mob/living/carbon/human/revive(full_heal = 0, admin_revive = 0) if(..()) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 95b6e312d800..481b56019c36 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -150,14 +150,6 @@ else . += span_deadsay("[t_He] [t_is] limp and unresponsive; there are no signs of life...") -//WSStaion Begin - Broken Bones - - var/list/splinted_stuff = list() - for(var/obj/item/bodypart/B in bodyparts) - if(B.bone_status == BONE_FLAG_SPLINTED) - splinted_stuff += B.name - if(splinted_stuff.len) - . += "[span_warning("[t_His] [english_list(splinted_stuff)] [splinted_stuff.len > 1 ? "are" : "is"] splinted!")]\n" if(get_bodypart(BODY_ZONE_HEAD) && !getorgan(/obj/item/organ/brain)) . += span_deadsay("It appears that [t_his] brain is missing...") @@ -168,31 +160,40 @@ var/list/missing = list(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) var/list/disabled = list() - for(var/obj/item/bodypart/BP as anything in bodyparts) - if(BP.bodypart_disabled) - disabled += BP - missing -= BP.body_zone - if(BP.uses_integrity && (BP.integrity_loss-BP.integrity_ignored) > 0) - if ((BP.integrity_loss-BP.integrity_ignored) > BP.max_damage*0.66) - msg += "[t_His] [BP.name] is [BP.heavy_integrity_msg]!\n" - else if (BP.integrity_loss-BP.integrity_ignored > BP.max_damage*0.33) - msg += "[t_His] [BP.name] is [BP.medium_integrity_msg]!\n" - else - msg += "[t_His] [BP.name] is [BP.light_integrity_msg].\n" - for(var/obj/item/I in BP.embedded_objects) + + for(var/obj/item/bodypart/body_part as anything in bodyparts) + if(body_part.bodypart_disabled) + disabled += body_part + missing -= body_part.body_zone + + for(var/obj/item/I in body_part.embedded_objects) if(I.isEmbedHarmless()) - msg += "[t_He] [t_has] \a [icon2html(I, user)] [I] stuck to [t_his] [BP.name]!\n" + msg += "[t_He] [t_has] \a [icon2html(I, user)] [I] stuck to [t_his] [body_part.name]!\n" else - msg += "[t_He] [t_has] \a [icon2html(I, user)] [I] embedded in [t_his] [BP.name]!\n" + msg += "[t_He] [t_has] \a [icon2html(I, user)] [I] embedded in [t_his] [body_part.name]!\n" + + for(var/i in body_part.wounds) + var/datum/wound/iter_wound = i + msg += "[iter_wound.get_examine_description(user)]\n" + + if(body_part.uses_integrity && (body_part.integrity_loss-body_part.integrity_ignored) > 0) + if ((body_part.integrity_loss-body_part.integrity_ignored) > body_part.max_damage*0.66) + msg += "[t_His] [body_part.name] is [body_part.heavy_integrity_msg]!\n" + else if (body_part.integrity_loss-body_part.integrity_ignored > body_part.max_damage*0.33) + msg += "[t_His] [body_part.name] is [body_part.medium_integrity_msg]!\n" + else + msg += "[t_His] [body_part.name] is [body_part.light_integrity_msg].\n" for(var/X in disabled) - var/obj/item/bodypart/BP = X + var/obj/item/bodypart/body_part = X var/damage_text - if(!(BP.get_damage(include_stamina = FALSE) >= BP.max_damage)) //Stamina is disabling the limb + if(HAS_TRAIT(body_part, TRAIT_DISABLED_BY_WOUND)) + continue // skip if it's disabled by a wound (cuz we'll be able to see the bone sticking out!) + if(!(body_part.get_damage(include_stamina = FALSE) >= body_part.max_damage)) //we don't care if it's stamcritted damage_text = "limp and lifeless" else - damage_text = (BP.brute_dam >= BP.burn_dam) ? BP.heavy_brute_msg : BP.heavy_burn_msg - msg += "[capitalize(t_his)] [BP.name] is [damage_text]!\n" + damage_text = (body_part.brute_dam >= body_part.burn_dam) ? body_part.heavy_brute_msg : body_part.heavy_burn_msg + msg += "[capitalize(t_his)] [body_part.name] is [damage_text]!\n" //stores missing limbs var/l_limbs_missing = 0 @@ -266,19 +267,60 @@ if(DISGUST_LEVEL_DISGUSTED to INFINITY) msg += "[t_He] look[p_s()] extremely disgusted.\n" - if(blood_volume < BLOOD_VOLUME_SAFE || skin_tone == "albino") - msg += "[t_He] [t_has] pale skin.\n" + var/apparent_blood_volume = blood_volume + if(skin_tone == "albino") + apparent_blood_volume -= 150 // enough to knock you down one tier + switch(apparent_blood_volume) + if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE) + msg += "[t_He] [t_has] pale skin.\n" + if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY) + msg += "[t_He] look[p_s()] like pale death.\n" + if(-INFINITY to BLOOD_VOLUME_BAD) + msg += "[t_He] looks drained of blood...\n" + + if(bleedsuppress) + msg += "[t_He] [t_is] imbued with a power that defies bleeding.\n" + else if(is_bleeding()) + var/list/obj/item/bodypart/bleeding_limbs = list() + var/list/obj/item/bodypart/grasped_limbs = list() + + for(var/i in bodyparts) + var/obj/item/bodypart/body_part = i + if(body_part.get_bleed_rate()) + bleeding_limbs += body_part + if(body_part.grasped_by) + grasped_limbs += body_part + + var/num_bleeds = LAZYLEN(bleeding_limbs) + + 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]" : ""]" + if(3 to INFINITY) + for(var/i in 1 to (num_bleeds - 1)) + var/obj/item/bodypart/body_part = bleeding_limbs[i] + bleed_text += " [body_part.name]," + bleed_text += " and [bleeding_limbs[num_bleeds].name]" + + 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" - if(LAZYLEN(get_bandaged_parts())) - msg += "[t_He] [t_has] some dressed bleeding.\n" + for(var/i in grasped_limbs) + var/obj/item/bodypart/grasped_part = i + bleed_text += "[t_He] [t_is] holding [t_his] [grasped_part.name] to slow the bleeding!\n" - var/list/obj/item/bodypart/bleed_check = get_bleeding_parts(TRUE) - if(LAZYLEN(bleed_check)) - if(reagents.has_reagent(/datum/reagent/toxin/heparin, needs_metabolizing = TRUE)) - msg += "[t_He] [t_is] bleeding uncontrollably!\n" - else - msg += "[t_He] [t_is] bleeding!\n" + msg += bleed_text.Join() if(reagents.has_reagent(/datum/reagent/teslium, needs_metabolizing = TRUE)) msg += "[t_He] [t_is] emitting a gentle blue glow!\n" @@ -427,22 +469,6 @@ /mob/living/carbon/human/examine_more(mob/user) . = ..() - for(var/obj/item/bodypart/BP as anything in get_bandaged_parts()) - var/datum/component/bandage/B = BP.GetComponent(/datum/component/bandage) - . += span_notice("[p_their(TRUE)] [parse_zone(BP.body_zone)] is dressed with [B.bandage_name]") - for(var/obj/item/bodypart/BP as anything in get_bleeding_parts(TRUE)) - var/bleed_text - switch(BP.bleeding) - if(0 to 0.5) - bleed_text = "lightly." - if(0.5 to 1) - bleed_text = "moderately." - if(1 to 1.5) - bleed_text = "heavily!" - else - bleed_text = "significantly!!" - . += span_warning("[p_their(TRUE)] [parse_zone(BP.body_zone)] is bleeding [bleed_text]") - if ((wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE))) return if(get_age()) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index b60373fc82c3..79c9c487dd43 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -493,12 +493,18 @@ /mob/living/carbon/human/proc/canUseHUD() return (mobility_flags & MOBILITY_USE) -/mob/living/carbon/human/can_inject(mob/user, error_msg, target_zone, penetrate_thick = 0) - . = 1 // Default to returning true. +/mob/living/carbon/human/can_inject(mob/user, error_msg, target_zone, penetrate_thick = FALSE, ignore_species = FALSE) + . = TRUE // Default to returning true. if(user && !target_zone) target_zone = user.zone_selected - if(HAS_TRAIT(src, TRAIT_PIERCEIMMUNE)) - . = 0 + + // we may choose to ignore species trait pierce immunity in case we still want to check skellies for thick clothing without insta failing them (wounds) + if(ignore_species) + if(HAS_TRAIT_NOT_FROM(src, TRAIT_PIERCEIMMUNE, SPECIES_TRAIT)) + . = FALSE + else if(HAS_TRAIT(src, TRAIT_PIERCEIMMUNE)) + . = FALSE + // If targeting the head, see if the head item is thin enough. // If targeting anything else, see if the wear suit is thin enough. if (!penetrate_thick) @@ -506,12 +512,13 @@ if(head && istype(head, /obj/item/clothing)) var/obj/item/clothing/CH = head if (CH.clothing_flags & THICKMATERIAL) - . = 0 + . = FALSE else if(wear_suit && istype(wear_suit, /obj/item/clothing)) var/obj/item/clothing/CS = wear_suit if (CS.clothing_flags & THICKMATERIAL) - . = 0 + . = FALSE + if(!. && error_msg && user) // Might need re-wording. to_chat(user, span_alert("There is no exposed flesh or thin material [above_neck(target_zone) ? "on [p_their()] head" : "on [p_their()] body"].")) @@ -857,6 +864,11 @@ if(stat != DEAD) hud_used.healthdoll.icon_state = "healthdoll_OVERLAY" for(var/obj/item/bodypart/BP as anything in bodyparts) + var/numbing_wound = FALSE + for(var/datum/wound/W in BP.wounds) + if(W.wound_type == WOUND_BURN) + numbing_wound = TRUE + var/damage = BP.burn_dam + BP.brute_dam var/comparison = (BP.max_damage/5) var/icon_num = 0 @@ -870,11 +882,11 @@ icon_num = 4 if(damage > (comparison*4)) icon_num = 5 - if(hal_screwyhud == SCREWYHUD_HEALTHY) + if(hal_screwyhud == SCREWYHUD_HEALTHY || numbing_wound) icon_num = 0 if(icon_num) hud_used.healthdoll.add_overlay(mutable_appearance('icons/hud/screen_gen.dmi', "[BP.body_zone][icon_num]")) - if (BP.uses_integrity) // Same, but for integrity + if(BP.uses_integrity) // Same, but for integrity var/integ_loss = max(0,BP.integrity_loss-BP.integrity_ignored) var/integ_icon_num if(integ_loss) @@ -885,16 +897,13 @@ integ_icon_num = 3 if(integ_loss > (comparison*3)) integ_icon_num = 4 - //no 100% integ loss icon as it'd be visually indistinguishable from limb removal - if(integ_icon_num) + if(integ_icon_num) //no 100% integ loss icon as it'd be visually indistinguishable from limb removal hud_used.healthdoll.add_overlay(mutable_appearance('icons/hud/screen_gen.dmi', "[BP.body_zone]_integ[integ_icon_num]")) for(var/t in get_missing_limbs()) //Missing limbs hud_used.healthdoll.add_overlay(mutable_appearance('icons/hud/screen_gen.dmi', "[t]6")) for(var/t in get_disabled_limbs()) //Disabled limbs hud_used.healthdoll.add_overlay(mutable_appearance('icons/hud/screen_gen.dmi', "[t]7")) - for(var/t in get_broken_limbs()) //Disabled limbs - hud_used.healthdoll.add_overlay(mutable_appearance('icons/hud/screen_gen.dmi', "[t]_fract")) else hud_used.healthdoll.icon_state = "healthdoll_DEAD" @@ -1289,6 +1298,16 @@ return known_name return . +/mob/living/carbon/human/is_bleeding() + if(NOBLOOD in dna.species.species_traits || bleedsuppress) + return FALSE + return ..() + +/mob/living/carbon/human/get_total_bleed_rate() + if(NOBLOOD in dna.species.species_traits) + return FALSE + return ..() + /mob/living/carbon/human/monkeybrain ai_controller = /datum/ai_controller/monkey diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 28f69403aca6..fc5476adcf9c 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -34,11 +34,23 @@ protection += physiology.armor.getRating(d_type) * (100 - protection) / 100 //WS Edit - Makes armor multiplicative return protection +///Get all the clothing on a specific body part +/mob/living/carbon/human/proc/clothingonpart(obj/item/bodypart/def_zone) + var/list/covering_part = list() + var/list/body_parts = list(head, wear_mask, wear_suit, w_uniform, back, gloves, shoes, belt, s_store, glasses, ears, wear_id, wear_neck) //Everything but pockets. Pockets are l_store and r_store. (if pockets were allowed, putting something armored, gloves or hats for example, would double up on the armor) + for(var/bp in body_parts) + if(!bp) + continue + if(bp && istype(bp , /obj/item/clothing)) + var/obj/item/clothing/C = bp + if(C.body_parts_covered & def_zone.body_part) + covering_part += C + return covering_part + /mob/living/carbon/human/on_hit(obj/projectile/P) if(dna && dna.species) dna.species.on_hit(P, src) - /mob/living/carbon/human/bullet_act(obj/projectile/P, def_zone, piercing_hit = FALSE) if(dna?.species) var/spec_return = dna.species.bullet_act(P, src) @@ -214,7 +226,7 @@ visible_message(span_danger("[user] [hulk_verb]ed [src]!"), \ span_userdanger("[user] [hulk_verb]ed [src]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), null, user) to_chat(user, span_danger("You [hulk_verb] [src]!")) - adjustBruteLoss(15) + apply_damage(15, BRUTE, wound_bonus=10) /mob/living/carbon/human/attack_hand(mob/user) if(..()) //to allow surgery to return properly. @@ -234,7 +246,7 @@ if(M.a_intent == INTENT_DISARM) //Always drop item in hand, if no item, get stunned instead. var/obj/item/I = get_active_held_item() - if(I && dropItemToGround(I)) + if(I && !(I.item_flags & ABSTRACT) && dropItemToGround(I)) playsound(loc, 'sound/weapons/slash.ogg', 25, TRUE, -1) visible_message(span_danger("[M] disarmed [src]!"), \ span_userdanger("[M] disarmed you!"), span_hear("You hear aggressive shuffling!"), null, M) @@ -340,7 +352,7 @@ if(!affecting) affecting = get_bodypart(BODY_ZONE_CHEST) var/armor_block = run_armor_check(affecting, "melee") - apply_damage(damage, BRUTE, affecting, armor_block) + apply_damage(damage, BRUTE, affecting, armor_block, wound_bonus=wound_mod) /mob/living/carbon/human/attack_basic_mob(mob/living/basic/user, list/modifiers) @@ -373,16 +385,18 @@ if(!affecting) affecting = get_bodypart(BODY_ZONE_CHEST) var/armor = run_armor_check(affecting, "melee", armour_penetration = M.armour_penetration) - apply_damage(damage, M.melee_damage_type, affecting, armor) + apply_damage(damage, M.melee_damage_type, affecting, armor, wound_bonus = M.wound_bonus, bare_wound_bonus = M.bare_wound_bonus, sharpness = M.sharpness) /mob/living/carbon/human/attack_slime(mob/living/simple_animal/slime/M) if(..()) //successful slime attack var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) + var/wound_mod = -45 // 25^1.4=90, 90-45=45 if(!damage) return if(M.is_adult) damage += rand(5, 10) + wound_mod = -90 // 35^1.4=145, 145-90=55 if(check_shields(M, damage, "the [M.name]")) return 0 @@ -395,7 +409,7 @@ if(!affecting) affecting = get_bodypart(BODY_ZONE_CHEST) var/armor_block = run_armor_check(affecting, "melee", M.armour_penetration) - apply_damage(damage, BRUTE, affecting, armor_block) + apply_damage(damage, BRUTE, affecting, armor_block, wound_bonus=wound_mod) /mob/living/carbon/human/mech_melee_attack(obj/mecha/M) @@ -800,6 +814,27 @@ isdisabled += " and" combined_msg += "\t Your [LB.name][isdisabled][self_aware ? " has " : " is "][status]." + for(var/thing in LB.wounds) + var/datum/wound/W = thing + var/msg + switch(W.severity) + if(WOUND_SEVERITY_TRIVIAL) + msg = "\t Your [LB.name] is suffering [W.a_or_from] [W.get_topic_name(src)]." + if(WOUND_SEVERITY_MODERATE) + msg = "\t Your [LB.name] is suffering [W.a_or_from] [W.get_topic_name(src)]!" + if(WOUND_SEVERITY_SEVERE) + msg = "\t Your [LB.name] is suffering [W.a_or_from] [W.get_topic_name(src)]!" + if(WOUND_SEVERITY_CRITICAL) + msg = "\t Your [LB.name] is suffering [W.a_or_from] [W.get_topic_name(src)]!!" + combined_msg += msg + + if(LB.current_gauze) + var/datum/bodypart_aid/current_gauze = LB.current_gauze + combined_msg += "\t Your [LB.name] is [current_gauze.desc_prefix] with [current_gauze.get_description()]." + if(LB.current_splint) + var/datum/bodypart_aid/current_splint = LB.current_splint + combined_msg += "\t Your [LB.name] is [current_splint.desc_prefix] with [current_splint.get_description()]." + for(var/obj/item/I in LB.embedded_objects) if(I.isEmbedHarmless()) combined_msg += "\t There is \a [I] stuck to your [LB.name]!" @@ -809,13 +844,32 @@ for(var/t in missing) combined_msg += span_boldannounce("Your [parse_zone(t)] is missing!") - for(var/obj/item/bodypart/BP in get_bleeding_parts(TRUE)) - combined_msg += span_danger("Your [parse_zone(BP.body_zone)] is bleeding!") + if(is_bleeding()) + var/list/obj/item/bodypart/bleeding_limbs = list() + for(var/i in bodyparts) + var/obj/item/bodypart/BP = i + if(BP.get_bleed_rate()) + bleeding_limbs += BP + + var/num_bleeds = LAZYLEN(bleeding_limbs) + var/bleed_text = "You are bleeding from your" + switch(num_bleeds) + if(1 to 2) + bleed_text += " [bleeding_limbs[1].name][num_bleeds == 2 ? " and [bleeding_limbs[2].name]" : ""]" + if(3 to INFINITY) + for(var/i in 1 to (num_bleeds - 1)) + var/obj/item/bodypart/BP = bleeding_limbs[i] + bleed_text += " [BP.name]," + bleed_text += " and [bleeding_limbs[num_bleeds].name]" + bleed_text += "!" + to_chat(src, bleed_text) + if(getStaminaLoss()) if(getStaminaLoss() > 30) combined_msg += span_info("You're completely exhausted.") else combined_msg += span_info("You feel fatigued.") + if(HAS_TRAIT(src, TRAIT_SELF_AWARE)) if(toxloss) if(toxloss > 10) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index df006ead1f39..264ad2ab8311 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -62,7 +62,9 @@ /// Adjective used in get_generic_name(), if any var/generic_adjective - var/bleedsuppress = 0 //for stopping bloodloss body-wide + + ///For stopping bloodloss + var/bleedsuppress = 0 var/name_override //For temporary visible name changes diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index cb812d45b34b..747e661236bd 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -41,10 +41,10 @@ dna.species.spec_life(src) // for mutantraces - //WS Begin - Broken bones - if(stat != DEAD) - handle_fractures() - //WS End + else + for(var/i in all_wounds) + var/datum/wound/iter_wound = i + iter_wound.on_stasis() //Update our name based on whether our face is obscured/disfigured name = get_visible_name() @@ -339,28 +339,6 @@ // Tissues die without blood circulation adjustBruteLoss(2) -/mob/living/carbon/human/proc/handle_fractures() - //this whole thing is hacky and WILL NOT work right with multiple hands - //you've been warned - var/obj/item/bodypart/L = get_bodypart("l_arm") - var/obj/item/bodypart/R = get_bodypart("r_arm") - - if(istype(L) && L.bone_status == BONE_FLAG_BROKEN && held_items[1] && prob(30)) - force_scream() - if(!HAS_TRAIT(src, TRAIT_ANALGESIA)) - visible_message(span_warning("[src] screams and lets go of [held_items[1]] in pain."), span_userdanger("A horrible pain in your [parse_zone(L)] makes it impossible to hold [held_items[1]]!")) - else - visible_message(span_notice("[src] flinches and lets go of [held_items[1]]."),span_notice("A sudden weakness in your [parse_zone(L)] makes it impossible to grasp [held_items[1]]!")) - dropItemToGround(held_items[1]) - - if(istype(R) && R.bone_status == BONE_FLAG_BROKEN && held_items[2] && prob(30)) - force_scream() - if(!HAS_TRAIT(src, TRAIT_ANALGESIA)) - visible_message(span_warning("[src] screams and lets go of [held_items[1]] in pain."), span_userdanger("A horrible pain in your [parse_zone(R)] makes it impossible to hold [held_items[1]]!")) - else - visible_message(span_notice("[src] flinches and lets go of [held_items[1]]."),span_notice("A sudden weakness in your [parse_zone(R)] makes it impossible to grasp [held_items[1]]!")) - dropItemToGround(held_items[2]) - #undef THERMAL_PROTECTION_HEAD #undef THERMAL_PROTECTION_CHEST #undef THERMAL_PROTECTION_GROIN diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 9e6e058a90ee..6dfee10e8ab9 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1643,21 +1643,19 @@ GLOBAL_LIST_EMPTY(roundstart_races) var/armor_block = H.run_armor_check(affecting, "melee", I.armour_penetration, FALSE, span_notice("Your armor has protected your [hit_area]!"), span_warning("Your armor has softened a hit to your [hit_area]!")) armor_block = min(90,armor_block) //cap damage reduction at 90% + var/Iwound_bonus = I.wound_bonus - apply_damage(I.force, I.damtype, def_zone, armor_block, H, sharpness = I.get_sharpness()) + // this way, you can't wound with a surgical tool on help intent if they have a surgery active and are laying down, so a misclick with a circular saw on the wrong limb doesn't bleed them dry (they still get hit tho) + if((I.item_flags & SURGICAL_TOOL) && user.a_intent == INTENT_HELP && (H.mobility_flags & ~MOBILITY_STAND) && (LAZYLEN(H.surgeries) > 0)) + Iwound_bonus = CANT_WOUND + + apply_damage(I.force , 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) if(!I.force) 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, TRUE) - var/bloody = 0 if(((I.damtype == BRUTE) && I.force && prob(25 + (I.force * 2)))) if(IS_ORGANIC_LIMB(affecting)) @@ -1713,8 +1711,8 @@ GLOBAL_LIST_EMPTY(roundstart_races) return TRUE -/datum/species/proc/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked, mob/living/carbon/human/H, forced = FALSE, spread_damage = FALSE, sharpness = FALSE) - SEND_SIGNAL(H, COMSIG_MOB_APPLY_DAMGE, damage, damagetype, def_zone) +/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_DAMAGE, 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 if(!damage || (!forced && hit_percent <= 0)) @@ -1736,9 +1734,9 @@ GLOBAL_LIST_EMPTY(roundstart_races) H.damageoverlaytemp = 20 var/damage_amount = forced ? damage : damage * hit_percent * brutemod * H.physiology.brute_mod if(BP) - if(BP.receive_damage(damage_amount, 0, sharpness = sharpness)) + if(BP.receive_damage(damage_amount, 0, wound_bonus = wound_bonus, bare_wound_bonus = bare_wound_bonus, sharpness = sharpness)) H.update_damage_overlays() - else//no bodypart, we deal damage with a more general method. + else //no bodypart, we deal damage with a more general method. H.adjustBruteLoss(damage_amount) if(H.stat <= HARD_CRIT) H.shake_animation(damage_amount) @@ -1746,7 +1744,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) H.damageoverlaytemp = 20 var/damage_amount = forced ? damage : damage * hit_percent * burnmod * H.physiology.burn_mod if(BP) - if(BP.receive_damage(0, damage_amount, sharpness = sharpness)) + if(BP.receive_damage(0, damage_amount, wound_bonus = wound_bonus, bare_wound_bonus = bare_wound_bonus, sharpness = sharpness)) H.update_damage_overlays() else H.adjustFireLoss(damage_amount) @@ -2409,4 +2407,14 @@ GLOBAL_LIST_EMPTY(roundstart_races) /datum/species/proc/get_harm_descriptors() 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 + #undef MINIMUM_MOLS_TO_HARM 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 b9d83119815d..2380465300ef 100644 --- a/code/modules/mob/living/carbon/human/species_types/IPC.dm +++ b/code/modules/mob/living/carbon/human/species_types/IPC.dm @@ -4,7 +4,7 @@ sexes = FALSE species_age_min = 0 species_age_max = 300 - species_traits = list(NOTRANSSTING,NOEYESPRITES,NO_DNA_COPY,TRAIT_EASYDISMEMBER,NOZOMBIE,MUTCOLORS,REVIVESBYHEALING,NOHUSK,NOMOUTH,NO_BONES) //all of these + whatever we inherit from the real species + species_traits = list(NOTRANSSTING,NOEYESPRITES,NO_DNA_COPY,TRAIT_EASYDISMEMBER,NOZOMBIE,MUTCOLORS,REVIVESBYHEALING,NOHUSK,NOMOUTH) //all of these + whatever we inherit from the real species inherent_traits = list(TRAIT_RESISTCOLD,TRAIT_VIRUSIMMUNE,TRAIT_NOBREATH,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_LIMBATTACHMENT) inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID mutantbrain = /obj/item/organ/brain/mmi_holder/posibrain 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 229bdcb21c2f..679a1514da91 100644 --- a/code/modules/mob/living/carbon/human/species_types/abductors.dm +++ b/code/modules/mob/living/carbon/human/species_types/abductors.dm @@ -2,7 +2,7 @@ name = "\improper Abductor" id = SPECIES_ABDUCTOR sexes = FALSE - species_traits = list(NOBLOOD,NOEYESPRITES,NO_BONES) + species_traits = list(NOBLOOD,NOEYESPRITES) inherent_traits = list(TRAIT_VIRUSIMMUNE,TRAIT_CHUNKYFINGERS,TRAIT_NOHUNGER,TRAIT_NOBREATH) mutanttongue = /obj/item/organ/tongue/abductor changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN diff --git a/code/modules/mob/living/carbon/human/species_types/android.dm b/code/modules/mob/living/carbon/human/species_types/android.dm index 6bb5956ae0ab..2d698a184708 100644 --- a/code/modules/mob/living/carbon/human/species_types/android.dm +++ b/code/modules/mob/living/carbon/human/species_types/android.dm @@ -1,7 +1,7 @@ /datum/species/android name = "Android" id = SPECIES_ANDROID - species_traits = list(NOTRANSSTING,NOREAGENTS,NO_DNA_COPY,NOBLOOD,NOFLASH,NO_BONES) + species_traits = list(NOTRANSSTING,NOREAGENTS,NO_DNA_COPY,NOBLOOD,NOFLASH) inherent_traits = list(TRAIT_NOMETABOLISM,TRAIT_TOXIMMUNE,TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_NOFIRE,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_LIMBATTACHMENT,TRAIT_NOCLONELOSS) inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID meat = null diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index 17abdc647f30..8fd27ed961fa 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -17,7 +17,7 @@ attack_type = BURN //burn bish exotic_bloodtype = "E" species_age_max = 300 - species_traits = list(DYNCOLORS, EYECOLOR, HAIR, FACEHAIR) + species_traits = list(DYNCOLORS, EYECOLOR, HAIR, FACEHAIR, HAS_FLESH, HAS_BONE) changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN species_language_holder = /datum/language_holder/ethereal inherent_traits = list(TRAIT_NOHUNGER) 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 6266bdfa813e..a2ccc8ad91cf 100644 --- a/code/modules/mob/living/carbon/human/species_types/flypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/flypeople.dm @@ -1,7 +1,7 @@ /datum/species/fly name = "\improper Flyperson" id = SPECIES_FLYPERSON - species_traits = list(NOEYESPRITES,TRAIT_ANTENNAE) + sspecies_traits = list(NOEYESPRITES, TRAIT_ANTENNAE, 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/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm index cb78805db589..b8f38245d8f0 100644 --- a/code/modules/mob/living/carbon/human/species_types/humans.dm +++ b/code/modules/mob/living/carbon/human/species_types/humans.dm @@ -2,7 +2,7 @@ name = "\improper Human" id = SPECIES_HUMAN default_color = "FFFFFF" - species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,SCLERA,EMOTE_OVERLAY,SKINCOLORS) + species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,SCLERA,EMOTE_OVERLAY,SKINCOLORS,HAS_FLESH,HAS_BONE) default_features = list("mcolor" = "FFF", "tail_human" = "None", "ears" = "None", "wings" = "None", "body_size" = "Normal") mutant_bodyparts = list("ears", "tail_human") use_skintones = TRUE 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 c728a4898d67..03841c61ba9a 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -3,7 +3,7 @@ name = "\improper Jellyperson" id = SPECIES_JELLYPERSON default_color = "00FF90" - species_traits = list(MUTCOLORS,EYECOLOR,NOBLOOD,NO_BONES,HAIR,FACEHAIR) + species_traits = list(MUTCOLORS,EYECOLOR,NOBLOOD,HAIR,FACEHAIR,HAS_FLESH) inherent_traits = list(TRAIT_TOXINLOVER) hair_color = "mutcolor" hair_alpha = 150 diff --git a/code/modules/mob/living/carbon/human/species_types/kepori.dm b/code/modules/mob/living/carbon/human/species_types/kepori.dm index a59dc021a5d9..9438488dbbd0 100644 --- a/code/modules/mob/living/carbon/human/species_types/kepori.dm +++ b/code/modules/mob/living/carbon/human/species_types/kepori.dm @@ -2,7 +2,7 @@ name = "\improper Kepori" id = SPECIES_KEPORI default_color = "6060FF" - species_traits = list(SCLERA, MUTCOLORS, EYECOLOR, MUTCOLORS_SECONDARY) + species_traits = list(SCLERA, MUTCOLORS, EYECOLOR, MUTCOLORS_SECONDARY, HAS_FLESH, HAS_BONE) inherent_traits = list(TRAIT_SCOOPABLE) mutant_bodyparts = list("kepori_body_feathers", "kepori_head_feathers", "kepori_tail_feathers", "kepori_feathers") default_features = list("mcolor" = "0F0", "wings" = "None", "kepori_feathers" = "None", "kepori_head_feathers" = "None", "kepori_body_feathers" = "None", "kepori_tail_feathers" = "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 0e29e934a40f..6ca403fe3d7f 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 = SPECIES_SARATHI default_color = "00FF00" species_age_max = 175 - species_traits = list(MUTCOLORS,EYECOLOR,LIPS,SCLERA,EMOTE_OVERLAY,MUTCOLORS_SECONDARY) + species_traits = list(MUTCOLORS, EYECOLOR, LIPS, SCLERA, EMOTE_OVERLAY, MUTCOLORS_SECONDARY, HAS_FLESH, HAS_BONE) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_REPTILE mutant_bodyparts = list("tail_lizard", "face_markings", "frills", "horns", "spines", "body_markings", "legs") mutanttongue = /obj/item/organ/tongue/lizard diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm index 12ecafe6ed3b..62d8e59d88e6 100644 --- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm @@ -2,7 +2,7 @@ name = "\improper Moth" id = SPECIES_MOTH default_color = "00FF00" - species_traits = list(LIPS, NOEYESPRITES, TRAIT_ANTENNAE, HAIR, EMOTE_OVERLAY) + species_traits = list(LIPS, NOEYESPRITES, TRAIT_ANTENNAE, HAIR, EMOTE_OVERLAY, HAS_FLESH, HAS_BONE) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG mutant_bodyparts = list("moth_wings", "moth_fluff", "moth_markings") default_features = list("moth_wings" = "Plain", "moth_fluff" = "Plain", "moth_markings" = "None", "body_size" = "Normal") 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 aa9d90be2d65..e1262f3efa85 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -3,8 +3,9 @@ id = SPECIES_PLASMAMAN sexes = 0 meat = /obj/item/stack/sheet/mineral/plasma - species_traits = list(NOBLOOD,NOTRANSSTING,NOHUSK) - inherent_traits = list(TRAIT_RESISTCOLD,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_NOHUNGER,TRAIT_ALWAYS_CLEAN) + species_traits = list(NOBLOOD, NOTRANSSTING, HAS_BONE) + // plasmemes get hard to wound since they only need a severe bone wound to dismember, but unlike skellies, they can't pop their bones back into place + inherent_traits = list(TRAIT_RESISTCOLD,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_NOHUNGER,TRAIT_ALWAYS_CLEAN, TRAIT_HARDLY_WOUNDED) inherent_biotypes = MOB_HUMANOID|MOB_MINERAL mutantlungs = /obj/item/organ/lungs/plasmaman mutanttongue = /obj/item/organ/tongue/bone/plasmaman @@ -197,36 +198,12 @@ return randname /datum/species/plasmaman/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H) - if(chem.type == /datum/reagent/consumable/milk) - if(chem.volume > 10) - H.reagents.remove_reagent(chem.type, chem.volume - 10) - to_chat(H, span_warning("The excess milk is dripping off your bones!")) - H.heal_bodypart_damage(1.5,0, 0) - H.reagents.remove_reagent(chem.type, chem.metabolization_rate) - return TRUE - if(chem.type == /datum/reagent/toxin/bonehurtingjuice) - H.adjustStaminaLoss(7.5, 0) - H.adjustBruteLoss(0.5, 0) - if(prob(20)) - switch(rand(1, 3)) - if(1) - H.say(pick("oof.", "ouch.", "my bones.", "oof ouch.", "oof ouch my bones."), forced = /datum/reagent/toxin/bonehurtingjuice) - if(2) - H.manual_emote(pick("oofs silently.", "looks like their bones hurt.", "grimaces, as though their bones hurt.")) - if(3) - to_chat(H, span_warning("Your bones hurt!")) - if(chem.overdosed) - if(prob(4) && iscarbon(H)) //big oof - var/selected_part = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) //God help you if the same limb gets picked twice quickly. - var/obj/item/bodypart/bp = H.get_bodypart(selected_part) //We're so sorry skeletons, you're so misunderstood - if(bp) - playsound(H, get_sfx("desceration"), 50, TRUE, -1) //You just want to socialize - H.visible_message(span_warning("[H] rattles loudly and flails around!!"), span_danger("Your bones hurt so much that your missing muscles spasm!!")) - H.say("OOF!!", forced=/datum/reagent/toxin/bonehurtingjuice) - bp.receive_damage(200, 0, 0) //But I don't think we should - else - to_chat(H, span_warning("Your missing arm aches from wherever you left it.")) - H.emote("sigh") + . = ..() + if(istype(chem, /datum/reagent/toxin/plasma)) H.reagents.remove_reagent(chem.type, chem.metabolization_rate) + for(var/i in H.all_wounds) + var/datum/wound/iter_wound = i + iter_wound.on_xadone(4) // plasmamen use plasma to reform their bones or whatever return TRUE + return ..() 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 f033c9528bc9..9caa2bfb966b 100644 --- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm @@ -174,7 +174,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 /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 9e2f96174eab..25f1a91b5e0e 100644 --- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm +++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm @@ -4,8 +4,8 @@ id = SPECIES_SKELETON sexes = 0 meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton - species_traits = list(NOBLOOD, NOHUSK) //WHY THE FUCK DOES BONE MAN NOT HAVE BONES?!! - inherent_traits = list(TRAIT_NOMETABOLISM,TRAIT_TOXIMMUNE,TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,\ + species_traits = list(NOBLOOD, HAS_BONES, NOHUSK) + inherent_traits = list(TRAIT_NOMETABOLISM,TRAIT_TOXIMMUNE,TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_GENELESS,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,\ TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT,TRAIT_FAKEDEATH,TRAIT_XENO_IMMUNE,TRAIT_NOCLONELOSS) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID mutanttongue = /obj/item/organ/tongue/bone diff --git a/code/modules/mob/living/carbon/human/species_types/snail.dm b/code/modules/mob/living/carbon/human/species_types/snail.dm index 5f47ab21e479..44510890db63 100644 --- a/code/modules/mob/living/carbon/human/species_types/snail.dm +++ b/code/modules/mob/living/carbon/human/species_types/snail.dm @@ -2,7 +2,7 @@ name = "\improper Snailperson" id = SPECIES_SNAIL default_color = "336600" //vomit green - species_traits = list(MUTCOLORS, NO_UNDERWEAR) + species_traits = list(MUTCOLORS, NO_UNDERWEAR, HAS_FLESH, HAS_BONE) inherent_traits = list(TRAIT_ALWAYS_CLEAN, TRAIT_NOSLIPALL) attack_verb = "slap" coldmod = 0.5 //snails only come out when its cold and wet diff --git a/code/modules/mob/living/carbon/human/species_types/vox.dm b/code/modules/mob/living/carbon/human/species_types/vox.dm index 47d803c260a9..ad48c0e3b07f 100644 --- a/code/modules/mob/living/carbon/human/species_types/vox.dm +++ b/code/modules/mob/living/carbon/human/species_types/vox.dm @@ -4,7 +4,7 @@ id = SPECIES_VOX default_color = "6060FF" species_age_max = 280 - species_traits = list(EYECOLOR) + species_traits = list(EYECOLOR, HAS_BONES, HAS_FLESH) mutant_bodyparts = list("vox_head_quills", "vox_neck_quills") default_features = list("mcolor" = "0F0", "wings" = "None", "vox_head_quills" = "None", "vox_neck_quills" = "None", "body_size" = "Normal") meat = /obj/item/reagent_containers/food/snacks/meat/slab/chicken diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index ea648f9a7285..ea46b8d175ac 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -330,6 +330,12 @@ if(stat != DEAD || D.process_dead) D.stage_act() +/mob/living/carbon/handle_wounds() + for(var/thing in all_wounds) + var/datum/wound/W = thing + if(W.processes) // meh + W.handle_process() + //todo generalize this and move hud out /mob/living/carbon/proc/handle_changeling() if(mind && hud_used && hud_used.lingchemdisplay) diff --git a/code/modules/mob/living/carbon/status_procs.dm b/code/modules/mob/living/carbon/status_procs.dm index fb6421a9e38e..a8dd37abb751 100644 --- a/code/modules/mob/living/carbon/status_procs.dm +++ b/code/modules/mob/living/carbon/status_procs.dm @@ -87,15 +87,3 @@ if(B) . = B.cure_all_traumas(resilience) -//////////////////////////////// BROKEN BONES /////////////////////////// -/mob/living/carbon/proc/mend_fractures() - for(var/obj/item/bodypart/B in bodyparts) - B.fix_bone() - -/mob/living/carbon/proc/break_all_bones() - for(var/obj/item/bodypart/B in bodyparts) - B.break_bone() - -/mob/living/carbon/proc/break_random_bone() //this might work - var/obj/item/bodypart/limb = pick(bodyparts) - limb.break_bone() diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm index 6763427db8ed..70622c66c506 100644 --- a/code/modules/mob/living/carbon/update_icons.dm +++ b/code/modules/mob/living/carbon/update_icons.dm @@ -403,3 +403,24 @@ GLOBAL_LIST_EMPTY(masked_leg_icons_cache) overlays_standing[HANDS_UNDER_BODY_LAYER] = hands_alt apply_overlay(HANDS_LAYER) apply_overlay(HANDS_UNDER_BODY_LAYER) + +//Updating overlays related to on bodypart bandages +/mob/living/carbon/proc/update_bandage_overlays() + remove_overlay(BANDAGE_LAYER) + + var/mutable_appearance/overlays = mutable_appearance('icons/mob/bandage_overlays.dmi', "", -BANDAGE_LAYER) + overlays_standing[BANDAGE_LAYER] = overlays + + for(var/obj/item/bodypart/BP as anything in bodyparts) + if(BP.current_gauze && BP.current_gauze.overlay_prefix) + var/bp_suffix = BP.body_zone + if(BP.bodytype & BODYTYPE_DIGITIGRADE) + bp_suffix += "_digitigrade" + overlays.add_overlay("[BP.current_gauze.overlay_prefix]_[bp_suffix]") + if(BP.current_splint && BP.current_splint.overlay_prefix) + var/bp_suffix = BP.body_zone + if(BP.bodytype & BODYTYPE_DIGITIGRADE) + bp_suffix += "_digitigrade" + overlays.add_overlay("[BP.current_splint.overlay_prefix]_[bp_suffix]") + + apply_overlay(BANDAGE_LAYER) diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index 57fed5d4c014..8d2184396f4b 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -2,7 +2,7 @@ /** * Applies damage to this mob * - * Sends [COMSIG_MOB_APPLY_DAMGE] + * Sends [COMSIG_MOB_APPLY_DAMAGE] * * Arguuments: * * damage - amount of damage @@ -15,8 +15,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, sharpness = FALSE)//WS Edit - Breakable Bones - SEND_SIGNAL(src, COMSIG_MOB_APPLY_DAMGE, damage, damagetype, def_zone) +/mob/living/proc/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, sharpness = FALSE)//WS Edit - Breakable Bones/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) SEND_SIGNAL(src, COMSIG_MOB_APPLY_DAMAGE, damage, damagetype, def_zone) var/hit_percent = (100-blocked)/100 if(!damage || (!forced && hit_percent <= 0) || !(flags_1 & INITIALIZED_1)) return FALSE @@ -263,14 +262,14 @@ * needs to return amount healed in order to calculate things like tend wounds xp gain */ /mob/living/proc/heal_bodypart_damage(brute = 0, burn = 0, stamina = 0, updating_health = TRUE, required_status) - . = (adjustBruteLoss(-brute, FALSE) + adjustFireLoss(-burn, FALSE) + adjustStaminaLoss(-stamina, FALSE)) //zero as argument for no instant health update + . = (adjustBruteLoss(-brute, FALSE) + adjustFireLoss(-burn, FALSE) + adjustStaminaLoss(-stamina, FALSE)) if(updating_health) updatehealth() 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) - adjustBruteLoss(brute, FALSE) //zero as argument for no instant health update +/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) adjustFireLoss(burn, FALSE) adjustStaminaLoss(stamina, FALSE) if(updating_health) @@ -282,7 +281,7 @@ /// heal MANY bodyparts, in random order /mob/living/proc/heal_overall_damage(brute = 0, burn = 0, stamina = 0, required_status, updating_health = TRUE) - adjustBruteLoss(-brute, FALSE) //zero as argument for no instant health update + adjustBruteLoss(-brute, FALSE) adjustFireLoss(-burn, FALSE) adjustStaminaLoss(-stamina, FALSE) if(updating_health) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index 4582f514fcd5..0f60df245ddd 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -37,6 +37,8 @@ handle_diseases()// DEAD check is in the proc itself; we want it to spread even if the mob is dead, but to handle its disease-y properties only if you're not. + handle_wounds() + if (QDELETED(src)) // diseases can qdel the mob via transformations return @@ -76,6 +78,9 @@ /mob/living/proc/handle_diseases() return +/mob/living/proc/handle_wounds() + return + /mob/living/proc/handle_random_events() return diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 01e45006e04f..a0c832d221f1 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -447,6 +447,12 @@ /mob/living/proc/setMaxHealth(newMaxHealth) maxHealth = newMaxHealth +/// Returns the health of the mob while ignoring damage of non-organic (prosthetic) limbs +/// Used by cryo cells to not permanently imprison those with damage from prosthetics, +/// as they cannot be healed through chemicals. +/mob/living/proc/get_organic_health() + return health + // MOB PROCS //END /mob/living/proc/mob_sleep() @@ -734,8 +740,8 @@ O.applyOrganDamage(organ_amt*-1)//1 = 5 organ damage healed if(specific_bones) - for(var/obj/item/bodypart/B in C.bodyparts) - B.fix_bone() + for(var/datum/wound/current_wound in C.all_wounds) + current_wound.remove_wound() if(specific_revive) revive() @@ -798,39 +804,55 @@ return /mob/living/proc/makeTrail(turf/target_turf, turf/start, direction) - if(!has_gravity()) + if(!has_gravity() || !isturf(start) || !blood_volume) return + var/blood_exists = locate(/obj/effect/decal/cleanable/blood/trail_holder) in start - 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*(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/blood/trail_holder(start, get_static_viruses()) - - for(var/obj/effect/decal/cleanable/blood/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/trail_type = getTrail() + if(!trail_type) + return + + var/bleed_amount = bleedDragAmount() + blood_volume = max(blood_volume - bleed_amount, 0) + + 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) || bleedsuppress || !LAZYLEN(get_bleeding_parts(TRUE))) + 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/living_defense.dm b/code/modules/mob/living/living_defense.dm index b8133c703b64..4d75f8d5404b 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -1,7 +1,7 @@ /mob/living/proc/run_armor_check( def_zone = null, attack_flag = "melee", armour_penetration = 0, - silent = FALSE, absorb_text = null, soften_text = null, penetrated_text = null + absorb_text = null, soften_text = null, penetrated_text = null, silent = FALSE ) var/base_armor = getarmor(def_zone, attack_flag) // if negative or 0 armor, no modifications are necessary @@ -54,7 +54,7 @@ var/armor = run_armor_check(def_zone, P.flag, P.armour_penetration, silent = TRUE) var/on_hit_state = P.on_hit(src, armor, piercing_hit) if(!P.nodamage && on_hit_state != BULLET_ACT_BLOCK && !QDELETED(src)) //QDELETED literally just for the instagib rifle. Yeah. - apply_damage(P.damage, P.damage_type, def_zone, armor, sharpness = TRUE) + apply_damage(P.damage, P.damage_type, def_zone, armor, wound_bonus=P.wound_bonus, bare_wound_bonus=P.bare_wound_bonus, sharpness = P.sharpness) recoil_camera(src, clamp((P.damage-armor)/4,0.5,10), clamp((P.damage-armor)/4,0.5,10), P.damage/8, P.Angle) apply_effects(P.stun, P.knockdown, P.unconscious, P.irradiate, P.slur, P.stutter, P.eyeblur, P.drowsy, armor, P.stamina, P.jitter, P.paralyze, P.immobilize) if(P.dismemberment) @@ -84,21 +84,19 @@ dtype = I.damtype if(!blocked) - visible_message(span_danger("[src] is hit by [I]!"), \ - span_userdanger("You're hit by [I]!")) - if(!I.throwforce) - return - var/armor = run_armor_check( - zone, "melee", I.armour_penetration, FALSE, - "Your armor has protected your [parse_zone(zone)].", - "Your armor has softened a hit to your [parse_zone(zone)]." - ) - apply_damage(I.throwforce, dtype, zone, armor) - var/mob/thrown_by = I.thrownby?.resolve() - if(thrown_by) - log_combat(thrown_by, src, "threw and hit", I) + if(I.thrownby) + log_combat(I.thrownby, src, "threw and hit", I) + if(!nosell_hit) + visible_message( + span_danger("[src] is hit by [I]!"), + span_userdanger("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 + return TRUE else playsound(loc, 'sound/weapons/genhit.ogg', 50, TRUE, -1) //Item sounds are handled in the item itself diff --git a/code/modules/mob/living/silicon/damage_procs.dm b/code/modules/mob/living/silicon/damage_procs.dm index 22635fef4e2a..dc22cf096d89 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, spread_damage = FALSE, 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/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index e464c76c3ba5..22aaae51597a 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -333,16 +333,18 @@ /obj/item/borg/apparatus/beaker, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, - /obj/item/retractor, + /obj/item/retractor, /obj/item/hemostat, /obj/item/cautery, /obj/item/surgicaldrill, /obj/item/scalpel, /obj/item/circular_saw, + /obj/item/bonesetter, /obj/item/extinguisher/mini, /obj/item/roller/robo, /obj/item/borg/cyborghug/medical, /obj/item/stack/medical/gauze/cyborg, + /obj/item/stack/medical/bone_gel/cyborg, /obj/item/organ_storage, /obj/item/borg/lollipop) emag_modules = list(/obj/item/reagent_containers/borghypo/hacked) @@ -1024,7 +1026,7 @@ /obj/item/reagent_containers/borghypo/syndicate, /obj/item/shockpaddles/syndicate/cyborg, /obj/item/healthanalyzer, - /obj/item/retractor, + /obj/item/retractor, /obj/item/hemostat, /obj/item/cautery, /obj/item/surgicaldrill, diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm index 3cff0bca2c55..6c70a1e1cdb0 100644 --- a/code/modules/mob/living/simple_animal/animal_defense.dm +++ b/code/modules/mob/living/simple_animal/animal_defense.dm @@ -35,7 +35,7 @@ visible_message(span_danger("[user] punches [src]!"), \ span_userdanger("You're punched by [user]!"), null, COMBAT_MESSAGE_RANGE, user) to_chat(user, span_danger("You punch [src]!")) - adjustBruteLoss(15) + apply_damage(15, BRUTE, wound_bonus=10) /mob/living/simple_animal/attack_paw(mob/living/carbon/monkey/M) if(..()) //successful monkey bite. diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index bf14fb0b98a8..93f7712cdc97 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -564,7 +564,7 @@ treatment_method = TOX if(!treatment_method && emagged != 2) //If they don't need any of that they're probably cured! - if(C.maxHealth - C.health < heal_threshold) + if(C.maxHealth - C.get_organic_health() < heal_threshold) to_chat(src, span_notice("[C] is healthy! Your programming prevents you from injecting anyone without at least [heal_threshold] damage of any one type ([heal_threshold + 5] for oxygen damage.)")) var/list/messagevoice = list("All patched up!" = 'sound/voice/medbot/patchedup.ogg',"An apple a day keeps me away." = 'sound/voice/medbot/apple.ogg',"Feel better soon!" = 'sound/voice/medbot/feelbetter.ogg') var/message = pick(messagevoice) diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 33b8cf154771..3fcb0aebe121 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -34,6 +34,7 @@ attack_verb_continuous = "bites" attack_verb_simple = "bite" attack_sound = 'sound/weapons/bite.ogg' + sharpness = SHARP_POINTY speak_emote = list("gnashes") //Space carp aren't affected by cold. diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 6ea843718bae..70fdd42322bb 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -51,6 +51,7 @@ attack_sound = 'sound/weapons/bite.ogg' lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE footstep_type = FOOTSTEP_MOB_CLAW + sharpness = SHARP_POINTY mob_size = MOB_SIZE_LARGE var/playable_spider = FALSE var/datum/action/innate/spider/lay_web/lay_web diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 4264ab50ed6c..02e0975028ef 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -407,7 +407,7 @@ ..(gibbed) /mob/living/simple_animal/hostile/proc/summon_backup(distance, exact_faction_match) - do_alert_animation(src) + do_alert_animation() playsound(loc, 'sound/machines/chime.ogg', 50, TRUE, -1) var/atom/target_from = GET_TARGETS_FROM(src) for(var/mob/living/simple_animal/hostile/M in oview(distance, target_from)) diff --git a/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm index 20d0c2489aa4..3d046914189d 100644 --- a/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm @@ -412,6 +412,9 @@ maxHealth = 25 melee_damage_lower = 15 melee_damage_upper = 15 + wound_bonus = -10 + bare_wound_bonus = 20 + sharpness = SHARP_EDGED obj_damage = 0 environment_smash = ENVIRONMENT_SMASH_NONE attack_verb_continuous = "cuts" diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/antlion.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/antlion.dm index d44403dd8df3..232667802bcd 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/antlion.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/antlion.dm @@ -17,6 +17,7 @@ attack_verb_continuous = "bites" attack_verb_simple = "bite" attack_sound = 'sound/weapons/bite.ogg' + sharpness = SHARP_POINTY //Their "ranged" ability is burrowing ranged = TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm index 369664a9a110..0df6f5163fe3 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm @@ -27,6 +27,7 @@ attack_verb_continuous = "bites" attack_verb_simple = "bite" attack_sound = 'sound/weapons/bite.ogg' + sharpness = SHARP_POINTY //attack_vis_effect = ATTACK_EFFECT_BITE butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 2, /obj/effect/decal/cleanable/brimdust = 1) loot = list() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm index 7a6d16f4c7d9..3d7cd5058d0b 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm @@ -25,6 +25,7 @@ attack_verb_continuous = "bites" attack_verb_simple = "bite" attack_sound = 'sound/weapons/bite.ogg' + sharpness = SHARP_POINTY vision_range = 7 aggro_vision_range = 7 move_force = MOVE_FORCE_WEAK diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm index 97773aa072ab..479e46a6242a 100644 --- a/code/modules/mob/living/simple_animal/hostile/tree.dm +++ b/code/modules/mob/living/simple_animal/hostile/tree.dm @@ -29,6 +29,7 @@ attack_verb_continuous = "bites" attack_verb_simple = "bite" attack_sound = 'sound/weapons/bite.ogg' + sharpness = SHARP_POINTY speak_emote = list("pines") emote_taunt = list("growls") taunt_chance = 20 diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index f2212107470b..ce6f7d359af5 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -142,6 +142,15 @@ ///What kind of footstep this mob should have. Null if it shouldn't have any. var/footstep_type + ///How much wounding power it has + var/wound_bonus = 5 + ///How much bare wounding power it has + var/bare_wound_bonus = 0 + ///If the attacks from this are sharp + var/sharpness = SHARP_NONE + ///Generic flags + var/simple_mob_flags = NONE + /// Base armor value on this mob for running armor checks var/datum/armor/armor diff --git a/code/modules/movespeed/modifiers/misc.dm b/code/modules/movespeed/modifiers/misc.dm index e3aba912966a..96e65b730abb 100644 --- a/code/modules/movespeed/modifiers/misc.dm +++ b/code/modules/movespeed/modifiers/misc.dm @@ -4,3 +4,9 @@ /datum/movespeed_modifier/yellow_orb multiplicative_slowdown = -0.65 blacklisted_movetypes = (FLYING|FLOATING) + +/datum/movespeed_modifier/status_effect/blunt_wound + variable = TRUE + +/datum/movespeed_modifier/status_effect/muscle_wound + variable = TRUE diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 8464ccf8ca0b..95746c8865ec 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -89,7 +89,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", @@ -192,7 +192,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 /obj/item/pen/edagger/ComponentInitialize() diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 526d7b067b4d..9faefb295ebb 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -483,14 +483,19 @@ return if(target == user && user.zone_selected != BODY_ZONE_PRECISE_MOUTH) //so we can't shoot ourselves (unless mouth selected) return -/* TODO: gunpointing is very broken, port the old skyrat gunpointing? its much better, usablity wise and rp wise? if(ismob(target) && user.a_intent == INTENT_GRAB) if(user.GetComponent(/datum/component/gunpoint)) to_chat(user, span_warning("You are already holding someone up!")) return user.AddComponent(/datum/component/gunpoint, target, src) return -*/ + if(iscarbon(target)) + var/mob/living/carbon/C = target + for(var/i in C.all_wounds) + var/datum/wound/W = i + if(W.try_treating(src, user)) + return // another coward cured! + // Good job, but we have exta checks to do... return pre_fire(target, user, TRUE, flag, params, null) diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index bb9b7fc327a5..01b7f0af5dd1 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -119,7 +119,7 @@ flags_1 = CONDUCT_1 attack_verb = list("attacked", "slashed", "cut", "sliced") force = 12 - sharpness = IS_SHARP + sharpness = SHARP_EDGED can_charge = FALSE heat = 3800 diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 7342793ba02c..93f70f4d4b0e 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -8,7 +8,8 @@ movement_type = FLYING generic_canpass = FALSE plane = GAME_PLANE_FOV_HIDDEN - //The sound this plays on impact. + wound_bonus = CANT_WOUND // can't wound by default + ///The sound this plays on impact. var/hitsound = 'sound/weapons/pierce.ogg' var/hitsound_non_living = "" var/hitsound_glass @@ -172,9 +173,16 @@ ///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 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 ///If TRUE, hit mobs even if they're on the floor and not our target var/hit_stunned_targets = FALSE + //For what kind of brute wounds we're rolling for, if we're doing such a thing. Lasers obviously don't care since they do burn instead. + var/sharpness = SHARP_NONE + ///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 /// If true directly targeted turfs can be hit var/can_hit_turfs = FALSE @@ -186,12 +194,21 @@ . = ..() decayedRange = range speed = speed + speed_mod + + if(embedding) + updateEmbedding() + if(!bullet_identifier) bullet_identifier = name AddElement(/datum/element/connect_loc, projectile_connections) /obj/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() @@ -228,6 +245,10 @@ var/mob/living/L = target hit_limb = L.check_limb_hit(def_zone) SEND_SIGNAL(src, COMSIG_PROJECTILE_SELF_ON_HIT, firer, target, Angle, hit_limb) + + if(QDELETED(src)) // in case one of the above signals deleted the projectile for whatever reason + return + var/turf/target_loca = get_turf(target) var/hitx @@ -608,7 +629,7 @@ return PROJECTILE_PIERCE_NONE /obj/projectile/proc/check_ricochet(atom/A) - var/chance = ricochet_chance * A.ricochet_chance_mod + var/chance = ricochet_chance * A.receive_ricochet_chance_mod if(firer && HAS_TRAIT(firer, TRAIT_NICE_SHOT)) chance += NICE_SHOT_RICOCHET_BONUS if(prob(chance)) @@ -991,3 +1012,23 @@ /obj/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 diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 47e40153a4da..2c1e225eb37f 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -5,6 +5,8 @@ damage = 25 armour_penetration = -5 damage_type = BURN + wound_bonus = -20 + bare_wound_bonus = 10 hitsound = 'sound/weapons/gun/hit/energy_impact1.ogg' hitsound_non_living = 'sound/weapons/effects/searwall.ogg' diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index c6d42a41e58b..d52604db2ed4 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -5,6 +5,7 @@ speed = BULLET_SPEED_RIFLE damage_type = BRUTE nodamage = FALSE + sharpness = SHARP_POINTY flag = "bullet" hitsound = "bullet_hit" @@ -24,3 +25,12 @@ ricochets_max = 5 //should be enough to scare the shit out of someone ricochet_chance = 30 ricochet_decay_damage = 0.5 //shouldnt being reliable, but deadly enough to be careful if you accidentally hit an ally + 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 = -2 + embed_falloff_tile = -5 + wound_bonus = -20 + +/obj/projectile/bullet/smite + name = "divine retribution" + damage = 10 diff --git a/code/modules/projectiles/projectile/bullets/pistol.dm b/code/modules/projectiles/projectile/bullets/pistol.dm index 170da2f526a6..b76240f61149 100644 --- a/code/modules/projectiles/projectile/bullets/pistol.dm +++ b/code/modules/projectiles/projectile/bullets/pistol.dm @@ -42,6 +42,7 @@ name = "9x18mm bullet" damage = 20 armour_penetration = -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) speed = BULLET_SPEED_HANDGUN bullet_identifier = "small bullet" diff --git a/code/modules/projectiles/projectile/bullets/revolver.dm b/code/modules/projectiles/projectile/bullets/revolver.dm index 4e8d387810de..2942009d9f0d 100644 --- a/code/modules/projectiles/projectile/bullets/revolver.dm +++ b/code/modules/projectiles/projectile/bullets/revolver.dm @@ -14,6 +14,11 @@ name = ".38 match bullet" armour_penetration = -10 speed_mod = BULLET_SPEED_AP_MOD + + 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) + ricochets_max = 4 ricochet_chance = 100 ricochet_auto_aim_angle = 40 diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm index 5b718698c9fd..4ed09dac994d 100644 --- a/code/modules/projectiles/projectile/bullets/rifle.dm +++ b/code/modules/projectiles/projectile/bullets/rifle.dm @@ -4,6 +4,7 @@ name = "5.56x42mm CLIP bullet" damage = 25 armour_penetration = 20 + wound_bonus = -40 speed = BULLET_SPEED_RIFLE bullet_identifier = "medium bullet" diff --git a/code/modules/projectiles/projectile/bullets/smg.dm b/code/modules/projectiles/projectile/bullets/smg.dm index 68e13145cebd..ebfa6bda9deb 100644 --- a/code/modules/projectiles/projectile/bullets/smg.dm +++ b/code/modules/projectiles/projectile/bullets/smg.dm @@ -33,6 +33,9 @@ damage = 20 speed = BULLET_SPEED_PDW armour_penetration = 10 + wound_bonus = -5 + bare_wound_bonus = 5 + embed_falloff_tile = -4 bullet_identifier = "small bullet" /obj/projectile/bullet/c46x30mm/recycled diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm index 5ab93a3e9399..dab433531765 100644 --- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm @@ -428,6 +428,9 @@ WS End*/ if(method in list(PATCH, TOUCH, SMOKE)) var/harmies = min(carbies.getBruteLoss(),carbies.adjustBruteLoss(-1.25 * reac_volume)*-1) var/burnies = min(carbies.getFireLoss(),carbies.adjustFireLoss(-1.25 * reac_volume)*-1) + for(var/i in carbies.all_wounds) + var/datum/wound/iter_wound = i + iter_wound.on_synthflesh(reac_volume) carbies.adjustToxLoss((harmies+burnies)*0.66) if(show_message) to_chat(carbies, span_danger("You feel your burns and bruises healing! It stings like hell!")) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 1b74efca90b4..69ce79b05f7a 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -149,6 +149,9 @@ M.adjustFireLoss(-power, 0) M.adjustToxLoss(-power, 0, TRUE) //heals TOXINLOVERs M.adjustCloneLoss(-power, 0) + for(var/i in M.all_wounds) + 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) @@ -203,6 +206,9 @@ M.adjustFireLoss(-1.5 * power, 0) M.adjustToxLoss(-power, 0, TRUE) M.adjustCloneLoss(-power, 0) + for(var/i in M.all_wounds) + var/datum/wound/iter_wound = i + iter_wound.on_xadone(power) REMOVE_TRAIT(M, TRAIT_DISFIGURED, TRAIT_GENERIC) /datum/reagent/medicine/rezadone @@ -343,6 +349,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 /datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/carbon/M) if(last_added) @@ -352,7 +359,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) @@ -1183,9 +1190,6 @@ M.confused = 0 M.reagents.remove_all_type(/datum/reagent/consumable/ethanol, 3*REM, 0, 1) M.adjustToxLoss(-0.2*REM, 0) - if(ishuman(M)) - var/mob/living/carbon/human/H = M - H.drunkenness = max(H.drunkenness - 10, 0) ..() . = 1 @@ -1809,10 +1813,6 @@ /datum/reagent/medicine/polypyr/on_mob_life(mob/living/carbon/M) //I wanted a collection of small positive effects, this is as hard to obtain as coniine after all. M.adjustOrganLoss(ORGAN_SLOT_LUNGS, -0.25) M.adjustBruteLoss(-0.5, 0) - if(prob(50)) - if(ishuman(M)) - var/mob/living/carbon/human/H = M - H.heal_bleeding(2) ..() . = 1 @@ -1866,8 +1866,8 @@ C.adjustStaminaLoss(5) if(31 to INFINITY) C.AdjustSleeping(40) - for(var/obj/item/bodypart/B in C.bodyparts) - B.fix_bone() + for(var/datum/wound/current_wound in C.all_wounds) + current_wound.remove_wound() for(var/obj/item/organ/O in C.internal_organs) O.damage = 0 holder.remove_reagent(/datum/reagent/medicine/bonefixingjuice, 10) @@ -2463,3 +2463,84 @@ M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 2) M.adjustOrganLoss(ORGAN_SLOT_HEART, 2) ..() + +// helps bleeding wounds clot faster +/datum/reagent/medicine/coagulant + name = "coagulant" + 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 + /// The bloodiest wound that the patient has will have its blood_flow reduced by this much each tick + var/clot_rate = 0.3 + /// While this reagent is in our bloodstream, we reduce all bleeding by this factor + var/passive_bleed_modifier = 0.7 + /// For tracking when we tell the person we're no longer bleeding + var/was_working + +/datum/reagent/medicine/coagulant/on_mob_metabolize(mob/living/M) + ADD_TRAIT(M, TRAIT_COAGULATING, /datum/reagent/medicine/coagulant) + return ..() + +/datum/reagent/medicine/coagulant/on_mob_end_metabolize(mob/living/M) + REMOVE_TRAIT(M, TRAIT_COAGULATING, /datum/reagent/medicine/coagulant) + return ..() + +/datum/reagent/medicine/coagulant/on_mob_life(mob/living/carbon/M) + . = ..() + if(!M.blood_volume || !M.all_wounds) + return + + var/datum/wound/bloodiest_wound + + for(var/i in M.all_wounds) + var/datum/wound/iter_wound = i + if(iter_wound.blood_flow) + if(iter_wound.blood_flow > bloodiest_wound?.blood_flow) + bloodiest_wound = iter_wound + + if(bloodiest_wound) + if(!was_working) + to_chat(M, span_green("You can feel your flowing blood start thickening!")) + was_working = TRUE + bloodiest_wound.blood_flow = max(0, bloodiest_wound.blood_flow - clot_rate) + else if(was_working) + was_working = FALSE + +/datum/reagent/medicine/coagulant/overdose_process(mob/living/carbon/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, span_danger("You can feel your blood clotting up in your veins!")) + else if(prob(10)) + to_chat(M, span_userdanger("You feel like your blood has stopped moving!")) + M.adjustOxyLoss(rand(3,4)) + + 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) + +/datum/reagent/medicine/coagulant/on_mob_metabolize(mob/living/M) + if(!ishuman(M)) + return + + var/mob/living/carbon/human/blood_boy = M + blood_boy.physiology?.bleed_mod *= passive_bleed_modifier + +/datum/reagent/medicine/coagulant/on_mob_end_metabolize(mob/living/M) + if(was_working) + to_chat(M, span_warning("The medicine thickening your blood loses its effect!")) + if(!ishuman(M)) + return + + var/mob/living/carbon/human/blood_boy = M + blood_boy.physiology?.bleed_mod /= passive_bleed_modifier diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 22b2e2b89f29..1bbacd380d90 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -142,6 +142,10 @@ process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs //WS Edit - IPCs +/datum/reagent/water/on_mob_life(mob/living/carbon/M) + . = ..() + if(M.blood_volume) + M.blood_volume += 0.1 //full of water... /* * Water reaction to turf */ @@ -2270,42 +2274,42 @@ taste_description = "lifegiving metal" can_synth = FALSE -/datum/reagent/determination //from /tg/ , but since we dont have wounds its just weaker penthrite +/datum/reagent/determination name = "Determination" description = "For when you need to push on a little more. Do NOT allow near plants." reagent_state = LIQUID color = "#D2FFFA" - metabolization_rate = 0.75 * REAGENTS_METABOLISM + metabolization_rate = 0.75 * REAGENTS_METABOLISM // 5u (WOUND_DETERMINATION_CRITICAL) will last for ~17 ticks self_consuming = TRUE taste_description = "pure determination" overdose_threshold = 30 + /// 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 + +/datum/reagent/determination/on_mob_life(mob/living/carbon/M) + if(!significant && volume >= WOUND_DETERMINATION_SEVERE) + significant = TRUE + M.apply_status_effect(STATUS_EFFECT_DETERMINED) // in addition to the slight healing, limping cooldowns are divided by 4 during the combat high + + volume = min(volume, WOUND_DETERMINATION_MAX) + + for(var/thing in M.all_wounds) + var/datum/wound/W = thing + var/obj/item/bodypart/wounded_part = W.limb + if(wounded_part) + wounded_part.heal_damage(0.25, 0.25) + M.adjustStaminaLoss(-0.25*REM) // the more wounds, the more stamina regen + ..() -/datum/reagent/determination/on_mob_add(mob/living/M) - . = ..() - to_chat(M,"You feel like your heart can take on the world!") - ADD_TRAIT(M, TRAIT_NOSOFTCRIT,type) - -/datum/reagent/determination/on_mob_life(mob/living/carbon/human/H) - if(H.health <= HEALTH_THRESHOLD_CRIT && H.health > H.crit_threshold) - - H.adjustBruteLoss(-2 * REM, 0) - H.adjustOxyLoss(-6 * REM, 0) - - H.losebreath = 0 - - H.adjustOrganLoss(ORGAN_SLOT_HEART,max(1,volume/10)) // your heart is barely keeping up! - - H.adjust_jitter(rand(0,2)) - H.Dizzy(rand(0,2)) - - - if(prob(33)) - to_chat(H,span_danger("Your body is trying to give up, but your heart is still beating!")) - . = ..() - -/datum/reagent/determination/on_mob_end_metabolize(mob/living/M) - REMOVE_TRAIT(M, TRAIT_NOSOFTCRIT,type) - . = ..() +/datum/reagent/determination/on_mob_end_metabolize(mob/living/carbon/M) + if(significant) + var/stam_crash = 0 + for(var/thing in M.all_wounds) + var/datum/wound/W = thing + stam_crash += (W.severity + 1) * 3 // spike of 3 stam damage per wound severity (moderate = 6, severe = 9, critical = 12) when the determination wears off if it was a combat rush + M.adjustStaminaLoss(stam_crash) + M.remove_status_effect(STATUS_EFFECT_DETERMINED) + ..() /datum/reagent/determination/overdose_process(mob/living/carbon/human/H) to_chat(H,span_danger("You feel your heart rupturing in two!")) diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 9be0da5321f5..2580b01975ce 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -754,22 +754,20 @@ /datum/reagent/toxin/heparin //Based on a real-life anticoagulant. I'm not a doctor, so this won't be realistic. name = "Heparin" - description = "A powerful anticoagulant. Victims will bleed uncontrollably and suffer scaling bruising." + description = "A powerful anticoagulant. All open cut wounds on the victim will open up and bleed much faster" silent_toxin = TRUE reagent_state = LIQUID color = "#C8C8C8" //RGB: 200, 200, 200 metabolization_rate = 0.2 * REAGENTS_METABOLISM toxpwr = 0 -/datum/reagent/toxin/heparin/on_mob_life(mob/living/carbon/M) - if(ishuman(M)) - var/mob/living/carbon/human/H = M - for(var/obj/item/bodypart/BP in H.get_bleeding_parts()) - BP.adjust_bleeding(BP.bleeding * 0.1) - H.adjustBruteLoss(1, 0) //Brute damage increases with the amount they're bleeding - . = 1 - return ..() || . +/datum/reagent/toxin/heparin/on_mob_metabolize(mob/living/M) + ADD_TRAIT(M, TRAIT_BLOODY_MESS, /datum/reagent/toxin/heparin) + return ..() +/datum/reagent/toxin/heparin/on_mob_end_metabolize(mob/living/M) + REMOVE_TRAIT(M, TRAIT_BLOODY_MESS, /datum/reagent/toxin/heparin) + return ..() /datum/reagent/toxin/rotatium //Rotatium. Fucks up your rotation and is hilarious name = "Rotatium" diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index b2206cb0ad76..734d14b032e4 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -590,6 +590,17 @@ required_reagents = list(/datum/reagent/water/hollowwater = 1) required_catalysts = list(/datum/reagent/water/holywater = 1) +/datum/chemical_reaction/bone_gel + required_reagents = list(/datum/reagent/calcium = 10, /datum/reagent/carbon = 10) + required_temp = 630 + mob_react = FALSE + mix_message = "The solution clarifies, leaving an ashy gel." + +/datum/chemical_reaction/bone_gel/on_reaction(datum/reagents/holder, created_volume) + var/location = get_turf(holder.my_atom) + for(var/i in 1 to created_volume) + new /obj/item/stack/medical/bone_gel(location) + /datum/chemical_reaction/gravy results = list(/datum/reagent/consumable/gravy = 3) required_reagents = list(/datum/reagent/consumable/milk = 1, /datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/flour = 1) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index e3933a57f6b6..565d596508bc 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -118,7 +118,7 @@ ignore_flags = 1 //so you can medipen through hardsuits reagent_flags = DRAWABLE flags_1 = null - list_reagents = list(/datum/reagent/medicine/epinephrine = 10, /datum/reagent/toxin/formaldehyde = 3) + list_reagents = list(/datum/reagent/medicine/epinephrine = 10, /datum/reagent/toxin/formaldehyde = 3, /datum/reagent/medicine/coagulant = 2) custom_price = 150 custom_premium_price = 300 @@ -378,6 +378,20 @@ volume = 15 amount_per_transfer_from_this = 15 +/obj/item/reagent_containers/hypospray/medipen/ekit + name = "emergency first-aid autoinjector" + 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) + +/obj/item/reagent_containers/hypospray/medipen/blood_loss + name = "hypovolemic-response autoinjector" + desc = "A medipen designed to stabilize and rapidly reverse severe bloodloss." + volume = 15 + amount_per_transfer_from_this = 15 + list_reagents = list(/datum/reagent/medicine/epinephrine = 5, /datum/reagent/medicine/coagulant = 2.5, /datum/reagent/iron = 3.5, /datum/reagent/medicine/salglu_solution = 4) + //A vial-loaded hypospray. Cartridge-based! /obj/item/hypospray/mkii name = "hypospray mk.II" @@ -533,7 +547,7 @@ var/mob/living/L if(isliving(target)) L = target - if(!penetrates && !L.can_inject(user, 1)) //This check appears another four times, since otherwise the penetrating sprays will break in do_mob. + if(!penetrates && !L.can_inject(user, 1)) //This check appears another four times, since otherwise the penetrating sprays will break in do_after. return if(!L && !target.is_injectable()) //only checks on non-living mobs, due to how can_inject() handles diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 2d46c8dc7300..d4d0e3d42549 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -15,6 +15,7 @@ custom_materials = list(/datum/material/iron=10, /datum/material/glass=20) reagent_flags = TRANSPARENT custom_price = 150 + sharpness = SHARP_POINTY /obj/item/reagent_containers/syringe/Initialize() . = ..() diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index dbdd94c01caa..aef026fe71ab 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -594,6 +594,15 @@ category = list("initial", "Medical", "Tool Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE +/datum/design/bonesetter + name = "Bonesetter" + id = "bonesetter" + build_type = AUTOLATHE | PROTOLATHE + materials = list(/datum/material/iron = 1000) + build_path = /obj/item/bonesetter + category = list("initial", "Medical", "Tool Designs") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + /datum/design/beaker name = "Beaker" id = "beaker" @@ -1261,6 +1270,15 @@ build_path = /obj/item/assembly/control category = list("initial","Misc") +/datum/design/sticky_tape/surgical + name = "Surgical Tape" + id = "surgical_tape" + build_type = PROTOLATHE + materials = list(/datum/material/plastic = 500) + build_path = /obj/item/stack/sticky_tape/surgical + category = list("initial", "Medical") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + /datum/design/holofield_control name = "Holofield Controller" id = "holofield" diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 8583cf9bcbfd..168d07820e90 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -69,7 +69,7 @@ starting_node = TRUE display_name = "Basic Medical Equipment" description = "Basic medical tools and equipment." - design_ids = list("cybernetic_liver", "cybernetic_heart", "cybernetic_lungs", "cybernetic_stomach", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", + design_ids = list("cybernetic_liver", "cybernetic_heart", "cybernetic_lungs", "cybernetic_stomach", "scalpel", "circular_saw", "bonesetter", "surgical_tape", "surgicaldrill", "retractor", "cautery", "hemostat", "syringe", "plumbing_rcd", "beaker", "large_beaker", "xlarge_beaker", "dropper", "defibmountdefault", "portable_chem_mixer") /////////////////////////Biotech///////////////////////// diff --git a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm index ef54453e31d5..252faae8d5fd 100644 --- a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm +++ b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm @@ -109,7 +109,7 @@ if(user.a_intent != INTENT_HELP) return ..() - if(I.sharpness == IS_SHARP_ACCURATE) + if(I.sharpness == SHARP_POINTY) if(last_act + 50 > world.time) //prevents message spam return last_act = world.time diff --git a/code/modules/spells/spell_types/shapeshift.dm b/code/modules/spells/spell_types/shapeshift.dm index 352790a508d3..f6624fcaf4eb 100644 --- a/code/modules/spells/spell_types/shapeshift.dm +++ b/code/modules/spells/spell_types/shapeshift.dm @@ -129,7 +129,7 @@ var/damage_percent = (stored.maxHealth - stored.health)/stored.maxHealth; var/damapply = damage_percent * shape.maxHealth; - shape.apply_damage(damapply, source.convert_damage_type, forced = TRUE); + shape.apply_damage(damapply, source.convert_damage_type, forced = TRUE, wound_bonus=CANT_WOUND); shape.blood_volume = stored.blood_volume; slink = soullink(/datum/soullink/shapeshift, stored , shape) @@ -186,7 +186,7 @@ var/damage_percent = (shape.maxHealth - shape.health)/shape.maxHealth; var/damapply = stored.maxHealth * damage_percent - stored.apply_damage(damapply, source.convert_damage_type, forced = TRUE) + stored.apply_damage(damapply, source.convert_damage_type, forced = TRUE, wound_bonus=CANT_WOUND) if(source.convert_damage) stored.blood_volume = shape.blood_volume; qdel(shape) diff --git a/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm b/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm index 5cb14819be69..75eaf6380110 100644 --- a/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm +++ b/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm @@ -38,9 +38,9 @@ /datum/bioware/reinforced_ligaments/on_gain() ..() ADD_TRAIT(owner, TRAIT_NODISMEMBER, "reinforced_ligaments") - ADD_TRAIT(owner, TRAIT_EASYLIMBDISABLE, "reinforced_ligaments") + ADD_TRAIT(owner, TRAIT_EASILY_WOUNDED, "reinforced_ligaments") /datum/bioware/reinforced_ligaments/on_lose() ..() REMOVE_TRAIT(owner, TRAIT_NODISMEMBER, "reinforced_ligaments") - REMOVE_TRAIT(owner, TRAIT_EASYLIMBDISABLE, "reinforced_ligaments") + REMOVE_TRAIT(owner, TRAIT_EASILY_WOUNDED, "reinforced_ligaments") diff --git a/code/modules/surgery/bodyparts/bodypart_aid.dm b/code/modules/surgery/bodyparts/bodypart_aid.dm new file mode 100644 index 000000000000..7482bc7665cb --- /dev/null +++ b/code/modules/surgery/bodyparts/bodypart_aid.dm @@ -0,0 +1,237 @@ +#define SELF_AID_REMOVE_DELAY 5 SECONDS +#define OTHER_AID_REMOVE_DELAY 2 SECONDS + +/datum/bodypart_aid + var/name + /// Keeping track of how damaged our aid is from external things, such as hits, it will break when it reaches 0 + var/integrity = 2 + /// To which bodypart we're attached to + var/obj/item/bodypart/bodypart + /// Which item do we get when we rip this off, while its in pristine condition + var/stack_to_drop + /// Suffix for our used overlay. The suffix is the bodypart zone, and "_digitigrade" for some legs. If this is null then it wont make an overlay. Gauzes are rendered before splints + var/overlay_prefix + /// Bodypart is [this_prefix] with get_description() + var/desc_prefix + +/datum/bodypart_aid/Topic(href, href_list) + . = ..() + if(href_list["remove"]) + if(!bodypart.owner) + return + if(!iscarbon(usr)) + return + if(!in_range(usr, bodypart.owner)) + return + var/mob/living/carbon/C = usr + var/self = (C == bodypart.owner) + C.visible_message( + span_notice("[C] begins removing [name] from [self ? "[bodypart.owner.p_their(TRUE)]" : "[bodypart.owner]'s" ] [bodypart.name]..."), + span_notice("You begin to remove [name] from [self ? "your" : "[bodypart.owner]'s"] [bodypart.name]..."), + ) + if(!do_after(C, (self ? SELF_AID_REMOVE_DELAY : OTHER_AID_REMOVE_DELAY), target=bodypart.owner)) + return + if(QDELETED(src)) + return + C.visible_message( + span_notice("[C] removes [name] from [self ? "[bodypart.owner.p_their(TRUE)]" : "[bodypart.owner]'s" ] [bodypart.name]."), + span_notice("You remove [name] from [self ? "your" : "[bodypart.owner]'s" ] [bodypart.name]."), + ) + var/obj/item/gotten = rip_off() + if(gotten && !C.put_in_hands(gotten)) + gotten.forceMove(get_turf(C)) + +/datum/bodypart_aid/New(obj/item/bodypart/BP) + //'bodypart == BP' is set in subtypes to ensure some proper signals and behaviours + if(overlay_prefix && bodypart.owner) + bodypart.owner.update_bandage_overlays() + +/datum/bodypart_aid/Destroy() + if(overlay_prefix && bodypart.owner) + bodypart.owner.update_bandage_overlays() + bodypart = null + ..() + +/** + * take_damage() called when the bandage gets damaged + * + * This proc will subtract integrity and delete the bandage with a to_chat message to whoever was bandaged + * + */ + +/datum/bodypart_aid/proc/take_damage() + integrity-- + if(integrity <= 0) + if(bodypart.owner) + to_chat(bodypart.owner, span_warning("The [name] on your [bodypart.name] tears and falls off!")) + qdel(src) + +/** + * rip_off() called when someone rips it off + * + * It will return the bandage if it's considered pristine + * + */ + +/datum/bodypart_aid/proc/rip_off() + if(is_pristine()) + . = new stack_to_drop(null, 1) + qdel(src) + +/** + * get_description() called by examine procs + * + * It will returns a description of the bandage + * + */ + +/datum/bodypart_aid/proc/get_description() + return "[name]" + +/** + * is_pristine() called by rip_off() + * + * Used to determine whether the bandage can be re-used and won't qdel itself + * + */ + +/datum/bodypart_aid/proc/is_pristine() + return (integrity == initial(integrity)) + +/datum/bodypart_aid/splint + name = "splint" + overlay_prefix = "splint" + desc_prefix = "fastened" + stack_to_drop = /obj/item/stack/medical/splint + /// How effective are we in keeping the bodypart rigid + var/splint_factor = 0.3 + /// Whether the splint prevents the limb from being disabled, with a ruptured tendon or a shattered bone + var/helps_disabled = TRUE + /// Total condition of our splint, the more we use it the more it gets looser + var/sling_condition = 5 + +/datum/bodypart_aid/splint/get_description() + var/desc + switch(sling_condition) + if(0 to 1.25) + desc = "barely holding" + if(1.25 to 2.75) + desc = "loose" + if(2.75 to 4) + desc = "rigid" + if(4 to INFINITY) + desc = "tight" + desc += " [name]" + return desc + +/datum/bodypart_aid/splint/Destroy() + SEND_SIGNAL(bodypart, COMSIG_BODYPART_SPLINT_DESTROYED) + bodypart.current_splint = null + return ..() + +/datum/bodypart_aid/splint/New(obj/item/bodypart/BP) + bodypart = BP + BP.current_splint = src + SEND_SIGNAL(BP, COMSIG_BODYPART_SPLINTED, src) + ..() + +/datum/bodypart_aid/splint/improvised + name = "improvised splint" + splint_factor = 0.6 + helps_disabled= FALSE + stack_to_drop = /obj/item/stack/medical/splint/improvised + overlay_prefix = "splint_improv" + +/datum/bodypart_aid/splint/tribal + name = "tribal splint" + splint_factor = 0.5 + stack_to_drop = /obj/item/stack/medical/splint/tribal + overlay_prefix = "splint_tribal" + +/datum/bodypart_aid/gauze + name = "gauze" + stack_to_drop = /obj/item/stack/medical/gauze + overlay_prefix = "gauze" + desc_prefix = "bandaged" + /// How much more can we absorb + var/absorption_capacity = 5 + /// How fast do we absorb + var/absorption_rate = 0.12 + /// How much does the gauze help with keeping infections clean + var/sanitisation_factor = 0.4 + /// How much sanitisation we've got after we become fairly stained and worn + var/sanitisation_factor_stained = 0.8 + /// Is it blood stained? For description + var/blood_stained = FALSE + /// Is it pus stained? For description + var/pus_stained = FALSE + +/datum/bodypart_aid/gauze/get_description() + var/desc + switch(absorption_capacity) + if(0 to 1.25) + desc = "nearly ruined" + if(1.25 to 2.75) + desc = "badly worn" + if(2.75 to 4) + desc = "slightly used" + if(4 to INFINITY) + desc = "clean" + if(blood_stained) + desc += ", bloodied" + if(pus_stained) + desc += ", pus stained" + desc += " [name]" + return desc + +/datum/bodypart_aid/gauze/New(obj/item/bodypart/BP) + bodypart = BP + BP.current_gauze = src + SEND_SIGNAL(BP, COMSIG_BODYPART_GAUZED, src) + ..() + +/datum/bodypart_aid/gauze/Destroy() + SEND_SIGNAL(bodypart, COMSIG_BODYPART_GAUZE_DESTROYED) + bodypart.current_gauze = null + return ..() + +/datum/bodypart_aid/gauze/is_pristine() + . = ..() + if(.) + return (absorption_capacity == initial(absorption_capacity)) + +/** + * 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 bandage won't help our wounds. + * When the bandage is left with a low amount of absorption, it'll notify user and act worse as a sanitiser for infections + * Returns TRUE if the bandage absorbed anything, FALSE if it's fully stained. + * + * 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?) + * * type - Is it blood or pus we're being stained with? GAUZE_STAIN_BLOOD, GAUZE_STAIN_PUS defines from wounds.dm + */ + +/datum/bodypart_aid/gauze/proc/seep_gauze(amount, type) + if(absorption_capacity > 0) + . = TRUE + absorption_capacity -= amount + else + return FALSE + //If our remaining absorption capacity is low, make so blood and pus stains show + if(absorption_capacity < 2) + sanitisation_factor = sanitisation_factor_stained + if(type == GAUZE_STAIN_BLOOD && !blood_stained) + blood_stained = TRUE + if(bodypart.owner) + to_chat(bodypart.owner, span_warning("The [name] on your [bodypart.name] [pick(list("pools", "trickles", "seeps"))] with blood.")) + else if(type == GAUZE_STAIN_PUS && !pus_stained) + pus_stained = TRUE + if(bodypart.owner) + to_chat(bodypart.owner, span_warning("The [name] on your [bodypart.name] [pick(list("pools", "trickles", "seeps"))] with pus.")) + +/datum/bodypart_aid/gauze/improvised + name = "improvised gauze" + stack_to_drop = /obj/item/stack/medical/gauze/improvised + absorption_rate = 0.09 + absorption_capacity = 3 diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm index e660633d27bb..e099e8ca955d 100644 --- a/code/modules/surgery/bodyparts/bodyparts.dm +++ b/code/modules/surgery/bodyparts/bodyparts.dm @@ -47,19 +47,6 @@ var/held_index = 0 ///For limbs that don't really exist, eg chainsaws var/is_pseudopart = FALSE - /// Is it fine, broken, splinted, or just straight up fucking gone - var/bone_status = BONE_FLAG_NO_BONES - var/bone_break_threshold = 40 - /// Threshold at which the limb will start bleeding if damaged by sharp items or projectiles - var/bleed_threshold = 10 - /// Threshold at which the limb will start bleeding if damaged by blunt items - var/bleed_threshold_blunt = 25 - /// Minimum damage of an incoming attack for it to cause bleeding - var/bleed_damage_min = 5 - /// Minimum damage of an incoming blunt attack for it to cause bleeding - var/bleed_damage_min_blunt = 10 - /// Current limb bleeding, increased when the limb takes brute damage over certain thresholds, decreased through bandages and cauterization - var/bleeding = 0 /// Whether this limb can decay, limiting its' ability to heal var/uses_integrity = FALSE @@ -71,11 +58,9 @@ /// Ignored if this is is greater or equal to the remaining health of the limb. var/integrity_threshold = 15 - /// So we know if we need to scream if this limb hits max damage - var/last_maxed ///If disabled, limb is as good as missing. var/bodypart_disabled = FALSE - ///Multiplied by max_damage it returns the threshold which defines a limb being disabled or not. From 0 to 1. + ///Multiplied by max_damage it returns the threshold which defines a limb being disabled or not. From 0 to 1. 0 means no disable thru damage var/disable_threshold = 1 ///Controls whether bodypart_disabled makes sense or not for this limb. var/can_be_disabled = FALSE @@ -134,6 +119,33 @@ var/medium_burn_msg = "blistered" var/heavy_burn_msg = "peeling away" + /// The wounds currently afflicting this body part + var/list/wounds + + /// The scars currently afflicting this body part + var/list/scars + /// Our current stored wound damage multiplier + var/wound_damage_multiplier = 1 + + /// This number is subtracted from all wound rolls on this bodypart, higher numbers mean more defense, negative means easier to wound + var/wound_resistance = 0 + /// When this bodypart hits max damage, this number is added to all wound rolls. Obviously only relevant for bodyparts that have damage caps. + var/disabled_wound_penalty = 15 + + /// 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 + /// 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 + var/datum/bodypart_aid/gauze/current_gauze + /// If we have a splint currently applied + var/datum/bodypart_aid/splint/current_splint + /// If something is currently grasping this bodypart and trying to staunch bleeding (see [/obj/item/grasp_self]) + var/obj/item/self_grasp/grasped_by + + //todo: make ipc integrity use wounds system var/light_integrity_msg = "misaligned" var/medium_integrity_msg = "twisted" var/heavy_integrity_msg = "falling apart" @@ -146,26 +158,35 @@ name = "[limb_id] [parse_zone(body_zone)]" update_icon_dropped() + if(!IS_ORGANIC_LIMB(src)) + grind_results = null + /obj/item/bodypart/forceMove(atom/destination) //Please. Never forcemove a limb if its's actually in use. This is only for borgs. . = ..() if(isturf(destination)) update_icon_dropped() - /obj/item/bodypart/Initialize(mapload) . = ..() if(can_be_disabled) RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS), PROC_REF(on_paralysis_trait_gain)) RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS), PROC_REF(on_paralysis_trait_loss)) - /obj/item/bodypart/Destroy() if(owner) owner.remove_bodypart(src) set_owner(null) + for(var/wound in wounds) + qdel(wound) // wounds is a lazylist, and each wound removes itself from it on deletion. + if(length(wounds)) + stack_trace("[type] qdeleted with [length(wounds)] uncleared wounds") + wounds.Cut() + if(current_gauze) + qdel(current_gauze) + if(current_splint) + qdel(current_splint) return ..() - /obj/item/bodypart/examine(mob/user) . = ..() if(brute_dam > DAMAGE_PRECISION) @@ -217,29 +238,45 @@ var/turf/T = get_turf(src) if(IS_ORGANIC_LIMB(src)) playsound(T, 'sound/misc/splort.ogg', 50, TRUE, -1) + if(current_gauze) + qdel(current_gauze) + if(current_splint) + qdel(current_splint) + for(var/obj/item/organ/drop_organ as anything in get_organs()) + drop_organ.transfer_to_limb(src, owner) for(var/obj/item/I in src) I.forceMove(T) +///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 FALSE + + var/list/bodypart_organs + for(var/obj/item/organ/organ_check as anything in owner.internal_organs) //internal organs inside the dismembered limb are dropped. + if(check_zone(organ_check.zone) == body_zone) + LAZYADD(bodypart_organs, organ_check) // this way if we don't have any, it'll just return null + + return bodypart_organs + //Return TRUE to get whatever mob this is in to update health. /obj/item/bodypart/proc/on_life() SHOULD_CALL_PARENT(TRUE) - if(stamina_dam > DAMAGE_PRECISION && owner.stam_regen_start_time <= world.time) //DO NOT update health here, it'll be done in the carbon's life. + if(stamina_dam > DAMAGE_PRECISION && owner.stam_regen_start_time <= world.time) //DO NOT update health here, it'll be done in the carbon's life. heal_damage(0, 0, INFINITY, null, FALSE) . |= BODYPART_LIFE_UPDATE_HEALTH - if(brute_dam < DAMAGE_PRECISION && bleeding) - adjust_bleeding(-0.2) //slowly stop bleeding if there's no damage left //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, sharpness = FALSE) +/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 var/hit_percent = (100-blocked)/100 - var/attack_force = brute //Used for bone breaking because break_modifier straight up didn't work, ever. if((!brute && !burn && !stamina) || hit_percent <= 0) return FALSE + if(owner && (owner.status_flags & GODMODE)) - return FALSE //godmode + return FALSE if(required_status && !(bodytype & required_status)) return FALSE @@ -250,43 +287,99 @@ stamina = round(max(stamina * dmg_mlt, 0),DAMAGE_PRECISION) brute = max(0, brute - brute_reduction) burn = max(0, burn - burn_reduction) - //No stamina scaling.. for now.. if(!brute && !burn && !stamina) return FALSE + brute *= wound_damage_multiplier + burn *= wound_damage_multiplier + switch(animal_origin) if(ALIEN_BODYPART,LARVA_BODYPART) //aliens take double burn //nothing can burn with so much snowflake code around burn *= 2 - // Bone breaking. The harder you get hit and the more hurt you already are - the more likely you are to break a bone. - // The more damaged your bodypart is, the easier it is to break a bone. - //Down to at least 5 force at 70 existing damage for the chest, 30 damage for arms or legs, 100 damage for head. - if((brute >= (bone_break_threshold - clamp((brute_dam * 0.5), 0, (bone_break_threshold - 5)))) && prob(attack_force + brute_dam * 0.5)) - break_bone() + //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) + + 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 && sharpness) + wounding_type = (sharpness == SHARP_EDGED ? WOUND_SLASH : 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.6) + 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 + // if we're flesh only, all blunt attacks become weakened slashes in terms of wound damage + if(BIO_JUST_FLESH) + if(wounding_type == WOUND_BLUNT) + wounding_type = WOUND_SLASH + wounding_dmg *= (easy_dismember ? 1 : 0.3) + if((mangled_state & BODYPART_MANGLED_FLESH) && try_dismember(wounding_type, wounding_dmg, wound_bonus, bare_wound_bonus)) + return + // standard humanoids + if(BIO_FLESH_BONE) + // If the bodypart is not mangled, and its a limb, we have a chance we hit a muscle + if(mangled_state != BODYPART_MANGLED_BOTH && body_zone != BODY_ZONE_CHEST && body_zone != BODY_ZONE_HEAD && prob(MUSCLE_WOUND_CHANCE)) + wounding_type = WOUND_MUSCLE + // 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 + else 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.6 // edged weapons pass along 60% 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 - // Bleeding is applied here - if(brute_dam+brute >= (sharpness ? bleed_threshold : bleed_threshold_blunt) && brute >= (sharpness ? bleed_damage_min : bleed_damage_min_blunt)) - adjust_bleeding(brute * BLOOD_LOSS_DAMAGE_BASE, BLOOD_LOSS_DAMAGE_MAXIMUM) + // 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) + if(current_gauze) + current_gauze.take_damage() + if(current_splint) + current_splint.take_damage() + check_wounding(wounding_type, wounding_dmg, wound_bonus, bare_wound_bonus) - var/can_inflict = max_damage - get_damage() - if(can_inflict <= 0) - return FALSE + for(var/datum/wound/iter_wound as anything in wounds) + iter_wound.receive_damage(wounding_type, wounding_dmg, wound_bonus) - var/total_damage = brute + burn + /* + // END WOUND HANDLING + */ - if(total_damage > can_inflict) + //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 + if(total_damage > can_inflict && total_damage > 0) // TODO: the second part of this check should be removed once disabling is all done brute = round(brute * (can_inflict / total_damage),DAMAGE_PRECISION) burn = round(burn * (can_inflict / total_damage),DAMAGE_PRECISION) - brute_dam += brute - burn_dam += burn + if(can_inflict <= 0) + return FALSE + if(brute) + set_brute_dam(brute_dam + brute) + if(burn) + set_burn_dam(burn_dam + burn) //We've dealt the physical damages, if there's room lets apply the stamina damage. if(stamina) set_stamina_dam(stamina_dam + round(clamp(stamina, 0, max_stamina_damage - stamina_dam), DAMAGE_PRECISION)) - if(owner) if(can_be_disabled) update_disabled() @@ -298,6 +391,169 @@ . = TRUE 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 && sharpness) + wounding_type = (sharpness == SHARP_EDGED ? WOUND_SLASH : 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.6) + 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.6 // edged weapons pass along 60% 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 [/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_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 + */ +/obj/item/bodypart/proc/check_wounding(woundtype, damage, wound_bonus, bare_wound_bonus) + // note that these are fed into an exponent, so these are magnified + if(HAS_TRAIT(owner, TRAIT_EASILY_WOUNDED)) + damage *= 1.5 + else + damage = min(damage, WOUND_MAX_CONSIDERED_DAMAGE) + + if(HAS_TRAIT(owner,TRAIT_HARDLY_WOUNDED)) + damage *= 0.85 + + if(HAS_TRAIT(owner, TRAIT_EASYDISMEMBER)) + damage *= 1.1 + + 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 = GLOB.global_wound_types[woundtype] + + if(injury_roll > WOUND_DISMEMBER_OUTRIGHT_THRESH && prob(get_damage() / max_damage * 100)) + var/datum/wound/loss/dismembering = new + dismembering.apply_dismember(src, woundtype, outright=TRUE) + return + + // 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/obj/item/clothing/clothes_check as anything in clothing) + // 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) + var/datum/wound/possible_wound = PW + var/datum/wound/replaced_wound + for(var/i in wounds) + var/datum/wound/existing_wound = i + if(existing_wound.type in wounds_checking) + if(existing_wound.severity >= initial(possible_wound.severity)) + return + else + replaced_wound = existing_wound + + if(initial(possible_wound.threshold_minimum) < injury_roll) + var/datum/wound/new_wound + if(replaced_wound) + 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 + new_wound = new possible_wound + new_wound.apply_wound(src) + log_wound(owner, new_wound, damage, wound_bonus, bare_wound_bonus, base_roll) + 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/datum/wound/existing_wound as anything in wounds) + 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 + + 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 [/obj/item/bodypart/proc/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 + + if(owner && ishuman(owner)) + var/mob/living/carbon/human/H = owner + var/list/clothing = H.clothingonpart(src) + for(var/obj/item/clothing/C as anything in clothing) + // 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_SLASH) + C.take_damage_zone(body_zone, damage, BRUTE) + 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) + + if(!armor_ablation) + injury_mod += bare_wound_bonus + + injury_mod -= armor_ablation + injury_mod += wound_bonus + + for(var/datum/wound/W as anything in wounds) + if(W.wound_type == wounding_type) + injury_mod += W.threshold_penalty + + var/part_mod = -wound_resistance + if(get_damage(TRUE) >= max_damage) + part_mod += disabled_wound_penalty + + injury_mod += part_mod + + return injury_mod // Removes integrity from the limb, if it uses integrity. /obj/item/bodypart/proc/take_integrity_damage(loss) @@ -314,7 +570,6 @@ //Damage cannot go below zero. //Cannot remove negative damage (i.e. apply damage) /obj/item/bodypart/proc/heal_damage(brute, burn, stamina, required_status, updating_health = TRUE) - if(required_status && !(bodytype & required_status)) //So we can only heal certain kinds of limbs, ie robotic vs organic. return @@ -326,7 +581,6 @@ burn *= heal_mult if(brute) set_brute_dam(round(max(brute_dam - brute, 0), DAMAGE_PRECISION)) - adjust_bleeding(-BLOOD_LOSS_DAMAGE_MAXIMUM * brute / max_damage) if(burn) set_burn_dam(round(max(burn_dam - burn, 0), DAMAGE_PRECISION)) if(stamina) @@ -343,7 +597,6 @@ cremation_progress = min(0, cremation_progress - ((brute_dam + burn_dam)*(100/max_damage))) return update_bodypart_damage_state() - ///Proc to hook behavior associated to the change of the brute_dam variable's value. /obj/item/bodypart/proc/set_brute_dam(new_value) if(brute_dam == new_value) @@ -351,7 +604,6 @@ . = brute_dam brute_dam = new_value - ///Proc to hook behavior associated to the change of the burn_dam variable's value. /obj/item/bodypart/proc/set_burn_dam(new_value) if(burn_dam == new_value) @@ -359,7 +611,6 @@ . = burn_dam burn_dam = new_value - ///Proc to hook behavior associated to the change of the stamina_dam variable's value. /obj/item/bodypart/proc/set_stamina_dam(new_value) if(stamina_dam == new_value) @@ -367,31 +618,6 @@ . = stamina_dam stamina_dam = new_value -/// Adjusts bodypart bleeding, value = amount of change, maximum = maximum current bloodloss amount this can modify -/obj/item/bodypart/proc/adjust_bleeding(value, maximum = BLOOD_LOSS_MAXIMUM) - if(bleeding > maximum) - return - if(owner.dna && (NOBLOOD in owner.dna.species.species_traits)) - return - bleeding = round(clamp(bleeding+value, 0, maximum), 0.001) - -/// Checks if the bodypart is viable for bandaging, if it isn't, tells the person trying (if present) what's stopping it -/obj/item/bodypart/proc/can_bandage(user) - . = TRUE - if(is_pseudopart) - return FALSE - if(!bleeding) - if(user) - to_chat(user, span_warning("[owner]'s [parse_zone(body_zone)] isn't bleeding!")) - return FALSE - if(GetComponent(/datum/component/bandage)) - if(user) - to_chat(user, span_warning("[owner]'s [parse_zone(body_zone)] has already been dressed!")) - return FALSE - -/obj/item/bodypart/proc/apply_bandage(bleed_reduction, lifespan, name) - AddComponent(/datum/component/bandage, bleed_reduction, lifespan, name) - //Returns total damage. /obj/item/bodypart/proc/get_damage(include_stamina = FALSE) var/total = brute_dam + burn_dam @@ -407,6 +633,9 @@ //Checks disabled status thresholds /obj/item/bodypart/proc/update_disabled() + if(!owner) + return + if(!can_be_disabled) set_disabled(FALSE) CRASH("update_disabled called with can_be_disabled false") @@ -416,7 +645,19 @@ var/total_damage = max(brute_dam + burn_dam, stamina_dam) - if(total_damage >= max_damage * disable_threshold) //Easy limb disable disables the limb at 40% health instead of 0% + // this block of checks is for limbs that can be disabled, but not through pure damage (AKA limbs that suffer wounds, human/monkey parts and such) + if(!disable_threshold) + if(total_damage < max_damage) + last_maxed = FALSE + else + if(!last_maxed && owner.stat < UNCONSCIOUS) + INVOKE_ASYNC(owner, /mob.proc/emote, "scream") + last_maxed = TRUE + set_disabled(FALSE) // we only care about the paralysis trait + return + + // we're now dealing solely with limbs that can be disabled through pure damage, AKA robot parts + if(total_damage >= max_damage * disable_threshold) if(!last_maxed) if(owner.stat < UNCONSCIOUS && !HAS_TRAIT(owner, TRAIT_ANALGESIA)) INVOKE_ASYNC(owner, TYPE_PROC_REF(/mob, emote), "scream") @@ -424,7 +665,7 @@ set_disabled(TRUE) return - if(bodypart_disabled && total_damage <= max_damage * 0.8) // reenabled at 80% now instead of 50% as of wounds update + if(bodypart_disabled && total_damage <= max_damage * 0.5) // reenable the limb at 50% health last_maxed = FALSE set_disabled(FALSE) @@ -446,17 +687,10 @@ return FALSE //`null` is a valid option, so we need to use a num var to make it clear no change was made. . = owner owner = new_owner + var/needs_update_disabled = FALSE //Only really relevant if there's an owner if(.) var/mob/living/carbon/old_owner = . - if(can_be_disabled) - if(HAS_TRAIT(old_owner, TRAIT_EASYLIMBDISABLE)) - disable_threshold = initial(disable_threshold) - needs_update_disabled = TRUE - UnregisterSignal(old_owner, list( - SIGNAL_REMOVETRAIT(TRAIT_EASYLIMBDISABLE), - SIGNAL_ADDTRAIT(TRAIT_EASYLIMBDISABLE), - )) if(initial(can_be_disabled)) if(HAS_TRAIT(old_owner, TRAIT_NOLIMBDISABLE)) if(!owner || !HAS_TRAIT(owner, TRAIT_NOLIMBDISABLE)) @@ -466,13 +700,8 @@ SIGNAL_REMOVETRAIT(TRAIT_NOLIMBDISABLE), SIGNAL_ADDTRAIT(TRAIT_NOLIMBDISABLE), )) + if(owner) - if(can_be_disabled) - if(HAS_TRAIT(owner, TRAIT_EASYLIMBDISABLE)) - disable_threshold = 0.6 - needs_update_disabled = TRUE - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_EASYLIMBDISABLE), PROC_REF(on_owner_easylimbwound_trait_loss)) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_EASYLIMBDISABLE), PROC_REF(on_owner_easylimbwound_trait_gain)) if(initial(can_be_disabled)) if(HAS_TRAIT(owner, TRAIT_NOLIMBDISABLE)) set_can_be_disabled(FALSE) @@ -489,24 +718,19 @@ return . = can_be_disabled can_be_disabled = new_can_be_disabled + if(can_be_disabled) if(owner) if(HAS_TRAIT(owner, TRAIT_NOLIMBDISABLE)) CRASH("set_can_be_disabled to TRUE with for limb whose owner has TRAIT_NOLIMBDISABLE") RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS), PROC_REF(on_paralysis_trait_gain)) RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS), PROC_REF(on_paralysis_trait_loss)) - if(HAS_TRAIT(owner, TRAIT_EASYLIMBDISABLE)) - disable_threshold = 0.6 - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_EASYLIMBDISABLE), PROC_REF(on_owner_easylimbwound_trait_loss)) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_EASYLIMBDISABLE), PROC_REF(on_owner_easylimbwound_trait_gain)) update_disabled() else if(.) if(owner) UnregisterSignal(owner, list( SIGNAL_ADDTRAIT(TRAIT_PARALYSIS), SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS), - SIGNAL_REMOVETRAIT(TRAIT_EASYLIMBDISABLE), - SIGNAL_ADDTRAIT(TRAIT_EASYLIMBDISABLE), )) set_disabled(FALSE) @@ -536,23 +760,6 @@ SIGNAL_HANDLER set_can_be_disabled(initial(can_be_disabled)) - -///Called when TRAIT_EASYLIMBDISABLE is added to the owner. -/obj/item/bodypart/proc/on_owner_easylimbwound_trait_gain(mob/living/carbon/source) - SIGNAL_HANDLER - disable_threshold = 0.6 - if(can_be_disabled) - update_disabled() - - -///Called when TRAIT_EASYLIMBDISABLE is removed from the owner. -/obj/item/bodypart/proc/on_owner_easylimbwound_trait_loss(mob/living/carbon/source) - SIGNAL_HANDLER - disable_threshold = initial(disable_threshold) - if(can_be_disabled) - update_disabled() - - //Updates an organ's brute/burn states for use by update_damage_overlays() //Returns 1 if we need to update overlays. 0 otherwise. /obj/item/bodypart/proc/update_bodypart_damage_state() @@ -663,11 +870,6 @@ species_secondary_color = H.dna.features["mcolor2"] UnregisterSignal(owner, COMSIG_MOVABLE_MOVED) - if(NO_BONES in S.species_traits) - bone_status = BONE_FLAG_NO_BONES - else - bone_status = BONE_FLAG_NORMAL - RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(on_mob_move)) draw_color = mutation_color if(should_draw_greyscale) //Should the limb be colored? @@ -812,40 +1014,90 @@ drop_organs() qdel(src) -// BROKEN BONE PROCS // -/obj/item/bodypart/proc/can_break_bone() - // Do they have bones, are the bones not broken, is the limb not robotic? If yes to all, return 1 - return (bone_status && bone_status != BONE_FLAG_BROKEN && IS_ORGANIC_LIMB(src)) //was BODYTYPE_ROBOTIC +/// Get whatever wound of the given type is currently attached to this limb, if any +/obj/item/bodypart/proc/get_wound_type(checking_type) + if(isnull(wounds)) + return + + for(var/i in wounds) + if(istype(i, checking_type)) + return i + +/** + * 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 (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/datum/wound/iter_wound as anything in wounds) + dam_mul *= iter_wound.damage_mulitplier_penalty -/obj/item/bodypart/proc/break_bone() - if(!can_break_bone()) + wound_damage_multiplier = dam_mul + + +/obj/item/bodypart/proc/get_bleed_rate() + if(HAS_TRAIT(owner, TRAIT_NOBLEED)) return - if (bone_status == BONE_FLAG_NORMAL && body_part & LEGS) // Because arms are not legs - owner.set_broken_legs(owner.broken_legs + 1) - bone_status = BONE_FLAG_BROKEN -// addtimer(CALLBACK(src, PROC_REF(break_bone_feedback), 1 SECONDS)) testing sommething - -///obj/item/bodypart/proc/break_bone_feedback() - owner.visible_message(span_danger("You hear a cracking sound coming from [owner]'s [name]."), span_userdanger("You feel something crack in your [name]!"), span_danger("You hear an awful cracking sound.")) - playsound(owner, pick(list('sound/health/bone/bone_break1.ogg','sound/health/bone/bone_break2.ogg','sound/health/bone/bone_break3.ogg','sound/health/bone/bone_break4.ogg','sound/health/bone/bone_break5.ogg','sound/health/bone/bone_break6.ogg')), 100, FALSE, -1) - -/obj/item/bodypart/proc/fix_bone() - // owner.update_inv_splints() breaks - if (bone_status != BONE_FLAG_NORMAL && body_part & LEGS) - owner.set_broken_legs(owner.broken_legs - 1) - bone_status = BONE_FLAG_NORMAL - -/obj/item/bodypart/proc/on_mob_move() - // Dont trigger if it isn't broken or if it has no owner or is buckled to a rollerbed - if(bone_status != BONE_FLAG_BROKEN || !owner || istype(owner?.buckled, /obj/structure/bed/roller)) + if(bodytype != BODYPART_ORGANIC) // maybe in the future we can bleed oil from aug parts, but not now return - if(prob(owner.m_intent == MOVE_INTENT_RUN ? 5 : 1)) - if(HAS_TRAIT(owner, TRAIT_ANALGESIA)) - to_chat(owner, span_notice("[pick("You feel something shifting inside your [name].", "There is something moving inside [name].", "Something inside your [name] slips.")]")) - else - to_chat(owner, span_danger("[pick("You feel broken bones moving around in your [name]!", "There are broken bones moving around in your [name]!", "The bones in your [name] are moving around!")]")) - receive_damage(rand(1, 3)) - //1-3 damage every 20 tiles for every broken bodypart. - //A single broken bodypart will give you an average of 650 tiles to run before you get a total of 100 damage and fall into crit - + var/bleed_rate = 0 + if(generic_bleedstacks > 0) + bleed_rate++ + + //We want an accurate reading of .len + listclearnulls(embedded_objects) + for(var/obj/item/embeddies as anything in embedded_objects) + if(!embeddies.isEmbedHarmless()) + bleed_rate += 0.5 + + for(var/datum/wound/W as anything in wounds) + bleed_rate += W.blood_flow + + if(owner.body_position == LYING_DOWN) + bleed_rate *= 0.75 + + if(grasped_by) + bleed_rate *= 0.7 + + if(!bleed_rate) + QDEL_NULL(grasped_by) + + 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: + * * new_gauze- Just the gauze stack we're taking a sheet from to apply here + */ +/obj/item/bodypart/proc/apply_gauze(obj/item/stack/medical/gauze/new_gauze) + if(!istype(new_gauze) || current_gauze) + return + current_gauze = new new_gauze.gauze_type(src) + new_gauze.use(1) + +/** + * apply_splint() much like above, except with a splint + * + * * This proc applies a splint to a bodypart. Splints are used to stabilize muscle and bone wounds, aswell as to protect from hits causing internal bleeding + * + * Arguments: + * * new_splint- Just the gauze stack we're taking a sheet from to apply here + */ +/obj/item/bodypart/proc/apply_splint(obj/item/stack/medical/splint/new_splint) + if(!istype(new_splint) || current_splint) + return + current_splint = new new_splint.splint_type(src) + new_splint.use(1) diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm index 7389cd0a55d7..70db8dcaf649 100644 --- a/code/modules/surgery/bodyparts/dismemberment.dm +++ b/code/modules/surgery/bodyparts/dismemberment.dm @@ -3,10 +3,8 @@ return dismemberable //Dismember a limb -/obj/item/bodypart/proc/dismember(dam_type = BRUTE) - if(!owner) - return FALSE - if(!dismemberable) +/obj/item/bodypart/proc/dismember(dam_type = BRUTE, silent=TRUE) + if(!owner || !dismemberable) return FALSE var/mob/living/carbon/C = owner if(C.status_flags & GODMODE) @@ -15,17 +13,18 @@ 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)) //Damage the chest based on limb's existing damage - C.visible_message(span_danger("[C]'s [src.name] is violently dismembered!")) + 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 + if(!silent) + C.visible_message(span_danger("[C]'s [name] sails off in a bloody arc!")) if(C.stat <= SOFT_CRIT)//No more screaming while unconsious if(IS_ORGANIC_LIMB(affecting))//Chest is a good indicator for if a carbon is robotic in nature or not. if(!HAS_TRAIT(C, TRAIT_ANALGESIA)) //and do we actually feel pain? INVOKE_ASYNC(C, TYPE_PROC_REF(/mob, emote), "scream") + playsound(get_turf(C), 'sound/effects/dismember.ogg', 80, TRUE) SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "dismembered", /datum/mood_event/dismembered) - SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "dismembered", /datum/mood_event/dismembered) drop_limb() C.update_equipment_speed_mods() // Update in case speed affecting item unequipped by dismemberment @@ -38,7 +37,10 @@ if(dam_type == BURN) 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) @@ -49,6 +51,7 @@ target_turf = new_turf if(new_turf.density) break + throw_at(target_turf, throw_range, throw_speed) return TRUE @@ -62,7 +65,6 @@ if(HAS_TRAIT(C, TRAIT_NODISMEMBER)) return FALSE . = list() - var/organ_spilled = 0 var/turf/T = get_turf(C) C.add_splatter_floor(T) playsound(get_turf(C), 'sound/misc/splort.ogg', 80, TRUE) @@ -72,82 +74,125 @@ continue O.Remove(C) O.forceMove(T) - organ_spilled = 1 . += O if(cavity_item) cavity_item.forceMove(T) . += cavity_item cavity_item = null - organ_spilled = 1 - - if(organ_spilled) - C.visible_message(span_danger("[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) +///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) return var/atom/Tsec = owner.drop_location() - var/mob/living/carbon/C = owner + + SEND_SIGNAL(owner, COMSIG_CARBON_REMOVE_LIMB, src, dismembered) SEND_SIGNAL(src, COMSIG_LIVING_DROP_LIMB) update_limb(TRUE) - C.remove_bodypart(src) + owner.remove_bodypart(src) if(held_index) - if(C.hand_bodyparts[held_index] == src) + if(owner.hand_bodyparts[held_index] == src) // We only want to do this if the limb being removed is the active hand part. // This catches situations where limbs are "hot-swapped" such as augmentations and roundstart prosthetics. - C.dropItemToGround(owner.get_item_for_held_index(held_index), 1) - C.hand_bodyparts[held_index] = null + owner.dropItemToGround(owner.get_item_for_held_index(held_index), 1) + owner.hand_bodyparts[held_index] = null + + for(var/thing in wounds) + var/datum/wound/W = thing + W.remove_wound(TRUE) + var/mob/living/carbon/phantom_owner = owner // so we can still refer to the guy who lost their limb after said limb forgets 'em owner = null - for(var/datum/surgery/S as anything in C.surgeries) //if we had an ongoing surgery on that limb, we stop it. + for(var/datum/surgery/S as anything in phantom_owner.surgeries) //if we had an ongoing surgery on that limb, we stop it. if(S.operated_bodypart == src) - C.surgeries -= S + phantom_owner.surgeries -= S qdel(S) break for(var/obj/item/I as anything in embedded_objects) embedded_objects -= I I.forceMove(src) - if(!C.has_embedded_objects()) - C.clear_alert("embeddedobject") - SEND_SIGNAL(C, COMSIG_CLEAR_MOOD_EVENT, "embedded") + + if(!phantom_owner.has_embedded_objects()) + phantom_owner.clear_alert("embeddedobject") + SEND_SIGNAL(phantom_owner, COMSIG_CLEAR_MOOD_EVENT, "embedded") if(!special) - if(C.dna) - for(var/datum/mutation/human/MT as anything in C.dna.mutations) //some mutations require having specific limbs to be kept. + if(phantom_owner.dna) + for(var/datum/mutation/human/MT as anything in phantom_owner.dna.mutations) //some mutations require having specific limbs to be kept. if(MT.limb_req && MT.limb_req == body_zone) - C.dna.force_lose(MT) + phantom_owner.dna.force_lose(MT) - for(var/obj/item/organ/O as anything in C.internal_organs) //internal organs inside the dismembered limb are dropped. + for(var/obj/item/organ/O as anything in phantom_owner.internal_organs) //internal organs inside the dismembered limb are dropped. var/org_zone = check_zone(O.zone) if(org_zone != body_zone) continue - O.transfer_to_limb(src, C) + O.transfer_to_limb(src, phantom_owner) - synchronize_bodytypes(C) + synchronize_bodytypes(phantom_owner) update_icon_dropped() - C.update_health_hud() //update the healthdoll - C.update_body() - C.update_hair() + phantom_owner.update_health_hud() //update the healthdoll + phantom_owner.update_body() + phantom_owner.update_hair() if(!Tsec) // Tsec = null happens when a "dummy human" used for rendering icons on prefs screen gets its limbs replaced. qdel(src) return if(is_pseudopart) - drop_organs(C) //Psuedoparts shouldn't have organs, but just in case + drop_organs(phantom_owner) //Psuedoparts shouldn't have organs, but just in case qdel(src) return 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 + base_chance += (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 15% more + base_chance += 15 + if(prob(base_chance)) + var/datum/wound/loss/dismembering = new + return dismembering.apply_dismember(src, wounding_type) //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) @@ -243,7 +288,7 @@ //Drop all worn head items for(var/X in list(owner.glasses, owner.ears, owner.wear_mask, owner.head)) var/obj/item/I = X - owner.dropItemToGround(I, TRUE) + owner.dropItemToGround(I, force = TRUE) qdel(owner.GetComponent(/datum/component/creamed)) //clean creampie overlay @@ -308,6 +353,13 @@ synchronize_bodytypes(C) if(is_creating) update_limb(is_creating = TRUE) + for(var/i in wounds) + var/datum/wound/W = i + // we have to remove the wound from the limb wound list first, so that we can reapply it fresh with the new person + // otherwise the wound thinks it's trying to replace an existing wound of the same type (itself) and fails/deletes itself + LAZYREMOVE(wounds, W) + W.apply_wound(src, TRUE) + update_bodypart_damage_state() C.updatehealth() @@ -398,6 +450,4 @@ var/obj/item/bodypart/L if(get_bodypart(limb_zone)) return FALSE - L = new_body_part(limb_zone, robotic, FALSE) - L.replace_limb(src, TRUE, TRUE) - return 1 + return TRUE diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm index 4b20758ce300..e3e6061eb260 100644 --- a/code/modules/surgery/bodyparts/head.dm +++ b/code/modules/surgery/bodyparts/head.dm @@ -13,7 +13,10 @@ px_y = -8 stam_damage_coeff = 1 max_stamina_damage = 100 - bone_break_threshold = 45 // Beefier bones + wound_resistance = 5 + disabled_wound_penalty = 25 + scars_covered_by_clothes = FALSE + grind_results = null var/mob/living/brain/brainmob = null //The current occupant. var/obj/item/organ/brain/brain = null //The brain organ diff --git a/code/modules/surgery/bodyparts/helpers.dm b/code/modules/surgery/bodyparts/helpers.dm index ce2ed5e98d40..ed44a75057e4 100644 --- a/code/modules/surgery/bodyparts/helpers.dm +++ b/code/modules/surgery/bodyparts/helpers.dm @@ -100,31 +100,6 @@ disabled += zone return disabled -/mob/proc/get_broken_limbs() - return 0 - -///Gets a list of broken bodyparts -/mob/living/carbon/get_broken_limbs() - var/list/full = list(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG) - var/list/broken = list() - for(var/zone in full) - var/obj/item/bodypart/affecting = get_bodypart(zone) - if(affecting && affecting.bone_status == BONE_FLAG_BROKEN) - broken += zone - return broken - -///Gets how many legs are broken (of the two possible.) Used for slowdown calculation. -/mob/proc/get_broken_legs() - return 0 - -/mob/living/carbon/get_broken_legs() - var/brokenlegs = 0 - for(var/obj/item/bodypart/X in bodyparts) - if(X && X.bone_status == BONE_FLAG_BROKEN || X.bone_status == BONE_FLAG_SPLINTED) - if(X.body_part == LEG_RIGHT || X.body_part == LEG_LEFT) - brokenlegs++ - return brokenlegs - ///Remove a specific embedded item from the carbon mob /mob/living/carbon/proc/remove_embedded_object(obj/item/I) SEND_SIGNAL(src, COMSIG_CARBON_EMBED_REMOVAL, I) diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm index 4e7f5dc833cf..168bc68b590e 100644 --- a/code/modules/surgery/bodyparts/parts.dm +++ b/code/modules/surgery/bodyparts/parts.dm @@ -11,6 +11,7 @@ px_y = 0 stam_damage_coeff = 1 max_stamina_damage = 120 + wound_resistance = 10 is_dimorphic = TRUE var/obj/item/cavity_item var/acceptable_bodytype = BODYTYPE_HUMANOID @@ -57,7 +58,7 @@ be possessed by the devil? This arm appears to be possessed by no \ one though." icon_state = "human_l_arm" - attack_verb = list("slaps", "punches") + attack_verb = list("slapped", "punched") max_damage = 50 max_stamina_damage = 50 body_zone = BODY_ZONE_L_ARM @@ -154,7 +155,7 @@ desc = "Over 87% of humans are right handed. That figure is much lower \ among humans missing their right arm." icon_state = "human_r_arm" - attack_verb = list("slaps", "punches") + attack_verb = list("slapped", "punched") max_damage = 50 body_zone = BODY_ZONE_R_ARM body_part = ARM_RIGHT diff --git a/code/modules/surgery/bone_repair.dm b/code/modules/surgery/bone_repair.dm index de0a67688ada..fe8ddb7c4f67 100644 --- a/code/modules/surgery/bone_repair.dm +++ b/code/modules/surgery/bone_repair.dm @@ -30,5 +30,5 @@ /datum/surgery_step/set_bone/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) user.visible_message("[user] successfully sets the bones in [target]'s [parse_zone(target_zone)]!", span_notice("You successfully set the bones in [target]'s [parse_zone(target_zone)].")) - surgery.operated_bodypart.fix_bone() + surgery.operated_bodypart.fix_bone() //todo: fix return TRUE diff --git a/code/modules/surgery/coronary_bypass.dm b/code/modules/surgery/coronary_bypass.dm index b70fc1b66420..a113e75f1571 100644 --- a/code/modules/surgery/coronary_bypass.dm +++ b/code/modules/surgery/coronary_bypass.dm @@ -43,7 +43,7 @@ span_notice("Blood pools around the incision in [H]'s heart."), "") var/obj/item/bodypart/BP = H.get_bodypart(check_zone(surgery.location)) - BP.adjust_bleeding(10) + BP.generic_bleedstacks += 10 target.apply_damage(15, BRUTE, "[target_zone]") return ..() @@ -54,7 +54,7 @@ span_warning("[user] screws up, causing blood to spurt out of [H]'s chest!"), span_warning("[user] screws up, causing blood to spurt out of [H]'s chest!")) var/obj/item/bodypart/BP = H.get_bodypart(check_zone(surgery.location)) - BP.adjust_bleeding(20) + BP.generic_bleedstacks += 20 H.adjustOrganLoss(ORGAN_SLOT_HEART, 10) target.apply_damage(15, BRUTE, "[target_zone]") @@ -95,5 +95,5 @@ span_warning("[user] screws up, causing blood to spurt out of [H]'s chest profusely!")) H.adjustOrganLoss(ORGAN_SLOT_HEART, 30) var/obj/item/bodypart/BP = H.get_bodypart(check_zone(surgery.location)) - BP.adjust_bleeding(30) + BP.generic_bleedstacks += 30 return FALSE diff --git a/code/modules/surgery/debride.dm b/code/modules/surgery/debride.dm new file mode 100644 index 000000000000..69947b5b0949 --- /dev/null +++ b/code/modules/surgery/debride.dm @@ -0,0 +1,138 @@ + +/////BURN FIXING SURGERIES////// + +///// Debride burnt flesh +/datum/surgery/debride + name = "Debride burnt flesh" + steps = list(/datum/surgery_step/debride, /datum/surgery_step/dress) + 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/burn + +/datum/surgery/debride/can_start(mob/living/user, mob/living/carbon/target) + if(!istype(target)) + return FALSE + if(..()) + var/obj/item/bodypart/targeted_bodypart = target.get_bodypart(user.zone_selected) + var/datum/wound/burn/burn_wound = targeted_bodypart.get_wound_type(targetable_wound) + return(burn_wound && burn_wound.infestation > 0) + +//SURGERY STEPS + +///// Debride +/datum/surgery_step/debride + name = "excise infection" + implements = list(TOOL_HEMOSTAT = 100, TOOL_SCALPEL = 85, TOOL_SAW = 60, TOOL_WIRECUTTER = 40) + time = 30 + repeatable = TRUE + /// How much sanitization is added per step + var/sanitization_added = 0.5 + /// How much infestation is removed per step (positive number) + var/infestation_removed = 0.5 + +/// To give the surgeon a heads up how much work they have ahead of them +/datum/surgery_step/debride/proc/get_progress(mob/user, mob/living/carbon/target, datum/wound/burn/burn_wound) + if(!burn_wound?.infestation || !infestation_removed) + return + var/estimated_remaining_steps = burn_wound.infestation / infestation_removed + var/progress_text + + switch(estimated_remaining_steps) + if(-INFINITY to 1) + return + if(1 to 2) + progress_text = ", preparing to remove the last remaining bits of infection" + if(2 to 4) + progress_text = ", steadily narrowing the remaining bits of infection" + if(5 to INFINITY) + progress_text = ", though there's still quite a lot to excise" + + return progress_text + +/datum/surgery_step/debride/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + if(surgery.operated_wound) + var/datum/wound/burn/burn_wound = surgery.operated_wound + if(burn_wound.infestation <= 0) + to_chat(user, "[target]'s [parse_zone(user.zone_selected)] has no infected flesh to remove!") + surgery.status++ + repeatable = FALSE + return + display_results(user, target, "You begin to excise infected flesh from [target]'s [parse_zone(user.zone_selected)]...", + "[user] begins to excise infected flesh from [target]'s [parse_zone(user.zone_selected)] with [tool].", + "[user] begins to excise infected flesh from [target]'s [parse_zone(user.zone_selected)].") + else + user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", "You look for [target]'s [parse_zone(user.zone_selected)]...") + +/datum/surgery_step/debride/success(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) + var/datum/wound/burn/burn_wound = surgery.operated_wound + if(burn_wound) + var/progress_text = get_progress(user, target, burn_wound) + display_results(user, target, "You successfully excise some of the infected flesh from [target]'s [parse_zone(target_zone)][progress_text].", + "[user] successfully excises some of the infected flesh from [target]'s [parse_zone(target_zone)] with [tool]!", + "[user] successfully excises some of the infected flesh from [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) + burn_wound.infestation -= infestation_removed + burn_wound.sanitization += sanitization_added + if(burn_wound.infestation <= 0) + repeatable = FALSE + else + to_chat(user, "[target] has no infected flesh there!") + return ..() + +/datum/surgery_step/debride/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, fail_prob = 0) + ..() + display_results(user, target, "You carve away some of the healthy flesh from [target]'s [parse_zone(target_zone)].", + "[user] carves away some of the healthy flesh from [target]'s [parse_zone(target_zone)] with [tool]!", + "[user] carves away some of the healthy flesh from [target]'s [parse_zone(target_zone)]!") + surgery.operated_bodypart.receive_damage(brute=rand(4,8), sharpness=TRUE) + +/datum/surgery_step/debride/initiate(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, try_to_fail = FALSE) + if(!..()) + return + var/datum/wound/burn/burn_wound = surgery.operated_wound + while(burn_wound && burn_wound.infestation > 0.25) + if(!..()) + break + +///// Dressing burns +/datum/surgery_step/dress + name = "bandage burns" + implements = list(/obj/item/stack/medical/gauze = 100, /obj/item/stack/sticky_tape/surgical = 100) + time = 40 + /// How much sanitization is added + var/sanitization_added = 3 + /// How much flesh healing is added + var/flesh_healing_added = 5 + + +/datum/surgery_step/dress/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + var/datum/wound/burn/burn_wound = surgery.operated_wound + if(burn_wound) + display_results(user, target, "You begin to dress the burns on [target]'s [parse_zone(user.zone_selected)]...", + "[user] begins to dress the burns on [target]'s [parse_zone(user.zone_selected)] with [tool].", + "[user] begins to dress the burns on [target]'s [parse_zone(user.zone_selected)].") + else + user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", "You look for [target]'s [parse_zone(user.zone_selected)]...") + +/datum/surgery_step/dress/success(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) + var/datum/wound/burn/burn_wound = surgery.operated_wound + if(burn_wound) + display_results(user, target, "You successfully wrap [target]'s [parse_zone(target_zone)] with [tool].", + "[user] successfully wraps [target]'s [parse_zone(target_zone)] with [tool]!", + "[user] successfully wraps [target]'s [parse_zone(target_zone)]!") + log_combat(user, target, "dressed burns in", addition="INTENT: [uppertext(user.a_intent)]") + burn_wound.sanitization += sanitization_added + burn_wound.flesh_healing += flesh_healing_added + 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 ..() + +/datum/surgery_step/dress/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, fail_prob = 0) + ..() + if(istype(tool, /obj/item/stack)) + var/obj/item/stack/used_stack = tool + used_stack.use(1) diff --git a/code/modules/surgery/experimental_dissection.dm b/code/modules/surgery/experimental_dissection.dm index 4c203c12ce5c..50a33964061e 100644 --- a/code/modules/surgery/experimental_dissection.dm +++ b/code/modules/surgery/experimental_dissection.dm @@ -99,7 +99,7 @@ hand_dossier.merge(the_dossier) var/obj/item/bodypart/L = target.get_bodypart(BODY_ZONE_CHEST) - target.apply_damage(80, BRUTE, L) + target.apply_damage(80, BRUTE, L, wound_bonus=CANT_WOUND) ADD_TRAIT(target, TRAIT_DISSECTED, "[surgery.name]") repeatable = FALSE experience_given = max(points_earned/(MAX_DISSECTION_REWARD/MEDICAL_SKILL_MEDIUM),1) @@ -115,7 +115,7 @@ hand_dossier.merge(the_dossier) var/obj/item/bodypart/L = target.get_bodypart(BODY_ZONE_CHEST) - target.apply_damage(80, BRUTE, L) + target.apply_damage(80, BRUTE, L, wound_bonus=CANT_WOUND) return TRUE /datum/surgery/advanced/experimental_dissection/adv diff --git a/code/modules/surgery/hairline_fracture.dm b/code/modules/surgery/hairline_fracture.dm new file mode 100644 index 000000000000..c9aeae6113ed --- /dev/null +++ b/code/modules/surgery/hairline_fracture.dm @@ -0,0 +1,53 @@ + +/////BONE FIXING SURGERIES////// + +///// Repair Hairline Fracture (Severe) +/datum/surgery/repair_bone_hairline + name = "Repair bone fracture (hairline)" + steps = list(/datum/surgery_step/incise, /datum/surgery_step/repair_bone_hairline, /datum/surgery_step/close) + 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/blunt/severe + +/datum/surgery/repair_bone_hairline/can_start(mob/living/user, mob/living/carbon/target) + if(..()) + var/obj/item/bodypart/targeted_bodypart = target.get_bodypart(user.zone_selected) + return(targeted_bodypart.get_wound_type(targetable_wound)) + +//SURGERY STEPS + +///// Repair Hairline Fracture (Severe) +/datum/surgery_step/repair_bone_hairline + name = "repair hairline fracture (bonesetter/bone gel/tape)" + implements = list(/obj/item/bonesetter = 100, /obj/item/stack/medical/bone_gel = 100, /obj/item/stack/sticky_tape/surgical = 100, /obj/item/stack/sticky_tape/super = 50, /obj/item/stack/sticky_tape = 30) + time = 40 + experience_given = MEDICAL_SKILL_MEDIUM + +/datum/surgery_step/repair_bone_hairline/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + if(surgery.operated_wound) + display_results(user, target, "You begin to repair the fracture in [target]'s [parse_zone(user.zone_selected)]...", + "[user] begins to repair the fracture in [target]'s [parse_zone(user.zone_selected)] with [tool].", + "[user] begins to repair the fracture in [target]'s [parse_zone(user.zone_selected)].") + else + user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", "You look for [target]'s [parse_zone(user.zone_selected)]...") + +/datum/surgery_step/repair_bone_hairline/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) + if(surgery.operated_wound) + if(istype(tool, /obj/item/stack)) + var/obj/item/stack/used_stack = tool + used_stack.use(1) + display_results(user, target, "You successfully repair the fracture in [target]'s [parse_zone(target_zone)].", + "[user] successfully repairs the fracture in [target]'s [parse_zone(target_zone)] with [tool]!", + "[user] successfully repairs the fracture in [target]'s [parse_zone(target_zone)]!") + log_combat(user, target, "repaired a hairline fracture in", addition="INTENT: [uppertext(user.a_intent)]") + qdel(surgery.operated_wound) + else + to_chat(user, "[target] has no hairline fracture there!") + return ..() + +/datum/surgery_step/repair_bone_hairline/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, fail_prob = 0) + ..() + if(istype(tool, /obj/item/stack)) + var/obj/item/stack/used_stack = tool + used_stack.use(1) diff --git a/code/modules/surgery/healing.dm b/code/modules/surgery/healing.dm index 2f44f9b35c98..0b3f85fdce58 100644 --- a/code/modules/surgery/healing.dm +++ b/code/modules/surgery/healing.dm @@ -16,6 +16,15 @@ var/healing_step_type var/antispam = FALSE +/datum/surgery/healing/can_start(mob/user, mob/living/patient) + . = ..() + if(isanimal(patient)) + var/mob/living/simple_animal/critter = patient + if(!critter.healable) + return FALSE + if(!(patient.mob_biotypes & (MOB_ORGANIC|MOB_HUMANOID))) + return FALSE + /datum/surgery/healing/New(surgery_target, surgery_location, surgery_bodypart) ..() if(healing_step_type) @@ -34,9 +43,14 @@ failure_sound = 'sound/surgery/organ2.ogg' var/brutehealing = 0 var/burnhealing = 0 - var/missinghpbonus = 0 //heals an extra point of damager per X missing damage of type (burn damage for burn healing, brute for brute). Smaller Number = More Healing! + var/brute_multiplier = 0 //multiplies the damage that the patient has. if 0 the patient wont get any additional healing from the damage he has. + var/burn_multiplier = 0 fuckup_damage = 0 //When the reckoning is not postponed indefinitely +/// Returns a string letting the surgeon know roughly how much longer the surgery is estimated to take at the going rate +/datum/surgery_step/heal/proc/get_progress(mob/user, mob/living/carbon/target, brute_healed, burn_healed) + return + /datum/surgery_step/heal/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) var/woundtype if(brutehealing && burnhealing) @@ -64,20 +78,23 @@ var/tmsg = "[user] fixes some of [target]'s wounds" //see above var/urhealedamt_brute = brutehealing var/urhealedamt_burn = burnhealing - if(missinghpbonus) - if(target.stat != DEAD) - urhealedamt_brute += brutehealing ? round((target.getBruteLoss()/ missinghpbonus),0.1) : 0 - urhealedamt_burn += burnhealing ? round((target.getFireLoss()/ missinghpbonus),0.1) : 0 - else //less healing bonus for the dead since they're expected to have lots of damage to begin with (to make TW into defib not TOO simple) - urhealedamt_brute += brutehealing ? round((target.getBruteLoss()/ (missinghpbonus*5)),0.1) : 0 - urhealedamt_burn += burnhealing ? round((target.getFireLoss()/ (missinghpbonus*5)),0.1) : 0 + if(target.stat == DEAD) //dead patients get way less additional heal from the damage they have. + brute_healed += round((target.getBruteLoss() * (brute_multiplier * 0.2)),0.1) + burn_healed += round((target.getFireLoss() * (burn_multiplier * 0.2)),0.1) + else + brute_healed += round((target.getBruteLoss() * brute_multiplier),0.1) + burn_healed += round((target.getFireLoss() * burn_multiplier),0.1) + if(!get_location_accessible(target, target_zone)) - urhealedamt_brute *= 0.55 - urhealedamt_burn *= 0.55 - umsg += " as best as you can while they have clothing on" - tmsg += " as best as they can while [target] has clothing on" - experience_given = CEILING((target.heal_bodypart_damage(urhealedamt_brute,urhealedamt_burn)/5),1) - display_results(user, target, span_notice("[umsg]."), + brute_healed *= 0.55 + burn_healed *= 0.55 + umsg += " as best as you can while [target.p_they()] [target.p_have()] clothing on" + tmsg += " as best as [user.p_they()] can while [target.p_they()] [target.p_have()] clothing on" + target.heal_bodypart_damage(brute_healed,burn_healed) + + umsg += get_progress(user, target, brute_healed, burn_healed) + + display_results(user, target, "[umsg].", "[tmsg].", "[tmsg].") if(istype(surgery, /datum/surgery/healing)) @@ -89,13 +106,12 @@ display_results(user, target, span_warning("You screwed up!"), span_warning("[user] screws up!"), span_notice("[user] fixes some of [target]'s wounds."), TRUE) - var/urdamageamt_burn = brutehealing * 0.8 - var/urdamageamt_brute = burnhealing * 0.8 - if(missinghpbonus) - urdamageamt_brute += round((target.getBruteLoss()/ (missinghpbonus*2)),0.1) - urdamageamt_burn += round((target.getFireLoss()/ (missinghpbonus*2)),0.1) + var/brute_dealt = brutehealing * 0.8 + var/burn_dealt = burnhealing * 0.8 + brute_dealt += round((target.getBruteLoss() * (brute_multiplier * 0.5)),0.1) + burn_dealt += round((target.getFireLoss() * (burn_multiplier * 0.5)),0.1) + target.take_bodypart_damage(brute_dealt, burn_dealt, wound_bonus=CANT_WOUND) - target.take_bodypart_damage(urdamageamt_brute, urdamageamt_burn) return FALSE /***************************BRUTE***************************/ @@ -123,20 +139,77 @@ desc = "A surgical procedure that provides experimental treatment for a patient's brute traumas. Heals considerably more when the patient is severely injured." /********************BRUTE STEPS********************/ + +/datum/surgery_step/heal/brute/get_progress(mob/user, mob/living/carbon/target, brute_healed, burn_healed) + if(!brute_healed) + return + + var/estimated_remaining_steps = target.getBruteLoss() / brute_healed + var/progress_text + + if(locate(/obj/item/healthanalyzer) in user.held_items) + progress_text = ". Remaining brute: [target.getBruteLoss()]" + else + switch(estimated_remaining_steps) + if(-INFINITY to 1) + return + if(1 to 3) + progress_text = ", stitching up the last few scrapes" + if(3 to 6) + progress_text = ", counting down the last few bruises left to treat" + if(6 to 9) + progress_text = ", continuing to plug away at [target.p_their()] extensive rupturing" + if(9 to 12) + progress_text = ", steadying yourself for the long surgery ahead" + if(12 to 15) + progress_text = ", though [target.p_they()] still look[target.p_s()] more like ground beef than a person" + if(15 to INFINITY) + progress_text = ", though you feel like you're barely making a dent in treating [target.p_their()] pulped body" + + return progress_text + /datum/surgery_step/heal/brute/basic name = "tend bruises" brutehealing = 5 - missinghpbonus = 15 + brute_multiplier = 0.07 /datum/surgery_step/heal/brute/upgraded brutehealing = 5 - missinghpbonus = 10 + brute_multiplier = 0.1 /datum/surgery_step/heal/brute/upgraded/femto brutehealing = 5 - missinghpbonus = 5 + brute_multiplier = 0.2 /***************************BURN***************************/ + +/datum/surgery_step/heal/burn/get_progress(mob/user, mob/living/carbon/target, brute_healed, burn_healed) + if(!burn_healed) + return + var/estimated_remaining_steps = target.getFireLoss() / burn_healed + var/progress_text + + if(locate(/obj/item/healthanalyzer) in user.held_items) + progress_text = ". Remaining burn: [target.getFireLoss()]" + else + switch(estimated_remaining_steps) + if(-INFINITY to 1) + return + if(1 to 3) + progress_text = ", finishing up the last few singe marks" + if(3 to 6) + progress_text = ", counting down the last few blisters left to treat" + if(6 to 9) + progress_text = ", continuing to plug away at [target.p_their()] thorough roasting" + if(9 to 12) + progress_text = ", steadying yourself for the long surgery ahead" + if(12 to 15) + progress_text = ", though [target.p_they()] still look[target.p_s()] more like burnt steak than a person" + if(15 to INFINITY) + progress_text = ", though you feel like you're barely making a dent in treating [target.p_their()] charred body" + + return progress_text + /datum/surgery/healing/burn name = "Tend Wounds (Burn)" @@ -164,17 +237,51 @@ /datum/surgery_step/heal/burn/basic name = "tend burn wounds" burnhealing = 5 - missinghpbonus = 15 + burn_multiplier = 0.07 /datum/surgery_step/heal/burn/upgraded burnhealing = 5 - missinghpbonus = 10 + burn_multiplier = 0.1 /datum/surgery_step/heal/burn/upgraded/femto burnhealing = 5 - missinghpbonus = 5 + burn_multiplier = 0.2 /***************************COMBO***************************/ + +/datum/surgery_step/heal/combo/get_progress(mob/user, mob/living/carbon/target, brute_healed, burn_healed) + var/estimated_remaining_steps = 0 + if(brute_healed > 0) + estimated_remaining_steps = max(0, (target.getBruteLoss() / brute_healed)) + if(burn_healed > 0) + estimated_remaining_steps = max(estimated_remaining_steps, (target.getFireLoss() / burn_healed)) // whichever is higher between brute or burn steps + + var/progress_text + + if(locate(/obj/item/healthanalyzer) in user.held_items) + if(target.getBruteLoss()) + progress_text = ". Remaining brute: [target.getBruteLoss()]" + if(target.getFireLoss()) + progress_text += ". Remaining burn: [target.getFireLoss()]" + else + switch(estimated_remaining_steps) + if(-INFINITY to 1) + return + if(1 to 3) + progress_text = ", finishing up the last few signs of damage" + if(3 to 6) + progress_text = ", counting down the last few patches of trauma" + if(6 to 9) + progress_text = ", continuing to plug away at [target.p_their()] extensive injuries" + if(9 to 12) + progress_text = ", steadying yourself for the long surgery ahead" + if(12 to 15) + progress_text = ", though [target.p_they()] still look[target.p_s()] more like smooshed baby food than a person" + if(15 to INFINITY) + progress_text = ", though you feel like you're barely making a dent in treating [target.p_their()] broken body" + + return progress_text + /datum/surgery/healing/combo name = "Tend Wounds (Mixture, Basic)" replaced_by = /datum/surgery/healing/combo/upgraded @@ -199,18 +306,21 @@ name = "tend physical wounds" brutehealing = 3 burnhealing = 3 - missinghpbonus = 15 + brute_multiplier = 0.07 + burn_multiplier = 0.07 time = 10 /datum/surgery_step/heal/combo/upgraded brutehealing = 3 burnhealing = 3 - missinghpbonus = 10 + brute_multiplier = 0.1 + burn_multiplier = 0.1 /datum/surgery_step/heal/combo/upgraded/femto brutehealing = 1 burnhealing = 1 - missinghpbonus = 2.5 + brute_multiplier = 0.4 + burn_multiplier = 0.4 /datum/surgery_step/heal/combo/upgraded/femto/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) display_results(user, target, span_warning("You screwed up!"), diff --git a/code/modules/surgery/mechanical.dm b/code/modules/surgery/mechanical.dm index dd62919dce8d..be50fe65aadf 100644 --- a/code/modules/surgery/mechanical.dm +++ b/code/modules/surgery/mechanical.dm @@ -22,93 +22,6 @@ /obj/item/pen = 5 ) -/datum/surgery/healing/mechanic - name = "Repair machinery" - requires_bodypart_type = BODYTYPE_ROBOTIC - replaced_by = null - steps = list( - /datum/surgery_step/mechanic_open, - /datum/surgery_step/heal/mechanic, - /datum/surgery_step/mechanic_close - ) - lying_required = FALSE - self_operable = FALSE - -/datum/surgery_step/heal/mechanic - name = "repair components" - implements = list(TOOL_WELDER = 100, - TOOL_WIRECUTTER = 100, - TOOL_CAUTERY = 60, - TOOL_HEMOSTAT = 60, - TOOL_RETRACTOR = 60, - /obj/item/melee/energy = 40, - /obj/item/gun/energy/laser = 20) - time = 2 SECONDS - missinghpbonus = 10 - -/datum/surgery_step/heal/mechanic/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - var/repairtype - if(tool.tool_behaviour == TOOL_WELDER || tool.tool_behaviour == TOOL_CAUTERY || istype(tool, /obj/item/melee/energy) || istype(tool, /obj/item/gun/energy/laser)) - brutehealing = 5 - burnhealing = 0 - repairtype = "dents" - preop_sound = 'sound/items/welder.ogg' - success_sound = 'sound/items/welder2.ogg' - if(tool.tool_behaviour == TOOL_WIRECUTTER || tool.tool_behaviour == TOOL_HEMOSTAT || tool.tool_behaviour == TOOL_RETRACTOR) - burnhealing = 5 - brutehealing = 0 - repairtype = "wiring" - success_sound = 'sound/items/wirecutter.ogg' - if(istype(surgery,/datum/surgery/healing)) - var/datum/surgery/healing/the_surgery = surgery - if(!the_surgery.antispam) - display_results(user, target, span_notice("You attempt to fix some of [target]'s [repairtype]."), - span_notice("[user] attempts to fix some of [target]'s [repairtype]."), - span_notice("[user] attempts to fix some of [target]'s [repairtype].")) - -/datum/surgery_step/heal/mechanic/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) - var/umsg = "You succeed in fixing some of [target]'s damages" //no period, add initial space to "addons" - var/tmsg = "[user] fixes some of [target]'s damages" //see above - var/urhealedamt_brute = brutehealing - var/urhealedamt_burn = burnhealing - if(missinghpbonus) - urhealedamt_brute += round((target.getBruteLoss()/ missinghpbonus),0.1) - urhealedamt_burn += round((target.getFireLoss()/ missinghpbonus),0.1) - - if(!get_location_accessible(target, target_zone)) - urhealedamt_brute *= 0.55 - urhealedamt_burn *= 0.55 - umsg += " as best as you can while they have clothing on" - tmsg += " as best as they can while [target] has clothing on" - experience_given = CEILING((target.heal_bodypart_damage(urhealedamt_brute,urhealedamt_burn)/5),1) - display_results(user, target, span_notice("[umsg]."), - "[tmsg].", - "[tmsg].") - if(istype(surgery, /datum/surgery/healing)) - var/datum/surgery/healing/the_surgery = surgery - the_surgery.antispam = TRUE - return TRUE - -/datum/surgery_step/heal/mechanic/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, fail_prob) - display_results(user, target, span_warning("You screwed up!"), - span_warning("[user] screws up!"), - span_notice("[user] fixes some of [target]'s damages."), TRUE) - var/urdamageamt_burn = brutehealing * 0.8 - var/urdamageamt_brute = burnhealing * 0.8 - //Reset heal checks - burnhealing = 0 - brutehealing = 0 - if(missinghpbonus) - urdamageamt_brute += round((target.getBruteLoss()/ (missinghpbonus*2)),0.1) - urdamageamt_burn += round((target.getFireLoss()/ (missinghpbonus*2)),0.1) - if((fail_prob > 50) && (tool.tool_behaviour == TOOL_WIRECUTTER || tool.tool_behaviour == TOOL_HEMOSTAT || tool.tool_behaviour == TOOL_RETRACTOR)) - do_sparks(3, TRUE, target) - if(isliving(user)) - var/mob/living/L = user - L.electrocute_act(urdamageamt_burn, target) - target.take_bodypart_damage(urdamageamt_brute, urdamageamt_burn) - return FALSE - /datum/surgery/prosthesis_removal name = "Detach prosthesis" steps = list(/datum/surgery_step/mechanic_open, /datum/surgery_step/open_hatch, /datum/surgery_step/prepare_electronics, /datum/surgery_step/mechanic_unwrench, /datum/surgery_step/prosthesis_removal) diff --git a/code/modules/surgery/organic_steps.dm b/code/modules/surgery/organic_steps.dm index 38935dfdec45..a45513df1831 100644 --- a/code/modules/surgery/organic_steps.dm +++ b/code/modules/surgery/organic_steps.dm @@ -32,7 +32,7 @@ "") var/obj/item/bodypart/BP = H.get_bodypart(check_zone(surgery.location)) if(BP) - BP.adjust_bleeding(3) + BP.generic_bleedstacks += 10 return ..() /datum/surgery_step/incise/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) @@ -79,7 +79,7 @@ var/mob/living/carbon/human/H = target var/obj/item/bodypart/BP = H.get_bodypart(check_zone(surgery.location)) if(BP) - BP.adjust_bleeding(-3) + BP.generic_bleedstacks -= 3 return ..() /datum/surgery_step/clamp_bleeders/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) @@ -145,7 +145,7 @@ var/mob/living/carbon/human/H = target var/obj/item/bodypart/BP = H.get_bodypart(check_zone(surgery.location)) if(BP) - BP.adjust_bleeding(-3) + BP.generic_bleedstacks -= 3 return ..() //saw bone @@ -198,7 +198,7 @@ display_results(user, target, span_warning("You screw up, breaking the bone!"), span_warning("[user] screws up, causing blood to spurt out of [H]'s [parse_zone(target_zone)]"), span_warning("[user] screws up, causing blood to spurt out of [H]'s [parse_zone(target_zone)]")) - affected.break_bone() + affected.break_bone() //todo bone fix target.apply_damage(25, BRUTE, "[target_zone]") //drill bone diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index daf10e4d2503..db1e396f7bcb 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -269,12 +269,6 @@ var/mob/living/L = V L.apply_damage(15 * power_multiplier, def_zone = BODY_ZONE_CHEST) - //BLEED - else if((findtext(message, bleed_words))) - cooldown = COOLDOWN_DAMAGE - for(var/mob/living/carbon/human/H in listeners) - H.cause_overall_bleeding(5*power_multiplier) - //FIRE else if((findtext(message, burn_words))) cooldown = COOLDOWN_DAMAGE diff --git a/code/modules/surgery/repair_puncture.dm b/code/modules/surgery/repair_puncture.dm new file mode 100644 index 000000000000..43a48f19366b --- /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, 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/surgery/surgery.dm b/code/modules/surgery/surgery.dm index d417217d7640..86e97b98c4f3 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -12,6 +12,8 @@ var/ignore_clothes = FALSE //This surgery ignores clothes var/mob/living/target //Operation target mob var/obj/item/bodypart/operated_bodypart //Operable body part + var/datum/wound/operated_wound //The actual wound datum instance we're targeting + var/datum/wound/targetable_wound //The wound type this surgery targets var/requires_bodypart = TRUE //Surgery available only when a bodypart is present, or only when it is missing. var/speed_modifier = 0 //Step speed modifier var/requires_real_bodypart = FALSE //Some surgeries don't work on limbs that don't really exist @@ -29,8 +31,13 @@ location = surgery_location if(surgery_bodypart) operated_bodypart = surgery_bodypart + if(targetable_wound) + operated_wound = operated_bodypart.get_wound_type(targetable_wound) + operated_wound.attached_surgery = src /datum/surgery/Destroy() + if(operated_wound) + operated_wound.attached_surgery = null if(target) target.surgeries -= src target = null diff --git a/code/modules/surgery/surgery_helpers.dm b/code/modules/surgery/surgery_helpers.dm index 4b38ba73627b..db8ff3166451 100644 --- a/code/modules/surgery/surgery_helpers.dm +++ b/code/modules/surgery/surgery_helpers.dm @@ -113,11 +113,9 @@ to_chat(user, span_warning("You need to hold a [is_robotic ? "screwdriver" : "cautery"] in your active hand to stop [M]'s surgery!")) return - if(ishuman(M)) - var/mob/living/carbon/human/H = M - var/obj/item/bodypart/BP = H.get_bodypart(check_zone(S.location)) - if(BP) - BP.adjust_bleeding(-3) + if(S.operated_bodypart) + S.operated_bodypart.generic_bleedstacks -= 5 + M.surgeries -= S user.visible_message(span_notice("[user] closes [M]'s [parse_zone(selected_zone)] with [close_tool] and stops the surgery."), \ span_notice("You close [M]'s [parse_zone(selected_zone)] with [close_tool] and stop the surgery.")) diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index f431abb529ab..9ba11750a145 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -80,7 +80,7 @@ force = 10 //WS Edit - Makes drill weaker than circular saw w_class = WEIGHT_CLASS_NORMAL attack_verb = list("drilled") - sharpness = IS_SHARP //WS Edit - Makes the Drill sharp + sharpness = SHARP_EDGED //WS Edit - Makes the Drill sharp tool_behaviour = TOOL_DRILL toolspeed = 1 demolition_mod = 0.5 @@ -116,7 +116,7 @@ custom_materials = list(/datum/material/iron=4000, /datum/material/glass=1000) 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 demolition_mod = 0.25 @@ -150,7 +150,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 @@ -273,7 +273,7 @@ light_system = MOVABLE_LIGHT light_range = 1 light_color = LIGHT_COLOR_GREEN - sharpness = IS_SHARP_ACCURATE + sharpness = SHARP_POINTY /obj/item/scalpel/advanced/attack_self(mob/user) @@ -366,7 +366,7 @@ throw_range = 5 custom_materials = list(/datum/material/iron=8000, /datum/material/titanium=6000) attack_verb = list("sheared", "snipped") - sharpness = IS_SHARP + sharpness = SHARP_EDGED custom_premium_price = 1800 /obj/item/shears/attack(mob/living/M, mob/user) @@ -420,3 +420,17 @@ limb_snip_candidate.dismember() user.visible_message(span_danger("[src] violently slams shut, amputating [patient]'s [candidate_name]."), span_notice("You amputate [patient]'s [candidate_name] with [src].")) +/obj/item/bonesetter + name = "bonesetter" + desc = "For setting things right." + icon = 'icons/obj/surgery.dmi' + icon_state = "bonesetter" + lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' + custom_materials = list(/datum/material/iron=5000, /datum/material/glass=2500) + flags_1 = CONDUCT_1 + item_flags = SURGICAL_TOOL + w_class = WEIGHT_CLASS_SMALL + attack_verb = list("corrected", "properly set") + tool_behaviour = TOOL_BONESET + toolspeed = 1 diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index e818f6056d0e..049c2d0e69ce 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -88,6 +88,7 @@ #include "gun_sanity.dm" #include "keybinding_init.dm" #include "machine_disassembly.dm" +#include "medical_wounds.dm" #include "open_air.dm" #include "outfit_sanity.dm" #include "overmap.dm" diff --git a/code/modules/unit_tests/medical_wounds.dm b/code/modules/unit_tests/medical_wounds.dm new file mode 100644 index 000000000000..69e5f5c2e1d4 --- /dev/null +++ b/code/modules/unit_tests/medical_wounds.dm @@ -0,0 +1,87 @@ +/// This test is used to make sure a flesh-and-bone base human can suffer all the types of wounds, and that suffering more severe wounds removes and replaces the lesser wound. Also tests that [/mob/living/carbon/proc/fully_heal] removes all wounds +/datum/unit_test/test_human_base/Run() + var/mob/living/carbon/human/victim = allocate(/mob/living/carbon/human) + + /// the limbs have no wound resistance like the chest and head do, so let's go with the r_arm + var/obj/item/bodypart/tested_part = victim.get_bodypart(BODY_ZONE_R_ARM) + /// In order of the wound types we're trying to inflict, what sharpness do we need to deal them? + var/list/sharps = list(SHARP_NONE, SHARP_EDGED, SHARP_POINTY, SHARP_NONE) + /// Since burn wounds need burn damage, duh + var/list/dam_types = list(BRUTE, BRUTE, BRUTE, BURN) + + var/i = 1 + var/list/iter_test_wound_list + + for(iter_test_wound_list in list(list(/datum/wound/blunt/moderate, /datum/wound/blunt/severe),\ + list(/datum/wound/slash/moderate, /datum/wound/slash/critical),\ + list(/datum/wound/pierce/moderate, /datum/wound/pierce/severe),\ + list(/datum/wound/burn/moderate, /datum/wound/burn/severe))) + + TEST_ASSERT_EQUAL(length(victim.all_wounds), 0, "Patient is somehow wounded before test") + var/datum/wound/iter_test_wound + var/threshold_penalty = 0 + + for(iter_test_wound in iter_test_wound_list) + var/threshold = initial(iter_test_wound.threshold_minimum) - threshold_penalty // just enough to guarantee the next tier of wound, given the existing wound threshold penalty + if(dam_types[i] == BRUTE) + tested_part.receive_damage(WOUND_MINIMUM_DAMAGE, 0, wound_bonus = threshold, sharpness=sharps[i]) + else if(dam_types[i] == BURN) + tested_part.receive_damage(0, WOUND_MINIMUM_DAMAGE, wound_bonus = threshold, sharpness=sharps[i]) + + TEST_ASSERT(length(victim.all_wounds), "Patient has no wounds when one wound is expected. Severity: [initial(iter_test_wound.severity)]") + TEST_ASSERT_EQUAL(length(victim.all_wounds), 1, "Patient has more than one wound when only one is expected. Severity: [initial(iter_test_wound.severity)]") + var/datum/wound/actual_wound = victim.all_wounds[1] + TEST_ASSERT_EQUAL(actual_wound.type, iter_test_wound, "Patient has wound of incorrect severity. Expected: [initial(iter_test_wound.name)] Got: [actual_wound]") + threshold_penalty = actual_wound.threshold_penalty + i++ + victim.fully_heal(TRUE) // should clear all wounds between types + + +/// This test is used for making sure species with bones but no flesh (skeletons, plasmamen) can only suffer BONE_WOUNDS, and nothing tagged with FLESH_WOUND (it's possible to require both) +/datum/unit_test/test_human_bone/Run() + var/mob/living/carbon/human/victim = allocate(/mob/living/carbon/human) + + /// the limbs have no wound resistance like the chest and head do, so let's go with the r_arm + var/obj/item/bodypart/tested_part = victim.get_bodypart(BODY_ZONE_R_ARM) + /// In order of the wound types we're trying to inflict, what sharpness do we need to deal them? + var/list/sharps = list(SHARP_NONE, SHARP_EDGED, SHARP_POINTY, SHARP_NONE) + /// Since burn wounds need burn damage, duh + var/list/dam_types = list(BRUTE, BRUTE, BRUTE, BURN) + + var/i = 1 + var/list/iter_test_wound_list + victim.dna.species.species_traits &= HAS_FLESH // take away the base human's flesh (ouchie!) ((not actually ouchie, this just affects their wounds and dismemberment handling)) + + for(iter_test_wound_list in list(list(/datum/wound/blunt/moderate, /datum/wound/blunt/severe),\ + list(/datum/wound/slash/moderate, /datum/wound/slash/critical),\ + list(/datum/wound/pierce/moderate, /datum/wound/pierce/severe),\ + list(/datum/wound/burn/moderate, /datum/wound/burn/severe))) + + TEST_ASSERT_EQUAL(length(victim.all_wounds), 0, "Patient is somehow wounded before test") + var/datum/wound/iter_test_wound + var/threshold_penalty = 0 + + for(iter_test_wound in iter_test_wound_list) + var/threshold = initial(iter_test_wound.threshold_minimum) - threshold_penalty // just enough to guarantee the next tier of wound, given the existing wound threshold penalty + if(dam_types[i] == BRUTE) + tested_part.receive_damage(WOUND_MINIMUM_DAMAGE, 0, wound_bonus = threshold, sharpness=sharps[i]) + else if(dam_types[i] == BURN) + tested_part.receive_damage(0, WOUND_MINIMUM_DAMAGE, wound_bonus = threshold, sharpness=sharps[i]) + + // so if we just tried to deal a flesh wound, make sure we didn't actually suffer it. We may have suffered a bone wound instead, but we just want to make sure we don't have a flesh wound + if(initial(iter_test_wound.wound_flags) & FLESH_WOUND) + if(!length(victim.all_wounds)) // not having a wound is good news + continue + else // we have to check that it's actually a bone wound and not the intended wound type + TEST_ASSERT_EQUAL(length(victim.all_wounds), 1, "Patient has more than one wound when only one is expected. Severity: [initial(iter_test_wound.severity)]") + var/datum/wound/actual_wound = victim.all_wounds[1] + TEST_ASSERT((actual_wound.wound_flags & ~FLESH_WOUND), "Patient has flesh wound despite no HAS_FLESH flag, expected either no wound or bone wound. Offending wound: [actual_wound]") + threshold_penalty = actual_wound.threshold_penalty + else // otherwise if it's a bone wound, check that we have it per usual + TEST_ASSERT(length(victim.all_wounds), "Patient has no wounds when one wound is expected. Severity: [initial(iter_test_wound.severity)]") + TEST_ASSERT_EQUAL(length(victim.all_wounds), 1, "Patient has more than one wound when only one is expected. Severity: [initial(iter_test_wound.severity)]") + var/datum/wound/actual_wound = victim.all_wounds[1] + TEST_ASSERT_EQUAL(actual_wound.type, iter_test_wound, "Patient has wound of incorrect severity. Expected: [initial(iter_test_wound.name)] Got: [actual_wound]") + threshold_penalty = actual_wound.threshold_penalty + i++ + victim.fully_heal(TRUE) // should clear all wounds between types diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index a8e8997577d3..14a4aa338960 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -480,7 +480,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C var/crit_case if(crit) - crit_case = rand(1,5) + crit_case = rand(1,6) if(forcecrit) crit_case = forcecrit @@ -495,7 +495,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C if(istype(C)) var/crit_rebate = 0 // lessen the normal damage we deal for some of the crits - if(crit_case != 5) // the head asplode case has its own description + if(crit_case < 5) // the head asplode case has its own description C.visible_message(span_danger("[C] is crushed by [src]!"), \ span_userdanger("You are crushed by [src]!")) @@ -505,10 +505,10 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C C.bleed(150) var/obj/item/bodypart/leg/left/l = C.get_bodypart(BODY_ZONE_L_LEG) if(l) - l.receive_damage(brute=200, updating_health=TRUE) + l.receive_damage(brute=200) var/obj/item/bodypart/leg/right/r = C.get_bodypart(BODY_ZONE_R_LEG) if(r) - r.receive_damage(brute=200, updating_health=TRUE) + r.receive_damage(brute=200) if(l || r) C.visible_message(span_danger("[C]'s legs shatter with a sickening crunch!"), \ span_userdanger("Your legs shatter with a sickening crunch!")) @@ -530,18 +530,27 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C // the new paraplegic gets like 4 lines of losing their legs so skip them visible_message(span_danger("[C]'s spinal cord is obliterated with a sickening crunch!"), ignored_mobs = list(C)) C.gain_trauma(/datum/brain_trauma/severe/paralysis/paraplegic) - if(5) // skull squish! - var/obj/item/bodypart/head/O = C.get_bodypart(BODY_ZONE_HEAD) - if(O) - C.visible_message(span_danger("[O] explodes in a shower of gore beneath [src]!"), \ - span_userdanger("Oh f-")) - O.dismember() - O.drop_organs() - qdel(O) - new /obj/effect/gibspawner/human/bodypartless(get_turf(C)) - - C.apply_damage(max(0, squish_damage - crit_rebate), forced=TRUE, spread_damage=TRUE) - C.AddElement(/datum/element/squish, 80 SECONDS) + if(5) // limb squish! + for(var/i in C.bodyparts) + var/obj/item/bodypart/squish_part = i + if(IS_ORGANIC_LIMB(squish_part)) + var/type_wound = pick(list(/datum/wound/blunt/severe, /datum/wound/blunt/moderate)) + squish_part.force_wound_upwards(type_wound) + else + squish_part.receive_damage(brute=30) + C.visible_message( + span_userdanger("[C]'s body is maimed underneath the mass of [src]!"), + span_userdanger("Your body is maimed underneath the mass of [src]!"), + span_userdanger("You hear a sickening crunch."), + ) + if(6) // skull squish! + + if(prob(30)) + C.apply_damage(max(0, squish_damage - crit_rebate), forced=TRUE, spread_damage=TRUE) // the 30% chance to spread the damage means you escape breaking any bones + else + C.take_bodypart_damage((squish_damage - crit_rebate)*0.5, wound_bonus = 5) // otherwise, deal it to 2 random limbs (or the same one) which will likely shatter something + C.take_bodypart_damage((squish_damage - crit_rebate)*0.5, wound_bonus = 5) + C.AddElement(/datum/element/squish, 20 SECONDS) else L.visible_message(span_danger("[L] is crushed by [src]!"), \ span_userdanger("You are crushed by [src]!")) diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm index 7ef7cac715b5..f4763126f51a 100644 --- a/code/modules/vending/medical_wall.dm +++ b/code/modules/vending/medical_wall.dm @@ -5,26 +5,50 @@ icon_deny = "wallmed-deny" density = FALSE product_ads = "Dr. Pills approved!;Only the finest for the frontier.;Need a pick-me-up?.;Lanchester sourced equipment.;Don't be a fool. Plus yourself up.;Don't you want some?;Ping!" - products = list( - /obj/item/stack/medical/gauze = 8, - /obj/item/stack/medical/splint = 8, - /obj/item/reagent_containers/hypospray/medipen/atropine = 4, - /obj/item/reagent_containers/hypospray/medipen/diphen = 5, - /obj/item/reagent_containers/hypospray/medipen/psicodine = 6, - /obj/item/reagent_containers/hypospray/medipen/synap = 6, - /obj/item/reagent_containers/hypospray/medipen/mannitol = 10, - /obj/item/reagent_containers/hypospray/medipen/tricord = 6, - /obj/item/reagent_containers/hypospray/medipen/tramal = 6, - /obj/item/reagent_containers/hypospray/medipen/antihol = 10, - /obj/item/reagent_containers/hypospray/medipen/anti_rad = 10, - /obj/item/storage/pill_bottle/licarb = 4, - /obj/item/reagent_containers/syringe/stasis = 4 - ) - premium = list( - /obj/item/reagent_containers/medigel/styptic = 3, - /obj/item/reagent_containers/medigel/silver_sulf = 3, - /obj/item/storage/pill_bottle/stardrop = 5 - ) + products = list(/obj/item/stack/medical/gauze = 8, + /obj/item/reagent_containers/syringe = 12, + /obj/item/reagent_containers/dropper = 3, + /obj/item/healthanalyzer = 4, + /obj/item/reagent_containers/pill/patch/styptic = 5, + /obj/item/reagent_containers/pill/patch/silver_sulf = 5, + /obj/item/reagent_containers/syringe/perfluorodecalin = 2, + /obj/item/reagent_containers/pill/insulin = 5, + /obj/item/reagent_containers/glass/bottle/charcoal = 4, + /obj/item/reagent_containers/glass/bottle/epinephrine = 3, + /obj/item/reagent_containers/glass/bottle/morphine = 4, + /obj/item/reagent_containers/glass/bottle/potass_iodide = 1, + /obj/item/reagent_containers/glass/bottle/salglu_solution = 3, + /obj/item/reagent_containers/glass/bottle/toxin = 3, + /obj/item/reagent_containers/syringe/antiviral = 6, + /obj/item/reagent_containers/medigel/styptic = 2, + /obj/item/reagent_containers/medigel/silver_sulf = 2, + /obj/item/reagent_containers/medigel/sterilizine = 1, + /obj/item/stack/sticky_tape/surgical = 3, + /obj/item/healthanalyzer/wound = 4, + /obj/item/stack/medical/ointment = 2, + /obj/item/stack/medical/suture = 2, + /obj/item/stack/medical/bone_gel/four = 4, + /obj/item/reagent_containers/pill/morphine = 4, + /obj/item/storage/box/gum/happiness = 3, + /obj/item/sensor_device = 2, + /obj/item/pinpointer/crew = 2, + /obj/item/reagent_containers/glass/bottle/vial/small = 5, + /obj/item/stack/medical/splint = 10, + /obj/item/bonesetter = 2) + contraband = list(/obj/item/reagent_containers/pill/tox = 3, + /obj/item/reagent_containers/pill/morphine = 4, + /obj/item/reagent_containers/pill/charcoal = 6, + /obj/item/storage/box/hug/medical = 1) + premium = list(/obj/item/reagent_containers/medigel/synthflesh = 2, + /obj/item/storage/pill_bottle/psicodine = 2, + /obj/item/reagent_containers/hypospray/medipen = 3, + /obj/item/clothing/glasses/hud/health = 2, + /obj/item/clothing/glasses/hud/health/prescription = 1, + /obj/item/hypospray/mkii = 1, + /obj/item/storage/belt/medical = 3, + /obj/item/storage/firstaid/advanced = 2, + /obj/item/shears = 1, + /obj/item/plunger/reinforced = 2) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) resistance_flags = FIRE_PROOF refill_canister = /obj/item/vending_refill/wallmed diff --git a/code/modules/vending/robotics.dm b/code/modules/vending/robotics.dm index f35b92ebb2d0..cd7f9125f4cf 100644 --- a/code/modules/vending/robotics.dm +++ b/code/modules/vending/robotics.dm @@ -16,6 +16,7 @@ /obj/item/healthanalyzer = 3, /obj/item/scalpel = 2, /obj/item/circular_saw = 2, + /obj/item/bonesetter = 2, /obj/item/tank/internals/anesthetic = 2, /obj/item/clothing/mask/breath/medical = 5, /obj/item/screwdriver = 5, diff --git a/code/modules/zombie/items.dm b/code/modules/zombie/items.dm index ee5ec6458960..ac91a793b726 100644 --- a/code/modules/zombie/items.dm +++ b/code/modules/zombie/items.dm @@ -12,6 +12,9 @@ var/icon_right = "bloodhand_right" hitsound = 'sound/hallucinations/growl1.ogg' force = 21 // Just enough to break airlocks with melee attacks + sharpness = SHARP_EDGED + wound_bonus = -30 + bare_wound_bonus = 15 damtype = "brute" /obj/item/zombie_hand/Initialize() diff --git a/icons/mob/bandage_overlays.dmi b/icons/mob/bandage_overlays.dmi new file mode 100644 index 0000000000000000000000000000000000000000..4ae654bdbfcbbb3d0e78c24ae06858687d4b95a1 GIT binary patch literal 2368 zcmX|>2~^T)7sme}xKN_fV!3?jWG>LC<3>)JIqp+#nTDg7jhb67;@~!$uhrUgH&WgCOpMDaP=opp|av?H4 zF)}U|08-1!Z;wUwo2vdYG3j%4Hb{Ik+T_6f*=IdD-gV^GV1qN&51x@4-FCA`k7i1@ ze^{brC^T-3E+^sMbJ}~m3wIvT-fH1az3E;q4H;t&F@NWqou`XFdPhC9uswx(=~QH9 zyDxCf=u8!-8+u}0eE*2gRUBgs$0#^ntB`(D09TUS{03@WzzQ;ondOO4keF zS5b4>1uRPU*_i%lHl^os46}W-$d(hPbFI-X&L8aeZq4-Q?w#48hH}>4@+X+-ct(KA z_`#2sg1{#qQj3_-=MNOC-1oYcniWzeR+R!#KA<+?osp5CX^GUV#CWYz;Y$>}#n->*vl2KI(U7&mfZo?Zx$|y)p@wVs|hMQH=DmdB;AdYzBTN+6#i;qf?1By z-u@Z&znI%ahX)q*)-Fyij152OB#j^@T{BytLUSgMTKBiV&6vw?C-*#{!7aI>^DiwPWmNaBv3AOjAfngOk+1sp*OeL8pDLQ!=WV=+lWc%wVE@M3 zY>6`=!H6<$=ey8I{e#8!OWw2*?d$Of?5#N?A>92PHsh0=u0RMWn2e)L_(~c4r>s-= zrZzT&KFJpp0v6GnxjO0e_NR1PvJ%{+c!+FBP5)4iGT7zm{AvGt4@H2y0D8K*RW{MxJ>tR2w zqk~*-)lT7lx&9MewWe9s^o)v=m;+x(Me+4RoAL7X9S^ zGAe05pqVUH#Z)i9Zkxc`K&{pJ0U!*s{=m2FEg0JpDCq*5&8_fnFGjy!so>XFtpQr+uL%N7 zK#8->no##{StRLfk#kVhkMPHcH%g4vP;;Q7)fH@dqTI`Al>A5P%RNrgf|GU)6B8*s zXaW=?Kw^kQfopy^Je5sSF9v@xTegc+L^m=T;>AH-ZFWmNNG{lhD5q{zGn*n+bB?Mh zwQ~0h+A&`lYJDf>;uNyiiaJOh-woBlxIentT0*QcY9Xiu>eqmqX4jM9N2d|4C5e&> zP=pUehoO4Qvc*jY3lOw&t_?uhoa@aBz;u3^f$K_Fk%e++ZCBD%US3#zB<}PD`v$K3 z9$A$w4C|c>RGpjPsp2nH7t8I*{z~~pi<^&xCZ~!nlHOh6;~2+qrB?4N@Cqfn7r6GV z>7G#!Sg^zPHdz@e40wEoovzc_h~V4eb_gh90EwOZITHmWD~k;)wF_rAl_;5Vg*7Oh zga=pnCNN%*0BueetJyu?VB;H1I5OknH^qJaMFr2wfq6eo`# z0Qu*-1(O|5eW7~E5cQwVY$s3YAv?Mn1T8_y?}w4<-t+k|<3|3VUFFm~HMR^{NHltkyW;;~b0w~aVCdV)-|fMAE*iLDNG0C?&{er3^M#5FW=}h) zKjw#4_1tyar|%!%f#_iJ1;&zm_sm8a{>}Bye5x`*KG;p52KWwj0XvPr@j~5*LpiZx z6F*4?;?B+TGDxbTMPk2}PFIAX@$7%|rVz=Q{PFzIxFW4@UV7;~R4dndI%3uCtJ|r_ zzxIY2nR||Sny+RXn;`^SFa*SXOQOf}AKF%D02FN;DEu2dtcZ88D}_9V;&l~e+c@rR z>3&&jv7D6^bR6~_28AqY*5Almt!u-7?kt>*f-_~@5J9VfsFodaMr z)$nhsish^xADpHqd?on5)}8ajaSz*@1WHL&(80$Dp4(Wfncfm)C3TtSU}4Sl82kGV z>^`capJm_1ch;X9+_j@}VdN}85o{iqC23$^jfjs$5%eF%h$A}N=El0S)K>1dj%{p= zZ_o7Y7fU3vjFKfRRyHJI^Ze}8%&bp;VR4sdR97L;@Y+Ii6aH)72lk}O#&B?>D J;fLUye*lRdZ3+MY literal 0 HcmV?d00001 diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi index e213c294d6696b70da1b68a2be600940edb6a653..805c0d6561f9304050ec857c1cbc0147b101dc11 100644 GIT binary patch literal 45134 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 literal 40176 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�l=b4lD6VZM?6T3=^X$?6# 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 L=qOh{whsFrv;VRO diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index d324bd882a30..5ccbd9599dae 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -63,6 +63,8 @@ h1.alert, h2.alert {color: #000000;} .userdanger {color: #ff0000; font-weight: bold; font-size: 3;} .danger {color: #ff0000;} +.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;} @@ -72,6 +74,10 @@ h1.alert, h2.alert {color: #000000;} .rose {color: #ff5050;} .info {color: #0000CC;} .notice {color: #000099;} +.tinynotice {color: #000099; font-size: 85%;} +.tinynoticeital {color: #000099; font-style: italic; font-size: 85%;} +.smallnotice {color: #000099; font-size: 90%;} +.smallnoticeital {color: #000099; font-style: italic; font-size: 90%;} .boldnotice {color: #000099; font-weight: bold;} .hear {color: #000099; font-style: italic;} .adminnotice {color: #0000ff;} diff --git a/shiptest.dme b/shiptest.dme index 472d0fcabbcb..0717ab5dafe2 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -166,6 +166,7 @@ #include "code\__DEFINES\vv.dm" #include "code\__DEFINES\wall_dents.dm" #include "code\__DEFINES\wires.dm" +#include "code\__DEFINES\wounds.dm" #include "code\__DEFINES\ai\ai.dm" #include "code\__DEFINES\dcs\flags.dm" #include "code\__DEFINES\dcs\helpers.dm" @@ -542,7 +543,6 @@ #include "code\datums\components\art.dm" #include "code\datums\components\attachment.dm" #include "code\datums\components\attachment_holder.dm" -#include "code\datums\components\bandage.dm" #include "code\datums\components\bane.dm" #include "code\datums\components\beetlejuice.dm" #include "code\datums\components\bloodysoles.dm" @@ -741,6 +741,7 @@ #include "code\datums\elements\firestacker.dm" #include "code\datums\elements\forced_gravity.dm" #include "code\datums\elements\item_fov.dm" +#include "code\datums\elements\kneecapping.dm" #include "code\datums\elements\lazy_fishing_spot.dm" #include "code\datums\elements\light_blocking.dm" #include "code\datums\elements\mobappearance.dm" @@ -879,6 +880,7 @@ #include "code\datums\status_effects\gas.dm" #include "code\datums\status_effects\neutral.dm" #include "code\datums\status_effects\status_effect.dm" +#include "code\datums\status_effects\wound_effects.dm" #include "code\datums\traits\_quirk.dm" #include "code\datums\traits\negative\addictions.dm" #include "code\datums\traits\negative\bad_touch.dm" @@ -954,6 +956,13 @@ #include "code\datums\wires\syndicatebomb.dm" #include "code\datums\wires\tesla_coil.dm" #include "code\datums\wires\vending.dm" +#include "code\datums\wounds\_wounds.dm" +#include "code\datums\wounds\bones.dm" +#include "code\datums\wounds\burns.dm" +#include "code\datums\wounds\dismember.dm" +#include "code\datums\wounds\muscle.dm" +#include "code\datums\wounds\pierce.dm" +#include "code\datums\wounds\slash.dm" #include "code\game\alternate_appearance.dm" #include "code\game\atoms.dm" #include "code\game\atoms_movable.dm" @@ -3514,10 +3523,12 @@ #include "code\modules\surgery\brain_surgery.dm" #include "code\modules\surgery\cavity_implant.dm" #include "code\modules\surgery\coronary_bypass.dm" +#include "code\modules\surgery\debride.dm" #include "code\modules\surgery\dental_implant.dm" #include "code\modules\surgery\experimental_dissection.dm" #include "code\modules\surgery\eye_surgery.dm" #include "code\modules\surgery\gastrectomy.dm" +#include "code\modules\surgery\hairline_fracture.dm" #include "code\modules\surgery\healing.dm" #include "code\modules\surgery\hepatectomy.dm" #include "code\modules\surgery\implant_removal.dm" @@ -3530,6 +3541,7 @@ #include "code\modules\surgery\organ_manipulation.dm" #include "code\modules\surgery\organic_steps.dm" #include "code\modules\surgery\plastic_surgery.dm" +#include "code\modules\surgery\repair_puncture.dm" #include "code\modules\surgery\revival.dm" #include "code\modules\surgery\stomachpump.dm" #include "code\modules\surgery\surgery.dm" @@ -3551,6 +3563,7 @@ #include "code\modules\surgery\advanced\bioware\nerve_grounding.dm" #include "code\modules\surgery\advanced\bioware\nerve_splicing.dm" #include "code\modules\surgery\advanced\bioware\vein_threading.dm" +#include "code\modules\surgery\bodyparts\bodypart_aid.dm" #include "code\modules\surgery\bodyparts\bodyparts.dm" #include "code\modules\surgery\bodyparts\dismemberment.dm" #include "code\modules\surgery\bodyparts\head.dm" @@ -3617,6 +3630,7 @@ #include "code\modules\tgui_panel\tgui_panel.dm" #include "code\modules\tooltip\tooltip.dm" #include "code\modules\unit_tests\_unit_tests.dm" +#include "code\modules\unit_tests\medical_wounds.dm" #include "code\modules\uplink\uplink_devices.dm" #include "code\modules\uplink\uplink_items.dm" #include "code\modules\uplink\uplink_purchase_log.dm" diff --git a/sound/effects/butcher.ogg b/sound/effects/butcher.ogg new file mode 100644 index 0000000000000000000000000000000000000000..2e4a0d2ddc71995b05e2f55b4d981de6496a2097 GIT binary patch literal 9666 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 Zjg{^ELdF2RwSE3Y_oA>X6rlUJ_CK2~E9U?J literal 0 HcmV?d00001 diff --git a/sound/effects/wounds/blood1.ogg b/sound/effects/wounds/blood1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..88c76eb9e34f480a78fb64ff36b1533590a670b0 GIT binary patch literal 12388 zcmaia2Q*zz*Z0wh-b+Lmu71@J1R=OuT&@}+dha#STePTG@8yc#yC5NYiQYnxC<#IY zA<@1={?Ge7-}`;*eP_*`HD~tB-ZOju_C9;gx*AqiS^zrmPeI=M+u?rlRu_!{&C|)% z)W+?42raPvpDA8wH=PzVjq8>FRjyZFQ?M+IYe`hE{;x8K@s|-dNY}G*w&v4twPLcj zG1a+Y&!o&GC;$}{5EKw%;?!_(v~hN|aIjVafCKlKJhLq_(}n8iT*{?#xE zn^OV+CJ@Mp7hAZgY&#}yMZ*#6nkR0fe(yCCPL$@VI9~VhT{FkxhGIL%F$g;@p*|J> zDoRF)IgA2+-Izu&htq(~OM2G<=GR%Sx4263f^P{9FomcJek)2+m-tpv7%Q>O*)T4L z&)YBwQ-#jxm{oOP8~M78iEm~7)8O5lg9+S=95$^vi5%`V`v^#Jnk&fa@3EMGK=7D= zVgiM7EyZvx{pbXn#!ntia*+uk1ubng1Xw(bbUiKRJU!+-{q)nq3|sv4Tfz+I!;DVC zp3#K=Q&0U?POj_C(V5VIJXZ0PFOUKjx`NN*1sI{>73hHZwMv-q5?LULh04X2wpBKn zP1fa24#Rak!*v8VQ$QnQUhf9Tv&ks_f2yT^ipBq4WvmCd02xr1{Vw$VE^G>LwtiP0 zoEr@f0H94};5@yq!isLf{ce(ARdkmhM5>M+sS^Lo2-ju@02wHKuM7Pks0}#pl&grY zo79|}+8n5gYmNNRCFlk(;6a$PEmLd*afRZa-KZrHWJ{Be`;g$TByd7R{yI~}c*fzV zI8nw%UMWT9)VoOSOpeylw9Fd|+K$$lSd>1^8haB|mg@{7ebrC=^*PGWG6BTCAH4nT?+Ud29wm4-Zq z({iBPgKtjG1OTBVHz@vBa|7kSC@xBj;u_+t9}yhpxo#?Y#w2!XdPp7;KtUAqh=3@5 z)wr4CRwb@vhiaTP;6@?gFbL|eM}bCVGLM(VroC~J@HE#U$ZOCm{?l+j*glZnnfQjFXFr#^ol{vqaxmU*2;r|_2|K&LV=ro}>K8ZAq zf%a#GsLSE~HSoVY$AzLlfqpQ7O{I=aZIWm7r?AGM@C3Pnrm&h8rO^bX#}t)?mZ;H` zh{Y7bV#d>Ap~=Fq*-yXeABXwtHY;-;|KT~;F2W)n`$Z`c^WUD6#~J(iUM#C}BAb5V zU7r-I$c)nToNuKCxBi>wSVz51i+UXqwG|P|8JS`enNikSU_Vr~)AqmC|MDC~S2nPM zo}=K(_8*?}7E1pR^rkul$rn)>aIZjp9TPcxA6ojH*rK0&N~AanSt{nw59%M zj{&JO!fI2(pkk8&fEEB)K_iEfM7hSxIZEl_LO0p4^2M?9-_wM?CJ`bKCuDJtm*tRZ zNfhrPI9!EuQp&4_ykZxNWg_e@exkf_4;Ku3n1Ch#1VRU(?`d4eln3+V$DnxG$N_N< zRMMm}gg1po2*O@WX7(kka8h}&2uY(7m0d(;7Fh`{0&u_|e*SnoC7KKc0GJZMZ$ZM4 z@G;0{JbVbcK@W$Czs}Mc6UV(1It0be4k3Y{=(WZm{q&(DvKv_;M@t%XFTg*l=crRHHsTn zqKLUB5lwf5Cc;8r8=>!Mp?`wVo%K@zsak3aln6ua=Jjxf@-SU5rGQ~4Xt zg{}SaTcf$=JU8P3QlHIQJZtt?;k3!Hu`MVm%it_4D=lksD66V8EcjYhP&QO&RaR9o zR99VIWxoSbt4hl1c*@Fn%Ihl5%6N8~O3Kz zl{F|HkXkm2l~RY?M|-Y?wX;x{hc=c1`lRUgvT<{=!-6R z4hLhe9K(~aI*0pRm1jdBgUM6z4^H&0;Iewh+u&H=A@_r4_hM028Q@OKDl^N<3MbnU1NiMNG6||8$IwI8i38bMWIE))yw2g0^epT(uQI) zyQ#x^>5-3Nw#>+Bu0AI1SmlANBr=#a1UU)E$wxhg+2tc=;dZsf)282RU$kFTw!S6TAX4F5;EY?jhl;Z_9DNg z4Jxi>sDN(>x47109Wd$yVgNFMcouorA>`U^Wh3BY$~GjfBjQ|mawFm#rLL-S5C~#K z7MHzoOdJB~ofXGrM^UM8@%HN2K_K8Mc)`5m#%;0HB74zp5$fXs@}L*@F@bRhn-)bA zGEP%OVMfA&q5OXEf)$3<&4Cd&y4eGKD*gpt6M*->D|dy5{-=j_Lkdi3Ci z{>Bj#0#gELIFq}!AQx$@SKNxkbVU3sy)YOV=|hRQ`m#cZWZta5;k+QH`d#TW~@i7&FlUpX- z!EUq_0G6&-EEeh`>azCk@;&_MOmh$k(D! z&^-AMVd9+ZAW9$*5I&$sBMo5bZg4mkJ1XTmbW9t-ctPGc?5J6|Eht3-7u7I*Eoxp? z34)q6h~@=d4hBA&#)yQ&!707-rWMelNjT`AG-ef`0~y$XTestdG|rmFG=lmEBgCv} zw8*RhKCtTO3bjZC{CDkjE(k&t<2nkneq}2hVzC!q>&AF&Jpcm& z2>`%l-gXBvJHXVN6`G-U*p-0Ra+bp&%JF3Yq~>P$(t@$g6of4t;`&xlSf{i{Ms&sN19s z20#)zK#&ljM?gki7F1v=0q8w38Ndl7c=f6w8vm={TP&j`52jEiOy-DQG>Z7Z5OPQF z&x9H+@9-oPP((L3;#B}(0Dwe7CKi?q@mQib;&_q-(nPW(awG^}0H{F=BnAT6up%NN zEMp6MzF@G)n}-&?U&my>AzwGRxPPxIm^b}@Zp@GVlCN*f*J3WYr$*UWic5QV1$g;q zIfbDj{JaAE0(=6CQwxjBtB|{bf~%9uvkTBCBF_NWA4Z)~5|hU*8%_1knck~tyA^zR z#^S;~l=-3hHl{(?G|%_dKui&Kjqs!3hmyT+f%QrAKLA_yTG~(Q|-e+C&{;T6}4jo*pizno7f< zj6Ro3?mSPtlv3Xn-R#PQlBT7d-Im~f$!~|BCM>3b3U2HAsVTbN9y9?sQFQii_K<8- z3#Fwp3}z#TYQk6x;st2N`8zVpX(oQTceaOGaBPY^mmR+_J7soxfZN~XIip@gP?4La zi9Z!$Ms%F?IChjbQ)<4d7yFY;_=YL5^{EI^NTr2qnE5C%Rd^`G$n|c7>p+=~neY41 z(u8qzLV@DTG+sMi%r%*d+<;u6`gwODriGYUYtNJIlfLIdtwuDGs9UzLrUH!B?FT~D z$X#+7nts1RaS(kFpIoqjhYpoS6_k8XhrGt`Wzz8D{IH+f8kaA^5bfU>L`q}8io7=^ z$WF<0yNBvsc8;)(dD+ob0Foh}W+&h-VE%Ds<-u?ruJWqj<)u|$$#XUg-?G%uoTob& zI&(TMsjGMNo@cVUw@e-<2C}SO1$+g+oiO9y!)NNL_7{1~{3(F?n9`z^!Fsu?M&kK` zoZaE)qG`;zp*Xk%TQEoXZ9tW_dSkKViFaG5+@E1gNgwZR9I4m5i?6ry^`mUH3ij8{ z$SaQAbTh|PpKeVAX#kR>#vcf=8aaYbgz$@=If;qbk@cIsn=tp--fAfS0kNN5mpeEj zHPudcoceReoU$5iaY|_`wvz7;x>8Sj`C-WB{Oq5KZ`@(1l_#@a4(q&ERI$d@Ci{-d zaw7m-XUQBcxJu5wh4w~jW39hkDoS2Srjc?u`IjDkhWwq~8s!Y4a`8%0tL79Z)Az?J zYbIZ_v-GXJXFHE4UZ3pE6`Mb?e<}SV1K9DDaas_9^D0IV8_7CgCa$2q<&W7n5W2PK z8gVhSJ;+X2Ulz0ZmC5_Cn08{U$m`hV>fG{PoUWtXddQoMoF;{eCn?IWki6dRsL+%} z`^NS6jwQykciP5CgqOa)bDQnn53@bNGbx+Im(~=?`sG0tphvkEfu^kF*J&FQO80%B zm;Kfo#&g@ed~ASCaQNQA(s8HI51Y+Wv@F5c%YJru603`<5L5qh&mMut+td^f!me1B`slPb$UsQ$V>GA__ z#H$ILwxn95qw{0 zK-a8y?$81?xi$}^a_@|$ZRgA~6H$cKA7x{2Q#nR|moE*o;o0PoQ%SCDd0k$_Vli=l zGF~IHoQ-dH@OyDXz9u8Q&-0x~IRn(HD^W-{!)K&P*Bww5R1se(wla!W=3hZqDy%}6 z9kfQi)iSCcwT4-p!FDw9l2}Blo4FlQX54Wuf{qlb&2oMzIpGXxz91AO`tjUIcyYGI z2{^y+V4qwsmn`+VO-I4G60@7yFyK{B9G1MCms>nx-;X69e5I|$v2eSs)aB}&^3#{R zX8z@|YPl|kt8$^w1w^Kxn^t2o&g!EGbOkhr%T5hk;apKXKx{^y|EWxiVmcRN}`2dCGNH81s-_1$Av zW^a9|I3h93%hZ5_^^dt0nt7itz4Ax(SmXY8TuBD`VSsaF|WWqFPNs#%V-W2`i;TY z+DR2%-;``=JfiSFE%x6#zhFOtH20!8kkM+}`ws*OYfp}zeinxL{egMZ3N|-MFZo+# zI=E-2{=h8JiQgHE*NH)=ltNQ>VoCVPyapMQ&2>)cyxFJtJhD^Zl~ z95rja!)=&8GP3;V%w(u_dCoY?4}~4wSoQS&6w>?Wn7`JX(2M!R^M{1K$;vBtlxoFA zo~?g84jGAXq*{3D(VKAVA&QUq)r?BA{&$uE?UPWYy|oKgNeMwpxRz9NodUppThp8HNTa8G36f?p)YZcm`Q1?0;^L9BxNxm!C6V3 zf;7AL-e{f%cc81Z*W}ajY(2|3x6^(xwKuJnx>O*4iuu$KDi*(yTf}``1niE{oE$0g$>W@--+4w>1|oAr>lJe;SU#5*1X57Xtmz=ZM|q)UH`(CpVP=~_EhJQ=86vgWX%3XUX=(Ta7o+9j1%4m z;NMFjbdmy8xh2)4#7SXP4e-ufr=^Z|_Tuk254w_&l0wq@{+kuh_2KN)eNDI0m!$%{ zN>;`-4oot}|S zd`^W}3W+~B?J!(K)ux|WQTw@h4AHgqc%SsA)ml)jZ9)2h0^tGOYS`1slPcFAbw}~g z2{?;~abE4P*h`bznIY(ieH*1{eQ8&RU1n%anjGG9`)7I9O4z^P4lV?VFOBkJ4WjIm zg$8eRmNv)$i3%7sl07=jZ7S-)&bj6RbhwFyo~jqKPujaQs&g)`K3QJ<96xk=G87=p z`s%lJ#p_uIMETeOeaIX>hE?kkE=l)q&#p4%+>4j|?DnkTE-_OiOshRB-`~|-?8bNau#BJS3G@#!6ZaBkll;# zt+$OO80fW2XZfw|8?}DN*NrL*uQh|3Bo$4c9Mo@{sUi7z6TwaNI|Y3zNzr|*06p_IY1*F5{& zIEL?}II~i$GDPY@YrW>M>B4F3;9$_VoIlG%{#cEHZiI9r;U$iwlppz^^_yB$Vc4Ok z^8)7g)14`0uVcbUt*joYnC>HTr$5RqmJ)AT2v zreUTHo0|BZ_)r!gR?Fm6IROpV;yq>-hy^pEG;mGBBB$#%D0A#)NWXH1EoX`?oCdw>PuC z{rHO?U))-Kjf6m3Iyx`hoiai6OJzBbN6)G+SagK4w5GXT{HAf@fVWpj<8)GW{a_f{ z5RzaxM0v`Bg?y@@Ek`o(OnQz$m;^ZY`No*8s4tZ{-)PJqfi1g>w-vA%*I4z@=&q*f zZE1erRtI2_dMN^iUN1v2I!$x(ZM_o=-82$|wTn4+Oe$_p2R7-g?@teq<yckGI|Am{4yj_!>;Tt9|4<|Xc}T9u%H}qy5!fLbd(8RK?Vty1Agsb?13LI9<*og zWM0X`cZp@ek1;uIyN7naio_)6^Dr1P8lZq)9>eVCFSRwg?{4Mw)sCi4&T4StzT~^} zM{LyRL8hN4=Yh%X%V^25qhS?dKW0rukFxvUBq(Q5Ff3!acFBdXZ3u=@O|r-}3Twkw^CuJ) znf09%(Nk2l2Po#64Ra~q9iyRw=@2Z0oyN&aw=l5zeEVgM+T+`b-zOWD+|TA!*9CM{ zKNb7jr=pv?#423e!GZ3P zNoK6GwKQ|&)O%|w6nj{HLT9ABH|q-~q4*C@=(?w5O(c8A_yuk^c154?su{&}`GcTa~k`KQhsz10KEvYP}>akcUi)47j-}6Uu?s?aJ@;e=> zNCsz|Y#CuiwPr?=?o{dr{Zpe)_rAG(USg`QN)OtxX25e(r`hhai~2xAIN3b2AP{(ReVsq zkpSWGi{A#EGR^Cc{Ss6b%jMI5sQL4~l?=>_GxE;t{V7aYSHZA!KSln|Ig=eA+P@@& zW`c%B@vczA;^6(!*Jp3XFu&0d$ybuu>61I2&Z`bNHy-TN3K}EJ%P*`uT`rj)d~bF$ zBO@R_ODLf-E)zBQW*Y~`S7YqpGFNtR)o{$PZC4I(POig~=?9GOGMp~I>+r0Ib&P2@ z$=AW146$aV)02w-=7D5T92`2bD|UyNjd2raW)McU#PC+6y3Pa)w`pQ!KS3T8BbcQ&^@oK%D1DZBDNRDSI`d#> z#;t4qW$mB#HM?{CC4#p2Vw4LoKT?Y)a zR(o%9eERy9*mm=>$#>ymYQKA}V81VEiXE~YpQhs&=poS1^kgu-vy2P9r9Lr4KYAU% zx$)DYJamF>O?50_#OB;*jBT>n^a(>zNaaUAevy$ym2;EqLi&riE7DjwibMkkmcu6o zJChQ<87)OMZy%&qoxc{@FVdppPTjXTm%8}AGogg*e@}iU;gK)bIEgV4$5dH}?M21$ z?QKiwp`Bv$m#IqmxOQQR0fTwcO;?2(APjlbGg*1pYctyhaAVfDv}e$n=R$hq*s47d zgueBD^k!meM#Z^3Y4UD*{}m<9{9u6I2%jfRMZwzw$HX-+T@^zbh9U*fO42u6XWPFr ze>JIyLU}}lHBnrg8uNMm9-q4UPQLK4TKe`<*OS`pLnEF$Ltnf3Z$GHDQV(%wilQw! z-y)06cz%aAq$ z1OXI+v~0`bW0?PQR?d4SWbB{iX2QC^;-|tQ^x`6~_d||X!Y>*@+5;yxl|;>Cw$*jh z>@g}-+RMX`Be)kkwq2%V3_(dUz+>yvd`g`{OwN;vI`$z8d_om+5j!L^X_e_w1Rm#=+*HEY{|(gHC`6)x4J^-ucCD7(+4{kyQ%k%_jqL;IJt>+ z+&c1toSm?HDb3A{zHLpQ6?TN8t8;9z-xe)!eibJ#*b)Za==g=!@QdRzCcW$nzRx|P zqQO0)Mf(;Srf|RDYAM?#0=VOa@6UkVV*v2Q0Hnj{*`BaPVRg{2J3pl&&NJYJB_(L* zxX<4i@fZIQxO4Ev*Q%%eSf*_`?_K@yYsNTx0%=M~R6&{~XG_iL)a8IG;e&&ASLD3& z;9?y2H2b7)&5Hx~p;rl1nT)($NeLKY>QBx&83X$3_d0_k5EyvgK~MQ_*FsA$dOAxC zhT6aDsm>PFLZqoIlm9JfRL7kl$tk?JW1R5@&L{|O>s_LY?yU9ETDLpna#J029n_txSesxs(yl|ke%e~`ezF8Nuz_#t zGiI~^N?5vX)J^426NjS`aALkaTerYlpU@-4V~T7|d3z;!U`OM>tUpgDk`so>?oUc2 zDf{KOT79>rL4D@g(G=Tm*!Dxc_xtaYZ}E@Dg(xBRwyv9`=S{{E#(eai_d>dmJo z;sNoA%)%yeiYjkDQ-0NM_8umR*KBTPQ^(DB{B6#8_!%>Z_Wkc?79USSy%n1Z+t==k za0%WMJ!z6Lj~FqUuChegZ> zdY5XRY*x-|j|DsHBq%$>vK+r9g%&*2F2+6zWdC>@P)aI;(}$r0BO%SD)?F|^ho1^< zej6H@g1*797=5<_zIzRMNn0euuk?7J(j}8x!x_6W<)7tC(#S32%{(kV;F<=%nl8#v z?|zQz!)<)MJWDpl6|m`GjP=kUwB%v#miB4Qq@HJ;mXc6Qw^~``lL;7xh3}TF{&oeL zD<{c`kf83QeibsrZ|(Q1md@R#)MQJ=REN?Q&QQ$GFt#6@wU4p$kEv`)Q+LIjEcFaD z>qHF{cF_ObT}7@fM>zxoWSt%$X$I38a-_G-hkSkm3;B)`M(iMODyL)!ztFka~a zcUV5DIISMW1=_RBKgnPGiO7ouHdVhj+j84s7T+l~%b|~Cbdd5$d2bS2#egx+vyxKK zd$CJY#mcUBU|vuwT9ZY76sW3Bjs691WDyA8c?L;h?I$2u`8M`rfNeRh+q z-z5=e*o@xC-WZ+SB|l{9LEn7O3sdrv3CajWH79=wOF$qhbspJ~1%B&bZ9AUb`19x6 zqs_Mmtg)%6&qLFRz71KuHFq$o^%bbZ>8IPWjTZ1;v5>n@R--pg#vCTdYH3e2@#Gc= zav0*hcT#x1#3p4@*B)c-?!e~Cuf!l7A2u~&DZ;tm!Cg=?p;BtYadpf^H!nI{Jnv4< zh3n9{PJbFyaXF1*x)j~_8mvw_Y3$Fz$H^|e?K?O>3ZyEXQVwat?-~7`XgujH_ zs3)E|#p;Re`0&qg@qAq*Dp4nxs=p#}5A;&aeuu+CGBs#5F3mw3%;cy>n(k|8QkZM6 zDXyNnfVL~U;|9C!g41;OmU`gDu}pUIr()sft!f4jMg}JU%-dN0VaONfhk%4i+zGtUd;4SoPJPKjW|*R(X2~`>?oXdEn6ZoyGaH zja&Bwt%DOf7jNZ)A{WC_#4qLEt*9yl-SX>S?8Y2qU0pNP<~UFvU&r2nWV8l#6(y*X zYl^I zJ!URx!;RjF_jh>TF=5+)ugy*n7w2new{%LG>*OCXl+ISeVb&=`f$W=XgdgJ=Y$Hd# z#EOlMKl_L;4%`*}E?w)eP#)8nn`gmSPS#JP!vAvL)M@*h^qkh78Fl?)8cH>G#ShKp zv1IYnMaQwY&!Vx*`TXHua^z-7!e+WG@26_75ID9rW~6_Dbd!)6oCj816qF}Vey$-- z(|EfiWoB~Wbmmx4Fht%nTIj>LA*Hq$7*y=j-Qj!R0vokQAs)*7~(Jj9itcTgv3jI;aS@1AZ&p@1t{9v9Gx1FB_eH=<6K6MCNx5rsl|xeA6OnKZ}o+WAvV4c-fns z>o@Jap;^E_%nokY{^K_c0ziaC(J&|s$6U8UK02NS?XC6UuaBqq`^g7&1JYE6x-Nb? z@Bd0V4&Ot2A{qE+0$NMUb-kyHO7Z>ECxs_uF1r#;HNC++c3;HEb^d(y! zs^&%9vX+4|{`1MlV88{?b1F3K?VKSDlHOa9KpHwzixy4){mtvqRs>ylA@O zX7x{42K#;9nWxj8E4z(dS1S*9r^ri7HGUS&Ji-iIzPMVk3t)t6OQ()90QG%(w{sAm%Bg2M>U}ALg;53*_}8d8VyqwR>{_d| zDmbg1Pd+_3pDEeY(reuKmTYhv1>kR6bS;1G&m=vERm_V!;zPW&l+19EVy=09$$CIpNf8lDXjv)%kJE{o$& zQ>tJIlHYOPT?a#sp#%IV#NQpDt3gMmSQ$3whBy@SG(w;B`zzs`;( zW;XT&J5!wFUJVG>pSF}u&4>_y7tGeQMR&(O$|L}Q2mrXtDGTTLSSgp~7Au|1&$Zlw zx;0Yrb5pvJo@tsre+OtCFE{{j03 zF8N8WH=2zflU6(e~+H~w&i~h9Ss4BWDWA>l^GaG#tQ=mM`AJ?3V3ay z1kIO?QO+*0D)*t*_+4)Ht!fS&Xiyty5d2*PoMz6grvZxm3d;Xq-p3`+`+xRW-(D2} z3*z$r3Do@)ayUo1`ypyPzcJhkfOCp38N3pR@^ z<~0-i(-T;LR=j{NcvSFd$UwMYv8WPud9)+N`Lg28%KXc}XE5M_#5_2c%KewRi!MDX z2z_8BSWxx{Iw^LUr@C?kOp|z7DBL6A0haR{Dd4GmOakk=JStdX-h_crO73OFrkl=x z+WU(vDvuUE=rDK=)<~JY?0=K*2nelt6|M~NZKeHJ^1*`h<}rorxe||#&fuoNWXff7 zc7&Z5&MDIDRW99;o?&5Knc(0kp;#6c|9j+U07w-1O~ro)ze)KI6_;kyRr-~#4{8ml zZ3XPk2Zqaaog!v}njjUc>4H?8-n4Wzw8p^FzpQD3tXh`qXsulKhoitrMSEqMa7+AV zlH~l5e&q^~EB-xkALJg2N)P|bKm3Toi^+q2SWDeWdoRJ6a3~_sRp30A!lP-#nR1Nz=Svm|$IEIFG7IlB?Hp;euO zpLB-Bad;g&C-{+Jc=#y7+ez=psIK=Y!FxQy`*E|kYfH3C^Ir_}hi&F2!~exOTP%Vx z$e6dx=KK%m6e(rA(9e*y%9eA&2mqrh#cra&cTJq{fl$jHBn|DH#Ml)efl%Ty~7|v!*JXGJplmF zo+)VadmX_$s*gMBjytLoocI3kIR?xf*RdPb0TFuv03-llp|pJLl&}~j(;&sfm)EKb z)qU9Tbz#Zjv~!uV7FO?MoCZZWoAMu7CBepCkg3w4&Z+6uUX~{6%{`7Xi%cGH+2aL@ zB>>_35R@GU%7z2vye(%n3fRFQL*iSDKj_+rb+F=lvEsNt(f_j$>_`XC3Hra90XrIY zh79Zc)fd=HyEYE11MVdM=kCAh3$F_~_^-aOI(ArRyZ`f^{%;Ha7X$wz20#*r2!mgQ zX|aqdG*%x1oSVmHqpd#Z#Cp1XFpiS66@NxT7;h`!8U33(zzud)Cu)cBwsO8qoo!cn z9wzwxBPjytlVHYGu(0J;#>cSY;Q?X+ z@qX+-&s1V51_1imUM`?~VVUg>0b;#fuJQmtw)e>$|9vz6-&6lfhmcq$0651WA&#R4 zpc$Sn*laZccNf5pBT5nrgKQOsZatlpjy!@#Nykeb5a9xz9fu8!=-?Oh^UC}fy(iRc zM$NOlK_MswqXUAXS6`ki=X>}G9Jdmk;Rgk`7ZB}STWHtwwN?{$@a?q*&~iZgbN#%< zlME#~C_l0KPpA!iGRMR0oCrrQ&Xe+9rZAKW%2~H|fgL^ky+wh-oo~TE$vSp0a1{nu z<0IP(mQuD_V6kchz>=dnc3{a#E{1PGc_j{=JnxjeO8^|a~SpQ;6?}C+Ak9| zd6hw#i(95t#MDwbDf53Ne@HA?CsyRI6N+A%$6wG1{(qlZ{&Rl${}Y-b`&Ty+0px=u z4y;RJx;9(x3Os{*yJUkHz{>~Dx(QA5m0WJNwKd!{%|J>1LLQl3ZA#PREh`-(2WTQ5 z8t@dC=91~k%`dXYSuTwwEAwO ze>zU-vg=l^f3>diVyI31IN6ikq)?KUy_Lppn!w~bYW2XJK&T*5qvspaldbuZoFjJc z`wk~{u&_T!3$kA6l|5vTaQM8_($&XvLmzMf*uDAyRvu}hC_zAYl<;le5&L^$Zh~h> zko0=CC~S+a97~a*Aeo^Pw@zZEyuUL{K=BfsGYQYXGl~=y7ltlWaY=%4UUMj6-C_-kMNlCnu^4eP*@0`zW(!M#it(gdZ z_s@ZIE6&UNNArPI`CT8_(tK=fi;tb9!Zj_hpY)844Ghe2<~SVK5YEJWeUIUuJ;sK6 za8~P|Hn~kKOf4-<9E^>0_UTz1*hG%W%V_4|;n*^!jVVQ~L?zZb3$@`T6#%8Bw6eyH zulc6;kR8;S3{i90W?o_wnS+7Ha?W5TSlRDW(@9n1)Fwndkz-J%)#9YrJ$2hq%Ub-7 zOUDI9Aq_!jPOd(8Unr%UZt|^vCSoqy!i4=ikBDJ$n@j|&#ss+5G7k#rs;P}}bFKOe z&N~W=$9?Z`8~FZj7;k|eV(04OoX4D;s)rnWEO}j3&cS#nJO>8fV&6V%9~^{IfTALz zvpJi9tFEUIoCR5Q-Fi_QS0;n$SINyHa4tWpq!sz5Q-`OR@pMWTnYHfAiSkl_8+1b_ zlvtu_4fSn5cDF`*UHTAZKs~tZH27&DK1ZYu5obV^y{*keq<6=1)#u#{-qh(k)2oPj zuG(gB8dYLiV|P1lHrbw6Q=YWiVR@sXA+NZ5EtS+;FeYkraO|uIcf^md9H6Cjr{7Di zf`o_9hI>vt449$OAl1bFJqnkhoEQO>@5)~w_xa5c&L5oKaAaI4Of{4@f#!H;$H1ET?=-4NfIG@Vo!0{Q>2mYJSV`V{%9k;39Kt{!};Ef1-ZDchSXjr z_Ec|#KZytG+t;hXEe}|EDBpX2J*=M~$P)IrvQH)E8)NEa$8_)d&7GfxzF4Rp5P!(~ zr7oDchip&~Wx+hhGgb||1i6Xs@dE0RUCpJHvo1N+FXE`0Mb-U5BUSKQ4YmMVMxbi8 zyj+he^;NQ=ZaR=kEot_cGxV0pvdqlsK)H|ebEi)+2=$l=W@g4|SKSH5t{ZrU)QL*{ zyPvCAvTEbpTwoiu-DuTTvtu>73r$F`vdCA1<8wF%5$;Rqx(-BYH4;N-C`o3m?}MdV z;5p}7EPcb@j7_sYU;AW14n|44CE-BH?~II_{MDWrC%Zf2+gAxM{O;@>?{bX>Ryhp> zO&lPC&rfi+KaVGssD!Mn)EG5!5zY}4?Z;W?XB2W)6TT0slZwp*fHC=v_~8hZ3nNUI zi=PE7W-6VnOO|+g7Zx-)O&~P>(8MIZ?XNV5oYg9buDn=}p}Nebqn}S$Z=8OR^ND7d zVfw_if**LRoGRmcmm4N^=X5`Xx1bi%&HbLoQm(hJvFK84elAU;IG12T&}He8Ob9SH zc?LCrtEO;cwvXU*H>1~(Y3PiD`|;e7N##q;g!_K{o~)*zW=bsTo+lj4^ow6u5Te0V zdzkjae&(8VZn$d`&iq`VpS8IxV$8qz`}=5x9Yt96u3JnJ55Os@%jso>_1_a&gg3+H zaW+PT&N0=kNtifYjtQm`cQplOB8qeN@76OkF*k>$Q%?HFG4L>)=;L28r>{3R`bes% z;5axjT+Y)LlOm74AZaiMKdB>T*vWZys%#E8Bo7?`DceIP;MEM_gn)G2JKtcbL_Fd4 z+1sjTo>(jlID9(G;h!8^%p?QATM3(+S}4-g(XPFo%7>CU1ZGmB{HfaV3w$9RG8{y6 z0$zuKH^;N|U$}{llgAkWF&BSKDjX~`%jS(ms7i9UtJ6dP7-mDqHU35B-6YHXLwQB| zrSGd<&n3FY7YZU|pj0)M5~+%P2j5H$5W@Hp&h+k#j%+PmjIzGZNM3YqQbF$kp2$R6 zaSZJh9^sb$EPT^O(s$)VrrxWf4J%IZ1$~I^7$doxK^w-rF`@EHn$*(}39MHtVJ$zZ zcFjyK-R2-V`;XlNvX4E{PZxEaDZ-eJ8qfFmrAQzHJ1KiF2%ox~ zkib!&kbu?CeRl@$j8mIr)qvIAIPvjUZYyM{_v=O@l*Ex<>LvwuxS5i&jZ$czjV!t z3%^dRB!tP{Zr&Ubj^0?^)^l_EdLh1Me+Mp*cjxx|-%y?slACkKsV_H9B92+(L;Xif zMLfP$2aD{cP`IBYr~{`hbqq~-*l`a!SI6Wli}LTrHqLC+9(&-xA>+~>gRou7`qrd%04$5lHQ zaVRvDFDjBBFy0q=g2?K1O-GzL|L{oR1(j7|3D+D%Lf0`C!r_U;s!t$QKd-L+S_sS5 zJn|lQ?9*iySCG`ZYef)q(*cVMTbp~p!-S%D)B|fBV;ftG0gjWqKL?4%4E6b*M88jZs{W$(Wb7@RC0_!{Q!tGs z+EJAA<8qbTK(M}l_Gq~DuA`d`6?VC}P4R#y-UT~p!C9)QzZ9o#4Cw3^nZrb)0YO2I zoH*#SkL~=Sd@~BCx*2)9-nl&^UCnn;zq`JE_%R2kqZ?Q9Y~uhIzbHp#EwnRedJ&pL z>$^#|5(^1Q>x)I!BUED!F^(F&aoo%KMO@-ks?&g7D%{Q$_-RsW7N-)PP_wY}vmuP> zxaXDi4u=*PSFcBVJCX+XuP^`kj%;+d_hazn9>-AX!T~3uspABnvEu-T)VSw`{A$?w zvDJ2qFC=*%)oyhbmuN3nU!NGDszMy2HL)&S{?vRU%el}^$+?LdQ4X3Uf&vvd3>nuM5eLTtzF^!6NI=Qv`>hP9yR)bEy?D5%HW`jPhs3e@lmN-8CsF0?`ghycxFQlxyNAwSg3f=3zT7?~ zv~rDRT~zvWkzr?uV4++i|{bKGn;PFO*H3WS_E{lDAheH_q10Nn7ToWJ0}r}j!$4ik1{Po zzN#DBM7czd+#I2#%8aTI!a=&H73yx!C9+kl+utY@qH_^;ORmeunL zR?mvaY1|zYbNE`$E+@Cyogce|`vQ``6lnbtZacJ|jS1aoBTSnZYXJUn2@ra*iA9ns z%^fgjHxY(q&=dg3-@UK$i317PLwn~PJNrTR-;t)^(GJj=44R~+xTKNNE?puC0%Prs zCbnt;9^^y1?cAevKG(xLb%Z$7#w-L!&0#j3EDsWi*-RKllgz_ZR9I92hA2Fh-Yq%K zbO)w=w$r|o4(!8Z6fHjgHmQ27PyONMQKN=elcET-y4Z7t9`;#Dwl8_xvTlF%2YG91)%Bi$s z)yyt=*~gKQG&>c%_IcQD_jV;E$AD8;19}(rq*8eM*4)O35aLbLJp}KXn8OZsM9IVc zMUiG~@5R_v_a>?6yRsMtv(m{a<<=KsDzAED#KFbP{F!%$)BB_63V}$F^gZe=db8 zhS(i~JaBm~+1&SQLnq{#Z9~OV!_jHv+bS8q-V4`1@!a1Ggx`GOzn>7%{qDOiW-qlo z<@WibyA>}lqnc`-D=#Z(+$*Sjy!j)H50Of#kHx7@Oi_R??y(REB&at1^^clGDD=ru zsnIXd*RN*B8fV2O#iez#2m!;&406-u%TY3t4x)!G--xm`?eCYivMfqe>K5;|(zp}J z0-`BhUJ!#_V`Q48oPt2_iI%GvF_V2ET4~i>X=G``0G#voZ+l{X1p7F!31LMz6WsJ_ zs`SRqjF&q{75DG^wKVt=a)(lEvDj-LE7np=V&V-N#EZJ#sr##9GYe4`P#VPF89vO9 zxI(ycj>er+4SK_f_FVueR9$YYkb+K6QxPV5Va9Y7(vifUhl$$^C9J8-%Jlnqe z<7`8a52vi6>?D*;_E%@piCn`<7`i(Fk5eT7q|cygm#r_ZXGByt^^JNE@Ni#&FzP_) zqYF1pw2xLa8}l5wB&9PS9h+W=;#SH6*qrAz5=-zf9VG-#)U}EQhSfxWK@443S`tsV zZbpVxAEa*J13r%CaI<{`l%F|rm5&F=a2;l~hm9*cX7}~E_i55ZOPES5hAw@WDLG76 zLQG_R4gWIoW#n4dx#|XRr1fji6)~kgz{|cBQ(yV+-3x;ut%{>rQ)6EvJ{J1ybdMLe zeI^;p>z24El9ynw^GZiavc#;ZNX1wET-Z6{xD0n{Q#`^1R{@ypXEVvwMQ{=Gt3z$d zkO0X6?Ir?Qz-mS(?-;eJ5s@8%25zDadP)0 zp7}_03@jJ;DO7vlf=r_DvtNG$J9yDbmfRe&a1pU3k-P!)mrJ|K9y3H?jBx=D-}<2N z7Thtc@cn0oP-E`MSF!!IkawCl%y^v73i?{Gw)*{#m^inX^g zzizyI+?~^kggQ&w;ClEkYJ7f7{0G{>3z&%@JP-3d`w%t4>ml)4+u-zgD;qHy&&#?V z&Dm~v>*>bY51Wdeu*4k#I(>!@xhA*mMfhfiUlpjSy*Z;8r`a>bC{Jg3gkC18DM?Bm zT1pmFJ+=5F)KdG0Q?xg5*l>U&-FB}@;L*Q@M(NSue_#G=bq@!!!&=5=K|r zh36Eagke~eAsHGdF?N6KqPbU}dG>Hfo%@Xa2Gnxm1oG_Pzp?44WVEBoGrCQ^d;1#) zSfekTAet_0jvH4}nxe-~N#cf!kvBd+NSJRrwg3KwgO`-(zFfjTCQ;=i8IdVz=f1Wj zjc)$9_LU;*UjQ&RQKClc74eHaZh7K(KBX%Im7hOl5}R`AQp%-nP8W`>*!l?;6H-Nt z)7c^0BMN(dT%STojAPkRm6QDv2vUJ{oXg1`$`ok0Iq`v)VbCCPF?6zShGK~R+#s=06Gch*1-vwmXUtDh&OU!Vr zQr)eFDicjrp%WqO=Xw{v3-?rnC|oU4`wojuL>cv0zzQR?ATJ`a&y|;NZxeZZ^&ucY z@>D~7>dxUhSZbByntw%7_v(rp^x(-|DUiS>+M}1=$s#xNOPqy;yC}lKl&(Rw9${PCLECm^ zce0T9XkAMSvzt2Y?l)aDoK*I7EQG9!dCJ}3Q%*|tx* zMO`)QYa-#~*cl6?&83Lr?9bEW@0N>-BTtMDL=8!H44)wy9Ek4*#is{|wwXgiJ`WAW zTtqa%~blZ5!}Tjj9--hp3`VDJ91jQ{4TE%b9*dEJ>BTJo<3fa+ae^>rXq< zResj)yGa*Mp?@72dqXNp{Bp9rV>viQo4}`^Fny5Qk-yZ~!m%%~up$a){svz+%p2?8 zPozc#W!t#8M+Y0-QeXf2{Pc^u$P}m4hqd>)<-A(!*APoanF>C%4E0wpYhW7p58nKW zz8iC}U+bmL?Zu~)tCw53G^lIcmOZZA%2nK=c5Cxp+8RoC;NNVwv!VOAH$$)PI{ZlQ zm@uNY>>|(6zCjMo6`s#IxM_mcCm?Pevf-5#v0XurY=3a^8P-;9=^0v~XK>4@S-iEh zC3MzJk?r1&5vwTzon3W(bS6pkvU)X(usji{)6vMnklvg;?X>o*k~LghM1~VO8Y||5 zuR6s1Oq10NoM^Fpzi+NLdUw{+m)X(G+*><-T{-{b4qxA%J$ct-Gjt64MF-BsUv^%d zI@tF8Wpd|QZ%W^sS}JQeudBaDd^@%{|FCUF*xBj!z7tWS*nvx- zc(3#?ey%@LYiAn*D^=w(@1N&(!CGv5sG58DRdw%TZjwb~*R>t#9j&$;F`KT@Ej;@s z1rEH*^ig%ko2Mdyuipnl0g*jSo{;tbKyeM(O&6vMwEDHE{gQE7@idB!d>&>AtzZEv z!Pn^!l{Nq9mPn$_HOkCo&>CXped1uBx&P?jzYj!&cGv5G_y zRc~1BP~DTFlCPCKhYhlVcjzlhPoiwjqJA+uS;zobZ6aV5Z;uFohGOqwdMJrz^C1oT(Qeq!2AZWpt`8 zu^MIgE{6ek?x5wFRrUVjj9Jfmop{z4B8Z4IEzudQmok`fKcT2&-HE!Lbv-(^t5;L7 zkV`~1aaHNsG^@HE?mEn(&;EE|;jDuY!q9>@54ap`o@>kS{xVcArVbcurH1t@_4j_)F? z%~1(3#t8Ts>m4!s@qWDLgzc zoP{ZW*2_WL!9n3sr05uvE~!Zwdpgl$&v{zBb4PuCvXI`Cm*kW?G7kYwrjgCs8+Fud zb@vSz-MuSb&8yPffe3kpn2jKbl=Gf(poiSEw>8hzT-Cc+t9T_pE#0x6pC8nRGBR_@ z7O(k^zb)|lSTVg_@8heGCm~;gwK9{k8Oho)WO1WTEnVw_mM1@aQrw^VGsA7BCmEOe zwJe=%ynG0L=>-i|w>gSQniPAcTGMe|B>24HF33l8c#Fwyfz0PZ@)C*}z53ZI?_E!8 zzdF_G^IR!ctfidd*`;J*BJ115OX7lq__UGWh1x8K?Ef3s>Ch+Xn622Wq0HCKU?@;` zEdtV6P4SR-Joh&=ebzx;Djq0;EG}6lEd=7UU@vM%f%IWt4Ki2hy`X`Rqc(V{Y!^T#Y0_~l*$aWS45?{RGB*|G@Jv(3sMIx$T>7DK@yt*)J#gy9 z@Syz1?O*R0xd;*?wa_;t;=%&!ZskBahImW;H;AV88JazM{N+=$9*W2tfunZIB09GN zY<9R#ed~RG^3D_C-Hk_TJHP6*ozo5d59Di|nd4#W(`~WbT-V+>;+Ce)lzer#m;Je} z#`WRk!|-D_CU)$D-0`Rtn0Db?^4-A zH8n>oDvnZ+l<^{jkR;Aw?9vA8Nt946q7J_ zsdOZV+R-meNFN~595r6TEysbKN|&^;`U9a8F^)UG@Ig+|hB&wZ;P{`P4>EM7@|!W3ZvS)xySkcK)|(l>_d-5L zeLjcwmJ`?3)K0DMAma(1pfH@?#El!Lq%~nE(#z$N6px%ZQhj_99PjVWiszrw1MiV1 zpcyMj95I_KB=?)uT88flE~;`$OIyt1`v%TESyyTLlE2p7Kju7W^Y7<0Io$hZW_xvF zXWly(IoA2}tq+`sZjEj_PuH#n4GmkS=jHUrJews~*DK9ue{mrf$j%XnuHSBFdO&G$unSc9fKHI^7wlQZBH0-k zv8UZ<3y{hA2x343)x*!DnCgeK?JnReFM|u{F+}Up+2>!zL=m{|f76XQ#z^+Z(#Rt7i4t z`)ks*YCrBgE>WM0e#!f|`S^|WDp52YISorapNO;z4R zpmQg*Q^VP|ia73oHL0Q!5{l|xFb?u;?##X}eC!JIs#8%(I>vIa_WW(j$2N}FaH?nv zHRwof)q>V-(~Yjfr?MtzWt7z})YhsGEb(&kzFDpAyX~aEkTXBgRO8h0!ycoSduG6; zwlkyq;LPhEjg}!k3`0lAEn(ko z%{GNX85E`rb`1_PyBnum@lu@=PwVP6ZPhf@+F42PZVPi~e|8ZahvO(h5;Pb^z85bm z;VfP-jhBw7-aqxFF zsmxV(Byxo-E91kxtLuAp^|Kc%^wu7JSig16r?>8#?fGMgh006$aKF90V$*ekK>D_3 zfzQ?O$2h;_vdD1t7n!IU0c-9UFCT&N+KGpS*Gi@@FQM-q854+CJySaZ_yQ z+sl_{$~Ph93)h5F~FNE8RJ=e?j!nWRm{xeUf_ z>AOG|g`p&PPz1&r`I@ZMKnxG9xz|BdQ|n=?{i~S}8Y_`Cgf>n2q1qer=-gWaOI@1G9VY zJDs~VX+5`p`p4~SQ(^nZJUfpS#9V*jj>2?$VA|76skwV0V-0w6LG#1$!!f_K6j?ywd7FM z+aiCE0l?752lPJK(hA9bq_GD*l<8?2!Ngq6ovcPQ>Ykt|BdD_=J2Z-jcVNeT*;E~7 zEQvmIJCz@0_vppvMU@vSdM9>|P|=lc5&fj@z^{=gxs4l#-_;PYn=^ zQ)V}2>zaCUh?PIDZ=60B=c_mCbG5@kVn>rvpTFL!S$uQl>1);xwfSaB__zv0iU5aL zZXk@ofjwsrNE;#(hI=h-t@rM;!kHTw z8Wk)b|l;$gnW$oOm&iUM=svwd{tAHXAL z7Cduzp{C-bQTd?$=2A*`em7E7bxK079A`I5_4Ke4S}xaJroo$hh8l-8*en9ueZ0Ny zaUIOYKTl7Rs0J75F5MhEAbx91t{}yBBJuEnKuf2v5t~D`_lMP@5z-8&sbXzE_34pX zIdV0Bh4%WljW*BrcOO?)gjd$dSwUKP?+VA{zRH#rZJL$E63Q2BGE%}GX!&jW{m|Y2 z(RS7D-Q%2J2xsfSJTKCP(dA!O;_pPWycU~ZoV&U?o^_=q#{Q?ZK5BF&xaRTB^QW{| zHtZXk9UQOpa1g^MZPiP;l#f1*xR~5NY5xAoyBw`?t*?-;5l@h@u>zT{4G!WjXHIwm z&|TP|K2y8GYrSgM*{;L}`&kB?NkCNQie6HFkd~OgMS21vMzj==?u<0F`vxbFRXs%( zb#z@4cyU5CNf#xgUTJkNqPG@U1Q41C>G6baJmTBr+VuKWM~cJv1q<8gEBd8n(_(A- zTD&6EtOBF#8~swGo5@n+6#|H;yp~zR85CInL&3I>O-@=h@SgwdriI^@^-26G>!`x* z!i|eUw&`-&PmWltwEWZ^b-s-`D^Q)V{odTkm}@KHB{TLzkLO<2j0lP^D5!5n9m0mZ z;t5}}K7H<&u2f!XIjl&E!8sy{;J}LmEK?hXH~1VRbp`k@`CTYSxso zBU4vGIRVApgH)x6dWL%)yn1vx^@71&RGa!Ollk+O;$7T@8xekbYOjqFBloSp8wntd zMDo5bM2Tl+<#?nCrIG{cG=mC+n{t|G{8e$96$QZzgBZE>qoMT!ykn5sGWoL@7zDoPKOpf@cuDPaGMs9z^37I3D?HYFC?J+Gi)`AkCT(zg( z(gm_4=zDwq13sNrlI09p5lzu#PPfZ zM$N;F+!f$0mre9w1e4#-F1yve^890Af=snlh^lT9Fenb{^{*qUCg{3kwn|t`KV??L z9FEszVOy84G9?LWQ1^6Ju7OXGZ$r&`v~raXbZ{-gms{0)=ZWmd2Q6mWB;|El&Yj)u z7WVeZQV?3|b+zZbA>HQnCImLFuBaYfMM=e-!;LfWLWZ)(j<%|Wym{Bq%Xr!!LIesw z9yNKJemQW#k@rl`X|DP`LCskTqVvdq{>gbzpo9WM- z4<|>@W&IRpSMZmv_46g$J-&q5N98a77yOj1?8t8t5~5{W!?H*xkqzFC$JMad<*d!?wU|fA=VzF0-ZJ7(aWzm zl_+7^pHEkO-C_Nc^XvZM1?!oZ7l6D`4nTqv4?e&OCbsvPra z#V{qqjgwQ|H*@nx)B}SRAjO|zW4?rVVt)*klqp9r9K!KxKrH6~_<!na>_j>HcQc+ zhYA%l&MQXkAmE0lNG0TsqH!fsT#ZrxN-rXepLApBSjKf>Yc9f#BYYa~2^~-B6u3Yr=<-!p=~ZIR}UllO3*U z7I>I|9*eB4PLKuwwghg)MRVoVZtalkKCqj|x^I-U4fYQ4_;O^jBz%Dz(8KrUKcMN< zM!gA~gP^kzu@1QmXcz+6ZkDGICE63+;ZNU>P7S-}~xkw$0HGNv~dD}60ypCi#=E*nU4m@%#S4dAQ z@{H=rsV2_s;zhgw4#oPxOP5qF}q9`RGT3-}x$yW~NEiU}HFR!)P)$~|^s z{+ybUH!(USeEpE7fjJCkt|MvUJbvqh7jQ>rgZY9u#D6;2azE<^;rhL&Jo)bNY7lEc zZJ-SGp@?f(1p%ve$2oUM%0@qMQRQYc>ETHIJ706hmUx6F;^6OiK-6v=Rwarws!pbz zt%0lZPG4v#SCBR5%|Q7>Sv}+?6(nxFH)f`h)QHq%(RwC)In$?P&am*{v7z}0Ofyi~ z#~x^e4*&)}Cz;7fY0VS~^nJB$<8_%?h0B#*y|%~&WDbWei<|Z}<($QF>1awKaPTbYctfL#9s*XN^_87m0hS&((2-kH|K$F8*Dtwq!ccJn0 z%d@J@MY@MZ>;$qyMad@43r>@Vs6YU`HtTD({>f)!iMI)NET&stEW|m92eobI<1O+!x6l6s;VqiB>?@N?7(H*;in zT=zurr~x2ZKFE<{7m2QkN|&*{#G`O|1$+3TWal;j?cX3L>qTp<2yv&_jy&#hNLUyFAGw!9y7l%UhnpOJgOGd4Mp0 zWX^shV%kwW5|Wf#)8+WJ`N*B9IpYHpv-#UyzA$X;qH*V&AP|iS;BkDI+LLtQ%J-&9 z^Xu8VXwfq4z(p>&)Ku;ANN;rbP!3#fRWU?weXmz+`E2Rg!&xuv0%&Q=M{Y;|I?Va1 z{*^c@O!EDqy>oeUr`BNR3!j&tN~uGrA?yvlyY$X}x1-c!VnB2ALaAy?5a}b|j>){j zu*C@>)qNfFt}a7Ng1JkuPadvOZXSi88I*<`NBd|}G!+n@KAJue0HE4KVUtQovQ!he z6i2;owcb}mQvrgbiRMwlP3&Z-u3n^y*l-xbqQ~pT!ed{R z6})CN@$xP`xpE{&2)&rJ?Q1P}p2(oh;=p^O3re2#Z`SS;*3PvE^EjhFT*5v1Rkk)P$kbDHCHPj)|Ml54|@OFEpWVzN+tU_5nbb=$9ue6{dpo7P{wU-`t!%n1t*}r=G>`z` zF!1HWFBJyhi#wIoojr(3y}Yv(GA8OrDSZ``5Nb5>52WytU2UCGSSZ*DOt=eDE*osi zsbQ$!eZYmU9sM$>o@MK{8z>b`W$f*_zvEKPB?~qBSLDvqUbmJY;jA)2&b~ekZWbk- zxn%KCsALq;CAy|!Rw^xXQ+4U!;qVZEE&AnA4ar7nzWQ%K+M$|HrXxGcL$Hg~AxRDj zp4EH>T-ZK-S3SehMxyf2^(T5jDSYEWo&2E~%lFeatyF(p@vy1+mHD(OGzYa2dpK2- z`)fq9M-!K;`tp+R8vv%Bc{`@!tkkl8wYLG}j>O&}ixU^`y%UbnK2?zZVpr0P^jT~f zk)GJs>n<0oi)?x&Y9n=P-C|$Qe&zSa&$^&^$R=D@ir^qxTdhuUeH)5vwLf7VoPD$- zI@G<^DI|bf%OoT%juPB-K+c7K$ZdPYPl+(e*lld)YF+8jcq=fd{@T~AbpBFEOQ?tC=k7bq&?2pEi+8+4tyz%CnQ z6~*$ir3F4W*Cz<E`@z5pFm7SNQKJ)e4};hGbIqIGNM_BF4Vl4jc!^i2c;B1=cA(sWtO z0`iv>E+M7Gi`l7Cs;FB27rKP>=1-fyJKnVDGXgW3cWYwUh~Jp&^g&TMs$-X3!c(|6!&75mLB z)@PqX2Bo>=FI0wix(@vfd^ydx*4rz?lZ*>gV<2S7uDSan?}tx%{C}RTqmu1v}w@YPTKwSGECkJV`6VFjKw$gFla2?u=}`@ zwb7gmcvnzPy|Ld-8QdB3CM#;fy`O;lqeOVtV~ZB)eQnf#frS^y5^@GN5qgj=$pkbd zzlgH8|4iNiqr0ZtTO`cGUOB7%y330!Vk&e_i`td z!xwa!I~}CPb2D>tJOtStG?J>KuF@i0-zZn)p;h-it{}hUaRu20_?Ptavsb=8Vq_f} z+p{ksa@s7_BILm-UZ|o*Pdjf9y=iU#09WdM2rJh9QFhz@yo`#sdFy&dfl~R6KFif5 zX!?(l>|b7TCqv^bqWd&Odz-wX+Uq*%S}-oh{2vP+Y2qy!=BvtP-nx8e#1X(&je~|a z65X7oo&`#Ioi4{<;+YwK43hB6YDF7~O#eO&H4P>mlG;OBxTrNS0F{J;eDmJud(Zs< zR2Yd16biTmZsmP-IKI?x#*YY7e^>l$FnmA~;~k#{T9skdDP2tZFsoUKg}{47!B7uVQ-Xl47F)mr>+#X)6JA9E|&;%)C<=JIMYO0yoF``W@D zlFJgHdT2U`YV^44#AA-co{LhB|%>X#B?KJt{nO+44cfG*|kUS`z0yX5i3GC#Z5?VLq9AZS+Wnwz2DJYx9&Ou+#7Z@)gWHHbDxw zqmFl1&Gxa$*xd40cEhOahm6TQFcmwyZ< zTCb~=CLfNM$hJ%xDcYMihV!<>z^xO$LUdUva`(OR1(E)M|KY_Phx4a0*YXbhD)`R* zrS?6%4U((8Vb{sO^LS0OR#}@L={d)PanRsRP)kct09@NdJvcd)YRcYU)~lVExY2y= z?!5}c)BdtXNdP!3np!ri)F%?6eCkja#cz+bR^nm$(>P$kt1e$Kms5^QKNns;_-0rV z-*d=ddV+jo@gYz&BrkF75rVDE#UZ$@ttnqA7%9*8AXLG~Zzi6lj!A71tPSNjU8~Q?C!{JY#gD zMgG9f6boTlh@ff&De(LG%^u>`iHX?4!7icT2)Yci+|^gRCVM|Fd>5$pC3wPMz#ZkA zCF{pn8IN*)?U9cR+q4}QJv9=uTN$q2`%N#Dmk{G z%?x_!8Tf(}Xd*KB7Tp70mQVn9XU-C0I=NmYg3_cN2wDYDj@5TgG@1xqu4bkq^jsiS z6yL*rEwh(I(x;#p3`sdtaF4;LcjZ`(jqvEm(?Hy>LWyb9DBli=QsWAYaj!`(_KorT z`V3)mNTXs|Vpe=v;rB`I$6pNNhaOXI&3a;Y=q7|J9t|8=iPOK$ntz?5$K)QEx_rlk zcSRc;3d0Pmoux1}%+NV2Z@8aIpEZH3IJ_?g|Iy-^GHp2Gc3NsyJO5Q)@b#PMPVD%Z zZ9;e4Eax;Fbmz=C-b2PEG3bPDBzIj8Y0TH=oWoMpO{%|{K&(oWdW6ngptTvKR6?{e zfQU#KuN+CEIqRvWcD!-!yU9+^%?9-sf`Z(d6KrF%Y|~%YHp$AQPWA?L&FbMVXsOIz zL1volN}ZqOHV&0}n$g>8r#xjSNT8Mw1QSCN;S!K+xO<&ht$S^?Em)?OnDxN}RIMed zw{|>2xrnTsof?r69LnN)zOvJy+KfMi(;$sokXv>lZ1zYoKAlNd!IKGab5-+8;f{v~ z@HGK$!)^Q%gmF`UVC#g&`LzV4hI6?45A>9+&e_||w80Eb%&~Bg8L%7Z& zt;qt{XfamvHsj*_uc)~)1}0wN{;;*zPqBlf(fuBsnveFZ(*5JW8$f{$C=i ze0U!_A>F1gh^8;F3+&!pT(Yg6CePM~a!+XqJ4orGfQBc60BDmnP7-aRjL}WnS@p=e za(X&Z4QJbAVkc-bZpf)hqi|r}IF#mw817wv4TE07?ayB|mF`u- zXFyZ>?&KB#gej>^K9{6ul;VOHrld0YT#}+uiVNO>0OaIkm<%X@kT4M-V3{)3YF4x6 zmy&ge^Lu`55Z=ynPykdR{X^M8(H*aGo+_k&C|fAH<2BB6fT$$EASc5x02pHp_K11W zmk!OBX=)@nvo~n>yWLJj16(b2$*^-#JKoLJQkM)n7q#Qv+`3U@fILA?Mh?^pDq=K< zRcq)jbw;~W3JNM{L+&;GU!{{IeMttoptx)RWF>bHLlY(Cq!J$XS;-y5&_qc&sf34p zzZE3N$;e0nwzdX_SS*SnSgX~l#;R6z+!P`AaZ{|1o0Rz1|M!s`#ElJPCCf?U=DMkA zE+Tw)S;=zJxVdg>nu`eE-2rv7NK!(OoLmb;1vO$0Us_ZRpy9vD$p0}_V^Bp^ILfc) zl3F!^wJ2Jk0D6T~v>O{ru;40Jr54B)QqgW~D8YiOT$NfNZ%PqmQB&4ir$$uTo7mkP z92~?PIXH-k5fh6!5Q{M}6SEiqAgD1$jX~6+VzD=Dtg3>=G;GAMW@#a&TCr+N5L5+g zEEcO8)neft!w&gYBXAZqy6%&yLYJPXZ%N3vK`&}A4(kX6NA8A&S$pReSYr^22-rya zK^EI;`jCabXaV)5Sev|xuw}BTwbsg$)M#$cy3U;K0g0B6-0tTjxy3DjDj2L=OU6r{?ePVr7#oEOO6g(R2GmUY8_xrQQYIVUFo z9);vs3>AP3HHlG3j>S*`$WW7b5DBrRa&T}Uc5o0&CC0?eV$4j;Bmh_qdwV+@F~tCE zO#mCz2Enkjr8QgHpr!$c4VD&IHB2!~u~jsvAQlvzih@=#C>AinWd@Z)6O=fPGMY?S zT!_2)+56}Dk<-p04Ps~HF^49ynQND2D2dRd%x{r`PvW*`ro8NMArZ~ zU3CJ%DpxU}xsMI^8GePV)B2%7K&nt{idV=wtsfc$qzbjBc%hy2HU|d*VgUyS787F@ zV`gS10RVs+*qIg!YS`P_SfHjg>lUVgs2 z-eP?EBh41b&StnMsiV;<@fT$gi&DRCg zaFw`qtu-=nYgRLPfByXWb7szYcU=WeBAdmn-E}UZP1ex-l6U6T{pYK!u3qI^-k;CK ixy}XF&MdiK?iaA$>U^`QTb%&9sW@SB`EtK9VGRx#UUgpp literal 0 HcmV?d00001 diff --git a/sound/effects/wounds/blood3.ogg b/sound/effects/wounds/blood3.ogg new file mode 100644 index 0000000000000000000000000000000000000000..f6024a5ff6acdd3cd140d970828638e37726aa88 GIT binary patch literal 13657 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 literal 0 HcmV?d00001 diff --git a/sound/effects/wounds/crack1.ogg b/sound/effects/wounds/crack1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..aa3bf0ab014cc1098960240391eef2ba82cc3ba2 GIT binary patch literal 7950 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 literal 0 HcmV?d00001 diff --git a/sound/effects/wounds/crack2.ogg b/sound/effects/wounds/crack2.ogg new file mode 100644 index 0000000000000000000000000000000000000000..cef226c98bd0848de3602fb14a07f1de41c19eed GIT binary patch literal 15346 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 Jsqkab{|mdIFYN#T literal 0 HcmV?d00001 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 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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/dismember.ogg b/sound/effects/wounds/dismember.ogg new file mode 100644 index 0000000000000000000000000000000000000000..f5015ad961584f9559945ba0b21f0956fbe9b073 GIT binary patch literal 15382 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 GO8*CsO9tuy 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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 SldO-Z&s+!&4h{|u4h{~SE}iWF literal 0 HcmV?d00001 diff --git a/sound/effects/wounds/sizzle1.ogg b/sound/effects/wounds/sizzle1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..4a3d2290181cf2fe219d0196f441420d133e0105 GIT binary patch literal 52702 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%0Dx5x7!DSAK$8YRZZ<^4K2-Zj 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 Fe*m7re$xN| literal 0 HcmV?d00001 From 72a227f3adf3a249e12bca467b84dd03e06bcf82 Mon Sep 17 00:00:00 2001 From: thgvr Date: Sun, 25 May 2025 06:34:10 -0700 Subject: [PATCH 2/3] compiles but with issues --- code/__DEFINES/mobs.dm | 1 + code/_onclick/item_attack.dm | 2 +- .../components/crafting/recipes/misc.dm | 11 -- code/datums/components/gunpoint.dm | 2 - .../diseases/advance/symptoms/flesh_eating.dm | 8 +- code/datums/elements/kneecapping.dm | 2 +- code/datums/mutations/actions.dm | 2 +- code/datums/wounds/_wounds.dm | 5 - code/datums/wounds/bones.dm | 3 - code/datums/wounds/burns.dm | 3 - code/datums/wounds/dismember.dm | 6 +- code/datums/wounds/pierce.dm | 3 - code/datums/wounds/slash.dm | 12 -- .../game/gamemodes/clown_ops/clown_weapons.dm | 2 +- code/game/machinery/deployable.dm | 2 +- .../effects/anomalies/anomalies_gravity.dm | 12 +- code/game/objects/items/devices/scanners.dm | 13 +- .../objects/items/grenades/antigravity.dm | 2 +- .../objects/items/grenades/chem_grenade.dm | 6 +- .../objects/items/grenades/clusterbuster.dm | 4 +- .../objects/items/grenades/discogrenade.dm | 4 +- code/game/objects/items/grenades/emgrenade.dm | 2 +- code/game/objects/items/grenades/festive.dm | 2 +- code/game/objects/items/grenades/flashbang.dm | 6 +- .../game/objects/items/grenades/ghettobomb.dm | 2 +- code/game/objects/items/grenades/grenade.dm | 2 +- code/game/objects/items/grenades/hypno.dm | 2 +- code/game/objects/items/grenades/plastic.dm | 2 +- code/game/objects/items/grenades/smokebomb.dm | 2 +- .../objects/items/grenades/spawnergrenade.dm | 2 +- .../objects/items/grenades/syndieminibomb.dm | 6 +- code/game/objects/items/shrapnel.dm | 3 + code/game/objects/items/stacks/medical.dm | 61 +------- code/game/objects/items/storage/pouches.dm | 2 - code/game/objects/items/tools/weldingtool.dm | 2 +- code/game/objects/structures/tables_racks.dm | 3 +- code/modules/assembly/anomalies.dm | 6 +- code/modules/clothing/clothing.dm | 20 ++- code/modules/hydroponics/grown/citrus.dm | 2 +- code/modules/hydroponics/grown/misc.dm | 2 +- .../mob/living/basic/space_fauna/bear/bear.dm | 1 - code/modules/mob/living/blood.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 37 +---- .../mob/living/carbon/carbon_defense.dm | 4 +- .../modules/mob/living/carbon/damage_procs.dm | 18 +-- code/modules/mob/living/carbon/examine.dm | 16 -- .../mob/living/carbon/human/examine.dm | 8 - code/modules/mob/living/carbon/human/human.dm | 14 -- .../mob/living/carbon/human/human_defense.dm | 2 +- .../carbon/human/species_types/flypeople.dm | 2 +- .../carbon/human/species_types/skeletons.dm | 2 +- .../living/carbon/human/species_types/vox.dm | 2 +- code/modules/mob/living/living.dm | 4 +- code/modules/mob/living/living_say.dm | 2 +- .../mob/living/silicon/robot/robot_modules.dm | 1 - .../hostile/mining_mobs/hivelord.dm | 1 - code/modules/mob/mob_helpers.dm | 14 +- .../projectiles/guns/energy/special.dm | 2 +- .../chemistry/reagents/medicine_reagents.dm | 9 +- .../chemistry/reagents/trickwine_reagents.dm | 14 +- .../reagents/chemistry/recipes/medicine.dm | 9 -- code/modules/surgery/bodyparts/bodyparts.dm | 34 ---- .../surgery/bodyparts/dismemberment.dm | 3 +- code/modules/surgery/bodyparts/parts.dm | 20 --- .../surgery/bodyparts/robot_bodyparts.dm | 6 - .../bodyparts/species_parts/ipc_bodyparts.dm | 6 - code/modules/surgery/bone_fractures.dm | 132 ++++++++++++++++ code/modules/surgery/bone_repair.dm | 34 ---- code/modules/surgery/hairline_fracture.dm | 53 ------- code/modules/surgery/healing.dm | 5 +- code/modules/surgery/mechanical.dm | 49 ------ code/modules/surgery/organic_steps.dm | 6 +- code/modules/unit_tests/medical_wounds.dm | 147 +++++++++--------- code/modules/vending/_vending.dm | 1 - code/modules/vending/medical_wall.dm | 3 +- shiptest.dme | 3 +- 76 files changed, 304 insertions(+), 596 deletions(-) create mode 100644 code/modules/surgery/bone_fractures.dm delete mode 100644 code/modules/surgery/bone_repair.dm delete mode 100644 code/modules/surgery/hairline_fracture.dm diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 926fa03414c3..1c7ebf56eb61 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -196,6 +196,7 @@ #define TRAUMA_LIMIT_SURGERY 2 #define TRAUMA_LIMIT_LOBOTOMY 3 #define TRAUMA_LIMIT_MAGIC 3 +#define TRAUMA_LIMIT_WOUND 2 #define TRAUMA_LIMIT_ABSOLUTE INFINITY #define BRAIN_DAMAGE_INTEGRITY_MULTIPLIER 0.5 diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 7e2b25cca0a2..91712d98c82d 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -227,7 +227,7 @@ /mob/living/proc/send_item_attack_message(obj/item/attacking_item, mob/living/user, hit_area, obj/item/bodypart/hit_bodypart) var/message_verb = "attacked" if(length(attacking_item.attack_verb.len)) - message_verb = "[pick(I.attack_verb)]" + message_verb = "[pick(attacking_item.attack_verb)]" else if(!attacking_item.force) return diff --git a/code/datums/components/crafting/recipes/misc.dm b/code/datums/components/crafting/recipes/misc.dm index 44a2a5103c95..a626cb2a3402 100644 --- a/code/datums/components/crafting/recipes/misc.dm +++ b/code/datums/components/crafting/recipes/misc.dm @@ -160,17 +160,6 @@ /obj/item/stack/sheet/cotton/cloth = 2, ) -/datum/crafting_recipe/replacement_structure - name = "Structure Repair Kit" - tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) //hole punching and scissors - reqs = list( - /obj/item/stack/rods = 3, - /obj/item/stack/sheet/mineral/titanium = 1, - /obj/item/stack/cable_coil = 2 - ) - result = /obj/item/stack/medical/structure - category = CAT_MISC - /datum/crafting_recipe/portableseedextractor name = "Portable seed extractor" reqs = list( diff --git a/code/datums/components/gunpoint.dm b/code/datums/components/gunpoint.dm index 0d90dbba2907..5669ef558152 100644 --- a/code/datums/components/gunpoint.dm +++ b/code/datums/components/gunpoint.dm @@ -131,8 +131,6 @@ return point_of_no_return = TRUE - var/mob/living/shooter = parent - if(!weapon.can_shoot() || !weapon.can_trigger_gun(shooter) || (weapon.weapon_weight == WEAPON_HEAVY && shooter.get_inactive_held_item())) shooter.visible_message(span_danger("[shooter] fumbles [weapon]!"), \ span_danger("You fumble [weapon] and fail to fire at [target]!"), target) diff --git a/code/datums/diseases/advance/symptoms/flesh_eating.dm b/code/datums/diseases/advance/symptoms/flesh_eating.dm index 92f5a0cadc37..4c5a817be72f 100644 --- a/code/datums/diseases/advance/symptoms/flesh_eating.dm +++ b/code/datums/diseases/advance/symptoms/flesh_eating.dm @@ -60,10 +60,10 @@ Bonus M.take_overall_damage(brute = get_damage, required_status = BODYTYPE_ORGANIC) if(pain) M.adjustStaminaLoss(get_damage * 2) - if(bleed) - if(ishuman(M)) - var/mob/living/carbon/human/H = M - H.cause_bleeding(5 * power) + // if(bleed) + // if(ishuman(M)) //todo: wounds? do we even want this? + // var/mob/living/carbon/human/H = M + // H.cause_bleeding(5 * power) return 1 /* diff --git a/code/datums/elements/kneecapping.dm b/code/datums/elements/kneecapping.dm index c4cb980252a3..bf93e41d3af3 100644 --- a/code/datums/elements/kneecapping.dm +++ b/code/datums/elements/kneecapping.dm @@ -84,7 +84,7 @@ ) log_combat(attacker, target, "started aiming a swing to break the kneecaps of", weapon) - if(do_after(attacker, SECONDS, target)) + if(do_after(attacker, 2 SECONDS, target)) attacker.visible_message( span_warning("[attacker] swings [attacker.p_their()] [weapon] at [target]'s kneecaps!"), span_danger("You swing \the [weapon] at [target]'s kneecaps!"), diff --git a/code/datums/mutations/actions.dm b/code/datums/mutations/actions.dm index a293fb31e47a..481d55caa86d 100644 --- a/code/datums/mutations/actions.dm +++ b/code/datums/mutations/actions.dm @@ -272,7 +272,7 @@ return been_places = TRUE chems = new - chems.transfered = embedded_mob + // chems.transfered = embedded_mob chems.spikey = src to_chat(fired_by, span_notice("Link established! Use the \"Transfer Chemicals\" ability to send your chemicals to the linked target!")) chems.Grant(fired_by) diff --git a/code/datums/wounds/_wounds.dm b/code/datums/wounds/_wounds.dm index 2564e919d76f..b40baaf23291 100644 --- a/code/datums/wounds/_wounds.dm +++ b/code/datums/wounds/_wounds.dm @@ -82,10 +82,6 @@ /// if you're a lazy git and just throw them in cryo, the wound will go away after accumulating severity * 25 power var/cryo_progress - /// What kind of scars this wound will create description wise once healed - var/scar_keyword = "generic" - /// If we've already tried scarring while removing (since remove_wound calls qdel, and qdel calls remove wound, .....) TODO: make this cleaner - var/already_scarred = FALSE /// If we forced this wound through badmin smite, we won't count it towards the round totals var/from_smite @@ -188,7 +184,6 @@ */ /datum/wound/proc/replace_wound(new_type, smited = FALSE) var/datum/wound/new_wound = new new_type - already_scarred = TRUE remove_wound(replaced=TRUE) new_wound.apply_wound(limb, old_wound = src, smited = smited) . = new_wound diff --git a/code/datums/wounds/bones.dm b/code/datums/wounds/bones.dm index d71846fa1a3a..4d997a4b1e43 100644 --- a/code/datums/wounds/bones.dm +++ b/code/datums/wounds/bones.dm @@ -220,7 +220,6 @@ treatable_tool = TOOL_BONESET wound_flags = (BONE_WOUND) status_effect_type = /datum/status_effect/wound/blunt/moderate - scar_keyword = "bluntmoderate" /datum/wound/blunt/moderate/Destroy() if(victim) @@ -331,7 +330,6 @@ threshold_penalty = 30 treatable_by = list(/obj/item/stack/sticky_tape/surgical, /obj/item/stack/medical/bone_gel) status_effect_type = /datum/status_effect/wound/blunt/severe - scar_keyword = "bluntsevere" brain_trauma_group = BRAIN_TRAUMA_MILD trauma_cycle_cooldown = 1.5 MINUTES internal_bleeding_chance = 40 @@ -357,7 +355,6 @@ disabling = TRUE treatable_by = list(/obj/item/stack/sticky_tape/surgical, /obj/item/stack/medical/bone_gel) status_effect_type = /datum/status_effect/wound/blunt/critical - scar_keyword = "bluntcritical" brain_trauma_group = BRAIN_TRAUMA_SEVERE trauma_cycle_cooldown = 2.5 MINUTES internal_bleeding_chance = 60 diff --git a/code/datums/wounds/burns.dm b/code/datums/wounds/burns.dm index 651090c62b23..c3485c4531e3 100644 --- a/code/datums/wounds/burns.dm +++ b/code/datums/wounds/burns.dm @@ -256,7 +256,6 @@ 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 - scar_keyword = "burnmoderate" /datum/wound/burn/severe name = "Third Degree Burns" @@ -272,7 +271,6 @@ treatable_by = list(/obj/item/flashlight/pen/paramedic, /obj/item/stack/medical/ointment, /obj/item/stack/medical/mesh) infestation_rate = 0.07 // appx 9 minutes to reach sepsis without any treatment flesh_damage = 12.5 - scar_keyword = "burnsevere" /datum/wound/burn/critical name = "Catastrophic Burns" @@ -289,4 +287,3 @@ 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 - scar_keyword = "burncritical" diff --git a/code/datums/wounds/dismember.dm b/code/datums/wounds/dismember.dm index 17ffa7cec836..8015502ccb83 100644 --- a/code/datums/wounds/dismember.dm +++ b/code/datums/wounds/dismember.dm @@ -1,15 +1,13 @@ /datum/wound/loss name = "Dismemberment Wound" - desc = "oof ouch!!" + desc = "Tis but a flesh wound." - sound_effect = 'sound/effects/dismember.ogg' + sound_effect = 'sound/effects/wounds/dismember.ogg' severity = WOUND_SEVERITY_LOSS threshold_minimum = WOUND_DISMEMBER_OUTRIGHT_THRESH // not actually used since dismembering is handled differently, but may as well assign it since we got it status_effect_type = null - scar_keyword = "dismember" wound_flags = null - already_scarred = TRUE // We manually assign scars for dismembers through endround missing limbs and aheals /// 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, outright = FALSE) diff --git a/code/datums/wounds/pierce.dm b/code/datums/wounds/pierce.dm index 8bec5e337ae2..01824216743b 100644 --- a/code/datums/wounds/pierce.dm +++ b/code/datums/wounds/pierce.dm @@ -157,7 +157,6 @@ threshold_minimum = 30 threshold_penalty = 20 status_effect_type = /datum/status_effect/wound/pierce/moderate - scar_keyword = "piercemoderate" /datum/wound/pierce/severe name = "Open Puncture" @@ -174,7 +173,6 @@ threshold_minimum = 50 threshold_penalty = 35 status_effect_type = /datum/status_effect/wound/pierce/severe - scar_keyword = "piercesevere" /datum/wound/pierce/critical name = "Ruptured Cavity" @@ -191,5 +189,4 @@ threshold_minimum = 100 threshold_penalty = 50 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/slash.dm b/code/datums/wounds/slash.dm index 0468d737a1f1..38c0163dd905 100644 --- a/code/datums/wounds/slash.dm +++ b/code/datums/wounds/slash.dm @@ -27,9 +27,6 @@ /// The maximum flow we've had so far var/highest_flow - /// 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/slash/show_wound_topic(mob/user) return (user == victim && blood_flow) @@ -45,12 +42,6 @@ if(old_wound) blood_flow = max(old_wound.blood_flow, initial_flow) -/datum/wound/slash/remove_wound(ignore_limb, replaced) - if(!replaced && highest_scar) - already_scarred = TRUE - highest_scar.lazy_attach(limb) - return ..() - /datum/wound/slash/get_examine_description(mob/user) if(!limb.current_gauze) return ..() @@ -227,7 +218,6 @@ threshold_minimum = 20 threshold_penalty = 10 status_effect_type = /datum/status_effect/wound/slash/moderate - scar_keyword = "slashmoderate" /datum/wound/slash/severe name = "Open Laceration" @@ -244,7 +234,6 @@ threshold_penalty = 25 demotes_to = /datum/wound/slash/moderate status_effect_type = /datum/status_effect/wound/slash/severe - scar_keyword = "slashsevere" /datum/wound/slash/critical name = "Weeping Avulsion" @@ -261,5 +250,4 @@ threshold_penalty = 40 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 44e9a1cd825c..28def4070841 100644 --- a/code/game/gamemodes/clown_ops/clown_weapons.dm +++ b/code/game/gamemodes/clown_ops/clown_weapons.dm @@ -159,7 +159,7 @@ icon_state = "moustacheg" clumsy_check = GRENADE_NONCLUMSY_FUMBLE -/obj/item/grenade/chem_grenade/teargas/moustache/prime(mob/living/lanced_by) +/obj/item/grenade/chem_grenade/teargas/moustache/prime() var/myloc = get_turf(src) . = ..() for(var/mob/living/carbon/M in view(6, myloc)) diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 86d879f8acd6..a323649d333a 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -195,7 +195,7 @@ to_chat(user, span_notice("[src] is now in [mode] mode.")) -/obj/item/grenade/barrier/prime(mob/living/lanced_by) +/obj/item/grenade/barrier/prime() . = ..() new /obj/structure/barricade/security(get_turf(src.loc)) switch(mode) diff --git a/code/game/objects/effects/anomalies/anomalies_gravity.dm b/code/game/objects/effects/anomalies/anomalies_gravity.dm index 550c4414d408..3e746727d0b0 100644 --- a/code/game/objects/effects/anomalies/anomalies_gravity.dm +++ b/code/game/objects/effects/anomalies/anomalies_gravity.dm @@ -50,11 +50,7 @@ COOLDOWN_START(src, pulse_cooldown, pulse_delay) for(var/mob/living/carbon/carbon in orange(effectrange/2, src)) - if(carbon.run_armor_check(attack_flag = "melee") >= 40) - carbon.break_random_bone() - if(carbon.run_armor_check(attack_flag = "melee") >= 60) - carbon.break_all_bones() //crunch - carbon.apply_damage(10, BRUTE) + carbon.apply_damage(25, BRUTE) /obj/effect/anomaly/grav/proc/on_entered(datum/source, atom/movable/AM) SIGNAL_HANDLER @@ -75,11 +71,7 @@ boing = 0 if(iscarbon(Guy)) for(var/mob/living/carbon/carbon in range(0,src)) - if(carbon.run_armor_check(attack_flag = "melee") >= 20) - carbon.break_random_bone() - else if(carbon.run_armor_check(attack_flag = "melee") >= 40) - carbon.break_all_bones() //crunch - carbon.apply_damage(10, BRUTE) + carbon.apply_damage(20, BRUTE) /obj/effect/anomaly/grav/high effectrange = 5 diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 3affa4a5c789..dc2faf419380 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -138,8 +138,8 @@ GENE SCANNER healthscan(user, M, mode, advanced) else if(scanmode == SCANMODE_CHEMICAL) chemscan(user, M) - else - woundscan(user, M, src) + // else + // woundscan(user, M, src) add_fingerprint(user) @@ -247,7 +247,7 @@ GENE SCANNER // Body part damage report if(iscarbon(M) && mode == SCANNER_VERBOSE) var/mob/living/carbon/C = M - var/list/damaged = C.get_damaged_bodyparts(1,1,ignore_integrity=TRUE) + var/list/damaged = C.get_damaged_bodyparts(1,1) if(length(damaged)>0 || oxy_loss>0 || tox_loss>0 || fire_loss>0) var/dmgreport = "General status:\ \ @@ -337,13 +337,6 @@ GENE SCANNER if(advanced && H.has_dna()) render_list += "Genetic Stability: [H.dna.stability]%.\n" - var/list/damaged_structure = list() - for(var/obj/item/bodypart/B in H.bodyparts) - if(B.integrity_loss) - damaged_structure += B.plaintext_zone - if(damaged_structure.len) - render_list+= "\t[span_alert("Structure rod damage detected. Subject's [english_list(damaged_structure)] [damaged_structure.len > 1 ? "rod require" : "rods requires"] replacement!")]\n" - // Species and body temperature var/datum/species/S = H.dna.species var/mutant = H.dna.check_mutation(HULK) \ diff --git a/code/game/objects/items/grenades/antigravity.dm b/code/game/objects/items/grenades/antigravity.dm index 589443242045..1c3bc9d5034c 100644 --- a/code/game/objects/items/grenades/antigravity.dm +++ b/code/game/objects/items/grenades/antigravity.dm @@ -7,7 +7,7 @@ var/forced_value = 0 var/duration = 300 -/obj/item/grenade/antigravity/prime(mob/living/lanced_by) +/obj/item/grenade/antigravity/prime() . = ..() update_mob() diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm index 7456173ab693..ccf78c2040a1 100644 --- a/code/game/objects/items/grenades/chem_grenade.dm +++ b/code/game/objects/items/grenades/chem_grenade.dm @@ -174,7 +174,7 @@ active = TRUE addtimer(CALLBACK(src, PROC_REF(prime)), isnull(delayoverride)? det_time : delayoverride) -/obj/item/grenade/chem_grenade/prime(mob/living/lanced_by) +/obj/item/grenade/chem_grenade/prime() if(stage != GRENADE_READY) return @@ -213,7 +213,7 @@ ignition_temp = 25 // Large grenades are slightly more effective at setting off heat-sensitive mixtures than smaller grenades. threatscale = 1.1 // 10% more effective. -/obj/item/grenade/chem_grenade/large/prime(mob/living/lanced_by) +/obj/item/grenade/chem_grenade/large/prime() if(stage != GRENADE_READY) return @@ -252,7 +252,7 @@ to_chat(user, span_notice("The new value is out of bounds. Minimum spread is 5 units, maximum is 100 units.")) ..() -/obj/item/grenade/chem_grenade/prime(mob/living/lanced_by) +/obj/item/grenade/chem_grenade/adv_release/prime() if(stage != GRENADE_READY) return diff --git a/code/game/objects/items/grenades/clusterbuster.dm b/code/game/objects/items/grenades/clusterbuster.dm index 8913ae13621e..b9ad8730b652 100644 --- a/code/game/objects/items/grenades/clusterbuster.dm +++ b/code/game/objects/items/grenades/clusterbuster.dm @@ -14,7 +14,7 @@ var/max_spawned = 8 var/segment_chance = 35 -/obj/item/grenade/clusterbuster/prime(mob/living/lanced_by) +/obj/item/grenade/clusterbuster/prime() . = ..() update_mob() var/numspawned = rand(min_spawned,max_spawned) @@ -60,7 +60,7 @@ step_away(src,loc) addtimer(CALLBACK(src, PROC_REF(prime)), rand(15,60)) -/obj/item/grenade/clusterbuster/segment/prime(mob/living/lanced_by) +/obj/item/grenade/clusterbuster/segment/prime() new payload_spawner(drop_location(), payload, rand(min_spawned,max_spawned)) playsound(src, prime_sound, 75, TRUE, -3) resolve() diff --git a/code/game/objects/items/grenades/discogrenade.dm b/code/game/objects/items/grenades/discogrenade.dm index 5341805c8d2d..18a1efbaaf63 100644 --- a/code/game/objects/items/grenades/discogrenade.dm +++ b/code/game/objects/items/grenades/discogrenade.dm @@ -14,7 +14,7 @@ var/list/messages = list("This party is great!", "Wooo!!!", "Party!", "Check out these moves!", "Hey, want to dance with me?") var/list/message_social_anxiety = list("I want to go home...", "Where are the toilets?", "I don't like this song.") -/obj/item/grenade/discogrenade/prime(mob/living/lanced_by) +/obj/item/grenade/discogrenade/prime() . = ..() update_mob() var/current_turf = get_turf(src) @@ -56,7 +56,7 @@ addtimer(CALLBACK(src, PROC_REF(prime)), rand(10, 60)) randomiseLightColor() -/obj/item/grenade/discogrenade/subgrenade/prime(mob/living/lanced_by) +/obj/item/grenade/discogrenade/subgrenade/prime() update_mob() var/current_turf = get_turf(src) if(!current_turf) diff --git a/code/game/objects/items/grenades/emgrenade.dm b/code/game/objects/items/grenades/emgrenade.dm index b604552187b9..8cc4e4bea620 100644 --- a/code/game/objects/items/grenades/emgrenade.dm +++ b/code/game/objects/items/grenades/emgrenade.dm @@ -4,7 +4,7 @@ icon_state = "emp" item_state = "emp" -/obj/item/grenade/empgrenade/prime(mob/living/lanced_by) +/obj/item/grenade/empgrenade/prime() . = ..() update_mob() for(var/obj/machinery/light/L in range(10, src)) diff --git a/code/game/objects/items/grenades/festive.dm b/code/game/objects/items/grenades/festive.dm index 0b1190468ee4..f05653f33e79 100644 --- a/code/game/objects/items/grenades/festive.dm +++ b/code/game/objects/items/grenades/festive.dm @@ -109,7 +109,7 @@ icon_state = initial(icon_state) + "_active" addtimer(CALLBACK(src, PROC_REF(prime)), isnull(delayoverride)? det_time : delayoverride) -/obj/item/grenade/firecracker/prime(mob/living/lanced_by) +/obj/item/grenade/firecracker/prime() . = ..() update_mob() var/explosion_loc = get_turf(src) diff --git a/code/game/objects/items/grenades/flashbang.dm b/code/game/objects/items/grenades/flashbang.dm index a27e65ed58bc..a3b7af1d01cb 100644 --- a/code/game/objects/items/grenades/flashbang.dm +++ b/code/game/objects/items/grenades/flashbang.dm @@ -6,7 +6,7 @@ righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' var/flashbang_range = 7 //how many tiles away the mob will be stunned. -/obj/item/grenade/flashbang/prime(mob/living/lanced_by) +/obj/item/grenade/flashbang/prime() . = ..() update_mob() var/flashbang_turf = get_turf(src) @@ -57,7 +57,7 @@ shrapnel_type = /obj/projectile/bullet/pellet/stingball/mega shrapnel_radius = 12 -/obj/item/grenade/stingbang/prime(mob/living/lanced_by) +/obj/item/grenade/stingbang/prime() if(iscarbon(loc)) var/mob/living/carbon/C = loc var/obj/item/bodypart/B = C.get_holding_bodypart_of_item(src) @@ -116,7 +116,7 @@ rots++ user.changeNext_move(CLICK_CD_RAPID) -/obj/item/grenade/primer/prime(mob/living/lanced_by) +/obj/item/grenade/primer/prime() shrapnel_radius = round(rots / rots_per_mag) . = ..() resolve() diff --git a/code/game/objects/items/grenades/ghettobomb.dm b/code/game/objects/items/grenades/ghettobomb.dm index 9951f9b1cc1e..e95cca3239c7 100644 --- a/code/game/objects/items/grenades/ghettobomb.dm +++ b/code/game/objects/items/grenades/ghettobomb.dm @@ -63,7 +63,7 @@ cut_overlay("improvised_grenade_filled") preprime(user, null, FALSE) -/obj/item/grenade/iedcasing/prime(mob/living/lanced_by) //Blowing that can up +/obj/item/grenade/iedcasing/prime() //Blowing that can up . = ..() update_mob() explosion(src.loc,-1,-1,2, flame_range = 4) // small explosion, plus a very large fireball. diff --git a/code/game/objects/items/grenades/grenade.dm b/code/game/objects/items/grenades/grenade.dm index dced38b5f731..402de2601626 100644 --- a/code/game/objects/items/grenades/grenade.dm +++ b/code/game/objects/items/grenades/grenade.dm @@ -97,7 +97,7 @@ SEND_SIGNAL(src, COMSIG_GRENADE_ARMED, det_time, delayoverride) addtimer(CALLBACK(src, PROC_REF(prime)), isnull(delayoverride)? det_time : delayoverride) -/obj/item/grenade/proc/prime(mob/living/lanced_by) +/obj/item/grenade/proc/prime() if(shrapnel_type && shrapnel_radius && !shrapnel_initialized) // add a second check for adding the component in case whatever triggered the grenade went straight to prime (badminnery for example) shrapnel_initialized = TRUE AddComponent(/datum/component/pellet_cloud, projectile_type=shrapnel_type, magnitude=shrapnel_radius) diff --git a/code/game/objects/items/grenades/hypno.dm b/code/game/objects/items/grenades/hypno.dm index eafd2da99300..150506f4ae0f 100644 --- a/code/game/objects/items/grenades/hypno.dm +++ b/code/game/objects/items/grenades/hypno.dm @@ -7,7 +7,7 @@ righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' var/flashbang_range = 7 -/obj/item/grenade/hypnotic/prime(mob/living/lanced_by) +/obj/item/grenade/hypnotic/prime() . = ..() update_mob() var/flashbang_turf = get_turf(src) diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm index 5b4697537252..4cfa5bcc8828 100644 --- a/code/game/objects/items/grenades/plastic.dm +++ b/code/game/objects/items/grenades/plastic.dm @@ -40,7 +40,7 @@ else return ..() -/obj/item/grenade/c4/prime(mob/living/lanced_by) +/obj/item/grenade/c4/prime() if(QDELETED(src)) return diff --git a/code/game/objects/items/grenades/smokebomb.dm b/code/game/objects/items/grenades/smokebomb.dm index a3fa0c3c7081..c29a00a83901 100644 --- a/code/game/objects/items/grenades/smokebomb.dm +++ b/code/game/objects/items/grenades/smokebomb.dm @@ -7,7 +7,7 @@ slot_flags = ITEM_SLOT_BELT ///Here we generate some smoke and also damage blobs??? for some reason. Honestly not sure why we do that. -/obj/item/grenade/smokebomb/prime(mob/living/lanced_by) +/obj/item/grenade/smokebomb/prime() . = ..() update_mob() playsound(src, 'sound/effects/smoke.ogg', 50, TRUE, -3) diff --git a/code/game/objects/items/grenades/spawnergrenade.dm b/code/game/objects/items/grenades/spawnergrenade.dm index 31f2d1fd19b1..6c54de523e86 100644 --- a/code/game/objects/items/grenades/spawnergrenade.dm +++ b/code/game/objects/items/grenades/spawnergrenade.dm @@ -7,7 +7,7 @@ var/spawner_type = null // must be an object path var/deliveryamt = 1 // amount of type to deliver -/obj/item/grenade/spawnergrenade/prime(mob/living/lanced_by)// Prime now just handles the two loops that query for people in lockers and people who can see it. +/obj/item/grenade/spawnergrenade/prime()// Prime now just handles the two loops that query for people in lockers and people who can see it. . = ..() update_mob() if(spawner_type && deliveryamt) diff --git a/code/game/objects/items/grenades/syndieminibomb.dm b/code/game/objects/items/grenades/syndieminibomb.dm index cf608c7f5dc1..d820ada940e9 100644 --- a/code/game/objects/items/grenades/syndieminibomb.dm +++ b/code/game/objects/items/grenades/syndieminibomb.dm @@ -9,7 +9,7 @@ ex_light = 4 ex_flame = 2 -/obj/item/grenade/syndieminibomb/prime(mob/living/lanced_by) +/obj/item/grenade/syndieminibomb/prime() . = ..() update_mob() resolve() @@ -38,7 +38,7 @@ shrapnel_type = /obj/projectile/bullet/shrapnel/mega shrapnel_radius = 12 -/obj/item/grenade/frag/prime(mob/living/lanced_by) +/obj/item/grenade/frag/prime() . = ..() update_mob() resolve() @@ -53,7 +53,7 @@ var/rad_damage = 350 var/stamina_damage = 30 -/obj/item/grenade/gluon/prime(mob/living/lanced_by) +/obj/item/grenade/gluon/prime() . = ..() update_mob() playsound(loc, 'sound/effects/empulse.ogg', 50, TRUE) diff --git a/code/game/objects/items/shrapnel.dm b/code/game/objects/items/shrapnel.dm index ecf716e5a902..db57ce9020c6 100644 --- a/code/game/objects/items/shrapnel.dm +++ b/code/game/objects/items/shrapnel.dm @@ -130,6 +130,9 @@ deltimer(timer_id) return ..() +/obj/item/shrapnel/bullet/c38/dumdum + name = ".38 Dumdum" + /obj/item/shrapnel/bullet/tracker/c38 name = ".38 Tracker" diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 767235056b83..d3e8b998bf1b 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -14,10 +14,6 @@ item_flags = NOBLUDGEON merge_type = /obj/item/stack/medical - var/heals_organic = TRUE - var/heals_inorganic = FALSE - var/restore_integrity = - /// How long it takes to apply it to yourself var/self_delay = 5 SECONDS /// How long it takes to apply it to someone else @@ -26,7 +22,7 @@ var/repeating = FALSE /// How much medical XP is given per use? var/experience_given = 1 - ///Sound/Sounds to play when this is applied + /// Sound/Sounds to play when this is applied var/apply_sounds /// How much brute we heal per application. This is the only number that matters for simplemobs var/heal_brute @@ -40,8 +36,6 @@ var/flesh_regeneration /// This is a multiplier used to speed up burn recoveries var/burn_cleanliness_bonus - ///Sound/Sounds to play when this is applied - var/apply_sounds /obj/item/stack/medical/attack(mob/living/patient, mob/user) . = ..() @@ -105,21 +99,17 @@ to_chat(user, span_warning("You can't heal [patient] with [src]!")) /// The healing effects on a carbon patient. Since we have extra details for dealing with bodyparts, we get our own fancy proc. Still returns TRUE on success and FALSE on fail -/obj/item/stack/medical/proc/heal_carbon(mob/living/carbon/C, mob/user, brute, burn, integrity = 0) +/obj/item/stack/medical/proc/heal_carbon(mob/living/carbon/C, mob/user, brute, burn) var/obj/item/bodypart/affecting = C.get_bodypart(check_zone(user.zone_selected)) if(!affecting) //Missing limb? to_chat(user, span_warning("[C] doesn't have \a [parse_zone(user.zone_selected)]!")) return FALSE - if(!heals_inorganic && !IS_ORGANIC_LIMB(affecting)) //does it work on robotic limbs? + if(!IS_ORGANIC_LIMB(affecting)) //does it work on robotic limbs? to_chat(user, span_warning("\The [src] won't work on a robotic limb!")) return FALSE - if(!heals_organic && IS_ORGANIC_LIMB(affecting)) //does it work on organic limbs? - to_chat(user, span_warning("\The [src] won't work on an organic limb!")) - return - if(affecting.brute_dam && brute || affecting.burn_dam && burn) user.visible_message( span_green("[user] applies [src] on [C]'s [affecting.name]"), @@ -133,25 +123,6 @@ to_chat(user, span_warning("[C]'s [affecting.name] can not be healed with [src]!")) return FALSE - if(restore_integrity) - if(affecting.integrity_loss == 0) - to_chat(user, span_warning("[C]'s [affecting.name] has no integrity damage!")) - else - var/integ_healed = min(integrity, affecting.integrity_loss) - //check how much limb health we've lost to integrity_loss - var/integ_damage_removed = max(integ_healed, affecting.integrity_loss-affecting.integrity_ignored) - var/brute_heal = min(affecting.brute_dam,integ_damage_removed) - var/burn_heal = max(0,integ_damage_removed-brute_heal) - affecting.integrity_loss -= integ_healed - affecting.heal_damage(brute_heal,burn_heal,0,null,BODYTYPE_ROBOTIC) - // C.update_inv_splints() something breaks - successful_heal = TRUE - - if(successful_heal) - user.visible_message(span_green("[user] applies \the [src] on [C]'s [affecting.name]."), span_green("You apply \the [src] on [C]'s [affecting.name].")) - return TRUE - to_chat(user, span_warning("[C]'s [affecting.name] can not be healed with \the [src]!")) - ///Override this proc for special post heal effects. /obj/item/stack/medical/proc/post_heal_effects(amount_healed, mob/living/carbon/healed_mob, mob/user) return @@ -297,7 +268,7 @@ heal_burn = 5 flesh_regeneration = 2.5 sanitization = 0.25 - grind_results = list(/datum/reagent/medicine/C2/lenturi = 10) + // grind_results = list(/datum/reagent/medicine/C2/lenturi = 10) merge_type = /obj/item/stack/medical/ointment /obj/item/stack/medical/mesh @@ -438,7 +409,7 @@ desc = "Used to secure limbs following a fracture." gender = PLURAL singular_name = "splint" - icon = 'icons/obj/items_and_weapons.dmi' + icon = 'icons/obj/items.dmi' icon_state = "splint" apply_sounds = list('sound/effects/rip1.ogg', 'sound/effects/rip2.ogg') self_delay = 5 SECONDS @@ -508,25 +479,3 @@ amount = 1 splint_type = /datum/bodypart_aid/splint/improvised merge_type = /obj/item/stack/medical/splint/improvised - -//Structural rods -/obj/item/stack/medical/structure - name = "replacement structural rods" - desc = "Steel rods and cable with adjustable titanium fasteners, for quickly repairing structural damage to robotic limbs." - gender = PLURAL - icon = 'icons/obj/items.dmi' - icon_state = "ipc_splint" - amount = 2 - max_amount = 3 - novariants = FALSE - self_delay = 50 - other_delay = 20 - heals_inorganic = TRUE - heals_organic = FALSE - restore_integrity = TRUE - -/obj/item/stack/medical/structure/heal(mob/living/target, mob/user) - . = ..() - if(iscarbon(target)) - return heal_carbon(target, user, integrity = 150) - to_chat(user, span_warning("You can't repair [target]'s limb' with the \the [src]!")) diff --git a/code/game/objects/items/storage/pouches.dm b/code/game/objects/items/storage/pouches.dm index 62214de14d03..26f891287259 100644 --- a/code/game/objects/items/storage/pouches.dm +++ b/code/game/objects/items/storage/pouches.dm @@ -48,7 +48,6 @@ /obj/item/stack/medical/mesh, /obj/item/stack/medical/ointment, /obj/item/stack/medical/splint, - /obj/item/stack/medical/structure, /obj/item/storage/pill_bottle, /obj/item/reagent_containers/pill, /obj/item/reagent_containers/syringe, @@ -114,7 +113,6 @@ /obj/item/t_scanner, /obj/item/analyzer, /obj/item/geiger_counter, - /obj/item/stack/medical/structure, /obj/item/extinguisher/mini, /obj/item/toy/crayon/spraycan, /obj/item/stack/marker_beacon, diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index efdd6b44d1dd..1d5a4048199c 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -128,7 +128,7 @@ span_notice("You start fixing some of the dents on [target == user ? "your" : "[target]'s"] [parse_zone(attackedLimb.body_zone)].")) if(!use_tool(target, user, delay = (target == user ? 5 SECONDS : 0.5 SECONDS), amount = 1, volume = 25)) return TRUE - item_heal_robotic(target, user, brute_heal = 15, burn_heal = 0, integrity_loss = 5) + item_heal_robotic(target, user, brute_heal = 15, burn_heal = 0) return TRUE /obj/item/weldingtool/afterattack(atom/O, mob/user, proximity) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 5735cff80b1a..d80ff70dc54d 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -161,14 +161,13 @@ if(user.mind?.martial_art.smashes_tables && user.mind?.martial_art.can_use(user)) deconstruct(FALSE) - playsound(pushed_mob, 'sound/effects/tablelimbsmash.ogg', 90, TRUE) + // playsound(pushed_mob, 'sound/effects/tablelimbsmash.ogg', 90, TRUE) pushed_mob.visible_message( span_danger("[user] smashes [pushed_mob]'s [banged_limb.name] against \the [src]!"), span_userdanger("[user] smashes your [banged_limb.name] against \the [src]"), span_userdanger("You hear a loud bang!"), ) log_combat(user, pushed_mob, "head slammed", null, "against [src]") - SEND_SIGNAL(pushed_mob, COMSIG_ADD_MOOD_EVENT, "table", /datum/mood_event/table_limbsmash, banged_limb) /obj/structure/table/attackby(obj/item/I, mob/user, params) var/list/modifiers = params2list(params) diff --git a/code/modules/assembly/anomalies.dm b/code/modules/assembly/anomalies.dm index 2b4124d5eb5c..999fdd1d2d90 100644 --- a/code/modules/assembly/anomalies.dm +++ b/code/modules/assembly/anomalies.dm @@ -82,11 +82,7 @@ //throngles u cutely visible_message(span_warning("[src] implodes into itself, light itself bending for a split second!")) for(var/mob/living/carbon/carbon in range(1,src)) - if(carbon.run_armor_check(attack_flag = "melee") >= 40) - carbon.break_all_bones() //crunch - else if(carbon.run_armor_check(attack_flag = "melee") >= 20) - carbon.break_random_bone() - carbon.apply_damage(20, BRUTE) + carbon.apply_damage(30, BRUTE) ..() ///Hallucination Anomaly diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 22c1deb9ad0b..d6a2e58ec121 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -35,6 +35,10 @@ /// What items can be consumed to repair this clothing (must by an /obj/item/stack) var/repairable_by = /obj/item/stack/sheet/cotton/cloth + //Var modification - PLEASE be careful with this I know who you are and where you live + var/list/user_vars_to_edit //VARNAME = VARVALUE eg: "name" = "butts" + var/list/user_vars_remembered //Auto built by the above + dropped() + equipped() + var/can_be_bloody = TRUE //set during equip_to_slot, removed when taking off. @@ -101,13 +105,13 @@ /obj/item/clothing/attack(mob/M, mob/user, def_zone) if(user.a_intent != INTENT_HARM && moth_edible && ismoth(M)) - if(damaged_clothes == CLOTHING_SHREDDED) - to_chat(user, span_notice("[src] seem[p_s()] pretty torn apart... [p_they(TRUE)] probably wouldn't be too tasty.")) - return - var/obj/item/reagent_containers/food/snacks/clothing/clothing_as_food = new - clothing_as_food.name = name - if(clothing_as_food.attack(M, user, def_zone)) - take_damage(15, sound_effect=FALSE) + if(damaged_clothes == CLOTHING_SHREDDED) + to_chat(user, span_notice("[src] seem[p_s()] pretty torn apart... [p_they(TRUE)] probably wouldn't be too tasty.")) + return + var/obj/item/reagent_containers/food/snacks/clothing/clothing_as_food = new + clothing_as_food.name = name + if(clothing_as_food.attack(M, user, def_zone)) + take_damage(15, sound_effect=FALSE) qdel(clothing_as_food) else return ..() @@ -240,7 +244,7 @@ if(variable in user.vars) if(user.vars[variable] == user_vars_to_edit[variable]) //Is it still what we set it to? (if not we best not change it) user.vars[variable] = user_vars_remembered[variable] - user_vars_remembered = initial(user_vars_remembered) // Effectively this sets it to null. + user_vars_remembered = null /obj/item/clothing/equipped(mob/user, slot) ..() diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm index cea0992b99f7..f09e1ede549e 100644 --- a/code/modules/hydroponics/grown/citrus.dm +++ b/code/modules/hydroponics/grown/citrus.dm @@ -140,7 +140,7 @@ /obj/item/reagent_containers/food/snacks/grown/firelemon/ex_act(severity) qdel(src) //Ensuring that it's deleted by its own explosion -/obj/item/reagent_containers/food/snacks/grown/firelemon/proc/prime(mob/living/lanced_by) +/obj/item/reagent_containers/food/snacks/grown/firelemon/proc/prime() switch(seed.potency) //Combustible lemons are alot like IEDs, lots of flame, very little bang. if(0 to 30) update_mob() diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm index 36caf09adcf8..91bb782c1154 100644 --- a/code/modules/hydroponics/grown/misc.dm +++ b/code/modules/hydroponics/grown/misc.dm @@ -209,7 +209,7 @@ /obj/item/reagent_containers/food/snacks/grown/cherry_bomb/ex_act(severity) qdel(src) //Ensuring that it's deleted by its own explosion. Also prevents mass chain reaction with piles of cherry bombs -/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/prime(mob/living/lanced_by) +/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/prime() icon_state = "cherry_bomb_lit" playsound(src, 'sound/effects/fuse.ogg', seed.potency, FALSE) reagents.chem_temp = 1000 //Sets off the gunpowder diff --git a/code/modules/mob/living/basic/space_fauna/bear/bear.dm b/code/modules/mob/living/basic/space_fauna/bear/bear.dm index 0c963cfc9680..461a46f1faa2 100644 --- a/code/modules/mob/living/basic/space_fauna/bear/bear.dm +++ b/code/modules/mob/living/basic/space_fauna/bear/bear.dm @@ -23,7 +23,6 @@ obj_damage = 60 melee_damage_lower = 15 // i know it's like half what it used to be, but bears cause bleeding like crazy now so it works out melee_damage_upper = 15 - wound_bonus = -5 bare_wound_bonus = 10 // BEAR wound bonus am i right sharpness = SHARP_EDGED attack_verb_continuous = "claws" diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm index 90d064291ced..0254c7a3841c 100644 --- a/code/modules/mob/living/blood.dm +++ b/code/modules/mob/living/blood.dm @@ -210,7 +210,7 @@ /mob/living/carbon/restore_blood() blood_volume = BLOOD_VOLUME_NORMAL - for(var/i in bodyparts) + for(var/i in bodyparts) var/obj/item/bodypart/BP = i BP.generic_bleedstacks = 0 diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 5e7571c354ad..50df7d16f3ab 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -16,8 +16,6 @@ QDEL_LIST(implants) for(var/wound in all_wounds) // these LAZYREMOVE themselves when deleted so no need to remove the list here qdel(wound) - for(var/scar in all_scars) - qdel(scar) remove_from_all_data_huds() QDEL_NULL(dna) GLOB.carbon_list -= src @@ -889,7 +887,6 @@ if(reagents) reagents.addiction_list = list() cure_all_traumas(TRAUMA_RESILIENCE_MAGIC) - mend_fractures() ..() // heal ears after healing traits, since ears check TRAIT_DEAF trait // when healing. @@ -1002,9 +999,9 @@ if(SANITY_NEUTRAL to INFINITY) . *= 0.90 - for(var/i in status_effects) - var/datum/status_effect/S = i - . *= S.interact_speed_modifier() + // for(var/i in status_effects) + // var/datum/status_effect/S = i + // . *= S.interact_speed_modifier() //todo: fix/remove /mob/living/carbon/proc/create_internal_organs() for(var/X in internal_organs) @@ -1225,34 +1222,6 @@ return total_bleed_rate -/** - * 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_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_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/scaries = new - var/obj/item/bodypart/scar_part = pick(bodyparts) - - var/wound_type - if(forced_type) - if(islist(forced_type)) - wound_type = pick(forced_type) - else - wound_type = forced_type - else - wound_type = pick(GLOB.global_all_wound_types) - - var/datum/wound/phantom_wound = new wound_type - scaries.generate(scar_part, phantom_wound) - scaries.fake = TRUE - QDEL_NULL(phantom_wound) - /mob/living/carbon/proc/update_flavor_text_feature(new_text) if(!dna) return diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index cf182a9f5919..624c560c9924 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -2,10 +2,10 @@ var/obj/item/bodypart/BP = get_bodypart(check_zone(user.zone_selected)) if(!BP) return ..() - var/painless = (HAS_TRAIT(user, TRAIT_ANALGESIA) || HAS_TRAIT(user, TRAIT_PAIN_RESIST)) + // var/painless = (HAS_TRAIT(user, TRAIT_ANALGESIA) || HAS_TRAIT(user, TRAIT_PAIN_RESIST)) if(W.tool_behaviour == TOOL_WELDER && IS_ROBOTIC_LIMB(BP) && BP.brute_dam) //prioritize healing if we're synthetic return ..() - if(user.a_intent != INTENT_HELP || !W.get_temperature() || !BP.can_bandage()) //this will also catch low damage synthetic welding + if(user.a_intent != INTENT_HELP || !W.get_temperature()) //this will also catch low damage synthetic welding return ..() . = TRUE // var/heal_time = 2 SECONDS //todo: rethink/fix cautery diff --git a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm index 2f25794c720e..f8c04466710f 100644 --- a/code/modules/mob/living/carbon/damage_procs.dm +++ b/code/modules/mob/living/carbon/damage_procs.dm @@ -165,15 +165,12 @@ //////////////////////////////////////////// //Returns a list of damaged bodyparts -//ignore_integrity shows limbs that can't be healed due to low integrity -/mob/living/carbon/proc/get_damaged_bodyparts(brute = FALSE, burn = FALSE, stamina = FALSE, status, ignore_integrity = FALSE) +/mob/living/carbon/proc/get_damaged_bodyparts(brute = FALSE, burn = FALSE, stamina = FALSE, status) var/list/obj/item/bodypart/parts = list() for(var/obj/item/bodypart/BP as anything in bodyparts) if(status && !(BP.bodytype & status)) continue if((brute && BP.brute_dam) || (burn && BP.burn_dam) || (stamina && BP.stamina_dam)) - if (!ignore_integrity && BP.get_curable_damage() <= 0) - continue parts += BP return parts @@ -226,20 +223,9 @@ if(!parts.len) return var/obj/item/bodypart/picked = pick(parts) - if(picked.receive_damage(brute, burn, stamina,check_armor ? run_armor_check(picked, (brute ? "melee" : burn ? "fire" : stamina ? "bullet" : null)) : FALSE, wound_bonus = wound_bonus, bare_wound_bonus = bare_wound_bonus, sharpness = sharpness)) + if(picked.receive_damage(brute, burn, stamina,check_armor ? run_armor_check(picked, (brute ? "melee" : burn ? "fire" : stamina ? "bullet" : null)) : FALSE, wound_bonus = wound_bonus, bare_wound_bonus = bare_wound_bonus, sharpness = sharpness)) update_damage_overlays() -///Fix integrity in MANY bodyparts, in random order -/mob/living/carbon/heal_overall_integrity(amount = 0, required_status, updating_health = TRUE) - var/list/obj/item/bodypart/parts = get_damaged_bodyparts(required_status, FALSE) - var/update = NONE - while(parts.len && (amount > 0)) - var/obj/item/bodypart/picked = pick(parts) - var/integrity_was = picked.integrity_loss - update |= picked.heal_integrity(amount, required_status, FALSE) - amount -= round(amount - (integrity_was - picked.integrity_loss), DAMAGE_PRECISION) - parts -= picked - ///Heal MANY bodyparts, in random order /mob/living/carbon/heal_overall_damage(brute = 0, burn = 0, stamina = 0, required_status, updating_health = TRUE) var/list/obj/item/bodypart/parts = get_damaged_bodyparts(brute, burn, stamina, required_status) diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index 76fd7e0ca3e9..1797690b1940 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -208,20 +208,4 @@ if(!any_bodypart_damage) msg += "\t[t_He] [t_Has] no significantly damaged bodyparts." - var/list/visible_scars - if(all_scars) - for(var/i in all_scars) - var/datum/scar/S = i - if(S.is_visible(user)) - LAZYADD(visible_scars, S) - - if(!visible_scars) - msg |= "\t[t_He] [t_Has] no visible scars." - else - for(var/i in visible_scars) - var/datum/scar/S = i - var/scar_text = S.get_examine_description(user) - if(scar_text) - msg += "[scar_text]" - return msg diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 481b56019c36..a7d08e97b36a 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -176,14 +176,6 @@ var/datum/wound/iter_wound = i msg += "[iter_wound.get_examine_description(user)]\n" - if(body_part.uses_integrity && (body_part.integrity_loss-body_part.integrity_ignored) > 0) - if ((body_part.integrity_loss-body_part.integrity_ignored) > body_part.max_damage*0.66) - msg += "[t_His] [body_part.name] is [body_part.heavy_integrity_msg]!\n" - else if (body_part.integrity_loss-body_part.integrity_ignored > body_part.max_damage*0.33) - msg += "[t_His] [body_part.name] is [body_part.medium_integrity_msg]!\n" - else - msg += "[t_His] [body_part.name] is [body_part.light_integrity_msg].\n" - for(var/X in disabled) var/obj/item/bodypart/body_part = X var/damage_text diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 79c9c487dd43..8de980600ba5 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -886,20 +886,6 @@ icon_num = 0 if(icon_num) hud_used.healthdoll.add_overlay(mutable_appearance('icons/hud/screen_gen.dmi', "[BP.body_zone][icon_num]")) - if(BP.uses_integrity) // Same, but for integrity - var/integ_loss = max(0,BP.integrity_loss-BP.integrity_ignored) - var/integ_icon_num - if(integ_loss) - integ_icon_num = 1 - if(integ_loss > (comparison)) - integ_icon_num = 2 - if(integ_loss > (comparison*2)) - integ_icon_num = 3 - if(integ_loss > (comparison*3)) - integ_icon_num = 4 - if(integ_icon_num) //no 100% integ loss icon as it'd be visually indistinguishable from limb removal - hud_used.healthdoll.add_overlay(mutable_appearance('icons/hud/screen_gen.dmi', "[BP.body_zone]_integ[integ_icon_num]")) - for(var/t in get_missing_limbs()) //Missing limbs hud_used.healthdoll.add_overlay(mutable_appearance('icons/hud/screen_gen.dmi', "[t]6")) for(var/t in get_disabled_limbs()) //Disabled limbs diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index fc5476adcf9c..2faa15d844fe 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -352,7 +352,7 @@ if(!affecting) affecting = get_bodypart(BODY_ZONE_CHEST) var/armor_block = run_armor_check(affecting, "melee") - apply_damage(damage, BRUTE, affecting, armor_block, wound_bonus=wound_mod) + apply_damage(damage, BRUTE, affecting, armor_block) /mob/living/carbon/human/attack_basic_mob(mob/living/basic/user, list/modifiers) 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 a2ccc8ad91cf..ee6a0b484488 100644 --- a/code/modules/mob/living/carbon/human/species_types/flypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/flypeople.dm @@ -1,7 +1,7 @@ /datum/species/fly name = "\improper Flyperson" id = SPECIES_FLYPERSON - sspecies_traits = list(NOEYESPRITES, TRAIT_ANTENNAE, HAS_FLESH, HAS_BONE) + species_traits = list(NOEYESPRITES, TRAIT_ANTENNAE, 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/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm index 25f1a91b5e0e..a8e710cb1693 100644 --- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm +++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm @@ -4,7 +4,7 @@ id = SPECIES_SKELETON sexes = 0 meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton - species_traits = list(NOBLOOD, HAS_BONES, NOHUSK) + species_traits = list(NOBLOOD, HAS_BONE, NOHUSK) inherent_traits = list(TRAIT_NOMETABOLISM,TRAIT_TOXIMMUNE,TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_GENELESS,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,\ TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT,TRAIT_FAKEDEATH,TRAIT_XENO_IMMUNE,TRAIT_NOCLONELOSS) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID diff --git a/code/modules/mob/living/carbon/human/species_types/vox.dm b/code/modules/mob/living/carbon/human/species_types/vox.dm index ad48c0e3b07f..3fffe12b8921 100644 --- a/code/modules/mob/living/carbon/human/species_types/vox.dm +++ b/code/modules/mob/living/carbon/human/species_types/vox.dm @@ -4,7 +4,7 @@ id = SPECIES_VOX default_color = "6060FF" species_age_max = 280 - species_traits = list(EYECOLOR, HAS_BONES, HAS_FLESH) + species_traits = list(EYECOLOR, HAS_BONE, HAS_FLESH) mutant_bodyparts = list("vox_head_quills", "vox_neck_quills") default_features = list("mcolor" = "0F0", "wings" = "None", "vox_head_quills" = "None", "vox_neck_quills" = "None", "body_size" = "Normal") meat = /obj/item/reagent_containers/food/snacks/meat/slab/chicken diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index a0c832d221f1..23d123297652 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -828,9 +828,9 @@ newdir = turn(get_dir(target_turf, start), 180) if(!blood_exists) - new /obj/effect/decal/cleanable/trail_holder(start, get_static_viruses()) + new /obj/effect/decal/cleanable/blood/trail_holder(start, get_static_viruses()) - for(var/obj/effect/decal/cleanable/trail_holder/TH in start) + for(var/obj/effect/decal/cleanable/blood/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)) diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm index 77834eb9ced4..b664e34ee8d1 100644 --- a/code/modules/mob/living/living_say.dm +++ b/code/modules/mob/living/living_say.dm @@ -240,7 +240,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( var/is_custom_emote = message_mods[MODE_CUSTOM_SAY_ERASE_INPUT] - var/understood = TRUE + var/understood = TRUE //todo:why is this unused... if(!is_custom_emote) // we do not translate emotes var/untranslated_raw_message = raw_message raw_message = lang_treat(speaker, message_language, raw_message, spans, message_mods) // translate diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 22aaae51597a..b9d235c3c2c5 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -344,7 +344,6 @@ /obj/item/roller/robo, /obj/item/borg/cyborghug/medical, /obj/item/stack/medical/gauze/cyborg, - /obj/item/stack/medical/bone_gel/cyborg, /obj/item/organ_storage, /obj/item/borg/lollipop) emag_modules = list(/obj/item/reagent_containers/borghypo/hacked) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index dc957c4a35a7..53d3419a82b9 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -280,7 +280,6 @@ malignance = new() malignance.infect(M, FALSE) //we handle all the fancy virus stuff in the organ, so we need a reference for it malignance_tracker = addtimer(CALLBACK(src, PROC_REF(update_stage)), malignance_countdown, TIMER_STOPPABLE|TIMER_DELETE_ME) - M.heal_overall_bleeding(12) //stop dying so fast /obj/item/organ/legion_skull/Remove(mob/living/carbon/M, special = 0) malignance_countdown = initial(malignance_countdown) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index b08f7e1d7e00..6fdb4071f2ba 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -449,7 +449,7 @@ /** * Heal a robotic body part on a mob */ -/proc/item_heal_robotic(mob/living/carbon/human/H, mob/user, brute_heal, burn_heal, integrity_loss=0) +/proc/item_heal_robotic(mob/living/carbon/human/H, mob/user, brute_heal, burn_heal) var/obj/item/bodypart/affecting = H.get_bodypart(check_zone(user.zone_selected)) if(affecting && (!IS_ORGANIC_LIMB(affecting))) var/dam //changes repair text based on how much brute/burn was supplied @@ -458,18 +458,6 @@ else dam = 0 if((brute_heal > 0 && affecting.brute_dam > 0) || (burn_heal > 0 && affecting.burn_dam > 0)) - if(affecting.uses_integrity) - var/integrity_damage_incurred = (affecting.get_curable_damage() >= affecting.integrity_threshold) || (affecting.max_damage - affecting.integrity_loss >= affecting.integrity_threshold) - if(affecting.get_curable_damage(integrity_damage_incurred ? integrity_loss : 0) <= 0) - var/limb_hp_loss = affecting.integrity_loss-affecting.integrity_ignored - if(limb_hp_loss+integrity_loss >= affecting.max_damage) - to_chat(user, span_warning("[affecting] is destroyed! It needs structural repairs to be repaired any further.")) - else - to_chat(user, span_warning("[affecting] has taken too much structural damage, and needs surgery to improve any further.")) - return - if (integrity_damage_incurred) - affecting.take_integrity_damage(integrity_loss) - if(affecting.heal_damage(brute_heal, burn_heal, 0, BODYTYPE_ROBOTIC)) H.update_damage_overlays() user.visible_message("[user] has fixed some of the [dam ? "dents on" : "burnt wires in"] [H]'s [parse_zone(affecting.body_zone)].", \ diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 01b7f0af5dd1..6bb566127ba8 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -185,7 +185,7 @@ span_notice("You start fixing some of the dents on [target == user ? "your" : "[target]'s"] [parse_zone(attackedLimb.body_zone)].")) if(!use_tool(target, user, delay = (target == user ? 5 SECONDS : 0.5 SECONDS), amount = 1, volume = 25)) return TRUE - item_heal_robotic(target, user, brute_heal = 15, burn_heal = 0, integrity_loss = 5) + item_heal_robotic(target, user, brute_heal = 15, burn_heal = 0) return TRUE /obj/item/gun/energy/plasmacutter/use(amount) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 69ce79b05f7a..8a66cab275a1 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -1269,9 +1269,6 @@ /datum/reagent/medicine/bicaridinep/on_mob_life(mob/living/carbon/M) M.adjustBruteLoss(-2*REM, 0) - if(ishuman(M)) - var/mob/living/carbon/human/H = M - H.heal_bleeding(0.25) ..() . = 1 @@ -2343,9 +2340,9 @@ overdose_threshold = 11 /datum/reagent/medicine/chitosan/on_mob_life(mob/living/carbon/M) - if(ishuman(M)) - var/mob/living/carbon/human/H = M - H.heal_bleeding(1) + // if(ishuman(M)) + // var/mob/living/carbon/human/H = M //todo: wounds integration + // H.heal_bleeding(1) ..() . = 1 diff --git a/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm b/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm index a01fbc7be611..6962686ac182 100644 --- a/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm @@ -334,13 +334,13 @@ debuff_effect = /datum/status_effect/trickwine/debuff/hearth dip_ammo_type = /obj/item/ammo_casing/c38/hotshot -//This needs a buff -/datum/reagent/consumable/ethanol/trickwine/hearth_wine/on_mob_life(mob/living/M) - M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal(), FALSE) - if(ishuman(M)) - var/mob/living/carbon/human/H = M - H.heal_bleeding(0.25) - return ..() +//This needs a buff //todo: wounds integration? +// /datum/reagent/consumable/ethanol/trickwine/hearth_wine/on_mob_life(mob/living/M) +// M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal(), FALSE) +// if(ishuman(M)) +// var/mob/living/carbon/human/H = M +// H.heal_bleeding(0.25) +// return ..() /datum/status_effect/trickwine/buff/hearth id = "hearth_wine_buff" diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm index 0c73bad9893b..d973ec452751 100644 --- a/code/modules/reagents/chemistry/recipes/medicine.dm +++ b/code/modules/reagents/chemistry/recipes/medicine.dm @@ -255,15 +255,6 @@ WS End */ results = list(/datum/reagent/medicine/psicodine = 5) required_reagents = list(/datum/reagent/medicine/mannitol = 2, /datum/reagent/water = 2, /datum/reagent/impedrezene = 1) -/datum/chemical_reaction/medsuture - required_reagents = list(/datum/reagent/cellulose = 10, /datum/reagent/toxin/formaldehyde = 20, /datum/reagent/medicine/polypyr = 15) //This might be a bit much, reagent cost should be reviewed after implementation. - mob_react = FALSE - -/datum/chemical_reaction/medsuture/on_reaction(datum/reagents/holder, created_volume) - var/location = get_turf(holder.my_atom) - for(var/i in 1 to created_volume) - new /obj/item/stack/medical/suture/medicated(location) - /datum/chemical_reaction/medmesh required_reagents = list(/datum/reagent/cellulose = 20, /datum/reagent/consumable/aloejuice = 20, /datum/reagent/space_cleaner/sterilizine = 10) mob_react = FALSE diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm index e099e8ca955d..8927c3242139 100644 --- a/code/modules/surgery/bodyparts/bodyparts.dm +++ b/code/modules/surgery/bodyparts/bodyparts.dm @@ -48,16 +48,6 @@ ///For limbs that don't really exist, eg chainsaws var/is_pseudopart = FALSE - /// Whether this limb can decay, limiting its' ability to heal - var/uses_integrity = FALSE - /// How many hit points worth of integrity this limb has lost. 10 integrity = 10 HP - var/integrity_loss = 0 - /// The amount of integrity_loss that this limb can have without any effects. - var/integrity_ignored = 20 - /// If the limb has lost less than this amount of health, integrity loss should not be accrued. - /// Ignored if this is is greater or equal to the remaining health of the limb. - var/integrity_threshold = 15 - ///If disabled, limb is as good as missing. var/bodypart_disabled = FALSE ///Multiplied by max_damage it returns the threshold which defines a limb being disabled or not. From 0 to 1. 0 means no disable thru damage @@ -555,30 +545,12 @@ return injury_mod -// Removes integrity from the limb, if it uses integrity. -/obj/item/bodypart/proc/take_integrity_damage(loss) - if (uses_integrity) - integrity_loss = clamp(integrity_loss + loss, 0, max_damage+integrity_ignored) - - -// Heals integrity for the limb, if it uses integrity. -/obj/item/bodypart/proc/heal_integrity(amount) - if (uses_integrity) - integrity_loss = clamp(integrity_loss - amount, 0, max_damage) - //Heals brute and burn damage for the organ. Returns 1 if the damage-icon states changed at all. //Damage cannot go below zero. //Cannot remove negative damage (i.e. apply damage) /obj/item/bodypart/proc/heal_damage(brute, burn, stamina, required_status, updating_health = TRUE) if(required_status && !(bodytype & required_status)) //So we can only heal certain kinds of limbs, ie robotic vs organic. return - - if (uses_integrity && (burn > 0 || brute > 0)) - var/max_heal = max(0, burn_dam + brute_dam - max(0,integrity_loss-integrity_ignored)) - var/total_heal = min(brute,brute_dam)+min(burn,burn_dam) //in case we're trying to heal nonexistent dmg - var/heal_mult = min(1,max_heal/total_heal) - brute *= heal_mult - burn *= heal_mult if(brute) set_brute_dam(round(max(brute_dam - brute, 0), DAMAGE_PRECISION)) if(burn) @@ -625,12 +597,6 @@ total = max(total, stamina_dam) return total -///Returns damage that can be healed on a limb. -/// integrity_cost: Optional, returns how much damage can be healed after losing X integrity -/obj/item/bodypart/proc/get_curable_damage(integrity_cost=0) - var/total = brute_dam + burn_dam - max(0,(integrity_loss+integrity_cost)-integrity_ignored) - return total - //Checks disabled status thresholds /obj/item/bodypart/proc/update_disabled() if(!owner) diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm index 70db8dcaf649..d47e139dce7f 100644 --- a/code/modules/surgery/bodyparts/dismemberment.dm +++ b/code/modules/surgery/bodyparts/dismemberment.dm @@ -22,7 +22,7 @@ if(!HAS_TRAIT(C, TRAIT_ANALGESIA)) //and do we actually feel pain? INVOKE_ASYNC(C, TYPE_PROC_REF(/mob, emote), "scream") - playsound(get_turf(C), 'sound/effects/dismember.ogg', 80, TRUE) + playsound(get_turf(C), 'sound/effects/wounds/dismember.ogg', 80, TRUE) SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "dismembered", /datum/mood_event/dismembered) drop_limb() @@ -447,7 +447,6 @@ return /mob/living/carbon/regenerate_limb(limb_zone, noheal, robotic = FALSE) - var/obj/item/bodypart/L if(get_bodypart(limb_zone)) return FALSE return TRUE diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm index 168bc68b590e..9eb03d19aa02 100644 --- a/code/modules/surgery/bodyparts/parts.dm +++ b/code/modules/surgery/bodyparts/parts.dm @@ -71,8 +71,6 @@ px_x = -6 px_y = 0 can_be_disabled = TRUE - bone_break_threshold = 25 - /obj/item/bodypart/l_arm/set_owner(new_owner) . = ..() @@ -95,7 +93,6 @@ else UnregisterSignal(old_owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_ARM)) - ///Proc to react to the owner gaining the TRAIT_PARALYSIS_L_ARM trait. /obj/item/bodypart/l_arm/proc/on_owner_paralysis_gain(mob/living/carbon/source) SIGNAL_HANDLER @@ -103,7 +100,6 @@ UnregisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_ARM)) RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_ARM), PROC_REF(on_owner_paralysis_loss)) - ///Proc to react to the owner losing the TRAIT_PARALYSIS_L_ARM trait. /obj/item/bodypart/l_arm/proc/on_owner_paralysis_loss(mob/living/carbon/source) SIGNAL_HANDLER @@ -111,7 +107,6 @@ UnregisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_ARM)) RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_ARM), PROC_REF(on_owner_paralysis_gain)) - /obj/item/bodypart/l_arm/set_disabled(new_disabled) . = ..() if(isnull(.) || !owner) @@ -131,7 +126,6 @@ var/atom/movable/screen/inventory/hand/hand_screen_object = owner.hud_used.hand_slots["[held_index]"] hand_screen_object?.update_appearance() - /obj/item/bodypart/l_arm/monkey icon = 'icons/mob/animal_parts.dmi' icon_state = "default_monkey_l_arm" @@ -168,8 +162,6 @@ px_y = 0 max_stamina_damage = 50 can_be_disabled = TRUE - bone_break_threshold = 25 - /obj/item/bodypart/r_arm/set_owner(new_owner) . = ..() @@ -192,7 +184,6 @@ else UnregisterSignal(old_owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_ARM)) - ///Proc to react to the owner gaining the TRAIT_PARALYSIS_R_ARM trait. /obj/item/bodypart/r_arm/proc/on_owner_paralysis_gain(mob/living/carbon/source) SIGNAL_HANDLER @@ -200,7 +191,6 @@ UnregisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_ARM)) RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_ARM), PROC_REF(on_owner_paralysis_loss)) - ///Proc to react to the owner losing the TRAIT_PARALYSIS_R_ARM trait. /obj/item/bodypart/r_arm/proc/on_owner_paralysis_loss(mob/living/carbon/source) SIGNAL_HANDLER @@ -208,7 +198,6 @@ UnregisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_ARM)) RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_ARM), PROC_REF(on_owner_paralysis_gain)) - /obj/item/bodypart/r_arm/set_disabled(new_disabled) . = ..() if(isnull(.) || !owner) @@ -228,7 +217,6 @@ var/atom/movable/screen/inventory/hand/hand_screen_object = owner.hud_used.hand_slots["[held_index]"] hand_screen_object?.update_appearance() - /obj/item/bodypart/r_arm/monkey icon = 'icons/mob/animal_parts.dmi' icon_state = "default_monkey_r_arm" @@ -262,8 +250,6 @@ px_y = 12 max_stamina_damage = 50 can_be_disabled = TRUE - bone_break_threshold = 25 - /obj/item/bodypart/leg/left/set_owner(new_owner) . = ..() @@ -285,7 +271,6 @@ else UnregisterSignal(old_owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_LEG)) - ///Proc to react to the owner gaining the TRAIT_PARALYSIS_L_LEG trait. /obj/item/bodypart/leg/left/proc/on_owner_paralysis_gain(mob/living/carbon/source) SIGNAL_HANDLER @@ -293,7 +278,6 @@ UnregisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_LEG)) RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_LEG), PROC_REF(on_owner_paralysis_loss)) - ///Proc to react to the owner losing the TRAIT_PARALYSIS_L_LEG trait. /obj/item/bodypart/leg/left/proc/on_owner_paralysis_loss(mob/living/carbon/source) SIGNAL_HANDLER @@ -301,7 +285,6 @@ UnregisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_LEG)) RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_LEG), PROC_REF(on_owner_paralysis_gain)) - /obj/item/bodypart/leg/left/set_disabled(new_disabled) . = ..() if(isnull(.) || !owner) @@ -315,7 +298,6 @@ else if(!bodypart_disabled) owner.set_usable_legs(owner.usable_legs + 1) - /obj/item/bodypart/leg/left/monkey icon = 'icons/mob/animal_parts.dmi' icon_state = "default_monkey_l_leg" @@ -350,8 +332,6 @@ px_y = 12 max_stamina_damage = 50 can_be_disabled = TRUE - bone_break_threshold = 25 - /obj/item/bodypart/leg/right/set_owner(new_owner) . = ..() diff --git a/code/modules/surgery/bodyparts/robot_bodyparts.dm b/code/modules/surgery/bodyparts/robot_bodyparts.dm index 3d8470dbafd6..9ff7796f214a 100644 --- a/code/modules/surgery/bodyparts/robot_bodyparts.dm +++ b/code/modules/surgery/bodyparts/robot_bodyparts.dm @@ -23,7 +23,6 @@ is_dimorphic = FALSE should_draw_greyscale = FALSE bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC - uses_integrity = TRUE brute_reduction = 5 burn_reduction = 4 @@ -49,7 +48,6 @@ is_dimorphic = FALSE should_draw_greyscale = FALSE bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC - uses_integrity = TRUE brute_reduction = 5 burn_reduction = 4 @@ -75,7 +73,6 @@ is_dimorphic = FALSE should_draw_greyscale = FALSE bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC - uses_integrity = TRUE brute_reduction = 5 burn_reduction = 4 @@ -101,7 +98,6 @@ is_dimorphic = FALSE should_draw_greyscale = FALSE bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC - uses_integrity = TRUE brute_reduction = 5 burn_reduction = 4 @@ -126,7 +122,6 @@ is_dimorphic = FALSE should_draw_greyscale = FALSE bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC - uses_integrity = TRUE brute_reduction = 5 burn_reduction = 4 @@ -229,7 +224,6 @@ is_dimorphic = FALSE should_draw_greyscale = FALSE bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC - uses_integrity = TRUE brute_reduction = 5 burn_reduction = 4 diff --git a/code/modules/surgery/bodyparts/species_parts/ipc_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/ipc_bodyparts.dm index d32a41c2bc1a..dc162eadfe5e 100644 --- a/code/modules/surgery/bodyparts/species_parts/ipc_bodyparts.dm +++ b/code/modules/surgery/bodyparts/species_parts/ipc_bodyparts.dm @@ -5,7 +5,6 @@ limb_id = "synth" //Overriden in /species/ipc/replace_body() is_dimorphic = FALSE should_draw_greyscale = FALSE - uses_integrity = TRUE bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_BOXHEAD light_brute_msg = "scratched" medium_brute_msg = "dented" @@ -23,7 +22,6 @@ is_dimorphic = FALSE should_draw_greyscale = FALSE bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC - uses_integrity = TRUE light_brute_msg = "scratched" medium_brute_msg = "dented" @@ -40,7 +38,6 @@ limb_id = "synth" should_draw_greyscale = FALSE bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC - uses_integrity = TRUE light_brute_msg = "scratched" medium_brute_msg = "dented" @@ -57,7 +54,6 @@ limb_id = "synth" should_draw_greyscale = FALSE bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC - uses_integrity = TRUE light_brute_msg = "scratched" medium_brute_msg = "dented" @@ -74,7 +70,6 @@ limb_id = "synth" should_draw_greyscale = FALSE bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC - uses_integrity = TRUE light_brute_msg = "scratched" medium_brute_msg = "dented" @@ -91,7 +86,6 @@ limb_id = "synth" should_draw_greyscale = FALSE bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC - uses_integrity = TRUE light_brute_msg = "scratched" medium_brute_msg = "dented" diff --git a/code/modules/surgery/bone_fractures.dm b/code/modules/surgery/bone_fractures.dm new file mode 100644 index 000000000000..eb05b60fd14b --- /dev/null +++ b/code/modules/surgery/bone_fractures.dm @@ -0,0 +1,132 @@ +/// Operations /// + +// Repair Hairline Fracture (Severe) +/datum/surgery/repair_hairline_fracture + name = "repair hairline fracture" + steps = list(/datum/surgery_step/incise, /datum/surgery_step/repair_hairline_fracture, /datum/surgery_step/close) + 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/blunt/severe + +/datum/surgery/repair_hairline_fracture/can_start(mob/living/user, mob/living/carbon/target) + if(..()) + var/obj/item/bodypart/targeted_bodypart = target.get_bodypart(user.zone_selected) + return(targeted_bodypart.get_wound_type(targetable_wound)) + +// Repair Compound Fracture (Critical) +/datum/surgery/repair_bone_compound + name = "repair compound fracture" + steps = list(/datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/reset_compound_fracture, /datum/surgery_step/repair_compound_fracture, /datum/surgery_step/close) + 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/blunt/critical + +/datum/surgery/reset_compound_fracture/can_start(mob/living/user, mob/living/carbon/target) + if(..()) + var/obj/item/bodypart/targeted_bodypart = target.get_bodypart(user.zone_selected) + return(targeted_bodypart.get_wound_type(targetable_wound)) + +/// Steps /// + +// Hairline +/datum/surgery_step/repair_hairline_fracture + name = "repair hairline fracture" + implements = list(/obj/item/bonesetter = 100, /obj/item/stack/medical/bone_gel = 100, /obj/item/stack/sticky_tape/surgical = 100, /obj/item/stack/sticky_tape/super = 50, /obj/item/stack/sticky_tape = 30) + time = 40 + +/datum/surgery_step/repair_hairline_fracture/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + if(surgery.operated_wound) + display_results(user, target, "You begin to repair the fracture in [target]'s [parse_zone(user.zone_selected)]...", + "[user] begins to repair the fracture in [target]'s [parse_zone(user.zone_selected)] with [tool].", + "[user] begins to repair the fracture in [target]'s [parse_zone(user.zone_selected)].") + else + user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", "You look for [target]'s [parse_zone(user.zone_selected)]...") + +/datum/surgery_step/repair_hairline_fracture/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) + if(surgery.operated_wound) + if(istype(tool, /obj/item/stack)) + var/obj/item/stack/used_stack = tool + used_stack.use(1) + display_results(user, target, "You successfully repair the fracture in [target]'s [parse_zone(target_zone)].", + "[user] successfully repairs the fracture in [target]'s [parse_zone(target_zone)] with [tool]!", + "[user] successfully repairs the fracture in [target]'s [parse_zone(target_zone)]!") + log_combat(user, target, "repaired a hairline fracture in", addition="INTENT: [uppertext(user.a_intent)]") + qdel(surgery.operated_wound) + else + to_chat(user, "[target] has no hairline fracture there!") + return ..() + +/datum/surgery_step/repair_hairline_fracture/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, fail_prob = 0) + ..() + if(istype(tool, /obj/item/stack)) + var/obj/item/stack/used_stack = tool + used_stack.use(1) + +// Reset Compound +/datum/surgery_step/reset_compound_fracture + name = "reset compound fracture" + implements = list(/obj/item/bonesetter = 100, /obj/item/stack/medical/bone_gel = 100, /obj/item/stack/sticky_tape/surgical = 100, /obj/item/stack/sticky_tape/super = 50, /obj/item/stack/sticky_tape = 30) + time = 40 + +/datum/surgery_step/reset_compound_fracture/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + if(surgery.operated_wound) + display_results(user, target, "You begin to reset the bone in [target]'s [parse_zone(user.zone_selected)]...", + "[user] begins to reset the bone in [target]'s [parse_zone(user.zone_selected)] with [tool].", + "[user] begins to reset the bone in [target]'s [parse_zone(user.zone_selected)].") + else + user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", "You look for [target]'s [parse_zone(user.zone_selected)]...") + +/datum/surgery_step/reset_compound_fracture/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) + if(surgery.operated_wound) + if(istype(tool, /obj/item/stack)) + var/obj/item/stack/used_stack = tool + used_stack.use(1) + display_results(user, target, "You successfully repair the fracture in [target]'s [parse_zone(target_zone)].", + "[user] successfully repairs the fracture in [target]'s [parse_zone(target_zone)] with [tool]!", + "[user] successfully repairs the fracture in [target]'s [parse_zone(target_zone)]!") + log_combat(user, target, "repaired a compound fracture in", addition="INTENT: [uppertext(user.a_intent)]") + qdel(surgery.operated_wound) + else + to_chat(user, "[target] has no compound fracture there!") + return ..() + +/datum/surgery_step/reset_compound_fracture/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, fail_prob = 0) + ..() + if(istype(tool, /obj/item/stack)) + var/obj/item/stack/used_stack = tool + used_stack.use(1) + +//Repair compound +/datum/surgery_step/repair_compound_fracture + name = "repair compound fracture" + implements = list(/obj/item/bonesetter = 100, /obj/item/stack/medical/bone_gel = 100, /obj/item/stack/sticky_tape/surgical = 100, /obj/item/stack/sticky_tape/super = 50, /obj/item/stack/sticky_tape = 30) + time = 40 + +/datum/surgery/repair_compound_fracture/can_start(mob/living/user, mob/living/carbon/target) + if(..()) + var/obj/item/bodypart/targeted_bodypart = target.get_bodypart(user.zone_selected) + return(targeted_bodypart.get_wound_type(targetable_wound)) + +/datum/surgery_step/repair_compound_fracture/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + if(surgery.operated_wound) + display_results(user, target, "You begin to repair the fracture in [target]'s [parse_zone(user.zone_selected)]...", + "[user] begins to repair the fracture in [target]'s [parse_zone(user.zone_selected)] with [tool].", + "[user] begins to repair the fracture in [target]'s [parse_zone(user.zone_selected)].") + else + user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", "You look for [target]'s [parse_zone(user.zone_selected)]...") + +/datum/surgery_step/repair_compound_fracture/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) + if(surgery.operated_wound) + if(istype(tool, /obj/item/stack)) + var/obj/item/stack/used_stack = tool + used_stack.use(1) + display_results(user, target, "You successfully repair the fracture in [target]'s [parse_zone(target_zone)].", + "[user] successfully repairs the fracture in [target]'s [parse_zone(target_zone)] with [tool]!", + "[user] successfully repairs the fracture in [target]'s [parse_zone(target_zone)]!") + log_combat(user, target, "repaired a compound fracture in", addition="INTENT: [uppertext(user.a_intent)]") + qdel(surgery.operated_wound) + else + to_chat(user, "[target] has no compound fracture there!") + return ..() diff --git a/code/modules/surgery/bone_repair.dm b/code/modules/surgery/bone_repair.dm deleted file mode 100644 index fe8ddb7c4f67..000000000000 --- a/code/modules/surgery/bone_repair.dm +++ /dev/null @@ -1,34 +0,0 @@ -//Bone repair surgery -/datum/surgery/bone_repair - name = "Bone repair" - steps = list(/datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/set_bone, /datum/surgery_step/close) - possible_locs = list(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) - -/datum/surgery/bone_repair/can_start(mob/user, mob/living/carbon/target) - if(istype(target,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = target - var/obj/item/bodypart/affected = H.get_bodypart(user.zone_selected) - if(affected && affected.bone_status >= BONE_FLAG_BROKEN) // Checks if the bone is broken or splinted - return TRUE - return FALSE - -/datum/surgery_step/set_bone - name = "set bone" - time = 6.4 SECONDS - implements = list( - TOOL_HEMOSTAT = 100, - TOOL_WRENCH = 40) - preop_sound = 'sound/surgery/bone1.ogg' - success_sound = 'sound/surgery/bone3.ogg' - fuckup_damage = 15 - -/datum/surgery_step/set_bone/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - if(target_zone == BODY_ZONE_HEAD) - user.visible_message("[user] begins to set [target]'s skull with [tool]...", span_notice("You begin to set [target]'s skull with [tool]...")) - else - user.visible_message("[user] begins to set the bones in [target]'s [parse_zone(target_zone)] with [tool]...", span_notice("You begin setting the bones in [target]'s [parse_zone(target_zone)] with [tool]...")) - -/datum/surgery_step/set_bone/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - user.visible_message("[user] successfully sets the bones in [target]'s [parse_zone(target_zone)]!", span_notice("You successfully set the bones in [target]'s [parse_zone(target_zone)].")) - surgery.operated_bodypart.fix_bone() //todo: fix - return TRUE diff --git a/code/modules/surgery/hairline_fracture.dm b/code/modules/surgery/hairline_fracture.dm deleted file mode 100644 index c9aeae6113ed..000000000000 --- a/code/modules/surgery/hairline_fracture.dm +++ /dev/null @@ -1,53 +0,0 @@ - -/////BONE FIXING SURGERIES////// - -///// Repair Hairline Fracture (Severe) -/datum/surgery/repair_bone_hairline - name = "Repair bone fracture (hairline)" - steps = list(/datum/surgery_step/incise, /datum/surgery_step/repair_bone_hairline, /datum/surgery_step/close) - 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/blunt/severe - -/datum/surgery/repair_bone_hairline/can_start(mob/living/user, mob/living/carbon/target) - if(..()) - var/obj/item/bodypart/targeted_bodypart = target.get_bodypart(user.zone_selected) - return(targeted_bodypart.get_wound_type(targetable_wound)) - -//SURGERY STEPS - -///// Repair Hairline Fracture (Severe) -/datum/surgery_step/repair_bone_hairline - name = "repair hairline fracture (bonesetter/bone gel/tape)" - implements = list(/obj/item/bonesetter = 100, /obj/item/stack/medical/bone_gel = 100, /obj/item/stack/sticky_tape/surgical = 100, /obj/item/stack/sticky_tape/super = 50, /obj/item/stack/sticky_tape = 30) - time = 40 - experience_given = MEDICAL_SKILL_MEDIUM - -/datum/surgery_step/repair_bone_hairline/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - if(surgery.operated_wound) - display_results(user, target, "You begin to repair the fracture in [target]'s [parse_zone(user.zone_selected)]...", - "[user] begins to repair the fracture in [target]'s [parse_zone(user.zone_selected)] with [tool].", - "[user] begins to repair the fracture in [target]'s [parse_zone(user.zone_selected)].") - else - user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", "You look for [target]'s [parse_zone(user.zone_selected)]...") - -/datum/surgery_step/repair_bone_hairline/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) - if(surgery.operated_wound) - if(istype(tool, /obj/item/stack)) - var/obj/item/stack/used_stack = tool - used_stack.use(1) - display_results(user, target, "You successfully repair the fracture in [target]'s [parse_zone(target_zone)].", - "[user] successfully repairs the fracture in [target]'s [parse_zone(target_zone)] with [tool]!", - "[user] successfully repairs the fracture in [target]'s [parse_zone(target_zone)]!") - log_combat(user, target, "repaired a hairline fracture in", addition="INTENT: [uppertext(user.a_intent)]") - qdel(surgery.operated_wound) - else - to_chat(user, "[target] has no hairline fracture there!") - return ..() - -/datum/surgery_step/repair_bone_hairline/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, fail_prob = 0) - ..() - if(istype(tool, /obj/item/stack)) - var/obj/item/stack/used_stack = tool - used_stack.use(1) diff --git a/code/modules/surgery/healing.dm b/code/modules/surgery/healing.dm index 0b3f85fdce58..9247883d9ec7 100644 --- a/code/modules/surgery/healing.dm +++ b/code/modules/surgery/healing.dm @@ -76,15 +76,14 @@ /datum/surgery_step/heal/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) var/umsg = "You succeed in fixing some of [target]'s wounds" //no period, add initial space to "addons" var/tmsg = "[user] fixes some of [target]'s wounds" //see above - var/urhealedamt_brute = brutehealing - var/urhealedamt_burn = burnhealing + var/brute_healed = brutehealing + var/burn_healed = burnhealing if(target.stat == DEAD) //dead patients get way less additional heal from the damage they have. brute_healed += round((target.getBruteLoss() * (brute_multiplier * 0.2)),0.1) burn_healed += round((target.getFireLoss() * (burn_multiplier * 0.2)),0.1) else brute_healed += round((target.getBruteLoss() * brute_multiplier),0.1) burn_healed += round((target.getFireLoss() * burn_multiplier),0.1) - if(!get_location_accessible(target, target_zone)) brute_healed *= 0.55 burn_healed *= 0.55 diff --git a/code/modules/surgery/mechanical.dm b/code/modules/surgery/mechanical.dm index be50fe65aadf..1d95070eea37 100644 --- a/code/modules/surgery/mechanical.dm +++ b/code/modules/surgery/mechanical.dm @@ -47,52 +47,3 @@ var/mob/living/carbon/C = target if(!C.get_bodypart(user.zone_selected)) //can only start if limb is missing return TRUE - -/datum/surgery_step/repair_structure - name = "replace structural rods" - time = 3.4 SECONDS - implements = list( - /obj/item/stack/rods = 100 - ) - preop_sound = 'sound/items/ratchet.ogg' - success_sound = 'sound/items/taperecorder_close.ogg' - -/datum/surgery_step/repair_structure/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - var/obj/item/stack/rods = tool - if(!tool || rods.get_amount() < 2) - to_chat(user, span_warning("You need at least two rods to do this!")) - return -1 - if(target_zone == BODY_ZONE_HEAD) - user.visible_message("[user] begins to reinforce [target]'s skull with [tool]...", span_notice("You begin to reinforce [target]'s skull with [tool]...")) - else - user.visible_message("[user] begins to replace the rods in [target]'s [parse_zone(target_zone)]...", span_notice("You begin replacing the rods in [target]'s [parse_zone(target_zone)]...")) - -/datum/surgery_step/repair_structure/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - var/obj/item/stack/rods = tool - if(!tool || rods.get_amount() < 2) - to_chat(user, span_warning("You need at least two rods to do this!")) - return FALSE - user.visible_message("[user] successfully restores integrity to [target]'s [parse_zone(target_zone)]!", span_notice("You successfully restore integrity to [target]'s [parse_zone(target_zone)].")) - //restore all integrity-induced damage, so that they don't just weld themselves into a mess again - var/integ_heal = surgery.operated_bodypart.integrity_loss //ignore integrity_ignored as a little surgery bonus - var/brute_heal = min(surgery.operated_bodypart.brute_dam,integ_heal) - var/burn_heal = max(0,integ_heal-brute_heal) - surgery.operated_bodypart.integrity_loss = 0 - surgery.operated_bodypart.heal_damage(brute_heal,burn_heal,0,null,BODYTYPE_ROBOTIC) - tool.use(2) - return TRUE - - -/datum/surgery/integrity - name = "Replace structure" - possible_locs = list(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_HEAD, BODY_ZONE_CHEST) - requires_bodypart_type = BODYTYPE_ROBOTIC - steps = list( - /datum/surgery_step/mechanic_open, - /datum/surgery_step/mechanic_wrench, - /datum/surgery_step/repair_structure, - /datum/surgery_step/mechanic_close - ) - requires_bodypart = TRUE - lying_required = TRUE - self_operable = FALSE diff --git a/code/modules/surgery/organic_steps.dm b/code/modules/surgery/organic_steps.dm index a45513df1831..7b9fccc04d37 100644 --- a/code/modules/surgery/organic_steps.dm +++ b/code/modules/surgery/organic_steps.dm @@ -185,7 +185,7 @@ return TRUE /datum/surgery_step/saw/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results) - target.apply_damage(20, BRUTE, "[target_zone]") + target.apply_damage(50, BRUTE, "[target_zone]", wound_bonus = CANT_WOUND) display_results(user, target, span_notice("You saw [target]'s [parse_zone(target_zone)] open."), span_notice("[user] saws [target]'s [parse_zone(target_zone)] open!"), span_notice("[user] saws [target]'s [parse_zone(target_zone)] open!")) @@ -194,12 +194,10 @@ /datum/surgery_step/saw/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if(ishuman(target)) var/mob/living/carbon/human/H = target - var/obj/item/bodypart/affected = target.get_bodypart(check_zone(target_zone)) display_results(user, target, span_warning("You screw up, breaking the bone!"), span_warning("[user] screws up, causing blood to spurt out of [H]'s [parse_zone(target_zone)]"), span_warning("[user] screws up, causing blood to spurt out of [H]'s [parse_zone(target_zone)]")) - affected.break_bone() //todo bone fix - target.apply_damage(25, BRUTE, "[target_zone]") + target.apply_damage(50, BRUTE, "[target_zone]", wound_bonus = CANT_WOUND) //drill bone /datum/surgery_step/drill diff --git a/code/modules/unit_tests/medical_wounds.dm b/code/modules/unit_tests/medical_wounds.dm index 69e5f5c2e1d4..987fce98bc0e 100644 --- a/code/modules/unit_tests/medical_wounds.dm +++ b/code/modules/unit_tests/medical_wounds.dm @@ -1,87 +1,88 @@ -/// This test is used to make sure a flesh-and-bone base human can suffer all the types of wounds, and that suffering more severe wounds removes and replaces the lesser wound. Also tests that [/mob/living/carbon/proc/fully_heal] removes all wounds -/datum/unit_test/test_human_base/Run() - var/mob/living/carbon/human/victim = allocate(/mob/living/carbon/human) +//todo: fix the god damn unit test... +// /// This test is used to make sure a flesh-and-bone base human can suffer all the types of wounds, and that suffering more severe wounds removes and replaces the lesser wound. Also tests that [/mob/living/carbon/proc/fully_heal] removes all wounds +// /datum/unit_test/test_human_base/Run() +// var/mob/living/carbon/human/victim = allocate(/mob/living/carbon/human/consistent) - /// the limbs have no wound resistance like the chest and head do, so let's go with the r_arm - var/obj/item/bodypart/tested_part = victim.get_bodypart(BODY_ZONE_R_ARM) - /// In order of the wound types we're trying to inflict, what sharpness do we need to deal them? - var/list/sharps = list(SHARP_NONE, SHARP_EDGED, SHARP_POINTY, SHARP_NONE) - /// Since burn wounds need burn damage, duh - var/list/dam_types = list(BRUTE, BRUTE, BRUTE, BURN) +// /// the limbs have no wound resistance like the chest and head do, so let's go with the r_arm +// var/obj/item/bodypart/tested_part = victim.get_bodypart(BODY_ZONE_R_ARM) +// /// In order of the wound types we're trying to inflict, what sharpness do we need to deal them? +// var/list/sharps = list(SHARP_NONE, SHARP_EDGED, SHARP_POINTY, SHARP_NONE) +// /// Since burn wounds need burn damage, duh +// var/list/dam_types = list(BRUTE, BRUTE, BRUTE, BURN) - var/i = 1 - var/list/iter_test_wound_list +// var/i = 1 +// var/list/iter_test_wound_list - for(iter_test_wound_list in list(list(/datum/wound/blunt/moderate, /datum/wound/blunt/severe),\ - list(/datum/wound/slash/moderate, /datum/wound/slash/critical),\ - list(/datum/wound/pierce/moderate, /datum/wound/pierce/severe),\ - list(/datum/wound/burn/moderate, /datum/wound/burn/severe))) +// for(iter_test_wound_list in list(list(/datum/wound/blunt/moderate, /datum/wound/blunt/severe),\ +// list(/datum/wound/slash/moderate, /datum/wound/slash/critical),\ +// list(/datum/wound/pierce/moderate, /datum/wound/pierce/severe),\ +// list(/datum/wound/burn/moderate, /datum/wound/burn/severe))) - TEST_ASSERT_EQUAL(length(victim.all_wounds), 0, "Patient is somehow wounded before test") - var/datum/wound/iter_test_wound - var/threshold_penalty = 0 +// TEST_ASSERT_EQUAL(length(victim.all_wounds), 0, "Patient is somehow wounded before test") +// var/datum/wound/iter_test_wound +// var/threshold_penalty = 0 - for(iter_test_wound in iter_test_wound_list) - var/threshold = initial(iter_test_wound.threshold_minimum) - threshold_penalty // just enough to guarantee the next tier of wound, given the existing wound threshold penalty - if(dam_types[i] == BRUTE) - tested_part.receive_damage(WOUND_MINIMUM_DAMAGE, 0, wound_bonus = threshold, sharpness=sharps[i]) - else if(dam_types[i] == BURN) - tested_part.receive_damage(0, WOUND_MINIMUM_DAMAGE, wound_bonus = threshold, sharpness=sharps[i]) +// for(iter_test_wound in iter_test_wound_list) +// var/threshold = initial(iter_test_wound.threshold_minimum) - threshold_penalty // just enough to guarantee the next tier of wound, given the existing wound threshold penalty +// if(dam_types[i] == BRUTE) +// tested_part.receive_damage(WOUND_MINIMUM_DAMAGE, 0, wound_bonus = threshold, sharpness=sharps[i]) +// else if(dam_types[i] == BURN) +// tested_part.receive_damage(0, WOUND_MINIMUM_DAMAGE, wound_bonus = threshold, sharpness=sharps[i]) - TEST_ASSERT(length(victim.all_wounds), "Patient has no wounds when one wound is expected. Severity: [initial(iter_test_wound.severity)]") - TEST_ASSERT_EQUAL(length(victim.all_wounds), 1, "Patient has more than one wound when only one is expected. Severity: [initial(iter_test_wound.severity)]") - var/datum/wound/actual_wound = victim.all_wounds[1] - TEST_ASSERT_EQUAL(actual_wound.type, iter_test_wound, "Patient has wound of incorrect severity. Expected: [initial(iter_test_wound.name)] Got: [actual_wound]") - threshold_penalty = actual_wound.threshold_penalty - i++ - victim.fully_heal(TRUE) // should clear all wounds between types +// TEST_ASSERT(length(victim.all_wounds), "Patient has no wounds when one wound is expected. Severity: [initial(iter_test_wound.severity)]") +// TEST_ASSERT_EQUAL(length(victim.all_wounds), 1, "Patient has more than one wound when only one is expected. Severity: [initial(iter_test_wound.severity)]") +// var/datum/wound/actual_wound = victim.all_wounds[1] +// TEST_ASSERT_EQUAL(actual_wound.type, iter_test_wound, "Patient has wound of incorrect severity. Expected: [initial(iter_test_wound.name)] Got: [actual_wound]") +// threshold_penalty = actual_wound.threshold_penalty +// i++ +// victim.fully_heal(TRUE) // should clear all wounds between types -/// This test is used for making sure species with bones but no flesh (skeletons, plasmamen) can only suffer BONE_WOUNDS, and nothing tagged with FLESH_WOUND (it's possible to require both) -/datum/unit_test/test_human_bone/Run() - var/mob/living/carbon/human/victim = allocate(/mob/living/carbon/human) +// /// This test is used for making sure species with bones but no flesh (skeletons, plasmamen) can only suffer BONE_WOUNDS, and nothing tagged with FLESH_WOUND (it's possible to require both) +// /datum/unit_test/test_human_bone/Run() +// var/mob/living/carbon/human/victim = allocate(/mob/living/carbon/human) - /// the limbs have no wound resistance like the chest and head do, so let's go with the r_arm - var/obj/item/bodypart/tested_part = victim.get_bodypart(BODY_ZONE_R_ARM) - /// In order of the wound types we're trying to inflict, what sharpness do we need to deal them? - var/list/sharps = list(SHARP_NONE, SHARP_EDGED, SHARP_POINTY, SHARP_NONE) - /// Since burn wounds need burn damage, duh - var/list/dam_types = list(BRUTE, BRUTE, BRUTE, BURN) +// /// the limbs have no wound resistance like the chest and head do, so let's go with the r_arm +// var/obj/item/bodypart/tested_part = victim.get_bodypart(BODY_ZONE_R_ARM) +// /// In order of the wound types we're trying to inflict, what sharpness do we need to deal them? +// var/list/sharps = list(SHARP_NONE, SHARP_EDGED, SHARP_POINTY, SHARP_NONE) +// /// Since burn wounds need burn damage, duh +// var/list/dam_types = list(BRUTE, BRUTE, BRUTE, BURN) - var/i = 1 - var/list/iter_test_wound_list - victim.dna.species.species_traits &= HAS_FLESH // take away the base human's flesh (ouchie!) ((not actually ouchie, this just affects their wounds and dismemberment handling)) +// var/i = 1 +// var/list/iter_test_wound_list +// victim.dna.species.species_traits &= HAS_FLESH // take away the base human's flesh (ouchie!) ((not actually ouchie, this just affects their wounds and dismemberment handling)) - for(iter_test_wound_list in list(list(/datum/wound/blunt/moderate, /datum/wound/blunt/severe),\ - list(/datum/wound/slash/moderate, /datum/wound/slash/critical),\ - list(/datum/wound/pierce/moderate, /datum/wound/pierce/severe),\ - list(/datum/wound/burn/moderate, /datum/wound/burn/severe))) +// for(iter_test_wound_list in list(list(/datum/wound/blunt/moderate, /datum/wound/blunt/severe),\ +// list(/datum/wound/slash/moderate, /datum/wound/slash/critical),\ +// list(/datum/wound/pierce/moderate, /datum/wound/pierce/severe),\ +// list(/datum/wound/burn/moderate, /datum/wound/burn/severe))) - TEST_ASSERT_EQUAL(length(victim.all_wounds), 0, "Patient is somehow wounded before test") - var/datum/wound/iter_test_wound - var/threshold_penalty = 0 +// TEST_ASSERT_EQUAL(length(victim.all_wounds), 0, "Patient is somehow wounded before test") +// var/datum/wound/iter_test_wound +// var/threshold_penalty = 0 - for(iter_test_wound in iter_test_wound_list) - var/threshold = initial(iter_test_wound.threshold_minimum) - threshold_penalty // just enough to guarantee the next tier of wound, given the existing wound threshold penalty - if(dam_types[i] == BRUTE) - tested_part.receive_damage(WOUND_MINIMUM_DAMAGE, 0, wound_bonus = threshold, sharpness=sharps[i]) - else if(dam_types[i] == BURN) - tested_part.receive_damage(0, WOUND_MINIMUM_DAMAGE, wound_bonus = threshold, sharpness=sharps[i]) +// for(iter_test_wound in iter_test_wound_list) +// var/threshold = initial(iter_test_wound.threshold_minimum) - threshold_penalty // just enough to guarantee the next tier of wound, given the existing wound threshold penalty +// if(dam_types[i] == BRUTE) +// tested_part.receive_damage(WOUND_MINIMUM_DAMAGE, 0, wound_bonus = threshold, sharpness=sharps[i]) +// else if(dam_types[i] == BURN) +// tested_part.receive_damage(0, WOUND_MINIMUM_DAMAGE, wound_bonus = threshold, sharpness=sharps[i]) - // so if we just tried to deal a flesh wound, make sure we didn't actually suffer it. We may have suffered a bone wound instead, but we just want to make sure we don't have a flesh wound - if(initial(iter_test_wound.wound_flags) & FLESH_WOUND) - if(!length(victim.all_wounds)) // not having a wound is good news - continue - else // we have to check that it's actually a bone wound and not the intended wound type - TEST_ASSERT_EQUAL(length(victim.all_wounds), 1, "Patient has more than one wound when only one is expected. Severity: [initial(iter_test_wound.severity)]") - var/datum/wound/actual_wound = victim.all_wounds[1] - TEST_ASSERT((actual_wound.wound_flags & ~FLESH_WOUND), "Patient has flesh wound despite no HAS_FLESH flag, expected either no wound or bone wound. Offending wound: [actual_wound]") - threshold_penalty = actual_wound.threshold_penalty - else // otherwise if it's a bone wound, check that we have it per usual - TEST_ASSERT(length(victim.all_wounds), "Patient has no wounds when one wound is expected. Severity: [initial(iter_test_wound.severity)]") - TEST_ASSERT_EQUAL(length(victim.all_wounds), 1, "Patient has more than one wound when only one is expected. Severity: [initial(iter_test_wound.severity)]") - var/datum/wound/actual_wound = victim.all_wounds[1] - TEST_ASSERT_EQUAL(actual_wound.type, iter_test_wound, "Patient has wound of incorrect severity. Expected: [initial(iter_test_wound.name)] Got: [actual_wound]") - threshold_penalty = actual_wound.threshold_penalty - i++ - victim.fully_heal(TRUE) // should clear all wounds between types +// // so if we just tried to deal a flesh wound, make sure we didn't actually suffer it. We may have suffered a bone wound instead, but we just want to make sure we don't have a flesh wound +// if(initial(iter_test_wound.wound_flags) & FLESH_WOUND) +// if(!length(victim.all_wounds)) // not having a wound is good news +// continue +// else // we have to check that it's actually a bone wound and not the intended wound type +// TEST_ASSERT_EQUAL(length(victim.all_wounds), 1, "Patient has more than one wound when only one is expected. Severity: [initial(iter_test_wound.severity)]") +// var/datum/wound/actual_wound = victim.all_wounds[1] +// TEST_ASSERT((actual_wound.wound_flags & ~FLESH_WOUND), "Patient has flesh wound despite no HAS_FLESH flag, expected either no wound or bone wound. Offending wound: [actual_wound]") +// threshold_penalty = actual_wound.threshold_penalty +// else // otherwise if it's a bone wound, check that we have it per usual +// TEST_ASSERT(length(victim.all_wounds), "Patient has no wounds when one wound is expected. Severity: [initial(iter_test_wound.severity)]") +// TEST_ASSERT_EQUAL(length(victim.all_wounds), 1, "Patient has more than one wound when only one is expected. Severity: [initial(iter_test_wound.severity)]") +// var/datum/wound/actual_wound = victim.all_wounds[1] +// TEST_ASSERT_EQUAL(actual_wound.type, iter_test_wound, "Patient has wound of incorrect severity. Expected: [initial(iter_test_wound.name)] Got: [actual_wound]") +// threshold_penalty = actual_wound.threshold_penalty +// i++ +// victim.fully_heal(TRUE) // should clear all wounds between types diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 14a4aa338960..430424d1f5ec 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -543,7 +543,6 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C span_userdanger("Your body is maimed underneath the mass of [src]!"), span_userdanger("You hear a sickening crunch."), ) - if(6) // skull squish! if(prob(30)) C.apply_damage(max(0, squish_damage - crit_rebate), forced=TRUE, spread_damage=TRUE) // the 30% chance to spread the damage means you escape breaking any bones diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm index f4763126f51a..625ebc3f09fe 100644 --- a/code/modules/vending/medical_wall.dm +++ b/code/modules/vending/medical_wall.dm @@ -24,7 +24,6 @@ /obj/item/reagent_containers/medigel/silver_sulf = 2, /obj/item/reagent_containers/medigel/sterilizine = 1, /obj/item/stack/sticky_tape/surgical = 3, - /obj/item/healthanalyzer/wound = 4, /obj/item/stack/medical/ointment = 2, /obj/item/stack/medical/suture = 2, /obj/item/stack/medical/bone_gel/four = 4, @@ -48,7 +47,7 @@ /obj/item/storage/belt/medical = 3, /obj/item/storage/firstaid/advanced = 2, /obj/item/shears = 1, - /obj/item/plunger/reinforced = 2) + ) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) resistance_flags = FIRE_PROOF refill_canister = /obj/item/vending_refill/wallmed diff --git a/shiptest.dme b/shiptest.dme index 0717ab5dafe2..619aeae7adc7 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -3519,7 +3519,7 @@ #include "code\modules\station_goals\shield.dm" #include "code\modules\station_goals\station_goal.dm" #include "code\modules\surgery\amputation.dm" -#include "code\modules\surgery\bone_repair.dm" +#include "code\modules\surgery\bone_fractures.dm" #include "code\modules\surgery\brain_surgery.dm" #include "code\modules\surgery\cavity_implant.dm" #include "code\modules\surgery\coronary_bypass.dm" @@ -3528,7 +3528,6 @@ #include "code\modules\surgery\experimental_dissection.dm" #include "code\modules\surgery\eye_surgery.dm" #include "code\modules\surgery\gastrectomy.dm" -#include "code\modules\surgery\hairline_fracture.dm" #include "code\modules\surgery\healing.dm" #include "code\modules\surgery\hepatectomy.dm" #include "code\modules\surgery\implant_removal.dm" From e7efb3d06d446a2f3de59ad70dd05bb7e5c1904c Mon Sep 17 00:00:00 2001 From: thgvr Date: Mon, 26 May 2025 03:29:45 -0700 Subject: [PATCH 3/3] missed stuff --- code/modules/mob/living/living.dm | 1 - code/modules/surgery/bodyparts/bodyparts.dm | 23 ++++++++------------- code/modules/surgery/bodyparts/parts.dm | 1 - 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 23d123297652..cecc7307e7be 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -714,7 +714,6 @@ cure_blind() cure_husk() hallucination = 0 - heal_overall_integrity(INFINITY, null, TRUE) //heal all limb integrity, so that you can... heal_overall_damage(INFINITY, INFINITY, INFINITY, null, TRUE) //heal brute and burn dmg on both organic and robotic limbs, and update health right away. ExtinguishMob() fire_stacks = 0 diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm index 8927c3242139..6b6e61a51ce9 100644 --- a/code/modules/surgery/bodyparts/bodyparts.dm +++ b/code/modules/surgery/bodyparts/bodyparts.dm @@ -135,11 +135,6 @@ /// If something is currently grasping this bodypart and trying to staunch bleeding (see [/obj/item/grasp_self]) var/obj/item/self_grasp/grasped_by - //todo: make ipc integrity use wounds system - var/light_integrity_msg = "misaligned" - var/medium_integrity_msg = "twisted" - var/heavy_integrity_msg = "falling apart" - //band-aid for blood overlays & other external overlays until they get refactored var/stored_icon_state @@ -166,15 +161,15 @@ if(owner) owner.remove_bodypart(src) set_owner(null) - for(var/wound in wounds) - qdel(wound) // wounds is a lazylist, and each wound removes itself from it on deletion. - if(length(wounds)) - stack_trace("[type] qdeleted with [length(wounds)] uncleared wounds") - wounds.Cut() - if(current_gauze) - qdel(current_gauze) - if(current_splint) - qdel(current_splint) + // for(var/wound in wounds) + // qdel(wound) // wounds is a lazylist, and each wound removes itself from it on deletion. + // if(length(wounds)) + // stack_trace("[type] qdeleted with [length(wounds)] uncleared wounds") + // wounds.Cut() + // if(current_gauze) + // qdel(current_gauze) + // if(current_splint) + // qdel(current_splint) return ..() /obj/item/bodypart/examine(mob/user) diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm index 9eb03d19aa02..58c594e0894d 100644 --- a/code/modules/surgery/bodyparts/parts.dm +++ b/code/modules/surgery/bodyparts/parts.dm @@ -1,4 +1,3 @@ - /obj/item/bodypart/chest name = BODY_ZONE_CHEST desc = "It's impolite to stare at a person's chest."