Merge pull request #660 from JustKekc/я-точно-ушёл-с-ВП

респрайты респрайов напитков и костюм крупье.
AdventureTimeSS14 · May 3, 2024 · 795773b · 795773b
2 parents ed9c813 + b66615b
commit 795773b
Show file tree

Hide file tree

Showing 218 changed files with 984 additions and 182 deletions.
diff --git a/Resources/Locale/en-US/foldable/components/foldable-component.ftl b/Resources/Locale/en-US/foldable/components/foldable-component.ftl
@@ -4,4 +4,6 @@ foldable-deploy-fail = You can't deploy the {$object} here.
 fold-verb = Fold
 unfold-verb = Unfold
 
-fold-flip-verb = Flip
+fold-flip-verb = Flip
+fold-pull-off-verb = Pull off
+fold-put-on-verb = Put on
diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl
@@ -366,3 +366,8 @@ ent-ADTClothingUniformHikeformCmo = походный костюм главног
 ent-ADTClothingUniformHikeJumpskirtCmo = походная юбка-костюм главного врача
     .desc = Рубашка и мешковитая юбка, отлично подходящие для активной работы как вне, так и внутри своего отдела.
     .suffix = { "" }
+
+ent-ADTClothingUniformCroupier = костюм крупье
+    .desc = Костюм самого главного по фишкам и картам.
+ent-ADTClothingUniformCroupierSkirt = юбка-костюм крупье
+    .desc = {ent-ADTClothingUniformCroupier.desc}
diff --git a/Resources/Locale/ru-RU/foldable/components/foldable-component.ftl b/Resources/Locale/ru-RU/foldable/components/foldable-component.ftl
@@ -3,3 +3,7 @@
 foldable-deploy-fail = Вы не можете разложить { $object } здесь.
 fold-verb = Сложить
 unfold-verb = Разложить
+
+fold-flip-verb = Перевернуть
+fold-pull-off-verb = Снять
+fold-put-on-verb = Надеть
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml
@@ -770,3 +770,29 @@
     sprite: ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpskirt/pathologist_alt.rsi
+
+- type: entity
+  parent: [ ClothingUniformBase, BaseFoldable ]
+  id: ADTClothingUniformCroupierSkirt
+  name: crupier jumpsuit
+  description: Fancy.
+  components:
+  #- type: Appearance
+  #- type: Foldable
+    #canFoldInsideContainer: true
+    #unfoldVerbText: fold-put-on-verb
+    #foldVerbText: fold-pull-off-verb
+  #- type: FoldableClothing
+    #foldedEquippedPrefix: vest
+    #foldedHeldPrefix: vest
+  - type: Clothing
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/uniform_croupier.rsi
+    #equippedPrefix: vest
+  - type: Sprite
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/uniform_croupier.rsi
+    #layers:
+    #- state: icon
+      #map: [ "unfoldedLayer" ]
+    #- state: icon_vest
+      #map: ["foldedLayer"]
+      #visible: false
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml
@@ -1279,3 +1279,29 @@
     sprite: ADT/Clothing/Uniforms/Jumpsuit/trader.rsi
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpsuit/trader.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ADTClothingUniformCroupier
+  name: crupier jumpsuit
+  description: Fancy.
+  components:
+  #- type: Appearance
+  #- type: Foldable
+    #canFoldInsideContainer: true
+    #unfoldVerbText: fold-put-on-verb
+    #foldVerbText: fold-pull-off-verb
+  #- type: FoldableClothing
+    #foldedEquippedPrefix: vest
+    #foldedHeldPrefix: vest
+  - type: Clothing
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/uniform_croupier.rsi
+    #equippedPrefix: vest
+  - type: Sprite
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/uniform_croupier.rsi
+    #layers:
+    #- state: icon
+      #map: [ "unfoldedLayer" ]
+    #- state: icon_vest
+      #map: ["foldedLayer"]
+      #visible: false
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drink_bottles.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drink_bottles.yml
@@ -33,8 +33,8 @@
           Quantity: 100
   - type: Drink
   - type: Sprite
-    sprite: ADT/Objects/Consumable/Drinks/just_kekc_cocktail.rsi
-    state: adtappleliqueurbottle
+    sprite: ADT/Objects/Consumable/Drinks/apple_liqueur_bottle.rsi
+    state: icon
   - type: Label
     currentLabel: apple-liqueur-name
 

diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/just_kekc_cocktails_glass.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/just_kekc_cocktails_glass.yml
@@ -13,8 +13,8 @@
         - ReagentId: ADTSummerShade
           Quantity: 30
   - type: Sprite
-    sprite: ADT/Objects/Consumable/Drinks/just_kekc_cocktail.rsi
-    state: adtsummershade
+    sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/summershade.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
@@ -31,8 +31,8 @@
         - ReagentId: ADTWinterSun
           Quantity: 30
   - type: Sprite
-    sprite: ADT/Objects/Consumable/Drinks/just_kekc_cocktail.rsi
-    state: adtwintersun
+    sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/wintersun.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
@@ -49,8 +49,8 @@
         - ReagentId: ADTHungoverAngel
           Quantity: 30
   - type: Sprite
-    sprite: ADT/Objects/Consumable/Drinks/just_kekc_cocktail.rsi
-    state: adthungoverangel
+    sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/hungoverangel.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
@@ -67,8 +67,8 @@
         - ReagentId: ADTCitrusBalance
           Quantity: 30
   - type: Sprite
-    sprite: ADT/Objects/Consumable/Drinks/just_kekc_cocktail.rsi
-    state: adtcitrusbalance
+    sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/citrucbalance.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
@@ -85,8 +85,8 @@
         - ReagentId: ADTDobryiDrink
           Quantity: 30
   - type: Sprite
-    sprite: ADT/Objects/Consumable/Drinks/just_kekc_cocktail.rsi
-    state: adtdobryidrink
+    sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/dobryi.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
@@ -103,8 +103,8 @@
         - ReagentId: ADTMilkEclipse
           Quantity: 30
   - type: Sprite
-    sprite: ADT/Objects/Consumable/Drinks/just_kekc_cocktail.rsi
-    state: adtmilkeclipse
+    sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/milkeclipse.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
@@ -121,8 +121,8 @@
         - ReagentId: ADTArcticExplosion
           Quantity: 30
   - type: Sprite
-    sprite: ADT/Objects/Consumable/Drinks/just_kekc_cocktail.rsi
-    state: adtarcticexplosion
+    sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/arcticexplosion.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
@@ -139,8 +139,8 @@
         - ReagentId: ADTSugarKnight
           Quantity: 30
   - type: Sprite
-    sprite: ADT/Objects/Consumable/Drinks/just_kekc_cocktail.rsi
-    state: adtsugarknight
+    sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/sugarknight.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
@@ -157,8 +157,8 @@
         - ReagentId: ADTGrapeLady
           Quantity: 30
   - type: Sprite
-    sprite: ADT/Objects/Consumable/Drinks/just_kekc_cocktail.rsi
-    state: adtgrapelady
+    sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/grapelady.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
@@ -175,8 +175,8 @@
         - ReagentId: ADTSaturdayBaron
           Quantity: 30
   - type: Sprite
-    sprite: ADT/Objects/Consumable/Drinks/just_kekc_cocktail.rsi
-    state: adtsaturdaybaron
+    sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/saturdaybaron.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
@@ -193,8 +193,8 @@
         - ReagentId: ADTArcticLatte
           Quantity: 30
   - type: Sprite
-    sprite: ADT/Objects/Consumable/Drinks/just_kekc_cocktail.rsi
-    state: adtarcticlatte
+    sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/arcticlatte.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
@@ -211,8 +211,8 @@
         - ReagentId: ADTSpecialTeaOolong
           Quantity: 30
   - type: Sprite
-    sprite: ADT/Objects/Consumable/Drinks/just_kekc_cocktail.rsi
-    state: adtspecialteaoolong
+    sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/teaoolong.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
@@ -229,8 +229,8 @@
         - ReagentId: ADTAzureBlue
           Quantity: 30
   - type: Sprite
-    sprite: ADT/Objects/Consumable/Drinks/just_kekc_cocktail.rsi
-    state: adtazureblue
+    sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/azureblue.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
@@ -247,8 +247,8 @@
         - ReagentId: ADTPenetrationDrink
           Quantity: 30
   - type: Sprite
-    sprite: ADT/Objects/Consumable/Drinks/just_kekc_cocktail.rsi
-    state: adtpenetrationdrink
+    sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/penetration.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
@@ -265,8 +265,8 @@
         - ReagentId: ADTEclipsedEclispe
           Quantity: 30
   - type: Sprite
-    sprite: ADT/Objects/Consumable/Drinks/just_kekc_cocktail.rsi
-    state: adteclipsedeclispe
+    sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/eclipsedeclipse.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
@@ -283,8 +283,8 @@
         - ReagentId: ADTSpaceBush
           Quantity: 30
   - type: Sprite
-    sprite: ADT/Objects/Consumable/Drinks/just_kekc_cocktail.rsi
-    state: adtspacebush
+    sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/spacebush.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
@@ -301,8 +301,8 @@
         - ReagentId: ADTBusinessConversation
           Quantity: 30
   - type: Sprite
-    sprite: ADT/Objects/Consumable/Drinks/just_kekc_cocktail.rsi
-    state: adtbizconversation
+    sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/buisinessconservation.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
@@ -319,8 +319,8 @@
         - ReagentId: ADTAppleLiqueur
           Quantity: 30
   - type: Sprite
-    sprite: ADT/Objects/Consumable/Drinks/just_kekc_cocktail.rsi
-    state: adtappleliqueur
+    sprite: ADT/Objects/Consumable/Drinks/apple_liqueur_glass.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
@@ -337,8 +337,8 @@
         - ReagentId: ADTAppleMartini
           Quantity: 30
   - type: Sprite
-    sprite: ADT/Objects/Consumable/Drinks/just_kekc_cocktail.rsi
-    state: adtapplemartini
+    sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/applemartini.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
@@ -355,8 +355,8 @@
         - ReagentId: ADTBacardiApple
           Quantity: 30
   - type: Sprite
-    sprite: ADT/Objects/Consumable/Drinks/just_kekc_cocktail.rsi
-    state: adtbacardiapple
+    sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/bacardiapple.rsi
+    state: icon
 
 #День Святого Валентина