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

Revamps the Beach away mission #78568

Merged
merged 5 commits into from Oct 3, 2023
Merged

Conversation

EuSouAFazer
Copy link
Contributor

@EuSouAFazer EuSouAFazer commented Sep 25, 2023

About The Pull Request

The beach has been revamped - it is no longer ancient and looks and feels much, much better.

image
image
image

image
image

Why It's Good For The Game

The beach's map has been masssively improved - it no longer is just a few square rooms on a beach, having a lot more to do and interact with.

  • A fully new hotel area has been added for MRP purpouses, gimmicks and a medical area.
  • Fishing poles and fishing toolboxes can be found scattered around to catch some tropical fish
  • All Terrain Vehicles and a dressing room have also been added
  • The bar and kitchen area has been significantly expanded to fit with modern TG's cooking
  • An arcade and Space Cola quiosk have also been added
  • The place, in general, looks a lot better

Changelog

🆑 Fazzie
add: A lot of new content has been added to the beach away mission
qol: It also looks substantially better, too!
/:cl:

@tgstation-server tgstation-server added Feature Exposes new bugs in interesting ways Map Edit Thank you for your tile-placing service. It's always appreciated. Quality of Life Increasing esword damage is not a quality of life for traitors labels Sep 25, 2023
@EuSouAFazer
Copy link
Contributor Author

What do you MEAN the fruit bowl's pixel_y is banned

image
image

@BlueMemesauce
Copy link
Contributor

can you post pictures becuase the hotel doesnt show up on map diff bot

@EuSouAFazer
Copy link
Contributor Author

Captura de tela 2023-09-24 224251

Captura de tela 2023-09-24 224429

Captura de tela 2023-09-24 224508

Sure; the mapdiff bot cut this area out so here it is

@github-actions
Copy link
Contributor

github-actions bot commented Oct 3, 2023

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale Even the uncaring universe rejects you, why even go on label Oct 3, 2023
@EuSouAFazer
Copy link
Contributor Author

Added some pics, if that's what was preventing it from being merged

Copy link
Member

@Maurukas Maurukas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is nice. This is really nice. There is a ton of Kilo level detail work here, and this is a map that desperately needed some love.

I'm not finding any issues here, and without pipenets, powernets or complex atmos, there's not a lot that can go wrong on this one.

@Maurukas Maurukas added this to the Away Missions milestone Oct 3, 2023
@Maurukas Maurukas merged commit a119c47 into tgstation:master Oct 3, 2023
20 checks passed
github-actions bot added a commit that referenced this pull request Oct 3, 2023
comfyorange added a commit that referenced this pull request Oct 3, 2023
@EuSouAFazer EuSouAFazer deleted the beachrevamp branch October 6, 2023 00:59
Jolly-66 pushed a commit to TaleStation/TaleStation that referenced this pull request Oct 6, 2023
Original PR: tgstation/tgstation#78568
-----
## About The Pull Request

The beach has been revamped - it is no longer ancient and looks and
feels much, much better.


![image](https://github.com/tgstation/tgstation/assets/84548101/556dd804-55a7-40ea-8955-c094ea63ccfd)

![image](https://github.com/tgstation/tgstation/assets/84548101/2f4572da-9ebf-43d2-b449-8b92046b66b0)

![image](https://github.com/tgstation/tgstation/assets/84548101/bf609d1b-60d7-4d33-9812-18ef0492b6fd)


![image](https://github.com/tgstation/tgstation/assets/84548101/00e6f360-9a5c-45a6-a6e5-a3d11697c0a6)

![image](https://github.com/tgstation/tgstation/assets/84548101/02d906f1-a2f3-4f7c-bec3-c9f811b1d52d)


## Why It's Good For The Game

The beach's map has been masssively improved - it no longer is just a
few square rooms on a beach, having a lot more to do and interact with.

- A fully new hotel area has been added for MRP purpouses, gimmicks and
a medical area.
- Fishing poles and fishing toolboxes can be found scattered around to
catch some tropical fish
- All Terrain Vehicles and a dressing room have also been added
- The bar and kitchen area has been significantly expanded to fit with
modern TG's cooking
- An arcade and Space Cola quiosk have also been added
- The place, in general, looks a lot better

## Changelog
:cl: Fazzie
add: A lot of new content has been added to the beach away mission
qol: It also looks substantially better, too!
/:cl:

---------

Co-authored-by: Fazzie <84548101+EuSouAFazer@users.noreply.github.com>
Furrior pushed a commit to ss220club/Paradise-SS220 that referenced this pull request Oct 27, 2023
<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то
может пойти не так. -->
<!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. -->

## Что этот PR делает
Порт ремапа пляжа с ТГ -
tgstation/tgstation#78568
По большей части он полноценный, за исключением следующих вещей:
Рыбалка и принадлежности для неё.
Пара мелочей на которые в целом похуй.

<!-- Вкратце опишите изменения, которые вносите. -->
<!-- Опишите **все** изменения, так как противное может сказаться на
рассмотрении этого PR'а! -->
<!-- Если вы исправляете Issue, добавьте "Fixes ParadiseSS13#1234" (где 1234 - номер
Issue) где-нибудь в описании PR'а. Это автоматически закроет Issue после
принятия PR'а. -->

## Почему это хорошо для игры
Пляж становится чуть более интересным и красивым.

<!-- Опишите, почему, по вашему, следует добавить эти изменения в игру.
-->

## Изображения изменений
![2023-10-27 12 34
06](https://github.com/ss220club/Paradise-SS220/assets/69762909/8d4e87f5-391e-4207-85d8-fe9300e1f18a)

<!-- Если вы не меняли карту или спрайты, можете опустить эту секцию.
Если хотите, можете вставить видео. -->

## Тестирование
В процессе, но вроде всё ок.

<!-- Как вы тестировали свой PR, если делали это вовсе? -->

## Changelog

:cl:
add: Если вам не повезло, и вы мало того что гейтер, так вам ещё и выпал
пляж, не расстраивайтесь, он теперь получше.
/:cl:

<!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы
можете написать свой ник справа от первого :cl:, если хотите. Иначе
будет использован ваш ник на ГитХабе. -->
<!-- Вы можете использовать несколько записей с одинаковым префиксом
(Они используются только для иконки в игре) и удалить ненужные. Помните,
что чейнджлог должен быть понятен обычным игроком. -->
<!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы
можете исключить всю секцию. -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Exposes new bugs in interesting ways Map Edit Thank you for your tile-placing service. It's always appreciated. Quality of Life Increasing esword damage is not a quality of life for traitors Stale Even the uncaring universe rejects you, why even go on
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants