Ports wounds from TG

_maps/shuttles/emergency_luxury.dmm

@@ -78,18 +78,6 @@
 /obj/structure/table/wood/fancy/black,
 /turf/open/floor/carpet,
 /area/shuttle/escape/luxury)
-"cZ" = (
-/obj/machinery/door/poddoor/shutters{
-	id = "ohnopoors"
-	},
-/obj/structure/window/plastitanium{
-	desc = "A durable looking window made of an alloy of of plasma and titanium. Appears to have poor people tears smudged all over it.";
-	flags_1 = 2177;
-	resistance_flags = 64
-	},
-/obj/structure/grille/indestructable,
-/turf/open/floor/plating,
-/area/shuttle/escape/luxury)
 "dl" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -233,6 +221,18 @@
 /obj/structure/shuttle/engine/propulsion,
 /turf/open/floor/plating/airless,
 /area/shuttle/escape/luxury)
+"oo" = (
+/obj/machinery/door/poddoor/shutters{
+	id = "ohnopoors"
+	},
+/obj/structure/grille/indestructable,
+/obj/structure/window/plastitanium{
+	desc = "A durable looking window made of an alloy of of plasma and titanium. Appears to have poor people tears smudged all over it.";
+	flags_1 = 2177;
+	resistance_flags = 64
+	},
+/turf/open/floor/plating,
+/area/shuttle/escape/luxury)
 "or" = (
 /obj/structure/shuttle/engine/heater,
 /obj/structure/window/reinforced{
@@ -283,7 +283,7 @@
 /area/shuttle/escape/luxury)
 "pv" = (
 /obj/structure/table/glass,
-/obj/item/surgicaldrill/advanced,
+/obj/item/cautery/advanced,
 /obj/item/scalpel/advanced,
 /obj/item/retractor/advanced,
 /turf/open/floor/mineral/gold{
@@ -559,16 +559,16 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating,
 /area/shuttle/escape/luxury)
-"IL" = (
+"JI" = (
 /obj/machinery/door/poddoor/shutters{
 	id = "ohnopoors"
 	},
-/obj/structure/grille/indestructable,
 /obj/structure/window/plastitanium{
 	desc = "A durable looking window made of an alloy of of plasma and titanium. Appears to have poor people tears smudged all over it.";
 	flags_1 = 2177;
 	resistance_flags = 64
 	},
+/obj/structure/grille/indestructable,
 /turf/open/floor/plating,
 /area/shuttle/escape/luxury)
 "Kn" = (
@@ -968,15 +968,15 @@ eL
 eL
 eL
 mt
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-IL
-cZ
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+JI
 mt
 mt
 mt

code/__DEFINES/DNA.dm

@@ -120,23 +120,28 @@
 #define MUTCOLORS_PARTSONLY	8
 #define NOZOMBIE		9
 /// If we want a race to have a standard color (for now this is only polysmorphs)
-#define NOCOLORCHANGE   20
+#define NOCOLORCHANGE   10
 /// Uses weird leg sprites. Optional for Lizards, required for ashwalkers. Don't give it to other races unless you make sprites for this (see human_parts_greyscale.dmi)
-#define DIGITIGRADE		10
-#define NO_UNDERWEAR	11
-#define NOLIVER			12
-#define NOSTOMACH		13
-#define NO_DNA_COPY     14
-#define DRINKSBLOOD		15
-#define NOFLASH			16
+#define DIGITIGRADE		11
+#define NO_UNDERWEAR	12
+#define NOLIVER			13
+#define NOSTOMACH		14
+#define NO_DNA_COPY     15
+#define DRINKSBLOOD		16
+#define NOFLASH			17
 /// Use this if you want to change the race's color without the player being able to pick their own color. AKA special color shifting
-#define DYNCOLORS		17
+#define DYNCOLORS		18
 /// Forced genders
-#define AGENDER			18
-#define FGENDER         21
-#define MGENDER	        22
+#define AGENDER			19
+#define FGENDER         20
+#define MGENDER	        21
 /// Do not draw eyes or eyeless overlay
-#define NOEYESPRITES	19
+#define NOEYESPRITES	22
+/// 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	23
+/// if we have bones (can suffer bone wounds)
+#define HAS_BONE	24
 
 //organ slots
 #define ORGAN_SLOT_BRAIN "brain"

code/__DEFINES/admin.dm

@@ -79,6 +79,10 @@
 #define ADMIN_PUNISHMENT_WHISTLE "Whistle"
 #define ADMIN_PUNISHMENT_CLUWNE "Cluwne"
 #define ADMIN_PUNISHMENT_MCNUGGET "Nugget"
+#define ADMIN_PUNISHMENT_CRACK ":B:oneless"
+#define ADMIN_PUNISHMENT_BLEED ":B:loodless"
+#define ADMIN_PUNISHMENT_PERFORATE ":B:erforate"
+#define ADMIN_PUNISHMENT_SCARIFY "Scarify"
 
 #define AHELP_ACTIVE 1
 #define AHELP_CLOSED 2

code/__DEFINES/combat.dm

@@ -170,9 +170,9 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(
 #define REFLECT_FAKEPROJECTILE		(1<<1)
 
 //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
 
 //His Grace.
 #define HIS_GRACE_SATIATED 0 //He hungers not. If bloodthirst is set to this, His Grace is asleep.

code/__DEFINES/components.dm

@@ -71,6 +71,7 @@
 #define COMSIG_ATOM_HULK_ATTACK "hulk_attack"					//from base of atom/attack_hulk(): (/mob/living/carbon/human)
 #define COMSIG_PARENT_EXAMINE "atom_examine"                    //from base of atom/examine(): (/mob)
 #define COMSIG_ATOM_GET_EXAMINE_NAME "atom_examine_name"		//from base of atom/get_examine_name(): (/mob, list/overrides)
+#define COMSIG_PARENT_EXAMINE_MORE "atom_examine_more"			//from base of atom/examine_more(): (/mob)
 	//Positions for overrides list
 #define EXAMINE_POSITION_ARTICLE 1
 #define EXAMINE_POSITION_BEFORE 2
@@ -228,9 +229,17 @@
 #define COMSIG_LIVING_STATUS_SLEEP "living_sleeping"			//from base of mob/living/Sleeping() (amount, update, ignore)
 #define COMPONENT_NO_STUN 1			//For all of them
 
-// /mob/living/carbon signals
+// /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_CARBON_SOUNDBANG "carbon_soundbang"					//from base of mob/living/carbon/soundbang_act(): (list(intensity))
 #define COMSIG_CARBON_STATUS_STAMCRIT "living_stamcrit"				//from base of mob/living/carbon/enter_stamcrit()
+#define COMSIG_BODYPART_GAUZED	"bodypart_gauzed" // from /obj/item/bodypart/proc/apply_gauze(/obj/item/stack/gauze)
+#define COMSIG_BODYPART_GAUZE_DESTROYED	"bodypart_degauzed" // from [/obj/item/bodypart/proc/seep_gauze] when it runs out of absorption
 
 // /mob/living/simple_animal/hostile signals
 #define COMSIG_HOSTILE_ATTACKINGTARGET "hostile_attackingtarget"
@@ -299,6 +308,7 @@
 
 
 // /mob/living/carbon/human signals
+#define COMSIG_HUMAN_EARLY_UNARMED_ATTACK "human_early_unarmed_attack"			//from mob/living/carbon/human/UnarmedAttack(): (atom/target, proximity, modifiers)
 #define COMSIG_HUMAN_MELEE_UNARMED_ATTACK "human_melee_unarmed_attack"			//from mob/living/carbon/human/UnarmedAttack(): (atom/target)
 #define COMSIG_HUMAN_MELEE_UNARMED_ATTACKBY "human_melee_unarmed_attackby"		//from mob/living/carbon/human/UnarmedAttack(): (mob/living/carbon/human/attacker)
 #define COMSIG_HUMAN_DISARM_HIT	"human_disarm_hit"	//Hit by successful disarm attack (mob/living/carbon/human/attacker,zone_targeted)

code/__DEFINES/is_helpers.dm

@@ -225,14 +225,6 @@ GLOBAL_LIST_INIT(heavyfootmob, typecacheof(list(
 
 #define iscash(A) (istype(A, /obj/item/coin) || istype(A, /obj/item/stack/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/item/projectile))

code/__DEFINES/misc.dm

@@ -407,6 +407,9 @@ GLOBAL_LIST_INIT(pda_styles, list(MONO, VT, ORBITRON, SHARE))
 #define PIRATE_NAMES_FILE "pirates.json"
 #define REDPILL_FILE "redpill.json"
 #define WANTED_FILE "wanted_message.json"
+#define FLESH_SCAR_FILE "wounds/flesh_scar_desc.json"
+#define BONE_SCAR_FILE "wounds/bone_scar_desc.json"
+#define SCAR_LOC_FILE "wounds/scar_loc.json"
 
 //Fullscreen overlay resolution in tiles.
 #define FULLSCREEN_OVERLAY_RESOLUTION_X 15

code/__DEFINES/mobs.dm

@@ -84,10 +84,6 @@
 #define BODYPART_ORGANIC   1
 #define BODYPART_ROBOTIC   2
 
-#define BODYPART_NOT_DISABLED 0
-#define BODYPART_DISABLED_DAMAGE 1
-#define BODYPART_DISABLED_PARALYSIS 2
-
 #define DEFAULT_BODYPART_ICON_ORGANIC 'icons/mob/human_parts_greyscale.dmi'
 #define DEFAULT_BODYPART_ICON_ROBOTIC 'icons/mob/augmentation/augments.dmi'
 
@@ -133,12 +129,14 @@
 #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_WOUND 2
 #define TRAUMA_LIMIT_LOBOTOMY 3
 #define TRAUMA_LIMIT_MAGIC 3
 #define TRAUMA_LIMIT_ABSOLUTE INFINITY
@@ -340,4 +338,6 @@
 #define WABBAJACK     (1<<6)
 
 #define SLEEP_CHECK_DEATH(X) sleep(X); if(QDELETED(src) || stat == DEAD) return;
-#define INTERACTING_WITH(X, Y) (Y in X.do_afters)
+/// If you examine the same atom twice in this timeframe, we call examine_more() instead of examine()
+#define EXAMINE_MORE_TIME	1 SECONDS
+#define INTERACTING_WITH(X, Y) (Y in X.do_afters)

code/__DEFINES/obj_flags.dm

@@ -29,6 +29,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 UNCATCHABLE				(1<<13) // Makes any item uncatchable if it is thrown at them
 #define MEDRESIST				(1<<14) // This item will block medical sprays when worn
+#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
 
@@ -54,3 +55,8 @@
 
 /// 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
+
+/// 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

code/__DEFINES/status_effects.dm

@@ -42,7 +42,9 @@
 
 #define STATUS_EFFECT_CREEP /datum/status_effect/creep //Provides immunity to lightburn for darkspawn, does nothing to anyone else //Yogs
 
- #define STATUS_EFFECT_TIME_DILATION /datum/status_effect/time_dilation //Provides immunity to slowdown and halves click-delay/action times //Yogs
+#define STATUS_EFFECT_TIME_DILATION /datum/status_effect/time_dilation //Provides immunity to slowdown and halves click-delay/action times //Yogs
+
+#define STATUS_EFFECT_DETERMINED /datum/status_effect/determined //currently in a combat high from being seriously wounded
 
 /////////////
 // DEBUFFS //
@@ -109,6 +111,8 @@
 
 #define STATUS_EFFECT_CLOUDSTRUCK /datum/status_effect/cloudstruck //blinds and applies an overlay.
 
+#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
+
 /////////////
 // NEUTRAL //
 /////////////

code/__DEFINES/tools.dm

@@ -10,6 +10,13 @@
 #define TOOL_SHOVEL			"shovel"
 #define TOOL_HATCHET		"hatchet"
 
+#define TOOL_RETRACTOR	 	"retractor"
+#define TOOL_HEMOSTAT 		"hemostat"
+#define TOOL_CAUTERY 		"cautery"
+#define TOOL_DRILL			"drill"
+#define TOOL_SCALPEL		"scalpel"
+#define TOOL_SAW			"saw"
+#define TOOL_BONESET		"bonesetter"
 
 // 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.