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

Station Anchor #425

Merged
merged 19 commits into from
Dec 22, 2024
Merged

Station Anchor #425

merged 19 commits into from
Dec 22, 2024

Conversation

fenndragon
Copy link
Contributor

Description

Adds Station Anchor

Changelog

🆑

  • add: Station Anchor

@fenndragon
Merge branch 'Fansana:master' into master
e54fb22
@fenndragon
Merge branch 'Fansana:master' into master
dbfdb83
@fenndragon
Merge branch 'master' of https://github.com/fenndragon/floofstation1
e5d52b8
@fenndragon
Merge branch 'master' of https://github.com/fenndragon/floofstation1
3d875f6
@fenndragon
Merge branch 'master' of https://github.com/fenndragon/floofstation1
158faf2
@fenndragon
Merge branch 'master' of https://github.com/fenndragon/floofstation1
7e2dd64
@fenndragon
Create folder
011a207
@fenndragon
Add files via upload
1c393df
@fenndragon
Merge branch 'Fansana:master' into master
4165083
@fenndragon
Merge branch 'Fansana:master' into master
032291f
@fenndragon
Merge branch 'master' of https://github.com/fenndragon/floofstation1
06fda0c
@fenndragon
Delete Content.Client/DeltaV/RainLizard directory
59bd1a1
@fenndragon
Merge branch 'Fansana:master' into master
5e2c02f
@fenndragon
Merge branch 'Fansana:master' into master
edbf9b2
@fenndragon
anchor
0ec437d
@fenndragon
Merge branch 'Fansana:master' into Anchor
8cb00df
@fenndragon
Merge branch 'Anchor' of https://github.com/fenndragon/floofstation1 …
a78411a 
…into Anchor
@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Changes: YML Changes any yml files labels Dec 21, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 21, 2024 •
edited
Loading

RSI Diff Bot; head commit ff97abf merging into 4894794
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Structures/Machines/station_anchor.rsi

State Old New Status
station_anchor Added
station_anchor_unlit Added

Edit: diff updated after ff97abf

@Fansana Fansana merged commit 932b132 into Fansana:master Dec 22, 2024
13 checks passed
Floof-Station-Bot added a commit that referenced this pull request Dec 22, 2024
@Floof-Station-Bot
Automatic Changelog Update (#425)
717f154
@Fansana Fansana mentioned this pull request Dec 27, 2024
Merged
@fenndragon fenndragon deleted the Anchor branch January 8, 2025 20:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Fansana Fansana Awaiting requested review from Fansana Fansana is a code owner

@Memeji Memeji Awaiting requested review from Memeji Memeji is a code owner

@FoxxoTrystan FoxxoTrystan Awaiting requested review from FoxxoTrystan FoxxoTrystan is a code owner

Assignees
No one assigned
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@fenndragon @Fansana