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

Культ плоти #871

Merged
merged 6 commits into from
Jan 1, 2025
Merged

Культ плоти #871

merged 6 commits into from
Jan 1, 2025

Conversation

VigersRay
Copy link
Collaborator

@VigersRay VigersRay commented Dec 16, 2024

Кратное описание

Что нужно доделать:

  • Скрытие ног при модификации паучих ног.

Проверки

  • Я не требую помощи для завершения PR
  • Перед выкладыванием/запросом о рассмотрении PR, Я проверил работоспособность изменений.
  • Я добавил скриншоты/видео изменений, или данный PR не меняет внутриигровые механики

Changelog

🆑 VigersRay

  • add: Добавлен режим культа плоти.

Copy link
Contributor

github-actions bot commented Dec 16, 2024

RSI Diff Bot; head commit f245c19 merging into f849696
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_Sunrise/FleshCult/FleshBodyMods/flesh_armor.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_Sunrise/FleshCult/FleshBodyMods/flesh_spider.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/_Sunrise/FleshCult/FleshBodyMods/heavy_flesh_armor.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_Sunrise/FleshCult/FleshBodyMods/heavy_flesh_helmet.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_Sunrise/FleshCult/FleshHandMods/flesh_blade.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Sunrise/FleshCult/FleshHandMods/flesh_claw.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Sunrise/FleshCult/FleshHandMods/flesh_fist.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Sunrise/FleshCult/FleshHandMods/flesh_spike_hand.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Sunrise/FleshCult/Interface/Alerts/flesh_point.rsi

State Old New Status
flesh_point0 Added
flesh_point1 Added
flesh_point10 Added
flesh_point11 Added
flesh_point12 Added
flesh_point13 Added
flesh_point14 Added
flesh_point15 Added
flesh_point16 Added
flesh_point2 Added
flesh_point3 Added
flesh_point4 Added
flesh_point5 Added
flesh_point6 Added
flesh_point7 Added
flesh_point8 Added
flesh_point9 Added

Resources/Textures/_Sunrise/FleshCult/Interface/flesh_icon.rsi

State Old New Status
Flesh Added

Resources/Textures/_Sunrise/FleshCult/flesh_cult_mobs.rsi

State Old New Status
ball Added
ball_dead Added
bat Added
bat_dead Added
fleshhugger-equipped-MASK Added
fleshhugger Added
fleshhugger_dead Added
small_worm Added
small_worm_dead Added
spider Added
spider_dead Added
worm Added
worm_dead Added

Resources/Textures/_Sunrise/FleshCult/flesh_cult_pudge.rsi

State Old New Status
alive Added
dead Added

Resources/Textures/_Sunrise/FleshCult/flesh_heart.rsi

State Old New Status
base_heart Added
final_heart Added

Resources/Textures/_Sunrise/FleshCult/flesh_projectiles.rsi

State Old New Status
spike Added

Resources/Textures/_Sunrise/FleshCult/flesh_tile.rsi

State Old New Status
flesh_11 Added
flesh_12 Added
flesh_13 Added

Resources/Textures/_Sunrise/FleshCult/flesh_toxic.rsi

State Old New Status
flesh_toxic Added

Resources/Textures/_Sunrise/FleshCult/flesh_wall.rsi

State Old New Status
flesh0 Added
flesh1 Added
flesh2 Added
flesh3 Added
flesh4 Added
flesh5 Added
flesh6 Added
flesh7 Added
full Added

Resources/Textures/_Sunrise/FleshCult/fleshspiderweb.rsi

State Old New Status
spider_web_1 Added
spider_web_2 Added

Edit: diff updated after f245c19

@kaworu177
Copy link

Ура

Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

# Conflicts:
#	Resources/Prototypes/ai_factions.yml
@VigersRay VigersRay marked this pull request as ready for review December 31, 2024 17:43
# Conflicts:
#	Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
@VigersRay VigersRay merged commit 6304ac7 into master Jan 1, 2025
11 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants