mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
[MIRROR] Virology Patch 1 (#9449)
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
a9e40d4e99
commit
756abe1f24
@@ -112,6 +112,10 @@ var/global/list/image/splatter_cache=list()
|
|||||||
var/obj/structure/bed/chair/wheelchair/W = perp.buckled
|
var/obj/structure/bed/chair/wheelchair/W = perp.buckled
|
||||||
W.bloodiness = 4
|
W.bloodiness = 4
|
||||||
|
|
||||||
|
if(viruses)
|
||||||
|
for(var/datum/disease/D in viruses)
|
||||||
|
perp.ContractDisease(D)
|
||||||
|
|
||||||
amount--
|
amount--
|
||||||
|
|
||||||
/obj/effect/decal/cleanable/blood/proc/dry()
|
/obj/effect/decal/cleanable/blood/proc/dry()
|
||||||
@@ -124,6 +128,11 @@ var/global/list/image/splatter_cache=list()
|
|||||||
..()
|
..()
|
||||||
if (amount && istype(user))
|
if (amount && istype(user))
|
||||||
add_fingerprint(user)
|
add_fingerprint(user)
|
||||||
|
|
||||||
|
if(viruses)
|
||||||
|
for(var/datum/disease/D in viruses)
|
||||||
|
user.ContractDisease(D)
|
||||||
|
|
||||||
if (user.gloves)
|
if (user.gloves)
|
||||||
return
|
return
|
||||||
var/taken = rand(1,amount)
|
var/taken = rand(1,amount)
|
||||||
@@ -259,4 +268,14 @@ var/global/list/image/splatter_cache=list()
|
|||||||
viruses.Cut()
|
viruses.Cut()
|
||||||
return ..()
|
return ..()
|
||||||
|
|
||||||
|
/obj/effect/decal/cleanable/mucus/Crossed(mob/living/carbon/human/perp)
|
||||||
|
if(viruses)
|
||||||
|
for(var/datum/disease/D in viruses)
|
||||||
|
perp.ContractDisease(D)
|
||||||
|
|
||||||
|
/obj/effect/decal/cleanable/vomit/Crossed(mob/living/carbon/human/perp)
|
||||||
|
if(viruses)
|
||||||
|
for(var/datum/disease/D in viruses)
|
||||||
|
perp.ContractDisease(D)
|
||||||
|
|
||||||
#undef DRYING_TIME
|
#undef DRYING_TIME
|
||||||
|
|||||||
@@ -248,7 +248,7 @@
|
|||||||
else
|
else
|
||||||
dat += span_warning("Unknown substance[(unknown > 1)?"s":""] found in subject's dermis.")
|
dat += span_warning("Unknown substance[(unknown > 1)?"s":""] found in subject's dermis.")
|
||||||
dat += "<br>"
|
dat += "<br>"
|
||||||
if(C.resistances.len)
|
if(LAZYLEN(C.resistances))
|
||||||
for (var/datum/disease/virus in C.GetViruses())
|
for (var/datum/disease/virus in C.GetViruses())
|
||||||
if(virus.visibility_flags & HIDDEN_SCANNER || virus.visibility_flags & HIDDEN_PANDEMIC)
|
if(virus.visibility_flags & HIDDEN_SCANNER || virus.visibility_flags & HIDDEN_PANDEMIC)
|
||||||
continue
|
continue
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
/datum/reagent/mutagen/mutagenvirusfood
|
/datum/reagent/mutagen/mutagenvirusfood
|
||||||
name = "Mutagenic agar"
|
name = "Mutagenic agar"
|
||||||
id = "mutagenvirusfood"
|
id = "mutagenvirusfood"
|
||||||
description = "mutates blood"
|
description = "Mutates viruses when mixed in blood. This one seems rather alright."
|
||||||
color = "#A3C00F"
|
color = "#A3C00F"
|
||||||
|
|
||||||
/datum/reagent/mutagen/mutagenvirusfood/sugar
|
/datum/reagent/mutagen/mutagenvirusfood/sugar
|
||||||
@@ -32,16 +32,16 @@
|
|||||||
/datum/reagent/medicine/adranol/adranolvirusfood
|
/datum/reagent/medicine/adranol/adranolvirusfood
|
||||||
name = "Virus rations"
|
name = "Virus rations"
|
||||||
id = "adranolvirusfood"
|
id = "adranolvirusfood"
|
||||||
description = "mutates blood"
|
description = "Mutates viruses when mixed in blood. This one seems rather weak."
|
||||||
color = "#D18AA5"
|
color = "#D18AA5"
|
||||||
|
|
||||||
/datum/reagent/phoron_dust/phoronvirusfood
|
/datum/reagent/toxin/phoron/phoronvirusfood
|
||||||
name = "Phoronic virus food"
|
name = "Phoronic virus food"
|
||||||
id = "phoronvirusfood"
|
id = "phoronvirusfood"
|
||||||
description = "mutates blood"
|
description = "Mutates viruses when mixed in blood. This one seems to be the strongest."
|
||||||
color = "#A69DA9"
|
color = "#A69DA9"
|
||||||
|
|
||||||
/datum/reagent/phoron_dust/phoronvirusfood/weak
|
/datum/reagent/toxin/phoron/phoronvirusfood/weak
|
||||||
name = "Weakened phoronic virus food"
|
name = "Weakened phoronic virus food. This one seems to have been weakened, but still strong."
|
||||||
id = "weakphoronvirusfood"
|
id = "weakphoronvirusfood"
|
||||||
color = "#CEC3C6"
|
color = "#CEC3C6"
|
||||||
|
|||||||
Reference in New Issue
Block a user