From e061f7f7eaa16f1845be3f9d8686d858b78b2f24 Mon Sep 17 00:00:00 2001
From: Detective Google <48196179+Detective-Google@users.noreply.github.com>
Date: Wed, 24 Jun 2020 17:10:41 -0500
Subject: [PATCH 1/2] piggyback carrying people is no longer comically slow
---
code/__DEFINES/mobs/slowdowns.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/__DEFINES/mobs/slowdowns.dm b/code/__DEFINES/mobs/slowdowns.dm
index 2d858e9509..8605dd1374 100644
--- a/code/__DEFINES/mobs/slowdowns.dm
+++ b/code/__DEFINES/mobs/slowdowns.dm
@@ -3,7 +3,7 @@
/// How much someone is slowed from fireman carrying a human
#define FIREMAN_CARRY_SLOWDOWN 0
/// How much someone is slowed by piggybacking a human
-#define PIGGYBACK_CARRY_SLOWDOWN 1
+#define PIGGYBACK_CARRY_SLOWDOWN .6
/// slowdown when in softcrit. Note that crawling slowdown will also apply at the same time!
#define SOFTCRIT_ADD_SLOWDOWN 2
/// slowdown when crawling
From a4c243331c8629e93970db02283b31e7d2068821 Mon Sep 17 00:00:00 2001
From: Detective Google <48196179+Detective-Google@users.noreply.github.com>
Date: Wed, 24 Jun 2020 17:25:39 -0500
Subject: [PATCH 2/2] aeugh
---
code/__DEFINES/mobs/slowdowns.dm | 2 +-
code/modules/mob/living/carbon/human/human.dm | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/__DEFINES/mobs/slowdowns.dm b/code/__DEFINES/mobs/slowdowns.dm
index 8605dd1374..4d9b4a0259 100644
--- a/code/__DEFINES/mobs/slowdowns.dm
+++ b/code/__DEFINES/mobs/slowdowns.dm
@@ -3,7 +3,7 @@
/// How much someone is slowed from fireman carrying a human
#define FIREMAN_CARRY_SLOWDOWN 0
/// How much someone is slowed by piggybacking a human
-#define PIGGYBACK_CARRY_SLOWDOWN .6
+#define PIGGYBACK_CARRY_SLOWDOWN 0
/// slowdown when in softcrit. Note that crawling slowdown will also apply at the same time!
#define SOFTCRIT_ADD_SLOWDOWN 2
/// slowdown when crawling
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 4421c383e6..4166069833 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -982,7 +982,7 @@
if(target.incapacitated(FALSE, TRUE) || incapacitated(FALSE, TRUE))
target.visible_message("[target] can't hang onto [src]!")
return
- buckle_mob(target, TRUE, TRUE, FALSE, 0, 2, FALSE)
+ buckle_mob(target, TRUE, TRUE, FALSE, 1, 2, FALSE)
else
visible_message("[target] fails to climb onto [src]!")
else