cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-12 08:36:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20609 from XDTM/TrueDrinks

Browse Source 
Repaths some alcoholic drinks under ethanol
This commit is contained in:
oranges
2016-09-24 19:50:39 +12:00
committed by GitHub
parent d9dce542cf 09373c86a7
commit cc3fe031ff
2 changed files with 115 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+115
View File
@@ -760,3 +760,118 @@ All effects don't start immediately, but rather get worse over time; the rate is
description = "Unidentifiable mixture. Unmeasurably high alcohol content."
color = rgb(51, 19, 3) //Sickly brown
boozepwr = 300 //I warned you
/datum/reagent/consumable/ethanol/atomicbomb
name = "Atomic Bomb"
id = "atomicbomb"
description = "Nuclear proliferation never tasted so good."
color = "#666300" // rgb: 102, 99, 0
boozepwr = 0 //custom drunk effect
/datum/reagent/consumable/ethanol/atomicbomb/on_mob_life(mob/living/M)
M.set_drugginess(50)
M.confused = max(M.confused+2,0)
M.Dizzy(10)
if (!M.slurring)
M.slurring = 1
M.slurring += 3
switch(current_cycle)
if(51 to 200)
M.Sleeping(5, 0)
. = 1
if(201 to INFINITY)
M.AdjustSleeping(2, 0)
M.adjustToxLoss(2, 0)
. = 1
..()
/datum/reagent/consumable/ethanol/gargle_blaster
name = "Pan-Galactic Gargle Blaster"
id = "gargleblaster"
description = "Whoah, this stuff looks volatile!"
color = "#664300" // rgb: 102, 67, 0
boozepwr = 0 //custom drunk effect
/datum/reagent/consumable/ethanol/gargle_blaster/on_mob_life(mob/living/M)
M.dizziness +=6
switch(current_cycle)
if(15 to 45)
if(!M.slurring)
M.slurring = 1
M.slurring += 3
if(45 to 55)
if(prob(50))
M.confused = max(M.confused+3,0)
if(55 to 200)
M.set_drugginess(55)
if(200 to INFINITY)
M.adjustToxLoss(2, 0)
. = 1
..()
/datum/reagent/consumable/ethanol/neurotoxin
name = "Neurotoxin"
id = "neurotoxin"
description = "A strong neurotoxin that puts the subject into a death-like state."
color = "#2E2E61" // rgb: 46, 46, 97
boozepwr = 0 //custom drunk effect
/datum/reagent/consumable/ethanol/neurotoxin/on_mob_life(mob/living/carbon/M)
M.Weaken(3, 1, 0)
M.dizziness +=6
switch(current_cycle)
if(15 to 45)
if(!M.slurring)
M.slurring = 1
M.slurring += 3
if(45 to 55)
if(prob(50))
M.confused = max(M.confused+3,0)
if(55 to 200)
M.set_drugginess(55)
if(200 to INFINITY)
M.adjustToxLoss(2, 0)
..()
. = 1
/datum/reagent/consumable/ethanol/hippies_delight
name = "Hippie's Delight"
id = "hippiesdelight"
description = "You just don't get it maaaan."
color = "#664300" // rgb: 102, 67, 0
nutriment_factor = 0
boozepwr = 0 //custom drunk effect
metabolization_rate = 0.2 * REAGENTS_METABOLISM
/datum/reagent/consumable/ethanol/hippies_delight/on_mob_life(mob/living/M)
if (!M.slurring)
M.slurring = 1
switch(current_cycle)
if(1 to 5)
M.Dizzy(10)
M.set_drugginess(30)
if(prob(10))
M.emote(pick("twitch","giggle"))
if(5 to 10)
M.Jitter(20)
M.Dizzy(20)
M.set_drugginess(45)
if(prob(20))
M.emote(pick("twitch","giggle"))
if (10 to 200)
M.Jitter(40)
M.Dizzy(40)
M.set_drugginess(60)
if(prob(30))
M.emote(pick("twitch","giggle"))
if(200 to INFINITY)
M.Jitter(60)
M.Dizzy(60)
M.set_drugginess(75)
if(prob(40))
M.emote(pick("twitch","giggle"))
if(prob(30))
M.adjustToxLoss(2, 0)
. = 1
..()
code/modules/reagents/chemistry/reagents/drink_reagents.dm
-113
View File
@@ -515,116 +515,3 @@
id = "grapesoda"
description = "Beloved of children and teetotalers."
color = "#E6CDFF"
//////////////////////////////////////////////The ten friggen million reagents that get you drunk//////////////////////////////////////////////
/datum/reagent/consumable/atomicbomb
name = "Atomic Bomb"
id = "atomicbomb"
description = "Nuclear proliferation never tasted so good."
color = "#666300" // rgb: 102, 99, 0
/datum/reagent/consumable/atomicbomb/on_mob_life(mob/living/M)
M.set_drugginess(50)
M.confused = max(M.confused+2,0)
M.Dizzy(10)
if (!M.slurring)
M.slurring = 1
M.slurring += 3
switch(current_cycle)
if(51 to 200)
M.Sleeping(5, 0)
. = 1
if(201 to INFINITY)
M.AdjustSleeping(2, 0)
M.adjustToxLoss(2, 0)
. = 1
..()
/datum/reagent/consumable/gargle_blaster
name = "Pan-Galactic Gargle Blaster"
id = "gargleblaster"
description = "Whoah, this stuff looks volatile!"
color = "#664300" // rgb: 102, 67, 0
/datum/reagent/consumable/gargle_blaster/on_mob_life(mob/living/M)
M.dizziness +=6
switch(current_cycle)
if(15 to 45)
if(!M.slurring)
M.slurring = 1
M.slurring += 3
if(45 to 55)
if(prob(50))
M.confused = max(M.confused+3,0)
if(55 to 200)
M.set_drugginess(55)
if(200 to INFINITY)
M.adjustToxLoss(2, 0)
. = 1
..()
/datum/reagent/consumable/neurotoxin
name = "Neurotoxin"
id = "neurotoxin"
description = "A strong neurotoxin that puts the subject into a death-like state."
color = "#2E2E61" // rgb: 46, 46, 97
/datum/reagent/consumable/neurotoxin/on_mob_life(mob/living/carbon/M)
M.Weaken(3, 1, 0)
M.dizziness +=6
switch(current_cycle)
if(15 to 45)
if(!M.slurring)
M.slurring = 1
M.slurring += 3
if(45 to 55)
if(prob(50))
M.confused = max(M.confused+3,0)
if(55 to 200)
M.set_drugginess(55)
if(200 to INFINITY)
M.adjustToxLoss(2, 0)
..()
. = 1
/datum/reagent/consumable/hippies_delight
name = "Hippie's Delight"
id = "hippiesdelight"
description = "You just don't get it maaaan."
color = "#664300" // rgb: 102, 67, 0
nutriment_factor = 0
metabolization_rate = 0.2 * REAGENTS_METABOLISM
/datum/reagent/consumable/hippies_delight/on_mob_life(mob/living/M)
if (!M.slurring)
M.slurring = 1
switch(current_cycle)
if(1 to 5)
M.Dizzy(10)
M.set_drugginess(30)
if(prob(10))
M.emote(pick("twitch","giggle"))
if(5 to 10)
M.Jitter(20)
M.Dizzy(20)
M.set_drugginess(45)
if(prob(20))
M.emote(pick("twitch","giggle"))
if (10 to 200)
M.Jitter(40)
M.Dizzy(40)
M.set_drugginess(60)
if(prob(30))
M.emote(pick("twitch","giggle"))
if(200 to INFINITY)
M.Jitter(60)
M.Dizzy(60)
M.set_drugginess(75)
if(prob(40))
M.emote(pick("twitch","giggle"))
if(prob(30))
M.adjustToxLoss(2, 0)
. = 1
..()