Skip to content

Commit

Permalink
Merge branch 'master' into benz
Browse files Browse the repository at this point in the history
  • Loading branch information
Darkiich authored May 22, 2024
2 parents 9293e94 + 7f3bb7c commit a04989c
Show file tree
Hide file tree
Showing 10 changed files with 58 additions and 6 deletions.
10 changes: 8 additions & 2 deletions Resources/Changelog/ChangelogADT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
5 changes: 4 additions & 1 deletion Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -370,4 +370,7 @@ ent-ADTClothingUniformHikeJumpskirtCmo = походная юбка-костюм
ent-ADTClothingUniformCroupier = костюм крупье
.desc = Костюм самого главного по фишкам и картам.
ent-ADTClothingUniformCroupierSkirt = юбка-костюм крупье
.desc = {ent-ADTClothingUniformCroupier.desc}
.desc = {ent-ADTClothingUniformCroupier.desc}
ent-ADTClothingUniformJumpskirtJanimaid = костюм горничной
.desc = Обновленный костюм горничной от НТ.
Original file line number Diff line number Diff line change
Expand Up @@ -795,4 +795,16 @@
#map: [ "unfoldedLayer" ]
#- state: icon_vest
#map: ["foldedLayer"]
#visible: false
#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
4 changes: 2 additions & 2 deletions Resources/Prototypes/Catalog/Fills/Crates/service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}

0 comments on commit a04989c

Please sign in to comment.