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 #13

Merged
merged 5 commits into from
Nov 22, 2023

Conversation

pull[bot]
Copy link

@pull pull bot commented Nov 22, 2023

See Commits and Changes for more details.


Created by pull[bot]

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

Generalcamo and others added 5 commits November 22, 2023 16:27
* Split up and rename `var/flags`

* Various fixes

* CL

* Don't rename Phoron Guard phoron preset

---------

Co-authored-by: Cody Brittain <[email protected]>
* Added the Xanan SMG

* CL

* Icon file

---------

Co-authored-by: Cody Brittain <[email protected]>
* here's the area

* a bunch of other stuff

* fucking shuttle landmark

* HERE'S THE FUCKING MARKERS

* some flag edits, coolant addition, mixing up the cans

* airlock markers check

* i missed a piece of pipe

* fixes docking tags maybe

* guehhhh

* hatehatehate

* i had to swap out the tiles because they started out at a low temp

* adding the space and turf vars to strongdmm too

* that didn't work let's make the vars null

* here's the area

a bunch of other stuff

fucking shuttle landmark

HERE'S THE FUCKING MARKERS

some flag edits, coolant addition, mixing up the cans

airlock markers check

i missed a piece of pipe

fixes docking tags maybe

guehhhh

hatehatehate

i had to swap out the tiles because they started out at a low temp

adding the space and turf vars to strongdmm too

that didn't work let's make the vars null

* new tag

* final bugfix?

* sneed

now it needs power :^)

* changelog

* turf fix
@pull pull bot merged commit a77f516 into Proxima-Project:master Nov 22, 2023
1 check 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.

3 participants