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

Moar Slime People work

Browse Source
This commit is contained in:
ZomgPonies
2013-10-28 06:06:34 -04:00
parent 2a5b419d9e
commit 78d2ccb0ef
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ_external.dm
+1 -1
View File
@@ -270,7 +270,7 @@
return
//Bone fracurtes
if(config.bones_can_break && brute_dam > min_broken_damage * config.organ_health_multiplier && !(status & (ORGAN_ROBOT|ORGAN_PEG)))
if(config.bones_can_break && brute_dam > min_broken_damage * config.organ_health_multiplier && !(status & (ORGAN_ROBOT|ORGAN_PEG)) && !(istype(owner, /mob/living/carbon/human/slime)))
src.fracture()
if(!(status & ORGAN_BROKEN))
perma_injury = 0
code/modules/reagents/reagent_containers/syringes.dm
+15 -2
View File
@@ -165,10 +165,23 @@
for(var/datum/reagent/blood/d in src.reagents.reagent_list)
B = d
break
var/datum/reagent/water/W
for(var/datum/reagent/water/r in src.reagents.reagent_list)
W = r
break
var/trans
if(W && istype(target,/mob/living/carbon/human/slime))
var/mob/living/carbon/human/slime/S = target
S.vessel.add_reagent("water", 5)
S.vessel.update_total()
if(B && istype(target,/mob/living/carbon))
var/mob/living/carbon/C = target
C.inject_blood(src,5)
if(istype(target,/mob/living/carbon/human/slime))
var/mob/living/carbon/human/slime/S = target
S.reagents.add_reagent("blood", 5)
S.reagents.update_total()
else
var/mob/living/carbon/C = target
C.inject_blood(src,5)
else
trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
user << "\blue You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units."