-
Notifications
You must be signed in to change notification settings - Fork 934
Research rework - Xenobiology edition #12895
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
Open
Watermelon914
wants to merge
32
commits into
cmss13-devs:master
Choose a base branch
from
Watermelon914:research-rework
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
32 commits
Select commit
Hold shift + click to select a range
1da3443
Reworked research
Watermelon914 b1aa358
Fixes a bunch of bugs
Watermelon914 736e078
Fixed inject blood speeds
Watermelon914 f06cb7b
Addresses comments
Watermelon914 33d36aa
Fixes deletion causing organ timers to hold refs
Watermelon914 088f1d2
Fixes missing_icons failing on an abstract type
Watermelon914 05b01f7
Actually commits the fix
Watermelon914 4460b1c
Fixed xenomorphs having half HP on evo
Watermelon914 22a55d8
Adds 2 drone hearts to research containment at the start of the round
Watermelon914 9e57f6e
Adds the missing reagents to the basic/advanced chem producers
Watermelon914 8bc7740
Nerfs the plasmas so that they can't be easily used as stimulants
Watermelon914 249dd7c
Fixed xeno chems not being treated as special during reports
Watermelon914 0018ce4
Reduces additional chemical volume down to 60 per chem
Watermelon914 2dc1df7
Brings it up to 120u per chem
Watermelon914 fbbb29b
Makes production capacity of resin glands equal to 2x their productio…
Watermelon914 3e9d1b5
Replaces vibration-absorbing with xeno-recognizing
Watermelon914 64bf145
Fixed a bug with the organ regen timer
Watermelon914 1fbdd31
Fixed compilation error + xenos suffering from crit again when their …
Watermelon914 e136fb5
Fixed rejuvenate not working on xenos, instantly critting them.
Watermelon914 5e069dc
Lesser drones no longer have organs, fixed de-evolving without an org…
Watermelon914 6fbc3e6
Anti-neurotoxin now requires royal plasma, to prevent getting it imme…
Watermelon914 3f2aa39
Fixed chemical extractors printing out botany research
Watermelon914 b1b38c5
Fixed chem producers not producing chems if they had more than 1 chem…
Watermelon914 42c46ca
Locks the reagents for the simple and advanced xenobio contracts so t…
Watermelon914 ae37ca0
Removed abstract type designation
Watermelon914 66c033d
Organs can only be planted in research containment
Watermelon914 e31cd5d
Resolve conflict
Watermelon914 2ed69be
Makes WRS mutually exclusive with nervestim and musclestim
Watermelon914 1394543
Removes plasmas from xeno blood since it can be obtained from organs now
Watermelon914 6b746a1
Fixed buying stuff on debt
Watermelon914 654a271
Adds PLASMA_PHEROMONE back to the drone tree castes so that it's actu…
Watermelon914 a03fed5
Resolve merge conflict
Watermelon914 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| PROCESSING_SUBSYSTEM_DEF(xeno_botany) | ||
| name = "Xenomorph Botany" | ||
| flags = SS_NO_INIT | ||
| wait = XENO_BOTANY_RATE |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| /obj/effect/alien/resin/chem_producer | ||
| name = "resin gland" | ||
| icon = 'icons/mob/xenos/fruits.dmi' | ||
| desc = "A weird-looking pulsating node that produces chemicals" | ||
| density = FALSE | ||
| opacity = FALSE | ||
| anchored = TRUE | ||
| health = 50 | ||
| layer = RESIN_STRUCTURE_LAYER | ||
| plane = FLOOR_PLANE | ||
|
|
||
| // Production stats | ||
| /// Which chem does this produce? | ||
| var/producing_chems = list() | ||
| /// How much is produced every XENO_BOTANY_RATE? | ||
| var/production_amt = 5 | ||
|
|
||
| /obj/effect/alien/resin/chem_producer/Initialize(mapload, mob/builder) | ||
| . = ..() | ||
| create_reagents(100) | ||
| START_PROCESSING(SSxeno_botany, src) | ||
|
|
||
| /obj/effect/alien/resin/chem_producer/process(delta_time) | ||
| var/turf/current_turf = get_turf(src) | ||
| if(!current_turf.weeds) | ||
| return | ||
|
|
||
| var/max_per_reagent = reagents.maximum_volume / length(producing_chems) | ||
| for(var/chem in producing_chems) | ||
| var/reagent_amt = reagents.get_reagent_amount(chem) | ||
| // Conservative, so that reagents don't end up overflowing and having weird floating point values | ||
| // because they all didn't fit into the volume | ||
| if(reagent_amt + production_amt > max_per_reagent) | ||
| continue | ||
| reagents.add_reagent(chem, production_amt, safety = TRUE) | ||
|
|
||
|
|
||
| /obj/effect/alin/resin/chem_producer/Destroy(force) | ||
| STOP_PROCESSING(SSxeno_botany, src) | ||
| return ..() | ||
|
|
||
| /obj/effect/alien/resin/chem_producer/basic | ||
| name = "basic gland" | ||
| desc = "A weird-looking pulsating node that produces all basic xenobiology reagents, at slower speeds." | ||
| icon = 'icons/mob/xenos/effects.dmi' | ||
| icon_state = "static_costnode" | ||
|
|
||
| producing_chems = list(PLASMA_PURPLE, PLASMA_CATECHOLAMINE, PLASMA_CHITIN) | ||
| production_amt = 1 | ||
|
|
||
| /obj/effect/alien/resin/chem_producer/advanced | ||
| name = "advanced gland" | ||
| desc = "A weird-looking pulsating node that produces all advanced xenobiology reagents, at slower speeds." | ||
| icon = 'icons/mob/xenos/effects.dmi' | ||
| icon_state = "static_constructnode" | ||
|
|
||
| producing_chems = list(PLASMA_REINFORCED_CHITIN, PLASMA_ADRENALINE, PLASMA_ACIDIC) | ||
| production_amt = 1 | ||
|
|
||
| /obj/effect/alien/resin/chem_producer/plasma | ||
| name = "plasma gland" | ||
| desc = "A weird-looking pulsating node that produces purple plasma" | ||
| icon_state = "fruit_plasma_immature" | ||
|
|
||
| producing_chems = list(PLASMA_PURPLE) | ||
| production_amt = 10 | ||
|
|
||
| /obj/effect/alien/resin/chem_producer/nutrient | ||
| name = "nutrient gland" | ||
| desc = "A weird-looking pulsating node that produces nutrient plasma" | ||
| icon_state = "fruit_plasma" | ||
|
|
||
| producing_chems = list(PLASMA_NUTRIENT) | ||
| production_amt = 10 | ||
|
|
||
| /obj/effect/alien/resin/chem_producer/chitin | ||
| name = "chitin gland" | ||
| desc = "A weird-looking pulsating node that produces chitin" | ||
| icon_state = "fruit_spore_immature" | ||
|
|
||
| producing_chems = list(PLASMA_CHITIN) | ||
| production_amt = 10 | ||
|
|
||
| /obj/effect/alien/resin/chem_producer/reinforced_chitin | ||
| name = "reinforced chitin gland" | ||
| desc = "A weird-looking pulsating node that produces reinforced chitin plasma" | ||
| icon_state = "fruit_spore" | ||
|
|
||
| producing_chems = list(PLASMA_REINFORCED_CHITIN) | ||
| production_amt = 10 | ||
|
|
||
| /obj/effect/alien/resin/chem_producer/neurotoxin | ||
| name = "neurotoxin gland" | ||
| desc = "A weird-looking pulsating node that produces neurotoxin plasma" | ||
| icon_state = "fruit_greater_immature" | ||
|
|
||
| producing_chems = list(PLASMA_NEUROTOXIN) | ||
| production_amt = 10 | ||
|
|
||
| /obj/effect/alien/resin/chem_producer/acid | ||
| name = "acid gland" | ||
| desc = "A weird-looking pulsating node that produces acidic plasma" | ||
| icon_state = "fruit_greater" | ||
|
|
||
| producing_chems = list(PLASMA_ACIDIC) | ||
| production_amt = 10 | ||
|
|
||
| /obj/effect/alien/resin/chem_producer/catecholamine | ||
| name = "catecholamine gland" | ||
| desc = "A weird-looking pulsating node that produces catecholamine plasma" | ||
| icon_state = "fruit_speed_immature" | ||
|
|
||
| producing_chems = list(PLASMA_CATECHOLAMINE) | ||
| production_amt = 10 | ||
|
|
||
| /obj/effect/alien/resin/chem_producer/adrenal | ||
| name = "adrenal gland" | ||
| desc = "A weird-looking pulsating node that produces adrenal plasma" | ||
| icon_state = "fruit_speed" | ||
|
|
||
| producing_chems = list(PLASMA_ADRENALINE) | ||
| production_amt = 10 | ||
|
|
||
| /obj/effect/alien/resin/chem_producer/royal | ||
| name = "royal gland" | ||
| desc = "A weird-looking pulsating node that produces royal plasma" | ||
| icon = 'icons/mob/xenos/structures64x64.dmi' | ||
| icon_state = "collector_gather" | ||
| plane = GAME_PLANE | ||
| pixel_x = -16 | ||
| pixel_y = -16 | ||
|
|
||
| producing_chems = list(PLASMA_ROYAL) | ||
| production_amt = 5 |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.