Skip to content

Commit

Permalink
Mirror: Grey Matter Addition and Slime Organ Tweak (DeltaV-Station#175)
Browse files Browse the repository at this point in the history
## Mirror of PR #25464: [Grey Matter Addition and Slime Organ
Tweak](space-wizards/space-station-14#25464)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `471dfed44531f3d2541c0b1050dd425e5ec6c4b1`

PR opened by <img
src="https://avatars.githubusercontent.com/u/151778459?v=4"
width="16"/><a href="https://github.com/FungiFellow"> FungiFellow</a> at
2024-02-22 08:03:24 UTC
PR merged by <img
src="https://avatars.githubusercontent.com/u/19864447?v=4"
width="16"/><a href="https://github.com/web-flow"> web-flow</a> at
2024-03-13 09:06:03 UTC

---

PR changed 9 files with 55 additions and 6 deletions.

The PR had the following labels:
- No C#
- Status: Needs Review


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
> 
> ## About the PR
> <!-- What did you change in this PR? -->
> I added 5u of Grey Matter into Humanoid Brains, it currently does 20
cellular damage total. Prions are scary
> GREY MATTER CANNOT BE EXTRACTED FROM THE BRAIN IN ANY WAY. (Except
Solutions manager)
> Drink:
>       effects:
>       - !type:SatiateHunger
>         factor: 1.5
>     Poison:
>       effects:
>       - !type:HealthChange
>         damage:
>           types:
>             Cellular: 2
> 
> Grey Matter: Thought juice, the stuff that leaks out of your ears.
> 
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> Gib to Brain eat Combo is far too easy to round remove someone. You
can still grind up, hide or throw away the brain just fine.
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
> 
> ## Media
> <!-- 
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
> 
> If you're unsure whether your PR will require media, ask a maintainer.
> 
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
> 
> - [X] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
>
![image](https://github.com/space-wizards/space-station-14/assets/151778459/41cba75d-78f6-453b-a9ef-f21a4102c7fa)
>
![image](https://github.com/space-wizards/space-station-14/assets/151778459/3303ba0a-d72d-4e0c-a2ab-a9df24903f61)
>
![image](https://github.com/space-wizards/space-station-14/assets/151778459/5dd1a6f6-b604-4981-bcde-65526da40cbd)
>
![image](https://github.com/space-wizards/space-station-14/assets/151778459/128e16de-9705-471a-8ffa-98a79acb5668)
>
![image](https://github.com/space-wizards/space-station-14/assets/151778459/3b132f3d-6b55-4830-ad99-d89df1b8c46b)
> 
> ## Breaking changes
> <!--
> List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
> -->
> 
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
> 
> <!--
> Make sure to take this Changelog template out of the comment block in
order for it to show up.
> 🆑
> - add: Added fun!
> - remove: Removed fun!
> - tweak: Changed fun!
> - fix: Fixed fun!
> -->
> 🆑
> - tweak: Humanoid Brains are now stuffed with Grey Matter, not
UncookedProteins
> - tweak: Slime Organs grind into Slime


</details>

Co-authored-by: FungiFellow <[email protected]>
  • Loading branch information
SimpleStation14 and FungiFellow authored May 5, 2024
1 parent 8589df5 commit a507435
Show file tree
Hide file tree
Showing 9 changed files with 55 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/flavors/flavor-profiles.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ flavor-base-clean = clean
flavor-base-alkaline = alkaline
flavor-base-holy = holy
flavor-base-horrible = horrible
# lmao
flavor-base-terrible = terrible
flavor-base-mindful = mindful
# Complex flavors. Put a flavor here when you want something that's more
# specific.
Expand Down
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/reagents/meta/biological.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ reagent-desc-fat = No matter how it was obtained, its application is important.
reagent-name-vomit = vomit
reagent-desc-vomit = You can see a few chunks of someone's last meal in it.
reagent-name-grey-matter = grey matter
reagent-desc-grey-matter = Thought juice, the stuff that leaks out of your ears.
1 change: 1 addition & 0 deletions Resources/Locale/en-US/reagents/meta/physical-desc.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,4 @@ reagent-physical-desc-alkaline = alkaline
reagent-physical-desc-reflective = reflective
reagent-physical-desc-holy = holy
reagent-physical-desc-slimy = slimy
reagent-physical-desc-neural = neural
2 changes: 1 addition & 1 deletion Resources/Prototypes/Body/Organs/diona.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
food:
maxVol: 5
reagents:
- ReagentId: UncookedAnimalProteins
- ReagentId: GreyMatter
Quantity: 5

- type: entity
Expand Down
16 changes: 15 additions & 1 deletion Resources/Prototypes/Body/Organs/human.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,21 @@
- type: Tag
tags:
- Meat

- type: SolutionContainerManager
solutions:
organ:
reagents:
- ReagentId: Nutriment
Quantity: 10
food:
maxVol: 5
reagents:
- ReagentId: GreyMatter
Quantity: 5
- type: FlavorProfile
flavors:
- people

- type: entity
id: OrganHumanEyes
parent: BaseHumanOrgan
Expand Down
10 changes: 7 additions & 3 deletions Resources/Prototypes/Body/Organs/slime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,14 @@
food:
maxVol: 5
reagents:
- ReagentId: UncookedAnimalProteins
- ReagentId: GreyMatter
Quantity: 5
organ:
reagents:
- ReagentId: Slime
Quantity: 10


- type: entity
id: OrganSlimeLungs
parent: BaseHumanOrgan
Expand All @@ -56,7 +60,7 @@
solutions:
organ:
reagents:
- ReagentId: Nutriment
- ReagentId: Slime
Quantity: 10
Lung:
maxVol: 100.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
- Material
- Pda
- IdCard
- Brain
tags:
- HighRiskItem
soundCooldown: 0
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/Flavors/flavors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,11 @@
flavorType: Base
description: flavor-base-clean

- type: flavor
id: mindful
flavorType: Base
description: flavor-base-mindful

- type: flavor
id: mustard
flavorType: Complex
Expand Down
21 changes: 21 additions & 0 deletions Resources/Prototypes/Reagents/biological.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,3 +201,24 @@
collection: FootstepBlood
params:
volume: 6

- type: reagent
id: GreyMatter
name: reagent-name-grey-matter
group: Biological
desc: reagent-desc-grey-matter
physicalDesc: reagent-physical-desc-neural
flavor: mindful
color: "#C584B8"
slippery: false
metabolisms:
Drink:
effects:
- !type:SatiateHunger
factor: 1.5
Poison:
effects:
- !type:HealthChange
damage:
types:
Cellular: 2

0 comments on commit a507435

Please sign in to comment.