cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-16 03:56:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[TMC] Baton rework (#45377)

Browse Source 
* stun

* stamina tweak

* 5 units

* 2 hits even with chem

* Update stunbaton.dm

* This is a good slowdown

* new chem + confusion

* overdose

* h

* update

Co-Authored-By: JJRcop <jrubcop@gmail.com>

* less cheap

* better overdosing

* typo

* *=

* confused

* overdose tweaks

* tweak

* no var

* typo

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* *

* tweaks

* stamina batons

* knockdown

* Update code/game/objects/items/melee/misc.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* number tweaks

* maint

* 2

* cooldown and less stuntime

* tweaks

* conflict

* text
This commit is contained in:
Akrilla
2019-08-14 19:59:46 +01:00
committed by moo
parent 3aa78524ba
commit 809be06373
8 changed files with 103 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
code/modules/reagents/chemistry/reagents/drug_reagents.dm
View File

@@ -440,3 +440,46 @@
M.emote(pick("twitch","laugh","frown"))
..()
. = 1
/datum/reagent/drug/pumpup
name = "Pump-Up"
description = "Take on the world! A fast acting, hard hitting drug that pushes the limit on what you can handle."
reagent_state = LIQUID
color = "#e38e44"
metabolization_rate = 2 * REAGENTS_METABOLISM
overdose_threshold = 30
/datum/reagent/drug/pumpup/on_mob_metabolize(mob/living/L)
..()
ADD_TRAIT(L, TRAIT_STUNRESISTANCE, type)
/datum/reagent/drug/pumpup/on_mob_end_metabolize(mob/living/L)
REMOVE_TRAIT(L, TRAIT_STUNRESISTANCE, type)
..()
/datum/reagent/drug/pumpup/on_mob_life(mob/living/carbon/M)
M.Jitter(5)
if(prob(5))
to_chat(M, "<span class='notice'>[pick("Go! Go! GO!", "You feel ready...", "You feel invincible...")]</span>")
if(prob(15))
M.losebreath++
M.adjustToxLoss(2, 0)
..()
. = 1
/datum/reagent/drug/pumpup/overdose_start(mob/living/M)
to_chat(M, "<span class='userdanger'>You can't stop shaking, your heart beats faster and faster...</span>")
/datum/reagent/drug/pumpup/overdose_process(mob/living/M)
M.Jitter(5)
if(prob(5))
M.drop_all_held_items()
if(prob(15))
M.emote(pick("twitch","drool"))
if(prob(20))
M.losebreath++
M.adjustStaminaLoss(4, 0)
if(prob(15))
M.adjustToxLoss(2, 0)
..()

6
code/modules/reagents/chemistry/recipes/drugs.dm
View File

@@ -47,3 +47,9 @@
results = list(/datum/reagent/drug/happiness = 4)
required_reagents = list(/datum/reagent/nitrous_oxide = 2, /datum/reagent/medicine/epinephrine = 1, /datum/reagent/consumable/ethanol = 1)
required_catalysts = list(/datum/reagent/toxin/plasma = 5)
/datum/chemical_reaction/pumpup
name = "Pump-Up"
id = /datum/reagent/drug/pumpup
results = list(/datum/reagent/drug/pumpup = 5)
required_reagents = list(/datum/reagent/medicine/epinephrine = 2, /datum/reagent/consumable/coffee = 5)

8
code/modules/reagents/reagent_containers/hypospray.dm
View File

@@ -235,3 +235,11 @@
ignore_flags = 0
reagent_flags = NONE
list_reagents = list(/datum/reagent/magillitis = 5)
/obj/item/reagent_containers/hypospray/medipen/pumpup
name = "maintanance pump-up"
desc = "A ghetto looking autoinjector filled with a cheap adrenaline shot... Great for shrugging off the effects of stunbatons."
volume = 15
amount_per_transfer_from_this = 15
list_reagents = list(/datum/reagent/drug/pumpup = 15)
icon_state = "maintenance"