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

Merge remote-tracking branch 'upstream/master' into ups

Browse Source
This commit is contained in:
Jabak
2024-07-31 01:26:23 +03:00
parent 9acf140673 49d6736a3e
commit a583cfde09
63 changed files with 1267 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Resources/Audio/White/Cult/rites.ogg Normal file
View File

Binary file not shown.

139
Resources/Changelog/ChangelogWhite.yml
View File

@@ -6970,3 +6970,142 @@
id: 425
time: '2024-07-29T03:04:21.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/510
- author: ThereDrD
changes:
- message: "\u0420\u041F\u0414 \u0442\u0435\u043F\u0435\u0440\u044C \u043C\u043E\
\u0436\u0435\u0442 \u0441\u0442\u0440\u043E\u0438\u0442\u044C \u0442\u0440\u0443\
\u0431\u044B \u0432 \u0441\u0442\u0435\u043D\u0430\u0445"
type: Tweak
- message: "\u041A\u0440\u0430\u0444\u0442 \u043C\u0435\u043D\u044E \u0442\u0435\
\u043F\u0435\u0440\u044C \u0442\u043E\u0436\u0435 \u043C\u043E\u0436\u0435\u0442\
\ \u0441\u0442\u0440\u043E\u0438\u0442\u044C \u0442\u0440\u0443\u0431\u044B\
\ \u0432 \u0441\u0442\u0435\u043D\u0430\u0445"
type: Tweak
- message: "\u041F\u043E\u0444\u0438\u043A\u0448\u0435\u043D\u043E \u043F\u0435\u0447\
\u0430\u0442\u0430\u043D\u0438\u0435 \u0437\u0430\u043F\u043E\u043B\u043D\u0435\
\u043D\u043D\u044B\u0445 \u0420\u0426\u0414 \u0438 \u0420\u041F\u0414. \u0447\
\u0442\u043E \u0434\u0430\u0432\u0430\u043B\u043E \u0432\u043E\u0437\u043C\u043E\
\u0436\u043D\u043E\u0441\u0442\u044C \u0434\u044E\u043F\u0430\u0442\u044C \u043C\
\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B"
type: Fix
- message: "\u0412\u0440\u0435\u043C\u044F \u0441\u0442\u0440\u043E\u0438\u0442\u0435\
\u043B\u044C\u0441\u0442\u0432\u0430 \u0443\u0441\u0442\u0440\u043E\u0439\u0441\
\u0442\u0432 \u0441\u043C\u044B\u0432\u0430 \u0432 \u0420\u041F\u0414 \u0441\
\u0442\u0430\u043B\u043E \u043F\u043E\u0431\u043E\u043B\u044C\u0448\u0435"
type: Fix
id: 426
time: '2024-07-29T12:33:46.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/511
- author: Spatison
changes:
- message: "\u0411\u043E\u0442\u0438\u043D\u043A\u0438 \u043A\u043B\u043E\u0443\u043D\
\u0430 \u0441\u043D\u043E\u0432\u0430 \u0440\u0430\u0431\u043E\u0442\u0430\u044E\
\u0442"
type: Fix
- message: "\u0421\u0432\u0435\u0442\u043E\u0432\u043E\u0435 \u043A\u043E\u043F\u044C\
\u0435 \u0442\u0435\u043F\u0435\u0440\u044C \u0438\u0441\u0447\u0435\u0437\u0430\
\u0435\u0442 \u0435\u0441\u043B\u0438 \u0435\u0433\u043E \u043F\u0435\u0440\u0435\
\u0434\u0430\u0442\u044C"
type: Fix
id: 427
time: '2024-07-30T00:13:05.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/513
- author: Aviu
changes:
- message: "\u041F\u0435\u0440\u0435\u0440\u0430\u0431\u043E\u0442\u0430\u043D\u043E\
\ \u0437\u0430\u043A\u043B\u0438\u043D\u0430\u043D\u0438\u0435 \u043A\u0440\u043E\
\u0432\u0430\u0432\u044B\u0445 \u043E\u0431\u0440\u044F\u0434\u043E\u0432 \u043A\
\u0443\u043B\u044C\u0442\u0430. \u0422\u0435\u043F\u0435\u0440\u044C \u043E\u043D\
\u043E \u0434\u0430\u0451\u0442 \u0430\u0443\u0440\u0443, \u043A\u043E\u0442\
\u043E\u0440\u043E\u0439 \u043D\u0430\u0434\u043E \u043A\u043B\u0438\u043A\u0430\
\u0442\u044C \u043D\u0430 \u043A\u0440\u043E\u0432\u044C, \u0447\u0442\u043E\
\u0431\u044B \u043F\u043E\u0433\u043B\u043E\u0442\u0438\u0442\u044C \u0435\u0451\
. \u041F\u0440\u0438 \u043F\u043E\u0433\u043B\u043E\u0449\u0435\u043D\u0438\u0438\
\ \u043E\u043D\u043E \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u043B\
\u0435\u0447\u0438\u0442, \u0442\u0435\u043F\u0435\u0440\u044C \u043D\u0443\u0436\
\u043D\u043E \u0443\u0434\u0430\u0440\u0438\u0442\u044C \u0430\u0443\u0440\u043E\
\u0439 \u043A\u0443\u043B\u044C\u0442\u0438\u0441\u0442\u0430 \u0438\u043B\u0438\
\ \u043A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u0430 \u0434\u043B\u044F\
\ \u043B\u0435\u0447\u0435\u043D\u0438\u044F, 1 \u0445\u043F \u0437\u0430 2\
\ \u0432\u044B\u0441\u043E\u0441\u0430\u043D\u043D\u043E\u0439 \u043A\u0440\u043E\
\u0432\u0438. \u0423\u0431\u0440\u0430\u043D\u044B \u043E\u0431\u0440\u044F\u0434\
\u044B \u0438\u0437 \u0432\u0435\u0440\u0431\u0430, \u0442\u0435\u043F\u0435\
\u0440\u044C \u043D\u0443\u0436\u043D\u043E \u0430\u043A\u0442\u0438\u0432\u0438\
\u0440\u043E\u0432\u0430\u0442\u044C \u0430\u0443\u0440\u0443 \u0432 \u0440\u0443\
\u043A\u0430\u0445, \u0447\u0442\u043E\u0431\u044B \u0432\u044B\u0431\u0440\u0430\
\u0442\u044C \u043A\u043E\u043F\u044C\u0451 \u0438\u043B\u0438 \u0437\u0430\u043B\
\u043F."
type: Add
- message: "\u0412\u0441\u0435 \u043A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\
\u044B \u043D\u0430\u0443\u0447\u0438\u043B\u0438\u0441\u044C \u0442\u0430\u0441\
\u043A\u0430\u0442\u044C."
type: Tweak
- message: "\u0414\u0436\u0430\u0433\u0433\u0435\u0440\u043D\u0430\u0443\u0442 \u0438\
\ \u0440\u0435\u043C\u0435\u0441\u043B\u0435\u043D\u043D\u0438\u043A \u0442\u0435\
\u043F\u0435\u0440\u044C \u043D\u0435\u043C\u043D\u043E\u0433\u043E \u0431\u044B\
\u0441\u0442\u0440\u0435\u0435."
type: Tweak
- message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043F\u0440\u0438 \u043F\u043E\
\u044F\u0432\u043B\u0435\u043D\u0438\u0438 \u043A\u043E\u043D\u0441\u0442\u0440\
\u0443\u043A\u0442\u0430 \u0432\u0441\u0435 \u0435\u0433\u043E \u0441\u043F\u043E\
\u0441\u043E\u0431\u043D\u043E\u0441\u0442\u0438 \u0438\u0437\u043D\u0430\u0447\
\u0430\u043B\u044C\u043D\u043E \u0432 \u043A\u0434."
type: Tweak
- message: "\u0421 \u0441\u043E\u043A\u0440\u044B\u0442\u043E\u0439 \u0440\u0443\
\u043D\u043E\u0439 \u043C\u043E\u0433\u0443\u0449\u0435\u0441\u0442\u0432\u0430\
\ \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435\u043B\u044C\u0437\u044F\
\ \u0432\u0437\u0430\u0438\u043C\u043E\u0434\u0435\u0439\u0441\u0442\u0432\u043E\
\u0432\u0430\u0442\u044C."
type: Tweak
id: 428
time: '2024-07-30T00:12:49.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/514
- author: Aviu
changes:
- message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0438\u0441\u043A\u0430\u0436\u0435\
\u043D\u043D\u044B\u043C \u0432\u043E\u0437\u0434\u0435\u0439\u0441\u0442\u0432\
\u0438\u0435\u043C \u043C\u043E\u0436\u043D\u043E \u043F\u0440\u0435\u0432\u0440\
\u0430\u0442\u0438\u0442\u044C \u0448\u043B\u044E\u0437 \u0432 \u0440\u0443\u043D\
\u0438\u0447\u0435\u0441\u043A\u0438\u0439 \u0448\u043B\u044E\u0437."
type: Add
- message: "\u0417\u0430\u043A\u043B\u0438\u043D\u0430\u043D\u0438\u0435 \u0442\u0435\
\u043B\u0435\u043F\u043E\u0440\u0442\u0430 \u0442\u0435\u043F\u0435\u0440\u044C\
\ \u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442 \u0442\u043E\u043B\u044C\u043A\
\u043E \u043D\u0430 \u043A\u0443\u043B\u044C\u0442\u0438\u0441\u0442\u043E\u0432\
."
type: Tweak
- message: "\u0422\u043E\u0432\u0430\u0440\u044B \u0432 \u0438\u043D\u0436\u0435\
\u043C\u0430\u0442\u0435 \u0442\u0435\u043F\u0435\u0440\u044C \u0431\u0435\u0441\
\u043F\u043B\u0430\u0442\u043D\u044B\u0435."
type: Tweak
id: 429
time: '2024-07-30T16:31:34.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/516
- author: Aviu
changes:
- message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0435\u0441\u043B\u0438 \u0432\
\u0437\u044F\u0442\u044C \u043D\u0430 \u0440\u0443\u043A\u0438 \u0444\u0435\u043B\
\u0438\u043D\u0438\u0434\u0430, \u0435\u0433\u043E \u043C\u043E\u0436\u043D\u043E\
\ \u0437\u0430\u0441\u0443\u043D\u0443\u0442\u044C \u0432 \u0432\u0435\u0449\
\u043C\u0435\u0448\u043E\u043A."
type: Add
- message: "\u0424\u0435\u043B\u0438\u043D\u0438\u0434\u044B \u043C\u043E\u0433\u0443\
\u0442 \u0437\u0430\u043B\u0430\u0437\u0438\u0442\u044C \u0432 \u0432\u0435\u0449\
\u043C\u0435\u0448\u043A\u0438."
type: Add
- message: "\u041F\u0440\u0438 \u043F\u043E\u043F\u044B\u0442\u043A\u0435 \u0432\
\u0437\u044F\u0442\u044C \u043D\u0430 \u0440\u0443\u043A\u0438 \u0432\u044B\u0441\
\u043A\u0430\u043A\u0438\u0432\u0430\u0435\u0442 \u043F\u043E\u043F\u0430\u043F\
\ \u0443 \u0446\u0435\u043B\u0438."
type: Add
- message: "\u0424\u0435\u043B\u0438\u043D\u0438\u0434\u044B \u0431\u0435\u0440\u0443\
\u0442\u0441\u044F \u043D\u0430 \u0440\u0443\u043A\u0438 \u0431\u044B\u0441\u0442\
\u0440\u0435\u0435."
type: Add
- message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0432\u0437\u044F\u0442\u0438\u0435\
\ \u043D\u0430 \u0440\u0443\u043A\u0438 \u043F\u0440\u043E\u0438\u0441\u0445\
\u043E\u0434\u0438\u0442 \u0431\u044B\u0441\u0442\u0440\u0435\u0435."
type: Tweak
id: 430
time: '2024-07-30T16:32:26.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/515

4
Resources/Locale/ru-RU/_white/cult/abilities.ftl
View File

@@ -20,10 +20,10 @@ juggernaut-create-wall-action-name = Щит
juggernaut-create-wall-action-description = Это заклинание создает временное невидимое силовое поле для защиты себя и союзников от подавляющего огня.
ent-ActionCultTwistedConstruction = Искажённое Воздействие
.desc = Зловещее заклинание, которое используют для превращения металла в рунический металл.
.desc = Зловещее заклинание, которое используют для превращения металла в рунический металл и обычных дверей в рунические.
ent-ActionCultTeleport = Телепорт
.desc = Полезное заклинание, которое телепортирует цель на выбранную руну телепотрации. Цель должна являются культистом или быть парализованной.
.desc = Полезное заклинание, которое телепортирует культиста на выбранную руну телепотрации.
ent-ActionCultSummonCombatEquipment = Призыв Боевого Снаряжения
.desc = Важное заклинание, которое позволяет вам вызвать полный набор боевого снаряжения.

3
Resources/Locale/ru-RU/_white/cult/entities.ftl
View File

@@ -8,6 +8,9 @@ ent-SoulShardGhost = камень душ
ent-StunHand = оглушающая аура
.desc = Оглушит и обезмолвит жертву при ударе.
ent-RitesHand = аура кровавых обрядов
.desc = Впитывает кровь из всего, к чему прикасается. При ударе по культистам и конструктам может исцелить их. Используйте в руке, чтобы провести продвинутый обряд.
ent-ShadowShackles = теневые оковы
.desc = Оковы, сковывающие запястья с помощью зловещей магии.

11
Resources/Locale/ru-RU/_white/cult/messages.ftl
View File

@@ -1,3 +1,12 @@
cult-stun-component-extra-message = [color=darkgray]Выбросите ауру, чтобы навсегда избавиться от неё.[/color]
cult-hand-component-extra-message = [color=darkgray]Выбросите ауру, чтобы навсегда избавиться от неё.[/color]
cult-magic-holy = Сила священного предмета в руках цели препятствует магии!
cult-magic-no-empty-hand = Вам нужна свободная рука для использования заклинания!
cult-rites-examine = [color=darkred]Всего высосано крови: { $blood }.[/color]
cult-rites-message = Всего высосано крови: { $blood }.
cult-rites-dead = Цель мертва.
cult-rites-heal-no-blood = Нет крови для лечения.
cult-rites-already-healed = Он не имеет повреждений.
cult-rites-after-heal = Осталось крови: { $blood }.
cult-rites-no-blood = Для обряда необходимо высосать { $required } крови с помощью заклинания Кровавые Обряды. Всего высосано: { $blood }.
cult-rites-no-hand = Вам нужна свободная рука для обряда.

5
Resources/Locale/ru-RU/_white/cult/verb.ftl
View File

@@ -7,8 +7,3 @@ verb-spell-create-too-much = Начертите руну могущества,
verb-spell-remove-text = Удалить заклинание крови
verb-spell-remove-message = Убрать любое из созданных заклинаний крови.
verb-spell-remove-no-spells = Заклинания крови отсутствуют.
verb-blood-rites-text = Кровавые обряды
verb-blood-rites-message = Всего высосано крови: { $blood }.
verb-blood-rites-no-blood = Для обряда необходимо высосать { $required } крови с помощью заклинания Кровавые Обряды. Всего высосано: { $blood }.
verb-blood-rites-no-hand = Вам нужна свободная рука для обряда.

6
Resources/Locale/ru-RU/_white/white-shit.ftl
View File

@@ -1,4 +1,4 @@
# Cult
# Cult
ent-CultBola = магическая { ent-Bola }
.desc = { ent-Bola.desc }
@@ -8,3 +8,7 @@ ent-CultBola = магическая { ent-Bola }
ent-EnergyBola = энергобола
.desc = Соверешенное слияние технологии и справедливости для отлова преступников.
action-name-insert-self = Залезть внутрь.
action-name-insert-other = Засунуть внутрь.
carry-start = { $carrier } пытается взять вас на руки!

18
Resources/Prototypes/Entities/Effects/rcd.yml
View File

@@ -1,4 +1,4 @@
- type: entity
- type: entity
id: EffectRCDBase
abstract: true
noSpawn: true
@@ -15,7 +15,7 @@
tags:
- HideContextMenu
- type: AnimationPlayer
- type: entity
parent: EffectRCDBase
id: EffectRCDDeconstructPreview
@@ -23,7 +23,7 @@
components:
- type: Sprite
state: deconstructPreview
- type: entity
parent: EffectRCDBase
id: EffectRCDConstruct0
@@ -33,7 +33,7 @@
state: construct0
- type: TimedDespawn
lifetime: 1.2
- type: entity
parent: EffectRCDBase
id: EffectRCDConstruct1
@@ -43,7 +43,7 @@
state: construct1
- type: TimedDespawn
lifetime: 2.2
- type: entity
parent: EffectRCDBase
id: EffectRCDConstruct2
@@ -53,7 +53,7 @@
state: construct2
- type: TimedDespawn
lifetime: 3.2
- type: entity
parent: EffectRCDBase
id: EffectRCDConstruct3
@@ -63,7 +63,7 @@
state: construct3
- type: TimedDespawn
lifetime: 4.2
- type: entity
parent: EffectRCDBase
id: EffectRCDConstruct4
@@ -83,7 +83,7 @@
state: deconstruct2
- type: TimedDespawn
lifetime: 3.2
- type: entity
parent: EffectRCDBase
id: EffectRCDDeconstruct4
@@ -112,4 +112,4 @@
- type: Sprite
state: deconstruct8
- type: TimedDespawn
lifetime: 9.2
lifetime: 9.2

