mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-25 21:19:44 +01:00
Allows non-contagious viruses to be picked up with blood (#18948)
* Virus :) * This too
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
icon = 'icons/obj/device.dmi'
|
||||
icon_state = "extrapolator_scan"
|
||||
desc = "A bulky scanning device, used to extract genetic material of potential pathogens."
|
||||
description_info = "Use on hand to change between SCAN and EXTRACT mode."
|
||||
item_flags = NOBLUDGEON
|
||||
slot_flags = SLOT_BELT
|
||||
w_class = ITEMSIZE_NORMAL
|
||||
|
||||
@@ -313,10 +313,7 @@ BLOOD_VOLUME_SURVIVE = 40
|
||||
if(!B.data["viruses"])
|
||||
B.data["viruses"] = list()
|
||||
|
||||
for(var/datum/disease/D in GetSpreadableViruses())
|
||||
B.data["viruses"] |= D.Copy()
|
||||
|
||||
for(var/datum/disease/D in GetDormantDiseases())
|
||||
for(var/datum/disease/D in GetViruses())
|
||||
B.data["viruses"] |= D.Copy()
|
||||
|
||||
if(!B.data["resistances"])
|
||||
@@ -360,7 +357,7 @@ BLOOD_VOLUME_SURVIVE = 40
|
||||
var/list/sniffles = injected.data["viruses"]
|
||||
for(var/ID in sniffles)
|
||||
var/datum/disease/D = ID
|
||||
if(D.spread_flags & (DISEASE_SPREAD_SPECIAL | DISEASE_SPREAD_NON_CONTAGIOUS)) // You can't put non-contagius diseases in blood, but just in case
|
||||
if(D.spread_flags & (DISEASE_SPREAD_SPECIAL | DISEASE_SPREAD_NON_CONTAGIOUS)) // Special/Non-Contagious stay in the blood, but they won't spread
|
||||
continue
|
||||
ContractDisease(D)
|
||||
if (injected.data["resistances"] && prob(5))
|
||||
|
||||
@@ -413,8 +413,7 @@
|
||||
//Grab any viruses they have
|
||||
if(iscarbon(target) && LAZYLEN(target.IsInfected()))
|
||||
LAZYINITLIST(viruses)
|
||||
var/datum/disease/virus = pick(target.IsInfected())
|
||||
viruses[hash] = virus.Copy()
|
||||
viruses[hash] = target.GetViruses()
|
||||
|
||||
//Dirtiness should be very low if you're the first injectee. If you're spam-injecting 4 people in a row around you though,
|
||||
//This gives the last one a 30% chance of infection.
|
||||
|
||||
Reference in New Issue
Block a user