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 all commits
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
1 change: 1 addition & 0 deletions Delta-v-rebase
Submodule Delta-v-rebase added at 900727
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/_DV/research/technologies.ftl
Original file line number Diff line number Diff line change
@@ -10,5 +10,8 @@ research-technology-energy-gun = Energy Guns
research-technology-energy-gun-advance = Advanced Energy Manipulation
research-technology-experimental-salvage-weaponry = Experimental Salvage Weaponry
research-technology-advance-laser = Advanced Laser Manipulation
research-technology-robust-melee = Robust Melee
research-technology-syringe-gun = Syringe Gun
research-technology-ionized-cryogenic-emission-equipment = Ionized Cryogenic Emission Equipment
research-technology-robust-melee = Robust Melee
research-technology-incendiary-laser-weapons = Incendiary Laser Weapons
Original file line number Diff line number Diff line change
@@ -607,6 +607,15 @@
sprite: Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi
- type: PointLight
color: "#ffffff"
- type: Psionic #DeltaV: Start - Psionic Countering Abilities
- type: TinfoilHat
passthrough: true
destroyOnFry: false
- type: ClothingGrantPsionicPower
power: DispelPower
- type: GuideHelp
guides:
- Psionics #DeltaV: End - Psionic Countering Abilities

#ERT Engineer Hardsuit
- type: entity
@@ -628,6 +637,8 @@
Slash: 0.9
Piercing: 0.9
Heat: 0.9
- type: FireProtection #DeltaV: ERT overhaul
reduction: 0.2 #DeltaV: ERT overhaul

#ERT Medical Hardsuit
- type: entity
15 changes: 14 additions & 1 deletion Resources/Prototypes/Research/arsenal.yml
Original file line number Diff line number Diff line change
@@ -162,7 +162,7 @@
- PowerCageMedium
- MagazineGrenadeEmpty
- GrenadeFlash
- GrenadeBlast
- GrenadeBlast
- ShuttleGunSvalinnMachineGunCircuitboard
- ShuttleGunPerforatorCircuitboard
- ShuttleGunFriendshipCircuitboard
@@ -183,6 +183,7 @@
recipeUnlocks:
- WeaponAdvancedLaser
- PortableRecharger
- WeaponEnergyGunAdvanced #DeltaV: Advanced Energy Gun

#- type: technology # DeltaV - Removed for only causing issues
# id: ExperimentalBatteryAmmo
@@ -196,6 +197,18 @@
# recipeUnlocks:
# - WeaponLaserSvalinn

- type: technology
id: ExperimentalBatteryAmmo
name: research-technology-experimental-battery-ammo
icon:
sprite: Objects/Weapons/Guns/Battery/svalinn.rsi
state: icon
discipline: Arsenal
tier: 2 # DeltaV: moved to t2 from t3
cost: 15000
recipeUnlocks:
- WeaponLaserSvalinn

- type: technology
id: AdvancedShuttleWeapon
name: research-technology-advanced-shuttle-weapon
38 changes: 38 additions & 0 deletions Resources/Prototypes/_DV/Catalog/Fills/Boxes/medical.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
- type: entity
name: basic medicine bottle box
parent: BoxCardboard
id: BoxBottleMedicineBasic
description: A box full of bottles with medicine.
components:
- type: StorageFill
contents:
- id: BruizineChemistryBottle
- id: LacerinolChemistryBottle
- id: PuncturaseChemistryBottle
- id: DermalineChemistryBottle
- id: PyrazineChemistryBottle
- id: DiphenhydramineChemistryBottle
- id: OmnizineChemistryBottle
- id: EphedrineChemistryBottle
amount: 2
- type: Sprite
layers:
- state: box
- state: bottle

- type: entity
name: advanced medicine bottle box
parent: BoxCardboard
id: BoxBottleMedicineAdvanced
description: A box full of bottles with medicine.
components:
- type: StorageFill
contents:
- id: OmnizineChemistryBottle
amount: 7
- id: EphedrineChemistryBottle
amount: 2
- type: Sprite
layers:
- state: box
- state: bottle
22 changes: 22 additions & 0 deletions Resources/Prototypes/_DV/Catalog/Fills/Boxes/security.yml
Original file line number Diff line number Diff line change
@@ -14,3 +14,25 @@
- id: CassetteTape
amount: 4
- id: TapeRecorder

