upd

Rxup · Jul 18, 2024 · 5bde087 · 5bde087
1 parent 95e11b8
commit 5bde087
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 57 deletions.
diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj
@@ -45,9 +45,6 @@
     <Compile Update="Backmen\Economy\WageConsole\UI\BonusWageWindow.cs">
       <DependentUpon>BonusWageWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Update="Backmen\Ghost\Roles\UI\RollerRow.cs">
-      <DependentUpon>RollerRow.xaml</DependentUpon>
-    </Compile>
   </ItemGroup>
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
   <Import Project="..\RobustToolbox\MSBuild\XamlIL.targets" />

diff --git a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml
@@ -23,7 +23,6 @@
             <BoxContainer Name="TopLeftContainer" Orientation="Vertical">
                 <actions:ActionsBar Name="Actions" Access="Protected" />
                 <BoxContainer Name="VoteMenu" Access="Public" Orientation="Vertical"/>
-                <BoxContainer Name="RollerMenu" Access="Public" Orientation="Vertical"/> <!-- backmen: GhostRoller -->
             </BoxContainer>
             <alerts:AlertsUI Name="Alerts" Access="Protected" />
         </LayoutContainer>

diff --git a/Content.Server/Backmen/StationAI/AiEyeMover.cs b/Content.Server/Backmen/StationAI/AiEyeMover.cs
@@ -47,10 +47,17 @@ public AiEyeMover(EntityManager entityManager, AICameraSystem cameraSystem, Enti
                 return null;
             }
 
+            if (!NewPosition.EntityId.IsValid())
+            {
+                _entityManager.QueueDeleteEntity(Eye);
+                return null;
+            }
+
+
             var core = Eye.Comp.AiCore.Value;
 
 
-            var gridUid = _transform.GetGrid(NewPosition);
+            var gridUid = _transform.GetGrid(NewPosition.EntityId);
 
             if (
                 gridUid == null ||

diff --git a/Content.Server/Ghost/Roles/GhostRoleSystem.cs b/Content.Server/Ghost/Roles/GhostRoleSystem.cs
@@ -47,7 +47,6 @@ public sealed class GhostRoleSystem : EntitySystem
         [Dependency] private readonly TransformSystem _transform = default!;
         [Dependency] private readonly SharedMindSystem _mindSystem = default!;
         [Dependency] private readonly Backmen.RoleWhitelist.WhitelistSystem _roleWhitelist = default!; // backmen: whitelist
-        [Dependency] private readonly Backmen.Ghost.Roles.GhostRoleRollerSystem _roleRoller = default!; // backmen: ghost roller
         [Dependency] private readonly SharedRoleSystem _roleSystem = default!;
         [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
@@ -311,7 +310,6 @@ public void RegisterGhostRole(Entity<GhostRoleComponent> role)
                 return;
 
             _ghostRoles[role.Comp.Identifier = GetNextRoleIdentifier()] = role;
-            _roleRoller.RegisterGhostRole(role); // backmen: ghost roller
             UpdateAllEui();
         }
 
@@ -322,7 +320,6 @@ public void UnregisterGhostRole(Entity<GhostRoleComponent> role)
                 return;
 
             _ghostRoles.Remove(comp.Identifier);
-            _roleRoller.UnregisterGhostRole(role); // backmen: ghost roller
             if (TryComp(role.Owner, out GhostRoleRaffleComponent? raffle))
             {
                 // if a raffle is still running, get rid of it
@@ -482,11 +479,6 @@ public bool Takeover(ICommonSession player, uint identifier)
             // end-backmen: whitelist
 
             var ev = new TakeGhostRoleEvent(player);
-            // start-backmen: ghost roller
-            _roleRoller.Takeover(role, ref ev);
-            if(ev.TookRole)
-                return false;
-            // end-backmen: ghost roller
             RaiseLocalEvent(role, ref ev);
 
             if (!ev.TookRole)

diff --git a/Content.Shared/Backmen/CCVar/CCVars.cs b/Content.Shared/Backmen/CCVar/CCVars.cs
@@ -163,16 +163,4 @@ public static readonly CVarDef<bool>
     public static readonly CVarDef<int> SpecForceDelay =
         CVarDef.Create("specforce.delay", 2, CVar.SERVERONLY);
 
-
-    /*
-     * enabling a roll to enter a ghost role for one player from the vote
-     */
-    public static readonly CVarDef<bool>
-        GhostRollerEnabled = CVarDef.Create("ghost.roller_enabled", false, CVar.SERVERONLY);
-
-    /// <summary>
-    /// the time that will be given to throw a number to vote for the ghost role
-    /// </summary>
-    public static readonly CVarDef<int> GhostRollerTime =
-        CVarDef.Create("ghost.roller_time", 20, CVar.REPLICATED | CVar.SERVER);
 }
diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
@@ -6,7 +6,6 @@
   noSpawn: true
   components:
   - type: CargoSellBlacklist
-  - type: GhostVisRoller
   - type: Sprite
     overrideContainerOcclusion: true # Ghosts always show up regardless of where they're contained.
     drawdepth: Ghosts

diff --git a/Resources/Prototypes/_Backmen/Maps/Pool/backmenstandart.yml b/Resources/Prototypes/_Backmen/Maps/Pool/backmenstandart.yml
@@ -14,7 +14,6 @@
   - Omega
   - Reach
   - Bagel
-  - Train
   - CorvaxSplit
   - Oasis
   - no_madDelta
diff --git a/Resources/Prototypes/_Backmen/ghostSponsor.yml b/Resources/Prototypes/_Backmen/ghostSponsor.yml
@@ -3,127 +3,117 @@
   components:
     - type: Sprite
       overrideContainerOcclusion: true # Ghosts always show up regardless of where they're contained.
-      noRot: true
       drawdepth: Ghosts
       sprite: Backmen/Mobs/Ghost/ghost_red.rsi
-      state: animated-red
       color: "#fff8"
       layers:
-        - state: animated-red
+      - state: animated-red
+        shader: unshaded
 
 - type: ghostTheme
   id: tier2
   components:
     - type: Sprite
       overrideContainerOcclusion: true # Ghosts always show up regardless of where they're contained.
-      noRot: true
       drawdepth: Ghosts
       sprite: Backmen/Mobs/Ghost/ghost_lava.rsi
-      state: animated-lava
       color: "#fff8"
       layers:
-        - state: animated-lava
+      - state: animated-lava
+        shader: unshaded
 
 - type: ghostTheme
   id: tier01
   components:
     - type: Sprite
       overrideContainerOcclusion: true # Ghosts always show up regardless of where they're contained.
-      noRot: true
       drawdepth: Ghosts
       sprite: Backmen/Mobs/Ghost/ghost_vip.rsi
-      state: animated_orange
       color: "#fff8"
       layers:
-        - state: animated_orange
+      - state: animated_orange
+        shader: unshaded
 
 - type: ghostTheme
   id: tier02
   components:
     - type: Sprite
       overrideContainerOcclusion: true # Ghosts always show up regardless of where they're contained.
-      noRot: true
       drawdepth: Ghosts
       sprite: Backmen/Mobs/Ghost/ghost_vip.rsi
-      state: animated_white
       color: "#fff8"
       layers:
-        - state: animated_white
+      - state: animated_white
+        shader: unshaded
 
 - type: ghostTheme
   id: tier03
   components:
     - type: Sprite
       overrideContainerOcclusion: true # Ghosts always show up regardless of where they're contained.
-      noRot: true
       drawdepth: Ghosts
       sprite: Backmen/Mobs/Ghost/ghost_vip.rsi
-      state: animated_ash
       color: "#fff8"
       layers:
-        - state: animated_ash
+      - state: animated_ash
+        shader: unshaded
 
 - type: ghostTheme
   id: tier04
   components:
     - type: Sprite
       overrideContainerOcclusion: true # Ghosts always show up regardless of where they're contained.
-      noRot: true
       drawdepth: Ghosts
       sprite: Backmen/Mobs/Ghost/ghost_vip.rsi
-      state: animated_ice
       color: "#fff8"
       layers:
-        - state: animated_ice
+      - state: animated_ice
+        shader: unshaded
 
 - type: ghostTheme
   id: tier05
   components:
     - type: Sprite
       overrideContainerOcclusion: true # Ghosts always show up regardless of where they're contained.
-      noRot: true
       drawdepth: Ghosts
       sprite: Backmen/Mobs/Ghost/ghost_vip.rsi
-      state: animated_superwhite
       color: "#fff8"
       layers:
-        - state: animated_superwhite
+      - state: animated_superwhite
+        shader: unshaded
 
 - type: ghostTheme
   id: tier06
   components:
     - type: Sprite
       overrideContainerOcclusion: true # Ghosts always show up regardless of where they're contained.
-      noRot: true
       drawdepth: Ghosts
       sprite: Backmen/Mobs/Ghost/ghost_vip.rsi
-      state: animated_star
       color: "#fff8"
       layers:
-        - state: animated_star
+      - state: animated_star
+        shader: unshaded
 
 - type: ghostTheme
   id: tier07
   components:
     - type: Sprite
       overrideContainerOcclusion: true # Ghosts always show up regardless of where they're contained.
-      noRot: true
       drawdepth: Ghosts
       sprite: Backmen/Mobs/Ghost/ghost_vip.rsi
-      state: animated_faceless
       color: "#fff8"
       layers:
-        - state: animated_faceless
+      - state: animated_faceless
+        shader: unshaded
 
 - type: ghostTheme
   id: tier08
   components:
     - type: Sprite
       overrideContainerOcclusion: true # Ghosts always show up regardless of where they're contained.
-      noRot: true
       drawdepth: Ghosts
       sprite: Backmen/Mobs/Ghost/ghost_vip.rsi
-      state: animated_kaiju
       color: "#fff8"
       layers:
-        - state: animated_kaiju
+      - state: animated_kaiju
+        shader: unshaded
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,6 @@ @@
       - Omega
       - Reach
       - Bagel
-      - Train
       - CorvaxSplit
       - Oasis
       - no_madDelta