Forge-Station · gordod3 · Jul 15, 2026 · Jul 15, 2026 · Jul 16, 2026 · Jul 16, 2026
diff --git a/Content.Shared/_NF/Clothing/EntitySystems/NFMoonBootsSystem.cs b/Content.Shared/_NF/Clothing/EntitySystems/NFMoonBootsSystem.cs
@@ -13,6 +13,7 @@ namespace Content.Shared._NF.Clothing.EntitySystems;
 
 public sealed partial class SharedNFMoonBootsSystem : EntitySystem
 {
+    [Dependency] private SharedGravitySystem _gravity = default!; /// Change-Forge
     [Dependency] private AlertsSystem _alerts = default!;
     [Dependency] private ClothingSystem _clothing = default!;
     [Dependency] private InventorySystem _inventory = default!;
@@ -40,6 +41,7 @@ private void OnToggled(Entity<NFMoonBootsComponent> ent, ref ItemToggledEvent ar
             && uid == worn)
         {
             UpdateMoonbootEffects(container.Owner, ent, args.Activated);
+            _gravity.RefreshWeightless(container.Owner); /// Change-Forge
         }
 
         var prefix = args.Activated ? "on" : null;
@@ -50,11 +52,13 @@ private void OnToggled(Entity<NFMoonBootsComponent> ent, ref ItemToggledEvent ar
     private void OnGotUnequipped(Entity<NFMoonBootsComponent> ent, ref ClothingGotUnequippedEvent args)
     {
         UpdateMoonbootEffects(args.Wearer, ent, false);
+        _gravity.RefreshWeightless(args.Wearer); /// Change-Forge
     }
 
     private void OnGotEquipped(Entity<NFMoonBootsComponent> ent, ref ClothingGotEquippedEvent args)
     {
         UpdateMoonbootEffects(args.Wearer, ent, _toggle.IsActivated(ent.Owner));
+        _gravity.RefreshWeightless(args.Wearer); /// Change-Forge
     }
 
     public void UpdateMoonbootEffects(EntityUid user, Entity<NFMoonBootsComponent> ent, bool state)

diff --git a/Resources/Locale/ru-RU/_NF/chat/emotes.ftl b/Resources/Locale/ru-RU/_NF/chat/emotes.ftl
@@ -59,5 +59,4 @@ chat-emote-msg-vulpkanin-whines = скулит
 chat-emote-msg-vulpkanin-howls = воет
 chat-emote-msg-vulpkanin-awoo = воет
 
-chat-emote-name-hiss = Шипеть
 chat-emote-msg-hiss = шипит
diff --git a/Resources/Locale/ru-RU/recipes/recipes.ftl b/Resources/Locale/ru-RU/recipes/recipes.ftl
@@ -90,4 +90,4 @@ construction-recipe-suit-storage = { ent-SuitStorageBase }
 construction-recipe-suit-storage-desc = { ent-SuitStorageBase.desc }
 
 construction-recipe-suit-storage-wallmount = { ent-SuitStorageWallmount }
-construction-recipe-suit-storage-desc = { ent-SuitStorageWallmount.desc }
+construction-recipe-suit-storage-wallmount-desc = { ent-SuitStorageWallmount.desc }
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -34,7 +34,7 @@
   - type: Tag
     tags:
     - BoxCardboard
-    - Trash # Frontier
+    # - Trash # Frontier #Forge-Change-Del
 
 - type: entity
   name: mousetrap box

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -361,6 +361,17 @@
           prob: 0.1
         - id: ShardGlassPlasma
           prob: 0.1
+          # Forge-Change-Start
+          # Goblin
+        - id: FireExtinguisher
+          prob: 0.05
+        - id: TrashBag
+          prob: 0.2
+        - id: Beaker
+          prob: 0.05
+        - id: DrinkColaCanEmpty
+          prob: 0.15
+          # Forge-Change-End
 
 - type: entity
   id: CrateCandles

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml
@@ -27,6 +27,7 @@
       - id: FoodTinMRETrash # Frontier
       - id: MysteryFigureBoxTrash # Frontier
       - id: FoodPSBTrash # Frontier
+      - id: DrinkColaCanEmpty # Forge-Change
     - !type:GroupSelector
       weight: 5
       children:
@@ -35,6 +36,8 @@
       - id: TrashBananaPeel # Frontier
       - id: FoodCornTrash # Frontier
       - id: TrashNapkin # Frontier
+      - id: Beaker      # Forge-Change
+      - id: DrinkGlass  # Forge-Change
 
 - type: entity
   name: Trash Spawner

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -345,10 +345,12 @@
 - type: weightedRandomEntity
   id: RatKingLoot
   weights: # DeltaV: Rebalanced for Rodentia rummaging because we don't have Rat King
-    RandomSpawner100: 100 #garbage
-#    FoodCheeseSlice: 15 #food
-#    RandomSnacks: 10
-#    RandomFoodSingle: 5
+  # Forge-Change-Start
+    RandomSpawner100: 85 #garbage
+    FoodCheeseSlice: 5   #food
+    RandomSnacks: 5
+    RandomFoodSingle: 5
+  # Forge-Change-End
 
 - type: entity
   id: ActionRatKingRaiseArmy

diff --git a/Resources/Prototypes/Entities/Objects/Materials/scrap.yml b/Resources/Prototypes/Entities/Objects/Materials/scrap.yml
@@ -26,6 +26,7 @@
     tags:
     - Recyclable
     - GoblinPreciousTrash # Forge-Change
+    - Trash               # Forge-Change
 
 - type: entity
   parent: BaseStructure
@@ -125,6 +126,8 @@
   - type: Tag
     tags:
     - MachineBoard
+    - Trash
+    - Recyclable
   # Forge-Change-End
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -93,8 +93,8 @@
   - type: StaticPrice
     price: 30
   - type: DnaSubstanceTrace
-  - type: TrashOnSolutionEmpty # Frontier
-    solution: beaker # Frontier
+  # - type: TrashOnSolutionEmpty # Frontier # Forge-Change-Del
+  #   solution: beaker # Frontier           # Forge-Change-Del
 
 - type: entity
   parent: BaseItem

diff --git a/Resources/Prototypes/Entities/Objects/Tools/binoculars.yml b/Resources/Prototypes/Entities/Objects/Tools/binoculars.yml
@@ -14,7 +14,7 @@
     delay: 1.0
   - type: CursorOffsetRequiresWield
   - type: EyeCursorOffset
-    maxOffset: 5
+    maxOffset: 10 # Forge-Change
     pvsIncrease: 0.5
   - type: SpeedModifiedOnWield
     walkModifier: 0.95

diff --git a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
@@ -68,5 +68,5 @@
   #   materialComposition:
   #     Plastic: 50
   - type: DnaSubstanceTrace
-  - type: TrashOnSolutionEmpty # Frontier
-    solution: bucket # Frontier
+  # - type: TrashOnSolutionEmpty # Frontier # Forge-Change-Del
+  #   solution: bucket # Frontier           # Forge-Change-Del
diff --git a/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml b/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml
@@ -38,6 +38,7 @@
         sound:
           collection: MetalGlassBreak
       - !type:ExplodeBehavior
+  - type: GravityAffected # Forge-Change
 
 - type: entity
   parent: BaseVehicle

diff --git a/Resources/Prototypes/Entities/Structures/Machines/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/frame.yml
@@ -130,6 +130,7 @@
           whitelist:
             components:
             - MachineBoard
+    - type: GravityAffected # Forge-Change
 
 - type: entity
   id: MachineFrameDestroyed

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -633,6 +633,7 @@
       sprite: Structures/Storage/Crates/labels.rsi
       offset: "0.0,0.03125"
       map: ["enum.PaperLabelVisuals.Layer"]
+  - type: RatKingRummageable # Forge-Change
 
 - type: entity
   parent: CrateBaseSecure

diff --git a/Resources/Prototypes/_Forge/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/_Forge/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -62,6 +62,7 @@
     - type: Tag
       tags:
       - PortableGeneratorClunkerCircuitboard
+      - Trash
 
 - type: entity
   id: GoblinThrusterCircuitboard
@@ -89,6 +90,7 @@
     - type: Tag
       tags:
       - GoblinThrusterCircuitboard
+      - Trash
 
 - type: entity
   id: GoblinComputerShuttleCircuitboard
@@ -110,6 +112,9 @@
     - type: Construction
       graph: goblin_makeshift_circuit
       node: goblinComputerShuttleCircuitboard
+    - type: Tag
+      tags:
+      - Trash
 
 - type: entity
   parent: BaseItem
@@ -127,3 +132,6 @@
   - type: Construction
     graph: goblin_makeshift_circuit
     node: incompleteCircuitboard
+  - type: Tag
+    tags:
+    - Trash
diff --git a/Resources/Prototypes/_Forge/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/_Forge/Entities/Structures/Shuttles/thrusters.yml
@@ -18,6 +18,8 @@
         shader: unshaded
         visible: false
         offset: 0, 0.5
+    - type: Machine
+      board: GoblinThrusterCircuitboard
     - type: Construction
       graph: goblin_machinery
       node: goblinThruster
diff --git a/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/base_launcher.yml b/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/base_launcher.yml
@@ -72,6 +72,7 @@
   - type: Repairable
     qualities:
     - Applicating
+  - type: GravityAffected # Forge-Change
 
 - type: entity
   id: BallisticArtilleryUnanchorable
@@ -172,6 +173,7 @@
   - type: Repairable
     qualities:
     - Applicating
+  - type: GravityAffected # Forge-Change
 
 - type: entity
   id: BallisticArtilleryCartridge
@@ -284,6 +286,7 @@
   - type: Repairable
     qualities:
     - Applicating
+  - type: GravityAffected # Forge-Change
 
 - type: entity
   id: BallisticArtilleryMagazine
@@ -341,6 +344,7 @@
       - !type:PlaySoundBehavior
         sound:
           collection: MetalBreak
+  - type: GravityAffected # Forge-Change
 
 - type: entity
   id: BallisticArtilleryTier2HP # Normal weapons, slightly stronger than plastitanium. This is the baseline durability for your average sized anchorable weapon.
@@ -361,6 +365,7 @@
       - !type:PlaySoundBehavior
         sound:
           collection: MetalBreak
+  - type: GravityAffected # Forge-Change
 
 - type: entity
   id: BallisticArtilleryTier3HP # Medium weapons. Reinforced plastitanium level. Typical for medium-class weapons. In-between heavy artillery and standard anchorables.
@@ -387,6 +392,7 @@
       - !type:PlaySoundBehavior
         sound:
           collection: MetalBreak
+  - type: GravityAffected # Forge-Change
 
 - type: entity
   id: BallisticArtilleryTier4HP # Capital Weapons. Cyrexas, main cannons. Anything really big.
@@ -413,6 +419,7 @@
       - !type:PlaySoundBehavior
         sound:
           collection: MetalBreak
+  - type: GravityAffected # Forge-Change
 
 - type: entity
   id: BallisticArtilleryTier5HP # Supercapital class armament, station outpost weaponry and capital pre-fracture weaponry, around 4x Reinforced Plastitanium Health.
@@ -439,3 +446,4 @@
       - !type:PlaySoundBehavior
         sound:
           collection: MetalBreak
+  - type: GravityAffected # Forge-Change
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/salvage.yml
@@ -58,4 +58,4 @@
 - type: entity
   id: NFCrateSalvageAssortedGoodiesTrashCart
   categories: [ HideSpawnMenu ]
-  parent: [ CrateTrashCart, NFCrateSalvageAssortedGoodies ]
+  parent: [ CrateTrashCartFilled ] # Forge-Change
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/trash_box.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/trash_box.yml
@@ -115,4 +115,5 @@
       - Recyclable
       - Trash
     maxItemSize: Huge # so you can pick up scrap chunks
+  - type: RatKingRummageable
     # Forge-Change-End