2
Resources/Prototypes/Entities/Mobs/Species/base.yml
View File

@@ -235,8 +235,6 @@
type: SpellSelectorBUI
- key: enum.CultEmpowerRemoveUiKey.Key
type: SpellRemoverBUI
- key: enum.BloodRitesUi.Key
type: CultistFactoryBUI
# WD-EDIT END
- type: Puller
- type: Butcherable

8
Resources/Prototypes/Entities/Objects/Tools/tools.yml
View File

@@ -524,6 +524,14 @@
- MailingUnit
- ToiletEmpty
- type: entity # WD
id: RapidPipeDispenserEmpty
parent: RapidPipeDispenser
suffix: Empty
components:
- type: LimitedCharges
charges: 0
- type: entity
id: RCDRecharging
parent: RCD

1
Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
View File

@@ -766,6 +766,7 @@
normalState: normal-unshaded
ejectState: eject-unshaded
denyState: deny-unshaded
priceMultiplier: 0.0
- type: Sprite
sprite: Structures/Machines/VendingMachines/engivend.rsi
layers:

10
Resources/Prototypes/Recipes/Construction/utilities.yml
View File

@@ -394,7 +394,7 @@
targetNode: half
category: construction-category-utilities
placementMode: SnapgridCenter
canBuildInImpassable: false
canBuildInImpassable: true
icon:
sprite: Structures/Piping/Atmospherics/pipe.rsi
state: pipeHalf
@@ -408,7 +408,7 @@
targetNode: straight
category: construction-category-utilities
placementMode: SnapgridCenter
canBuildInImpassable: false
canBuildInImpassable: true
icon:
sprite: Structures/Piping/Atmospherics/pipe.rsi
state: pipeStraight
@@ -422,7 +422,7 @@
targetNode: bend
category: construction-category-utilities
placementMode: SnapgridCenter
canBuildInImpassable: false
canBuildInImpassable: true
icon:
sprite: Structures/Piping/Atmospherics/pipe.rsi
state: pipeBend
@@ -436,7 +436,7 @@
targetNode: tjunction
category: construction-category-utilities
placementMode: SnapgridCenter
canBuildInImpassable: false
canBuildInImpassable: true
icon:
sprite: Structures/Piping/Atmospherics/pipe.rsi
state: pipeTJunction
@@ -450,7 +450,7 @@
targetNode: fourway
category: construction-category-utilities
placementMode: SnapgridCenter
canBuildInImpassable: false
canBuildInImpassable: true
icon:
sprite: Structures/Piping/Atmospherics/pipe.rsi
state: pipeFourway

1
Resources/Prototypes/_White/Actions/cult_actions.yml
View File

@@ -123,7 +123,6 @@
sprite: /Textures/White/Cult/actions_cult.rsi
state: blood_rites
event: !type:CultBloodRitesInstantActionEvent
speech: "Fel'th Dol Ab'orod!"
charges: 5
temporary: true
removeOnNoCharges: true

30
Resources/Prototypes/_White/Entities/Cult/Effects/effects.yml
View File

