From d6bf1613e2e4a5142dbd4601b15c1835489dfeeb Mon Sep 17 00:00:00 2001 From: Humonitarian Date: Sat, 6 May 2023 16:24:09 +0200 Subject: [PATCH 1/3] Fixes hammer upgrade --- code/__DEFINES/items.dm | 1 + code/game/objects/items/weapons/tools/mods/_upgrades.dm | 7 +++++++ code/game/objects/items/weapons/tools/mods/mod_types.dm | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/items.dm b/code/__DEFINES/items.dm index 48a81ae5729..0f1c315d8fc 100644 --- a/code/__DEFINES/items.dm +++ b/code/__DEFINES/items.dm @@ -10,6 +10,7 @@ #define UPGRADE_FORCE_MOD "force_mod" #define UPGRADE_FUELCOST_MULT "fuelcost_mult" #define UPGRADE_POWERCOST_MULT "powercost_mult" +#define UPGRADE_QUALITY "add_quality" #define UPGRADE_BULK "bulk_mod" diff --git a/code/game/objects/items/weapons/tools/mods/_upgrades.dm b/code/game/objects/items/weapons/tools/mods/_upgrades.dm index 1f885c78dbf..91f59bfb182 100644 --- a/code/game/objects/items/weapons/tools/mods/_upgrades.dm +++ b/code/game/objects/items/weapons/tools/mods/_upgrades.dm @@ -286,6 +286,13 @@ T.use_fuel_cost *= tool_upgrades[UPGRADE_FUELCOST_MULT] if(tool_upgrades[UPGRADE_POWERCOST_MULT]) T.use_power_cost *= tool_upgrades[UPGRADE_POWERCOST_MULT] + if(tool_upgrades[UPGRADE_QUALITY]) + if(toggleable) + T.switched_on_qualities |= UPGRADE_QUALITY + if(switched_on) + T.tool_qualities |= UPGRADE_QUALITY + else + T.tool_qualities |= UPGRADE_QUALITY if(tool_upgrades[UPGRADE_BULK]) T.extra_bulk += tool_upgrades[UPGRADE_BULK] if(tool_upgrades[UPGRADE_HEALTH_THRESHOLD]) diff --git a/code/game/objects/items/weapons/tools/mods/mod_types.dm b/code/game/objects/items/weapons/tools/mods/mod_types.dm index 4650b9d12e7..01a7078e31d 100644 --- a/code/game/objects/items/weapons/tools/mods/mod_types.dm +++ b/code/game/objects/items/weapons/tools/mods/mod_types.dm @@ -590,8 +590,10 @@ I.tool_upgrades = list( UPGRADE_WORKSPEED = -0.1, UPGRADE_HEALTH_THRESHOLD = 5, - tool_qualities = list(QUALITY_HAMMERING = 10) + UPGRADE_QUALITY = list(QUALITY_HAMMERING = 10) ) + I.required_qualities = list(QUALITY_SAWING, QUALITY_SHOVELING, QUALITY_WIRE_CUTTING, QUALITY_BOLT_TURNING) + I.negative_qualities = list(QUALITY_WELDING, QUALITY_HAMMERING) I.prefix = "flattened" //Vastly reduces tool sounds, for stealthy hacking From 7971bf588f25ea8d0f593db6a46c51b2a9241f90 Mon Sep 17 00:00:00 2001 From: Humonitarian Date: Sat, 6 May 2023 16:31:37 +0200 Subject: [PATCH 2/3] Typo --- code/game/objects/items/weapons/tools/mods/_upgrades.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/tools/mods/_upgrades.dm b/code/game/objects/items/weapons/tools/mods/_upgrades.dm index 91f59bfb182..a67684ac148 100644 --- a/code/game/objects/items/weapons/tools/mods/_upgrades.dm +++ b/code/game/objects/items/weapons/tools/mods/_upgrades.dm @@ -287,7 +287,7 @@ if(tool_upgrades[UPGRADE_POWERCOST_MULT]) T.use_power_cost *= tool_upgrades[UPGRADE_POWERCOST_MULT] if(tool_upgrades[UPGRADE_QUALITY]) - if(toggleable) + if(T.toggleable) T.switched_on_qualities |= UPGRADE_QUALITY if(switched_on) T.tool_qualities |= UPGRADE_QUALITY From 0c9f1bdd24beece6c1d61709e5ba78563b02881b Mon Sep 17 00:00:00 2001 From: Humonitarian Date: Sat, 6 May 2023 16:45:02 +0200 Subject: [PATCH 3/3] same as above --- code/game/objects/items/weapons/tools/mods/_upgrades.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/tools/mods/_upgrades.dm b/code/game/objects/items/weapons/tools/mods/_upgrades.dm index a67684ac148..ed1065c24b0 100644 --- a/code/game/objects/items/weapons/tools/mods/_upgrades.dm +++ b/code/game/objects/items/weapons/tools/mods/_upgrades.dm @@ -289,7 +289,7 @@ if(tool_upgrades[UPGRADE_QUALITY]) if(T.toggleable) T.switched_on_qualities |= UPGRADE_QUALITY - if(switched_on) + if(T.switched_on) T.tool_qualities |= UPGRADE_QUALITY else T.tool_qualities |= UPGRADE_QUALITY