cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-13 16:12:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

Browse Source 
Conflicts:
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm
This commit is contained in:
Kelenius
2015-03-28 19:14:59 +03:00
parent 30c6646671 6ec0c2e504
commit 24ef7752cd
260 changed files with 2116 additions and 2965 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/blood.dm
-6
View File
@@ -273,12 +273,6 @@ proc/blood_splatter(var/target,var/datum/reagent/blood/source,var/large)
if(istype(source,/mob/living/carbon/human))
var/mob/living/carbon/human/M = source
source = M.get_blood(M.vessel)
else if(istype(source,/mob/living/carbon/monkey))
var/mob/living/carbon/monkey/donor = source
if(donor.dna)
source = new()
source.data["blood_DNA"] = donor.dna.unique_enzymes
source.data["blood_type"] = donor.dna.b_type
// Are we dripping or splattering?
var/list/drips = list()