cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 06:28:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2

Browse Source 
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/giant_spider.dm
#	code/modules/organs/blood.dm
#	code/modules/organs/internal/lungs.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_external.dm
This commit is contained in:
Anewbe
2017-03-22 17:29:01 -05:00
parent 1b3b67b8ca 38598f3aae
commit 2c9c3e208e
537 changed files with 17289 additions and 9499 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/other.dm
+2 -4
View File
@@ -146,10 +146,8 @@
var/trans = container.reagents.trans_to_mob(target, container.amount_per_transfer_from_this, CHEM_BLOOD) //technically it's contact, but the reagents are being applied to internal tissue
if (trans > 0)
if(container.reagents.has_reagent("peridaxon"))
affected.status &= ~ORGAN_DEAD
affected.owner.update_body(1)
affected.status &= ~ORGAN_DEAD
affected.owner.update_body(1)
user.visible_message("\blue [user] applies [trans] units of the solution to affected tissue in [target]'s [affected.name]", \
"\blue You apply [trans] units of the solution to affected tissue in [target]'s [affected.name] with \the [tool].")