The Blood Cult #1001

Remuchi · 2024-10-02T11:19:43Z

Description

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

TODO

Media

Changelog

🆑

add: Added Blood Cult Gamemode.

github-actions · 2024-10-02T11:19:56Z

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

github-actions · 2024-10-02T11:20:21Z

RSI Diff Bot; head commit a6444af merging into 5756a0e
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/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			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/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

Edit: diff updated after a6444af

Signed-off-by: VMSolidus <[email protected]>

…ein-Engines into feature/blood-cult

Signed-off-by: Remuchi <[email protected]>

whateverusername0 · 2024-10-08T03:33:36Z

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

github-actions · 2024-10-14T21:45:52Z

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

github-actions · 2024-10-14T21:45:52Z

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 <[email protected]>

github-actions · 2024-11-17T00:42:44Z

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

Signed-off-by: Remuchi <[email protected]>

Remuchi · 2024-11-19T11:29:39Z

Technically It's still work in progress but it's now ready for review.

…ein-Engines into pr/1001

Signed-off-by: Remuchi <[email protected]>

VMSolidus

Excellent work Remuchi.

Erisfiregamer1 · 2024-11-22T21:47:02Z

am I about to live witness Cult being merged

gluesniffler · 2024-11-22T21:48:37Z

am I about to live witness Cult being merged

given the extent of the work we probably should have @DEATHB4DEFEAT or @Pspritechologist also review it

Erisfiregamer1 · 2024-11-22T21:49:36Z

am I about to live witness Cult being merged

given the extent of the work we probably should have @DEATHB4DEFEAT or @Pspritechologist also review it

nawwwwwww it's funnier to speedmerge things and fix the thousand bugs later

Remuchi added 6 commits September 18, 2024 13:32

feat: cult 0.1

baed2c5

feat: blood boil, barrier and empower runes, cleanup

8a3c36b

feat: teleport, summon, rending and apocalypse runes

d439ff4

remove: changed radial selector to use states instead of component

e3ceb11

feat: constructs

d4caaab

feat: cult factories and pylon

3363f7f

github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Oct 2, 2024

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

FoxxoTrystan assigned Remuchi Oct 2, 2024

FoxxoTrystan added the Holy Shit label Oct 2, 2024

Merge branch 'master' into feature/blood-cult

aa3af0c

Signed-off-by: VMSolidus <[email protected]>

github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Oct 3, 2024

Remuchi added 7 commits October 3, 2024 09:08

feat: runed door and pylon construction hijack

7f1ba25

Merge branch 'feature/blood-cult' of https://github.com/Remuchi/Einst…

e290009

…ein-Engines into feature/blood-cult

feat: cult structures construction

8d38d90

Signed-off-by: Remuchi <[email protected]>

feat: shades

cab38bb

Signed-off-by: Remuchi <[email protected]>

feat: eldritch longsword, true cult armor and robe

b0a66e3

Signed-off-by: Remuchi <[email protected]>

feat: whetstone and shuttle curse

82eee92

Signed-off-by: Remuchi <[email protected]>

feat: holy water deconverts cultists

37bb7a3

Signed-off-by: Remuchi <[email protected]>

github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Oct 14, 2024

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 added 2 commits November 6, 2024 14:30

Merge remote-tracking branch 'upstream/master' into feature/blood-cult

15e9a2f

fix: fixed runed door repulsing

9044f00

Signed-off-by: Remuchi <[email protected]>

github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Nov 7, 2024

feat: summoning spells

0f9c91d

Signed-off-by: Remuchi <[email protected]>

github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Nov 17, 2024

Remuchi added 4 commits November 19, 2024 17:32

feat: blood rites

eacb9d2

Signed-off-by: Remuchi <[email protected]>

Merge remote-tracking branch 'upstream/master' into feature/blood-cult

75bb806

fix: fixes after master merge

213497f

Signed-off-by: Remuchi <[email protected]>

fix: add event handling

d05b951

Signed-off-by: Remuchi <[email protected]>

Remuchi marked this pull request as ready for review November 19, 2024 11:29

github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Nov 19, 2024

Remuchi added Priority: 3-Medium Needs to be resolved at some point Size: 1-Very Large For especially large issues/PRs labels Nov 19, 2024

VMSolidus added 2 commits November 21, 2024 20:07

Engine Shennanigans

1146c5b

Merge branch 'feature/blood-cult' of https://github.com/Remuchi/Einst…

8fe44a2

…ein-Engines into pr/1001

Remuchi added the Status: Do Not Merge Do not merge label Nov 22, 2024

Remuchi and others added 3 commits November 22, 2024 17:05

fix: fixes for the latest master merge

1975775

Signed-off-by: Remuchi <[email protected]>

feat: proper mirror shield

07a8d44

Signed-off-by: Remuchi <[email protected]>

One small fix

a6444af

VMSolidus approved these changes Nov 22, 2024

View reviewed changes

Peptide90 approved these changes Nov 22, 2024

View reviewed changes

VMSolidus merged commit 1500208 into Simple-Station:master Nov 22, 2024
12 checks passed

sleepyyapril pushed a commit to sleepyyapril/Einstein-Engines that referenced this pull request Nov 22, 2024

Automatic Changelog Update (Simple-Station#1001)

a179e18

Remuchi deleted the feature/blood-cult branch November 23, 2024 02:57

Piras314 mentioned this pull request Nov 23, 2024

Blood Cult Goob-Station/Goob-Station#290

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

The Blood Cult #1001

The Blood Cult #1001

Remuchi commented Oct 2, 2024 •

edited

Loading

github-actions bot commented Oct 2, 2024

github-actions bot commented Oct 2, 2024 •

edited

Loading

whateverusername0 commented Oct 8, 2024

github-actions bot commented Oct 14, 2024

github-actions bot commented Oct 14, 2024

github-actions bot commented Nov 17, 2024

Remuchi commented Nov 19, 2024

VMSolidus left a comment

Erisfiregamer1 commented Nov 22, 2024

gluesniffler commented Nov 22, 2024

Erisfiregamer1 commented Nov 22, 2024

The Blood Cult #1001

The Blood Cult #1001

Conversation

Remuchi commented Oct 2, 2024 • edited Loading

Description

TODO

Media

Changelog

github-actions bot commented Oct 2, 2024

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

whateverusername0 commented Oct 8, 2024

github-actions bot commented Oct 14, 2024

github-actions bot commented Oct 14, 2024

github-actions bot commented Nov 17, 2024

Remuchi commented Nov 19, 2024

VMSolidus left a comment

Choose a reason for hiding this comment

Erisfiregamer1 commented Nov 22, 2024

gluesniffler commented Nov 22, 2024

Erisfiregamer1 commented Nov 22, 2024

Remuchi commented Oct 2, 2024 •

edited

Loading

github-actions bot commented Oct 2, 2024 •

edited

Loading