From 87a70dd063f2ef3780c29e5d6614806eeed333b1 Mon Sep 17 00:00:00 2001
From: Jamie D <993128+JamieD1@users.noreply.github.com>
Date: Sun, 18 Jul 2021 15:53:46 +0100
Subject: [PATCH 1/8] Update riding.dm
---
code/datums/components/riding.dm | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm
index 5704924a29ce..f25123ce647c 100644
--- a/code/datums/components/riding.dm
+++ b/code/datums/components/riding.dm
@@ -267,6 +267,7 @@
/datum/component/riding/cyborg
del_on_unbuckle_all = TRUE
+ var/throwcooldown = FALSE
/datum/component/riding/cyborg/ride_check(mob/user)
var/atom/movable/AM = parent
@@ -316,12 +317,16 @@
/datum/component/riding/cyborg/force_dismount(mob/living/M)
var/atom/movable/AM = parent
AM.unbuckle_mob(M)
+ if(throwcooldown)
+ to_chat(src.parent, "You have to wait for your motors to recharge")
var/turf/target = get_edge_target_turf(AM, AM.dir)
var/turf/targetm = get_step(get_turf(AM), AM.dir)
M.Move(targetm)
M.visible_message("[M] is thrown clear of [AM]!")
M.throw_at(target, 14, 5, AM)
M.Paralyze(60)
+ throwcooldown = TRUE
+ addtimer(VARSET_CALLBACK(src, throwcooldown, FALSE), 10 SECONDS)
/datum/component/riding/proc/equip_buckle_inhands(mob/living/carbon/human/user, amount_required = 1, riding_target_override = null)
var/atom/movable/AM = parent
From 53d45c7d464cd79a65aa4e4e280e759b3cd9e1d4 Mon Sep 17 00:00:00 2001
From: Jamie D <993128+JamieD1@users.noreply.github.com>
Date: Sun, 18 Jul 2021 15:57:56 +0100
Subject: [PATCH 2/8] Update riding.dm
---
code/datums/components/riding.dm | 1 +
1 file changed, 1 insertion(+)
diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm
index f25123ce647c..908fc660b0a2 100644
--- a/code/datums/components/riding.dm
+++ b/code/datums/components/riding.dm
@@ -319,6 +319,7 @@
AM.unbuckle_mob(M)
if(throwcooldown)
to_chat(src.parent, "You have to wait for your motors to recharge")
+ return
var/turf/target = get_edge_target_turf(AM, AM.dir)
var/turf/targetm = get_step(get_turf(AM), AM.dir)
M.Move(targetm)
From 764fe0da431eb0cabc8af6d5489152e246a4d348 Mon Sep 17 00:00:00 2001
From: Jamie D <993128+JamieD1@users.noreply.github.com>
Date: Sun, 18 Jul 2021 16:05:00 +0100
Subject: [PATCH 3/8] E
---
code/datums/components/riding.dm | 9 ++++-----
code/modules/mob/living/silicon/robot/robot.dm | 2 ++
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm
index 908fc660b0a2..00f8be3ca6fe 100644
--- a/code/datums/components/riding.dm
+++ b/code/datums/components/riding.dm
@@ -267,7 +267,6 @@
/datum/component/riding/cyborg
del_on_unbuckle_all = TRUE
- var/throwcooldown = FALSE
/datum/component/riding/cyborg/ride_check(mob/user)
var/atom/movable/AM = parent
@@ -317,8 +316,8 @@
/datum/component/riding/cyborg/force_dismount(mob/living/M)
var/atom/movable/AM = parent
AM.unbuckle_mob(M)
- if(throwcooldown)
- to_chat(src.parent, "You have to wait for your motors to recharge")
+ if(AM.throwcooldown)
+ to_chat(AM, "You have to wait for your motors to recharge")
return
var/turf/target = get_edge_target_turf(AM, AM.dir)
var/turf/targetm = get_step(get_turf(AM), AM.dir)
@@ -326,8 +325,8 @@
M.visible_message("[M] is thrown clear of [AM]!")
M.throw_at(target, 14, 5, AM)
M.Paralyze(60)
- throwcooldown = TRUE
- addtimer(VARSET_CALLBACK(src, throwcooldown, FALSE), 10 SECONDS)
+ AM.throwcooldown = TRUE
+ addtimer(VARSET_CALLBACK(src, AM.throwcooldown, FALSE), 10 SECONDS)
/datum/component/riding/proc/equip_buckle_inhands(mob/living/carbon/human/user, amount_required = 1, riding_target_override = null)
var/atom/movable/AM = parent
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 7abd1802eed5..3a7f95f20797 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -16,6 +16,8 @@
var/obj/item/robot_suit/robot_suit = null ///Used for deconstruction to remember what the borg was constructed out of..
var/obj/item/mmi/mmi = null
+ var/throwcooldown = FALSE
+
var/shell = FALSE
var/deployed = FALSE
var/mob/living/silicon/ai/mainframe = null
From 40fba6e362c82b6af0a0cc4a7a4580eefb12fa37 Mon Sep 17 00:00:00 2001
From: Jamie D <993128+JamieD1@users.noreply.github.com>
Date: Sun, 18 Jul 2021 16:24:16 +0100
Subject: [PATCH 4/8] Update code/datums/components/riding.dm
Co-authored-by: Theos
---
code/datums/components/riding.dm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm
index 00f8be3ca6fe..020f67e878a9 100644
--- a/code/datums/components/riding.dm
+++ b/code/datums/components/riding.dm
@@ -316,7 +316,8 @@
/datum/component/riding/cyborg/force_dismount(mob/living/M)
var/atom/movable/AM = parent
AM.unbuckle_mob(M)
- if(AM.throwcooldown)
+ var/mob/living/silicon/robot/S = AM
+ if(S?.throwcooldown)
to_chat(AM, "You have to wait for your motors to recharge")
return
var/turf/target = get_edge_target_turf(AM, AM.dir)
From 2a76dd86ed671b78803614986504910a3e6bd1c4 Mon Sep 17 00:00:00 2001
From: Jamie D <993128+JamieD1@users.noreply.github.com>
Date: Sun, 18 Jul 2021 16:25:27 +0100
Subject: [PATCH 5/8] Update code/datums/components/riding.dm
---
code/datums/components/riding.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm
index 020f67e878a9..821ca86bd93c 100644
--- a/code/datums/components/riding.dm
+++ b/code/datums/components/riding.dm
@@ -318,7 +318,7 @@
AM.unbuckle_mob(M)
var/mob/living/silicon/robot/S = AM
if(S?.throwcooldown)
- to_chat(AM, "You have to wait for your motors to recharge")
+ to_chat(S, "You have to wait for your motors to recharge")
return
var/turf/target = get_edge_target_turf(AM, AM.dir)
var/turf/targetm = get_step(get_turf(AM), AM.dir)
From 4c015071f132e1927e50ce76602e99642c3fd4b1 Mon Sep 17 00:00:00 2001
From: Jamie D <993128+JamieD1@users.noreply.github.com>
Date: Sun, 18 Jul 2021 16:25:31 +0100
Subject: [PATCH 6/8] Update code/datums/components/riding.dm
---
code/datums/components/riding.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm
index 821ca86bd93c..adc2f3c68422 100644
--- a/code/datums/components/riding.dm
+++ b/code/datums/components/riding.dm
@@ -326,8 +326,8 @@
M.visible_message("[M] is thrown clear of [AM]!")
M.throw_at(target, 14, 5, AM)
M.Paralyze(60)
- AM.throwcooldown = TRUE
- addtimer(VARSET_CALLBACK(src, AM.throwcooldown, FALSE), 10 SECONDS)
+ S.throwcooldown = TRUE
+ addtimer(VARSET_CALLBACK(S, throwcooldown, FALSE), 10 SECONDS)
/datum/component/riding/proc/equip_buckle_inhands(mob/living/carbon/human/user, amount_required = 1, riding_target_override = null)
var/atom/movable/AM = parent
From 55de21bea0e8d21825dbfdca7fd06abe5a89cbae Mon Sep 17 00:00:00 2001
From: Jamie D <993128+JamieD1@users.noreply.github.com>
Date: Sat, 24 Jul 2021 10:12:52 +0100
Subject: [PATCH 7/8] Update code/datums/components/riding.dm
---
code/datums/components/riding.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm
index adc2f3c68422..8ea36096a58d 100644
--- a/code/datums/components/riding.dm
+++ b/code/datums/components/riding.dm
@@ -317,7 +317,7 @@
var/atom/movable/AM = parent
AM.unbuckle_mob(M)
var/mob/living/silicon/robot/S = AM
- if(S?.throwcooldown)
+ if(S.throwcooldown)
to_chat(S, "You have to wait for your motors to recharge")
return
var/turf/target = get_edge_target_turf(AM, AM.dir)
From 737521c7c68788409f0b23d2455ede204a49b8a6 Mon Sep 17 00:00:00 2001
From: Jamie D <993128+JamieD1@users.noreply.github.com>
Date: Sat, 24 Jul 2021 10:12:57 +0100
Subject: [PATCH 8/8] Update code/modules/mob/living/silicon/robot/robot.dm
---
code/modules/mob/living/silicon/robot/robot.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 3a7f95f20797..e782038688b9 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -16,7 +16,7 @@
var/obj/item/robot_suit/robot_suit = null ///Used for deconstruction to remember what the borg was constructed out of..
var/obj/item/mmi/mmi = null
- var/throwcooldown = FALSE
+ var/throwcooldown = FALSE /// Used to determine cooldown for spin.
var/shell = FALSE
var/deployed = FALSE