Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes APS #4347

Merged
merged 4 commits into from
Sep 8, 2023
Merged

Fixes APS #4347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d7aaa8
Update Embryo.dm
BeagleGaming1 Sep 6, 2023
4d786d5
Update prop_positive.dm
BeagleGaming1 Sep 6, 2023
edfffd4
Update Embryo.dm
BeagleGaming1 Sep 6, 2023
59da130
Update prop_positive.dm
BeagleGaming1 Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/Embryo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@
var/flags_embryo = FALSE // Used in /ciphering/predator property
/// The ckey of any player hugger that made this embryo
var/hugger_ckey
/// The total time the person is hugged divided by stages until burst
var/per_stage_hugged_time = 90 //Set in Initialize due to config

/obj/item/alien_embryo/Initialize(mapload, ...)
. = ..()
per_stage_hugged_time = CONFIG_GET(number/embryo_burst_timer) / 5
if(istype(loc, /mob/living))
affected_mob = loc
affected_mob.status_flags |= XENO_HOST
Expand Down Expand Up @@ -76,8 +79,6 @@

/obj/item/alien_embryo/proc/process_growth(delta_time)
var/datum/hive_status/hive = GLOB.hive_datum[hivenumber]
/// The total time the person is hugged divided by stages until burst
var/per_stage_hugged_time = CONFIG_GET(number/embryo_burst_timer) / 5
//Low temperature seriously hampers larva growth (as in, way below livable), so does stasis
if(!hive.hardcore) // Cannot progress if the hive has entered hardcore mode.
if(affected_mob.in_stasis || affected_mob.bodytemperature < 170)
Expand Down
32 changes: 16 additions & 16 deletions code/modules/reagents/chemistry_properties/prop_positive.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,24 +481,24 @@
description = "Antimicrobial property specifically targeting parasitic pathogens in the body disrupting their growth and potentially killing them."
rarity = PROPERTY_UNCOMMON

/datum/chem_property/positive/antiparasitic/process(mob/living/M, potency = 1, delta_time)
if(!ishuman(M))
return
var/mob/living/carbon/human/H = M
for(var/content in H.contents)
var/obj/item/alien_embryo/A = content
if(A && istype(A))
if(A.counter > 0)
A.counter = A.counter - potency
H.take_limb_damage(0,POTENCY_MULTIPLIER_MEDIUM*potency)
/datum/chem_property/positive/antiparasitic/process(mob/living/current_mob, potency = 1, delta_time)
if(!ishuman(current_mob))
return
var/mob/living/carbon/human/current_human = current_mob
for(var/content in current_human.contents)
var/obj/item/alien_embryo/embryo = content
if(embryo && istype(embryo))
if(embryo.counter > 0)
embryo.counter = embryo.counter - potency
current_human.take_limb_damage(0,POTENCY_MULTIPLIER_MEDIUM*potency)
else
A.stage--
if(A.stage <= 0)//if we reach this point, the embryo dies and the occupant takes a nasty amount of acid damage
qdel(A)
H.take_limb_damage(0,rand(20,40))
H.vomit()
embryo.stage--
if(embryo.stage <= 0)//if we reach this point, the embryo dies and the occupant takes a nasty amount of acid damage
qdel(embryo)
current_human.take_limb_damage(0,rand(20,40))
current_human.vomit()
else
A.counter = 90
embryo.counter = embryo.per_stage_hugged_time

/datum/chem_property/positive/antiparasitic/process_overdose(mob/living/M, potency = 1)
M.apply_damage(potency, TOX)
Expand Down