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

code/modules/mob/living/basic/bots/_bots.dm

@@ -131,8 +131,8 @@ GLOBAL_LIST_INIT(command_strings, list(
 
 	//Adds bot to the diagnostic HUD system
 	prepare_huds()
-	for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
-		diag_hud.add_atom_to_hud(src)
+	var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
+	diag_hud.add_atom_to_hud(src)
 	diag_hud_set_bothealth()
 	diag_hud_set_botstat()
 	diag_hud_set_botmode()

code/modules/mob/living/basic/drone/_drone.dm

@@ -134,8 +134,8 @@
 	shy_update()
 	alert_drones(DRONE_NET_CONNECT)
 
-	for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
-		diag_hud.add_atom_to_hud(src)
+	var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
+	diag_hud.add_atom_to_hud(src)
 
 	add_traits(list(
 		TRAIT_VENTCRAWLER_ALWAYS,

code/modules/mob/living/basic/drone/drone_say.dm

@@ -48,4 +48,4 @@
 /mob/living/basic/drone/proc/drone_chat(message, list/spans = list(), list/message_mods = list())
 	log_sayverb_talk(message, message_mods, tag = "drone chat")
 	var/message_part = generate_messagepart(message, spans, message_mods)
-	alert_drones("<i>Drone Chat: [span_name("[name]")] <span class='message'>[message_part]</span></i>", TRUE)
+	alert_drones(span_drone("Drone Chat: [span_name("[name]")] [span_message(message_part)]"), TRUE)

code/modules/mob/living/basic/farm_animals/deer/deer_ai.dm

@@ -44,7 +44,7 @@
 	target_key = BB_DEER_GRASS_TARGET
 	finding_behavior = /datum/ai_behavior/find_and_set/in_list/turf_types
 	hunting_behavior = /datum/ai_behavior/hunt_target/eat_grass
-	hunt_targets = list(/turf/open/floor/grass)
+	hunt_targets = list(/turf/open/floor/grass, /turf/open/misc/grass)
 	hunt_range = 7
 	hunt_chance = 45
 

code/modules/mob/living/basic/farm_animals/goose/goose.dm

@@ -57,7 +57,7 @@
 	SIGNAL_HANDLER
 	if (ai_controller?.blackboard[BB_GOOSE_PANICKED])
 		return COMSIG_MOB_CANCEL_EAT
-	if (potential_food.has_material_type(/datum/material/plastic) || IsEdible(potential_food))
+	if (potential_food.has_material_type(/datum/material/plastic) || IS_EDIBLE(potential_food))
 		return NONE// Geese only eat FOOD or PLASTIC
 	return COMSIG_MOB_CANCEL_EAT
 

code/modules/mob/living/basic/farm_animals/goose/goose_ai.dm

@@ -62,7 +62,7 @@
 
 	var/list/filtered = list()
 	for (var/obj/item/thing as anything in found)
-		if (IsEdible(thing) || thing.has_material_type(/datum/material/plastic))
+		if (IS_EDIBLE(thing) || thing.has_material_type(/datum/material/plastic))
 			filtered += thing
 
 	if(length(filtered))

code/modules/mob/living/basic/farm_animals/goose/goose_vomit.dm

@@ -124,7 +124,7 @@
 
 /// Stop fucking around and get the rest of it out
 /datum/status_effect/goose_vomit/proc/vomit_finale()
-	tick_interval = 0.1 SECONDS
+	tick_interval = 0.2 SECONDS
 	owner.set_jitter_if_lower(1 SECONDS)
 	hurl_item(vomit_strongly = TRUE)
 
@@ -176,7 +176,7 @@
 
 /datum/status_effect/goose_choking/on_remove()
 	UnregisterSignal(owner, COMSIG_LIVING_DEATH)
-	if (duration >= world.time)
+	if (duration > 0)
 		return // Saved by something, although probably by dying early
 	owner.death_message = "lets out one final oxygen-deprived honk before [owner.p_they()] go[owner.p_es()] limp and lifeless.."
 	owner.death()

code/modules/mob/living/basic/space_fauna/changeling/flesh_spider.dm

@@ -16,7 +16,7 @@
 	response_help_simple = "pet"
 	response_disarm_continuous = "gently pushes aside"
 	response_disarm_simple = "gently push aside"
-	damage_coeff = list(BRUTE = 1, BURN = 1.25, TOX = 1, STAMINA = 1, OXY = 1)
+	damage_coeff = list(BRUTE = 1, BURN = 1.25, TOX = 4, STAMINA = 1, OXY = 1)
 	basic_mob_flags = FLAMMABLE_MOB
 	status_flags = NONE
 	speed = -0.1

code/modules/mob/living/basic/space_fauna/regal_rat/regal_rat.dm

@@ -197,7 +197,7 @@
 		return TRUE // it might be possible to attack this? we'll find out soon enough
 
 	var/mob/living/living_target = the_target
-	if (HAS_TRAIT(living_target, TRAIT_FAKEDEATH) || living_target.stat == DEAD)
+	if(HAS_TRAIT_NOT_FROM(living_target, TRAIT_FAKEDEATH, SPECIES_TRAIT) || living_target.stat == DEAD)
 		balloon_alert(src, "already dead!")
 		return FALSE
 

code/modules/mob/living/basic/space_fauna/spider/spider.dm

@@ -14,7 +14,7 @@
 	response_disarm_simple = "gently push aside"
 	initial_language_holder = /datum/language_holder/spider
 	melee_attack_cooldown = CLICK_CD_MELEE
-	damage_coeff = list(BRUTE = 1, BURN = 1.25, TOX = 1, STAMINA = 1, OXY = 1)
+	damage_coeff = list(BRUTE = 1, BURN = 1.25, TOX = 3, STAMINA = 1, OXY = 1)
 	basic_mob_flags = FLAMMABLE_MOB
 	status_flags = NONE
 	unsuitable_cold_damage = 4