Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ert Overhaul 4.0 #2552

Open
wants to merge 63 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
0f4a3d7
Sprites + IK-30 and Advanced Energy Gun
Tryded Dec 28, 2024
4e9b60f
hardsuit YML
Tryded Dec 28, 2024
ec16eb6
Merge branch 'master' into ERT-Overhaul-4.0
Tryded Dec 29, 2024
a544f42
Elite Hardsuit Sprites and Helmets
Tryded Dec 29, 2024
f67c209
Merge branch 'master' into ERT-Overhaul-4.0
Tryded Dec 29, 2024
efbafb4
fix laser mags rsi
Tryded Dec 29, 2024
ba11f25
Merge branch 'ERT-Overhaul-4.0' of https://github.com/Tryded/Delta-v-…
Tryded Dec 29, 2024
2f48183
attempt fix
Tryded Dec 29, 2024
be2790b
fix 2
Tryded Dec 29, 2024
0c01227
fix3
Tryded Dec 29, 2024
596928f
fix 5
Tryded Dec 29, 2024
d3d104a
Give Chaplain ERT actual powers
Tryded Dec 29, 2024
39917ba
WHY IS THERE A 2 THERE
Tryded Dec 29, 2024
002253d
Combat RCD
Tryded Dec 29, 2024
3412342
advanced compact defib
Tryded Dec 29, 2024
55e0738
CMO Defib steal objective
Tryded Dec 29, 2024
8c643b9
fix RSIs
Tryded Dec 29, 2024
a92c44b
IK-60 redux
Tryded Dec 29, 2024
c299152
Merge branch 'master' into ERT-Overhaul-4.0
Tryded Dec 29, 2024
e91d880
RSI fixes
Tryded Dec 29, 2024
8a48511
License fix
Tryded Dec 29, 2024
2b34e35
PDW-9 Redux
Tryded Dec 29, 2024
7c12ac7
Holorollerbeds
Tryded Dec 29, 2024
b1a27fb
Holostretcher folded
Tryded Dec 29, 2024
b1873bb
Immolator Cannons
Tryded Dec 29, 2024
ba36ea1
Researchable Immolator Cannons
Tryded Dec 29, 2024
e49990a
rsi Fixes
Tryded Dec 29, 2024
bdde111
rsi fix
Tryded Dec 29, 2024
a19e65e
fire protection to helmets
Tryded Dec 29, 2024
bd8549d
typo
Tryded Dec 29, 2024
50803bd
Orderable Laser Carbines
Tryded Dec 29, 2024
5deec5d
Lathe Recipes
Tryded Dec 29, 2024
310ef07
miss cap fixes
Tryded Dec 29, 2024
f3d25ff
helmet and projectiles fix
Tryded Dec 29, 2024
76c32a0
chemical bottles
Tryded Dec 29, 2024
57e6da6
ERT loadouts
Tryded Dec 29, 2024
b2152e7
Merge branch 'master' into ERT-Overhaul-4.0
Tryded Dec 29, 2024
cce1a2f
No more survival box
Tryded Dec 29, 2024
a8500e8
Merge branch 'ERT-Overhaul-4.0' of https://github.com/Tryded/Delta-v-…
Tryded Dec 29, 2024
f483d43
Ghostroles for ERT
Tryded Dec 29, 2024
ba70ddc
fix
Tryded Dec 29, 2024
0948f3f
fix2
Tryded Dec 29, 2024
acfe24f
Update EmergencyResponseTeam.yml
Tryded Dec 29, 2024
ad82a4d
fix
Tryded Dec 29, 2024
3023d50
fix again
Tryded Dec 29, 2024
3487bf7
ERT Hardsuit fix
Tryded Dec 29, 2024
738a62e
spritefix
Tryded Dec 29, 2024
7e8e1cc
typo
Tryded Dec 29, 2024
ed7bef4
Typo fix 2.0
Tryded Dec 29, 2024
1ee6173
mass commenting out
Tryded Dec 30, 2024
60c2e7c
Revert "mass commenting out"
Tryded Dec 30, 2024
cff553e
hotfix
Tryded Dec 30, 2024
152c5d3
fixes
Tryded Dec 30, 2024
423da97
the gun fixes
Tryded Dec 30, 2024
4d088cb
loadout fixes
Tryded Dec 30, 2024
c2f09e0
rsi fixes
Tryded Dec 30, 2024
7315875
Loadout fixes
Tryded Jan 5, 2025
593cc9b
The great namespace move part 1
Tryded Feb 6, 2025
116b7c3
Merge branch 'master' into ERT-Overhaul-4.0
Tryded Feb 8, 2025
9cb56bf
No more DeltaV namespace
Tryded Feb 8, 2025
0fb5df1
no more textures DeltaV namespace
Tryded Feb 8, 2025
1feace3
gogogo
Tryded Feb 20, 2025
6fdec08
Fingerscrossed Merge Conflict resolve
Tryded Feb 20, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix laser mags rsi
  • Loading branch information
Tryded committed Dec 29, 2024
commit efbafb4668cea517ecaa768fcf02f8b678b45572
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from TG Station at pull request https://github.com/ParadiseSS13/Paradise/pull/21147. Vulpkanin states by Tryded for DeltaV",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon",
},
{
"name": "icon-flash",
},
{
"name": "off-equipped-HELMET",
"directions": 4
},
{
"name": "on-equipped-HELMET",
"directions": 4
},
{
"name": "off-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "on-equipped-HELMET-vulpkanin",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
@@ -21,9 +21,6 @@
},
{
"name": "mag-unshaded-4"
},
{
"name": "mag-unshaded-5"
}
]
}