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.

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

Гиперконвекционный Фабрикатор Экзокостюмов #1109

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions Resources/Changelog/ChangelogSunrise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10570,15 +10570,3 @@
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ ent-PacificatorCircuitboard = pacifism generator machine board
.desc = Makes all sentient beings within range pacifists.
ent-ReflectorMachineCircuitboard = reflector machine board
.desc = { ent-BaseMachineCircuitboard.desc }
ent-ExosuitFabricatorHyperConvectionMachineCircuitboard = hyper convection exosuit fabricator machine board
.desc = { ent-BaseMachineCircuitboard.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
ent-MiniSyringeCryostasis = cryostasis mini syringe
.desc = A cryostasis syringe, reshaped to fit inside of a gun.
.suffix = Cryostasis, MiniSyringe
ent-MiniSyringeBluespace = bluespace mini syringe
.desc = A Bluespace syringe, reshaped to fit inside of a gun.
.suffix = Bluespace, MiniSyringe
ent-PrefilledMiniSyringe = { ent-MiniSyringe }
.desc = { ent-MiniSyringe.desc }
ent-MiniSyringeMuteToxin = { ent-PrefilledMiniSyringe }
.suffix = MuteToxin, MiniSyringe
.desc = { ent-PrefilledMiniSyringe.desc }
ent-MiniSyringeFresium = { ent-PrefilledMiniSyringe }
.suffix = Fresium, MiniSyringe
.desc = { ent-PrefilledMiniSyringe.desc }
ent-MiniSyringeCarpoToxin = { ent-PrefilledMiniSyringe }
.suffix = CarpoToxin, MiniSyringe
.desc = { ent-PrefilledMiniSyringe.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
ent-ClothingBackpackDuffelWeaponSubMachineGunWt550Filled = Bundle WT550
.desc = WT550 with 3 raspy magazines.
ent-ClothingBackpackDuffelWeaponSubMachineGunMP5Filled = Bundle MP5
.desc = Mp5 with 2 raspy magazines.
ent-ClothingBackpackDuffelWeaponRifleLecterFilled = Bundle Lecter
.desc = Lecter with 3 raspy magazines.
ent-ClothingBackpackDuffelWeaponSubMachineGunP90Filled = Bundle P-90
.desc = P-90 with 2 raspy magazines.
ent-ClothingBackpackDuffelWeaponAMS42Filled = Bundle AMS-42
.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 LAW-12
.desc = LAW-12 with 1 Box ammo.
ent-ClothingBackpackDuffelWeaponRifleBR64Filled = Bundle BR-64
.desc = BR-64 with 2 raspy magazines.
ent-ClothingBackpackDuffelWeaponLightMachineGunMG42 = Bundle MG-342
.desc = MG-342 with 2 raspy magazines.
ent-ClothingBackpackDuffelWeaponSniperHristovFilled = Bundle Hristov
.desc = Hristov with 4 raspy 10-round ammo box.
ent-ClothingBackpackDuffelNanotrasenMedicalBundleFilled = nanotrasen medical bundle
.desc = A large duffel bag for holding any medical army goods.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
ent-LauncherSyringeMed = syringe gun
.suffix = Standart
.desc = Load full of poisoned syringes for optimal fun.

ent-LauncherSyringePistol = syringe pistol
.suffix = Compact
.desc = { ent-LauncherSyringeMed.desc }

ent-LauncherSyringePistolFilled = syringe pistol
.suffix = Compact, Filled
.desc = { ent-LauncherSyringeMed.desc }

ent-LauncherSyringeRapid = Auto syringe gun
.suffix = Auto
.desc = { ent-LauncherSyringeMed.desc }

ent-LauncherSyringeRapidFilled = Auto syringe gun
.suffix = Auto, Filled
.desc = { ent-LauncherSyringeMed.desc }

ent-LauncherSyringeSMG = syringe SMG
.suffix = Admeme
.desc = { ent-LauncherSyringeMed.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ent-Interrogator = Экстрактор имплантов
.desc = Устройство предназначеное для извлечения имплантов из гуманоидов.
ent-ImplantExtractor = Микроволновой экстрактор имплантов
.desc = Устройство предназначеное для извлечения имплантов из гуманоидов, разработанное для извлечени имплантов в условиях низкоквалифицированных врачей.
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
ent-PrinterDoc = document printer
.desc = Bureaucratic perfection. Stores a database of all Nanotrasen documents, and lets you print them as long as you have paper.
ent-ExosuitFabricatorHyperConvection = hyper convection exosuit fabricator
.desc = A highly-experimental Exosuit Fabricator that harnesses the power of extreme heat to slowly create objects more cost-effectively.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ent-LootSpawnerMedicalMinor = healing supplies spawner
.desc = { ent-MarkerBase.desc }
ent-LootSpawnerMedicalClassy = medical loot spawner
.desc = { ent-MarkerBase.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
ent-LootSpawnerSecurityBasic = security loot spawner
.suffix = Gear, Simple
.desc = { ent-MarkerBase.desc }
ent-LootSpawnerSecurity = security loot spawner
.suffix = Gear, Better
.desc = { ent-MarkerBase.desc }
ent-LootSpawnerArmory = armory loot spawner
.suffix = Guns, Armor
.desc = { ent-MarkerBase.desc }
ent-LootSpawnerArmoryGunsOnly = armory loot spawner
.suffix = Guns
.desc = { ent-MarkerBase.desc }
ent-LootSpawnerArmoryArmorOnly = armory loot spawner
.suffix = Armor
.desc = { ent-MarkerBase.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
ent-Bluecrystal = Bluecrystal
.desc = It seems to be pulsing with enticing energies.
.suffix = 100 BC
ent-Bluecrystal1 = { ent-Bluecrystal }
.suffix = 1 BC
.desc = { ent-Bluecrystal.desc }
ent-Bluecrystal25 = { ent-Bluecrystal }
.suffix = 25 BC
.desc = { ent-Bluecrystal.desc }
ent-Bluecrystal50 = { ent-Bluecrystal }
.suffix = 50 BC
.desc = { ent-Bluecrystal.desc }

ent-Crystallite = Crystallite
.desc = It seems to be pulsing with enticing energies.
.suffix = 100 BC
ent-Crystallite1 = { ent-Crystallite }
.suffix = 1 BC
.desc = { ent-Crystallite.desc }
ent-Crystallite25 = { ent-Crystallite }
.suffix = 25 BC
.desc = { ent-Crystallite.desc }
ent-Crystallite50 = { ent-Crystallite }
.suffix = 50 BC
.desc = { ent-Crystallite.desc }

ent-BaseUplinkNTERT = Bluespace ERT visionary
.desc = looking radio...
.suffix = Empty
ent-BaseUplinkNTERT60BC = { ent-BaseUplinkNTERT }
.suffix = 80 BC, 60С, ERT, Amber
.desc = { ent-BaseUplinkNTERT.desc }
ent-BaseUplinkNTERT100BC = { ent-BaseUplinkNTERT }
.suffix = 100 BC, 75С, ERT, Red
.desc = { ent-BaseUplinkNTERT.desc }
ent-BaseUplinkNTERT200BC = { ent-BaseUplinkNTERT }
.suffix = 200 BC, 150С, ERT, Gamma
.desc = { ent-BaseUplinkNTERT.desc }
ent-BaseUplinkNTERTBlueShield = { ent-BaseUplinkNTERT }
.suffix = 8 BC, 10С, BlueShield
.desc = { ent-BaseUplinkNTERT.desc }
ent-BaseUplinkNTERTDebug = { ent-BaseUplinkNTERT }
.suffix = 999, DEBUG
.desc = { ent-BaseUplinkNTERT.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ent-LeftArmBorg = { ent-BaseBorgArmLeft }
.desc = { ent-BaseBorgArmLeft.desc }
ent-RightArmBorg = { ent-BaseBorgArmRight }
.desc = { ent-BaseBorgArmRight.desc }
ent-LeftLegBorg = { ent-BaseBorgLegLeft }
.desc = { ent-BaseBorgLegLeft.desc }
ent-RightLegBorg = { ent-BaseBorgLegRight }
.desc = { ent-BaseBorgLegRight.desc }
ent-LightHeadBorg = { ent-BaseBorgHead }
.desc = { ent-BaseBorgHead.desc }
ent-TorsoBorg = { ent-BaseBorgTorso }
.desc = { ent-BaseBorgTorso.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
ent-ClusterBang = clusterbang
.desc = Can be used only with flashbangs. Explodes several times.
ent-ClusterBangFull = clusterbang
.desc = Launches three flashbangs after the timer runs out.
.suffix = Full
ent-ClusterGrenade = clustergrenade
.desc = Why use one grenade when you can use three at once!
ent-ClusterBananaPeel = cluster banana peel
.desc = Splits into 6 explosive banana peels after throwing, guaranteed fun!
ent-GrenadeStinger = stinger grenade
.desc = Nothing to see here, please disperse.
ent-GrenadeIncendiary = incendiary grenade
.desc = Guaranteed to light up the mood.
ent-GrenadeShrapnel = shrapnel grenade
.desc = Releases a deadly spray of shrapnel that causes severe bleeding.
ent-SlipocalypseClusterSoap = slipocalypse clustersoap
.desc = Spreads small pieces of syndicate soap over an area upon landing on the floor.
ent-GrenadeFoamDart = foam dart grenade
.desc = Releases a bothersome spray of foam darts that cause severe welching.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
ent-CryogenicSleepUnit = cryogenic sleep unit
.desc = A super-cooled container that keeps crewmates safe during space travel.
ent-CryogenicSleepUnitSpawner = { ent-CryogenicSleepUnit }
.suffix = Spawner, Roundstart AllJobs
.desc = { ent-CryogenicSleepUnit.desc }
ent-CryogenicSleepUnitSpawnerLateJoin = { ent-CryogenicSleepUnit }
.suffix = Spawner, LateJoin
.desc = { ent-CryogenicSleepUnit.desc }
5 changes: 5 additions & 0 deletions Resources/Locale/en-US/_strings/atmos/gas-pipe-sensor.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
gas-pipe-sensor-distribution-loop = Distribution loop
gas-pipe-sensor-waste-loop = Waste loop
gas-pipe-sensor-mixed-air = Mixed air
gas-pipe-sensor-teg-hot-loop = TEG hot loop
gas-pipe-sensor-teg-cold-loop = TEG cold loop
1 change: 1 addition & 0 deletions Resources/Locale/en-US/_strings/research/technologies.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ research-technology-advanced-anomaly-research = Advanced Anomaly Research
research-technology-rped = Rapid Part Exchange
research-technology-super-parts = Super Parts
research-technology-deterrence = Deterrence Technologies
research-technology-industrial-robotics = Industrial Robotics

research-technology-janitorial-equipment = Janitorial Equipment
research-technology-laundry-tech = Laundry Tech
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ent-ComputerIcarus = консоль управления "Икарус"
.desc = Консоль предназначеная для получения доступа и управления орбитальным оружием НТ "Икарус".
ent-IcarusKey = ключ авторизации "Икарус"
.desc = Ключ предназначеный для получения доступа к орбитальному оружию НТ "Икарус"
ent-PinpointerIcarus = пинпоинтер "Икарус"
.desc = Портативное устройство слежения, способное отслеживать ключи орбитального оружия НТ "Икарус"
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ent-IcarusKeyImplanter = имплантатор ключей "Икарус"
.desc = { ent-BaseImplantOnlyImplanter.desc }
ent-IcarusKeyImplanter = icarus key implanter
.desc = { ent-BaseImplantOnlyImplanter.desc }
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ent-IcarusKey = ключ авторизации "Икарус"
.desc = Ключ предназначеный для получения доступа к орбитальному оружию НТ "Икарус"
ent-IcarusKey = icarus authentication keycard
.desc = A high profile authentication keycard to Nanotrasen's Icarus secured network.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ent-AssaultOpsPDA = КПК пассажира
.desc = Почему он не серый?
ent-AssaultOpsPDA = passenger PDA
.desc = Why isn't it gray?
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ent-PinpointerIcarus = пинпоинтер "Икарус"
ent-PinpointerIcarus = pinpointer
.desc = { ent-PinpointerBase.desc }
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
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 боевых медипена каждого.
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ent-ClothingBeltSheathSyndicateFilled = { ent-ClothingBeltSheathSyndicate }
.suffix = Filled
.desc = { ent-ClothingBeltSheathSyndicate.desc }
ent-BeltSheathSyndieFilledBox = обёрнутая рапира синдиката
.desc = Разверните.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ent-Footstep = след
.desc = След из жидкости.
ent-DragMark = мазня
ent-Footstep = Footstep
.desc = Trace of liquid
ent-DragMark = drag mark
.desc = { ent-Footstep.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
ent-PrinterDocMachineCircuitboard = принтер документов (машинная плата)
.desc = Машинная плата принтера документов.
ent-PacificatorCircuitboard = генератор пацифизма (машинная плата)
.desc = { ent-BaseMachineCircuitboard.desc }
ent-ImplantExtractorMachineCircuitboard = Экстрактор имплантов (машинная плата)
.desc = Машинная плата Микроволнового экстрактора имплантов.
ent-InterrogatorMachineCircuitboard = Экстрактор имплантов "Interrogator" (машинная плата)
.desc = { ent-ImplantExtractorMachineCircuitboard.desc }
ent-ExosuitFabricatorHyperConvectionMachineCircuitboard = гиперконвекционный фабрикатор экзокостюмов (машинная плата)
.desc = { ent-BaseMachineCircuitboard.desc }

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ent-Footstep = след
.desc = След из жидкости.
ent-DragMark = мазня
.desc = Вероятно кто-то решил побыть половой тряпкой.
Loading
Loading