cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 23:17:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changeling Blood Test (#18171)

Browse Source 
* changeling blood

* more handling

* actually don't
This commit is contained in:
Will
2025-08-07 21:24:20 -04:00
committed by GitHub
parent fc7faa9ece
commit b8e26ac2a9
11 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/machinery/chem_master.dm
+1
View File
@@ -158,6 +158,7 @@
var/datum/reagent/blood/B = R
result["blood_type"] = B.data["blood_type"]
result["blood_dna"] = B.data["blood_DNA"]
result["changeling"] = B.data["changeling"]
arguments["analysis"] = result
tgui_modal_message(src, id, "", null, arguments)
code/modules/reagents/machinery/dispenser/reagent_tank.dm
+1 -1
View File
@@ -543,5 +543,5 @@
/obj/structure/reagent_dispensers/bloodbarrel/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_BLOOD, 1000, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"="O-","resistances"=null,"trace_chem"=null))
reagents.add_reagent(REAGENT_ID_BLOOD, 1000, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"="O-","resistances"=null,"trace_chem"=null,"changeling"=FALSE))
AddElement(/datum/element/climbable)
code/modules/reagents/reagent_containers/_reagent_containers.dm
+7
View File
@@ -164,3 +164,10 @@
EXTRAPOLATOR_ACT_SET(., EXTRAPOLATOR_ACT_PRIORITY_ISOLATE)
var/datum/reagent/blood/blood = reagents.get_reagent(REAGENT_ID_BLOOD)
EXTRAPOLATOR_ACT_ADD_DISEASES(., blood?.get_diseases())
/obj/item/reagent_containers/proc/attempt_changeling_test(var/obj/item/W,var/mob/user)
if(is_open_container() && W.is_hot())
var/datum/reagent/blood/B = reagents.get_reagent("blood")
if(B)
balloon_alert(user, "\The [W] burns the blood in \the [src].")
B.changling_blood_test(reagents)
code/modules/reagents/reagent_containers/blood_pack.dm
+1 -1
View File
@@ -36,7 +36,7 @@
if(blood_type != null)
label_text = "[blood_type]"
update_iv_label()
reagents.add_reagent(reag_id, 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null))
reagents.add_reagent(reag_id, 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null,"changeling"=FALSE))
update_icon()
/obj/item/reagent_containers/blood/on_reagent_change()
code/modules/reagents/reagent_containers/glass.dm
+1
View File
@@ -164,6 +164,7 @@
if(W && W.w_class <= w_class && (flags & OPENCONTAINER) && user.a_intent != I_HELP)
balloon_alert(user, "[W] dipped into \the [src].")
reagents.touch_obj(W, reagents.total_volume)
attempt_changeling_test(W,user)
/obj/item/reagent_containers/glass/proc/update_name_label()
if(label_text == "")
code/modules/reagents/reagent_containers/virology.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/item/reagent_containers/glass/beaker/vial/culture
name = "virus culture"
desc = "A bottle with a virus culture"
var/list/data = list("donor" = null, "viruses" = null, "blood_DNA" = null, "blood_type" = null, "resistances" = null, "trace_chems" = null)
var/list/data = list("donor" = null, "viruses" = null, "blood_DNA" = null, "blood_type" = null, "resistances" = null, "trace_chems" = null, "changeling"=FALSE)
var/list/diseases = list()
/obj/item/reagent_containers/glass/beaker/vial/culture/cold
code/modules/reagents/reagents/core.dm
+16 -2
View File
@@ -1,5 +1,5 @@
/datum/reagent/blood
data = new/list("donor" = null, "viruses" = null, "species" = SPECIES_HUMAN, "blood_DNA" = null, "blood_type" = null, "blood_colour" = "#A10808", "resistances" = null, "trace_chem" = null, REAGENT_ID_ANTIBODIES = list())
data = new/list("donor" = null, "viruses" = null, "species" = SPECIES_HUMAN, "blood_DNA" = null, "blood_type" = null, "blood_colour" = "#A10808", "resistances" = null, "trace_chem" = null, REAGENT_ID_ANTIBODIES = list(), "changeling" = FALSE)
name = REAGENT_BLOOD
id = REAGENT_ID_BLOOD
description = "Blood."
@@ -113,6 +113,9 @@
if(!data || !newdata)
return
if(newdata["species"] != "synthetic" && (data["changeling"] || newdata["changeling"]))
data["changeling"] = TRUE // Spread to other samples as an antag tactic
if(data["viruses"] || newdata["viruses"])
var/list/mix1 = data["viruses"]
var/list/mix2 = newdata["viruses"]
@@ -170,12 +173,23 @@
if(!H.isSynthetic() && data["species"] == "synthetic") // Remember not to inject oil into your veins, it's bad for you.
H.reagents.add_reagent(REAGENT_ID_TOXIN, removed * 1.5)
return
M.inject_blood(src, volume * volume_mod)
remove_self(volume)
/datum/reagent/blood/proc/changling_blood_test(var/datum/reagents/holder)
if(data["changeling"])
var/location = get_turf(holder.my_atom)
holder.my_atom.visible_message(span_danger("The blood in \the [holder.my_atom] screams and leaps out!"))
if(istype(holder.my_atom,/obj/item/reagent_containers/glass))
holder.splash(location, holder.total_volume)
holder.clear_reagents() // lets be sure it's all gone if it was in something weird instead
playsound(holder.my_atom, 'sound/effects/splat.ogg', 50, 1)
playsound(holder.my_atom, 'sound/voice/hiss6.ogg', 50, 1)
return TRUE
return FALSE
/datum/reagent/blood/proc/get_diseases()
. = list()
if(data && data["viruses"])