From 5009723663c59cde1f193cd7a9aa003b1785a3f2 Mon Sep 17 00:00:00 2001 From: einknusprigestoast Date: Tue, 7 Jul 2026 16:03:03 +0200 Subject: [PATCH 1/4] Added Jackdaw and Kammerer --- .../Locale/en-US/_DV/tools/ERT_selector.ftl | 104 ++++ .../_DV/Catalog/ERT_Loadout_catalog.yml | 457 ++++++++++++++++++ .../Objects/Specific/ERT_loadout_selector.yml | 160 ++++++ 3 files changed, 721 insertions(+) create mode 100644 Resources/Locale/en-US/_DV/tools/ERT_selector.ftl create mode 100644 Resources/Prototypes/_DV/Catalog/ERT_Loadout_catalog.yml create mode 100644 Resources/Prototypes/_DV/Entities/Objects/Specific/ERT_loadout_selector.yml diff --git a/Resources/Locale/en-US/_DV/tools/ERT_selector.ftl b/Resources/Locale/en-US/_DV/tools/ERT_selector.ftl new file mode 100644 index 00000000000..d983e70264c --- /dev/null +++ b/Resources/Locale/en-US/_DV/tools/ERT_selector.ftl @@ -0,0 +1,104 @@ +ert-amber-gun-name-patos = Patos bundle +ert-amber-gun-desc-patos = A one-handed submachinegun that punches above its weight. Keep your small magazine capacity in mind. + +ert-amber-gun-name-aegun = Advanced energy gun +ert-amber-gun-desc-aegun = One advanced energy gun, for both lethal and non-lethal engagments. + +ert-amber-gun-name-mixlaser = Mixed Laser bundle +ert-amber-gun-desc-mixlaser = A disabler SMG together with a Laser Carbine, bundled with a portable recharger. + +ert-amber-gun-name-kammerer = Kammerer +ert-amber-gun-desc-kammerer = Do not be afraid Captain. + +ert-medkit-name = First aid kit +ert-medkit-desc = A simple first aid kit, dont get shoot too hard. + +ert-brutekit-name = Brute kit +ert-brutekit-desc = A brute kit, dont get shot with lasers. + +ert-drozdkit-name = Drozd bundle +ert-drozdkit-desc = A heavy submachinegun bundled with different ammo types, a NanoTrasen armaments classic. + +ert-lecterkit-name = Lecter bundle +ert-lecterbundle-desc = A high-grade assault rifle packaged with a handful of magazines, precise and packs a punch, but quite bulky. + +ert-IK30kit-name = IK-30 bundle +ert-IK30kit-desc = A magazine fed energy weapon packaged with a handful of magazines, for when recharging your energy gun is not an option. + +ert-AutoInjectorLight-name = Auto Injectors +ert-AutoInjectorLight-desc = A handful of Autoinjectors and a roll of Gauze for bad days. + +ert-AdvancedTopicals-name = Advanced Topicals +ert-AdvancedTopicals-desc = Sutures, Mesh and Bloodbags. A lot of Sutures, Mesh and Bloodbags. + +ert-CombatMedkit-name = Combat Medkit +ert-CombatMedkit-desc = A combat medkit, should get you through a gunfight or two. + +ert-LeaderRedOfficer-name = Officers Bundle +ert-LeaderRedOfficer-desc = A kit containing a Universal Handgun, a Advanced Laser Pistol and a trench whistle. AVANTI! + +ert-LeaderRedColdCannon-name = I.C.E.E bundle +ert-LeaderRedColdCannon-desc = A I.C.E.E cannon bundled together with a portable recharger. + +ert-LeaderRedWT-name = WT550 bundle +ert-LeaderRedWT-desc = The classic WT550 submachinegun, bundled together with a few magazines and two telescopic shields. + +ert-enforcerkit-name = Enforcer bundle +ert-enforcerkit-desc = A Enforcer bundled with 3 boxes of buckshot. + +ert-GammaOfficer-name = Officers Bundle +ert-GammaOfficer-desc = A kit containing a N1984 and a trench whistle. "Retreat? We just got here" + +ert-GammaLeaderAntelope-name = Antelope bundle +ert-GammaLeaderAntelope-desc = A bundle containing a Antelope automatic shotgun and 5 drums to feed it with. Ration your ammo carefully. + +ert-LeaderAtrides-name = Atreides Bundle +ert-LeaderAtrides-desc = A Atreides bundled together with two telescopic shields and 5 magazines. + +ert-GammaPulseRifle-name = Pulse Rifle +ert-GammaPulseRifle-desc = A singular pulse rifle. Corporate asks you to not take this option. + +ert-GammaSecCombatkit-name = Combat Medkit bundle +ert-GammaSecCombatkit-desc = A Combat Medkit bundled together with some additional auto-injectors. + +ert-GammaSecStimkit-name = Stimulant bundle +ert-GammaSecStimkit-desc = A jetinjector bundled together with 2 bottles of Ephedrine and one bottle of Omnizine. Dont ask about the legality + +ert-GammaSecliquidkit-name = Liquid medicine bundle +ert-GammaSecliquidkit-desc = A jetinjector bundled together with a box full of highly fragile medicine bottles. + +ert-GammaWTkit-name = WT550 bundle +ert-GammaWTkit-desc = The classic WT550 bundled together with 5 magazines and 2 telescopic shields. + +ert-enforcerkitspecial-name = Enforcer bundle +ert-enforcerkitspecial-desc = An Enforcer bundled together with buckshot, incendiary shells and uranium ammunition. + +ert-Immolatorkit-name = Immolator bundle +ert-Immolatorkit-desc = The original firestarter bundled together with a portable recharger and an energy gun. + +ert-IK60kit-name = IK-60 bundle +ert-IK60kit-desc = IK-60-M bundled together with 4 Laser magazines. Watch your ammo consumption. + +ert-jackdawkit-name = Jackdaw bundle +ert-jackdawkit-desc = A caseless rifle, paired with 20 round magazines. Property of Internal Affairs. + +ert-GammaC4-name = C4 box +ert-GammaC4-desc = 4 timed charges of plastic breaching explosives. + +ert-GammaThermals-name = Special Forces gasmask +ert-GammaThermals-desc = A gasmask with both a thermal and a nightvision lense. + +ert-GammaJets-name = Jetpack bundle +ert-GammaJets-desc = A jetpack bundle containing a handheld mass scanner, a better cell for it and a pair of pocket breathinggastanks. + +ert-GammaNadesHE-name = Explosive grenades +ert-GammaNadesHE-desc = Three explosive grenades for the usage against soft targets. + +ert-GammaSmokes-name = Smoke grenades +ert-GammaSmokes-desc = Three smoke grenades to obscure vision. + +ert-GammaIncend-name = Incendiary grenades +ert-GammaIncend-desc = Two Incendiary grenades. Keep in mind your suit protects less against these. + +ert-GammaEMP-name = Electro Magnetic Pulse Grenades +ert-GammaEMP-desc = A pair of EMP grenades, incase you have to disable Cyborgs or Lasers. diff --git a/Resources/Prototypes/_DV/Catalog/ERT_Loadout_catalog.yml b/Resources/Prototypes/_DV/Catalog/ERT_Loadout_catalog.yml new file mode 100644 index 00000000000..704607be2a7 --- /dev/null +++ b/Resources/Prototypes/_DV/Catalog/ERT_Loadout_catalog.yml @@ -0,0 +1,457 @@ +- type: thiefBackpackSet + id: ERTPatosBundle + name: ert-amber-gun-name-patos + description: ert-amber-gun-desc-patos + sprite: + sprite: _DV/Objects/Weapons/Guns/SMGs/patos.rsi + state: icon + content: + - WeaponSubMachineGunPatos + - MagazinePistolHighCapacity + - MagazinePistolHighCapacity + - MagazinePistolHighCapacity + - MagazinePistolHighCapacity + +- type: thiefBackpackSet + id: ERTaegunBundle + name: ert-amber-gun-name-aegun + description: ert-amber-gun-desc-aegun + sprite: + sprite: _DV/Objects/Weapons/Guns/Battery/energygunadvanced.rsi + state: icon + content: + - WeaponEnergyGunAdvanced + +- type: thiefBackpackSet + id: ERTmixlaserBundle + name: ert-amber-gun-name-mixlaser + description: ert-amber-gun-desc-mixlaser + sprite: + sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi + state: icon + content: + - WeaponLaserCarbine + - WeaponDisablerSMG + - PortableRecharger + +- type: thiefBackpackSet + id: ERTkammerer + name: ert-amber-gun-name-kammerer + description: ert-amber-gun-desc-kammerer + sprite: + sprite: Objects/Weapons/Guns/Shotguns/pump.rsi + state: icon + content: + - WeaponShotgunKammerer + - BoxLethalshot + +- type: thiefBackpackSet + id: ERTMedkit + name: ert-medkit-name + description: ert-medkit-desc + sprite: + sprite: Objects/Specific/Medical/firstaidkits.rsi + state: firstaid + content: + - MedkitFilled + +- type: thiefBackpackSet + id: ERTBrutekit + name: ert-brutekit-name + description: ert-brutekit-desc + sprite: + sprite: Objects/Specific/Medical/firstaidkits.rsi + state: brutekit + content: + - MedkitBruteFilled + +- type: thiefBackpackSet + id: ERTLecterkit + name: ert-lecterkit-name + description: ert-lecterbundle-desc + sprite: + sprite: _DV/Objects/Weapons/Guns/Rifles/lecter.rsi + state: icon + content: + - WeaponRifleLecter + - MagazineRifle + - MagazineRifle + - MagazineRifle + - MagazineRifle + - MagazineRifle + +- type: thiefBackpackSet + id: ERTDrozdkit + name: ert-drozdkit-name + description: ert-drozdkit-desc + sprite: + sprite: _DV/Objects/Weapons/Guns/SMGs/drozd.rsi + state: icon + content: + - WeaponSubMachineGunDrozd + - MagazinePistolSubMachineGun + - MagazinePistolSubMachineGun + - MagazinePistolSubMachineGunRubber + - MagazinePistolSubMachineGunRubber + - MagazinePistolSubMachineGunUranium + - MagazinePistolSubMachineGunUranium + - MagazinePistolSubMachineGunUranium + +- type: thiefBackpackSet + id: ERTLaserIK30kit + name: ert-IK30kit-name + description: ert-IK30kit-desc + sprite: + sprite: _DV/Objects/Weapons/Guns/Rifles/lasercarbine.rsi + state: icon + content: + - WeaponRifleLaser + - MagazineLaser + - MagazineLaser + - MagazineLaser + - MagazineLaser + - MagazineLaser + +- type: thiefBackpackSet + id: ERTEnforcerkit + name: ert-enforcerkit-name + description: ert-enforcerkit-desc + sprite: + sprite: _DV/Objects/Weapons/Guns/Shotguns/enforcer.rsi + state: icon + content: + - WeaponShotgunEnforcer + - BoxLethalshot + - BoxLethalshot + - BoxLethalshot + +- type: thiefBackpackSet + id: ERTCombatMedkit + name: ert-CombatMedkit-name + description: ert-CombatMedkit-desc + sprite: + sprite: Objects/Specific/Medical/firstaidkits.rsi + state: blackkit + content: + - MedkitCombatFilled + +- type: thiefBackpackSet + id: ERTAutoInjectorLight + name: ert-AutoInjectorLight-name + description: ert-AutoInjectorLight-desc + sprite: + sprite: Objects/Specific/Medical/medipen.rsi + state: punctpen + content: + - BurnAutoInjector + - BurnAutoInjector + - PunctAutoInjector + - PunctAutoInjector + - Gauze + +- type: thiefBackpackSet + id: ERTAdvancedTopicals + name: ert-AdvancedTopicals-name + description: ert-AdvancedTopicals-desc + sprite: + sprite: Objects/Specific/Medical/firstaidkits.rsi + state: advkit + content: + - MedicatedSuture + - RegenerativeMesh + - MedkitAdvancedFilled + +- type: thiefBackpackSet + id: ERTLeaderOfficerRed + name: ert-LeaderRedOfficer-name + description: ert-LeaderRedOfficer-desc + sprite: + sprite: _DV/Objects/Weapons/Guns/Pistols/universal.rsi + state: icon + content: + - WeaponPistolUniversal + - SyndicateWhistle + - MagazineUniversalMagnum + - MagazineUniversalMagnum + - MagazineUniversalMagnum + - WeaponAdvancedLaser + - Binoculars + +- type: thiefBackpackSet + id: ERTLeaderWTRed + name: ert-LeaderRedWT-name + description: ert-LeaderRedWT-desc + sprite: + sprite: Objects/Weapons/Guns/SMGs/wt550.rsi + state: icon + content: + - WeaponSubMachineGunWt550 + - MagazinePistolSubMachineGunTopMounted + - MagazinePistolSubMachineGunTopMounted + - MagazinePistolSubMachineGunTopMounted + - MagazinePistolSubMachineGunTopMounted + - TelescopicShield + - TelescopicShield + +- type: thiefBackpackSet + id: ERTLeaderColdCannonRed + name: ert-LeaderRedColdCannon-name + description: ert-LeaderRedColdCannon-desc + sprite: + sprite: _DV/Objects/Weapons/Guns/Battery/cold_cannon.rsi + state: icon + content: + - WeaponColdCannon + - PortableRecharger + +- type: thiefBackpackSet + id: ERTLeaderGammaAtrides + name: ert-LeaderAtrides-name + description: ert-LeaderAtrides-desc + sprite: + sprite: Objects/Weapons/Guns/SMGs/atreides.rsi + state: icon + content: + - WeaponSubMachineGunAtreides + - MagazinePistolSubMachineGun + - MagazinePistolSubMachineGun + - MagazinePistolSubMachineGun + - MagazinePistolSubMachineGun + - MagazinePistolSubMachineGun + - TelescopicShield + - TelescopicShield + +- type: thiefBackpackSet + id: ERTLeaderGammaPulseRifle + name: ert-GammaPulseRifle-name + description: ert-GammaPulseRifle-desc + sprite: + sprite: Objects/Weapons/Guns/Battery/pulse_rifle.rsi + state: icon + content: + - WeaponPulseRifle + +- type: thiefBackpackSet + id: ERTLeaderGammaAntelope + name: ert-GammaLeaderAntelope-name + description: ert-GammaLeaderAntelope-desc + sprite: + sprite: _DV/Objects/Weapons/Guns/Shotguns/Antelope.rsi + state: icon + content: + - WeaponShotgunAntelope + - MagazineShotgun + - MagazineShotgun + - MagazineShotgun + - MagazineShotgun + - MagazineShotgun + +- type: thiefBackpackSet + id: ERTLeaderOfficerGamma + name: ert-GammaOfficer-name + description: ert-GammaOfficer-desc + sprite: + sprite: Objects/Weapons/Guns/Pistols/N1984.rsi + state: icon + content: + - SyndicateWhistle + - WeaponPistolN1984 + - MagazineMagnum + - MagazineMagnum + - MagazineMagnum + - MagazineBoxMagnum + - MagazineBoxMagnum + - Binoculars + +- type: thiefBackpackSet + id: ERTGammaSecCombatkit + name: ert-GammaSecCombatkit-name + description: ert-GammaSecCombatkit-desc + sprite: + sprite: Objects/Specific/Medical/firstaidkits.rsi + state: blackkit + content: + - MedkitCombatFilled + - PunctAutoInjector + - PyraAutoInjector + +- type: thiefBackpackSet + id: ERTGammaSecStimkit + name: ert-GammaSecStimkit-name + description: ert-GammaSecStimkit-desc + sprite: + sprite: Objects/Specific/Medical/advanced_jetinjector.rsi + state: jetinjector_base + content: + - AdvancedJetInjector + - ChemistryBottleEphedrine + - ChemistryBottleEphedrine + - ChemistryBottleOmnizine + +- type: thiefBackpackSet + id: ERTGammaSecChemkit + name: ert-GammaSecliquidkit-name + description: ert-GammaSecliquidkit-desc + sprite: + sprite: Objects/Specific/Medical/jetinjector.rsi + state: jetinjector_base + content: + - AdvancedJetInjector + - BoxBottleMedicineBasic + +- type: thiefBackpackSet + id: ERTGammaSecWT + name: ert-GammaWTkit-name + description: ert-GammaWTkit-desc + sprite: + sprite: Objects/Weapons/Guns/SMGs/wt550.rsi + state: icon + content: + - WeaponSubMachineGunWt550 + - MagazinePistolSubMachineGunTopMounted + - MagazinePistolSubMachineGunTopMounted + - MagazinePistolSubMachineGunTopMounted + - MagazinePistolSubMachineGunTopMounted + - MagazinePistolSubMachineGunTopMounted + - TelescopicShield + - TelescopicShield + +- type: thiefBackpackSet + id: ERTGammaSecEnforcer + name: ert-enforcerkitspecial-name + description: ert-enforcerkitspecial-desc + sprite: + sprite: _DV/Objects/Weapons/Guns/Shotguns/enforcer.rsi + state: icon + content: + - WeaponShotgunEnforcer + - BoxLethalshot + - BoxLethalshot + - BoxShotgunUranium + - BoxShotgunUranium + - BoxShotgunIncendiary + - BoxShotgunIncendiary + +- type: thiefBackpackSet + id: ERTGammaSecImmolator + name: ert-Immolatorkit-name + description: ert-Immolatorkit-desc + sprite: + sprite: _DV/Objects/Weapons/Guns/Battery/multi_lens_immolator.rsi + state: icon + content: + - WeaponImmolatorMulti + - WeaponEnergyGun + - PortableRecharger + +- type: thiefBackpackSet + id: ERTGammaSecIK60 + name: ert-IK60kit-name + description: ert-IK60kit-desc + sprite: + sprite: _DV/Objects/Weapons/Guns/Rifles/lasercarbineert.rsi + state: icon + content: + - WeaponRifleLaserERT + - MagazineLaser + - MagazineLaser + - MagazineLaser + - MagazineLaser + +- type: thiefBackpackSet + id: ERTGammaSecJackdaw + name: ert-jackdawkit-name + description: ert-jackdawkit-desc + sprite: + sprite: _DV/Objects/Weapons/Guns/Rifles/jackdaw.rsi + state: icon + content: + - WeaponRifleJackdaw + - MagazineCaselessRifleShort + - MagazineCaselessRifleShort + - MagazineCaselessRifleShort + - MagazineCaselessRifleShort + - MagazineCaselessRifleShort + - MagazineCaselessRifleShort + - MagazineCaselessRifleShort + - MagazineCaselessRifleShort + +- type: thiefBackpackSet + id: ERTGammaC4 + name: ert-GammaC4-name + description: ert-GammaC4-desc + sprite: + sprite: Objects/Weapons/Bombs/c4.rsi + state: icon + content: + - BoxC4 + +- type: thiefBackpackSet + id: ERTGammaThermals + name: ert-GammaThermals-name + description: ert-GammaThermals-desc + sprite: + sprite: _White/Clothing/Eyes/Goggles/thermal.rsi + state: icon + content: + - ClothingMaskGasDeathSquad + +- type: thiefBackpackSet + id: ERTGammaJets + name: ert-GammaJets-name + description: ert-GammaJets-desc + sprite: + sprite: _DV/Objects/Tanks/Jetpacks/blue.rsi + state: icon + content: + - HandHeldMassScanner + - JetpackBlueFilled + - PowerCellMicroreactor + - DoubleEmergencyOxygenTankFilled + - DoubleEmergencyNitrogenTankFilled + +- type: thiefBackpackSet + id: ERTGammaHE + name: ert-GammaNadesHE-name + description: ert-GammaNadesHE-desc + sprite: + sprite: Objects/Weapons/Grenades/grenade.rsi + state: icon + content: + - ExGrenade + - ExGrenade + - ExGrenade + +- type: thiefBackpackSet + id: ERTGammaSmoke + name: ert-GammaSmokes-name + description: ert-GammaSmokes-desc + sprite: + sprite: Objects/Weapons/Grenades/smoke.rsi + state: icon + content: + - SmokeGrenade + - SmokeGrenade + - SmokeGrenade + +- type: thiefBackpackSet + id: ERTGammaIncend + name: ert-GammaIncend-name + description: ert-GammaIncend-desc + sprite: + sprite: Objects/Weapons/Grenades/pyrogrenade.rsi + state: icon + content: + - GrenadeIncendiary + - GrenadeIncendiary + +- type: thiefBackpackSet + id: ERTGammaEMP + name: ert-GammaEMP-name + description: ert-GammaEMP-desc + sprite: + sprite: Objects/Weapons/Grenades/empgrenade.rsi + state: icon + content: + - EmpGrenade + - EmpGrenade diff --git a/Resources/Prototypes/_DV/Entities/Objects/Specific/ERT_loadout_selector.yml b/Resources/Prototypes/_DV/Entities/Objects/Specific/ERT_loadout_selector.yml new file mode 100644 index 00000000000..3da45b6f36c --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Specific/ERT_loadout_selector.yml @@ -0,0 +1,160 @@ +- type: entity + parent: ToolboxThief + id: ERTGearSelectorGunAmberSec + name: ERT Equipment Selector + suffix: Amber, Sec, Guns + description: "A small item teleporting a pre-determined set of equipment into the ERT members hands" + components: + - type: Sprite + sprite: _Goobstation/Objects/Devices/unique_teleporters.rsi + state: standard + - type: ThiefUndeterminedBackpack + maxSelectedSets: 1 + possibleSets: + - ERTPatosBundle + - ERTaegunBundle + - ERTmixlaserBundle + - ERTkammerer + +- type: entity + parent: ToolboxThief + id: ERTGearSelectorMedsAmber + name: ERT Equipment Selector + suffix: Amber, Sec, Meds + description: "A small item teleporting a pre-determined set of equipment into the ERT members hands" + components: + - type: Sprite + sprite: _Goobstation/Objects/Devices/unique_teleporters.rsi + state: standard + - type: ThiefUndeterminedBackpack + maxSelectedSets: 1 + possibleSets: + - ERTMedkit + - ERTBrutekit + +- type: entity + parent: ToolboxThief + id: ERTGearSelectorGunRedSec + name: ERT Equipment Selector + suffix: Red, Sec, Guns + description: "A small item teleporting a pre-determined set of equipment into the ERT members hands" + components: + - type: Sprite + sprite: _Goobstation/Objects/Devices/unique_teleporters.rsi + state: standard + - type: ThiefUndeterminedBackpack + maxSelectedSets: 1 + possibleSets: + - ERTLaserIK30kit + - ERTDrozdkit + - ERTLecterkit + - ERTEnforcerkit + +- type: entity + parent: ToolboxThief + id: ERTGearSelectorMedsRed + name: ERT Equipment Selector + suffix: Red, Sec, Meds + description: "A small item teleporting a pre-determined set of equipment into the ERT members hands" + components: + - type: Sprite + sprite: _Goobstation/Objects/Devices/unique_teleporters.rsi + state: standard + - type: ThiefUndeterminedBackpack + maxSelectedSets: 1 + possibleSets: + - ERTAutoInjectorLight + - ERTAdvancedTopicals + - ERTCombatMedkit + +- type: entity + parent: ToolboxThief + id: ERTGearSelectorLeaderRed + name: ERT Equipment Selector + suffix: Red, Leader + description: "A small item teleporting a pre-determined set of equipment into the ERT members hands" + components: + - type: Sprite + sprite: _Goobstation/Objects/Devices/unique_teleporters.rsi + state: standard + - type: ThiefUndeterminedBackpack + maxSelectedSets: 1 + possibleSets: + - ERTLeaderOfficerRed + - ERTLeaderWTRed + - ERTLeaderColdCannonRed + +- type: entity + parent: ToolboxThief + id: ERTGearSelectorGunGammaSec + name: ERT Equipment Selector + suffix: Gamma, Gun, Sec + description: "A small item teleporting a pre-determined set of equipment into the ERT members hands" + components: + - type: Sprite + sprite: _Goobstation/Objects/Devices/unique_teleporters.rsi + state: standard + - type: ThiefUndeterminedBackpack + maxSelectedSets: 1 + possibleSets: + - ERTGammaSecEnforcer + - ERTGammaSecWT + - ERTGammaSecImmolator + - ERTGammaSecIK60 + - ERTGammaSecJackdaw + +- type: entity + parent: ToolboxThief + id: ERTGearSelectorMedsGammaSec + name: ERT Equipment Selector + suffix: Gamma, Meds, Sec + description: "A small item teleporting a pre-determined set of equipment into the ERT members hands" + components: + - type: Sprite + sprite: _Goobstation/Objects/Devices/unique_teleporters.rsi + state: standard + - type: ThiefUndeterminedBackpack + maxSelectedSets: 1 + possibleSets: + - ERTGammaSecCombatkit + - ERTGammaSecStimkit + - ERTGammaSecChemkit + +- type: entity + parent: ToolboxThief + id: ERTGearSelectorLeaderGamma + name: ERT Equipment Selector + suffix: Gamma, Leader + description: "A small item teleporting a pre-determined set of equipment into the ERT members hands" + components: + - type: Sprite + sprite: _Goobstation/Objects/Devices/unique_teleporters.rsi + state: standard + - type: ThiefUndeterminedBackpack + maxSelectedSets: 1 + possibleSets: + - ERTLeaderOfficerGamma + - ERTLeaderGammaAntelope + - ERTLeaderGammaAtrides + - ERTLeaderGammaPulseRifle + +- type: entity + parent: ToolboxThief + id: ERTGearSelectorGammaSecUtility + name: ERT Equipment Selector + suffix: Gamma, Sec, Utility + description: "A small item teleporting a pre-determined set of equipment into the ERT members hands" + components: + - type: Sprite + sprite: _Goobstation/Objects/Devices/unique_teleporters.rsi + state: standard + - type: ThiefUndeterminedBackpack + maxSelectedSets: 1 + possibleSets: + - ERTGammaC4 + - ERTGammaThermals + - ERTGammaJets + - ERTGammaHE + - ERTGammaSmoke + - ERTGammaIncend + - ERTGammaEMP From bb8505761f9f412842726d892046a6b11e3b5693 Mon Sep 17 00:00:00 2001 From: einknusprigestoast Date: Tue, 7 Jul 2026 16:02:25 +0200 Subject: [PATCH 2/4] ERT hardsuit change --- .../_DV/Entities/Clothing/OuterClothing/hardsuits.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/hardsuits.yml index 04a660ca557..0434945143a 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/hardsuits.yml @@ -391,8 +391,9 @@ coefficients: Blunt: 0.5 Slash: 0.5 - Piercing: 0.50 + Piercing: 0.6 Heat: 0.6 + Cold: 0.7 Radiation: 0 Caustic: 0.35 Holy: 0.50 From 5f7f833ae571cf49cbe8e69ff600a88168ebbd2f Mon Sep 17 00:00:00 2001 From: einknusprigestoast Date: Tue, 7 Jul 2026 16:01:19 +0200 Subject: [PATCH 3/4] Jackdaw changes --- .../Entities/Objects/Weapons/Guns/Rifles/rifles.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 0330c0294f1..f14efa73dff 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -45,7 +45,7 @@ parent: [BaseWeaponRifle, BaseGunWieldable] id: WeaponRifleJackdaw description: The beginning of the end is heralded by the song of a Jackdaw. Uses .25 caseless ammo. - suffix: Deathsquad + suffix: ERT # was Deathsquad components: - type: Item size: Large @@ -56,12 +56,15 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] + - type: GunWieldBonus + minAngle: -15 + maxAngle: -11 - type: Gun - minAngle: 2 - maxAngle: 6 + minAngle: 17 + maxAngle: 17 angleIncrease: 2 angleDecay: 8 - fireRate: 6 # DeltaV - was 8 + fireRate: 6 # was 8 selectedMode: FullAuto availableModes: - SemiAuto @@ -73,7 +76,7 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineCaselessRifle + startingItem: MagazineCaselessRifleShort # was a normal magazine insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg priority: 2 From c70572b007acc38986e41ed023c4178215657b33 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 7 Jul 2026 14:19:58 +0000 Subject: [PATCH 4/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- Resources/Prototypes/_DV/Catalog/ERT_Loadout_catalog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_DV/Catalog/ERT_Loadout_catalog.yml b/Resources/Prototypes/_DV/Catalog/ERT_Loadout_catalog.yml index 704607be2a7..2e9873ec008 100644 --- a/Resources/Prototypes/_DV/Catalog/ERT_Loadout_catalog.yml +++ b/Resources/Prototypes/_DV/Catalog/ERT_Loadout_catalog.yml @@ -38,7 +38,7 @@ id: ERTkammerer name: ert-amber-gun-name-kammerer description: ert-amber-gun-desc-kammerer - sprite: + sprite: sprite: Objects/Weapons/Guns/Shotguns/pump.rsi state: icon content: