Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Meth nerf #8278

Merged
alexkar598 merged 9 commits into from
May 19, 2020
Merged

Meth nerf #8278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
43cffef
Merge pull request #1 from yogstation13/master
MenacingManatee Apr 26, 2020
f005ea3
Meth tweak
MenacingManatee Apr 26, 2020
12436a6
Slightly less damage
MenacingManatee Apr 26, 2020
495e6c4
Meth nerf 2: Electric boogaloo
MenacingManatee Apr 26, 2020
059f63b
Meth now properly results in 5 parts instead of 4
MenacingManatee Apr 27, 2020
70c241e
Adds suggested changes
MenacingManatee May 6, 2020
706e74b
Merge branch 'Manatee_meth_nerf' of https://github.com/MenacingManate…
MenacingManatee May 6, 2020
f4e5ad9
Merge branch 'master' into Manatee_meth_nerf
alexkar598 May 11, 2020
0457856
Removed random extra newline
MenacingManatee May 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/reagents/chemistry/reagents/drug_reagents.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@

/datum/reagent/drug/methamphetamine/on_mob_metabolize(mob/living/L)
..()
L.add_movespeed_modifier(type, update=TRUE, priority=100, multiplicative_slowdown=-2, blacklisted_movetypes=(FLYING|FLOATING))
L.add_movespeed_modifier(type, update=TRUE, priority=100, multiplicative_slowdown=-1.6, blacklisted_movetypes=(FLYING|FLOATING))

/datum/reagent/drug/methamphetamine/on_mob_end_metabolize(mob/living/L)
L.remove_movespeed_modifier(type)
Expand Down
13 changes: 11 additions & 2 deletions code/modules/reagents/chemistry/recipes/drugs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,19 @@
/datum/chemical_reaction/methamphetamine
name = /datum/reagent/drug/methamphetamine
id = /datum/reagent/drug/methamphetamine
results = list(/datum/reagent/drug/methamphetamine = 4)
required_reagents = list(/datum/reagent/medicine/ephedrine = 1, /datum/reagent/iodine = 1, /datum/reagent/phosphorus = 1, /datum/reagent/hydrogen = 1)
results = list(/datum/reagent/drug/methamphetamine = 5)
required_reagents = list(/datum/reagent/medicine/ephedrine = 1, /datum/reagent/iodine = 1, /datum/reagent/phosphorus = 1, /datum/reagent/hydrogen = 1, /datum/reagent/toxin/acid/fluacid = 1)
required_temp = 374

/datum/chemical_reaction/methamphetamine/on_reaction(datum/reagents/holder)
var/datum/reagents/R = new/datum/reagents(5)
R.my_atom = holder.my_atom
R.add_reagent(/datum/reagent/toxin/acid/fluacid, 5)
var/datum/effect_system/smoke_spread/chem/S = new
S.set_up(R, 0.5, holder.my_atom, 0)
S.start()
playsound(get_turf(holder.my_atom), 'sound/effects/smoke.ogg', 50, 1, -3)

/datum/chemical_reaction/bath_salts
name = /datum/reagent/drug/bath_salts
id = /datum/reagent/drug/bath_salts
Expand Down