From 62ce2001c2400e96de78255ba1360d6be540cde5 Mon Sep 17 00:00:00 2001 From: Superlagg Date: Wed, 12 Jul 2023 14:26:56 -0700 Subject: [PATCH 1/3] power armor super salty nerfs --- code/datums/martial/sleeping_carp.dm | 2 + code/modules/clothing/suits/arfsuits.dm | 56 +++++++++++++++++++++--- sound/effects/bworp.ogg | Bin 0 -> 4362 bytes sound/effects/electric_hiss.ogg | Bin 0 -> 6575 bytes sound/weapons/bullet_ricochet_1.ogg | Bin 0 -> 5816 bytes sound/weapons/bullet_ricochet_2.ogg | Bin 0 -> 5421 bytes sound/weapons/metal_clank.ogg | Bin 0 -> 4639 bytes 7 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 sound/effects/bworp.ogg create mode 100644 sound/effects/electric_hiss.ogg create mode 100644 sound/weapons/bullet_ricochet_1.ogg create mode 100644 sound/weapons/bullet_ricochet_2.ogg create mode 100644 sound/weapons/metal_clank.ogg diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index b738afdcccd..2b9bfd9d097 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -119,6 +119,8 @@ */ /datum/martial_art/the_sleeping_carp/on_projectile_hit(mob/living/carbon/human/A, obj/item/projectile/P, def_zone) . = ..() + if(P.hitscan && prob(50)) + return BULLET_ACT_HIT //AKTUALLY U CANNOT DEFLECT HITSKANS UNLESS UWrE A NINJA ADNJ EVEN THEN ITS A 50% CHANCE if(A.incapacitated(FALSE, TRUE)) //NO STUN return BULLET_ACT_HIT if(!CHECK_ALL_MOBILITY(A, MOBILITY_USE|MOBILITY_STAND)) //NO UNABLE TO USE, NO DEFLECTION ON THE FLOOR diff --git a/code/modules/clothing/suits/arfsuits.dm b/code/modules/clothing/suits/arfsuits.dm index aeb84e8a611..ccc3c74a7b4 100644 --- a/code/modules/clothing/suits/arfsuits.dm +++ b/code/modules/clothing/suits/arfsuits.dm @@ -3107,7 +3107,7 @@ /// How much slowdown is added when suit is unpowered var/unpowered_slowdown = 3 /// Projectiles below this damage will get deflected - var/deflect_damage = 18 + var/deflect_damage = BULLET_DAMAGE_PISTOL_10MM /// If TRUE - it requires PA training trait to be worn var/requires_training = TRUE /// If TRUE - the suit will give its user specific traits when worn @@ -3118,6 +3118,10 @@ var/obj/item/salvaged_type = null /// Used to track next tool required to salvage the suit var/salvage_step = 0 + var/deflecting = TRUE + COOLDOWN_DECLARE(emp_cooldown) + COOLDOWN_DECLARE(deflect_cd) + var/deflect_cooldown = 0.5 SECONDS slowdown = ARMOR_SLOWDOWN_PA * ARMOR_SLOWDOWN_GLOBAL_MULT armor = ARMOR_VALUE_PA armor_tier_desc = ARMOR_CLOTHING_PA @@ -3321,6 +3325,17 @@ toggle_cell(user) return +/obj/item/clothing/suit/armor/power_armor/CtrlShiftClick(mob/user) + if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user))) + return ..() + if(!COOLDOWN_FINISHED(src, emp_cooldown)) + to_chat(user, span_warning("Deflector shields still respooling!")) + TOGGLE_VAR(deflecting) + if(deflecting) + to_chat(user, span_notice("You activate the suit's deflector shield.")) + else + to_chat(user, span_alert("You deactivate the suit's deflector shield.")) + /obj/item/clothing/suit/armor/power_armor/proc/toggle_cell(mob/living/user) if(cell) user.visible_message(span_notice("[user] removes \the [cell] from [src]!"), \ @@ -3358,6 +3373,11 @@ . = ..() if(. & EMP_PROTECT_SELF) return + if(deflecting) + deflecting = FALSE + to_chat(owner, span_alert("Deflector shield overloaded!")) + playsound(get_turf(src), "sound/effects/electric_hiss.ogg", 100, TRUE) + COOLDOWN_START(src, emp_cooldown, 30 SECONDS) if(!powered) return if(cell) @@ -3387,11 +3407,30 @@ L.update_equipment_speed_mods() /obj/item/clothing/suit/armor/power_armor/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return) - if((attack_type == ATTACK_TYPE_PROJECTILE) && (def_zone in protected_zones)) - if(prob(70) && (damage < deflect_damage) && (armour_penetration <= 0)) // Weak projectiles like shrapnel get deflected - block_return[BLOCK_RETURN_REDIRECT_METHOD] = REDIRECT_METHOD_DEFLECT - return BLOCK_SHOULD_REDIRECT | BLOCK_REDIRECTED | BLOCK_SUCCESS | BLOCK_PHYSICAL_INTERNAL - return ..() + if(!COOLDOWN_FINISHED(src, deflect_cooldown)) + return ..() + if(!deflecting) + return ..() + if(attack_type != ATTACK_TYPE_PROJECTILE) + return ..() + if(!(def_zone in protected_zones)) + return ..() + if(!powered || !cell || cell.charge <= 0) + return ..() + if(damage > deflect_damage) + return ..() + if(armour_penetration > 0) + return ..() + block_return[BLOCK_RETURN_REDIRECT_METHOD] = REDIRECT_METHOD_DEFLECT + cell.use(round(cell.maxcharge * (rand(1, damage) * 0.005), 10)) + do_sparks(2, FALSE, owner) + SSrecoil.kickback(owner, recoil_in = 10) + var/soundplay = pick("sound/weapons/bullet_ricochet_1.ogg", "sound/weapons/bullet_ricochet_2.ogg") + playsound(get_turf(src), soundplay, 100, TRUE) + playsound(get_turf(src), "sound/weapons/metal_clank.ogg", 100, TRUE) + playsound(get_turf(src), "sound/effects/bworp.ogg", 75, TRUE) + COOLDOWN_START(src, deflect_cd, deflect_cooldown) + return BLOCK_SHOULD_REDIRECT | BLOCK_REDIRECTED | BLOCK_SUCCESS | BLOCK_PHYSICAL_INTERNAL /obj/item/clothing/suit/armor/power_armor/t45b name = "Refurbished T-45b power armor" @@ -3402,6 +3441,11 @@ 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/debug_pa + name = "Debug T-45b power armor" + desc = "Its comfy and easy to wear!" + requires_training = FALSE + /obj/item/clothing/suit/armor/power_armor/t45b/raider name = "powered scrap suit" 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???" diff --git a/sound/effects/bworp.ogg b/sound/effects/bworp.ogg new file mode 100644 index 0000000000000000000000000000000000000000..721bca434a52bc01cd2acb9de7a2131f6b7a40a6 GIT binary patch literal 4362 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 literal 0 HcmV?d00001 diff --git a/sound/effects/electric_hiss.ogg b/sound/effects/electric_hiss.ogg new file mode 100644 index 0000000000000000000000000000000000000000..afa8049ce0b418cb4095d1d044686d23778835ad GIT binary patch literal 6575 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 M_G~51lOneL2RgC#6951J literal 0 HcmV?d00001 diff --git a/sound/weapons/bullet_ricochet_1.ogg b/sound/weapons/bullet_ricochet_1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e237903ed9afe0955d967ad01ad15bc3671a5c39 GIT binary patch literal 5816 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 O5(9;tjJnNW4fq?9r)D7l literal 0 HcmV?d00001 diff --git a/sound/weapons/bullet_ricochet_2.ogg b/sound/weapons/bullet_ricochet_2.ogg new file mode 100644 index 0000000000000000000000000000000000000000..8fb6059f21495180fbad58e1df6e7a5a7044da4b GIT binary patch literal 5421 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 literal 0 HcmV?d00001 From 95424bdda9bc208914bd0a0e46b81885f8e9a7d9 Mon Sep 17 00:00:00 2001 From: Superlagg Date: Wed, 12 Jul 2023 14:29:54 -0700 Subject: [PATCH 2/3] bit more reasonable salt --- code/modules/clothing/suits/arfsuits.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/suits/arfsuits.dm b/code/modules/clothing/suits/arfsuits.dm index ccc3c74a7b4..367a959a8fe 100644 --- a/code/modules/clothing/suits/arfsuits.dm +++ b/code/modules/clothing/suits/arfsuits.dm @@ -3422,7 +3422,7 @@ if(armour_penetration > 0) return ..() block_return[BLOCK_RETURN_REDIRECT_METHOD] = REDIRECT_METHOD_DEFLECT - cell.use(round(cell.maxcharge * (rand(1, damage) * 0.005), 10)) + cell.use(round(rand(1, damage*15), 10)) // A normal capacity cell gets 30ish shots on average do_sparks(2, FALSE, owner) SSrecoil.kickback(owner, recoil_in = 10) var/soundplay = pick("sound/weapons/bullet_ricochet_1.ogg", "sound/weapons/bullet_ricochet_2.ogg") From 6141118c4d084376117569023c7df48e81fe07c4 Mon Sep 17 00:00:00 2001 From: Superlagg Date: Wed, 12 Jul 2023 14:37:50 -0700 Subject: [PATCH 3/3] examine me --- code/modules/clothing/suits/arfsuits.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/clothing/suits/arfsuits.dm b/code/modules/clothing/suits/arfsuits.dm index 367a959a8fe..500063fd889 100644 --- a/code/modules/clothing/suits/arfsuits.dm +++ b/code/modules/clothing/suits/arfsuits.dm @@ -3353,6 +3353,12 @@ . += "The power meter shows [round(cell.percent(), 0.1)]% charge remaining." else . += "The power cell slot is currently empty." + if(deflecting && powered && cell) + . += "The deflector shield is currently active." + else if(!COOLDOWN_FINISHED(src, emp_cooldown)) + . += "The deflector shield is respooling!" + else + . += "The deflector shield is currently inactive." if(ispath(salvaged_type)) . += salvage_hint()