diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm
index ae959bb42b0..cf0460baa54 100644
--- a/code/game/machinery/bots/ed209bot.dm
+++ b/code/game/machinery/bots/ed209bot.dm
@@ -1002,5 +1002,5 @@ Auto Patrol: []"},
/obj/machinery/bot/ed209/proc/declare_arrest()
var/area/location = get_area(src)
for(var/mob/living/carbon/human/human in world)
- if((human.z == src.z) && istype(human.glasses, /obj/item/clothing/glasses/hud/security) && !human.blinded)
+ if((human.z == src.z) && istype(human.glasses, /obj/item/clothing/glasses/hud/security) || istype(human.glasses, /obj/item/clothing/glasses/sunglasses/sechud) && !human.blinded)
human << "\icon[human.glasses] [src.name] is [arrest_type ? "detaining" : "arresting"] level [threatlevel] [target] in [location]"
diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm
index c2b4f9d25e1..c0076d3d44b 100644
--- a/code/game/machinery/bots/secbot.dm
+++ b/code/game/machinery/bots/secbot.dm
@@ -782,5 +782,5 @@ Auto Patrol: []"},
/obj/machinery/bot/secbot/proc/declare_arrest()
var/area/location = get_area(src)
for(var/mob/living/carbon/human/human in world)
- if((human.z == src.z) && istype(human.glasses, /obj/item/clothing/glasses/hud/security) && !human.blinded)
+ if((human.z == src.z) && istype(human.glasses, /obj/item/clothing/glasses/hud/security) || istype(human.glasses, /obj/item/clothing/glasses/sunglasses/sechud) && !human.blinded)
human << "\icon[human.glasses] [src.name] is [arrest_type ? "detaining" : "arresting"] level [threatlevel] [target] in [location]"
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 2d31c71d53e..8111d84c901 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -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"
diff --git a/code/modules/reagents/Chemistry-Reagents-Recreational.dm b/code/modules/reagents/Chemistry-Reagents-Recreational.dm
index 1192f980c38..91708e674ba 100644
--- a/code/modules/reagents/Chemistry-Reagents-Recreational.dm
+++ b/code/modules/reagents/Chemistry-Reagents-Recreational.dm
@@ -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
-*/
\ No newline at end of file
+
+//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
\ No newline at end of file
diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi
index be63a82cb18..40172233ae8 100644
Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
index 6436f2abfa3..a43cac5d878 100644
Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