diff --git a/code/modules/reagents/chemistry/reagents/drugs.dm b/code/modules/reagents/chemistry/reagents/drugs.dm index 2cf79cd7d8a..f804a1ffe95 100644 --- a/code/modules/reagents/chemistry/reagents/drugs.dm +++ b/code/modules/reagents/chemistry/reagents/drugs.dm @@ -173,7 +173,7 @@ M.AdjustStunned(-4 SECONDS) M.AdjustWeakened(-4 SECONDS) M.AdjustKnockDown(-4 SECONDS) - update_flags |= M.adjustStaminaLoss(-25, FALSE) + update_flags |= M.adjustStaminaLoss(-40, FALSE) if(prob(15)) M.emote(pick("twitch", "twitch_s", "grumble", "laugh")) if(prob(8)) @@ -181,7 +181,7 @@ if(prob(5 * DRAWBACK_CHANCE_MODIFIER(recent_consumption))) to_chat(M, "You feel warm.") // fever, gets worse with volume M.bodytemperature += 30 * recent_consumption - M.Confused(2 SECONDS * recent_consumption) + M.Confused(1 SECONDS * recent_consumption) //let us see how this feels if(prob(4)) to_chat(M, "You feel kinda awful!") @@ -246,7 +246,7 @@ /datum/reagent/pump_up/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE - update_flags |= M.adjustStaminaLoss(-15) // two cycles to get out of stam crit ~4 seconds + update_flags |= M.adjustStaminaLoss(-21) // one cycle to get out of stam crit ~2 second M.AdjustParalysis(-2 SECONDS) M.AdjustStunned(-2 SECONDS) M.AdjustWeakened(-2 SECONDS) @@ -377,7 +377,7 @@ if(prob(5)) M.emote(pick("twitch_s","blink_r","shiver")) M.AdjustJitter(10 SECONDS, bound_upper = 100 SECONDS) - update_flags |= M.adjustStaminaLoss(-40, FALSE) + update_flags |= M.adjustStaminaLoss(-30, FALSE) M.SetSleeping(0) M.SetDrowsy(0) if(prob(10 * DRAWBACK_CHANCE_MODIFIER(recent_consumption))) @@ -556,7 +556,7 @@ addiction_threshold = 5 addiction_decay_rate = 0.2 /// how much do we edit the stun and stamina mods? lower is more resistance - var/tenacity = 0.7 + var/tenacity = 0.5 /datum/reagent/aranesp/on_mob_add(mob/living/L) if(ishuman(L)) @@ -568,11 +568,12 @@ var/update_flags = STATUS_UPDATE_NONE var/recent_consumption = holder.addiction_threshold_accumulated[type] - // small amount of stam regen, meaning that if you can buy time between hits - // you can take 6 disabler shots (30 base * 0.7 stam mod = 21 stam damage each, 5 shots to 105 which is stamina crit. but you can heal 6 in 3 cycles) before going down + // So. Before this let you take 5 shots before going down. Nice and all, but you needed to combine this with another antistun drug to be benefical, which means you need 2 downsides. It was not pratical, or used + // you can take 7 disabler shots (30 base * 0.5 stam mod = 15 stam damage each, 7 shots to 105 which is stamina crit. but you can heal 6 in 3 cycles) before going down. + // Strong combined with another drug, but frankly I could do meth crank hydro for a better mix. Will be interesting with batons? update_flags |= M.adjustStaminaLoss(-2, FALSE) if(prob(10 * DRAWBACK_CHANCE_MODIFIER(recent_consumption))) - update_flags |= M.adjustToxLoss(4, FALSE) + update_flags |= M.adjustToxLoss(4, FALSE) //This does toxin damage. This kills any chem mixes, which could be considered a good thing, but it is a drug that MUST be combined with other drugs. I want to turn this down, but someone will just iv drip a certian bar drink if(prob(5)) M.emote(pick("twitch", "shake", "tremble","quiver", "twitch_s")) if(prob(8)) @@ -825,7 +826,7 @@ M.AdjustStunned(-4 SECONDS) M.AdjustWeakened(-4 SECONDS) M.AdjustKnockDown(-4 SECONDS) - update_flags |= M.adjustStaminaLoss(-25, FALSE) + update_flags |= M.adjustStaminaLoss(-40, FALSE) if(prob(5)) var/high_message = pick("You feel calm.", "You feel collected.", "You feel like you need to relax.") if(prob(10)) diff --git a/code/modules/reagents/chemistry/recipes/drugs_reactions.dm b/code/modules/reagents/chemistry/recipes/drugs_reactions.dm index fc5cb501adf..11db37ca83c 100644 --- a/code/modules/reagents/chemistry/recipes/drugs_reactions.dm +++ b/code/modules/reagents/chemistry/recipes/drugs_reactions.dm @@ -62,7 +62,7 @@ name = "bath_salts" id = "bath_salts" result = "bath_salts" - required_reagents = list("????" = 1, "saltpetre" = 1, "msg" = 1, "cleaner" = 1, "enzyme" = 1, "mugwort" = 1, "mercury" = 1) + required_reagents = list("????" = 1, "saltpetre" = 1, "msg" = 1, "cleaner" = 1, "enzyme" = 1, "sodiumchloride" = 1, "mercury" = 1) result_amount = 6 min_temp = T0C + 100 mix_message = "Tiny cubic crystals precipitate out of the mixture. Huh."