From e621f98261032d320adb90b924ee632c1569fd3b Mon Sep 17 00:00:00 2001 From: vincibrv Date: Sun, 16 Jun 2024 12:12:08 +0200 Subject: [PATCH 1/6] makes xenos take damage when patting fire on ground --- code/_onclick/xeno.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/_onclick/xeno.dm b/code/_onclick/xeno.dm index 453539ff1c3f..6619b71ae68e 100644 --- a/code/_onclick/xeno.dm +++ b/code/_onclick/xeno.dm @@ -54,6 +54,8 @@ var/turf/target_turf = target for(var/obj/flamer_fire/fire in target_turf) firepatted = TRUE + if(!(src.fire_immunity & FIRE_IMMUNITY_NO_DAMAGE)) + src.apply_damage(fire.burnlevel, BURN,fire) if((fire.firelevel > fire_level_to_extinguish) && (!fire.fire_variant)) //If fire_variant = 0, default fire extinguish behavior. fire.firelevel -= fire_level_to_extinguish fire.update_flame() From 5e94ec40b5c709da3a0fc9c689e44b8e5ce01d02 Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Sun, 16 Jun 2024 20:27:22 +0200 Subject: [PATCH 2/6] Update code/_onclick/xeno.dm Co-authored-by: kiVts <48099872+kiVts@users.noreply.github.com> --- code/_onclick/xeno.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_onclick/xeno.dm b/code/_onclick/xeno.dm index 6619b71ae68e..546dddb915f4 100644 --- a/code/_onclick/xeno.dm +++ b/code/_onclick/xeno.dm @@ -55,7 +55,7 @@ for(var/obj/flamer_fire/fire in target_turf) firepatted = TRUE if(!(src.fire_immunity & FIRE_IMMUNITY_NO_DAMAGE)) - src.apply_damage(fire.burnlevel, BURN,fire) + apply_damage(fire.burnlevel, BURN,fire) if((fire.firelevel > fire_level_to_extinguish) && (!fire.fire_variant)) //If fire_variant = 0, default fire extinguish behavior. fire.firelevel -= fire_level_to_extinguish fire.update_flame() From c94ded31e4a558af876b4fb0928e6aeb9892cac7 Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Sun, 16 Jun 2024 20:27:55 +0200 Subject: [PATCH 3/6] Update code/_onclick/xeno.dm Co-authored-by: kiVts <48099872+kiVts@users.noreply.github.com> --- code/_onclick/xeno.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_onclick/xeno.dm b/code/_onclick/xeno.dm index 546dddb915f4..8c5b84e9ebfc 100644 --- a/code/_onclick/xeno.dm +++ b/code/_onclick/xeno.dm @@ -54,7 +54,7 @@ var/turf/target_turf = target for(var/obj/flamer_fire/fire in target_turf) firepatted = TRUE - if(!(src.fire_immunity & FIRE_IMMUNITY_NO_DAMAGE)) + if(!(caste.fire_immunity & FIRE_IMMUNITY_NO_DAMAGE) || fire.tied_reagent.fire_penetrating) apply_damage(fire.burnlevel, BURN,fire) if((fire.firelevel > fire_level_to_extinguish) && (!fire.fire_variant)) //If fire_variant = 0, default fire extinguish behavior. fire.firelevel -= fire_level_to_extinguish From c2435e9ae552f195fda2a19cd458702ba3ca54f6 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Wed, 19 Jun 2024 20:50:11 +0200 Subject: [PATCH 4/6] halves the damage --- code/_onclick/xeno.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/_onclick/xeno.dm b/code/_onclick/xeno.dm index 6619b71ae68e..3304df7333d4 100644 --- a/code/_onclick/xeno.dm +++ b/code/_onclick/xeno.dm @@ -54,8 +54,8 @@ var/turf/target_turf = target for(var/obj/flamer_fire/fire in target_turf) firepatted = TRUE - if(!(src.fire_immunity & FIRE_IMMUNITY_NO_DAMAGE)) - src.apply_damage(fire.burnlevel, BURN,fire) + if(!(caste.fire_immunity & FIRE_IMMUNITY_NO_DAMAGE) || fire.tied_reagent.fire_penetrating) + apply_damage(fire.burnlevel/2, BURN,fire) if((fire.firelevel > fire_level_to_extinguish) && (!fire.fire_variant)) //If fire_variant = 0, default fire extinguish behavior. fire.firelevel -= fire_level_to_extinguish fire.update_flame() From dab978b2f16186b0028166b08e9af0ac989a45f7 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Wed, 19 Jun 2024 21:04:42 +0200 Subject: [PATCH 5/6] adds forward compatability with check_fire_intensity_resistance() --- code/_onclick/xeno.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_onclick/xeno.dm b/code/_onclick/xeno.dm index 3304df7333d4..e9828ed264ec 100644 --- a/code/_onclick/xeno.dm +++ b/code/_onclick/xeno.dm @@ -55,7 +55,7 @@ for(var/obj/flamer_fire/fire in target_turf) firepatted = TRUE if(!(caste.fire_immunity & FIRE_IMMUNITY_NO_DAMAGE) || fire.tied_reagent.fire_penetrating) - apply_damage(fire.burnlevel/2, BURN,fire) + apply_damage(max(fire.burnlevel/2-check_fire_intensity_resistance() , 0), BURN,fire) if((fire.firelevel > fire_level_to_extinguish) && (!fire.fire_variant)) //If fire_variant = 0, default fire extinguish behavior. fire.firelevel -= fire_level_to_extinguish fire.update_flame() From d3e8a40d79232f3d953e59c5fcb36745c86a09e0 Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Thu, 20 Jun 2024 08:23:40 +0200 Subject: [PATCH 6/6] Update code/_onclick/xeno.dm Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/_onclick/xeno.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/_onclick/xeno.dm b/code/_onclick/xeno.dm index e9828ed264ec..4c56e652b11d 100644 --- a/code/_onclick/xeno.dm +++ b/code/_onclick/xeno.dm @@ -54,8 +54,9 @@ var/turf/target_turf = target for(var/obj/flamer_fire/fire in target_turf) firepatted = TRUE - if(!(caste.fire_immunity & FIRE_IMMUNITY_NO_DAMAGE) || fire.tied_reagent.fire_penetrating) - apply_damage(max(fire.burnlevel/2-check_fire_intensity_resistance() , 0), BURN,fire) + if(!(caste.fire_immunity & FIRE_IMMUNITY_NO_DAMAGE) || fire.tied_reagent?.fire_penetrating) + var/firedamage = max(fire.burnlevel - check_fire_intensity_resistance(), 0) * 0.5 + apply_damage(firedamage, BURN, fire) if((fire.firelevel > fire_level_to_extinguish) && (!fire.fire_variant)) //If fire_variant = 0, default fire extinguish behavior. fire.firelevel -= fire_level_to_extinguish fire.update_flame()