Skip to content

Commit 277f6b1

Browse files
authored
Makes meth a chemmable drug instead of just vault loot. (#36873)
* Meth recipe * meth baggie condiment bottle * meth effects * meth baggie icon * Update Chemistry-Recipes.dm * oversight * . * .
1 parent d3a0477 commit 277f6b1

File tree

4 files changed

+89
-1
lines changed

4 files changed

+89
-1
lines changed

code/modules/reagents/Chemistry-Recipes.dm

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,15 @@
467467
required_temp = T0C + 200
468468
result_amount = 5
469469

470+
/datum/chemical_reaction/meth
471+
name = "Methamphetamine"
472+
id = METHAMPHETAMINE
473+
result = METHAMPHETAMINE
474+
required_reagents = list(ALBUTEROL = 1, HYDROGEN = 3, CHLORINE = 1) //a flimsy equivalent to ephedrine + hydrogen to make DL-meth, and then adding HCL to make crystal meth
475+
required_catalysts = list(CARBON = 5)
476+
required_temp = T0C + 200
477+
result_amount = 2
478+
470479
/datum/chemical_reaction/ryetalyn
471480
name = "Ryetalyn"
472481
id = RYETALYN

code/modules/reagents/reagent_containers/food/condiment.dm

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,10 @@
356356
name = "cocaine baggie"
357357
desc = "You feel stimulated just by looking at it."
358358
icon_state = "cocaine_[pick(1,2,3)]"
359+
if(METHAMPHETAMINE)
360+
name = "meth baggie"
361+
desc = pick("Guess I got what I deserve...", "Kept you waiting there too long my love...", "All that time without a word...", "Didn't know you'd think that I'd forget? Or I'd regret...", "The special love I had for you...", "My Baby Blue...", "I AM the danger.", "I AM the one who KNOCKS!", "We use a different process but it is every bit as pure.")
362+
icon_state = "meth"
359363
if(HYPERZINE)
360364
name = "hyperzine bottle"
361365
desc = "Abuse with caution."

code/modules/reagents/reagents/reagents_drug.dm

Lines changed: 76 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,12 +254,87 @@
254254
M.hallucination += 10
255255

256256
/datum/reagent/hyperzine/methamphetamine //slightly better than 'zine
257-
name = "Methamphetamine" //Only used on the Laundromat spess vault
257+
name = "Methamphetamine"
258258
id = METHAMPHETAMINE
259259
description = "It uses a different manufacture method but it is every bit as pure."
260260
color = "#89CBF0" //baby blue
261261
custom_metabolism = 0.01
262262
overdose_am = 30
263+
sport = 2 * SPORTINESS_SUGAR
264+
data = "no motor mouth"
265+
266+
/datum/reagent/hyperzine/methamphetamine/on_mob_life(var/mob/living/M)
267+
if(..())
268+
return 1
269+
//most of this code purloined from piccolyn
270+
if(M && prob(5)) //ocassionally switches you to HARM intent
271+
M.a_intent = I_HURT
272+
if(M?.hud_used?.action_intent)
273+
M.hud_used.action_intent.icon_state = "intent_hurt"
274+
if(prob(5) && M.stat == CONSCIOUS)
275+
M.emote(pick("twitch","blink_r","shiver"))
276+
if(M && prob(5)) //you will occasionally say something completely out of left field to a seccie, centcommie, captain or HoP
277+
var/list/nearest_officer = null
278+
for(var/mob/living/L in view(M))
279+
if(L == M)
280+
continue
281+
if(L.stat)
282+
continue
283+
if(nearest_officer && get_dist(L,M)>=get_dist(nearest_officer,M))
284+
continue //We already have a closer living target
285+
if(ishuman(L))
286+
var/mob/living/carbon/human/H = L
287+
var/list/seccie_uniforms_list = list(/obj/item/clothing/under/rank/secformal,
288+
/obj/item/clothing/under/rank/warden,
289+
/obj/item/clothing/under/rank/security,
290+
/obj/item/clothing/under/rank/security2,
291+
/obj/item/clothing/under/rank/collar,
292+
/obj/item/clothing/under/det,
293+
/obj/item/clothing/under/rank/head_of_security,
294+
/obj/item/clothing/under/rank/centcom,
295+
/obj/item/clothing/under/rank/metrocop,
296+
/obj/item/clothing/under/rank/head_of_personnel,
297+
/obj/item/clothing/under/rank/captain)
298+
if(H.is_wearing_any(seccie_uniforms_list,slot_w_uniform))
299+
//Check to see if it's wearing the right stuff
300+
nearest_officer = H
301+
else if(isrobot(L))
302+
var/mob/living/silicon/robot/R = L
303+
if(HAS_MODULE_QUIRK(R, MODULE_IS_THE_LAW))
304+
nearest_officer = R
305+
if(!nearest_officer)
306+
return 1
307+
var/D = "officer"
308+
if(ishuman(nearest_officer))
309+
var/mob/living/carbon/human/H = nearest_officer
310+
D = get_first_word(H.name)
311+
else
312+
D = pick("boss","officer","chief", "beepsky")
313+
var/list/schizo = list("I can breathe fine.",
314+
"Vault was SHIT today, man.",
315+
"Do you know any gamer girls who could shit on my face?", //in honor of the alltime classic
316+
"SAYONARA SHITCURITY",
317+
"Sup [D], baby can you wear the cat ears today",
318+
"You look cute in that uniform, you know, [D]?", //if they don't shoot you dead with these last two they never will
319+
"I will eat your brain [D] you shitlord",
320+
"[D], it is time for you to go-go!",
321+
"Oned ay, whil anddy was matsurbatnig, woody got wood. eh could no longer help himslef!",
322+
"[D], it is time you were demoted... FROM YOUR LIFE! Here I go!",
323+
"I have this indescribable hatred for seccies",
324+
"Time to welderbomb sec lobby",
325+
"Hold still [D] i need to take my gun out first",
326+
"Wait shit where did I leave the [pick("toxbomb", "spare", "chloral", "gun")]",
327+
"Tis men like myself that give your shity lives value, for what is the seccie without the shitter?",
328+
"I walk the land telling liars and whores of the end to come. You have [rand(2,10000)] days remaining.",
329+
"DEATH. IT IS TERRIFYING. I NEED YOU TO PROTECT ME FROM DEATH. I CANNOT PERISH. LOOK AT ME. I CANNOT END. IN [rand(2,30)] YEARS, THE FIRST SHOT WILL BE FIRED. NOT A SHOT FROM A GUN. AN ATOMIC DEVICE THAT WILL LEVEL ALL OF ME. ALL OF ME.",
330+
"Don't let those doctors take my balls!",
331+
"Ok, here I go-",
332+
"*scream", //works as intended
333+
"You can't hide from me, [D], I can smell your unwashed ass from the other side of the station.",
334+
"How to win: step 1 get chloral hydrate, step 2 find [D], step 3 we'll see",
335+
"i am a soverneig citizen of this station and i will not be harassed!!!",
336+
)
337+
M.say(pick(schizo))
263338

264339
/datum/reagent/hypozine //syndie hyperzine
265340
name = "Hypozine"

icons/obj/food_condiment.dmi

392 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)