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

Adds a number of Cybersun clothing options to emagged vendors #2285

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Adds a number of Cybersun clothing options to emagged vendors #2285

wants to merge 3 commits into from

Conversation

Lyndomen
Copy link
Contributor

About the PR

JustAnOrange would like to PR a set of sprites, here they are.

Why / Balance

neat, accessible via lobby bundle or emagging engi drobe, law drobe, and sci drobe for respective clothing.

Technical details

yaml

Media

image

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

no

Changelog
🆑 JustAnOrange, Lyndomen

  • add: Added 4 new Cybersun outfits found across various emagged clothing vendors

@Lyndomen Lyndomen requested review from IamVelcroboy and a team as code owners November 25, 2024 20:13
@github-actions github-actions bot added S: Needs Review size/M 64-255 lines Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an rsi and removed size/M 64-255 lines labels Nov 25, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 25, 2024 •
edited
Loading

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

Resources/Textures/DeltaV/Clothing/Belt/syndbelt_overlay.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after 3180795

@github-actions github-actions bot added the size/M 64-255 lines label Nov 25, 2024
@JustAnOrng
Copy link

ctrl f emaggedInventory:
contrabandInventory:

@JustAnOrng
Copy link

:trollface:

deltanedas
deltanedas requested changes Nov 26, 2024
View reviewed changes
Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
@@ -16,3 +16,5 @@
ClothingOuterWinterEngi: 2
ClothingNeckScarfStripedOrange: 3
ClothingShoesBootsWinterEngi: 2
emaggedInventory:
Copy link
Member

Choose a reason for hiding this comment

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

comment

Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
@@ -16,3 +16,5 @@
ClothingNeckScarfStripedPurple: 3
ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics
ClothingShoesBootsWinterSci: 2
emaggedInventory:
Copy link
Member

Choose a reason for hiding this comment

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

comment

@JustAnOrng
Copy link

I do think that It'd work better as a contraband inventory thing, so they're more accessible. Nobody other than people who work in the department and are also syndies and also know about it will be able to access this, which sucks, since they're all rad!

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Dec 6, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 6, 2024

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

@deltanedas deltanedas requested a review from a team as a code owner December 17, 2024 04:52
@Smugman
Copy link
Contributor

Smugman commented Dec 26, 2024

Heya, Curious about the state of this, was hoping to add these uniforms and most other emag/contraband syndie clothes like the recruiter one to the emagged Uniform Printer, since that one already gets most upstream syndie clothes when Emagged.

Smugman
Smugman reviewed Dec 27, 2024
View reviewed changes
Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -30,3 +30,6 @@
SpaceCash100: 2
emaggedInventory:
CyberPen: 1
ClothingUniformCybersunAttorney: 1 # DeltaV
Copy link
Contributor

Choose a reason for hiding this comment

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

I would also put the briefcase and attorney clothes into contraband inventory instead of emagged, The briefcase is one of the snazziest items on offer!

@Smugman Smugman mentioned this pull request Dec 27, 2024
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Smugman Smugman Smugman left review comments

@deltanedas deltanedas deltanedas requested changes

@IamVelcroboy IamVelcroboy Awaiting requested review from IamVelcroboy

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Merge Conflict Fix your PR! S: Needs Review size/M 64-255 lines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Lyndomen @JustAnOrng @Smugman @deltanedas @MilonPL