diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Hands/gloves.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Hands/gloves.ftl index 0650a5ff27e..e1efd1a391b 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/Hands/gloves.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/Hands/gloves.ftl @@ -4,7 +4,7 @@ ent-ADTClothingHandsNovaGloves = перчатки Новы .desc = Это перчатки Новы. Как она их получила? Секрет. ent-ADTClothingHandsRedjiGloves = Перчатки старика Реджи - .desc = Старая пара перчаток без пальцев + .desc = Старая пара перчаток. Скорее всего беспалыми они стали со временем. ent-ADTClothingHandsRabbitGloves = кроличьи перчатки .desc = Ох. Фурри. diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl index f45f32663e6..dea184b0909 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl @@ -13,11 +13,11 @@ ent-ADTClothingUniformPriestPrimalSuit = традиционный наряд ж ent-ADTClothingUniformJumpsuitMaugly = штурмовой костюм "Маугли" .desc = Удобный и прочный современный штурмовой костюм из плотной палаточной хлопчатобумажной ткани, который хорошо показал себя на войне в джунглях. .suffix = { "" } -ent-ADTClothingUniformRedgiJumpskirt = юбка-костюм заведующей отелем - .desc = Потёртый, но от того не менее стильный, костюм для женской половины персонала +ent-ADTClothingUniformRedjiJumpskirt = юбка-костюм заведующей отелем + .desc = Как гласит официальное заявление, НТ выпустило этот вариант формы из-за многочисленных жалоб со стороны женской половины барменов, поскольку изначально был только мужской костюм. В действительности это волновало человека 3 от силы. .suffix = { "" } -ent-ADTClothingUniformRedgiSuit = костюм заведующего отелем - .desc = Потёртый, но от того не менее стильный, костюм +ent-ADTClothingUniformRedjiSuit = костюм заведующего отелем + .desc = Легенды гласят, что в этот костюм пренадлежал некоему Реджинальду, что разливал всем корневое пиво. .suffix = { "" } ent-ADTClothingUniformNewBarmanSuit = обновлённый костюм бармена .desc = Обновлённый комплект одежды для более изысканого разлития напитков diff --git a/Resources/Locale/ru-RU/ADT/Clothing/outerclothing.ftl b/Resources/Locale/ru-RU/ADT/Clothing/outerclothing.ftl index 2bc865df016..0f4f62ef07a 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/outerclothing.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/outerclothing.ftl @@ -1,5 +1,5 @@ ent-ADTClothingOuterJacketBartender = барная жилетка - .desc = удобная барная жилетка для повседневной носки. + .desc = Удобная и стильная жилетка. Смотрите, не испорьте удобство и стиль разлитым напитком. .suffix = { "" } ent-ADTClothingOuterCoatPyotrCoat = шинель Петра Шахина diff --git a/Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/cocoa_solid_pack.ftl b/Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/cocoa_solid_pack.ftl index 7b1c136f4fd..773df0a9f61 100644 --- a/Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/cocoa_solid_pack.ftl +++ b/Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/cocoa_solid_pack.ftl @@ -1,2 +1,2 @@ ent-ADTReagentContainerCocoaSolid = пачка какао-порошка - .desc = Большая пачка порошкового какао. Разбавьте водой перед употреблением! + .desc = Большая пачка порошкового какао. Разбавьте водой перед употреблением! Упаковка выглядет крайне знакомой, однако почему понять трудно. diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml index 771e1558b28..e0e74d5ad28 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml @@ -699,3 +699,15 @@ - type: Tag tags: - WhitelistChameleon + + #nope_ingeneer когда-то давно. +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatRedji + name: Redji hat + description: stylish hat + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/redji_hat.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/redji_hat.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/redji_hat.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/redji_hat.yml deleted file mode 100644 index 3bf6b2880f0..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/redji_hat.yml +++ /dev/null @@ -1,11 +0,0 @@ - #nope_ingeneer -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadHatRedji - name: Redji hat - description: stylish hat - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/old_stylish_hat.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/old_stylish_hat.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml index 33adef64516..53273c8a1c7 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml @@ -202,14 +202,14 @@ #nope_ingeneer - type: entity parent: ClothingUniformBase - id: ADTClothingUniformRedgiJumpskirt - name: Redgi skirt - description: this shit isnt fucking work + id: ADTClothingUniformRedjiJumpskirt + name: Redji skirt + description: this shit isnt fucking work. UPD(By JustKekc); it does. components: - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpskirt/skirt_redji.rsi + sprite: ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpskirt/skirt_redji.rsi + sprite: ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi - type: entity parent: ClothingUniformBase diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml index 70d7f33ee8c..1f4152738ee 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml @@ -96,9 +96,9 @@ #nope_ingeneer - type: entity parent: ClothingUniformBase - id: ADTClothingUniformRedgiSuit - name: Redgi suit - description: An old and stylish suit that old Redgi wear somedays before. + id: ADTClothingUniformRedjiSuit + name: Redji suit + description: An old and stylish suit that old man Redji used to wear. No one really knows him, but his uniform became popular, especially with Pun Puns. components: - type: Sprite sprite: ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi @@ -126,6 +126,10 @@ sprite: ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi + clothingVisuals: + jumpsuit: + - state: equipped-INNERCLOTHING + - state: equipped-INNERCLOTHING-apron #Pyotr - type: entity diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml index 13f89b36da8..27394bf8f27 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml @@ -6,22 +6,22 @@ ClothingEyesHudBeer: 2 ClothingEyesEyepatchHudBeer: 2 ClothingHeadsetService: 2 - ClothingOuterApronBar: 2 + #ClothingOuterApronBar: 2 #Респрайт сразу 2 апрона затрагивает. *Они буквально одинаковые, только один без линии.* + ADTClothingOuterJacketBartender: 2 + ADTClothingOuterApronBar: 2 ClothingOuterWinterBar: 2 - ClothingUniformJumpsuitBartender: 2 - ClothingUniformJumpskirtBartender: 2 + ADTClothingUniformNewBarmanSuit: 2 + ADTClothingUniformNewBarmanSkirt: 2 + #ClothingUniformJumpsuitBartender: 2 #Не вижу смысла в старой. + #ClothingUniformJumpskirtBartender: 2 ClothingUniformJumpsuitBartenderPurple: 2 ClothingShoesColorBlack: 2 ClothingOuterArmorBasicSlim: 2 ClothingOuterVest: 2 ClothingBeltBandolier: 2 ClothingEyesGlassesSunglasses: 2 - ADTClothingUniformRedgiSuit: 2 - ADTClothingUniformRedgiJumpskirt: 2 + ADTClothingUniformRedjiSuit: 2 + ADTClothingUniformRedjiJumpskirt: 2 ADTClothingHandsRedjiGloves: 2 ADTClothingHeadHatRedji: 2 ADTClothingRedjiShoes: 2 - ADTClothingOuterJacketBartender: 2 - ADTClothingUniformNewBarmanSuit: 2 - ADTClothingUniformNewBarmanSkirt: 2 - ADTClothingOuterApronBar: 2 diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/equipped-HAND.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/equipped-HAND.png index 76b2a94d21b..e98ddda4500 100644 Binary files a/Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/equipped-HAND.png and b/Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/icon.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/icon.png index 00fdc192b78..8623825535c 100644 Binary files a/Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/icon.png and b/Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/inhand-left.png index 55da81d14f4..6665325d23b 100644 Binary files a/Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/inhand-left.png and b/Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/inhand-right.png index e3f5f36280b..74d9a0aeb35 100644 Binary files a/Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/inhand-right.png and b/Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/meta.json b/Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/meta.json index 094917a00de..2b1672dd39a 100644 --- a/Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/meta.json +++ b/Resources/Textures/ADT/Clothing/Hands/Gloves/redji_gloves.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by keks code by nope_ingeneer", + "copyright": "Made by nope_ingeneer, sprites by JustKekc", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/old_stylish_hat.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/old_stylish_hat.rsi/equipped-HELMET.png deleted file mode 100644 index b78dbf1c6a4..00000000000 Binary files a/Resources/Textures/ADT/Clothing/Head/Hats/old_stylish_hat.rsi/equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/old_stylish_hat.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/old_stylish_hat.rsi/icon.png deleted file mode 100644 index 568c12ed612..00000000000 Binary files a/Resources/Textures/ADT/Clothing/Head/Hats/old_stylish_hat.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/old_stylish_hat.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/old_stylish_hat.rsi/inhand-left.png deleted file mode 100644 index 8eb635ab6a6..00000000000 Binary files a/Resources/Textures/ADT/Clothing/Head/Hats/old_stylish_hat.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/old_stylish_hat.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/old_stylish_hat.rsi/inhand-right.png deleted file mode 100644 index 3779383ad06..00000000000 Binary files a/Resources/Textures/ADT/Clothing/Head/Hats/old_stylish_hat.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/redji_hat.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/redji_hat.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..ed397446b68 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/redji_hat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/redji_hat.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/redji_hat.rsi/icon.png new file mode 100644 index 00000000000..2f2d4fffc4a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/redji_hat.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/redji_hat.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/redji_hat.rsi/inhand-left.png new file mode 100644 index 00000000000..519f4da0df8 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/redji_hat.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/redji_hat.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/redji_hat.rsi/inhand-right.png new file mode 100644 index 00000000000..4b68584b6de Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/redji_hat.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/old_stylish_hat.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/redji_hat.rsi/meta.json similarity index 87% rename from Resources/Textures/ADT/Clothing/Head/Hats/old_stylish_hat.rsi/meta.json rename to Resources/Textures/ADT/Clothing/Head/Hats/redji_hat.rsi/meta.json index 7582cbe6f50..cab300bbfcd 100644 --- a/Resources/Textures/ADT/Clothing/Head/Hats/old_stylish_hat.rsi/meta.json +++ b/Resources/Textures/ADT/Clothing/Head/Hats/redji_hat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "sprite by Keks code by nopeingeneer", + "copyright": "Made by nope_ingeneer, sprites by JustKekc", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/equipped-OUTERCLOTHING.png index 8fc40e07ebb..ac846e44e76 100644 Binary files a/Resources/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/icon.png index c70e32d284f..13e7c9b38a3 100644 Binary files a/Resources/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/icon.png and b/Resources/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/inhand-left.png index 8619f1652eb..202357712fc 100644 Binary files a/Resources/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/inhand-left.png and b/Resources/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/inhand-right.png index 95a0c8d917e..85e394c8153 100644 Binary files a/Resources/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/inhand-right.png and b/Resources/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/meta.json index 4dae699b20a..2544555d64a 100644 --- a/Resources/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/meta.json +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Jackets/barjacket.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by nope_ingeneer", + "copyright": "Created by nope_ingeneer, sprites by JustKekc", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/equipped-OUTERCLOTHING.png index 870be2b70e7..d47a31373a2 100644 Binary files a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/icon.png index 23a4898b328..8354bc97d0f 100644 Binary files a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/icon.png and b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/inhand-left.png index 8fe146a9928..2782efbb2c0 100644 Binary files a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/inhand-left.png and b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/inhand-right.png index 50e00c0d3f8..0caa25d11c1 100644 Binary files a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/inhand-right.png and b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/meta.json index 33e72ea94f9..8901b4a89e8 100644 --- a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/meta.json +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/apronbar.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "ADT Team", + "copyright": "ADT Team, resprite by JustKekc.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/equipped-FEET.png b/Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/equipped-FEET.png index aee0a18f30a..65a68ec7c51 100644 Binary files a/Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/equipped-FEET.png and b/Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/icon.png b/Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/icon.png index 8c073fb00c1..ecc8fbc3b92 100644 Binary files a/Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/icon.png and b/Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/inhand-left.png index 38c8cdf56b5..8be239d52b3 100644 Binary files a/Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/inhand-left.png and b/Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/inhand-right.png index 07dfc6f7e51..1ef85c48fb9 100644 Binary files a/Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/inhand-right.png and b/Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/meta.json b/Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/meta.json index 05795067548..0695d1146ee 100644 --- a/Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/meta.json +++ b/Resources/Textures/ADT/Clothing/Shoes/Boots/redji_shoes.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by nope_ingeneer", + "copyright": "Created by nope_ingeneer, sprites by JustKekc", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/equipped-INNERCLOTHING.png index d0a2bbe7613..a579b46dde5 100644 Binary files a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/icon.png index c53fb350f7a..3b064e426cb 100644 Binary files a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/icon.png and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/inhand-left.png index 5f3d92d4c69..8e59498fe3e 100644 Binary files a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/inhand-left.png and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/inhand-right.png index 21cd3486782..5dfdc109e53 100644 Binary files a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/inhand-right.png and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/meta.json index 6dd9855ef55..53e23d5e82a 100644 --- a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/meta.json +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/new_barman_skirt.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by nope_ingeneer", + "copyright": "Created by nope_ingeneer, sprites by JustKekc", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000..55b335fb672 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..17af9d27352 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi/icon.png new file mode 100644 index 00000000000..b1abe253faa Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi/inhand-left.png new file mode 100644 index 00000000000..4e568479358 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi/inhand-right.png new file mode 100644 index 00000000000..bb9fadd2508 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/skirt_redji.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi/meta.json similarity index 72% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/skirt_redji.rsi/meta.json rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi/meta.json index 6dd9855ef55..4d63a9897e8 100644 --- a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/skirt_redji.rsi/meta.json +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/redji_skirt.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by nope_ingeneer", + "copyright": "Created by nope_ingeneer, sprites by JustKekc", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 } ] } diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/skirt_redji.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/skirt_redji.rsi/equipped-INNERCLOTHING.png deleted file mode 100644 index 20be3f021dc..00000000000 Binary files a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/skirt_redji.rsi/equipped-INNERCLOTHING.png and /dev/null differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/skirt_redji.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/skirt_redji.rsi/icon.png deleted file mode 100644 index 4a1dd5a0749..00000000000 Binary files a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/skirt_redji.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/skirt_redji.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/skirt_redji.rsi/inhand-left.png deleted file mode 100644 index 2a43e88b93c..00000000000 Binary files a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/skirt_redji.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/skirt_redji.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/skirt_redji.rsi/inhand-right.png deleted file mode 100644 index ece2a523dcf..00000000000 Binary files a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/skirt_redji.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/equipped-INNERCLOTHING.png index a535d166e37..e94a0bd5680 100644 Binary files a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/icon.png index f0b7832b0f2..8d32e947d82 100644 Binary files a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/icon.png and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/inhand-left.png index 5f3d92d4c69..8e59498fe3e 100644 Binary files a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/inhand-left.png and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/inhand-right.png index 21cd3486782..5dfdc109e53 100644 Binary files a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/inhand-right.png and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/meta.json index 6dd9855ef55..53e23d5e82a 100644 --- a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/meta.json +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_barman_suit.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by nope_ingeneer", + "copyright": "Created by nope_ingeneer, sprites by JustKekc", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/equipped-INNERCLOTHING-apron.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/equipped-INNERCLOTHING-apron.png new file mode 100644 index 00000000000..0febd17f2f5 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/equipped-INNERCLOTHING-apron.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/equipped-INNERCLOTHING.png index c4de05b98e7..abcfee5b0a0 100644 Binary files a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/icon.png index 66afadc518b..9f8000e9a9b 100644 Binary files a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/icon.png and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/inhand-left.png index 07d7526ab37..5cc356495e4 100644 Binary files a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/inhand-left.png and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/inhand-right.png index 31c70aec225..2e51f08fe8b 100644 Binary files a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/inhand-right.png and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/meta.json index 6dd9855ef55..f6907656084 100644 --- a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/meta.json +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/new_service_suit.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by nope_ingeneer", + "copyright": "Created by nope_ingeneer, sprites by JustKekc.", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-apron", + "directions": 4 } ] } diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000..6b91da7866a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/equipped-INNERCLOTHING.png index 6ee6626b876..bb8411ad68b 100644 Binary files a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/icon.png index 07c6efd3640..311216650d4 100644 Binary files a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/icon.png and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/inhand-left.png index 2a43e88b93c..4e568479358 100644 Binary files a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/inhand-left.png and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/inhand-right.png index ece2a523dcf..bb9fadd2508 100644 Binary files a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/inhand-right.png and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/meta.json index 6dd9855ef55..4d63a9897e8 100644 --- a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/meta.json +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redji_suit.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by nope_ingeneer", + "copyright": "Created by nope_ingeneer, sprites by JustKekc", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 } ] } diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/cocoa_pack.rsi/icon.png b/Resources/Textures/ADT/Objects/Consumable/Food/cocoa_pack.rsi/icon.png index 0e0a5ea89be..dba86678197 100644 Binary files a/Resources/Textures/ADT/Objects/Consumable/Food/cocoa_pack.rsi/icon.png and b/Resources/Textures/ADT/Objects/Consumable/Food/cocoa_pack.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/cocoa_pack.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/cocoa_pack.rsi/meta.json index 37c1f8772b8..90fdaa1932d 100644 --- a/Resources/Textures/ADT/Objects/Consumable/Food/cocoa_pack.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Consumable/Food/cocoa_pack.rsi/meta.json @@ -5,6 +5,6 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Created by Adventure Times MRP", + "copyright": "Created by Adventure Times MRP, resprite by JustKekc.", "states": [ { "name": "icon" } ] }