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 can be unlocked from research.
add: Added the immolator cannon which shoots concentrated projectiles that causes the target to catch on fire. This can be unlocked from research.
tweak: There was a recent reorganization of the Emergency Response Teams by Nanotrasen.

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 6fdec08 merging into 13fa454
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_DV/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/_DV/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/_DV/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/_DV/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/_DV/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/_DV/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/_DV/Clothing/OuterClothing/Hardsuits/ERTSuits/eliteertchaplain.rsi

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

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

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

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

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

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

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

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

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

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

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

Resources/Textures/_DV/Markers/jobs.rsi

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

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

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

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

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

Resources/Textures/_DV/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/_DV/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/_DV/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/_DV/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/_DV/Objects/Weapons/Guns/Rifles/lasercarbine.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/_DV/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/_DV/Structures/Furniture/rollerbeds.rsi

State	Old	New	Status
rollerbed			Added
rollerbed_buckled			Added
rollerbed_folded			Added

Edit: diff updated after 6fdec08

…rebase into ERT-Overhaul-4.0

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

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

Lyndomen

Meowdy, taking this under direction review. From a technical perspective, it might be best to split this into 3 separate PRs- one adding advanced Defib, one overhauling guns, and the other adding ERT.

Stop-Signs · 2025-01-29T19:10:54Z

Hi there! Direction update here, this PR is really cool and we are putting it on our priority list, we should have a decision on this within a few days, at most one week.

Stop-Signs · 2025-01-31T23:27:40Z

Hey again, here with direction feedback! First of all we love this PR and think its fantastic, we have some slight concerns mainly about the weapons being changed/added.

Specifically, the IK carbine. We would like the IK carbine to be researchable, not orderable by cargo, and along with that we dont really see a reason to split it between the IK-30 and IK-60. Basically toss the IK-30 and put the IK-60 in its own research along with the ammo and magazines for it. Furthermore since its already full auto in its current iteration we would like it to have a full and semi auto fire mode. Other than that everything looks good.

Oh and in the description of these new guns you may consider not including the word "laser" for energy projectiles.

Tryded · 2025-01-31T23:43:46Z

Hey again, here with direction feedback! First of all we love this PR and think its fantastic, we have some slight concerns mainly about the weapons being changed/added.

Specifically, the IK carbine. We would like the IK carbine to be researchable, not orderable by cargo, and along with that we dont really see a reason to split it between the IK-30 and IK-60. Basically toss the IK-30 and put the IK-60 in its own research along with the ammo and magazines for it. Furthermore since its already full auto in its current iteration we would like it to have a full and semi auto fire mode. Other than that everything looks good.

The main difference between IK-30 and IK-60 is that Ik-60 is ERT exclusive and better compared to Ik-30 as it has a 2 shot burst fire mode that acts a bit like the hyper fire mode of the AN-94. I might just make IK-30 researchable with full auto but give the special hyperburst to the IK-60

Stop-Signs · 2025-01-31T23:48:35Z

That would be fine, we would like the ik-30 to remain similar to the current ik60. As well as keeping more powerful guns out of the cargo manifest.

Radezolid

Couple of notes for whenever you move to the _DV namespace:

