Upstream core (#282)

* yes (cherry picked from commit a6b5e1c66dfe4241977bcde753af594392164eca) * Is real, navernoe (#944) * its real * fix shield * remove comments game preset * maximum predicted * fixes * АААААААААААААААААААААААААААА ПОМОГИТЕ Я ЕБНУЛСЯ ПОКА ФИКСИЛ ЭТУ ЗАЛУПУ * govnoedit * secret (cherry picked from commit 22c7b68048590b5098efbfff0d0f5205d3a64c48) * [Feature/Tweaks] Raznoe (#934) * make thruster great again * make hardsuit hos great again * new ficha for medical hud * fix * vrode da * GOOOVNO REMIX REVERB EXTRA * fix * правки --------- Co-authored-by: BIGZi0348 <svalker0348@gmail.com> (cherry picked from commit 141e61a0449873842f46d83eff9e9ce857147d60) * Automatic changelog update (cherry picked from commit d14fe5fb6c934ed522df0b5bc453e4c04707a6db) * [Feature] Executions (#932) * based * cleanup * cleanup + fixes * fix * fix * fix ftl * Update Resources/Locale/ru-RU/_white/executions/execution.ftl Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update execution.ftl * правки * vrode norm * da --------- Co-authored-by: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: BIGZi0348 <svalker0348@gmail.com> (cherry picked from commit 83e164172f8e290acee7634f14ac51281be020ad) * Automatic changelog update (cherry picked from commit 71f907c563a30a1fc7ef5751a4d6f2c780a14f4c) * hotfix (#946) (cherry picked from commit f577caec41ab277ee8fc1c18fe64f7e26a6e50f5) --------- Co-authored-by: RavmorganButOnCocaine <valtos@nextmail.ru>
2025-04-13 19:03:49 +05:00
parent a444b16d7d
commit 0e4e5b7805
38 changed files with 748 additions and 161 deletions
--- a/Resources/Prototypes/Device/devicenet_frequencies.yml
+++ b/Resources/Prototypes/Device/devicenet_frequencies.yml
@@ -131,4 +131,9 @@
 - type: deviceFrequency
  id: SyndicateMessagesClient
  name: device-frequency-prototype-name-syndicate-messages-client
-  frequency: 2793
+  frequency: 2793
+# PARSEC
+- type: deviceFrequency
+  id: Thruster #used by thrusters
+  name: device-frequency-prototype-name-thrusters
+  frequency: 1512
--- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
@@ -12,6 +12,7 @@
  abstract: true
  noSpawn: true
  components:
+  - type: ShowDeadWithoutMind
  - type: ShowHealthBars
    damageContainers:
    - Biological
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -411,14 +411,15 @@
  - type: Armor
    modifiers:
      coefficients:
-        Blunt: 0.6
-        Slash: 0.5
-        Piercing: 0.5
+        Blunt: 0.55
+        Slash: 0.55
+        Piercing: 0.6
        Radiation: 0.5
-        Caustic: 0.6
+        Caustic: 0.5
+        Heat: 0.6
  - type: ClothingSpeedModifier
-    walkModifier: 0.8
-    sprintModifier: 0.8
+    walkModifier: 0.9
+    sprintModifier: 0.9
  - type: HeldSpeedModifier
  - type: ToggleableClothing
    clothingPrototype: ClothingHeadHelmetHardsuitSecurityRed
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -89,6 +89,7 @@
  - type: ShowRevIcons
  - type: ShowZombieIcons
  - type: ShowCultHud
+  - type: ShowDeadWithoutMind
  - type: Inventory
    templateId: aghost
  - type: InventorySlots
--- a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
+++ b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
@@ -35,6 +35,16 @@
    - type: InteractionOutline
    - type: Sprite
    - type: Appearance
+    - type: DeviceNetwork # Parsec
+      deviceNetId: Wireless
+      receiveFrequencyId: Thruster
+    - type: WirelessNetworkConnection # Parsec
+      range: 200
+    - type: DeviceLinkSink # Parsec
+      ports:
+      - Toggle
+      - On
+      - Off
    - type: ThrusterVisuals
    - type: ApcPowerReceiver
      powerLoad: 1500
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -274,7 +274,7 @@
  noSpawn: true
  components:
  - type: GameRule
-    minPlayers: 30 # Amour
+    minPlayers: 20
  - type: CultRule
  - type: AntagSelection
    definitions:
--- a/Resources/Prototypes/StatusIcon/antag.yml
+++ b/Resources/Prototypes/StatusIcon/antag.yml
@@ -43,3 +43,13 @@
  icon:
    sprite: /Textures/Interface/Misc/job_icons.rsi
    state: Syndicate
+# Parsec
+- type: statusIcon
+  id: DeadWithoutMindIcon
+  priority: 10
+  locationPreference: Left
+  layer: Mod
+  isShaded: true
+  icon:
+    sprite: /Textures/Interface/Misc/job_icons.rsi
+    state: DeadWithoutMind
--- a/Resources/Prototypes/_White/Entities/Cult/Altars/cult_altars.yml
+++ b/Resources/Prototypes/_White/Entities/Cult/Altars/cult_altars.yml
@@ -121,6 +121,8 @@
    - FactoryCultShuttleCurse
    - FactoryCultClothingBlindfold
    - FactoryCultVeilShifter
+  - type: ActivatableUI
+    key: enum.CultistAltarUiKey.Key
  - type: UserInterface
    interfaces:
      enum.CultistAltarUiKey.Key:
@@ -180,6 +182,8 @@
    products:
    - FactoryWhetstone
    - FactoryConstructShell
+  - type: ActivatableUI
+    key: enum.CultistAltarUiKey.Key
  - type: UserInterface
    interfaces:
      enum.CultistAltarUiKey.Key:
@@ -243,6 +247,8 @@
    - FactoryUnholyHalberd
    - FactoryCultRobeModify
    - FactoryCultMirrorShield
+  - type: ActivatableUI
+    key: enum.CultistAltarUiKey.Key
  - type: UserInterface
    interfaces:
      enum.CultistAltarUiKey.Key:
--- a/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml
+++ b/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml
@@ -141,11 +141,11 @@
  size: 0.8, 0.8

 - type: customGhost
-  id: hitpanda-ghost
-  ckey: hitpanda
+  id: caypennow-ghost
+  ckey: CaypenNow
  sprite: White/Ghosts/hitpanda_ghost.rsi
  alpha: 0.8
-  ghostName: Панда
+  ghostName: Undefined
  ghostDescription: Полыхает...
  size: 1, 1

--- a/Resources/Prototypes/game_presets.yml
+++ b/Resources/Prototypes/game_presets.yml
@@ -173,20 +173,20 @@
  - BasicRoundstartVariation

 #WD EDIT START
-# - type: gamePreset
-#   id: Cult
-#   alias:
-#     - cult
-#   name: cult-title
-#   description: cult-description
-#   showInVote: true
-#   minPlayers: 20
-#   rules:
-#     - Cult
-#     - SubGamemodesRule
-#     - BasicStationEventScheduler
-#     - BasicRoundstartVariation
-#     - GameRuleMeteorScheduler
+- type: gamePreset
+  id: Cult
+  alias:
+    - cult
+  name: cult-title
+  description: cult-description
+  showInVote: true
+  minPlayers: 20
+  rules:
+    - Cult
+    - SubGamemodesRule
+    - BasicStationEventScheduler
+    - BasicRoundstartVariation
+    - GameRuleMeteorScheduler

 - type: gamePreset
  id: Changeling
@@ -313,4 +313,18 @@
    - BasicStationEventScheduler
    - BasicRoundstartVariation
    - GameRuleMeteorScheduler
+
+- type: gamePreset
+  id: SecretCult #For Admin Use: Runs Cult, but shows "Secret" in lobby.
+  alias:
+  - secretcult
+  name: secret-title
+  showInVote: false #Admin Use
+  description: secret-description
+  rules:
+  - Cult
+  - SubGamemodesRule
+  - BasicStationEventScheduler
+  - BasicRoundstartVariation
+  - GameRuleMeteorScheduler
 #WD EDIT END
--- a/Resources/Prototypes/secret_weights.yml
+++ b/Resources/Prototypes/secret_weights.yml
@@ -4,7 +4,7 @@
    Traitor: 0.35
    Changeling: 0.14
    Nukeops: 0.14
-  # Cult: 0.15
+    Cult: 0.15
    Wizard: 0.09
    Revolutionary: 0.1
    Zombie: 0.09