Skip to content

Commit

Permalink
Unknown Methamphetamine Isomer is now actually safe (#2214)
Browse files Browse the repository at this point in the history
* works

* lol i suck

---------

Co-authored-by: RikuTheKiller <[email protected]>
  • Loading branch information
RikuTheKiller and RikuLeinonenVuoksi authored Jun 11, 2024
1 parent d3f00bf commit 6b23634
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 19 deletions.
3 changes: 2 additions & 1 deletion code/modules/reagents/chemistry/reagents/drug_reagents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@
affected_mob.AdjustImmobilized(-40 * REM * seconds_per_tick)
affected_mob.stamina.adjust(2 * REM * seconds_per_tick, TRUE)
affected_mob.set_jitter_if_lower(4 SECONDS * REM * seconds_per_tick)
affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, rand(1, 4) * REM * seconds_per_tick, required_organtype = affected_organtype)
if(!safe || overdosed) // MONKESTATION EDIT: Makes Unknown Methamphetamine Isomer actually safe. "safe" is false by default.
affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, rand(1, 4) * REM * seconds_per_tick, required_organtype = affected_organtype)
if(SPT_PROB(2.5, seconds_per_tick))
affected_mob.emote(pick("twitch", "shiver"))
..()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,9 @@
// Double the OD treshold, no brain damage
/datum/reagent/drug/methamphetamine
var/safe = FALSE

// Double the OD treshold, no brain damage or addiction
/datum/reagent/drug/methamphetamine/borer_version
name = "Unknown Methamphetamine Isomer"
overdose_threshold = 40

/datum/reagent/drug/methamphetamine/borer_version/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
var/high_message = pick("You feel hyper.", "You feel like you need to go faster.", "You feel like you can run the world.")
if(SPT_PROB(2.5, seconds_per_tick))
to_chat(affected_mob, span_notice("[high_message]"))
affected_mob.add_mood_event("tweaking", /datum/mood_event/stimulant_medium, name)
affected_mob.AdjustStun(-40 * REM * seconds_per_tick)
affected_mob.AdjustKnockdown(-40 * REM * seconds_per_tick)
affected_mob.AdjustUnconscious(-40 * REM * seconds_per_tick)
affected_mob.AdjustParalyzed(-40 * REM * seconds_per_tick)
affected_mob.AdjustImmobilized(-40 * REM * seconds_per_tick)
affected_mob.stamina.adjust(2 * REM * seconds_per_tick, TRUE)
affected_mob.set_jitter_if_lower(4 SECONDS * REM * seconds_per_tick)
if(SPT_PROB(2.5, seconds_per_tick))
affected_mob.emote(pick("twitch", "shiver"))
..()
. = TRUE
addiction_types = null
safe = TRUE

0 comments on commit 6b23634

Please sign in to comment.