Merge remote-tracking branch 'upstream/master' into ups

Resources/Changelog/ChangelogWhite.yml

@@ -4876,3 +4876,60 @@
   id: 324
   time: '2024-06-22T12:55:50.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/376
+- author: Aviu
+  changes:
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043C\u043E\u0436\u043D\u043E\
+      \ \u0441\u0433\u043E\u0440\u0435\u0442\u044C \u0434\u043E \u0442\u043B\u0430\
+      ."
+    type: Add
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043F\u0440\u0438 \u0443\u0434\
+      \u0430\u043B\u0435\u043D\u0438\u0438 \u0442\u0435\u043B\u0430 \u043F\u0440\u0438\
+      \u0437\u0440\u0430\u043A \u043A\u043E\u0440\u0440\u0435\u043A\u0442\u043D\u043E\
+      \ \u0441\u043F\u0430\u0432\u043D\u0438\u0442\u0441\u044F."
+    type: Fix
+  id: 325
+  time: '2024-06-25T21:39:44.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/382
+- author: ThereDrD
+  changes:
+  - message: "\u0418\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441 \u0442\u0435\u043B\
+      \u0435\u043F\u043E\u0440\u0442\u0430 \u043F\u0440\u0438\u0437\u0440\u0430\u043A\
+      \u0430 \u043F\u0435\u0440\u0435\u0440\u0430\u0431\u043E\u0442\u0430\u043D \u043F\
+      \u043E\u0434 \u0441\u0442\u0438\u043B\u044C \u0441\u044113 \u0438 \u0441\u0442\
+      \u0430\u043B \u0431\u043E\u043B\u0435\u0435 \u0431\u043E\u043B\u0435\u0435 \u0443\
+      \u0434\u043E\u0431\u043D\u044B\u0439. \u0422\u0435\u043F\u0435\u0440\u044C \u044D\
+      \u0442\u043E \u043C\u043E\u0436\u043D\u043E \u0441\u0447\u0438\u0442\u0430\u0442\
+      \u044C \u043F\u043E\u043B\u043D\u043E\u0446\u0435\u043D\u043D\u044B\u043C \u043E\
+      \u0431\u0437\u043E\u0440\u043E\u043C \u0441\u043E\u0441\u0442\u043E\u044F\u043D\
+      \u0438\u044F \u0440\u0430\u0443\u043D\u0434\u0430."
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0421\u043E\u0440\
+      \u0442\u0438\u0440\u043E\u0432\u043A\u0430 \u043F\u0435\u0440\u0441\u043E\u043D\
+      \u0430\u0436\u0435\u0439 \u0438 \u0438\u0433\u0440\u043E\u043A\u043E\u0432 \u043F\
+      \u043E \u0434\u0435\u043F\u0430\u0440\u0442\u0430\u043C\u0435\u043D\u0442\u0430\
+      \u043C\u0438 \u0438 \u043F\u043E\u0434\u0441\u043A\u0430\u0437\u043A\u0430 \u0441\
+      \ \u0434\u043E\u043B\u0436\u043D\u043E\u0441\u0442\u044C\u044E \u043F\u0435\u0440\
+      \u0441\u043E\u043D\u0430\u0436\u0430 \u043F\u0440\u0438 \u043D\u0430\u0432\u0435\
+      \u0434\u0435\u043D\u0438\u0438 \u043C\u044B\u0448\u043A\u0438 \u043D\u0430 \u0438\
+      \u043C\u044F."
+    type: Add
+  - message: "\u0412 \u043C\u0435\u043D\u044E \u0442\u0435\u043B\u0435\u043F\u043E\
+      \u0440\u0442\u0430 \u0433\u043E\u0441\u0442\u043E\u0432 \u0442\u0435\u043F\u0435\
+      \u0440\u044C \u0432\u044B\u0434\u0435\u043B\u044F\u044E\u0442\u0441\u044F \u0433\
+      \u043B\u043E\u0431\u0430\u043B\u044C\u043D\u044B\u0435 \u0430\u043D\u0442\u0430\
+      \u0433\u043E\u043D\u0438\u0441\u0442\u044B, \u043D\u0430\u043F\u0440\u0438\u043C\
+      \u0435\u0440 \u041D\u044E\u043A\u0435\u0440\u044B, \u043F\u0430\u0443\u043A\u0438\
+      \ \u0438\u043B\u0438 \u041A\u0443\u043B\u044C\u0442, \u043A\u043E\u0433\u0434\
+      \u0430 \u043F\u043E\u043B\u0443\u0447\u0438\u0442 \u043D\u0438\u043C\u0431\u044B\
+      ."
+    type: Add
+  - message: "\u041F\u043E\u0438\u0441\u043A \u0443\u0434\u0430\u043B\u0435\u043D\
+      \ \u0438\u0437 \u043C\u0435\u043D\u044E \u0442\u0435\u043B\u0435\u043F\u043E\
+      \u0440\u0442\u0430 \u0432 \u0432\u0438\u0434\u0443 \u043D\u0435\u0432\u0435\u0440\
+      \u043E\u044F\u0442\u043D\u043E\u0439 \u0437\u0430\u0431\u0430\u0433\u043E\u0432\
+      \u0430\u043D\u043D\u043E\u0441\u0442\u0438 \u0438\u0437-\u0437\u0430 \u043A\u043E\
+      \u0434\u0430 \u0434\u0432\u0438\u0436\u043A\u0430."
+    type: Remove
+  id: 326
+  time: '2024-06-26T02:13:42.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/378

