* Funny merge skew from banana (#71039)
When a food feature PR and a food refactor come together, and get merged
without re-running checks, something very funny happens.
A merge skew.
Edible component uses inherent component so this is fine.
* Funny merge skew from banana
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
* Clowns will now always like bananas. (#70919)
## About The Pull Request
Clown's liver makes them like bananas, ignoring their racial food
preferences.
## Why It's Good For The Game
I don't think clown moths should vomit from eating bananas. They are
clowns, after all.
Also clowns are healed from eating them, so it's a bit silly that they
vomit from their funny medicine.
## Changelog
🆑
balance: Non-human clowns enjoy eating bananas now.
/🆑
* Clowns will now always like bananas.
Co-authored-by: Striders13 <53361823+Striders13@users.noreply.github.com>
* Adds a bar to the biogen to show how full a container is (#70407)
About The Pull Request
Adds a bar to the UI of the biogen to show how full the container inside is
2022-10-08.23-47-27.mp4
I tidied it up a little bit but forgot to record it so here's a screenshot of how it looks now
image
Why It's Good For The Game
Helpful so you don't have to keep doing math over how many u's of reagents you'll have room for in a container
Changelog
cl Wallem
qol: The Biogen will show how full the container inside it is
/cl
* Adds a bar to the biogen to show how full a container is
Co-authored-by: Wallem <66052067+Wallemations@users.noreply.github.com>
* Fixes storage mass transfer being generally broken, adds mass transferring onto griddles (#69084)
* - Fixes storage mass transfer
- Brings some sanity to storage procs
- Implements a griddle feature that never was
* Uncomment this
* Right-click attack fix
* Scoop fix
* Smartfridges use silent
* Restores some lost checks
* Fixes storage implants
* Fixes storage mass transfer being generally broken, adds mass transferring onto griddles
* update modular
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
* Splits up 'Gross' food from 'Gore' and reshuffles taste preferences accordingly (#68899)
* Splits up 'gross' food from 'carrion'
* Adds a couple of missed burgers.
Moths dislike Carrion rather than it being poison to them.
* BEES is now BUGS
* It's always safe and a good idea to use find/replace
* Splits up 'Gross' food from 'Gore' and reshuffles taste preferences accordingly
* Splits up 'Gross' food from 'Gore' and reshuffles taste preferences accordingly
Co-authored-by: Jacquerel <hnevard@gmail.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
* Add liquid dark matter to bluespace bananas (#69207)
* Add liquid dark matter to bluespace bananas
* Buff liquid dark matter
* Add antimatter to taste description
* Add liquid dark matter to bluespace bananas
Co-authored-by: Tim <timothymtorres@gmail.com>
* Removes ComponentInitialize()
* Fixes a leftover merge conflict marker
* Fixes the oversight that came from the upstream merge skew
* Fixes all of the instances where we used ComponentInitialize() when we shouldn't've been
* Fixes CI being broken because of the HEV suits
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
* Replaces the mood component with a mood datum
* Fixes merge conflicts and updates all of our mood events to use the new mood datums
Co-authored-by: Seth Scherer <supernovaa41@gmx.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
* [GBP No Update] Perish, individual logging runtime (#69024)
missed 2 or 3(lol it was more when I look back at the files), LOG_GAME tags on the log_message line, and did some cleaning up since i was looking through every log_message again
Co-authored-by: tattle <66640614+dragomagol@ users.noreply.github.com>
Co-authored-by: tattle <66640614+dragomagol@ users.noreply.github.com>
* [GBP No Update] Perish, individual logging runtime
Co-authored-by: Mooshimi <85910816+Mooshimi@users.noreply.github.com>
Co-authored-by: tattle <66640614+dragomagol@ users.noreply.github.com>
* Fixes seed extractors not taking seeds from plant bags. (#68842)
* Fixes seed extractors not taking seeds from plant bags.
- When refactored, it accidently changed it from taking the seed "from its loc" to "from the extractor itself", which always failed
* Unit test
* Genericises it a bit
* Fixes seed extractors not taking seeds from plant bags.
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
* Replaces GetComponent in Mining items with Signalers (#68575)
* Replaces many instances of GetComponents in mining items with signals and better uses overall of Components, in drills and the GPS handcuffs.
* To do this, also added 3 new signals to mechs when you are adding/removing mech equipment onto one.
* Replaces GetComponent in Mining items with Signalers
Co-authored-by: Salex08 <33989683+Salex08@users.noreply.github.com>
* Fixes digitigrade legs drawing incorrectly with certain suits. (#68287)
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
* Fixes digitigrade legs drawing incorrectly with certain suits.
Co-authored-by: lizardqueenlexi <105025397+lizardqueenlexi@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
* The Toiletbong and other poetical additions (*click* Noice) (#68193)
* Main
* Added deconstruction and better rotation
* Open flame during usage, emagging
* Wording fix, sound fix
* Extra-indestructable check
* Storage is now a normal datum instead of a component? Noice
* Updated harvest.dmi after bell pepper resprite
* The new atom storage broke the emag capability, added a small fix
* The Toiletbong and other poetical additions (*click* Noice)
Co-authored-by: LordVollkorn <66637090+LordVollkorn@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
* Tsu's Brand Spanking New Storage: or, How I Learned To Pass Github Copilot As My Own Code
* Delete storage.dm
* yippee
* shit
* holy shit i am stupid
* more fixes
* fuck
* woops
* Fixes some cases which references are used in trait sources, potentially causing hard deletes (#67974)
About The Pull Request
Fixes some cases in which actual references were used in trait sources instead of keys (or ref() keys).
This can cause some rare and difficult to find hard deletes.
Trait sources should be a string key relating to the source of it, not an actual reference to what added it. References within trait sources are never handled in Destroy(), because it's not expected behavior, meaning it can cause hanging references.
So, I went through with a regex to find some cases and replaced them.
I used the following and just picked through the few by hand to find erroneous ones.
ADD_TRAIT\(.+, .+, [a-z]+\)
REMOVE_TRAIT_TRAIT\(.+, .+, [a-z]+\)
Why It's Good For The Game
Less hard deletes, probably.
Changelog
cl Melbert
code: Some traits which mistakenly were sourced from a hard reference are no longer.
/cl
* Fixes some cases which references are used in trait sources, potentially causing hard deletes
* wew
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
* Olives! + Custom sushi/Pierogi changes (#67239)
About The Pull Request
This is a continuation of #66946 since I have enough points to finally do so.
This PR will:
Expand upon my previous sushi PR, allowing people to use an ingredient on a sushi sheet to start creating custom sushi.
Add olives! A new type of fruit that can be grown in hydroponics. When ground, it becomes olive paste which when mixed with water in a 4-1 reaction turns into 2 units of quality oil.
Make pierogis require a dough slice to craft instead of a bun.
Make quality oil cost 50 credits to order instead of 120
Why It's Good For The Game
Since my sushi PR merged, many people have asked me to add custom sushi, so here it is. This will allow chefs to make more interesting menus with added customization.
Quality oil is an extremely expensive commodity (120 credits for one 50 unit bottle, 240 if you expedite it!!!) and can only be acquired from cargo. I feel because of this, many chefs do not make lizard or mothic foods because simply acquiring the ingredients to do so is either very time consuming, expensive, or both. This will encourage people to make those foods more often since one of the key ingredients in many lizard or mothic dishes can be made by them, too. Olives themselves can be eaten as a snack and open up opportunities for new foods in the future, and it makes sense for you to make your own oil since the process is simple yet highly inefficient in real life.
This PR originally had a way to craft cornmeal as well, but that idea was adopted yesterday in #67227 which they can keep.
Lastly, it seems more reasonable for pierogis to require a dough slice instead of a burger bun. Don't think that requires more explanation.
I believe my gbp score is at -3, but I have three PRs waiting to merge currently which will boost me way above that.
Changelog
cl
add: Botany can now grow olives, which can be ground into a paste and mixed with water to make quality oil.
add: You can now make custom sushi by using an ingredient on a seaweed sheet. The sushi will be named after the first ingredient you use.
balance: Pierogis now need a dough slice instead of a bun
balance: Quality oil costs 50 credits to order instead of 120
/cl
* Olives! + Custom sushi/Pierogi changes
Co-authored-by: MidoriWroth <kodyman@att.net>
* Fixes Novaflowers not lighting people on fire, again. Unit tests it. Cleans up some unique plant genes stuff too. (#67597)
* Fixes Novaflowers not lighting people on fire, again. Unit tests it. Cleans up some unique plant genes stuff too.
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
