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

Cult! #770

Merged
merged 683 commits into from
Dec 27, 2024
Merged

Cult! #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
683 commits
Select commit Hold shift + click to select a range
22e5326
trying to fix rules
SkaldetSkaeg Oct 26, 2024
acdbfdb
MiGo task fix
SkaldetSkaeg Oct 26, 2024
482cb8b
upd cult visual and add moth "tail"
FunTust Oct 26, 2024
c27a941
Merge branch 'Cult!Cult!Cult!' of https://github.com/FunTust/space-st…
FunTust Oct 26, 2024
d04aebb
gameRule+gamepreset rename
SkaldetSkaeg Oct 26, 2024
945bc6b
check fix?
FunTust Oct 26, 2024
1ed9e23
astral alert change
SkaldetSkaeg Oct 26, 2024
c9d1761
Merge pull request #47 from FunTust/Cult!Cult!Cult!
SkaldetSkaeg Oct 26, 2024
30748a7
robust fix
SkaldetSkaeg Oct 26, 2024
d3818ae
refactore nyarlathotep
FunTust Oct 26, 2024
c70a5c3
rulefix, rolitemfix, gamerulefix
SkaldetSkaeg Oct 26, 2024
d6feb5f
+TTS for MiGo, InteractionBlock in astral
SkaldetSkaeg Oct 26, 2024
8ea2c1e
upd search system
FunTust Oct 26, 2024
4e84e20
kudzu_fix
SkaldetSkaeg Oct 26, 2024
2c0eea0
singularity/tesla fix
FunTust Oct 26, 2024
b980ad4
95% done
lexaSvarshik Oct 26, 2024
ed56e91
Merge branch 'Cult!Cult!Cult!' into cult
lexaSvarshik Oct 26, 2024
21d4869
Merge pull request #48 from FunTust/Cult!Cult!Cult!
SkaldetSkaeg Oct 27, 2024
edb4f22
Merge pull request #49 from lexaSvarshik/cult
SkaldetSkaeg Oct 27, 2024
d91f907
Icons rename + weapon size
SkaldetSkaeg Oct 27, 2024
1f53ac2
atragProtorename + astral blocking
SkaldetSkaeg Oct 27, 2024
1975686
Merge pull request #46 from Gnomeev/cultists'
SkaldetSkaeg Oct 27, 2024
339ee11
god overlay fix + buildings materials tweak
SkaldetSkaeg Oct 27, 2024
8727a8d
Cult buildings fixes and walls
stalengd Oct 27, 2024
d9ea807
Merge remote-tracking branch 'skaldet/cult!cult!cult!' into cult-buil…
stalengd Oct 27, 2024
0b748c8
tweaks in popup and deleting unused code
SkaldetSkaeg Oct 27, 2024
c4d099b
icons for building
SkaldetSkaeg Oct 27, 2024
7f2f7be
Merge pull request #50 from stalengd/cult-buildings-fixes-and-walls
SkaldetSkaeg Oct 27, 2024
4b25655
burglarbug sprite update
SkaldetSkaeg Oct 27, 2024
e77b850
block duplication of sacrifice
SkaldetSkaeg Oct 28, 2024
39db162
burglar meta
SkaldetSkaeg Oct 28, 2024
ef02611
RoleId change
SkaldetSkaeg Oct 28, 2024
5c97f66
Merge branch 'master' into Cult!Cult!Cult!
SkaldetSkaeg Oct 28, 2024
235fb56
robust update
SkaldetSkaeg Oct 28, 2024
612db2e
missing popup
SkaldetSkaeg Oct 28, 2024
e64b684
Telephaty fix
SkaldetSkaeg Oct 29, 2024
935d466
add localization 1
Theywod Oct 30, 2024
54e2209
roleItem rewrite into restrictedItem
SkaldetSkaeg Nov 1, 2024
038e287
remove role cause mindcomponent hadn't been found
SkaldetSkaeg Nov 1, 2024
d2fa86d
+random sounds for god
SkaldetSkaeg Nov 1, 2024
6fe7785
add eng name and desc to actions and burglarbug
Theywod Nov 1, 2024
f91956f
add eng name and desc Nyarlathotep
Theywod Nov 1, 2024
6cde1c2
added CountDown category
SkaldetSkaeg Nov 1, 2024
7942b0c
Merge pull request #51 from Theywod/add-cult-locale-1
SkaldetSkaeg Nov 1, 2024
2c069f7
code clean up
canvaswalker Nov 1, 2024
6bab358
Merge branch 'SerbiaStrong-220:master' into Cult!Cult!Cult!
SkaldetSkaeg Nov 2, 2024
d8dc735
full cleanup + wield fix
canvaswalker Nov 2, 2024
2676a08
beach chance increase
SkaldetSkaeg Nov 3, 2024
369a219
big renaming
canvaswalker Nov 3, 2024
9ae47d2
conflicts resolve
canvaswalker Nov 3, 2024
20239da
renaming end
canvaswalker Nov 3, 2024
e8d0ba6
fix checks
SkaldetSkaeg Nov 3, 2024
fdcdb8a
cringe fix
canvaswalker Nov 3, 2024
546a907
Merge pull request #52 from Gnomeev/Irremovable_tweaks
SkaldetSkaeg Nov 3, 2024
757265b
telephaty + popup fix
SkaldetSkaeg Nov 3, 2024
6ad2103
add locale
Theywod Nov 4, 2024
1b6282b
add some fixes
Theywod Nov 4, 2024
ed0d1b9
Merge pull request #53 from Theywod/add-cult-locale-2
SkaldetSkaeg Nov 4, 2024
3cd65e6
Merge branch 'SerbiaStrong-220:master' into Cult!Cult!Cult!
SkaldetSkaeg Nov 5, 2024
fc9a69c
beach disarm + desc tweak
SkaldetSkaeg Nov 5, 2024
2bfdec6
sacr delay
SkaldetSkaeg Nov 5, 2024
38b40b0
+ new action
SkaldetSkaeg Nov 5, 2024
edfc111
pict rename
SkaldetSkaeg Nov 6, 2024
53ef966
close to fix announcements
SkaldetSkaeg Nov 7, 2024
c03f83f
announcemets fix
SkaldetSkaeg Nov 7, 2024
e73cf0a
no healing multipying
SkaldetSkaeg Nov 10, 2024
1dec9e2
events transfeting
SkaldetSkaeg Nov 10, 2024
83e1b09
+ bibleuser blacklist, corruption list expand and decult visuals
SkaldetSkaeg Nov 11, 2024
d0b3623
+ stunbatons in corrupted list
SkaldetSkaeg Nov 11, 2024
d911b5b
burglarbug update
SkaldetSkaeg Nov 11, 2024
931faad
acsending popup, reagent in a shroom buff
SkaldetSkaeg Nov 11, 2024
a29a1fc
Merge branch 'master' into Cult!Cult!Cult!
SkaldetSkaeg Nov 12, 2024
6eed7c0
altar fix
SkaldetSkaeg Nov 12, 2024
43ea21b
add-deconstruction
Kirus59 Nov 12, 2024
f5a7710
altarComp god datafield, AnimalCorruption by parent
SkaldetSkaeg Nov 13, 2024
b454134
add erase whitelist
Kirus59 Nov 14, 2024
b156bab
some cleaning
Kirus59 Nov 14, 2024
7bf5e28
prevent abuse
Kirus59 Nov 14, 2024
e52b63c
rave fix + buildings tweak
SkaldetSkaeg Nov 17, 2024
622cab9
Merge branch 'Cult!Cult!Cult!' into fix-deconstruction
SkaldetSkaeg Nov 18, 2024
d613274
Merge pull request #55 from Kirus59/fix-deconstruction
SkaldetSkaeg Nov 18, 2024
37e465e
actions
EstKemran Nov 19, 2024
01af9f2
Merge pull request #56 from EstKemran/cult-actions
SkaldetSkaeg Nov 20, 2024
e42c2db
first-try
Kirus59 Nov 20, 2024
4c26647
remove dismatle action
SkaldetSkaeg Nov 21, 2024
c24cae5
+plant action, delete spare images
SkaldetSkaeg Nov 21, 2024
7876e52
added locales, and first bui steps
SkaldetSkaeg Nov 21, 2024
528ea10
new BUI for planting
SkaldetSkaeg Nov 21, 2024
8a755ea
cleanse pic add
SkaldetSkaeg Nov 21, 2024
1905f6e
block-rotation
Kirus59 Nov 22, 2024
5d968e7
add check and comment fixes
Kirus59 Nov 22, 2024
3c5cbc7
Merge remote-tracking branch 'SkaldetSkaeg/Cult!Cult!Cult!' into Burg…
Kirus59 Nov 22, 2024
e5673e0
meta fix + holy water fix
SkaldetSkaeg Nov 22, 2024
ec69319
fix-prototype
Kirus59 Nov 22, 2024
1b648f6
logs to debag sacraficial targets
SkaldetSkaeg Nov 23, 2024
57306f6
marking removal fix + some cleansing effect attempts
SkaldetSkaeg Nov 23, 2024
902b01d
+ comments
SkaldetSkaeg Nov 23, 2024
f477f3d
Merge pull request #57 from Kirus59/BurglarBug-changes
SkaldetSkaeg Nov 23, 2024
9c07d03
Spitballer-fixes
Kirus59 Nov 23, 2024
ea563a7
Merge pull request #58 from Kirus59/spitter-fixes
SkaldetSkaeg Nov 24, 2024
fc2f644
lots of sprites an tweaks
SkaldetSkaeg Nov 25, 2024
e635f3e
+ additional log
SkaldetSkaeg Nov 25, 2024
08fd71f
some tweaks
SkaldetSkaeg Nov 25, 2024
626a102
more logs, for fixing
SkaldetSkaeg Nov 25, 2024
b90ecc6
added eaten shroom desc for cultists
SkaldetSkaeg Nov 26, 2024
9ef103c
altar popup added
SkaldetSkaeg Nov 26, 2024
7d5235b
rave saint water clearing
SkaldetSkaeg Nov 26, 2024
41c11e3
fix popup altar
SkaldetSkaeg Nov 26, 2024
02fb8d3
rave tweaks and fixes
SkaldetSkaeg Nov 26, 2024
df7a2da
+ verb on insertion
SkaldetSkaeg Nov 26, 2024
f1bcef6
healing pod comp, suffix tweak
SkaldetSkaeg Nov 27, 2024
1fb3616
healing tweaks
SkaldetSkaeg Nov 27, 2024
1ed39d5
monkeyfix + bloodloss healing for cult
SkaldetSkaeg Nov 27, 2024
95745ce
no fixture for a pod, cause you can stuck in wall
SkaldetSkaeg Nov 27, 2024
bd0a1ca
new frame pic
SkaldetSkaeg Nov 27, 2024
cc175bc
rave ghosting overlay fix
SkaldetSkaeg Nov 27, 2024
d6db667
migo rename
SkaldetSkaeg Nov 28, 2024
460f3f4
small rename
SkaldetSkaeg Nov 29, 2024
b564566
Fungus machine ActivatableUI fix
Kirus59 Nov 29, 2024
ce52fb5
Delete MiGo hands
Kirus59 Nov 29, 2024
2ec41cf
Merge pull request #59 from Kirus59/Cult-hydroponics-tweak
SkaldetSkaeg Nov 30, 2024
95a89b5
added check for eaten shrooms
SkaldetSkaeg Nov 30, 2024
1db4e0d
titles-fix
Kirus59 Nov 30, 2024
31b61bb
StuckOnEquip-errors-fix
Kirus59 Nov 30, 2024
f44e826
YAML-fixes
Kirus59 Nov 30, 2024
bfd9d74
delete-suffix
Kirus59 Nov 30, 2024
3527d37
Merge pull request #61 from Kirus59/StuckOnEquip-fix
SkaldetSkaeg Nov 30, 2024
dfa0a1a
Burglar-bug-sprite-changes
Kirus59 Dec 1, 2024
3055874
Merge pull request #62 from Kirus59/YAML-fixes
SkaldetSkaeg Dec 1, 2024
20cea02
Merge pull request #60 from Kirus59/titles-fix
SkaldetSkaeg Dec 1, 2024
ffb21f0
Merge pull request #63 from Kirus59/Burglar-bug-sprites-changes
SkaldetSkaeg Dec 1, 2024
af189b6
cocoons change
SkaldetSkaeg Dec 3, 2024
5439f24
Merge branch 'master' into Cult!Cult!Cult!
SkaldetSkaeg Dec 3, 2024
c8b67a4
robust
SkaldetSkaeg Dec 3, 2024
8c1f4e2
updated cocoon version
SkaldetSkaeg Dec 3, 2024
94a5c43
wtf lib
SkaldetSkaeg Dec 6, 2024
479c3a5
cleasing tweaks + new sound
SkaldetSkaeg Dec 6, 2024
665bb04
cleansing sound added
SkaldetSkaeg Dec 6, 2024
7349d1b
forced gamerule objectives refresh
SkaldetSkaeg Dec 7, 2024
109eeda
on sacr change obj update
SkaldetSkaeg Dec 7, 2024
700843d
telepahy naming fix
SkaldetSkaeg Dec 7, 2024
21278f4
oculine cleansing rave
SkaldetSkaeg Dec 8, 2024
58e91ad
rave tweaks
SkaldetSkaeg Dec 9, 2024
dc900be
added effects
SkaldetSkaeg Dec 10, 2024
3ed6a52
add new sprite
SkaldetSkaeg Dec 10, 2024
5ea99c0
guidebook tweaks
SkaldetSkaeg Dec 11, 2024
9de8b9e
null shroom
SkaldetSkaeg Dec 14, 2024
ee6672b
planting fix
SkaldetSkaeg Dec 14, 2024
b69d8b6
guidebook altar fix
SkaldetSkaeg Dec 14, 2024
dda4cf6
animals tweaks
SkaldetSkaeg Dec 14, 2024
d166a9f
Merge branch 'master' into Cult!Cult!Cult!
SkaldetSkaeg Dec 14, 2024
2e126f2
animals buff
SkaldetSkaeg Dec 14, 2024
5f8bd0f
bulglar bug fix
SkaldetSkaeg Dec 14, 2024
e6c6055
another fix
SkaldetSkaeg Dec 14, 2024
ea4a4c9
visuals update
SkaldetSkaeg Dec 14, 2024
9e520fa
seeds fix
SkaldetSkaeg Dec 15, 2024
d4daef0
corruption fixes
SkaldetSkaeg Dec 15, 2024
4f3f08c
corruption fix, migomiceliun fix
SkaldetSkaeg Dec 15, 2024
125d733
largo fix
SkaldetSkaeg Dec 15, 2024
45884a7
nullification shroom botany fix
SkaldetSkaeg Dec 15, 2024
9da8680
StuckOnEquip icon fix
Kirus59 Dec 16, 2024
91b02d8
Enslave tweaks
Kirus59 Dec 16, 2024
e32efcc
some fixes
Kirus59 Dec 16, 2024
0a68214
get mind fixes
Kirus59 Dec 16, 2024
69d96e6
add comment & some fixes
Kirus59 Dec 16, 2024
88da10d
Better rave fade
stalengd Dec 16, 2024
8b2f1b7
Texture fade overlay component DeleteAfterFadeOut
stalengd Dec 16, 2024
5e43ff0
telepathy naming fix
SkaldetSkaeg Dec 18, 2024
12f5e30
Merge pull request #66 from stalengd/cult-better-rave-fade
SkaldetSkaeg Dec 18, 2024
1f6620f
Merge pull request #64 from Kirus59/StuckOnEquipComponent-fixes
SkaldetSkaeg Dec 18, 2024
97ebedf
Merge pull request #65 from Kirus59/convertion-verb
SkaldetSkaeg Dec 18, 2024
fcb0b61
healing fixes
Kirus59 Dec 19, 2024
60f95d6
Remove AscensionReagent when Enslaved
Kirus59 Dec 19, 2024
b83589e
ChemMiGomicelium fixes
Kirus59 Dec 19, 2024
3dcbf65
reagent fix
Kirus59 Dec 19, 2024
0f03b65
Merge pull request #68 from Kirus59/delete-MiGomycelium-from-stomach
SkaldetSkaeg Dec 21, 2024
2dea6ef
Merge pull request #67 from Kirus59/healing-fixes
SkaldetSkaeg Dec 21, 2024
4f4615d
Merge branch 'master' into Cult!Cult!Cult!
SkaldetSkaeg Dec 21, 2024
55e7c36
reagent-tweaks
Kirus59 Dec 21, 2024
ae721df
Merge pull request #69 from Kirus59/ChemMiGomicelium-fixes
SkaldetSkaeg Dec 22, 2024
2c40860
Merge branch 'Cult!Cult!Cult!' of https://github.com/SkaldetSkaeg/spa…
SkaldetSkaeg Dec 22, 2024
dc801a2
+ new effects
SkaldetSkaeg Dec 22, 2024
27bb516
Merge branch 'master' into Cult!Cult!Cult!
SkaldetSkaeg Dec 22, 2024
5c9cca9
Merge branch 'SerbiaStrong-220:master' into Cult!Cult!Cult!
SkaldetSkaeg Dec 22, 2024
a416f2c
backpack-fixes
Kirus59 Dec 22, 2024
2b28ab8
CultYoggBed
Kirus59 Dec 22, 2024
409325f
Add missing comment
Kirus59 Dec 22, 2024
ac740d9
add materials
Kirus59 Dec 22, 2024
7df5465
some cleaning
Kirus59 Dec 22, 2024
c999a76
spitballer, horn, venomancer renames +bubble +effects
SkaldetSkaeg Dec 22, 2024
d2723f7
Merge branch 'Cult!Cult!Cult!' of https://github.com/SkaldetSkaeg/spa…
SkaldetSkaeg Dec 22, 2024
4ccf779
sounds update + rename
SkaldetSkaeg Dec 22, 2024
672c448
sedativeSting now stuckonEquip + cocoon
SkaldetSkaeg Dec 22, 2024
3138201
+ new cargo holywater
SkaldetSkaeg Dec 22, 2024
3cbd7d7
popups fixes
Kirus59 Dec 22, 2024
73b3d0b
delete needless using
Kirus59 Dec 22, 2024
b11951b
Merge remote-tracking branch 'SkaldetSkaeg/Cult!Cult!Cult!' into back…
Kirus59 Dec 22, 2024
9abc087
Merge remote-tracking branch 'SkaldetSkaeg/Cult!Cult!Cult!' into Cult…
Kirus59 Dec 22, 2024
a48216f
objective added on enslaving
SkaldetSkaeg Dec 23, 2024
93e3766
RestrictedItem now has flag on pulling
SkaldetSkaeg Dec 23, 2024
2021b24
block offering from unremoveable items
SkaldetSkaeg Dec 23, 2024
ada914c
naming fix
SkaldetSkaeg Dec 23, 2024
10abbfc
MiGomycelium rave fix
Kirus59 Dec 23, 2024
0ddb604
fix fix
Kirus59 Dec 23, 2024
8da0eba
+ new restricted parrent
SkaldetSkaeg Dec 24, 2024
c219931
examined acsending
SkaldetSkaeg Dec 24, 2024
a961c60
astral timings tweaks
SkaldetSkaeg Dec 24, 2024
d26acd6
botany + cargo tweaks
SkaldetSkaeg Dec 25, 2024
b48f358
no rotation, file migration, corruption effect
SkaldetSkaeg Dec 25, 2024
e81b8b2
god layer fix
SkaldetSkaeg Dec 25, 2024
052dda8
seed + god fix
SkaldetSkaeg Dec 25, 2024
546b483
noun fix, altar final acsending fixes
SkaldetSkaeg Dec 25, 2024
b2982cd
Merge remote-tracking branch 'SkaldetSkaeg/Cult!Cult!Cult!' into back…
Kirus59 Dec 25, 2024
e2d94c5
Merge remote-tracking branch 'SkaldetSkaeg/Cult!Cult!Cult!' into popu…
Kirus59 Dec 25, 2024
d91bf26
Pond fixes
Kirus59 Dec 25, 2024
87b4566
Pod verb fixes
Kirus59 Dec 25, 2024
c7d841b
Delete needless usings
Kirus59 Dec 25, 2024
430902a
Merge pull request #70 from Kirus59/backpack-fixes
SkaldetSkaeg Dec 26, 2024
0a60dfa
Merge branch 'SerbiaStrong-220:master' into Cult!Cult!Cult!
SkaldetSkaeg Dec 26, 2024
560ae83
Merge pull request #72 from Kirus59/popups-fix
SkaldetSkaeg Dec 26, 2024
6e8164e
Merge pull request #73 from Kirus59/Mi-Go-rave-fix
SkaldetSkaeg Dec 26, 2024
32c3bc3
Merge pull request #74 from Kirus59/prud-fixes
SkaldetSkaeg Dec 26, 2024
e9746ad
Merge pull request #75 from Kirus59/cult-pod-fixes
SkaldetSkaeg Dec 26, 2024
8480c44
god coords + acsending tweaks
SkaldetSkaeg Dec 26, 2024
8507119
weapons tweaks
SkaldetSkaeg Dec 26, 2024
3c73ef0
armor tweaks
SkaldetSkaeg Dec 26, 2024
4c875cb
corruptedAnimals nefr
SkaldetSkaeg Dec 26, 2024
d925654
Merge remote-tracking branch 'SkaldetSkaeg/Cult!Cult!Cult!' into Cult…
Kirus59 Dec 26, 2024
be18866
commented bed
Kirus59 Dec 26, 2024
9930e5a
add TODO
Kirus59 Dec 26, 2024
63ac2b0
Merge pull request #71 from Kirus59/CultYoggBed
SkaldetSkaeg Dec 26, 2024
248c511
before merge tweaks
SkaldetSkaeg Dec 26, 2024
5ab0489
Merge branch 'Cult!Cult!Cult!' of https://github.com/SkaldetSkaeg/spa…
SkaldetSkaeg Dec 26, 2024
a69059a
add shroom
SkaldetSkaeg Dec 26, 2024
59da30f
final fixes
SkaldetSkaeg Dec 26, 2024
a4710e6
add fox movement
SkaldetSkaeg Dec 26, 2024
184df12
movement fix
SkaldetSkaeg Dec 26, 2024
76c8fe2
fixes for checks
SkaldetSkaeg Dec 26, 2024
87fc9c9
license + chicken fix
SkaldetSkaeg Dec 26, 2024
383c1fa
container nasrali fix
SkaldetSkaeg Dec 26, 2024
97e4c97
naming fix
SkaldetSkaeg Dec 26, 2024
71c3813
god music fixes + containers fix
SkaldetSkaeg Dec 27, 2024
3a3dab8
god fixes + sheet attemps
SkaldetSkaeg Dec 27, 2024
d3f134e
made it energy type rn
SkaldetSkaeg Dec 27, 2024
7f54c99
trying to find out
SkaldetSkaeg Dec 27, 2024
a727e70
returning back embeded
SkaldetSkaeg Dec 27, 2024
1ad1d6e
check spawn on despawn
SkaldetSkaeg Dec 27, 2024
e6aec7e
replace with spawn ion trigger
SkaldetSkaeg Dec 27, 2024
9edb949
spitballer fixes
SkaldetSkaeg Dec 27, 2024
ed9f387
another fixes
SkaldetSkaeg Dec 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
15 changes: 12 additions & 3 deletions Content.Client/Inventory/ClientInventorySystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -163,18 +163,24 @@ public void SetSlotHighlight(EntityUid owner, InventorySlotsComponent component,
}

public void UpdateSlot(EntityUid owner, InventorySlotsComponent component, string slotName,
bool? blocked = null, bool? highlight = null)
bool? blocked = null, bool? highlight = null, bool? stuckOnEquip = null)//ss220 StuckOnEquip
{
var oldData = component.SlotData[slotName];
var newHighlight = oldData.Highlighted;
var newBlocked = oldData.Blocked;
var newStuckOnEquip = oldData.StuckOnEquip;//ss220 StuckOnEquip

if (blocked != null)
newBlocked = blocked.Value;

if (highlight != null)
newHighlight = highlight.Value;

//ss220 StuckOnEquip begin
if (stuckOnEquip != null)
newStuckOnEquip = stuckOnEquip.Value;
//ss220 StuckOnEquip end

var newData = component.SlotData[slotName] =
new SlotData(component.SlotData[slotName], newHighlight, newBlocked);
if (owner == _playerManager.LocalEntity)
Expand Down Expand Up @@ -255,6 +261,7 @@ public sealed class SlotData
public EntityUid? HeldEntity => Container?.ContainedEntity;
public bool Blocked;
public bool Highlighted;
public bool StuckOnEquip; //ss220 StuckOnEquip

[ViewVariables]
public ContainerSlot? Container;
Expand All @@ -268,20 +275,22 @@ public sealed class SlotData
public string FullTextureName => SlotDef.FullTextureName;

public SlotData(SlotDefinition slotDef, ContainerSlot? container = null, bool highlighted = false,
bool blocked = false)
bool blocked = false, bool stuckOnEquip = false)//ss220 StuckOnEquip
{
SlotDef = slotDef;
Highlighted = highlighted;
Blocked = blocked;
Container = container;
StuckOnEquip = stuckOnEquip; //ss220 StuckOnEquip
}

