Skip to content

Commit

Permalink
Merge branch 'master' into Chitinid
Browse files Browse the repository at this point in the history
  • Loading branch information
ElusiveCoin authored Jan 14, 2025
2 parents 76f92af + d9baf11 commit ed9bfff
Show file tree
Hide file tree
Showing 15 changed files with 139 additions and 122 deletions.
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);
}
}
}
77 changes: 40 additions & 37 deletions Resources/Changelog/DeltaVChangelog.yml
Original file line number Diff line number Diff line change
@@ -1,41 +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
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
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
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.
Expand Down Expand Up @@ -3851,3 +3814,43 @@
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
- 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
- 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
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/_DV/store/uplink-catalog.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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

1 change: 1 addition & 0 deletions Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
- id: ClothingShoesBootsWinterChiefMedicalOfficer
- id: LunchboxCommandFilledRandom
prob: 0.3
- id: ChemMasterFlatpack # So the chemist can make pills

- type: entityTable
id: LockerFillResearchDirectorDeltaV
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@
contents:
- id: ClothingHeadHatPwig
- id: Musket
- id: CartridgeAntiMateriel
amount: 2
- id: CartridgeMusket
amount: 4
- id: PaperMailNTMusket

# Delta Mail
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit ed9bfff

Please sign in to comment.