Commit be311c0
Стелс ботинки (#396)
* Nerf
* Revert "Nerf"
This reverts commit f9d2a58.
* Revert "Remove tehtra, pending re-mapping"
This reverts commit 68ed9a7.
* PLZ WORK
# 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
* Merge pull request #20 from Pixeltheaertist/finishing-touches
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
* Fixed water gas
# Conflicts:
# Content.Shared/Atmos/Atmospherics.cs
* Update gases
# Conflicts:
# Resources/Locale/en-US/reagents/meta/gases.ftl
* miner
* .
* попытки починить газы
* fix
* jellid update
# 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
* fix
* тяжело..
* add: Новые безвучные ботинки
* Fix: забыл про локаль в аплинке
* ЭТА ОРФОГРАФИЯ ПРОСТО ИМБА
* починка ошибки фикс грида, повысил температуру воды и вырезал безполезный код
* Правки в локаль (вроде ничего не забыл)
* Revert "Merge pull request #1 from lAstronautl/water"
This reverts commit 9fe4acc, reversing
changes made to b450973.
* зачем тут пробелы?
* маленькая корректировка локали
* Weh!
* No-no
---------
Co-authored-by: Astronaut <vserverah@gmail.com>
Co-authored-by: MilenVolf <milen.volf@gmail.com>1 parent d8debc3 commit be311c0
5 files changed
Lines changed: 42 additions & 2 deletions
File tree
- Resources
- Locale
- en-US/_starshine/store
- ru-RU/_starshine
- ss14-ru/entities/clothing/shoes
- store
- Prototypes/Starshine
- Catalog
- Entities/Clothing/Shoes
Lines changed: 3 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | 1 | | |
3 | 2 | | |
4 | 3 | | |
| |||
37 | 36 | | |
38 | 37 | | |
39 | 38 | | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
166 | 166 | | |
167 | 167 | | |
168 | 168 | | |
169 | | - | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
170 | 178 | | |
171 | 179 | | |
172 | 180 | | |
| |||
Lines changed: 25 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
0 commit comments