Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rework silly #506

Closed
wants to merge 6 commits into from
Closed

Rework silly #506

wants to merge 6 commits into from

Conversation

Roudenn
Copy link
Contributor

@Roudenn Roudenn commented Mar 9, 2024

Описание PR

Данный ПР добавляет в игру переделанную версию карты CorvaxSilly - BackmenSilly, которая также заменяет предшественника в пулле.
В карте очень много изменений, потому вот самые главные из них:

  • Удалён обломок синдиката с множеством сильного лута
  • Все без исключения секретки изменены/ослаблены/удалены
  • В инженерии расширился атмос, а также изменена комната с генератором на повреждённом РИТЭГе
  • Переработан лут в оружейке
  • В РнД изменилось количество лута + теперь есть труба для подачи газов в комнату с артом
  • Дормы теперь чуть более просторные
  • Добавлено хранилище плат, которое содержит много полезного для инженеров + ящик для соляр
  • В химке есть раздатчик химикатов и химкомат, в хранилище плат есть платы для центрифуги и электролизной установки
  • Добавлены банкоматы, спавнер ИИ, спавнер бригмедика и его шкаф
  • Очень много плакатов!
  • Везде есть экраны, в прибытии есть экраны прибытия
  • Кабинеты глав теперь сильнее укреплены
  • Камни планеты заменены на астероидные, для чуть более ванильного вида (а ещё раньше там было по 10 камней настакано друг на друга, не очень круто)

Проверки

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения

🆑 Rouden

  • tweak: Станция Silly была значительно переработана.

Roudenn added 5 commits March 6, 2024 19:45
commit c6a3d44
Author: Kayzel <[email protected]>
Date:   Wed Mar 6 16:21:44 2024 +0300

    done?

commit 7bb340f
Author: Kayzel <[email protected]>
Date:   Wed Mar 6 16:01:00 2024 +0300

    fix

commit a5bdb51
Author: Kayzel <[email protected]>
Date:   Wed Mar 6 15:28:14 2024 +0300

    yml success

commit 8b30042
Merge: 56d6e9e 2935e5b
Author: Kayzel <[email protected]>
Date:   Wed Mar 6 15:10:51 2024 +0300

    Merge remote-tracking branch 'wizard/master' into upstream-sync

commit 2935e5b
Author: Tayrtahn <[email protected]>
Date:   Wed Mar 6 00:34:50 2024 -0500

    Remove all obsolete BatteryComponent method calls (#25871)

    Removed all obsolete, non-ECS method calls to BatteryComponent

commit 4228305
Author: PJBot <[email protected]>
Date:   Wed Mar 6 02:04:13 2024 +0000

    Automatic changelog update

commit 974c4b9
Author: Brandon Hu <[email protected]>
Date:   Wed Mar 6 02:03:07 2024 +0000

    adds barber scissors to hristov bundle (#25695)

    bald update

    Co-authored-by: Kadeo64 <[email protected]>

commit 0738829
Author: Tayrtahn <[email protected]>
Date:   Tue Mar 5 20:59:05 2024 -0500

    Add SharedPopupSystem.PopupPredicted (#25811)

    * Added SharedPopupSystem.PopupPredicted

    * Documentation improvement

commit 72b0889
Author: PJBot <[email protected]>
Date:   Wed Mar 6 01:45:31 2024 +0000

    Automatic changelog update

commit e648fe5
Author: metalgearsloth <[email protected]>
Date:   Wed Mar 6 12:44:26 2024 +1100

    Fix pod launch offset (#25855)

    Was too lazy to fix and forgot.

commit 46f6799
Author: Errant <[email protected]>
Date:   Wed Mar 6 02:43:51 2024 +0100

    Readmin enables Debug Coordinates in F3 overlay (#25063)

    readmin debugcoords

commit 89831d7
Author: PJBot <[email protected]>
Date:   Wed Mar 6 01:43:14 2024 +0000

    Automatic changelog update

commit 8e2ebdd
Author: PJBot <[email protected]>
Date:   Wed Mar 6 01:42:09 2024 +0000

    Automatic changelog update

commit 2ba28cc
Author: Арт <[email protected]>
Date:   Wed Mar 6 04:42:05 2024 +0300

    New cloth & hair (#25772)

    * Clothing sprites & meta

    * Changing prototypes & sprites

    Rename sprites folder, edit prototypes and meta

    * Hair_sprites_&_prototype

    Add hair sprites and change prototype

    * Update meta.json

    * Rename added hair

    * Revert "Changing prototypes & sprites"

    This reverts commit 801cadbdaa90cfb5e7ae43cd7d017e20b40cdc98.

    * Revert "Clothing sprites & meta"

    This reverts commit 73442163fd8bc8f49207e616b415dc0f26d6ef32.

commit 27e14d8
Author: Ilya246 <[email protected]>
Date:   Wed Mar 6 05:41:03 2024 +0400

    buff gas leak event (#25864)

    the fog is coming

commit 623aa79
Author: PJBot <[email protected]>
Date:   Wed Mar 6 01:40:53 2024 +0000

    Automatic changelog update

commit 0913327
Author: I.K <[email protected]>
Date:   Tue Mar 5 19:40:03 2024 -0600

    Update wideswing rotations (#25868)

    * Added appropriate wideAnimationRotation fields to items that needed it

    * Modified some wideAnimationRotation

commit 0ab4ace
Author: Ko4ergaPunk <[email protected]>
Date:   Wed Mar 6 04:39:47 2024 +0300

    Post light update (#25814)

    * penis

    * done

commit be18649
Author: PJBot <[email protected]>
Date:   Wed Mar 6 01:38:29 2024 +0000

    Automatic changelog update

commit 8e8156a
Author: Froffy025 <[email protected]>
Date:   Tue Mar 5 20:37:24 2024 -0500

    Add water to water tiles. (#25825)

    * update

    * rename tank to pool. bigger arbitrary #. remove bad copy paste part.

commit 55cebb3
Author: PJBot <[email protected]>
Date:   Wed Mar 6 01:37:10 2024 +0000

    Automatic changelog update

commit 8a154d3
Author: Ps3Moira <[email protected]>
Date:   Tue Mar 5 17:36:04 2024 -0800

    Separate Certain Walls (#25674)

    Separate Walls

commit d385c1b
Author: Pieter-Jan Briers <[email protected]>
Date:   Wed Mar 6 02:35:26 2024 +0100

    Paper save button, back to ctrl+enter save. (#25870)

    * Revert "Change keybindings for paper (#25853)"

    This reverts commit 4b56996.

    * Add a save button to the paper editing UI instead.

commit b5066dc
Author: PJBot <[email protected]>
Date:   Wed Mar 6 01:34:26 2024 +0000

    Automatic changelog update

commit f4976a3
Author: Tayrtahn <[email protected]>
Date:   Tue Mar 5 20:33:28 2024 -0500

    Add prediction to hand labeler labels (#25869)

    Added prediction to labels

commit 9074037
Author: lzk <[email protected]>
Date:   Wed Mar 6 02:33:20 2024 +0100

    Allow livestock and artifact crate to go under plastic flaps (#25862)

commit d3b981f
Author: deepdarkdepths <[email protected]>
Date:   Tue Mar 5 20:29:02 2024 -0500

    Fixes glowsticks being unable to be inserted into trashbags (#25863)

    Glowstick now garbo

commit d938763
Author: PJBot <[email protected]>
Date:   Wed Mar 6 01:18:55 2024 +0000

    Automatic changelog update

commit 7e9c3b8
Author: deepdarkdepths <[email protected]>
Date:   Tue Mar 5 20:17:50 2024 -0500

    Adds paramedic cap to the uniform printer (#25861)

    Update lathe+clothing.yml

commit 9036e59
Author: PJBot <[email protected]>
Date:   Wed Mar 6 00:27:05 2024 +0000

    Automatic changelog update

commit f0e8695
Author: MACMAN2003 <[email protected]>
Date:   Tue Mar 5 16:25:59 2024 -0800

    Clockwork structures and furniture (#24673)

    * sprites

    something something strength and certainty of steel (except this is brass)

    * test1

    * commas it was commas

    * commas and brackets

    * LET THERE BE BRASS

    * brass-glass-etc-windows-thindows-floors-lattice

    * ALL THE STRUCTURES!!

    "Which structures did you add?"
    "all."

    * buyable brass

    and on the first day the quartermaster said "let there be brass" and all the cargo techs stopped inve$ting in awe

    * Update windoor.yml

    i forgor 💀

    * Update tiles.ftl

    * i hate random capital letters

    * linter fix 1

    whew, thank god for linters

    * fix 2

    * maybe this

    shot in the dark, idk what the hell i'm doing hopefully this fixes it?

    * fix attempt 1

    weather to true, maybe the thingy got confused?

    * remove clockwork lattice

    it's fixed the test fail... but at what cost?

    * changes 1

    * fix clockwork windoor

    * FLOORS

    HAHAHA LET THERE BE FLOORS

    * try linter fix 1

    i love linters they find things i'd never catch myself

    * tweaks fixes 1

    fixes merge conflict and does more stuff part two later because i'm tired

    * tweaks fixes 2

    i should probably do this stuff during the day when i have more energy but eh

    * Update assembly.yml

    * Update chairs.yml

    * fix door sprites

    somehow the deny_unlit was broken for all the clockwork doors

    * fix glass.yml

commit b66bad2
Author: Jay <[email protected]>
Date:   Wed Mar 6 08:01:41 2024 +1100

    Add nutribricks to other survival boxes (#25749)

commit 35d0d0b
Author: PJBot <[email protected]>
Date:   Tue Mar 5 20:59:01 2024 +0000

    Automatic changelog update

commit 4d0ec65
Author: Whisper <[email protected]>
Date:   Tue Mar 5 15:57:54 2024 -0500

    the bladed flatcap (#25780)

commit bad1174
Author: Menshin <[email protected]>
Date:   Tue Mar 5 16:57:28 2024 +0100

    Enforce Space Heater max/min temperatures server side (#25835)

    Actually enforce max/min temperatures server side

commit 574c625
Author: metalgearsloth <[email protected]>
Date:   Tue Mar 5 21:08:44 2024 +1100

    Fix shuttle disabling on ftl (#25859)

    Branch moment.

commit 68bb57b
Author: exincore <[email protected]>
Date:   Tue Mar 5 01:20:38 2024 -0600

    Fixed Emag wiping door access without bolting open (#25836)

commit 4b56996
Author: Brandon Hu <[email protected]>
Date:   Tue Mar 5 07:19:14 2024 +0000

    Change keybindings for paper (#25853)

    fix: sane keybindings?

commit bbb7880
Author: metalgearsloth <[email protected]>
Date:   Tue Mar 5 18:07:17 2024 +1100

    Fix docking fallback (#25854)

    Only thing that even triggers it atm is escape pods.

commit 926b140
Author: PJBot <[email protected]>
Date:   Tue Mar 5 04:35:24 2024 +0000

    Automatic changelog update

commit 511e245
Author: Brandon Hu <[email protected]>
Date:   Tue Mar 5 04:34:18 2024 +0000

     Remove the ability for command or any antag-safe role from being initial infected in zombie mode #25529  (#25785)

    * fix(antags): respects canBeAntag = true

    * updated more

    * includeAllJobs = False??????????

    * fixed comma placement

    * removed unused dependencies

commit 7d841d4
Author: PJBot <[email protected]>
Date:   Tue Mar 5 03:14:56 2024 +0000

    Automatic changelog update

commit 550612a
Author: deltanedas <[email protected]>
Date:   Tue Mar 5 03:13:50 2024 +0000

    fishops nerf real (#25148)

    * refactor ops

    * inherit dna and fiber when fish hydrated

    * :trollface:

    * kid named finger

    * :trollface:

    * move rehydrating to shared :trollface:

    * nobody noticed the popup being missing all this time

    * method ops

    ---------

    Co-authored-by: deltanedas <@deltanedas:kde.org>

commit 5a77e52
Author: Emisse <[email protected]>
Date:   Mon Mar 4 16:52:58 2024 -0700

    resave europa (#25848)

    europa

commit 1e8b683
Author: PJBot <[email protected]>
Date:   Mon Mar 4 23:52:19 2024 +0000

    Automatic changelog update

commit f4754fe
Author: Lawdog <[email protected]>
Date:   Mon Mar 4 17:51:12 2024 -0600

    Shot glass max volume decrease (#25847)

    Lower Volume

commit 79b1c0e
Author: Emisse <[email protected]>
Date:   Mon Mar 4 16:41:08 2024 -0700

    resave origin (#25846)

    origin update

commit 40fb39e
Author: Emisse <[email protected]>
Date:   Mon Mar 4 16:29:08 2024 -0700

    resave fland (#25845)

    fland update

commit bdcf144
Author: Ed <[email protected]>
Date:   Tue Mar 5 02:13:34 2024 +0300

    Frozen hydroponic dungeon (#25837)

    +dungen

commit 163a527
Author: PJBot <[email protected]>
Date:   Mon Mar 4 22:37:13 2024 +0000

    Automatic changelog update

commit 7944bad
Author: Nairod <[email protected]>
Date:   Mon Mar 4 16:36:06 2024 -0600

    Lathe-able Welding Masks (#25842)

    * Lathe-able Welding Masks

    * Fix Composition Tests
@Roudenn Roudenn requested a review from Rxup as a code owner March 9, 2024 08:29
@Rxup Rxup requested review from Kirillcas and removed request for Rxup March 9, 2024 18:27
* Добавлено хранилище плат

* Добавлены антианомальные зоны
@Kirillcas
Copy link
Contributor

посмотри всё-же новую островную версию Силли стэйшон (мне не очень будет понятно, ибо я на Силли что щяс и что тогда не играл)

@Kirillcas Kirillcas closed this Mar 14, 2024
@Kirillcas
Copy link
Contributor

окей... решил сам пролетаться и вижу что планетарный концепт тут выглядит лучше, особенно на фоне обычных станций ( а и меньшее количество игроков идёт тут в угоду концепции)

@Roudenn Roudenn deleted the rework-silly branch March 14, 2024 18:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants