This repository has been archived by the owner on Mar 23, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 8
Pull upstream #206
Open
Just-a-Unity-Dev
wants to merge
475
commits into
StationWare:master
Choose a base branch
from
Just-a-Unity-Dev:stationware-pull_upstream
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Pull upstream #206
Just-a-Unity-Dev
wants to merge
475
commits into
StationWare:master
from
Just-a-Unity-Dev:stationware-pull_upstream
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* basefoodcondimentbottle tweaks * move to drinkscondiments, inherit from drinksbase * Revert "move to drinkscondiments, inherit from drinksbase" This reverts commit a54604de41d124e80238340e8296cc6960d8fbc0. * oh boy here I go overcomplicating stuff again
* allow grilles to be placed on lattice * Revert "allow grilles to be placed on lattice" This reverts commit 5c536686cdcd85d49681f934d9abaf69076e2bc2. * allow grilles to be placed on lattice (fixed) * file namespace
Co-authored-by: deltanedas <@deltanedas:kde.org>
* paracusia component auto comp state * it works * rule component config
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Hotplate overhaul - Beakers are now placed on top of the hotplate instead of itemslot. - Hotplate LED now only lights up if it's heating something. - More comments/xmldoc. - Some other minor tweaks. * Actually remove the beaker slot
* he's got a gun * gung * oops
Co-authored-by: deltanedas <@deltanedas:kde.org>
* swap emergency and regular crowbar damage * a * same damage * remove dupe * egg --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* Replays: final boss * Undo formatting change in EntryPoint
Co-authored-by: moonheart08 <[email protected]>
github-actions
bot
added
cartography
Something that changes map files
sprites
Something that changes sprites
ui
oH GOD NOT THE UI MKNES PELASE PLEA SEODNT SEND ME TO THE UI MINES LEKLEASE IU BEG YOU
labels
Jun 25, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
cartography
Something that changes map files
sprites
Something that changes sprites
ui
oH GOD NOT THE UI MKNES PELASE PLEA SEODNT SEND ME TO THE UI MINES LEKLEASE IU BEG YOU
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
we should make this automated or something,,,, waaahhhhhh