cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 07:59:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Drowsiness Changes (#11996)

Browse Source 
* Drowsiness Changes

* Spelling Fixes
This commit is contained in:
Doxxmedearly
2021-06-24 21:48:15 -03:00
committed by GitHub
parent da1ba3bd84
commit d548614525
18 changed files with 73 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm
+7 -7
View File
@@ -21,7 +21,7 @@
M.add_chemical_effect(CE_PAINKILLER, 5 + round(power,5))
if(power > 5)
M.drowsyness = min(20,max(M.drowsyness,power - 5))
M.drowsiness = min(20,max(M.drowsiness,power - 5))
if(power > 10)
var/nutrition_percent = M.nutrition/M.max_nutrition
@@ -92,7 +92,7 @@
if(prob(80))
M.add_chemical_effect(CE_NEUROTOXIC, 3*removed)
if(prob(50))
M.drowsyness = max(M.drowsyness, 3)
M.drowsiness = max(M.drowsiness, 3)
if(prob(10))
M.emote("drool")
@@ -162,17 +162,17 @@
/decl/reagent/raskara_dust/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)
M.add_chemical_effect(CE_PAINKILLER, 10)
M.drowsyness += 1 * removed
M.drowsiness += 1 * removed
/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.drowsyness += 2 * removed
M.drowsiness += 2 * removed
if(prob(5))
M.emote("cough")
/decl/reagent/raskara_dust/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)
M.add_chemical_effect(CE_PAINKILLER, 50)
M.drowsyness += 3 * removed
M.drowsiness += 3 * removed
if(prob(5))
M.emote("twitch")
@@ -198,7 +198,7 @@
holder.reagent_data[type]["special"] += (REAGENT_VOLUME(holder, type)/10)*removed
M.make_jittery(5 + holder.reagent_data[type]["special"])
M.drowsyness = max(0,M.drowsyness - (1 + holder.reagent_data[type]["special"]*0.1))
M.drowsiness = max(0,M.drowsiness - (1 + holder.reagent_data[type]["special"]*0.1))
if(holder.reagent_data[type]["special"] > 5)
M.add_chemical_effect(CE_SPEEDBOOST, 1)
M.apply_effect(1 + holder.reagent_data[type]["special"]*0.25, STUTTER)
@@ -280,7 +280,7 @@
if(M.losebreath < 5)
M.losebreath++
if(prob(50))
M.drowsyness = max(M.drowsyness, 3)
M.drowsiness = max(M.drowsiness, 3)
/decl/reagent/toxin/krok
name = "Krok Juice"
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+7 -7
View File
@@ -724,7 +724,7 @@
if (caffeine)
M.add_up_to_chemical_effect(CE_SPEEDBOOST, caffeine)
M.dizziness = max(0, M.dizziness + adj_dizzy)
M.drowsyness = max(0, M.drowsyness + adj_drowsy)
M.drowsiness = max(0, M.drowsiness + adj_drowsy)
M.sleeping = max(0, M.sleeping + adj_sleepy)
if(add_nutrition == TRUE)
@@ -1376,7 +1376,7 @@
if(alien != IS_DIONA)
M.dizziness = max(0, M.dizziness - 5)
M.drowsyness = max(0, M.drowsyness - 3)
M.drowsiness = max(0, M.drowsiness - 3)
M.sleeping = max(0, M.sleeping - 2)
M.intoxication = max(0, (M.intoxication - (removed*0.25)))
@@ -1745,7 +1745,7 @@
M.make_jittery(20)
M.druggy = max(M.druggy, 30)
M.dizziness += 5
M.drowsyness = 0
M.drowsiness = 0
/decl/reagent/drink/grenadine
name = "Grenadine Syrup"
@@ -2195,7 +2195,7 @@
..()
if(alien != IS_DIONA)
M.dizziness = max(0, M.dizziness - 5)
M.drowsyness = max(0, M.drowsyness - 3)
M.drowsiness = max(0, M.drowsiness - 3)
M.sleeping = max(0, M.sleeping - 2)
if(M.bodytemperature > 310)
M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
@@ -2319,7 +2319,7 @@
..()
if(alien == IS_DIONA)
return
M.drowsyness = max(0, M.drowsyness - 7)
M.drowsiness = max(0, M.drowsiness - 7)
M.make_jittery(5)
if (M.bodytemperature > 310)
@@ -4445,7 +4445,7 @@
if(alien != IS_DIONA)
M.make_jittery(20)
M.dizziness += 5
M.drowsyness = 0
M.drowsiness = 0
/decl/reagent/drink/zorasoda/venomgrass
name = "Zo'ra Soda Sour Venom Grass"
@@ -4528,7 +4528,7 @@
if(alien != IS_DIONA)
M.druggy = max(M.druggy, 30)
M.dizziness += 5
M.drowsyness = 0
M.drowsiness = 0
/decl/reagent/drink/hrozamal_soda
name = "Hro'zamal Soda"
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
+7 -7
View File
@@ -133,7 +133,7 @@
return
if(remove_generic)
M.drowsyness = max(0, M.drowsyness - 6 * removed)
M.drowsiness = max(0, M.drowsiness - 6 * removed)
M.hallucination -= (2 * removed)
if(check_min_dose(M, 0.5))
M.add_up_to_chemical_effect(CE_ANTITOXIN, 1)
@@ -392,7 +392,7 @@
metabolism_min = REM * 0.0125
/decl/reagent/synaptizine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)
M.drowsyness = max(M.drowsyness - 5, 0)
M.drowsiness = max(M.drowsiness - 5, 0)
if(REAGENT_VOLUME(holder, type) < 10) // Will prevent synaptizine interrupting a seizure caused by its own overdose.
M.AdjustParalysis(-1)
M.AdjustStunned(-1)
@@ -602,7 +602,7 @@
//These status effects will now take a little while for the dose to build up and remove them
M.dizziness = max(0, M.dizziness - DP)
M.drowsyness = max(0, M.drowsyness - DP)
M.drowsiness = max(0, M.drowsiness - DP)
M.stuttering = max(0, M.stuttering - DP)
M.confused = max(0, M.confused - DP)
@@ -788,7 +788,7 @@
if(prob(7))
M.add_chemical_effect(CE_NEUROTOXIC, 3 * removed)
if(prob(50))
M.drowsyness = max(M.drowsyness, 3)
M.drowsiness = max(M.drowsiness, 3)
/decl/reagent/cetahydramine
name = "Cetahydramine"
@@ -806,7 +806,7 @@
/decl/reagent/cetahydramine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)
M.add_chemical_effect(CE_NOITCH, M.chem_doses[type] * 2) // 5 units of cetahydramine will counter 10 units of dermaline/butazoline itching.
if(prob(M.chem_doses[type]/2))
M.drowsyness += 2
M.drowsiness += 2
/decl/reagent/sterilizine
name = "Sterilizine"
@@ -1021,7 +1021,7 @@
M.eye_blurry = max(M.eye_blurry, 30)
if(REAGENT_VOLUME(M.reagents, /decl/reagent/oxycomorphine))
M.ear_deaf = 20
M.drowsyness = max(M.drowsyness, 10)
M.drowsiness = max(M.drowsiness, 10)
M.make_dizzy(15)
if(prob(3))
to_chat(M, SPAN_GOOD(pick("You lose all sense of connection to the real world.", "Everything is so tranquil.", "You feel dettached from reality.", "Your feel disconnected from your body.", "You are aware of nothing but your conscious thoughts.")))
@@ -1077,7 +1077,7 @@
/decl/reagent/mental/vaam/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)
. = ..()
M.add_chemical_effect(CE_PAINKILLER, 5)
M.drowsyness = 0
M.drowsiness = 0
/decl/reagent/mental/vaam/overdose(var/mob/living/carbon/human/M, var/alien, var/removed, var/scale, var/datum/reagents/holder)
. = ..()
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
+1 -1
View File
@@ -121,7 +121,7 @@
M.SetParalysis(0)
M.silent = 0
M.dizziness = 0
M.drowsyness = 0
M.drowsiness = 0
M.stuttering = 0
M.confused = 0
M.sleeping = 0
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
+4 -4
View File
@@ -478,10 +478,10 @@
else if(dose < 7)
if(prob(50))
M.Weaken(2)
M.drowsyness = max(M.drowsyness, 20)
M.drowsiness = max(M.drowsiness, 20)
else
M.sleeping = max(M.sleeping, 20)
M.drowsyness = max(M.drowsyness, 60)
M.drowsiness = max(M.drowsiness, 60)
/decl/reagent/polysomnine
name = "Polysomnine"
@@ -501,7 +501,7 @@
var/dose = M.chem_doses[type]
if(dose == metabolism)
M.confused += 2
M.drowsyness += 2
M.drowsiness += 2
else if(dose < 2)
M.Weaken(30)
M.eye_blurry = max(M.eye_blurry, 10)
@@ -619,7 +619,7 @@
update_canmove()
/mob/living/carbon/human/proc/berserk_process()
drowsyness = max(drowsyness - 5, 0)
drowsiness = max(drowsiness - 5, 0)
AdjustParalysis(-1)
AdjustStunned(-1)
AdjustWeakened(-1)