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

This commit is contained in:
xPokee
2025-10-03 07:05:54 -04:00
517 changed files with 24339 additions and 21253 deletions
@@ -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
+1 -1
View File
@@ -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)