mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-20 03:25:49 +01:00
Makes gas reagents have standardized behavior, skrell liver behavior generalized
This commit is contained in:
@@ -63,13 +63,18 @@
|
||||
return
|
||||
|
||||
/datum/reagent/proc/on_mob_life(var/mob/living/M as mob, var/alien)
|
||||
if(!istype(M, /mob/living)) // YOU'RE A FUCKING RETARD NEO WHY CAN'T YOU JUST FIX THE PROBLEM ON THE REAGENT - Iamgoofball
|
||||
return //Noticed runtime errors from facid trying to damage ghosts, this should fix. --NEO
|
||||
// Certain elements in too large amounts cause side-effects
|
||||
if(!istype(M))
|
||||
return
|
||||
if(reagent_state == GAS && M.stat != DEAD && ishuman(M))
|
||||
// make gas reagents affect people like the gasses
|
||||
var/mob/living/carbon/human/H = M
|
||||
if(id == H.species.breath_type)
|
||||
M.adjustOxyLoss(-2*REM)
|
||||
else if(id == H.species.poison_type)
|
||||
M.adjustToxLoss(REAGENTS_METABOLISM)
|
||||
if(holder)
|
||||
holder.remove_reagent(src.id, metabolization_rate) //By default it slowly disappears.
|
||||
holder.remove_reagent(id, metabolization_rate) //By default it slowly disappears.
|
||||
current_cycle++
|
||||
return
|
||||
|
||||
// Called when two reagents of the same are mixing.
|
||||
/datum/reagent/proc/on_merge(var/data)
|
||||
|
||||
@@ -36,8 +36,7 @@
|
||||
if(ishuman(M) && !M.isSynthetic())
|
||||
var/mob/living/carbon/human/H = M
|
||||
L = H.get_int_organ(/obj/item/organ/internal/liver)
|
||||
if(!L || (istype(L) && L.dna.species in list("Skrell", "Neara")))
|
||||
d*=5
|
||||
d *= L ? L.alcohol_intensity : 5
|
||||
|
||||
M.dizziness += dizzy_adj.
|
||||
if(d >= slur_start && d < pass_out)
|
||||
|
||||
@@ -42,16 +42,6 @@
|
||||
reagent_state = GAS
|
||||
color = "#808080" // rgb: 128, 128, 128
|
||||
|
||||
/datum/reagent/oxygen/on_mob_life(var/mob/living/M as mob, var/alien)
|
||||
if(M.stat == 2) return
|
||||
if(ishuman(M))
|
||||
var/mob/living/carbon/human/H = M
|
||||
if(H.species && (H.species.name == "Vox" || H.species.name =="Vox Armalis"))
|
||||
M.adjustToxLoss(REAGENTS_METABOLISM)
|
||||
holder.remove_reagent(src.id, REAGENTS_METABOLISM) //By default it slowly disappears.
|
||||
return
|
||||
..()
|
||||
|
||||
|
||||
/datum/reagent/nitrogen
|
||||
name = "Nitrogen"
|
||||
@@ -60,16 +50,6 @@
|
||||
reagent_state = GAS
|
||||
color = "#808080" // rgb: 128, 128, 128
|
||||
|
||||
/datum/reagent/nitrogen/on_mob_life(var/mob/living/M as mob, var/alien)
|
||||
if(M.stat == 2) return
|
||||
if(ishuman(M))
|
||||
var/mob/living/carbon/human/H = M
|
||||
if(H.species && (H.species.name == "Vox" || H.species.name =="Vox Armalis"))
|
||||
M.adjustOxyLoss(-2*REM)
|
||||
holder.remove_reagent(src.id, REAGENTS_METABOLISM) //By default it slowly disappears.
|
||||
return
|
||||
..()
|
||||
|
||||
|
||||
/datum/reagent/hydrogen
|
||||
name = "Hydrogen"
|
||||
|
||||
Reference in New Issue
Block a user