From 1b1ed21f42eaaa5b5d888efe182803508440f99e Mon Sep 17 00:00:00 2001 From: BlackMajor Date: Tue, 19 Nov 2019 22:13:22 +1300 Subject: [PATCH 1/2] No adrenals for borgs please --- code/game/objects/items/robot/robot_upgrades.dm | 4 +++- code/modules/mob/living/silicon/robot/robot.dm | 2 ++ .../code/modules/mob/living/silicon/robot/robot_movement.dm | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 6e6db2feae..1f367c7d92 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -74,7 +74,7 @@ /obj/item/borg/upgrade/vtec/action(mob/living/silicon/robot/R, user = usr) . = ..() if(.) - if(R.speed < 0) + if(!R.cansprint) to_chat(R, "A VTEC unit is already installed!") to_chat(user, "There's no room for another VTEC unit!") return FALSE @@ -82,11 +82,13 @@ //R.speed = -2 // Gotta go fast. //Citadel change - makes vtecs give an ability rather than reducing the borg's speed instantly R.AddAbility(new/obj/effect/proc_holder/silicon/cyborg/vtecControl) + R.cansprint = 0 /obj/item/borg/upgrade/vtec/deactivate(mob/living/silicon/robot/R, user = usr) . = ..() if (.) R.speed = initial(R.speed) + R.cansprint = 1 /obj/item/borg/upgrade/disablercooler name = "cyborg rapid energy blaster cooling module" diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 6dcd0a8cc9..84474f72db 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -112,6 +112,8 @@ var/bellyup = 0 var/dogborg = FALSE + var/cansprint = 1 + /mob/living/silicon/robot/get_cell() return cell diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm b/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm index 28327cde0e..a7405883a4 100644 --- a/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm +++ b/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm @@ -14,7 +14,7 @@ . += speed /mob/living/silicon/robot/proc/togglesprint(shutdown = FALSE) //Basically a copypaste of the proc from /mob/living/carbon/human - if(!shutdown && (!cell || cell.charge < 25)) + if(!shutdown && !cansprint && (!cell || cell.charge < 25)) return FALSE sprinting = shutdown ? FALSE : !sprinting if(!resting && canmove) From d4f6bc67ca718aba76b1f1d414e4ac9b43734457 Mon Sep 17 00:00:00 2001 From: BlackMajor Date: Tue, 19 Nov 2019 22:41:39 +1300 Subject: [PATCH 2/2] Whoops that cansprint is in the wrong place --- .../code/modules/mob/living/silicon/robot/robot_movement.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm b/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm index a7405883a4..59630186d1 100644 --- a/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm +++ b/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm @@ -14,7 +14,7 @@ . += speed /mob/living/silicon/robot/proc/togglesprint(shutdown = FALSE) //Basically a copypaste of the proc from /mob/living/carbon/human - if(!shutdown && !cansprint && (!cell || cell.charge < 25)) + if(!shutdown && (!cell || cell.charge < 25) || !cansprint) return FALSE sprinting = shutdown ? FALSE : !sprinting if(!resting && canmove)