Code

nt expeditionary weapons#6682

Code

Merged

TheLordME merged 52 commits intoCitadel-Station-13:masterCitadel-Station-13/Citadel-Station-13-RP:masterfrom silicons:thogsilicons/Citadel-Station-13-RP:thogCopy head branch name to clipboardOct 14, 2024

+1,348-244

Commits

Commits on Aug 6, 2024

• staging sprites

  silicons

  committed
  af4fcee

  Copy full SHA for af4fcee

Commits on Aug 7, 2024

• stub everything, add SRP

  silicons

  committed
  24f4765

  Copy full SHA for 24f4765

Commits on Aug 21, 2024

• stage that

  silicons

  committed
  c466624

  Copy full SHA for c466624

Commits on Aug 22, 2024

• shotguns

  silicons

  committed
  a433483

  Copy full SHA for a433483

• names

  silicons

  committed
  d5857b6

  Copy full SHA for d5857b6

• heavy rifle descs

  silicons

  committed
  f5c26a9

  Copy full SHA for f5c26a9

• rest of the descs

  silicons

  committed
  6ba9157

  Copy full SHA for 6ba9157

• constant expressions

  silicons

  committed
  4b496c2

  Copy full SHA for 4b496c2

• hrm

  silicons

  committed
  02bd69c

  Copy full SHA for 02bd69c

Commits on Aug 23, 2024

• projectiles, split up

  silicons

  committed
  81e3fb2

  Copy full SHA for 81e3fb2

Commits on Aug 24, 2024

• Merge remote-tracking branch 'citrp/master' into thog

  silicons

  committed
  980600c

  Copy full SHA for 980600c

Commits on Aug 25, 2024

• all that

  silicons

  committed
  5807d15

  Copy full SHA for 5807d15

• those

  silicons

  committed
  21e9273

  Copy full SHA for 21e9273

• Sprites

  silicons

  committed
  af0d572

  Copy full SHA for af0d572

• .dmi

  silicons

  committed
  3988ecd

  Copy full SHA for 3988ecd

• stuff

  silicons

  committed
  d3516df

  Copy full SHA for d3516df

• that

  silicons

  committed
  c500db7

  Copy full SHA for c500db7

Commits on Sep 2, 2024

• Merge remote-tracking branch 'upstream/master' into thog

  silicons

  committed
  6104775

  Copy full SHA for 6104775

• better comment

  silicons

  committed
  5cef56c

  Copy full SHA for 5cef56c

• that

  silicons

  committed
  c50d49e

  Copy full SHA for c50d49e

Commits on Sep 10, 2024

• Merge remote-tracking branch 'upstream/master' into thog

  silicons

  committed
  e4aba47

  Copy full SHA for e4aba47

• that

  silicons

  committed
  0167054

  Copy full SHA for 0167054

Commits on Sep 28, 2024

• Merge remote-tracking branch 'citrp/master' into thog

  silicons

  committed
  c4fd68c

  Copy full SHA for c4fd68c

• that

  silicons

  committed
  cc1832f

  Copy full SHA for cc1832f

• heavy rifle

  silicons

  committed
  4b78847

  Copy full SHA for 4b78847

• that

  silicons

  committed
  42d0573

  Copy full SHA for 42d0573

• progress

  silicons

  committed
  2756328

  Copy full SHA for 2756328

• load methods

  silicons

  committed
  fc65380

  Copy full SHA for fc65380

Commits on Oct 4, 2024

• fix

  silicons

  committed
  06b26d6

  Copy full SHA for 06b26d6

• Merge remote-tracking branch 'upstream/master' into thog

  silicons

  committed
  10c85b6

  Copy full SHA for 10c85b6

Commits on Oct 5, 2024

• that

  silicons

  committed
  4bd87c6

  Copy full SHA for 4bd87c6

• that

  silicons

  committed
  eeb7e62

  Copy full SHA for eeb7e62

• rifle sprites

  silicons

  committed
  80ff1f5

  Copy full SHA for 80ff1f5

Commits on Oct 8, 2024

• stuff

  silicons

  committed
  68875b1

  Copy full SHA for 68875b1

• statusus

  silicons

  committed
  1dd6f5b

  Copy full SHA for 1dd6f5b

Commits on Oct 12, 2024

• Merge remote-tracking branch 'citrp/master' into thog

  silicons

  committed
  d6bfa7d

  Copy full SHA for d6bfa7d

• Fix

  silicons

  committed
  9c857ac

  Copy full SHA for 9c857ac

Commits on Oct 13, 2024

• that

  silicons

  committed
  9b3cf82

  Copy full SHA for 9b3cf82

• sigh

  silicons

  committed
  3456f73

  Copy full SHA for 3456f73

• that

  silicons

  committed
  e256140

  Copy full SHA for e256140

• that

  silicons

  committed
  58e8505

  Copy full SHA for 58e8505

• renderer

  silicons

  committed
  eeb1965

  Copy full SHA for eeb1965

• fix

  silicons

  committed
  529f40e

  Copy full SHA for 529f40e

Commits on Oct 14, 2024

• fix

  silicons

  committed
  134f8f8

  Copy full SHA for 134f8f8

• fix

  silicons

  committed
  a6d1e48

  Copy full SHA for a6d1e48

• iknow this isn't an admin pr but it's so bad i can't debug so lol

  silicons

  committed
  52ccb27

  Copy full SHA for 52ccb27

• iknow this isn't an admin pr but it's so bad i can't debug so lol

  silicons

  committed
  fe6608f

  Copy full SHA for fe6608f

• shorten the paths

  silicons

  committed
  f700711

  Copy full SHA for f700711

• Fix

  silicons

  committed
  5c95f0d

  Copy full SHA for 5c95f0d

• better ejection

  silicons

  committed
  e584d0c

  Copy full SHA for e584d0c

• make that clearer

  silicons

  committed
  56923fe

  Copy full SHA for 56923fe

• Fix

  silicons

  committed
  5c55369

  Copy full SHA for 5c55369