@@ -1,13 +1,11 @@
- type: entity
id: CultTileSpawnEffect
name: Sparkle
id: CultTileEffect
name: cult tile effect
placement:
mode: SnapgridCenter
components:
# Animation is like 3 something seconds so we just need to despawn it before then.
- type: TimedDespawn
lifetime: 0.5
- type: EvaporationSparkle
- type: Transform
noRot: true
anchored: true
@@ -19,6 +17,14 @@
netsync: false
drawdepth: FloorObjects
color: "#FF0000"
- type: entity
parent: CultTileEffect
id: CultTileSpawnEffect
name: cult tile glow
placement:
mode: SnapgridCenter
components:
- type: PointLight
color: "#FF0000"
@@ -26,10 +32,8 @@
id: CultTeleportInEffect
name: Teleport in
components:
# Animation is like 3 something seconds so we just need to despawn it before then.
- type: TimedDespawn
lifetime: 0.8
- type: EvaporationSparkle
- type: Transform
noRot: true
anchored: true
@@ -47,10 +51,8 @@
id: CultTeleportOutEffect
name: Teleport out
components:
# Animation is like 3 something seconds so we just need to despawn it before then.
- type: TimedDespawn
lifetime: 0.8
- type: EvaporationSparkle
- type: Transform
noRot: true
anchored: true
@@ -70,7 +72,6 @@
components:
- type: TimedDespawn
lifetime: 1
- type: EvaporationSparkle
- type: Transform
noRot: true
anchored: true
@@ -90,7 +91,6 @@
components:
- type: TimedDespawn
lifetime: 1
- type: EvaporationSparkle
- type: Transform
noRot: true
anchored: true
@@ -118,3 +118,13 @@
duration: 0.5
- type: TimedDespawn
lifetime: 0.5
- type: entity
parent: EffectRCDBase
id: EffectConstructRed
noSpawn: true
components:
- type: Sprite
state: construct_red
- type: TimedDespawn
lifetime: 5.2

74
Resources/Prototypes/_White/Entities/Cult/Items/hands.yml Normal file
View File

@@ -0,0 +1,74 @@
- type: entity
parent: BaseItem
id: BaseCultHand
abstract: true
noSpawn: true
name: magical aura
description: A sinister looking aura that distorts the flow of reality around it.
components:
- type: Item
size: Ginormous
- type: MeleeWeapon
canHeavyAttack: false
canMiss: false
attackRate: 2
wideAnimationRotation: 180
damage:
types:
Heat: 0
- type: DeleteOnDropAttempt
message: cult-hand-component-extra-message
- type: Unremoveable
deleteOnDrop: true
- type: CultItem
canPickUp: false
- type: entity
parent: BaseCultHand
id: StunHand
name: stunning aura
description: Will stun and mute a weak-minded victim on hit.
components:
- type: Sprite
sprite: White/Cult/Entities/stun.rsi
state: icon
- type: Item
sprite: White/Cult/Entities/stun.rsi
- type: MeleeWeapon
canAttackSelf: false
attackWhitelist:
components:
- StatusEffects
attackBlacklist:
components:
- Cultist
- Construct
- type: CultStunHand
speech: "Fuu ma'jin!"
- type: entity
parent: BaseCultHand
id: RitesHand
name: blood rite aura
description: Absorbs blood from anything you touch. Touching cultists and constructs can heal them. Use in-hand to cast an advanced rite.
components:
- type: Sprite
sprite: White/Cult/Entities/rites.rsi
state: icon
- type: Item
sprite: White/Cult/Entities/rites.rsi
- type: MeleeWeapon
attackWhitelist:
components:
- Cultist
- Construct
- type: CultRitesHand
speech: "Fel'th Dol Ab'orod!"
- type: ActivatableUI
key: enum.BloodRitesUi.Key
inHandsOnly: true
closeOnHandDeselect: true
- type: UserInterface
interfaces:
- key: enum.BloodRitesUi.Key
type: CultistFactoryBUI

34
Resources/Prototypes/_White/Entities/Cult/Items/stun_hand.yml
View File

@@ -1,34 +0,0 @@
- type: entity
parent: BaseItem
id: StunHand
name: stunning aura
description: Will stun and mute a weak-minded victim on hit.
components:
- type: Sprite
sprite: White/Cult/Entities/stun.rsi
state: icon
- type: Item
size: Ginormous
sprite: White/Cult/Entities/stun.rsi
- type: MeleeWeapon
canHeavyAttack: false
canAttackSelf: false
canMiss: false
attackWhitelist:
components:
- StatusEffects
attackBlacklist:
components:
- Cultist
- Construct
wideAnimationRotation: 180
damage:
types:
Heat: 0
- type: CultStunHand
- type: DeleteOnDropAttempt
message: cult-stun-component-extra-message
- type: Unremoveable
deleteOnDrop: true
- type: CultItem
canPickUp: false

5
Resources/Prototypes/_White/Entities/Cult/Runes/cult_runes.yml
View File

@@ -30,6 +30,7 @@
- type: Appearance
- type: CultRuneBase
invokePhrase: "Qu'laris ver'don, thal'sorin mik'thar!"
gatherInvokers: false
- type: CultRuneBuff
- type: CultRune
- type: Concealable
@@ -47,6 +48,8 @@
color: '#F80000'
- type: Appearance
- type: CultRuneBase
invokePhrase: "H'drak v'loso, mir'kanas verbot!"
gatherInvokers: false
- type: CultEmpower
isRune: true
- type: UserInterface
@@ -55,7 +58,6 @@
type: SpellSelectorBUI
- type: CultRune
- type: Concealable
examinableWhileConcealed: true
- type: entity
parent: CollideRune
@@ -91,7 +93,6 @@
- type: Appearance
- type: CultRuneBase
invokePhrase: "N'ath reth sh'yro eth d'rekkathnor!"
gatherInvokers: true
- type: CultRuneSummoning
- type: CultRune
- type: Concealable

10
Resources/Prototypes/_White/Entities/Cult/constructs.yml
View File

@@ -7,8 +7,8 @@
context: "human"
- type: InputMover
- type: MovementSpeedModifier
baseWalkSpeed: 2.5
baseSprintSpeed: 2.5
baseWalkSpeed: 3
baseSprintSpeed: 3
- type: DamageOnHighSpeedImpact
damage:
types:
@@ -61,6 +61,8 @@
- type: ContentEye
- type: Actions
- type: Hands
- type: Puller
needsHands: false
- type: ShowCultHud
- type: IsDeadIC
- type: NightVision
@@ -138,8 +140,6 @@
baseWalkSpeed: 3
baseSprintSpeed: 3
- type: MovementIgnoreGravity
- type: Puller
needsHands: false
- type: MeleeWeapon
canHeavyAttack: false
hidden: true
@@ -202,8 +202,6 @@
150: Dead
- type: Sprite
state: harvester
- type: Puller
needsHands: false
- type: MeleeWeapon
canHeavyAttack: false
hidden: true

3
Resources/Prototypes/_White/Mobs/Species/felinid.yml
View File

@@ -143,6 +143,9 @@
min: 0.74
max: 0.85
starting: 0.8
- type: Carriable
doAfterLength: 2
- type: PseudoItem
- type: entity
save: false

2
Resources/Prototypes/_White/Mobs/Species/harpy.yml
View File

@@ -45,8 +45,6 @@
type: SpellSelectorBUI
- key: enum.CultEmpowerRemoveUiKey.Key
type: SpellRemoverBUI
- key: enum.BloodRitesUi.Key
type: CultistFactoryBUI
# WD-EDIT END
- type: Sprite
scale: 0.9, 0.9

42
Resources/Prototypes/_White/RPD/rpd.yml
View File

