Darkpack Pull 6/28/2026

_maps/map_files/Vampire/runtimetown.dmm

@@ -711,6 +711,7 @@
 /obj/item/ammo_box/darkpack/c9mm,
 /obj/item/ammo_box/darkpack/c45acp/silver,
 /obj/item/ammo_box/darkpack/c45acp,
+/obj/item/ammo_box/darkpack/c46pdw,
 /turf/open/floor/plating/rough,
 /area/vtm/interior/anarch)
 "nq" = (
@@ -774,10 +775,6 @@
 "oD" = (
 /turf/open/misc/grass,
 /area/vtm/outside/pacificheights)
-"oF" = (
-/obj/structure/chair/wood/darkpack,
-/turf/open/floor/plating/rough,
-/area/vtm/interior/techshop)
 "oM" = (
 /turf/open/floor/plating/sidewalk,
 /area/vtm/interior/supply)
@@ -1628,6 +1625,7 @@
 /area/vtm/outside/pacificheights)
 "CB" = (
 /obj/structure/extinguisher_cabinet/directional/north,
+/obj/structure/chair/wood/darkpack,
 /turf/open/floor/plating/rough,
 /area/vtm/interior/techshop)
 "CF" = (
@@ -2099,6 +2097,15 @@
 /obj/structure/ladder/manhole/up,
 /turf/open/floor/plating/rough,
 /area/vtm/interior/techshop)
