From da35e2b677f463fbbfef0bafda5be3aa55ebd90b Mon Sep 17 00:00:00 2001 From: melandor0 Date: Thu, 23 Oct 2014 02:23:22 +0200 Subject: [PATCH 1/2] new advanced med hud sprite --- code/modules/clothing/glasses/hud.dm | 2 +- icons/mob/eyes.dmi | Bin 7727 -> 7840 bytes icons/obj/clothing/glasses.dmi | Bin 6871 -> 7187 bytes 3 files changed, 1 insertion(+), 1 deletion(-) 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/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index be63a82cb18f78070257a5afbd402c476d6e9ced..40172233ae82656f919b8f267ef063d58ef1fd1f 100644 GIT binary patch literal 7840 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 literal 6871 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 From 4a081070b35a037d35cea0f5e64b0f7198e73f57 Mon Sep 17 00:00:00 2001 From: melandor0 Date: Fri, 24 Oct 2014 21:15:49 +0200 Subject: [PATCH 2/2] Sec HUD fixes Now reports beepsky and ED 209 arrest activity. --- code/game/machinery/bots/ed209bot.dm | 2 +- code/game/machinery/bots/secbot.dm | 2 +- .../Chemistry-Reagents-Recreational.dm | 87 +++++++++++++++---- 3 files changed, 73 insertions(+), 18 deletions(-) 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/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