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

Allow POs/anyone with access to select what dropship they want to use + ports automatic mobile port sizes #12819

Merged
merged 47 commits into from
May 19, 2023

Conversation

mc-oofert
Copy link
Contributor

@mc-oofert mc-oofert commented Apr 25, 2023

About The Pull Request

ports automatic mobile port sizes from tgstation
adds a dropship picker console where you get a list of dropships to pick to use for the rest of the round
the console is one-use
pics slighty old again
2023-05-05 06_45_49-Window

carrier
_big
standard
2023-04-25 12_13_59-Window
foodtruck
2023-04-25 13_02_20-Window
nkhaul
_factorio

Why It's Good For The Game

Its cool

also POs should be able to pick because using the same old silly tadpole kinda sucks
with this they can pick tadpoles with their own advantages and disadvantages

Changelog

🆑
add: automatic docking sizes for mobile ports
add: 4 new dropships
add: dropship picker console
/:cl:

@tgstation-server tgstation-server added Merge Conflict Pull request is in a conflicted state with base branch. Map Edit One or more changes to .dmm files. Feature New interesting mechanics with new interesting bugs UI We make things worse, but rounder labels Apr 25, 2023
@Losenis
Copy link
Contributor

Losenis commented Apr 25, 2023

no healbus??????????????????

@mc-oofert
Copy link
Contributor Author

no healbus??????????????????

too many shuttles for 1 PR

@mc-oofert
Copy link
Contributor Author

im not even sure that the conflict is from

@cazuccmuss
Copy link

holy shit the return of the old tad. never thought id see it again

@RipGrayson
Copy link
Contributor

im not even sure that the conflict is from

You're conflicting with the recently merged TGS_Pillar_of_Spring.dmm changes.

@tgstation-server tgstation-server removed the Merge Conflict Pull request is in a conflicted state with base branch. label Apr 25, 2023
@breadhunt
Copy link
Contributor

OAAAAAAAAAAAAAAA!!!!!!!!!!!!!!

PILL TADOP!! PILL TADOP!! COME ON YOU APES, YOU WANNA LIVE FOREVER?!!

+1,726,927,362.4

@github-actions github-actions bot added the Merge Conflict Pull request is in a conflicted state with base branch. label Apr 25, 2023
@github-actions github-actions bot removed the Merge Conflict Pull request is in a conflicted state with base branch. label Apr 25, 2023
@tgstation-server tgstation-server removed the Merge Conflict Pull request is in a conflicted state with base branch. label May 12, 2023
@Naaanii
Copy link
Contributor

Naaanii commented May 12, 2023

Landing zones on shipmaps should be adjusted too. Unsure if that's covered in the scope of this PR.

@Lumipharon Lumipharon added the Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes. label May 12, 2023
comfyorange added a commit that referenced this pull request May 12, 2023
@mc-oofert
Copy link
Contributor Author

Landing zones on shipmaps should be adjusted too. Unsure if that's be covered in the scope of this PR.

mappers should learn to respect defined docking port sizes not me

@MiniMeatwad
Copy link
Contributor

Not so sure about the carrier tadpole, it can be used to place invincible walls blocking off parts of the map. Also noob trap if you don't use it for anything else.

@mc-oofert
Copy link
Contributor Author

Not so sure about the carrier tadpole, it can be used to place invincible walls blocking off parts of the map. Also noob trap if you don't use it for anything else.

mf doesnt use carrier tadpole for that "old tadpole revision" drip
xope

@tyeagg
Copy link
Contributor

tyeagg commented May 13, 2023

the security camera console on the carrier model doesnt work

comfyorange added a commit that referenced this pull request May 14, 2023
comfyorange added a commit that referenced this pull request May 14, 2023
@Lumipharon
Copy link
Contributor

@mc-oofert the food processor actually does nothing in tgmc (until tg food gets ported), and food truck is missing a gibber, so I'd probs replace it processor with a gibber.

@mc-oofert
Copy link
Contributor Author

@mc-oofert the food processor actually does nothing in tgmc (until tg food gets ported), and food truck is missing a gibber, so I'd probs replace it processor with a gibber.

damn

@tgstation-server tgstation-server removed the Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes. label May 15, 2023
comfyorange added a commit that referenced this pull request May 15, 2023
@Lumipharon Lumipharon added the Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes. label May 15, 2023
comfyorange added a commit that referenced this pull request May 15, 2023
comfyorange added a commit that referenced this pull request May 16, 2023
@Lumipharon
Copy link
Contributor

Why is there just a random outer hull wall under the booze vendor on the food truck?

@mc-oofert
Copy link
Contributor Author

Why is there just a random outer hull wall under the booze vendor on the food truck?

like 90% of all ss13 stations have their booze vendor placed on a wall so i went "why not"

comfyorange added a commit that referenced this pull request May 17, 2023
comfyorange added a commit that referenced this pull request May 18, 2023
comfyorange added a commit that referenced this pull request May 19, 2023
comfyorange added a commit that referenced this pull request May 19, 2023
comfyorange added a commit that referenced this pull request May 19, 2023
@TiviPlus TiviPlus merged commit 76c591c into tgstation:master May 19, 2023
github-actions bot added a commit that referenced this pull request May 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature New interesting mechanics with new interesting bugs Map Edit One or more changes to .dmm files. Sprites Changes to .dmi file. Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes. UI We make things worse, but rounder
Projects
None yet
Development

Successfully merging this pull request may close these issues.