Новые уши, хвосты и прочая косметика

Resources/Locale/ru-RU/_stories/markings/cat.ftl

@@ -0,0 +1 @@
+marking-CatTailAnimated = Кошачий хвост (виляющий)

Resources/Locale/ru-RU/_stories/markings/vulpkanin.ftl

@@ -0,0 +1,8 @@
+marking-VulpEar = Уши вульпканина
+marking-VulpEarJackal = Уши шакала
+marking-VulpEarFennec = Уши фенека
+marking-VulpEarFox = Лисьи уши
+marking-VulpEarOtie = Уши Оти
+marking-TailFluffy= Пушистый хвост
+marking-VulpTailAnimated= Вульпканин-хвост (виляющий)
+marking-TailFoxAnimated= Лисий хвост (виляющий)

Resources/Locale/ru-RU/_stories/store/uplink-catalog.ftl

@@ -0,0 +1,3 @@
+# Pointless
+uplink-dog-ears-name = Собачьи ушки
+uplink-dog-ears-desc = Тяф!

Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml

@@ -61,6 +61,7 @@
   components:
   - type: StorageFill
     contents:
+      - id: ClothingHeadHatCapHoS # Stories
       - id: ClothingHeadHatBeretHoS
       - id: ClothingHeadHatHoshat
       - id: ClothingUniformJumpskirtHoSAlt

Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml

@@ -38,3 +38,23 @@
   sprites:
   - sprite: Mobs/Customization/cat_parts.rsi
     state: tail_cat
+
+# Stories-CatTailAnimated-Start
+- type: marking
+  id: CatTailAnimated
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Human]
+  coloring:
+    default:
+      type:
+        !type:CategoryColoring
+        category: Hair
+      fallbackTypes:
+      - !type:CategoryColoring
+        category: FacialHair
+      - !type:SkinColoring
+  sprites:
+  - sprite: Mobs/Customization/cat_parts.rsi
+    state: tail_cat_wag
+# Stories-CatTailAnimated-End

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

@@ -977,6 +977,7 @@
       - ClothingUniformJumpsuitHoP
       - ClothingUniformJumpskirtHoP
       - ClothingHeadHatBeretHoS
+      - ClothingHeadHatCapHoS # Stories
       - ClothingHeadHatHoshat
       - ClothingUniformJumpsuitHoS
       - ClothingUniformJumpskirtHoS

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -53,6 +53,7 @@
   - StoriesWristwatchGold
   - ClothingNeckCloakCollector
   - ClothingNeckCloakAnomalist
+  - NeckLizard
   - ClothingNeckCloakSnake
   - ToyFigurineColossus
   - ToyFigurineAshDragon
@@ -1254,6 +1255,7 @@
   loadouts:
   - HeadofSecurityHead
   - HeadofSecurityBeret
+  - HeadofSecurityBeretHatCap # Stories
 
 - type: loadoutGroup
   id: HeadofSecurityJumpsuit

Resources/Prototypes/_Stories/Catalog/uplink_catalog.yml

@@ -53,3 +53,13 @@
       whitelist:
         tags:
           - NukeOpsUplink
+
+- type: listing
+  id: UplinkDogEars
+  name: uplink-dog-ears-name
+  description: uplink-dog-ears-desc
+  productEntity: ClothingHeadHatDogEars
+  cost:
+    Telecrystal: 26
+  categories:
+  - UplinkPointless

Resources/Prototypes/_Stories/Entities/Clothing/Head/hats.yml

@@ -13,3 +13,14 @@
     - ClothMade
     - HamsterWearable
     - WhitelistChameleon
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatCapHoS
+  name: фуражка главы службы безопасности
+  description: Прочная форменная фуражка начальника службы безопасности. Напоминает рядовым офицерам, кто здесь главный.
+  components:
+  - type: Sprite
+    sprite: Stories/Clothing/Head/Hats/hoshat.rsi
+  - type: Clothing
+    sprite: Stories/Clothing/Head/Hats/hoshat.rsi

Resources/Prototypes/_Stories/Entities/Mobs/Customization/Markings/vulpkanin_ear.yml

@@ -0,0 +1,112 @@
+- type: marking
+  id: VulpEar
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Human]
+  coloring:
+    default:
+      type:
+        !type:CategoryColoring
+        category: Hair
+      fallbackTypes:
+      - !type:SkinColoring
+    layers:
+      ears_cat_inner:
+        type:
+          !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi
+    state: vulp
+  - sprite: Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi
+    state: vulp-inner
+
+- type: marking
+  id: VulpEarJackal
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Human]
+  coloring:
+    default:
+      type:
+        !type:CategoryColoring
+        category: Hair
+      fallbackTypes:
+      - !type:SkinColoring
+    layers:
+      ears_cat_inner:
+        type:
+          !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi
+    state: jackal
+  - sprite: Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi
+    state: jackal-inner
+
+- type: marking
+  id: VulpEarFennec
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Human]
+  coloring:
+    default:
+      type:
+        !type:CategoryColoring
+        category: Hair
+      fallbackTypes:
+      - !type:SkinColoring
+    layers:
+      ears_cat_inner:
+        type:
+          !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+    - sprite: Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: fennec
+    - sprite: Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: fennec-inner
+
+- type: marking
+  id: VulpEarFox
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Human]
+  coloring:
+    default:
+      type:
+        !type:CategoryColoring
+        category: Hair
+      fallbackTypes:
+      - !type:SkinColoring
+    layers:
+      ears_cat_inner:
+        type:
+          !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+    - sprite: Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: fox
+
+- type: marking
+  id: VulpEarOtie
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Human]
+  coloring:
+    default:
+      type:
+        !type:CategoryColoring
+        category: Hair
+      fallbackTypes:
+      - !type:SkinColoring
+    layers:
+      ears_cat_inner:
+        type:
+          !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+    - sprite: Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: otie
+    - sprite: Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi
+      state: otie-inner

Resources/Prototypes/_Stories/Entities/Mobs/Customization/Markings/vulpkanin_tail.yml

@@ -0,0 +1,57 @@
+- type: marking
+  id: TailFluffy
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Human]
+  coloring:
+    default:
+      type:
+        !type:CategoryColoring
+        category: Hair
+      fallbackTypes:
+      - !type:CategoryColoring
+        category: FacialHair
+      - !type:SkinColoring
+  sprites:
+  - sprite: Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi
+    state: fluffy
+
+- type: marking
+  id: VulpTailAnimated
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Human]
+  coloring:
+    default:
+      type:
+        !type:CategoryColoring
+        category: Hair
+      fallbackTypes:
+      - !type:CategoryColoring
+        category: FacialHair
+      - !type:SkinColoring
+  sprites:
+    - sprite: Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi
+      state: vulp_wag
+    - sprite: Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi
+      state: vulp_wag-tip
+
+- type: marking
+  id: TailFoxAnimated
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Human]
+  coloring:
+    default:
+      type:
+        !type:CategoryColoring
+        category: Hair
+      fallbackTypes:
+      - !type:CategoryColoring
+        category: FacialHair
+      - !type:SkinColoring
+  sprites:
+    - sprite: Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi
+      state: fox_wag
+    - sprite: Stories/Mobs/Customization/Vulpkanin/tail_markings.rsi
+      state: fox_wag-fade

Resources/Prototypes/_Stories/Loadouts/cargo_technician.yml

@@ -0,0 +1,17 @@
+- type: loadoutEffectGroup
+  id: CargoTechnicianNeckLizard
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobCargoTechnician
+      time: 36000 #10 hrs
+
+- type: loadout
+  id: NeckLizard
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: CargoTechnicianNeckLizard
+  storage:
+    back:
+    - ClothingNeckCloakAdmin

Resources/Prototypes/_Stories/Loadouts/head_of_security.yml

@@ -0,0 +1,5 @@
+# Head
+- type: loadout
+  id: HeadofSecurityBeretHatCap
+  equipment:
+    head: ClothingHeadHatCapHoS

Resources/Prototypes/_Stories/Recipes/Lathes/clothing.yml

@@ -0,0 +1,5 @@
+# Hats
+- type: latheRecipe
+  parent: BaseCommandHatRecipe
+  id: ClothingHeadHatCapHoS
+  result: ClothingHeadHatCapHoS

Resources/Textures/Stories/Clothing/Head/Hats/hoshat.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/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Stories/Mobs/Customization/Vulpkanin/ear_markings.rsi/meta.json

@@ -0,0 +1,47 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/VOREStation/VOREStation/ edited by Floofers",
+  "size": {
+      "x": 32,
+      "y": 32
+  },
+  "states": [
+    {
+      "name": "vulp",
+      "directions": 4
+    },
+    {
+      "name": "vulp-inner",
+      "directions": 4
+    },
+    {
+      "name": "jackal",
+      "directions": 4
+    },
+    {
+      "name": "jackal-inner",
+      "directions": 4
+    },
+    {
+      "name": "fennec",
+      "directions": 4
+    },
+    {
+      "name": "fennec-inner",
+      "directions": 4
+    },
+    {
+      "name": "fox",
+      "directions": 4
+    },
+    {
+      "name": "otie",
+      "directions": 4
+    },
+    {
+      "name": "otie-inner",
+      "directions": 4
+    }
+  ]
+}