diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index ac1eefb5f7..6dad18f5d0 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -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 diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/departments.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/departments.yml new file mode 100644 index 0000000000..895358a5c0 --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/departments.yml @@ -0,0 +1,8 @@ +- type: department + id: CentralCommand + description: department-CentralCommand-description + color: "#49C423" + roles: + - LPPBlueShieldOfficer + primary: false + weight: 101 \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/lobbyscreenslpp.yml b/Resources/Prototypes/_LostParadise/lobbyscreenslpp.yml index b544631101..e3166972e5 100644 --- a/Resources/Prototypes/_LostParadise/lobbyscreenslpp.yml +++ b/Resources/Prototypes/_LostParadise/lobbyscreenslpp.yml @@ -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 diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Prosecutor.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Prosecutor.png index d1ee86786c..5a7c02ba7b 100644 Binary files a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Prosecutor.png and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Prosecutor.png differ diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/mood1.png b/Resources/Textures/Interface/Alerts/mood.rsi/mood1.png index ae1e1386db..f079bb2b9e 100644 Binary files a/Resources/Textures/Interface/Alerts/mood.rsi/mood1.png and b/Resources/Textures/Interface/Alerts/mood.rsi/mood1.png differ diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/mood2.png b/Resources/Textures/Interface/Alerts/mood.rsi/mood2.png index 41be928f02..5b0c8ea1ed 100644 Binary files a/Resources/Textures/Interface/Alerts/mood.rsi/mood2.png and b/Resources/Textures/Interface/Alerts/mood.rsi/mood2.png differ diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/mood3.png b/Resources/Textures/Interface/Alerts/mood.rsi/mood3.png index 179991e198..ac04371b5f 100644 Binary files a/Resources/Textures/Interface/Alerts/mood.rsi/mood3.png and b/Resources/Textures/Interface/Alerts/mood.rsi/mood3.png differ diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/mood4.png b/Resources/Textures/Interface/Alerts/mood.rsi/mood4.png index 4ea7d70117..aa3fa25f9e 100644 Binary files a/Resources/Textures/Interface/Alerts/mood.rsi/mood4.png and b/Resources/Textures/Interface/Alerts/mood.rsi/mood4.png differ diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/mood5.png b/Resources/Textures/Interface/Alerts/mood.rsi/mood5.png index c4c3370f62..17141758e8 100644 Binary files a/Resources/Textures/Interface/Alerts/mood.rsi/mood5.png and b/Resources/Textures/Interface/Alerts/mood.rsi/mood5.png differ diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/mood6.png b/Resources/Textures/Interface/Alerts/mood.rsi/mood6.png index 388483e143..bc72b81792 100644 Binary files a/Resources/Textures/Interface/Alerts/mood.rsi/mood6.png and b/Resources/Textures/Interface/Alerts/mood.rsi/mood6.png differ diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/mood7.png b/Resources/Textures/Interface/Alerts/mood.rsi/mood7.png index b4f944d045..7f03bb9464 100644 Binary files a/Resources/Textures/Interface/Alerts/mood.rsi/mood7.png and b/Resources/Textures/Interface/Alerts/mood.rsi/mood7.png differ diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/mood8.png b/Resources/Textures/Interface/Alerts/mood.rsi/mood8.png index f12f71b7ff..517955802c 100644 Binary files a/Resources/Textures/Interface/Alerts/mood.rsi/mood8.png and b/Resources/Textures/Interface/Alerts/mood.rsi/mood8.png differ diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/mood9.png b/Resources/Textures/Interface/Alerts/mood.rsi/mood9.png index e65c650149..ddf1906baa 100644 Binary files a/Resources/Textures/Interface/Alerts/mood.rsi/mood9.png and b/Resources/Textures/Interface/Alerts/mood.rsi/mood9.png differ diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/mood_happiness_bad.png b/Resources/Textures/Interface/Alerts/mood.rsi/mood_happiness_bad.png index 4ed8f4d68f..63701ae176 100644 Binary files a/Resources/Textures/Interface/Alerts/mood.rsi/mood_happiness_bad.png and b/Resources/Textures/Interface/Alerts/mood.rsi/mood_happiness_bad.png differ diff --git a/Resources/Textures/Interface/Alerts/mood.rsi/mood_happiness_good.png b/Resources/Textures/Interface/Alerts/mood.rsi/mood_happiness_good.png index eb9943a301..b8f26b7a93 100644 Binary files a/Resources/Textures/Interface/Alerts/mood.rsi/mood_happiness_good.png and b/Resources/Textures/Interface/Alerts/mood.rsi/mood_happiness_good.png differ diff --git a/Resources/Textures/Interface/Alerts/offer_item.rsi/meta.json b/Resources/Textures/Interface/Alerts/offer_item.rsi/meta.json index 18cef93dca..8096d009f8 100644 --- a/Resources/Textures/Interface/Alerts/offer_item.rsi/meta.json +++ b/Resources/Textures/Interface/Alerts/offer_item.rsi/meta.json @@ -8,11 +8,11 @@ }, "states": [ { - "name": "offer_item" + "name": "offer_item", "delays": [ [ - 0.5, - 0.5 + 0.5, + 0.5 ] ] } diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/MedicalIntern.png b/Resources/Textures/Interface/Misc/job_icons.rsi/MedicalIntern.png index 80e1a9b2ff..f138fbaf33 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/MedicalIntern.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/MedicalIntern.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/SecurityCadet.png b/Resources/Textures/Interface/Misc/job_icons.rsi/SecurityCadet.png index a35685ba32..a2b796ca52 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/SecurityCadet.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/SecurityCadet.png differ diff --git a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_discharged.png b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_discharged.png index 2e012349e0..0170618e6c 100644 Binary files a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_discharged.png and b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_discharged.png differ diff --git a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_paroled.png b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_paroled.png index 042fb147b1..20d2b4a5b5 100644 Binary files a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_paroled.png and b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_paroled.png differ diff --git a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_suspected.png b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_suspected.png index cfb34742bf..536ec5523e 100644 Binary files a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_suspected.png and b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_suspected.png differ diff --git a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_wanted.png b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_wanted.png index 2df379d112..d7dafddd82 100644 Binary files a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_wanted.png and b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_wanted.png differ diff --git a/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/Adjutant.png b/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/Adjutant.png index ab98ac86f4..6253ea7d3c 100644 Binary files a/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/Adjutant.png and b/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/Adjutant.png differ diff --git a/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/Blueshield.png b/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/Blueshield.png index e6d62d32a1..629ab91615 100644 Binary files a/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/Blueshield.png and b/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/Blueshield.png differ diff --git a/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/Nanotrasen.png b/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/Nanotrasen.png index f03e86c6b1..7e9b9d4bc0 100644 Binary files a/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/Nanotrasen.png and b/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/Nanotrasen.png differ diff --git a/Resources/Textures/_LostParadise/LobbyScreens/attributions.yml b/Resources/Textures/_LostParadise/LobbyScreens/attributions.yml index 430b71abf5..c24905cb2f 100644 --- a/Resources/Textures/_LostParadise/LobbyScreens/attributions.yml +++ b/Resources/Textures/_LostParadise/LobbyScreens/attributions.yml @@ -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" diff --git a/Resources/Textures/_LostParadise/LobbyScreens/penisher.png b/Resources/Textures/_LostParadise/LobbyScreens/penisher.png deleted file mode 100644 index 79c90f3ea2..0000000000 Binary files a/Resources/Textures/_LostParadise/LobbyScreens/penisher.png and /dev/null differ