еще доработки

AdventureTimeSS14 · Oct 24, 2024 · 4b9beb1 · 4b9beb1
1 parent c4eb853
commit 4b9beb1
Show file tree

Hide file tree

Showing 13 changed files with 48 additions and 43 deletions.
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Underwear/socks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Underwear/socks.ftl
@@ -51,9 +51,7 @@ ent-ADTClothingUnderwearSocksStockingsHeart = длинные чулки с се
 ent-ADTClothingUnderwearSocksRabbit = носки с кроликами
     .desc = Теплый и необычные носочки в виде кроликов.
 
-ent-ClothingUnderwearSocksCoder = носочки для програмиста
-    .desc = Пришло время отдаться коду!11!!
-ent-ClothingUnderwearSocksBee = носочки с пчёлами
+ent-ADTClothingUnderwearSocksBee = носочки с пчёлами
     .desc = Заставь их загудеть от волнения.
 
 ent-ADTClothingUnderwearSocksBlueshield = носки офицера "Синего Щита"

diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Customization/Markings/Human.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Customization/Markings/Human.ftl
@@ -6,7 +6,9 @@ marking-HumanPiercingNippleR = Правый сосок
 marking-HumanPiercingNipple = Сосок
 
 marking-ADTFoxTail = Лисий хвост
-marking-ADTMilkyTail = Шипастый хвост
+marking-ADTMilkyTail = Шипастый хвост, Человек
+marking-ADTMilkyEars = Удлинённые уши, Человек
+marking-ADTMilkyHorns = Рога, Человек
 
 # Аргументации
 marking-AugmentsRoboticArmRight-r_roboarm = Аугментация, правая рука (Робот)

diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks/socks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks/socks.yml
@@ -40,7 +40,7 @@
 
 - type: entity
   parent: ADTClothingUnderwearSocksBase
-  id: ClothingUnderwearSocksBee # HACK
+  id: ADTClothingUnderwearSocksBee # HACK
   name: bee socks
   description: Make them loins buzz!
   components:

diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Human.yml b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Human.yml
@@ -86,3 +86,22 @@
     state: milky_tail
   - sprite: ADT/Mobs/Customization/Human/demon.rsi
     state: milky_tail_secondary
+
+- type: marking
+  id: ADTMilkyEars
+  bodyPart: Head
+  markingCategory: HeadTop
+  speciesRestriction: [Human]
+  sprites:
+  - sprite: ADT/Mobs/Customization/Human/demon.rsi
+    state: milky_ears
+
+- type: marking
+  id: ADTMilkyHorns
+  bodyPart: Head
+  markingCategory: HeadSide
+  speciesRestriction: [Human]
+  sprites:
+  - sprite: ADT/Mobs/Customization/Human/demon.rsi
+    state: milky_horns
+
diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Security/brigmedic.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Security/brigmedic.yml
@@ -72,69 +72,58 @@
 - type: loadout
   id: ADTEyesGlassesMed
   equipment:
-    back: ADTClothingEyesGlassesMed
+    eyes: ADTClothingEyesGlassesMed
 
 - type: loadout
   id: ADTEyesGlassesSecurity
   equipment:
-    back: ClothingEyesGlassesSecurity
+    eyes: ClothingEyesGlassesSecurity
 
 - type: loadout
   id: ADTEyesGlassesSunglasses
   equipment:
-    back: ClothingEyesGlassesSunglasses
+    eyes: ClothingEyesGlassesSunglasses
 
 # Hands Gloves
 - type: loadout
   id: ADTHandsGlovesLatex
   equipment:
-    back: ClothingHandsGlovesLatex
+    gloves: ClothingHandsGlovesLatex
 
 - type: loadout
   id: ADTHandsGlovesNitrile
   equipment:
-    back: ClothingHandsGlovesNitrile
-
-- type: loadout
-  id: ADTHandsGlovesCombat
-  equipment:
-    back: ClothingHandsGlovesCombat
-
-# PDA
-- type: loadout
-  id: ADTBrigmedicPDA
-  equipment:
-    back: BrigmedicPDA
+    gloves: ClothingHandsGlovesNitrile
 
 # belt
 - type: loadout
   id: ADTBeltMedicalFilled
   equipment:
-    back: ClothingBeltMedicalFilled
+    belt: ClothingBeltMedicalFilled
 
 - type: loadout
   id: ADTBeltSecurityRPS
   equipment:
-    back: ClothingBeltSecurityWebbingFilled
+    belt: ClothingBeltSecurityWebbingFilled
 
 - type: loadout
   id: ADTBeltSecurityForBrigmedic
   equipment:
-    back: ClothingBeltSecurityFilled
+    belt: ClothingBeltSecurityFilled
 
 # outerwear
 - type: loadout
   id: ADTOuterCoatBrigmedicWB
   equipment:
-    back: ADTClothingOuterCoatBrigmedicWB
+    outerClothing: ADTClothingOuterCoatBrigmedicWB
 
 - type: loadout
   id: ADTOuterVestSecurityMedic
   equipment:
-    back: ClothingOuterVestSecurityMedic
+    outerClothing: ClothingOuterVestSecurityMedic
 
 - type: loadout
   id: ADTOuterCoatLabSecurityMedic
   equipment:
-    back: ClothingOuterCoatLabSecurityMedic
+    outerClothing: ClothingOuterCoatLabSecurityMedic
 
diff --git a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml
@@ -307,16 +307,6 @@
   loadouts:
   - ADTHandsGlovesLatex
   - ADTHandsGlovesNitrile
-  - ADTHandsGlovesCombat
-
-  # PDA
-- type: loadoutGroup
-  id: ADTBrigmedicPDA
-  name: loadout-brigmedic-pda-adt
-  minLimit: 0
-  maxLimit: 1
-  loadouts:
-  - ADTBrigmedicPDA
 
   # Eyes
 - type: loadoutGroup
@@ -337,8 +327,7 @@
   maxLimit: 1
   loadouts:
   - ADTBeltMedicalFilled
-  - ADTBeltSecurityRPS
-  - ADTBeltSecurityForBrigmedic
+  - ADTMedicalBeltBag
 
   # outerwear
 - type: loadoutGroup

diff --git a/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml
@@ -170,10 +170,9 @@
   - ADTBrigmedicOuterWear
   - ADTBrigmedicBack
   # Another stuffs
-  - ADTBrigmedicBelts
+  - ADTMedicalBelt
   - ADTBrigmedicEyes
   - ADTBrigmedicGloves
-  - ADTBrigmedicPDA
   # another:
   - SecurityShoes
   - SurvivalSecurity

diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/ADT/Roles/Jobs/Medical/senior_physician.yml
@@ -26,4 +26,3 @@
   equipment:
     id: SeniorPhysicianPDA
     ears: ClothingHeadsetMedical
-    belt: ClothingBeltMedicalFilled
diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/ADT/Roles/Jobs/Security/brigmedic.yml
@@ -27,7 +27,6 @@
 - type: startingGear
   id: BrigmedicGear
   equipment:
-    jumpsuit: ADTClothingUniformBrigmedicJumpsuitTurtleneck
     id: BrigmedicPDA
     ears: ClothingHeadsetBrigmedic
     pocket1: WeaponPistolMk58

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -95,6 +95,9 @@
     ADTClothingUnderwearSocksKneeComfyGrey: 2
     ADTClothingUnderwearSocksKneeComfyRed: 2
     ADTClothingUnderwearSocksKneeComfyViolet: 2
+    ADTClothingUnderwearSocksBee: 2
+    ClothingUnderSocksBee: 2
+    ClothingUnderSocksCoder: 1
 # ADT конец носков
     # ADT бельё/обмотки/плащи начало
     ADTClothingFootWrapsWhite: 2

diff --git a/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/meta.json b/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/meta.json
@@ -26,6 +26,14 @@
             [0.25,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2],
             [0.25,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2]
         ]
+     },
+     {
+        "name": "milky_horns",
+        "directions": 4
+     },
+     {
+        "name": "milky_ears",
+        "directions": 4
      }
   ]
 }
diff --git a/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_ears.png b/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_ears.png
diff --git a/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_horns.png b/Resources/Textures/ADT/Mobs/Customization/Human/demon.rsi/milky_horns.png