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

TGU - 3/14/2024 #1154

Merged
merged 8 commits into from Mar 20, 2024
Merged

TGU - 3/14/2024 #1154

merged 8 commits into from Mar 20, 2024

Conversation

Bilbo367
Copy link
Contributor

About The Pull Request

Tgu. Adds linting with open dream.
Mining Coop upgrades.
Some spy fixes.

Why It's Good For The Game

because the coders made it that way.

Changelog

@Bilbo367
Copy link
Contributor Author

Last commit lies. Does not fix cargo after testing

@remove32 remove32 added the TGU label Mar 17, 2024
@Horatio22 Horatio22 merged commit a6070fa into fulpstation:master Mar 20, 2024
29 checks passed
DAKKA-WAAAGH pushed a commit to DAKKA-WAAAGH/fulpstation that referenced this pull request Mar 22, 2024
* TGU - 3/14/2024

* a

* nanite source fix

* Fixes Cargo

* Fix polling mutating its target's plane and layer

* Fixing cargo 2

---------

Co-authored-by: JohnFulpWillard <53777086+JohnFulpWillard@users.noreply.github.com>
Horatio22 pushed a commit that referenced this pull request Mar 23, 2024
* Create Industrial.dmm

* Update Industrial.dmm

* Moves map to modules

* Sets up the files

* Not eyes apparently -- GLASSES of course

* Adds some lights and such

* Update Industrial.dmm

* Update Industrial.dmm

* I failed at making an emagged cleanbot, honkbot will do instead

* Resolve conflict 1

* Prep for update

* Moves .dmm files to proper location

As per @Horatio22

* These walls lack opacity = 1 no longer

* Resolve Conflict 2

* Removes old nanite relics from the game (#1168)

* Removes old nanite relics from the game

* Update tgstation.dme

* forgot this

* new fluff room

* difffrent fluff room

* Updates with master

* Adds a second fulp Deathmatch arena (#1156)

* adds heliocentric

* Update deathmatch_loadouts.dm

* Update deathmatch_maps.dm

* Update heliocentric.dmm

* Update heliocentric.dmm

* Update deathmatch_maps.dm

* fixes ctf

* fixes

* fix

* am old an rusty

* Phone webedit

* Prep for update

* TGU - 3/14/2024 (#1154)

* TGU - 3/14/2024

* a

* nanite source fix

* Fixes Cargo

* Fix polling mutating its target's plane and layer

* Fixing cargo 2

---------

Co-authored-by: JohnFulpWillard <53777086+JohnFulpWillard@users.noreply.github.com>

* Pubby Decal Refresh (#1160)

* Changes many decals all over the station

* Missed decal

* More Tweaks, removes more yellowed hashes

* More (surely) epic changes

* Bridge touch up

* removes helio's layer 1 cables in sm chamber (#1169)

* removes helio's layer 1 cables in sm chamber

* Update Heliostation.dmm

* Update Heliostation.dmm

* Big Map Refector (#1170)

* Moves .dmm files to proper location

As per @Horatio22

* These walls lack opacity = 1 no longer

* Resolve Conflict 2

* Rebase, resend...

* Update, resend... I love conflicts!

---------

Co-authored-by: anettera <27014495+remove32@users.noreply.github.com>
Co-authored-by: Bilbo367 <163439532+Bilbo367@users.noreply.github.com>
Co-authored-by: Pepsilawn <reisenrui@gmail.com>
Co-authored-by: JohnFulpWillard <53777086+JohnFulpWillard@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants