Skip to content

Commit

Permalink
Merge pull request #239 from FaDeOkno/syndi-small-update
Browse files Browse the repository at this point in the history
Небольшие подарки агентам
  • Loading branch information
FaDeOkno authored Dec 23, 2023
2 parents 5eeffff + bccc953 commit 2f56be9
Show file tree
Hide file tree
Showing 11 changed files with 275 additions and 0 deletions.
10 changes: 10 additions & 0 deletions Resources/Changelog/ChangelogADT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -884,3 +884,13 @@ Entries:
- {message: Изменил шансы кастомного и обычного лута на экспедициях карго, type: Tweak}
id: 55643 #костыль отображения в Обновлениях
time: '2023-12-22T07:40:00.0000000+00:00'

- author: Котя
changes:
- {message: Добавлен стан-багет шеф-повару и миму агентам, type: Add}
- {message: Добавлена трость-дробовик миму агенту, type: Add}
- {message: Добавлен поддельный дефибриллятор медикам агентам, type: Add}
- {message: Добавлен набор токсинов барменам агентам, type: Add}
- {message: Добавлен токсин немоты миму агенту, type: Add}
id: 55644 #костыль отображения в Обновлениях
time: '2023-12-23T04:40:00.0000000+00:00'
15 changes: 15 additions & 0 deletions Resources/Locale/ru-RU/ADT/Catalog/fills/syndicate.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
ent-ADTAmatoxinChemistryBottle = бутылочка аматоксина
.desc = "Маленькая бутылочка"
ent-ADTLicoxideChemistryBottle = бутылочка ликоксида
.desc = "Маленькая бутылочка"
ent-ADTLexorinChemistryBottle = бутылочка лексорина
.desc = "Маленькая бутылочка"
ent-MuteToxinChemistryBottle = бутылочка токсина немоты
.desc = "Маленькая бутылочка"
ent-BartenderToxinsPack = набор барных токсинов
.desc = Небольшой набор эффективных токсинов, используемых многими барменами Синдиката.
.suffix = { "Заполнен" }
15 changes: 15 additions & 0 deletions Resources/Locale/ru-RU/ADT/Catalog/store/uplink.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,18 @@ uplink-ssmokegrenade-bundle-desc = Набор из 6 дымовых гранат
uplink-tritiumgrenades-name = тритиевая взрывчатка
uplink-tritiumgrenades-desc = Радиоактивная граната выпускающая газ при взрыве, хорошо подходит для уничтожение экипажа без защиты.
uplink-stun-baguette-name = электро-багет
uplink-stun-baguette-desc = Замаскированная под обычное хлебобулочное изделие шоковая дубинка. Будет как отличным оружием, так и чудесным последним перекусом вашей жертвы.
uplink-cane-shotgun-name = трость-дробовик
uplink-cane-shotgun-desc = Дробовик, вмещающий в себя до трёх патронов от обычной двуствольной винтовки. Идеально замаскирован под трость.
uplink-mute-toxin-name = токсин немоты
uplink-mute-toxin-desc = Вещество, способное лишить кого-либо речи на короткий срок.
uplink-bar-toxins-name = набор барных токсинов
uplink-bar-toxins-desc = Небольшой набор, содержащий множество эффективных токсинов для незаметного подмешивания в коктейли.
uplink-fake-defib-name = поддельный дефибриллятор
uplink-fake-defib-desc = Дефибриллятор, лишь наносящий увеличенные электрические ожоги. Идеален для активной имитации бурной деятельности.
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/Guns.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,7 @@ ent-ADTWeaponRifleAR12 = AR-12
ent-ADTWeaponPistolGlock19 = Glock 19
.desc = Тяжёлый, но вместе с тем очень удобный и приятно лежащий в руке пистолет неизвестного производства. Принят как допустимая альтернатива mk58.
.suffix = Пистолет, Именной, Lapkee
ent-ADTWhiteCaneShotgun = белая трость
.desc = Это не для вас. Это для тех, кто не может понять, что вы слепы, когда вы спрашиваете, является ли отдел снабжения баром.
.suffix = { "Дробовик" }
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/ADT/Objects/Weapons/Melee/melee.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,7 @@ ent-ADTPyotrSabre = палаш Петра Шахина
ent-ADTWoodenSword = деревянный меч
.desc = Настоящий робаст нуждается в ежедневных тренировках.
.suffix = { "Тренировочное" }
ent-ADTStunbaguette = багет
.desc = Bon appétit! Attendez... Il est faux!
.suffix = { "Дубинка" }
7 changes: 7 additions & 0 deletions Resources/Locale/ru-RU/ADT/Objects/specific/medstuff.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,10 @@ ent-ADTPatchHonk = хонк пластырь
ent-ADTCratePatchPack = набор пластырей
.desc = Набор содержащий 4 коробки с пластырями
.suffix = { "" }
ent-ADTBaseFakeDefibrillator = дефибриллятор
.desc = ЧИСТО! РАЗРЯД!
.suffix = { "Поддельный" }
ent-Defibrillator = дефибриллятор
.desc = ЧИСТО! РАЗРЯД!
.suffix = { "Поддельный" }
51 changes: 51 additions & 0 deletions Resources/Prototypes/ADT/Catalog/Fills/Syndicate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
- type: entity
id: ADTAmatoxinChemistryBottle
name: amatoxin bottle
parent: BaseChemistryBottleFilled
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: Amatoxin
Quantity: 30

- type: entity
id: ADTLicoxideChemistryBottle
name: licoxide bottle
parent: BaseChemistryBottleFilled
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: Licoxide
Quantity: 30

- type: entity
id: ADTLexorinChemistryBottle
name: licoxide bottle
parent: BaseChemistryBottleFilled
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: Lexorin
Quantity: 30

- type: entity
id: BartenderToxinsPack
suffix: Filled
parent: MedkitCombat
components:
- type: StorageFill
contents:
- id: MuteToxinChemistryBottle
- id: ADTAmatoxinChemistryBottle
- id: ADTLicoxideChemistryBottle
- id: ADTLexorinChemistryBottle
- id: ADTLexorinChemistryBottle
76 changes: 76 additions & 0 deletions Resources/Prototypes/ADT/Catalog/uplink.yml
Original file line number Diff line number Diff line change
Expand Up @@ -262,3 +262,79 @@
whitelist:
tags:
- NukeOpsUplink


# Job Specific

- type: listing
id: ADTStunbaguette
name: uplink-stun-baguette-name
description: uplink-stun-baguette-desc
productEntity: ADTStunbaguette
cost:
Telecrystal: 7
categories:
- UplinkJob
conditions:
- !type:BuyerJobCondition
whitelist:
- Chef
- Mime

- type: listing
id: ADTuplinkCaneShotgun
name: uplink-cane-shotgun-name
description: uplink-cane-shotgun-desc
productEntity: ADTWhiteCaneShotgun
cost:
Telecrystal: 6
categories:
- UplinkJob
conditions:
- !type:BuyerJobCondition
whitelist:
- Mime
- Passenger

- type: listing
id: ADTuplinkMuteToxin
name: uplink-mute-toxin-name
description: uplink-mute-toxin-desc
productEntity: MuteToxinChemistryBottle
cost:
Telecrystal: 2
categories:
- UplinkJob
conditions:
- !type:BuyerJobCondition
whitelist:
- Mime

- type: listing
id: ADTuplinkBartenderToxinsPack
name: uplink-bar-toxins-name
description: uplink-bar-toxins-desc
productEntity: BartenderToxinsPack
cost:
Telecrystal: 12
categories:
- UplinkJob
conditions:
- !type:BuyerJobCondition
whitelist:
- Bartender

- type: listing
id: ADTuplinkADTFakeDefibrillator
name: uplink-fake-defib-name
description: uplink-fake-defib-desc
productEntity: ADTFakeDefibrillator
cost:
Telecrystal: 10
categories:
- UplinkJob
conditions:
- !type:BuyerDepartmentCondition
whitelist:
- Medical

Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- type: entity
id: ADTFakeDefibrillator
parent: Defibrillator
components:
- type: Defibrillator
zapHeal:
types:
Asphyxiation: -1
writheDuration: 5
zapDamage: 35
zapDelay: 2
doAfterDuration: 1
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
- type: entity
parent: BaseItem
id: ADTWhiteCaneShotgun
name: white cane
description: This isn't for you. It's for the people who can't figure out you're blind when you ask if cargo is the bar.
components:
- type: Sprite
sprite: Objects/Weapons/Melee/white_cane.rsi
state: icon
- type: Item
size: Normal
sprite: Objects/Weapons/Melee/white_cane.rsi
- type: Gun
fireRate: 2
selectedMode: SemiAuto
availableModes:
- SemiAuto
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
soundEmpty:
path: /Audio/Weapons/Guns/Empty/empty.ogg
- type: BallisticAmmoProvider
whitelist:
tags:
- ShellShotgun
capacity: 3
proto: ShellShotgun
soundInsert:
path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
ents: []
- type: StaticPrice
price: 4500
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
- type: entity
name: stun baguette
parent: BaseItem
id: ADTStunbaguette
description: A stun baton for incapacitating people with. Actively harming with this is considered bad tone.
components:
- type: Sprite
sprite: Objects/Consumable/Food/Baked/bread.rsi
state: baguette
- type: MeleeWeapon
wideAnimationRotation: -135
damage:
types:
Blunt: 2
bluntStaminaDamageFactor: 2.0
angle: 60
animation: WeaponArcSlash
- type: StaminaDamageOnHit
damage: 30
sound: /Audio/Weapons/egloves.ogg
- type: StaminaDamageOnCollide
damage: 30
sound: /Audio/Weapons/egloves.ogg
- type: ItemCooldown
- type: Item
heldPrefix: off
size: Normal
- type: DisarmMalus
malus: 0.225
- type: Appearance
- type: StaticPrice
price: 100
- type: Food
- type: FlavorProfile
flavors:
- bun
- shocking
- type: SolutionContainerManager
solutions:
food:
maxVol: 15
reagents:
- ReagentId: Nutriment
Quantity: 8
- ReagentId: Licoxide
Quantity: 15

0 comments on commit 2f56be9

Please sign in to comment.