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

Resprite, Localisation and Other Things #38

Closed
wants to merge 1 commit 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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/locales-new/autotranslate-18.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ent-HoloprojectorSecurity = голобарьерный проектор
.desc = Создает прочный, но хрупкий голографический барьер.
ent-ParamedicPDA = ПДА парамедика
.desc = Блестящие и стерильные. Имеет встроенный экспресс-анализатор здоровья.
ent-BrigmedicPDA = ПДА парамедика
ent-BrigmedicPDA = ПДА бригмедика
.desc = Интересно, чей пульс на экране? Надеюсь, он не остановится... В ПДА встроен анализатор здоровья.
ent-SeniorEngineerPDA = ПДА бригадира
.desc = Кажется, его несколько раз разбирали и собирали обратно.
2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/locales-new/autotranslate-2.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ent-ClothingHeadHatCasa = Шляпа
.desc = Шляпа конусообразной формы
ent-ClothingHeadHatBeretRND = берет учёного
.desc = Берет для настоящих ученых.
ent-ClothingHeadHatBeretBrigmedic = медицинский берет
ent-ClothingHeadHatBeretBrigmedic = берет бригмедика
.desc = Белый берет выглядит как кремовый пирог на голове.
ent-ClothingHeadHatBeretMerc = берет наемника
.desc = Оливковый берет, на значке изображен шакал на скале.
17 changes: 17 additions & 0 deletions Resources/Locale/ru-RU/prototypes/access/accesses.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,20 @@ id-card-access-level-nuclear-operative = Ядерные оперативники
id-card-access-level-syndicate-agent = Агенты Синдиката

id-card-access-level-central-command = Центральное Коммандование

id-card-access-level-orders = Заказы
id-card-access-level-mantis = Мантис
id-card-access-level-chief-justice = Верховный судья
id-card-access-level-prosecutor = Прокурор
id-card-access-level-justice = Юридический
id-card-access-level-corpsman = Бригмедик
id-card-access-level-psychologist = Психолог
id-card-access-level-mail = Почта
id-card-access-level-boxer = Боксёр
id-card-access-level-clown = Клоун
id-card-access-level-library = Библиотека
id-card-access-level-mime = Мим
id-card-access-level-musician = Музыкант
id-card-access-level-reporter = Репортёр
id-card-access-level-zookeeper = Зоолог
id-card-access-level-unused = Ты не должен был видеть это
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ ent-ClothingBeltSyndieHolster = плечевая кобура синдиката
ent-ClothingBeltSecurityWebbing = РПС охраны
.desc = Уникальный, универсальный разгрузочный жилет с ремнями и поясом, может вмещать снаряжение службы безопасности.
.suffix = { "" }
ent-ClothingBeltMedicalRig = медицинская РПС
.desc = Специальный разгрузочный жилет в медицинских цветах, что имеет множество карманов и отделений для хранения медикаментов.
.suffix = { "" }
ent-ClothingBeltBrigmedicRig = РПС бригмедика
.desc = Одна из вариаций медицинской РПС, что обладает аналогичными характеристиками и параметрами, что и оригинал.
.suffix = { "" }
ent-ClothingBeltMilitaryWebbing = армейская РПС
.desc = Ременно-поясная система тактических ремней, которую носят абордажные группы Синдиката.
.suffix = { "" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,3 +193,42 @@ ent-VendingMachineSpaceUp = раздатчик Спейс-Ап
ent-VendingMachineStarkist = раздатчик Старкист
.desc = Вкус звезды в жидком виде.
.suffix = { "" }
ent-VendingMachineBoxingDrobe = Боксомат
.desc = Торговый автомат для боксёрской одежды.
.suffix = { "" }
ent-VendingMachineCourierDrobe = КурьерШкаф
.desc = Идеальная, прочная и удобная одежда для курьеров! О да, самое то!
.suffix = { "" }
ent-VendingMachineCuraDrobe = КураДроб
.desc = Одежда для длительных посиделок за книжками только тут!
.suffix = { "" }
ent-VendingMachineDrGibb = Напитки Доктора Гибба
.desc = Напитки от всеми известного Доктора Гибба! (Примечание: Врачи не рекомендуют пить данные напитки, пейте на свой страх и риск.)
.suffix = { "" }
ent-VendingMachineMNKDrobe = АмиДроб
.desc = Спортивная одежда от компании «Амидас».
.suffix = { "" }
ent-VendingMachineAutomatrobe = ТургоШкаф
.desc = Торговый автомат одежды для автоматурга.
.suffix = { "" }
ent-VendingMachineAutomatrobe = ТургоШкаф
.desc = Торговый автомат одежды для автоматурга.
.suffix = { "" }
ent-VendingMachineSolsnack = СолМат
.desc = Закуски прямо из Солнечной системы!
.suffix = { "" }
ent-VendingMachinePride = ГееМат
.desc = Боже правый, как оно сюда попало?..
.suffix = { "" }
ent-VendingMachineRepDrobe = РепоШкаф
.desc = Торговый автомат одежды для репортёра.
.suffix = { "" }
ent-VendingMachineFitness = СпортДроб
.desc = Одежда для спорта! Содержит на 99% больше белка!
.suffix = { "" }
ent-VendingMachineChemicalsSyndicate = СиндиХимия
.desc = Совершенно точно не продаёт химикаты и реагенты для Синдиката.
.suffix = { "" }
ent-VendingMachineHotfood = Горячие закуски
.desc = Старый торговый автомат, предлагающий «горячие блюда». Вы сомневаетесь, что его содержимое ещё съедобно.
.suffix = { "" }
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@
- id: WeaponDisabler
- id: ClothingOuterCoatHoSTrench
- id: ClothingMaskNeckGaiter
- id: ClothingOuterHardsuitCombatHoS # DeltaV - ClothingOuterHardsuitSecurityRed replaced in favour of head of security's advanced combat hardsuit.
- id: ClothingOuterHardsuitSecurityRed # WWDP - Edit
- id: ClothingBeltSecurityFilled
- id: ClothingHeadsetAltSecurity
- id: ClothingEyesGlassesSunglasses
Expand Down
10 changes: 6 additions & 4 deletions Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
prob: 0.3
- id: ClothingMaskSterile
- id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes!
prob: 0.3
prob: 0.3

- type: entity
parent: LockerWallMedical
Expand Down Expand Up @@ -145,7 +145,7 @@
orGroup: Surgshrubs
- id: ClothingMaskSterile
- id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes!
prob: 0.3
prob: 0.3

- type: entity
id: LockerChemistryFilled
Expand Down Expand Up @@ -184,10 +184,11 @@
- id: ClothingHeadsetMedical
- id: ClothingMaskSterile
- id: ClothingShoesBootsWinterParamedic #Delta V: Add departmental winter boots
- id: ClothingBeltMedicalRig # WWDP - Edit
- id: MedkitFilled
prob: 0.3
- id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes!
prob: 0.3
prob: 0.3

- type: entity
id: LockerParamedicFilledHardsuit #Delta V - Paramedic locker with suit
Expand All @@ -207,8 +208,9 @@
- id: ClothingHeadsetMedical
- id: ClothingMaskSterile
- id: ClothingShoesBootsWinterParamedic #Delta V: Add departmental winter boots
- id: ClothingBeltMedicalRig # WWDP - Edit
- id: HandheldGPSBasic
- id: MedkitFilled
prob: 0.3
- id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes!
prob: 0.3
prob: 0.3
96 changes: 38 additions & 58 deletions Resources/Prototypes/Catalog/Fills/Lockers/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
- id: ClothingOuterWinterWarden
- id: RubberStampWarden
- id: DoorRemoteArmory
- id: ClothingOuterHardsuitCombatWarden # DeltaV - ClothingOuterHardsuitWarden replaced in favour of warden's riot combat hardsuit.
- id: ClothingOuterHardsuitWarden # WWDP - Edit
- id: HoloprojectorSecurity
- id: ClothingEyesHudSecurity
- id: BoxPDAPrisoner # Delta-V
Expand Down Expand Up @@ -63,28 +63,26 @@
- type: StorageFill
contents:
- id: FlashlightSeclite
prob: 0.8
- id: ClothingUniformJumpsuitSecGrey
prob: 0.3
- id: ClothingUniformJumpsuitSecBlue # DeltaV - consistency with other sec uniforms
prob: 0.3
# - id: ClothingUniformJumpsuitSecGrey # WWDP - Nah
# prob: 0.3
# - id: ClothingUniformJumpsuitSecBlue # DeltaV - consistency with other sec uniforms # WWDP - Nah
# prob: 0.3
- id: ClothingUniformJumpsuitSec # DeltaV - consistency with other sec uniforms
prob: 0.3
- id: ClothingUniformJumpskirtSecGrey # DeltaV - consistency with other sec uniforms
prob: 0.3
- id: ClothingUniformJumpskirtSecBlue # DeltaV - consistency with other sec uniforms
prob: 0.3
# - id: ClothingUniformJumpskirtSecGrey # DeltaV - consistency with other sec uniforms # WWDP - Nah
# prob: 0.3
# - id: ClothingUniformJumpskirtSecBlue # DeltaV - consistency with other sec uniforms # WWDP - Nah
# prob: 0.3
- id: ClothingUniformJumpskirtSec # DeltaV - consistency with other sec uniforms
prob: 0.3
- id: ClothingHeadHelmetBasic
- id: ClothingHeadHelmetInsulated # Nyanotrasen - Insulative headgear
prob: 0.4
- id: ClothingOuterArmorPlateCarrier # DeltaV - ClothingOuterArmorBasic replaced in favour of plate carrier and stabproof vest
- id: ClothingOuterArmorDuraVest
- id: ClothingOuterStasecSweater # DeltaV - in case the officers get cold :3
prob: 0.75
- id: ClothingUniformJumpsuitSecFormal # DeltaV - emergency parade time, Central's coming to visit
prob: 0.25
- id: ClothingOuterArmorBasic # WWDP - Edit
# - id: ClothingHeadHelmetInsulated # Nyanotrasen - Insulative headgear # WWDP - Nah
# prob: 0.4
# - id: ClothingOuterArmorPlateCarrier # DeltaV - ClothingOuterArmorBasic replaced in favour of plate carrier and stabproof vest # WWDP - Nah
# - id: ClothingOuterArmorDuraVest
# - id: ClothingOuterStasecSweater # DeltaV - in case the officers get cold :3 # WWDP - Nah
# prob: 0.75
# - id: ClothingUniformJumpsuitSecFormal # DeltaV - emergency parade time, Central's coming to visit # WWDP - Nah
# prob: 0.25
- id: ClothingBeltSecurityFilled
- id: Flash
prob: 0.5
Expand All @@ -95,79 +93,61 @@
- id: WeaponMeleeNeedle
prob: 0.1
- id: ClothingEyesHudSecurity
- id: ClothingMaskGasSecurity # WWDP - Edit
- id: HoloprojectorSecurity
prob: 0.6
- id: WeaponPistolMk58 # WWDP - Edit
- id: MagazinePistolRubber # WWDP - Edit
- id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
prob: 0.3

- type: entity
id: LockerBrigmedicFilled
suffix: Corpsman, Filled # DeltaV - rename brigmedic to corpsman
suffix: Brigmedic, Filled
parent: LockerBrigmedic
components:
- type: StorageFill
contents:
- id: ClothingEyesHudSecurity
- id: WeaponDisabler
- id: TrackingImplanter
amount: 2
## - id: ClothingOuterHardsuitCombatCorpsman # DeltaV - ClothingOuterHardsuitBrigmedic replaced in favour of corpsman's combat hardsuit; removing from standard filled locker to place in hardsuit filled locker.
- id: BoxSterileMask
- id: ClothingHeadHatBeretCorpsman # DeltaV - ClothingHeadHatBeretBrigmedic replaced in favour of corpsman beret.
## - id: ClothingOuterCoatAMG # DeltaV - removed until I can resprite it or replace it.
- id: ClothingEyesHudMedSec # WWDP - Edit
- id: ClothingHeadHatBeretBrigmedic # WWDP - Edit
- id: ClothingOuterCoatAMG # WWDP - Edit
- id: ClothingBeltBrigmedicRig # WWDP - Edit
- id: ClothingUniformJumpsuitBrigmedic
- id: ClothingUniformJumpskirtBrigmedic
## - id: ClothingUniformJumpskirtOfLife # DeltaV - nah
## prob: 0.1
- id: HandheldGPSBasic # Delta V - added it for tracking the implant tracker pop up.
- id: MedkitFilled
- id: MedkitCombatFilled
prob: 0.6
- id: MedkitAdvancedFilled
prob: 0.4
- id: MedkitOxygenFilled
prob: 0.3
- id: MedkitBruteFilled
prob: 0.3
- id: MedkitToxinFilled
prob: 0.3
- id: MedkitBurnFilled
prob: 0.7
## - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse # DeltaV - why
## prob: 0.15
- id: MedkitFilled # WWDP - Edit
- id: ClothingNeckCloakMoth #bzzz Moth-pocalypse # DeltaV - why # WWDP - because
prob: 0.15
- id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
prob: 0.3

# DeltaV - adding corpsman locker w/ hardsuit

- type: entity
id: LockerBrigmedicFilledHardsuit
suffix: Corpsman, Filled, Hardsuit
suffix: Brigmedic, Filled, Hardsuit
parent: LockerBrigmedic
components:
- type: StorageFill
contents:
- id: ClothingEyesHudSecurity
- id: WeaponDisabler
- id: TrackingImplanter
amount: 2
- id: ClothingOuterHardsuitCombatCorpsman
- id: BoxSterileMask # WWDP - Edit
- id: ClothingEyesHudMedSec # WWDP - Edit
- id: ClothingHeadHatBeretBrigmedic # WWDP - Edit
- id: ClothingOuterHardsuitBrigmedic # WWDP - Edit
- id: ClothingOuterCoatAMG # WWDP - Edit
- id: ClothingBeltBrigmedicRig # WWDP - Edit
- id: ClothingUniformJumpsuitBrigmedic
- id: ClothingUniformJumpskirtBrigmedic
- id: HandheldGPSBasic # Added GPS because I just think it should be there tbh.
- id: MedkitFilled
- id: MedkitCombatFilled
prob: 0.6
- id: MedkitAdvancedFilled
prob: 0.4
- id: MedkitOxygenFilled
prob: 0.3
- id: MedkitBruteFilled
prob: 0.3
- id: MedkitToxinFilled
prob: 0.3
- id: MedkitBurnFilled
prob: 0.7
- id: ClothingNeckCloakMoth #bzzz Moth-pocalypse # DeltaV - why # WWDP - because
prob: 0.15
- id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
prob: 0.3

Expand Down
13 changes: 6 additions & 7 deletions Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
- type: StorageFill
contents:
- id: OxygenTankFilled
- id: ClothingOuterHardsuitCombatOfficer # DeltaV - ClothingOuterHardsuitSecurity replaced in favour of security combat hardsuit.
- id: ClothingOuterHardsuitSecurity
- id: ClothingMaskBreath
- type: AccessReader
access: [["Security"]]
Expand Down Expand Up @@ -198,7 +198,7 @@
contents:
- id: OxygenTankFilled
- id: JetpackSecurityFilled
- id: ClothingOuterHardsuitCombatHoS # DeltaV - ClothingOuterHardsuitSecurityRed replaced in favour of head of security's advanced combat hardsuit.
- id: ClothingOuterHardsuitSecurityRed
- id: ClothingMaskGasSwat
- type: AccessReader
access: [["HeadOfSecurity"]]
Expand All @@ -212,7 +212,7 @@
- type: StorageFill
contents:
- id: OxygenTankFilled
- id: ClothingOuterHardsuitCombatWarden # DeltaV - ClothingOuterHardsuitWarden replaced in favour of warden's riot combat hardsuit.
- id: ClothingOuterHardsuitWarden
- id: ClothingMaskBreath
- type: AccessReader
access: [["Armory"]]
Expand Down Expand Up @@ -262,18 +262,17 @@
- type: AccessReader
access: [ [ "Paramedic" ] ]

# DeltaV - Adding Corpsman Suit Storage Unit
- type: entity
id: SuitStorageCorpsman
parent: SuitStorageBase
suffix: Corpsman
suffix: Brigmedic
components:
- type: StorageFill
contents:
- id: NitrogenTankFilled
- id: OxygenTankFilled
- id: ClothingOuterHardsuitCombatCorpsman
- id: ClothingMaskBreath
- id: ClothingOuterHardsuitBrigmedic
- id: ClothingMaskBreathMedicalSecurity
- type: AccessReader
access: [ [ "Corpsman" ] ]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
- type: entity
parent: DefaultStationBeaconSecurity
id: DefaultStationBeaconCorpsman
suffix: Corpsman
suffix: Brigmedic
components:
- type: NavMapBeacon
text: station-beacon-corpsman
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,15 @@
- type: entity
parent: AirlockSecurity
id: AirlockCorpsmanLocked
suffix: Corpsman, Locked
suffix: Brigmedic, Locked
components:
- type: AccessReader
access: [["Corpsman"]]

- type: entity
parent: AirlockSecurityGlass
id: AirlockCorpsmanGlassLocked
suffix: Corpsman, Locked
suffix: Brigmedic, Locked
components:
- type: AccessReader
access: [["Corpsman"]]
Expand Down
Loading
Loading