Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475

code/game/objects/effects/anomalies.dm

@@ -193,9 +193,9 @@
 	var/turf/T = safepick(get_area_turfs(impact_area))
 	if(T)
 			// Calculate new position (searches through beacons in world)
-		var/obj/item/device/radio/beacon/chosen
+		var/obj/item/device/beacon/chosen
 		var/list/possible = list()
-		for(var/obj/item/device/radio/beacon/W in GLOB.teleportbeacons)
+		for(var/obj/item/device/beacon/W in GLOB.teleportbeacons)
 			possible += W
 
 		if(possible.len > 0)
@@ -218,7 +218,7 @@
 			var/y_distance = TO.y - FROM.y
 			var/x_distance = TO.x - FROM.x
 			for (var/atom/movable/A in urange(12, FROM )) // iterate thru list of mobs in the area
-				if(istype(A, /obj/item/device/radio/beacon))
+				if(istype(A, /obj/item/device/beacon))
 					continue // don't teleport beacons because that's just insanely stupid
 				if(A.anchored)
 					continue

code/game/objects/effects/spawners/bundle.dm

@@ -22,7 +22,7 @@
 		/obj/item/reagent_containers/food/snacks/egg)
 
 /obj/effect/spawner/bundle/costume/gladiator
-	name = "gladitator costume spawner"
+	name = "gladiator costume spawner"
 	items = list(
 		/obj/item/clothing/under/gladiator,
 		/obj/item/clothing/head/helmet/gladiator)