Comment out the ERT upstream backpacks to avoid repetition on the spawn menu.
Remove the defibrillator PR from this one until it gets approved, meanwhile you can give them the DefibrillatorCompact.
JSON needs four space indentation and perma links to commits where you took them from cited at the copyright.
The ERT elite helmet icons are too small for our format, they look weird on the action bar.
Fix the order of the id, parent and name. The correct order is: type>abstract>parent>id>name>description>components`.

Radezolid · 2025-01-31T22:41:24Z

Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/medical.yml

Add a end of file newline.

Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/medical.yml

Radezolid · 2025-01-31T22:43:42Z

Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/medical.yml

+      - state: box
+      - state: bottle


Same here, remove two spaces from the indentation.

Radezolid · 2025-01-31T22:45:09Z

Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/medical.yml

+
+- type: entity
+  name: advanced medicine bottle box
+  parent: BoxCardboard


Inherit from the basic medicine box you made earlier to reduce repeated stuff like the description and sprite definition.

Radezolid · 2025-02-01T03:07:05Z

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-0
+        map: ["enum.GunVisualLayers.Mag"]


Change this line to use the ["enum.GunVisualLayers.MagUnshaded"] map so the magazine aligns properly.

Radezolid · 2025-02-01T03:08:18Z

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

+        map: ["enum.GunVisualLayers.Base"]
+        shader: unshaded
+      - state: mag-0
+        map: ["enum.GunVisualLayers.Mag"]
+      - state: mag-unshaded-0
+        map: ["enum.GunVisualLayers.MagUnshaded"]
+        shader: unshaded


Unindent by two spaces.

Radezolid · 2025-02-01T03:08:40Z

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

Remove this to fix the double magazine.

Radezolid · 2025-02-01T03:16:12Z

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Battery/immolator.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-unshaded-4
+        map: ["enum.GunVisualLayers.MagUnshaded"]
+        shader: unshaded
+  - type: Gun
+    fireRate: 1.5
+    soundGunshot:
+      path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg
+    soundEmpty:
+      path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletEnergyGunMediumImmolator
+    fireCost: 100
+  - type: Battery
+    maxCharge: 800
+    startingCharge: 800
+  - type: GunRequiresWield


You are missing the clothing component for it to show at the back.

Radezolid · 2025-02-01T03:21:31Z

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

+- type: entity
+  parent: BulletEnergyGunLaser
+  id: BulletEnergyGunMediumImmolator
+  name: Medium Immolator Bolt
+  components:
+    - type: IgniteOnCollide
+      fireStacks: 1.0
+
+- type: entity
+  parent: BulletEnergyGunLaser
+  id: BulletEnergyGunHeavyImmolator
+  name: Heavy Immolator Bolt
+  components:
+    - type: IgniteOnCollide
+      fireStacks: 1.5
+    - type: Projectile
+      impactEffect: BulletImpactEffectRedDisabler
+      damage:
+        types:
+          Heat: 45
+      soundHit:
+        collection: MeatLaserImpact
+
+- type: entity
+  parent: BulletEnergyGunLaser
+  id: BulletEnergyGunLightImmolator
+  name: Light Immolator Bolt
+  components:
+    - type: IgniteOnCollide
+      fireStacks: .25
+    - type: Projectile
+      impactEffect: BulletImpactEffectRedDisabler
+      damage:
+        types:
+          Heat: 8
+      soundHit:
+        collection: MeatLaserImpact


These need [ HideSpawnMenu ].

github-actions · 2025-02-06T13:38:36Z

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

Signed-off-by: Tryded <[email protected]>

github-actions · 2025-02-09T22:25:20Z

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

Tryded added 2 commits December 30, 2024 16:15

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

Tryded mentioned this pull request Jan 5, 2025

energy guns buff take 2 #2623

Merged

2 tasks

Loadout fixes

7315875

Tryded marked this pull request as ready for review January 5, 2025 20:20

Lyndomen reviewed Jan 5, 2025

View reviewed changes

Tryded mentioned this pull request Jan 12, 2025

Add Advanced Compact Defibrilator #2713

Open

2 tasks

Radezolid suggested changes Feb 1, 2025

View reviewed changes

The great namespace move part 1

593cc9b

Tryded requested a review from deltanedas as a code owner February 6, 2025 02:00

github-actions bot added S: Merge Conflict Fix your PR! and removed S: Merge Conflict Fix your PR! labels Feb 6, 2025

Merge branch 'master' into ERT-Overhaul-4.0

116b7c3

Signed-off-by: Tryded <[email protected]>

github-actions bot removed the S: Merge Conflict Fix your PR! label Feb 8, 2025

Tryded added 2 commits February 8, 2025 17:17

No more DeltaV namespace

9cb56bf

no more textures DeltaV namespace

0fb5df1

github-actions bot added the S: Merge Conflict Fix your PR! label Feb 9, 2025

Tryded added 2 commits February 20, 2025 14:58

gogogo

1feace3

Fingerscrossed Merge Conflict resolve

6fdec08

github-actions bot removed the S: Merge Conflict Fix your PR! label Feb 20, 2025

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

github-actions bot commented Dec 31, 2024

Lyndomen left a comment

Stop-Signs commented Jan 29, 2025

Stop-Signs commented Jan 31, 2025

Tryded commented Jan 31, 2025

Stop-Signs commented Jan 31, 2025 •

edited

Loading

Radezolid left a comment

Radezolid Jan 31, 2025

Radezolid Jan 31, 2025

Radezolid Jan 31, 2025

Radezolid Feb 1, 2025

Radezolid Feb 1, 2025

Radezolid Feb 1, 2025

Radezolid Feb 1, 2025

Radezolid Feb 1, 2025

github-actions bot commented Feb 6, 2025

github-actions bot commented Feb 9, 2025

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

github-actions bot commented Dec 31, 2024

Lyndomen left a comment

Choose a reason for hiding this comment

Stop-Signs commented Jan 29, 2025

Stop-Signs commented Jan 31, 2025

Tryded commented Jan 31, 2025

Stop-Signs commented Jan 31, 2025 • edited Loading

Radezolid left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Feb 6, 2025

github-actions bot commented Feb 9, 2025

Tryded commented Dec 28, 2024 •

edited

Loading

github-actions bot commented Dec 29, 2024 •

edited

Loading

Stop-Signs commented Jan 31, 2025 •

edited

Loading