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

New UI #733

Merged
merged 7 commits into from
Jan 3, 2025
Merged

New UI #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1373fb4
Сохранил изменения перед pull
CrimeMoot Jan 2, 2025
4dbae55
suns
CrimeMoot Jan 3, 2025
9104bfc
issue
CrimeMoot Jan 3, 2025
8de92d0
upd
CrimeMoot Jan 3, 2025
e257a49
Merge branch 'new_UI' of https://github.com/fospas/Space-Cats-14 into…
CrimeMoot Jan 3, 2025
d403614
d-
CrimeMoot Jan 3, 2025
5bd4e8d
cl
CrimeMoot Jan 3, 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
4 changes: 2 additions & 2 deletions Resources/Prototypes/Actions/crit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
checkCanInteract: false
checkConsciousness: false
icon:
sprite: Interface/Actions/actions_crit.rsi
sprite: _SpaceCats/Interface/actions_crit.rsi # Cats edit
state: fakedeath
event: !type:CritFakeDeathEvent
useDelay: 30
Expand All @@ -40,7 +40,7 @@
checkCanInteract: false
checkConsciousness: false
icon:
sprite: Interface/Actions/actions_crit.rsi
sprite: _SpaceCats/Interface/actions_crit.rsi # Cats edit
state: lastwords
event: !type:CritLastWordsEvent
startDelay: true
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Actions/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@
- type: InstantAction
checkCanInteract: false
checkConsciousness: false
icon: Interface/Actions/harmOff.png
iconOn: Interface/Actions/harm.png
icon: _SpaceCats/Interface/Actions/harmOff.png # Cats edit
iconOn: _SpaceCats/Interface/Actions/harm.png # Cats edit
event: !type:ToggleCombatActionEvent
priority: -100

Expand Down
Loading
Loading