diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs index 267daff089..3ddaa10096 100644 --- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs +++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs @@ -1,3 +1,4 @@ +using Content.Server._CP14.Temperature; using Content.Server.Administration.Logs; using Content.Server.Atmos.Components; using Content.Server.IgnitionSource; @@ -27,7 +28,6 @@ using Robust.Shared.Physics.Components; using Robust.Shared.Physics.Events; using Robust.Shared.Physics.Systems; using Robust.Shared.Random; -using Content.Server.CrystallPunk.Temperature; namespace Content.Server.Atmos.EntitySystems { diff --git a/Content.Server/Audio/AmbientSoundSystem.cs b/Content.Server/Audio/AmbientSoundSystem.cs index aa2c656a86..39af6b36ab 100644 --- a/Content.Server/Audio/AmbientSoundSystem.cs +++ b/Content.Server/Audio/AmbientSoundSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.CrystallPunk.Temperature; +using Content.Server._CP14.Temperature; using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; using Content.Shared.Audio; @@ -13,7 +13,7 @@ public sealed class AmbientSoundSystem : SharedAmbientSoundSystem base.Initialize(); SubscribeLocalEvent(HandlePowerChange); SubscribeLocalEvent(HandlePowerSupply); - SubscribeLocalEvent(OnFireChanged); //CrystallPunk bonfire moment + SubscribeLocalEvent(OnFireChanged); //CrystallPunk bonfire moment } private void HandlePowerSupply(EntityUid uid, AmbientOnPoweredComponent component, ref PowerNetBatterySupplyEvent args) @@ -27,7 +27,7 @@ public sealed class AmbientSoundSystem : SharedAmbientSoundSystem } //CrystallPunk bonfire moment - private void OnFireChanged(Entity ent, ref OnFireChangedEvent args) + private void OnFireChanged(Entity ent, ref OnFireChangedEvent args) { SetAmbience(ent, args.OnFire); } diff --git a/Content.Server/Temperature/Systems/EntityHeaterSystem.cs b/Content.Server/Temperature/Systems/EntityHeaterSystem.cs index 78323198fc..48e3ce4f87 100644 --- a/Content.Server/Temperature/Systems/EntityHeaterSystem.cs +++ b/Content.Server/Temperature/Systems/EntityHeaterSystem.cs @@ -1,5 +1,5 @@ +using Content.Server._CP14.Temperature; using Content.Server.Atmos.Components; -using Content.Server.CrystallPunk.Temperature; using Content.Server.Power.Components; using Content.Server.Temperature.Components; using Content.Shared.Examine; @@ -49,7 +49,7 @@ public sealed class EntityHeaterSystem : EntitySystem } //CrystallPunk bonfire - var flammbaleQuery = EntityQueryEnumerator(); + var flammbaleQuery = EntityQueryEnumerator(); while (flammbaleQuery.MoveNext(out var uid, out _, out var placer, out var flammable)) { if (!flammable.OnFire) diff --git a/Content.Server/_CP14/Temperature/CPFireSpreadComponent.cs b/Content.Server/_CP14/Temperature/CP14FireSpreadComponent.cs similarity index 88% rename from Content.Server/_CP14/Temperature/CPFireSpreadComponent.cs rename to Content.Server/_CP14/Temperature/CP14FireSpreadComponent.cs index c3c193dd17..786511b498 100644 --- a/Content.Server/_CP14/Temperature/CPFireSpreadComponent.cs +++ b/Content.Server/_CP14/Temperature/CP14FireSpreadComponent.cs @@ -4,8 +4,8 @@ namespace Content.Server._CP14.Temperature; /// A component that allows fire to spread to nearby objects. The basic mechanics of a spreading fire /// -[RegisterComponent, Access(typeof(CPFireSpreadSystem))] -public sealed partial class CPFireSpreadComponent : Component +[RegisterComponent, Access(typeof(CP14FireSpreadSystem))] +public sealed partial class CP14FireSpreadComponent : Component { /// /// radius of ignition of neighboring objects diff --git a/Content.Server/_CP14/Temperature/CPFireSpreadSystem.cs b/Content.Server/_CP14/Temperature/CP14FireSpreadSystem.cs similarity index 82% rename from Content.Server/_CP14/Temperature/CPFireSpreadSystem.cs rename to Content.Server/_CP14/Temperature/CP14FireSpreadSystem.cs index 9ab1027612..d570f5ed3a 100644 --- a/Content.Server/_CP14/Temperature/CPFireSpreadSystem.cs +++ b/Content.Server/_CP14/Temperature/CP14FireSpreadSystem.cs @@ -1,12 +1,11 @@ using Content.Server.Atmos.Components; using Content.Server.Atmos.EntitySystems; -using Content.Server.CrystallPunk.Temperature; using Robust.Shared.Random; using Robust.Shared.Timing; namespace Content.Server._CP14.Temperature; -public sealed partial class CPFireSpreadSystem : EntitySystem +public sealed partial class CP14FireSpreadSystem : EntitySystem { [Dependency] private readonly FlammableSystem _flammable = default!; @@ -18,10 +17,10 @@ public sealed partial class CPFireSpreadSystem : EntitySystem public override void Initialize() { - SubscribeLocalEvent (OnCompInit); + SubscribeLocalEvent (OnCompInit); } - private void OnCompInit(Entity ent, ref OnFireChangedEvent args) + private void OnCompInit(Entity ent, ref OnFireChangedEvent args) { if (!args.OnFire) return; @@ -34,7 +33,7 @@ public sealed partial class CPFireSpreadSystem : EntitySystem { base.Update(frameTime); - var query = EntityQueryEnumerator(); + var query = EntityQueryEnumerator(); while (query.MoveNext(out var uid, out var spread, out var flammable)) { if (!flammable.OnFire) diff --git a/Content.Server/_CP14/Temperature/CPFlammableAmbientSoundComponent.cs b/Content.Server/_CP14/Temperature/CP14FlammableAmbientSoundComponent.cs similarity index 76% rename from Content.Server/_CP14/Temperature/CPFlammableAmbientSoundComponent.cs rename to Content.Server/_CP14/Temperature/CP14FlammableAmbientSoundComponent.cs index aa04a35172..548997f81f 100644 --- a/Content.Server/_CP14/Temperature/CPFlammableAmbientSoundComponent.cs +++ b/Content.Server/_CP14/Temperature/CP14FlammableAmbientSoundComponent.cs @@ -1,12 +1,12 @@ using Content.Server.Temperature.Systems; -namespace Content.Server.CrystallPunk.Temperature; +namespace Content.Server._CP14.Temperature; /// /// CTurn on and turn off AmbientSound when Flammable OnFire os changed /// [RegisterComponent, Access(typeof(EntityHeaterSystem))] -public sealed partial class CPFlammableAmbientSoundComponent : Component +public sealed partial class CP14FlammableAmbientSoundComponent : Component { } diff --git a/Content.Server/_CP14/Temperature/CPFlammableEntityHeaterComponent.cs b/Content.Server/_CP14/Temperature/CP14FlammableEntityHeaterComponent.cs similarity index 66% rename from Content.Server/_CP14/Temperature/CPFlammableEntityHeaterComponent.cs rename to Content.Server/_CP14/Temperature/CP14FlammableEntityHeaterComponent.cs index 84ece0aff5..1fa92fda1d 100644 --- a/Content.Server/_CP14/Temperature/CPFlammableEntityHeaterComponent.cs +++ b/Content.Server/_CP14/Temperature/CP14FlammableEntityHeaterComponent.cs @@ -1,11 +1,11 @@ using Content.Server.Temperature.Systems; -namespace Content.Server.CrystallPunk.Temperature; +namespace Content.Server._CP14.Temperature; /// /// Adds thermal energy from FlammableComponent to entities with placed on it. /// [RegisterComponent, Access(typeof(EntityHeaterSystem))] -public sealed partial class CPFlammableEntityHeaterComponent : Component +public sealed partial class CP14FlammableEntityHeaterComponent : Component { } diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/cloak.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/cloak.yml index b68403cd9d..e9fefe6c02 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/cloak.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/cloak.yml @@ -53,7 +53,7 @@ - type: Clothing sprite: _CP14/Clothing/Cloak/yellowhoodie.rsi - type: ToggleableClothing - clothingPrototype: CPClothingHeadHoodieYellow + clothingPrototype: CP14ClothingHeadHoodieYellow requiredSlot: - cloak slot: head diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml index c58acc2c33..60ef7ac66c 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml @@ -28,7 +28,7 @@ - type: MeleeWeapon attackRate: 1.8 wideAnimationRotation: 225 - wideAnimation: CPWeaponArcSlash + wideAnimation: CP14WeaponArcSlash damage: types: Slash: 5 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/handheldAxe.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/handheldAxe.yml index 87e76906ad..2229934a50 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/handheldAxe.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/handheldAxe.yml @@ -20,7 +20,7 @@ attackRate: 1.4 range: 1.2 wideAnimationRotation: 225 - wideAnimation: CPWeaponArcSlash + wideAnimation: CP14WeaponArcSlash damage: types: Slash: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/lightHammer.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/lightHammer.yml index 59a7d2cfdc..a76dab20eb 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/lightHammer.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/lightHammer.yml @@ -19,7 +19,7 @@ - type: MeleeWeapon attackRate: 1.5 wideAnimationRotation: 225 - wideAnimation: CPWeaponArcSlash + wideAnimation: CP14WeaponArcSlash cPAnimationLength: 0.18 damage: types: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/mace.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/mace.yml index 95d7e31f56..c3c5525856 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/mace.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/mace.yml @@ -16,7 +16,7 @@ - type: MeleeWeapon attackRate: 0.7 wideAnimationRotation: 205 - wideAnimation: CPWeaponArcSlash + wideAnimation: CP14WeaponArcSlash damage: types: Blunt: 25 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml index 9bd04512f3..ea02cd44d2 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml @@ -27,7 +27,7 @@ - type: MeleeWeapon attackRate: 1.5 wideAnimationRotation: 225 - wideAnimation: CPWeaponArcSlash + wideAnimation: CP14WeaponArcSlash cPAnimationLength: 0.18 damage: types: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml index b33b20ac31..1c1e8cf9f1 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml @@ -19,7 +19,7 @@ - type: MeleeWeapon attackRate: 1 wideAnimationRotation: -115 - wideAnimation: CPWeaponArcThrust + wideAnimation: CP14WeaponArcThrust damage: types: Piercing: 24 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml index 6d122e0d83..b45e1d4601 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml @@ -24,7 +24,7 @@ - type: MeleeWeapon attackRate: 0.5 wideAnimationRotation: 205 - wideAnimation: CPWeaponArcSlash + wideAnimation: CP14WeaponArcSlash damage: types: Slash: 5 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/coins.yml b/Resources/Prototypes/_CP14/Entities/Objects/coins.yml index 6025373edf..b0ace5cf7b 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/coins.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/coins.yml @@ -5,7 +5,7 @@ components: - type: Tag tags: - - CPCoin + - CP14Coin - type: Item size: Tiny - type: Stack @@ -39,7 +39,7 @@ - state: coin10 map: ["base"] - type: Stack - stackType: CPCopperCoin + stackType: CP14CopperCoin - type: entity id: CP14CopperCoin5 @@ -76,7 +76,7 @@ - state: coin10 map: ["base"] - type: Stack - stackType: CPSilverCoin + stackType: CP14SilverCoin - type: entity id: CP14SilverCoin5 @@ -113,7 +113,7 @@ - state: coin10 map: ["base"] - type: Stack - stackType: CPGoldCoin + stackType: CP14GoldCoin - type: entity id: CP14GoldCoin5 @@ -150,7 +150,7 @@ - state: coin10 map: ["base"] - type: Stack - stackType: CPPlatinumCoin + stackType: CP14PlatinumCoin - type: entity id: CP14PlatinumCoin5 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Decoration/bonfire.yml b/Resources/Prototypes/_CP14/Entities/Structures/Decoration/bonfire.yml index bc09d38610..db42592bda 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Decoration/bonfire.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Decoration/bonfire.yml @@ -43,7 +43,7 @@ behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] - - type: CPFlammableAmbientSound + - type: CP14FlammableAmbientSound - type: AmbientSound enabled: false volume: -5 @@ -75,4 +75,4 @@ whitelist: components: - Temperature - - type: CPFlammableEntityHeater \ No newline at end of file + - type: CP14FlammableEntityHeater \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/chests.yml b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/chests.yml index b2ec883bbb..daad079672 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/chests.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/chests.yml @@ -2,7 +2,7 @@ parent: - CP14ChestGeneric - CP14BaseWooden - id: CPWoodenChest + id: CP14WoodenChest name: wooden chest description: A simple wooden chest for easy storage of junk. components: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml index 15d33dcfc3..04d7a89f2e 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml @@ -36,9 +36,6 @@ sprite: _CP14/Structures/Walls/cave_stone_copper.rsi - type: Icon sprite: _CP14/Structures/Walls/cave_stone_copper.rsi - - type: IconSmooth - key: CPwall - base: stone - type: Destructible thresholds: - trigger: @@ -54,7 +51,7 @@ volume: -6 - !type:SpawnEntitiesBehavior spawn: - CPOreCopper: + CP14OreCopper: min: 1 max: 5 @@ -69,9 +66,6 @@ sprite: _CP14/Structures/Walls/cave_stone_iron.rsi - type: Icon sprite: _CP14/Structures/Walls/cave_stone_iron.rsi - - type: IconSmooth - key: CPwall - base: stone - type: Destructible thresholds: - trigger: @@ -87,7 +81,7 @@ volume: -6 - !type:SpawnEntitiesBehavior spawn: - CPOreIron: + CP14OreIron: min: 1 max: 5 @@ -102,9 +96,6 @@ sprite: _CP14/Structures/Walls/cave_stone_silver.rsi - type: Icon sprite: _CP14/Structures/Walls/cave_stone_silver.rsi - - type: IconSmooth - key: CPwall - base: stone - type: Destructible thresholds: - trigger: @@ -120,7 +111,7 @@ volume: -6 - !type:SpawnEntitiesBehavior spawn: - CPOreSilver: + CP14OreSilver: min: 1 max: 5 @@ -135,9 +126,6 @@ sprite: _CP14/Structures/Walls/cave_stone_gold.rsi - type: Icon sprite: _CP14/Structures/Walls/cave_stone_gold.rsi - - type: IconSmooth - key: CPwall - base: stone - type: Destructible thresholds: - trigger: @@ -153,6 +141,6 @@ volume: -6 - !type:SpawnEntitiesBehavior spawn: - CPOreGold: + CP14OreGold: min: 1 max: 5 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/base.yml b/Resources/Prototypes/_CP14/Entities/base.yml index fa136bcd99..5dd1d8797a 100644 --- a/Resources/Prototypes/_CP14/Entities/base.yml +++ b/Resources/Prototypes/_CP14/Entities/base.yml @@ -8,7 +8,7 @@ - type: Tag tags: - Wooden - - type: CPFlammableAmbientSound + - type: CP14FlammableAmbientSound - type: AmbientSound enabled: false volume: -5 @@ -35,4 +35,4 @@ - type: FireVisuals sprite: _CP14/Effects/fire.rsi normalState: small - - type: CPFireSpread \ No newline at end of file + - type: CP14FireSpread \ No newline at end of file