Ert Overhaul 4.0 #2552

Tryded · 2024-12-28T18:30:24Z

About the PR

Port Paradise Station ERT, Correctly this time. https://www.paradisestation.org/wiki/index.php/Emergency_Response_Team

Why / Balance

Makes it quicker to spawn ERT via the use of gamerules
Centers the ERT's arsenal around Energy Weaponry
Removes Pulse Rifles from main ERT's arsenal
Creates tiers of ERTs for different levels of threats.

Technical details

YAML gaming

Media

Requirements

I have tested all added content and changes.
I have added media to this PR or it does not require an ingame showcase.

To do:
Guns

Clothing

ERT hardsuit rebalance
Elite ERT hardsuits

Equipment

Combat RCD
Advanced Compact Defibrillator
~~- [ ] Universal Pinpointers targeting the Team Leader~~ separate PR
Holostretcher
Medkits of Medical Chemicals
Boxes of Mindshields
Boxes of C4s
~~[ ] Trash bags of holding~~

Spawning
~~- [ ] Gamerule for spawning ERT Pods~~ Separate PR
~~- [ ] Map of the actual pods for the ERT~~ Separate PR

ERT Ghostroles

Breaking changes

Changelog

🆑 Tryded

add: Added the advanced energy gun which self-recharges and has two settings: Disable and Kill. This is researchable by science.
tweak: There was a recent reorganization of the Emergency Response Teams by Nanotrasen.
DELTAVADMIN:
add: Added new gamerules for spawning Emergency Response Teams. ERTs are now is different tiers which increases in this order: Amber, Red, Gamma.

Avalon-Proto · 2024-12-28T18:35:26Z

I am already liking the sound of this

Lyndomen · 2024-12-28T19:04:50Z

This is dope, let me meetwith the team to find out what types of ERT would be good to have prebaked

Radezolid · 2024-12-28T19:44:47Z

While you're at it, make the ERT Engineer hardsuit fireproof please.

Unkn0wnGh0st333 · 2024-12-28T21:39:31Z

If you need help mapping a ERT shuttle let me know

github-actions · 2024-12-29T01:39:28Z

RSI Diff Bot; head commit c2f09e0 merging into 44413b0
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi

State	Old	New	Status
base			Removed
icon			Removed
inhand-left			Removed
inhand-right			Removed
mag-unshaded-0			Removed
mag-unshaded-1			Removed
mag-unshaded-2			Removed
mag-unshaded-3			Removed
mag-unshaded-4			Removed

Resources/Textures/DeltaV/Clothing/Head/Hardsuits/ERThelmets/eliteertchaplain.rsi

State	Old	New	Status
icon-flash			Added
icon			Added
off-equipped-HELMET-vulpkanin			Added
off-equipped-HELMET			Added
on-equipped-HELMET-vulpkanin			Added
on-equipped-HELMET			Added

Resources/Textures/DeltaV/Clothing/Head/Hardsuits/ERThelmets/eliteertengineer.rsi

State	Old	New	Status
icon-flash			Added
icon			Added
off-equipped-HELMET-vulpkanin			Added
off-equipped-HELMET			Added
on-equipped-HELMET-vulpkanin			Added
on-equipped-HELMET			Added

Resources/Textures/DeltaV/Clothing/Head/Hardsuits/ERThelmets/eliteertjanitor.rsi

State	Old	New	Status
icon-flash			Added
icon			Added
off-equipped-HELMET-vulpkanin			Added
off-equipped-HELMET			Added
on-equipped-HELMET-vulpkanin			Added
on-equipped-HELMET			Added

Resources/Textures/DeltaV/Clothing/Head/Hardsuits/ERThelmets/eliteertleader.rsi

State	Old	New	Status
icon-flash			Added
icon			Added
off-equipped-HELMET-vulpkanin			Added
off-equipped-HELMET			Added
on-equipped-HELMET-vulpkanin			Added
on-equipped-HELMET			Added

Resources/Textures/DeltaV/Clothing/Head/Hardsuits/ERThelmets/eliteertmedical.rsi

State	Old	New	Status
icon-flash			Added
icon			Added
off-equipped-HELMET-vulpkanin			Added
off-equipped-HELMET			Added
on-equipped-HELMET-vulpkanin			Added
on-equipped-HELMET			Added

Resources/Textures/DeltaV/Clothing/Head/Hardsuits/ERThelmets/eliteertsecurity.rsi

State	Old	New	Status
icon-flash			Added
icon			Added
off-equipped-HELMET-vulpkanin			Added
off-equipped-HELMET			Added
on-equipped-HELMET-vulpkanin			Added
on-equipped-HELMET			Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/ERTSuits/eliteertchaplain.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/ERTSuits/eliteertengineer.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/ERTSuits/eliteertjanitor.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/ERTSuits/eliteertleader.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/ERTSuits/eliteertmedical.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/ERTSuits/eliteertsecurity.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/DeltaV/Markers/jobs.rsi

State	Old	New	Status
ertchaplaingamma			Added
ertengineergamma			Added
ertjanitorgamma			Added
ertleadergamma			Added
ertmedicalgamma			Added
ertsecuritygamma			Added

Resources/Textures/DeltaV/Objects/Medical/advancedcompactdefib.rsi

State	Old	New	Status
equipped-BELT			Added
icon			Added
inhand-left			Added
inhand-right			Added
screen			Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Casings/laser_casing.rsi

State	Old	New	Status
base-spent			Added
base			Added
tip			Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Energy/laser_mag.rsi

State	Old	New	Status
base			Added
mag-1			Added
mag-2			Added
mag-3			Added
mag-4			Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygunadvanced.rsi

State	Old	New	Status
base			Added
icon			Added
inhand-left			Added
inhand-right			Added
mag-unshaded-0			Added
mag-unshaded-1			Added
mag-unshaded-2			Added
mag-unshaded-3			Added
mag-unshaded-4			Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/immolator.rsi

State	Old	New	Status
base			Added
equipped-BACKPACK			Added
equipped-SUITSTORAGE			Added
icon			Added
inhand-left			Added
inhand-right			Added
mag-unshaded-0			Added
mag-unshaded-1			Added
mag-unshaded-2			Added
mag-unshaded-3			Added
mag-unshaded-4			Added
wielded-inhand-left			Added
wielded-inhand-right			Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/multi_lens_immolator.rsi

State	Old	New	Status
base			Added
equipped-BACKPACK			Added
equipped-SUITSTORAGE			Added
icon			Added
inhand-left			Added
inhand-right			Added
mag-unshaded-0			Added
mag-unshaded-1			Added
mag-unshaded-2			Added
mag-unshaded-3			Added
mag-unshaded-4			Added
wielded-inhand-left			Added
wielded-inhand-right			Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/lasercarbine.rsi

State	Old	New	Status
base			Added
icon			Added
inhand-left			Added
inhand-right			Added
mag-0			Added
mag-1			Added
mag-2			Added
mag-3			Added
mag-4			Added
mag-unshaded-0			Added
mag-unshaded-1			Added
mag-unshaded-2			Added
mag-unshaded-3			Added
mag-unshaded-4			Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/lasercarbineert.rsi

State	Old	New	Status
base			Added
equipped-BACKPACK			Added
equipped-SUITSTORAGE			Added
icon			Added
inhand-left			Added
inhand-right			Added
mag-0			Added
mag-1			Added
mag-2			Added
mag-3			Added
mag-4			Added
mag-unshaded-0			Added
mag-unshaded-1			Added
mag-unshaded-2			Added
mag-unshaded-3			Added
mag-unshaded-4			Added

Resources/Textures/DeltaV/Structures/Furniture/rollerbeds.rsi

State	Old	New	Status
rollerbed			Added
rollerbed_buckled			Added
rollerbed_folded			Added

Edit: diff updated after c2f09e0

…rebase into ERT-Overhaul-4.0

This reverts commit 1ee6173.

