McCargo (Update) #1102
Merged
McCargo (Update) #1102
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
Map-Shuttle
MagnusCrowe
approved these changes
Mar 9, 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
Fixed McCargo deep fry issue
Changed eva suit storage to pilot
Remove some lights, looking a bit darker now
Why / Balance
Had to be done.
Technical details
Mapping
Media
Breaking changes
N/A
Changelog
N/A