Resources/Locale/en-US/burning/bodyburn.ftl

@@ -0,0 +1 @@
+bodyburn-text-others = {$name} burns to ash!

Resources/Locale/en-US/ghost/ghost-gui.ftl

@@ -19,6 +19,7 @@ ghost-gui-toggle-hearing-popup-off = You can now only hear radio and nearby mess
 
 ghost-target-window-title = Ghost Warp
 ghost-target-window-current-button = Warp: {$name}
+ghost-target-window-warp-to-most-followed = Warp to Most Followed
 
 ghost-roles-window-title = Ghost Roles
 ghost-roles-window-request-role-button = Request

Resources/Locale/ru-RU/_white/ui/ghostTeleportMenu.ftl

@@ -0,0 +1,34 @@
+global-antagonist-wizard-name = Волшебник
+global-antagonist-wizard-description = Старый сумашедший из Федерации Магов, обученный смертельным заклинаниям
+global-antagonist-nukeops-name = Ядерный оперативник
+global-antagonist-nukeops-description = Элитный наемник Синдиката
+global-antagonist-loneops-name = Одинокий оперативник
+global-antagonist-loneops-description = Элитный наемник Синдиката, один против всей станции
+global-antagonist-cult-name = Кровавый культист
+global-antagonist-cult-description = Демонопоклонники, использующие магию крови
+global-antagonist-ninja-name = Ниндзя
+global-antagonist-ninja-description = Напичканный высокими технологиями элитный боец
+global-antagonist-zombie-name = Зомби
+global-antagonist-zombie-description = Восставший из мертвых под действием вируса
+global-antagonist-dragon-name = Космический дракон
+global-antagonist-dragon-description = Дракон! Я видела дракона!!
+global-antagonist-revenant-name = Мстительный дух
+global-antagonist-revenant-description = Призрачное существо питающееся жизненной силой
+global-antagonist-slime-name = Слизень
+global-antagonist-slime-description = Голодный сгусток чего-то одновременно твердого и жидкого
+global-antagonist-spider-name = Гигансткий паук
+global-antagonist-spider-description = Соразмерный с человеком агрессивный паук
+global-antagonist-spider-clown-name = Гигантский хонк-паук
+global-antagonist-spider-clown-description = Соразмерный с человеком агрессивный клоун-паук. ХОНК!
+global-antagonist-rats-name = Гигантская крыса
+global-antagonist-rats-description = Вечноголодная и агрессивная крыса
+global-antagonist-unknown-name = Неизвестно
+global-antagonist-unknown-description = Подозрительно!!
+
+ghost-teleport-menu-antagonists-label = Антагонисты
+ghost-teleport-menu-alive-label = Живые
+ghost-teleport-menu-dead-label = Мертвые
+ghost-teleport-menu-ghosts-label = Призраки
+ghost-teleport-menu-left-label = Вышедшие из тела
+ghost-teleport-menu-locations-label = Локации и объекты
+ghost-teleport-menu-count-label = Количество

Resources/Locale/ru-RU/job/department.ftl

@@ -5,6 +5,6 @@ department-Engineering = Инженерный отдел
 department-Medical = Медицинский отдел
 department-Security = Служба безопасности
 department-Science = Научный отдел
-department-Specific = Особые для станции
+department-Specific = Другие
 department-Silicon = Киборги
 department-Justice = Отдел юстиции

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -2225,6 +2225,8 @@
       name: ghost-role-information-giant-spider-name
       description: ghost-role-information-giant-spider-description
     - type: GhostTakeoverAvailable
+    - type: GlobalAntagonist
+      antagonistPrototype: globalAntagonistSpider
 
 - type: entity
   name: angry monkey
@@ -2285,6 +2287,8 @@
     - type: Bloodstream
       bloodMaxVolume: 150
       bloodReagent: Laughter
