-
Notifications
You must be signed in to change notification settings - Fork 414
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
Tryded
wants to merge
63
commits into
DeltaV-Station:master
Choose a base branch
from
Tryded:ERT-Overhaul-4.0
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+2,853
−37
Open
Ert Overhaul 4.0 #2552
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 4e9b60f
hardsuit YML
Tryded ec16eb6
Merge branch 'master' into ERT-Overhaul-4.0
Tryded a544f42
Elite Hardsuit Sprites and Helmets
Tryded f67c209
Merge branch 'master' into ERT-Overhaul-4.0
Tryded efbafb4
fix laser mags rsi
Tryded ba11f25
Merge branch 'ERT-Overhaul-4.0' of https://github.com/Tryded/Delta-v-…
Tryded 2f48183
attempt fix
Tryded be2790b
fix 2
Tryded 0c01227
fix3
Tryded 596928f
fix 5
Tryded d3d104a
Give Chaplain ERT actual powers
Tryded 39917ba
WHY IS THERE A 2 THERE
Tryded 002253d
Combat RCD
Tryded 3412342
advanced compact defib
Tryded 55e0738
CMO Defib steal objective
Tryded 8c643b9
fix RSIs
Tryded a92c44b
IK-60 redux
Tryded c299152
Merge branch 'master' into ERT-Overhaul-4.0
Tryded e91d880
RSI fixes
Tryded 8a48511
License fix
Tryded 2b34e35
PDW-9 Redux
Tryded 7c12ac7
Holorollerbeds
Tryded b1a27fb
Holostretcher folded
Tryded b1873bb
Immolator Cannons
Tryded ba36ea1
Researchable Immolator Cannons
Tryded e49990a
rsi Fixes
Tryded bdde111
rsi fix
Tryded a19e65e
fire protection to helmets
Tryded bd8549d
typo
Tryded 50803bd
Orderable Laser Carbines
Tryded 5deec5d
Lathe Recipes
Tryded 310ef07
miss cap fixes
Tryded f3d25ff
helmet and projectiles fix
Tryded 76c32a0
chemical bottles
Tryded 57e6da6
ERT loadouts
Tryded b2152e7
Merge branch 'master' into ERT-Overhaul-4.0
Tryded cce1a2f
No more survival box
Tryded a8500e8
Merge branch 'ERT-Overhaul-4.0' of https://github.com/Tryded/Delta-v-…
Tryded f483d43
Ghostroles for ERT
Tryded ba70ddc
fix
Tryded 0948f3f
fix2
Tryded acfe24f
Update EmergencyResponseTeam.yml
Tryded ad82a4d
fix
Tryded 3023d50
fix again
Tryded 3487bf7
ERT Hardsuit fix
Tryded 738a62e
spritefix
Tryded 7e8e1cc
typo
Tryded ed7bef4
Typo fix 2.0
Tryded 1ee6173
mass commenting out
Tryded 60c2e7c
Revert "mass commenting out"
Tryded cff553e
hotfix
Tryded 152c5d3
fixes
Tryded 423da97
the gun fixes
Tryded 4d088cb
loadout fixes
Tryded c2f09e0
rsi fixes
Tryded 7315875
Loadout fixes
Tryded 593cc9b
The great namespace move part 1
Tryded 116b7c3
Merge branch 'master' into ERT-Overhaul-4.0
Tryded 9cb56bf
No more DeltaV namespace
Tryded 0fb5df1
no more textures DeltaV namespace
Tryded 1feace3
gogogo
Tryded 6fdec08
Fingerscrossed Merge Conflict resolve
Tryded File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Combat RCD
commit 002253d4e622820c39c4ea5958c9bb76ec41cc2b
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
- type: entity | ||
id: RCDCombat | ||
parent: RCD | ||
name: Combat RCD #ERT | ||
description: The rapid construction device can be used to quickly place and remove various station structures and fixtures. This one seems to have a higher capacity. | ||
components: | ||
- type: LimitedCharges | ||
maxcharge: 500 | ||
charges: 500 |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix the order of these.