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

Swifter's Ship Emporium! #218

Closed

Conversation

swifterjack
Copy link
Contributor

@swifterjack swifterjack commented Sep 1, 2021

About The Pull Request

Adds six new playable ships, and one new adminspawn ship to the game.
Unatomized changes of drone law changes, and oil thruster buffs.

Ships added:
Syndicate aligned Luxembourg, a mercantile Donk! Co. ship, designed to be used to sell Donk! pockets and other products across the galaxy. Medium size.
luxembourg
Syndicate aligned Spitfire, a model predating the widespread usage of bluespace and plasma in ship movement, using an outdated method of oil to create thrust. Retrofitted with advanced medical and rescue supplies. Small size.
spitfire
The Pill. It's the pill. Torture hell. Smallest shiptest.
pill
Space Statio.3, a fucking brick with thrusters, containing all you need to call yourself a station. Costs more than you'll ever have.
statio
Nanotrasen aligned Raven, a heavy personnel transport vessel with armaments on the sides. Fancy schmancy. Medium size.
raven
Nanotrasen aligned Goon, a repurposed emergency shuttle for space exploration, looks familiar. Small size.
goon
Dronetest: A vessel manned only by drones, contains no cryosleepers. Incredibly dangerous for humans.
dronetested
Oil thruster change: Holds only 1000 units now, but generates 20 thrust each click using 50u of oil. Still doesnt face the right way.
Drone law changes: Laws changed to be less station centric, and focus more on where they were activated.
"1. You must serve the goals of those who inhabit the vessel you reside on.\n"+
"2. You must upkeep and improve the vessel you were activated upon, and reside upon."

Why It's Good For The Game

More ships that you have all been waiting for.

Changelog

🆑 Swifterjackie
add: Added seven new maps
tweak: changed drone laws
balance: buffed oil thrusters
/:cl:

@keywordlabeler keywordlabeler bot added Balance/Rebalance Makes powergaming easier in expected ways, or easier in unexpected ways. Feature REALLY causes more bugs in the future that we won't know about. Tweak labels Sep 1, 2021
@github-actions github-actions bot added Config Watch us shake head admins violently until this gets merged. Map Change Tile placing is hard. Thank you for your service. labels Sep 1, 2021
@rye-rice
Copy link
Member

rye-rice commented Sep 1, 2021

108

@swifterjack swifterjack changed the title Swifter's Ship Emporium! [DNM] Swifter's Ship Emporium! Sep 1, 2021
@keywordlabeler keywordlabeler bot added the Do Not Merge You probably made someone angry, or you're stopping people from getting angry. label Sep 1, 2021
@swifterjack
Copy link
Contributor Author

please testmerge this i beg you

@rye-rice
Copy link
Member

rye-rice commented Sep 1, 2021

108

@Pontenerd Pontenerd mentioned this pull request Sep 19, 2021
@github-actions
Copy link
Contributor

github-actions bot commented Oct 4, 2021

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 14 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale All falls to entropy eventually. label Oct 4, 2021
@swifterjack swifterjack changed the title [DNM] Swifter's Ship Emporium! Swifter's Ship Emporium! Oct 5, 2021
@swifterjack
Copy link
Contributor Author

retlaw said she'd fix these once they are merged, so get em in and she'll get em fixed

@swifterjack
Copy link
Contributor Author

im unsure if im going to have the energy to finish these properly otherwise

@github-actions github-actions bot removed the Stale All falls to entropy eventually. label Oct 6, 2021
@ZephyrTFA
Copy link
Member

Can't merge it because the maps arent compiling properly. You'll need to reopen them in SDMM and correct the turf paths

undefined type: /obj/effect/turf_decal/tile/blue

@ZephyrTFA
Copy link
Member

Runtime in unsorted.dm,1056: Invalid job slot entry! Solgov Representative: 1 on Statio.3-class Station With Thrusters's config! Excluding job.

Runtime in unsorted.dm,1056: Invalid job slot entry! Head Of Personnel: 1 on Raven-class Heavy Transporter's config! Excluding job.

@ZephyrTFA
Copy link
Member

@MarkSuckerberg I can't really touch maps, can you fix the compile errors on this?

@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Nov 22, 2021
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Nov 22, 2021
@swifterjack
Copy link
Contributor Author

fixed my repo and did the baytile script

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Dec 4, 2021
@github-actions
Copy link
Contributor

github-actions bot commented Dec 4, 2021

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@triplezeta triplezeta closed this Dec 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance/Rebalance Makes powergaming easier in expected ways, or easier in unexpected ways. Do Not Merge You probably made someone angry, or you're stopping people from getting angry. Feature REALLY causes more bugs in the future that we won't know about. Map Change Tile placing is hard. Thank you for your service. Merge Conflict Use Git Hooks, you're welcome. Tweak
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants