Доработка разных моментов и добавление небольшого кастома для человека (

#672) Содержит разные исправления и доработки последних проблем что я нашел, ну и немного добавки. Плюс починка тестов за хеллоуин. :cl: Filo - add: Еще немного носочков в одеждомат. - add: Добавлено создание сумок в принтер гп - add: Добавлен хвост для людей?... - tweak: Изменил отображение урона на теле у новакидов и сумеречников - fix: Пофиксил одевание носков с пчелками и программиста - fix: Мелкие исправления по типу: ослаблении хеллоуинского броника, уменьшении цены стильномата(70к это перебор), порезы таярам, лоадаута бригмедика.
AdventureTimeSS14 · Oct 25, 2024 · 026f2df · 026f2df
1 parent 5ee9d79
commit 026f2df
Show file tree

Hide file tree

Showing 53 changed files with 455 additions and 112 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,6 +6,9 @@ marking-HumanPiercingNippleR = Правый сосок
 marking-HumanPiercingNipple = Сосок
 
 marking-ADTFoxTail = Лисий хвост
+marking-ADTMilkyTail = Шипастый хвост, Человек
+marking-ADTMilkyEars = Удлинённые уши, Человек
+marking-ADTMilkyHorns = Рога, Человек
 
 # Аргументации
 marking-AugmentsRoboticArmRight-r_roboarm = Аугментация, правая рука (Робот)
@@ -47,4 +50,4 @@ marking-AugmentsAugTorso = Аугментация, корпус мужской (
 marking-Malstrem = Мальстрём
 marking-Beholder = Наблюдатель
 marking-Terminator = Терминатор
-marking-Iron_jaw = Стальная челюсть
+marking-Iron_jaw = Стальная челюсть
diff --git a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_food.yml
@@ -94,6 +94,6 @@
     sprite: ADT/Objects/Misc/halloween_smilecandy_bowl.rsi
     state: icon-0
   product: ADTCrateHalloweenFood
-  cost: 1200
+  cost: 2300
   category: cargoproduct-category-name-food
   group: market
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml
@@ -133,7 +133,7 @@
     sprite: ADT/Clothing/Belt/black_suspenders.rsi #спрайты от prazat911
     quickEquip: true
   - type: StaticPrice
-    price: 160
+    price: 15
 
 - type: entity
   parent: ClothingBeltBase
@@ -147,7 +147,7 @@
     sprite: ADT/Clothing/Belt/leather_suspenders.rsi #спрайты от prazat911
     quickEquip: true
   - type: StaticPrice
-    price: 160
+    price: 15
 
 # Разгрузка и подсумки ТСФ
 
@@ -227,7 +227,7 @@
     sprite: ADT/Clothing/Belt/killa_webbing.rsi
   - type: Clothing
     sprite: ADT/Clothing/Belt/killa_webbing.rsi
-    
+
 - type: entity
   parent: ClothingBeltStorageBase
   id: ADTClothingBeltMedicalBag

diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml
@@ -26,7 +26,7 @@
   - type: Clothing
     sprite: ADT/Clothing/Eyes/Glasses/pink_glasses.rsi #спрайты от dion_clawed
   - type: StaticPrice
-    price: 200
+    price: 25
 
 - type: entity
   parent: ClothingEyesBase

diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml
@@ -43,7 +43,7 @@
   - type: Clothing
     sprite: ADT/Clothing/Head/Hats/cinnamon_flat_cap.rsi #спрайты от prazat911
   - type: StaticPrice
-    price: 150
+    price: 15
 
 - type: entity
   parent: ClothingHeadBase
@@ -56,7 +56,7 @@
   - type: Clothing
     sprite: ADT/Clothing/Head/Hats/grey_flat_cap.rsi #спрайты от prazat911
   - type: StaticPrice
-    price: 150
+    price: 15
 
 - type: entity
   parent: ClothingHeadBase

diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/misc.yml
@@ -9,7 +9,7 @@
     - type: Clothing
       sprite: ADT/Clothing/Neck/Misc/gold_chain.rsi #спрайты от prazat911
     - type: StaticPrice
-      price: 500
+      price: 75
 
 - type: entity
   parent: ClothingNeckBase
@@ -30,7 +30,7 @@
     - type: Sprite
       sprite: ADT/Clothing/Neck/Misc/choker_with_spike.rsi
     - type: StaticPrice
-      price: 300
+      price: 40
 
 - type: entity
   parent: ClothingNeckBase
@@ -41,7 +41,7 @@
     - type: Sprite
       sprite: ADT/Clothing/Neck/Misc/choker_with_heart.rsi
     - type: StaticPrice
-      price: 300
+      price: 40
 
 
       # halloween

diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/ties.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/ties.yml
@@ -9,7 +9,7 @@
     - type: Clothing
       sprite: ADT/Clothing/Neck/Ties/blue_tie.rsi #спрайты от prazat911
     - type: StaticPrice
-      price: 150
+      price: 65
 
 - type: entity
   parent: ClothingNeckBase
@@ -22,4 +22,4 @@
     - type: Clothing
       sprite: ADT/Clothing/Neck/Ties/gold_tie.rsi #спрайты от prazat911
     - type: StaticPrice
-      price: 150
+      price: 75
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml
@@ -166,5 +166,11 @@
     sprite: ADT/Clothing/OuterClothing/Armor/CSIJ_armor.rsi
   - type: Clothing
     sprite: ADT/Clothing/OuterClothing/Armor/CSIJ_armor.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Slash: 0.95
+        Piercing: 0.85
   - type: ExplosionResistance
     damageCoefficient: 0.9
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml
@@ -46,7 +46,7 @@
   - type: Clothing
     sprite: ADT/Clothing/OuterClothing/Coats/gray_sweatshirttop.rsi
   - type: StaticPrice
-    price: 800
+    price: 65
 
 - type: entity
   parent: ClothingOuterStorageBase
@@ -59,7 +59,7 @@
   - type: Clothing
     sprite: ADT/Clothing/OuterClothing/Coats/black_sweatshirttop.rsi
   - type: StaticPrice
-    price: 800
+    price: 65
 
 
 - type: entity

diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -25,4 +25,4 @@
   - type: Clothing
     sprite: ADT/Clothing/OuterClothing/WinterCoats/russian_coat.rsi #спрайты от prazat911
   - type: StaticPrice
-    price: 1000
+    price: 120
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/ADT/Entities/Clothing/Shoes/misc.yml
@@ -9,7 +9,7 @@
   - type: Clothing
     sprite: ADT/Clothing/Shoes/Boots/light_shoes.rsi
   - type: StaticPrice
-    price: 120
+    price: 15
 
 - type: entity
   parent: ClothingShoesBaseButcherable
@@ -22,7 +22,7 @@
   - type: Clothing
     sprite: ADT/Clothing/Shoes/Boots/white_sandals.rsi  #спрайты от dion_clawed
   - type: StaticPrice
-    price: 240
+    price: 23
 
 - type: entity
   parent: ClothingShoesBaseButcherable
@@ -35,7 +35,7 @@
   - type: Clothing
     sprite: ADT/Clothing/Shoes/Boots/black_boots.rsi  #спрайты от dion_clawed
   - type: StaticPrice
-    price: 240
+    price: 23
 
 - type: entity
   parent: ClothingShoesBaseButcherable

diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Bottom/bottom.yml b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Bottom/bottom.yml
@@ -176,7 +176,7 @@
   - type: Sprite
     sprite: ADT/Clothing/Underwear/Bottom/lace_panties.rsi #спрайты от prazat911
   - type: StaticPrice
-    price: 100
+    price: 28
 
 #New Year.
 - type: entity
@@ -216,7 +216,7 @@
   - type: Sprite
     sprite: ADT/Clothing/Underwear/Bottom/red_panties.rsi
   - type: StaticPrice
-    price: 100
+    price: 25
 
 - type: entity
   parent: ADTClothingUnderwearBottomBase
@@ -227,7 +227,7 @@
   - type: Sprite
     sprite: ADT/Clothing/Underwear/Bottom/black_panties.rsi
   - type: StaticPrice
-    price: 100
+    price: 25
 
 - type: entity
   parent: ADTClothingUnderwearBottomBase

diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks/base_clothingsocks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks/base_clothingsocks.yml
@@ -27,6 +27,8 @@
         reagents:
         - ReagentId: Fiber
           Quantity: 10
+  - type: StaticPrice
+    price: 14
   - type: Tag
     tags:
       - ClothMade

diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks/socks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks/socks.yml
@@ -40,21 +40,12 @@
 
 - type: entity
   parent: ADTClothingUnderwearSocksBase
-  id: ClothingUnderwearSocksBee # HACK
+  id: ADTClothingUnderwearSocksBee # HACK
   name: bee socks
   description: Make them loins buzz!
   components:
   - type: Sprite
-    sprite: Clothing/Under/Socks/bee.rsi
-
-- type: entity
-  parent: ADTClothingUnderwearSocksBase
-  id: ClothingUnderwearSocksCoder # HACK
-  name: coder socks
-  description: It's time to code sisters!!11!
-  components:
-  - type: Sprite
-    sprite: Clothing/Under/Socks/coder.rsi
+    sprite: ADT/Clothing/Underwear/Socks/socksbee.rsi
 
 #приколы празата
 - type: entity
@@ -244,7 +235,7 @@
   - type: Sprite
     sprite: ADT/Clothing/Underwear/Socks/socks_rabbit.rsi
   - type: StaticPrice
-    price: 120
+    price: 26
 
 # TGS
 

diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Top/top.yml b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Top/top.yml
@@ -122,7 +122,7 @@
   - type: Sprite
     sprite: ADT/Clothing/Underwear/Top/sportsbrablack.rsi
   - type: StaticPrice
-    price: 100
+    price: 28
 
 - type: entity
   parent: ADTClothingUnderwearTopBase
@@ -133,7 +133,7 @@
   - type: Sprite
     sprite: ADT/Clothing/Underwear/Top/peabra.rsi
   - type: StaticPrice
-    price: 100
+    price: 28
 
 - type: entity
   parent: ADTClothingUnderwearTopBase
@@ -144,7 +144,7 @@
   - type: Sprite
     sprite: ADT/Clothing/Underwear/Top/lace_bra.rsi
   - type: StaticPrice
-    price: 100
+    price: 28
 
 - type: entity
   parent: ADTClothingUnderwearTopBase
@@ -173,7 +173,7 @@
   - type: Sprite
     sprite: ADT/Clothing/Underwear/Top/red_bra.rsi
   - type: StaticPrice
-    price: 100
+    price: 28
 
 - type: entity
   parent: ADTClothingUnderwearTopBase
@@ -184,7 +184,7 @@
   - type: Sprite
     sprite: ADT/Clothing/Underwear/Top/black_bra.rsi
   - type: StaticPrice
-    price: 100
+    price: 28
 
 - type: entity
   parent: ADTClothingUnderwearTopBase