cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 21:18:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tgstation/master' into upstream-6-2-2026

Browse Source
This commit is contained in:
shayoki
2026-06-03 01:23:54 -05:00
parent 66f8cdea0b 7169c517a8
commit f601a6ddaf
1259 changed files with 50763 additions and 28726 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/bitrunning/objects/disks.dm
+1 -1
View File
@@ -186,7 +186,7 @@
/obj/item/borg/upgrade/modkit/range,
/obj/item/borg/upgrade/modkit/damage,
/obj/item/borg/upgrade/modkit/cooldown,
/obj/item/borg/upgrade/modkit/aoe/mobs,
/obj/item/borg/upgrade/modkit/cooldown/aoe/mobs,
/obj/item/borg/upgrade/modkit/human_passthrough,
)
code/modules/bitrunning/objects/hololadder.dm
+8
View File
@@ -64,6 +64,14 @@
if(isnull(user.mind))
return
var/obj/machinery/quantum_server/our_server = server_ref.resolve()
if(!our_server.domain_complete)
for(var/datum/weakref/ghostrole_weakref as anything in our_server.spawned_threat_refs)
var/mob/living/ghostrole = ghostrole_weakref.resolve()
if(ghostrole?.stat == CONSCIOUS && ghostrole.client && ghostrole.mind.has_antag_datum(/datum/antagonist/bitrunning_glitch))
to_chat(user, span_danger("A being in the simulation is preventing your retreat. You must either complete your mission or remove the obstacle before safe exit will be possible."))
return
if(!HAS_TRAIT(user, TRAIT_TEMPORARY_BODY))
balloon_alert(user, "no connection detected")
return