-
Notifications
You must be signed in to change notification settings - Fork 136
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
The Blood Cult #1001
base: master
Are you sure you want to change the base?
The Blood Cult #1001
Conversation
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
RSI Diff Bot; head commit 8bdf5b4 merging into 85a770c Resources/Textures/WhiteDream/BloodCult/Effects/airlock_glow.rsi
Resources/Textures/WhiteDream/BloodCult/Effects/cult_in_out.rsi
Resources/Textures/WhiteDream/BloodCult/Effects/pentagram.rsi
Resources/Textures/WhiteDream/BloodCult/Effects/tiles_spawn.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Clothes/Helmet/cult_helmet.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Clothes/Helmet/cult_hood.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Clothes/Outer/cult_armor.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Clothes/Outer/cult_robe.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Items/Weapons/cult_blade.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Items/Weapons/cult_spear.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Items/arcane_barrage.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Items/blood_spear.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Items/construct_shell.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Items/mirror_shield.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Items/rites.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Items/shuttle_curse.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Items/soul_stone.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Items/stun.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Items/veil_shifter.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Items/void_torch.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Items/whetstone_cult.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Runes/apocalypse.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Runes/dimensional_rending.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Runes/regular.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Structures/Concealed/cult.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Structures/Concealed/cult_airlock.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Structures/Concealed/cult_girder.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Structures/altar.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Structures/archives.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Structures/barrier.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Structures/cult_airlock.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Structures/cult_girder.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Structures/cult_shield.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Structures/forge.rsi
Resources/Textures/WhiteDream/BloodCult/Entities/Structures/pylon.rsi
|
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
…ein-Engines into feature/blood-cult
Signed-off-by: Remuchi <RemuchiOfficial@gmail.com>
Signed-off-by: Remuchi <RemuchiOfficial@gmail.com>
Signed-off-by: Remuchi <RemuchiOfficial@gmail.com>
Signed-off-by: Remuchi <RemuchiOfficial@gmail.com>
Signed-off-by: Remuchi <RemuchiOfficial@gmail.com>
Can you believe it guys? Mah'weyh pleggh at e'ntrath! Just a week away! |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
1 similar comment
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
# Conflicts: # Content.Server/UserInterface/ActivatableUISystem.cs # Content.Shared/Alert/AlertType.cs # Content.Shared/UserInterface/ActivatableUIComponent.cs # Resources/Prototypes/Reagents/medicine.yml
Signed-off-by: Remuchi <RemuchiOfficial@gmail.com>
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
# Conflicts: # Content.Client/RadialSelector/RadialSelectorMenuBUI.cs # Content.Client/ShortConstruction/UI/ShortConstructionMenuBUI.cs
Description
Adds a new game mode - The Blood Cult.
Hail to Nar'Sie!
TODO
EXTRA:
Media
Changelog
🆑