Code

Weapon resizing#34387

Code

Open

Nox38 wants to merge 22 commits intospace-wizards:masterspace-wizards/space-station-14:masterfrom Nox38:Weapon-ResizingNox38/space-station-14:Weapon-ResizingCopy head branch name to clipboard

+185-96

Commits

Commits on Jan 11, 2025

• Initial commit

  Nox38

  committed
  9e88c32

  Copy full SHA for 9e88c32

• Changed a few things

  Nox38

  committed
  ccb3d5b

  Copy full SHA for ccb3d5b

• made advanced laser pistol 2x2.

  Nox38

  committed
  4b91ded

  Copy full SHA for 4b91ded

Commits on Jan 12, 2025

• fixed Eshotgun error

  Nox38

  committed
  cfe86d3

  Copy full SHA for cfe86d3

• Made the Hristov actually fit into its bundle, oops

  Nox38

  committed
  0f83c7a

  Copy full SHA for 0f83c7a

Commits on Jan 13, 2025

• Made the pump shotguns larger.

  Nox38

  committed
  6b6f1ce

  Copy full SHA for 6b6f1ce

• Added custom sizes for unused guns, rebalanced Hristov and L6, made pump shotguns 2x5.

  Nox38

  committed
  61cc19c

  Copy full SHA for 61cc19c

• Renamed laser rifle to laser carbine

  Nox38

  committed
  1551092

  Copy full SHA for 1551092

• Flipped retro laser pistol, thanks ItzChilde! Also, oops mistake in laser rifle

  Nox38

  committed
  ddee319

  Copy full SHA for ddee319

• mistake in laser rifle oops

  Nox38

  committed
  1d2833c

  Copy full SHA for 1d2833c

Commits on Jan 21, 2025

• reverted laser rifle name change

  Nox38

  committed
  997190b

  Copy full SHA for 997190b

Commits on Jan 23, 2025

• Merge branch 'master' into Weapon-Resizing

  Nox38

  authored
  69712ba

  Copy full SHA for 69712ba

• Merge remote-tracking branch 'origin/master' into Weapon-Resizing

  Nox38

  committed
  93e4ece

  Copy full SHA for 93e4ece

• Merge remote-tracking branch 'origin/Weapon-Resizing' into Weapon-Resizing

  Nox38

  committed
  275a5c7

  Copy full SHA for 275a5c7

• Revert "reverted laser rifle name change"

  Show description for 1b252f6
  Nox38

  committed
  1b252f6

  Copy full SHA for 1b252f6

• fixed merge conflict I hope please god

  Nox38

  committed
  e4d54fe

  Copy full SHA for e4d54fe

Commits on Jan 31, 2025

• Merge remote-tracking branch 'origin/master' into Weapon-Resizing

  Nox38

  committed
  44fe46d

  Copy full SHA for 44fe46d

• Merge branch 'master' into Weapon-Resizing

  Nox38

  authored
  59937eb

  Copy full SHA for 59937eb

Commits on Feb 10, 2025

• Merge remote-tracking branch 'origin/master' into Weapon-Resizing

  Show description for 61e6825
  Nox38

  committed
  61e6825

  Copy full SHA for 61e6825

Commits on Mar 3, 2025

• Merge remote-tracking branch 'origin/master' into Weapon-Resizing

  Show description for 900cce2
  Nox38

  committed
  900cce2

  Copy full SHA for 900cce2

• Fixed merge conflicts, once again ready to go!

  Nox38

  committed
  74837b1

  Copy full SHA for 74837b1

• Fixed a small issue

  Nox38

  committed
  d0cb7ad

  Copy full SHA for d0cb7ad