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

Whiskey (New) #763

Merged
merged 21 commits into from
Mar 16, 2024
Merged

Whiskey (New) #763

merged 21 commits into from
Mar 16, 2024

Conversation

cite2000
Copy link
Contributor

@cite2000 cite2000 commented Dec 26, 2023

About the PR

Adding the NSFD "Whiskey" ship.

Why / Balance

I felt NFSD needed a heavy rescue ship since the next best medical vessel is the Hospitaller which isn't always the best when there's more than one injured or dead. There are certain situations where you just simple need more medical capabilities to be able to handle of the dead. Some situations this is the case is in some POI like the labs and asteroid which can easily cause the death of entire crews if things go bad. In situations like this the hospitaller is simply not large enough and the empress and other such ships seem like improper due to them being flagships and slow to maneuver especially when other POIs need their attention more such as vaults and syndicate stashes.

Media

whiskey lower init
whiskey lower litup
whiskey upper init
whiskey upper litup

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog

🆑

  • add: NFSD medical ship "Whiskey"

@dvir001 dvir001 added the Map-Shuttle Map - Shuttle label Dec 26, 2023
@MagnusCrowe MagnusCrowe self-requested a review December 26, 2023 14:46
@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Dec 26, 2023
@github-actions github-actions bot added the Map label Dec 30, 2023
Copy link
Contributor

@TsjipTsjip TsjipTsjip left a comment

Choose a reason for hiding this comment

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

Bunch of notes, this ship also needs a maintainer to give their approval on it before it is merged in the sense of the concept. I'm not sure if we need this ship on the security's ship catalog.

Resources/Prototypes/_NF/Shipyard/whiskey.yml Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

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

We should seriously consider whether or not we want this kind of ship in frontier.

Major notes:

  • Are these holding cells? 1-tile? This has to be remediated.
    image
  • Remove the loose headset.
    image
  • Table through directional window.
    image
  • Cloning on a non-flagship feels iffy. The Helix having it is already a bit of a stretch, but acceptable as it is purely medical, not a security ship. Also equipment is clipping with the directional windows.
    image
  • Engineering feels very overkill for what is essentially a shuttle meant to be manned by two brigmedics. Remove the engineering locker for starters, superpacman feels overkill and should be replaced with two regular pacmans. It just feels too over-equipped.
    image

Minor notes:

  • Doctors should not be smoking. That's just opinion tho.
    image

As it stands, this ship is not ready to be merged and needs a bit of work still.

@TsjipTsjip
Copy link
Contributor

Oh and also, the glass underneath the thrusters feels very weird. I'd just let those be lattice.

…ng locker with utility belt, moved table to prevent clipping, moved brigmedic headset into locker, added table into storage closet. ((FIXED SHIP SPAWNING))
@YumiGumi
Copy link
Contributor

Oh and also, the glass underneath the thrusters feels very weird. I'd just let those be lattice.

glass instead of lattice looks cleaner and has been an accepted building practice. it's transparent so you don't have the lattice just sticking out, this example has been see on several other ships including several security vessels. I respect your opinion on the vessel, but i'll add you've been hyper critical of the ship since it's conception. Some people have their preferred building styles and I view these as a more of an artist's signature rather than it being so problematic.

@dvir001
Copy link
Contributor

dvir001 commented Dec 31, 2023

Oh and also, the glass underneath the thrusters feels very weird. I'd just let those be lattice.

glass instead of lattice looks cleaner and has been an accepted building practice. it's transparent so you don't have the lattice just sticking out, this example has been see on several other ships including several security vessels. I respect your opinion on the vessel, but i'll add you've been hyper critical of the ship since it's conception. Some people have their preferred building styles and I view these as a more of an artist's signature rather than it being so problematic.

I agree that glass underneath the thrusters feels very weird, logic wise it should not be a thing and it makes then look disconnected from the shuttle

This is something that should be updated and fixed with older ships who were held to different map standards before.

Were getting more hyper critical as were getting ships who add more mapper maintainers upkeep while having issues that could have been fixed while they were still being worked on, then having someone else fix later.

Look at how many shuttles had to get full atmost redone in the past 2 weeks since this was not a requirement for smalls ships before.

There is a baseline doc coming out soon to help streamline this process to have mapping more clear.

@YumiGumi
Copy link
Contributor

Oh and also, the glass underneath the thrusters feels very weird. I'd just let those be lattice.

glass instead of lattice looks cleaner and has been an accepted building practice. it's transparent so you don't have the lattice just sticking out, this example has been see on several other ships including several security vessels. I respect your opinion on the vessel, but i'll add you've been hyper critical of the ship since it's conception. Some people have their preferred building styles and I view these as a more of an artist's signature rather than it being so problematic.

