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

code/modules/spells/spell_types/cone/cone_of_cold.dm

@@ -50,7 +50,7 @@
 	if(ispath(frozen_status_effect_path) && unfreeze_mob_duration > 0 SECONDS) // 0 duration = don't apply the status effect
 		var/datum/status_effect/freeze = target_mob.apply_status_effect(frozen_status_effect_path)
 		if(unfreeze_mob_duration != INFINITY)
-			freeze.duration = world.time + unfreeze_mob_duration
+			freeze.duration = unfreeze_mob_duration
 
 	if(on_freeze_brute_damage || on_freeze_burn_damage)
 		target_mob.take_overall_damage(on_freeze_brute_damage, on_freeze_burn_damage)

code/modules/spells/spell_types/conjure_item/_conjure_item.dm

@@ -72,6 +72,8 @@
 	if(istype(mob_caster))
 		mob_caster.put_in_hands(created, del_on_fail = delete_on_failure)
 
+	post_created(cast_on, created)
+
 	return ..()
 
 /// Instantiates the item we're conjuring and returns it.

code/modules/spells/spell_types/self/disable_tech.dm

@@ -13,7 +13,7 @@
 
 /datum/action/cooldown/spell/emp/cast(atom/cast_on)
 	. = ..()
-	empulse(get_turf(cast_on), emp_heavy, emp_light)
+	empulse(get_turf(cast_on), emp_heavy, emp_light, emp_source = src)
 
 /datum/action/cooldown/spell/emp/disable_tech
 	name = "Disable Tech"