Virology's broken as fuck, damnifino why

This commit is contained in:
Poojawa
2019-08-21 03:36:40 -05:00
parent b29607c019
commit 32c7a7c3ee
9 changed files with 34 additions and 26 deletions
+1 -1
View File
@@ -45,7 +45,7 @@
return(BRUTELOSS)
/obj/item/clothing/shoes/transfer_blood_dna(list/blood_dna)
/obj/item/clothing/shoes/transfer_blood_dna(list/blood_dna, diseases)
..()
if(blood_dna.len)
last_bloodtype = blood_dna[blood_dna[blood_dna.len]]//trust me this works
+1 -1
View File
@@ -7,7 +7,7 @@
if(add_blood_DNA(G.blood_DNA)) //only reduces the bloodiness of our gloves if the item wasn't already bloody
G.transfer_blood--
else if(M.bloody_hands > 1)
if(add_blood_DNA(M.blood_DNA))
if(add_blood_DNA(M.blood_DNA, M.diseases))
M.bloody_hands--
if(!suit_fibers)
suit_fibers = list()
+1 -1
View File
@@ -170,7 +170,7 @@
if(iscarbon(user))
var/mob/living/carbon/C = user
user_dna = C.dna
B.add_blood_DNA(user_dna)
B.add_blood_DNA(user_dna, C.diseases)
var/datum/callback/gibspawner = CALLBACK(GLOBAL_PROC, /proc/spawn_atom_to_turf, /obj/effect/gibspawner/generic, B, 1, FALSE, list(user_dna))
B.throw_at(target, BRAINS_BLOWN_THROW_RANGE, BRAINS_BLOWN_THROW_SPEED, callback=gibspawner)
return(BRUTELOSS)
@@ -194,7 +194,7 @@
to_chat(usr, "<span class='warning'>ERROR: Cannot replicate virus strain.</span>")
return
A = A.Copy()
var/list/data = list("viruses" = list(A))
var/list/data = list("blood_DNA" = "UNKNOWN DNA", "blood_type" = "SY", "viruses" = list(A))
var/obj/item/reagent_containers/glass/bottle/B = new(drop_location())
B.name = "[A.name] culture bottle"
B.desc = "A small bottle. Contains [A.agent] culture in synthblood medium."
@@ -35,7 +35,7 @@
/datum/reagent/blood/reaction_obj(obj/O, volume)
if(volume >= 3 && istype(O))
O.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"]))
O.add_blood_DNA(data)
/datum/reagent/blood/on_new(list/data)
if(istype(data))
@@ -107,8 +107,8 @@
if(reac_volume < 3)
return
T.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"]))
var/obj/effect/decal/cleanable/blood/B = locate() in T
T.add_blood_DNA(data)
var/obj/effect/decal/cleanable/blood/B = locate() in T //find some blood here
if(!B.reagents)
B.reagents.add_reagent(id, reac_volume)
B.update_icon()
+1 -1
View File
@@ -25,7 +25,7 @@
create_reagents(volume, reagent_flags)
if(spawned_disease)
var/datum/disease/F = new spawned_disease()
var/list/data = list("viruses"= list(F))
var/list/data = list("blood_DNA" = "UNKNOWN DNA", "blood_type" = "SY","viruses"= list(F))
reagents.add_reagent("blood", disease_amount, data)
add_initial_reagents()