Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-2025-11-05

code/modules/mining/boulder_processing/_boulder_processing.dm

@@ -103,6 +103,8 @@
 /obj/machinery/bouldertech/CanAllowThrough(atom/movable/mover, border_dir)
 	if(!anchored)
 		return FALSE
+	if(istype(mover, /obj/item/stack/sheet))
+		return TRUE
 	if(istype(mover, /obj/item/boulder))
 		return can_process_boulder(mover)
 	if(isgolem(mover))
@@ -350,8 +352,8 @@
 				rejected_mats[possible_mat] = quantity
 				continue
 			points_held = round(points_held + (quantity * possible_mat.points_per_unit * MINING_POINT_MACHINE_MULTIPLIER)) // put point total here into machine
-			if(!silo_materials.mat_container.insert_amount_mat(quantity, possible_mat))
-				rejected_mats[possible_mat] = quantity
+			if(isnull(silo_materials.silo) || !silo_materials.mat_container.insert_amount_mat(quantity, possible_mat))
+				new possible_mat.sheet_type(drop_location(), floor(quantity / SHEET_MATERIAL_AMOUNT))
 
 		//puts back materials that couldn't be processed
 		chosen_boulder.set_custom_materials(rejected_mats, refining_efficiency)

code/modules/mining/equipment/monster_organs/brimdust_sac.dm

@@ -93,6 +93,8 @@
 	desc = "You %STACKS% explosive dust, kinetic impacts will cause it to detonate! \
 		The explosion will not harm you as long as you're not under atmospheric pressure. \
 		Click this alert to shake off the dust."
+	use_user_hud_icon = TRUE
+	overlay_state = "brimdemon_1"
 
 /atom/movable/screen/alert/status_effect/brimdust_coating/MouseEntered(location,control,params)
 	desc = initial(desc)
@@ -132,7 +134,8 @@
 	. = ..()
 	if (stacks == 0)
 		return
-	linked_alert.icon_state = "brimdemon_[stacks]"
+	linked_alert.overlay_state = "brimdemon_[stacks]"
+	linked_alert.update_appearance(UPDATE_OVERLAYS)
 	if (dust_overlay)
 		owner.cut_overlay(dust_overlay)
 		dust_overlay.alpha = stacks * BRIMDUST_ALPHA_PER_STACK

code/modules/mining/equipment/monster_organs/rush_gland.dm

@@ -51,7 +51,8 @@
 /atom/movable/screen/alert/status_effect/lobster_rush
 	name = "Lobster Rush"
 	desc = "Adrenaline is surging through you!"
-	icon_state = "lobster"
+	use_user_hud_icon = TRUE
+	overlay_state = "lobster"
 
 /datum/status_effect/lobster_rush/on_apply()
 	. = ..()

code/modules/mining/lavaland/ash_flora.dm

@@ -242,6 +242,10 @@
 	wine_power = 50
 	foodtypes = FRUIT
 
+/obj/item/food/grown/ash_flora/cactus_fruit/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/raptor_food, growth_modifier = 0.1, ability_modifier = -0.05)
+
 /obj/item/food/grown/ash_flora/seraka
 	name = "seraka cap"
 	desc = "Small, deeply flavourful mushrooms originally native to Tizira."
@@ -249,6 +253,10 @@
 	seed = /obj/item/seeds/lavaland/seraka
 	wine_power = 40
 
+/obj/item/food/grown/ash_flora/seraka/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/raptor_food, ability_modifier = 0.1)
+
 /obj/item/food/grown/ash_flora/fireblossom
 	name = "fire blossom"
 	desc = "A flower from a fire blossom."
@@ -257,7 +265,12 @@
 	seed = /obj/item/seeds/lavaland/fireblossom
 	wine_power = 40
 
-//SEEDS
+/obj/item/food/grown/ash_flora/fireblossom/Initialize(mapload)
+	. = ..()
+	// Fire flowers make fireproof raptors
+	AddElement(/datum/element/raptor_food, color_chances = string_list(list(/datum/raptor_color/blue = 5)))
+
+// SEEDS
 
 /obj/item/seeds/lavaland
 	name = "lavaland seeds"

code/modules/mining/lavaland/mining_loot/consumables.dm

@@ -219,8 +219,7 @@
 	var/list/radial_wings = list()
 	var/list/name2type = list()
 	for(var/obj/item/organ/wings/functional/possible_type as anything in wing_types)
-		var/datum/sprite_accessory/accessory = initial(possible_type.sprite_accessory_override) //get the type
-		accessory = SSaccessories.sprite_accessories[initial(accessory.key)][initial(accessory.name)] //SKYRAT EDIT CHANGE - ORIGINAL: accessory = SSaccessories.wings_list[initial(accessory.name)] //get the singleton instance
+		var/datum/sprite_accessory/accessory = SSaccessories.sprite_accessories[FEATURE_WINGS][possible_type::sprite_accessory_override::name] // BUBBER EDIT CHANGE - Original: var/datum/sprite_accessory/accessory = SSaccessories.feature_list[FEATURE_WINGS][possible_type::sprite_accessory_override::name] //get the singleton instance
 		var/image/img = image(icon = accessory.icon, icon_state = "m_wingsopen_[accessory.icon_state]_BEHIND") //Process the HUD elements
 		img.transform *= 0.5
 		img.pixel_w = -32

code/modules/mining/ores_coins.dm

@@ -215,6 +215,10 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	scan_state = "rock_diamond"
 	merge_type = /obj/item/stack/ore/diamond
 
+/obj/item/stack/ore/diamond/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/raptor_food, speed_modifier = 0.05, health_modifier = -1, color_chances = string_list(list(/datum/raptor_color/yellow = 3)))
+
 /obj/item/stack/ore/diamond/five
 	amount = 5