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

Engine Update v240.1.3 #1634

Merged
merged 2 commits into from
Jan 22, 2025
Merged

Conversation

sleepyyapril
Copy link
Contributor

No description provided.

@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: YML Changes any yml files and removed Status: Needs Review Someone please review this labels Jan 22, 2025
@github-actions github-actions bot added Changes: Workflow Changes any GitHub workflow files Status: Needs Review Someone please review this labels Jan 22, 2025
@VMSolidus
Copy link
Member

image
WHAT DOES IT MEAAAAN?

Comment on lines 9 to +10
this_aint_right:
if: github.actor != 'sleepyyapril' && github.actor != 'VMSolidus' && github.actor != 'DEATHB4DEFEAT'
Copy link
Member

Choose a reason for hiding this comment

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

funny

Copy link
Contributor Author

Choose a reason for hiding this comment

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

no test fails :3

@sleepyyapril sleepyyapril merged commit 140e461 into Simple-Station:master Jan 22, 2025
12 checks passed
@sleepyyapril sleepyyapril deleted the v240-1-2 branch January 22, 2025 22:59
sleepyyapril pushed a commit to sleepyyapril/Einstein-Engines that referenced this pull request Jan 27, 2025
* add: group heading

* tweak: move these phrase locales to "locations"

why were they uncategorized? wtf

* tweak: make phrase group headings big

* tweak: fix up group names

* add: relative location phrases

* tweak: remove safety status phrase group name

appears at top

* add: more subject phrases

* newlines

* add: machine phrase

* add: more pronoun phrases

* add: safety/temperature phrases

* add: "darkness" phrase

* add: color phrases

* add: flavor and common plant phrases

* add: more colors

* add: blood

* add: "skeleton" phrase

* Revert "add: "skeleton" phrase"

This reverts commit bc49e47b3e68b7e56728e7466bda5872a3141f19.

I ACTUALLY FORGOT I HAD ONE ALREADY LOL
sleepyyapril pushed a commit to sleepyyapril/Einstein-Engines that referenced this pull request Feb 15, 2025
* remove String uses

* remove AlwaysPushInheritance for strings

* move medbiofab to shitmed

* remove always push on body part

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: gluesniffler <159397573+gluesniffler@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Workflow Changes any GitHub workflow files Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants