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

[pull] master from Aurorastation:master #7

Merged
merged 7 commits into from
Nov 6, 2023

Conversation

pull[bot]
Copy link

@pull pull bot commented Nov 2, 2023

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

NonQueueingMatt and others added 5 commits November 2, 2023 09:33
* Dionae general lore pass

Accents, backgrounds, and gender

* Create dionapass.yml

* Update background.dm
* Establishes the Halloween Event File

* Includes the dm

* wooohooo

* Fixes some stuff

* Removes the dmm from the dme

* Fixes Spawning

* Finishing Touches I think

* Additional changes

* map fix

* Wood/Floor fixes

* fixes major map corruption

* wtf is happening to the map bro

* ugh.

* Changes all windows and stuff

* guh

* Decal/Background Corrections

* Update aurorastation.dme

Co-authored-by: SleepyGemmy <[email protected]>

* fixes some issues from feedback

* Revert "Merge remote-tracking branch 'origin/HalloweenEvent' into HalloweenEvent"

This reverts commit 2fca262, reversing
changes made to fc0c993.

* Adds Disposals

* Emergency decal correction

---------

Co-authored-by: SleepyGemmy <[email protected]>
* Adds Recolourable Shorts and Short Shorts

* Fixes

* Fix
@pull pull bot merged commit 4fc1a62 into Proxima-Project:master Nov 6, 2023
2 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants