diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index ce5371a73e5..c62e087ec96 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1791,9 +1791,15 @@ Entries: - { message: "Изменен спрайт Костяного копья, теперь оно выглядит круче", type: Tweak} id: 55750 #костыль отображения в Обновлениях time: '2024-04-16T01:40:00.0000000+00:00' - + +- author: мудрый дуб + changes: + - {message: "НТ теперь поставляют новый костюм горничной в ящике театрального снаряжения", type: Add} + id: 55751 #костыль отображения в Обновлениях + time: '2024-05-22T21:56:00.0000000+00:00' + - author: мудрый дуб changes: - - {message: "В импланте "аплинк" добавилось новое оружие - бензопила. Так же были подкручен урон взамен на скорость атаки", type: Add} + - {message: "В импланте 'аплинк' добавилось новое оружие - бензопила. Так же были подкручен урон взамен на скорость атаки", type: Add} id: 55752 #костыль отображения в Обновлениях time: '2024-05-23T00:06:00.0000000+00:00' \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl index fae0ca981a9..fdd1e8aa49f 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl @@ -370,4 +370,7 @@ ent-ADTClothingUniformHikeJumpskirtCmo = походная юбка-костюм ent-ADTClothingUniformCroupier = костюм крупье .desc = Костюм самого главного по фишкам и картам. ent-ADTClothingUniformCroupierSkirt = юбка-костюм крупье - .desc = {ent-ADTClothingUniformCroupier.desc} \ No newline at end of file + .desc = {ent-ADTClothingUniformCroupier.desc} + +ent-ADTClothingUniformJumpskirtJanimaid = костюм горничной + .desc = Обновленный костюм горничной от НТ. \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml index fd6ee827dbf..1e9d3cc1ce4 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml @@ -795,4 +795,16 @@ #map: [ "unfoldedLayer" ] #- state: icon_vest #map: ["foldedLayer"] - #visible: false \ No newline at end of file + #visible: false + +- 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 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index 8f8c1a114fc..ac403a933b2 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -83,11 +83,11 @@ - id: ClothingMaskClown - id: ClothingMaskMime - id: ClothingShoesClown - - id: ClothingUniformJumpskirtJanimaid + # - id: ClothingUniformJumpskirtJanimaid - id: ClothingNeckCloakVoid - id: RevolverCapGun - id: BarberScissors - + - id: ADTClothingUniformJumpskirtJanimaid - type: entity id: CrateServiceCustomSmokable parent: CrateGenericSteel 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..70aa3eb3202 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "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 + } + ] + } +