cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 22:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes Toxin Damage from Drinking Blood in Virus Culture Bottles (#23968)

Browse Source 
* Make spawned_disease use O-

* Change type to Vh Null

* Make Vh Null not update blood_volume

* Make Vh Null not feed vampires

* Move string to define

* Update code/__DEFINES/reagents_defines.dm

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

---------

Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
This commit is contained in:
Arthri
2024-03-01 23:34:09 +00:00
committed by GitHub
co-authored by GDN Arthri
parent 27c70cde0a
commit 8844a2ab97
5 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/water.dm
+1 -1
View File
@@ -118,7 +118,7 @@
if(method == REAGENT_INGEST && iscarbon(M))
var/mob/living/carbon/C = M
if(C.mind?.has_antag_datum(/datum/antagonist/vampire))
if(C.mind?.has_antag_datum(/datum/antagonist/vampire) && data["blood_type"] != BLOOD_TYPE_FAKE_BLOOD)
C.set_nutrition(min(NUTRITION_LEVEL_WELL_FED, C.nutrition + 10))
C.blood_volume = min(C.blood_volume + round(volume, 0.1), BLOOD_VOLUME_NORMAL)
..()
code/modules/reagents/chemistry/reagents_datum.dm
+2 -1
View File
@@ -78,7 +78,8 @@
if(id == "blood" && !(data?["blood_type"] in get_safe_blood(C.dna?.blood_type)) || C.dna?.species.name != data?["species"] && (data?["species_only"] || C.dna?.species.own_species_blood))
C.reagents.add_reagent("toxin", volume * 0.5)
else
C.blood_volume = min(C.blood_volume + round(volume, 0.1), BLOOD_VOLUME_NORMAL)
if(data?["blood_type"] != BLOOD_TYPE_FAKE_BLOOD)
C.blood_volume = min(C.blood_volume + round(volume, 0.1), BLOOD_VOLUME_NORMAL)
// This does not absorb the blood we are getting in *this* reagent transfer operation,
// (because the actual transfer has not happened yet. Because reasons) but it does process
// the blood already in the mob.
code/modules/reagents/reagent_containers.dm
+1 -1
View File
@@ -39,7 +39,7 @@
create_reagents(volume, temperature_min, temperature_max)
if(spawned_disease)
var/datum/disease/F = new spawned_disease(0)
var/list/data = list("viruses" = list(F), "blood_color" = "#A10808")
var/list/data = list("viruses" = list(F), "blood_color" = "#A10808", "blood_type" = BLOOD_TYPE_FAKE_BLOOD)
reagents.add_reagent("blood", disease_amount, data)
add_initial_reagents()