Code

02/27/2024 pr#1174

Code

Closed

Salvantrix wants to merge 36 commits intonew-frontiers-14:masternew-frontiers-14/frontier-station-14:masterfrom Salvantrix:02/27/2024-PRSalvantrix/frontier-station-14:02/27/2024-PRCopy head branch name to clipboard

+3,388-260

Commits

Commits on Feb 27, 2024

• NFSD Resprite

  Salvantrix

  committed
  44fbb3f

  Copy full SHA for 44fbb3f

• Updated License and Copyright sections.

  Salvantrix

  committed
  aa66c34

  Copy full SHA for aa66c34

Commits on Feb 28, 2024

• ID

  dvir001

  committed
  3685288

  Copy full SHA for 3685288

• Filled

  dvir001

  committed
  1c047e3

  Copy full SHA for 1c047e3

• NFSD Resprite

  Show description for 63f45ca
  Salvantrix

  committed
  63f45ca

  Copy full SHA for 63f45ca

• NFSD ITS GREEN NOW

  Show description for 593c1d6
  Salvantrix

  committed
  593c1d6

  Copy full SHA for 593c1d6

• Brigmed green

  Show description for 9801732
  Salvantrix

  committed
  9801732

  Copy full SHA for 9801732

• Yeah..

  Salvantrix

  committed
  375c120

  Copy full SHA for 375c120

Commits on Mar 4, 2024

• 03/04/2024

  Show description for 52af6a6
  Salvantrix

  committed
  52af6a6

  Copy full SHA for 52af6a6

Commits on Mar 6, 2024

• 03/05/2024

  Show description for e2222c7
  Salvantrix

  committed
  e2222c7

  Copy full SHA for e2222c7

Commits on Mar 7, 2024

• 03/06/2024

  Show description for 161a980
  Salvantrix

  committed
  161a980

  Copy full SHA for 161a980

Commits on Mar 12, 2024

• fix conflicts

  Cheackraze

  committed
  6610951

  Copy full SHA for 6610951

Commits on Mar 14, 2024

• fix conflicts

  Cheackraze

  committed
  73c8fe6

  Copy full SHA for 73c8fe6

• Merge remote-tracking branch 'Salvantrix/02/27/2024-PR' into fork/02/27/2024-PR

  Cheackraze

  committed
  90709ee

  Copy full SHA for 90709ee

• fix RobustToolbox

  Cheackraze

  committed
  8528b05

  Copy full SHA for 8528b05

• fix robust

  Cheackraze

  committed
  432cf9f

  Copy full SHA for 432cf9f

• Merge branch 'master' into fork/02/27/2024-PR

  Cheackraze

  committed
  fc806d1

  Copy full SHA for fc806d1

• fix it already

  Cheackraze

  committed
  17e316f

  Copy full SHA for 17e316f

• fix

  Cheackraze

  committed
  994780c

  Copy full SHA for 994780c

• try again

  Cheackraze

  committed
  f18cd7a

  Copy full SHA for f18cd7a

• Merge remote-tracking branch 'Salvantrix/02/27/2024-PR' into fork/02/27/2024-PR

  Show description for 80008ba
  Cheackraze

  committed
  80008ba

  Copy full SHA for 80008ba

• remove robust

  Cheackraze

  committed
  52788d9

  Copy full SHA for 52788d9

• re add robust

  Cheackraze

  committed
  0319259

  Copy full SHA for 0319259

Commits on Mar 29, 2024

• Merge branch 'master' into fork/02/27/2024-PR

  Show description for 18d6723
  Cheackraze

  committed
  18d6723

  Copy full SHA for 18d6723

• rename Icon to icon

  Cheackraze

  committed
  fd6c276

  Copy full SHA for fd6c276

• id fix

  Cheackraze

  committed
  9af4d67

  Copy full SHA for 9af4d67

• rename initial

  Cheackraze

  committed
  dc0f1d4

  Copy full SHA for dc0f1d4

• rename

  Cheackraze

  committed
  b37cf60

  Copy full SHA for b37cf60

• fix the icon finally. why does git handle renaming so poorly i will never understand.

  Cheackraze

  committed
  56238ac

  Copy full SHA for 56238ac

• Merge branch 'master' into fork/02/27/2024-PR

  Cheackraze

  committed
  4e8d5d8

  Copy full SHA for 4e8d5d8

• mantle - Mantle

  Cheackraze

  committed
  34a537d

  Copy full SHA for 34a537d

• detective ranking change

  Cheackraze

  committed
  70e5021

  Copy full SHA for 70e5021

Commits on Mar 30, 2024

• NFSD Experimental Hardsuit + Doors

  Show description for 123dd1c
  Salvantrix

  committed
  123dd1c

  Copy full SHA for 123dd1c

• Suit+Wall mounted storage updated.

  Show description for c09bc7c
  Salvantrix

  committed
  c09bc7c

  Copy full SHA for c09bc7c

• blue = green

  Salvantrix

  committed
  ee240b1

  Copy full SHA for ee240b1

• Fix for HUD Icons

  Show description for e636147
  Salvantrix

  committed
  e636147

  Copy full SHA for e636147