Стелс ботинки #396
Open
Стелс ботинки #396
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit f9d2a58.
…ace-station-14 into arumoon-server
…ace-station-14 into arumoon-server
…ace-station-14 into arumoon-server
…ace-station-14 into arumoon-server
…ace-station-14 into arumoon-server
…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
added 4 commits
February 28, 2025 20:40
…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
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
MilenVolf
requested changes
Mar 9, 2025
Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/shoes/specific.ftl
Outdated
Show resolved
Hide resolved
Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/shoes/specific.ftl
Outdated
Show resolved
Hide resolved
Resources/Prototypes/Starshine/Entities/Clothing/Shoes/base_shoes.yml
Outdated
Show resolved
Hide resolved
…-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
|
я чутка провтыкал но вроде всё исправил |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
О запросе слияния
Новые бесшумный ботинки у которых модификатор ClothingSlowOnDamageModifier: 0.15 так же они хамелеон НЕ ноу слипы
Почему / Баланс
Больше предметов для антагов
Медиа
Требования
Чейнджлог
🆑