From 2673025daae657228377c87f62ae89bbc18fdf9c Mon Sep 17 00:00:00 2001 From: killer653 Date: Sun, 15 Oct 2017 11:30:19 -0400 Subject: [PATCH] Removes halloss, adds digestion check --- .../station/station_special_abilities_vr.dm | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm index 5186700731..b373166cdc 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm @@ -418,21 +418,15 @@ T << "An odd sensation flows through your body as [C] begins to drain you!" C.nutrition = (C.nutrition + (T.nutrition*0.05)) //Drain a small bit at first. 5% of the prey's nutrition. T.nutrition = T.nutrition*0.95 - if(T.halloss < 30) - T.apply_damage(10, HALLOSS) if(2) C << "You feel stronger with every passing moment of draining [T]." src.visible_message("[C] seems to be doing something to [T], their body looking weaker with every passing moment!") T << "You feel weaker with every passing moment as [C] drains you!" C.nutrition = (C.nutrition + (T.nutrition*0.1)) T.nutrition = T.nutrition*0.9 - if(T.halloss < 30) - T.apply_damage(15, HALLOSS) if(3 to 99) C.nutrition = (C.nutrition + (T.nutrition*0.1)) //Just keep draining them. T.nutrition = T.nutrition*0.9 - if(T.halloss < 30) //Let's do up to 49 halloss max. - T.apply_damage(20, HALLOSS) if(T.nutrition < 100 && stage < 99)//Did they drop below 100 nutrition? If so, immediately jump to stage 99 so it can advance to 100. stage = 99 if(100) @@ -487,27 +481,28 @@ T << "An odd sensation flows through your body as [C] begins to drain you!" C.nutrition = (C.nutrition + (T.nutrition*0.05)) //Drain a small bit at first. 5% of the prey's nutrition. T.nutrition = T.nutrition*0.95 - if(T.halloss < 30) - T.apply_damage(10, HALLOSS) if(2) C << "You feel stronger with every passing moment as you drain [T]." C.visible_message("[C] seems to be doing something to [T], [T]'s body looking weaker with every passing moment!") T << "You feel weaker with every passing moment as [C] drains you!" C.nutrition = (C.nutrition + (T.nutrition*0.1)) T.nutrition = T.nutrition*0.9 - if(T.halloss < 30) - T.apply_damage(15, HALLOSS) if(3 to 48) //Should be more than enough to get under 100. C.nutrition = (C.nutrition + (T.nutrition*0.1)) //Just keep draining them. T.nutrition = T.nutrition*0.9 - if(T.halloss < 30) //Let's do up to 49 halloss max. - T.apply_damage(20, HALLOSS) - if(T.nutrition < 100)//Did they drop below 100 nutrition? If so, immediately jump to stage 50 (Lethal!) + if(T.nutrition < 100)//Did they drop below 100 nutrition? If so, do one last check then jump to stage 50 (Lethal!) stage = 49 if(49) if(T.nutrition < 100)//Did they somehow not get drained below 100 nutrition yet? If not, go back to stage 3 and repeat until they get drained. stage = 3 //Otherwise, advance to stage 50 (Lethal draining.) if(50) + if(!T.digestable) + C << "You feel invigorated as you completely drain [T] and begin to move onto draining their lifeforce before realizing they have too strong of a grasp on their lifeforce for you to do so!" + T << "You feel completely drained as [C] finishes draining you and begins to move onto your lifeforce, but you have too strong a grasp on it for them to do so!" + C.nutrition = (C.nutrition + T.nutrition) + T.nutrition = 0 //Completely drained of everything. + T.apply_damage(100, HALLOSS) //Knock em out. + return C << "You begin to drain [T]'s lifeforce..." T << "An odd sensation flows through your body as you feel your lifeforce slowly being sucked away into [C]!" if(51 to 99)