From 84894d841c2c30cafeb551403c0f49aec3501116 Mon Sep 17 00:00:00 2001 From: Wolfking6116 Date: Tue, 19 Mar 2024 03:54:27 -0400 Subject: [PATCH] Squashed commit of the following: commit 8dcb88abb675144c299be6501c5bf866eca9677a Author: FrontierATC Date: Mon Mar 18 18:39:31 2024 +0000 Automatic Changelog (#1119) commit 223e3f9f08e79e9dba46b9d85dd48e081eea3464 Author: ThatOneGoblin25 <145570657+ThatOneGoblin25@users.noreply.github.com> Date: Tue Mar 19 05:39:07 2024 +1100 Adds BoxShotgunSlug to ammo.yml (#1119) commit 2457bc92e5d23a758dcd804467bf0bd6ad6d867f Author: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon Mar 18 20:29:04 2024 +0200 Update opportunity.yml (#1131) commit 87939deeaac7a2dbfb9a90ad22e27b7e616e859b Author: FrontierATC Date: Mon Mar 18 16:46:35 2024 +0000 Automatic Changelog (#1122) commit 41b04a59eaa61c14c7179d59ce4365f2fe4a1670 Author: Alice "Arimah" Heurlin <30327355+arimah@users.noreply.github.com> Date: Mon Mar 18 17:46:12 2024 +0100 Increase soup maxVol to prevent spillage (#1122) commit f5fcd414457a93c6c29fa6bbb881175137d74477 Author: FrontierATC Date: Mon Mar 18 16:45:25 2024 +0000 Automatic Changelog (#1088) commit 719be3ba26ad6c0878523ef4b68edd1b75fa964c Author: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Mon Mar 18 19:45:02 2024 +0300 Hardsuits Fabrication, Salvage TechFab (#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 b57358cf3daf48fc7afd6d82e2677b25f978ce6c Author: FrontierATC Date: Mon Mar 18 16:35:59 2024 +0000 Automatic Changelog (#1126) commit 41ff359ffaa67f1a75af2b4a579284776745487f Author: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon Mar 18 18:35:36 2024 +0200 Fix Pen Sign (#1126) * My name, not the card name * FTL commit 7701f4f9fb2be98edefc948628e5ab57f71c2103 Author: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon Mar 18 18:33:45 2024 +0200 UnEmagged (#1128) commit ce1892950a7b1f44b0507578448515740d961976 Author: FrontierATC Date: Mon Mar 18 16:31:19 2024 +0000 Automatic Changelog (#1127) commit 065c84d85ea1980fdbb8589ff3124294db625f79 Author: AndresE55 <80334192+Leander-0@users.noreply.github.com> Date: Mon Mar 18 12:30:56 2024 -0400 Rules formatting (#1127) * rule typos * formatting commit 0054ba1dd6f1d797b3a7b322acb2aa64dfa3d8f4 Author: FrontierATC Date: Mon Mar 18 13:42:33 2024 +0000 Automatic Changelog (#1129) commit e1f6ec6254d0d5755d82c5095888f7dbec6e4473 Author: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> Date: Mon Mar 18 08:42:10 2024 -0500 removes opportunity from shipyard (#1129) commit 714d1c145bc59a3a7d4dd2651d6cf96776a05f7c Author: FrontierATC Date: Sun Mar 17 10:21:57 2024 +0000 Automatic Changelog (#1121) commit a622d9ae9f1d13a3b1a02aae5b8f1f71d65bffe1 Author: Leth <38314429+Letholldus@users.noreply.github.com> Date: Sun Mar 17 06:21:37 2024 -0400 Adjusts the price of the NC Hauler to cost what it should (#1121) commit 92998285eb9cc715632388b5c20d7f279efb28e8 Author: FrontierATC Date: Sun Mar 17 08:29:54 2024 +0000 Automatic Changelog (#1104) commit 91b177749477711b9446f2af0cd8bdce2efeb44c Author: Cuir <123379145+Cu1r@users.noreply.github.com> Date: Sun Mar 17 04:29:25 2024 -0400 Canister (New) - Tiny scrap vessel (#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 650d525bb593e68ce8ab80bd35adfcdf67e5e8df Author: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sun Mar 17 09:38:23 2024 +0200 Condor (#1123) commit 34e2069a00ae88e7499591c682bfb2e74a5e2cfd Author: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sun Mar 17 09:37:56 2024 +0200 Update mcdelivery.yml (#1124) commit a52ab8f27edba30d4ccbff0b24c26f90cc5431dc Author: nyozzl <123180058+nyozzl@users.noreply.github.com> Date: Sat Mar 16 23:14:48 2024 +0000 Updates disciple/fixes a few things (#1093) Co-authored-by: Nyazz commit c20376a3b2a098909dd242d61496aa6f5eb60bb2 Author: Batuh1n <157067574+Batuh1n@users.noreply.github.com> Date: Sun Mar 17 01:36:58 2024 +0300 KnuckleVerse (New) - Bboxing ship (#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 <92953893+aknyyn@users.noreply.github.com> Co-authored-by: checkraze Co-authored-by: Maxtone commit fdff25afec0165045c963a677a706505baabfb8a Author: FrontierATC Date: Sat Mar 16 21:54:00 2024 +0000 Automatic Changelog (#763) commit edd866f4eee10794a0cda8c305dbaa443d637f0d Author: cite2000 <154713988+cite2000@users.noreply.github.com> Date: Sat Mar 16 17:53:36 2024 -0400 Whiskey (New) (#763) * adds the whiskey ship * added the NFSD whiskey. * Revert "added the NFSD whiskey." This reverts commit 2d5625984d083ba7b9921d4d8a6ed7110839b72b. * 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 Co-authored-by: Maxtone commit 1aa4f28c9aa49a7e8e1b02293743e1a149a01124 Author: FrontierATC Date: Thu Mar 14 22:47:56 2024 +0000 Automatic Changelog (#1091) commit 7021040fe03d92c0585b31501d4b02f2181ba8f8 Author: AndresE55 <80334192+Leander-0@users.noreply.github.com> Date: Thu Mar 14 18:47:32 2024 -0400 Update server rules (#1091) commit 0d978ca9829d9597cbd5ed7e1c676f8a08665f7c Author: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> Date: Thu Mar 14 14:55:25 2024 +0100 Fix tabletop computers (#1113) * Update computers_tabletop.yml * Revert "Revert "Tabletop computer deconstruct fix (#1090)" (#1092)" This reverts commit 54d1714bf6bab1308daa6a8fc475fd999237fdbb. * Fix draw depth --------- Co-authored-by: VMSolidus commit 31e3931a0d74c000bfb1b032c9ab1a4039c68529 Author: exincore Date: Mon Mar 11 18:43:05 2024 -0500 refactor(research): Improve initial research client registration (#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 <98561806+EmoGarbage404@users.noreply.github.com> --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> (cherry picked from commit aaf5d0d30254d27d319b2b5f5874ebe787537f0a) commit b5a9528c1a120cc3bfd496b87d735cb5a163d35b Author: FrontierATC Date: Mon Mar 11 23:32:13 2024 +0000 Automatic Changelog (#1096) commit 6d0915744aaf54ac64889b808a38a1e8ebf8fb5b Author: Wolfking6116 <31782778+Wolfking6116@users.noreply.github.com> Date: Mon Mar 11 19:31:50 2024 -0400 Refinement process for Artifexium (#1096) * swapped artifexium with raw version * raw artifexium description * raw artifexium reagent * Refined artifexium recipes * added dashes Forgot the dash --------- Co-authored-by: Wolfking6116 commit 2e26e40d717aa4459bf6656f6c466ac7523da925 Author: FrontierATC Date: Mon Mar 11 23:21:13 2024 +0000 Automatic Changelog (#1098) commit 93b9c40d751577dd8314758dc0fe9c2a3930a1ae Author: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Date: Tue Mar 12 02:20:49 2024 +0300 Fix carrying (#1098) * Revert "Remove contests (#25425)" This reverts commit 012e6e6c * 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 ad2e93f086c8b2ff75a52a678ca40c77f9ff96c5 Author: FrontierATC Date: Mon Mar 11 23:04:13 2024 +0000 Automatic Changelog (#1053) commit 9f27054d20834530c88746ec6d1708940a77c523 Author: Qulibly <52052459+Qulibly@users.noreply.github.com> Date: Tue Mar 12 00:03:50 2024 +0100 Crew monitor general tweaks and QoL changes (#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 commit 50f2b55ba159ae223a9cd52d483ec894f99145d4 Author: ThatOneGoblin25 <145570657+ThatOneGoblin25@users.noreply.github.com> Date: Tue Mar 12 01:31:26 2024 +1100 Added Air tank to fill (#1105) Removed nitrogen and oxygen tank from fill commit 3eeebdd4bf1dfb5557922469381d7cb89fab14fe Author: FrontierATC Date: Mon Mar 11 05:47:43 2024 +0000 Automatic Changelog (#1106) commit 791cd86e04eb3ceb5daccff768ebb8e0a455aebf Author: ThatOneGoblin25 <145570657+ThatOneGoblin25@users.noreply.github.com> Date: Mon Mar 11 16:47:20 2024 +1100 Remove RCD (#1106) Removes RCD and Ammo commit d66236b6fd811dd80502b86c761ecc5260c7aa11 Author: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sun Mar 10 01:59:44 2024 +0200 McCargo (Update) (#1102) * Update mccargo.yml * Removed one light