Skip to content

Commit

Permalink
Merge pull request #688 from Us3rn4me228/slug-cats
Browse files Browse the repository at this point in the history
Слизнекотики (#688)
  • Loading branch information
modern-nm authored May 20, 2024
2 parents 8ea1d6f + a4c5d48 commit 7d446f7
Show file tree
Hide file tree
Showing 27 changed files with 256 additions and 2 deletions.
18 changes: 16 additions & 2 deletions Resources/Changelog/ChangelogADT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1758,8 +1758,22 @@ Entries:
id: 55746 #костыль отображения в Обновлениях
time: '2024-05-07T23:25:00.0000000+00:00'

- author: username228
changes:
- {message: "Лучшие ксенобиологи NanoTrasen смогли вернуть к жизни один из вымерших инопланетных видов - Слизнекошек с Дождливой планеты! Теперь у работников корпорации появляется уникальнейшая возможность лицезреть этих очаровательных созданий в живую, а так же завести себе как питомца!", type: Add}
id: 55747 #костыль отображения в Обновлениях
time: '2024-05-10T20:25:00.0000000+00:00'

- author: JustKekc
changes:
- {message: "Добавлена замена '??' в тексте сообщения на 'вопросительно смотрит' эмоцией.", type: Add}
id: 55747 #костыль отображения в Обновлениях
time: '2024-05-10T20:25:00.0000000+00:00'
id: 55748
time: '2024-05-10T20:25:00.0000000+00:00'

- author: Петр Игнатьевич
changes:
- {message: "Куличи в Гетмор Шоколаде - закончились.", type: Remove}
- {message: "Добавлена наши модификации карт Аврит, Ориджин и Трейн.", type: Add}
- {message: "Частично пофикшена видимость невидимок визорами.", type: Fix}
id: 55749 #костыль отображения в Обновлениях
time: '2024-05-13T08:20:00.0000000+00:00'
151 changes: 151 additions & 0 deletions Resources/Prototypes/ADT/Entities/Mobs/SlugCats/slugcat.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
- type: entity
name: Slug cat
parent: SimpleMobBase
id: ADTMobSlugCatCreek
description: An amazing creature that looks like a cat and a slug at the same time. But it's not a slug, it's a very different creature. The pride of xenobiology. Very agile and intelligent, they come from a planet with a dangerous habitat. Loves spears.
components:
- type: Sprite
drawdepth: Mobs
sprite: ADT/Mobs/Animals/slug-cat.rsi
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: creek
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeCircle
radius: 0.35
density: 15
mask:
- MobMask
layer:
- MobLayer
- type: Tag
tags:
- DoorBumpOpener
- type: Appearance
- type: DamageStateVisuals
states:
Alive:
Base: creek
Dead:
Base: dead-creek
- type: Butcherable
spawned:
- id: FoodMeat
amount: 1
#insert ur resting component here
- type: InteractionPopup
successChance: 0.8
interactSuccessString: petting-success-cat
interactFailureString: petting-failure-generic
interactSuccessSpawn: EffectHearts
# interactSuccessSound:
# path: /Audio/Animals/cat_meow.ogg
# interactFailureSound:
# path: /Audio/Animals/cat_hiss.ogg
- type: Speech
speechSounds: Cat
speechVerb: SmallMob
- type: ReplacementAccent
accent: cat
- type: Grammar
attributes:
gender: epicene
- type: MobPrice
price: 200
- type: SentienceTarget
flavorKind: station-event-random-sentience-flavor-organic
- type: NpcFactionMember
factions:
- Passive
- type: MobThresholds
thresholds:
0: Alive
40: Dead
- type: MeleeWeapon
damage:
types:
Blunt: 2.5

- type: entity
name: Slug cat
parent: ADTMobSlugCatCreek
id: ADTMobSlugCatHoly
components:
- type: Sprite
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: holy
- type: DamageStateVisuals
states:
Alive:
Base: holy
Dead:
Base: dead-holy


- type: entity
name: Slug cat
parent: ADTMobSlugCatCreek
id: ADTMobSlugCatMonk
components:
- type: Sprite
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: monk
- type: DamageStateVisuals
states:
Alive:
Base: monk
Dead:
Base: dead-monk

- type: entity
name: Slug cat
parent: ADTMobSlugCatCreek
id: ADTMobSlugCatSonfariel
components:
- type: Sprite
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: sonfariel
- type: DamageStateVisuals
states:
Alive:
Base: sonfariel
Dead:
Base: dead-sonfariel

- type: entity
name: Slug cat
parent: ADTMobSlugCatCreek
id: ADTMobSlugCatSpearMaster
components:
- type: Sprite
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: spear-master
- type: DamageStateVisuals
states:
Alive:
Base: spear-master
Dead:
Base: dead-spear-master

- type: entity
name: Slug cat
parent: ADTMobSlugCatCreek
id: ADTMobSlugCatTechnician
components:
- type: Sprite
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: technician
- type: DamageStateVisuals
states:
Alive:
Base: technician
Dead:
Base: dead-technician
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.
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.
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
89 changes: 89 additions & 0 deletions Resources/Textures/ADT/Mobs/Animals/slug-cat.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by #boctonskuitea (discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon-creek"
},
{
"name": "icon-holy"
},
{
"name": "icon-monk"
},
{
"name": "icon-sonfariel"
},
{
"name": "icon-spear-master"
},
{
"name": "icon-technician"
},
{
"name": "creek-rest"
},
{
"name": "holy-rest"
},
{
"name": "monk-rest"
},
{
"name": "sonfariel-rest"
},
{
"name": "spear-master-rest"
},
{
"name": "technician-rest"
},
{
"name": "creek",
"directions": 4
},
{
"name": "holy",
"directions": 4
},
{
"name": "monk",
"directions": 4
},
{
"name": "sonfariel",
"directions": 4
},
{
"name": "spear-master",
"directions": 4
},
{
"name": "technician",
"directions": 4
},
{
"name": "dead-creek"
},
{
"name": "dead-holy"
},
{
"name": "dead-monk"
},
{
"name": "dead-sonfariel"
},
{
"name": "dead-spear-master"
},
{
"name": "dead-technician"
}
]
}
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.
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.

0 comments on commit 7d446f7

Please sign in to comment.