I agree that glass underneath the thrusters feels very weird, logic wise it should not be a thing and it makes then look disconnected from the shuttle

This is something that should be updated and fixed with older ships who were held to different map standards before.

Were getting more hyper critical as were getting ships who add more mapper maintainers upkeep while having issues that could have been fixed while they were still being worked on, then having someone else fix later.

Look at how many shuttles had to get full atmost redone in the past 2 weeks since this was not a requirement for smalls ships before.

There is a baseline doc coming out soon to help streamline this process to have mapping more clear.

the ship i'm specifically regarding was made by magnus in the last month.

@dvir001
Copy link
Contributor

dvir001 commented Dec 31, 2023

Oh and also, the glass underneath the thrusters feels very weird. I'd just let those be lattice.

glass instead of lattice looks cleaner and has been an accepted building practice. it's transparent so you don't have the lattice just sticking out, this example has been see on several other ships including several security vessels. I respect your opinion on the vessel, but i'll add you've been hyper critical of the ship since it's conception. Some people have their preferred building styles and I view these as a more of an artist's signature rather than it being so problematic.

I agree that glass underneath the thrusters feels very weird, logic wise it should not be a thing and it makes then look disconnected from the shuttle
This is something that should be updated and fixed with older ships who were held to different map standards before.
Were getting more hyper critical as were getting ships who add more mapper maintainers upkeep while having issues that could have been fixed while they were still being worked on, then having someone else fix later.
Look at how many shuttles had to get full atmost redone in the past 2 weeks since this was not a requirement for smalls ships before.
There is a baseline doc coming out soon to help streamline this process to have mapping more clear.

the ship i'm specifically regarding was made by magnus in the last month.

I dont care who made the ship, if its need to be changed it will.

@TsjipTsjip
Copy link
Contributor

but i'll add you've been hyper critical of the ship since it's conception

The only comment I have made before about this ship on discord is that plastitanium walls felt weird. This was wrong, as I have since learned it's common practice. I am sorry you feel this way about my comments, I should add that I am not a maintainer and as such you're allowed to put all my feedback in the disposal unit if you so choose. If you know better than me when it comes to mapping, then do do that.

Aside from my final review that I'll leave on this PR in a minute or so which will only contain critical points, I am detaching myself from this pull request as I believe any more feedback I give will not be treated receptively.

Copy link
Contributor

@TsjipTsjip TsjipTsjip left a comment

Choose a reason for hiding this comment

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

  • Spawning issue is resolved.
  • Brigmed headset has to be removed entirely, it contains an NFSD key which should only ever be normally obtainable through spawning as a role, getting it from SR/Sheriff in a PTech, or via "illegal" means (i.e. artifacts, ...) (I know there is telecomms servers around, this will be remediated as well in a later PR effort.)

@dvir001
Copy link
Contributor

dvir001 commented Dec 31, 2023

  • Brigmed headset

Ill get the Brigmed headset added to vender, but ill need to make new proto without the keys..

@dvir001 dvir001 closed this Dec 31, 2023
@dvir001 dvir001 reopened this Dec 31, 2023
@dvir001
Copy link
Contributor

dvir001 commented Dec 31, 2023

Sorry about the close, this is a mistake on my part with the comment click.

@YumiGumi

This comment was marked as off-topic.

@cite2000
Copy link
Contributor Author

  • Spawning issue is resolved.
  • Brigmed headset has to be removed entirely, it contains an NFSD key which should only ever be normally obtainable through spawning as a role, getting it from SR/Sheriff in a PTech, or via "illegal" means (i.e. artifacts, ...) (I know there is telecomms servers around, this will be remediated as well in a later PR effort.)

while this is the case will the hospitaller be changed to no longer include a headset with sec comms in it? will update to remove the headset shortly.

@TsjipTsjip
Copy link
Contributor

while this is the case will the hospitaller be changed to no longer include a headset with sec comms in it? will update to remove the headset shortly.

I will add this to the list of things to do. Thanks for flagging it.

@cite2000
Copy link
Contributor Author

cite2000 commented Dec 31, 2023

while this is the case will the hospitaller be changed to no longer include a headset with sec comms in it? will update to remove the headset shortly.

I will add this to the list of things to do. Thanks for flagging it.

actually on further inspection quite a few sec ships have sec comms in them. every baliff locker has sec comms in it. as does every sheriff locker. this includes the wasp, empress, marauder, hospitaller at least.

@TsjipTsjip
Copy link
Contributor

actually on further inspection quite a few sec ships have sec comms in them. every baliff locker has sec comms in it. as does every sheriff locker.

If it's in the locker fill that points to an underlying issue... Gonna @dvir001 here cause they know what can and can't be removed from the locker fill without breaking something in the most horrible way imaginable. (Imagine a sheriff without comms!)

@Cheackraze
Copy link
Member

having the cloner on this ship is a no-go, i suggest turning that room into the singular holding cell if anything. The superpacman cant stay, its not allowed to be a round start buyable generator. Glass under thrusters is also a no-go, and on any other ship that has them should be changed to lattice. The comms issue is because theres just an overabundance of them everywhere because of being essentially double mapped and they are still too often ending up in hands of non-security, we still havent exactly landed on the perfect solution but for now we need to at least trim the free mapped ones.

Im going to say that overall everything @TsjipTsjip has said, I would have also mentioned.

Design-wise, I like the layout, however I feel in some areas your decal work is a bit too noisy. I feel that the black and red diamond entry way is too noisy and only serves to hide the fact that that room is a bit awkward, empty, and a touch pointless. You could use that space for some other form or function or at the very least put some chairs down for passengers or a bench or something, and the noisiness of the tiled pattern toned down a bit.

As an idea, I'm not opposed to a medium-sized brig-medic focused ship for the situations you describe in your original post.

@github-actions github-actions bot removed the YML label Jan 9, 2024
…versions, changed out cloning setup for a cryogenics setup, changed atmost from air canister to proper atmos setup.
@dvir001 dvir001 changed the title Whiskey Whiskey (New) Jan 25, 2024
@dvir001
Copy link
Contributor

dvir001 commented Feb 10, 2024

@cite2000 I updated the PR for you to support the new update, new files location and new naming.
You can keep working on this PR after you run a pull for the changes made here.

Please make sure to use the new ship guide lines when working on this PR:
https://frontierstation14.com/index.php/Ship_Submission_Guidelines

@Cheackraze
Copy link
Member

if the picture in the post is accurate, this looks good to me @MagnusCrowe if you concur lets get this in

@MagnusCrowe
Copy link
Contributor

I'll review it today.

Copy link
Contributor

@MagnusCrowe MagnusCrowe left a comment

Choose a reason for hiding this comment

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

image
Top to bottom:

  • Please remove the cigarettes
  • Please add vacuum tiles to your corners to prevent space wind from pulling up the glass
  • Please move your late join spawn point so it's not on top of the table

After these are done, I will merge it

Edit: IDK if you did this intentionally or if it was an oversight but the blue edge painting on the dark tile does not line up with the offset floor tiles. Also it's semi-transparent so you can see even more that it isn't lined up. If that was an artistic choice the ignore this part of the comment.

@MagnusCrowe MagnusCrowe added Status: Awaiting Changes This PR has changes that need to be made before merging and removed Status: Needs Review This PR is awaiting reviews labels Mar 9, 2024
@cite2000
Copy link
Contributor Author

so i failed to mention this but about a week ago i attempted to pull the changes made and launch it and have been unable to properly launch it since. quite possibly i might need to entirely remake it at this rate.

@VividPups
Copy link
Contributor

can you post the error code that you receive when trying to do it?

@Cheackraze
Copy link
Member

so i failed to mention this but about a week ago i attempted to pull the changes made and launch it and have been unable to properly launch it since. quite possibly i might need to entirely remake it at this rate.

your work is all saved so far here on github, so in the worst case it would simply be deleting your local repository and pulling it fresh from here. Feel free to reach out on the discord if you're still having troubles

@cite2000
Copy link
Contributor Author

cite2000 commented Mar 12, 2024

yes, i cannot seem to figure out the error so i may have to get some assistance with that. it always seems to be something different

image

@cite2000
Copy link
Contributor Author

here's a picture of basically what changed, that should be everything that was requested
image

Copy link
Contributor

@MagnusCrowe MagnusCrowe left a comment

Choose a reason for hiding this comment

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

I moved the cryo pump out from under the table, put plating under your grilled windows, replaced the generators with the ship version that runs on map init, and moved the files to the correct mapping folder /_NF/Shuttles/Security/whiskey.yml.

@MagnusCrowe MagnusCrowe merged commit edd866f into new-frontiers-14:master Mar 16, 2024
11 checks passed
FrontierATC added a commit that referenced this pull request Mar 16, 2024
Wolfking6116 pushed a commit to Wolfking6116/frontier-station-14 that referenced this pull request Mar 19, 2024
commit 8dcb88a
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 18:39:31 2024 +0000

    Automatic Changelog (new-frontiers-14#1119)

commit 223e3f9
Author: ThatOneGoblin25 <[email protected]>
Date:   Tue Mar 19 05:39:07 2024 +1100

    Adds BoxShotgunSlug to ammo.yml (new-frontiers-14#1119)

commit 2457bc9
Author: Dvir <[email protected]>
Date:   Mon Mar 18 20:29:04 2024 +0200

    Update opportunity.yml (new-frontiers-14#1131)

commit 87939de
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 16:46:35 2024 +0000

    Automatic Changelog (new-frontiers-14#1122)

commit 41b04a5
Author: Alice "Arimah" Heurlin <[email protected]>
Date:   Mon Mar 18 17:46:12 2024 +0100

    Increase soup maxVol to prevent spillage (new-frontiers-14#1122)

commit f5fcd41
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 16:45:25 2024 +0000

    Automatic Changelog (new-frontiers-14#1088)

commit 719be3b
Author: ErhardSteinhauer <[email protected]>
Date:   Mon Mar 18 19:45:02 2024 +0300

    Hardsuits Fabrication, Salvage TechFab (new-frontiers-14#1088)

    * Hardsuits Fabrication

    * fixes

    * botany EVA, sundicate hard suit for EMAG enjoyers

    * moved pirate eva to arsenal

    * fix

    * i changed something earlier today but i don't remember what. i recon i can do no wrong by merging this.

    * merge conflict fix, salvtechfab flatpack

    * circuitvend.yml

    purge

    * fix

    * mailcarrier eva

    * renamed mailman eva to mailcarrier eva

    * no spawn set to true for added toggleable helmets

commit b57358c
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 16:35:59 2024 +0000

    Automatic Changelog (new-frontiers-14#1126)

commit 41ff359
Author: Dvir <[email protected]>
Date:   Mon Mar 18 18:35:36 2024 +0200

    Fix Pen Sign (new-frontiers-14#1126)

    * My name, not the card name

    * FTL

commit 7701f4f
Author: Dvir <[email protected]>
Date:   Mon Mar 18 18:33:45 2024 +0200

    UnEmagged (new-frontiers-14#1128)

commit ce18929
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 16:31:19 2024 +0000

    Automatic Changelog (new-frontiers-14#1127)

commit 065c84d
Author: AndresE55 <[email protected]>
Date:   Mon Mar 18 12:30:56 2024 -0400

    Rules formatting  (new-frontiers-14#1127)

    * rule typos

    * formatting

commit 0054ba1
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 13:42:33 2024 +0000

    Automatic Changelog (new-frontiers-14#1129)

commit e1f6ec6
Author: Maxtone <[email protected]>
Date:   Mon Mar 18 08:42:10 2024 -0500

    removes opportunity from shipyard (new-frontiers-14#1129)

commit 714d1c1
Author: FrontierATC <[email protected]>
Date:   Sun Mar 17 10:21:57 2024 +0000

    Automatic Changelog (new-frontiers-14#1121)

commit a622d9a
Author: Leth <[email protected]>
Date:   Sun Mar 17 06:21:37 2024 -0400

    Adjusts the price of the NC Hauler to cost what it should (new-frontiers-14#1121)

commit 9299828
Author: FrontierATC <[email protected]>
Date:   Sun Mar 17 08:29:54 2024 +0000

    Automatic Changelog (new-frontiers-14#1104)

commit 91b1777
Author: Cuir <[email protected]>
Date:   Sun Mar 17 04:29:25 2024 -0400

    Canister (New) - Tiny scrap vessel (new-frontiers-14#1104)

    * Added UAC Canister to the scrapyard for purchase.

    * Fixed headlights not being mounted.
    Fixed diagonally adjacent walls.
    Fixed ship price (6600 --> 8000 spesos).
    Added two small items to make the ship a bit less empty and more lived in.

    * Fixed a few minor issues.

    * Fixed another minor issue.

    * Removed Passenger spawn point.
    Replaced Passenger job with Pilot.

commit 650d525
Author: Dvir <[email protected]>
Date:   Sun Mar 17 09:38:23 2024 +0200

    Condor (new-frontiers-14#1123)

commit 34e2069
Author: Dvir <[email protected]>
Date:   Sun Mar 17 09:37:56 2024 +0200

    Update mcdelivery.yml (new-frontiers-14#1124)

commit a52ab8f
Author: nyozzl <[email protected]>
Date:   Sat Mar 16 23:14:48 2024 +0000

    Updates disciple/fixes a few things (new-frontiers-14#1093)

    Co-authored-by: Nyazz <Nyazz@DESKTOP-Q577H4Q>

commit c20376a
Author: Batuh1n <[email protected]>
Date:   Sun Mar 17 01:36:58 2024 +0300

    KnuckleVerse (New) - Bboxing ship (new-frontiers-14#891)

    * Adds the boxing ship, KnuckleVerse.

    * Make it more expensive and remove "SW" from map name knuckleverse.yml

    * Update the shuttle, shuttle's folder location to _NF and shuttle's price and also add pilot job

    * Atmos, and power change, a few other changes to design

    * removed many emergency lights, fixed power

    ---------

    Co-authored-by: aknyyn <[email protected]>
    Co-authored-by: checkraze <[email protected]>
    Co-authored-by: Maxtone <[email protected]>

commit fdff25a
Author: FrontierATC <[email protected]>
Date:   Sat Mar 16 21:54:00 2024 +0000

    Automatic Changelog (new-frontiers-14#763)

commit edd866f
Author: cite2000 <[email protected]>
Date:   Sat Mar 16 17:53:36 2024 -0400

    Whiskey (New) (new-frontiers-14#763)

    * adds the whiskey ship

    * added the NFSD whiskey.

    * Revert "added the NFSD whiskey."

    This reverts commit 2d56259.

    * fixed the NFSD whiskey ship.

    * added latejoin spawn, changed air outlet, changed files slightly.

    * replaced power monitoring with air tank dispensor, replaced engineering locker with utility belt, moved table to prevent clipping, moved brigmedic headset into locker, added table into storage closet. ((FIXED SHIP SPAWNING))

    * changed lattices back to glass, removed brig-med headset, removed holding cells.

    * changed the tile under the thrusters to be lattice, while the corners were left as glass.

    * changed price from 47k to 55k to more accurately account for markup.

    * Fixed pathing error

    * Revamped main (waiting) room, changed generator out for 2 downgraded versions, changed out cloning setup for a cryogenics setup, changed atmost from air canister to proper atmos setup.

    * Merge remote-tracking branch 'origin/master' into pr/763

    * YML fix

    * added vacuum tiles, removed cigarettes, moved late join one tile down, added trystan plushie

    * Ship Generators, moved cryo pump, moved file to sec folder

    ---------

    Co-authored-by: Dvir <[email protected]>
    Co-authored-by: Maxtone <[email protected]>

commit 1aa4f28
Author: FrontierATC <[email protected]>
Date:   Thu Mar 14 22:47:56 2024 +0000

    Automatic Changelog (new-frontiers-14#1091)

commit 7021040
Author: AndresE55 <[email protected]>
Date:   Thu Mar 14 18:47:32 2024 -0400

    Update server rules (new-frontiers-14#1091)

commit 0d978ca
Author: GreaseMonk <[email protected]>
Date:   Thu Mar 14 14:55:25 2024 +0100

    Fix tabletop computers (new-frontiers-14#1113)

    * Update computers_tabletop.yml

    * Revert "Revert "Tabletop computer deconstruct fix (new-frontiers-14#1090)" (new-frontiers-14#1092)"

    This reverts commit 54d1714.

    * Fix draw depth

    ---------

    Co-authored-by: VMSolidus <[email protected]>

commit 31e3931
Author: exincore <[email protected]>
Date:   Mon Mar 11 18:43:05 2024 -0500

    refactor(research): Improve initial research client registration (new-frontiers-14#1086)

    * refactor(research): Improve initial research client registration

    * refactor(research): Move EntityLookupSystem dependency to main class file

    * Fix `ResearchSystem.Client` `UpdateClientInterface` preconditions. (#25743)

    * fix(research): Fix `ResearchSystem.Client` `UpdateClientInterface` preconditions.

    Fixes a paradox where selecting a research server requires a research server to already be selected.
    This would softlock the research client until it is reconstructed.

    * style: Discards the discard operator

    Co-authored-by: Nemanja <[email protected]>

    ---------

    Co-authored-by: Nemanja <[email protected]>
    (cherry picked from commit aaf5d0d)

commit b5a9528
Author: FrontierATC <[email protected]>
Date:   Mon Mar 11 23:32:13 2024 +0000

    Automatic Changelog (new-frontiers-14#1096)

commit 6d09157
Author: Wolfking6116 <[email protected]>
Date:   Mon Mar 11 19:31:50 2024 -0400

    Refinement process for Artifexium (new-frontiers-14#1096)

    * swapped artifexium with raw version

    * raw artifexium description

    * raw artifexium reagent

    * Refined artifexium recipes

    * added dashes

    Forgot the dash

    ---------

    Co-authored-by: Wolfking6116 <[email protected]>

commit 2e26e40
Author: FrontierATC <[email protected]>
Date:   Mon Mar 11 23:21:13 2024 +0000

    Automatic Changelog (new-frontiers-14#1098)

commit 93b9c40
Author: Mnemotechnican <[email protected]>
Date:   Tue Mar 12 02:20:49 2024 +0300

    Fix carrying (new-frontiers-14#1098)

    * Revert "Remove contests (#25425)"

    This reverts commit 012e6e6

    * Re-add contests to carrying

    * Fix various bugs

    * Add clarifying comments

    * Remove the contest from shoving; remove unused contests

    * Un-restore contests

    * This was unintended

    * Revert another minor change

commit ad2e93f
Author: FrontierATC <[email protected]>
Date:   Mon Mar 11 23:04:13 2024 +0000

    Automatic Changelog (new-frontiers-14#1053)

commit 9f27054
Author: Qulibly <[email protected]>
Date:   Tue Mar 12 00:03:50 2024 +0100

    Crew monitor general tweaks and QoL changes (new-frontiers-14#1053)

    * Crew monitor global coordinates tweak

    * Crew Monitor changes to make monitor work with coordinates

    * Crew Monitor WIP space detection tweak

    * Crew Monitor Space detection and expedition tweak

    * Crew Monitor Location and Vessel detection

    * Crew Monitor NET_LOCATION_NAME value fixup

    ---------

    Co-authored-by: Qulibly <[email protected]>

commit 50f2b55
Author: ThatOneGoblin25 <[email protected]>
Date:   Tue Mar 12 01:31:26 2024 +1100

    Added Air tank to fill (new-frontiers-14#1105)

    Removed nitrogen and oxygen tank from fill

commit 3eeebdd
Author: FrontierATC <[email protected]>
Date:   Mon Mar 11 05:47:43 2024 +0000

    Automatic Changelog (new-frontiers-14#1106)

commit 791cd86
Author: ThatOneGoblin25 <[email protected]>
Date:   Mon Mar 11 16:47:20 2024 +1100

    Remove RCD (new-frontiers-14#1106)

    Removes RCD and Ammo

commit d66236b
Author: Dvir <[email protected]>
Date:   Sun Mar 10 01:59:44 2024 +0200

    McCargo (Update) (new-frontiers-14#1102)

    * Update mccargo.yml

    * Removed one light
Wolfking6116 pushed a commit to Wolfking6116/frontier-station-14 that referenced this pull request Mar 19, 2024
commit 8dcb88a
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 18:39:31 2024 +0000

    Automatic Changelog (new-frontiers-14#1119)

commit 223e3f9
Author: ThatOneGoblin25 <[email protected]>
Date:   Tue Mar 19 05:39:07 2024 +1100

    Adds BoxShotgunSlug to ammo.yml (new-frontiers-14#1119)

commit 2457bc9
Author: Dvir <[email protected]>
Date:   Mon Mar 18 20:29:04 2024 +0200

    Update opportunity.yml (new-frontiers-14#1131)

commit 87939de
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 16:46:35 2024 +0000

    Automatic Changelog (new-frontiers-14#1122)

commit 41b04a5
Author: Alice "Arimah" Heurlin <[email protected]>
Date:   Mon Mar 18 17:46:12 2024 +0100

    Increase soup maxVol to prevent spillage (new-frontiers-14#1122)

commit f5fcd41
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 16:45:25 2024 +0000

    Automatic Changelog (new-frontiers-14#1088)

commit 719be3b
Author: ErhardSteinhauer <[email protected]>
Date:   Mon Mar 18 19:45:02 2024 +0300

    Hardsuits Fabrication, Salvage TechFab (new-frontiers-14#1088)

    * Hardsuits Fabrication

    * fixes

    * botany EVA, sundicate hard suit for EMAG enjoyers

    * moved pirate eva to arsenal

    * fix

    * i changed something earlier today but i don't remember what. i recon i can do no wrong by merging this.

    * merge conflict fix, salvtechfab flatpack

    * circuitvend.yml

    purge

    * fix

    * mailcarrier eva

    * renamed mailman eva to mailcarrier eva

    * no spawn set to true for added toggleable helmets

commit b57358c
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 16:35:59 2024 +0000

    Automatic Changelog (new-frontiers-14#1126)

commit 41ff359
Author: Dvir <[email protected]>
Date:   Mon Mar 18 18:35:36 2024 +0200

    Fix Pen Sign (new-frontiers-14#1126)

    * My name, not the card name

    * FTL

commit 7701f4f
Author: Dvir <[email protected]>
Date:   Mon Mar 18 18:33:45 2024 +0200

    UnEmagged (new-frontiers-14#1128)

commit ce18929
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 16:31:19 2024 +0000

    Automatic Changelog (new-frontiers-14#1127)

commit 065c84d
Author: AndresE55 <[email protected]>
Date:   Mon Mar 18 12:30:56 2024 -0400

    Rules formatting  (new-frontiers-14#1127)

    * rule typos

    * formatting

commit 0054ba1
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 13:42:33 2024 +0000

    Automatic Changelog (new-frontiers-14#1129)

commit e1f6ec6
Author: Maxtone <[email protected]>
Date:   Mon Mar 18 08:42:10 2024 -0500

    removes opportunity from shipyard (new-frontiers-14#1129)

commit 714d1c1
Author: FrontierATC <[email protected]>
Date:   Sun Mar 17 10:21:57 2024 +0000

    Automatic Changelog (new-frontiers-14#1121)

commit a622d9a
Author: Leth <[email protected]>
Date:   Sun Mar 17 06:21:37 2024 -0400

    Adjusts the price of the NC Hauler to cost what it should (new-frontiers-14#1121)

commit 9299828
Author: FrontierATC <[email protected]>
Date:   Sun Mar 17 08:29:54 2024 +0000

    Automatic Changelog (new-frontiers-14#1104)

commit 91b1777
Author: Cuir <[email protected]>
Date:   Sun Mar 17 04:29:25 2024 -0400

    Canister (New) - Tiny scrap vessel (new-frontiers-14#1104)

    * Added UAC Canister to the scrapyard for purchase.

    * Fixed headlights not being mounted.
    Fixed diagonally adjacent walls.
    Fixed ship price (6600 --> 8000 spesos).
    Added two small items to make the ship a bit less empty and more lived in.

    * Fixed a few minor issues.

    * Fixed another minor issue.

    * Removed Passenger spawn point.
    Replaced Passenger job with Pilot.

commit 650d525
Author: Dvir <[email protected]>
Date:   Sun Mar 17 09:38:23 2024 +0200

    Condor (new-frontiers-14#1123)

commit 34e2069
Author: Dvir <[email protected]>
Date:   Sun Mar 17 09:37:56 2024 +0200

    Update mcdelivery.yml (new-frontiers-14#1124)

commit a52ab8f
Author: nyozzl <[email protected]>
Date:   Sat Mar 16 23:14:48 2024 +0000

    Updates disciple/fixes a few things (new-frontiers-14#1093)

    Co-authored-by: Nyazz <Nyazz@DESKTOP-Q577H4Q>

commit c20376a
Author: Batuh1n <[email protected]>
Date:   Sun Mar 17 01:36:58 2024 +0300

    KnuckleVerse (New) - Bboxing ship (new-frontiers-14#891)

    * Adds the boxing ship, KnuckleVerse.

    * Make it more expensive and remove "SW" from map name knuckleverse.yml

    * Update the shuttle, shuttle's folder location to _NF and shuttle's price and also add pilot job

    * Atmos, and power change, a few other changes to design

    * removed many emergency lights, fixed power

    ---------

    Co-authored-by: aknyyn <[email protected]>
    Co-authored-by: checkraze <[email protected]>
    Co-authored-by: Maxtone <[email protected]>

commit fdff25a
Author: FrontierATC <[email protected]>
Date:   Sat Mar 16 21:54:00 2024 +0000

    Automatic Changelog (new-frontiers-14#763)

commit edd866f
Author: cite2000 <[email protected]>
Date:   Sat Mar 16 17:53:36 2024 -0400

    Whiskey (New) (new-frontiers-14#763)

    * adds the whiskey ship

    * added the NFSD whiskey.

    * Revert "added the NFSD whiskey."

    This reverts commit 2d56259.

    * fixed the NFSD whiskey ship.

    * added latejoin spawn, changed air outlet, changed files slightly.

    * replaced power monitoring with air tank dispensor, replaced engineering locker with utility belt, moved table to prevent clipping, moved brigmedic headset into locker, added table into storage closet. ((FIXED SHIP SPAWNING))

    * changed lattices back to glass, removed brig-med headset, removed holding cells.

    * changed the tile under the thrusters to be lattice, while the corners were left as glass.

    * changed price from 47k to 55k to more accurately account for markup.

    * Fixed pathing error

    * Revamped main (waiting) room, changed generator out for 2 downgraded versions, changed out cloning setup for a cryogenics setup, changed atmost from air canister to proper atmos setup.

    * Merge remote-tracking branch 'origin/master' into pr/763

    * YML fix

    * added vacuum tiles, removed cigarettes, moved late join one tile down, added trystan plushie

    * Ship Generators, moved cryo pump, moved file to sec folder

    ---------

    Co-authored-by: Dvir <[email protected]>
    Co-authored-by: Maxtone <[email protected]>

commit 1aa4f28
Author: FrontierATC <[email protected]>
Date:   Thu Mar 14 22:47:56 2024 +0000

    Automatic Changelog (new-frontiers-14#1091)

commit 7021040
Author: AndresE55 <[email protected]>
Date:   Thu Mar 14 18:47:32 2024 -0400

    Update server rules (new-frontiers-14#1091)

commit 0d978ca
Author: GreaseMonk <[email protected]>
Date:   Thu Mar 14 14:55:25 2024 +0100

    Fix tabletop computers (new-frontiers-14#1113)

    * Update computers_tabletop.yml

    * Revert "Revert "Tabletop computer deconstruct fix (new-frontiers-14#1090)" (new-frontiers-14#1092)"

    This reverts commit 54d1714.

    * Fix draw depth

    ---------

    Co-authored-by: VMSolidus <[email protected]>

commit 31e3931
Author: exincore <[email protected]>
Date:   Mon Mar 11 18:43:05 2024 -0500

    refactor(research): Improve initial research client registration (new-frontiers-14#1086)

    * refactor(research): Improve initial research client registration

    * refactor(research): Move EntityLookupSystem dependency to main class file

    * Fix `ResearchSystem.Client` `UpdateClientInterface` preconditions. (#25743)

    * fix(research): Fix `ResearchSystem.Client` `UpdateClientInterface` preconditions.

    Fixes a paradox where selecting a research server requires a research server to already be selected.
    This would softlock the research client until it is reconstructed.

    * style: Discards the discard operator

    Co-authored-by: Nemanja <[email protected]>

    ---------

    Co-authored-by: Nemanja <[email protected]>
    (cherry picked from commit aaf5d0d)

commit b5a9528
Author: FrontierATC <[email protected]>
Date:   Mon Mar 11 23:32:13 2024 +0000

    Automatic Changelog (new-frontiers-14#1096)

commit 6d09157
Author: Wolfking6116 <[email protected]>
Date:   Mon Mar 11 19:31:50 2024 -0400

    Refinement process for Artifexium (new-frontiers-14#1096)

    * swapped artifexium with raw version

    * raw artifexium description

    * raw artifexium reagent

    * Refined artifexium recipes

    * added dashes

    Forgot the dash

    ---------

    Co-authored-by: Wolfking6116 <[email protected]>

commit 2e26e40
Author: FrontierATC <[email protected]>
Date:   Mon Mar 11 23:21:13 2024 +0000

    Automatic Changelog (new-frontiers-14#1098)

commit 93b9c40
Author: Mnemotechnican <[email protected]>
Date:   Tue Mar 12 02:20:49 2024 +0300

    Fix carrying (new-frontiers-14#1098)

    * Revert "Remove contests (#25425)"

    This reverts commit 012e6e6

    * Re-add contests to carrying

    * Fix various bugs

    * Add clarifying comments

    * Remove the contest from shoving; remove unused contests

    * Un-restore contests

    * This was unintended

    * Revert another minor change

commit ad2e93f
Author: FrontierATC <[email protected]>
Date:   Mon Mar 11 23:04:13 2024 +0000

    Automatic Changelog (new-frontiers-14#1053)

commit 9f27054
Author: Qulibly <[email protected]>
Date:   Tue Mar 12 00:03:50 2024 +0100

    Crew monitor general tweaks and QoL changes (new-frontiers-14#1053)

    * Crew monitor global coordinates tweak

    * Crew Monitor changes to make monitor work with coordinates

    * Crew Monitor WIP space detection tweak

    * Crew Monitor Space detection and expedition tweak

    * Crew Monitor Location and Vessel detection

    * Crew Monitor NET_LOCATION_NAME value fixup

    ---------

    Co-authored-by: Qulibly <[email protected]>

commit 50f2b55
Author: ThatOneGoblin25 <[email protected]>
Date:   Tue Mar 12 01:31:26 2024 +1100

    Added Air tank to fill (new-frontiers-14#1105)

    Removed nitrogen and oxygen tank from fill

commit 3eeebdd
Author: FrontierATC <[email protected]>
Date:   Mon Mar 11 05:47:43 2024 +0000

    Automatic Changelog (new-frontiers-14#1106)

commit 791cd86
Author: ThatOneGoblin25 <[email protected]>
Date:   Mon Mar 11 16:47:20 2024 +1100

    Remove RCD (new-frontiers-14#1106)

    Removes RCD and Ammo

commit d66236b
Author: Dvir <[email protected]>
Date:   Sun Mar 10 01:59:44 2024 +0200

    McCargo (Update) (new-frontiers-14#1102)

    * Update mccargo.yml

    * Removed one light
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Map-Shuttle Map - Shuttle No C# Status: Awaiting Changes This PR has changes that need to be made before merging
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants