Removed Datafarms

Content.Server/_Goobstation/ItemMiner/Systems/ItemMinerSystem.cs

@@ -3,15 +3,13 @@
 using Content.Server.Power.EntitySystems;
 using Content.Server.Stack;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
 namespace Content.Server._Goobstation.ItemMiner;
 
 public sealed class ItemMinerSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly IRobustRandom _gambling = default!;
     [Dependency] private readonly PowerReceiverSystem _power = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly StackSystem _stack = default!;
@@ -66,9 +64,6 @@ public override void Update(float frameTime)
                 continue;
             miner.NextAt += miner.Interval;
 
-            if (miner.SpawnChance < 1f && !_gambling.Prob(miner.SpawnChance))
-                continue;
-
             // mine
             var minedUid = Spawn(proto, xform.Coordinates);
             var ev = new ItemMinedEvent(minedUid);

Content.Shared/Construction/SharedFlatpackSystem.cs

@@ -50,7 +50,7 @@ private void OnInsertAttempt(Entity<FlatpackCreatorComponent> ent, ref ItemSlotI
         if (args.Slot.ID != ent.Comp.SlotId || args.Cancelled)
             return;
 
-        if (TryComp<MachineBoardComponent>(args.Item, out var board) && board.Flatpackable) // Mono
+        if (HasComp<MachineBoardComponent>(args.Item))
             return;
 
         if (TryComp<ComputerBoardComponent>(args.Item, out var computer) && computer.Prototype != null)

Content.Shared/_Goobstation/ItemMiner/ItemMinerComponent.cs

@@ -41,12 +41,6 @@ public sealed partial class ItemMinerComponent : Component
     [DataField]
     public TimeSpan Interval = TimeSpan.FromSeconds(10.0f);
 
-    /// <summary>
-    /// Chance to actually spawn the result each interval.
-    /// </summary>
-    [DataField]
-    public float SpawnChance = 1f;
-
     /// <summary>
     /// Whether to need to be anchored to run.
     /// </summary>

Resources/Locale/en-US/_Mono/research/experimental.ftl

@@ -2,7 +2,5 @@ research-technology-xenopsychology = Xenopsychology
 research-technology-bluespace-tethering = Bluespace Tethering
 research-technology-basic-parts = Basic Components
 
-research-technology-data-farms = Data Farming
-
 research-technology-basic-research = Basic Research
-research-technology-advanced-research = Advanced Research
+research-technology-advanced-research = Advanced Research

Resources/Maps/Dungeon/experiment.yml

@@ -8695,7 +8695,7 @@ entities:
     - type: Transform
       pos: 42.607162,12.70194
       parent: 1653
-- proto: ResearchDisk10000
+- proto: ResearchDisk
   entities:
   - uid: 1625
     components:

Resources/Maps/Salvage/medium-1.yml

@@ -855,7 +855,7 @@ entities:
     - type: Transform
       pos: -3.5,-0.5
       parent: 85
-- proto: ResearchDisk10000
+- proto: ResearchDisk
   entities:
   - uid: 87
     components:

Resources/Maps/_Mono/POI/pdvhelios.yml

@@ -9193,7 +9193,7 @@ entities:
     - type: Transform
       pos: 1.5,67.5
       parent: 1
-- proto: DatafarmResearchFaction
+- proto: BaseResearchAndDevelopmentPointSource
   entities:
   - uid: 316
     components:

Resources/Maps/_Mono/POI/tsfmchalcyon.yml

@@ -10974,13 +10974,15 @@ entities:
       rot: 3.141592653589793 rad
       pos: 24.5,-13.5
       parent: 1
-- proto: DatafarmResearchFaction
+- proto: BaseResearchAndDevelopmentPointSource
   entities:
   - uid: 1217
     components:
     - type: Transform
       pos: -3.5,9.5
       parent: 1
+    missingComponents:
+    - Anchorable
 - proto: Bed
   entities:
   - uid: 1218

Resources/Maps/_Mono/POI/usspbaikal.yml

@@ -9118,7 +9118,7 @@ entities:
     - type: Transform
       pos: 63.5,60.5
       parent: 1
-- proto: DatafarmResearchFaction
+- proto: BaseResearchAndDevelopmentPointSource
   entities:
   - uid: 716
     components:

Resources/Maps/reach.yml

@@ -1900,7 +1900,7 @@ entities:
     - type: Transform
       pos: -9.5,6.5
       parent: 2
-- proto: DatafarmResearchFaction
+- proto: BaseResearchAndDevelopmentPointSource
   entities:
   - uid: 82
     components:

Resources/Prototypes/Catalog/Fills/Crates/salvage.yml

@@ -44,7 +44,7 @@
         prob: 0.1
       - id: WelderIndustrialAdvanced
         prob: 0.1
-      - id: ResearchDisk10000 # Mono
+      - id: ResearchDisk
         prob: 0.1
       - id: SheetUranium
         prob: 0.1

Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml

@@ -71,7 +71,7 @@
       weight: 10
       children:
       - id: ClothingBeltUtilityFilled
-      - id: ResearchDisk10000
+      - id: ResearchDisk
       - id: ResearchDisk35000
       - id: RandomInstruments
 

Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml

@@ -93,7 +93,7 @@
     - id: SheetPlasma1
       amount: !type:RangeNumberSelector
         range: 3, 5
-    - id: ResearchDisk10000
+    - id: ResearchDisk
     - id: DrinkGoldenCup
     - id: TreasureSampleTube
     - !type:NestedSelector

Resources/Prototypes/Entities/Objects/Decoration/present.yml

@@ -234,7 +234,7 @@
         orGroup: GiftPool
       - id: WeaponFlareGun
         orGroup: GiftPool
-      - id: ResearchDisk10000
+      - id: ResearchDisk
         orGroup: GiftPool
       - id: Machete
         orGroup: GiftPool

Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml

@@ -100,9 +100,6 @@
     points: 10000
   - type: StaticPrice
     price: 2000
-  - type: Tag
-    tags:
-    - ResearchDisk10000
 
 - type: entity
   parent: ResearchDisk
@@ -140,9 +137,6 @@
     points: 10000
   - type: StaticPrice # Frontier
     price: 2000 # Mono
-  - type: Tag
-    tags:
-    - ResearchDisk10000
 
 - type: entity
   parent: ResearchDisk

Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml

@@ -1,10 +1,14 @@
 - type: entity
   abstract: true
   parent: BaseStructure
-  id: BaseMachineIndestructible # Mono: Changed to BaseMachineIndestructible and removed destructible/damageable components
+  id: BaseMachine
   components:
   - type: Animateable
   - type: InteractionOutline
+  - type: Anchorable
+    delay: 2
+  - type: Physics
+    bodyType: Static
   - type: Transform
     noRot: true
   - type: Fixtures
@@ -18,30 +22,17 @@
         - MachineMask
         layer:
         - MachineLayer
-  - type: LanguageSpeaker # Einstein Engines - Language - Yes, on BASE MACHINE. This is all I need to make sure that in 99% of cases, machines use the language system.
-  - type: LanguageKnowledge # Einstein Engines - Language
-    speaks:
-    - TauCetiBasic
-    understands:
-    - TauCetiBasic
-  - type: Climbable # mono
-  - type: FootstepModifier # mono
-    footstepSoundCollection:
-      collection: FootstepHull
-
-- type: entity
-  abstract: true
-  parent: BaseMachineIndestructible
-  id: BaseMachine # Mono: Changed to parent off of previous BaseMachine but without destructible/damageable components
-  components:
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:
         !type:DamageTrigger
         damage: 200
       behaviors:
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
     - trigger:
         !type:DamageTrigger
         damage: 100
@@ -51,11 +42,16 @@
       - !type:PlaySoundBehavior
         sound:
           collection: MetalBreak
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
-  - type: Anchorable
-    delay: 2
+  - type: LanguageSpeaker # Einstein Engines - Language - Yes, on BASE MACHINE. This is all I need to make sure that in 99% of cases, machines use the language system.
+  - type: LanguageKnowledge # Einstein Engines - Language
+    speaks:
+    - TauCetiBasic
+    understands:
+    - TauCetiBasic
+  - type: Climbable # mono
+  - type: FootstepModifier # mono
+    footstepSoundCollection:
+      collection: FootstepHull
 
 - type: entity
   abstract: true