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

[Feature] Bkm konkurs #865

Merged
merged 69 commits into from
Oct 29, 2024
Merged

[Feature] Bkm konkurs #865

merged 69 commits into from
Oct 29, 2024

Conversation

nomad0260
Copy link
Collaborator

Описание PR

Медиа

Тип PR

  • Feature

Изменения

@nomad0260
Summey
6260108
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
bf861fb
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
a32c7c7
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
c717c1e
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
52a29bf
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
d631ed3
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
542643f
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
1efb09a
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
e298cd2
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
e6554ea
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
9831574
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
6a1099a
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
5ce39f8
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
ab0f0fd
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
1be86ff
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
b7c8314
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
7447cbd
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
aa959c4
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
7241f6d
@nomad0260
fks ленивая жопа
7850054
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
42c67e5
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
cc4f519
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
4a6ce75
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
36f4f65
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
db8034d
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
eb52e27
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
dd76a00
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
531f8c0
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
e5c5b55
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
71d6c07
nomad0260 added 19 commits July 10, 2024 14:54
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
9dc1b91
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
bdf9b18
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
44d8429
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
e4d3586
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
e77890d
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
ab094b3
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
7d5f4c1
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
95d0b7c
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
ed64abf
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
72ef760
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
e1b675d
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
4462f40
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
a7e0c98
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
e73604d
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
cc095b0
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
ef6bf97
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
fd48b66
@nomad0260
Merge branch 'master' of https://github.com/nomad0260/space-station-14-
e40d43a
@nomad0260
konkurs шняга
938817f
@nomad0260 nomad0260 requested a review from Rxup as a code owner October 28, 2024 07:29
@github-actions github-actions bot added Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. No C# Нету кода. Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation labels Oct 28, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 28, 2024 •
edited
Loading

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

Resources/Textures/Backmen/Clothing/OuterClothing/Coats/bizzare.rsi

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

Resources/Textures/Backmen/Mobs/Ghost/mujik.rsi

State Old New Status
mujik Added

Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Shotguns/sh-39/big.rsi

State Old New Status
tank Added

Edit: diff updated after 4109b98

@Rxup Rxup merged commit 6442873 into Rxup:master Oct 29, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

Assignees
No one assigned
Labels
Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. No C# Нету кода.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nomad0260 @Rxup