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

Merge pull request #439 from melandor0/paradise

Browse Source 
Sec/Med Hud fixes
This commit is contained in:
Fox-McCloud
2014-10-24 21:55:31 -04:00
parent 7f613ecb0c 4a081070b3
commit 0028617926
6 changed files with 74 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/glasses/hud.dm
+1 -1
View File
@@ -18,7 +18,7 @@
/obj/item/clothing/glasses/hud/health_advanced
name = "Advanced Health Scanner HUD"
desc = "A heads-up display that scans the humans in view and provides accurate data about their health status. Includes anti-flash filter."
icon_state = "healthhud"
icon_state = "advmedhud"
code/modules/reagents/Chemistry-Reagents-Recreational.dm
+71 -16
View File
@@ -1,10 +1,11 @@
//Cough medicine.
/datum/reagent/antidepressant/dextromethorphan
name = "Dextromethorphan"
id = "dextromethorphan"
description = "Cough medicine."
reagent_state = LIQUID
color = "#FF1111"
custom_metabolism = 0.01
custom_metabolism = 0.05
data = 0
var/message = 0
@@ -19,25 +20,26 @@
M << "\red Your throat feels better and you stop coughing."
//The coughing check is made in carbon/human/emote.dm where it checks after this reagent.
message = 1
if(5 to 10)
if(5 to 12.5)
if(message < 2)
M << "\red You feel full of strength and energy! You're getting restless!"
message = 2
if(prob(5)) M.emote(pick("giggle"))
if(10 to 20)
if(prob(5)) M.emote(pick("twitch_s"))
if(12.5 to 25)
if(message < 3)
M << "\red Your heartrate is racing. You feel euphoric!"
message = 3
M.druggy = max(M.druggy, 15)
if(prob(5)) M.emote(pick("twitch_s", "giggle"))
if(20 to INFINITY)
if(prob(5)) M.emote(pick("twitch_s","moan"))
if(25 to INFINITY)
if(message < 4)
M << "\red Your heart is racing and your body won't respond properly. You almost feel like you're on autopilot."
message = 4
M.druggy = max(M.druggy, 15)
if(prob(10)) M.emote(pick("twitch","giggle","drool"))
if(prob(10)) M.emote(pick("twitch","moan","drool"))
if(prob(10)) M:weakened = max(M:weakened, 10)
M.hallucination = max(M.hallucination, 5)
if(prob(5)) M.hallucination = max(M.hallucination, 5)
..()
return
@@ -48,17 +50,17 @@
required_reagents = list("cryptobiolin" = 1, "hydrogen" = 1, "carbon" = 1)
result_amount = 3
//MDMA
/datum/reagent/antidepressant/mdma
name = "MDMA"
id = "mdma"
description = "MDMA is one of the most popular recreational psychoactives, most commonly sold in the form of 'ecstasy' tablets. It is known for its empathogenic, euphoric, and stimulant effects, and has also been used in psychotherapy."
reagent_state = LIQUID
color = "#EEEEEE"
custom_metabolism = 0.01
custom_metabolism = 0.1
data = 0
var/message = 0
/* Not finished -Mel
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(!data) data = 0
@@ -70,27 +72,27 @@
M << "\red Your heart rate increases. Your senses all seem more amplified. You start to feel... euphoric."
message = 1
M.druggy = max(M.druggy, 15)
if(prob(5)) M.emote(pick("giggle"))
if(prob(5)) M.emote(pick("giggle","moan"))
if(5 to 10)
if(message < 2)
M << "\red Your heart rate increases. Your senses all seem more amplified. You start to feel... euphoric."
message = 2
M.druggy = max(M.druggy, 15)
if(prob(5)) M.emote(pick("giggle"))
if(prob(5)) M.emote(pick("giggle","moan"))
if(10 to 20)
if(message < 3)
M << "\red Your heart rate increases. Your senses all seem more amplified. You start to feel... euphoric."
message = 3
M.druggy = max(M.druggy, 15)
if(prob(5)) M.emote(pick("giggle"))
if(prob(5)) M.emote(pick("giggle","moan"))
if(20 to INFINITY)
if(message < 4)
M << "\red That was probably too much..."
message = 4
M.druggy = max(M.druggy, 15)
if(prob(10)) M.emote(pick("twitch","giggle","drool"))
if(prob(10)) M.emote(pick("twitch","giggle","moan"))
if(prob(10)) M.emote(pick("drool"))
if(prob(10)) M:weakened = max(M:weakened, 10)
M.hallucination = max(M.hallucination, 5)
..()
return
@@ -100,4 +102,57 @@
result = "mdma"
required_reagents = list("cryptobiolin" = 1, "inaprovaline" = 1, "sugar" = 1)
result_amount = 3
*/
//Meth
/datum/reagent/antidepressant/meth
name = "Methamphetamine"
id = "meth"
description = "Methamphetamine is a neurotoxin and potent psychostimulant of the phenethylamine and amphetamine classes that is used as a recreational drug and, rarely, to treat attention deficit hyperactivity disorder (ADHD) and obesity."
reagent_state = LIQUID
color = "#000088"
custom_metabolism = 0.1
data = 0
var/message = 0
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(!data) data = 0
if(!message) message = 0
data += custom_metabolism
switch(data + src.volume)
if(1 to 5)
if(message == 0)
M << "\red You feel an intense euphoria wash over you."
message = 1
M.druggy = max(M.druggy, 15)
if(prob(10)) M.emote(pick("giggle","moan"))
if(5 to 10)
if(message < 2)
M << "\red The euphoria washing over you is accompanied by an intense restlessness. You need something to do... badly."
message = 2
M.druggy = max(M.druggy, 15)
if(prob(10)) M.emote(pick("giggle", "moan", "twitch_s", "twitch"))
if(10 to 20)
if(message < 3)
M << "\red The euphoria you're feeling is accompanied by equal parts restlessness and discomfort as your heartbeat goes all over the place."
message = 3
M.druggy = max(M.druggy, 15)
if(prob(10)) M.emote(pick("giggle", "moan", "twitch_s", "twitch"))
if(20 to INFINITY)
if(message < 4)
M << "\red Your heartbeat becomes highly irregular all of a sudden. The world seems a blur around you. Your head is aching."
message = 4
M.druggy = max(M.druggy, 15)
if(prob(10)) M.emote(pick("giggle", "moan", "twitch_s", "twitch"))
if(prob(10)) M.emote(pick("drool"))
if(prob(10)) M:weakened = max(M:weakened, 10)
..()
return
/datum/chemical_reaction/meth
name = "Methamphetamine"
id = "meth"
result = "meth"
required_reagents = list("water" = 1, "dextromethorphan" = 1, "potassium" = 1)
required_catalysts = list("fuel" = 5)
result_amount = 3