cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Blood Types (#12520)

Browse Source
This commit is contained in:
Fox McCloud
2019-10-07 23:15:54 -04:00
committed by variableundefined
parent 36e464cf7e
commit 93fa76bee0
16 changed files with 44 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/blood.dm
+2 -2
View File
@@ -155,7 +155,7 @@
if((D.spread_flags & SPECIAL) || (D.spread_flags & NON_CONTAGIOUS))
continue
C.ForceContractDisease(D)
if(!(blood_data["blood_type"] in get_safe_blood(C.dna.b_type)))
if(!(blood_data["blood_type"] in get_safe_blood(C.dna.blood_type)))
C.reagents.add_reagent("toxin", amount * 0.5)
return 1
@@ -193,7 +193,7 @@
blood_data["ckey"] = ckey
if(!suiciding)
blood_data["cloneable"] = 1
blood_data["blood_type"] = copytext(src.dna.b_type,1,0)
blood_data["blood_type"] = copytext(src.dna.blood_type,1,0)
blood_data["gender"] = gender
blood_data["real_name"] = real_name
blood_data["blood_color"] = dna.species.blood_color
code/modules/surgery/organs/organ.dm
+2 -2
View File
@@ -57,7 +57,7 @@
if(dna)
if(!blood_DNA)
blood_DNA = list()
blood_DNA[dna.unique_enzymes] = dna.b_type
blood_DNA[dna.unique_enzymes] = dna.blood_type
else
dna = new /datum/dna(null)
if(species_override)
@@ -79,7 +79,7 @@
blood_DNA.Cut()
else
blood_DNA = list()
blood_DNA[dna.unique_enzymes] = dna.b_type
blood_DNA[dna.unique_enzymes] = dna.blood_type
/obj/item/organ/proc/necrotize(update_sprite = TRUE)
damage = max_damage