NEW WEAPONS + Weapon size balances

Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

@@ -7,7 +7,7 @@
   components:
   - type: Sprite
   - type: Item
-    size: Huge
+    size: Large
   - type: Clothing
     sprite: Objects/Weapons/Guns/Rifles/ak.rsi
     quickEquip: false

Resources/Prototypes/_Nuclear14/Entities/Objects/Tools/cooking.yml

@@ -0,0 +1,33 @@
+- type: entity
+  parent: BaseItem
+  id: N14RollingPin
+  name: rolling pin
+  description: A versatile tool that can be used to prepare bread or squish radroaches.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Objects/Weapons/Melee/rolling_pin.rsi
+    state: icon
+  - type: Item
+    sprite: _Nuclear14/Objects/Weapons/Melee/rolling_pin.rsi
+    size: Small
+  - type: Clothing
+    sprite: _Nuclear14/Objects/Weapons/Melee/rolling_pin.rsi
+    quickEquip: false
+    slots:
+    - Belt
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    damage:
+      types:
+        Blunt: 10
+    soundHit:
+      collection: N14SmallSwing
+  - type: Tool
+    qualities:
+    - Rolling
+  - type: PhysicalComposition
+    materialComposition:
+      Wood: 100
+  - type: Tag
+    tags:
+    - RollingPin

Resources/Prototypes/_Nuclear14/Entities/Objects/Tools/tools.yml

@@ -1,3 +1,5 @@
+#MARK: Tools
+
 - type: entity
   name: wirecutters
   parent: Wirecutter
@@ -91,17 +93,94 @@
 
 - type: entity
   name: shovel
-  parent: Shovel
+  parent: BaseItem
   id: N14Shovel
-  description: A large tool for digging and moving dirt.
-  # components:
-  # - type: Tool
-    # qualities:
-      # - Shoveling
-    # useSound:
-      # path: /Audio/Items/crowbar.ogg
+  description: A hefty tool made too dig graves, or dig out brahmin pens.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Objects/Weapons/Melee/shovel.rsi
+    state: icon
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    damage:
+      types:
+        Blunt: 5
+    soundSwing:
+      collection: N14LargeSwing
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 100
+      Wood: 50
+  - type: Tool
+    qualities:
+      - Digging
+    useSound:
+      path: /Audio/Nyanotrasen/Items/shovel_dig.ogg
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 16
+  - type: Clothing
+    sprite: _Nuclear14/Objects/Weapons/Melee/shovel.rsi
+    quickEquip: false
+    slots:
+    - Back
+    - suitStorage
+  - type: Item
+    size: Large
+  - type: EarthDigging
+  - type: Shovel
+
+- type: entity
+  name: zappy shovel
+  parent: BaseItem
+  id: N14ShovelZappy
+  description: A shovel electrified with a battery and wires too make it more deadly in combat.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Objects/Weapons/Melee/shovel_zappy.rsi
+    state: icon
+  - type: StaminaDamageOnHit
+    damage: 25
+  - type: StaminaDamageOnCollide
+    damage: 25
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    damage:
+      types:
+        Blunt: 4
+        Shock: 1
+    soundSwing:
+      collection: N14LargeSwing
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 100
+      Wood: 50
+  - type: Tool
+    qualities:
+      - Digging
+    useSound:
+      path: /Audio/Nyanotrasen/Items/shovel_dig.ogg
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 14
+        Shock: 8
+  - type: Clothing
+    sprite: _Nuclear14/Objects/Weapons/Melee/shovel_zappy.rsi
+    quickEquip: false
+    slots:
+    - Back
+    - suitStorage
+  - type: Item
+    size: Large
+  - type: EarthDigging
+  - type: Shovel
+
 
-# Saws
+#MARK: Saws
 
 - type: entity
   name: saw

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

@@ -5,7 +5,7 @@
   components:
   - type: Sprite
   - type: Item
-    size: Small
+    size: Large
   - type: AmmoCounter
   - type: Gun
     minAngle: 35
@@ -47,6 +47,11 @@
     quickEquip: false
     slots:
     - Belt
+  - type: Item
+    size: Small
+    shape:
+    - 0,0,1,0
+    - 0,1,0,1
   - type: Gun
     availableModes:
     - Semiauto
@@ -61,7 +66,7 @@
   abstract: true
   components:
   - type: Item
-    size: Normal
+    size: Large
   - type: Clothing
     sprite: Objects/Weapons/Guns/Battery/taser.rsi
     quickEquip: false
@@ -99,6 +104,11 @@
         whitelist:
           tags:
             - N14PowerCellSmall
+  - type: Item
+    size: Small
+    shape:
+    - 0,0,1,1
+    - 0,0,1,1
   - type: Gun
     fireRate: 1.5
     soundGunshot:

Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/launcher.yml

@@ -62,6 +62,8 @@
     - Back
     - suitStorage
   - type: AmmoCounter
+  - type: Item
+    size: Large
   - type: Gun
     minAngle: 24
     maxAngle: 105

Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Heavy/missile.yml

@@ -17,6 +17,8 @@
   - type: GunWieldBonus
     minAngle: -23
     maxAngle: -104
+  - type: Item
+    size: Ginormous
   - type: Gun
     fireRate: 0.5
     minAngle: 24

Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/LMGs/LMGs.yml

@@ -14,6 +14,7 @@
       - state: mag-0
         map: ["enum.GunVisualLayers.Mag"]
   - type: Item
+    size: Huge
     sprite: _Nuclear14/Objects/Weapons/Guns/LMGs/autorifle.rsi
   - type: Wieldable
   - type: GunWieldBonus
@@ -49,8 +50,8 @@
           tags:
             - N14Cartridge308Rifle
   - type: ClothingSpeedModifier
-    walkModifier: 0.8
-    sprintModifier: 0.8
+    walkModifier: 0.85
+    sprintModifier: 0.85
   - type: HeldSpeedModifier
   - type: MagazineVisuals
     magState: mag
@@ -76,6 +77,7 @@
       - state: mag-0
         map: ["enum.GunVisualLayers.Mag"]
   - type: Item
+    size: Huge 
     sprite: _Nuclear14/Objects/Weapons/Guns/LMGs/lmg.rsi
   - type: Wieldable
   - type: GunWieldBonus
@@ -111,8 +113,8 @@
           tags:
             - N14Cartridge556Rifle
   - type: ClothingSpeedModifier
-    walkModifier: 0.9
-    sprintModifier: 0.9
+    walkModifier: 0.85
+    sprintModifier: 0.85
   - type: HeldSpeedModifier
   - type: MagazineVisuals
     magState: mag

Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml

@@ -13,6 +13,9 @@
         map: ["enum.GunVisualLayers.Mag"]
   - type: Item
     size: Small
+    shape:
+    - 0,0,1,1
+    - 0,1,0,1
   - type: Clothing
     sprite: Objects/Weapons/Guns/Pistols/viper.rsi
     quickEquip: false
@@ -270,7 +273,7 @@
 
 - type: entity
   name: chinese pistol
-  parent: BaseWeaponSniper
+  parent: N14BaseWeaponPistol
   id: N14WeaponPistolChinese
   description: An elegant long barrel pistol with an integrated magazine, chambered in 9mm.
   components:
@@ -313,7 +316,7 @@
 
 - type: entity
   name: the spy
-  parent: BaseWeaponSniper
+  parent: N14BaseWeaponPistol
   id: N14WeaponPistolSpy
   description: A modified version of the common chinese pistol with a integrated silencer, extended mag and full-auto conversion. This gun was designed with passion, chambered in 9mm.
   components:

Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml

@@ -14,6 +14,11 @@
         - N14CartridgePistol9
         - SpeedLoader9
     proto: N14CartridgePistol9
+  - type: Item
+    size: Small
+    shape:
+    - 0,0,0,1
+    - 0,0,0,1
   - type: Gun
     minAngle: 1
     maxAngle: 5

Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

@@ -17,8 +17,6 @@
         map: ["enum.GunVisualLayers.Base"]
       - state: mag-0
         map: ["enum.GunVisualLayers.Mag"]
-  - type: Item
-    sprite: _Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi
   - type: Wieldable
   - type: GunWieldBonus
     minAngle: -21
@@ -79,8 +77,6 @@
         map: ["enum.GunVisualLayers.Base"]
       - state: mag-0
         map: ["enum.GunVisualLayers.Mag"]
-  - type: Item
-    sprite: _Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi
   - type: Wieldable
   - type: GunWieldBonus
     minAngle: -21
@@ -138,8 +134,6 @@
         map: ["enum.GunVisualLayers.Base"]
       - state: mag-0
         map: ["enum.GunVisualLayers.Mag"]
-  - type: Item
-    sprite: _Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi
   - type: Wieldable
   - type: GunWieldBonus
     minAngle: -20
@@ -200,7 +194,6 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-0
       map: ["enum.GunVisualLayers.Mag"]
-  - type: Item
   - type: Wieldable
   - type: GunWieldBonus
     minAngle: -21

Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml

@@ -17,8 +17,6 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-0
       map: ["enum.GunVisualLayers.Mag"]
-  - type: Item
-    sprite: _Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi
   - type: Gun
     fireRate: 8
     soundGunshot:
@@ -144,8 +142,6 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-0
       map: ["enum.GunVisualLayers.Mag"]
-  - type: Item
-    sprite: _Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi
   - type: Gun
     fireRate: 4
     soundGunshot:
@@ -209,8 +205,6 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-0
       map: ["enum.GunVisualLayers.Mag"]
-  - type: Item
-    sprite: _Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi
   - type: Gun
     fireRate: 6
     soundGunshot:
@@ -336,8 +330,6 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-0
       map: ["enum.GunVisualLayers.Mag"]
-  - type: Item
-    sprite: _Nuclear14/Objects/Weapons/Guns/SMGs/9mmSMG.rsi
   - type: Gun
     fireRate: 8.5
     soundGunshot:
@@ -400,8 +392,6 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-0
       map: ["enum.GunVisualLayers.Mag"]
-  - type: Item
-    sprite: _Nuclear14/Objects/Weapons/Guns/SMGs/45SMG.rsi
   - type: Gun
     fireRate: 7
     soundGunshot: