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

Новый антагонист: Вампиры #560

Merged
merged 74 commits into from
Oct 31, 2024
Merged
Changes from 1 commit
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
a092bad
Initial Commit
Rainfey Jan 9, 2024
76517c5
Unfinished
Rainfey Jan 11, 2024
793cbbc
Continuing, more abilities
Rainfey Jan 13, 2024
bd047c0
Remove necromicon healing
Rainfey Jan 13, 2024
bf66e69
oops
Rainfey Jan 13, 2024
adfdfb6
Continuing
Rainfey Jan 17, 2024
ca250a4
Continuing
Rainfey Jan 18, 2024
c862f3a
Checkpoint incase i need to undo something
Rainfey Jan 19, 2024
da2504f
Rewrite to use event per power, working passives
Rainfey Jan 20, 2024
7b18f77
Merge branch 'feature-vampires' of https://github.com/Rainfey/space-s…
Rinary1 Oct 28, 2024
bb545ed
refactor fixes
Rinary1 Oct 29, 2024
c629c50
so many fixes
Rinary1 Oct 29, 2024
9a37308
some fixes
Rinary1 Oct 29, 2024
2f5a98d
some fixes
Rinary1 Oct 29, 2024
e936beb
new textures, status icon
Rinary1 Oct 29, 2024
e4fd88d
vampire antag role, mind role
Rinary1 Oct 29, 2024
4561703
проверку на дауна вызывали?(если Null, у сервера ступор головного фат…
Rinary1 Oct 29, 2024
5d6c769
fix 1
Rinary1 Oct 29, 2024
bbb21f7
fix 2
Rinary1 Oct 29, 2024
6bbe4f7
fix fatal, fix build
Rinary1 Oct 29, 2024
52079be
breafing audio
Rinary1 Oct 29, 2024
e38c10e
fix icons style, store in action
Rinary1 Oct 29, 2024
0154ebe
clear store things, add gamerule, mid round game rule
Rinary1 Oct 29, 2024
f97e23b
some rework
Rinary1 Oct 29, 2024
e0354cb
clear any store systems
Rinary1 Oct 29, 2024
41e178f
clear x2
Rinary1 Oct 29, 2024
c8c0a9e
if you have 150 Blood Essence, you get mutation
Rinary1 Oct 29, 2024
b8f01f3
upd
Rinary1 Oct 29, 2024
7a030fe
some changes
Rinary1 Oct 29, 2024
f4a9487
simple mutation menu
Rinary1 Oct 29, 2024
92bbdbd
я вот сижу, в 12 ночи, пишу какую-то очередную хуйню, вместо приятног…
Rinary1 Oct 29, 2024
0b8f929
upd
Rinary1 Oct 30, 2024
6ed4298
Merge branch 'space-sunrise:master' into Vampires
Rinary1 Oct 30, 2024
8146612
Merge branch 'space-sunrise:master' into Vampires
Rinary1 Oct 30, 2024
54e4693
Merge branch 'master' of https://github.com/space-sunrise/space-stati…
Rinary1 Oct 30, 2024
2da2635
Merge branch 'master' of https://github.com/space-sunrise/space-stati…
Rinary1 Oct 30, 2024
3078ab0
normal mutations menu
Rinary1 Oct 30, 2024
25bdcc0
actions translate
Rinary1 Oct 30, 2024
16647a0
None type, base actions list
Rinary1 Oct 30, 2024
4b0e8be
passive abilities
Rinary1 Oct 30, 2024
9d02cca
ability earning
Rinary1 Oct 30, 2024
389059e
fix
Rinary1 Oct 30, 2024
21fb36b
translate vampire preset
Rinary1 Oct 30, 2024
0407ccf
translate vampire mutations menu
Rinary1 Oct 30, 2024
f270cdd
mutations menu textures
Rinary1 Oct 30, 2024
6191618
disable some
Rinary1 Oct 30, 2024
7818f28
ДРАНЫЙ БРИФ ФАТАЛКУ ПО ПРИКОЛУ БЕЕМ
Rinary1 Oct 30, 2024
5ddc73b
game preset
Rinary1 Oct 30, 2024
7d3eb64
Merge branch 'space-sunrise:master' into Vampires
Rinary1 Oct 30, 2024
059fab5
mutation can infinity changed
Rinary1 Oct 30, 2024
a617f77
fix
Rinary1 Oct 30, 2024
13c2220
fully rework abilities update system
Rinary1 Oct 30, 2024
74a6cb3
gargantua info
Rinary1 Oct 30, 2024
32eff4b
Merge branch 'master' of https://github.com/space-sunrise/space-stati…
Rinary1 Oct 31, 2024
0863cfe
update ignore list
Rinary1 Oct 31, 2024
c69424c
fix gargantua passives
Rinary1 Oct 31, 2024
7292014
vampire objectives
Rinary1 Oct 31, 2024
bf3df63
new icons
Rinary1 Oct 31, 2024
09578c2
balance
Rinary1 Oct 31, 2024
3b8cd68
fix
Rinary1 Oct 31, 2024
7978338
upd objectives
Rinary1 Oct 31, 2024
1228f0e
fix metabolizer type, balance 2
Rinary1 Oct 31, 2024
287eef4
fix metabolizer type 2
Rinary1 Oct 31, 2024
5fc2436
fix syntax
Rinary1 Oct 31, 2024
d65aaa7
clear translation
Rinary1 Oct 31, 2024
cc5aa4b
xd
Rinary1 Oct 31, 2024
c723b60
update
Rinary1 Oct 31, 2024
eae5ced
round end info
Rinary1 Oct 31, 2024
6259732
fix
Rinary1 Oct 31, 2024
4e1b597
drain objective fix
Rinary1 Oct 31, 2024
4110053
fix
Rinary1 Oct 31, 2024
6aeb741
fix syntax
Rinary1 Oct 31, 2024
0a1a9e5
fix
Rinary1 Oct 31, 2024
c24223a
clear
Rinary1 Oct 31, 2024
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
Prev Previous commit
Next Next commit
clear translation
Rinary1 committed Oct 31, 2024
commit d65aaa79f9fdd8e235ba6900cadce62dba0b26db
15 changes: 6 additions & 9 deletions Resources/Locale/ru-RU/_strings/Vampires/vampires.ftl
Original file line number Diff line number Diff line change
@@ -32,18 +32,15 @@ store-category-vampirepassives = Пассивные

#Powers

vampire-power-blessing = Blessing of Lilith
vampire-power-blessing-description = Swear your soul to Lilith, receive her blessing, and feast upon the bounty around you.

#Passives
vampire-passive-unholystrength = Unholy Strength
vampire-passive-unholystrength-description = Infuse your upper body muscles with essence, granting you claws and increased strength. Effect: 10 Slash per hit
vampire-passive-unholystrength = Нечестивая сила
vampire-passive-unholystrength-description = Наполните мышцы верхней части тела кровью, наделяя вас когтями и повышенной силой. Эффект: 10 порезов за удар

vampire-passive-supernaturalstrength = Supernatural Strength
vampire-passive-supernaturalstrength-description = Increase your upper body muscles strength further, no barrier shall stand in your way. Effect: 15 Slash per hit, able to pry open doors by hand.
vampire-passive-supernaturalstrength = Сверхъестественная сила
vampire-passive-supernaturalstrength-description = Увеличьте силу мышц верхней части тела, и ни одна преграда не встанет на вашем пути. Эффект: 15 порезов за удар, возможность открывать двери руками.

vampire-passive-deathsembrace = Deaths Embrace
vampire-passive-deathsembrace-description = Embrace death and it shall pass you over. Effect: Heal when in a coffin, automatically return to your coffin upon death for 100 blood essence.
vampire-passive-deathsembrace = Объятия смерти
vampire-passive-deathsembrace-description = Примите смерть, и она обойдет вас стороной. Эффект: исцеление в гробу, автоматическое возвращение в гроб после смерти за 100 эссенции крови.

#Mutation menu


Unchanged files with check annotations Beta

"CaptainIDVampireStealObjective",
"CaptainJetpackVampireStealObjective",
"CaptainGunVampireStealObjective"
}

Check failure on line 37 in Content.Server/GameTicking/Rules/Components/VampireRuleComponent.cs

GitHub Actions / Test Packaging

; expected

Check failure on line 37 in Content.Server/GameTicking/Rules/Components/VampireRuleComponent.cs

GitHub Actions / Test Packaging

; expected

Check failure on line 37 in Content.Server/GameTicking/Rules/Components/VampireRuleComponent.cs

GitHub Actions / build (ubuntu-latest)

; expected

Check failure on line 37 in Content.Server/GameTicking/Rules/Components/VampireRuleComponent.cs

GitHub Actions / build (ubuntu-latest)

; expected

Check failure on line 37 in Content.Server/GameTicking/Rules/Components/VampireRuleComponent.cs

GitHub Actions / YAML Linter

; expected

Check failure on line 37 in Content.Server/GameTicking/Rules/Components/VampireRuleComponent.cs

GitHub Actions / YAML Linter

; expected
}