From b9dda6326430a74bc4c347db5124b07a7c8c810b Mon Sep 17 00:00:00 2001 From: MintRain Date: Thu, 27 Feb 2025 23:58:25 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D1=87=D0=B5=D0=BB=D0=B8=D0=BD=D0=B0=D1=8F?= =?UTF-8?q?=20=D0=B3=D1=80=D0=B0=D0=BD=D0=B0=D1=82=D0=B0!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавление ради добавления. --- .../en-US/starshine/store/uplink-catalog.ftl | 3 + .../objects/weapons/throwable/grenades.ftl | 4 ++ .../ru-RU/starshine/store/uplink-catalog.ftl | 20 +++++- .../Starshine/Catalog/uplink_catalog.yml | 61 +++++++++++------- .../Objects/Weapons/Throwable/grenades.yml | 48 ++++++++++++++ .../Grenades/beegrenade.rsi/equipped-BELT.png | Bin 0 -> 271 bytes .../Weapons/Grenades/beegrenade.rsi/icon.png | Bin 0 -> 332 bytes .../Weapons/Grenades/beegrenade.rsi/meta.json | 21 ++++++ .../Grenades/beegrenade.rsi/primed.png | Bin 0 -> 382 bytes 9 files changed, 132 insertions(+), 25 deletions(-) create mode 100644 Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/weapons/throwable/grenades.ftl create mode 100644 Resources/Prototypes/Starshine/Entities/Objects/Weapons/Throwable/grenades.yml create mode 100644 Resources/Textures/Starshine/Objects/Weapons/Grenades/beegrenade.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Starshine/Objects/Weapons/Grenades/beegrenade.rsi/icon.png create mode 100644 Resources/Textures/Starshine/Objects/Weapons/Grenades/beegrenade.rsi/meta.json create mode 100644 Resources/Textures/Starshine/Objects/Weapons/Grenades/beegrenade.rsi/primed.png diff --git a/Resources/Locale/en-US/starshine/store/uplink-catalog.ftl b/Resources/Locale/en-US/starshine/store/uplink-catalog.ftl index 3f242fecd255..2ee94a95ac6e 100644 --- a/Resources/Locale/en-US/starshine/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/starshine/store/uplink-catalog.ftl @@ -36,3 +36,6 @@ uplink-magazine-caseless-rifle-bundle-desc = A bundle containing magazines for a uplink-miniature-energy-crossbow-syndie-green-name = Miniature Energy Crossbow uplink-miniature-energy-crossbow-syndie-green-desc = The syndicate's energy crossbow, small, silent and deadly. + +uplink-bee-grenade-name = Bee Grenade +uplink-bee-grenade-desc = A grenade full of aggressive bees. Keep in mind that the bees will also be aggressive towards YOU. diff --git a/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/weapons/throwable/grenades.ftl b/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/weapons/throwable/grenades.ftl new file mode 100644 index 000000000000..2629128fb665 --- /dev/null +++ b/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/weapons/throwable/grenades.ftl @@ -0,0 +1,4 @@ +ent-BeeGrenade = пчелиная граната + .desc = Граната, полная пчёл... О НЕТ, ТОЛЬКО НЕ ПЧЁЛЫ! +ent-BeeGrenadeDummy = { ent-BeeGrenade } + .desc = { ent-BeeGrenade.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/starshine/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/starshine/store/uplink-catalog.ftl index e9b63869c53f..caec3e8b900f 100644 --- a/Resources/Locale/ru-RU/starshine/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/starshine/store/uplink-catalog.ftl @@ -1,25 +1,39 @@ ## Starshine uplink-bow-bundle-name = Набор композитного лука uplink-bow-bundle-desc = Скрытая угроза: Композитный лук, созданный компанией Cybersun. Имеет с собой колчан стрел. + uplink-bow-compound-red-name = Кровавый композитный лук uplink-bow-compound-red-desc = Залит кровью грейтайдов. Отличный легкий лук, в паре с пробивными стрелами. Можно модернизировать при помощи С4. + uplink-syndie-miner-armor-name = Кроваво-красная шахтерская броня uplink-syndie-miner-armor-desc = Кроваво-красный вариант шахтерской брони. Мы надеемся, вы купили её, зная что делаете. + uplink-kr51-bundle-name = Набор КР51 uplink-kr51-bundle-desc = Скрытая угроза: Классическая автоматическая винтовка КР51, в наборе с 3 магазинами. + uplink-magazine-caseless-rifle-name = Магазин винтовки (.25 безгильзовые) uplink-magazine-caseless-rifle-desc = Магазин для винтовки с 30 безгильзовыми патронами. Совместим с КР51. + uplink-magazine-caseless-rifle-bundle-name = Набор с магазинами винтовки (.25) uplink-magazine-caseless-rifle-bundle-desc = Набор, содержащий 4 расширенных магазина для дробовика. Совместим с КР51. + uplink-miniature-energy-crossbow-syndie-green-name = Энергетический мини арбалет uplink-miniature-energy-crossbow-syndie-green-desc = Энергетический арбалет синдиката, маленький, бесшумный и смертоносный. + uplink-syringe-cartridge-name = Коробка шприцевых картриджей uplink-syringe-cartridge-desc = Коробка шприцевых картриджей для шприцевого пистолета + uplink-gygax-syndie-name = АБМС «Гайгэкс» -uplink-gygax-desc = Перекрашенный синдикатом АБМНТ «Гайгэкс», потрёпан и сильно изношен, но все еще функционирует в штатном режиме. Прямо как с последней корпоротивной войны. +uplink-gygax-desc = Перекрашенный синдикатом АБМНТ «Гайгэкс», потрёпан и сильно изношен, но все еще функционирует в штатном режиме. Прямо как с последней корпоротивной войны. + uplink-mauler-name = АБМС «Маулер» -uplink-mauler-desc = Перекрашенный синдикатом мародёр, был изрядно изменен, но все тот же старый добрый мародёр. +uplink-mauler-desc = Перекрашенный синдикатом мародёр, был изрядно изменен, но все тот же старый добрый мародёр. + uplink-clothing-pnv-name = ПНВ uplink-clothing-pnv-desc = Прибор ночного видения. + uplink-m90gl-bundle-name = Набор m90-gl -uplink-m90gl-bundle-desc = Старая винтовка типа булпап. И нет, подствольник не настоящий. \ No newline at end of file +uplink-m90gl-bundle-desc = Старая винтовка типа булпап. И нет, подствольник не настоящий. + +uplink-bee-grenade-name = Пчелиная граната +uplink-bee-grenade-desc = Граната, полная агрессивных пчёл. Учтите, что пчёлы будут также агрессивны и к ВАМ. diff --git a/Resources/Prototypes/Starshine/Catalog/uplink_catalog.yml b/Resources/Prototypes/Starshine/Catalog/uplink_catalog.yml index 578d2ff1eb4d..9a05f79e2d61 100644 --- a/Resources/Prototypes/Starshine/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Starshine/Catalog/uplink_catalog.yml @@ -1,5 +1,5 @@ ## Starshine - +#Weaponry - type: listing id: UplinkMiniatureEnergyCrossbow name: uplink-miniature-energy-crossbow-syndie-green-name @@ -32,6 +32,18 @@ categories: - UplinkWeaponry +- type: listing + id: UplinkM90GLBundle + name: uplink-m90gl-bundle-name + description: uplink-m90gl-bundle-desc + icon: { sprite: /Textures/Objects/Weapons/Guns/Rifles/carbine.rsi, state: icon } + productEntity: ClothingBackpackDuffelSyndicateFilledCarbine + cost: + Telecrystal: 17 + categories: + - UplinkWeaponry + +#Ammo - type: listing id: UplinkMagazineCaselessRifle name: uplink-magazine-caseless-rifle-name @@ -48,40 +60,45 @@ tags: - NukeOpsUplink +#Wearables - type: listing - id: uplinkMinerSyndie - name: uplink-syndie-miner-armor-name - description: uplink-syndie-miner-armor-desc - productEntity: ClothingOuterArmorMinerSyndie + id: UplinkClothingEyesVision + name: uplink-clothing-pnv-name + description: uplink-clothing-pnv-desc + productEntity: ClothingEyesVision cost: Telecrystal: 3 categories: - - UplinkJob - conditions: - - !type:BuyerJobCondition - whitelist: - - SalvageSpecialist + - UplinkWearables +#Explosives - type: listing - id: UplinkM90GLBundle - name: uplink-m90gl-bundle-name - description: uplink-m90gl-bundle-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Rifles/carbine.rsi, state: icon } - productEntity: ClothingBackpackDuffelSyndicateFilledCarbine + id: BeeGrenade + name: uplink-bee-grenade-name + description: uplink-bee-grenade-desc + productEntity: BeeGrenade + discountCategory: usualDiscounts + discountDownTo: + Telecrystal: 4 cost: - Telecrystal: 17 + Telecrystal: 6 categories: - - UplinkWeaponry + - UplinkExplosives +#Job - type: listing - id: UplinkClothingEyesVision - name: uplink-clothing-pnv-name - description: uplink-clothing-pnv-desc - productEntity: ClothingEyesVision + id: uplinkMinerSyndie + name: uplink-syndie-miner-armor-name + description: uplink-syndie-miner-armor-desc + productEntity: ClothingOuterArmorMinerSyndie cost: Telecrystal: 3 categories: - - UplinkWearables + - UplinkJob + conditions: + - !type:BuyerJobCondition + whitelist: + - SalvageSpecialist diff --git a/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Throwable/grenades.yml new file mode 100644 index 000000000000..575f0e834d4d --- /dev/null +++ b/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Throwable/grenades.yml @@ -0,0 +1,48 @@ +#Grenades +- type: entity + name: bee grenade + description: Grenade full of bees... OH NO, NOT THE BEES! + parent: [ProjectileGrenadeBase, BaseSyndicateContraband, GrenadeBase] + id: BeeGrenade + components: + - type: Sprite + sprite: Starshine/Objects/Weapons/Grenades/beegrenade.rsi + - type: TimerTriggerVisuals + primingSound: + path: /Audio/Items/Toys/bee.ogg + params: + volume: 7 + - type: SpawnOnTrigger + proto: BeeGrenadeEffect + - type: ProjectileGrenade + fillPrototype: MobAngryBee + capacity: 10 + +#dummy grenades +- type: entity + parent: BeeGrenade + id: BeeGrenadeDummy + suffix: Fake + components: + - type: ProjectileGrenade + fillPrototype: PlushieBee + capacity: 10 + +#Effects +- type: entity + name: beegrenadeeffect + id: BeeGrenadeEffect + categories: [ HideSpawnMenu ] + components: + - type: PointLight + enabled: true + color: "#f9e914" + energy: 3 + radius: 3 + softness: 1 + offset: "0, 0" + - type: LightFade + duration: 0.5 + - type: TimedDespawn + lifetime: 0.5 + diff --git a/Resources/Textures/Starshine/Objects/Weapons/Grenades/beegrenade.rsi/equipped-BELT.png b/Resources/Textures/Starshine/Objects/Weapons/Grenades/beegrenade.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..a5bdfe9d4d49bcdb3496e896e437e8411abac8a1 GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|PI|gHhE&XX zd&`#Vkb}sPkA}z8Cd^S*n6`8O);NW!+cH@KCnTI%7bvFdb;|# JtaD0e0s#8CYd-)0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Starshine/Objects/Weapons/Grenades/beegrenade.rsi/icon.png b/Resources/Textures/Starshine/Objects/Weapons/Grenades/beegrenade.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..53791d2701aa9dd8745832d09fbd55190ee16027 GIT binary patch literal 332 zcmV-S0ki&zP)Px$21!IgR9J=Wl`#r~KoCVoiJCHHE?^NBK`kU@j^Q0VgOz9S4j#i&QW!z3tn4f; z6BRc_5R%9WvxykO{z~Sv^B*&=0tg8Stt^T6pyeFt_ML0N7NEv;i*z~{lKL%ZZn^xwK;BQ+Fw|FcI2XVO@m}Kz e7ZMWs3EcrD>~zA5P}76}0000Px$I7vi7R9J;$U>F6XU=$26U?f+gp_#>h82kLG6J(piLW$)D+L|z-|KvJ?i5yMH zmOXs<5XDiX0Ai9&wvw zN01Z++S=OxVU{rov!PgyEKdp`DG^?n%EVxh4YBx&n=Av9@MDI5Z+|fuHM7Cx&B|!# zfPXK3FkG0*fe>JpW%&2vD#L}TOmKMy25#Cpz^Ivx;an{w@%?&n7OOlPY4(#J1-Rtt z8wFV8NsR)MvZ1!N_WyIWzi`SMHM22Xy?T{)<-qR)y8jKb|KXIsFqMgc)!{NpX3`)E zNCRZ&0$lQ>0+NF3=L*&T_$)bB`-_1+;x_H;0wxK}X!!Ty2g#O` Date: Fri, 28 Feb 2025 21:04:28 +0300 Subject: [PATCH 2/3] fix because we need. --- .../entities/objects/weapons/throwable/grenades.ftl | 7 ++++--- Resources/Prototypes/Starshine/Catalog/uplink_catalog.yml | 4 ++-- .../Entities/Objects/Weapons/Throwable/grenades.yml | 8 ++++---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/weapons/throwable/grenades.ftl b/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/weapons/throwable/grenades.ftl index 2629128fb665..9b781bb17b20 100644 --- a/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/weapons/throwable/grenades.ftl +++ b/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/weapons/throwable/grenades.ftl @@ -1,4 +1,5 @@ -ent-BeeGrenade = пчелиная граната +ent-UplinkBeeGrenade = пчелиная граната .desc = Граната, полная пчёл... О НЕТ, ТОЛЬКО НЕ ПЧЁЛЫ! -ent-BeeGrenadeDummy = { ent-BeeGrenade } - .desc = { ent-BeeGrenade.desc } \ No newline at end of file +ent-BeeGrenadePlushie = { ent-UplinkBeeGrenade } + .desc = { ent-UplinkBeeGrenade.desc } + diff --git a/Resources/Prototypes/Starshine/Catalog/uplink_catalog.yml b/Resources/Prototypes/Starshine/Catalog/uplink_catalog.yml index 9a05f79e2d61..489239155107 100644 --- a/Resources/Prototypes/Starshine/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Starshine/Catalog/uplink_catalog.yml @@ -73,10 +73,10 @@ #Explosives - type: listing - id: BeeGrenade + id: UplinkBeeGrenade name: uplink-bee-grenade-name description: uplink-bee-grenade-desc - productEntity: BeeGrenade + productEntity: UplinkBeeGrenade discountCategory: usualDiscounts discountDownTo: Telecrystal: 4 diff --git a/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Throwable/grenades.yml index 575f0e834d4d..64e762828050 100644 --- a/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Throwable/grenades.yml @@ -3,7 +3,7 @@ name: bee grenade description: Grenade full of bees... OH NO, NOT THE BEES! parent: [ProjectileGrenadeBase, BaseSyndicateContraband, GrenadeBase] - id: BeeGrenade + id: UplinkBeeGrenade components: - type: Sprite sprite: Starshine/Objects/Weapons/Grenades/beegrenade.rsi @@ -18,10 +18,10 @@ fillPrototype: MobAngryBee capacity: 10 -#dummy grenades +#fake grenades - type: entity - parent: BeeGrenade - id: BeeGrenadeDummy + parent: UplinkBeeGrenade + id: BeeGrenadePlushie suffix: Fake components: - type: ProjectileGrenade From 6a8b5de159e346a82bf2fe7da5eb72b7bf216df1 Mon Sep 17 00:00:00 2001 From: MintRain Date: Sat, 1 Mar 2025 15:27:50 +0300 Subject: [PATCH 3/3] meh meh --- .../ss14-ru/entities/objects/weapons/throwable/grenades.ftl | 6 +++--- Resources/Prototypes/Starshine/Catalog/uplink_catalog.yml | 2 +- .../Entities/Objects/Weapons/Throwable/grenades.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/weapons/throwable/grenades.ftl b/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/weapons/throwable/grenades.ftl index 9b781bb17b20..10f035720bdc 100644 --- a/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/weapons/throwable/grenades.ftl +++ b/Resources/Locale/ru-RU/starshine/ss14-ru/entities/objects/weapons/throwable/grenades.ftl @@ -1,5 +1,5 @@ -ent-UplinkBeeGrenade = пчелиная граната +ent-BeeGrenade = пчелиная граната .desc = Граната, полная пчёл... О НЕТ, ТОЛЬКО НЕ ПЧЁЛЫ! -ent-BeeGrenadePlushie = { ent-UplinkBeeGrenade } - .desc = { ent-UplinkBeeGrenade.desc } +ent-BeeGrenadePlushie = { ent-BeeGrenade } + .desc = { ent-BeeGrenade.desc } diff --git a/Resources/Prototypes/Starshine/Catalog/uplink_catalog.yml b/Resources/Prototypes/Starshine/Catalog/uplink_catalog.yml index 489239155107..595a996006e1 100644 --- a/Resources/Prototypes/Starshine/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Starshine/Catalog/uplink_catalog.yml @@ -76,7 +76,7 @@ id: UplinkBeeGrenade name: uplink-bee-grenade-name description: uplink-bee-grenade-desc - productEntity: UplinkBeeGrenade + productEntity: BeeGrenade discountCategory: usualDiscounts discountDownTo: Telecrystal: 4 diff --git a/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Throwable/grenades.yml index 64e762828050..63c6ce12100b 100644 --- a/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Throwable/grenades.yml @@ -3,7 +3,7 @@ name: bee grenade description: Grenade full of bees... OH NO, NOT THE BEES! parent: [ProjectileGrenadeBase, BaseSyndicateContraband, GrenadeBase] - id: UplinkBeeGrenade + id: BeeGrenade components: - type: Sprite sprite: Starshine/Objects/Weapons/Grenades/beegrenade.rsi @@ -20,7 +20,7 @@ #fake grenades - type: entity - parent: UplinkBeeGrenade + parent: BeeGrenade id: BeeGrenadePlushie suffix: Fake components: