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>
This commit is contained in:
withoutcode333
2025-04-13 19:03:49 +05:00
committed by GitHub
parent a444b16d7d
commit 0e4e5b7805
38 changed files with 748 additions and 161 deletions

View File

@@ -1,65 +1,4 @@
Entries:
- author: Aviu
changes:
- message: "\u0421\u0432\u044F\u0442\u0430\u044F \u0432\u043E\u0434\u0430 \u0442\
\u0435\u043F\u0435\u0440\u044C \u0443\u0442\u043E\u043B\u044F\u0435\u0442 \u0436\
\u0430\u0436\u0434\u0443, \u0438\u0441\u043F\u0430\u0440\u044F\u0435\u0442\u0441\
\u044F, \u0438 \u043D\u0430 \u043D\u0435\u0439 \u043C\u043E\u0436\u043D\u043E\
\ \u043F\u043E\u0441\u043A\u043E\u043B\u044C\u0437\u043D\u0443\u0442\u044C\u0441\
\u044F."
type: Fix
- message: "\u0420\u0443\u043D\u044B \u0432\u043D\u043E\u0432\u044C \u0441\u0442\
\u0438\u0440\u0430\u044E\u0442\u0441\u044F \u0431\u0438\u0431\u043B\u0438\u0435\
\u0439 \u0438 \u0431\u0440\u044B\u0437\u0433\u0430\u043D\u044C\u0435\u043C \u0441\
\u0432\u044F\u0442\u043E\u0439 \u0432\u043E\u0434\u043E\u0439."
type: Fix
id: 174
time: '2024-03-02T09:08:32.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/159
- author: Aviu
changes:
- message: "\u0421\u043A\u0435\u043B\u0435\u0442 \u0438\u0437 \u0448\u043A\u0430\
\u0444\u0430 \u0442\u0435\u043F\u0435\u0440\u044C \u0432\u044B\u0433\u043B\u044F\
\u0434\u0438\u0442 \u043A\u0430\u043A \u0441\u043A\u0435\u043B\u0435\u0442."
type: Fix
id: 175
time: '2024-03-02T09:10:00.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/160
- author: Remuchi
changes:
- message: "\u0438\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u043E\u0442\
\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u044F \u0430\u043D\u0442\u0430\
\u0436\u043A\u0438, \u0441\u0442\u0430\u0442\u0443\u0441\u0430 \u0438 \u043F\
\u043E\u0434\u043E\u0431\u043D\u043E\u0433\u043E \u0432 \u0430\u0445\u0435\u043B\
\u043F\u0435."
type: Fix
- message: "\u043D\u043E\u0442\u0435\u0441\u044B, \u043E\u0442\u043F\u0440\u0430\
\u0432\u043B\u044F\u0435\u043C\u044B\u0435 \u0432 \u0447\u0430\u0442, \u0431\
\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u043E\u0442\u043F\u0440\u0430\u0432\
\u043B\u044F\u044E\u0442\u0441\u044F \u0435\u0449\u0451 \u0438 \u0432 \u043A\
\u043E\u043D\u0441\u043E\u043B\u044C."
type: Fix
- message: "\u0442\u0435\u043A\u0441\u0442\u0443\u0440\u0430 \u0441\u0435\u043A\u0440\
\u0435\u0442\u043D\u043E\u0439 \u0434\u0432\u0435\u0440\u0438 \u0431\u044B\u043B\
\u0430 \u043F\u0435\u0440\u0435\u0440\u0438\u0441\u043E\u0432\u0430\u043D\u0430\
\ \u0434\u043B\u044F \u0441\u043E\u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\
\u0438\u044F \u0441 \u0430\u043A\u0442\u0443\u0430\u043B\u044C\u043D\u044B\u043C\
\u0438 \u0442\u0435\u043A\u0441\u0442\u0443\u0440\u0430\u043C\u0438 \u0441\u0442\
\u0435\u043D"
type: Fix
- message: "\u0438\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u043E\u0448\
\u0438\u0431\u043A\u0438 \u043F\u0435\u0440\u0435\u0432\u043E\u0434\u0430 \u043F\
\u0440\u0438 \u0432\u044B\u043B\u0438\u0437\u044B\u0432\u0430\u043D\u0438\u0438\
\ \u0440\u0430\u043D \u0437\u0430 \u0444\u0435\u043B\u0438\u043D\u0438\u0434\
\u0430"
type: Fix
- message: "\u043F\u0435\u0440\u0435\u0432\u043E\u0434\u044B \u0434\u043B\u044F\
\ \u0441\u0435\u043A\u0440\u0435\u0442\u043D\u043E\u0439 \u0434\u0432\u0435\u0440\
\u0438"
type: Add
id: 176
time: '2024-03-02T14:16:27.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/161
- author: Remuchi
changes:
- message: "\u0418\u043C\u043F\u043B\u0430\u043D\u0442 \u043F\u043E\u0434\u0447\u0438\
@@ -9079,3 +9018,56 @@
id: 673
time: '2025-04-03T17:50:03.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/942
- author: CaypenNow
changes:
- message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0432 \u043C\u0435\u0434\u0438\
\u0446\u0438\u043D\u0441\u043A\u043E\u043C \u0432\u0438\u0437\u043E\u0440\u0435\
\ \u0435\u0441\u0442\u044C \u0441\u043F\u0435\u0446\u0438\u0430\u043B\u044C\u043D\
\u0430\u044F \u0432\u0438\u0437\u0443\u0430\u043B\u044C\u043D\u0430\u044F \u043F\
\u043E\u043C\u0435\u0442\u043A\u0430, \u0432 \u0441\u043B\u0443\u0447\u0430\u0435\
\ \u0435\u0441\u043B\u0438 \u0447\u0435\u043B\u043E\u0432\u0435\u043A \u043C\
\u0435\u0440\u0442\u0432 \u0438 \u0432 \u043D\u0435\u043C \u043D\u0435\u0442\
\ \u0434\u0443\u0448\u0438."
type: Add
- message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043C\u043E\u0436\u043D\u043E\
\ \u043F\u0440\u0438\u0432\u044F\u0437\u0430\u0442\u044C \u0434\u0432\u0438\u0433\
\u0430\u0442\u0435\u043B\u0438 \u0448\u0430\u0442\u0442\u043B\u043E\u0432 \u043A\
\ \u043F\u0435\u0440\u0435\u0434\u0430\u0442\u0447\u0438\u043A\u0443 \u0441\u0438\
\u0433\u043D\u0430\u043B\u043E\u0432 \u0438 \u043A\u043D\u043E\u043F\u043A\u0430\
\u043C."
type: Add
- message: "\u0417\u0430\u0449\u0438\u0442\u0430 \u0438 \u043C\u043E\u0434\u0438\
\u0444\u0438\u043A\u0430\u0442\u043E\u0440\u044B \u0441\u043A\u043E\u0440\u043E\
\u0441\u0442\u0438 \u0441\u043A\u0430\u0444\u0430\u043D\u0434\u0440\u0430 \u0413\
\u0421\u0411 \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u044B."
type: Tweak
id: 674
time: '2025-04-13T11:46:23.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/934
- author: CaypenNow
changes:
- message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u043A\u0443\u043B\
\u044C\u0442. \u041F\u043E\u043A\u0430 \u0432 \u0442\u0435\u0441\u0442\u043E\
\u0432\u043E\u043C \u0440\u0435\u0436\u0438\u043C\u0435."
type: Add
- message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0449\u0438\u0442 \u043A\u0443\
\u043B\u044C\u0442\u0430 \u043F\u0440\u043E\u043B\u0435\u0442\u0430\u0435\u0442\
\ \u0441\u043A\u0432\u043E\u0437\u044C \u043C\u0430\u043B\u0435\u043D\u044C\u043A\
\u0438\u0445 \u0436\u0438\u0432\u043E\u0442\u043D\u044B\u0445 (\u043C\u044B\u0448\
\u0438, \u043A\u0440\u044B\u0441\u044B)."
type: Tweak
id: 675
time: '2025-04-13T11:46:00.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/944
- author: CaypenNow
changes:
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0432\u043E\u0437\
\u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u043A\u0430\u0437\u043D\u0438\
\u0442\u044C/\u0441\u0430\u043C\u043E\u0443\u0431\u0438\u0439\u0442\u044C\u0441\
\u044F \u0441 \u043F\u043E\u043C\u043E\u0449\u044C\u044E \u0431\u043B\u0438\u0436\
\u043D\u0435\u0433\u043E/\u043E\u0433\u043D\u0435\u0441\u0442\u0440\u0435\u043B\
\u044C\u043D\u043E\u0433\u043E \u043E\u0440\u0443\u0436\u0438\u044F."
type: Add
id: 676
time: '2025-04-13T12:32:46.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/932

View File

@@ -0,0 +1,13 @@
execution-verb-name = Казнить
execution-verb-message = Казнить кого-либо при помощи вашего оружия.
execution-popup-gun-initial-external = {$attacker} приставляет {$weapon} к голове {$victim}.
execution-popup-gun-complete-external = {$attacker} стреляет в голову {$victim}!
execution-popup-gun-clumsy-external = {$attacker} промахивается в {$victim} и стреляет в себя!
execution-popup-gun-empty = {CAPITALIZE($weapon)} щелкает.
suicide-popup-gun-initial-external = {$attacker} направляет ствол {$weapon} в свой рот.
suicide-popup-gun-complete-external = {$attacker} стреляет {REFLEXIVE($attacker)} себе в голову!
execution-popup-melee-initial-external = {$attacker} приставляет {$weapon} к горлу {$victim}.
execution-popup-melee-complete-external = {$attacker} перерезает горло {$victim}!
suicide-popup-melee-initial-external = {$attacker} приставляет {$weapon} к своему горлу.
suicide-popup-melee-complete-external = {$attacker} перерезает себе горло с помощью {$weapon}!

View File

@@ -5,6 +5,8 @@ device-frequency-prototype-name-crew-monitor = Отслеживатель эки
device-frequency-prototype-name-lights = Умное освещение
device-frequency-prototype-name-mailing-units = Почтовый блок
device-frequency-prototype-name-pdas = ПДА
# Thrusters | Parsec
device-frequency-prototype-name-thrusters = Двигатели
# prefixes for randomly generated device addresses
device-address-prefix-vent = Вент-
device-frequency-prototype-name-basic-device = Простые устройства

View File

@@ -1,30 +0,0 @@
execution-verb-name = Казнить
execution-verb-message = Казнить кого-либо при помощи вашего оружия.
# All the below localisation strings have access to the following variables
# attacker (the person committing the execution)
# victim (the person being executed)
# weapon (the weapon used for the execution)
execution-popup-gun-initial-internal = Вы направляете ствол {$weapon} на голову {$victim}.
execution-popup-gun-initial-external = {$attacker} направляет ствол {$weapon} на голову {$victim}.
execution-popup-gun-complete-internal = Вы выстреливаете в голову {$victim}!
execution-popup-gun-complete-external = {$attacker} выстреливает в голову {$victim}!
execution-popup-gun-clumsy-internal = Вы промахиваетесь мимо головы {$victim} и стреляете себе в ногу!
execution-popup-gun-clumsy-external = {$attacker} промахивается мимо головы {$victim} и стреляет в {POSS-ADJ($attacker)} ногу!
execution-popup-gun-empty = {CAPITALIZE($weapon)} щёлкает.
suicide-popup-gun-initial-internal = Вы суёте ствол {$weapon} себе в рот.
suicide-popup-gun-initial-external = {$attacker} суёт ствол {$weapon} в {POSS-ADJ($attacker)} рот.
suicide-popup-gun-complete-internal = Вы стреляете себе в голову!
suicide-popup-gun-complete-external = {$attacker} стреляет {REFLEXIVE($attacker)} себе в голову!
execution-popup-melee-initial-internal = Вы заносите {$weapon} над горлом {$victim}.
execution-popup-melee-initial-external = {$attacker} заносит {POSS-ADJ($attacker)} {$weapon} над горлом {$victim}.
execution-popup-melee-complete-internal = Вы перерезаете горло {$victim}!
execution-popup-melee-complete-external = {$attacker} перерезает горло {$victim}!
suicide-popup-melee-initial-internal = Вы заносите {$weapon} над своим горлом.
suicide-popup-melee-initial-external = {$attacker} заносит {POSS-ADJ($attacker)} {$weapon} над горлом {POSS-ADJ($attacker)}.
suicide-popup-melee-complete-internal = Вы перерезаете себе горло при помощи {$weapon}!
suicide-popup-melee-complete-external = {$attacker} перерезает горло {POSS-ADJ($attacker)} при помощи {$weapon}!

View File

@@ -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

View File

@@ -12,6 +12,7 @@
abstract: true
noSpawn: true
components:
- type: ShowDeadWithoutMind
- type: ShowHealthBars
damageContainers:
- Biological

View File

@@ -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

View File

@@ -89,6 +89,7 @@
- type: ShowRevIcons
- type: ShowZombieIcons
- type: ShowCultHud
- type: ShowDeadWithoutMind
- type: Inventory
templateId: aghost
- type: InventorySlots

View File

@@ -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

View File

@@ -274,7 +274,7 @@
noSpawn: true
components:
- type: GameRule
minPlayers: 30 # Amour
minPlayers: 20
- type: CultRule
- type: AntagSelection
definitions:

View File

@@ -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

View File

@@ -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:

View File

@@ -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

View File

@@ -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

View File

@@ -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

Binary file not shown.

After

Width:  |  Height:  |  Size: 512 B

View File

@@ -180,6 +180,9 @@
[1.0,1.0]
]
},
{
"name": "DeadWithoutMind"
},
{
"name": "Syndicate"
},