Adds a cat and then a gat (#1868)

* Adds the cat

* Adds the gat

* Adds the calico to suspicion spawner

* Fixed physics thing

* Updated BB

* Added Calico mag to ammo spawner

Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs

@@ -546,5 +546,6 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
         Box = 1 << 7,
         Pan = 1 << 8,
         Dart = 1 << 9, // Placeholder
+        CalicoTopMounted = 1 << 10,
     }
 }

Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml

@@ -41,6 +41,7 @@
         - RifleSTS
         - RifleVintorez
         - RifleWintermute
+        - RifleCalico
       chance: 0.75
       gameRules:
         - RuleSuspicion
@@ -289,6 +290,7 @@
         - MagazineClRifle10x24
         - MagazineClRiflePistol
         - MagazineLRifle
+        - MagazinePistolCalicoTopMounted
       chance: 0.95
       gameRules:
         - RuleSuspicion

Resources/Prototypes/Entities/Mobs/NPCs/pets.yml

@@ -169,6 +169,42 @@
       normal: cat
       dead: cat_dead
 
+- type: entity
+  save: false
+  name: calico cat
+  parent: PetBaseMob_Content
+  id: CatCalicoMob_Content
+  description:
+  drawdepth: Mobs
+  suffix: AI
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: Mobs/Pets/cat.rsi
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: cat2
+  - type: Icon
+    sprite: Mobs/Pets/cat.rsi
+    state: cat
+  - type: Collidable
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.50,-0.25,0.30,0.25"
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+      layer:
+      - Opaque
+      - MobImpassable
+  - type: Appearance
+    visuals:
+    - type: DamageStateVisualizer
+      normal: cat2
+      dead: cat2_dead
+
 - type: entity
   save: false
   name: sloth

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/magazines.yml

@@ -103,6 +103,32 @@
       steps: 6
       zeroVisible: false
 
+- type: entity
+  id: MagazinePistolCalicoTopMounted
+  name: Calico Magazine (.35 auto top-mounted)
+  parent: MagazinePistolSmgBase
+  components:
+  - type: RangedMagazine
+    caliber: Pistol
+    magazineType: CalicoTopMounted
+    fillPrototype: CartridgePistol
+    capacity: 100
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi
+    layers:
+    - state: base
+      map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: mag-1
+      shader: unshaded
+  - type: Appearance
+    visuals:
+    - type: MagVisualizer
+      magState: mag
+      steps: 1
+      zeroVisible: false
+
 - type: entity
   id: MagazinePistol
   name: magazine (.35 auto)

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

@@ -315,3 +315,43 @@
       magState: mag
       steps: 1
       zeroVisible: true
+
+- type: entity
+  name: calico m900
+  parent: RifleBase
+  id: RifleCalico
+  description: A carbine with a unique cylindrical magazine design which allows for high capacity loads.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Rifles/calico.rsi
+    layers:
+      - state: base
+        map: ["enum.RangedBarrelVisualLayers.Base"]
+      - state: mag-0
+        map: ["enum.RangedBarrelVisualLayers.Mag"]
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Rifles/calico.rsi
+  - type: Item
+    size: 24
+    sprite: Objects/Weapons/Guns/Rifles/calico.rsi
+  - type: RangedWeapon
+  - type: MagazineBarrel
+    magFillPrototype: MagazinePistolCalicoTopMounted
+    caliber: Pistol
+    magazineTypes:
+    - CalicoTopMounted
+    fireRate: 3
+    minAngle: 0
+    maxAngle: 25
+    angleIncrease: 15
+    angleDecay: 25
+    soundGunshot: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
+    soundRack: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg
+    soundMagInsert: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
+    soundMagEject: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
+  - type: Appearance
+    visuals:
+    - type: MagVisualizer
+      magState: mag
+      steps: 1
+      zeroVisible: true

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/meta.json

@@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi",
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "base",
+            "directions": 1
+        },
+        {
+            "name": "mag-1",
+            "directions": 1
+        }
+    ]
+}

Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/meta.json

@@ -0,0 +1,31 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Yeeye",
+    "states": [
+        {
+            "name": "icon",
+            "directions": 1
+        },
+        {
+            "name": "base",
+            "directions": 1
+        },
+        {
+            "name": "mag-0",
+            "directions": 1
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}