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

This commit is contained in:
xPokee
2025-09-10 14:12:16 -04:00
277 changed files with 8854 additions and 7401 deletions
@@ -445,7 +445,6 @@ Return to step 11 of normal process."}
if(do_after(user, time_to_cuff, carbon_victim) && carbon_victim.canBeHandcuffed())
if(!carbon_victim.handcuffed)
carbon_victim.set_handcuffed(new /obj/item/restraints/handcuffs/energy/used(carbon_victim))
carbon_victim.update_handcuffed()
to_chat(user, span_notice("You restrain [carbon_victim]."))
log_combat(user, carbon_victim, "handcuffed")
else
@@ -582,7 +582,6 @@
if(do_after(user, 3 SECONDS, C))
if(!C.handcuffed)
C.set_handcuffed(new /obj/item/restraints/handcuffs/energy/cult/used(C))
C.update_handcuffed()
C.adjust_silence(10 SECONDS)
to_chat(user, span_notice("You shackle [C]."))
log_combat(user, C, "shackled")
@@ -350,13 +350,7 @@
//BUBBERSTATION EDIT END
sac_target.visible_message(span_danger("[sac_target] begins to shudder violenty as dark tendrils begin to drag them into thin air!"))
sac_target.set_handcuffed(new /obj/item/restraints/handcuffs/energy/cult(sac_target))
sac_target.update_handcuffed()
if(sac_target.legcuffed)
sac_target.legcuffed.forceMove(sac_target.drop_location())
sac_target.legcuffed.dropped(sac_target)
sac_target.legcuffed = null
sac_target.update_worn_legcuffs()
sac_target.dropItemToGround(sac_target.legcuffed, TRUE)
sac_target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 85, 150)
sac_target.do_jitter_animation()