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.

Sign up for GitHub

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

Jump to bottom

The Blood Cult #1001

Draft
wants to merge 19 commits into
base: master
Choose a base branch
from
Draft

The Blood Cult #1001

wants to merge 19 commits into from

Conversation

Remuchi
Copy link
Contributor

@Remuchi Remuchi commented Oct 2, 2024 •
edited
Loading

Description

Adds a new game mode - The Blood Cult.
Hail to Nar'Sie!

TODO

  • Gamemode
  • Roles
  • Runes
  • Constructs
  • Structures
    • Forge
    • Archives
    • Altar
    • Pylon
      • Structure
      • Placement System
    • Airlocks
      • Repulsor system
    • Construction system
  • Items
    • Eldritch Whetstone
    • Construct Shell
    • Flask of Unholy Water
    • True Nar'sian Hardened Armor
    • Flagellant's Robe
    • Eldritch Longsword
    • Zealot's Blindfold
      • Night vision system
    • Shuttle Curse
    • Veil Shifter
    • Void Torch
  • Reagents
    • Holy Water
    • Unholy Water
  • Actions
  • Cult leader selection system
  • Rending/Apocalypse rune placement markers
    EXTRA:
  • Spirit Realm rune
  • Eldritch language
  • Conceal magic
  • Ru locale

Media

Example Media Embed

Changelog

🆑

  • add: Added Blood Cult Gamemode.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Oct 2, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 2, 2024

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

@github-actions github-actions bot added Changes: Audio Changes any ogg files Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Oct 2, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 2, 2024 •
edited
Loading

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

Resources/Textures/WhiteDream/BloodCult/Effects/airlock_glow.rsi

State Old New Status
doorglow Added

Resources/Textures/WhiteDream/BloodCult/Effects/blood_boil.rsi

State Old New Status
bullet Added

Resources/Textures/WhiteDream/BloodCult/Effects/cult_in_out.rsi

State Old New Status
cult_in Added
cult_out Added

Resources/Textures/WhiteDream/BloodCult/Effects/pentagram.rsi

State Old New Status
halo1 Added
halo2 Added
halo3 Added
halo4 Added
halo5 Added
halo6 Added

Resources/Textures/WhiteDream/BloodCult/Effects/tiles_spawn.rsi

State Old New Status
floorglow Added

Resources/Textures/WhiteDream/BloodCult/Effects/wall_glow.rsi

State Old New Status
wallglow Added

Resources/Textures/WhiteDream/BloodCult/Entities/Clothes/Helmet/cult_helmet.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/WhiteDream/BloodCult/Entities/Clothes/Helmet/cult_hood.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/WhiteDream/BloodCult/Entities/Clothes/Outer/cult_armor.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/WhiteDream/BloodCult/Entities/Clothes/Outer/cult_robe.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/WhiteDream/BloodCult/Entities/Items/Weapons/cult_blade.rsi

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

Resources/Textures/WhiteDream/BloodCult/Entities/Items/Weapons/cult_spear.rsi

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

Resources/Textures/WhiteDream/BloodCult/Entities/Items/arcane_barrage.rsi

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

Resources/Textures/WhiteDream/BloodCult/Entities/Items/blood_spear.rsi

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

Resources/Textures/WhiteDream/BloodCult/Entities/Items/bola.rsi

State Old New Status
icon Added

Resources/Textures/WhiteDream/BloodCult/Entities/Items/construct_shell.rsi

State Old New Status
icon Added

Resources/Textures/WhiteDream/BloodCult/Entities/Items/mirror_shield.rsi

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

Resources/Textures/WhiteDream/BloodCult/Entities/Items/rites.rsi

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

Resources/Textures/WhiteDream/BloodCult/Entities/Items/shuttle_curse.rsi

State Old New Status
icon Added

Resources/Textures/WhiteDream/BloodCult/Entities/Items/soul_stone.rsi

State Old New Status
soul_stone Added
soul_stone_blessed Added
soul_stone_glow Added

Resources/Textures/WhiteDream/BloodCult/Entities/Items/stun.rsi

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

Resources/Textures/WhiteDream/BloodCult/Entities/Items/veil_shifter.rsi

State Old New Status
icon Added
icon_off Added

Resources/Textures/WhiteDream/BloodCult/Entities/Items/void_torch.rsi

State Old New Status
icon Added
icon_off Added
lit-inhand-left Added
lit-inhand-right Added
unlit-inhand-left Added
unlit-inhand-right Added

Resources/Textures/WhiteDream/BloodCult/Entities/Items/whetstone_cult.rsi

State Old New Status
icon Added
icon_off Added

Resources/Textures/WhiteDream/BloodCult/Entities/Runes/apocalypse.rsi

