rock rework

Resources/Prototypes/Procedural/salvage_loot.yml

@@ -111,6 +111,8 @@
           prob: 0.7
         - proto: CDDogtags # imp
           prob: 0.7
+        - proto: BigRock #imp
+          prob: 0.01
 
 # Mob loot table
 

Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/rock.yml

@@ -1,36 +1,24 @@
 - type: entity
-  parent: BaseItem
-  id: BigRock
+  parent: [BaseItem, BaseRock]
+  id: SlightlySmallerRock
   name: rock
   description: It's a rock. You should know what to do with this.
   components:
   - type: Sprite
     noRot: true
-    sprite: Objects/Decoration/Flora/flora_rockssolid.rsi
-    layers:
-    - state: rocksolid01
-      map: ["random"]
-  - type: RandomSprite
-    available:
-    - random:
-        rocksolid01: ""
-        rocksolid02: ""
-        rocksolid03: ""
+    sprite: _Impstation/Objects/Weapons/Melee/bigrock.rsi
+    state: bigrock
   - type: Item
     size: Normal
+    inhandVisuals:
+      left:
+      - state: rock-inhand-left
+      right:
+      - state: rock-inhand-right
   - type: Appearance
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeCircle
-          radius: 0.4
-        density: 1000
-        layer:
-        - HalfWallLayer
-        - Opaque
-  - type: Climbable
   - type: MeleeWeapon
+    soundHit:
+      collection: Ronck
     wideAnimationRotation: 45
     damage:
       types:
@@ -45,7 +33,50 @@
     damage:
       types:
         Blunt: 10
+    soundHit:
+      collection: Ronck
   - type: StaminaDamageOnHit
     damage: 4
   - type: UseDelay
     delay: 1
+
+- type: entity
+  parent: [BaseItem, BaseRock]
+  id: BigRock
+  name: big rock
+  description: It's a rock. You should know what to do with this.
+  components:
+  - type: Sprite
+    noRot: true
+    sprite: _Impstation/Objects/Weapons/Melee/bigrock.rsi
+    state: bigrock
+  - type: Item
+    size: Ginormous
+    inhandVisuals:
+      left:
+      - state: bigrock-inhand
+      right:
+      - state: bigrock-inhand
+  - type: MeleeWeapon
+    soundHit:
+      collection: Ronck
+    wideAnimationRotation: 45
+    attackRate: 0.5
+    damage:
+      types:
+        Blunt: 25 # one must imagine cain happy
+        Structural: 5
+  - type: Appearance
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 25
+    staminaCost: 50
+    soundHit:
+      collection: Ronck
+  - type: StaminaDamageOnHit
+    damage: 4
+  - type: MultiHandedItem
+  - type: HeldSpeedModifier
+    walkModifier: 0.5
+    sprintModifier: 0.5

Resources/Prototypes/_Impstation/SoundCollections/destruction.yml

@@ -1,8 +1,13 @@
 - type: soundCollection
   id: HollowPlastic
-  files: 
+  files:
   - /Audio/_Impstation/Effects/hollow_plastic1.ogg
   - /Audio/_Impstation/Effects/hollow_plastic2.ogg
   - /Audio/_Impstation/Effects/hollow_plastic3.ogg
   - /Audio/_Impstation/Effects/hollow_plastic4.ogg
   - /Audio/_Impstation/Effects/hollow_plastic5.ogg
+
+- type: soundCollection
+  id: Ronck
+  files:
+  - /Audio/Effects/break_stone.ogg

Resources/Textures/_Impstation/Objects/Weapons/Melee/bigrock.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "bigrock taken from tgstation at commit https://github.com/tgstation/tgstation/commit/74bda160b97739cb9159dd19fe0800a5526735c0, inhands by carousel for impstation",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "bigrock"
+        },
+        {
+            "name": "bigrock-inhand",
+            "directions": 4
+        },
+        {
+            "name": "rock-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "rock-inhand-right",
+            "directions": 4
+        }
+    ]
+}