cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make can_inject deterministic; fix odysseus syringes sometimes not working [PR #12858, take two] (#14637)

Browse Source 
* PR #12858 revival

* Move the can_inject unit tests to unit_tests/

* Remove the can_inject unit tests
This commit is contained in:
moxian
2020-11-03 12:27:43 -05:00
committed by GitHub
parent 3e046495d1
commit 290fbca27c
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/plant_genes.dm
+4 -1
View File
@@ -396,7 +396,10 @@
/datum/plant_gene/trait/stinging/on_throw_impact(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
if(isliving(target) && G.reagents && G.reagents.total_volume)
var/mob/living/L = target
if(L.reagents && L.can_inject(null, FALSE))
// It would be nice to inject the body part the original thrower aimed at,
// but we don't have this kind of information here. So pick something at random.
var/target_zone = pick("chest", "chest", "chest", "l_leg", "r_leg", "l_arm", "r_arm", "head")
if(L.reagents && L.can_inject(null, FALSE, target_zone))
var/injecting_amount = max(1, G.seed.potency*0.2) // Minimum of 1, max of 20
var/fraction = min(injecting_amount/G.reagents.total_volume, 1)
G.reagents.reaction(L, REAGENT_INGEST, fraction)