public SlotData(SlotData oldData, bool highlighted = false, bool blocked = false)
public SlotData(SlotData oldData, bool highlighted = false, bool blocked = false, bool stuckOnEquip = false)//ss220 StuckOnEquip
{
SlotDef = oldData.SlotDef;
Highlighted = highlighted;
Container = oldData.Container;
Blocked = blocked;
StuckOnEquip = stuckOnEquip; //ss220 StuckOnEquip
}

public static implicit operator SlotData(SlotDefinition s)
Expand Down
38 changes: 38 additions & 0 deletions Content.Client/SS220/Bible/ExorcismPerformerSystem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
using Content.Client.Light.Components;
using Content.Client.Light.EntitySystems;
using Content.Shared.SS220.Bible;
using Robust.Client.GameObjects;

namespace Content.Client.SS220.Bible;

public sealed class ExorcismPerformerSystem : SharedExorcismPerformerSystem
{

[Dependency] private readonly LightBehaviorSystem _lightBehavior = default!;
public override void Initialize()
{
SubscribeLocalEvent<ExorcismPerformerComponent, AppearanceChangeEvent>(OnAppearanceChanged);
}

private void OnAppearanceChanged(Entity<ExorcismPerformerComponent> entity, ref AppearanceChangeEvent args)
{
if (!args.AppearanceData.TryGetValue(ExorcismPerformerVisualState.State, out var value) || value is not ExorcismPerformerVisualState state)
{
return;
}
//ToDo its broken ... Stalen?
/*
if (TryComp(entity, out LightBehaviourComponent? lightBehaviour))
{
// Reset any running behaviour to reset the animated properties back to the original value, to avoid conflicts between resets
_lightBehavior.StopLightBehaviour((entity, lightBehaviour));

if (state == ExorcismPerformerVisualState.Performing)
{
_lightBehavior.StartLightBehaviour(entity.Comp.LightBehaviourId);
}
}
*/
}
}
51 changes: 51 additions & 0 deletions Content.Client/SS220/Bible/UI/ExorcismBoundUserInterface.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
using Content.Shared.SS220.Bible;

