cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Better Viro (#9421)

Browse Source 
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2024-11-06 16:45:37 -07:00
committed by GitHub
parent b76e8aa897
commit 6c05f5da45
116 changed files with 4191 additions and 1774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
code/modules/organs/blood.dm
View File

@@ -253,10 +253,19 @@ var/const/CE_STABLE_THRESHOLD = 0.5
//set reagent data
B.data["donor"] = src
if (!B.data["virus2"])
B.data["virus2"] = list()
B.data["virus2"] |= virus_copylist(src.virus2)
B.data["antibodies"] = src.antibodies
if(!B.data["viruses"])
B.data["viruses"] = list()
for(var/datum/disease/D in GetViruses())
if(D.spread_flags & SPECIAL || D.spread_flags & NON_CONTAGIOUS)
continue
B.data["viruses"] |= D.Copy()
if(!B.data["resistances"])
B.data["resistances"] = list()
if(B.data["resistances"])
B.data["resistances"] |= GetResistances()
B.data["blood_DNA"] = copytext(src.dna.unique_enzymes,1,0)
B.data["blood_type"] = copytext(src.dna.b_type,1,0)
@@ -289,10 +298,14 @@ var/const/CE_STABLE_THRESHOLD = 0.5
/mob/living/carbon/proc/inject_blood(var/datum/reagent/blood/injected, var/amount)
if (!injected || !istype(injected))
return
var/list/sniffles = virus_copylist(injected.data["virus2"])
var/list/sniffles = injected.data["viruses"]
for(var/ID in sniffles)
var/datum/disease2/disease/sniffle = sniffles[ID]
infect_virus2(src,sniffle,1)
var/datum/disease/D = ID
if((D.spread_flags & SPECIAL) || (D.spread_flags & NON_CONTAGIOUS)) // You can't put non-contagius diseases in blood, but just in case
continue
ContractDisease(D)
if (injected.data["resistances"] && prob(5))
antibodies |= injected.data["resistances"]
if (injected.data["antibodies"] && prob(5))
antibodies |= injected.data["antibodies"]
var/list/chems = list()
@@ -433,8 +446,8 @@ var/const/CE_STABLE_THRESHOLD = 0.5
B.blood_DNA[source.data["blood_DNA"]] = "O+"
// Update virus information.
if(source.data["virus2"])
B.virus2 = virus_copylist(source.data["virus2"])
if(source.data["viruses"])
B.viruses = source.data["viruses"]
B.fluorescent = 0
B.invisibility = 0