Code

Ert Overhaul 4.0#2552

Code

Open

Tryded wants to merge 63 commits intoDeltaV-Station:masterDeltaV-Station/Delta-v:masterfrom Tryded:ERT-Overhaul-4.0Tryded/Delta-v-rebase:ERT-Overhaul-4.0Copy head branch name to clipboard

+2,853-37

Commits

Commits on Dec 28, 2024

• Sprites + IK-30 and Advanced Energy Gun

  Tryded

  committed
  0f4a3d7

  Copy full SHA for 0f4a3d7

• hardsuit YML

  Tryded

  committed
  4e9b60f

  Copy full SHA for 4e9b60f

Commits on Dec 29, 2024

• Merge branch 'master' into ERT-Overhaul-4.0

  Tryded

  authored
  ec16eb6

  Copy full SHA for ec16eb6

• Elite Hardsuit Sprites and Helmets

  Tryded

  committed
  a544f42

  Copy full SHA for a544f42

• Merge branch 'master' into ERT-Overhaul-4.0

  Tryded

  authored
  f67c209

  Copy full SHA for f67c209

• fix laser mags rsi

  Tryded

  committed
  efbafb4

  Copy full SHA for efbafb4

• Merge branch 'ERT-Overhaul-4.0' of https://github.com/Tryded/Delta-v-rebase into ERT-Overhaul-4.0

  Tryded

  committed
  ba11f25

  Copy full SHA for ba11f25

• attempt fix

  Tryded

  committed
  2f48183

  Copy full SHA for 2f48183

• fix 2

  Tryded

  committed
  be2790b

  Copy full SHA for be2790b

• fix3

  Tryded

  committed
  0c01227

  Copy full SHA for 0c01227

• fix 5

  Tryded

  committed
  596928f

  Copy full SHA for 596928f

• Give Chaplain ERT actual powers

  Tryded

  committed
  d3d104a

  Copy full SHA for d3d104a

• WHY IS THERE A 2 THERE

  Tryded

  committed
  39917ba

  Copy full SHA for 39917ba

• Combat RCD

  Tryded

  committed
  002253d

  Copy full SHA for 002253d

• advanced compact defib

  Tryded

  committed
  3412342

  Copy full SHA for 3412342

• CMO Defib steal objective

  Tryded

  committed
  55e0738

  Copy full SHA for 55e0738

• fix RSIs

  Tryded

  committed
  8c643b9

  Copy full SHA for 8c643b9

• IK-60 redux

  Tryded

  committed
  a92c44b

  Copy full SHA for a92c44b

• Merge branch 'master' into ERT-Overhaul-4.0

  Tryded

  authored
  c299152

  Copy full SHA for c299152

• RSI fixes

  Tryded

  committed
  e91d880

  Copy full SHA for e91d880

• License fix

  Tryded

  committed
  8a48511

  Copy full SHA for 8a48511

• PDW-9 Redux

  Tryded

  committed
  2b34e35

  Copy full SHA for 2b34e35

• Holorollerbeds

  Tryded

  committed
  7c12ac7

  Copy full SHA for 7c12ac7

• Holostretcher folded

  Tryded

  committed
  b1a27fb

  Copy full SHA for b1a27fb

• Immolator Cannons

  Tryded

  committed
  b1873bb

  Copy full SHA for b1873bb

• Researchable Immolator Cannons

  Tryded

  committed
  ba36ea1

  Copy full SHA for ba36ea1

• rsi Fixes

  Tryded

  committed
  e49990a

  Copy full SHA for e49990a

• rsi fix

  Tryded

  committed
  bdde111

  Copy full SHA for bdde111

• fire protection to helmets

  Tryded

  committed
  a19e65e

  Copy full SHA for a19e65e

• typo

  Tryded

  committed
  bd8549d

  Copy full SHA for bd8549d

