updated the salvage shuttle

[Flameingman2]

About the PR

updated the salvage shuttle, and renamed the old shuttle file to have (old) in its name

Why / Balance

Allows salvage players to be able to engage with all of its content

Technical details

This had no code changes, only mapping

Media

the piping and wiring

a mini jetpack, a filled normal medkit for use on the shuttle, and an empty combat medkit for basic first aid while off the shuttle

Handheld mass scanner and a med battery for it

Starting Power gen is 16kW of power, starting power draw is 14.2kW of power, the RTG gives 10kW power, and the two generators give 3kW power each

Lockable buttons to the shutters and blastdoors, all of which are labeled with what they trigger

The front pilot area has two consoles, one is the shuttle console, and the other is the expedition console

Fax to allow requests and paperwork to be sent to the salvage shuttle

Holopad to allow holocalls from and to any long-range holopads, of which there is one in the default cargo shuttle, in the ATS, in the bridge (sometimes), and in the cargo department

Three Carp plushies and one carp decal

Three cans of breathable gas, the white can is for fixing the atmos of the shuttle should it be vented or to replace it when it gets used up, the O2 (blue) and N2 (red) cans are for refilling the gas tanks that the salvagers use

Basic atmos system to both fill the shuttle with air, and to vent out any unwanted gasses

Power system that should prevent ONE EMP from mission killing the shuttle. Two APCs, one substation, and three power generators (one RTG and Two 3kW gens)

8 thrusters, two in each direction, each thruster area has a light

Three wide rear docking area, to allow docking to the vast majority of shuttles and stations

Requirements

• I have read and am following the Pull Request and Changelog Guidelines.
• I have added media to this PR or it does not require an in-game showcase.
• If I am porting something, I have done my best to respect the appropriate licenses associated with the presented changes.
  • All art assets are a commercially appropriate license (CC-BY-SA-3.0, CC-BY-SA-4.0, CC0-1.0, etc)

License

MIT

Breaking changes

Changelog

[Flameingman2]

only failure is the build and test debug /build

[Skarletto]

100% remove the medkits, jetpack, cell recharger, o2 and n2 canisters. Also that scrubber is supposed to be connected to a passive vent, not a regular vent, though I'd say remove those two and let salvage suffocate in their own dusty air.

I'm still on the fence about the fax. For some reason, this shuttle is 100x better than the cargo shuttle. I don't think salvagers should have it this easy. I'm going see what the community at large thinks about it though.

Edit: Vote held on discord that will directly impact this PR https://discord.com/channels/748354466335686736/1505356395695046807/1517020435114622990

[Flameingman2]

100% remove the medkits, jetpack, cell recharger, o2 and n2 canisters. Also that scrubber is supposed to be connected to a passive vent, not a regular vent, though I'd say remove those two and let salvage suffocate in their own dusty air.

I'm still on the fence about the fax. For some reason, this shuttle is 100x better than the cargo shuttle. I don't think salvagers should have it this easy. I'm going see what the community at large thinks about it though.

Edit: Vote held on discord that will directly impact this PR https://discord.com/channels/748354466335686736/1505356395695046807/1517020435114622990

the fact that you posted
"something else, got to # ss14 contributors" without saying what it is, is very biased, as it does not tell the voters what it is, as it implies that it is something OTHER than a shuttle, which are the two options above it
the other options say what it does, while this one is the ONLY one that does NOT say what it is

[Skarletto]

That option was to let people suggest something else. Sorry it was not straight forward. Your work was "akin to the cargo shuttle" in my head. Not the last one.

[adamsong]

There seems to be an error in the map file, the tests are failing on

SERVER: 12.210s [ERRO] system.network_configurator: Can't resolve "Content.Shared.DeviceNetwork.Components.NetworkConfiguratorComponent" on entity 0/n0D!
    at System.Environment.get_StackTrace()

additionally, this should be a new map in Maps/_Monkestation/Shuttles instead of modifying the existing shuttle file, and appropriate attribution given in shuttle_attributions.yml (If this is a modified version of the previous shuttle, include those authors).

Finally, you mentioned a cvar to enable the shuttle? What is it, I want to make sure we have it set properly.

[Flameingman2]

There seems to be an error in the map file, the tests are failing on

SERVER: 12.210s [ERRO] system.network_configurator: Can't resolve "Content.Shared.DeviceNetwork.Components.NetworkConfiguratorComponent" on entity 0/n0D!
    at System.Environment.get_StackTrace()

additionally, this should be a new map in Maps/_Monkestation/Shuttles instead of modifying the existing shuttle file, and appropriate attribution given in shuttle_attributions.yml (If this is a modified version of the previous shuttle, include those authors).

Finally, you mentioned a cvar to enable the shuttle? What is it, I want to make sure we have it set properly.

I do not know the Cvar, and it seems I have to keep the mulitool I used to link on the shuttle then

and I will move it to the right folder

[Flameingman2]

I cant seem to find who made the mining shuttle, the wizden one
but, I did find out how to get the shuttle and anyother shuttle to spawn in at round start

[Flameingman2]

all checks are good now
Ill have to do another PR that changes
Resources/Prototypes/Entities/Stations/base.yml
to allow the shuttle to spawn in
then Ill have to figure out how to readd removed content, how fun

[Skarletto]

The vote has ended, and the playerbase voted to give salvage a "shuttle in heavy disrepair".

I understand you've put a lot of effort into this PR in both mapping and figuring out what YMLs to edit. I wouldn't want your efforts to be brushed off, so I'd like to suggest making your current shuttle into a salvager unknown shuttle event. We don't have the player population to trigger this event currently (though you could lower the player weight for your shuttle), but eventually we will. Admins can also force this event in a round. I'm aware this would require you to rework your PR a bunch, so I won't force you to do this if you'd rather not.

If you want to go through with adding it as an event, you can check out this PR, which adds an unknown shuttle to the event (it was closed due to a freeze, so the changed files should be a good example of what you need) space-wizards/space-station-14#32850 . The original PR that adds this event can be found here space-wizards/space-station-14#24490 .

As for your current PR, I'd prefer if you wrecked your shuttle a bunch to meet the state of heavy disrepair players voted for. This would mean a bare minimums shuttle, something that you can fly with, but has no amenities to help that flying. I would prefer a welding fuel generator + a welding fuel tank for the power generation, but don't mind giving them a small continuous generator (or RTG) since our rounds are not incredibly long. You can also give them a holopad if you'd like. A singular generator is prefered, so salvage has to look for a second one if they want to add more machines to their shuttle (power should be scarce roundstart, apart from actually flying the shuttle). As for everything else, I'd imagine 2 thrusters (maneuverable with the gyro), gyroscope, shuttle computer and exped computer, substation and apc should be the only other stuff on board. As for atmos, I'd like the shuttle to start spaced, so it should have broken windows. Salvagers will be able to repair the windows and repressurize their shuttle themselves if you add a connector + vent as you had on your current shuttle (+ that scrubber and passive vent setup for waste). In the end, it's mostly just removing fluff and breaking things a bit.

Again, I understand if you'd rather not do any of this, I wouldn't blame you. I'm really grateful that you've been working towards contributing to our fork, and I'm sorry the vision doesn't quite align with what you originally had in mind.

[adamsong]

Sorry for the delay in review, I've been working on a fairly big MR that should hopefully be ready soon. Unfortunately, there is a high chance of merge conflicts, we'll know more once it's merged.

[adamsong]

Looks like you avoided merge conflicts, go ahead and merge in master anyway, just so that the tests run again.

[Flameingman2]

lets see if this works

[Flameingman2]

all checks pass, will need to add in the .txt file and the shuttle should be good
still no idea why its failing to spawn

[adamsong]

I don't see any code to get it to spawn, all I see is the map file and the attributions. shuttle.grid_fill and shuttle.preload_grids are the cvars you need to make any shuttles spawn.

Additionally, I echo Skarlet's post from earlier, as a midround event this works, but not as a roundstart shuttle, if you want to split this into the event version as you have it, and a rundown version that is modified and make roundstart you can.

[Flameingman2]

I don't see any code to get it to spawn, all I see is the map file and the attributions. shuttle.grid_fill and shuttle.preload_grids are the cvars you need to make any shuttles spawn.

Additionally, I echo Skarlet's post from earlier, as a midround event this works, but not as a roundstart shuttle, if you want to split this into the event version as you have it, and a rundown version that is modified and make roundstart you can.

I am having issues with getting the shuttle to spawn in, and I have no idea what's going on with it. The advice I was given was to revert the PR that removed it, and when I tried to do that, it did not work

I will take a look at the Cvars. Where are they stored for Monkeystation?

I am also sick of making and repairing shittles as salvage. I have done it for nearly 200 hours at this point, I have roughly 800 hours on salvage on various servers

a pic of my Steam playtime

[adamsong]

sudo cvar <name> <value>