From 975ecb83ffb2453db5baf7364b5bbea4dbce7e31 Mon Sep 17 00:00:00 2001 From: ExcessiveUseOfCobblestone Date: Mon, 13 May 2019 17:57:31 -0400 Subject: [PATCH 001/177] borgs can now unbuckle from stasis beds --- code/game/machinery/stasis.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/game/machinery/stasis.dm b/code/game/machinery/stasis.dm index 5f7f0263dbb..77396effcbb 100644 --- a/code/game/machinery/stasis.dm +++ b/code/game/machinery/stasis.dm @@ -138,4 +138,10 @@ /obj/machinery/stasis/nap_violation(mob/violator) unbuckle_mob(violator, TRUE) + +/obj/machinery/stasis/attack_robot(mob/user) + if(Adjacent(user) && occupant) + unbuckle_mob(occupant) + else + ..() #undef STASIS_TOGGLE_COOLDOWN From 93ae69ac46331bb2e5341446ffb3efc90c2ebed1 Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Tue, 14 May 2019 11:35:38 +0000 Subject: [PATCH 002/177] Automatic changelog compile, [ci skip] --- html/changelog.html | 4 ++++ html/changelogs/.all_changelog.yml | 2 ++ html/changelogs/AutoChangeLog-pr-43908.yml | 4 ---- 3 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-43908.yml diff --git a/html/changelog.html b/html/changelog.html index 08628bc3ea9..33c9136e169 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -78,6 +78,10 @@
  • An extra tile to the Box chapel's width
  • One barely noticeable tile of width from escape(one escape brig chair dead [*] )
    • +

    RaveRadbury updated:

    +

    Skoglol updated: