Skip to content
This repository has been archived by the owner on Mar 23, 2024. It is now read-only.

Pull upstream #206

Open
wants to merge 475 commits into
base: master
Choose a base branch
from

Conversation

Just-a-Unity-Dev
Copy link
Contributor

we should make this automated or something,,,, waaahhhhhh

MisterMecky and others added 30 commits June 14, 2023 20:18
* 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>
PJBot and others added 27 commits June 24, 2023 08:04
* 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 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.