cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replaces vox O2 downside with vox only blood. (#18523)

Browse Source 
* Replaces vox brute downside with vox only blood.

* I'm dumb, but at least I am not stupid

* Update code/modules/reagents/chemistry/reagents/water.dm

Co-authored-by: Adri <jozsef.adrienn@gmail.com>

* Add to medbay, cargo, makes blood colour work

* more readable

* Update code/modules/reagents/chemistry/reagents.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* spacing, removes == "Vox"

* test time

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* makes it work and testing works

Co-authored-by: Adri <jozsef.adrienn@gmail.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
This commit is contained in:
Qwertytoforty
2022-08-11 00:41:17 +01:00
committed by GitHub
co-authored by Adri Charlie SteelSlayer
parent cf641caf12
commit 7276267a94
9 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/blood.dm
+3 -1
View File
@@ -164,7 +164,7 @@
if((D.spread_flags & SPECIAL) || (D.spread_flags & NON_CONTAGIOUS))
continue
C.ForceContractDisease(D)
if(!(blood_data["blood_type"] in get_safe_blood(C.dna.blood_type)))
if(!(blood_data?["blood_type"] in get_safe_blood(C.dna.blood_type)) || C.dna.species.name != blood_data["species"] && (blood_data["species_only"] || C.dna.species.own_species_blood))
C.reagents.add_reagent("toxin", amount * 0.5)
return 1
@@ -208,6 +208,8 @@
blood_data["blood_color"] = dna.species.blood_color
blood_data["factions"] = faction
blood_data["dna"] = dna.Clone()
blood_data["species"] = dna.species.name
blood_data["species_only"] = dna.species.own_species_blood
return blood_data
if(blood_id == "slimejelly")
var/blood_data = list()