Merge branch 'space-syndicate:master' into sosu

Resources/Changelog/ChangelogSyndie.yml

@@ -1,57 +1,4 @@
 Entries:
-- author: lapatison
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0440\u0430\u0437\
-      \u043B\u0438\u0447\u043D\u044B\u0435 \u043F\u0435\u0440\u0435\u0432\u043E\u0434\
-      \u044B"
-    type: Add
-  id: 220
-  time: '2022-08-16T16:26:53.0000000+00:00'
-- author: lapatison
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u0435\u0440\
-      \u0435\u0432\u043E\u0434\u044B"
-    type: Add
-  id: 221
-  time: '2022-08-16T16:42:20.0000000+00:00'
-- author: Morty
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u043E\u0441\
-      \u043B\u0435\u0434\u043D\u0438\u0435 \u043E\u0431\u043D\u043E\u0432\u043B\u0435\
-      \u043D\u0438\u044F"
-    type: Add
-  id: 222
-  time: '2022-08-17T07:30:50.0000000+00:00'
-- author: lapatison
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u0435\u0440\
-      \u0435\u0432\u043E\u0434\u044B"
-    type: Add
-  id: 223
-  time: '2022-08-17T20:10:56.0000000+00:00'
-- author: lapatison
-  changes:
-  - message: "\u041F\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043D\u044B \u0442\u0430\
-      \u0431\u043B\u0438\u0447\u043A\u0438"
-    type: Tweak
-  id: 224
-  time: '2022-08-18T16:31:19.0000000+00:00'
-- author: Morty
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u043E\u0441\
-      \u043B\u0435\u0434\u043D\u0438\u0435 \u043E\u0431\u043D\u043E\u0432\u043B\u0435\
-      \u043D\u0438\u044F"
-    type: Add
-  id: 225
-  time: '2022-08-19T20:09:21.0000000+00:00'
-- author: lapatison
-  changes:
-  - message: "\u041F\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043D\u043E \u043F\u043E\
-      \u0441\u043B\u0435\u0434\u043D\u0435\u0435 \u043E\u0431\u043D\u043E\u0432\u043B\
-      \u0435\u043D\u0438\u0435"
-    type: Tweak
-  id: 226
-  time: '2022-08-19T21:28:25.0000000+00:00'
 - author: lapatison
   changes:
   - message: "\u041F\u043E\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u0435\
@@ -4551,3 +4498,65 @@
   id: 719
   time: '2024-11-30T10:45:49.0000000+00:00'
   url: https://github.com/space-syndicate/space-station-14/pull/2818
+- author: MureixloL, KREKS, SonicDC
+  changes:
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0441\u043F\u0440\u0430\
+      \u0439\u0442\u044B!"
+    type: Tweak
+  id: 720
+  time: '2024-12-11T23:32:29.0000000+00:00'
+  url: https://github.com/space-syndicate/space-station-14/pull/2802
+- author: TiFeRi
+  changes:
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0430 \u043A\u0430\u0440\u0442\
+      \u0430 Paper."
+    type: Tweak
+  id: 721
+  time: '2024-12-01T17:32:59.0000000+00:00'
+  url: https://github.com/space-syndicate/space-station-14/pull/2822
+- author: Litogin
+  changes:
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u043E\u0442\
+      \u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 \u0443\u043D\u0438\u0444\
+      \u043E\u0440\u043C\u044B \u043D\u0430 \u0436\u0435\u043D\u0441\u043A\u0438\u0445\
+      \ \u0432\u0435\u0440\u0441\u0438\u044F\u0445 \u0443\u043D\u0430\u0442\u0445\u043E\
+      \u0432 \u0438 \u0432\u0443\u043B\u044C\u043F"
+    type: Fix
+  id: 722
+  time: '2024-12-05T23:10:01.0000000+00:00'
+  url: https://github.com/space-syndicate/space-station-14/pull/2832
+- author: Ko4erga
+  changes:
+  - message: "\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0430 \u043A\u0430\u0440\
+      \u0442\u0430 Tushkan."
+    type: Tweak
+  id: 723
+  time: '2024-12-02T12:51:18.0000000+00:00'
+  url: https://github.com/space-syndicate/space-station-14/pull/2826
+- author: doctor_jake
+  changes:
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0430 \u043A\u0430\u0440\u0442\
+      \u0430 Silly."
+    type: Tweak
+  id: 724
+  time: '2024-11-30T15:45:31.0000000+00:00'
+  url: https://github.com/space-syndicate/space-station-14/pull/2809
+- author: Ko4erga
+  changes:
+  - message: "\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0430 \u043A\u0430\u0440\
+      \u0442\u0430 Pilgrim."
+    type: Tweak
+  id: 725
+  time: '2024-11-30T15:45:52.0000000+00:00'
+  url: https://github.com/space-syndicate/space-station-14/pull/2821
+- author: Ko4erga
+  changes:
+  - message: "\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0430 \u043A\u0430\u0440\
+      \u0442\u0430 Pilgrim."
+    type: Tweak
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D \u043F\u0430\u0440\u0430\u043B\
+      \u0430\u043A\u0441 \u043D\u0430 Silly."
+    type: Tweak
+  id: 726
+  time: '2024-12-03T07:23:23.0000000+00:00'
+  url: https://github.com/space-syndicate/space-station-14/pull/2828

Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl

@@ -1,2 +1,4 @@
 ent-SpawnPointPilot = pilot
     .desc = { ent-SpawnPointJobBase.desc }
+ent-SpawnPointSurgeon = surgeon
+    .desc = { ent-SpawnPointJobBase.desc }

Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl

@@ -1,2 +1,4 @@
 ent-SpawnPointPilot = пилот
     .desc = { ent-SpawnPointJobBase.desc }
+ent-SpawnPointSurgeon = хирург
+    .desc = { ent-SpawnPointJobBase.desc }

Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml

@@ -7,5 +7,15 @@
     job_id: Pilot
   - type: Sprite
     layers:
-      - state: green
-      - state: seniorofficer
+    - state: green
+    - state: seniorofficer
+
+- type: entity
+  id: SpawnPointSurgeon
+  parent: SpawnPointJobBase
+  name: surgeon
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: virologist

Resources/Prototypes/Corvax/Objectives/objectiveGroups.yml

@@ -1,4 +1,4 @@
 - type: weightedRandom
   id: TraitorObjectiveGroupNukieDisk
   weights:
-    NukeDiskStealObjective: 0.05
+    NukeDiskStealObjective: 1

Resources/Prototypes/Corvax/lobbyscreens.yml

@@ -134,45 +134,45 @@
   id: GrayTide
   background: /Textures/Corvax/LobbyScreens/gray-tide.png
 
-#- type: lobbyBackground
-#  id: NewYearBar
-#  background: /Textures/Corvax/LobbyScreens/new-year-bar.png
+- type: lobbyBackground
+  id: NewYearBar
+  background: /Textures/Corvax/LobbyScreens/new-year-bar.png
 
-#- type: lobbyBackground
-#  id: NewYearSec
-#  background: /Textures/Corvax/LobbyScreens/new-year-sec.png
+- type: lobbyBackground
+  id: NewYearSec
+  background: /Textures/Corvax/LobbyScreens/new-year-sec.png
 
-#- type: lobbyBackground
-#  id: NewYearSave
-#  background: /Textures/Corvax/LobbyScreens/new-year-save.png
+- type: lobbyBackground
+  id: NewYearSave
+  background: /Textures/Corvax/LobbyScreens/new-year-save.png
 
-#- type: lobbyBackground
-#  id: NewYearComfort
-#  background: /Textures/Corvax/LobbyScreens/new-year-comfort.png
+- type: lobbyBackground
+  id: NewYearComfort
+  background: /Textures/Corvax/LobbyScreens/new-year-comfort.png
 
-#- type: lobbyBackground
-#  id: NewYearParty
-#  background: /Textures/Corvax/LobbyScreens/new-year-party.png
+- type: lobbyBackground
+  id: NewYearParty
+  background: /Textures/Corvax/LobbyScreens/new-year-party.png
 
-#- type: lobbyBackground
-#  id: NewYearPine
-#  background: /Textures/Corvax/LobbyScreens/new-year-pine.png
+- type: lobbyBackground
+  id: NewYearPine
+  background: /Textures/Corvax/LobbyScreens/new-year-pine.png
 
-#- type: lobbyBackground
-#  id: NewYearExplosion
-#  background: /Textures/Corvax/LobbyScreens/new-year-explosion.png
+- type: lobbyBackground
+  id: NewYearExplosion
+  background: /Textures/Corvax/LobbyScreens/new-year-explosion.png
 
 - type: lobbyBackground
   id: SpaceNuke
   background: /Textures/Corvax/LobbyScreens/space-nuke.png
 
-#- type: lobbyBackground
-#  id: NewYearPenguins
-#  background: /Textures/Corvax/LobbyScreens/new-year-penguins.png
+- type: lobbyBackground
+  id: NewYearPenguins
+  background: /Textures/Corvax/LobbyScreens/new-year-penguins.png
 
-#- type: lobbyBackground
-#  id: NewYearNuke
-#  background: /Textures/Corvax/LobbyScreens/new-year-nuke.png
+- type: lobbyBackground
+  id: NewYearNuke
+  background: /Textures/Corvax/LobbyScreens/new-year-nuke.png
 
 - type: lobbyBackground
   id: ArnoldIntelligence

Resources/Prototypes/Objectives/objectiveGroups.yml

@@ -6,7 +6,7 @@
     TraitorObjectiveGroupKill: 1
     TraitorObjectiveGroupState: 1 #As in, something about your character. Alive, dead, arrested, gained an ability...
     TraitorObjectiveGroupSocial: 1 #Involves helping/harming others without killing them or stealing their stuff
-    TraitorObjectiveGroupNukieDisk: 1  #Corvax
+    TraitorObjectiveGroupNukieDisk: 0.05  #Corvax
 
 - type: weightedRandom
   id: TraitorObjectiveGroupSteal

Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 and inhand modified by emisse, monkey by Ko4erga (discord)",
+  "copyright": "resprited by @mishutka09, monkey by Ko4erga (discord)",
   "size": {
     "x": 32,
     "y": 32
@@ -27,4 +27,4 @@
       "directions": 4
     }
   ]
-}
+}

Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 and inhand modified by emisse, monkey made by brainfood1183 (github) for ss14",
+  "copyright": "resprited by @mishutka09, monkey made by brainfood1183 (github) for ss14",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, derivative monkey made by brainfood1183 (github) for ss14",
+  "copyright": "Resprited by @mishutka09, derivative monkey made by brainfood1183 (github) for ss14",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, derivative monkey made by brainfood1183 (github) for ss14",
+  "copyright": "Resprited by @mishutka09, derivative monkey made by brainfood1183 (github) for ss14",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, derivative monkey made by brainfood1183 (github) for ss14",
+  "copyright": "Resprited by @mishutka09, derivative monkey made by brainfood1183 (github) for ss14",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Structures/Furniture/rollerbeds.rsi/meta.json

@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0, Baystation 12 and AuroraStation",
+    "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0, Baystation 12 and AuroraStation, emergency and cheap Resprite by KREKS",
     "size": {
         "x": 32,
         "y": 32