Merge branch 'Fansana:master' into secmagboots

Fansana · Nov 14, 2024 · b36de03 · b36de03
2 parents 6d960bc + 20d89fd
commit b36de03
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 12 deletions.
diff --git a/Content.Server/Arcade/BlockGame/BlockGame.Ui.cs b/Content.Server/Arcade/BlockGame/BlockGame.Ui.cs
@@ -157,7 +157,7 @@ private void InputTick(float frameTime)
     /// <param name="message">The message to broadcase to all players/spectators.</param>
     private void SendMessage(BoundUserInterfaceMessage message)
     {
-        _uiSystem.ServerSendUiMessage(_entityManager.GetEntity(message.Entity), BlockGameUiKey.Key, message);
+        _uiSystem.ServerSendUiMessage(_owner, BlockGameUiKey.Key, message);
     }
 
     /// <summary>
@@ -167,7 +167,7 @@ private void SendMessage(BoundUserInterfaceMessage message)
     /// <param name="actor">The target recipient.</param>
     private void SendMessage(BoundUserInterfaceMessage message, EntityUid actor)
     {
-        _uiSystem.ServerSendUiMessage(_entityManager.GetEntity(message.Entity), BlockGameUiKey.Key, message, actor);
+        _uiSystem.ServerSendUiMessage(_owner, BlockGameUiKey.Key, message, actor);
     }
 
     /// <summary>

diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml
@@ -1410,8 +1410,38 @@ Entries:
   url: https://github.com/Fansana/floofstation1/pull/328
 - author: SleepyScarecrow
   changes:
-  - type: Tweak
-    message: Tweaked Dark Oasis Recipe
+    - type: Tweak
+      message: Tweaked Dark Oasis Recipe
   id: 181
   time: '2024-11-11T06:50:56.0000000+00:00'
   url: https://github.com/Fansana/floofstation1/pull/341
+- author: Fansana
+  changes:
+    - type: Fix
+      message: Fixed block game UI!
+  id: 189
+  time: '2024-11-13T22:20:32.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/348
+- author: fenndragon
+  changes:
+    - type: Tweak
+      message: Tweaked Price
+  id: 190
+  time: '2024-11-14T09:55:10.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/353
+- author: Memeji
+  changes:
+    - type: Fix
+      message: Gladiators can no longer have bionics.
+    - type: Tweak
+      message: Bionic arm cannot opened powered doors. Cost reduced to 6 instead of 8.
+  id: 191
+  time: '2024-11-14T09:55:48.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/343
+- author: Fansana
+  changes:
+    - type: Tweak
+      message: Tweaked game mode votes
+  id: 192
+  time: '2024-11-14T09:57:52.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/350
diff --git a/Resources/Prototypes/Floof/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Floof/Catalog/Cargo/cargo_fun.yml
@@ -14,6 +14,6 @@
     sprite: Structures/Storage/Crates/xeno.rsi
     state: icon
   product: CrateNTxenos
-  cost: 100000
+  cost: 99999
   category: cargoproduct-category-name-fun
   group: market
diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml
@@ -365,6 +365,7 @@
       inverted: true
       jobs:
         - Prisoner # Bionics should be "Confiscated" from long term prisoners.
+        - Gladiator # Floof
     - !type:CharacterSpeciesRequirement
       species:
         - Human # Entirely arbitrary, I've decided I want a trait unique to humans. Since they don't normally get anything exciting.
@@ -403,6 +404,7 @@
       inverted: true
       jobs:
         - Prisoner # Bionics should be "Confiscated" from long term prisoners.
+        - Gladiator # Floof
     - !type:CharacterSpeciesRequirement
       inverted: true
       species:
@@ -420,16 +422,17 @@
 - type: trait
   id: BionicArm
   category: Physical
-  points: -8
+  points: -3 # Floof - since you can't get free JoL anymore
   requirements:
     - !type:CharacterJobRequirement
       inverted: true
       jobs:
         - Prisoner # Bionics should be "Confiscated" from long term prisoners.
+        - Gladiator # Floof
   components:
     - type: Prying
       speedModifier: 1
-      pryPowered: true
+      pryPowered: false # Floof
 
 - type: trait
   id: PlateletFactories
@@ -440,6 +443,7 @@
       inverted: true
       jobs:
         - Prisoner # Bionics should be "Confiscated" from long term prisoners.
+        - Gladiator # Floof
     - !type:CharacterSpeciesRequirement
       inverted: true
       species:
@@ -469,6 +473,7 @@
       inverted: true
       jobs:
         - Prisoner # Bionics should be "Confiscated" from long term prisoners.
+        - Gladiator # Floof
     - !type:CharacterSpeciesRequirement
       species:
         - Human
@@ -487,6 +492,7 @@
       inverted: true
       jobs:
         - Prisoner # Bionics should be "Confiscated" from long term prisoners.
+        - Gladiator # Floof
     - !type:CharacterTraitRequirement
       inverted: true
       traits:
@@ -509,6 +515,7 @@
       inverted: true
       jobs:
         - Prisoner # Bionics should be "Confiscated" from long term prisoners.
+        - Gladiator # Floof
     - !type:CharacterDepartmentRequirement
       departments:
         - Security
@@ -533,6 +540,7 @@
       inverted: true
       jobs:
         - Prisoner # Bionics should be "Confiscated" from long term prisoners.
+        - Gladiator # Floof
     - !type:CharacterTraitRequirement
       traits:
         - CyberEyes
@@ -558,6 +566,7 @@
       inverted: true
       jobs:
         - Prisoner # Bionics should be "Confiscated" from long term prisoners.
+        - Gladiator # Floof
     - !type:CharacterTraitRequirement
       traits:
         - CyberEyes
@@ -581,6 +590,7 @@
       inverted: true
       jobs:
         - Prisoner # Bionics should be "Confiscated" from long term prisoners.
+        - Gladiator # Floof
     - !type:CharacterDepartmentRequirement
       departments:
         - Security

diff --git a/Resources/Prototypes/game_presets.yml b/Resources/Prototypes/game_presets.yml
@@ -3,7 +3,7 @@
   alias:
     - survival
   name: survival-title
-  showInVote: true # secret # DeltaV - Me when the survival. Used for periapsis.
+  showInVote: false # secret # DeltaV - Me when the survival. Used for periapsis.
   description: survival-description
   rules:
     - RampingStationEventScheduler
@@ -14,7 +14,7 @@
   id: SurvivalHellshift
   alias:
     - hellshift
-  showInVote: true
+  showInVote: false
   name: hellshift-title
   description: hellshift-description
   rules:
@@ -25,7 +25,7 @@
 - type: gamePreset
   id: SurvivalIrregular
   alias: [irregular]
-  showInVote: true
+  showInVote: false
   name: irregular-title
   description: irregular-description
   rules:
@@ -62,7 +62,7 @@
   - extended
   - shittersafari
   name: extended-title
-  showInVote: true #2boring2vote # DeltaV - I'd like to disagree, used for periapsis.
+  showInVote: false #2boring2vote # DeltaV - I'd like to disagree, used for periapsis.
   description: extended-description
   rules:
   - BasicStationEventScheduler
@@ -127,7 +127,7 @@
     - traitor
   name: traitor-title
   description: traitor-description
-  showInVote: true
+  showInVote: false
   rules:
     - Traitor
     - SubGamemodesRule