Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ФИКС томатов убийц #2441

Merged
merged 4 commits into from
Jan 7, 2025
Merged

ФИКС томатов убийц #2441

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a34d17
furry's maid
Tris0r Jan 1, 2025
747ff69
Update miscellaneous.yml
stalengd Jan 5, 2025
88581a8
с Рождеством!
Tris0r Jan 6, 2025
c393ebc
Merge branch 'tomato-cheburek' of https://github.com/Tris0r/space-sta…
Tris0r Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@
- type: NpcFactionMember
factions:
- SimpleHostile
#ss220 fix start
addFriendlyFactions:
- PetsNT
#ss220 fix end
- type: HTN
rootTask:
task: KillerTomatoCompound
Expand Down Expand Up @@ -238,4 +242,4 @@
types:
Blunt: 0.11
- type: StaticPrice
price: 400
price: 400
8 changes: 5 additions & 3 deletions Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,11 @@
- type: NpcFactionMember
factions:
- PetsNT
- type: HTN
rootTask:
task: SimpleHostileCompound
#ss220 fix start
# - type: HTN
# rootTask:
# task: SimpleHostileCompound
#ss220 fix end
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Это зачем?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Чтобы рантайм не атаковал первый

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

А это не помешает ему охотиться на мышей?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

помешает

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Значит надо по-другому

- type: Grammar
attributes:
proper: true
Expand Down
Loading