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.

Sign up for GitHub

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

Jump to bottom

Add Hairflower and Explorer's Labcoat to Loadouts #60

Merged
merged 4 commits into from
Jul 25, 2024
Merged

Add Hairflower and Explorer's Labcoat to Loadouts #60

merged 4 commits into from
Jul 25, 2024

Conversation

AeraAuling
Copy link
Contributor

Description

Very simple PR. This adds the hairflower and Explorer's labcoat to the head loadout and Epistemics job loadouts respectively. This will go to upstream eventually, I've just got way too much open on that side and don't want to accidentally push kitsune stuff with this, so it gets to come here first

TODO

  • add hairflower to public head loadouts
  • add explorer's labcoat to epi

Media

Example Media Embed

Changelog

🆑

  • add: Epistemics has been given a supply of new labcoats, and everyone has been authorized to wear hairflowers.

@github-actions github-actions bot added the Changes: YML Changes any yml files label Jul 25, 2024
@Floof-Station-Bot Floof-Station-Bot changed the title Add hairflower and explorer's labcoat to loadouts Add Hairflower and Explorer's Labcoat to Loadouts Jul 25, 2024
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Jul 25, 2024
FoxxoTrystan
FoxxoTrystan requested changes Jul 25, 2024
View reviewed changes
Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

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

Simple first good .yml changes PR, make sure to mark so we dont override it with upsteam merges.

Resources/Prototypes/Loadouts/head.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Loadouts/head.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Loadouts/Jobs/science.yml Outdated Show resolved Hide resolved
@FoxxoTrystan FoxxoTrystan added Status: Awaiting Changes Do not merge due to requested changes Priority: 3-Low Should be resolved at some point and removed Status: Needs Review Someone please review this labels Jul 25, 2024
@AeraAuling AeraAuling requested a review from FoxxoTrystan July 25, 2024 01:25
@github-actions github-actions bot added Status: Needs Review Someone please review this and removed Status: Awaiting Changes Do not merge due to requested changes labels Jul 25, 2024
@Fansana Fansana merged commit 3241c3d into Fansana:master Jul 25, 2024
11 of 12 checks passed
Floof-Station-Bot added a commit that referenced this pull request Jul 25, 2024
@Floof-Station-Bot
Automatic Changelog Update (#60)
f3a7d6d
DangerRevolution added a commit to DangerRevolution/Einstein-Engines that referenced this pull request Aug 10, 2024
@DangerRevolution
Fansana/floofstation1#60 - Hairflower and Explorer Coat into Loadouts
a3ae0c1
Merrokitsune pushed a commit to Merrokitsune/Aphrodite that referenced this pull request Nov 17, 2024
@Doctor-Cpu @Merrokitsune
Reapply "Vent crawling (Fansana#60)" (Fansana#77)
c0d3aee 
This reverts commit 576fcb3b0e25a6f2ad443ab797d9847906bec28d.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Fansana Fansana Fansana approved these changes

@FoxxoTrystan FoxxoTrystan FoxxoTrystan approved these changes

Assignees

@AeraAuling AeraAuling

Labels
Changes: YML Changes any yml files Priority: 3-Low Should be resolved at some point Status: Needs Review Someone please review this
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@AeraAuling @FoxxoTrystan @Fansana