Code

Weapons Update#350

Code

Merged

Rxup merged 27 commits intoRxup:masterRxup/space-station-14:masterfrom nomad0260:weapons-updatenomad0260/space-station-14-:weapons-updateCopy head branch name to clipboardDec 16, 2023

+1,248-87

Commits

Commits on Nov 26, 2023

• first changes

  nomad0260

  committed
  e632354

  Copy full SHA for e632354

• Update pulse.yml

  nomad0260

  committed
  0aad87a

  Copy full SHA for 0aad87a

• Update guns64.ftl

  nomad0260

  committed
  d27daf3

  Copy full SHA for d27daf3

• Update uplink_catalog.yml

  nomad0260

  committed
  e9c0a95

  Copy full SHA for e9c0a95

• Update observer.yml

  nomad0260

  committed
  19fd2e8

  Copy full SHA for 19fd2e8

• саммери

  nomad0260

  committed
  1f3b3ee

  Copy full SHA for 1f3b3ee

Commits on Nov 29, 2023

• textures

  nomad0260

  committed
  645fe21

  Copy full SHA for 645fe21

• Merge branch 'Rxup:master' into weapons-update

  nomad0260

  authored
  f2c6465

  Copy full SHA for f2c6465

• some staff

  nomad0260

  committed
  c8657c0

  Copy full SHA for c8657c0

• Merge branch 'weapons-update' of https://github.com/nomad0260/space-station-14- into weapons-update

  nomad0260

  committed
  7e17fcc

  Copy full SHA for 7e17fcc

Commits on Dec 13, 2023

• Merge branch 'weapons-update' of https://github.com/nomad0260/space-station-14- into weapons-update

  nomad0260

  committed
  7271018

  Copy full SHA for 7271018

• Update guns64.ftl

  nomad0260

  committed
  24dbc12

  Copy full SHA for 24dbc12

• Summery

  nomad0260

  committed
  52e3cd1

  Copy full SHA for 52e3cd1

• Update centFifa.yml

  nomad0260

  committed
  f8fe04b

  Copy full SHA for f8fe04b

• Update centFifa.yml

  nomad0260

  committed
  0920428

  Copy full SHA for 0920428

• Update uplink_catalog.yml

  nomad0260

  committed
  5e5a5f1

  Copy full SHA for 5e5a5f1

• Update pulse.yml

  nomad0260

  committed
  d592b90

  Copy full SHA for d592b90

Commits on Dec 14, 2023

• Revert "Update observer.yml"

  Show description for ec55c86
  nomad0260

  committed
  ec55c86

  Copy full SHA for ec55c86

• Conflicts

  nomad0260

  committed
  0b24074

  Copy full SHA for 0b24074

• Merge branch 'master' into weapons-update

  nomad0260

  committed
  bb541b6

  Copy full SHA for bb541b6

• Update migration.yml

  nomad0260

  committed
  ac7ef0a

  Copy full SHA for ac7ef0a

Commits on Dec 15, 2023

• Update armory.yml

  nomad0260

  committed
  67c83b8

  Copy full SHA for 67c83b8

• Update pulse.yml

  nomad0260

  committed
  72e48e0

  Copy full SHA for 72e48e0

• Update briefcases.yml

  nomad0260

  committed
  7083fe0

  Copy full SHA for 7083fe0

• sr127

  nomad0260

  committed
  9a77265

  Copy full SHA for 9a77265

• sr127

  nomad0260

  committed
  196d396

  Copy full SHA for 196d396

• some fixs

  nomad0260

  committed
  e2c733f

  Copy full SHA for e2c733f