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.

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

RILENA 2 #2574

Closed
wants to merge 9 commits into from
Closed

RILENA 2 #2574

wants to merge 9 commits into from

Conversation

MoonTheBird
Copy link
Contributor

About The Pull Request

Added a bunch more RILENA stuff!
FOOD:
image
PLUSHIES:
image
POSTERS:
image

Why It's Good For The Game

MORE RILENA

Changelog

🆑
add: Added a bunch more RILENA stuff! Five more posters, three more plushies, a popsicle, some macaroni and cheese, and, of course, the elusive RILENA MRE.
/:cl:

@MoonTheBird MoonTheBird requested a review from a team as a code owner December 8, 2023 02:00
@github-actions github-actions bot added Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Dec 8, 2023
@@ -285,6 +285,14 @@
tastes = list("cheese" = 1, "pizza" = 1)
foodtype = GRAIN | DAIRY

/obj/item/reagent_containers/food/snacks/ration/entree/cereal
name = "/improper RILENA flavored cereal"
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
name = "/improper RILENA flavored cereal"
name = "\improper RILENA flavored cereal"

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jan 11, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@meemofcourse
Copy link
Contributor

fix ur conflicts and address review pls

@thgvr
Copy link
Member

thgvr commented Feb 4, 2024

I think we should probably go a little less hard on this stuff

@thgvr
Copy link
Member

thgvr commented Mar 12, 2024

No activity in a while, ping me if you'd like to work on this again

@thgvr thgvr closed this Mar 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. Merge Conflict Use Git Hooks, you're welcome. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants