Merge pull request #652 from ArchieBeepBoop/virofixes

[TESTMERGE] The Viro Rework done right? Ports a load of viro, (sentient) disease, symptoms code updates from tg.
This commit is contained in:
Dahlular
2020-11-10 01:54:24 -07:00
committed by GitHub
34 changed files with 395 additions and 161 deletions
@@ -195,6 +195,8 @@
B.reagents.add_reagent("blood", 20, data)
wait = TRUE
update_icon()
var/turf/source_turf = get_turf(src)
log_virus("A culture bottle was printed for the virus [A.admin_details()] at [loc_name(source_turf)] by [key_name(usr)]")
addtimer(CALLBACK(src, .proc/reset_replicator_cooldown), 50)
. = TRUE
if("create_vaccine_bottle")
@@ -702,3 +702,11 @@
id = "royalbluecarpet"
results = list("royalbluecarpet" = 2)
required_reagents = list("carpet" = 1, "clonexadone" = 1)
/datum/chemical_reaction/synth_blood
name = "Synthetic Blood"
id = "syntheticblood"
results = list("syntheticblood" = 3)
required_reagents = list("salglu_solution" = 1, "iron" = 1, "stable_plasma" = 1)
mix_message = "The mixture congeals and gives off a faint copper scent."
required_temp = 350
@@ -47,7 +47,7 @@
"<span class='userdanger'>[user] forces [M] to [apply_method] [src].</span>")
var/makes_me_think = pick(strings("redpill.json", "redpill_questions"))
if(icon_state == "pill4" && prob(5)) //you take the red pill - you stay in Wonderland, and I show you how deep the rabbit hole goes
if(icon_state == "pill4" && prob(10)) //you take the red pill - you stay in Wonderland, and I show you how deep the rabbit hole goes
addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, M, "<span class='notice'>[makes_me_think]</span>"), 50)
log_combat(user, M, "fed", reagents.log_list())