+"IU" = (
+/obj/structure/table,
+/obj/item/gun/ballistic/automatic/darkpack/mp7,
+/obj/item/ammo_box/magazine/darkpack/c46pdw,
+/obj/item/ammo_box/magazine/darkpack/c46pdw,
+/obj/item/ammo_box/magazine/darkpack/c46pdw/ext,
+/obj/item/ammo_box/magazine/darkpack/c46pdw/ext,
+/turf/open/floor/plating/rough,
+/area/vtm/interior/techshop)
 "IZ" = (
 /obj/machinery/fax/aasimites,
 /obj/structure/table/wood,
@@ -2388,6 +2395,8 @@
 /obj/structure/vampdoor{
 	dir = 4
 	},
+/obj/effect/mapping_helpers/door/access/claimable,
+/obj/effect/mapping_helpers/door/lock,
 /turf/open/floor/plating/rough,
 /area/vtm/interior/techshop)
 "Mg" = (
@@ -3960,7 +3969,7 @@ Ri
 Wz
 bU
 EL
-Id
+IU
 Id
 Id
 Id
@@ -4028,7 +4037,7 @@ pN
 pN
 Jo
 EL
-oF
+Id
 ho
 Id
 Id

code/__DEFINES/~darkpack/dcs/signals_mob/signals_mob_living.dm

@@ -1,3 +1,6 @@
+///from base of /mob/living/proc/melee_swing()
+#define COMSIG_LIVING_MELEE_SWING "mob_melee_swing"
+
 #define COMSIG_LIVING_JUMP_PREP_TOGGLE "living_jump_prep_toggle"
 
 //from base of living/set_pull_offset(): (mob/living/pull_target, grab_state)

code/__DEFINES/~darkpack/storyteller_dice.dm

@@ -1,3 +1,4 @@
+#define ROLL_COOLDOWN -2
 #define ROLL_BOTCH -1
 #define ROLL_FAILURE 0
 #define ROLL_SUCCESS 1
@@ -14,3 +15,8 @@
 #define ROLL_ADMIN "admin"
 /// Output is show to no one and is not logged
 #define ROLL_NONE "none"
+
+/// Time at which the roll was recorded
+#define OLD_ROLL_TIME 1
+/// Dice output of the old roll (roll define or just raw number depending on numerical)
+#define OLD_ROLL_OUTPUT 2

code/__DEFINES/~darkpack/traits/declarations.dm

@@ -156,6 +156,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_NATURAL "natural"
 #define TRAIT_AURA_OF_CONFIDENCE "aura_of_confidence"
 
+/// Mob has had atleast one tooth yanked out while having no method of regenerating it.
+#define TRAIT_TOOTH_PULLED "tooth_pulled"
+
 /// Sixth sense restricted to view range
 #define TRAIT_LOCAL_SIXTHSENSE "local_sixth_sense"
 /// If the mob can't have surgery done on it. See: Blood form Tzimisce
@@ -186,6 +189,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_FAIR_GLABRO "fair_glabro"
 #define TRAIT_EAT_FOOD "eat_food"
 #define TRAIT_CALM_HEART "calm_heart"
-
+#define TRAIT_ACUTE_HEARING "acute_hearing"
+#define TRAIT_DISFIGURED_APPEARANCE "disfigured_appearance"
+#define TRAIT_GRAVE_SMELL "grave_smell"
+#define TRAIT_GLOWING_EYES "glowing_eyes"
 
 // END TRAIT DEFINES

code/_globalvars/lists/maintenance_loot.dm

@@ -17,13 +17,18 @@
 GLOBAL_LIST_INIT(trash_loot, list(//junk: useless, very easy to get, or ghetto chemistry items
 	list(//trash
 		/obj/item/trash/can = 1,
+		/* // DARKPACK EDIT REMOVAL
 		/obj/item/trash/candy = 1,
 		/obj/item/trash/cheesie = 1,
 		/obj/item/trash/chips = 1,
 		/obj/item/trash/pistachios = 1,
 		/obj/item/trash/popcorn = 1,
 		/obj/item/trash/raisins = 1,
 		/obj/item/trash/sosjerky = 1,
+		*/
+		// DARKPACK ADD CHANGE START
+		/obj/effect/spawner/random/trash/food_packaging = 7,
+		// DARKPACK ADD CHANGE END
 		/obj/item/trash/flare = 1,
 		/obj/item/trash/candle = 1,
 
@@ -101,7 +106,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
 		/obj/item/radio/headset = 1,
 		/obj/item/storage/backpack = 1,
 		/obj/item/storage/belt/fannypack = 1,
-		/obj/item/storage/wallet/random = 1,
+		/obj/item/storage/wallet/darkpack = 1, // DARKPACK EDIT CHANGE
 		) = 1,
 
 	list(//construction and crafting
@@ -147,7 +152,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
 		/obj/item/extinguisher = 1,
 		/obj/item/grenade/smokebomb = 1,
 		/obj/item/radio/off = 1,
-		/obj/item/stack/spacecash/c10 = 1,
+		/obj/item/stack/dollar/rand/hundred = 1, // DARKPACK EDIT CHANGE
 		/obj/item/stack/medical/wrap/sticky_tape = 1,
 		/obj/item/tank/internals/emergency_oxygen = 1,
 		/obj/item/paper/paperslip/fishing_tip = 1,
@@ -164,6 +169,8 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
 
 GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
 	list(//tools
+		/obj/effect/spawner/random/weapon/small_melee = 10, // DARKPACK EDIT ADD START - LOOT
+		/obj/effect/spawner/random/weapon/weak_large_melee = 5, // DARKPACK EDIT ADD END
 		/obj/item/grenade/iedcasing/spawned = 1,
 		/obj/item/hatchet = 1,
 		/obj/item/melee/baton/security/cattleprod = 1,
@@ -364,15 +371,20 @@ GLOBAL_LIST_INIT(rarity_loot, list(//rare: really good items
 		) = 1,
 
 	list(//misc
+		/obj/effect/spawner/random/occult/artifact = 10, // DARKPACK EDIT ADD
 		/obj/item/book/granter/crafting_recipe/dusting/pipegun_prime = 1,
 		/obj/item/book/granter/crafting_recipe/trash_cannon = 1,
+		/* // DARKPACK EDIT REMOVAL
 		/obj/item/book/granter/crafting_recipe/dusting/laser_musket_prime = 1,
 		/obj/item/book/granter/crafting_recipe/dusting/detached_ratvarian_repeater = 1,
 		/obj/item/book/granter/sign_language = 1,
+		*/
 		/obj/item/disk/nuclear/fake = 1,
 		/obj/item/disk/surgery/advanced_plastic_surgery = 1,
+		/* // DARKPACK EDIT REMOVAL
 		/obj/item/skillchip/brainwashing = 1,
 		/obj/item/skillchip/intj = 1,
+		*/
 		/obj/item/tattoo_kit = 1,
 		/obj/item/folder/ancient_paperwork = 1,
 		) = 1,

code/_globalvars/traits/_traits.dm

@@ -675,6 +675,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_SPACE_ANT_IMMUNITY" = TRAIT_SPACE_ANT_IMMUNITY,
 		"TRAIT_BRAIN_TRAUMA_IMMUNITY" = TRAIT_BRAIN_TRAUMA_IMMUNITY,
 		"TRAIT_NECROPOLIS_WORSHIP" = TRAIT_NECROPOLIS_WORSHIP,
+		"TRAIT_ACUTE_HEARING" = TRAIT_ACUTE_HEARING, // DARKPACK EDIT ADD - MERITS_FLAWS - ACUTE SENSE
 		"TRAIT_ANIMAL_MUSK" = TRAIT_ANIMAL_MUSK, // DARKPACK EDIT ADD - MERITS_FLAWS
 		"TRAIT_AURA_OF_CONFIDENCE" = TRAIT_AURA_OF_CONFIDENCE, // DARKPACK EDIT ADD - WEREWOLF
 		"TRAIT_BETRAYERS_MARK" = TRAIT_BETRAYERS_MARK, // DARKPACK EDIT ADD - MERITS_FLAWS - (Tremere)
@@ -694,6 +695,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_DIFFICULT_FRENZY" = TRAIT_DIFFICULT_FRENZY, // DARKPACK EDIT ADD - FRENZY
 		"TRAIT_DIFFICULT_RAGE" = TRAIT_DIFFICULT_RAGE, // DARKPACK EDIT ADD - FRENZY
 		"TRAIT_DISCO_DANCER" = TRAIT_DISCO_DANCER, // DARKPACK EDIT ADD
+		"TRAIT_DISFIGURED_APPEARANCE" = TRAIT_DISFIGURED_APPEARANCE, // DARKPACK EDIT ADD - MERITS_FLAWS - PHYSICAL FLAWS
 		"TRAIT_DULLFANGS" = TRAIT_DULLFANGS, // DARKPACK EDIT ADD - MERITS_FLAWS
 		"TRAIT_EAT_FOOD" = TRAIT_EAT_FOOD, // DARKPACK EDIT ADD - MERITS_FLAWS
 		"TRAIT_EFFICIENT_DIGESTION" = TRAIT_EFFICIENT_DIGESTION, //DARKPACK EDIT ADD
@@ -707,7 +709,9 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_FORCED_EMOTION" = TRAIT_FORCED_EMOTION, // DARKPACK EDIT ADD - Melpominee
 		"TRAIT_FRENETIC_AURA" = TRAIT_FRENETIC_AURA, // DARKPACK EDIT ADD
 		"TRAIT_GHOST_VISION" = TRAIT_GHOST_VISION, // DARKPACK EDIT ADD - POWERS - (Necromancy)
+		"TRAIT_GLOWING_EYES" = TRAIT_GLOWING_EYES, // DARKPACK EDIT ADD - MERITS_FLAWS - PHYSICAL FLAWS
 		"TRAIT_GOLD_WEAKNESS" = TRAIT_GOLD_WEAKNESS, // DARKPACK EDIT ADD - WEREWOLF - (corax)
+		"TRAIT_GRAVE_SMELL" = TRAIT_GRAVE_SMELL, // DARKPACK EDIT ADD - MERITS_FLAWS - PHYSICAL FLAWS
 		"TRAIT_GRIP_OF_THE_DAMNED" = TRAIT_GRIP_OF_THE_DAMNED, // DARKPACK EDIT ADD
 		"TRAIT_GULLET" = TRAIT_GULLET, // DARKPACK EDIT ADD
 		"TRAIT_HIDDEN_DIABLERIE" = TRAIT_HIDDEN_DIABLERIE, //DARKPACK EDIT ADD
@@ -761,6 +765,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_THIRD_EYE" = TRAIT_THIRD_EYE, // DARKPACK EDIT ADD - Tremere & Salubri Quirk
 		"TRAIT_TIMEWARPER" = TRAIT_TIMEWARPER, // DARKPACK EDIT ADD
 		"TRAIT_TIME_SENSE" = TRAIT_TIME_SENSE, // DARKPACK EDIT ADD - MERITS_FLAWS
+		"TRAIT_TOOTH_PULLED" = TRAIT_TOOTH_PULLED, // DARKPACK EDIT ADD
 		"TRAIT_TORPOR" = TRAIT_TORPOR, // DARKPACK EDIT ADD
 		"TRAIT_TOUGH_FLESH" = TRAIT_TOUGH_FLESH, // DARKPACK EDIT ADD
 		"TRAIT_TRANSFORM_UPDATES_ICON" = TRAIT_TRANSFORM_UPDATES_ICON, // DARKPACK EDIT ADD - WEREWOLF

code/_globalvars/traits/admin_tooling.dm

@@ -363,6 +363,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_LEFT_EYE_SCAR" = TRAIT_LEFT_EYE_SCAR,
 		"TRAIT_RIGHT_EYE_SCAR" = TRAIT_RIGHT_EYE_SCAR,
 		"TRAIT_CARPOTOXIN_IMMUNE" = TRAIT_CARPOTOXIN_IMMUNE,
+		"TRAIT_ACUTE_HEARING" = TRAIT_ACUTE_HEARING, // DARKPACK EDIT ADD - MERITS_FLAWS - ACUTE SENSE
 		"TRAIT_ANIMAL_MUSK" = TRAIT_ANIMAL_MUSK, // DARKPACK EDIT ADD - MERITS_FLAWS
 		"TRAIT_AURA_OF_CONFIDENCE" = TRAIT_AURA_OF_CONFIDENCE, // DARKPACK EDIT ADD - WEREWOLF
 		"TRAIT_BLOODY_LOVER" = TRAIT_BLOODY_LOVER, // DARKPACK EDIT ADD
@@ -380,6 +381,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_DIFFICULT_FRENZY" = TRAIT_DIFFICULT_FRENZY, // DARKPACK EDIT ADD - FRENZY
 		"TRAIT_DIFFICULT_RAGE" = TRAIT_DIFFICULT_RAGE, // DARKPACK EDIT ADD - FRENZY
 		"TRAIT_DISCO_DANCER" = TRAIT_DISCO_DANCER, // DARKPACK EDIT ADD
+		"TRAIT_DISFIGURED_APPEARANCE" = TRAIT_DISFIGURED_APPEARANCE, // DARKPACK EDIT ADD - MERITS_FLAWS - PHYSICAL FLAWS
 		"TRAIT_DULLFANGS" = TRAIT_DULLFANGS, // DARKPACK EDIT ADD - MERITS_FLAWS
 		"TRAIT_EFFICIENT_DIGESTION" = TRAIT_EFFICIENT_DIGESTION, // DARKPACK EDIT ADD
 		"TRAIT_ENHANCED_MELEE_DODGE" = TRAIT_ENHANCED_MELEE_DODGE, // DARKPACK EDIT ADD
@@ -389,7 +391,9 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_FERA_RENOWN" = TRAIT_FERA_RENOWN, // DARKPACK EDIT ADD - WEREWOLF
 		"TRAIT_FRENETIC_AURA" = TRAIT_FRENETIC_AURA, // DARKPACK EDIT ADD
 		"TRAIT_GHOST_VISION" = TRAIT_GHOST_VISION, // DARKPACK EDIT ADD - POWERS - (Necromancy)
+		"TRAIT_GLOWING_EYES" = TRAIT_GLOWING_EYES, // DARKPACK EDIT ADD - MERITS_FLAWS - PHYSICAL FLAWS
 		"TRAIT_GOLD_WEAKNESS" = TRAIT_GOLD_WEAKNESS, // DARKPACK EDIT ADD - WEREWOLF - (corax)
+		"TRAIT_GRAVE_SMELL" = TRAIT_GRAVE_SMELL, // DARKPACK EDIT ADD - MERITS_FLAWS - PHYSICAL FLAWS
 		"TRAIT_GRIP_OF_THE_DAMNED" = TRAIT_GRIP_OF_THE_DAMNED, // DARKPACK EDIT ADD
 		"TRAIT_GULLET" = TRAIT_GULLET, // DARKPACK EDIT ADD
 		"TRAIT_HIDDEN_DIABLERIE" = TRAIT_HIDDEN_DIABLERIE, //DARKPACK EDIT ADD
@@ -435,6 +439,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_THE_LARGEST_MAW" = TRAIT_THE_LARGEST_MAW, // DARKPACK EDIT ADD
 		"TRAIT_TIMEWARPER" = TRAIT_TIMEWARPER, // DARKPACK EDIT ADD
 		"TRAIT_TIME_SENSE" = TRAIT_TIME_SENSE, // DARKPACK EDIT ADD - MERITS_FLAWS
+		"TRAIT_TOOTH_PULLED" = TRAIT_TOOTH_PULLED, // DARKPACK EDIT ADD
 		"TRAIT_TORPOR" = TRAIT_TORPOR, // DARKPACK EDIT ADD
 		"TRAIT_TOUGH_FLESH" = TRAIT_TOUGH_FLESH, // DARKPACK EDIT ADD
 		"TRAIT_TRANSFORM_UPDATES_ICON" = TRAIT_TRANSFORM_UPDATES_ICON, // DARKPACK EDIT ADD - WEREWOLF

code/_onclick/click.dm

@@ -176,8 +176,13 @@
 		else
 			if(LAZYACCESS(modifiers, RIGHT_CLICK))
 				ranged_secondary_attack(A, modifiers)
+			/* // DARKPACK EDIT REMOVAL - COMBAT
 			else
 				RangedAttack(A, modifiers)
+			*/
+		// DARKPACK EDIT ADD START - COMBAT
+		RangedAttack(A, modifiers)
+		// DARKPACK EDIT ADD END
 
 /// Is the atom obscured by a PREVENT_CLICK_UNDER_1 object above it
 /atom/proc/IsObscured()

code/_onclick/hud/hud.dm

@@ -6,7 +6,7 @@
 
 // The default UI style is the first one in the list
 GLOBAL_LIST_INIT(available_ui_styles, list(
-	"World of Darkness" = 'modular_darkpack/master_files/icons/hud/screen_darkness_new.dmi', // DARKPACK EDIT ADD - (Put at the top because it has almost full coverage now!)
+	"World-of-Darkness" = 'modular_darkpack/master_files/icons/hud/screen_darkness_new.dmi', // DARKPACK EDIT ADD - (Put at the top because it has almost full coverage now!)
 	"Pentex-Knox" = 'modular_darkpack/master_files/icons/hud/screen_pentexknox.dmi', // DARKPACK EDIT ADD - (Trasen-Knox logo with a Pentex logo)
 	/* // DARKPACK EDIT REMOVAL
 	"Midnight" = 'icons/hud/screen_midnight.dmi',

code/controllers/subsystem/processing/quirks.dm

@@ -33,6 +33,7 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list(
 	list(/datum/quirk/darkpack/thaumaturgically_inept, /datum/quirk/darkpack/mage_blood), // DARKPACK EDIT ADD - MERITS_FLAWS
 	list(/datum/quirk/mute, /datum/quirk/darkpack/the_largest_maw), // DARKPACK EDIT ADD - MERITS_FLAWS
 	list(/datum/quirk/mute, /datum/quirk/darkpack/speech_impediment), // DARKPACK EDIT ADD - MERITS_FLAWS
+	list(/datum/quirk/darkpack/monstrous, /datum/quirk/darkpack/disfigured), // DARKPACK EDIT ADD - MERITS_FLAWS - PHYSICAL FLAWS
 ))
 
 GLOBAL_LIST_INIT(quirk_string_blacklist, generate_quirk_string_blacklist())

code/game/objects/effects/spawners/random/trash.dm

@@ -92,10 +92,11 @@
 /obj/effect/spawner/random/trash/food_packaging
 	name = "empty food packaging spawner"
 	loot = list(
+		/* // DARKPACK EDIT REMOVAL
 		/obj/item/trash/raisins = 2,
 		/obj/item/trash/cheesie = 2,
 		/obj/item/trash/candy = 2,
-		/obj/item/trash/chips = 10, // DARKPACK EDIT CHANGE
+		/obj/item/trash/chips = 2,
 		/obj/item/trash/sosjerky = 2,
 		/obj/item/trash/pistachios = 2,
 		/obj/item/trash/peanuts = 2,
@@ -139,8 +140,12 @@
 		/obj/item/popsicle_stick = 1,
 		/obj/item/trash/ready_donk = 1,
 		/obj/item/trash/tray = 1,
-		/obj/item/trash/vampirebar = 5, // DARKPACK EDIT ADD START
-		/obj/item/trash/vampirenugget = 1, // DARKPACK EDIT ADD END
+		*/
+		// DARKPACK EDIT ADD START
+		/obj/item/trash/vampirebar = 5,
+		/obj/item/trash/chips = 10,
+		/obj/item/trash/vampirenugget = 1,
+		// DARKPACK EDIT ADD END
 	)
 
 /obj/effect/spawner/random/trash/botanical_waste

code/game/objects/items.dm

@@ -1233,6 +1233,12 @@
 				outline_color = COLOR_THEME_TRASENKNOX
 			if("detective")
 				outline_color = COLOR_THEME_DETECTIVE
+			// DARKPACK EDIT ADD START
+			if("pentex-knox")
+				outline_color = COLOR_THEME_TRASENKNOX
+			if("world-of-darkness")
+				outline_color = COLOR_WHITE
+			// DARKPACK EDIT ADD END
 			else //this should never happen, hopefully
 				outline_color = COLOR_WHITE
 	if(color)

code/modules/jobs/job_types/_job.dm

@@ -220,6 +220,10 @@
 		if(st_get_stat(STAT_FINANCE))
 			var/finance = st_get_stat(STAT_FINANCE)
 			switch(finance)
+				if(0)
+					if(!CONFIG_GET(flag/punishing_zero_dots))
+						bank_account.account_balance = rand(50, 100)
+						bank_account.paycheck_amount = 15
 				if(1)
 					bank_account.account_balance = rand(100, 200)
 					bank_account.paycheck_amount = 40
@@ -258,7 +262,7 @@
 	dna.species.pre_equip_species_outfit(equipping, src, visual_only)
 	equip_outfit_and_loadout(equipping.get_outfit(consistent), player_client?.prefs, visual_only)
 
-/datum/job/proc/announce_head(mob/living/carbon/human/human, channels, job_title) //tells the given channel that the given mob is the new department head. See communications.dm for valid channels. // DARKPACK EDIT CHANGE - ALTERNATIVE_JOB_TITLES 
+/datum/job/proc/announce_head(mob/living/carbon/human/human, channels, job_title) //tells the given channel that the given mob is the new department head. See communications.dm for valid channels. // DARKPACK EDIT CHANGE - ALTERNATIVE_JOB_TITLES
 	if(human)
 		//timer because these should come after the captain announcement
 		SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_addtimer), CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(aas_config_announce), /datum/aas_config_entry/newhead, list("PERSON" = human.real_name, "RANK" = human.job), null, channels, null, TRUE), 1))
@@ -512,7 +516,7 @@
 				hangover_landmark.used = TRUE
 				break
 			return hangover_spawn_point || get_latejoin_spawn_point()
-	// DARKPACK EDIT CHANGE START - ALTERNATIVE_JOB_TITLES 
+	// DARKPACK EDIT CHANGE START - ALTERNATIVE_JOB_TITLES
 	if(length(GLOB.jobspawn_overrides[job_spawn_title]))
 		return pick(GLOB.jobspawn_overrides[job_spawn_title])
 	// DARKPACK EDIT CHANGE END

code/modules/loadout/categories/inhands.dm

@@ -1,10 +1,9 @@
-/* // DARKPACK EDIT REMOVAL START - Loadout categories
 /// Inhand items (Moves overrided items to backpack)
 /datum/loadout_category/inhands
 	category_name = "Inhand"
 	category_ui_icon = FA_ICON_BRIEFCASE
 	type_to_generate = /datum/loadout_item/inhand
-	tab_order = /datum/loadout_category/head::tab_order + 4
+	tab_order = /datum/loadout_category/head::tab_order + 11 // DARKPACK EDIT CHANGE
 
 /datum/loadout_item/inhand
 	abstract_type = /datum/loadout_item/inhand
@@ -29,7 +28,8 @@
 	name = "Briefcase (Leather)"
 	item_path = /obj/item/storage/briefcase
 
+/* // DARKPACK EDIT REMOVAL
 /datum/loadout_item/inhand/briefcase_secure
 	name = "Briefcase (Secure)"
 	item_path = /obj/item/storage/briefcase/secure
-*/ // DARKPACK EDIT REMOVAL END - Loadout categories
+*/

code/modules/loadout/categories/pocket.dm

@@ -3,7 +3,7 @@
 	category_name = "Other"
 	category_ui_icon = FA_ICON_QUESTION
 	type_to_generate = /datum/loadout_item/pocket_items
-	tab_order = /datum/loadout_category/head::tab_order + 11
+	tab_order = /datum/loadout_category/head::tab_order + 12 // DARKPACK EDIT CHANGE
 	/// How many pocket items are allowed
 	VAR_PRIVATE/max_allowed = 6 // DARKPACK EDIT CHANGE - Bumped up realtivly high as it contains a few soft "required" items for gameplay
 

code/modules/mob/living/carbon/carbon.dm

@@ -61,17 +61,9 @@
 // DARKPACK EDIT ADD START
 		if(isliving(thrower))
 			var/mob/living/attacker = thrower
-			var/attacker_strengthbrawl = attacker.st_get_stat(STAT_STRENGTH) + attacker.st_get_stat(STAT_BRAWL)
-			var/attacker_dexathletics = attacker.st_get_stat(STAT_DEXTERITY) + attacker.st_get_stat(STAT_ATHLETICS)
-			var/attacker_keephigher = max(attacker_strengthbrawl, attacker_dexathletics)
 
-			var/victim_stamina = victim.st_get_stat(STAT_STAMINA)
-			var/victim_stambrawl = victim_stamina + victim.st_get_stat(STAT_BRAWL)
-			var/victim_stamathletics = victim_stamina + victim.st_get_stat(STAT_ATHLETICS)
-			var/victim_keephigher = max(victim_stambrawl, victim_stamathletics)
-
-			var/attacker_roll = SSroll.storyteller_roll(dice = attacker_keephigher, difficulty = 6, roller = thrower, numerical = TRUE)
-			var/victim_roll = SSroll.storyteller_roll(dice = victim_keephigher, difficulty = 6, roller = victim, numerical = TRUE)
+			var/attacker_roll = SSroll.storyteller_roll_datum(attacker, victim, /datum/storyteller_roll/tackle_attacker)
+			var/victim_roll = SSroll.storyteller_roll_datum(victim, attacker, /datum/storyteller_roll/tackle_defender)
 
 			if(victim_roll > attacker_roll)
 				blocked = TRUE