State Old New Status
icon Added

Resources/Textures/WhiteDream/BloodCult/Entities/Runes/dimensional_rending.rsi

State Old New Status
rune Added
rune_animated Added

Resources/Textures/WhiteDream/BloodCult/Entities/Runes/regular.rsi

State Old New Status
barrier Added
blood_boil Added
empower Added
offering Added
revive Added
spirit_realm Added
strength Added
summon Added
teleport Added

Resources/Textures/WhiteDream/BloodCult/Entities/Structures/Concealed/cult.rsi

State Old New Status
cult0 Added
cult1 Added
cult2 Added
cult3 Added
cult4 Added
cult5 Added
cult6 Added
cult7 Added
full Added

Resources/Textures/WhiteDream/BloodCult/Entities/Structures/Concealed/cult_airlock.rsi

State Old New Status
assembly Added
closed Added
closing Added
open Added
opening Added

Resources/Textures/WhiteDream/BloodCult/Entities/Structures/Concealed/cult_girder.rsi

State Old New Status
cultgirder Added

Resources/Textures/WhiteDream/BloodCult/Entities/Structures/altar.rsi

State Old New Status
icon Added
icon_off Added

Resources/Textures/WhiteDream/BloodCult/Entities/Structures/archives.rsi

State Old New Status
icon Added
icon_off Added

Resources/Textures/WhiteDream/BloodCult/Entities/Structures/barrier.rsi

State Old New Status
barrier Added

Resources/Textures/WhiteDream/BloodCult/Entities/Structures/cult_airlock.rsi

State Old New Status
assembly Added
closed Added
closing Added
open Added
opening Added

Resources/Textures/WhiteDream/BloodCult/Entities/Structures/cult_girder.rsi

State Old New Status
icon Added

Resources/Textures/WhiteDream/BloodCult/Entities/Structures/cult_shield.rsi

State Old New Status
icon Added

Resources/Textures/WhiteDream/BloodCult/Entities/Structures/forge.rsi

State Old New Status
icon Added
icon_off Added

Resources/Textures/WhiteDream/BloodCult/Entities/Structures/pylon.rsi

State Old New Status
icon Added
icon_off Added

Edit: diff updated after 8bdf5b4

@VMSolidus
Merge branch 'master' into feature/blood-cult
aa3af0c 
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Oct 3, 2024
@Remuchi
feat: runed door and pylon construction hijack
7f1ba25
@Remuchi
Merge branch 'feature/blood-cult' of https://github.com/Remuchi/Einst…
e290009 
…ein-Engines into feature/blood-cult
@Remuchi
feat: cult structures construction
8d38d90 
Signed-off-by: Remuchi <RemuchiOfficial@gmail.com>
@Remuchi
feat: shades
cab38bb 
Signed-off-by: Remuchi <RemuchiOfficial@gmail.com>
@Remuchi
feat: eldritch longsword, true cult armor and robe
b0a66e3 
Signed-off-by: Remuchi <RemuchiOfficial@gmail.com>
@Remuchi
feat: whetstone and shuttle curse
82eee92 
Signed-off-by: Remuchi <RemuchiOfficial@gmail.com>
@Remuchi
feat: holy water deconverts cultists
37bb7a3 
Signed-off-by: Remuchi <RemuchiOfficial@gmail.com>
@whateverusername0
Copy link
Contributor

Can you believe it guys? Mah'weyh pleggh at e'ntrath! Just a week away!

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Oct 14, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

1 similar comment
@github-actions GitHub Actions
Copy link
Contributor

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

@Remuchi
Merge remote-tracking branch 'upstream/master' into feature/blood-cult
626e6e6 
# Conflicts:
#	Content.Server/UserInterface/ActivatableUISystem.cs
#	Content.Shared/Alert/AlertType.cs
#	Content.Shared/UserInterface/ActivatableUIComponent.cs
#	Resources/Prototypes/Reagents/medicine.yml
@Remuchi
feat: void torch, veil shifter and blindfolds
5b6981b 
Signed-off-by: Remuchi <RemuchiOfficial@gmail.com>
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Oct 20, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Oct 20, 2024
@Remuchi
Merge remote-tracking branch 'upstream/master' into feature/blood-cult
f5b7dd9 
# Conflicts:
#	Content.Client/RadialSelector/RadialSelectorMenuBUI.cs
#	Content.Client/ShortConstruction/UI/ShortConstructionMenuBUI.cs
@Remuchi
fix: unshittify pylon construction
08d2de3
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Oct 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Remuchi Remuchi

Labels
Changes: Audio Changes any ogg files Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Holy Shit
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Remuchi @whateverusername0 @FoxxoTrystan @VMSolidus