Skip to content

Commit

Permalink
Респрайт слаймов
Browse files Browse the repository at this point in the history
  • Loading branch information
PyotrIgn committed Nov 2, 2023
1 parent c6743e9 commit d52a95d
Show file tree
Hide file tree
Showing 18 changed files with 356 additions and 117 deletions.
8 changes: 8 additions & 0 deletions Resources/Changelog/ChangelogADT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -448,3 +448,11 @@ Entries:
- {message: Вульпканинов уменьшил на 10%., type: Tweak}
id: 55595 #костыль отображения в Обновлениях
time: '2023-11-02T04:20:00.0000000+00:00'

- author: Петр Игнатьевич
changes:
- {message: Респрат слаймов. Автор спрайтов - LunaLita, type: Add}
- {message: Добавлена игрушка Тимрики., type: Add}
- {message: Добавлена свадебная арка, type: Add}
id: 55596 #костыль отображения в Обновлениях
time: '2023-11-02T06:20:00.0000000+00:00'
2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/ADT/Clothing/halloween.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ ent-ADTSpiderStool = паучий стул
ent-ADTMobAdultSlimesGreenHalloweenAngry = зеленый слайм
.suffix = Хеллоуин
.desc = Эта зеленая жижа явно не выглядит дружелюбно. Большая, склизкая пасть так и наровит вас полготить, чтобы ваша плоть растворилась внутри.
.desc = Эта зеленая жижа явно не выглядит дружелюбно. Большая, склизкая пасть так и норовит вас поглотить, чтобы ваша плоть растворилась внутри.
ent-ADTHalloweenCandyBowl = корзинка для хеллоуинских сладостей
.suffix = Хеллоуин
Expand Down
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/ADT/Objects/Fan/plushie_aidan.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,7 @@ ent-ADTPlushieSati = Сати
ent-ADTPlushieUma = Ума
.desc = Мягкая, и такая милая!
.suffix = { "" }
ent-ADTPlushieTimrika = Тимрика
.desc = На вид мягкая, милая и шерстяная таяранка! Однако рисунки костей имеют свою историю.
.suffix = { "" }
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTWeddingArc = свадебная арка
.desc = Красиво, торжественно и предрекает путь к прекрасному будущему. Или к разорению на алиментах.
10 changes: 10 additions & 0 deletions Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -363,3 +363,13 @@
- type: Sprite
sprite: ADT/Objects/Fun/toys.rsi
state: plushie_uma

- type: entity
parent: BasePlushie
id: ADTPlushieTimrika
name: Timrika plushie
description: It looks like a soft, cute and woolly tyaranka! However, bone drawings have their own history.
components:
- type: Sprite
sprite: ADT/Objects/Fun/toys.rsi
state: plushie_timrika
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
- type: entity
name: wedding arc
id: ADTWeddingArc
description: Wedding arc
placement:
mode: SnapgridCenter
components:
- type: Clickable
- type: InteractionOutline
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeCircle
radius: 0.5
density: 100
mask:
- Impassable
- type: Sprite
sprite: ADT/Structures/Decoration/wedding_ark.rsi
drawdepth: Overdoors
state: arc
noRot: true
- type: Pullable
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Metallic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 100
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger
damage: 50
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
- type: StaticPrice
price: 10
- type: Transform
anchored: true
- type: Physics
bodyType: Static
- type: Anchorable
10 changes: 5 additions & 5 deletions Resources/Prototypes/GameRules/events.yml
Original file line number Diff line number Diff line change
Expand Up @@ -318,13 +318,13 @@
- type: VentCrittersRule
entries:
- id: MobAdultSlimesBlueAngry
prob: 0.01
prob: 0.02
- id: MobAdultSlimesGreenAngry
prob: 0.01
prob: 0.02
- id: MobAdultSlimesYellowAngry
prob: 0.01
- id: ADTMobAdultSlimesGreenHalloweenAngry
prob: 0.04
prob: 0.02
#- id: ADTMobAdultSlimesGreenHalloweenAngry
# prob: 0.04

- type: entity
id: SpiderSpawn
Expand Down
3 changes: 3 additions & 0 deletions Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@
},
{
"name": "plushie_uma"
},
{
"name": "plushie_timrika"
}
]
}
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,14 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made from author of discord:yunachka для Время Приключений MRP",
"size": {
"x": 64,
"y": 64
},
"states": [
{
"name": "arc"
}
]
}
Binary file modified Resources/Textures/Mobs/Aliens/slimes.rsi/blue_adult_slime.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Mobs/Aliens/slimes.rsi/blue_adult_slime_dead.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Mobs/Aliens/slimes.rsi/green_adult_slime.png
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

0 comments on commit d52a95d

Please sign in to comment.