shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6285 from Citadel-Station-13/upstream-merge-36961

Browse Source 
[MIRROR] Fixes mixed blood samples to preserve cloneable if the samples are the same
This commit is contained in:
deathride58
2018-04-07 00:50:56 +00:00
committed by GitHub
parent d79d4ae3f1 3c7852ed62
commit b53b81455a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/other_reagents.dm
+2 -1
View File
@@ -41,7 +41,8 @@
/datum/reagent/blood/on_merge(list/mix_data)
if(data && mix_data)
data["cloneable"] = 0 //On mix, consider the genetic sampling unviable for pod cloning, or else we won't know who's even getting cloned, etc
if(data["blood_DNA"] != mix_data["blood_DNA"])
data["cloneable"] = 0 //On mix, consider the genetic sampling unviable for pod cloning if the DNA sample doesn't match.
if(data["viruses"] || mix_data["viruses"])
var/list/mix1 = data["viruses"]