Tryded · 2024-12-30T21:59:25Z

I have no idea why is it failing

github-actions · 2024-12-31T01:01:39Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Tryded added 2 commits December 28, 2024 12:10

Sprites + IK-30 and Advanced Energy Gun

0f4a3d7

hardsuit YML

4e9b60f

Tryded requested review from a team as code owners December 28, 2024 18:30

Tryded marked this pull request as draft December 28, 2024 18:30

github-actions bot added size/L 256-1023 lines S: Needs Review Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an rsi and removed S: Needs Review labels Dec 28, 2024

Tryded and others added 2 commits December 28, 2024 18:43

Merge branch 'master' into ERT-Overhaul-4.0

ec16eb6

Elite Hardsuit Sprites and Helmets

a544f42

Tryded and others added 12 commits December 28, 2024 19:39

Merge branch 'master' into ERT-Overhaul-4.0

f67c209

fix laser mags rsi

efbafb4

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

ba11f25

…rebase into ERT-Overhaul-4.0

attempt fix

2f48183

fix 2

be2790b

fix3

0c01227

fix 5

596928f

Give Chaplain ERT actual powers

d3d104a

WHY IS THERE A 2 THERE

39917ba

Combat RCD

002253d

advanced compact defib

3412342

CMO Defib steal objective

55e0738

chemical bottles

76c32a0

github-actions bot added size/XL Over 1024 lines and removed size/L 256-1023 lines labels Dec 29, 2024

Tryded and others added 5 commits December 29, 2024 13:29

ERT loadouts

57e6da6

Merge branch 'master' into ERT-Overhaul-4.0

b2152e7

No more survival box

cce1a2f

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

a8500e8

…rebase into ERT-Overhaul-4.0

Ghostroles for ERT

f483d43

Tryded marked this pull request as ready for review December 29, 2024 20:26

Tryded requested a review from a team as a code owner December 29, 2024 20:26

Tryded added 12 commits December 29, 2024 14:34

fix

ba70ddc

fix2

0948f3f

Update EmergencyResponseTeam.yml

acfe24f

fix

ad82a4d

fix again

3023d50

ERT Hardsuit fix

3487bf7

spritefix

738a62e

typo

7e8e1cc

Typo fix 2.0

ed7bef4

mass commenting out

1ee6173

Revert "mass commenting out"

60c2e7c

This reverts commit 1ee6173.

hotfix

cff553e

Tryded added 3 commits December 30, 2024 16:07

fixes

152c5d3

the gun fixes

423da97

loadout fixes

4d088cb

Tryded marked this pull request as draft December 30, 2024 22:41

rsi fixes

c2f09e0

github-actions bot added the S: Merge Conflict Fix your PR! label Dec 31, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Ert Overhaul 4.0 #2552

Ert Overhaul 4.0 #2552

Tryded commented Dec 28, 2024 •

edited

Loading

Avalon-Proto commented Dec 28, 2024

Lyndomen commented Dec 28, 2024

Radezolid commented Dec 28, 2024

Unkn0wnGh0st333 commented Dec 28, 2024

github-actions bot commented Dec 29, 2024 •

edited

Loading

Tryded commented Dec 30, 2024

github-actions bot commented Dec 31, 2024

Ert Overhaul 4.0 #2552

Are you sure you want to change the base?

Ert Overhaul 4.0 #2552

Conversation

Tryded commented Dec 28, 2024 • edited Loading

About the PR

Why / Balance

Technical details

Media

Requirements

Breaking changes

Avalon-Proto commented Dec 28, 2024

Lyndomen commented Dec 28, 2024

Radezolid commented Dec 28, 2024

Unkn0wnGh0st333 commented Dec 28, 2024

github-actions bot commented Dec 29, 2024 • edited Loading

Tryded commented Dec 30, 2024

github-actions bot commented Dec 31, 2024

Tryded commented Dec 28, 2024 •

edited

Loading

github-actions bot commented Dec 29, 2024 •

edited

Loading