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.

Sign up for GitHub

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

Removes TWitch from normal rounds, and blacklists key chems from stra #4626

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+25 −12
Open

Removes TWitch from normal rounds, and blacklists key chems from stra #4626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f461fc
Removes TWitch from normal rounds, and blacklists key chems from stra…
OliverOtter Dec 20, 2024
bdd6afe
grammer skill issue
OliverOtter Dec 20, 2024
09c6e40
Adding more to the blacklist, removed pen from imports.
OliverOtter Dec 20, 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
17 changes: 16 additions & 1 deletion code/modules/hydroponics/seeds.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,19 @@
var/list/infusion_mutations = list()
///infusion damage
var/infusion_damage = 0

///Blacklist for strange seeds, because botany is already as strong as it is.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be in a modular folder

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll move it when I get home then.

var/static/list/reagent_blacklist = typecacheof(list(
/datum/reagent/drug/twitch,
/datum/reagent/medicine/adminordrazine,
/datum/reagent/medicine/changelingadrenaline,
/datum/reagent/medicine/changelinghaste,
/datum/reagent/medicine/adminordrazine/quantum_heal,
/datum/reagent/drug/demoneye,
/datum/reagent/medicine/syndicate_nanites,
/datum/reagent/drug/methamphetamine/borer_version,
/datum/reagent/medicine/stimulants,
/datum/reagent/medicine/muscle_stimulant
))
/obj/item/seeds/Initialize(mapload, nogenes = FALSE)
. = ..()
pixel_x = base_pixel_x + rand(-8, 8)
Expand Down Expand Up @@ -610,6 +622,9 @@
var/amount_random_reagents = rand(lower, upper)
for(var/i in 1 to amount_random_reagents)
var/random_amount = rand(4, 15) * 0.01 // this must be multiplied by 0.01, otherwise, it will not properly associate
var/datum/reagent/chosen_reagent = get_random_reagent_id()
if (is_type_in_typecache(chosen_reagent, reagent_blacklist)) //MONKESTATION EDIT : To remove chems that have no reasons to exist in plants. Im looking at you Changeling chems, and twitch.
continue
var/datum/plant_gene/reagent/R = new(get_random_reagent_id(), random_amount)
if(R.can_add(src))
if(!R.try_upgrade_gene(src))
Expand Down
5 changes: 0 additions & 5 deletions monkestation/code/modules/blueshift/armaments/deforest_medical.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,6 @@
item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/synalvipitol
contraband = TRUE

/datum/armament_entry/company_import/deforest/medpens_stim/twitch
item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/twitch
cost = PAYCHECK_COMMAND * 3
contraband = TRUE

/datum/armament_entry/company_import/deforest/medpens_stim/demoneye
item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/demoneye
cost = PAYCHECK_COMMAND * 3
Expand Down
2 changes: 2 additions & 0 deletions monkestation/code/modules/blueshift/opfor/equipment/medical.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
/datum/opposing_force_equipment/medical/twitch
name = "TWitch Sensory Stimulant Injector"
item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/twitch
description = "A special type of injector containing 10u of TWitch alongside some other chems. Overdosing on this can lead to heart implosion, but give you super speed and bullet immortality."
admin_note = "TWITCH IS VERY OVERPOWERED IF OD'D ON. Overdosing gives them a MASSIVE speed boost, with the ability to dodge 100% of ALL projectiles. OD limit is 15u."

/datum/opposing_force_equipment/medical/demoneye
name = "DemonEye Steroid Injector"
Expand Down
13 changes: 7 additions & 6 deletions monkestation/code/modules/blueshift/reagents/deforest.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,12 +213,11 @@
// Reaction to make twitch, makes 10u from 17u input reagents
/datum/chemical_reaction/twitch
results = list(
/datum/reagent/drug/twitch = 10,
/datum/reagent/drug/twitch = 5,
)
required_reagents = list(
/datum/reagent/impedrezene = 5,
/datum/reagent/bluespace = 10,
/datum/reagent/consumable/liquidelectricity = 2,
/datum/reagent/medicine/adminordrazine = 30,
Copy link
Collaborator

@wraith-54321 wraith-54321 Dec 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest making it need lavaland reagents instead, that or making it be a secret recipe like metalgen, currently this is a waste of adminordrazine as its still a better chem

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I contemplated on this, but decided not to. Having full projectile immunity is extremely busted, and it's not suppose to be made anyways, which is why it uses adminordrazine.

/datum/reagent/bluespace = 30 //why? because fuck you thats why. Im gonna leave it at this. Good luck making it.
)
mob_react = FALSE
reaction_tags = REACTION_TAG_EASY | REACTION_TAG_DRUG | REACTION_TAG_ORGAN | REACTION_TAG_DAMAGING
Expand All @@ -228,10 +227,12 @@
name = "TWitch"
description = "A drug originally developed by and for plutonians to assist them during raids. \
Does not see wide use due to the whole reality-disassociation and heart disease thing afterwards. \
Can be intentionally overdosed to increase the drug's effects"
However, the gods came to an agreement, and banished it from the realms. \
If the gods catch you using this, expect a swift and painful death."

reagent_state = LIQUID
color = "#c22a44"
taste_description = "television static"
taste_description = "television static, and the gods wrath"
metabolization_rate = 0.65 * REAGENTS_METABOLISM
ph = 3
overdose_threshold = 15
Expand Down
Loading