From a3d5417ee9e1060348faab28d3c8cffd1442fd5e Mon Sep 17 00:00:00 2001 From: RinPin <89030906+RinPin@users.noreply.github.com> Date: Mon, 3 Jul 2023 01:54:22 -0300 Subject: [PATCH 1/2] adds new speed for refurbished armor + nerfs powered scrap armor --- code/__DEFINES/armor.dm | 8 ++++++++ code/modules/clothing/head/f13heavy_helmets.dm | 3 ++- code/modules/clothing/suits/arfsuits.dm | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/armor.dm b/code/__DEFINES/armor.dm index 5e1af39af02..409cdd38f6b 100644 --- a/code/__DEFINES/armor.dm +++ b/code/__DEFINES/armor.dm @@ -951,6 +951,14 @@ GLOBAL_LIST_INIT(armor_token_operation_legend, list( */ #define ARMOR_SLOWDOWN_SALVAGE 2 + +/* + * Refurbished Power Armor + * Basically driving a crappy car +*/ +#define ARMOR_SLOWDOWN_REPA 1.2 + + /* * Power Armor * Basically driving a car diff --git a/code/modules/clothing/head/f13heavy_helmets.dm b/code/modules/clothing/head/f13heavy_helmets.dm index d9ee1fd1e1c..a3baeadb80d 100644 --- a/code/modules/clothing/head/f13heavy_helmets.dm +++ b/code/modules/clothing/head/f13heavy_helmets.dm @@ -20,7 +20,8 @@ desc = "a raider's attempt to duplicate a power armor helmet. The result is a fuzed mass of metal and ceramic that nonetheless provides protection" icon_state = "raiderpa_helm" item_state = "raiderpa_helm" - + armor = ARMOR_VALUE_SALVAGE + slowdown = ARMOR_SLOWDOWN_REPA * ARMOR_SLOWDOWN_GLOBAL_MULT /obj/item/clothing/head/helmet/f13/heavy/salvaged_pa/t45b/ncr name = "ncr salvaged T-45b helmet" desc = "It's an NCR salvaged T-45b power armor helmet, better repaired than regular salvaged PA, and decorated with the NCR flag and other markings for an NCR Heavy Trooper." diff --git a/code/modules/clothing/suits/arfsuits.dm b/code/modules/clothing/suits/arfsuits.dm index 9bc783f640e..a20394c5eff 100644 --- a/code/modules/clothing/suits/arfsuits.dm +++ b/code/modules/clothing/suits/arfsuits.dm @@ -3399,7 +3399,7 @@ icon_state = "t45bpowerarmor" item_state = "t45bpowerarmor" armor = ARMOR_VALUE_SALVAGE - slowdown = ARMOR_SLOWDOWN_SALVAGE * ARMOR_SLOWDOWN_GLOBAL_MULT + slowdown = ARMOR_SLOWDOWN_REPA * ARMOR_SLOWDOWN_GLOBAL_MULT salvaged_type = /obj/item/clothing/suit/armor/heavy/salvaged_pa/t45b /obj/item/clothing/suit/armor/power_armor/t45b/raider @@ -3407,6 +3407,8 @@ desc = "A monumentously heavy suit of rusty metal and car parts. Either an actual power armor exoskeleton or some home-built substitute sits embedded under all that rust. Is this some attempt at power armor???" icon_state = "raiderpa" item_state = "raiderpa" + armor = ARMOR_VALUE_SALVAGE + slowdown = ARMOR_SLOWDOWN_REPA * ARMOR_SLOWDOWN_GLOBAL_MULT mutantrace_variation = STYLE_DIGITIGRADE salvaged_type = /obj/item/clothing/suit/armor/medium/raider/raidermetal From b4d97ad2fcabb268025d9be626858d3c4731a381 Mon Sep 17 00:00:00 2001 From: Superlagg Date: Mon, 3 Jul 2023 10:38:45 -0700 Subject: [PATCH 2/2] Update armor.dm --- code/__DEFINES/armor.dm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/__DEFINES/armor.dm b/code/__DEFINES/armor.dm index 710c15c2b34..eb37363cafa 100644 --- a/code/__DEFINES/armor.dm +++ b/code/__DEFINES/armor.dm @@ -951,14 +951,6 @@ GLOBAL_LIST_INIT(armor_token_operation_legend, list( */ #define ARMOR_SLOWDOWN_SALVAGE 2 - -/* - * Refurbished Power Armor - * Basically driving a crappy car -*/ -#define ARMOR_SLOWDOWN_REPA 1.2 - - /* * Refurbished Power Armor * Basically driving a crappy car