Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

code/modules/bitrunning/antagonists/cyber_police.dm

@@ -33,7 +33,6 @@
 
 /datum/outfit/cyber_police/post_equip(mob/living/carbon/human/user, visuals_only)
 	var/obj/item/clothing/under/officer_uniform = user.w_uniform
-	if(officer_uniform)
-		officer_uniform.has_sensor = NO_SENSORS
-		officer_uniform.sensor_mode = SENSOR_OFF
-		user.update_suit_sensors()
+	if(istype(officer_uniform))
+		officer_uniform.set_has_sensor(NO_SENSORS)
+		officer_uniform.set_sensor_mode(SENSOR_OFF)

code/modules/bitrunning/server/signal_handlers.dm

@@ -71,7 +71,7 @@
 		if(isliving(thing)) // so we can mutate them
 			var/mob/living/creature = thing
 
-			if(ismegafauna(creature))
+			if(istype(creature, /mob/living/simple_animal/hostile/megafauna))
 				var/mob/living/simple_animal/hostile/megafauna/boss = creature
 				boss.make_virtual_megafauna()
 				continue

code/modules/bitrunning/server/threats.dm

@@ -131,7 +131,7 @@
 /obj/machinery/quantum_server/proc/station_spawn(mob/living/antag, obj/machinery/byteforge/chosen_forge)
 	antag.balloon_alert(antag, "scanning...")
 	chosen_forge.setup_particles(angry = TRUE)
-	var/obj/machinery/announcement_system/aas = get_announcement_system(source = src)
+	var/obj/machinery/announcement_system/aas = get_announcement_system(null, src, list(RADIO_CHANNEL_SUPPLY))
 	if (aas)
 		aas.broadcast("QUANTUM SERVER ALERT: Security breach detected. Unauthorized entry sequence in progress...", list(RADIO_CHANNEL_SUPPLY))
 	SEND_SIGNAL(src, COMSIG_BITRUNNER_STATION_SPAWN)