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

Tank vendor #15505

Merged
merged 9 commits into from
Apr 7, 2024
Merged

Tank vendor #15505

merged 9 commits into from
Apr 7, 2024

Conversation

TiviPlus
Copy link
Member

@TiviPlus TiviPlus commented Mar 29, 2024

About The Pull Request

Adds tank vendor/elevator to all shipmaps except PoS

Changelog

🆑
add: Added tank vendor
/:cl:

@tgstation-server tgstation-server added Map Edit One or more changes to .dmm files. UI We make things worse, but rounder labels Mar 29, 2024
@TiviPlus TiviPlus added Feature New interesting mechanics with new interesting bugs and removed Map Edit One or more changes to .dmm files. UI We make things worse, but rounder labels Mar 29, 2024
@tgstation-server tgstation-server added Map Edit One or more changes to .dmm files. UI We make things worse, but rounder labels Mar 29, 2024
@TiviPlus TiviPlus marked this pull request as ready for review March 29, 2024 21:06
comfyorange added a commit that referenced this pull request Mar 29, 2024
comfyorange added a commit that referenced this pull request Mar 29, 2024
comfyorange added a commit that referenced this pull request Mar 29, 2024
@Dolth
Copy link
Contributor

Dolth commented Mar 30, 2024

Why not pos?

@TiviPlus
Copy link
Member Author

Pos has an open pr reworking it

comfyorange added a commit that referenced this pull request Mar 30, 2024
comfyorange added a commit that referenced this pull request Mar 30, 2024
@github-actions github-actions bot added the Merge Conflict Pull request is in a conflicted state with base branch. label Mar 30, 2024
@tgstation-server tgstation-server removed the Merge Conflict Pull request is in a conflicted state with base branch. label Mar 31, 2024
comfyorange added a commit that referenced this pull request Mar 31, 2024
comfyorange added a commit that referenced this pull request Mar 31, 2024
comfyorange added a commit that referenced this pull request Apr 1, 2024
comfyorange added a commit that referenced this pull request Apr 1, 2024
comfyorange added a commit that referenced this pull request Apr 1, 2024
comfyorange added a commit that referenced this pull request Apr 1, 2024
comfyorange added a commit that referenced this pull request Apr 1, 2024
comfyorange added a commit that referenced this pull request Apr 1, 2024
@novaepee
Copy link
Contributor

novaepee commented Apr 2, 2024

#15539

pos hotfix for tc is ready

comfyorange added a commit that referenced this pull request Apr 2, 2024
comfyorange added a commit that referenced this pull request Apr 2, 2024
comfyorange added a commit that referenced this pull request Apr 3, 2024
shuttle_id = SHUTTLE_VEHICLE_SUPPLY
home_id = "vehicle_home"
/// current selected vehicles typepath
var/current_veh_type
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

imagine being so lazy that you cannot type vehicle


/datum/supply_ui/vehicles/ui_data(mob/living/user)
var/list/data = list()
if(supply_shuttle)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if(!supply_shuttle)
data["elevator"] = "MISSING!"
return data

comfyorange added a commit that referenced this pull request Apr 3, 2024
comfyorange added a commit that referenced this pull request Apr 4, 2024
comfyorange added a commit that referenced this pull request Apr 6, 2024
@BraveMole BraveMole merged commit 93b9434 into tgstation:master Apr 7, 2024
6 checks passed
github-actions bot added a commit that referenced this pull request Apr 7, 2024
@TiviPlus TiviPlus deleted the tankVendor branch April 7, 2024 15:26
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. UI We make things worse, but rounder
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants