Skip to content

Commit

Permalink
Merge branch 'master' into Hyper-ExosuitFab
Browse files Browse the repository at this point in the history
  • Loading branch information
KaiserMaus committed Jan 13, 2025
2 parents fa86f6b + add9c64 commit 70997d5
Show file tree
Hide file tree
Showing 82 changed files with 2,798 additions and 4,222 deletions.
12 changes: 12 additions & 0 deletions Resources/Changelog/ChangelogSunrise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10570,3 +10570,15 @@
id: 731
time: '2025-01-11T23:53:03.0000000+00:00'
url: https://github.com/space-sunrise/space-station-14/pull/1107
- author: KaiserMaus
changes:
- message: "\u0423\u0434\u0430\u043B\u0435\u043D\u043E \u041D\u043E\u0432\u043E\u0433\
\u043E\u0434\u043D\u0438\u0435 \u0443\u043A\u0440\u0430\u0448\u0435\u043D\u0438\
\u044F."
type: Remove
- message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0448\u0430\u0442\
\u0442\u043B \u044D\u0432\u0430\u043A\u0443\u0430\u0446\u0438\u0438 Cog"
type: Fix
id: 732
time: '2025-01-13T18:31:46.0000000+00:00'
url: https://github.com/space-sunrise/space-station-14/pull/1103

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

5 changes: 0 additions & 5 deletions Resources/Locale/en-US/_strings/atmos/gas-pipe-sensor.ftl

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ent-IcarusKeyImplanter = icarus key implanter
.desc = { ent-BaseImplantOnlyImplanter.desc }
ent-IcarusKeyImplanter = имплантатор ключей "Икарус"
.desc = { ent-BaseImplantOnlyImplanter.desc }
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ent-IcarusKey = icarus authentication keycard
.desc = A high profile authentication keycard to Nanotrasen's Icarus secured network.
ent-IcarusKey = ключ авторизации "Икарус"
.desc = Ключ предназначеный для получения доступа к орбитальному оружию НТ "Икарус"
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ent-AssaultOpsPDA = passenger PDA
.desc = Why isn't it gray?
ent-AssaultOpsPDA = КПК пассажира
.desc = Почему он не серый?
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ent-PinpointerIcarus = pinpointer
ent-PinpointerIcarus = пинпоинтер "Икарус"
.desc = { ent-PinpointerBase.desc }
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
ent-ClothingBackpackDuffelSyndicateFilledBauer = Bauer-127 bundle
.desc = The iconic Bauer-127 magazine rifle with 2 raspy magazines in the set.
ent-ClothingBackpackDuffelWeaponSubMachineGunWt550Filled = Bundle WT550
.desc = WT550 with 3 raspy magazines.
ent-ClothingBackpackDuffelWeaponSubMachineGunMP5Filled = Bundle MP5
.desc = MP5 with 2 raspy magazines.
ent-ClothingBackpackDuffelWeaponRifleLecterFilled = Bundlelecter
.desc = Lecter with 3 raspy magazines.
ent-ClothingBackpackDuffelWeaponSubMachineGunP90Filled = Bundle p90
.desc = P-90 with 2 raspy magazines.
ent-ClothingBackpackDuffelWeaponAMS42Filled = Bundle ams42
.desc = AMS-42 with 3 raspy magazines.
ent-ClothingBackpackDuffelWeaponRifleG36Filled = Bundle G36
.desc = G36 with 2 raspy magazines.
ent-ClothingBackpackDuffelWeaponShotgunZauerFilled = Bundle zauer
.desc = Zauer with 2 raspy magazines.
ent-ClothingBackpackDuffelWeaponXM1014Filled = Bundle xm1014
.desc = XM1014 with 1 Box ammo.
ent-ClothingBackpackDuffelWeaponShotgun12Filled = Bundle law12
.desc = Law-12 with 1 Box ammo.
ent-ClothingBackpackDuffelWeaponRifleBR64Filled = Bundle br64
.desc = BR64 with 2 raspy magazines.
ent-ClothingBackpackDuffelWeaponLightMachineGunMG42 = Bundle mg342
.desc = MG-342 with 2 raspy magazines.
ent-ClothingBackpackDuffelWeaponSniperHristovFilled = Bundle Hristov
.desc = Hristov with 4 raspy .60 10-rounds Box.
ent-ClothingBackpackDuffelNanotrasenMedicalBundleFilled = nanotrasen medical bundle
.desc = A large duffel bag for holding any medical army goods.
ent-ClothingBackpackDuffelWeaponSubMachineGunWt550Filled = Набор WT550
.desc = WT550 c 3мя магазинами.
ent-ClothingBackpackDuffelWeaponSubMachineGunMP5Filled = Набор MP5
.desc = Mp5 c 2мя магазинами.
ent-ClothingBackpackDuffelWeaponRifleLecterFilled = Набор Lecter
.desc = Lecter c 3мя магазинами.
ent-ClothingBackpackDuffelWeaponSubMachineGunP90Filled = Набор P-90
.desc = P-90 c 2мя магазинами.
ent-ClothingBackpackDuffelWeaponAMS42Filled = Набор AMS-42
.desc = AMS-42 c 3мя магазинами.
ent-ClothingBackpackDuffelWeaponRifleG36Filled = Набор G36
.desc = G36 c 2мя магазинами.
ent-ClothingBackpackDuffelWeaponShotgunZauerFilled = Набор Zauer
.desc = Zauer c 2мя магазинами дроби.
ent-ClothingBackpackDuffelWeaponXM1014Filled = Набор XM1014
.desc = XM1014 c пачкой патронов дроби.
ent-ClothingBackpackDuffelWeaponShotgun12Filled = Набор LAW-12
.desc = LAW-12 c пачкой патронов дроби.
ent-ClothingBackpackDuffelWeaponRifleBR64Filled = Набор BR-64
.desc = BR-64 c 2мя магазинами.
ent-ClothingBackpackDuffelWeaponLightMachineGunMG42 = Набор MG-342
.desc = MG-342 c 2мя магазинами.
ent-ClothingBackpackDuffelWeaponSniperHristovFilled = Набор Христов
.desc = Христов с 4мя коробками на 10 антиматериальных патрон.
ent-ClothingBackpackDuffelNanotrasenMedicalBundleFilled = набор медикаментов НаноТрейзен
.desc = Все, что нужно для возвращения в строй ваших товарищей: главным образом, боевые аптечки, дефибриллятор и 4 боевых медипена каждого.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ent-Footstep = Footstep
.desc = Trace of liquid
ent-DragMark = drag mark
ent-Footstep = след
.desc = След из жидкости.
ent-DragMark = мазня
.desc = { ent-Footstep.desc }

This file was deleted.

This file was deleted.

Loading

0 comments on commit 70997d5

Please sign in to comment.