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

Underused uplink stuff fix #1157

Merged
merged 6 commits into from
Aug 6, 2024
Merged
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
6 changes: 4 additions & 2 deletions Resources/Locale/en-US/store/uplink-catalog.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,15 @@ 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.
#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
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.
#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
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.
Expand Down
6 changes: 4 additions & 2 deletions Resources/Locale/ru-RU/store/uplink-catalog.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,13 @@ uplink-storage-implanter-desc = Прячьте предметы внутри с
uplink-freedom-implanter-name = Имплантер Свобода
uplink-freedom-implanter-desc = Сбегите от этих противных сотрудников СБ при помощи этого импланта, который можно использовать аж три раза!
uplink-scram-implanter-name = Имплантер Побег
uplink-scram-implanter-desc = Двухразовый имплант, который телепортирует вас в большом радиусе. Попытается телепортировать вас на незанятое место. Иногда сбоит. Страхование жизни не прилагается.
#SS220-underused-uplinks-stuff
uplink-scram-implanter-desc = Имеет 12 зарядов, телепортирует вас в небольшом радиусе. Попытается телепортировать вас на незанятое место. Иногда сбоит. Страхование жизни не прилагается.
uplink-dna-scrambler-implanter-name = Имплантер Миксер ДНК
uplink-dna-scrambler-implanter-desc = Одноразовый имплант, который можно активировать для перемешивания ДНК и приобретения совершенно нового облика.
uplink-emp-implanter-name = Имплантер ЭМИ
uplink-emp-implanter-desc = При активации создаёт небольшой ЭМИ, который обесточивает находящуюся рядом электронику; может быть использован три раза, прежде чем разрядится внутренняя батарея.
#SS220-underused-uplinks-stuff
uplink-emp-implanter-desc = При активации создаёт небольшой ЭМИ, который обесточивает находящуюся рядом электронику; может быть использован пять раз, прежде чем разрядится внутренняя батарея.
uplink-macro-bomb-implanter-name = Имплантер Макробомба
uplink-macro-bomb-implanter-desc = Вколите его, и после смерти вы устроите большой взрыв. Большой риск для союзников, используйте на свой страх и риск. Заменяет Микробомбу.
uplink-uplink-implanter-name = Имплантер Аплинк
Expand Down
9 changes: 6 additions & 3 deletions Resources/Prototypes/Actions/types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
components:
- type: InstantAction
checkCanInteract: false
charges: 3
charges: 5 #SS220-underused-uplinks-stuff begin
useDelay: 5
itemIconStyle: BigAction
priority: -20
Expand All @@ -134,11 +134,14 @@
- type: entity
id: ActionActivateScramImplant
name: SCRAM!
description: Randomly teleports you within a large distance.
#SS220-underused-uplinks-stuff begin
description: Randomly teleports you within a medium distance.
noSpawn: true
#SS220-underused-uplinks-stuff end
components:
- type: InstantAction
checkCanInteract: false
charges: 2
charges: 12 #SS220 changed
useDelay: 5
itemIconStyle: BigAction
priority: -20
Expand Down
12 changes: 6 additions & 6 deletions Resources/Prototypes/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
icon: { sprite: /Textures/Objects/Storage/boxicons.rsi, state: throwing_knives }
productEntity: ThrowingKnivesKit
cost:
Telecrystal: 6
Telecrystal: 4 #SS220-underused-uplinks-stuff
categories:
- UplinkWeaponry

Expand Down Expand Up @@ -648,7 +648,7 @@
description: uplink-cigarettes-desc
productEntity: CigPackSyndicate
cost:
Telecrystal: 2
Telecrystal: 1 #SS220-underused-uplinks-stuff
categories:
- UplinkChemicals

Expand Down Expand Up @@ -1126,7 +1126,7 @@
icon: { sprite: /Textures/Actions/Implants/implants.rsi, state: freedom }
productEntity: FreedomImplanter
cost:
Telecrystal: 5
Telecrystal: 3 #SS220-underused-uplinks-stuff
categories:
- UplinkImplants

Expand Down Expand Up @@ -1159,7 +1159,7 @@
icon: { sprite: /Textures/Objects/Magic/magicactions.rsi, state: shield }
productEntity: EmpImplanter
cost:
Telecrystal: 2
Telecrystal: 1 #SS220-underused-uplinks-stuff
categories:
- UplinkImplants

Expand Down Expand Up @@ -1226,7 +1226,7 @@
icon: { sprite: /Textures/Objects/Devices/communication.rsi, state: old-radio }
productEntity: UplinkImplanter
cost:
Telecrystal: 2
Telecrystal: 1 #SS220-underused-uplinks-stuff
categories:
- UplinkImplants
conditions:
Expand Down Expand Up @@ -1355,7 +1355,7 @@
icon: { sprite: /Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi, state: icon }
productEntity: ClothingBackpackDuffelSyndicateEVABundle
cost:
Telecrystal: 2
Telecrystal: 1 #SS220-underused-uplinks-stuff
categories:
- UplinkWearables

Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +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
Expand Down
10 changes: 6 additions & 4 deletions Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,15 @@
- type: Clothing
sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi
- type: ClothingSpeedModifier
walkModifier: 0.95
sprintModifier: 0.9
#SS220-underused-uplinks-stuff begin
walkModifier: 1
sprintModifier: 1
#SS220-underused-uplinks-stuff end
- type: GasTank
outputPressure: 42.6
air:
# 2 minutes of thrust
volume: 0.75
# SS220 fix
volume: 5

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Также вопрос в следующем - ты изменил объём, но не трогал кол-во вещества (те самые пресловутые моли), поэтому в магах изначально газа больше газа не станет. Это намеренно?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Да, я подумал что слишком жирно будет их сразу полностью заправленными делать, придётся найти канистру и заправить. Это всё ещё делает их полезнее, просто от игрока ещё действия потребуются чтобы их потенциал раскрыть

temperature: 293.15
moles:
- 0.153853429 # oxygen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger
damage: 100
damage: 200 #SS220-underused-uplinks-stuff
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
Expand All @@ -160,7 +160,7 @@
soundGunshot: /Audio/Weapons/Guns/Gunshots/gun_sentry.ogg
- type: BallisticAmmoProvider
proto: CartridgePistol
capacity: 50
capacity: 100 #SS220-underused-uplinks-stuff
- type: Construction
deconstructionTarget: null
graph: WeaponTurretSyndicateDisposable
Expand Down
Loading