Mons are real, Total Catgirl removal

Resources/Prototypes/DeltaV/Species/vulpkanin.yml

@@ -1,7 +1,7 @@
 - type: species
   id: Vulpkanin
   name: species-name-vulpkanin
-  roundStart: true
+  roundStart: false
   prototype: MobVulpkanin
   sprites: MobVulpkaninSprites
   defaultSkinTone: "#985629"

Resources/Prototypes/Entities/Clothing/Hands/specific.yml

@@ -30,3 +30,4 @@
   - type: Thieving
     stripTimeReduction: 2
     stealthy: true
+

Resources/Prototypes/Entities/Clothing/Head/helmets.yml

@@ -378,3 +378,27 @@
     sprite: Clothing/Head/Helmets/podwars_helmet.rsi
   - type: Clothing
     sprite: Clothing/Head/Helmets/podwars_helmet.rsi
+
+#Sons of Mars
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHelmetSOM
+  name: SOM Helmet
+  description: A robust helmet with an orange reinforced glass dome. Smells like something burning.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/somhelm.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/somhelm.rsi
+  - type: IngestionBlocker
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.9
+  - type: Tag
+    tags:
+    - HidesHair

Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml

@@ -374,3 +374,28 @@
     sprite: Clothing/OuterClothing/Misc/red_racoon.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Misc/red_racoon.rsi
+
+# Sons of Mars
+
+- type: entity
+  parent: ClothingOuterBaseLarge
+  id: ClothingSoMMedium
+  name: SoM Medium Armor
+  description: The Sons of Mars most produced armor. built to last.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Misc/sonsmedium.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Misc/sonsmedium.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.5
+        Slash: 0.5
+        Piercing: 0.5
+        Heat: 0.5
+        Radiation: 0.5
+        Caustic: 0.5
+  - type: ExplosionResistance
+    damageCoefficient: 0.9
+  - type: GroupExamine

Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml

@@ -21,3 +21,16 @@
       interfaces:
         - key: enum.ChameleonUiKey.Key
           type: ChameleonBoundUserInterface
+
+# Sons of Mars
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformSOM
+  name: SOM Uniform
+  description: An intimidating red jumpsuit. Smells like martian soil.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/somuniform.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/somuniform.rsi

Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_weaponry.yml

@@ -158,3 +158,105 @@
     steps: 5
     zeroVisible: true
   - type: Appearance
+
+- type: entity
+  name: AC 10 "Scattershot"
+  # Don't parent to BaseWeaponShotgun because it differs significantly
+  parent: BaseMechEquipment
+  id: WeaponShotgunMech
+  description: It's a magazine-fed shotgun designed for close quarters combat. Uses .50 shotgun shells.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    size: Large
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi
+    quickEquip: false
+    slots:
+    - Back
+    - suitStorage
+  - type: AmmoCounter
+  - type: Gun
+    fireRate: 0.5
+    selectedMode: FullAuto
+    availableModes:
+    - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
+    soundEmpty:
+      path: /Audio/Weapons/Guns/Empty/empty.ogg
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineShotgun
+        priority: 2
+        whitelist:
+          tags:
+          - MagazineShotgun
+        insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
+  - type: MagazineAmmoProvider
+  - type: MagazineVisuals
+    magState: mag
+    steps: 1
+    zeroVisible: true
+  - type: Appearance
+  - type: StaticPrice
+    price: 500
+
+- type: entity
+  name:  FNX-99 "Hades" Carbine
+  parent: BaseMechEquipment
+  id: WeaponSubMachineGunMech
+  description: An excellent fully automatic Heavy SMG with mech mounting brackets.
+  components:
+    - type: Sprite
+      sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
+      layers:
+        - state: base
+          map: ["enum.GunVisualLayers.Base"]
+        - state: mag-0
+          map: ["enum.GunVisualLayers.Mag"]
+    - type: Clothing
+      sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
+    - type: Gun
+      fireRate: 6
+      selectedMode: FullAuto
+      soundGunshot:
+        path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
+      availableModes:
+        - FullAuto
+    - type: ItemSlots
+      slots:
+        gun_magazine:
+          name: Magazine
+          startingItem: MagazinePistolSubMachineGunFire
+          insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
+          ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
+          priority: 2
+          whitelist:
+            tags:
+              - MagazinePistolSubMachineGun
+        gun_chamber:
+          name: Chamber
+          startingItem: CartridgePistolIncendiary
+          priority: 1
+          whitelist:
+            tags:
+              - CartridgePistolIncendiary
+    - type: MagazineVisuals
+      magState: mag
+      steps: 1
+      zeroVisible: true
+    - type: Appearance

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml

@@ -273,3 +273,23 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazinePistolSubMachineGunFire
+  name: SMG magazine (.35 auto)
+  parent: BaseMagazinePistolSubMachineGun
+  components:
+  - type: BallisticAmmoProvider
+    capacity: 30
+    proto: CartridgePistolIncendiary
+    whitelist:
+      tags:
+        - CartridgePistolIncendiary
+    soundInsert:
+      path: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg
+  - type: Sprite
+    layers:
+    - state: red
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]

Resources/Prototypes/Nyanotrasen/Species/felinid.yml

@@ -1,7 +1,7 @@
 - type: species
   id: Felinid
   name: species-name-felinid
-  roundStart: true
+  roundStart: false
   prototype: MobFelinid
   sprites: MobHumanSprites
   markingLimits: MobFelinidMarkingLimits

Resources/Textures/Clothing/Head/Helmets/somhelm.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by patogrone (ss14 discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "direction": 4
+    }
+  ]
+}

Resources/Textures/Clothing/OuterClothing/Misc/sonsmedium.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/dbc2435fa562f4ef130a7112d2a4cc9c80099894",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/Clothing/Uniforms/Jumpsuit/somuniform.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/dbc2435fa562f4ef130a7112d2a4cc9c80099894",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-INNERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}