Ports "Ship construction through the power of science!" and others #11901

nmajask · 2021-07-27T22:09:53Z

Github documenting your Pull Request

This PR ports 3 PRs from Beestation

All of these are done by the wonderful PowerfulBacon and most of the changes were to make it work with our code. There are still a few issues that need to be fixed, but you can still build and fly a shuttle.

Whats Different?

The big difference is the icon for the RSD and its interface, using icons I threw together as the current ones on Bee don't fit our art style and the old one doesn't fit its function (it originally worked like an RCD, but now functions as a drone controller). These icons aren't the best, and if someone provides better ones I can replace them with it

New Icon (its animated in game):

Whats Needs to be Fixed?

I haven't done much testing, but these are a few of the issues I have noticed.

Clean up the code
Rearrange the tech web to fit the new tech
Fix the RSD drone not using its icons
Readd the name filter
Port "Bluespace Navigation Gigabeacon #44807" by Dennok, as it allows you to make custom docks for ships

After further testing, I found a few more issues

Runtime in shuttle_engine.dm,121: Division by zero
Runtime in shuttle_creator_console.dm,61: Cannot read null.client (cause of the eye icon issue?)

Jamie informed me of some other fixes that I will look into adding when I can

There are still a ton of things I need to test, but as it is time consuming to make shuttles and test them it may take some time

What Do You Plan on Adding?

There are a few things that I want to try adding, but most of these are just ideas and probably wont be added.

Tgui for the shuttle interface
More engines, like ones that have different properties depending on the gas mix provided, big engines, or one that runs on dilithium
More upgrades (fuel usage reduction, anti-knockdown, DNA locks, ect.)
Emaging the computer to allow you to fly to syndicate lab on Lavaland (if it is spawned)
Ship weapons (I already looked into adding the weapons from "Making shuttles great(er) again through the power of science! (Bluespace Exploration Core) #2551", but I would need more time to port it)
Maybe even FTL-like exploration instead of our current space exploration system (This would take a LONG time to make, would only be a drain on the server if there is no job that uses it, and may not even be fun, but you could do a lot of cool stuff with it. PowerfulBacon has already created something similar too.)
The ability to make multi area shuttles (this wouldn't be too hard in theory, as shuttles already store its contained areas as a list, so I would just need to add a way to make different areas in the RSD)

Wiki Documentation

If this gets merged, there are going to be a lot of changes needed. The new tool, boards, machines, and techs will need to be added into their respective pages and many new icons will need to be added. Also, it may be a good idea to make a guide on how to make shuttles at some point, maybe merging it with the one for space pods and renaming it to space vehicle construction or something.

Changelog

🆑 PowerfulBacon, Dennok
rscadd: Added custom shuttles
rscadd: Added in new circuit boards, machines, techs, icons, and a tool for creating custom shuttles
rscadd: Created 2 new config options defining shuttle max size and count of shuttles
/:cl:

- Ports BeeStation/BeeStation-Hornet#1398

- Ports https://github.com/BeeStation/BeeStation-Hornet/pull/1904/files# and BeeStation/BeeStation-Hornet#1529

- Removed some unused files - Fixed a change to a random file

- Added some more important files - Added the icons I forgot to add

- Should fix this, maybe?

- Added the turf icons

Anvilman6 · 2021-07-27T23:33:02Z

I look at this, and I feel joy that we have such an ambitious featurecoder contributing to our base.
But I also feel fear about how much documentation this is going to need generated.

Your PRs and ports continue to amaze, Nmajask - keep it up!

maxion12345 · 2021-07-28T03:41:48Z

fuckkk we could have this be some sorta progression

we make it so lavaland only has pitiful amounts of diamond/bluespace, and science needs to construct a shuttle for the miners to go to space to miner asteroids that have larger amounts of them

but this will never occur because people already bitch about science having to push a button to get mining tech, having them build a shuttle would make shaft miner mains cry

One down, two to go - Fixes the name filter by using isnotpetty instead of OOC_FILTER_CHECK, now if you make a shuttle with a bad name, it will message the admins.

nmajask · 2021-07-29T06:16:30Z

Just fixed the name filter and am currently working on changing the UI for shuttle to use Tgui.

I look at this, and I feel joy that we have such an ambitious featurecoder contributing to our base.
But I also feel fear about how much documentation this is going to need generated.

Your PRs and ports continue to amaze, Nmajask - keep it up!

Thanks for the support, I have many more things that I want to add and port. Also, if you need any help with updating the wiki with changes from my PRs I would be more than happy to help provide information or make edits/guides.

fuckkk we could have this be some sorta progression

we make it so lavaland only has pitiful amounts of diamond/bluespace, and science needs to construct a shuttle for the miners to go to space to miner asteroids that have larger amounts of them

but this will never occur because people already bitch about science having to push a button to get mining tech, having them build a shuttle would make shaft miner mains cry

Yeah, it would be cool to have shuttles be used for progression in mining, but what would more likely happen is miners just wouldn't care and sci would just end up with less resources to work with. The only way you could get that to work is if you either rework mining and made it less focused on fighting bosses and getting loot or add bosses and loot to asteroids.

- Fixes the tech web - Adds the new icons for the RSD

PowerfulBacon · 2021-08-17T15:24:21Z

Should be noted that the engines and heaters cause hard dels due to not doing anything when deleted.

Should fix most of the runtimes and issues that ive had thanks to Jamie's help. Should bring this from ""functional"" to "functional".

why github desktop, WHY!!

nmajask · 2021-09-05T07:34:59Z

I have been holding off working on this for WAY too long

PowerfulBacon · 2021-09-05T18:04:03Z

code/modules/shuttle/custom_shuttle.dm

+
+/obj/machinery/computer/camera_advanced/shuttle_docker/custom/proc/linkShuttle(var/new_id)
+	shuttleId = new_id
+	shuttlePortId = "shuttle[new_id]_custom"


This used to break on bee if you make more than 1 shuttle docker so might want to check it out

This used to break on bee if you make more than 1 shuttle docker so might want to check it out

Was there a PR that fixed it, or did you instead just rework the shuttle system to get around it?

It was fixed as a part of the shuttle system rework

I think the cause was the port ID not being unique for each console. Just adding a static number and sticking _[varname++] on the end should fix it I think. (Actually the shuttles themselves would need to have the custom port added too so maybe its not as easy as it sounds)

It was either that or the ports weren't being deleted properly.

They kinda work.

why do i do this the way i do

nmajask · 2021-09-13T22:41:51Z

Should be noted that the engines and heaters cause hard dels due to not doing anything when deleted.

Sorry for taking so long to reply, I got burnt out from working on this for a while and just now got back to working on it. I talked with Jamie about this and he said that its not something to worry about.

Ports "Custom shuttle offsets and view range depends on ship size. yogstation13#2685" by Dennok and "Custom transit dir for custom shuttle yogstation13#2689" by Dennok

SomeguyManperson · 2021-09-15T11:15:45Z

is this ready for testing?

nmajask · 2021-09-15T22:42:20Z

is this ready for testing?

It should be, I got everything that was vital for it to work done I think

JamieD1 · 2021-09-17T11:37:07Z

Test merging

- Added the Admin RSD, which ignores the shuttle size and area limit, allowing you to turn whole chucks of the station into shuttles - Renamed the shuttle navigation computer to the shuttle zoning designator to avoid confusion - Tweaked the designs for the shuttle circuit board design to use the correct name for the boards - Moved the Bluespace Navigation Gigabeacon board into shuttle machinery

- I forgot to add Bluespace Navigation Gigabeacon to the lists of unlocks for Spacepod Construction, so I fixed that

SomeguyManperson

currently has a merge conflict I don't think we've got any bugs or massive issues so

JamieD1 · 2021-10-03T20:18:17Z

Fix conflict then dm me

…o custom-shuttles

got to love merge conflicts

nmajask added 2 commits July 26, 2021 19:31

Ports "Ship construction through the power of science!"

c2fa5dc

- Ports BeeStation/BeeStation-Hornet#1398

Ports some changes

ad59cf4

- Ports https://github.com/BeeStation/BeeStation-Hornet/pull/1904/files# and BeeStation/BeeStation-Hornet#1529

nmajask requested a review from a team as a code owner July 27, 2021 22:09

nmajask requested a review from a team July 27, 2021 22:09

Yogbot-13 added DME Edit This PR affects the yogstation.DME file Feature This adds new content to the game Sprites This PR has spriting changes labels Jul 27, 2021

Should fix some stuff

d7b934c

- Removed some unused files - Fixed a change to a random file

github-actions bot added the Config Config files need to be changed on the host for this to work label Jul 27, 2021

nmajask added 3 commits July 27, 2021 18:35

Should fix more stuff

77c5be1

- Added some more important files - Added the icons I forgot to add

Oh, I didn't update the dme

a836e54

- Should fix this, maybe?

Probably should add the turf icons

31e9c40

- Added the turf icons

nesisknesis approved these changes Jul 28, 2021

View reviewed changes

Fixes the name filter

020aa40

One down, two to go - Fixes the name filter by using isnotpetty instead of OOC_FILTER_CHECK, now if you make a shuttle with a bad name, it will message the admins.

JamieD1 marked this pull request as draft August 1, 2021 13:36

Fixes the tech web

a92ffab

- Fixes the tech web - Adds the new icons for the RSD

nmajask added 3 commits September 1, 2021 18:14

Merge branch 'yogstation13:master' into custom-shuttles

95dd81b

Should fix some stuff with the shuttles

dbdd04e

Should fix most of the runtimes and issues that ive had thanks to Jamie's help. Should bring this from ""functional"" to "functional".

I am too tired for this

0205a97

why github desktop, WHY!!

PowerfulBacon reviewed Sep 5, 2021

View reviewed changes

nmajask added 2 commits September 13, 2021 18:20

Adds spaceship navigation beacons

446d615

They kinda work.

should fix the beacons

a652323

why do i do this the way i do

nmajask marked this pull request as ready for review September 13, 2021 22:38

Ports some fixes by Dennok

5f906cc

Ports "Custom shuttle offsets and view range depends on ship size. yogstation13#2685" by Dennok and "Custom transit dir for custom shuttle yogstation13#2689" by Dennok

JamieD1 added the TESTMERGED This PR is currently live in a test merge. label Sep 17, 2021

JamieD1 and others added 3 commits September 17, 2021 13:25

Merge branch 'master' into custom-shuttles

558e74f

Fixes Bluespace Navigation Gigabeacon not being able to be researched

f35ad53

- I forgot to add Bluespace Navigation Gigabeacon to the lists of unlocks for Spacepod Construction, so I fixed that

maxion12345 mentioned this pull request Sep 20, 2021

Monstermos doesn't space rooms exposed to space randomly #12336

Closed

Bluedazzled mentioned this pull request Sep 20, 2021

>You climb out of BIG Carr x100 #12345

Open

Sniblet mentioned this pull request Sep 26, 2021

Noncultists throwing mirror shields can kill people who are next to each other instantly #12380

Closed

SomeguyManperson added Merge conflict Files are conflicting with current live changes. Test Merge - Scheduled This PR is waiting to be test merged and removed TESTMERGED This PR is currently live in a test merge. labels Sep 30, 2021

SomeguyManperson approved these changes Oct 3, 2021

View reviewed changes

SomeguyManperson enabled auto-merge (squash) October 3, 2021 19:30

nmajask added 2 commits October 3, 2021 20:04

Merge branch 'master' of git://github.com/yogstation13/Yogstation int…

cadedd4

…o custom-shuttles

readded the RSD sprites

2a59620

got to love merge conflicts

auto-merge was automatically disabled October 4, 2021 00:04
Head branch was pushed to by a user without write access

JamieD1 merged commit 791f92f into yogstation13:master Oct 6, 2021

Yogbot-13 added a commit that referenced this pull request Oct 6, 2021

Automatic changelog generation #11901 [ci skip]

b05b19c

Uh oh!

Ports "Ship construction through the power of science!" and others #11901

Ports "Ship construction through the power of science!" and others #11901

Uh oh!

Conversation

nmajask commented Jul 27, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Github documenting your Pull Request

Whats Different?

Whats Needs to be Fixed?

What Do You Plan on Adding?

Wiki Documentation

Changelog

Uh oh!

Anvilman6 commented Jul 27, 2021

Uh oh!

maxion12345 commented Jul 28, 2021

Uh oh!

nmajask commented Jul 29, 2021

Uh oh!

PowerfulBacon commented Aug 17, 2021

Uh oh!

nmajask commented Sep 5, 2021

Uh oh!

PowerfulBacon Sep 5, 2021

Choose a reason for hiding this comment

Uh oh!

nmajask Sep 13, 2021

Choose a reason for hiding this comment

Uh oh!

PowerfulBacon Sep 15, 2021

Choose a reason for hiding this comment

Uh oh!

PowerfulBacon Sep 15, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

PowerfulBacon Sep 15, 2021

Choose a reason for hiding this comment

Uh oh!

nmajask commented Sep 13, 2021

Uh oh!

SomeguyManperson commented Sep 15, 2021

Uh oh!

nmajask commented Sep 15, 2021

Uh oh!

JamieD1 commented Sep 17, 2021

Uh oh!

SomeguyManperson left a comment

Choose a reason for hiding this comment

Uh oh!

JamieD1 commented Oct 3, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

nmajask commented Jul 27, 2021 •

edited

Loading

PowerfulBacon Sep 15, 2021 •

edited

Loading