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

Crew monitor general tweaks and QoL changes #1053

Merged
merged 8 commits into from
Mar 11, 2024

Conversation

Qulibly
Copy link
Contributor

@Qulibly Qulibly commented Feb 23, 2024

About the PR

Changes which coordinates are displayed on the crew monitoring, console and handheld. From relative coordinates from the user to target. To global coordinates which match ones on GPS.
Uses code from space-wizards/space-station-14#25116

Additionally tweaks when signal is sent to allow detection of people from space and in expeditions.

Also shows name of the locations players are in. Like "Tinnia's Rest" or if they are in space or expedition.

Coordinates show only on coordinates mode. While rough location on coordinates and vital modes.

Why / Balance

It should greatly aid the medics in finding exact people's location as well as corpse's.
As before they needed to compare roughly which direction their patient was or rely on medical implant.
This way they will be able to just take a look at monitor and know exactly where to head.

Could potentially make detective's job bit easier too.

Overall is mainly aimed at improving medical gameplay.

Technical details

For GPS coordinates uses exact code from space-wizards/space-station-14#25116

For detection, used abit from space-wizards/space-station-14#24880
Then was made that when grid is null it will fallback on the map coordinates.

Location name showing was the hardest part to figure out.
But basically first checks for grid. If it detectes it then checks if its expedition one. When it detects it simply gets its metadata name.
If grid is null then will name location as space.

Otherwise will show as unknown.
It does replace the place for jobs. But in Frontier I dont think they are the most important. And icons should suffice.

Media

obraz
obraz
obraz
obraz
obraz

  • I have added screenshots/videos to this PR showcasing its changes ingame

Breaking changes

Pretty much ANY changes to crew monitor code or suit sensors have very high chance of breaking this. Quite extensive modification was needed to get it all working.

Changelog

🆑

  • tweak: Tweaked crew monitors with new QoL features

@github-actions github-actions bot added the C# label Feb 23, 2024
@GreaseMonk
Copy link
Contributor

FYI , i found a related pr here space-wizards/space-station-14#25116
I'm indifferent for the outcome of this

@Cheackraze
Copy link
Member

@Qulibly what do you think? it shouldnt be too difficult to grab those other changes in that upstream commit to fix the console, however, that contributor also hinted that they would work on a different form of fixing this exact problem. In any case, this solution is incredibly small and simple and I wouldnt mind having it since its a good enough change. The map inside the crew monitor console isnt nearly as helpful here as it is upstream in any case.

@Qulibly
Copy link
Contributor Author

Qulibly commented Feb 29, 2024

@Qulibly what do you think? it shouldnt be too difficult to grab those other changes in that upstream commit to fix the console, however, that contributor also hinted that they would work on a different form of fixing this exact problem. In any case, this solution is incredibly small and simple and I wouldnt mind having it since its a good enough change. The map inside the crew monitor console isnt nearly as helpful here as it is upstream in any case.

Alrighty so I tried the space-wizards/space-station-14#25116 and its working decently well. It makes the monitor console work and show people when they are on same grid.

It does require bit more changes but works simiraliry, except bit nicer crew monitor.

One thing I'm wondering is: If its worth it and also, if there are any other things that I could improve about operation of the crew monitor to make it easier to use. Like perhaps having people still send signal when in space and also that if you have enabled suit coords it will show name of grid/vessel you are on, and in space show "in space".

Imma see if I can get that. If not then will just keep it as gps coordinates adding only.

@Qulibly Qulibly changed the title Change Crew monitor's coordinates from relative(local) to absolute(global) Crew monitor general tweaks and QoL changes Mar 2, 2024
@Qulibly
Copy link
Contributor Author

Qulibly commented Mar 2, 2024

@Cheackraze Alrighty worked abit. I ended up using code from that PR. Then looked further to try and fix some other issues like players not being detected if they arent on any grid and also one neat feature like showing location name.

Managed to code working both.

Although I really need it reviewed if there arent any things that need to be additionally commented. Tweaked and checked if it wont cause too high lag AND if its even maintanable.

Honestly really needing feedback.

@github-actions github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Mar 4, 2024
Copy link
Contributor

github-actions bot commented Mar 4, 2024

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

@github-actions github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Mar 5, 2024
Copy link
Contributor

@GreaseMonk GreaseMonk left a comment

Choose a reason for hiding this comment

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

Seems to be working , as for code review my only point is that NET_LOCATIONNAME should be NET_LOCATION_NAME for consistency

Copy link
Member

@Cheackraze Cheackraze left a comment

Choose a reason for hiding this comment

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

idk if its github or just this system has some already bad whitespace formatting or something but its hard to read.

Clean up that name as GreaseMonk suggested and will merge it

@Qulibly
Copy link
Contributor Author

Qulibly commented Mar 8, 2024

idk if its github or just this system has some already bad whitespace formatting or something but its hard to read.

Clean up that name as GreaseMonk suggested and will merge it

Alrighty. Name cleaned up.
With whitespace rechecked and couldn't find/see issue.
Prolly should check if I didn't accidentally left around too much.

@Qulibly Qulibly requested a review from Cheackraze March 9, 2024 10:59
@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Mar 9, 2024
@GreaseMonk
Copy link
Contributor

GreaseMonk commented Mar 11, 2024

if you press "view file" on those files, the indentation seems to be fine

@GreaseMonk
Copy link
Contributor

@Cheackraze should be good to go

@Cheackraze Cheackraze merged commit 9f27054 into new-frontiers-14:master Mar 11, 2024
11 checks passed
FrontierATC added a commit that referenced this pull request Mar 11, 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
C# FTL Status: Needs Review This PR is awaiting reviews UI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants