cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 13:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes syringes with monkeys, virus transfers, and iv drip feedback

Browse Source
This commit is contained in:
paprka
2015-02-04 12:21:05 -08:00
parent b1a3cde873
commit f6bf89656b
3 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/blood.dm
+11 -7
View File
@@ -186,19 +186,18 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
. = ..()
vessel.remove_reagent("blood",amount) // Removes blood if human
//Transfers blood from container ot vessels
//Transfers blood from container to vessels
/mob/living/carbon/proc/inject_blood(obj/item/weapon/reagent_containers/container, var/amount)
var/datum/reagent/blood/injected = get_blood(container.reagents)
if(NOBLOOD in dna.species.specflags)
reagents.add_reagent("blood", amount, injected.data)
reagents.update_total()
return
if(!injected)
return
for(var/datum/disease/D in injected.data["viruses"])
var/datum/disease/new_virus = D.Copy(1)
injected.data["viruses"] += new_virus
var/list/chems = list()
chems = params2list(injected.data["trace_chem"])
for(var/C in chems)
@@ -207,11 +206,16 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
container.reagents.remove_reagent("blood", amount)
//Transfers blood from container ot vessels, respecting blood types compatability.
//Transfers blood from container to vessels, respecting blood types compatability.
/mob/living/carbon/human/inject_blood(obj/item/weapon/reagent_containers/container, var/amount)
var/datum/reagent/blood/injected = get_blood(container.reagents)
if(NOBLOOD in dna.species.specflags)
reagents.add_reagent("blood", amount, injected.data)
reagents.update_total()
return
var/datum/reagent/blood/our = get_blood(vessel)
if (!injected || !our)
code/modules/reagents/reagent_containers/syringes.dm
+7 -6
View File
@@ -157,16 +157,17 @@
reagents.reaction(target, INGEST)
spawn(5)
target.add_fingerprint(user)
var/datum/reagent/blood/B = locate() in src.reagents.reagent_list
var/trans
var/datum/reagent/blood/B
for(var/datum/reagent/blood/d in src.reagents.reagent_list)
B = d
break
if(B && istype(target,/mob/living/carbon))
var/mob/living/carbon/C = target
C.inject_blood(src,5)
else
trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
user << "<span class='notice'>You inject [trans] unit\s of the solution. [src] now contains [reagents.total_volume] unit\s.</span>"
if(reagents.total_volume <= 0 && mode == SYRINGE_INJECT)
src.reagents.trans_to(target, amount_per_transfer_from_this)
user << "<span class='notice'>You inject 5 units of the solution. The syringe now contains [src.reagents.total_volume] units.</span>"
if (reagents.total_volume <= 0 && mode==SYRINGE_INJECT)
mode = SYRINGE_DRAW
update_icon()