yeag

TheDenSS14 · Nov 24, 2024 · 68868ed · 68868ed
1 parent c8eadb6
commit 68868ed
Show file tree

Hide file tree

Showing 36 changed files with 940 additions and 934 deletions.
diff --git a/Content.Shared/Medical/Surgery/Tools/BoneSetterComponent.cs b/Content.Shared/Medical/Surgery/Tools/BoneSetterComponent.cs
@@ -3,4 +3,10 @@
 namespace Content.Shared.Medical.Surgery.Tools;
 
 [RegisterComponent, NetworkedComponent]
-public sealed partial class BoneSetterComponent : Component;
+public sealed partial class BoneSetterComponent : Component, ISurgeryToolComponent
+{
+    public string ToolName => "a bone setter";
+    public bool? Used { get; set; } = null;
+    [DataField]
+    public float Speed { get; set; } = 1f;
+}
diff --git a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
@@ -33,7 +33,7 @@ public sealed partial class LatheRecipePrototype : IPrototype
         [DataField("icon")]
         public SpriteSpecifier? Icon;
 
-        [DataField("completetime")]
+        [DataField("completeTime")]
         private TimeSpan _completeTime = TimeSpan.FromSeconds(5);
 
         [DataField("materials", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<int, MaterialPrototype>))]

diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/clothing.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/clothing.yml
@@ -3,28 +3,28 @@
 - type: latheRecipe
   id: ClothingUniformJumpsuitSecBlue
   result: ClothingUniformJumpsuitSecBlue
-  completetime: 4
+  completeTime: 4
   materials:
     Cloth: 300
 
 - type: latheRecipe
   id: ClothingUniformJumpsuitSecGrey
   result: ClothingUniformJumpsuitSecGrey
-  completetime: 4
+  completeTime: 4
   materials:
     Cloth: 300
 
 - type: latheRecipe
   id: ClothingUniformJumpsuitWardenBlue
   result: ClothingUniformJumpsuitWardenBlue
-  completetime: 4
+  completeTime: 4
   materials:
     Cloth: 300
 
 - type: latheRecipe
   id: ClothingUniformJumpsuitWardenGrey
   result: ClothingUniformJumpsuitWardenGrey
-  completetime: 4
+  completeTime: 4
   materials:
     Cloth: 300
 
@@ -33,42 +33,42 @@
 - type: latheRecipe
   id: ClothingUniformJumpskirtSecBlue
   result: ClothingUniformJumpskirtSecBlue
-  completetime: 4
+  completeTime: 4
   materials:
     Cloth: 300
 
 - type: latheRecipe
   id: ClothingUniformJumpskirtSecGrey
   result: ClothingUniformJumpskirtSecGrey
-  completetime: 4
+  completeTime: 4
   materials:
     Cloth: 300
 
 - type: latheRecipe
   id: ClothingUniformJumpskirtHoSBlue
   result: ClothingUniformJumpskirtHoSBlue
-  completetime: 4
+  completeTime: 4
   materials:
     Cloth: 300
 
 - type: latheRecipe
   id: ClothingUniformJumpskirtHoSGrey
   result: ClothingUniformJumpskirtHoSGrey
-  completetime: 4
+  completeTime: 4
   materials:
     Cloth: 300
 
 - type: latheRecipe
   id: ClothingUniformJumpskirtWardenBlue
   result: ClothingUniformJumpskirtWardenBlue
-  completetime: 4
+  completeTime: 4
   materials:
     Cloth: 300
 
 - type: latheRecipe
   id: ClothingUniformJumpskirtWardenGrey
   result: ClothingUniformJumpskirtWardenGrey
-  completetime: 4
+  completeTime: 4
   materials:
     Cloth: 300
 
@@ -77,6 +77,6 @@
 - type: latheRecipe
   id: ClothingOuterStasecSweater
   result: ClothingOuterStasecSweater
-  completetime: 4
+  completeTime: 4
   materials:
     Cloth: 500
diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/electronics.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/electronics.yml
@@ -1,7 +1,7 @@
 - type: latheRecipe
   id: SalvageExpeditionsComputerCircuitboard
   result: SalvageExpeditionsComputerCircuitboard
-  completetime: 4
+  completeTime: 4
   materials:
      Steel: 100
      Glass: 900

diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml
@@ -2,31 +2,31 @@
   id: SpeedLoaderSpecial
   result: SpeedLoaderSpecial
   category: Ammo
-  completetime: 5
+  completeTime: 5
   materials:
     Steel: 200
 
 - type: latheRecipe
   id: MagazinePistolSpecial
   result: MagazinePistolSpecial
   category: Ammo
-  completetime: 5
+  completeTime: 5
   materials:
     Steel: 100
 
 - type: latheRecipe
   id: CartridgeSpecial
   result: CartridgeSpecial
   category: Ammo
-  completetime: 2
+  completeTime: 2
   materials:
     Steel: 20
 
 - type: latheRecipe
   id: CartridgeSpecialRubber
   result: CartridgeSpecialRubber
   category: Ammo
-  completetime: 2
+  completeTime: 2
   materials:
     Plastic: 5
     Steel: 5
@@ -35,15 +35,15 @@
   id: CartridgeSpecialIncendiary
   result: CartridgeSpecialIncendiary
   category: Ammo
-  completetime: 2
+  completeTime: 2
   materials:
     Plastic: 20
 
 - type: latheRecipe
   id: CartridgeSpecialUranium
   result: CartridgeSpecialUranium
   category: Ammo
-  completetime: 2
+  completeTime: 2
   materials:
     Plastic: 20
     Uranium: 10
@@ -52,7 +52,7 @@
   id: CartridgeSpecialHoly
   result: CartridgeSpecialHoly
   category: Ammo
-  completetime: 2
+  completeTime: 2
   materials:
     Steel: 15
     Silver: 5
@@ -61,7 +61,7 @@
   id: CartridgeSpecialMindbreaker
   result: CartridgeSpecialMindbreaker
   category: Ammo
-  completetime: 2
+  completeTime: 2
   materials:
     Plastic: 15
     Steel: 5
@@ -71,23 +71,23 @@
   id: MagazineBoxSpecial
   result: MagazineBoxSpecial
   category: Ammo
-  completetime: 5
+  completeTime: 5
   materials:
     Steel: 1250
 
 - type: latheRecipe
   id: MagazineBoxSpecialPractice
   result: MagazineBoxSpecialPractice
   category: Ammo
-  completetime: 5
+  completeTime: 5
   materials:
     Plastic: 1200
 
 - type: latheRecipe
   id: MagazineBoxSpecialRubber
   result: MagazineBoxSpecialRubber
   category: Ammo
-  completetime: 5
+  completeTime: 5
   materials:
     Steel: 350
     Plastic: 300
@@ -96,15 +96,15 @@
   id: MagazineBoxSpecialIncendiary
   result: MagazineBoxSpecialIncendiary
   category: Ammo
-  completetime: 5
+  completeTime: 5
   materials:
     Plastic: 1250
 
 - type: latheRecipe
   id: MagazineBoxSpecialUranium
   result: MagazineBoxSpecialUranium
   category: Ammo
-  completetime: 5
+  completeTime: 5
   materials:
     Plastic: 1250
     Uranium: 125
@@ -113,7 +113,7 @@
   id: MagazineBoxSpecialMindbreaker
   result: MagazineBoxSpecialMindbreaker
   category: Ammo
-  completetime: 5
+  completeTime: 5
   materials:
     Plastic: 1250
     Steel: 75
@@ -122,15 +122,15 @@
 - type: latheRecipe
   id: ClothingOuterArmorPlateCarrier
   result: ClothingOuterArmorPlateCarrier
-  completetime: 10
+  completeTime: 10
   materials:
     Steel: 1500
     Plastic: 1500
 
 - type: latheRecipe
   id: ClothingOuterArmorDuraVest
   result: ClothingOuterArmorDuraVest
-  completetime: 10
+  completeTime: 10
   materials:
     Steel: 500
     Plastic: 1000
@@ -139,7 +139,7 @@
   id: WeaponEnergyGun
   result: WeaponEnergyGun
   category: Weapons
-  completetime: 8
+  completeTime: 8
   materials:
     Steel: 2000
     Glass: 800
@@ -149,7 +149,7 @@
   id: WeaponEnergyGunMini
   result: WeaponEnergyGunMini
   category: Weapons
-  completetime: 4
+  completeTime: 4
   materials:   #Half of Energy Gun Recipe
     Steel: 1000
     Glass: 400
@@ -159,7 +159,7 @@
   id: WeaponEnergyGunPistol
   result: WeaponEnergyGunPistol
   category: Weapons
-  completetime: 10
+  completeTime: 10
   materials:
     Steel: 1500
     Glass: 600
@@ -170,7 +170,7 @@
   id: WeaponGunLaserCarbineAutomatic
   result: WeaponGunLaserCarbineAutomatic
   category: Weapons
-  completetime: 15
+  completeTime: 15
   materials:
     Steel: 2000
     Glass: 1000

diff --git a/Resources/Prototypes/Floof/Recipes/Lathes/language.yml b/Resources/Prototypes/Floof/Recipes/Lathes/language.yml
@@ -1,7 +1,7 @@
 - type: latheRecipe
   id: ArachnicTranslator
   result: ArachnicTranslator
-  completetime: 2
+  completeTime: 2
   materials:
     Steel: 500
     Glass: 100
@@ -11,7 +11,7 @@
 - type: latheRecipe
   id: ArachnicTranslatorImplanter
   result: ArachnicTranslatorImplanter
-  completetime: 2
+  completeTime: 2
   materials:
     Steel: 500
     Glass: 500

diff --git a/Resources/Prototypes/Floof/Recipes/Lathes/medical.yml b/Resources/Prototypes/Floof/Recipes/Lathes/medical.yml
@@ -1,7 +1,7 @@
 - type: latheRecipe
   id: HypoMini
   result: HypoMini
-  completetime: 40
+  completeTime: 40
   materials:
     PlasmaGlass: 500
     Plasteel: 500

diff --git a/Resources/Prototypes/Floof/Recipes/Lathes/security.yml b/Resources/Prototypes/Floof/Recipes/Lathes/security.yml
@@ -2,14 +2,14 @@
   id: MagazineMagnumEmpty
   result: MagazineMagnumEmpty
   category: Ammo
-  completetime: 5
+  completeTime: 5
   materials:
     Steel: 50
 
 - type: latheRecipe
   id: MagazineMagnum
   result: MagazineMagnum
   category: Ammo
-  completetime: 5
+  completeTime: 5
   materials:
      Steel: 210