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

[MIRROR] Battery acid pie #2142

Merged
merged 1 commit into from
Feb 29, 2024
Merged

[MIRROR] Battery acid pie #2142

merged 1 commit into from
Feb 29, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1153
Original PR: tgstation/tgstation#81663

About The Pull Request

I added a battery acid pie you make with 2 batteries and one plain pie

image

Why It's Good For The Game

The game had a very noticeable and substantial lack of battery acid pies (plus I wanted there to be more dishes for ethereals)

edit: sorry I couldn't figure out how to add labels

Changelog

🆑
add: Added the battery acid pie
/:cl:

* Battery acid pie (#81663)

## About The Pull Request

I added a battery acid pie you make with 2 batteries and one plain pie


![image](https://github.com/tgstation/tgstation/assets/55806451/f7d4ed6f-9d71-46ea-ac62-0035c28612d7)


## Why It's Good For The Game

The game had a very noticeable and substantial lack of battery acid pies
(plus I wanted there to be more dishes for ethereals)

edit: sorry I couldn't figure out how to add labels

## Changelog
🆑 
add: Added the battery acid pie
/:cl:

* Battery acid pie

---------

Co-authored-by: L0pz <[email protected]>
@Iajret Iajret merged commit 0eb5f2a into master Feb 29, 2024
24 checks passed
@Iajret Iajret deleted the upstream-mirror-1153 branch February 29, 2024 18:17
Iajret pushed a commit that referenced this pull request Apr 23, 2024
* New views for mc controller ui (#82769)

## About The Pull Request
Lots of qol improvements for controller tgui

- Auto sort order based on type
- Bar view for items in deciseconds

<details>
<summary>vids</summary>

in a live round

![image](https://github.com/tgstation/tgstation/assets/42397676/52fd4677-763a-4ea9-965a-386ab59cd353)

modals

![Tzp0i9yfwP](https://github.com/tgstation/tgstation/assets/42397676/06ca6d9e-c528-4f02-8dbb-d302d2380396)

bar view with defaults for decisecond sorts

![2X6IqQIE7c](https://github.com/tgstation/tgstation/assets/42397676/88b80fd4-1116-4ba1-aa0b-6bac56827e6b)

</details>

## Why It's Good For The Game
Better admin tools
## Changelog
:cl:
add: Admin tools buffed, check the Controller Overview
add: Controller Overview moved to debug tab
/:cl:

* New views for mc controller ui

---------

Co-authored-by: Jeremiah <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants