From 139dd26f954c92501fd970cf86fd3c9de7b2c609 Mon Sep 17 00:00:00 2001 From: TryHardo7 Date: Sun, 16 Jun 2024 16:21:23 +0300 Subject: [PATCH 1/5] underused antag stuff done --- Resources/Locale/en-US/store/uplink-catalog.ftl | 4 ++-- Resources/Locale/ru-RU/store/uplink-catalog.ftl | 4 ++-- Resources/Prototypes/Actions/types.yml | 6 +++--- Resources/Prototypes/Catalog/uplink_catalog.yml | 12 ++++++------ .../Prototypes/Entities/Clothing/Back/backpacks.yml | 4 ++++ .../Prototypes/Entities/Clothing/Shoes/magboots.yml | 8 ++++---- .../Entities/Objects/Weapons/Guns/turrets.yml | 4 ++-- 7 files changed, 23 insertions(+), 19 deletions(-) diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 3ae2d65c16c3..f006a372ed85 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -171,13 +171,13 @@ uplink-freedom-implanter-name = Freedom Implanter uplink-freedom-implanter-desc = Get away from those nasty sec officers with this three use implant! uplink-scram-implanter-name = Scram Implanter -uplink-scram-implanter-desc = A 2-use implant which teleports you within a large radius. Attempts to teleport you onto an unobstructed tile. May sometimes fail to do so. Life insurance not included. +uplink-scram-implanter-desc = A 12-use implant which teleports you within a medium radius. Attempts to teleport you onto an unobstructed tile. May sometimes fail to do so. Life insurance not included. uplink-dna-scrambler-implanter-name = DNA Scrambler Implanter uplink-dna-scrambler-implanter-desc = A single use implant that can be activated to modify your DNA and give you a completely new look. uplink-emp-implanter-name = EMP Implanter -uplink-emp-implanter-desc = Detonates a small EMP pulse on activation that drains nearby electronics of their power, can be used three times before the internal battery runs out. +uplink-emp-implanter-desc = Detonates a small EMP pulse on activation that drains nearby electronics of their power, can be used five times before the internal battery runs out. uplink-macro-bomb-implanter-name = Macro Bomb Implanter uplink-macro-bomb-implanter-desc = Inject this and on death you'll create a large explosion. Huge team casualty cost, use at own risk. Replaces internal micro bomb. diff --git a/Resources/Locale/ru-RU/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/store/uplink-catalog.ftl index d5df12868325..4b6e4ad92c1d 100644 --- a/Resources/Locale/ru-RU/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/store/uplink-catalog.ftl @@ -118,11 +118,11 @@ uplink-storage-implanter-desc = Прячьте предметы внутри с uplink-freedom-implanter-name = Имплантер Свобода uplink-freedom-implanter-desc = Сбегите от этих противных сотрудников СБ при помощи этого импланта, который можно использовать аж три раза! uplink-scram-implanter-name = Имплантер Побег -uplink-scram-implanter-desc = Двухразовый имплант, который телепортирует вас в большом радиусе. Попытается телепортировать вас на незанятое место. Иногда сбоит. Страхование жизни не прилагается. +uplink-scram-implanter-desc = Имеет 12 зарядов, телепортирует вас в небольшом радиусе. Попытается телепортировать вас на незанятое место. Иногда сбоит. Страхование жизни не прилагается. uplink-dna-scrambler-implanter-name = Имплантер Миксер ДНК uplink-dna-scrambler-implanter-desc = Одноразовый имплант, который можно активировать для перемешивания ДНК и приобретения совершенно нового облика. uplink-emp-implanter-name = Имплантер ЭМИ -uplink-emp-implanter-desc = При активации создаёт небольшой ЭМИ, который обесточивает находящуюся рядом электронику; может быть использован три раза, прежде чем разрядится внутренняя батарея. +uplink-emp-implanter-desc = При активации создаёт небольшой ЭМИ, который обесточивает находящуюся рядом электронику; может быть использован пять раз, прежде чем разрядится внутренняя батарея. uplink-macro-bomb-implanter-name = Имплантер Макробомба uplink-macro-bomb-implanter-desc = Вколите его, и после смерти вы устроите большой взрыв. Большой риск для союзников, используйте на свой страх и риск. Заменяет Микробомбу. uplink-uplink-implanter-name = Имплантер Аплинк diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml index 12631ec90423..e704abe3f3a4 100644 --- a/Resources/Prototypes/Actions/types.yml +++ b/Resources/Prototypes/Actions/types.yml @@ -130,7 +130,7 @@ components: - type: InstantAction checkCanInteract: false - charges: 3 + charges: 5 useDelay: 5 itemIconStyle: BigAction priority: -20 @@ -142,12 +142,12 @@ - type: entity id: ActionActivateScramImplant name: SCRAM! - description: Randomly teleports you within a large distance. + description: Randomly teleports you within a medium distance. noSpawn: true components: - type: InstantAction checkCanInteract: false - charges: 2 + charges: 12 #SS220 changed useDelay: 5 itemIconStyle: BigAction priority: -20 diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 880556885d78..135b2694984c 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -72,7 +72,7 @@ icon: { sprite: /Textures/Objects/Storage/boxicons.rsi, state: throwing_knives } productEntity: ThrowingKnivesKit cost: - Telecrystal: 6 + Telecrystal: 4 categories: - UplinkWeaponry @@ -648,7 +648,7 @@ description: uplink-cigarettes-desc productEntity: CigPackSyndicate cost: - Telecrystal: 2 + Telecrystal: 1 categories: - UplinkChemicals @@ -855,7 +855,7 @@ description: uplink-slipocalypse-clustersoap-desc productEntity: SlipocalypseClusterSoap cost: - Telecrystal: 3 + Telecrystal: 2 categories: - UplinkDisruption @@ -1126,7 +1126,7 @@ icon: { sprite: /Textures/Actions/Implants/implants.rsi, state: freedom } productEntity: FreedomImplanter cost: - Telecrystal: 5 + Telecrystal: 3 categories: - UplinkImplants @@ -1159,7 +1159,7 @@ icon: { sprite: /Textures/Objects/Magic/magicactions.rsi, state: shield } productEntity: EmpImplanter cost: - Telecrystal: 2 + Telecrystal: 1 categories: - UplinkImplants @@ -1355,7 +1355,7 @@ icon: { sprite: /Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi, state: icon } productEntity: ClothingBackpackDuffelSyndicateEVABundle cost: - Telecrystal: 2 + Telecrystal: 1 categories: - UplinkWearables diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index ffc821517d01..f67c6f76d131 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -268,6 +268,10 @@ sprite: Clothing/Back/Backpacks/syndicate.rsi - type: ExplosionResistance damageCoefficient: 0.1 + - type: Storage + grid: + - 0,0,7,4 + maxItemSize: Huge #Special - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml index bafe892f2d10..d4dafb22df67 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml @@ -95,13 +95,13 @@ toggleAction: ActionToggleMagbootsSyndie - type: ClothingSpeedModifier walkModifier: 0.95 - sprintModifier: 0.9 + sprintModifier: 1 #SS220 fix enabled: false - type: GasTank - outputPressure: 42.6 + outputPressure: 21.2 air: - # 2 minutes of thrust - volume: 0.75 + # SS220 fix + volume: 5 temperature: 293.15 moles: - 0.153853429 # oxygen diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml index 3f75faf75e1e..2380108fe62c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml @@ -147,7 +147,7 @@ acts: [ "Destruction" ] - trigger: !type:DamageTrigger - damage: 100 + damage: 200 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -160,7 +160,7 @@ soundGunshot: /Audio/Weapons/Guns/Gunshots/gun_sentry.ogg - type: BallisticAmmoProvider proto: CartridgePistol - capacity: 50 + capacity: 100 - type: Construction deconstructionTarget: null graph: WeaponTurretSyndicateDisposable From 66f3b305ff4ede149af498f999184113f474f062 Mon Sep 17 00:00:00 2001 From: TryHardo7 <166473301+TryHardo7@users.noreply.github.com> Date: Sun, 16 Jun 2024 17:49:39 +0300 Subject: [PATCH 2/5] Update Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml Co-authored-by: Anri --- Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml index d4dafb22df67..e25faf376816 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml @@ -98,7 +98,7 @@ sprintModifier: 1 #SS220 fix enabled: false - type: GasTank - outputPressure: 21.2 + outputPressure: 42.6 air: # SS220 fix volume: 5 From 35919f18853b51532e6d950e905135065b0641ef Mon Sep 17 00:00:00 2001 From: TryHardo7 <166473301+TryHardo7@users.noreply.github.com> Date: Sun, 16 Jun 2024 17:51:56 +0300 Subject: [PATCH 3/5] Update magboots.yml --- Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml index e25faf376816..8d6385ff65a2 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml @@ -94,7 +94,7 @@ - type: Magboots toggleAction: ActionToggleMagbootsSyndie - type: ClothingSpeedModifier - walkModifier: 0.95 + walkModifier: 1 sprintModifier: 1 #SS220 fix enabled: false - type: GasTank From 55687bf9759902521b4fe5aa71e2c8df442bf349 Mon Sep 17 00:00:00 2001 From: TryHardo7 <166473301+TryHardo7@users.noreply.github.com> Date: Tue, 2 Jul 2024 21:37:01 +0300 Subject: [PATCH 4/5] Update uplink_catalog.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Исправление стоимости аплинк имплентера. --- Resources/Prototypes/Catalog/uplink_catalog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 135b2694984c..f08e119aed85 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1226,7 +1226,7 @@ icon: { sprite: /Textures/Objects/Devices/communication.rsi, state: old-radio } productEntity: UplinkImplanter cost: - Telecrystal: 2 + Telecrystal: 1 categories: - UplinkImplants conditions: From 698a0850b2f8fc92a22e24c7831f8d49a9ec4d32 Mon Sep 17 00:00:00 2001 From: Dexler <69513582+DexlerXD@users.noreply.github.com> Date: Tue, 6 Aug 2024 21:13:46 +0300 Subject: [PATCH 5/5] add our tags --- Resources/Locale/en-US/store/uplink-catalog.ftl | 2 ++ Resources/Locale/ru-RU/store/uplink-catalog.ftl | 2 ++ Resources/Prototypes/Actions/types.yml | 2 +- Resources/Prototypes/Catalog/uplink_catalog.yml | 12 ++++++------ .../Prototypes/Entities/Clothing/Back/backpacks.yml | 2 ++ .../Entities/Objects/Weapons/Guns/turrets.yml | 4 ++-- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index edaac3c82d5c..4b6bd17f20b0 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -174,12 +174,14 @@ uplink-freedom-implanter-name = Freedom Implanter uplink-freedom-implanter-desc = Get away from those nasty sec officers with this three use implant! uplink-scram-implanter-name = Scram Implanter +#SS220-underused-uplinks-stuff uplink-scram-implanter-desc = A 12-use implant which teleports you within a medium radius. Attempts to teleport you onto an unobstructed tile. May sometimes fail to do so. Life insurance not included. uplink-dna-scrambler-implanter-name = DNA Scrambler Implanter uplink-dna-scrambler-implanter-desc = A single use implant that can be activated to modify your DNA and give you a completely new look. uplink-emp-implanter-name = EMP Implanter +#SS220-underused-uplinks-stuff uplink-emp-implanter-desc = Detonates a small EMP pulse on activation that drains nearby electronics of their power, can be used five times before the internal battery runs out. uplink-macro-bomb-implanter-name = Macro Bomb Implanter diff --git a/Resources/Locale/ru-RU/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/store/uplink-catalog.ftl index e1a7940977ba..78c1f88cad9b 100644 --- a/Resources/Locale/ru-RU/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/store/uplink-catalog.ftl @@ -118,10 +118,12 @@ uplink-storage-implanter-desc = Прячьте предметы внутри с uplink-freedom-implanter-name = Имплантер Свобода uplink-freedom-implanter-desc = Сбегите от этих противных сотрудников СБ при помощи этого импланта, который можно использовать аж три раза! uplink-scram-implanter-name = Имплантер Побег +#SS220-underused-uplinks-stuff uplink-scram-implanter-desc = Имеет 12 зарядов, телепортирует вас в небольшом радиусе. Попытается телепортировать вас на незанятое место. Иногда сбоит. Страхование жизни не прилагается. uplink-dna-scrambler-implanter-name = Имплантер Миксер ДНК uplink-dna-scrambler-implanter-desc = Одноразовый имплант, который можно активировать для перемешивания ДНК и приобретения совершенно нового облика. uplink-emp-implanter-name = Имплантер ЭМИ +#SS220-underused-uplinks-stuff uplink-emp-implanter-desc = При активации создаёт небольшой ЭМИ, который обесточивает находящуюся рядом электронику; может быть использован пять раз, прежде чем разрядится внутренняя батарея. uplink-macro-bomb-implanter-name = Имплантер Макробомба uplink-macro-bomb-implanter-desc = Вколите его, и после смерти вы устроите большой взрыв. Большой риск для союзников, используйте на свой страх и риск. Заменяет Микробомбу. diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml index 5d9b24314791..a7544138c938 100644 --- a/Resources/Prototypes/Actions/types.yml +++ b/Resources/Prototypes/Actions/types.yml @@ -122,7 +122,7 @@ components: - type: InstantAction checkCanInteract: false - charges: 5 + charges: 5 #SS220-underused-uplinks-stuff begin useDelay: 5 itemIconStyle: BigAction priority: -20 diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index e545b025edf0..cdaa657c8c36 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -72,7 +72,7 @@ icon: { sprite: /Textures/Objects/Storage/boxicons.rsi, state: throwing_knives } productEntity: ThrowingKnivesKit cost: - Telecrystal: 4 + Telecrystal: 4 #SS220-underused-uplinks-stuff categories: - UplinkWeaponry @@ -648,7 +648,7 @@ description: uplink-cigarettes-desc productEntity: CigPackSyndicate cost: - Telecrystal: 1 + Telecrystal: 1 #SS220-underused-uplinks-stuff categories: - UplinkChemicals @@ -1126,7 +1126,7 @@ icon: { sprite: /Textures/Actions/Implants/implants.rsi, state: freedom } productEntity: FreedomImplanter cost: - Telecrystal: 3 + Telecrystal: 3 #SS220-underused-uplinks-stuff categories: - UplinkImplants @@ -1159,7 +1159,7 @@ icon: { sprite: /Textures/Objects/Magic/magicactions.rsi, state: shield } productEntity: EmpImplanter cost: - Telecrystal: 1 + Telecrystal: 1 #SS220-underused-uplinks-stuff categories: - UplinkImplants @@ -1226,7 +1226,7 @@ icon: { sprite: /Textures/Objects/Devices/communication.rsi, state: old-radio } productEntity: UplinkImplanter cost: - Telecrystal: 1 + Telecrystal: 1 #SS220-underused-uplinks-stuff categories: - UplinkImplants conditions: @@ -1355,7 +1355,7 @@ icon: { sprite: /Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi, state: icon } productEntity: ClothingBackpackDuffelSyndicateEVABundle cost: - Telecrystal: 1 + Telecrystal: 1 #SS220-underused-uplinks-stuff categories: - UplinkWearables diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index e99788482ae3..03689d8081d8 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -309,10 +309,12 @@ sprite: Clothing/Back/Backpacks/syndicate.rsi - type: ExplosionResistance damageCoefficient: 0.1 + #SS220-underused-uplinks-stuff begin - type: Storage grid: - 0,0,7,4 maxItemSize: Huge + #SS220-underused-uplinks-stuff end #Special - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml index fb0043bbfe8d..b7756ccd896c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml @@ -147,7 +147,7 @@ acts: [ "Destruction" ] - trigger: !type:DamageTrigger - damage: 200 + damage: 200 #SS220-underused-uplinks-stuff behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -160,7 +160,7 @@ soundGunshot: /Audio/Weapons/Guns/Gunshots/gun_sentry.ogg - type: BallisticAmmoProvider proto: CartridgePistol - capacity: 100 + capacity: 100 #SS220-underused-uplinks-stuff - type: Construction deconstructionTarget: null graph: WeaponTurretSyndicateDisposable