diff --git a/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl index 02c8515fdff..e816e3158aa 100644 --- a/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl @@ -23,4 +23,6 @@ flavor-complex-businessconversation = как горечь, алкоголь и flavor-complex-applemartini = как алкоголь и зелёное яблоко flavor-complex-bacardiapple = как ром с привкусом яблока flavor-complex-elderguards = как закон и очень странная смесь алкоголя с нотками уксуса -flavor-complex-limeshade = как теплая тень с лаймовым привкусом \ No newline at end of file +flavor-complex-ADTSawdust = как 24-ая смена за день в лютый мороз +flavor-complex-limeshade = как теплая тень с лаймовым привкусом + 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/jumpskirts.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl index f9981a09924..5b4ffac7010 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 } @@ -110,4 +110,7 @@ ent-ClothingUniformJumpskirtBlueshieldTurtleneck = юбка-водолазка .desc = Белая удобная водолазка с юбкой для Офицера Синего Щита с пришитыми золотыми погонами и ярким именным бейджиком. К сожалению, если вы её наденете, это не будет значить, что вам дадут отпуск. ent-ADTClothingJumpskirtHopAlt = деловой костюм с юбкой главы персонала - .desc = Качетсвенно сделанная униформа для тех глав персонала, что могут себе такую позволить. + .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 0bb10c4eb47..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 @@ -201,10 +201,11 @@ ent-ADTClothingUniformNewMekka = униформа Новой Мекки .suffix = { "Новая Мекка" } ent-ADTClothingJumpsuitHopAlt = деловой костюм главы персонала - .desc = Качетсвенно сделанная униформа для тех глав персонала, что могут себе такую позволить. + .desc = Качетсвенно сделанная униформа для тех глав персонала, что могут себе такую позволить. ent-ADTClothingJumpsuitSecOffMogesBrown = костюм офицера СБ с Могеса - .desc = Не совсем формальный, но очень подходящий для трофиков костюм офицера, служившего в филиале Нанотрейзен на планете Могес. Заслужить право носить такой может только ветеран СБ. Стоять, СБ Могеса! + .desc = Не совсем формальный, но очень подходящий для трофиков костюм офицера, служившего в филиале Нанотрейзен на планете Могес. Заслужить право носить такой может только ветеран СБ. Стоять, СБ Могеса! ent-ADTClothingJumpsuitSecOffMogesBlue = костюм офицера СБ с Могеса .desc = Не совсем формальный, но очень подходящий для трофиков костюм офицера, служившего в филиале Нанотрейзен на планете Могес. Заслужить право носить такой может только ветеран СБ. Стоять, СБ Могеса! ent-ADTClothingJumpsuitSecOffMogesGray = костюм офицера СБ с Могеса .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 3619f64b208..e27f8449d9f 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 @@ -250,6 +250,19 @@ - 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 + #Альтернативная одежда для ГП - type: entity parent: ClothingUniformBase @@ -286,3 +299,4 @@ - state: icon_vest map: ["foldedLayer"] visible: false + 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/Flavors/flavors.yml b/Resources/Prototypes/ADT/Flavors/flavors.yml index 74ba72cfd9d..34ce9962b7c 100644 --- a/Resources/Prototypes/ADT/Flavors/flavors.yml +++ b/Resources/Prototypes/ADT/Flavors/flavors.yml @@ -118,3 +118,8 @@ flavorType: Complex description: flavor-complex-limeshade +# Суп +- type: flavor + id: ADTSawdust + flavorType: Complex + description: flavor-complex-ADTSawdust 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..ccaaaf3ced9 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml @@ -81,10 +81,15 @@ components: - type: StorageFill contents: + # ADT Tweak start + - id: BurnAutoInjector + - id: BruteAutoInjector + - id: RadAutoInjector + - id: AntiPoisonMedipen + # ADT Tweak End - 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 00000000000..e8deec91755 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..8dc7d2f4002 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/equipped-INNERCLOTHING.png differ 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 00000000000..5b015d332eb Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-left.png new file mode 100644 index 00000000000..cf9f79d6b1e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-left.png differ 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 00000000000..0b7d11a9484 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-right.png differ 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 00000000000..9f91f21ff45 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/bowl.rsi/bowl.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/bowl.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/bowl.rsi/meta.json new file mode 100644 index 00000000000..39c386b1d48 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Food/bowl.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: Mascot_valeraCreated for Adventure Time. bowl Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. escargot from tgstation at https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + + { + "name": "bowl" + }, + { + "name": "soupsawdust" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/bowl.rsi/soupsawdust.png b/Resources/Textures/ADT/Objects/Consumable/Food/bowl.rsi/soupsawdust.png new file mode 100644 index 00000000000..e6ebaccd4fe Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/bowl.rsi/soupsawdust.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/meta.json index ffbf8c8739a..df73fb647cd 100644 --- a/Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/meta.json @@ -1,14 +1,14 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Adventure Time", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "Created by Adventure Times MRP", "states": [ { "name": "khachapuri" } ] -} \ No newline at end of file +}