From 35e19f96a11148446cb865d9450053a4ef10d239 Mon Sep 17 00:00:00 2001 From: InsaneRed Date: Sun, 7 Apr 2024 16:55:30 +0300 Subject: [PATCH 1/7] explosion and damage --- .../xenomorph/strains/castes/ravager/hedgehog.dm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm index e1d6dc583416..e8dca386ed2a 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm @@ -1,6 +1,6 @@ /datum/xeno_strain/hedgehog name = RAVAGER_HEDGEHOG - description = "You lose your empower, charge, scissor cut and some slash damage, for a bit more explosive resistance, immunity to small explosions, and you gain several new abilities that allow you to become a spiky tank. You build up shards internally over time and also when taking damage that increase your armor's resilience. You can use these shards to power three new abilities: Spike Shield, which gives you a temporary shield that spits bone shards around you when damaged, Fire Spikes, which launches spikes at your target that slows them and does extra damage if they move, and finally, Spike Shed, which launches spikes all around yourself and gives you a temporary speed boost as an escape plan at the cost of all your stored shards and being unable to gain shards for thirty seconds." + description = "You lose your empower, charge, scissor cut and some slash damage, for a bit more explosive resistance, your explosion immunity scales with your shard count if you have more then half you get explosion immunity but if you have below half you lose it, and you gain several new abilities that allow you to become a spiky tank. You build up shards internally over time and also when taking damage that increase your armor's resilience. You can use these shards to power three new abilities: Spike Shield, which gives you a temporary shield that spits bone shards around you when damaged, Fire Spikes, which launches spikes at your target that slows them and does extra damage if they move, and finally, Spike Shed, which launches spikes all around yourself and gives you a temporary speed boost as an escape plan at the cost of all your stored shards and being unable to gain shards for thirty seconds." flavor_description = "They will be of iron will and steely muscle. In great armor shall they be clad, and with the mightiest spikes will they be armed." icon_state_prefix = "Hedgehog" @@ -19,9 +19,9 @@ /datum/xeno_strain/hedgehog/apply_strain(mob/living/carbon/xenomorph/ravager/ravager) ravager.plasma_max = 0 - ravager.small_explosives_stun = FALSE + ravager.small_explosives_stun = TRUE ravager.explosivearmor_modifier += XENO_EXPOSIVEARMOR_MOD_SMALL - ravager.damage_modifier -= XENO_DAMAGE_MOD_SMALL + ravager.damage_modifier -= XENO_DAMAGE_MOD_MED ravager.recalculate_everything() @@ -72,7 +72,6 @@ bound_xeno.speed_modifier += shard_lock_speed_mod bound_xeno.recalculate_speed() - shards_locked = FALSE // Return true if we have enough shards, false otherwise @@ -103,6 +102,14 @@ var/percentage_shards = round((shards / max_shards) * 100, 10) if(percentage_shards) holder.overlays += image('icons/mob/hud/hud.dmi', "xenoenergy[percentage_shards]") + + if(percentage_shards >= 50) + bound_xeno.small_explosives_stun = FALSE + return + if(percentage_shards <= 50) + bound_xeno.small_explosives_stun = TRUE + return + return From a586b7af284c08d75b3357681ed2d52083fad89c Mon Sep 17 00:00:00 2001 From: InsaneRed Date: Sun, 7 Apr 2024 17:05:00 +0300 Subject: [PATCH 2/7] damage --- .../living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm index e8dca386ed2a..25cb0c72ed33 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm @@ -21,7 +21,7 @@ ravager.plasma_max = 0 ravager.small_explosives_stun = TRUE ravager.explosivearmor_modifier += XENO_EXPOSIVEARMOR_MOD_SMALL - ravager.damage_modifier -= XENO_DAMAGE_MOD_MED + ravager.damage_modifier -= XENO_DAMAGE_MOD_VERY_SMALL ravager.recalculate_everything() From ae9458fa075a5fae27f97f69a5996035ae2107fd Mon Sep 17 00:00:00 2001 From: InsaneRed <47158596+InsaneRed@users.noreply.github.com> Date: Thu, 11 Apr 2024 16:01:40 +0300 Subject: [PATCH 3/7] Update code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm Co-authored-by: Birdtalon --- .../carbon/xenomorph/strains/castes/ravager/hedgehog.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm index 25cb0c72ed33..f66aee468f89 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm @@ -105,10 +105,8 @@ if(percentage_shards >= 50) bound_xeno.small_explosives_stun = FALSE - return - if(percentage_shards <= 50) + if(percentage_shards < 50) bound_xeno.small_explosives_stun = TRUE - return return From 262be2055b192c83e285e6484e4a8982a0a101df Mon Sep 17 00:00:00 2001 From: InsaneRed Date: Sat, 13 Apr 2024 16:41:47 +0300 Subject: [PATCH 4/7] color --- .../living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm index f66aee468f89..7cc33b9c415c 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm @@ -105,8 +105,11 @@ if(percentage_shards >= 50) bound_xeno.small_explosives_stun = FALSE + bound_xeno.remove_filter("hedge_unstunnable", 1, list("type" = "outline", "color" = "#421313", "size" = 1)) if(percentage_shards < 50) bound_xeno.small_explosives_stun = TRUE + bound_xeno.add_filter("hedge_unstunnable", 1, list("type" = "outline", "color" = "#421313", "size" = 1)) + return From af973ccccfce85534deceede3a0d33d913ce2662 Mon Sep 17 00:00:00 2001 From: InsaneRed <47158596+InsaneRed@users.noreply.github.com> Date: Tue, 16 Apr 2024 22:26:29 +0300 Subject: [PATCH 5/7] Update code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- .../living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm index 7cc33b9c415c..4796e5204093 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm @@ -1,6 +1,6 @@ /datum/xeno_strain/hedgehog name = RAVAGER_HEDGEHOG - description = "You lose your empower, charge, scissor cut and some slash damage, for a bit more explosive resistance, your explosion immunity scales with your shard count if you have more then half you get explosion immunity but if you have below half you lose it, and you gain several new abilities that allow you to become a spiky tank. You build up shards internally over time and also when taking damage that increase your armor's resilience. You can use these shards to power three new abilities: Spike Shield, which gives you a temporary shield that spits bone shards around you when damaged, Fire Spikes, which launches spikes at your target that slows them and does extra damage if they move, and finally, Spike Shed, which launches spikes all around yourself and gives you a temporary speed boost as an escape plan at the cost of all your stored shards and being unable to gain shards for thirty seconds." + description = "You lose your empower, charge, scissor cut, and some slash damage in exchange for more explosive resistance. Your resistance scales with your shard count and at 50% grants you immunity to some explosive stuns. You accumulate shards over time and when taking damage. You can use these shards to power three new abilities: Spike Shield which gives you a temporary shield that spits bone shards around you when damaged; Fire Spikes which launches spikes at your target to slow them and deal damage when they move; and Spike Shed which launches all your spikes, grants a temporary speed boost, and disables shard generation for thirty seconds." flavor_description = "They will be of iron will and steely muscle. In great armor shall they be clad, and with the mightiest spikes will they be armed." icon_state_prefix = "Hedgehog" From 2a896a1ac464a35df774b4204e861b0a4d10b1b2 Mon Sep 17 00:00:00 2001 From: InsaneRed Date: Tue, 16 Apr 2024 23:19:41 +0300 Subject: [PATCH 6/7] changes --- .../carbon/xenomorph/strains/castes/ravager/hedgehog.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm index 4796e5204093..3623e5556f9f 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm @@ -21,7 +21,7 @@ ravager.plasma_max = 0 ravager.small_explosives_stun = TRUE ravager.explosivearmor_modifier += XENO_EXPOSIVEARMOR_MOD_SMALL - ravager.damage_modifier -= XENO_DAMAGE_MOD_VERY_SMALL + ravager.damage_modifier -= XENO_DAMAGE_MOD_SMALL ravager.recalculate_everything() @@ -105,10 +105,10 @@ if(percentage_shards >= 50) bound_xeno.small_explosives_stun = FALSE - bound_xeno.remove_filter("hedge_unstunnable", 1, list("type" = "outline", "color" = "#421313", "size" = 1)) + bound_xeno.add_filter("hedge_unstunnable", 1, list("type" = "outline", "color" = "#421313", "size" = 1)) if(percentage_shards < 50) bound_xeno.small_explosives_stun = TRUE - bound_xeno.add_filter("hedge_unstunnable", 1, list("type" = "outline", "color" = "#421313", "size" = 1)) + bound_xeno.remove_filter("hedge_unstunnable", 1, list("type" = "outline", "color" = "#421313", "size" = 1)) return From 21d9c80056fa7a7353ac892d5f5bc99999cae0d9 Mon Sep 17 00:00:00 2001 From: Drathek <76988376+Drulikar@users.noreply.github.com> Date: Tue, 16 Apr 2024 18:26:32 -0700 Subject: [PATCH 7/7] Update code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm --- .../living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm index 3623e5556f9f..5cb756d8889d 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm @@ -106,7 +106,7 @@ if(percentage_shards >= 50) bound_xeno.small_explosives_stun = FALSE bound_xeno.add_filter("hedge_unstunnable", 1, list("type" = "outline", "color" = "#421313", "size" = 1)) - if(percentage_shards < 50) + else bound_xeno.small_explosives_stun = TRUE bound_xeno.remove_filter("hedge_unstunnable", 1, list("type" = "outline", "color" = "#421313", "size" = 1))