Skip to content

Xenowears#519

Merged
DangerRevolution merged 54 commits intoSimple-Station:masterfrom
ShadesMars:Xenowear
Aug 15, 2024
Merged

Xenowears#519
DangerRevolution merged 54 commits intoSimple-Station:masterfrom
ShadesMars:Xenowear

Conversation

@ShadesMars
Copy link
Copy Markdown
Contributor

@ShadesMars ShadesMars commented Jul 6, 2024

Description

Add a bit of clothing specie related and some tiny misc changes.

Normally i wanted to add the spooders changes here but with the other spider specie coming in il hold myself for now.


TODO

  • Add clothings
  • Loadouts/Vending machines

Media

image


Changelog

🆑

  • add: Xenowears! new non-human related clothings.

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Jul 6, 2024
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jul 6, 2024

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

Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi

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

Resources/Textures/Clothing/Neck/mantles/oldmantle.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/Clothing/Neck/mantles/unathimantle.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/Clothing/OuterClothing/Misc/unathirobe.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/Clothing/Shoes/Misc/clothWrap.rsi

State Old New Status
equipped-FEET Added
equipped-HAND Added
icon Added

Edit: diff updated after 5e35d63

@ShadesMars ShadesMars marked this pull request as draft July 7, 2024 17:37
@ShadesMars ShadesMars marked this pull request as ready for review July 9, 2024 11:45
@DangerRevolution
Copy link
Copy Markdown
Contributor

Lots of unrelated changes under one PR; probably worth splitting off some parts.....

@VMSolidus VMSolidus dismissed stale reviews from DEATHB4DEFEAT and DangerRevolution August 6, 2024 18:49

stale

@github-actions
Copy link
Copy Markdown
Contributor

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

Signed-off-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com>
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Aug 11, 2024
@github-actions github-actions bot removed the Changes: Localization Changes any ftl files label Aug 12, 2024
@ShadesMars
Copy link
Copy Markdown
Contributor Author

This need to be reviewed and have the "do not merge" removed.

@VMSolidus VMSolidus removed the Status: Do Not Merge Do not merge label Aug 12, 2024
parent: ClothingOuterBase
id: ClothingOuterUnathiRobe
name: roughspun robes
description: A traditional Unathi garment.
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I am aware, change the name of the clothing or change the name of the species.

{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise",
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is still valid

{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise",
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is still valid

{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise",
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is still valid

@ShadesMars
Copy link
Copy Markdown
Contributor Author

bounty-description-labeler = Due to a bureaucratic error, our sorting center almost sent hundreds of crates of carrots to the Unathi settlement. We urgently need additional labelers to restore order in the warehouse as a matter of urgency.

description: A translator implant giving the ability to speak to dragons! Subsequently, also allows to communicate with the Unathi.

@ShadesMars
Copy link
Copy Markdown
Contributor Author

Sure we can change the specie name, but not in this PR

Copy link
Copy Markdown
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

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

i'll rename the gyatt damn species in a different PR

@DangerRevolution DangerRevolution merged commit df73a1c into Simple-Station:master Aug 15, 2024
SimpleStation14 added a commit that referenced this pull request Aug 15, 2024
tmcqueen pushed a commit to tmcqueen/Syndicate-Station that referenced this pull request Aug 24, 2024
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Add a bit of clothing specie related and some tiny misc changes.

Normally i wanted to add the spooders changes here but with the other
spider specie coming in il hold myself for now.

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [x] Add clothings
- [x] Loadouts/Vending machines

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/47865d65-754d-4b70-9c10-19bc9aa55ac6)

</p>
</details>

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: Xenowears! new non-human related clothings.

---------

Signed-off-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
tmcqueen pushed a commit to tmcqueen/Syndicate-Station that referenced this pull request Aug 24, 2024
tmcqueen pushed a commit to tmcqueen/Syndicate-Station that referenced this pull request Aug 24, 2024
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Add a bit of clothing specie related and some tiny misc changes.

Normally i wanted to add the spooders changes here but with the other
spider specie coming in il hold myself for now.

---

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [x] Add clothings
- [x] Loadouts/Vending machines

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>

![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/47865d65-754d-4b70-9c10-19bc9aa55ac6)

</p>
</details>

---

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: Xenowears! new non-human related clothings.

---------

Signed-off-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
tmcqueen pushed a commit to tmcqueen/Syndicate-Station that referenced this pull request Aug 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Changes: C# Changes any cs files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 4-Low Should be resolved at some point Size: 3-Medium For medium issues/PRs Status: Needs Review Someone please review this Type: Feature Creation of or significant changes to a feature

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants