aaaaaaaaaaaaaaaaa

Simple-Station · Sep 22, 2024 · b27c093 · b27c093
1 parent 9c6df29
commit b27c093
Show file tree

Hide file tree

Showing 12 changed files with 153 additions and 171 deletions.
diff --git a/Content.Server/StationEvents/Components/RampingStationEventSchedulerComponent.cs b/Content.Server/StationEvents/Components/RampingStationEventSchedulerComponent.cs
@@ -24,6 +24,7 @@ public sealed partial class RampingStationEventSchedulerComponent : Component
     /// <summary>
     ///     The number by which average expected shift length is multiplied. Higher values lead to slower chaos growth.
     /// </summary>
+    [DataField]
     public float ShiftLengthModifier = 1f;
 
     // Everything below is overridden in the RampingStationEventSchedulerSystem based on CVars

diff --git a/Resources/Maps/Salvage/vegan-meatball.yml b/Resources/Maps/Salvage/vegan-meatball.yml
@@ -505,7 +505,7 @@ entities:
         chemicals:
           THC:
             Inherent: True
-            PotencyDivisor: 10
+            potencyDivisor: 10
             Max: 10
             Min: 1
         productPrototypes:
@@ -578,7 +578,7 @@ entities:
         chemicals:
           Stellibinin:
             Inherent: True
-            PotencyDivisor: 4
+            potencyDivisor: 4
             Max: 25
             Min: 1
         productPrototypes:

diff --git a/Resources/Prototypes/DeltaV/Recipes/Construction/clothing.yml b/Resources/Prototypes/DeltaV/Recipes/Construction/clothing.yml
@@ -21,7 +21,7 @@
   objectType: Item
 
 - type: constructionGraph
-  id: PrescriptionMedHud
+  id: ClothingEyesPrescriptionMedHud
   start: start
   graph:
     - node: start
@@ -53,7 +53,7 @@
       entity: ClothingEyesPrescriptionMedHud
 
 - type: constructionGraph
-  id: PrescriptionSecHud
+  id: ClothingEyesPrescriptionSecHud
   start: start
   graph:
     - node: start

diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -631,7 +631,7 @@
         settings: short
     - type: GhostTakeoverAvailable
     - type: Loadout
-      prototypes: [ JobCargoTechnician ]
+      prototypes: [ CargoTechGear ]
     - type: RandomMetadata
       nameSegments:
       - names_first
@@ -686,7 +686,7 @@
         settings: short
     - type: GhostTakeoverAvailable
     - type: Loadout
-      prototypes: [ JobClown ]
+      prototypes: [ ClownGear ]
     - type: RandomMetadata
       nameSegments:
       - names_clown
@@ -744,7 +744,7 @@
         settings: short
     - type: GhostTakeoverAvailable
     - type: Loadout
-      prototypes: [ JobChef ]
+      prototypes: [ ChefGear ]
     - type: RandomMetadata
       nameSegments:
       - names_first
@@ -807,7 +807,7 @@
         settings: default
     - type: GhostTakeoverAvailable
     - type: Loadout
-      prototypes: [ JobResearchDirector ]
+      prototypes: [ ResearchDirectorGear ]
     - type: RandomMetadata
       nameSegments:
       - names_first
@@ -825,7 +825,7 @@
         settings: default
     - type: GhostTakeoverAvailable
     - type: Loadout
-      prototypes: [ JobChiefMedicalOfficer ]
+      prototypes: [ ChiefMedicalOfficerGear ]
     - type: RandomMetadata
       nameSegments:
       - names_first
@@ -843,7 +843,7 @@
         settings: default
     - type: GhostTakeoverAvailable
     - type: Loadout
-      prototypes: [ JobCaptain ]
+      prototypes: [ CaptainGear ]
     - type: RandomMetadata
       nameSegments:
       - names_first

diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -109,7 +109,6 @@
   - type: WeldingHealing # Same as Brutepack - Estacao Pirata IPCs
     damageContainers:
       - Silicon
-    FuelCost: 5
     damage:
       types:
         Blunt: -15

diff --git a/Resources/Prototypes/Entities/Structures/Specific/oracle.yml b/Resources/Prototypes/Entities/Structures/Specific/oracle.yml
@@ -33,7 +33,6 @@
       fountain:
         maxVol: 200
   - type: Drink
-    isOpen: true
     solution: fountain
   - type: DrawableSolution
     solution: fountain
@@ -59,14 +58,6 @@
     rewardEntities:
     - OracleRewardDisks
     - OracleRewardCrystals
-    demandBlacklist:
-      tags:
-      - Bluespace
-      components:
-      - MobState
-    demandWhitelist:
-      components:
-      - Item
   - type: LanguageSpeaker
     currentLanguage: TauCetiBasic
   - type: LanguageKnowledge

diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -549,8 +549,6 @@
         node: girder
       - !type:DoActsBehavior
         acts: ["Destruction"]
-    destroySound:
-      collection: MetalBreak
   - type: IconSmooth
     key: walls
     base: reinf_over
@@ -806,8 +804,6 @@
         node: girder
       - !type:DoActsBehavior
         acts: ["Destruction"]
-    destroySound:
-      collection: MetalBreak
   - type: Construction
     graph: Girder
     node: diagonalshuttleWall