Стелс ботинки by lAstronautl · Pull Request #396 · Workbench-Team/space-station-14

lAstronautl · 2025-02-28T17:38:43Z

О запросе слияния

Новые бесшумный ботинки у которых модификатор ClothingSlowOnDamageModifier: 0.15 так же они хамелеон НЕ ноу слипы

Почему / Баланс

Больше предметов для антагов

Медиа

Требования

Я прочитал и следую Руководству по созданию Запросов на слияние и Чейнджлогов.
Я добавил медиа в этот PR, или для этого не требуется игровая демонстрация.

Чейнджлог
🆑

add: Добавлены стелс ботинки за 3 ТК в аплинк!

This reverts commit f9d2a58.

…ace-station-14 into arumoon-server

…ion-14 into arumoon-server # Conflicts: # Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs # Content.Server/Holosign/HolosignSystem.cs # Content.Server/ServerInfo/ServerInfoManager.cs # Content.Shared/CCVar/CCVars.cs # Resources/Maps/Misc/terminal.yml # Resources/Maps/Nonstations/nukieplanet.yml # Resources/Maps/Test/dev_map.yml # Resources/Maps/metastation.yml # Resources/Prototypes/Catalog/Cargo/cargo_vending.yml # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml # Resources/Prototypes/Entities/Objects/Materials/ore.yml # Resources/Prototypes/Entities/Objects/Specific/chemistry.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Recipes/Lathes/medical.yml # Resources/Prototypes/Recipes/Lathes/tools.yml # Resources/Prototypes/Recipes/Reactions/chemicals.yml # Resources/Prototypes/tags.yml # Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json # Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json # Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json # Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json # Resources/migration.yml

…ace-station-14 into arumoon-server # Conflicts: # Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs # Content.Server/ServerInfo/ServerInfoManager.cs # Content.Shared/CCVar/CCVars.cs # Resources/Maps/Misc/terminal.yml # Resources/Maps/Test/dev_map.yml # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Entities/Objects/Materials/ore.yml # Resources/Prototypes/Entities/Objects/Specific/chemistry.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Recipes/Lathes/medical.yml # Resources/Prototypes/Recipes/Lathes/tools.yml # Resources/Prototypes/Recipes/Reactions/chemicals.yml # Resources/Prototypes/tags.yml # Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json # Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json # Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json # Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json # Resources/migration.yml

This reverts commit 68ed9a7.

# Conflicts: # Content.Server/Atmos/Portable/PortableScrubberComponent.cs # Content.Server/StationEvents/Components/GasLeakRuleComponent.cs # Content.Shared/Atmos/Atmospherics.cs # Content.Shared/Atmos/Piping/Unary/Components/SharedVentScrubberComponent.cs # Resources/Locale/en-US/gases/gases.ftl # Resources/Maps/Shuttles/arrivals.yml # Resources/Prototypes/Atmospherics/gases.yml # Resources/Prototypes/Atmospherics/thresholds.yml # Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml # Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml # Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml # Resources/Prototypes/Maps/Pools/default.yml # Resources/Textures/Effects/atmospherics.rsi/meta.json # Conflicts: # Resources/Prototypes/Atmospherics/gases.yml # Resources/Textures/Effects/atmospherics.rsi/meta.json

finishing up # Conflicts: # Content.Shared/Atmos/Atmospherics.cs # Content.Shared/CCVar/CCVars.cs # Resources/Locale/en-US/station-events/events/vent-critters.ftl # Resources/Maps/Misc/terminal.yml # Resources/Maps/RimAavikko/RimAtlas.yml # Resources/Prototypes/Entities/Markers/Spawners/Conditional/timed.yml # Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml # Resources/Prototypes/Entities/Structures/Walls/railing.yml # Resources/Prototypes/Maps/Pools/default.yml

# Conflicts: # Content.Shared/Atmos/Atmospherics.cs

# Conflicts: # Resources/Locale/en-US/reagents/meta/gases.ftl

# Conflicts: # Resources/Locale/en-US/alerts/alerts.ftl # Resources/Locale/en-US/job/department-desc.ftl # Resources/Locale/en-US/job/job-description.ftl # Resources/Locale/en-US/job/job-names.ftl # Resources/Prototypes/Entities/Markers/Spawners/jobs.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml # Resources/Prototypes/Roles/Jobs/departments.yml # Resources/map_attributions.txt

…зный код

…ace-station-14 into water # Conflicts: # Resources/Maps/tehtra.yml # Resources/Prototypes/Atmospherics/gases.yml # Resources/Prototypes/Atmospherics/thresholds.yml # Resources/Prototypes/Maps/tehtra.yml

github-actions · 2025-03-09T10:07:32Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

MilenVolf

Пару моментов поправить и отлично 👍

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/specific.ftl

Resources/Locale/en-US/starshine/store/uplink-catalog.ftl

Resources/Locale/ru-RU/starshine/store/uplink-catalog.ftl

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/shoes/specific.ftl

Resources/Prototypes/Starshine/Entities/Clothing/Shoes/base_shoes.yml

Water

…-station-14 into Uplink-Steals-Boots # Conflicts: # Resources/Locale/en-US/starshine/store/uplink-catalog.ftl # Resources/Locale/ru-RU/starshine/store/uplink-catalog.ftl # Resources/Prototypes/Starshine/Catalog/uplink_catalog.yml

This reverts commit 9fe4acc, reversing changes made to b450973.

github-actions · 2025-06-20T07:20:30Z

RSI Diff Bot; head commit ea016ec merging into b450973
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Effects/atmospherics.rsi

State	Old	New	Status
water			Added

Resources/Textures/Interface/Alerts/breathing.rsi

State	Old	New	Status
too_much_water			Added

lAstronautl · 2025-06-20T07:21:09Z

я чутка провтыкал но вроде всё исправил

github-actions · 2025-10-29T18:41:24Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

…ace-station-14 into Uplink-Steals-Boots

Не говори человеку-пауку, что я не съел кашу 😔

lAstronautl and others added 23 commits June 11, 2024 12:15

Nerf

f9d2a58

Revert "Nerf"

474d8c3

This reverts commit f9d2a58.

Merge branch 'arumoon-server' of https://github.com/Workbench-Team/sp…

65c2fb9

…ace-station-14 into arumoon-server

Merge branch 'arumoon-server' of https://github.com/Workbench-Team/sp…

bc212fe

…ace-station-14 into arumoon-server

Merge branch 'arumoon-server' of https://github.com/Workbench-Team/sp…

a38fdf4

…ace-station-14 into arumoon-server

Merge branch 'arumoon-server' of https://github.com/Workbench-Team/sp…

c9f8a0b

…ace-station-14 into arumoon-server

Merge branch 'arumoon-server' of https://github.com/Workbench-Team/sp…

c41c8ed

…ace-station-14 into arumoon-server

Merge branch 'arumoon-server' of https://github.com/Workbench-Team/sp…

c72c108

…ace-station-14 into arumoon-server

Revert "Remove tehtra, pending re-mapping"

c9ea08a

This reverts commit 68ed9a7.

Fixed water gas

e6dff61

# Conflicts: # Content.Shared/Atmos/Atmospherics.cs

Update gases

c0cd1bd

# Conflicts: # Resources/Locale/en-US/reagents/meta/gases.ftl

miner

38d7e7b

.

ccfbe58

попытки починить газы

64a968c

fix

7d593c0

fix

dc863d7

тяжело..

59a7ab3

add: Новые безвучные ботинки

8e754a3

github-actions bot added size/S Changes: No C# S: Untriaged labels Feb 28, 2025

Astronaut added 4 commits February 28, 2025 20:40

Fix: забыл про локаль в аплинке

72044b3

ЭТА ОРФОГРАФИЯ ПРОСТО ИМБА

2c8aae9

починка ошибки фикс грида, повысил температуру воды и вырезал безполе…

a2221bf

…зный код

Merge branch 'arumoon-server' of https://github.com/Workbench-Team/sp…

190a349

…ace-station-14 into water # Conflicts: # Resources/Maps/tehtra.yml # Resources/Prototypes/Atmospherics/gases.yml # Resources/Prototypes/Atmospherics/thresholds.yml # Resources/Prototypes/Maps/tehtra.yml

github-actions bot added the S: Merge Conflict label Mar 9, 2025

MilenVolf previously requested changes Mar 9, 2025

View reviewed changes

lAstronautl and others added 3 commits April 22, 2025 21:42

Merge pull request #1 from lAstronautl/water

9fe4acc

Water

Правки в локаль (вроде ничего не забыл)

85b6b93

github-actions bot removed the S: Merge Conflict label Jun 20, 2025

Revert "Merge pull request #1 from lAstronautl/water"

51dbf35

This reverts commit 9fe4acc, reversing changes made to b450973.

github-actions bot added Changes: Sprites size/M and removed size/S labels Jun 20, 2025

зачем тут пробелы?

b288ed1

github-actions bot added size/S and removed size/M labels Jun 20, 2025

маленькая корректировка локали

6ccb32a

github-actions bot added the S: Merge Conflict label Oct 29, 2025

MilenVolf added 2 commits October 29, 2025 22:47

Merge branch 'arumoon-server' of https://github.com/Workbench-Team/sp…

1fd5593

…ace-station-14 into Uplink-Steals-Boots

Weh!

e4cd006

github-actions bot removed the S: Merge Conflict label Oct 29, 2025

No-no

5da6bbb

MilenVolf merged commit be311c0 into Workbench-Team:arumoon-server Oct 29, 2025
13 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Стелс ботинки#396

Стелс ботинки#396
MilenVolf merged 36 commits intoWorkbench-Team:arumoon-serverfrom
lAstronautl:Uplink-Steals-Boots

lAstronautl commented Feb 28, 2025

Uh oh!

github-actions bot commented Mar 9, 2025

Uh oh!

MilenVolf left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Jun 20, 2025

Uh oh!

lAstronautl commented Jun 20, 2025

Uh oh!

github-actions bot commented Oct 29, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

lAstronautl commented Feb 28, 2025

О запросе слияния

Почему / Баланс

Медиа

Требования

Uh oh!

github-actions bot commented Mar 9, 2025

Uh oh!

MilenVolf left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Jun 20, 2025

Uh oh!

lAstronautl commented Jun 20, 2025

Uh oh!

github-actions bot commented Oct 29, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants