From ab975a29fb3c6b036f72504d822e2b1c32decf44 Mon Sep 17 00:00:00 2001 From: ihatethisengine <115417687+ihatethisengine@users.noreply.github.com> Date: Sun, 21 Jul 2024 11:05:45 +0300 Subject: [PATCH 1/5] Update ammo.dm --- code/datums/ammo/ammo.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/datums/ammo/ammo.dm b/code/datums/ammo/ammo.dm index a59290ab5f51..596bc17b52e9 100644 --- a/code/datums/ammo/ammo.dm +++ b/code/datums/ammo/ammo.dm @@ -173,6 +173,8 @@ living_mob.apply_stamina_damage(fired_projectile.ammo.damage, fired_projectile.def_zone, ARMOR_BULLET) /datum/ammo/proc/slowdown(mob/living/living_mob, obj/projectile/fired_projectile) + if(living_mob.mob_size >= MOB_SIZE_BIG) + return //Big mobs are not affected. if(iscarbonsizexeno(living_mob)) var/mob/living/carbon/xenomorph/target = living_mob target.apply_effect(1, SUPERSLOW) From 1bd7fd93315f79642f15ad1d3ecb505e661ddf45 Mon Sep 17 00:00:00 2001 From: ihatethisengine <115417687+ihatethisengine@users.noreply.github.com> Date: Sun, 21 Jul 2024 11:13:34 +0300 Subject: [PATCH 2/5] Update code/datums/ammo/ammo.dm --- code/datums/ammo/ammo.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/ammo/ammo.dm b/code/datums/ammo/ammo.dm index 596bc17b52e9..3b26484c915e 100644 --- a/code/datums/ammo/ammo.dm +++ b/code/datums/ammo/ammo.dm @@ -174,7 +174,7 @@ /datum/ammo/proc/slowdown(mob/living/living_mob, obj/projectile/fired_projectile) if(living_mob.mob_size >= MOB_SIZE_BIG) - return //Big mobs are not affected. + return //Big mobs are not affected. if(iscarbonsizexeno(living_mob)) var/mob/living/carbon/xenomorph/target = living_mob target.apply_effect(1, SUPERSLOW) From a217d21edc596f16c4db01808b8ad3590a1a7de4 Mon Sep 17 00:00:00 2001 From: ihatethisengine <115417687+ihatethisengine@users.noreply.github.com> Date: Tue, 30 Jul 2024 08:38:39 +0300 Subject: [PATCH 3/5] webedit --- code/datums/ammo/ammo.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/datums/ammo/ammo.dm b/code/datums/ammo/ammo.dm index 3b26484c915e..82a43c504b70 100644 --- a/code/datums/ammo/ammo.dm +++ b/code/datums/ammo/ammo.dm @@ -173,8 +173,10 @@ living_mob.apply_stamina_damage(fired_projectile.ammo.damage, fired_projectile.def_zone, ARMOR_BULLET) /datum/ammo/proc/slowdown(mob/living/living_mob, obj/projectile/fired_projectile) - if(living_mob.mob_size >= MOB_SIZE_BIG) - return //Big mobs are not affected. + if(isxeno(living_mob)) + var/mob/living/carbon/xenomorph/xeno = living_mob + if(xeno.caste.tier > 2) + return //tier 3 are not affected if(iscarbonsizexeno(living_mob)) var/mob/living/carbon/xenomorph/target = living_mob target.apply_effect(1, SUPERSLOW) From d8ae6515584cbdde3d6d655a49b3068c3338668a Mon Sep 17 00:00:00 2001 From: ihatethisengine <115417687+ihatethisengine@users.noreply.github.com> Date: Tue, 30 Jul 2024 08:40:25 +0300 Subject: [PATCH 4/5] Update code/datums/ammo/ammo.dm --- code/datums/ammo/ammo.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/ammo/ammo.dm b/code/datums/ammo/ammo.dm index 82a43c504b70..c29a96c02a86 100644 --- a/code/datums/ammo/ammo.dm +++ b/code/datums/ammo/ammo.dm @@ -176,7 +176,7 @@ if(isxeno(living_mob)) var/mob/living/carbon/xenomorph/xeno = living_mob if(xeno.caste.tier > 2) - return //tier 3 are not affected + return //tier 3 are not affected if(iscarbonsizexeno(living_mob)) var/mob/living/carbon/xenomorph/target = living_mob target.apply_effect(1, SUPERSLOW) From c4c73694d35c4d9a6c45393fdafca3f24fc543cc Mon Sep 17 00:00:00 2001 From: ihatethisengine <115417687+ihatethisengine@users.noreply.github.com> Date: Wed, 31 Jul 2024 07:12:23 +0300 Subject: [PATCH 5/5] Update code/datums/ammo/ammo.dm --- code/datums/ammo/ammo.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/ammo/ammo.dm b/code/datums/ammo/ammo.dm index c29a96c02a86..f2a7dc8ffc81 100644 --- a/code/datums/ammo/ammo.dm +++ b/code/datums/ammo/ammo.dm @@ -175,8 +175,8 @@ /datum/ammo/proc/slowdown(mob/living/living_mob, obj/projectile/fired_projectile) if(isxeno(living_mob)) var/mob/living/carbon/xenomorph/xeno = living_mob - if(xeno.caste.tier > 2) - return //tier 3 are not affected + if(xeno.caste.tier > 2 || (xeno.caste.tier == 0 && xeno.mob_size >= MOB_SIZE_BIG)) + return //tier 3 and big tier 0 (like queen) are not affected if(iscarbonsizexeno(living_mob)) var/mob/living/carbon/xenomorph/target = living_mob target.apply_effect(1, SUPERSLOW)