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.

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

Фиксы и мелкие правки #60

Merged
merged 3 commits into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 13 additions & 22 deletions Resources/Prototypes/Roles/Jobs/departments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,25 +105,16 @@
# - Chaplain # Lost Paradise - move to Service
- ForensicMantis # Nyanotrasen - ForensicMantis, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml

- type: department
id: Specific
description: department-Specific-description
color: "#9FED58"
weight: 10
roles:
- Boxer
- Reporter
- Zookeeper
- Psychologist
- MartialArtist # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml
- Gladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml
primary: false

- type: department
id: CentralCommand
description: department-CentralCommand-description
color: "#49C423"
roles:
- LPPBlueShieldOfficer
primary: false
weight: 101
# - type: department
# id: Specific
# description: department-Specific-description
# color: "#9FED58"
# weight: 10
# roles:
# - Boxer
# - Reporter
# - Zookeeper
# - Psychologist
# - MartialArtist # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml
# - Gladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml
# primary: false
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
- type: department
id: CentralCommand
description: department-CentralCommand-description
color: "#49C423"
roles:
- LPPBlueShieldOfficer
primary: false
weight: 101
4 changes: 0 additions & 4 deletions Resources/Prototypes/_LostParadise/lobbyscreenslpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
id: Teftelka
background: /Textures/_LostParadise/LobbyScreens/teftelka.png

- type: lobbyBackground
id: Penisher
background: /Textures/_LostParadise/LobbyScreens/penisher.png

- type: lobbyBackground
id: Amina
background: /Textures/_LostParadise/LobbyScreens/amina.png
Expand Down
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/Interface/Alerts/mood.rsi/mood1.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/Interface/Alerts/mood.rsi/mood2.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/Interface/Alerts/mood.rsi/mood3.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/Interface/Alerts/mood.rsi/mood4.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/Interface/Alerts/mood.rsi/mood5.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/Interface/Alerts/mood.rsi/mood6.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/Interface/Alerts/mood.rsi/mood7.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/Interface/Alerts/mood.rsi/mood8.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/Interface/Alerts/mood.rsi/mood9.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
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
Expand Up @@ -8,11 +8,11 @@
},
"states": [
{
"name": "offer_item"
"name": "offer_item",
"delays": [
[
0.5,
0.5
0.5,
0.5
]
]
}
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.
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
Expand Up @@ -8,11 +8,6 @@
copyright: "Telegram - @push1nkaa"
source: "https://discord.gg/v5mGmMzAdB"

- files: ["penisher.png"]
license: "CC BY-NC-ND 4.0"
copyright: "Discord - tongandroch/340929623636574209"
source: "https://discord.gg/v5mGmMzAdB"

- files: ["amina.png"]
license: "CC BY-NC-ND 4.0"
copyright: "Discord - insulgon/361486758980091916"
Expand Down
Binary file not shown.
Loading