cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-15 00:53:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Overdose Rework

Browse Source
This commit is contained in:
Fox-McCloud
2016-05-03 19:55:11 -04:00
parent 12b6b22aad
commit b295e7809e
14 changed files with 411 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob.dm
+5 -3
View File
@@ -1349,16 +1349,18 @@ mob/proc/yank_out_object()
ghost.notify_cloning(message, sound, source)
return ghost
/mob/proc/fakevomit(green=0) //for aesthetic vomits that need to be instant and do not stun. -Fox
/mob/proc/fakevomit(green = 0, no_text = 0) //for aesthetic vomits that need to be instant and do not stun. -Fox
if(stat==DEAD)
return
var/turf/location = loc
if (istype(location, /turf/simulated))
if(green)
src.visible_message("<span class='warning'>[src] vomits up some green goo!</span>","<span class='warning'>You vomit up some green goo!</span>")
if(!no_text)
visible_message("<span class='warning'>[src] vomits up some green goo!</span>","<span class='warning'>You vomit up some green goo!</span>")
new /obj/effect/decal/cleanable/vomit/green(location)
else
src.visible_message("<span class='warning'>[src] pukes all over \himself!</span>","<span class='warning'>You puke all over yourself!</span>")
if(!no_text)
visible_message("<span class='warning'>[src] pukes all over \himself!</span>","<span class='warning'>You puke all over yourself!</span>")
location.add_vomit_floor(src, 1)
playsound(location, 'sound/effects/splat.ogg', 50, 1)
code/modules/reagents/newchem/disease.dm
+13
View File
@@ -50,6 +50,19 @@
M.ForceContractDisease(new /datum/disease/tuberculosis(0))
..()
/datum/reagent/jagged_crystals
name = "Jagged Crystals"
id = "jagged_crystals"
description = "Rapid chemical decomposition has warped these crystals into twisted spikes."
reagent_state = SOLID
color = "#FA0000" // rgb: 250, 0, 0
/datum/reagent/jagged_crystals/on_mob_life(var/mob/living/carbon/M as mob)
if(!M) M = holder.my_atom
M.ForceContractDisease(new /datum/disease/berserker(0))
..()
/datum/reagent/spore
name = "Blob Spores"
id = "spore"
code/modules/reagents/newchem/drugs.dm
+163 -55
View File
@@ -26,11 +26,45 @@
..()
return
/datum/reagent/nicotine/overdose_process(var/mob/living/M as mob)
M.adjustToxLoss(1*REM)
M.adjustOxyLoss(1*REM)
..()
return
/datum/reagent/nicotine/overdose_process(var/mob/living/M as mob, severity)
var/effect = ..()
if(severity == 1)
if(effect <= 2)
M.visible_message("<span class='warning'>[M] looks nervous!</span>")
M.confused += 15
M.adjustToxLoss(2)
M.Jitter(10)
M.emote("twitch_s")
else if(effect <= 4)
M.visible_message("<span class='warning'>[M] is all sweaty!</span>")
M.bodytemperature += rand(15,30)
M.adjustToxLoss(3)
else if(effect <= 7)
M.adjustToxLoss(4)
M.emote("twitch")
M.Jitter(10)
else if(severity == 2)
if(effect <= 2)
M.emote("gasp")
to_chat(M, "<span class='warning'>You can't breathe!</span>")
M.adjustOxyLoss(15)
M.adjustToxLoss(3)
M.Stun(1)
else if(effect <= 4)
to_chat(M, "<span class='warning'>You feel terrible!</span>")
M.emote("drool")
M.Jitter(10)
M.adjustToxLoss(5)
M.Weaken(1)
M.confused += 33
else if(effect <= 7)
M.emote("collapse")
to_chat(M, "<span class='warning'>Your heart is pounding!</span>")
M << sound('sound/goonstation/effects/heartbeat.ogg')
M.Paralyse(5)
M.Jitter(30)
M.adjustToxLoss(6)
M.adjustOxyLoss(20)
/datum/reagent/crank
name = "Crank"
@@ -62,12 +96,45 @@
M.emote(pick("groan", "moan"))
..()
return
/datum/reagent/crank/overdose_process(var/mob/living/M as mob)
M.adjustBrainLoss(rand(1,10)*REM)
M.adjustToxLoss(rand(1,10)*REM)
M.adjustBruteLoss(rand(1,10)*REM)
..()
return
/datum/reagent/crank/overdose_process(var/mob/living/M as mob, severity)
var/effect = ..()
if(severity == 1)
if(effect <= 2)
M.visible_message("<span class='warning'>[M] looks confused!</span>")
M.confused += 20
M.Jitter(20)
M.emote("scream")
else if(effect <= 4)
M.visible_message("<span class='warning'>[M] is all sweaty!</span>")
M.bodytemperature += rand(5,30)
M.adjustBrainLoss(1)
M.adjustToxLoss(1)
M.Stun(2)
else if(effect <= 7)
M.Jitter(30)
M.emote("grumble")
else if(severity == 2)
if(effect <= 2)
M.visible_message("<span class='warning'>[M] is sweating like a pig!</span>")
M.bodytemperature += rand(20,100)
M.adjustToxLoss(5)
M.Stun(3)
else if(effect <= 4)
M.visible_message("<span class='warning'>[M] starts tweaking the hell out!</span>")
M.Jitter(100)
M.adjustToxLoss(2)
M.adjustBrainLoss(8)
M.Weaken(3)
M.confused += 25
M.emote("scream")
M.reagents.add_reagent("jagged_crystals", 5)
else if(effect <= 7)
M.emote("scream")
M.visible_message("<span class='warning'>[M] nervously scratches at their skin!</span>")
M.Jitter(10)
M.adjustBruteLoss(5)
M.emote("twitch_s")
/datum/chemical_reaction/crank
name = "Crank"
@@ -120,12 +187,40 @@
..()
return
/datum/reagent/krokodil/overdose_process(var/mob/living/M as mob)
if(prob(10))
M.adjustBrainLoss(rand(1,5)*REM)
M.adjustToxLoss(rand(1,5)*REM)
..()
return
/datum/reagent/krokodil/overdose_process(var/mob/living/M as mob, severity)
var/effect = ..()
if(severity == 1)
if(effect <= 2)
M.visible_message("<span class='warning'>[M] looks dazed!</span>")
M.Stun(3)
M.emote("drool")
else if(effect <= 4)
M.emote("shiver")
M.bodytemperature -= 40
else if(effect <= 7)
to_chat(M, "<span class='warning'>Your skin is cracking and bleeding!</span>")
M.adjustBruteLoss(5)
M.adjustToxLoss(2)
M.adjustBrainLoss(1)
M.emote("cry")
else if(severity == 2)
if(effect <= 2)
M.visible_message("<span class='warning'>[M]</b> sways and falls over!</span>")
M.adjustToxLoss(3)
M.adjustBrainLoss(3)
M.Weaken(8)
M.emote("faint")
else if(effect <= 4)
if(ishuman(M))
var/mob/living/carbon/human/H = M
H.visible_message("<span class='warning'>[M]'s skin is rotting away!</span>")
H.adjustBruteLoss(25)
H.emote("scream")
H.ChangeToHusk()
H.emote("faint")
else if(effect <= 7)
M.emote("shiver")
M.bodytemperature -= 70
/datum/chemical_reaction/krokodil
name = "Krokodil"
@@ -169,19 +264,30 @@
..()
return
/datum/reagent/methamphetamine/overdose_process(var/mob/living/M as mob)
if(prob(20))
M.emote("laugh")
if(prob(33))
M.visible_message("<span class='danger'>[M]'s hands flip out and flail everywhere!</span>")
var/obj/item/I = M.get_active_hand()
if(I)
M.drop_item()
..()
if(prob(50))
M.adjustToxLoss(10)
M.adjustBrainLoss(pick(0.5, 0.6, 0.7, 0.8, 0.9, 1))
return
/datum/reagent/methamphetamine/overdose_process(var/mob/living/M as mob, severity)
var/effect = ..()
if(severity == 1)
if(effect <= 2)
M.visible_message("<span class='warning'>[M] can't seem to control their legs!</span>")
M.confused += 20
M.Weaken(4)
else if(effect <= 4)
M.visible_message("<span class='warning'>[M]'s hands flip out and flail everywhere!</span>")
M.drop_l_hand()
M.drop_r_hand()
else if(effect <= 7)
M.emote("laugh")
else if(severity == 2)
if(effect <= 2)
M.visible_message("<span class='warning'>[M]'s hands flip out and flail everywhere!</span>")
M.drop_l_hand()
M.drop_r_hand()
else if(effect <= 4)
M.visible_message("<span class='warning'>[M] falls to the floor and flails uncontrollably!</span>")
M.Jitter(10)
M.Weaken(10)
else if(effect <= 7)
M.emote("laugh")
/datum/chemical_reaction/methamphetamine
name = "methamphetamine"
@@ -255,7 +361,7 @@
mix_message = "Tiny cubic crystals precipitate out of the mixture. Huh."
mix_sound = 'sound/goonstation/misc/fuse.ogg'
/datum/reagent/bath_salts/overdose_process(var/mob/living/M as mob)
/datum/reagent/bath_salts/overdose_process(var/mob/living/M as mob, severity)
M.hallucination += 10
if(M.canmove && !istype(M.loc, /turf/space))
for(var/i = 0, i < 8, i++)
@@ -266,7 +372,6 @@
var/obj/item/I = M.get_active_hand()
if(I)
M.drop_item()
..()
return
/datum/chemical_reaction/aranesp
@@ -381,24 +486,30 @@
/datum/reagent/fliptonium/reagent_deleted(var/mob/living/M as mob)
M.SpinAnimation(speed = 12, loops = -1)
/datum/reagent/fliptonium/overdose_process(var/mob/living/M as mob)
if(volume > 15)
if(prob(5))
switch(pick(1, 2, 3))
if(1)
M.emote("laugh")
M.adjustToxLoss(1)
if(2)
to_chat(M, "<span class='danger'>[M] can't seem to control their legs!</span>")
M.Weaken(8)
M.adjustToxLoss(1)
if(3)
to_chat(M, "<span class='danger'>[M]'s hands flip out and flail everywhere!</span>")
M.drop_l_hand()
M.drop_r_hand()
M.adjustToxLoss(1)
..()
return
/datum/reagent/fliptonium/overdose_process(var/mob/living/M as mob, severity)
var/effect = ..()
if(severity == 1)
if(effect <= 2)
M.visible_message("<span class='warning'>[M] can't seem to control their legs!</span>")
M.confused += 33
M.Weaken(2)
else if(effect <= 4)
M.visible_message("<span class='warning'>[M]'s hands flip out and flail everywhere!</span>")
M.drop_l_hand()
M.drop_r_hand()
else if(effect <= 7)
M.emote("laugh")
else if(severity == 2)
if(effect <= 2)
M.visible_message("<span class='warning'>[M]'s hands flip out and flail everywhere!</span>")
M.drop_l_hand()
M.drop_r_hand()
else if (effect <= 4)
M.visible_message("<span class='warning'>[M] falls to the floor and flails uncontrollably!</span>")
M.Jitter(5)
M.Weaken(5)
else if(effect <= 7)
M.emote("laugh")
//////////////////////////////
// Synth-Drugs //
@@ -445,7 +556,7 @@
..()
return
/datum/reagent/lube/ultra/overdose_process(var/mob/living/M as mob)
/datum/reagent/lube/ultra/overdose_process(var/mob/living/M as mob, severity)
if(prob(20))
M.emote("ping")
if(prob(33))
@@ -457,7 +568,6 @@
if(prob(50))
M.adjustFireLoss(10)
M.adjustBrainLoss(pick(0.5, 0.6, 0.7, 0.8, 0.9, 1))
return
//Surge: Krokodil
/datum/reagent/surge
@@ -484,7 +594,7 @@
..()
return
/datum/reagent/surge/overdose_process(var/mob/living/M as mob)
/datum/reagent/surge/overdose_process(var/mob/living/M as mob, severity)
//Hit them with the same effects as an electrode!
M.Stun(5)
M.Weaken(5)
@@ -502,8 +612,6 @@
B.icon = I
M.adjustFireLoss(rand(1,5)*REM)
M.adjustBruteLoss(rand(1,5)*REM)
..()
return
/datum/chemical_reaction/surge
name = "Surge"
code/modules/reagents/newchem/food.dm
+8 -13
View File
@@ -175,15 +175,12 @@ datum/reagent/mugwort/on_mob_life(var/mob/living/M as mob)
metabolization_rate = 0.2
overdose_threshold = 133
datum/reagent/porktonium/overdose_process(var/mob/living/M as mob)
if(volume > 133)
if(prob(15))
M.reagents.add_reagent("cholesterol", rand(1,3))
if(prob(8))
M.reagents.add_reagent("radium", 15)
M.reagents.add_reagent("cyanide", 10)
..()
return
/datum/reagent/porktonium/overdose_process(var/mob/living/M as mob, severity)
if(prob(15))
M.reagents.add_reagent("cholesterol", rand(1,3))
if(prob(8))
M.reagents.add_reagent("radium", 15)
M.reagents.add_reagent("cyanide", 10)
/datum/reagent/fungus
name = "Space fungus"
@@ -283,11 +280,10 @@ datum/reagent/cheese/reaction_turf(var/turf/T, var/volume)
color = "#B2B139"
overdose_threshold = 50
/datum/reagent/fake_cheese/overdose_process(var/mob/living/M as mob)
/datum/reagent/fake_cheese/overdose_process(var/mob/living/M as mob, severity)
if(prob(8))
to_chat(M, "<span class='warning'>You feel something squirming in your stomach. Your thoughts turn to cheese and you begin to sweat.</span>")
M.adjustToxLoss(rand(1,2))
..()
/datum/reagent/weird_cheese
name = "Weird cheese"
@@ -442,7 +438,7 @@ datum/reagent/ectoplasm/reaction_turf(var/turf/T, var/volume)
..()
return
/datum/reagent/hydrogenated_soybeanoil/overdose_process(var/mob/living/M as mob)
/datum/reagent/hydrogenated_soybeanoil/overdose_process(var/mob/living/M as mob, severity)
if(prob(33))
to_chat(M, "<span class='warning'>You feel horribly weak.</span>")
if(prob(10))
@@ -453,7 +449,6 @@ datum/reagent/ectoplasm/reaction_turf(var/turf/T, var/volume)
M.adjustOxyLoss(25)
M.Stun(5)
M.Paralyse(10)
..()
/datum/chemical_reaction/hydrogenated_soybeanoil
name = "Partially hydrogenated space-soybean oil"
code/modules/reagents/newchem/medicine.dm
+83 -55
View File
@@ -65,6 +65,7 @@ datum/reagent/salglu_solution
description = "This saline and glucose solution can help stabilize critically injured patients and cleanse wounds."
reagent_state = LIQUID
color = "#C8A5DC"
penetrates_skin = 1
metabolization_rate = 0.15
datum/reagent/salglu_solution/on_mob_life(var/mob/living/M as mob)
@@ -170,7 +171,7 @@ datum/reagent/omnizine
overdose_threshold = 30
addiction_chance = 5
datum/reagent/omnizine/on_mob_life(var/mob/living/M as mob)
/datum/reagent/omnizine/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M.adjustToxLoss(-1*REM)
M.adjustOxyLoss(-1*REM)
@@ -181,13 +182,39 @@ datum/reagent/omnizine/on_mob_life(var/mob/living/M as mob)
..()
return
datum/reagent/omnizine/overdose_process(var/mob/living/M as mob)
M.adjustToxLoss(3*REM)
M.adjustOxyLoss(3*REM)
M.adjustBruteLoss(3*REM)
M.adjustFireLoss(3*REM)
..()
return
/datum/reagent/omnizine/overdose_process(var/mob/living/M as mob, severity)
var/effect = ..()
if(severity == 1) //lesser
M.stuttering += 1
if(effect <= 1)
M.visible_message("<span class='warning'>[M] suddenly cluches their gut!</span>")
M.emote("scream")
M.Stun(4)
M.Weaken(4)
else if(effect <= 3)
M.visible_message("<span class='warning'>[M] completely spaces out for a moment.</span>")
M.confused += 15
else if(effect <= 5)
M.visible_message("<span class='warning'>[M] stumbles and staggers.</span>")
M.Dizzy(5)
M.Weaken(3)
else if(effect <= 7)
M.visible_message("<span class='warning'>[M] shakes uncontrollably.</span>")
M.Jitter(30)
else if(severity == 2) // greater
if(effect <= 2)
M.visible_message("<span class='warning'>[M] suddenly cluches their gut!</span>")
M.emote("scream")
M.Stun(7)
M.Weaken(7)
else if(effect <= 5)
M.visible_message("<span class='warning'>[M] jerks bolt upright, then collapses!</span>")
M.Paralyse(5)
M.Weaken(4)
else if(effect <= 8)
M.visible_message("<span class='warning'>[M] stumbles and staggers.</span>")
M.Dizzy(5)
M.Weaken(3)
datum/reagent/calomel
name = "Calomel"
@@ -290,13 +317,6 @@ datum/reagent/sal_acid/on_mob_life(var/mob/living/M as mob)
..()
return
datum/reagent/sal_acid/overdose_process(var/mob/living/M as mob)
if(volume > 25)
if(prob(8))
M.adjustToxLoss(rand(1,2))
..()
return
/datum/chemical_reaction/sal_acid
name = "Salicyclic Acid"
id = "sal_acid"
@@ -361,17 +381,17 @@ datum/reagent/perfluorodecalin/on_mob_life(var/mob/living/carbon/human/M as mob)
mix_message = "The mixture rapidly turns into a dense pink liquid."
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
datum/reagent/ephedrine
/datum/reagent/ephedrine
name = "Ephedrine"
id = "ephedrine"
description = "Ephedrine is a plant-derived stimulant."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 0.3
overdose_threshold = 45
overdose_threshold = 35
addiction_chance = 25
datum/reagent/ephedrine/on_mob_life(var/mob/living/M as mob)
/datum/reagent/ephedrine/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M.drowsyness = max(0, M.drowsyness-5)
M.AdjustParalysis(-1)
@@ -389,12 +409,26 @@ datum/reagent/ephedrine/on_mob_life(var/mob/living/M as mob)
..()
return
datum/reagent/ephedrine/overdose_process(var/mob/living/M as mob)
if(prob(33))
M.adjustToxLoss(1*REM)
M.losebreath++
..()
return
/datum/reagent/ephedrine/overdose_process(var/mob/living/M as mob, severity)
var/effect = ..()
if(severity == 1)
if(effect <= 1)
M.visible_message("<span class='warning'>[M] suddenly and violently vomits!</span>")
M.fakevomit(no_text = 1)
else if(effect <= 3)
M.emote(pick("groan","moan"))
if(effect <= 8)
M.emote("collapse")
else if(severity == 2)
if(effect <= 2)
M.visible_message("<span class='warning'>[M] suddenly and violently vomits!</span>")
M.fakevomit(no_text = 1)
else if(effect <= 5)
M.visible_message("<span class='warning'>[M.name] staggers and drools, their eyes bloodshot!</span>")
M.Dizzy(2)
M.Weaken(3)
if(effect <= 15)
M.emote("collapse")
/datum/chemical_reaction/ephedrine
name = "Ephedrine"
@@ -441,7 +475,7 @@ datum/reagent/morphine
description = "A strong but highly addictive opiate painkiller with sedative side effects."
reagent_state = LIQUID
color = "#C8A5DC"
overdose_threshold = 30
overdose_threshold = 20
addiction_chance = 50
shock_reduction = 50
@@ -464,16 +498,6 @@ datum/reagent/morphine/on_mob_life(var/mob/living/M as mob)
..()
return
datum/reagent/morphine/overdose_process(var/mob/living/M as mob)
if(prob(33))
var/obj/item/I = M.get_active_hand()
if(I)
M.drop_item()
M.Dizzy(1)
M.Jitter(1)
..()
return
datum/reagent/oculine/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(prob(80))
@@ -519,7 +543,7 @@ datum/reagent/atropine
reagent_state = LIQUID
color = "#000000"
metabolization_rate = 0.2
overdose_threshold = 35
overdose_threshold = 25
datum/reagent/atropine/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -541,14 +565,6 @@ datum/reagent/atropine/on_mob_life(var/mob/living/M as mob)
..()
return
datum/reagent/atropine/overdose_process(var/mob/living/M as mob)
if(prob(50))
M.adjustToxLoss(2*REM)
M.Dizzy(1)
M.Jitter(1)
..()
return
/datum/chemical_reaction/atropine
name = "Atropine"
id = "atropine"
@@ -564,7 +580,7 @@ datum/reagent/epinephrine
reagent_state = LIQUID
color = "#96B1AE"
metabolization_rate = 0.2
overdose_threshold = 30
overdose_threshold = 20
datum/reagent/epinephrine/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -591,13 +607,26 @@ datum/reagent/epinephrine/on_mob_life(var/mob/living/M as mob)
..()
return
datum/reagent/epinephrine/overdose_process(var/mob/living/M as mob)
if(prob(33))
M.adjustStaminaLoss(5*REM)
M.adjustToxLoss(2*REM)
M.losebreath++
..()
return
/datum/reagent/epinephrine/overdose_process(var/mob/living/M as mob, severity)
var/effect = ..()
if (severity == 1)
if(effect <= 1)
M.visible_message("<span class='warning'>[M] suddenly and violently vomits!</span>")
M.fakevomit(no_text = 1)
else if(effect <= 3)
M.emote(pick("groan","moan"))
if(effect <= 8)
M.emote("collapse")
else if(severity == 2)
if(effect <= 2)
M.visible_message("<span class='warning'>[M] suddenly and violently vomits!</span>")
M.fakevomit(no_text = 1)
else if(effect <= 5)
M.visible_message("<span class='warning'>[M] staggers and drools, their eyes bloodshot!</span>")
M.Dizzy(2)
M.Weaken(3)
if(effect <= 15)
M.emote("collapse")
/datum/chemical_reaction/epinephrine
name = "Epinephrine"
@@ -812,13 +841,11 @@ datum/reagent/stimulants/reagent_deleted(var/mob/living/M as mob)
M.adjustStaminaLoss(-5*REM)
..()
/datum/reagent/medicine/stimulative_agent/overdose_process(mob/living/M)
/datum/reagent/medicine/stimulative_agent/overdose_process(mob/living/M, severity)
if(prob(33))
M.adjustStaminaLoss(2.5*REM)
M.adjustToxLoss(1*REM)
M.losebreath++
..()
return
datum/reagent/insulin
name = "Insulin"
@@ -855,6 +882,7 @@ datum/reagent/teporone
reagent_state = LIQUID
color = "#D782E6"
addiction_chance = 20
overdose_threshold = 50
datum/reagent/teporone/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
code/modules/reagents/newchem/newchem_procs.dm
+8 -4
View File
@@ -51,14 +51,15 @@
continue
//If you got this far, that means we can process whatever reagent this iteration is for. Handle things normally from here.
if(M && R)
R.on_mob_life(M)
if(R.volume >= R.overdose_threshold && !R.overdosed && R.overdose_threshold > 0)
R.overdosed = 1
R.overdose_start(M)
if(R.volume < R.overdose_threshold && R.overdosed)
R.overdosed = 0
if(R.overdosed)
R.overdose_process(M)
R.on_mob_life(M)
R.overdose_process(M, R.volume >= R.overdose_threshold*2 ? 2 : 1)
for(var/A in addiction_list)
var/datum/reagent/R = A
if(M && R)
@@ -117,8 +118,11 @@
return
// Called if the reagent has passed the overdose threshold and is set to be triggering overdose effects
/datum/reagent/proc/overdose_process(var/mob/living/M as mob)
return
/datum/reagent/proc/overdose_process(var/mob/living/M as mob, severity)
var/effect = rand(1, 100) - severity
if (effect <= 8)
M.adjustToxLoss(severity)
return effect
/datum/reagent/proc/overdose_start(var/mob/living/M as mob)
return
code/modules/reagents/newchem/toxins.dm
+39 -19
View File
@@ -55,23 +55,45 @@
..()
return
/datum/reagent/histamine/overdose_process(var/mob/living/M as mob)
if(prob(2))
to_chat(M, "<span class='danger'>You feel mucus running down the back of your throat.</span>")
M.adjustToxLoss(1)
M.jitteriness += 4
M.emote("sneeze", "cough")
else if(prob(4))
M.stuttering += rand(0,5)
if(prob(25))
M.emote(pick("choke","gasp"))
M.adjustOxyLoss(5)
else if(prob(7))
to_chat(M, "<span class='danger'>Your chest hurts!</span>")
M.emote(pick("cough","gasp"))
M.adjustOxyLoss(3)
..()
return
/datum/reagent/histamine/overdose_process(var/mob/living/M as mob, severity)
var/effect = ..()
if(severity == 1)
if(effect <= 2)
to_chat(M, "<span class='warning'>You feel mucus running down the back of your throat.</span>")
M.adjustToxLoss(1)
M.Jitter(4)
M.emote(pick("sneeze", "cough"))
else if(effect <= 4)
M.stuttering += rand(0,5)
if(prob(25))
M.emote(pick("choke","gasp"))
M.adjustOxyLoss(5)
else if(effect <= 7)
to_chat(M, "<span class='warning'>Your chest hurts!</span>")
M.emote(pick("cough","gasp"))
M.adjustOxyLoss(3)
else if(severity == 2)
if(effect <= 2)
M.visible_message("<span class='warning'>[M] breaks out in hives!</span>")
M.adjustBruteLoss(6)
else if(effect <= 4)
M.visible_message("<span class='warning'>[M] has a horrible coughing fit!</span>")
M.Jitter(10)
M.stuttering += rand(0,5)
M.emote("cough")
if(prob(40))
M.emote(pick("choke","gasp"))
M.adjustOxyLoss(6)
M.Weaken(8)
else if(effect <= 7)
to_chat(M, "<span class='warning'>Your heartbeat is pounding inside your head!</span>")
M.playsound_local(M.loc, "sound/goonstation/effects/heartbeat.ogg", 50, 1)
M.emote("collapse")
M.adjustOxyLoss(8)
M.adjustToxLoss(3)
M.Weaken(3)
M.emote(pick("choke", "gasp"))
to_chat(M, "<span class='warning'>You feel like you're dying!</span>")
/datum/reagent/formaldehyde
name = "Formaldehyde"
@@ -130,8 +152,6 @@
M.jitteriness += 1000
spawn(rand(20, 100))
M.gib()
..()
return
/datum/reagent/neurotoxin2
name = "Neurotoxin"
code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm
+2 -6
View File
@@ -151,10 +151,8 @@
..()
return
/datum/reagent/ethanol/absinthe/overdose_process(mob/living/M)
/datum/reagent/ethanol/absinthe/overdose_process(mob/living/M, severity)
M.adjustToxLoss(1)
..()
return
/datum/reagent/ethanol/rum
name = "Rum"
@@ -169,10 +167,8 @@
M.dizziness +=5
return
/datum/reagent/ethanol/rum/overdose_process(mob/living/M)
/datum/reagent/ethanol/rum/overdose_process(mob/living/M, severity)
M.adjustToxLoss(1)
..()
return
/datum/reagent/ethanol/mojito
name = "Mojito"
code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm
+1 -4
View File
@@ -201,13 +201,10 @@
..()
return
/datum/reagent/drink/coffee/overdose_process(var/mob/living/M as mob)
/datum/reagent/drink/coffee/overdose_process(var/mob/living/M as mob, severity)
if(volume > 45)
M.Jitter(5)
..()
return
/datum/reagent/drink/coffee/icecoffee
name = "Iced Coffee"
id = "icecoffee"
code/modules/reagents/oldchem/reagents/reagents_food.dm
+10 -14
View File
@@ -167,13 +167,11 @@
description = "Sodium chloride, common table salt."
reagent_state = SOLID
color = "#B1B0B0"
overdose_threshold = 100
/datum/reagent/sodiumchloride/overdose_process(var/mob/living/M as mob)
if(volume > 100)
if(prob(70))
M.adjustBrainLoss(1)
if(prob(8))
M.adjustToxLoss(rand(1,2))
/datum/reagent/sodiumchloride/overdose_process(var/mob/living/M as mob, severity)
if(prob(70))
M.adjustBrainLoss(1)
..()
return
@@ -454,11 +452,9 @@
M.emote("collapse")
..()
/datum/reagent/sugar/overdose_process(var/mob/living/M as mob)
if(volume > 200)
M.Paralyse(3)
M.Weaken(4)
if(prob(8))
M.adjustToxLoss(1)
..()
return
/datum/reagent/sugar/overdose_process(var/mob/living/M as mob, severity)
M.Paralyse(3 * severity)
M.Weaken(4 * severity)
if(prob(8))
M.adjustToxLoss(severity)
code/modules/reagents/oldchem/reagents/reagents_med.dm
+23 -3
View File
@@ -40,6 +40,7 @@
description = "Synaptizine is used to treat neuroleptic shock. Can be used to help remove disabling symptoms such as paralysis."
reagent_state = LIQUID
color = "#FA46FA"
overdose_threshold = 40
/datum/reagent/synaptizine/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -53,6 +54,27 @@
..()
return
/datum/reagent/synaptizine/overdose_process(var/mob/living/M as mob, severity)
var/effect = ..()
if(severity == 1)
if(effect <= 1)
M.visible_message("<span class='warning'>[M] suddenly and violently vomits!</span>")
M.fakevomit(no_text = 1)
else if(effect <= 3)
M.emote(pick("groan","moan"))
if(effect <= 8)
M.adjustToxLoss(1)
else if(severity == 2)
if(effect <= 2)
M.visible_message("<span class='warning'>[M] suddenly and violently vomits!</span>")
M.fakevomit(no_text = 1)
else if(effect <= 5)
M.visible_message("<span class='warning'>[M] staggers and drools, their eyes bloodshot!</span>")
M.Dizzy(8)
M.Weaken(4)
if(effect <= 15)
M.adjustToxLoss(1)
/datum/reagent/mitocholide
name = "Mitocholide"
id = "mitocholide"
@@ -114,12 +136,10 @@
..()
return
/datum/reagent/rezadone/overdose_process(mob/living/M)
/datum/reagent/rezadone/overdose_process(mob/living/M, severity)
M.adjustToxLoss(1)
M.Dizzy(5)
M.Jitter(5)
..()
return
/datum/reagent/spaceacillin
name = "Spaceacillin"