namespace Content.Client.SS220.Bible.UI;

public sealed class ExorcismBoundUserInterface : BoundUserInterface
{
[ViewVariables]
private ExorcismMenu? _menu;

[ViewVariables]
public int LengthMin { get; private set; }
[ViewVariables]
public int LengthMax { get; private set; }


public ExorcismBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
{
}

protected override void Open()
{
_menu = new ExorcismMenu(this);
_menu.OnClose += Close;
_menu.OpenCentered();
}

public void ReadButtonPressed(string message)
{
SendMessage(new ExorcismReadMessage(message));
_menu?.Close();
}

protected override void UpdateState(BoundUserInterfaceState state)
{
if (state is not ExorcismInterfaceState exorcismState)
return;

LengthMin = exorcismState.LengthMin;
LengthMax = exorcismState.LengthMax;
_menu?.RefreshLengthCounter();
}

protected override void Dispose(bool disposing)
{
base.Dispose(disposing);
if (!disposing) return;

_menu?.Dispose();
}
}
11 changes: 11 additions & 0 deletions Content.Client/SS220/Bible/UI/ExorcismMenu.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!-- © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt -->
<controls:FancyWindow xmlns="https://spacestation14.io"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
Title="{Loc 'bible-exorcism-menu-title'}"
MinSize="400 225">
<BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True" Margin="5">
<TextEdit Name="MessageInput" HorizontalExpand="True" VerticalExpand="True" Margin="0 0 0 5" MinHeight="100" />
<Label Name="LengthLabel"></Label>
<Button Name="ReadButton" Text="{Loc 'bible-exorcism-menu-read-button'}" StyleClasses="OpenLeft" Access="Public" />
</BoxContainer>
</controls:FancyWindow>
76 changes: 76 additions & 0 deletions Content.Client/SS220/Bible/UI/ExorcismMenu.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
using Content.Client.UserInterface.Controls;
using Content.Shared.SS220.Bible;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Utility;

namespace Content.Client.SS220.Bible.UI;

[GenerateTypedNameReferences]
public sealed partial class ExorcismMenu : FancyWindow
{
private ExorcismBoundUserInterface Owner { get; set; }

public ExorcismMenu(ExorcismBoundUserInterface owner)
{
IoCManager.InjectDependencies(this);
RobustXamlLoader.Load(this);

Owner = owner;

var loc = IoCManager.Resolve<ILocalizationManager>();
MessageInput.Placeholder = new Rope.Leaf(loc.GetString("bible-exorcism-menu-message-placeholder"));

MessageInput.OnTextChanged += (args) =>
{
var len = GetLength();
if (len < Owner.LengthMin)
{
ReadButton.Disabled = true;
ReadButton.ToolTip = Loc.GetString("bible-exorcism-message-too-short");
}
else if (len > Owner.LengthMax)
{
ReadButton.Disabled = true;
ReadButton.ToolTip = Loc.GetString("bible-exorcism-message-too-long");
}
else
{
ReadButton.Disabled = false;
ReadButton.ToolTip = null;
}
RefreshLengthCounter(len);
};

RefreshLengthCounter();

ReadButton.OnPressed += _ => Owner.ReadButtonPressed(Rope.Collapse(MessageInput.TextRope));
ReadButton.Disabled = true;
}

public override void Close()
{
base.Close();
}

public void RefreshLengthCounter()
{
RefreshLengthCounter(GetLength());
}

protected override void Dispose(bool disposing)
{
base.Dispose(disposing);
}

private void RefreshLengthCounter(int length)
{
LengthLabel.Text = $"{length}/{Owner.LengthMin}";
}

private int GetLength()
{
return ExorcismUtils.GetSanitazedMessageLength(Rope.Collapse(MessageInput.TextRope));
}
}
15 changes: 15 additions & 0 deletions Content.Client/SS220/CultYogg/Altar/CultYoggAltarSystem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt

using Content.Shared.SS220.CultYogg;
using Content.Shared.SS220.CultYogg.Altar;
using Robust.Client.GameObjects;

namespace Content.Client.SS220.CultYogg.Altar;

public sealed partial class CultYoggAltarSystem : SharedCultYoggAltarSystem
{
public override void Initialize()
{
base.Initialize();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
using Content.Shared.StatusIcon;
using Content.Shared.StatusIcon.Components;
using Robust.Shared.Prototypes;
using Content.Shared.SS220.CultYogg.CultYoggIcons;
using Content.Shared.SS220.CultYogg.Sacraficials;
using Robust.Client.Player;

namespace Content.Client.SS220.CultYogg.CultYoggIcon;

public sealed class ShowCultYoggIconsSystem : EntitySystem
{
[Dependency] private readonly IPrototypeManager _prototype = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;


public override void Initialize()
{
base.Initialize();

SubscribeLocalEvent<ShowCultYoggIconsComponent, GetStatusIconsEvent>(OnGetCultistsIconsEvent);
SubscribeLocalEvent<CultYoggSacrificialComponent, GetStatusIconsEvent>(OnGetSacraficialIconsEvent);
}

private void OnGetCultistsIconsEvent(Entity<ShowCultYoggIconsComponent> uid, ref GetStatusIconsEvent ev)
{

if (!TryComp<ShowCultYoggIconsComponent>(uid, out var cultComp))
return;

var iconId = cultComp.StatusIcon;

if (_prototype.TryIndex<FactionIconPrototype>(iconId, out var iconPrototype))
ev.StatusIcons.Add(iconPrototype);
else
Log.Error($"Invalid faction icon prototype: {iconPrototype}");
}
private void OnGetSacraficialIconsEvent(Entity<CultYoggSacrificialComponent> uid, ref GetStatusIconsEvent ev)
{
var viewer = _playerManager.LocalSession?.AttachedEntity;
if (viewer == uid)
return;

if (!TryComp<CultYoggSacrificialComponent>(uid, out var sacrComp))
return;

var iconId = sacrComp.StatusIcon;

if (_prototype.TryIndex<FactionIconPrototype>(iconId, out var iconPrototype))
ev.StatusIcons.Add(iconPrototype);
else
Log.Error($"Invalid faction icon prototype: {iconPrototype}");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
using Content.Shared.SS220.CultYogg.Cultists;
using Robust.Client.GameObjects;

namespace Content.Client.SS220.CultYogg.Cultists;

/// <summary>
/// </summary>
public sealed class AcsendingVisualizerSystem : VisualizerSystem<AcsendingComponent>
{
public override void Initialize()
{
base.Initialize();

SubscribeLocalEvent<AcsendingComponent, ComponentInit>(OnComponentInit);
SubscribeLocalEvent<AcsendingComponent, ComponentShutdown>(OnShutdown);
}

private void OnShutdown(Entity<AcsendingComponent> uid, ref ComponentShutdown args)
{
// Need LayerMapTryGet because Init fails if there's no existing sprite / appearancecomp
// which means in some setups (most frequently no AppearanceComp) the layer never exists.
if (TryComp<SpriteComponent>(uid, out var sprite) &&
sprite.LayerMapTryGet(AcsendingVisualLayers.Particles, out var layer))
{
sprite.RemoveLayer(layer);
}
}

private void OnComponentInit(Entity<AcsendingComponent> uid, ref ComponentInit args)
{
if (!TryComp<SpriteComponent>(uid, out var sprite) || !TryComp(uid, out AppearanceComponent? appearance))
return;

sprite.LayerMapReserveBlank(AcsendingVisualLayers.Particles);
sprite.LayerSetVisible(AcsendingVisualLayers.Particles, true);
sprite.LayerSetShader(AcsendingVisualLayers.Particles, "unshaded");

if (uid.Comp.Sprite != null)
{
sprite.LayerSetRSI(AcsendingVisualLayers.Particles, uid.Comp.Sprite.RsiPath);
sprite.LayerSetState(AcsendingVisualLayers.Particles, uid.Comp.Sprite.RsiState);
}
}
}

public enum AcsendingVisualLayers : byte
{
Particles
}
Loading
Loading