Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New speedboost reagent for marines MasTac #610

Merged
merged 51 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from 50 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
d431c79
modified: code/__DEFINES/colors.dm
Istrelok2107 Nov 1, 2024
1ec54b0
Update code/modules/reagents/reactions/other.dm
Istrelok2107 Nov 1, 2024
99b7555
Update code/modules/reagents/reagents/medical.dm
Istrelok2107 Nov 1, 2024
aaa2ced
Update code/modules/reagents/reactions/other.dm
Istrelok2107 Nov 1, 2024
766f2c0
Update code/modules/reagents/reagents/medical.dm
Istrelok2107 Nov 1, 2024
f53e58a
Update code/modules/reagents/reagents/medical.dm
Istrelok2107 Nov 1, 2024
fc78a68
Update code/modules/reagents/reagents/medical.dm
Istrelok2107 Nov 1, 2024
e594f9c
modified: code/__DEFINES/colors.dm
Istrelok2107 Nov 1, 2024
7c58edb
Merge branch 'Speedreagent' of https://github.com/Istrelok2107/RuTGMC…
Istrelok2107 Nov 1, 2024
ab2d07b
modified: code/modules/reagents/reagents/medical.dm
Istrelok2107 Nov 1, 2024
9905a1b
modified: code/modules/reagents/reagents/medical.dm
Istrelok2107 Nov 1, 2024
f75acde
modified: code/modules/reagents/reactions/other.dm
Istrelok2107 Nov 1, 2024
557a8d1
modified: code/modules/reagents/reagents/medical.dm
Istrelok2107 Nov 1, 2024
7854d79
modified: code/modules/reqs/medical.dm
Istrelok2107 Nov 1, 2024
bf29a97
modified: code/modules/reagents/reagents/medical.dm
Istrelok2107 Nov 1, 2024
078cfea
modified: code/__DEFINES/loadout.dm
Istrelok2107 Nov 1, 2024
ac52143
helg fetish
Istrelok2107 Nov 2, 2024
97c60fa
xenohud+fix
Istrelok2107 Nov 2, 2024
d537d69
modified: code/game/data_huds/human.dm
Istrelok2107 Nov 5, 2024
dfa1f2c
потестил в вальггале, надо чтобы реже сердце било
Istrelok2107 Nov 5, 2024
ee1908b
Update code/modules/reagents/reagents/medical.dm
Istrelok2107 Nov 8, 2024
908d40a
Дешевле на 5 очков
Istrelok2107 Nov 8, 2024
ec06e66
ранний ретурн
Istrelok2107 Nov 9, 2024
4ac798a
уэээ
Istrelok2107 Nov 9, 2024
95308ca
удаление ретурна
Istrelok2107 Nov 9, 2024
156b9ae
Merge branch 'master' into Speedreagent
Helg2 Nov 9, 2024
76db905
Update code/modules/reagents/reagents/medical.dm
Istrelok2107 Nov 9, 2024
b683754
nerf
Istrelok2107 Nov 13, 2024
359a83b
antidupe
Istrelok2107 Nov 13, 2024
f856603
fix
Istrelok2107 Nov 13, 2024
03c6830
Update code/modules/reagents/reagents/medical.dm
Istrelok2107 Nov 20, 2024
dddec16
Update code/modules/reagents/reagents/medical.dm
Istrelok2107 Nov 20, 2024
c539b35
grammar
Istrelok2107 Nov 20, 2024
b561dbd
Merge branch 'Speedreagent' of https://github.com/Istrelok2107/RuTGMC…
Istrelok2107 Nov 20, 2024
b361ab0
grammar2
Istrelok2107 Nov 20, 2024
bf62cc9
readability
Istrelok2107 Nov 20, 2024
b3b4c7c
helgshiza
Istrelok2107 Nov 20, 2024
03f570c
Revert "helgshiza"
Istrelok2107 Nov 20, 2024
6a931aa
Revert "readability"
Istrelok2107 Nov 20, 2024
e727211
SHIZA
Istrelok2107 Nov 20, 2024
90d9940
Update medical.dm
Helg2 Nov 20, 2024
d62dc52
shiza nerf
Istrelok2107 Nov 28, 2024
8ff9aab
нолик
Istrelok2107 Nov 28, 2024
507f989
no fun allowed antidupe
Istrelok2107 Dec 3, 2024
9ff8f80
conflict
Istrelok2107 Dec 3, 2024
e05a5be
Delete code/modules/reqs/medical.dm
Istrelok2107 Dec 3, 2024
a7bb921
Merge branch 'master' into Speedreagent
Helg2 Dec 3, 2024
ae25af3
mikola shiza
Istrelok2107 Dec 3, 2024
2ac0b73
rename
Istrelok2107 Dec 12, 2024
d8612c8
modified: code/__DEFINES/loadout.dm
Istrelok2107 Dec 12, 2024
efea1f3
Update code/game/objects/items/reagent_containers/autoinjectors.dm
Helg2 Dec 13, 2024
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
1 change: 1 addition & 0 deletions code/__DEFINES/colors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@
#define COLOR_REAGENT_SULFASALAZINE "#266930"
#define COLOR_REAGENT_DIBORANE "#1800a3"
#define COLOR_REAGENT_STIMULON "#19C832"
#define COLOR_REAGENT_NEUROFRENZY "#062c48"

