From 8d59f9e1e09391e655440dc32ce72ac7fd41c99d Mon Sep 17 00:00:00 2001 From: Yawet330 <65188584+Yawet330@users.noreply.github.com> Date: Thu, 13 May 2021 14:35:56 +0100 Subject: [PATCH] [NONMODULAR]Venus Humantraps are no longer capable of immortality (#5647) * You forced my hand, again. * Update venus_human_trap.dm * Update venus_human_trap.dm * Update venus_human_trap.dm Co-authored-by: Yawet330 --- .../mob/living/simple_animal/hostile/venus_human_trap.dm | 4 ++-- modular_skyrat/master_files/code/modules/events/spacevine.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm index a3faf393989..01da642cb6f 100644 --- a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm +++ b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm @@ -134,7 +134,7 @@ /// The maximum amount of vines a plant can have at one time var/max_vines = 4 /// How far away a plant can attach a vine to something - var/vine_grab_distance = 5 + var/vine_grab_distance = 4 //SKYRAT EDIT - Original 5 /// Whether or not this plant is ghost possessable var/playable_plant = TRUE @@ -174,7 +174,7 @@ vines += newVine if(isliving(the_target)) var/mob/living/L = the_target - L.Paralyze(20) + L.Knockdown(2 SECONDS) //Skyrat EDIT - Removes hardstun, bye! ranged_cooldown = world.time + ranged_cooldown_time /mob/living/simple_animal/hostile/venus_human_trap/Login() diff --git a/modular_skyrat/master_files/code/modules/events/spacevine.dm b/modular_skyrat/master_files/code/modules/events/spacevine.dm index 8ed8c25b473..374a3acd3b5 100644 --- a/modular_skyrat/master_files/code/modules/events/spacevine.dm +++ b/modular_skyrat/master_files/code/modules/events/spacevine.dm @@ -578,11 +578,11 @@ return for(var/datum/spacevine_mutation/SM in mutations) SM.on_cross(src, AM) - if(istype(AM, /mob/living/simple_animal/hostile/venus_human_trap)) //skyrat change: vines heal flytraps 10% on cross + if(istype(AM, /mob/living/simple_animal/hostile/venus_human_trap)) //SKYRAT CHANGE - Vines now heal less. Again. Stop forcing our hand by abusing on_entered. var/mob/living/simple_animal/hostile/venus_human_trap/VS = AM if(VS.health >= VS.maxHealth) return - VS.adjustHealth(-clamp(VS.health += 5, 0, VS.maxHealth), TRUE, TRUE) + VS.adjustHealth(-clamp(VS.health += 2, 0, VS.maxHealth), TRUE, TRUE) to_chat(VS, "The vines attempt to regenerate some of your wounds!") return