@@ -10,7 +10,7 @@
prototype: GasPipeStraight
cost: 1
delay: 0
collisionMask: InteractImpassable
collisionMask: None
rules:
- MustBuildOnSubfloor
rotation: User
@@ -26,7 +26,7 @@
prototype: GasPipeBend
cost: 1
delay: 0
collisionMask: InteractImpassable
collisionMask: None
rules:
- MustBuildOnSubfloor
rotation: User
@@ -42,7 +42,7 @@
prototype: GasPipeTJunction
cost: 1
delay: 0
collisionMask: InteractImpassable
collisionMask: None
rules:
- MustBuildOnSubfloor
rotation: User
@@ -58,7 +58,7 @@
prototype: GasPipeFourway
cost: 1
delay: 0
collisionMask: InteractImpassable
collisionMask: None
rules:
- MustBuildOnSubfloor
rotation: User
@@ -270,7 +270,7 @@
prototype: DisposalPipe
cost: 1
delay: 0
collisionMask: InteractImpassable
collisionMask: None
rules:
- MustBuildOnSubfloor
rotation: User
@@ -286,7 +286,7 @@
prototype: DisposalBend
cost: 1
delay: 0
collisionMask: InteractImpassable
collisionMask: None
rules:
- MustBuildOnSubfloor
rotation: User
@@ -302,7 +302,7 @@
prototype: DisposalJunction
cost: 1
delay: 0
collisionMask: InteractImpassable
collisionMask: None
rules:
- MustBuildOnSubfloor
rotation: User
@@ -318,7 +318,7 @@
prototype: DisposalJunctionFlipped
cost: 1
delay: 0
collisionMask: InteractImpassable
collisionMask: None
rules:
- MustBuildOnSubfloor
rotation: User
@@ -334,7 +334,7 @@
prototype: DisposalYJunction
cost: 1
delay: 0
collisionMask: InteractImpassable
collisionMask: None
rules:
- MustBuildOnSubfloor
rotation: User
@@ -350,7 +350,7 @@
prototype: DisposalRouter
cost: 1
delay: 0
collisionMask: InteractImpassable
collisionMask: None
rules:
- MustBuildOnSubfloor
rotation: User
@@ -366,7 +366,7 @@
prototype: DisposalRouterFlipped
cost: 1
delay: 0
collisionMask: InteractImpassable
collisionMask: None
rules:
- MustBuildOnSubfloor
rotation: User
@@ -382,7 +382,7 @@
prototype: DisposalTagger
cost: 1
delay: 0
collisionMask: InteractImpassable
collisionMask: None
rules:
- MustBuildOnSubfloor
rotation: User
@@ -398,7 +398,7 @@
prototype: DisposalSignalRouter
cost: 1
delay: 0
collisionMask: InteractImpassable
collisionMask: None
rules:
- MustBuildOnSubfloor
rotation: User
@@ -414,7 +414,7 @@
prototype: DisposalSignalRouterFlipped
cost: 1
delay: 0
collisionMask: InteractImpassable
collisionMask: None
rules:
- MustBuildOnSubfloor
rotation: User
@@ -430,7 +430,7 @@
prototype: DisposalTrunk
cost: 1
delay: 0
collisionMask: InteractImpassable
collisionMask: None
rules:
- MustBuildOnSubfloor
rotation: User
@@ -447,10 +447,10 @@
mode: ConstructObject
prototype: DisposalUnit
cost: 2
delay: 1
delay: 2
collisionMask: InteractImpassable
rotation: User
fx: EffectRCDConstruct1
fx: EffectRCDConstruct2
- type: rcd
id: MailingUnit
@@ -461,10 +461,10 @@
mode: ConstructObject
prototype: MailingUnit
cost: 2
delay: 1
delay: 2
collisionMask: InteractImpassable
rotation: User
fx: EffectRCDConstruct1
fx: EffectRCDConstruct2
- type: rcd
id: ToiletEmpty
@@ -475,8 +475,8 @@
mode: ConstructObject
prototype: ToiletEmpty
cost: 2
delay: 1
delay: 2
collisionMask: InteractImpassable
rotation: User
fx: EffectRCDConstruct1
fx: EffectRCDConstruct2

12
Resources/Prototypes/_White/Recipes/lathe_recipes.yml
View File

@@ -170,16 +170,16 @@
- type: latheRecipe
id: RapidPipeDispenserRecipe
result: RapidPipeDispenser
result: RapidPipeDispenserEmpty
completetime: 1
materials:
Steel: 300
Glass: 300
Steel: 500
Glass: 500
- type: latheRecipe
id: RCDRecipe
result: RCD
result: RCDEmpty
completetime: 1
materials:
Steel: 300
Glass: 300
Steel: 500
Glass: 500

BIN
Resources/Textures/Effects/rcd.rsi/construct_red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

69
Resources/Textures/Effects/rcd.rsi/meta.json
View File

@@ -25,7 +25,7 @@
0.1
]
]
},
},
{
"name": "construct1",
"delays": [
@@ -64,7 +64,7 @@
0.1
]
]
},
},
{
"name": "construct2",
"delays": [
@@ -201,7 +201,66 @@
0.1
]
]
},
},
{
"name": "construct_red",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "deconstruct2",
"delays": [
@@ -358,7 +417,7 @@
0.1
]
]
},
},
{
"name": "deconstruct8",
"delays": [
@@ -451,7 +510,7 @@
0.05,
0.05,
0.05,
0.05
0.05
]
]
}

BIN
Resources/Textures/White/Cult/Entities/rites.rsi/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 665 B

BIN
Resources/Textures/White/Cult/Entities/rites.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 543 B

BIN
Resources/Textures/White/Cult/Entities/rites.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 554 B

66
Resources/Textures/White/Cult/Entities/rites.rsi/meta.json Normal file
View File

@@ -0,0 +1,66 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/d0dffe7ca643db2624424fdcebf45863f85c0448",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4,
"delays": [
[
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1
]
]
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1
]
]
}
]
}

BIN
Resources/Textures/White/Cult/Entities/stun.rsi/inhand-left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 845 B

After

Width:  |  Height:  |  Size: 508 B

BIN
Resources/Textures/White/Cult/Entities/stun.rsi/inhand-right.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 843 B

After

Width:  |  Height:  |  Size: 504 B