mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-29 07:59:01 +01:00
Several Diona Fixes (#12135)
This commit is contained in:
@@ -296,7 +296,7 @@
|
||||
/decl/reagent/lithium/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)
|
||||
if(M.canmove && !M.restrained() && !(istype(M.loc, /turf/space)))
|
||||
step(M, pick(cardinal))
|
||||
if(prob(5))
|
||||
if(prob(5) && ishuman(M))
|
||||
M.emote(pick("twitch", "drool", "moan"))
|
||||
|
||||
/decl/reagent/mercury
|
||||
@@ -323,7 +323,7 @@
|
||||
M.confused = max(M.confused, 10)
|
||||
if(dose > 4)
|
||||
M.add_chemical_effect(CE_CLUMSY, 1)
|
||||
if(prob(dose/4))
|
||||
if(prob(dose/4) && ishuman(M))
|
||||
M.emote(pick("twitch", "shiver", "drool"))
|
||||
if(prob(dose/4))
|
||||
M.visible_message("<b>[M]</b> chuckles spontaneously.", "You chuckle spontaneously.")
|
||||
@@ -446,7 +446,7 @@
|
||||
M.take_organ_damage(0, removed * power * 0.2) //burn damage, since it causes chemical burns. Acid doesn't make bones shatter, like brute trauma would.
|
||||
return
|
||||
if(!M.unacidable && removed > 0)
|
||||
if(istype(M, /mob/living/carbon/human) && REAGENT_VOLUME(holder, type) >= meltdose)
|
||||
if(ishuman(M) && REAGENT_VOLUME(holder, type) >= meltdose)
|
||||
var/mob/living/carbon/human/H = M
|
||||
var/obj/item/organ/external/affecting = H.get_organ(BP_HEAD)
|
||||
if(affecting)
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
|
||||
/decl/reagent/serotrotium/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)
|
||||
var/mob/living/carbon/human/H = M
|
||||
if(istype(H) && (H.species.flags & NO_BLOOD))
|
||||
if(!istype(H) || (istype(H) && (H.species.flags & NO_BLOOD))) //If we're not human OR if we're human but don't have blood.
|
||||
return
|
||||
if(prob(7))
|
||||
M.emote(pick("twitch", "drool", "moan", "gasp"))
|
||||
@@ -93,7 +93,7 @@
|
||||
M.add_chemical_effect(CE_NEUROTOXIC, 3*removed)
|
||||
if(prob(50))
|
||||
M.drowsiness = max(M.drowsiness, 3)
|
||||
if(prob(10))
|
||||
if(prob(10) && ishuman(M))
|
||||
M.emote("drool")
|
||||
|
||||
/decl/reagent/mindbreaker
|
||||
@@ -130,24 +130,20 @@
|
||||
if(dose < 1)
|
||||
M.apply_effect(3, STUTTER)
|
||||
M.make_dizzy(5)
|
||||
if(prob(5))
|
||||
M.emote(pick("twitch", "giggle"))
|
||||
else if(dose < 2)
|
||||
M.apply_effect(3, STUTTER)
|
||||
M.make_jittery(5)
|
||||
M.dizziness = max(150, M.dizziness)
|
||||
M.make_dizzy(5)
|
||||
M.druggy = max(M.druggy, 35)
|
||||
if(prob(10))
|
||||
M.emote(pick("twitch", "giggle"))
|
||||
else
|
||||
M.apply_effect(3, STUTTER)
|
||||
M.make_jittery(10)
|
||||
M.dizziness = max(150, M.dizziness)
|
||||
M.make_dizzy(10)
|
||||
M.druggy = max(M.druggy, 40)
|
||||
if(prob(15))
|
||||
M.emote(pick("twitch", "giggle"))
|
||||
if(ishuman(M) && prob(min(15, dose*5)))
|
||||
M.emote(pick("twitch", "giggle"))
|
||||
|
||||
/decl/reagent/raskara_dust
|
||||
name = "Raskara Dust"
|
||||
@@ -167,7 +163,7 @@
|
||||
/decl/reagent/raskara_dust/affect_breathe(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)
|
||||
M.add_chemical_effect(CE_PAINKILLER, 25)
|
||||
M.drowsiness += 2 * removed
|
||||
if(prob(5))
|
||||
if(prob(5) && ishuman(M))
|
||||
M.emote("cough")
|
||||
|
||||
/decl/reagent/raskara_dust/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)
|
||||
@@ -274,8 +270,9 @@
|
||||
M.add_chemical_effect(CE_PAINKILLER, 40) // basically like Perconol, but a bit worse
|
||||
// doesn't make you vomit, though
|
||||
if(prob(7))
|
||||
M.emote(pick("twitch", "drool", "moan", "giggle"))
|
||||
to_chat(M, SPAN_WARNING(pick("You feel great!", "You don't have a care in the world.", "You couldn't care less about anything.", "You feel so relaxed...")))
|
||||
if(ishuman(M))
|
||||
M.emote(pick("twitch", "drool", "moan", "giggle"))
|
||||
M.adjustOxyLoss(0.01 * removed)
|
||||
if(M.losebreath < 5)
|
||||
M.losebreath++
|
||||
|
||||
@@ -121,7 +121,7 @@
|
||||
if(injectable)
|
||||
affect_ingest(M, alien, removed, holder)
|
||||
|
||||
/decl/reagent/nutriment/affect_ingest(var/mob/living/carbon/human/M, var/alien, var/removed, var/datum/reagents/holder)
|
||||
/decl/reagent/nutriment/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)
|
||||
if(!istype(M))
|
||||
return
|
||||
var/obj/item/organ/internal/parasite/P = M.internal_organs_by_name["blackkois"]
|
||||
|
||||
@@ -471,7 +471,7 @@
|
||||
M.add_chemical_effect(CE_PULSE, -2)
|
||||
var/dose = M.chem_doses[type]
|
||||
if(dose < 2)
|
||||
if(dose == metabolism * 2 || prob(5))
|
||||
if(ishuman(M) && (dose == metabolism * 2 || prob(5)))
|
||||
M.emote("yawn")
|
||||
else if(dose < 3.5)
|
||||
M.eye_blurry = max(M.eye_blurry, 10)
|
||||
|
||||
Reference in New Issue
Block a user