fix: fixes for the latest master merge

Signed-off-by: Remuchi <[email protected]>
Simple-Station · Nov 22, 2024 · 1975775 · 1975775
1 parent 8fe44a2
commit 1975775
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 24 deletions.
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
@@ -143,7 +143,7 @@ private void AddAntagVerbs(GetVerbsEvent<Verb> args)
         {
             Text = Loc.GetString("admin-verb-text-make-blood-cultist"),
             Category = VerbCategory.Antag,
-            Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Objects/Weapons/Melee/cult_dagger.rsi"), "icon"),
+            Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Weapons/Melee/cult_dagger.rsi"), "icon"),
             Act = () =>
             {
                 _antag.ForceMakeAntag<BloodCultRuleComponent>(player, DefaultBloodCultRule);

diff --git a/Content.Server/WhiteDream/BloodCult/Gamerule/BloodCultRuleComponent.cs b/Content.Server/WhiteDream/BloodCult/Gamerule/BloodCultRuleComponent.cs
@@ -1,5 +1,4 @@
 using Content.Server.NPC.Components;
-using Content.Shared.Roles;
 using Content.Shared.WhiteDream.BloodCult.BloodCultist;
 using Content.Shared.WhiteDream.BloodCult.Constructs;
 using Robust.Shared.Prototypes;
@@ -9,9 +8,6 @@ namespace Content.Server.WhiteDream.BloodCult.Gamerule;
 [RegisterComponent]
 public sealed partial class BloodCultRuleComponent : Component
 {
-    [DataField]
-    public ProtoId<AntagPrototype> CultistRolePrototype = "Cultist";
-
     [DataField]
     public ProtoId<NpcFactionPrototype> NanoTrasenFaction = "NanoTrasen";
 

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
@@ -59,7 +59,6 @@
   - type: SolutionContainerManager
     solutions:
       tank:
-        canMix: true
         maxVol: 1500
   - type: DrainableSolution
     solution: tank

diff --git a/Resources/Prototypes/WhiteDream/Entities/Clothing/Cult/armor.yml b/Resources/Prototypes/WhiteDream/Entities/Clothing/Cult/armor.yml
@@ -72,6 +72,9 @@
         Heat: 1.4
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodCultHoodTrue
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot { }
 
 - type: entity
   parent: ClothingHeadHatHoodCulthood

diff --git a/Resources/Prototypes/WhiteDream/Entities/Objects/Cult/constructs.yml b/Resources/Prototypes/WhiteDream/Entities/Objects/Cult/constructs.yml
@@ -104,8 +104,6 @@
     tags:
     - CannotSuicide
     - DoorBumpOpener
-  - type: NameIdentifier
-    group: Construct
   - type: Appearance
 
 - type: entity
@@ -126,7 +124,6 @@
       100: Dead
   - type: Construct
   - type: MeleeWeapon
-    canHeavyAttack: false
     hidden: true
     angle: 30
     animation: WeaponArcSmash
@@ -162,7 +159,6 @@
   - type: Construct
   - type: MovementIgnoreGravity
   - type: MeleeWeapon
-    canHeavyAttack: false
     hidden: true
     angle: 30
     animation: WeaponArcPunch
@@ -202,7 +198,6 @@
     baseWalkSpeed: 4
     baseSprintSpeed: 4
   - type: MeleeWeapon
-    canHeavyAttack: false
     hidden: true
     angle: 30
     animation: WeaponArcSmash
@@ -242,7 +237,6 @@
     baseWalkSpeed: 5
     baseSprintSpeed: 5
   - type: MeleeWeapon
-    canHeavyAttack: false
     hidden: true
     angle: 30
     animation: WeaponArcSmash
@@ -265,7 +259,6 @@
       0: Alive
       40: Dead
   - type: MeleeWeapon
-    canHeavyAttack: false
     hidden: true
     angle: 30
     animation: WeaponArcSmash

diff --git a/Resources/Prototypes/WhiteDream/Entities/Objects/Materials/cult.yml b/Resources/Prototypes/WhiteDream/Entities/Objects/Materials/cult.yml
@@ -37,7 +37,7 @@
     key: enum.RadialSelectorUiKey.Key
     userWhitelist:
       components:
-        BloodCultist
+      - BloodCultist
   - type: ShortConstruction
     entries:
     - prototype: CultPylon

diff --git a/Resources/Prototypes/WhiteDream/Entities/Objects/Structures/Cult/barrier.yml b/Resources/Prototypes/WhiteDream/Entities/Objects/Structures/Cult/barrier.yml
@@ -41,7 +41,7 @@
       behaviors:
       - !type:SpawnEntitiesBehavior
         spawn:
-          CultRunedMetal:
+          RunedMetal:
             min: 5
             max: 5
       - !type:PlaySoundBehavior

diff --git a/Resources/Prototypes/WhiteDream/Entities/Objects/Structures/Cult/factories.yml b/Resources/Prototypes/WhiteDream/Entities/Objects/Structures/Cult/factories.yml
@@ -48,7 +48,7 @@
     key: enum.RadialSelectorUiKey.Key
     userWhitelist:
       components:
-        BloodCultist
+      - BloodCultist
   - type: GenericVisualizer
     visuals:
       enum.GenericCultVisuals.State:
@@ -66,8 +66,8 @@
     sprite: WhiteDream/BloodCult/Entities/Structures/altar.rsi
   - type: TimedFactory
     entries:
-      - prototype: ConstructShell
-      - prototype: WhetstoneCult
+    - prototype: ConstructShell
+    - prototype: WhetstoneCult
   # TODO: Add prototypes
   #    - Flask of Unholy Water
   - type: Construction

diff --git a/Resources/Prototypes/WhiteDream/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/WhiteDream/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
@@ -13,7 +13,6 @@
       groups:
         Burn: 10
         Brute: 10
-    ignoreTarget: true
   - type: PointLight
     enabled: true
     color: "#ff4300"

diff --git a/Resources/Prototypes/WhiteDream/Entities/Objects/Weapons/Melee/cult.yml b/Resources/Prototypes/WhiteDream/Entities/Objects/Weapons/Melee/cult.yml
@@ -25,10 +25,9 @@
   - type: ActivatableUI
     key: enum.RuneDrawerBuiKey.Key
     inHandsOnly: true
-    closeOnHandDeselect: true
     userWhitelist:
       components:
-        BloodCultist
+      - BloodCultist
   - type: UserInterface
     interfaces:
       enum.RuneDrawerBuiKey.Key:

diff --git a/Resources/Prototypes/WhiteDream/Recipes/Construction/cult_graphs.yml b/Resources/Prototypes/WhiteDream/Recipes/Construction/cult_graphs.yml
@@ -18,9 +18,6 @@
 - type: constructionGraph
   id: CultFactoryAltar
   start: start
-  icon:
-    sprite: WhiteDream/BloodCult/Entities/Structures/altar.rsi
-    state: icon_off
   graph:
   - node: start
     edges: