From 3a83ac0fd54894ff02bf9be13545503055983797 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Mon, 13 Jan 2025 15:25:19 -0300 Subject: [PATCH 01/10] Add a ChemMaster flatpack to the CMO's locker (#2683) * Added the flatpack * Add the flatpack to the CMO's locker --- Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml | 1 + .../_DV/Entities/Objects/Devices/Devices/flatpack.yml | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 Resources/Prototypes/_DV/Entities/Objects/Devices/Devices/flatpack.yml diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml index 9cffb69a970..ce8ff57b1d1 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml @@ -66,6 +66,7 @@ - id: ClothingShoesBootsWinterChiefMedicalOfficer - id: LunchboxCommandFilledRandom prob: 0.3 + - id: ChemMasterFlatpack # So the chemist can make pills - type: entityTable id: LockerFillResearchDirectorDeltaV diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/Devices/flatpack.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/Devices/flatpack.yml new file mode 100644 index 00000000000..eedeb96a871 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/Devices/flatpack.yml @@ -0,0 +1,8 @@ +- type: entity + parent: BaseFlatpack + id: ChemMasterFlatpack + name: chemmaster 4000 flatpack + description: A flatpack used for constructing a ChemMaster 4000. + components: + - type: Flatpack + entity: ChemMaster From adb9a55266f88e5849f794dfb0405bf12b8141e7 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Mon, 13 Jan 2025 19:25:38 +0100 Subject: [PATCH 02/10] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index bacb6b0d3f1..a759cfb528a 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Added Carpy the Legal Carp, coming to justice departments near you. - type: Add - id: 403 - time: '2024-06-17T16:50:22.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1398 - author: Lyndomen changes: - message: Reduced minimum number of players to 20 for nukies to spawn @@ -3851,3 +3844,11 @@ id: 902 time: '2025-01-12T23:16:01.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2710 +- author: Radezolid + changes: + - message: CMO's lockers now spawn with a ChemMaster flatpack inside to aid the + chemist with pill making. + type: Tweak + id: 903 + time: '2025-01-13T18:25:19.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2683 From f8c86e2c5d400a2760fe25e8086968fc19a32910 Mon Sep 17 00:00:00 2001 From: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Date: Mon, 13 Jan 2025 15:21:05 -0500 Subject: [PATCH 03/10] Port: Disable round end pacifism and add a new command to pacify everyone (#2642) * pacify stuff from Harmony * pacify stuff from Harmony * error ops * yeag --- .../_DV/RoundEnd/RoundEndSystem.Pacified.cs | 61 ------------------- .../_Harmony/RoundEnd/PacifyAllCommand | 60 ++++++++++++++++++ 2 files changed, 60 insertions(+), 61 deletions(-) delete mode 100644 Content.Server/_DV/RoundEnd/RoundEndSystem.Pacified.cs create mode 100644 Content.Server/_Harmony/RoundEnd/PacifyAllCommand diff --git a/Content.Server/_DV/RoundEnd/RoundEndSystem.Pacified.cs b/Content.Server/_DV/RoundEnd/RoundEndSystem.Pacified.cs deleted file mode 100644 index 7e7fd81ae60..00000000000 --- a/Content.Server/_DV/RoundEnd/RoundEndSystem.Pacified.cs +++ /dev/null @@ -1,61 +0,0 @@ -using Content.Server.Explosion.Components; -using Content.Server.GameTicking; -using Content.Shared.CombatMode; -using Content.Shared.CombatMode.Pacification; -using Content.Shared._DV.CCVars; -using Content.Shared.Explosion.Components; -using Content.Shared.Flash.Components; -using Content.Shared.Store.Components; -using Robust.Shared.Configuration; - -namespace Content.Server._DV.RoundEnd; - -public sealed class PacifiedRoundEnd : EntitySystem -{ - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - - private bool _enabled; - - public override void Initialize() - { - base.Initialize(); - _configurationManager.OnValueChanged(DCCVars.RoundEndPacifist, v => _enabled = v, true); - SubscribeLocalEvent(OnRoundEnded); - } - - private void OnRoundEnded(RoundEndTextAppendEvent ev) - { - if (!_enabled) - return; - - var harmQuery = EntityQueryEnumerator(); - while (harmQuery.MoveNext(out var uid, out _)) - { - EnsureComp(uid); - } - - var explosiveQuery = EntityQueryEnumerator(); - while (explosiveQuery.MoveNext(out var uid, out _)) - { - RemComp(uid); - } - - var grenadeQuery = EntityQueryEnumerator(); - while (grenadeQuery.MoveNext(out var uid, out _)) - { - RemComp(uid); - } - - var flashQuery = EntityQueryEnumerator(); - while (flashQuery.MoveNext(out var uid, out _)) - { - RemComp(uid); - } - - var uplinkQuery = EntityQueryEnumerator(); - while (uplinkQuery.MoveNext(out var uid, out _)) - { - RemComp(uid); - } - } -} diff --git a/Content.Server/_Harmony/RoundEnd/PacifyAllCommand b/Content.Server/_Harmony/RoundEnd/PacifyAllCommand new file mode 100644 index 00000000000..8018b63affc --- /dev/null +++ b/Content.Server/_Harmony/RoundEnd/PacifyAllCommand @@ -0,0 +1,60 @@ +// Credits: +// This code was originally created by DebugOk, deltanedas, and NullWanderer for DeltaV. +// Available at https://github.com/DebugOk/Delta-v/blob/master/Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs +// Original PR: https://github.com/DeltaV-Station/Delta-v/pull/350 +// Modified by FluffMe on 12.10.2024 with no major changes except the Namespaces and the CVar name. +// Modified and moved by youtissoum on 04.01.2025 to turn into a command. +using Content.Server.Administration; +using Content.Server.Explosion.Components; // DeltaV +using Content.Shared.Administration; +using Content.Shared.CombatMode; +using Content.Shared.CombatMode.Pacification; +using Content.Shared.Explosion.Components; +using Content.Shared.Flash.Components; +using Content.Shared.Store.Components; +using Robust.Shared.Console; + +namespace Content.Server._Harmony.RoundEnd; + +[AdminCommand(AdminFlags.Admin)] +public sealed class PacifyAllCommand : IConsoleCommand +{ + [Dependency] private readonly IEntityManager _entityManager = default!; + + public string Command => "pacifyall"; + public string Description => "Pacify all players permanently."; + public string Help => string.Empty; + + public void Execute(IConsoleShell shell, string argStr, string[] args) + { + var harmQuery = _entityManager.EntityQueryEnumerator(); + while (harmQuery.MoveNext(out var uid, out _)) + { + _entityManager.EnsureComponent(uid); + } + + var explosiveQuery = _entityManager.EntityQueryEnumerator(); + while (explosiveQuery.MoveNext(out var uid, out _)) + { + _entityManager.RemoveComponent(uid); + } + + var grenadeQuery = _entityManager.EntityQueryEnumerator(); + while (grenadeQuery.MoveNext(out var uid, out _)) + { + _entityManager.RemoveComponent(uid); + } + + var flashQuery = _entityManager.EntityQueryEnumerator(); + while (flashQuery.MoveNext(out var uid, out _)) + { + _entityManager.RemoveComponent(uid); + } + + var uplinkQuery = _entityManager.EntityQueryEnumerator(); + while (uplinkQuery.MoveNext(out var uid, out _)) + { + _entityManager.RemoveComponent(uid); + } + } +} From a14998fe17cf9697be12e5610b10c53754e0197c Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Mon, 13 Jan 2025 21:21:24 +0100 Subject: [PATCH 04/10] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index a759cfb528a..d4b48bd1c70 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Lyndomen - changes: - - message: Reduced minimum number of players to 20 for nukies to spawn - type: Tweak - id: 404 - time: '2024-06-17T16:52:21.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1404 - author: deltanedas changes: - message: Void Jetpacks can now be reverse engineered. @@ -3852,3 +3845,11 @@ id: 903 time: '2025-01-13T18:25:19.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2683 +- author: Lyndomen + changes: + - message: Ports pacifism tweaks from Harmony, allowing some violence at CC. Don't + grief, but continue to roleplay! Thank you youtissoum. + type: Add + id: 904 + time: '2025-01-13T20:21:05.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2642 From 3fdd6f91869c89df7a4a2c5a1e63295f1b34ec82 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Mon, 13 Jan 2025 15:16:08 -0600 Subject: [PATCH 05/10] energy guns buff take 2 (#2623) Yummy --- .../Objects/Weapons/Guns/Battery/battery_guns.yml | 15 ++++++++------- .../Weapons/Guns/Projectiles/projectiles.yml | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 7a4123c9d8a..fca41634074 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -23,8 +23,8 @@ soundEmpty: path: /Audio/_DV/Weapons/Guns/Empty/dry_fire.ogg - type: Battery - maxCharge: 1000 - startingCharge: 1000 + maxCharge: 1500 + startingCharge: 1500 - type: ProjectileBatteryAmmoProvider proto: BulletDisabler fireCost: 50 @@ -192,8 +192,8 @@ soundEmpty: path: /Audio/_DV/Weapons/Guns/Empty/dry_fire.ogg - type: Battery - maxCharge: 800 - startingCharge: 800 + maxCharge: 1000 + startingCharge: 1000 - type: ProjectileBatteryAmmoProvider proto: BulletDisabler fireCost: 50 @@ -229,7 +229,7 @@ name: IK-60 energy carbine parent: BaseWeaponBattery id: WeaponGunLaserCarbineAutomatic - description: "A 20 round semi-automatic energy carbine." + description: "A 20 round hybrid-fire energy carbine." components: - type: Sprite sprite: _DV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi @@ -250,9 +250,10 @@ fireRate: 3 availableModes: - SemiAuto + - FullAuto - type: Battery - maxCharge: 2000 - startingCharge: 2000 + maxCharge: 3000 + startingCharge: 3000 - type: ProjectileBatteryAmmoProvider proto: BulletEnergyGunLaser fireCost: 100 diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 2eac2b57f9c..12e7643f944 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -42,6 +42,6 @@ impactEffect: BulletImpactEffectRedDisabler damage: types: - Heat: 20 # Slightly more damage than the 17heat from the Captain's Hitscan lasgun + Heat: 24 # these will hurt but not quite a 4 shot soundHit: collection: MeatLaserImpact From b0517033eb278c61dd6e189a3ba0e2b3bcf86c93 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Mon, 13 Jan 2025 22:16:28 +0100 Subject: [PATCH 06/10] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index d4b48bd1c70..94d3145e3af 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Void Jetpacks can now be reverse engineered. - type: Tweak - id: 405 - time: '2024-06-17T17:03:06.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1400 - author: Velcroboy changes: - message: Added justice to The Hive @@ -3853,3 +3846,12 @@ id: 904 time: '2025-01-13T20:21:05.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2642 +- author: Stop-Signs + changes: + - message: Energy guns got an overall buff! + type: Tweak + - message: IK-60 carbine can now toggle between semi and full auto + type: Tweak + id: 905 + time: '2025-01-13T21:16:09.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2623 From 00be66655610665cdd20161e6abbe1357737f251 Mon Sep 17 00:00:00 2001 From: Avalon Date: Mon, 13 Jan 2025 20:27:13 -0500 Subject: [PATCH 07/10] Hristov Tweaks, Incidental Musiket Changes (#2213) * Tallholads! * Small changes * Update snipers.yml * ding * conflictiskill * ConflictFixOps * ConfliuctFixOps2 * comment stuff * Adjustments * Update antimateriel.yml Signed-off-by: Avalon --------- Signed-off-by: Avalon Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Guns/Ammunition/Projectiles/antimateriel.yml | 7 ++++--- .../Objects/Weapons/Guns/Snipers/snipers.yml | 14 ++++++++------ .../Objects/Specific/Mail/mail_security.yml | 4 ++-- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml index 65b7dbc1655..70f0a053959 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml @@ -7,7 +7,8 @@ - type: Projectile damage: types: - Piercing: 40 - Structural: 30 + Piercing: 50 # DeltaV - Damage Bumped, was 40 + Structural: 200 # DeltaV - was 30 + ignoreResistances: true # DeltaV - Hristov be spooky now - type: StaminaDamageOnCollide - damage: 35 + damage: 50 # DeltaV - was 35 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index fa9777e48b7..d261294a5e8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -65,12 +65,14 @@ capacity: 5 proto: CartridgeAntiMateriel - type: GunRequiresWield # DeltaV - Firing an antimateriel rifle is.. incredibly unweildy with one hand. + - type: Gun # DeltaV + fireRate: 0.5 - type: entity name: musket parent: [ BaseWeaponSniper, BaseGunWieldable, BaseMinorContraband ] id: Musket - description: This should've been in a museum long before you were born. Uses .60 anti-materiel ammo. + description: This should've been in a museum long before you were born. Uses musket catridges. # Delta V - swapping to our crafted musket ammo components: - type: Sharp - type: Item @@ -90,9 +92,9 @@ - type: BallisticAmmoProvider whitelist: tags: - - CartridgeAntiMateriel + - CartridgeMusket # DeltaV - musket instead of anti materiel ammo capacity: 1 - proto: CartridgeAntiMateriel + proto: CartridgeMusket # DeltaV - type: MeleeWeapon wideAnimationRotation: -135 damage: @@ -109,7 +111,7 @@ name: flintlock pistol parent: [BaseWeaponSniper, BaseMinorContraband] id: WeaponPistolFlintlock - description: A pirate's companion. Yarrr! Uses .60 anti-materiel ammo. + description: A pirate's companion. Yarrr! Uses musket cartridges. # Delta V - Ditto the above components: - type: Gun minAngle: 0 @@ -127,9 +129,9 @@ - type: BallisticAmmoProvider whitelist: tags: - - CartridgeAntiMateriel + - CartridgeMusket # DeltaV - musket instead of anti materiel ammo capacity: 1 - proto: CartridgeAntiMateriel + proto: CartridgeMusket # DeltaV - type: StaticPrice price: 0 diff --git a/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail_security.yml b/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail_security.yml index c08e92cc6b2..caf130da16f 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail_security.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail_security.yml @@ -70,8 +70,8 @@ contents: - id: ClothingHeadHatPwig - id: Musket - - id: CartridgeAntiMateriel - amount: 2 + - id: CartridgeMusket + amount: 4 - id: PaperMailNTMusket # Delta Mail From 72ba711e3b0b2ee9dba32cacceb948d5e861c22b Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Tue, 14 Jan 2025 02:27:32 +0100 Subject: [PATCH 08/10] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 94d3145e3af..8fab3d5ffc8 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Velcroboy - changes: - - message: Added justice to The Hive - type: Add - id: 406 - time: '2024-06-18T07:58:42.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1409 - author: DLondon changes: - message: Adds the corpsman and librarian to Edge station @@ -3855,3 +3848,10 @@ id: 905 time: '2025-01-13T21:16:09.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2623 +- author: Avalon-Proto + changes: + - message: Snipers rejoice, the Hristov is back on the menu + type: Tweak + id: 906 + time: '2025-01-14T01:27:13.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2213 From cd34f4e73fe2902298916e9a3d8b07ca22f06378 Mon Sep 17 00:00:00 2001 From: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Date: Mon, 13 Jan 2025 20:39:31 -0500 Subject: [PATCH 09/10] rename elite suit to thermal suit (#2720) * Update uplink-catalog.ftl Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update duffelbag.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update hardsuit-helmets.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update hardsuits.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * change elite to thermal * elite to thermal * Update uplink-catalog.ftl Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * evil whitespace Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> --------- Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> --- Resources/Locale/en-US/_DV/store/uplink-catalog.ftl | 2 ++ Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml | 4 ++-- Resources/Prototypes/Catalog/uplink_catalog.yml | 2 +- .../Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml | 2 +- .../Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl b/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl index 4f9b354a857..7f59fee1a77 100644 --- a/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl @@ -31,3 +31,5 @@ uplink-appraisal-tool-gun-name = Appraisal Tool Gun uplink-appraisal-tool-gun-desc = A modified Viper to appear as an appraisal tool, at the cost of slightly slower firerate uplink-storage-implanter-delta-desc = Hide goodies inside of yourself with new bluespace technology! Budget cuts have resulted in it NOT STORING High Value or storage items. + +uplink-hardsuit-syndieelite-delta-name = Syndicate Thermal Hardsuit diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index bdbcbc53d0f..e8d1c995e0c 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -257,8 +257,8 @@ - type: entity parent: ClothingBackpackDuffelSyndicateBundle id: ClothingBackpackDuffelSyndicateEliteHardsuitBundle - name: syndicate elite hardsuit bundle - description: "Contains the Syndicate's elite hardsuit, which comes with some more stuff in it." + name: syndicate thermal hardsuit bundle # DeltaV change elite to thermal + description: "Contains the Syndicate's thermal hardsuit, which comes with some more stuff in it." # DeltaV change elite to thermal components: - type: StorageFill contents: diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 9e95b187e4e..01dfb872833 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1604,7 +1604,7 @@ - type: listing id: UplinkHardsuitSyndieElite - name: uplink-hardsuit-syndieelite-name + name: uplink-hardsuit-syndieelite-delta-name # DeltaV change elite to thermal description: uplink-hardsuit-syndieelite-desc icon: { sprite: /Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi, state: icon } productEntity: ClothingBackpackDuffelSyndicateEliteHardsuitBundle diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index ce8b437cdfc..eb119a362ce 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -395,7 +395,7 @@ - type: entity parent: ClothingHeadHardsuitWithLightBase id: ClothingHeadHelmetHardsuitSyndieElite - name: syndicate elite helmet + name: syndicate thermal helmet # DeltaV change elite to thermal description: An elite version of the blood-red hardsuit's helmet, with improved armor and fireproofing. Property of Gorlex Marauders. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 80b5e12cf48..d903ab38b9f 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -550,7 +550,7 @@ - type: entity parent: [ClothingOuterHardsuitBase, BaseSyndicateContraband] id: ClothingOuterHardsuitSyndieElite - name: syndicate elite hardsuit + name: syndicate thermal hardsuit # DeltaV change elite to thermal description: An elite version of the blood-red hardsuit, with improved mobility and fireproofing. Property of Gorlex Marauders. components: - type: Sprite From d9baf114bb3e998525549925c7a4dab86960b03b Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Tue, 14 Jan 2025 02:39:50 +0100 Subject: [PATCH 10/10] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 8fab3d5ffc8..059eceb7cde 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,13 +1,4 @@ Entries: -- author: DLondon - changes: - - message: Adds the corpsman and librarian to Edge station - type: Add - - message: Adjusted various elements of Edge station as part of a long-term rebuild - type: Tweak - id: 407 - time: '2024-06-19T05:02:56.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1330 - author: deltanedas changes: - message: CentComm now has a justice department if you want to use it for admemes. @@ -3855,3 +3846,11 @@ id: 906 time: '2025-01-14T01:27:13.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2213 +- author: Lyndomen, KameriaKats + changes: + - message: Syndicate Elite Suits are now called Syndicate Thermal Suits to better + represent their niche + type: Tweak + id: 907 + time: '2025-01-14T01:39:32.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2720