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

update #1694

Closed
wants to merge 51 commits into from
Closed

update #1694

wants to merge 51 commits into from

Conversation

u9djfgoj
Copy link

No description provided.

Smirnov and others added 30 commits July 8, 2023 14:16
Replaced old posters by Sh18RW's.
002fdf5
Moved sprite
afbe218
Added locale without renaming locale names.
a5caa96
Removed mention of NT
afeb01d
Fixed wrong word
cb9acb7
@u9djfgoj
Merge pull request #1 from Sh18RW/indev
4735842 
Indev
Add new files for space station
169a3df
Merge branch 'master' of https://github.com/u9djfgoj/space-station-ussp
3b0e2e8
@u9djfgoj
Описание изменений
aadef94
@u9djfgoj
Merge branch 'master' of https://github.com/u9djfgoj/space-station-ussp
d08dce5
@u9djfgoj
Revert "Merge branch 'master' of https://github.com/u9djfgoj/space-st…
66bfd3f 
…ation-ussp"

This reverts commit d08dce5, reversing
changes made to aadef94.
@u9djfgoj
Описание изменений
dfa215e
@u9djfgoj
Merge branch 'master' of https://github.com/u9djfgoj/space-station-ussp
71cf7cd
@u9djfgoj
Revert "Описание изменений"
e71aaf3 
This reverts commit aadef94.
Replaced posters by new
aa5d302
Replaced a poster5_legit.png
7a89010
Added locale for new posters
d0c3a3b
Fixed misspell
0c8ddc8
Added USSP soap texture
96f0375
Added USSP soap
9b615f5
Replaced NT soap to USSP
e813164
Added USSP cloak
8e5ec3d
Added doshirak
505aabc
Refactor ramen to doshirak
7373d2d
Refactor ramen to doshirak
fdf592c
Changed botany instruments
7d8bcb5
Added USSP cloak icon
7cd9c71
Added hell doshirak icon
c2b1589
Added USSP soup inhand textures
99f9115
Fixed naming
bf58301
u9djfgoj and others added 18 commits July 16, 2023 19:02
@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged Merge Conflict PR have unsolved merge conflicts labels Dec 28, 2023
@github-actions GitHub Actions
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: Localization Can be reviewed or fixed by people who are knowledgeable with translation Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design labels Dec 28, 2023
@github-actions GitHub Actions
Copy link
Contributor

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

Resources/Textures/Objects/Tools/Hydroponics/hatchet.rsi

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

Resources/Textures/Objects/Tools/Hydroponics/hoe.rsi

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

Resources/Textures/Objects/Tools/Hydroponics/scythe.rsi

State Old New Status
equipped-BACKPACK Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Objects/Tools/Hydroponics/spade.rsi

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

Resources/Textures/Structures/Wallmounts/posters.rsi

State Old New Status
poster11_legit Modified
poster13_legit Modified
poster14_legit Modified
poster15_legit Modified
poster18_legit Modified
poster1_legit Modified
poster25_legit Modified
poster2_legit Modified
poster36_legit Modified
poster38_legit Modified
poster3_legit Modified
poster5_contraband Modified
poster5_legit Modified
poster7_legit Modified
poster9_legit Modified

Resources/Textures/Objects/Consumable/Drinks/ramen.rsi

State Old New Status
icon Removed

Resources/Textures/Clothing/Neck/Cloaks/ussp.rsi

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

Resources/Textures/Objects/Consumable/Drinks/doshirak.rsi

State Old New Status
icon Added

Resources/Textures/Objects/Consumable/Drinks/hell_doshirak.rsi

State Old New Status
icon Added

Resources/Textures/Objects/Specific/Janitorial/soap.rsi

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

@u9djfgoj
Copy link
Author

не туда...

@u9djfgoj u9djfgoj closed this Dec 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

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

Assignees
No one assigned
Labels
Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design Merge Conflict PR have unsolved merge conflicts Status: Needs Review This PR requires new reviews before it can be merged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@u9djfgoj @Sh18RW