From 8b50fa9aef10b99dd64ae3b5d4d869342bd53b63 Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Sat, 11 Apr 2026 09:39:46 -0700 Subject: [PATCH] fixes cyborg omnitool upgrade doing nothing (#95597) ## About The Pull Request somehow no one has noticed this. currently all this does is give medborgs TRAIT_FASTMED and adv. health analyzer, and nothing else for it or for engiborg. ## Why It's Good For The Game HAHAHA I LOVE POWERCREEPING CYBORGS!!!!! --- code/game/objects/items/robot/items/tools.dm | 7 +++++-- code/game/objects/items/robot/robot_upgrades.dm | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/robot/items/tools.dm b/code/game/objects/items/robot/items/tools.dm index 460e4bef7f2..41e73a1bf79 100644 --- a/code/game/objects/items/robot/items/tools.dm +++ b/code/game/objects/items/robot/items/tools.dm @@ -241,6 +241,7 @@ tool.item_flags |= ABSTRACT ADD_TRAIT(tool, TRAIT_NODROP, INNATE_TRAIT) atoms[reference] = tool + tool.toolspeed = initial(tool.toolspeed) - upgraded * 0.3 //and finally assign the upgraded toolspeed, if any. return tool /obj/item/borg/cyborg_omnitool/attack_self(mob/user) @@ -283,8 +284,10 @@ * * upgrade - TRUE/FALSE for upgraded */ /obj/item/borg/cyborg_omnitool/proc/set_upgraded(upgrade) - upgraded = upgraded - + upgraded = upgrade + for(var/obj/item/tool_path as anything in atoms) + var/obj/item/tool = atoms[tool_path] + tool.toolspeed = initial(tool.toolspeed) - upgraded * 0.3 playsound(src, 'sound/items/tools/change_jaws.ogg', 50, TRUE) /obj/item/borg/cyborg_omnitool/medical diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 986a6f6baf6..b5f2d7b78ce 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -493,6 +493,8 @@ return FALSE for(var/obj/item/borg/cyborg_omnitool/engineering/omnitool in cyborg.model.modules) omnitool.set_upgraded(TRUE) + for(var/obj/item/weldingtool/largetank/cyborg/welder in cyborg.model.modules) + welder.toolspeed = initial(welder.toolspeed) - 0.3 /obj/item/borg/upgrade/engineering_omnitool/deactivate(mob/living/silicon/robot/cyborg, mob/living/user = usr) . = ..() @@ -500,6 +502,8 @@ return . for(var/obj/item/borg/cyborg_omnitool/omnitool in cyborg.model.modules) omnitool.set_upgraded(FALSE) + for(var/obj/item/weldingtool/largetank/cyborg/welder in cyborg.model.modules) + welder.toolspeed = initial(welder.toolspeed) /obj/item/borg/upgrade/defib name = "medical cyborg defibrillator"