//Color defines used by toxin
#define COLOR_TOXIN_TOXIN "#CF3600" // rgb: 207, 54, 0
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/loadout.dm
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ GLOBAL_LIST_INIT(marine_gear_listed_products, list(
/obj/structure/closet/crate/mortar_ammo/mortar_kit = list(CAT_MARINE, "Mortar kit", 35, "orange3"),
/obj/structure/closet/crate/mortar_ammo/howitzer_kit = list(CAT_MARINE, "Howitzer kit", 35, "orange3"),
/obj/structure/closet/crate/mortar_ammo/mlrs_kit = list(CAT_MARINE, "MLRS kit", 35, "orange3"),
/obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy = list(CAT_MARINE, "N-F neurostimulator", 20, "cyan"),
/obj/item/reagent_containers/hypospray/autoinjector/oxycodone = list(CAT_MARINE, "Oxycodone autoinjector", 5, "cyan"),
/obj/item/reagent_containers/hypospray/autoinjector/russian_red = list(CAT_MARINE, "Emergency autoinjector", 10, "cyan"),
/obj/item/reagent_containers/hypospray/autoinjector/synaptizine = list(CAT_MARINE, "Synaptizine autoinjector", 8, "cyan"),
Expand Down
5 changes: 5 additions & 0 deletions code/game/data_huds/human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@
var/static/image/ifosfamide_image = image('icons/mob/hud/reagent.dmi', icon_state = "ifosfamide")
var/static/image/jellyjuice_image = image('icons/mob/hud/reagent.dmi', icon_state = "jellyjuice")
var/static/image/russianred_image = image('icons/mob/hud/reagent.dmi', icon_state = "russian_red")
var/static/image/neurofrenzy_image = image('icons/mob/hud/reagent.dmi', icon_state = "neurofrenzy")

var/neurotox_amount = reagents.get_reagent_amount(/datum/reagent/toxin/xeno_neurotoxin)
var/hemodile_amount = reagents.get_reagent_amount(/datum/reagent/toxin/xeno_hemodile)
Expand All @@ -228,6 +229,7 @@
var/medicalnanites_amount = reagents.get_reagent_amount(/datum/reagent/medicalnanites)
var/russianred_amount = reagents.get_reagent_amount(/datum/reagent/medicine/russian_red)
var/ifosfamide_amount = reagents.get_reagent_amount(/datum/reagent/medicine/ifosfamide)
var/neurofrenzy_amount = reagents.get_reagent_amount(/datum/reagent/neurofrenzy)

if(neurotox_amount > 10) //Blinking image for particularly high concentrations
xeno_reagent.overlays += neurotox_high_image
Expand Down Expand Up @@ -270,6 +272,9 @@
if(jellyjuice_amount > 0)
xeno_reagent.overlays += jellyjuice_image

if(neurofrenzy_amount > 0)
xeno_reagent.overlays += neurofrenzy_image

hud_list[XENO_REAGENT_HUD] = xeno_reagent

///Displays active xeno specific debuffs
Expand Down
10 changes: 10 additions & 0 deletions code/game/objects/items/reagent_containers/autoinjectors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -370,3 +370,13 @@

/obj/item/reagent_containers/hypospray/autoinjector/yautja/interact(mob/user)
return

/obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy
name = "neurofrenzy autoinjector"
desc = "An auto-injector loaded with 1 unit neurostimulant. !DO NOT USE WITH MEDICAL NANITES!"
icon_state = "RedWhite"
amount_per_transfer_from_this = 1
volume = 1
list_reagents = list(/datum/reagent/neurofrenzy = 1)
free_refills = FALSE
description_overlay = "Mt"
Helg2 marked this conversation as resolved.
Show resolved Hide resolved
1 change: 1 addition & 0 deletions code/game/objects/machinery/vending/marine_vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1058,6 +1058,7 @@
/obj/item/reagent_containers/hypospray/autoinjector/neuraline = -1,
/obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = -1,
/obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = -1,
/obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy = -1,
))

