Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

reagents inside syringes can now be used for surgeries that require reagents and use a syringe in the same step #7974

Merged
SomeguyManperson merged 3 commits into from
Mar 14, 2020
Merged

reagents inside syringes can now be used for surgeries that require reagents and use a syringe in the same step #7974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77c86be
this else doesn't need to be here
SomeguyManperson Mar 13, 2020
4a65292
surgery steps that use a syringe can check the syringe for reagents
SomeguyManperson Mar 13, 2020
e3b8813
levio- SAAAAAAAAAAAs not levio -SUUUUUUUUUUUU
SomeguyManperson Mar 13, 2020
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: 2 additions & 3 deletions code/modules/surgery/advanced/dna_recovery.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@

if(!HAS_TRAIT_FROM(target, TRAIT_BADDNA, CHANGELING_DRAIN))
return FALSE
else
return TRUE
return TRUE

/datum/surgery_step/dna_recovery
name = "recover DNA"
Expand All @@ -37,4 +36,4 @@
"[user] successfully repairs some of [target]'s DNA",
"[user] completes the surgery on [target]'s brain.")
REMOVE_TRAIT(target, TRAIT_BADDNA, CHANGELING_DRAIN)
return TRUE
return TRUE
16 changes: 12 additions & 4 deletions code/modules/surgery/surgery_step.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@
prob_chance = implements[implement_type]
prob_chance *= surgery.get_propability_multiplier()

if((prob(prob_chance) || iscyborg(user)) && chem_check(target) && !try_to_fail)
if((prob(prob_chance) || iscyborg(user)) && chem_check(target, user,
tool) && !try_to_fail)
if(success(user, target, target_zone, tool, surgery))
advance = 1
else
Expand Down Expand Up @@ -122,20 +123,27 @@
/datum/surgery_step/proc/tool_check(mob/user, obj/item/tool)
return 1

/datum/surgery_step/proc/chem_check(mob/living/carbon/target)
/datum/surgery_step/proc/chem_check(mob/living/carbon/target, user, obj/item/tool)
if(!LAZYLEN(chems_needed))
return TRUE

var/obj/item/reagent_containers/syringe/S
if(target.can_inject(user, FALSE))
S = tool
if(require_all_chems)
. = TRUE
for(var/R in chems_needed)
if(!target.reagents.has_reagent(R))
return FALSE
if(!(S && S.reagents.has_reagent(R)))
return FALSE
S.reagents.remove_reagent(R, min(S.amount_per_transfer_from_this, S.reagents.get_reagent_amount(R)))
else
. = FALSE
for(var/R in chems_needed)
if(target.reagents.has_reagent(R))
return TRUE
if(S && S.reagents.has_reagent(R))
S.reagents.remove_reagent(R, min(S.amount_per_transfer_from_this, S.reagents.get_reagent_amount(R)))
return TRUE

/datum/surgery_step/proc/get_chem_list()
if(!LAZYLEN(chems_needed))
Expand Down