Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Upstream core (#284)

Browse Source 
* [Feature] Holo Update (#948)

* Это база, основа, фундамент.

* update icons

* based2

* zamena headcoder

* протоНовые функции

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

* abilities

* zvuk

* tweaks & fixes

* sprite fix

* govno

* govno2

* fix govna

* GOVNOOOOOOOOOOOO

* finally

* цена

(cherry picked from commit cf4a7d0a7ccb780905e0df7db80d60d2338c02d0)

* Automatic changelog update

(cherry picked from commit 32a1f13849b4593fa03eafff99179814278f5f11)

---------

Co-authored-by: RavmorganButOnCocaine <valtos@nextmail.ru>
This commit is contained in:
withoutcode333
2025-04-18 08:26:02 +05:00
committed by GitHub
parent 6f1be858ec
commit 08f0c51ce0
26 changed files with 790 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Resources/Audio/White/Guardian/charger.ogg Normal file
View File

Binary file not shown.

54
Resources/Changelog/ChangelogWhite.yml
View File

@@ -1,16 +1,4 @@
Entries:
- author: Aviu
changes:
- message: "\u0411\u0417 \u0442\u0435\u043F\u0435\u0440\u044C \u0443\u0441\u044B\
\u043F\u043B\u044F\u0435\u0442 \u0433\u0435\u043D\u043E\u043A\u0440\u0430\u0434\
\u043E\u0432."
type: Add
- message: "\u041D\u0438\u0442\u0440\u0438\u0443\u043C \u0441\u043D\u043E\u0432\u0430\
\ \u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442."
type: Fix
id: 178
time: '2024-03-03T08:09:04.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/167
- author: ThereDrD
changes:
- message: "\u0424\u0438\u043A\u0441 \u043F\u0443\u0441\u0442\u044B\u0445 \u0441\
@@ -9078,3 +9066,45 @@
id: 677
time: '2025-04-13T16:14:06.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/947
- author: CaypenNow
changes:
- message: "\u0413\u043E\u043B\u043E\u043F\u0430\u0440\u0430\u0437\u0438\u0442\u044B\
\ \u043F\u043E\u043B\u0443\u0447\u0438\u043B\u0438 \u043F\u043E\u043B\u043D\u043E\
\u0435 \u043E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u0435. \u0422\u0435\
\u043F\u0435\u0440\u044C, \u043F\u0440\u0438 \u0438\u043C\u043F\u043B\u0430\u043D\
\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0438 \u0433\u043E\u043B\u043E\
\u043F\u0430\u0440\u0430\u0437\u0438\u0442\u0430, \u0435\u0441\u0442\u044C \u0432\
\u043E\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u0432\u044B\u0431\
\u0440\u0430\u0442\u044C \u043E\u0434\u0438\u043D \u0438\u0437 4 \u043A\u043B\
\u0430\u0441\u0441\u043E\u0432. \u041A\u0430\u0436\u0434\u044B\u0439 \u043A\u043B\
\u0430\u0441\u0441 \u0438\u043C\u0435\u0435\u0442 \u0440\u0430\u0437\u043B\u0438\
\u0447\u0438\u044F, \u0430 \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0435\
\ \u0438 \u0441\u043E\u0431\u0441\u0442\u0432\u0435\u043D\u043D\u044B\u0435\
\ \u0441\u043F\u043E\u0441\u043E\u0431\u043D\u043E\u0441\u0442\u0438."
type: Add
- message: "\u0413\u043E\u043B\u043E\u043F\u0430\u0440\u0430\u0437\u0438\u0442 \u043F\
\u043E\u043B\u0443\u0447\u0438\u043B \u043D\u043E\u0432\u044B\u0439 \u0441\u043F\
\u0440\u0430\u0439\u0442"
type: Add
- message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0433\u043E\u043B\u043E\u043F\u0430\
\u0440\u0430\u0437\u0438\u0442 \u043C\u043E\u0436\u0435\u0442 \u0432\u044B\u0445\
\u043E\u0434\u0438\u0442\u044C \u0438\u0437 \u0442\u0435\u043B\u0430 \u0441\u0430\
\u043C"
type: Tweak
- message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0433\u043E\u043B\u043E\u043F\u0430\
\u0440\u0430\u0437\u0438\u0442 \u043C\u043E\u0436\u0435\u0442 \u0442\u0430\u0441\
\u043A\u0430\u0442\u044C \u0432\u0435\u0449\u0438\u0442\u044C"
type: Tweak
- message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0446\u0432\u0435\u0442 \u0433\
\u043E\u043B\u043E\u043F\u0430\u0440\u0430\u0437\u0438\u0442\u0430 - \u0443\u043D\
\u0438\u043A\u0430\u043B\u044C\u043D\u044B\u0439 \u0434\u043B\u044F \u043A\u043B\
\u0430\u0441\u0441\u0430, \u0430 \u043D\u0435 \u043F\u0440\u043E\u0441\u0442\
\u043E \u0440\u0430\u043D\u0434\u043E\u043C\u043D\u044B\u0439."
type: Tweak
- message: "\u0426\u0435\u043D\u0430 \u0433\u043E\u043B\u043E\u043F\u0430\u0440\u0430\
\u0437\u0438\u0442\u0430 \u043F\u043E\u0432\u044B\u0448\u0435\u043D\u0430. 12\
\ \u0422\u041A --> 13 \u0422\u041A"
type: Tweak
id: 678
time: '2025-04-18T03:18:09.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/948

4
Resources/Locale/ru-RU/_white/guardian/guardian.ftl Normal file
View File

@@ -0,0 +1,4 @@
guardian-assasin-name = Ассасин
guardian-lighting-name = Молниеносный
guardian-charger-name = Быстрый
guardian-standart-name = Классический

2
Resources/Prototypes/Catalog/uplink_catalog.yml
View File

@@ -922,7 +922,7 @@
icon: { sprite: /Textures/Objects/Misc/guardian_info.rsi, state: icon }
productEntity: BoxHoloparasite
cost:
Telecrystal: 12
Telecrystal: 13
categories:
- UplinkAllies
conditions:

221
Resources/Prototypes/Entities/Mobs/Player/guardian.yml
View File

@@ -20,6 +20,7 @@
context: "human"
- type: MobMover
- type: InputMover
- type: Puller
- type: MovementSpeedModifier
baseWalkSpeed: 4
baseSprintSpeed: 5.5
@@ -29,20 +30,6 @@
Blunt: 5
soundHit:
collection: MetalThud
- type: RandomSprite
available:
- enum.DamageStateVisualLayers.Base:
magic_base: ""
enum.DamageStateVisualLayers.BaseUnshaded:
magic_flare: Sixteen
- enum.DamageStateVisualLayers.Base:
miner_base: ""
enum.DamageStateVisualLayers.BaseUnshaded:
miner_flare: Sixteen
- enum.DamageStateVisualLayers.Base:
tech_base: ""
enum.DamageStateVisualLayers.BaseUnshaded:
tech_flare: Sixteen
- type: Sprite
drawdepth: Mobs
sprite: White/Mobs/Aliens/Guardians/guardians.rsi
@@ -112,8 +99,8 @@
# From the uplink injector
- type: entity
name: Holoparasite
id: MobHoloparasiteGuardian
name: HoloparasiteStandart
id: MobHoloparasiteGuardianStandart
parent: MobGuardianBase
description: A mesmerising whirl of hard-light patterns weaves a marvelous, yet oddly familiar visage. It stands proud, tuning into its owner's life to sustain itself.
components:
@@ -126,22 +113,208 @@
raffle:
settings: default
- type: GhostTakeoverAvailable
- type: Sprite
drawdepth: Mobs
sprite: White/Mobs/Aliens/Guardians/guardians.rsi
layers:
- state: tech_base
map: [ "enum.DamageStateVisualLayers.Base" ]
- state: tech_flare
map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
color: "#707070"
shader: unshaded
noRot: true
- type: Guardian
damageShare: 0.5
distance: 6
- type: MovementSpeedModifier
baseWalkSpeed: 4.5
baseSprintSpeed: 6
- type: DamageOnHighSpeedImpact
damage:
types:
Blunt: 5
soundHit:
collection: MetalThud
- type: MeleeWeapon
hidden: false
altDisarm: false
animation: WeaponArcFist
attackRate: 2.2
autoAttack: true
soundHit:
collection: Punch
damage:
types:
Blunt: 24
Structural: 24
- type: NameIdentifier
group: Holoparasite
- type: TypingIndicator
proto: holo
- type: Sprite
layers:
- state: tech_base
map: [ "enum.DamageStateVisualLayers.Base" ]
- state: tech_flare
map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
color: "#40a7d7"
shader: unshaded
- type: HTN
rootTask:
task: SimpleHumanoidHostileCompound
- type: entity
name: HoloparasiteAssasin
id: MobHoloparasiteGuardianAssasin
parent: MobGuardianBase
description: A mesmerising whirl of hard-light patterns weaves a marvelous, yet oddly familiar visage. It stands proud, tuning into its owner's life to sustain itself.
components:
- type: GhostRole
allowMovement: true
allowSpeech: true
makeSentient: true
name: ghost-role-information-holoparasite-name
description: ghost-role-information-holoparasite-description
raffle:
settings: default
- type: GhostTakeoverAvailable
- type: Sprite
drawdepth: Mobs
sprite: White/Mobs/Aliens/Guardians/guardians.rsi
layers:
- state: tech_base
map: [ "enum.DamageStateVisualLayers.Base" ]
- state: tech_flare
map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
color: "#9d0016"
shader: unshaded
noRot: true
- type: Guardian
damageShare: 1
distance: 10
- type: MovementSpeedModifier
baseWalkSpeed: 4
baseSprintSpeed: 5.5
- type: DamageOnHighSpeedImpact
damage:
types:
Blunt: 5
soundHit:
collection: MetalThud
- type: MeleeWeapon
hidden: false
altDisarm: false
animation: WeaponArcFist
attackRate: 2
autoAttack: true
soundHit:
collection: Punch
damage:
types:
Blunt: 14
Structural: 14
- type: NameIdentifier
group: Holoparasite
- type: TypingIndicator
proto: holo
- type: HTN
rootTask:
task: SimpleHumanoidHostileCompound
- type: entity
name: HoloparasiteCharger
id: MobHoloparasiteGuardianCharger
parent: MobGuardianBase
description: A mesmerising whirl of hard-light patterns weaves a marvelous, yet oddly familiar visage. It stands proud, tuning into its owner's life to sustain itself.
components:
- type: GhostRole
allowMovement: true
allowSpeech: true
makeSentient: true
name: ghost-role-information-holoparasite-name
description: ghost-role-information-holoparasite-description
raffle:
settings: default
- type: GhostTakeoverAvailable
- type: Sprite
drawdepth: Mobs
sprite: White/Mobs/Aliens/Guardians/guardians.rsi
layers:
- state: tech_base
map: [ "enum.DamageStateVisualLayers.Base" ]
- state: tech_flare
map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
color: "#54f3ff"
shader: unshaded
noRot: true
- type: MovementSpeedModifier
baseWalkSpeed: 6
baseSprintSpeed: 7.5
- type: DamageOnHighSpeedImpact
damage:
types:
Blunt: 5
soundHit:
collection: MetalThud
- type: MeleeWeapon
hidden: false
altDisarm: false
animation: WeaponArcFist
attackRate: 2.5
autoAttack: true
soundHit:
collection: Punch
damage:
types:
Blunt: 15
Structural: 15
- type: NameIdentifier
group: Holoparasite
- type: TypingIndicator
proto: holo
- type: HTN
rootTask:
task: SimpleHumanoidHostileCompound
- type: entity
name: HoloparasiteLighting
id: MobHoloparasiteGuardianLighting
parent: MobGuardianBase
description: A mesmerising whirl of hard-light patterns weaves a marvelous, yet oddly familiar visage. It stands proud, tuning into its owner's life to sustain itself.
components:
- type: GhostRole
allowMovement: true
allowSpeech: true
makeSentient: true
name: ghost-role-information-holoparasite-name
description: ghost-role-information-holoparasite-description
raffle:
settings: default
- type: GhostTakeoverAvailable
- type: Sprite
drawdepth: Mobs
sprite: White/Mobs/Aliens/Guardians/guardians.rsi
layers:
- state: tech_base
map: [ "enum.DamageStateVisualLayers.Base" ]
- state: tech_flare
map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
color: "#2000c8"
shader: unshaded
noRot: true
- type: MeleeWeapon
hidden: false
altDisarm: false
animation: WeaponArcFist
attackRate: 1.8
autoAttack: true
soundHit:
collection: Punch
damage:
types:
Blunt: 5
Structural: 5
- type: NameIdentifier
group: Holoparasite
- type: TypingIndicator
proto: holo
- type: HTN
rootTask:
task: SimpleHumanoidHostileCompound
# From Wizard deck of cards
- type: entity
name: Ifrit

9
Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml
View File

@@ -9,6 +9,15 @@
state: combat_hypo
- type: GuardianCreator
guardianProto: MobHoloparasiteGuardian
guardiansAvaliable:
- Assasin
- Charger
- Standart
- Lighting
- type: UserInterface # PARSEC EDIT
interfaces:
enum.GuardianSelectorUiKey.Key:
type: GuardianSelectorBUI
- type: entity
name: holoclown injector

36
Resources/Prototypes/_White/Actions/guardian.yml Normal file
View File

@@ -0,0 +1,36 @@
- type: entity
id: ActionGuardianPowerToggle
name: "[color=green]Сила голопаразита[/color]"
description: Уникальная способность голопаразита.
noSpawn: true
components:
- type: InstantAction
checkCanInteract: false
checkConsciousness: false
icon: White/Interface/Guardian/powerOff.png
iconOn: White/Interface/Guardian/power.png
event: !type:ToggleGuardianPowerActionEvent
- type: entity
id: ActionGuardianPowerOff
parent: ActionCombatModeToggle
name: "[color=red]Сила голопаразита[/color]"
description: Уникальная способность голопаразита.
noSpawn: true
components:
- type: InstantAction
enabled: false
autoPopulate: false
- type: entity
id: ActionChargerPower
name: "[color=green]Сила голопаразита[/color]"
description: Уникальная способность голопаразита, позволяет зарядить ваш кулак и одним ударом поразить цель.
noSpawn: true
components:
- type: InstantAction
useDelay: 4
checkCanInteract: false
checkConsciousness: false
icon: White/Interface/Guardian/powerOff.png
event: !type:ChargerPowerActionEvent

BIN
Resources/Textures/White/Interface/Guardian/power.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
Resources/Textures/White/Interface/Guardian/powerOff.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
Resources/Textures/White/Interface/guardianselector.rsi/assasin.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 297 B

BIN
Resources/Textures/White/Interface/guardianselector.rsi/charger.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 276 B

BIN
Resources/Textures/White/Interface/guardianselector.rsi/lighting.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 252 B

20
Resources/Textures/White/Interface/guardianselector.rsi/meta.json Normal file
View File

@@ -0,0 +1,20 @@
{
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/tgstation/tgstation/blob/master/icons/hud/guardian.dmi",
"version": 1,
"size": { "y": 32, "x": 32 },
"states": [
{
"name": "charger"
},
{
"name": "lighting"
},
{
"name": "assasin"
},
{
"name": "standart"
}
]
}

BIN
Resources/Textures/White/Interface/guardianselector.rsi/standart.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 268 B