- type: entity
name: mindshield box
parent: BoxCardboard
id: BoxMindshield
description: A box filled with mindshield implants.
components:
- type: StorageFill
contents:
- id: MindShieldImplanter
amount: 4

- type: entity
name: c4 box
parent: BoxCardboard
id: BoxC4
description: A box filled with C4s.
components:
- type: StorageFill
contents:
- id: C4
amount: 4
1 change: 1 addition & 0 deletions Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
@@ -65,6 +65,7 @@
- id: CMOIDCard
- id: ClothingShoesBootsWinterChiefMedicalOfficer
- id: LunchboxCommandFilledRandom
- id: DefibrillatorCompactAdvanced # New Steal Objective
prob: 0.3
- id: ChemMasterFlatpack # So the chemist can make pills
- id: MedBioFabricatorFlatpack # Replaced the shitmed board
69 changes: 69 additions & 0 deletions Resources/Prototypes/_DV/Entities/Clothing/Back/backpacks.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,72 @@
#ERT
- type: entity
parent: [ ClothingBackpack, BaseCentcommContraband ]
id: ClothingBackpackERTLeaderDeltaV
name: ERT leader backpack
description: A spacious backpack with lots of pockets, worn by the Commander of an Emergency Response Team.
components:
- type: Sprite
sprite: Clothing/Back/Backpacks/ertleader.rsi
- type: Storage
grid:
- 0,0,10,3
- type: ExplosionResistance
damageCoefficient: 0.1

- type: entity
parent: ClothingBackpackERTLeaderDeltaV
id: ClothingBackpackERTSecurityDeltaV
name: ERT security backpack
description: A spacious backpack with lots of pockets, worn by Security Officers of an Emergency Response Team.
components:
- type: Sprite
sprite: Clothing/Back/Backpacks/ertsec.rsi

- type: entity
parent: ClothingBackpackERTLeaderDeltaV
id: ClothingBackpackERTMedicalDeltaV
name: ERT medical backpack
description: A spacious backpack with lots of pockets, worn by Medical Officers of an Emergency Response Team.
components:
- type: Sprite
sprite: Clothing/Back/Backpacks/ertmed.rsi

- type: entity
parent: ClothingBackpackERTLeaderDeltaV
id: ClothingBackpackERTEngineerDeltaV
name: ERT engineer backpack
description: A spacious backpack with lots of pockets, worn by Engineers of an Emergency Response Team.
components:
- type: Sprite
sprite: Clothing/Back/Backpacks/erteng.rsi

- type: entity
parent: ClothingBackpackERTLeaderDeltaV
id: ClothingBackpackERTJanitorDeltaV
name: ERT janitor backpack
description: A spacious backpack with lots of pockets, worn by Janitors of an Emergency Response Team.
components:
- type: Sprite
sprite: Clothing/Back/Backpacks/ertjanitor.rsi

- type: entity
parent: ClothingBackpackERTLeaderDeltaV
id: ClothingBackpackERTClownDeltaV
name: ERT clown backpack
description: A spacious backpack with lots of pockets, worn by Clowns of an Emergency Response Team.
components:
- type: Sprite
sprite: Clothing/Back/Backpacks/ertclown.rsi

- type: entity
parent: ClothingBackpackERTLeaderDeltaV
id: ClothingBackpackERTChaplainDeltaV
name: ERT chaplain backpack
description: A spacious backpack with lots of pockets, worn by Chaplains of an Emergency Response Team.
components:
- type: Sprite
sprite: Clothing/Back/Backpacks/ertchaplain.rsi

- type: entity
parent: ClothingBackpack
id: ClothingBackpackCentcom
127 changes: 127 additions & 0 deletions Resources/Prototypes/_DV/Entities/Clothing/Head/hardsuit-helmets.yml
Original file line number Diff line number Diff line change
@@ -158,3 +158,130 @@
coefficients:
Heat: 0.90
Radiation: 0.75

#Elite ERT Hardsuit Helmets
#ERT Leader Hardsuit
- type: entity
parent: [ BaseCentcommContraband, ClothingHeadHelmetHardsuitSyndieCommander ]
id: ClothingHeadHelmetHardsuitERTLeaderElite
name: Elite ERT leader hardsuit helmet
description: A special hardsuit helmet worn by members of an emergency response team.
components:
- type: Sprite
sprite: DeltaV/Clothing/Head/Hardsuits/ERThelmets/eliteertleader.rsi
- type: Clothing
sprite: DeltaV/Clothing/Head/Hardsuits/ERThelmets/eliteertleader.rsi
- type: PointLight
color: "#addbff"
- type: Armor
modifiers:
coefficients:
Blunt: 0.9
Slash: 0.9
Piercing: 0.9
Heat: 0.9
- type: FireProtection
reduction: 0.2

#ERT Chaplain Hardsuit
- type: entity
parent: [ BaseCentcommContraband, ClothingHeadHelmetHardsuitSyndie ]
id: ClothingHeadHelmetHardsuitERTChaplainElite
name: Elite ERT chaplain hardsuit helmet
description: A special hardsuit helmet worn by members of an emergency response team.
components:
- type: Sprite
sprite: DeltaV/Clothing/Head/Hardsuits/ERThelmets/eliteertchaplain.rsi
- type: Clothing
sprite: DeltaV/Clothing/Head/Hardsuits/ERThelmets/eliteertchaplain.rsi
- type: PointLight
color: "#ffffff"
- type: Psionic
- type: TinfoilHat
passthrough: true
destroyOnFry: false
- type: ClothingGrantPsionicPower
power: DispelPower
- type: GuideHelp
guides:
- Psionics
- type: FireProtection
reduction: 0.2

#ERT Engineer Hardsuit
- type: entity
parent: [ BaseCentcommContraband, ClothingHeadHelmetHardsuitSyndie ]
id: ClothingHeadHelmetHardsuitERTEngineerElite
name: Elite ERT engineer hardsuit helmet
description: A special hardsuit helmet worn by members of an emergency response team.
components:
- type: Sprite
sprite: DeltaV/Clothing/Head/Hardsuits/ERThelmets/eliteertengineer.rsi
- type: Clothing
sprite: DeltaV/Clothing/Head/Hardsuits/ERThelmets/eliteertengineer.rsi
- type: PointLight
color: "#f4ffad"
- type: Armor
modifiers:
coefficients:
Blunt: 0.9
Slash: 0.9
Piercing: 0.9
Heat: 0.9
- type: FireProtection
reduction: 0.2

#ERT Medical Hardsuit
- type: entity
parent: [ BaseCentcommContraband, ClothingHeadHelmetHardsuitSyndieElite ]
id: ClothingHeadHelmetHardsuitERTMedicalElite
name: Elite ERT medic hardsuit helmet
description: A special hardsuit helmet worn by members of an emergency response team.
components:
- type: Sprite
sprite: DeltaV/Clothing/Head/Hardsuits/ERThelmets/eliteertmedical.rsi
- type: Clothing
sprite: DeltaV/Clothing/Head/Hardsuits/ERThelmets/eliteertmedical.rsi
- type: PointLight
color: "#adffec"
- type: FireProtection
reduction: 0.2

#ERT Security Hardsuit
- type: entity
parent: [ BaseCentcommContraband, ClothingHeadHelmetHardsuitSyndie ]
id: ClothingHeadHelmetHardsuitERTSecurityElite
name: Elite ERT security hardsuit helmet
description: A special hardsuit helmet worn by members of an emergency response team.
components:
- type: Sprite
sprite: DeltaV/Clothing/Head/Hardsuits/ERThelmets/eliteertsecurity.rsi
- type: Clothing
sprite: DeltaV/Clothing/Head/Hardsuits/ERThelmets/eliteertsecurity.rsi
- type: PointLight
color: "#ffadc6"
- type: Armor
modifiers:
coefficients:
Blunt: 0.9
Slash: 0.9
Piercing: 0.9
Heat: 0.9
- type: FireProtection
reduction: 0.2

#ERT Janitor Hardsuit
- type: entity
parent: [ BaseCentcommContraband, ClothingHeadHelmetHardsuitSyndie ]
id: ClothingHeadHelmetHardsuitERTJanitorElite
name: Elite ERT janitor hardsuit helmet
description: A special hardsuit helmet worn by members of an emergency response team.
components:
- type: Sprite
sprite: DeltaV/Clothing/Head/Hardsuits/ERThelmets/eliteertjanitor.rsi
- type: Clothing
sprite: DeltaV/Clothing/Head/Hardsuits/ERThelmets/eliteertjanitor.rsi
- type: PointLight
color: "#cbadff"
- type: FireProtection
reduction: 0.2
Loading