Oxygen is Toxic to the Vox, Plasma Heals Plasmamen, Plasmaman Suit Autoextinguishes, Oxygen Burns Plasmamen

Oxygen is toxic to the Vox (as toxic as plasma).
Plasma healing plasmaman from swindly @
https://github.com/tgstation/tgstation/pull/24209
Plasmaman suit auto-extinguishing actually does something now.
Oxygen burns Plasmamen.
This commit is contained in:
KasparoVy
2017-02-21 07:26:04 -05:00
parent fb1cef8029
commit 829dcf4229
7 changed files with 40 additions and 8 deletions
@@ -39,6 +39,25 @@
reagent_state = GAS
color = "#808080" // rgb: 128, 128, 128
/datum/reagent/oxygen/on_mob_life(var/mob/living/carbon/human/H)
if(istype(H) && H.species && H.species.poison_type && H.species.poison_type == id)
H.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER) //Same as plasma.
if(istype(H) && H.species && H.species.flags & PLASMA_BASED) //Oxygen lights up plasma-based lifeforms.
if(prob(60))
H.adjust_fire_stacks(0.25)
if(prob(40))
H.IgniteMob() //Light them up.
..()
/datum/reagent/oxygen/reaction_mob(var/mob/living/carbon/human/H, method=TOUCH, volume)
if(istype(H) && H.species && H.species.flags & PLASMA_BASED) //Oxygen lights up plasma-based lifeforms.
if(method == INGEST)
to_chat(H, "<span class='warning'>You feel a horrible burning from within as your body bursts into flame!</span>")
if(method == TOUCH)
to_chat(H, "<span class='warning'>Your body bursts into flames as it comes into contact with the substance!</span>")
H.adjust_fire_stacks(1) //Same as phlogiston, guaranteed one-time firestack delivery and ignition.
H.IgniteMob()
..()
/datum/reagent/nitrogen
name = "Nitrogen"
@@ -22,7 +22,12 @@
color = "#7A2B94"
/datum/reagent/plasma/on_mob_life(mob/living/M)
M.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER)
var/mob/living/carbon/human/H = M
if(istype(H) && H.species && H.species.flags & PLASMA_BASED) //Plasma shouldn't poison plasmamen.
if(prob(20))
H.heal_organ_damage(1, 1)
else
M.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER)
if(holder.has_reagent("epinephrine"))
holder.remove_reagent("epinephrine", 2)
if(iscarbon(M))