-
Notifications
You must be signed in to change notification settings - Fork 550
Small Dominia Food & Drink Update #21440
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
Fyniiy
wants to merge
30
commits into
Aurorastation:master
Choose a base branch
from
Fyniiy:domi-food-drink
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 24 commits
Commits
Show all changes
30 commits
Select commit
Hold shift + click to select a range
b05624a
Add files via upload
Fyniiy 9bd87f5
Add files via upload
Fyniiy 4ec4609
Add files via upload
Fyniiy 77e5380
Add files via upload
Fyniiy d35f809
Add files via upload
Fyniiy bcee78e
Update snacks.dm
Fyniiy aaf58eb
Update recipes_human.dm
Fyniiy 9b41d84
Update food_drink_dominia.dm
Fyniiy bd2db81
Update Chemistry-Recipes.dm
Fyniiy bc2284c
Update human.dm
Fyniiy b3efa00
Update processed.dm
Fyniiy 76eccec
Add files via upload
Fyniiy 9817207
Update food_drink_dominia.dm
Fyniiy 544b251
Update recipes_human.dm
Fyniiy c1262fb
Update misc.dm
Fyniiy ef5b39f
Update recipes_human.dm
Fyniiy e0331da
Update food_drink_dominia.dm
Fyniiy 34c08c1
Update processed.dm
Fyniiy 9864f38
Update snacks.dm
Fyniiy 7335eb7
Update recipes_human.dm
Fyniiy 4cb376d
Update processed.dm
Fyniiy 94269b3
Update trash.dm
Fyniiy 7a9c998
Add files via upload
Fyniiy bacc3f4
Delete html/changelogs/Fyni-DomiFlagBoxTweak.yml
Fyniiy 18246fa
Update code/modules/cooking/recipes/cultural/recipes_human.dm
Fyniiy 88414f0
Update code/modules/reagents/reagent_containers/food/snacks/cultural/…
Fyniiy e2161b6
Update code/modules/reagents/reagent_containers/food/snacks/cultural/…
Fyniiy 9b23364
Update html/changelogs/Fyni-DomiFoodandDrink.yml
Fyniiy dad907f
Update code/modules/reagents/Chemistry-Recipes.dm
Fyniiy ecc10c7
Update processed.dm
Fyniiy 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
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,61 @@ | ||
################################ | ||
# Example Changelog File | ||
# | ||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. | ||
# | ||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) | ||
# When it is, any changes listed below will disappear. | ||
# | ||
# Valid Prefixes: | ||
# bugfix | ||
# - (fixes bugs) | ||
# wip | ||
# - (work in progress) | ||
# qol | ||
# - (quality of life) | ||
# soundadd | ||
# - (adds a sound) | ||
# sounddel | ||
# - (removes a sound) | ||
# rscadd | ||
# - (adds a feature) | ||
# rscdel | ||
# - (removes a feature) | ||
# imageadd | ||
# - (adds an image or sprite) | ||
# imagedel | ||
# - (removes an image or sprite) | ||
# spellcheck | ||
# - (fixes spelling or grammar) | ||
# experiment | ||
# - (experimental change) | ||
# balance | ||
# - (balance changes) | ||
# code_imp | ||
# - (misc internal code change) | ||
# refactor | ||
# - (refactors code) | ||
# config | ||
# - (makes a change to the config files) | ||
# admin | ||
# - (makes changes to administrator tools) | ||
# server | ||
# - (miscellaneous changes to server) | ||
################################# | ||
|
||
# Your name. | ||
author: Fyni | ||
|
||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. | ||
delete-after: True | ||
|
||
# Any changes you've made. See valid prefix list above. | ||
# INDENT WITH TWO SPACES. NOT TABS. SPACES. | ||
# SCREW THIS UP AND IT WON'T WORK. | ||
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. | ||
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. | ||
changes: | ||
- rscadd: "Adds voidsman stew and carian stroganoff to make-able recipes" | ||
- rscadd: "Adds algae crisps to the Getmore vendor." | ||
- rscadd: "Adds the witchspirit cocktail to the makeable list" | ||
- rscadd: "Removes actual witchspirits" | ||
Fyniiy marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
Binary file not shown.
Binary file modified
BIN
+814 Bytes
(100%)
icons/obj/item/reagent_containers/food/cultural/human.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
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.