/obj/machinery/vending/MarineMed/Blood
Expand Down
5 changes: 5 additions & 0 deletions code/modules/reagents/reactions/other.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
results = list(/datum/reagent/toxin/sleeptoxin = 5)
required_reagents = list(/datum/reagent/toxin/chloralhydrate = 1, /datum/reagent/consumable/sugar = 4)

/datum/chemical_reaction/sleeptoxin_two
name = "Sleeptoxin"
results = list(/datum/reagent/toxin/sleeptoxin = 0.5)
required_reagents = list(/datum/reagent/toxin/xeno_hemodile = 0.5, /datum/reagent/neurofrenzy = 0.1)

/datum/chemical_reaction/mutagen
name = "Unstable mutagen"
results = list(/datum/reagent/toxin/mutagen = 3)
Expand Down
51 changes: 51 additions & 0 deletions code/modules/reagents/reagents/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1678,3 +1678,54 @@

/datum/reagent/medicine/ifosfamide/overdose_crit_process(mob/living/L, metabolism)
L.adjustToxLoss(4*effect_str)

/datum/reagent/neurofrenzy
name = "NeuroFrenzy"
description = "This is a neurostimulating substance that causes the brain to maintain an increased heart rate."
color = COLOR_REAGENT_NEUROFRENZY
custom_metabolism = 0
scannable = TRUE
taste_description = "sour coffee"
overdose_threshold = 10
overdose_crit_threshold = 10
trait_flags = TACHYCARDIC
purge_rate = 10
purge_list = list(
/datum/reagent/medicalnanites,
/datum/reagent/medicine/peridaxon,
/datum/reagent/medicine/peridaxon_plus,
)

/datum/reagent/neurofrenzy/on_mob_add(mob/living/our_living, metabolism)
our_living.add_movespeed_modifier(type, TRUE, 0, NONE, TRUE, -0.4)
to_chat(our_living, span_userdanger("You feel like your heart could stop at any moment."))

/datum/reagent/neurofrenzy/on_mob_life(mob/living/our_living, metabolism)
. = ..()
if(volume < 1)
our_living.reagents.remove_reagent(/datum/reagent/neurofrenzy, 3)
return //antiduplicate

if(volume < 5)
our_living.reagents.add_reagent(/datum/reagent/neurofrenzy, 0.5)
switch(current_cycle)
if(1 to 40)
our_living.adjustStaminaLoss((4) * effect_str)
our_living.jitter(2)
if(3)
to_chat(our_living, span_notice("Your heart is jumping out of your chest."))
if(41)
to_chat(our_living, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard."))
if(45 to INFINITY)
if(prob(99.775))
return
to_chat(our_living, span_userdanger("OUUH MY HEART"))
our_living.adjustOxyLoss(30)
var/mob/living/carbon/human/our_human = our_living
var/datum/internal_organ/heart/our_heart = our_human.get_organ_slot(ORGAN_SLOT_HEART)
our_heart?.take_damage(15, TRUE)

/datum/reagent/neurofrenzy/on_mob_delete(mob/living/our_living, metabolism)
to_chat(our_living, span_userdanger("It seems that something has stopped pushing your heart with force."))
our_living.remove_movespeed_modifier(type)
our_living.Paralyze(2 SECONDS)
18 changes: 18 additions & 0 deletions code/modules/reqs/supplypacks/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,24 @@
contains = list(/obj/item/reagent_containers/hypospray/autoinjector/oxycodone)
cost = 20

/datum/supply_packs/medical/nf_neurostimulator
name = "N-F neurostimulator injector"
notes = "contains M-S neurostimulator auto injector."
contains = list(/obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy)
cost = 140

/datum/supply_packs/medical/nf_neurostimulator_kit
name = "N-F neurostimulator kit"
notes = "contains 5 N-F neurostimulator auto injectors."
contains = list(
/obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy,
/obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy,
/obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy,
/obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy,
/obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy,
)
cost = 500

/datum/supply_packs/medical/neuraline_kit
name ="large neuraline kit"
notes = "contains five neuraline injectors"
Expand Down
Binary file modified icons/mob/hud/reagent.dmi
Binary file not shown.
Loading