+    - type: GlobalAntagonist
+      antagonistPrototype: globalAntagonistSpiderClown
 
 - type: entity
   name: possum

Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml

@@ -121,6 +121,8 @@
   - type: NightVision
     toggleSound: null
     color: "#404040"
+  - type: GlobalAntagonist
+    antagonistPrototype: globalAntagonistRats
 
 - type: entity
   id: MobRatKingBuff
@@ -198,7 +200,6 @@
     - map: [ "enum.DamageStateVisualLayers.BaseUnshaded"]
       state: eyes
       shader: unshaded
-
   - type: SpriteMovement
     movementLayers:
       movement:
@@ -291,6 +292,8 @@
   - type: FireVisuals
     sprite: Mobs/Effects/onfire.rsi
     normalState: Mouse_burning
+  - type: GlobalAntagonist
+    antagonistPrototype: globalAntagonistRats
 
 - type: weightedRandomEntity
   id: RatKingLoot

Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml

@@ -93,3 +93,5 @@
     - RevenantTheme
   - type: Speech
     speechVerb: Ghost
+  - type: GlobalAntagonist
+    antagonistPrototype: globalAntagonistRevenant

Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml

@@ -148,6 +148,8 @@
         - SimpleHostile
     - type: GhostRole
       description: ghost-role-information-angry-slimes-description
+    - type: GlobalAntagonist
+      antagonistPrototype: globalAntagonistSlime
 
 - type: entity
   name: green slime
@@ -183,6 +185,8 @@
         - SimpleHostile
     - type: GhostRole
       description: ghost-role-information-angry-slimes-description
+    - type: GlobalAntagonist
+      antagonistPrototype: globalAntagonistSlime
 
 - type: entity
   name: yellow slime
@@ -218,3 +222,5 @@
         - SimpleHostile
     - type: GhostRole
       description: ghost-role-information-angry-slimes-description
+    - type: GlobalAntagonist
+      antagonistPrototype: globalAntagonistSlime

Resources/Prototypes/Entities/Mobs/Player/dragon.yml

@@ -154,6 +154,8 @@
   - type: GuideHelp
     guides:
     - MinorAntagonists
+  - type: GlobalAntagonist
+    antagonistPrototype: globalAntagonistDragon
 
 - type: entity
   parent: BaseMobDragon

Resources/Prototypes/Entities/Mobs/base.yml

@@ -60,6 +60,21 @@
         damage: 400
       behaviors:
       - !type:GibBehavior { }
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Heat
+        damage: 1500
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawnInContainer: true
+        spawn:
+          Ash:
+            min: 1
+            max: 1
+      - !type:BurnBodyBehavior { }
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MeatLaserImpact
   - type: RadiationReceiver
   - type: Stamina
   - type: MobState

Resources/Prototypes/Roles/Jobs/departments.yml

@@ -1,7 +1,9 @@
 - type: department
   id: Command
+  name: department-Command
   description: department-Command-description
   color: "#334E6D"
+  weight: 200
   roles:
   - CentralCommandOfficial
   - Captain
@@ -13,13 +15,14 @@
   - Quartermaster
   - Inspector
   primary: false
-  weight: 100
+  buttonStyle: ButtonColorCommandDepartment
 
 - type: department
   id: Security
+  name: department-Security
   description: department-Security-description
   color: "#DE3A3A"
-  weight: 20
+  weight: 180
   roles:
   - HeadOfSecurity
   - Warden
@@ -27,21 +30,80 @@
   - SecurityOfficer
   - Detective
   - SecurityCadet
+  buttonStyle: ButtonColorSecurityDepartment
+
+- type: department
+  id: Justice
+  name: department-Justice
+  description: department-Justice-description
+  weight: 160
+  color: "#710d00"
+  roles:
+  - Inspector
+  - Lawyer
+  buttonStyle: ButtonColorJusticeDepartment
+
+- type: department
+  id: Medical
+  name: department-Medical
+  description: department-Medical-description
+  color: "#52B4E9"
+  weight: 140
+  roles:
+  - ChiefMedicalOfficer
+  - SeniorPhysician
+  - MedicalDoctor
+  - Paramedic
+  - Chemist
+  - MedicalIntern
+  - Psychologist
+  buttonStyle: ButtonColorMedicalDepartment
+
+- type: department
+  id: Engineering
+  name: department-Engineering
+  description: department-Engineering-description
+  color: "#EFB341"
+  weight: 120
+  roles:
+  - ChiefEngineer
+  - SeniorEngineer
+  - AtmosphericTechnician
+  - StationEngineer
+  - TechnicalAssistant
+  buttonStyle: ButtonColorEngineeringDepartment
+
+- type: department
+  id: Science
+  name: department-Science
+  description: department-Science-description
+  color: "#D381C9"
+  weight: 100
+  roles:
+  - ResearchDirector
+  - SeniorResearcher
+  - Scientist
+  - ResearchAssistant
+  buttonStyle: ButtonColorScienceDepartment
 
 - type: department
   id: Cargo
+  name: department-Cargo
   description: department-Cargo-description
   color: "#A46106"
+  weight: 80
   roles:
   - Quartermaster
   - CargoTechnician
   - SalvageSpecialist
+  buttonStyle: ButtonColorCargoDepartment
 
 - type: department
   id: Civilian
+  name: department-Civilian
   description: department-Civilian-description
   color: "#9FED58"
-  weight: -10
+  weight: 60
   roles:
   - HeadOfPersonnel
   - Borg
@@ -60,57 +122,18 @@
   - Visitor
   - Zookeeper
   - Passenger
-
-- type: department
-  id: Engineering
-  description: department-Engineering-description
-  color: "#EFB341"
-  roles:
-  - ChiefEngineer
-  - SeniorEngineer
-  - AtmosphericTechnician
-  - StationEngineer
-  - TechnicalAssistant
-
-- type: department
-  id: Medical
-  description: department-Medical-description
-  color: "#52B4E9"
-  roles:
-  - ChiefMedicalOfficer
-  - SeniorPhysician
-  - MedicalDoctor
-  - Paramedic
-  - Chemist
-  - MedicalIntern
-  - Psychologist
-
-- type: department
-  id: Science
-  description: department-Science-description
-  color: "#D381C9"
-  roles:
-  - ResearchDirector
-  - SeniorResearcher
-  - Scientist
-  - ResearchAssistant
+  buttonStyle: ButtonColorCivilianDepartment
 
 - type: department
   id: Specific
+  name: department-Specific
   description: department-Specific-description
   color: "#9FED58"
-  weight: 10
+  weight: 0
   roles:
   - Boxer
   - Reporter
   - Zookeeper
   - Psychologist
   primary: false
-
-- type: department
-  id: Justice
-  description: department-Justice-description
-  color: "#710d00"
-  roles:
-  - Inspector
-  - Lawyer
+  buttonStyle: ButtonColorSpecificDepartment

Resources/Prototypes/_White/Antag/globalAntagonists.yml

@@ -0,0 +1,77 @@
+- type: antagonist
+  id: globalAntagonistWizard
+  name: global-antagonist-wizard-name
+  description: global-antagonist-wizard-description
+  weight: 0
+
+- type: antagonist
+  id: globalAntagonistNukeops
+  name: global-antagonist-nukeops-name
+  description: global-antagonist-nukeops-description
+  weight: 1
+
+- type: antagonist
+  id: globalAntagonistLoneops
+  name: global-antagonist-loneops-name
+  description: global-antagonist-loneops-description
+  weight: 2
+
+- type: antagonist
+  id: globalAntagonistCult
+  name: global-antagonist-cult-name
+  description: global-antagonist-cult-description
+  weight: 3
+
+- type: antagonist
+  id: globalAntagonistNinja
+  name: global-antagonist-ninja-name
+  description: global-antagonist-ninja-description
+  weight: 4
+
+- type: antagonist
+  id: globalAntagonistZombie
+  name: global-antagonist-zombie-name
+  description: global-antagonist-zombie-description
+  weight: 5
+
+- type: antagonist
+  id: globalAntagonistDragon
+  name: global-antagonist-dragon-name
+  description: global-antagonist-dragon-description
+  weight: 6
+
+- type: antagonist
+  id: globalAntagonistRevenant
+  name: global-antagonist-revenant-name
+  description: global-antagonist-revenant-description
+  weight: 7
+
+- type: antagonist
+  id: globalAntagonistSlime
+  name: global-antagonist-slime-name
+  description: global-antagonist-slime-description
+  weight: 8
+
+- type: antagonist
+  id: globalAntagonistSpider
+  name: global-antagonist-spider-name
+  description: global-antagonist-spider-description
+  weight: 9
+
+- type: antagonist
+  id: globalAntagonistSpiderClown
+  name: global-antagonist-spider-clown-name
+  description: global-antagonist-spider-clown-description
+  weight: 10
+
+- type: antagonist
+  id: globalAntagonistRats
+  name: global-antagonist-rats-name
+  description: global-antagonist-rats-description
+  weight: 11
+
+- type: antagonist
+  id: globalAntagonistUnknown
+  name: global-antagonist-unknown-name
+  description: global-antagonist-unknown-description
+  weight: 12