From 8910f8ad9e8776841a1d6ffed87356b2b6370adf Mon Sep 17 00:00:00 2001 From: Vulpias <37509487+Vulpias@users.noreply.github.com> Date: Fri, 23 Mar 2018 08:08:09 +0100 Subject: [PATCH 1/2] venom patch, final fix Changed the units after changing how they metabolize, and a changed the effects a bit. --- .../station/station_special_abilities_vr.dm | 37 +++++++++++++------ 1 file changed, 25 insertions(+), 12 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 3eaf982026..b528f7be72 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 @@ -839,20 +839,20 @@ if(choice == "Aphrodisiac") src.show_message("You sink your fangs into [T] and inject your aphrodisiac!") src.visible_message("[src] sinks their fangs into [T]!") - T.bloodstr.add_reagent("succubi_aphrodisiac",200) + T.bloodstr.add_reagent("succubi_aphrodisiac",100) return 0 else if(choice == "Numbing") src.show_message("You sink your fangs into [T] and inject your poison!") src.visible_message("[src] sinks their fangs into [T]!") - T.bloodstr.add_reagent("numbing_enzyme",50) //Poisons should work when more units are injected + T.bloodstr.add_reagent("numbing_enzyme",20) //Poisons should work when more units are injected else if(choice == "Paralyzing") src.show_message("You sink your fangs into [T] and inject your poison!") src.visible_message("[src] sinks their fangs into [T]!") - T.bloodstr.add_reagent("succubi_paralize",50) //Poisons should work when more units are injected + T.bloodstr.add_reagent("succubi_paralize",20) //Poisons should work when more units are injected else return //Should never happen -/* +/* //will maybe add something one day mob/living/carbon/proc/charmed() //TODO charmed = 1 @@ -867,6 +867,7 @@ mob/living/carbon/proc/charmed() //TODO name = "Aphrodisiac" id = "succubi_aphrodisiac" description = "A unknown liquid, it smells sweet" + metabolism = REM * 0.8 color = "#8A0829" scannable = 0 @@ -875,30 +876,42 @@ mob/living/carbon/proc/charmed() //TODO M.show_message("You feel funny, and fall in love with the person in front of you") M.emote(pick("blush", "moans", "giggles", "turns visibly red")) //M.charmed() //TODO - return + return /datum/reagent/succubi_numbing //Using numbing_enzyme instead. name = "Numbing Fluid" id = "succubi_numbing" description = "A unknown liquid, it doesn't smell" + metabolism = REM * 0.5 color = "#41029B" scannable = 0 /datum/reagent/succubi_numbing/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - if(prob(7)) - M.show_message("You start to feel weakened, your body seems heavy.") + + var/effective_dose = dose + var/threshold = 1 + + if(effective_dose < 1.5 * threshold) M.eye_blurry = max(M.eye_blurry, 10) - return + else if(effective_dose < 5 * threshold) + M.Weaken(2) + M.drowsyness = max(M.drowsyness, 20) + if(proc(7)) + M.show_message("You start to feel weakened, your body seems heavy.") + return /datum/reagent/succubi_paralize name = "Paralyzing Fluid" id = "succubi_numbing" description = "A unknown liquid, it doesn't smell" + metabolism= REM * 0.5 color = "#41029B" scannable = 0 -/datum/reagent/succubi_paralize/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - if(prob(7)) - M.show_message("You lose sensation of your body.") +/datum/reagent/succubi_paralize/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) //will first keep it like that. lets see what it changes. if nothing, than I will rework the effect again + + if(proc(7)) M.Weaken(20) - return \ No newline at end of file + M.eye_blurry = max(M.eye_blurry, 10) + M.show_message("You lose sensation of your body.") + return From f89c3bb654b41dc62ef74af6910b6510d47bf5fb Mon Sep 17 00:00:00 2001 From: Vulpias <37509487+Vulpias@users.noreply.github.com> Date: Fri, 23 Mar 2018 08:15:28 +0100 Subject: [PATCH 2/2] Update station_special_abilities_vr.dm --- .../human/species/station/station_special_abilities_vr.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 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 b528f7be72..3e6592fd6e 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 @@ -896,7 +896,7 @@ mob/living/carbon/proc/charmed() //TODO else if(effective_dose < 5 * threshold) M.Weaken(2) M.drowsyness = max(M.drowsyness, 20) - if(proc(7)) + if(prob(7)) M.show_message("You start to feel weakened, your body seems heavy.") return @@ -910,7 +910,7 @@ mob/living/carbon/proc/charmed() //TODO /datum/reagent/succubi_paralize/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) //will first keep it like that. lets see what it changes. if nothing, than I will rework the effect again - if(proc(7)) + if(prob(7)) M.Weaken(20) M.eye_blurry = max(M.eye_blurry, 10) M.show_message("You lose sensation of your body.")