Merge branch 'master' of github.com:tgstation/tgstation into upstream-2026-06-23

code/modules/spells/spell.dm

@@ -319,6 +319,8 @@
 				if(!caster.get_organ_slot(ORGAN_SLOT_TONGUE))
 					invocation(caster)
 					to_chat(caster, span_warning("Your lack of tongue is making it difficult to say the correct words to cast [src]..."))
+					if(caster.click_intercept == src)
+						unset_click_ability(caster, refund_cooldown = TRUE)
 					StartCooldown(2 SECONDS)
 					return SPELL_CANCEL_CAST
 
@@ -330,6 +332,8 @@
 						ignored_mobs = caster,
 					)
 					to_chat(caster, span_warning("You can't position your hands correctly to invoke [src][caster.num_hands > 0 ? "" : ", as you have none"]..."))
+					if(caster.click_intercept == src)
+						unset_click_ability(caster, refund_cooldown = TRUE)
 					StartCooldown(2 SECONDS)
 					return SPELL_CANCEL_CAST
 

code/modules/spells/spell_types/shapeshift/_shapeshift.dm

@@ -165,9 +165,9 @@
 	new_shape.add_traits(list(TRAIT_DONT_WRITE_MEMORY, TRAIT_SHAPESHIFTED), SHAPESHIFT_TRAIT)
 
 	// Make sure that if you shapechanged into a bot, the AI can't just turn you off.
-	var/mob/living/simple_animal/bot/polymorph_bot = new_shape
+	var/mob/living/basic/bot/polymorph_bot = new_shape
 	if (istype(polymorph_bot))
-		polymorph_bot.bot_cover_flags |= BOT_COVER_EMAGGED
+		polymorph_bot.bot_access_flags |= BOT_COVER_EMAGGED
 		polymorph_bot.bot_mode_flags &= ~BOT_MODE_REMOTE_ENABLED
 
 	return new_shape

code/modules/spells/spell_types/shapeshift/polar_bear.dm

@@ -6,4 +6,4 @@
 	invocation_type = INVOCATION_EMOTE
 	spell_requirements = NONE
 
-	possible_shapes = list(/mob/living/simple_animal/hostile/asteroid/polarbear/lesser)
+	possible_shapes = list(/mob/living/basic/mining/polarbear/lesser)