Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-2405b

This commit is contained in:
Waterpig
2024-05-13 17:42:53 +02:00
258 changed files with 10186 additions and 3366 deletions
+4 -1
View File
@@ -88,11 +88,14 @@
/obj/machinery/quantum_server/emag_act(mob/user, obj/item/card/emag/emag_card)
. = ..()
if(obj_flags & EMAGGED)
return
obj_flags |= EMAGGED
glitch_chance = 0.09
add_overlay(mutable_appearance('icons/obj/machines/bitrunning.dmi', "emag_overlay"))
balloon_alert(user, "bzzzt...")
balloon_alert(user, "system jailbroken...")
playsound(src, 'sound/effects/sparks1.ogg', 35, vary = TRUE)
/obj/machinery/quantum_server/update_appearance(updates)
@@ -2,6 +2,7 @@
/obj/machinery/quantum_server/proc/add_threats(mob/living/threat)
spawned_threat_refs.Add(WEAKREF(threat))
SEND_SIGNAL(src, COMSIG_BITRUNNER_THREAT_CREATED)
threat.AddComponent(/datum/component/virtual_entity, src)
/// Choses which antagonist role is spawned based on threat
/obj/machinery/quantum_server/proc/get_antagonist_role()