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

Slight tweaks

Browse Source
This commit is contained in:
Dave
2019-02-15 17:31:56 -05:00
parent 7302fe038f
commit c16702e235
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/iv_bag.dm
+7 -6
View File
@@ -61,8 +61,8 @@
if(mode) // Injecting
if(reagents.total_volume)
var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1) //the fraction that is transfered of the total volume
reagents.reaction(injection_target, INGEST, fraction) //make reagents reacts, but don't spam messages
var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1) //The amount of reagents we'll transfer to the person
reagents.reaction(injection_target, INGEST, fraction) //React the amount we're transfering.
reagents.trans_to(injection_target, amount_per_transfer_from_this)
update_icon()
else // Drawing
@@ -84,19 +84,19 @@
var/mob/living/L
if(isliving(target))
L = target
if(injection_target)
if(injection_target) // Removing the needle
if(L != injection_target)
to_chat(user, "<span class='notice'>[src] is already inserted into [injection_target]'s arm!")
return
if(L != user)
L.visible_message("<span class='danger'>[user] is trying to remove [src]'s needle from [L]'s arm!</span>", \
"<span class='userdanger'>[user] is trying to remove [src]'s needle from [L]'s arm!</span>")
"<span class='userdanger'>[user] is trying to remove [src]'s needle from [L]'s arm!</span>")
if(!do_mob(user, L))
return
L.visible_message("<span class='danger'>[user] removes [src]'s needle from [L]'s arm!</span>", \
"<span class='userdanger'>[user] removes [src]'s needle from [L]'s arm!</span>")
"<span class='userdanger'>[user] removes [src]'s needle from [L]'s arm!</span>")
end_processing()
else
else // Inserting the needle
if(!L.can_inject(user, 1))
return
if(L != user)
@@ -153,6 +153,7 @@
if(blood_type != null)
set_label(blood_type)
reagents.add_reagent("blood", 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null))
amount_per_transfer_from_this = 5 // Bloodbags are set to transfer 5 units by default.
update_icon()