Merge remote-tracking branch 'WD-core/master' into upstream-core

Resources/Prototypes/Entities/Clothing/Pouches/base_clothingpouch.yml

@@ -14,7 +14,7 @@
     materialComposition:
       Cloth: 35
   - type: StaticPrice
-    price: 200
+    price: 50
   - type: EmitSoundOnPickup
     sound:
       path: /Audio/White/Web/walk1.ogg

Resources/Prototypes/Entities/Clothing/Pouches/pouches.yml

@@ -27,7 +27,7 @@
         - Patch
         - Healing
   - type: StaticPrice
-    price: 250
+    price: 75
   - type: Appearance
 
 - type: entity
@@ -50,8 +50,6 @@
         - SmokeOnTrigger
         - ClusterGrenade
         - ExplodeOnTrigger
-  - type: StaticPrice
-    price: 125
   - type: Appearance
 
 - type: entity
@@ -118,7 +116,7 @@
     maxFillLevels: 1
     fillBaseName: fill-
   - type: StaticPrice
-    price: 110
+    price: 40
   - type: Appearance
 
 - type: entity
@@ -165,5 +163,5 @@
     slots: [pocket, belt]
     quickEquip: false
   - type: StaticPrice
-    price: 150
+    price: 70
   - type: Appearance

Resources/Prototypes/Entities/Clothing/Shoes/boots.yml

@@ -22,7 +22,7 @@
     sprite: Clothing/Shoes/Boots/jackboots.rsi
 
 - type: entity
-  parent: ClothingShoesBaseButcherable
+  parent: ClothingShoesMilitaryBase # WD
   id: ClothingShoesBootsSalvage
   name: salvage boots
   description: Steel-toed salvage boots for salvaging in hazardous environments.
@@ -31,7 +31,6 @@
     sprite: Clothing/Shoes/Boots/explorer.rsi
   - type: Clothing
     sprite: Clothing/Shoes/Boots/explorer.rsi
-  - type: Matchbox
 
 - type: entity
   parent: ClothingShoesBaseButcherable

Resources/Prototypes/Entities/Objects/Tools/blueprint.yml

@@ -30,10 +30,10 @@
 
 - type: entity
   parent: BaseBlueprint
-  id: BlueprintSeismicCharge
-  name: seismic charge blueprint
-  description: A blueprint with a schematic of a seismic charge. It can be inserted into an autolathe.
+  id: BlueprintMiningDrillDiamond # WD start
+  name: diamond mining drill blueprint
+  description: A blueprint with a schematic of a diamond mining drill. It can be inserted into an autolathe.
   components:
   - type: Blueprint
     providedRecipes:
-    - SeismicCharge
+    - MiningDrillDiamond # WD end

Resources/Prototypes/Entities/Objects/Tools/flare.yml

@@ -26,6 +26,8 @@
         loop: true
         volume: -10
         maxDistance: 5
+  - type: StaticPrice # WD
+    price: 5 # WD
 
   - type: Sprite
     sprite: Objects/Misc/flare.rsi

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml

@@ -113,4 +113,4 @@
     - type: Sprite
       layers:
         - state: boxwide
-        - state: shellslug
+        - state: shelltranquilizer # WD

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml

@@ -10,7 +10,7 @@
     - ShellShotgun
   - type: CartridgeAmmo
     count: 6
-    spread: 28
+    spread: 14 # WD
     soundEject:
       collection: ShellEject
   - type: Sprite
@@ -125,9 +125,9 @@
       ammo:
         reagents:
         - ReagentId: ChloralHydrate
-          Quantity: 5
+          Quantity: 12 # WD
   - type: SolutionTransfer
-    maxTransferAmount: 7
+    maxTransferAmount: 15 # WD
   - type: SpentAmmoVisuals
     state: "practice"
 

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml

@@ -7,7 +7,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 35
+        Piercing: 32 # WD
 
 - type: entity
   id: BulletMagnumPractice

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml

@@ -10,7 +10,10 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 40
+        Piercing: 50 # WD start
+  - type: StaminaDamageOnCollide
+    ignoreResistances: false
+    damage: 80 # WD end
 
 - type: entity
   id: PelletShotgunBeanbag

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -420,6 +420,7 @@
     layers:
     - state: chronobolt
       shader: unshaded
+  - type: GatheringProjectile # WD
   - type: Projectile
     impactEffect: BulletImpactEffectKinetic
     damage:
@@ -487,9 +488,10 @@
     damage:
       types:
         Blunt: 0
+        Structural: 15 # WD
   # Short lifespan
   - type: TimedDespawn
-    lifetime: 0.4
+    lifetime: 0.2 # WD
 
 - type: entity
   parent: BaseBullet

Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml

@@ -64,3 +64,25 @@
         Brute: 3
       types:
         Structural: 12
+
+- type: entity
+  name: diamond tipped mining drill
+  parent: MiningDrill
+  id: MiningDrillDiamond
+  description: A significantly more efficient mining drill tipped with diamond.
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/handdrilldiamond.rsi
+    state: handdrill
+  - type: MeleeWeapon
+    autoAttack: true
+    angle: 0
+    wideAnimationRotation: -90
+    soundHit:
+      path: "/Audio/Items/drill_hit.ogg"
+    attackRate: 4
+    damage:
+      groups:
+        Brute: 6
+      types:
+        Structural: 30

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

@@ -382,6 +382,10 @@
       - WeaponForceGun
       - WeaponLaserSvalinn
       - WeaponProtoKineticAccelerator
+      - WeaponAdvancedProtoKineticAccelerator # WD start
+      - SeismicCharge
+      - WeaponCrusherDagger
+      - WeaponCrusher # WD end
       - WeaponTetherGun
       - WeaponGrapplingGun
       - ClothingBackpackHolding