• Orderable Laser Carbines

  Tryded

  committed
  50803bd

  Copy full SHA for 50803bd

• Lathe Recipes

  Tryded

  committed
  5deec5d

  Copy full SHA for 5deec5d

• miss cap fixes

  Tryded

  committed
  310ef07

  Copy full SHA for 310ef07

• helmet and projectiles fix

  Tryded

  committed
  f3d25ff

  Copy full SHA for f3d25ff

• chemical bottles

  Tryded

  committed
  76c32a0

  Copy full SHA for 76c32a0

• ERT loadouts

  Tryded

  committed
  57e6da6

  Copy full SHA for 57e6da6

• Merge branch 'master' into ERT-Overhaul-4.0

  Tryded

  authored
  b2152e7

  Copy full SHA for b2152e7

• No more survival box

  Tryded

  committed
  cce1a2f

  Copy full SHA for cce1a2f

• Merge branch 'ERT-Overhaul-4.0' of https://github.com/Tryded/Delta-v-rebase into ERT-Overhaul-4.0

  Tryded

  committed
  a8500e8

  Copy full SHA for a8500e8

• Ghostroles for ERT

  Tryded

  committed
  f483d43

  Copy full SHA for f483d43

• fix

  Tryded

  committed
  ba70ddc

  Copy full SHA for ba70ddc

• fix2

  Tryded

  committed
  0948f3f

  Copy full SHA for 0948f3f

• Update EmergencyResponseTeam.yml

  Tryded

  committed
  acfe24f

  Copy full SHA for acfe24f

• fix

  Tryded

  committed
  ad82a4d

  Copy full SHA for ad82a4d

• fix again

  Tryded

  committed
  3023d50

  Copy full SHA for 3023d50

• ERT Hardsuit fix

  Tryded

  committed
  3487bf7

  Copy full SHA for 3487bf7

• spritefix

  Tryded

  committed
  738a62e

  Copy full SHA for 738a62e

• typo

  Tryded

  committed
  7e8e1cc

  Copy full SHA for 7e8e1cc

• Typo fix 2.0

  Tryded

  committed
  ed7bef4

  Copy full SHA for ed7bef4

Commits on Dec 30, 2024

• mass commenting out

  Tryded

  committed
  1ee6173

  Copy full SHA for 1ee6173

• Revert "mass commenting out"

  Show description for 60c2e7c
  Tryded

  committed
  60c2e7c

  Copy full SHA for 60c2e7c

• hotfix

  Tryded

  committed
  cff553e

  Copy full SHA for cff553e

• fixes

  Tryded

  committed
  152c5d3

  Copy full SHA for 152c5d3

• the gun fixes

  Tryded

  committed
  423da97

  Copy full SHA for 423da97

• loadout fixes

  Tryded

  committed
  4d088cb

  Copy full SHA for 4d088cb

• rsi fixes

  Tryded

  committed
  c2f09e0

  Copy full SHA for c2f09e0

Commits on Jan 5, 2025

• Loadout fixes

  Tryded

  committed
  7315875

  Copy full SHA for 7315875

Commits on Feb 6, 2025

• The great namespace move part 1

  Tryded

  committed
  593cc9b

  Copy full SHA for 593cc9b

Commits on Feb 8, 2025

• Merge branch 'master' into ERT-Overhaul-4.0

  Show description for 116b7c3
  Tryded

  authored
  116b7c3

  Copy full SHA for 116b7c3

• No more DeltaV namespace

  Tryded

  committed
  9cb56bf

  Copy full SHA for 9cb56bf

• no more textures DeltaV namespace

  Tryded

  committed
  0fb5df1

  Copy full SHA for 0fb5df1

Commits on Feb 20, 2025

• gogogo

  Tryded

  committed
  1feace3

  Copy full SHA for 1feace3

• Fingerscrossed Merge Conflict resolve

  Tryded

  committed
  6fdec08

  Copy full SHA for 6fdec08