Skip to content

Commit

Permalink
Merge branch 'master' into Hristov-tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
Avalon-Proto authored Jan 14, 2025
2 parents e843294 + b051703 commit 65728d6
Show file tree
Hide file tree
Showing 40 changed files with 746 additions and 661 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public sealed partial class TeslaEnergyBallComponent : Component
/// The amount of energy to which the tesla must reach in order to be destroyed.
/// </summary>
[DataField, ViewVariables(VVAccess.ReadWrite)]
public float EnergyToDespawn = -100f;
public float EnergyToDespawn = -540f; // DeltaV, make the Tesla take as long to fail as the singulo.

/// <summary>
/// Played when energy reaches the lower limit (and entity destroyed)
Expand Down
61 changes: 0 additions & 61 deletions Content.Server/_DV/RoundEnd/RoundEndSystem.Pacified.cs

This file was deleted.

60 changes: 60 additions & 0 deletions Content.Server/_Harmony/RoundEnd/PacifyAllCommand
Original file line number Diff line number Diff line change
@@ -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<CombatModeComponent>();
while (harmQuery.MoveNext(out var uid, out _))
{
_entityManager.EnsureComponent<PacifiedComponent>(uid);
}

var explosiveQuery = _entityManager.EntityQueryEnumerator<ExplosiveComponent>();
while (explosiveQuery.MoveNext(out var uid, out _))
{
_entityManager.RemoveComponent<ExplosiveComponent>(uid);
}

var grenadeQuery = _entityManager.EntityQueryEnumerator<OnUseTimerTriggerComponent>();
while (grenadeQuery.MoveNext(out var uid, out _))
{
_entityManager.RemoveComponent<OnUseTimerTriggerComponent>(uid);
}

var flashQuery = _entityManager.EntityQueryEnumerator<FlashComponent>();
while (flashQuery.MoveNext(out var uid, out _))
{
_entityManager.RemoveComponent<FlashComponent>(uid);
}

var uplinkQuery = _entityManager.EntityQueryEnumerator<StoreComponent>();
while (uplinkQuery.MoveNext(out var uid, out _))
{
_entityManager.RemoveComponent<StoreComponent>(uid);
}
}
}
60 changes: 32 additions & 28 deletions Resources/Changelog/DeltaVChangelog.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,4 @@
Entries:
- author: Bellwether
changes:
- message: The Chief Justice's apparel is now available in the uniform printer
type: Tweak
id: 402
time: '2024-06-17T16:37:43.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/1395
- 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
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.
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
Expand Down Expand Up @@ -3851,3 +3823,35 @@
id: 901
time: '2025-01-12T15:48:39.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/2658
- author: Dirius77
changes:
- message: Made the Tesla much slower to fade after power loss.
type: Tweak
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
- 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
- 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
16 changes: 0 additions & 16 deletions Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@
equipment:
jumpsuit: ClothingUniformJumpsuitQMFormal

- type: loadout #DeltaV
id: QuartermasterFormalDress
equipment:
jumpsuit: ClothingUniformJumpskirtQMFormal

# Head
- type: loadout
id: QuartermasterHead
Expand All @@ -40,11 +35,6 @@
equipment:
head: ClothingHeadHatBeretQM

- type: loadout # DeltaV
id: LogiOfficerBeret
equipment:
head: ClothingHeadHatBeretLogi

# Neck
- type: loadout
id: QuartermasterCloak
Expand All @@ -61,9 +51,3 @@
id: QuartermasterWintercoat
equipment:
outerClothing: ClothingOuterWinterQM

# Shoes - DeltaV
- type: loadout
id: QuartermasterWinterBoots
equipment:
shoes: ClothingShoesBootsWinterLogisticsOfficer
11 changes: 0 additions & 11 deletions Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,3 @@
id: SalvageBoots
equipment:
shoes: ClothingShoesBootsSalvage

- type: loadout # DeltaV
id: SalvageWinterBoots
equipment:
shoes: ClothingShoesBootsWinterMiner

# Neck - DeltaV
- type: loadout # DeltaV
id: SalvageCloak
equipment:
neck: ClothingNeckSalvager
6 changes: 0 additions & 6 deletions Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,3 @@
id: BartenderWintercoat
equipment:
outerClothing: ClothingOuterWinterBar

# Glasses - DeltaV
- type: loadout
id: BartenderGlasses
equipment:
eyes: ClothingEyesHudBeer
46 changes: 0 additions & 46 deletions Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,52 +48,6 @@
equipment:
jumpsuit: ClothingUniformColorRainbow

# Rose Hoodie w/ Skirt - DeltaV
- type: loadout
id: MioSkirt
equipment:
jumpsuit: ClothingCostumeMioSkirt

# Turqoise Hoodie w/ Shorts - DeltaV
- type: loadout
id: NaotaHoodie
equipment:
jumpsuit: ClothingCostumeNaota

# Casual Blue - DeltaV
- type: loadout
id: CasualRedSkirt
equipment:
jumpsuit: ClothingUniformJumpskirtCasualRed

- type: loadout
id: CasualRedSuit
equipment:
jumpsuit: ClothingUniformJumpsuitCasualRed


# Casual Blue - DeltaV
- type: loadout
id: CasualBlueSkirt
equipment:
jumpsuit: ClothingUniformJumpskirtCasualBlue

- type: loadout
id: CasualBlueSuit
equipment:
jumpsuit: ClothingUniformJumpsuitCasualBlue

# Casual Purple - DeltaV
- type: loadout
id: CasualPurpleSkirt
equipment:
jumpsuit: ClothingUniformJumpskirtCasualPurple

- type: loadout
id: CasualPurpleSuit
equipment:
jumpsuit: ClothingUniformJumpsuitCasualPurple

# Ancient
- type: loadout
id: AncientJumpsuit
Expand Down
27 changes: 0 additions & 27 deletions Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,12 @@
equipment:
head: ClothingHeadHatCapcap

- type: loadout # DeltaV
id: CaptainBeret
equipment:
head: ClothingHeadHatBeretCap

# Neck
- type: loadout
id: CaptainCloak
equipment:
neck: ClothingNeckCloakCap

- type: loadout # DeltaV
id: CaptainCloakFormal
equipment:
neck: ClothingNeckCloakCapFormal

- type: loadout
id: CaptainMantle
equipment:
Expand Down Expand Up @@ -77,20 +67,3 @@
id: CaptainWintercoat
equipment:
outerClothing: ClothingOuterWinterCap

# Gloves - DeltaV
- type: loadout # DeltaV
id: CaptainGloves
equipment:
gloves: ClothingHandsGlovesCaptain

- type: loadout # DeltaV
id: InspectionGloves
equipment:
gloves: ClothingHandsGlovesInspection

# Shoes - DeltaV
- type: loadout # DeltaV
id: CaptainWinterBoots
equipment:
shoes: ClothingShoesBootsWinterCap
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,6 @@
equipment:
outerClothing: ClothingOuterVestHazard

- type: loadout # DeltaV
id: StationEngineerWintercoat
equipment:
outerClothing: ClothingOuterWinterEngi

# Shoes
- type: loadout
id: WorkBoots
Expand Down
Loading

0 comments on commit 65728d6

Please sign in to comment.