wounds attempt 3

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

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

code/__DEFINES/combat.dm

@@ -148,31 +148,43 @@
 #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)
 #define EMBED_POINTY list("ignore_throwspeed_threshold" = TRUE)
 #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

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

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))

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

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 ;_;
 

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,14 +187,16 @@
 #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
 #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

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

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

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

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