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

Blood Red Coder Socks Addition #37

Merged
merged 5 commits into from
Jul 19, 2024
Merged

Blood Red Coder Socks Addition #37

merged 5 commits into from
Jul 19, 2024

Conversation

Shiro69420
Copy link
Contributor

@Shiro69420 Shiro69420 commented Jul 18, 2024 •
edited by FoxxoTrystan
Loading

Description

Added Blood-red Coder Socks to the game. I also put 3 inside the Pride-O-Mat emag storage and the pointless section of syndicate uplink for 1 TC.

Media

Changelog

🆑

  • add: blood-red coder socks to things

@Shiro69420
Blood Red Coder Socks
cc84550 
Added blood red coder socks to the game. Added it to uplink and emag storage in pride-o-mat.
@Shiro69420
Update pride.yml
6d48853 
Quick fix because I forgot to fucking add it to the actual vending machine.
@Shiro69420
Merge branch 'Fansana:master' into master
e64691a
@Shiro69420
Fixing Spelling and whatnot
8367363 
Fixing spelling, adding - to be consistent.
@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Jul 18, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 18, 2024 •
edited
Loading

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

Resources/Textures/Floof/Clothing/Under/Socks/codervalid.rsi

State Old New Status
equipped-FEET Added
icon Added

Edit: diff updated after 03a6df2

FoxxoTrystan
FoxxoTrystan requested changes Jul 18, 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.

Please follow the correct PR Format, this will not be merged until its is fixed.

Code is code overall with just one code suggestions, good job.

Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml Outdated Show resolved Hide resolved
@FoxxoTrystan FoxxoTrystan added Priority: 3-Low Should be resolved at some point Status: Awaiting Changes Do not merge due to requested changes labels Jul 18, 2024
@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 18, 2024
@Fansana Fansana merged commit 63036df into Fansana:master Jul 19, 2024
13 of 14 checks passed
Floof-Station-Bot added a commit that referenced this pull request Jul 19, 2024
@Floof-Station-Bot
Automatic Changelog Update (#37)
c6f7c09
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

@Shiro69420 Shiro69420

Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI 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
@Shiro69420 @FoxxoTrystan @Fansana