Merge branch 'ed-22-12-2024-upstream' of https://github.com/crystallpunk-14/crystall-punk-14 into ed-22-12-2024-upstream

Resources/Locale/en-US/_CP14/flavors/flavor-profiles.ftl

@@ -22,5 +22,5 @@ cp14-flavor-complex-zellasian-pleasure = like aristocratic and vinous
 cp14-flavor-complex-leeks = like fruity and mystical
 cp14-flavor-complex-durandate = like cheap and tart
 cp14-flavor-complex-ale = like bread
-cp14-flavor-complex-bloodytear = like sad and alcoholic
+cp14-flavor-complex-bloody-tear = like sad and alcoholic
 cp14-flavor-complex-bottomless = like semi-divine and dangerous

Resources/Locale/en-US/_CP14/markings/human-hair.ftl

@@ -11,6 +11,7 @@ marking-CP14HumanHairBigBraid = Full Braid
 marking-CP14HumanHairCrazyBald = CrazyBald
 marking-CP14HumanHairBigDoubleBun = Double Bun
 marking-CP14HumanHairPonyTail7 = Ponytail
+marking-CP14HumanHairPulato = Pulato
 marking-CP14HumanHairSideTail4 = Side tail
 marking-CP14HumanHairSwept2 = Swept
 marking-CP14HumanHairUpdo = Updo

Resources/Locale/en-US/_CP14/reagents/meta/consumable/drink/alcohol.ftl

@@ -11,7 +11,7 @@ cp14-reagent-name-dwarfbeer = Beer Joy of the Deep
 cp14-reagent-name-gerbil = Beer Gerbil
 cp14-reagent-name-breeze = Beer Breeze
 cp14-reagent-name-blowlaw = Beer Blow Law
-cp14-reagent-name-bloodytear = Ale Bloody Tear
+cp14-reagent-name-bloody-tear = Ale Bloody Tear
 cp14-reagent-name-bottomless = Ale Bottomless
 cp14-reagent-name-zellasian-pleasure = Wine Zellasian Pleasure
 cp14-reagent-name-leeks = Wine Leeks

Resources/Locale/ru-RU/_CP14/flavors/flavor-profiles.ftl

@@ -22,5 +22,5 @@ cp14-flavor-complex-zellasian-pleasure = аристократично и вин
 cp14-flavor-complex-leeks = фруктово и мистически
 cp14-flavor-complex-durandate = дешёвое и терпкое
 cp14-flavor-complex-ale = как хлеб
-cp14-flavor-complex-bloodytear = печально и алкогольно
+cp14-flavor-complex-bloody-tear = печально и алкогольно
 cp14-flavor-complex-bottomless = полубожественно и опасно

Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl

@@ -11,6 +11,7 @@ marking-CP14HumanHairBigBraid = Хвост во весь рост
 marking-CP14HumanHairCrazyBald = Безумная проплешина
 marking-CP14HumanHairBigDoubleBun = Два пунпона
 marking-CP14HumanHairPonyTail7 = Конский хвост
+marking-CP14HumanHairPulato = Пулато
 marking-CP14HumanHairSideTail4 = Хвост сбоку
 marking-CP14HumanHairSwept2 = Суровый взгляд
 marking-CP14HumanHairUpdo = Пучок

Resources/Locale/ru-RU/_CP14/reagents/meta/consumable/drink/alcohol.ftl

@@ -11,7 +11,7 @@ cp14-reagent-name-dwarfbeer = Пиво Радость глубин
 cp14-reagent-name-gerbil = Пиво Песчянка
 cp14-reagent-name-breeze = Пиво Ветерок
 cp14-reagent-name-blowlaw = Пиво Удар закона
-cp14-reagent-name-bloodytear = Эль Кровавая слеза
+cp14-reagent-name-bloody-tear = Эль Кровавая слеза
 cp14-reagent-name-bottomless = Эль Бездоннка
 cp14-reagent-name-zellasian-pleasure = Вино Услада Зелласиан
 cp14-reagent-name-leeks = Вино Ликс

Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml

@@ -102,6 +102,14 @@
     - sprite: _CP14/Mobs/Customization/human_hair.rsi
       state: ponytail7
       
+- type: marking
+  id: CP14HumanHairPulato
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_hair.rsi
+      state: pulato
+      
 - type: marking
   id: CP14HumanHairSideTail4
   bodyPart: Hair

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml

@@ -24,7 +24,7 @@
   - type: IncreaseDamageOnWield
     damage:
       types: 
-        Blunt: 6
+        Blunt: 3
   - type: MeleeWeapon
     angle: 100
     attackRate: 1.3
@@ -33,7 +33,7 @@
     wideAnimation: CP14WeaponArcSlash
     damage:
       types:
-        Blunt: 6
+        Blunt: 3
     soundHit:
       collection: MetalThud
     cPAnimationLength: 0.3

Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel_crane.yml

@@ -130,7 +130,7 @@
         - ReagentId: CP14AleBloodyTear
           Quantity: 500
   - type: Label
-    currentLabel: cp14-reagent-name-bloodytear
+    currentLabel: cp14-reagent-name-bloody-tear
 
 - type: entity
   parent: CP14CraneBarrel

Resources/Prototypes/_CP14/Flavors/flavor.yml

@@ -100,7 +100,7 @@
 - type: flavor
   id: CP14bloodyTear
   flavorType: Complex
-  description: cp14-flavor-complex-bloodytear
+  description: cp14-flavor-complex-bloody-tear
 
 - type: flavor
   id: CP14bottomless

Resources/Prototypes/_CP14/Reagents/Biological/Consumable/Drink/alcohol.yml

@@ -2,7 +2,7 @@
 
 - type: reagent
   id: CP14DwarfBeer
-  name: cp14-reagent-name-beer
+  name: cp14-reagent-name-dwarfbeer
   parent: BaseAlcohol
   desc: cp14-reagent-desc-beer
   slippery: true
@@ -76,7 +76,7 @@
 
 - type: reagent
   id: CP14BeerGerbil
-  name: cp14-reagent-name-beer
+  name: cp14-reagent-name-gerbil
   parent: BaseAlcohol
   desc: cp14-reagent-desc-beer
   physicalDesc: reagent-physical-desc-bubbly
@@ -93,7 +93,7 @@
 
 - type: reagent
   id: CP14BeerBreeze
-  name: cp14-reagent-name-beer
+  name: cp14-reagent-name-breeze
   parent: BaseAlcohol
   desc: cp14-reagent-desc-beer
   physicalDesc: reagent-physical-desc-bubbly
@@ -110,7 +110,7 @@
 
 - type: reagent
   id: CP14BeerBlowLaw
-  name: cp14-reagent-name-beer
+  name: cp14-reagent-name-blowlaw
   parent: BaseAlcohol
   desc: cp14-reagent-desc-beer
   physicalDesc: reagent-physical-desc-bubbly
@@ -142,7 +142,7 @@
 
 - type: reagent
   id: CP14WineZellasianPleasure
-  name: cp14-reagent-name-wine
+  name: cp14-reagent-name-zellasian-pleasure
   parent: BaseAlcohol
   desc: cp14-reagent-desc-wine
   physicalDesc: reagent-physical-desc-translucent
@@ -160,7 +160,7 @@
 
 - type: reagent
   id: CP14WineLeeks
-  name: cp14-reagent-name-wine
+  name: cp14-reagent-name-leeks
   parent: BaseAlcohol
   desc: cp14-reagent-desc-wine
   physicalDesc: reagent-physical-desc-translucent
@@ -177,7 +177,7 @@
 
 - type: reagent
   id: CP14WineDurandate
-  name: cp14-reagent-name-wine
+  name: cp14-reagent-name-durandate
   parent: BaseAlcohol
   desc: cp14-reagent-desc-wine
   physicalDesc: reagent-physical-desc-translucent
@@ -213,9 +213,9 @@
 
 - type: reagent
   id: CP14AleBloodyTear
-  name: cp14-reagent-name-ale
+  name: cp14-reagent-name-bloody-tear
   parent: BaseAlcohol
-  desc: cp14-reagent-desc-ale-bloodytear
+  desc: cp14-reagent-desc-ale
   physicalDesc: reagent-physical-desc-bubbly
   flavor: CP14bloodyTear
   color: "#993333"
@@ -230,7 +230,7 @@
 
 - type: reagent
   id: CP14AleBottomless
-  name: cp14-reagent-name-ale
+  name: cp14-reagent-name-bottomless
   parent: BaseAlcohol
   desc: cp14-reagent-desc-ale
   physicalDesc: reagent-physical-desc-bubbly

Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json

@@ -4,7 +4,7 @@
       "x": 48,
       "y": 48
     },
-    "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, adapted to CrystallEdge by TheShuEd. Crazybald by TheShuEd, maxy_shagy by Max Gab",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, adapted to CrystallEdge by TheShuEd. Crazybald by TheShuEd, maxy_shagy by Max Gab, pulato.png made by DreamlyJack",
     "license": "CC-BY-SA-3.0",
     "states": [
       {
@@ -63,6 +63,10 @@
         "name": "ponytail7",
         "directions": 4
       },
+      {
+        "name": "pulato",
+        "directions": 4
+      },
       {
         "name": "sidetail4",
         "directions": 4