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

Collar Me Surprised #105

Merged
merged 6 commits into from
Aug 13, 2024
Merged

Collar Me Surprised #105

merged 6 commits into from
Aug 13, 2024

Conversation

Memeji
Copy link
Collaborator

@Memeji Memeji commented Aug 13, 2024

Description

This update adds some collars to the game. Many found in the various department wardrobe vendors.


Changelog

🆑

  • add: Black Collar to Clothesmate and Loadout
  • add: Blue Collar Clothesmate and Loadout
  • add: CentCom Collar to CentDrobe
  • add: Captain's Collar to the Uniform Printer and Captain's Loadout
  • add: Engineer Collar to EngiDrobe and Engineer's Loadout
  • add: Epistemics Collar to SciDrobe and Epistemic's Loadout
  • add: Logistics Collar to CargoDrobe and Logistic's Loadout
  • add: Medical Collar to MediDrobe and Medical's Loadout
  • add: Security Collar to SecDrobe and Security's Loadout
  • add: Blood-Red Collar to SyndieDrobe and Loadout

@github-actions github-actions bot added Status: Needs Review Someone please review this Status: Merge Conflict FIX YOUR PR AAAGH labels Aug 13, 2024
Copy link
Contributor

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

@github-actions github-actions bot added Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Aug 13, 2024
@Floof-Station-Bot Floof-Station-Bot changed the title Collar me surprised Collar Me Surprised Aug 13, 2024
Copy link
Contributor

github-actions bot commented Aug 13, 2024

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

Resources/Textures/Floof/Clothing/Neck/collar_black.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/Floof/Clothing/Neck/collar_blue.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/Floof/Clothing/Neck/collar_cc.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/Floof/Clothing/Neck/collar_cmd.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/Floof/Clothing/Neck/collar_engi.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/Floof/Clothing/Neck/collar_epi.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/Floof/Clothing/Neck/collar_logi.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/Floof/Clothing/Neck/collar_med.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/Floof/Clothing/Neck/collar_sec.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/Floof/Clothing/Neck/collar_syndi.rsi

State Old New Status
equipped-NECK Added
icon Added

Edit: diff updated after c6b19a0

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Aug 13, 2024
@FoxxoTrystan
Copy link
Collaborator

All look good, tho do you think you could add those in "Loadout" also?
in the neck category.

@FoxxoTrystan FoxxoTrystan added the Priority: 2-Medium Needs to be resolved at some point label Aug 13, 2024
@Memeji
Copy link
Collaborator Author

Memeji commented Aug 13, 2024

All look good, tho do you think you could add those in "Loadout" also? in the neck category.

Doing so now! Didn't notice it till I already submitted it so I'll quickly get them added.

@FoxxoTrystan FoxxoTrystan self-requested a review August 13, 2024 18:52
Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Loadouts/Jobs/cargo.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Loadouts/Jobs/engineering.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Loadouts/Jobs/medical.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Loadouts/Jobs/science.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Loadouts/Jobs/security.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Loadouts/neck.yml Outdated Show resolved Hide resolved
@Memeji Memeji requested a review from FoxxoTrystan August 13, 2024 19:31
@Memeji Memeji merged commit cd048b6 into master Aug 13, 2024
15 checks passed
Floof-Station-Bot added a commit that referenced this pull request Aug 13, 2024
@Mnemotechnician
Copy link
Contributor

This should absolutely be ported to EE

@FoxxoTrystan
Copy link
Collaborator

This should absolutely be ported to EE

Okay, go fight VM to add this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 2-Medium Needs to be resolved at some point Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants