From d1be81a26272bdd75c992d826092be0ec36d0df4 Mon Sep 17 00:00:00 2001 From: Hyrmik <72623996+Hyrmik@users.noreply.github.com> Date: Wed, 11 Sep 2024 20:45:48 +0300 Subject: [PATCH 1/5] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D1=83=D0=BF=D0=B0=20=D0=B8=D0=B7=20?= =?UTF-8?q?=D0=BE=D0=BF=D0=B8=D0=BB=D0=BE=D0=BA,=20=D0=BA=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D1=8E=D0=BC=D0=B0=20=D0=B3=D0=BE=D1=80=D0=BD=D0=B8=D1=87?= =?UTF-8?q?=D0=BD=D0=BE=D0=B9,=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B4=D0=B2=D0=B8=D0=BD?= =?UTF-8?q?=D1=83=D1=82=D0=BE=D0=B9=20=D0=B0=D0=BF=D1=82=D0=B5=D1=87=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Clothing/Shoes/jumpboots.ftl | 4 +- .../Entities/Clothing/Uniforms/jumpsuits.ftl | 3 + .../Entities/Objects/Consumable/Food/soup.ftl | 2 + .../Entities/Clothing/Uniforms/jumpskirts.yml | 36 +++++--- .../Entities/Objects/Consumable/Food/soup.yml | 87 ++++++++++++++++++ .../ADT/Recipes/Cooking/meal_recipes.yml | 18 +++- .../Catalog/Fills/Crates/service.yml | 3 +- .../Catalog/Fills/Items/firstaidkits.yml | 5 +- .../Spawners/Random/Food_Drinks/food_meal.yml | 1 + .../Objects/Specific/Medical/medkits.yml | 5 + .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1262 bytes .../janimaid.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1262 bytes .../Uniforms/Jumpskirt/janimaid.rsi/icon.png | Bin 0 -> 652 bytes .../Jumpskirt/janimaid.rsi/inhand-left.png | Bin 0 -> 530 bytes .../Jumpskirt/janimaid.rsi/inhand-right.png | Bin 0 -> 555 bytes .../Uniforms/Jumpskirt/janimaid.rsi/meta.json | 30 ++++++ .../Objects/Consumable/Food/bowl.rsi/bowl.png | Bin 0 -> 401 bytes .../Consumable/Food/bowl.rsi/meta.json | 18 ++++ .../Consumable/Food/bowl.rsi/soupsawdust.png | Bin 0 -> 602 bytes .../Consumable/Food/meals.rsi/meta.json | 6 +- 20 files changed, 197 insertions(+), 21 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/soup.ftl create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/soup.yml create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/bowl.rsi/bowl.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/bowl.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/bowl.rsi/soupsawdust.png diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Shoes/jumpboots.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Shoes/jumpboots.ftl index 479cd99251a..109472a86d3 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Shoes/jumpboots.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Shoes/jumpboots.ftl @@ -1,2 +1,4 @@ ent-ADTClothingJumpBoots = прыжковые ботинки -ent-ADTClothingJumpBootsSynd = кроваво-красные прыжковые ботинки \ No newline at end of file + .desc = Выглядят тяжелыми... Пока вы ими не воспользуетесь. +ent-ADTClothingJumpBootsSynd = кроваво-красные прыжковые ботинки + .desc = Выглядят тяжелыми... Пока вы ими не воспользуетесь. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl index e7f120fdb72..f0f364efa2b 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl @@ -199,3 +199,6 @@ ent-ADTClothingUniformInvestigatorSuit = форма следователя Сл ent-ADTClothingUniformNewMekka = униформа Новой Мекки .desc = Эта униформа имеет очень долгую и кровавую историю... .suffix = { "Новая Мекка" } + +ent-ADTClothingUniformJumpskirtJanimaid = костюм горничной + .desc = Обновленный костюм горничной от НТ. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/soup.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/soup.ftl new file mode 100644 index 00000000000..8300327ae9d --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/soup.ftl @@ -0,0 +1,2 @@ +ent-ADTFoodSoupSawdust = суп с опилками + .desc = Ешьте, ведь потом вам нужно будет топить генератор... diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml index 07c3265440f..f2289cd84c8 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml @@ -42,7 +42,7 @@ description: Warm and comfy. components: - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi + sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_women.rsi - type: StaticPrice @@ -55,7 +55,7 @@ description: Brighter shade of blue. components: - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi + sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_azure_women.rsi - type: StaticPrice @@ -68,7 +68,7 @@ description: Filled with happines. components: - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi + sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_yellow_women.rsi - type: StaticPrice @@ -81,7 +81,7 @@ description: Cheaper analog of CentComm turtleneck. components: - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi + sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_green_women.rsi - type: StaticPrice @@ -94,7 +94,7 @@ description: -Ya know why i wear red? It hides blood well! -But that's brown color... components: - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi + sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brown_women.rsi - type: StaticPrice @@ -107,7 +107,7 @@ description: Hides blood of clowns well! components: - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi + sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_red_women.rsi - type: StaticPrice @@ -120,7 +120,7 @@ description: I don't want to talk about it. components: - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi + sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_orange_women.rsi - type: StaticPrice @@ -133,7 +133,7 @@ description: Who would wear this? components: - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi + sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_pink_women.rsi - type: StaticPrice @@ -146,7 +146,7 @@ description: Grey style? components: - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi + sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_grey_women.rsi - type: StaticPrice @@ -159,7 +159,7 @@ description: Darker shade of azure. components: - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi + sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_blue_women.rsi - type: StaticPrice @@ -172,7 +172,7 @@ description: Feel yourself like a real scientist. components: - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi + sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_purple_women.rsi - type: StaticPrice @@ -185,7 +185,7 @@ description: Favourite clothes of bookworms. components: - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi + sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_women.rsi - type: StaticPrice @@ -249,3 +249,15 @@ sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ADTClothingUniformJumpskirtJanimaid + name: janitorial maid uniform + description: For professionals, not the posers. + suffix: ADT + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/soup.yml new file mode 100644 index 00000000000..772de9ecd06 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/soup.yml @@ -0,0 +1,87 @@ +- type: entity + parent: FoodBase + id: ADTFoodBowlBase + abstract: true + components: + - type: Item + storedRotation: -90 + - type: Food + trash: + - FoodBowlBig + utensil: Spoon + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 20 + - type: Sprite + sprite: ADT/Objects/Consumable/Food/bowl.rsi + - type: DamageOnLand + damage: + types: + Blunt: 5 + - type: DamageOtherOnHit + damage: + types: + Blunt: 5 + - type: Spillable + solution: food + # soup weapon! + - type: MeleeWeapon + soundNoDamage: + path: "/Audio/Effects/Fluids/splat.ogg" + damage: + types: + Blunt: 0 + - type: Damageable + damageContainer: Inorganic + - type: Tag + tags: + - Soup + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + params: + volume: -8 + - !type:SpillBehavior { } + - !type:SpawnEntitiesBehavior + spawn: + FoodBowlBigTrash: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + name: sawdust soup + parent: ADTFoodBowlBase + id: ADTFoodSoupSawdust + description: Where did the soup come from in my sawdust? + components: + - type: FlavorProfile + flavors: + - ADTSawdust + - type: Sprite + layers: + - state: bowl + - state: soupsawdust + - type: SolutionContainerManager + solutions: + food: + maxVol: 21 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Vitamin + Quantity: 3 + - ReagentId: Water + Quantity: 15 + diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml index c816632bb77..ec255d09e7a 100644 --- a/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml @@ -3,10 +3,22 @@ name: Khachapuri recipe result: ADTFoodMealKhachapuri time: 15 - reagents: + reagents: Egg: 12 TableSalt: 5 Milk: 5 - solids: + solids: FoodCheeseSlice: 1 - FoodBreadPlainSlice: 1 \ No newline at end of file + FoodBreadPlainSlice: 1 + +- type: microwaveMealRecipe + id: ADTFoodSawdustSoupRecipe + name: sawdust soup recipe + result: ADTFoodSoupSawdust + time: 15 + reagents: + Water: 10 + TableSalt: 10 + solids: + FoodBowlBig: 1 + MaterialWoodPlank1: 1 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index 09020809c53..a63091782d1 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -84,7 +84,7 @@ - id: ClothingMaskClown - id: ClothingMaskMime - id: ClothingShoesClown - - id: ClothingUniformJumpskirtJanimaid + # - id: ClothingUniformJumpskirtJanimaid ADT Tweak - id: ClothingNeckCloakVoid - id: RevolverCapGun - id: BarberScissors @@ -93,6 +93,7 @@ - id: ClownRecorder - id: ClothingBeltSuspendersRed - id: ClothingBeltSuspendersBlack + - id: ADTClothingUniformJumpskirtJanimaid #ADT Tweak - type: entity id: CrateServiceCustomSmokable diff --git a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml index 7da375d582f..c8787ff8c19 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml @@ -81,10 +81,13 @@ components: - type: StorageFill contents: + - id: BurnAutoInjector + - id: BruteAutoInjector + - id: RadAutoInjector + - id: AntiPoisonMedipen - id: MedicatedSuture - id: RegenerativeMesh - id: Bloodpack - amount: 2 - type: entity id: MedkitCombatFilled diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml index 4c64bdd7860..cabefe9cbbf 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml @@ -69,6 +69,7 @@ - FoodSoupOnion - FoodSoupBisque - FoodSoupBungo + - ADTFoodSoupSawdust #ADT tweak - FoodMealCornInButter - FoodSoupStew chance: 0.8 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml index 82f91669cd1..df68699c338 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml @@ -72,6 +72,11 @@ parent: Medkit id: MedkitAdvanced components: + #ADT Tweak + - type: Storage + grid: + - 0,0,4,1 + #ADT Tweak - type: Sprite state: advkit - type: Item diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..e8deec917552b3d56e1dcb524e489e33d75c5e2d GIT binary patch literal 1262 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 Y1z0*`9)VO~NdN!<07*qoM6N<$f>G39N&o-= literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5b015d332ebbc77d01e6c66c7467de18b4d3cc66 GIT binary patch literal 652 zcmV;70(1R|P)Px%MoC0LR9J=Wl|P8na1_VCid#sg4*4x5r!gG@V&!lYgba>C!9|dB(c!RSDTq0^ zL9pT^o{^wS#8J3Ckb)pwI7B@02=r+08oDGyr~b(N9P}4@(6fnu1|gs2m;Bz#dtYAO z`~855ii-aY$MuLYMvH8WF>+jQq3tA2mvLr{k*+tevDsT_-`MOy*BdxV;3CeHNp6}Z z0N}}E8-5Uyrmf`mI3DBntrom@+xY26Ns^pe7I&$GNG{7V0HFQg5snUr`1bV^`u%?X zy=7T+;o@bSJ$D{k&z}MSIOkXyhJnWEe*N-09l+gmk(#4TcH%LHK6^M3DLMVvLa=gk%^7DT+ddVUQn$$Hvof zJrd%76~9mu&Z8&_sj3RjIX-;+f;b*S(^hcx$|cCMj5JL#o6QQxEp-n33x2Bt0Pud> z$7pnr@9TO4H(J*Kpi~7)2~ZS;de2@!*BbzSOo8|XVgg2^1K1Dmml9DJ$MwjvEMkn& zV3_1xE}j`+Sq4>A^P{;|t6@5w!Zb}xCKIG-3Q3X*B`+;tUI+kW mSq4dx@)bbg#1$146@u@pk2Mno${0le0000Px$%t=H+RCt{2+ObN*P!tB>KjNAPIIGf2;XZ^*(LwPId;r14;v|BblQAra;T(X7h=_=Yh=_=Yh^i40 z+v)bKi^r+4oo>&Hi2dt#Wpnwu&!SCViA2Q4ag6CCox9oTBt;y@0AP(VQJq{NZ1_r~ zwFUs}?j6jnyV#wtlPd&oZ$PJei)KTj;p>y#+HU0Q(@BaXNut5?$Tk~NE7w|3O4)I0 z@b%erIZzs{BUu|YZeP#r|@grZ}&NiK=hA&0dO}+ UgWq(gk^lez07*qoM6N<$g4s>}v;Y7A literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..0b7d11a94842b05dcb9b1ea95323dbef00b11916 GIT binary patch literal 555 zcmV+`0@VG9P)Px$IcnCxgcf zp<7ByNFXs@G6b?`5qH>wmwNy`z}KOiq7ca_FWLr0MDskya^X?>pz%wW3y(a{u?v$> z`k;OCwoX7%6aav?@Ae*y$9}xN?fT?>*)}+t9%DR`Y<6|7uU?Pp@#Vt9IhUPXTHFx}7$V)^-L_|bH zL_|bHME7EuzFGE8sk1b;E==ri`piJHOdp?@dLlYYW9z~+L&O?908L$iDT)HC)#_21 zKBe9(V2CpVlj$*>bJ^_b9P{~Q-S!U-ldXc@zgX#mjz^O19~?e9Gw}1r_bgsd6|Bh^ zqh}Y_b^pWrH*n4kQ}6rVX9nUP(|qP&M|8TvZ1T*2wN`I#@6=jbx0~C$VJ4s}jJ0-S tfkZ@&F)AW;OS$Tv^d9Z%nE@i|^cS;cP7EsG(?kFO002ovPDHLkV1hFD2e<$L literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/meta.json new file mode 100644 index 00000000000..a27130c115e --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made for digimortal's Adventure Time(Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/bowl.rsi/bowl.png b/Resources/Textures/ADT/Objects/Consumable/Food/bowl.rsi/bowl.png new file mode 100644 index 0000000000000000000000000000000000000000..9f91f21ff45290c6290ab7088b4548db7df39772 GIT binary patch literal 401 zcmV;C0dD?@P)|`Qn6O}B-1+YfJx&?jz85kHCEUX==V!4B>FT?X^j~I;Y z{W0ug!KUHVsWS|EIvNZoj_yYhhdBsed^0dGFsN(mGcYhPFi1+tF)%PNFx8P;;0EG#?6ozV*)4&Qjii_`-5J4z21+nyI{h`;63BBd|uC! zXLy8CiqkB4s_6+J0VIF~kN^?@kUp-dX&Tm;$+$&c3;Lc<5QZlMyj*&MJ({7=ey4CFx`xHp zmlb>&F;P5&7&ei{B??Z=`bL#X*&%1o6J-OMYio4&Kd6cm({42xMpHa{cwczK_~aXy zi{2~I>=T4T+>s)()n@AQ9PZa|v>G)`GfiaMY*%+Fmn?LvKx{}dEthd?lG$LN(CX#ItmAK>S4Fs+Xx Date: Wed, 11 Sep 2024 23:10:43 +0300 Subject: [PATCH 2/5] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl | 1 + Resources/Prototypes/ADT/Flavors/flavors.yml | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl index 55aeec7d216..837d8ac5f71 100644 --- a/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl @@ -23,3 +23,4 @@ flavor-complex-businessconversation = как горечь, алкоголь и flavor-complex-applemartini = как алкоголь и зелёное яблоко flavor-complex-bacardiapple = как ром с привкусом яблока flavor-complex-elderguards = как закон и очень странная смесь алкоголя с нотками уксуса +flavor-complex-ADTSawdust = как 24-ая смена за день в лютый мороз diff --git a/Resources/Prototypes/ADT/Flavors/flavors.yml b/Resources/Prototypes/ADT/Flavors/flavors.yml index 030e8b467fb..741350b4b5a 100644 --- a/Resources/Prototypes/ADT/Flavors/flavors.yml +++ b/Resources/Prototypes/ADT/Flavors/flavors.yml @@ -112,3 +112,11 @@ id: adt_elderguards flavorType: Complex description: flavor-complex-elderguards + + +# Суп + +- type: flavor + id: ADTSawdust + flavorType: Complex + description: flavor-complex-ADTSawdust From 13e3950bee7d703a3df8c4746d033b4284c937de Mon Sep 17 00:00:00 2001 From: Hyrmik <72623996+Hyrmik@users.noreply.github.com> Date: Sat, 14 Sep 2024 17:16:36 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=83=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl | 5 ++++- .../ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl index 16ec0c2cacf..491840adf3b 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl @@ -99,7 +99,7 @@ ent-ADTQMJumpskirtWarm = водолазка квартирмейстера ent-ADTHOSJumpskirtWarm = { ent-ClothingUniformJumpsuitHoSAlt } .desc = { ent-ClothingUniformJumpsuitHoSAlt.desc } - + ent-ADTRDJumpskirtWarm = { ent-ClothingUniformJumpsuitResearchDirector } .desc = { ent-ClothingUniformJumpsuitResearchDirector.desc } @@ -108,3 +108,6 @@ ent-ADTCapJumpskirtWarm = { ent-ADTCapJumpsuitWarm } ent-ClothingUniformJumpskirtBlueshieldTurtleneck = юбка-водолазка офицера синего щита .desc = Белая удобная водолазка с юбкой для Офицера Синего Щита с пришитыми золотыми погонами и ярким именным бейджиком. К сожалению, если вы её наденете, это не будет значить, что вам дадут отпуск. + +ent-ADTClothingUniformJumpskirtJanimaid = костюм горничной + .desc = Обновленный костюм горничной от НТ. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl index f0f364efa2b..e7f120fdb72 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl @@ -199,6 +199,3 @@ ent-ADTClothingUniformInvestigatorSuit = форма следователя Сл ent-ADTClothingUniformNewMekka = униформа Новой Мекки .desc = Эта униформа имеет очень долгую и кровавую историю... .suffix = { "Новая Мекка" } - -ent-ADTClothingUniformJumpskirtJanimaid = костюм горничной - .desc = Обновленный костюм горничной от НТ. From 7614ddaf203cb0bd3a657b879328239a5297f3e9 Mon Sep 17 00:00:00 2001 From: Hyrmik <72623996+Hyrmik@users.noreply.github.com> Date: Sat, 14 Sep 2024 17:23:10 +0300 Subject: [PATCH 4/5] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl index 6a22df81388..20f40f8a959 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl @@ -200,10 +200,6 @@ ent-ADTClothingUniformNewMekka = униформа Новой Мекки .desc = Эта униформа имеет очень долгую и кровавую историю... .suffix = { "Новая Мекка" } - -ent-ADTClothingUniformJumpskirtJanimaid = костюм горничной - .desc = Обновленный костюм горничной от НТ. - ent-ADTClothingJumpsuitHopAlt = деловой костюм главы персонала .desc = Качетсвенно сделанная униформа для тех глав персонала, что могут себе такую позволить. ent-ADTClothingJumpsuitSecOffMogesBrown = костюм офицера СБ с Могеса From 1be28fe0bd7a06ed6eb1a899ed36e5f57f7fc80e Mon Sep 17 00:00:00 2001 From: Hyrmik <72623996+Hyrmik@users.noreply.github.com> Date: Sat, 14 Sep 2024 19:45:07 +0300 Subject: [PATCH 5/5] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml index c8787ff8c19..ccaaaf3ced9 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml @@ -81,10 +81,12 @@ components: - type: StorageFill contents: + # ADT Tweak start - id: BurnAutoInjector - id: BruteAutoInjector - id: RadAutoInjector - id: AntiPoisonMedipen + # ADT Tweak End - id: MedicatedSuture - id: RegenerativeMesh - id: Bloodpack