From bc29717d2edac2d4d763e86ec11bccde0b0e0a5b Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Sat, 31 Jul 2021 21:17:47 +0100 Subject: [PATCH 1/3] Plant B Gone --- code/modules/reagents/chemistry/reagents/toxin_reagents.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index ae9287e0cda6..c91b736f96bd 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -255,6 +255,8 @@ if(!C.wear_mask) // If not wearing a mask var/damage = min(round(0.4*reac_volume, 0.1),10) C.adjustToxLoss(damage) + if(istype(M, /mob/living/simple_animal/hostile/venus_human_trap) + M.adjustToxLoss(10) /datum/reagent/toxin/plantbgone/weedkiller name = "Weed Killer" From 8b1ffa85f9282a0152e363ebdf41bfda33f576ce Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Sat, 31 Jul 2021 22:58:09 +0100 Subject: [PATCH 2/3] Update code/modules/reagents/chemistry/reagents/toxin_reagents.dm Co-authored-by: adamsong --- code/modules/reagents/chemistry/reagents/toxin_reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index c91b736f96bd..8a6c4487669b 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -255,7 +255,7 @@ if(!C.wear_mask) // If not wearing a mask var/damage = min(round(0.4*reac_volume, 0.1),10) C.adjustToxLoss(damage) - if(istype(M, /mob/living/simple_animal/hostile/venus_human_trap) + if(istype(M, /mob/living/simple_animal/hostile/venus_human_trap)) M.adjustToxLoss(10) /datum/reagent/toxin/plantbgone/weedkiller From 837cefa845f043420a6a0cee4ee99bf2efa04bb6 Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Sat, 18 Sep 2021 18:09:32 +0100 Subject: [PATCH 3/3] Fixes and makes it work --- .../simple_animal/hostile/venus_human_trap.dm | 14 ++++++++++++-- .../reagents/chemistry/reagents/toxin_reagents.dm | 2 -- 2 files changed, 12 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 845e2ab59fea..0753a4abd5a1 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 @@ -105,7 +105,10 @@ if(!kudzu_need()) adjustHealth(5) if(prob(20)) - to_chat(src, "You wither away without the support of the kudzu...") + to_chat(src, span_danger("You wither away without the support of the kudzu...")) + if(check_gas()) + adjustHealth(6) + to_chat(src, span_danger("The gas reacts with you and starts to melt you away!")) /mob/living/simple_animal/hostile/venus_human_trap/AttackingTarget() . = ..() @@ -205,4 +208,11 @@ for(var/obj/structure/spacevine/vine_found in view(3,src)) return TRUE return FALSE - \ No newline at end of file + +/mob/living/simple_animal/hostile/venus_human_trap/proc/check_gas() + for(var/contents in src.loc) + if(istype(contents, /obj/effect/particle_effect/smoke/chem)) + var/obj/effect/particle_effect/smoke/chem/gas = contents + if(gas.reagents.has_reagent(/datum/reagent/toxin/plantbgone, 1)) + return TRUE + return FALSE diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 8a6c4487669b..ae9287e0cda6 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -255,8 +255,6 @@ if(!C.wear_mask) // If not wearing a mask var/damage = min(round(0.4*reac_volume, 0.1),10) C.adjustToxLoss(damage) - if(istype(M, /mob/living/simple_animal/hostile/venus_human_trap)) - M.adjustToxLoss(10) /datum/reagent/toxin/plantbgone/weedkiller name = "Weed Killer"