From 52cc8f9d0698a7336f6cd7302b6b081e699de00d Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Thu, 18 Apr 2024 10:40:00 +0300 Subject: [PATCH] Re-enables borg resizing for Tall/Wide with more aggressive limits (#1687) (#2944) * 1 * nomod nomore Co-authored-by: Zergspower --- code/game/objects/items/robot/robot_upgrades.dm | 14 ++++++-------- .../code/modules/research/techweb/all_nodes.dm | 1 + modular_nova/modules/borgs/code/robot_upgrade.dm | 3 +-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 3ea58c4517c..264e039dfe1 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -555,14 +555,12 @@ to_chat(usr, span_warning("This unit already has an expand module installed!")) return FALSE // NOVA EDIT BEGIN - if(robot.model.model_select_icon == "nomod") - to_chat(usr, span_warning("Default models cannot take expand or shrink upgrades.")) - return FALSE - if((TRAIT_R_WIDE in robot.model.model_features) || (TRAIT_R_TALL in robot.model.model_features)) - to_chat(usr, span_warning("This unit's chassis cannot be enlarged any further.")) - return FALSE + var/resize_amount = 1.25 + if(TRAIT_R_WIDE in robot.model.model_features) + resize_amount = 1.25 + if(TRAIT_R_TALL in robot.model.model_features) + resize_amount = 1.05 // NOVA EDIT END - ADD_TRAIT(robot, TRAIT_NO_TRANSFORM, REF(src)) var/prev_lockcharge = robot.lockcharge robot.SetLockdown(TRUE) @@ -579,7 +577,7 @@ robot.set_anchored(FALSE) REMOVE_TRAIT(robot, TRAIT_NO_TRANSFORM, REF(src)) robot.hasExpanded = TRUE - robot.update_transform(1.5) // NOVA EDIT CHANGE - ORIGINAL: robot.update_transform(2) + robot.update_transform(resize_amount) // NOVA EDIT CHANGE - ORIGINAL: robot.update_transform(2) /obj/item/borg/upgrade/expand/deactivate(mob/living/silicon/robot/R, user = usr) . = ..() diff --git a/modular_nova/master_files/code/modules/research/techweb/all_nodes.dm b/modular_nova/master_files/code/modules/research/techweb/all_nodes.dm index 725f55c64ad..e0b805baf52 100644 --- a/modular_nova/master_files/code/modules/research/techweb/all_nodes.dm +++ b/modular_nova/master_files/code/modules/research/techweb/all_nodes.dm @@ -232,6 +232,7 @@ design_ids += list( "borg_upgrade_clamp", "borg_upgrade_brush", + "borg_upgrade_shrink", ) return ..() diff --git a/modular_nova/modules/borgs/code/robot_upgrade.dm b/modular_nova/modules/borgs/code/robot_upgrade.dm index e275b6889d1..9a51254472f 100644 --- a/modular_nova/modules/borgs/code/robot_upgrade.dm +++ b/modular_nova/modules/borgs/code/robot_upgrade.dm @@ -412,7 +412,6 @@ if(TRAIT_R_SMALL in borg.model.model_features) to_chat(usr, span_warning("This unit's chassis cannot be shrunk any further.")) return FALSE - borg.hasShrunk = TRUE ADD_TRAIT(borg, TRAIT_NO_TRANSFORM, REF(src)) var/prev_lockcharge = borg.lockcharge @@ -429,7 +428,7 @@ borg.SetLockdown(FALSE) borg.set_anchored(FALSE) REMOVE_TRAIT(borg, TRAIT_NO_TRANSFORM, REF(src)) - borg.update_transform(0.75) + borg.update_transform(0.90) /obj/item/borg/upgrade/shrink/deactivate(mob/living/silicon/robot/borg, user = usr) . = ..()