Code

merge loadouts#2

Code

Closed

Dutch-VanDerLinde wants to merge 44 commits intoDutch-VanDerLinde:Medical-Loadouts-CompleteDutch-VanDerLinde/space-station-14:Medical-Loadouts-Completefrom metalgearsloth:2024-02-28-loadoutsmetalgearsloth/space-station-14:2024-02-28-loadoutsCopy head branch name to clipboard

+10,458-953

Commits

Commits on Feb 28, 2024

• Loadouts redux

  metalgearsloth

  committed
  b34e20c

Commits on Feb 29, 2024

• Loadout window mockup

  metalgearsloth

  committed
  03fea6b

• More workout

  metalgearsloth

  committed
  48663a7

• rent

  metalgearsloth

  committed
  df8082d

• validation

  metalgearsloth

  committed
  f93abe9

• Developments

  metalgearsloth

  committed
  48e6b63

• bcs

  metalgearsloth

  committed
  bf20f1e

• More cleanup

  metalgearsloth

  committed
  0ef7415

• Rebuild working

  metalgearsloth

  committed
  8a009b4

Commits on Mar 1, 2024

• Fix model and loading

  metalgearsloth

  committed
  0be7b7d

• obsession

  metalgearsloth

  committed
  9282023

• efcore

  metalgearsloth

  committed
  a98bc82

• We got a stew goin

  metalgearsloth

  committed
  2fffc92

• Cleanup

  metalgearsloth

  committed
  1c0551a

• Optional + SeniorEngineering fix

  metalgearsloth

  committed
  ee3b761

Commits on Mar 2, 2024

• Fixes

  metalgearsloth

  committed
  f19beb8

Commits on Mar 3, 2024

• Update science.yml

  musicmanvr

  authored
  69525cf

• add

  Show description for a17928c
  musicmanvr

  committed
  a17928c

• Merge pull request #5 from musicmanvr/patch-1

  Show description for fa559a4
  metalgearsloth

  authored
  fa559a4

• Automatic naming

  metalgearsloth

  committed
  a68021d

• Merge remote-tracking branch 'upstream/master' into 2024-02-28-loadouts

  Show description for b79b921
  metalgearsloth

  committed
  b79b921

• Update nukeops

  metalgearsloth

  committed
  8314b52

• Coming together

  metalgearsloth

  committed
  be0b18d

• Right now

  metalgearsloth

  committed
  8fa84d4

• stargate

  metalgearsloth

  committed
  9ca9488

• rejig the UI

  metalgearsloth

  committed
  0525f46

Commits on Mar 4, 2024

• weh

  metalgearsloth

  committed
  7891b65

Commits on Mar 10, 2024

• Loadouts tweaks

  metalgearsloth

  committed
  0c732b1

Commits on Mar 11, 2024

• Merge remote-tracking branch 'upstream/master' into 2024-02-28-loadouts

  Show description for 536d1c2
  metalgearsloth

  committed
  536d1c2

• Merge conflicts + ordering fix

  metalgearsloth

  committed
  21cb8d6

• yerba mate

  metalgearsloth

  committed
  28cac64

• chocolat

  metalgearsloth

  committed
  4b67482

Commits on Mar 27, 2024

• Merge remote-tracking branch 'upstream/master' into 2024-02-28-loadouts

  metalgearsloth

  committed
  ad812bc

Commits on Mar 28, 2024

• More updates

  metalgearsloth

  committed
  3a073b3

Commits on Apr 3, 2024

• Make typing indicator shaded (space-wizards#26678)

  lzk228

  authored
  025107f

• Automatic changelog update

  PJBot

  committed
  c5fe41c

• Validate wire layout prototypes and remove invalid WiresComponents (space-wizards#26682)

  Show description for 74c45da
  Tayrtahn

  authored
  74c45da

• Increase time inbetween anomaly pulses (space-wizards#26677)

  Show description for c87ba22
  EmoGarbage404

  authored
  c87ba22

• Automatic changelog update

  PJBot

  committed
  e6a0904

• Fix for items dropped being rotated to world north (space-wizards#26662)

  Show description for 5aadb17
  

  Plykiya

  and

  Plykiya

  authored
  5aadb17

• Automatic changelog update

  PJBot

  committed
  70ec12f

• Merge remote-tracking branch 'upstream/master' into 2024-02-28-loadouts

  Show description for 52d8e2d
  metalgearsloth

  committed
  52d8e2d

• Add multi-selection support

  metalgearsloth

  committed
  d084d9c

Commits on Apr 4, 2024

• Latest changes

  metalgearsloth

  committed
  058652c