Darkpack Pull 2/24/2026

code/__DEFINES/clothing.dm

@@ -45,9 +45,9 @@
 
 //Suit/Skirt
 /// Preference: Jumpsuit
-#define PREF_SUIT "Jumpsuit"
+#define PREF_SUIT "Suit" // DARKPACK EDIT CHANGE
 /// Preference: Jumpskirt
-#define PREF_SKIRT "Jumpskirt"
+#define PREF_SKIRT "Skirt" // DARKPACK EDIT CHANGE
 
 // Types of backpack
 /// Backpack type: Department themed backpack

code/__DEFINES/~darkpack/keybindings.dm

@@ -2,12 +2,12 @@
 #define COMSIG_KB_HUMAN_BITE_DOWN "keybinding_human_bite_down"
 
 // Pixelshifting
-#define COMSIG_KB_MOB_PIXEL_SHIFT_DOWN "keybinding_mob_pixel_shift_down"
-#define COMSIG_KB_MOB_PIXEL_SHIFT_UP "keybinding_mob_pixel_shift_up"
-#define COMSIG_KB_MOB_ITEM_PIXEL_SHIFT_DOWN "keybinding_mob_item_pixelshift_down"
-#define COMSIG_KB_MOB_ITEM_PIXEL_SHIFT_UP "keybinding_mob_item_pixelshift_up"
-#define COMSIG_KB_MOB_PIXEL_TILT_DOWN "keybinding_mob_pixeltilt_down"
-#define COMSIG_KB_MOB_PIXEL_TILT_UP "keybinding_mob_pixeltilt_up"
+#define COMSIG_KB_LIVING_PIXEL_SHIFT_DOWN "keybinding_living_pixel_shift_down"
+#define COMSIG_KB_LIVING_PIXEL_SHIFT_UP "keybinding_living_pixel_shift_up"
+#define COMSIG_KB_LIVING_ITEM_PIXEL_SHIFT_DOWN "keybinding_living_item_pixelshift_down"
+#define COMSIG_KB_LIVING_ITEM_PIXEL_SHIFT_UP "keybinding_living_item_pixelshift_up"
+#define COMSIG_KB_LIVING_PIXEL_TILT_DOWN "keybinding_living_pixeltilt_down"
+#define COMSIG_KB_LIVING_PIXEL_TILT_UP "keybinding_living_pixeltilt_up"
 
 // LOOC
 #define COMSIG_KB_CLIENT_LOOC_DOWN "keybinding_client_looc_down"

code/__DEFINES/~darkpack/storyteller_dice.dm

@@ -10,6 +10,8 @@
 #define ROLL_PUBLIC "public"
 /// Output is only shown to the roller
 #define ROLL_PRIVATE "private"
+/// Output is shown to both the roller and the target
+#define ROLL_PRIVATE_AND_TARGET "roller+target"
 /// Output of the roll to admins + you
 #define ROLL_PRIVATE_ADMIN "private+admin"
 /// Output of the roll to admins only

code/_globalvars/lists/clothing.dm

@@ -1,8 +1,10 @@
 GLOBAL_LIST_INIT(backpacklist, list(
+	/* // DARKPACK EDIT REMOVAL
 	DBACKPACK,
 	DDUFFELBAG,
 	DSATCHEL,
 	DMESSENGER,
+	*/
 	GBACKPACK,
 	GDUFFELBAG,
 	GSATCHEL,

code/_globalvars/traits/admin_tooling.dm

@@ -355,9 +355,76 @@ 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_BLOODY_LOVER" = TRAIT_BLOODY_LOVER, // DARKPACK EDIT ADD
+		"TRAIT_BLOODY_SUCKER" = TRAIT_BLOODY_SUCKER, // DARKPACK EDIT ADD
+		"TRAIT_BLOOD_DRINKER" = TRAIT_BLOOD_DRINKER, // DARKPACK EDIT ADD
+		"TRAIT_BLUSH_OF_HEALTH" = TRAIT_BLUSH_OF_HEALTH, // DARKPACK EDIT ADD
+		"TRAIT_CANNOT_RESIST_MIND_CONTROL" = TRAIT_CANNOT_RESIST_MIND_CONTROL, // DARKPACK EDIT ADD
+		"TRAIT_CAN_ENTER_TORPOR" = TRAIT_CAN_ENTER_TORPOR, // DARKPACK EDIT ADD
+		"TRAIT_CHARMER" = TRAIT_CHARMER, // DARKPACK EDIT ADD
+		"TRAIT_COFFIN_THERAPY" = TRAIT_COFFIN_THERAPY, // DARKPACK EDIT ADD
+		"TRAIT_COLD_AURA" = TRAIT_COLD_AURA, // DARKPACK EDIT ADD
+		"TRAIT_CONSENSUAL_FEEDING_ONLY" = TRAIT_CONSENSUAL_FEEDING_ONLY, // DARKPACK EDIT ADD
+		"TRAIT_DEFICIENT_VITAE" = TRAIT_DEFICIENT_VITAE, // DARKPACK EDIT ADD
+		"TRAIT_DIABLERIE" = TRAIT_DIABLERIE, // DARKPACK EDIT ADD
+		"TRAIT_DISCO_DANCER" = TRAIT_DISCO_DANCER, // DARKPACK EDIT ADD
+		"TRAIT_ENHANCED_MELEE_DODGE" = TRAIT_ENHANCED_MELEE_DODGE, // DARKPACK EDIT ADD
+		"TRAIT_FAKE_SOULLESS" = TRAIT_FAKE_SOULLESS, // DARKPACK EDIT ADD
+		"TRAIT_FEEDING_RESTRICTION" = TRAIT_FEEDING_RESTRICTION, // DARKPACK EDIT ADD
+		"TRAIT_FERA_FUR" = TRAIT_FERA_FUR, // 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_GULLET" = TRAIT_GULLET, // DARKPACK EDIT ADD
+		"TRAIT_HOMOSEXUAL" = TRAIT_HOMOSEXUAL, // DARKPACK EDIT ADD
+		"TRAIT_HUNGRY" = TRAIT_HUNGRY, // DARKPACK EDIT ADD
+		"TRAIT_HUNTED" = TRAIT_HUNTED, // DARKPACK EDIT ADD
+		"TRAIT_ILLEGAL_IDENTITY" = TRAIT_ILLEGAL_IDENTITY, // DARKPACK EDIT ADD - GOVERMENT
+		"TRAIT_INVISIBLE_TO_CAMERA" = TRAIT_INVISIBLE_TO_CAMERA, // DARKPACK EDIT ADD
+		"TRAIT_IN_FRENZY" = TRAIT_IN_FRENZY, // DARKPACK EDIT ADD
+		"TRAIT_IRRESISTIBLE_VITAE" = TRAIT_IRRESISTIBLE_VITAE, // DARKPACK EDIT ADD
+		"TRAIT_LAZY" = TRAIT_LAZY, // DARKPACK EDIT ADD
+		"TRAIT_LONGER_FRENZY" = TRAIT_LONGER_FRENZY, // DARKPACK EDIT ADD
+		"TRAIT_LOUD_HOWLER" = TRAIT_LOUD_HOWLER, // DARKPACK EDIT ADD - WEREWOLF
+		"TRAIT_MASQUERADE_VIOLATING_EYES" = TRAIT_MASQUERADE_VIOLATING_EYES, // DARKPACK EDIT ADD
+		"TRAIT_MASQUERADE_VIOLATING_FACE" = TRAIT_MASQUERADE_VIOLATING_FACE, // DARKPACK EDIT ADD
+		"TRAIT_MYSTICISM_KNOWLEDGE" = TRAIT_MYSTICISM_KNOWLEDGE, // DARKPACK EDIT ADD
+		"TRAIT_NECROMANCY_KNOWLEDGE" = TRAIT_NECROMANCY_KNOWLEDGE, // DARKPACK EDIT ADD
+		"TRAIT_NEEDS_BLOOD" = TRAIT_NEEDS_BLOOD, //DARKPACK EDIT ADD - Hunger and Frenzy
+		"TRAIT_NON_INT" = TRAIT_NON_INT, // DARKPACK EDIT ADD
+		"TRAIT_NO_LYING_ANGLE" = TRAIT_NO_LYING_ANGLE, // DARKPACK EDIT ADD - WEREWOLF
+		"TRAIT_OBFUSCATED" = TRAIT_OBFUSCATED, // DARKPACK EDIT ADD
+		"TRAIT_PAINFUL_VAMPIRE_KISS" = TRAIT_PAINFUL_VAMPIRE_KISS, // DARKPACK EDIT ADD
+		"TRAIT_PASSDOOR" = TRAIT_PASSDOOR, // DARKPACK EDIT ADD
+		"TRAIT_PASS_THROUGH_WALLS" = TRAIT_PASS_THROUGH_WALLS, // DARKPACK EDIT ADD
+		"TRAIT_REJECTED_BY_TECHNOLOGY" = TRAIT_REJECTED_BY_TECHNOLOGY, // DARKPACK EDIT ADD
+		"TRAIT_REPELLED_BY_HOLINESS" = TRAIT_REPELLED_BY_HOLINESS, // DARKPACK EDIT ADD
+		"TRAIT_RUBICON" = TRAIT_RUBICON, // DARKPACK EDIT ADD
+		"TRAIT_SENSITIVE_HUMANITY" = TRAIT_SENSITIVE_HUMANITY, // DARKPACK EDIT ADD
+		"TRAIT_SERPENTIS_SKIN" = TRAIT_SERPENTIS_SKIN, // DARKPACK EDIT ADD - POWERS - (Serpentis)
+		"TRAIT_SILENCED" = TRAIT_SILENCED, // DARKPACK EDIT ADD - POWERS - (Quietus)
+		"TRAIT_SMALL_HANDS" = TRAIT_SMALL_HANDS, // DARKPACK EDIT ADD - WEREWOLF
+		"TRAIT_STAKED" = TRAIT_STAKED, // DARKPACK EDIT ADDn.
+		"TRAIT_STAKE_IMMUNE" = TRAIT_STAKE_IMMUNE, // DARKPACK EDIT ADD
+		"TRAIT_STAKE_RESISTANT" = TRAIT_STAKE_RESISTANT, // DARKPACK EDIT ADD
 		"TRAIT_THAUMATURGY_KNOWLEDGE" = TRAIT_THAUMATURGY_KNOWLEDGE, // DARKPACK EDIT ADD
+		"TRAIT_TIMEWARPER" = TRAIT_TIMEWARPER, // 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
+		"TRAIT_UNAGING" = TRAIT_UNAGING, // DARKPACK EDIT ADD
+		"TRAIT_UNBONDABLE" = TRAIT_UNBONDABLE, // DARKPACK EDIT ADD
+		"TRAIT_UNMASQUERADE" = TRAIT_UNMASQUERADE, // DARKPACK EDIT ADD
 		"TRAIT_VICISSITUDE_KNOWLEDGE" = TRAIT_VICISSITUDE_KNOWLEDGE, // DARKPACK EDIT ADD
-		"TRAIT_MYSTICISM_KNOWLEDGE" = TRAIT_MYSTICISM_KNOWLEDGE, // DARKPACK EDIT ADD
+		"TRAIT_VIOLATOR" = TRAIT_VIOLATOR, // DARKPACK EDIT ADD
+		"TRAIT_VITAE_ADDICTION" = TRAIT_VITAE_ADDICTION, // DARKPACK EDIT ADD
+		"TRAIT_VTM_CLANS" = TRAIT_VTM_CLANS, // DARKPACK EDIT ADD
+		"TRAIT_VTM_MORALITY" = TRAIT_VTM_MORALITY, // DARKPACK EDIT ADD
+		"TRAIT_WARM_AURA" = TRAIT_WARM_AURA, // DARKPACK EDIT ADD
+		"TRAIT_WEAK_TO_DOMINATE" = TRAIT_WEAK_TO_DOMINATE, // DARKPACK EDIT ADD - POWERS - (Dominate)
+		"TRAIT_WTA_GAROU_AUSPICE" = TRAIT_WTA_GAROU_AUSPICE, // DARKPACK EDIT ADD
+		"TRAIT_WTA_GAROU_BREED" = TRAIT_WTA_GAROU_BREED, // DARKPACK EDIT ADD
+		"TRAIT_WTA_GAROU_TRIBE" = TRAIT_WTA_GAROU_TRIBE, // DARKPACK EDIT ADD
+		"TRAIT_WYRMTAINTED" = TRAIT_WYRMTAINTED, // DARKPACK EDIT ADD
 	),
 	/obj/item = list(
 		"TRAIT_APC_SHOCKING" = TRAIT_APC_SHOCKING,

code/controllers/subsystem/processing/quirks.dm

@@ -68,10 +68,14 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 
 /datum/controller/subsystem/processing/quirks/proc/SetupQuirks()
 	// Sort by Positive, Negative, Neutral; and then by name
-	var/list/quirk_list = sort_list(subtypesof(/datum/quirk/darkpack), GLOBAL_PROC_REF(cmp_quirk_asc)) // DARKPACK EDIT CHANGE - Original : var/list/quirk_list = sort_list(subtypesof(/datum/quirk), GLOBAL_PROC_REF(cmp_quirk_asc))
+	var/list/quirk_list = sort_list(valid_subtypesof(/datum/quirk), GLOBAL_PROC_REF(cmp_quirk_asc)) // DARKPACK EDIT CHANGE - (Filter abstracts)
 
 	for(var/type in quirk_list)
 		var/datum/quirk/quirk_type = type
+		// DARKPACK EDIT ADD START - MERITS/FLAWS
+		if(!quirk_type::darkpack_allowed)
+			continue
+		// DARKPACK EDIT ADD END
 
 		quirk_prototypes[type] = new type
 		quirks[initial(quirk_type.name)] = quirk_type

code/datums/components/crafting/crafting.dm

@@ -245,7 +245,7 @@
 			human_crafter = crafter
 			if(CONFIG_GET(flag/punishing_zero_dots) && human_crafter.st_get_stat(STAT_CRAFTS) < 1)
 				return ", you dont know how to craft!"
-			recipe_time = recipe_time / human_crafter.st_get_stat(STAT_CRAFTS)
+			recipe_time = recipe_time / max(human_crafter.st_get_stat(STAT_CRAFTS), 1)
 		// DARKPACK EDIT ADD END
 
 		if(!do_after(crafter, round(recipe_time, 0.1 SECONDS), target = crafter))

code/datums/mapgen/JungleGenerator.dm

@@ -6,7 +6,7 @@
 	var/list/possible_biomes = list(
 	BIOME_LOW_HEAT = list(
 		BIOME_LOW_HUMIDITY = /datum/biome/plains,
-		BIOME_LOWMEDIUM_HUMIDITY = /datum/biome/mudlands,
+		BIOME_LOWMEDIUM_HUMIDITY = /datum/biome/plains,
 		BIOME_HIGHMEDIUM_HUMIDITY = /datum/biome/mudlands,
 		BIOME_HIGH_HUMIDITY = /datum/biome/water
 		),

code/datums/mapgen/biomes/_biome.dm

@@ -191,14 +191,14 @@
 /datum/biome/plains
 	turf_type = /turf/open/misc/grass
 	flora_types = list(
-		/obj/effect/spawner/random/flora/grass = 25,
-		/obj/effect/spawner/random/flora/bushes = 10,
+		/obj/effect/spawner/random/flora/grass = 50,
+		/obj/effect/spawner/random/flora/bushes = 15,
 		/obj/structure/flora/tree/vamp/pine = 1,
 		/obj/structure/flora/rock/pile/darkpack = 1,
 		/obj/structure/flora/rock/darkpack = 1,
 		/obj/effect/mine/stick = 2,
 	)
-	flora_density = 60
+	flora_density = 70
 	fauna_types = list(
 		/mob/living/basic/butterfly = 40,
 		/mob/living/basic/deer = 20,
@@ -215,13 +215,13 @@
 	turf_type = /turf/open/misc/grass
 	flora_types = list(
 		/obj/effect/spawner/random/flora/grass = 5,
-		/obj/effect/spawner/random/flora/bushes = 2,
+		/obj/effect/spawner/random/flora/flowers = 2,
 		/obj/structure/flora/tree/vamp/pine = 3,
 		/obj/structure/flora/rock/pile/darkpack = 1,
 		/obj/structure/flora/rock/darkpack = 1,
 		/obj/effect/mine/stick = 3,
 	)
-	flora_density = 30
+	flora_density = 40
 	fauna_types = list(
 		/mob/living/basic/butterfly = 40,
 		/mob/living/basic/deer = 20,
@@ -235,7 +235,7 @@
 	fauna_density = 1
 
 /datum/biome/jungle/deep
-	flora_density = 50
+	flora_density = 60
 
 /datum/biome/wasteland
 	turf_type = /turf/open/misc/dirt

code/datums/quirks/positive_quirks/bilingual.dm

@@ -1,12 +1,13 @@
 /datum/quirk/bilingual
-	name = "Bilingual"
+	name = "Language" // DARKPACK EDIT CHANGE - MERITS/FLAWS
 	desc = "Over the years you've picked up an extra language!"
 	icon = FA_ICON_GLOBE
-	value = 4
+	value = 1 // DARKPACK EDIT CHANGE - MERITS/FLAWS
 	gain_text = span_notice("Some of the words of the people around you certainly aren't common. Good thing you studied for this.")
 	lose_text = span_notice("You seem to have forgotten your second language.")
 	medical_record_text = "Patient speaks multiple languages."
 	mail_goodies = list(/obj/item/taperecorder, /obj/item/clothing/head/beret/frenchberet, /obj/item/clothing/mask/fakemoustache/italian)
+	darkpack_allowed = TRUE // DARKPACK EDIT ADD - MERITS/FLAWS
 
 /datum/quirk_constant_data/bilingual
 	associated_typepath = /datum/quirk/bilingual

code/game/objects/items/handcuffs.dm

@@ -39,6 +39,7 @@
 	inhand_icon_state = "handcuff"
 	lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
+	ONFLOOR_ICON_HELPER('modular_darkpack/modules/deprecated/icons/onfloor.dmi') // DARKPACK EDIT ADD
 	obj_flags = CONDUCTS_ELECTRICITY
 	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_HANDCUFFED
 	throwforce = 0
@@ -179,6 +180,8 @@
 */
 /obj/item/restraints/handcuffs/alien
 	icon_state = "handcuffAlien"
+	ONFLOOR_ICON_HELPER(null) // DARKPACK EDIT ADD
+	icon = 'icons/obj/weapons/restraints.dmi' // DARKPACK EDIT ADD
 
 /**
  *
@@ -393,6 +396,8 @@
 	breakouttime = 45 SECONDS
 	icon_state = "cult_shackles"
 	flags_1 = NONE
+	ONFLOOR_ICON_HELPER(null) // DARKPACK EDIT ADD
+	icon = 'icons/obj/weapons/restraints.dmi' // DARKPACK EDIT ADD
 
 /obj/item/restraints/handcuffs/cult/on_uncuffed(datum/source, mob/living/wearer)
 	. = ..()

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -317,7 +317,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
 	new/datum/stack_recipe("winged wooden chair", /obj/structure/chair/wood/wings, 3, time = 1 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
 	new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_STRUCTURE), \
 	new/datum/stack_recipe("wooden stairs frame", /obj/structure/stairs_frame/wood, 10, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_STRUCTURE), \
-	new/datum/stack_recipe("wooden fence", /obj/structure/railing/wooden_fence, 2, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_STRUCTURE), \
+	new/datum/stack_recipe("wooden fence", /obj/structure/railing/darkpack/wood, 2, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_STRUCTURE), \
 	new/datum/stack_recipe("cat house", /obj/structure/cat_house, 5, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_STRUCTURE), \
 	new/datum/stack_recipe("coffin", /obj/structure/closet/crate/coffin, 5, time = 1.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
 	new/datum/stack_recipe("book case", /obj/structure/bookcase, 4, time = 1.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \

code/game/objects/structures/bonfire.dm

@@ -10,7 +10,7 @@
 /obj/structure/bonfire
 	name = "bonfire"
 	desc = "For grilling, broiling, charring, smoking, heating, roasting, toasting, simmering, searing, melting, and occasionally burning things."
-	icon = 'modular_darkpack/master_files/icons/obj/service/hydroponics/equipment.dmi' // DARKPACK EDIT CHANGE
+	icon = 'modular_darkpack/modules/decor/icons/fires.dmi' // DARKPACK EDIT CHANGE
 	icon_state = "bonfire"
 	base_icon_state = "bonfire" // DARKPACK EDIT ADD
 	light_color = LIGHT_COLOR_FIRE
@@ -207,8 +207,26 @@
 	base_icon_state = "campfire"
 
 /obj/structure/bonfire/prelit/alt
-	icon_state = "campfire"
+	icon_state = "campfire_on_fire"
 	base_icon_state = "campfire"
+
+/obj/structure/bonfire/alt2
+	icon_state = "campfire_alt"
+	base_icon_state = "campfire_alt"
+
+/obj/structure/bonfire/prelit/alt2
+	icon_state = "campfire_alt_on_fire"
+	base_icon_state = "campfire_alt"
+
+/obj/structure/bonfire/fire_barrel
+	icon_state = "fire_barrel"
+	base_icon_state = "fire_barrel"
+	density = TRUE
+
+/obj/structure/bonfire/prelit/fire_barrel
+	icon_state = "fire_barrel_on_fire"
+	base_icon_state = "fire_barrel"
+	density = TRUE
 // DARKPACK EDIT ADD END
 
 #undef BONFIRE_FIRE_STACK_STRENGTH

code/game/objects/structures/ladders.dm

@@ -81,7 +81,7 @@
 	RegisterSignal(loc, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(add_ladder_rim))
 	loc.add_filter(SOURCE_LADDER(ladder), 1, alpha_mask_filter(
 		x = ladder.pixel_x + ladder.pixel_w,
-		y = ladder.pixel_y + ladder.pixel_z,
+		y = ladder.pixel_y + ladder.pixel_z + 8, // DARKPACK EDIT CHANGE
 		render_source = "*[SOURCE_LADDER(ladder)]",
 		flags = MASK_INVERSE,
 	))
@@ -137,8 +137,10 @@
 /obj/structure/ladder/proc/make_base_transparent()
 	if(!SSmapping.level_trait(z, ZTRAIT_DOWN)) // Ladders which are actually teleporting you to another z level
 		return
+	/* DARKPACK EDIT REMOVAL
 	base_pixel_z = initial(base_pixel_z) + 12
 	pixel_z = base_pixel_z
+	*/
 	new /obj/effect/abstract/ladder_hole(loc, src)
 
 /// Clears any ladder holes created by this ladder

code/game/objects/structures/stairs.dm

@@ -27,7 +27,7 @@
 	/// Upstairs turf. Is observed for changes if force_open_above is TRUE (to re-open if necessary)
 	VAR_FINAL/turf/directly_above
 	/// If TRUE, we have left/middle/right sprites.
-	var/has_merged_sprites = TRUE
+	var/has_merged_sprites = FALSE // DARKPACK EDIT CHANGE
 	/// Lazyassoc list of weakef to mob viewing stair indicators to their images
 	VAR_PRIVATE/list/mob_to_image
 

code/game/objects/structures/table_frames.dm

@@ -12,7 +12,7 @@
 /obj/structure/table_frame
 	name = "table frame"
 	desc = "Four metal legs with four framing rods for a table. You could easily pass through this."
-	icon = 'icons/obj/structures.dmi'
+	icon = 'modular_darkpack/master_files/icons/obj/structures.dmi' // DARKPACK EDIT CHANGE
 	icon_state = "table_frame"
 	density = FALSE
 	anchored = FALSE

code/game/objects/structures/tables_racks.dm

@@ -1461,7 +1461,16 @@
 	building = TRUE
 	to_chat(user, span_notice("You start constructing a rack..."))
 	// DARKPACK EDIT ADD START
-	var/obj/structure/rack/rack_choice = tgui_input_list(user, "Choose rack type", "Rack Choice", list(/obj/structure/rack, /obj/structure/rack/clothing, /obj/structure/rack/clothing_hanger, /obj/structure/rack/food))
+	var/obj/structure/rack/rack_choice = tgui_input_list(user, "Choose rack type", "Rack Choice", list(
+		/obj/structure/rack,
+		/obj/structure/rack/clothing,
+		/obj/structure/rack/clothing_hanger,
+		/obj/structure/rack/tall/wood_shelf,
+		/obj/structure/rack/tall/wood_shelf/alt,
+		/obj/structure/rack/tall/metal_shelf,
+		/obj/structure/rack/tall/store_shelf,
+		/obj/structure/rack/tall/store_shelf_metal,
+	))
 	if(!rack_choice)
 		return
 	// DARKPACK EDIT ADD END