Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
VigersRay committed Aug 10, 2024
2 parents a9152c0 + 61fbe1f commit cc42d82
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
8 changes: 8 additions & 0 deletions Resources/Changelog/ChangelogSunrise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2365,3 +2365,11 @@
id: 173
time: '2024-08-08T06:28:44.0000000+00:00'
url: https://github.com/space-sunrise/space-station-14/pull/268
- author: Rinary
changes:
- message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u0441\u0443\
\u043C\u043A\u0438 \u041E\u0421\u0429"
type: Fix
id: 174
time: '2024-08-09T01:16:10.0000000+00:00'
url: https://github.com/space-sunrise/space-station-14/pull/269
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
- type: loadout
id: BlueShieldDuffel
equipment:
jumpsuit: ClothingUniformJumpsuitBlueShield
jumpsuit: ClothingBackpackDuffelBlueShield

- type: loadout
id: BlueShieldJumpskirt
Expand Down

0 comments on commit cc42d82

Please sign in to comment.