Merge remote-tracking branch 'upstream/master' into submarine

Resources/Changelog/DeltaVChangelog.yml

@@ -1558,3 +1558,17 @@ Entries:
       message: Fixed missing Mantis stamp sprite.
   id: 234
   time: '2024-02-09T10:47:35.0000000+00:00'
+- author: FluffiestFloof
+  changes:
+    - type: Tweak
+      message: .38 Special is now in the ammo techfab.
+    - type: Fix
+      message: Fixed .38 Special Mindbreaker not breaking minds.
+  id: 235
+  time: '2024-02-10T23:17:28.0000000+00:00'
+- author: FluffiestFloof
+  changes:
+    - type: Fix
+      message: Fixed glimmer mite being extremely loud for some.
+  id: 236
+  time: '2024-02-10T23:21:56.0000000+00:00'

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml

@@ -48,10 +48,26 @@
 - type: entity
   id: BulletSpecialMindbreaker
   name: bullet (.38 special mindbreaker)
-  parent: BaseBullet
+  parent: BaseBulletPractice
   noSpawn: true
   components:
   - type: Projectile
     damage:
       types:
-        Blunt: 3
+        Blunt: 1
+  - type: SolutionContainerManager
+    solutions:
+      ammo:
+        maxVol: 9
+  - type: RefillableSolution
+    solution: ammo
+  - type: DrainableSolution
+    solution: ammo
+  - type: SolutionInjectOnCollide
+    transferAmount: 9
+    blockSlots: NONE #shouldn't be blocked by a mask
+  - type: InjectableSolution
+    solution: ammo
+  - type: GuideHelp
+    guides:
+    - Psionics

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -36,7 +36,7 @@
       state: disabler
     - proto: BulletEnergyGunLaser
       fireCost: 200
-      name: kill
+      name: lethal
       state: lethal
   - type: MagazineVisuals
     magState: mag
@@ -151,7 +151,7 @@
       state: disabler
     - proto: BulletEnergyGunLaser
       fireCost: 200
-      name: kill
+      name: lethal
       state: lethal
   - type: MagazineVisuals
     magState: mag

Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml

@@ -1,20 +1,31 @@
 - type: latheRecipe
   id: SpeedLoaderSpecial
   result: SpeedLoaderSpecial
+  category: Ammo
   completetime: 5
   materials:
     Steel: 200
 
+- type: latheRecipe
+  id: MagazinePistolSpecial
+  result: MagazinePistolSpecial
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 100
+
 - type: latheRecipe
   id: CartridgeSpecial
   result: CartridgeSpecial
+  category: Ammo
   completetime: 2
   materials:
     Steel: 20
 
 - type: latheRecipe
   id: CartridgeSpecialRubber
   result: CartridgeSpecialRubber
+  category: Ammo
   completetime: 2
   materials:
     Plastic: 5
@@ -23,6 +34,7 @@
 - type: latheRecipe
   id: CartridgeSpecialHoly
   result: CartridgeSpecialHoly
+  category: Ammo
   completetime: 2
   materials:
     Plastic: 5
@@ -32,6 +44,7 @@
 - type: latheRecipe
   id: CartridgeSpecialMindbreaker
   result: CartridgeSpecialMindbreaker
+  category: Ammo
   completetime: 2
   materials:
     Plastic: 5
@@ -41,13 +54,23 @@
 - type: latheRecipe
   id: MagazineBoxSpecial
   result: MagazineBoxSpecial
+  category: Ammo
   completetime: 5
   materials:
     Steel: 1000
 
+- type: latheRecipe
+  id: MagazineBoxSpecialPractice
+  result: MagazineBoxSpecialPractice
+  category: Ammo
+  completetime: 5
+  materials:
+    Plastic: 950
+
 - type: latheRecipe
   id: MagazineBoxSpecialRubber
   result: MagazineBoxSpecialRubber
+  category: Ammo
   completetime: 5
   materials:
     Steel: 350
@@ -68,43 +91,47 @@
   materials:
     Steel: 500
     Plastic: 1000
-    
+
 - type: latheRecipe
   id: WeaponEnergyGun
   result: WeaponEnergyGun
+  category: Weapons
   completetime: 8
   materials:
     Steel: 2000
     Glass: 800
     Plastic: 500
-    
-- type: latheRecipe  
+
+- type: latheRecipe
   id: WeaponEnergyGunMini
   result: WeaponEnergyGunMini
+  category: Weapons
   completetime: 4
   materials:   #Half of Energy Gun Recipe
     Steel: 1000
     Glass: 400
-    Plastic: 250 
+    Plastic: 250
 
 - type: latheRecipe
   id: WeaponEnergyGunPistol
   result: WeaponEnergyGunPistol
+  category: Weapons
   completetime: 10
   materials:
     Steel: 1500
     Glass: 600
     Plastic: 400
     Gold: 150
-    
+
 - type: latheRecipe
   id: WeaponGunLaserCarbineAutomatic
   result: WeaponGunLaserCarbineAutomatic
+  category: Weapons
   completetime: 15
-  materials: 
+  materials:
     Steel: 2000
     Glass: 1000
     Plastic: 500
     Gold: 250
     Silver: 100
-    Plasma: 500
+    Plasma: 500

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

@@ -677,13 +677,15 @@
       - ShellShotgunSlug
       - ShellShotgunFlare
       - ShellTranquilizer
+      - MagazinePistolSpecial # DeltaV - .38 Special psi-breaker
       - MagazinePistol
       - MagazinePistolSubMachineGun
       - MagazinePistolSubMachineGunTopMounted
       - MagazineRifle
       - MagazineLightRifle
       - MagazineBoxPistol
       - MagazineBoxSpecial # DeltaV - .38 Special revolver
+      - MagazineBoxSpecialPractice # DeltaV - .38 Special revolver
       - MagazineBoxMagnum
       - MagazineBoxRifle
       - MagazineBoxLightRifle
@@ -802,6 +804,7 @@
       staticRecipes:
         - CartridgePistol
         - CartridgeMagnum
+        - CartridgeSpecial # DeltaV - .38 Special revolver
         - ShellShotgun
         - ShellShotgunSlug
         - ShellShotgunFlare
@@ -810,6 +813,7 @@
         - CartridgeRifle
         - MagazineBoxPistol
         - MagazineBoxMagnum
+        - MagazineBoxSpecial # DeltaV - .38 Special revolver
         - MagazineBoxRifle
         - MagazineBoxLightRifle
     - type: MaterialStorage

Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/meta.json

@@ -29,12 +29,16 @@
 			"name": "mag-unshaded-4"
 		},
         {
-			"name": "lethal-inhand-left",
+			"name": "inhand-left",
 			"directions": 4
 		},
 		{
-			"name": "lethal-inhand-right",
+			"name": "inhand-right",
 			"directions": 4
-		}
+		},
+		{
+			"name": "equipped-BACKPACK",
+			"directions": 4
+        }
 	]
 }