cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-08 16:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

A few Overdose Reagent Tweaks

Browse Source
This commit is contained in:
Fox-McCloud
2015-12-29 00:56:08 -05:00
parent 3e4ba3a857
commit 4908b32727
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/reagents/newchem/drugs.dm
View File

@@ -15,7 +15,7 @@
/datum/reagent/nicotine/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
var/smoke_message = pick("You can just feel your lungs dying!", "You feel relaxed.", "You feel calmed.", "You feel the lung cancer forming.", "You feel the money you wasted.", "You feel like a space cowboy.", "You feel rugged.")
var/smoke_message = pick("You feel relaxed.", "You feel calmed.", "You feel like a space cowboy.", "You feel rugged.")
if(prob(5))
M << "<span class='notice'>[smoke_message]</span>"
if(prob(50))
@@ -27,8 +27,6 @@
return
/datum/reagent/nicotine/overdose_process(var/mob/living/M as mob)
if(prob(20))
M << "You feel like you smoked too much."
M.adjustToxLoss(1*REM)
M.adjustOxyLoss(1*REM)
..()

1
code/modules/reagents/newchem/newchem_procs.dm
View File

@@ -45,7 +45,6 @@ datum/reagents/proc/metabolize(var/mob/M)
if(M && R)
if(R.volume >= R.overdose_threshold && !R.overdosed && R.overdose_threshold > 0)
R.overdosed = 1
M << "<span class = 'userdanger'>You feel like you took too much [R.name]!</span>"
R.overdose_start(M)
if(R.volume < R.overdose_threshold && R.overdosed)
R.overdosed = 0

18
code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm
View File

@@ -144,13 +144,16 @@
confused_start = 100
//copy paste from LSD... shoot me
/datum/reagent/ethanol/absinthe/on_mob_life(var/mob/M)
/datum/reagent/ethanol/absinthe/on_mob_life(var/mob/living/M)
if(!M) M = holder.my_atom
if(!data) data = 1
data++
M:hallucination += 5
if(volume > overdose_threshold)
M:adjustToxLoss(1)
M.hallucination += 5
..()
return
/datum/reagent/ethanol/absinthe/overdose_process(mob/living/M)
M.adjustToxLoss(1)
..()
return
@@ -164,8 +167,11 @@
/datum/reagent/ethanol/rum/on_mob_life(var/mob/living/M as mob)
..()
M.dizziness +=5
if(volume > overdose_threshold)
M:adjustToxLoss(1)
return
/datum/reagent/ethanol/rum/overdose_process(mob/living/M)
M.adjustToxLoss(1)
..()
return
/datum/reagent/ethanol/mojito