From 42627a0c33755b3096a4c6f0b5a115736efb49ed Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Tue, 28 Jan 2025 13:04:10 +0300 Subject: [PATCH] Random content (#815) * demiplane crystal sprite update * fix demiplane astral haze vanilla * fix infinity money stacking * rabbits outbreak! * fix meta * fix rga * fix CLRF * move subterranean leap action to actions folder * Update audio.yml * Update natural.yml * restore lzk commit * fix endscreen text * fix goblin displacement, fix #809 * Update kudzu.yml --- Content.Server/Ghost/GhostSystem.cs | 9 +- .../_CP14/Cargo/CP14CargoSystem.Shuttle.cs | 1 + .../Rules/CP14PersonalObjectivesRule.cs | 18 +- Content.Shared/Actions/BaseActionComponent.cs | 5 + Content.Shared/Actions/SharedActionsSystem.cs | 3 + Resources/Maps/_CP14/comoss.yml | 2 +- Resources/Maps/_CP14/comoss_d.yml | 2 +- Resources/Prototypes/Actions/types.yml | 2 + .../Entities/Mobs/Player/observer.yml | 1 + .../Spells/Earth/MOB_subterranean_leap.yml | 46 +++ .../Markers/Spawners/demiplane_rifts.yml | 15 +- .../_CP14/Entities/Mobs/NPC/mole.yml | 48 +-- .../_CP14/Entities/Mobs/Species/elf.yml | 10 + .../_CP14/Entities/Mobs/Species/goblin.yml | 10 + .../_CP14/Entities/Mobs/Species/human.yml | 10 + .../_CP14/Entities/Mobs/Species/silva.yml | 10 + .../_CP14/Entities/Mobs/Species/tiefling.yml | 10 + .../_CP14/Entities/Mobs/Species/zombie.yml | 10 + .../_CP14/Entities/Objects/guidebooks.yml | 2 +- .../_CP14/Entities/Structures/kudzu.yml | 66 ++++ .../_CP14/Entities/Structures/round_end.yml | 19 +- .../_CP14/Entities/Tiles/astral_corrosion.yml | 30 ++ .../Prototypes/_CP14/GameRules/events.yml | 36 +- .../human_inventory_template.yml | 2 +- .../Demiplane/Modifiers/Danger/misc.yml | 2 +- Resources/Prototypes/_CP14/Tiles/natural.yml | 10 +- Resources/Prototypes/audio.yml | 338 +----------------- .../Backpacks/leather_backpack.rsi/meta.json | 2 +- .../Alchemist/alchemist_cloak.rsi/meta.json | 2 +- .../Bank/commandant_jacket.rsi/meta.json | 2 +- .../Captain/captain_jacket.rsi/meta.json | 2 +- .../General/blacksmith_apron.rsi/meta.json | 2 +- .../Cloak/Roles/General/blue.rsi/meta.json | 2 +- .../Roles/General/cheetah_skin.rsi/meta.json | 2 +- .../Cloak/Roles/General/furcape.rsi/meta.json | 2 +- .../Roles/General/furcape2.rsi/meta.json | 2 +- .../Cloak/Roles/General/green.rsi/meta.json | 2 +- .../_CP14/LobbyScreens/attributions.yml | 2 +- .../Consumable/Food/dough.rsi/meta.json | 2 +- .../Objects/Consumable/Food/pie.rsi/meta.json | 2 +- .../demiplane_link_crystal.rsi/base.png | Bin 1574 -> 0 bytes .../demiplane_link_crystal.rsi/empty.png | Bin 0 -> 1552 bytes .../demiplane_link_crystal.rsi/frame.png | Bin 0 -> 833 bytes .../demiplane_link_crystal.rsi/full.png | Bin 0 -> 1629 bytes .../demiplane_link_crystal.rsi/meta.json | 29 +- .../demiplane_link_crystal.rsi/warning.png | Bin 0 -> 7698 bytes .../_CP14/Tiles/Dirt/attributions.yml | 2 +- .../Textures/_CP14/Tiles/attributions.yml | 4 +- 48 files changed, 329 insertions(+), 449 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/MOB_subterranean_leap.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Structures/kudzu.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Tiles/astral_corrosion.yml delete mode 100644 Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/base.png create mode 100644 Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/empty.png create mode 100644 Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/frame.png create mode 100644 Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/full.png create mode 100644 Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/warning.png diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs index 65f4c1efe2..230a93d985 100644 --- a/Content.Server/Ghost/GhostSystem.cs +++ b/Content.Server/Ghost/GhostSystem.cs @@ -223,14 +223,7 @@ namespace Content.Server.Ghost private void OnMapInit(EntityUid uid, GhostComponent component, MapInitEvent args) { - if (_actions.AddAction(uid, ref component.BooActionEntity, out var act, component.BooAction) - && act.UseDelay != null) - { - var start = _gameTiming.CurTime; - var end = start + act.UseDelay.Value; - _actions.SetCooldown(component.BooActionEntity.Value, start, end); - } - + _actions.AddAction(uid, ref component.BooActionEntity, component.BooAction); //_actions.AddAction(uid, ref component.ToggleGhostHearingActionEntity, component.ToggleGhostHearingAction); //Dont need in CP14 _actions.AddAction(uid, ref component.ToggleLightingActionEntity, component.ToggleLightingAction); _actions.AddAction(uid, ref component.ToggleFoVActionEntity, component.ToggleFoVAction); diff --git a/Content.Server/_CP14/Cargo/CP14CargoSystem.Shuttle.cs b/Content.Server/_CP14/Cargo/CP14CargoSystem.Shuttle.cs index 062066cd1e..831333437a 100644 --- a/Content.Server/_CP14/Cargo/CP14CargoSystem.Shuttle.cs +++ b/Content.Server/_CP14/Cargo/CP14CargoSystem.Shuttle.cs @@ -110,6 +110,7 @@ public sealed partial class CP14CargoSystem station.OnStation = true; CashOut((ent.Comp.Station, station)); + station.Balance = 0; } UpdateAllStores(); diff --git a/Content.Server/_CP14/GameTicking/Rules/CP14PersonalObjectivesRule.cs b/Content.Server/_CP14/GameTicking/Rules/CP14PersonalObjectivesRule.cs index 38c94873b8..d24ef4a493 100644 --- a/Content.Server/_CP14/GameTicking/Rules/CP14PersonalObjectivesRule.cs +++ b/Content.Server/_CP14/GameTicking/Rules/CP14PersonalObjectivesRule.cs @@ -39,7 +39,8 @@ public sealed class CP14PersonalObjectivesRule : GameRuleSystem(objEnt)) @@ -140,10 +144,16 @@ public sealed class CP14PersonalObjectivesRule : GameRuleSystem 0.99f) status = "cp14-objective-endtext-status-success"; + show = true; + var meta = MetaData(objEnt); - sb.Append($"{meta.EntityName} - {Loc.GetString(status)} ({(int)(progress * 100)}%)\n"); + sbLocal.Append($"{meta.EntityName} - {Loc.GetString(status)} ({(int)(progress * 100)}%)\n"); } + + if (show) + sb.Append(sbLocal); } + args.AddLine(sb.ToString()); } } diff --git a/Content.Shared/Actions/BaseActionComponent.cs b/Content.Shared/Actions/BaseActionComponent.cs index 01452bdc72..c3aa6cc97e 100644 --- a/Content.Shared/Actions/BaseActionComponent.cs +++ b/Content.Shared/Actions/BaseActionComponent.cs @@ -76,6 +76,11 @@ public abstract partial class BaseActionComponent : Component // TODO serialization public (TimeSpan Start, TimeSpan End)? Cooldown; + /// + /// If true, the action will have an initial cooldown applied upon addition. + /// + [DataField] public bool StartDelay = false; + /// /// Time interval between action uses. /// diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs index 83763fb8d2..1a4a8706dc 100644 --- a/Content.Shared/Actions/SharedActionsSystem.cs +++ b/Content.Shared/Actions/SharedActionsSystem.cs @@ -825,6 +825,9 @@ public abstract class SharedActionsSystem : EntitySystem if (action.AttachedEntity != null) RemoveAction(action.AttachedEntity.Value, actionId, action: action); + if (action.StartDelay && action.UseDelay != null) + SetCooldown(actionId, action.UseDelay.Value); + DebugTools.AssertOwner(performer, comp); comp ??= EnsureComp(performer); action.AttachedEntity = performer; diff --git a/Resources/Maps/_CP14/comoss.yml b/Resources/Maps/_CP14/comoss.yml index bc3e37ebbe..edcf83d3b8 100644 --- a/Resources/Maps/_CP14/comoss.yml +++ b/Resources/Maps/_CP14/comoss.yml @@ -106504,4 +106504,4 @@ entities: parent: 2 - type: WarpPoint location: Dungeon -... +... \ No newline at end of file diff --git a/Resources/Maps/_CP14/comoss_d.yml b/Resources/Maps/_CP14/comoss_d.yml index 3f480d8381..3a49c2aad6 100644 --- a/Resources/Maps/_CP14/comoss_d.yml +++ b/Resources/Maps/_CP14/comoss_d.yml @@ -126093,4 +126093,4 @@ entities: - type: Transform pos: 0.5,-11.5 parent: 2 -... +... \ No newline at end of file diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml index b9e2e05779..a9ac169d3c 100644 --- a/Resources/Prototypes/Actions/types.yml +++ b/Resources/Prototypes/Actions/types.yml @@ -280,6 +280,8 @@ checkCanInteract: false checkConsciousness: false event: !type:WakeActionEvent + startDelay: true + useDelay: 2 - type: entity id: ActionActivateHonkImplant diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml index d2baf0a36b..32a481491c 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml @@ -80,6 +80,7 @@ icon: Interface/Actions/scream.png checkCanInteract: false event: !type:BooActionEvent + startDelay: true useDelay: 120 - type: entity diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/MOB_subterranean_leap.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/MOB_subterranean_leap.yml new file mode 100644 index 0000000000..4edbb9b0e8 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/MOB_subterranean_leap.yml @@ -0,0 +1,46 @@ +- type: entity + id: CP14ActionMoleSpellSubterraneanLeap + name: Subterranean leap + description: Make a subterranean leap, quickly approaching the victim. + components: + - type: CP14MagicEffectCastSlowdown + speedMultiplier: -1.0 + - type: CP14MagicEffectManaCost + manaCost: 5 + - type: CP14MagicEffect + telegraphyEffects: + - !type:CP14SpellSpawnEntityOnTarget + spawns: + - CP14ImpactEffectDigging + effects: + - !type:CP14SpellCasterTeleport + needVision: false + - !type:CP14SpellSpawnEntityOnTarget + spawns: + - CP14ImpactEffectDigging + - type: CP14MagicEffectCastingVisual + proto: CP14ImpactEffectDigging + - type: EntityWorldTargetAction + useDelay: 8 + range: 10 + checkCanAccess: false + itemIconStyle: BigAction + sound: !type:SoundPathSpecifier + path: /Audio/Effects/gib3.ogg + icon: + sprite: _CP14/Effects/Magic/spells_icons_monster.rsi + state: subterranean_leap + event: !type:CP14DelayedEntityWorldTargetActionEvent + hidden: true + breakOnMove: false + raiseOnUser: true + +- type: entity + id: CP14ImpactEffectDigging + parent: CP14BaseMagicImpact + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: _CP14/Effects/material_splash.rsi + layers: + - state: dirt1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml index 571e660fa5..b3e361ab93 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml @@ -85,7 +85,6 @@ children: - id: CP14MobDinoSmallHydra - - type: entity parent: CP14BaseMobGroupSpawner id: CP14MobGroupSpawnerMosquito @@ -99,3 +98,17 @@ range: 2, 3 children: - id: CP14MobMonsterMosquito + +- type: entity + parent: CP14BaseMobGroupSpawner + id: CP14MobGroupSpawnerRabbits + suffix: 2-3 Rabbits + components: + - type: EntityTableSpawner + deleteSpawnerAfterSpawn: false + offset: 1 + table: !type:GroupSelector + rolls: !type:RangeNumberSelector + range: 2, 3 + children: + - id: CP14MobRabbit diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/mole.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/mole.yml index 472827bbbe..e896926e4b 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/mole.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/mole.yml @@ -94,50 +94,4 @@ - FootstepSound - CP14Mosquito - type: StealTarget - stealGroup: CP14Mole - -- type: entity - id: CP14ActionMoleSpellSubterraneanLeap - name: Subterranean leap - description: Make a subterranean leap, quickly approaching the victim. - components: - - type: CP14MagicEffectCastSlowdown - speedMultiplier: -1.0 - - type: CP14MagicEffect - manaCost: 5 - telegraphyEffects: - - !type:CP14SpellSpawnEntityOnTarget - spawns: - - CP14ImpactEffectDigging - effects: - - !type:CP14SpellCasterTeleport - needVision: false - - !type:CP14SpellSpawnEntityOnTarget - spawns: - - CP14ImpactEffectDigging - - type: CP14MagicEffectCastingVisual - proto: CP14ImpactEffectDigging - - type: EntityWorldTargetAction - useDelay: 8 - range: 10 - checkCanAccess: false - itemIconStyle: BigAction - sound: !type:SoundPathSpecifier - path: /Audio/Effects/gib3.ogg - icon: - sprite: _CP14/Effects/Magic/spells_icons_monster.rsi - state: subterranean_leap - event: !type:CP14DelayedEntityWorldTargetActionEvent - hidden: true - breakOnMove: false - raiseOnUser: true - -- type: entity - id: CP14ImpactEffectDigging - parent: CP14BaseMagicImpact - categories: [ HideSpawnMenu ] - components: - - type: Sprite - sprite: _CP14/Effects/material_splash.rsi - layers: - - state: dirt1 \ No newline at end of file + stealGroup: CP14Mole \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml index 0f9445add8..532ee368cd 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml @@ -39,6 +39,11 @@ 32: sprite: _CP14/Mobs/Species/Human/displacement.rsi state: female_cloak + outerClothing: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_cloak pants: sizeMaps: 32: @@ -71,6 +76,11 @@ 32: sprite: _CP14/Mobs/Species/Human/displacement.rsi state: female_cloak + outerClothing: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_cloak pants: sizeMaps: 32: diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml index 5b8d0c4c4e..7e297b3540 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml @@ -83,6 +83,11 @@ 32: sprite: _CP14/Mobs/Species/Goblin/displacement.rsi state: cloak + outerClothing: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: cloak eyes: sizeMaps: 32: @@ -143,6 +148,11 @@ 32: sprite: _CP14/Mobs/Species/Goblin/displacement.rsi state: cloak + outerClothing: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: cloak eyes: sizeMaps: 32: diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml index c6278490c6..699add7587 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml @@ -22,6 +22,11 @@ - type: Inventory templateId: CP14Human femaleDisplacements: + outerClothing: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_cloak cloak: sizeMaps: 32: @@ -53,6 +58,11 @@ 32: sprite: _CP14/Mobs/Species/Human/displacement.rsi state: female_cloak + outerClothing: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_cloak gloves: sizeMaps: 32: diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml index 04fc7a587b..58951ba2ed 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml @@ -80,6 +80,11 @@ - type: Inventory templateId: CP14Human displacements: + outerClothing: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_cloak cloak: sizeMaps: 32: @@ -165,6 +170,11 @@ 32: sprite: _CP14/Mobs/Species/Human/displacement.rsi state: female_cloak + outerClothing: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_cloak pants: sizeMaps: 32: diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml index d3990af0c0..2c7c1d6ab2 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml @@ -50,6 +50,11 @@ - type: Inventory templateId: CP14Human femaleDisplacements: + outerClothing: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_cloak cloak: sizeMaps: 32: @@ -87,6 +92,11 @@ 32: sprite: _CP14/Mobs/Species/Human/displacement.rsi state: female_cloak + outerClothing: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_cloak gloves: sizeMaps: 32: diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml index d269f82295..30b72a1b33 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml @@ -145,6 +145,11 @@ - type: Inventory templateId: CP14Partial femaleDisplacements: + outerClothing: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_cloak cloak: sizeMaps: 32: @@ -176,6 +181,11 @@ 32: sprite: _CP14/Mobs/Species/Human/displacement.rsi state: female_cloak + outerClothing: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_cloak gloves: sizeMaps: 32: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/guidebooks.yml b/Resources/Prototypes/_CP14/Entities/Objects/guidebooks.yml index 9ef52b7c44..5cac9bf017 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/guidebooks.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/guidebooks.yml @@ -16,4 +16,4 @@ - type: GuideHelp guides: - CP14_RU_Imperial_Laws - - CP14_EN_Imperial_Laws + - CP14_EN_Imperial_Laws \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/kudzu.yml b/Resources/Prototypes/_CP14/Entities/Structures/kudzu.yml new file mode 100644 index 0000000000..fc878adaba --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/kudzu.yml @@ -0,0 +1,66 @@ +- type: entity + name: astral haze + id: CP14AstralHaze + categories: [ ForkFiltered ] + parent: + - BaseKudzu + - BaseShadow + components: + - type: Physics + canCollide: false + - type: Occluder + - type: Sprite + drawdepth: Effects + sprite: Effects/spookysmoke.rsi + layers: + - state: spookysmoke + color: "#793a80dd" + map: [base] + - type: Kudzu + growthTickChance: 0.2 + spreadChance: 0.99 + - type: RandomSpawner + deleteSpawnerAfterSpawn: false + rareChance: 0.05 + offset: 0.2 + chance: 0.45 + prototypes: + - CP14AstralCorrosion + rarePrototypes: + - CP14AstralHazeKudzuLootSpawner + - type: Tag + tags: + - HideContextMenu + - SpookyFog + - type: OptionsVisualizer + visuals: + base: + - options: Default + data: { state: spookysmoke } + - options: ReducedMotion + data: { state: spookysmoke_static } + +- type: entity + id: CP14AstralHazeKudzuLootSpawner + parent: MarkerBase + categories: [ ForkFiltered ] + components: + - type: Sprite + layers: + - state: red + - sprite: Structures/Specific/Anomalies/shadow_anom.rsi + state: anom + - type: RandomSpawner + offset: 0.05 + chance: 0.5 + prototypes: + - CP14CrystalAmethystsSmall + - CP14CrystalAmethystsSmall + - CP14CrystalAmethystsSmall + - CP14CrystalAmethystsMedium + - CP14CrystalAmethystsMedium + - CP14CrystalAmethystsBig + rareChance: 0.05 + #rarePrototypes: + # - MobCatShadow + # - ArtifactFragment \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/round_end.yml b/Resources/Prototypes/_CP14/Entities/Structures/round_end.yml index 0fcb9d28eb..18edda0fd6 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/round_end.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/round_end.yml @@ -28,13 +28,26 @@ noRot: true sprite: _CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi layers: - - state: base + - state: full + - state: frame drawdepth: Mobs offset: 0,0.9 - type: PointLight - color: "#42166b" - energy: 3 + enabled: true + color: "#8f42ff" + energy: 30 radius: 5 + netsync: false + - type: LightBehaviour + behaviours: + - !type:PulseBehaviour + interpolate: Cubic + maxDuration: 5 + minValue: 1.0 + maxValue: 40.0 + property: Energy + isLooped: true + enabled: true - type: CP14MagicContainerRoundFinisher - type: CP14MagicEnergyExaminable - type: CP14MagicEnergyContainer diff --git a/Resources/Prototypes/_CP14/Entities/Tiles/astral_corrosion.yml b/Resources/Prototypes/_CP14/Entities/Tiles/astral_corrosion.yml new file mode 100644 index 0000000000..13a6d2967d --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Tiles/astral_corrosion.yml @@ -0,0 +1,30 @@ +- type: entity + id: CP14AstralCorrosion + name: astral corrosion + description: Glowing cracks in reality. It's probably fine. + categories: [ ForkFiltered ] + placement: + mode: SnapgridCenter + components: + - type: Clickable + - type: Sprite + sprite: /Textures/Tiles/Planet/shadowbasalt.rsi + layers: + - state: basalt1 + shader: unshaded + drawdepth: LowFloors + - type: SyncSprite + - type: RequiresTile + - type: Transform + anchored: true + - type: Tag + tags: + - HideContextMenu + - type: RandomSprite + available: + - 0: + basalt1: "" + basalt2: "" + basalt3: "" + basalt4: "" + basalt5: "" \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/GameRules/events.yml b/Resources/Prototypes/_CP14/GameRules/events.yml index 6dd63d960d..7294b538ca 100644 --- a/Resources/Prototypes/_CP14/GameRules/events.yml +++ b/Resources/Prototypes/_CP14/GameRules/events.yml @@ -12,21 +12,10 @@ id: CP14BasicCalmEventsTable table: !type:AllSelector children: - #- id: CP14ClosetSkeleton - id: CP14ZombiesSpawn - id: CP14HydrasSpawn - id: CP14MosquitoSpawn - -#- type: entity -# parent: CP14BaseGameRule -# id: CP14ClosetSkeleton -# components: -# - type: StationEvent -# weight: 5 -# duration: 1 -# minimumPlayers: 10 -# - type: RandomEntityStorageSpawnRule -# prototype: CP14MobUndeadSkeletonCloset + - id: CP14RabbitsSpawn - type: entity parent: CP14BaseStationEventShortDelay @@ -43,7 +32,7 @@ - type: VentCrittersRule entries: - id: CP14MobGroupSpawnerZombie - prob: 0.05 + prob: 0.08 - type: entity parent: CP14BaseStationEventShortDelay @@ -60,7 +49,7 @@ - type: VentCrittersRule entries: - id: CP14MobGroupSpawnerHydras - prob: 0.05 + prob: 0.08 - type: entity parent: CP14BaseStationEventShortDelay @@ -77,4 +66,21 @@ - type: VentCrittersRule entries: - id: CP14MobGroupSpawnerMosquito - prob: 0.05 + prob: 0.08 + +- type: entity + parent: CP14BaseStationEventShortDelay + id: CP14RabbitsSpawn + components: + - type: StationEvent + startAnnouncement: cp14-event-announcement-demiplane-outbreak + startAudio: + path: /Audio/_CP14/Ambience/event_boom.ogg + earliestStart: 20 + minimumPlayers: 10 + weight: 5 + duration: 60 + - type: VentCrittersRule + entries: + - id: CP14MobGroupSpawnerRabbits + prob: 0.08 diff --git a/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml b/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml index fd91015ad9..08ffd88e5a 100644 --- a/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml +++ b/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml @@ -14,7 +14,7 @@ slotTexture: mask slotFlags: MASK uiWindowPos: 0,2 - strippingWindowPos: 1,2 + strippingWindowPos: 2,0 displayName: Mask - name: eyes slotTexture: eyes diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/misc.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/misc.yml index 5c96936a26..fa51e7f9cf 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/misc.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/misc.yml @@ -46,7 +46,7 @@ Danger: 0.3 layers: - !type:OreDunGen - entity: ShadowKudzu + entity: CP14AstralHaze count: 10 minGroupSize: 1 maxGroupSize: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Tiles/natural.yml b/Resources/Prototypes/_CP14/Tiles/natural.yml index d41b543f8b..1d10f72e7e 100644 --- a/Resources/Prototypes/_CP14/Tiles/natural.yml +++ b/Resources/Prototypes/_CP14/Tiles/natural.yml @@ -39,7 +39,6 @@ collection: FootstepAsteroid heatCapacity: 10000 weather: true - suckReagents: true - type: tile editorHidden: false @@ -71,7 +70,6 @@ collection: FootstepSnow #TODO heatCapacity: 10000 weather: true - suckReagents: true - type: tile id: CP14FloorGrass @@ -104,7 +102,6 @@ collection: FootstepGrass heatCapacity: 10000 weather: true - suckReagents: true - type: tile id: CP14FloorGrassLight @@ -137,7 +134,6 @@ collection: FootstepGrass heatCapacity: 10000 weather: true - suckReagents: true - type: tile id: CP14FloorGrassTall @@ -170,7 +166,6 @@ collection: FootstepGrass heatCapacity: 10000 weather: true - suckReagents: true - type: tile id: CP14FloorSnowDeepDeep @@ -203,7 +198,6 @@ collection: FootstepSnow heatCapacity: 10000 weather: true - suckReagents: true - type: tile id: CP14FloorSnowDeep @@ -236,7 +230,6 @@ collection: FootstepSnow heatCapacity: 10000 weather: true - suckReagents: true - type: tile id: CP14FloorSnow @@ -268,5 +261,4 @@ footstepSounds: collection: FootstepSnow heatCapacity: 10000 - weather: true - suckReagents: true \ No newline at end of file + weather: true \ No newline at end of file diff --git a/Resources/Prototypes/audio.yml b/Resources/Prototypes/audio.yml index eef39b5c3b..a9e0920ee1 100644 --- a/Resources/Prototypes/audio.yml +++ b/Resources/Prototypes/audio.yml @@ -1,337 +1 @@ -- type: ambientMusic - id: Morgue - sound: - params: - volume: -12 - collection: AmbienceSpooky - rules: NearMorgue - priority: 4 - -- type: ambientMusic - id: SpookyFog - sound: - params: - volume: -12 - collection: AmbienceSpookyFog - rules: NearSpookyFog - priority: 5 - -- type: ambientMusic - id: Holy - sound: - params: - volume: -12 - collection: AmbienceHoly - rules: NearPrayable - priority: 4 - -- type: ambientMusic - id: Train - sound: - params: - volume: -8 - collection: AmbienceTrain - rules: NearTrain - priority: 4 - -# Departments -- type: ambientMusic - id: Medical - sound: - params: - volume: -12 - collection: AmbienceMedical - rules: NearMedical - priority: 3 - -- type: ambientMusic - id: Engineering - sound: - params: - volume: -12 - collection: AmbienceEngineering - rules: NearEngineering - priority: 3 - -# General areas -- type: ambientMusic - id: Maintenance - sound: - params: - volume: -12 - collection: AmbienceMaintenance - rules: NearMaintenance - priority: 2 - -- type: ambientMusic - id: Space - sound: - params: - volume: -10 - collection: AmbienceSpace - fadeIn: true - interruptable: true - rules: InSpace - priority: 1 - -- type: ambientMusic - id: Mining - sound: - params: - volume: -12 - collection: AmbienceMining - rules: OnMapGrid - fadeIn: true - interruptable: true - priority: 1 - -## Fallback if nothing else found -- type: ambientMusic - id: General - sound: - params: - volume: -12 - collection: AmbienceGeneral - rules: AlwaysTrue - -# Sound collections -- type: soundCollection - id: AmbienceEngineering - files: - - /Audio/Ambience/ambiatmos.ogg - - /Audio/Ambience/ambiatmos2.ogg - - /Audio/Ambience/ambisin1.ogg - - /Audio/Ambience/ambisin2.ogg - - /Audio/Ambience/ambisin3.ogg - - /Audio/Ambience/ambisin4.ogg - - /Audio/Ambience/ambitech.ogg - - /Audio/Ambience/ambitech2.ogg - - /Audio/Ambience/ambitech3.ogg - -- type: soundCollection - id: AmbienceGeneral - files: - - /Audio/Ambience/ambigen1.ogg - - /Audio/Ambience/ambigen3.ogg - - /Audio/Ambience/ambigen4.ogg - - /Audio/Ambience/ambigen5.ogg - - /Audio/Ambience/ambigen6.ogg - - /Audio/Ambience/ambigen7.ogg - - /Audio/Ambience/ambigen8.ogg - - /Audio/Ambience/ambigen9.ogg - - /Audio/Ambience/ambigen10.ogg - - /Audio/Ambience/ambigen11.ogg - - /Audio/Ambience/ambigen12.ogg - - /Audio/Ambience/ambigen14.ogg - - /Audio/Ambience/ambigen15.ogg - -- type: soundCollection - id: AmbienceHoly - files: - - /Audio/Ambience/ambicha1.ogg - - /Audio/Ambience/ambicha2.ogg - - /Audio/Ambience/ambicha3.ogg - - /Audio/Ambience/ambicha4.ogg - - /Audio/Ambience/ambiholy.ogg - - /Audio/Ambience/ambiholy2.ogg - - /Audio/Ambience/ambiholy3.ogg - -- type: soundCollection - id: AmbienceMaintenance - files: - - /Audio/Ambience/ambimaint1.ogg - - /Audio/Ambience/ambimaint2.ogg - - /Audio/Ambience/ambimaint3.ogg - - /Audio/Ambience/ambimaint4.ogg - - /Audio/Ambience/ambimaint5.ogg - - /Audio/Ambience/ambitech2.ogg - - /Audio/Voice/Misc/lowHiss1.ogg - - /Audio/Voice/Misc/lowHiss2.ogg - - /Audio/Voice/Misc/lowHiss3.ogg - - /Audio/Voice/Misc/lowHiss4.ogg - - /Audio/Ambience/maintambience.ogg - -- type: soundCollection - id: AmbienceMedical - files: - - /Audio/Ambience/ambinice.ogg - -- type: soundCollection - id: AmbienceMining - files: - - /Audio/Ambience/ambicave.ogg - - /Audio/Ambience/ambidanger.ogg - - /Audio/Ambience/ambidanger2.ogg - - /Audio/Ambience/ambilava1.ogg - - /Audio/Ambience/ambilava2.ogg - - /Audio/Ambience/ambilava3.ogg - - /Audio/Ambience/ambimaint1.ogg - - /Audio/Ambience/ambimine.ogg - - /Audio/Ambience/ambiruin.ogg - - /Audio/Ambience/ambiruin2.ogg - - /Audio/Ambience/ambiruin3.ogg - - /Audio/Ambience/ambiruin4.ogg - - /Audio/Ambience/ambiruin5.ogg - - /Audio/Ambience/ambiruin6.ogg - - /Audio/Ambience/ambiruin7.ogg - - /Audio/Ambience/voyage_neverending.ogg - - /Audio/Ambience/unanchored.ogg - -- type: soundCollection - id: AmbienceRuins - files: - - /Audio/Ambience/ambicave.ogg - - /Audio/Ambience/ambidanger.ogg - - /Audio/Ambience/ambidanger2.ogg - - /Audio/Ambience/ambimaint1.ogg - - /Audio/Ambience/ambimine.ogg - - /Audio/Ambience/ambimystery.ogg - - /Audio/Ambience/ambiruin.ogg - - /Audio/Ambience/ambiruin2.ogg - - /Audio/Ambience/ambiruin3.ogg - - /Audio/Ambience/ambiruin4.ogg - - /Audio/Ambience/ambiruin5.ogg - - /Audio/Ambience/ambiruin6.ogg - - /Audio/Ambience/ambiruin7.ogg - -- type: soundCollection - id: AmbienceSpace - files: - - /Audio/Ambience/constellations.ogg - - /Audio/Ambience/starlight.ogg - - /Audio/Ambience/drifting.ogg - - /Audio/Ambience/spookyspace1.ogg - - /Audio/Ambience/spookyspace2.ogg - - /Audio/Ambience/ambispace2.ogg - - /Audio/Lobby/title2.ogg - -- type: soundCollection - id: AmbienceSpooky - files: - - /Audio/Ambience/ambimo1.ogg - - /Audio/Ambience/ambimo2.ogg - - /Audio/Ambience/ambimystery.ogg - - /Audio/Ambience/ambiodd.ogg - - /Audio/Ambience/ambiruin6.ogg - - /Audio/Ambience/ambiruin7.ogg - -- type: soundCollection - id: AmbienceTrain - files: - - /Audio/Ambience/ambitrain1.ogg - - /Audio/Ambience/ambitrain2.ogg - - /Audio/Ambience/ambitrain3.ogg - - /Audio/Ambience/ambiruin3.ogg - - /Audio/Ambience/ambiruin5.ogg - - /Audio/Ambience/ambiruin6.ogg - -- type: soundCollection - id: AmbienceSpookyFog - files: - - /Audio/Ambience/spookyspace1.ogg - - /Audio/Ambience/spookyspace2.ogg - - /Audio/Ambience/ambimo2.ogg - - /Audio/Ambience/ambilava1.ogg - - /Audio/Ambience/ambilava2.ogg - - /Audio/Ambience/ambiruin2.ogg - - /Audio/Ambience/ambiruin3.ogg - - /Audio/Ambience/ambiruin4.ogg - - /Audio/Ambience/ambiruin5.ogg - - /Audio/Ambience/ambiruin6.ogg - - /Audio/Ambience/ambiruin7.ogg - - /Audio/Ambience/ambidanger.ogg - - /Audio/Ambience/ambidanger2.ogg - - /Audio/Ambience/ambimine.ogg - -## Background noise on station, separate to ambient music. -- type: soundCollection - id: AmbienceStation - files: - - /Audio/Ambience/shipambience.ogg - -# Rules -#- type: rules -# id: AlwaysTrue -# rules: -# - !type:AlwaysTrueRule - -- type: rules - id: InSpace - rules: - - !type:InSpaceRule - - !type:GridInRangeRule - inverted: true - range: 3 - -# TODO -- type: rules - id: NearEngineering - rules: - - !type:NearbyAccessRule - access: - - Engineering - range: 2.5 - -- type: rules - id: NearMaintenance - rules: - - !type:NearbyTilesPercentRule - ignoreAnchored: true - percent: 0.25 - tiles: - - Plating - range: 2 - -- type: rules - id: NearTrain - rules: - - !type:NearbyTilesPercentRule - ignoreAnchored: true - percent: 0.05 - tiles: - - TrainLattice - range: 4 - -- type: rules - id: NearMedical - rules: - - !type:NearbyTilesPercentRule - ignoreAnchored: true - percent: 0.5 - tiles: - - FloorWhite - range: 3 - -- type: rules - id: NearPrayable - rules: - - !type:NearbyComponentsRule - anchored: true - components: - - type: Prayable - range: 5 - -- type: rules - id: NearMorgue - rules: - - !type:NearbyComponentsRule - anchored: true - count: 2 - components: - - type: Morgue - range: 3 - -- type: rules - id: NearSpookyFog - rules: - - !type:NearbyEntitiesRule - count: 5 - whitelist: - tags: - - SpookyFog - range: 4 - -- type: rules - id: OnMapGrid - rules: - - !type:OnMapGridRule +# Not used in CrystallEdge \ No newline at end of file diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/meta.json index 0e05895483..26e15e3899 100644 --- a/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "All right reserved", "copyright": "Created by jaraten (Discord/Github)", "size": { "x": 32, diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/Alchemist/alchemist_cloak.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Alchemist/alchemist_cloak.rsi/meta.json index d90ae32452..0799f0bd2c 100644 --- a/Resources/Textures/_CP14/Clothing/Cloak/Roles/Alchemist/alchemist_cloak.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Alchemist/alchemist_cloak.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "CC-BY-SA-4.0", "copyright": "Created by TheShuEd", "size": { "x": 32, diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/Bank/commandant_jacket.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Bank/commandant_jacket.rsi/meta.json index d90ae32452..0799f0bd2c 100644 --- a/Resources/Textures/_CP14/Clothing/Cloak/Roles/Bank/commandant_jacket.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Bank/commandant_jacket.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "CC-BY-SA-4.0", "copyright": "Created by TheShuEd", "size": { "x": 32, diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/Captain/captain_jacket.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Captain/captain_jacket.rsi/meta.json index d90ae32452..0799f0bd2c 100644 --- a/Resources/Textures/_CP14/Clothing/Cloak/Roles/Captain/captain_jacket.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Captain/captain_jacket.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "CC-BY-SA-4.0", "copyright": "Created by TheShuEd", "size": { "x": 32, diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/blacksmith_apron.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/blacksmith_apron.rsi/meta.json index d90ae32452..0799f0bd2c 100644 --- a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/blacksmith_apron.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/blacksmith_apron.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "CC-BY-SA-4.0", "copyright": "Created by TheShuEd", "size": { "x": 32, diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/blue.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/blue.rsi/meta.json index 6911a856d9..cadc025ad2 100644 --- a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/blue.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/blue.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "CC-BY-SA-4.0", "copyright": "Created by omsoyk (Discord)", "size": { "x": 32, diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/cheetah_skin.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/cheetah_skin.rsi/meta.json index 65eacb6461..a8f686cb7c 100644 --- a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/cheetah_skin.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/cheetah_skin.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "CC-BY-SA-4.0", "copyright": "Created by Prazat", "size": { "x": 32, diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape.rsi/meta.json index 9ea060ef70..049bd400e8 100644 --- a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "CC-BY-SA-4.0", "copyright": "Created by KBAS5", "size": { "x": 32, diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape2.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape2.rsi/meta.json index 9ea060ef70..049bd400e8 100644 --- a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape2.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/furcape2.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "CC-BY-SA-4.0", "copyright": "Created by KBAS5", "size": { "x": 32, diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/green.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/green.rsi/meta.json index d90ae32452..0799f0bd2c 100644 --- a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/green.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/green.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "CC-BY-SA-4.0", "copyright": "Created by TheShuEd", "size": { "x": 32, diff --git a/Resources/Textures/_CP14/LobbyScreens/attributions.yml b/Resources/Textures/_CP14/LobbyScreens/attributions.yml index 063f9bce06..5697e8f6e0 100644 --- a/Resources/Textures/_CP14/LobbyScreens/attributions.yml +++ b/Resources/Textures/_CP14/LobbyScreens/attributions.yml @@ -1,4 +1,4 @@ - files: ["angel.webp", "beginning.webp", "typicalAlchemistDay.webp", "tiefling.webp", "gob_way.webp", "cutecat.webp"] - license: "CLA" + license: "All right reserved" copyright: "alisw_a on discord" source: "https://github.com/crystallpunk-14/crystall-punk-14" diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/dough.rsi/meta.json b/Resources/Textures/_CP14/Objects/Consumable/Food/dough.rsi/meta.json index f7c67328e7..f2abaf2091 100644 --- a/Resources/Textures/_CP14/Objects/Consumable/Food/dough.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Consumable/Food/dough.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CLA", + "license": "CC-BY-SA-4.0", "copyright": "bun_cooked bun_cooked_slice_bottom bun_cooked_slice_top dough_medium dough_medium_flat Created by Artista.rar, bread_cooked by perzonaz (discord) & resprited by omsoyk dough_large created by TheShuEd", "size": { "x": 32, diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/pie.rsi/meta.json b/Resources/Textures/_CP14/Objects/Consumable/Food/pie.rsi/meta.json index 9fb32be55c..9857793136 100644 --- a/Resources/Textures/_CP14/Objects/Consumable/Food/pie.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Consumable/Food/pie.rsi/meta.json @@ -4,7 +4,7 @@ "x": 32, "y": 32 }, - "license": "CLA", + "license": "CC-BY-SA-4.0", "copyright": "Created by Artista", "states": [ { diff --git a/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/base.png b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/base.png deleted file mode 100644 index 2fb6c276eb0bb4be8230f83368a787d8f8bf94bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1574 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 LNkvXXu0mjf4ES>n literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/full.png b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/full.png new file mode 100644 index 0000000000000000000000000000000000000000..1c32e92fcc5c5ee2ce16854e2d4d2e9bf5c78990 GIT binary patch literal 1629 zcmV-j2BP_iP)Px*7fD1xRA_&8e3PYKIUTLJX!UfriuxO`&#EJB=gJBBX>Mq1cupOO*-k_TYT$+1XiH zJ2M+Y*$2kj+12iQ^Zl6lz7^oZhYuhBdrVH{4X^IK&#M~~Ca3bo!Syme{pf2?M0hHI z$OAxa`H3eYJQKi@ujgw3yb_!&N!9$kuW(6K&O$yfq^ov-o7No#j|zbyKmex=$t>Mo<7LXY4!lTU_7Hd4(yn$+IP5L>?7D!*XWn|~?n#akmBtq{U!}N68 zkyxQ=58il30zW>w?3$0d1%5AMWqk_(kUV|LM!wTXS!TS`NFm;lu-#^&dsyo6$^x!G zUI75S`SDo*z~yh|EaZV5pP%R+MkA0Binvys!)GVHbe)lu1kgfs{@gp5o=zh>e;0}I zE+KgUSg1S%01Wj6O%c_4O@)HG1kqzOP?+4_<_f8|`<^oIywa9{@0CUWC421pr!#SXocut=^Qy z-P(n;1r7{s?|XRik^Wwr6?nuBM{Q$$!HO`w?gnWA%lQQhd0Mb|QaoAycx8PHeZdOm z$~UEALCZ?a60erl5b5v555LZsWMhY;<{yu~Uh z$XG(z0z7!vqTqbC)s03VgKNc{NtDj*$x6&a6x1vlfeZ>wJ9+-ITPO+O{XgE35DKB7 zC5Q;qnA^oniv?)UPn$Si#Ivn#%j^R?Zo^(HV+mye{LWLf6Quwq5cz7oX3qF-F6aa$ z0Z!XyQNiLAs5H*6Bke+K8f^qJQaef&XcNE^=gY=ZM^0L<)s=w&MFFj5o6e06PFTi? za3mDAkl&LS5TVe_Ii^CV*_I^_C<+i&Sww~vu@rqQ{=Q({aJwoiTYyre(>hQstzm5S zsO39O3!V(51<*{z4o5N66BJ%UR#=KYc61-U@#Pju7GNtZ5+Nc(#Xn%R4&SkpftDa% zS>M9S`j(?5+J%e=ZCOZEc@d~1$AazLsVsg<0+L-x^D~jBZ8M?J%sDo0b*$Q2EI_Wq zlP8b`*c7R2%b_eF*_A}HD`_ELt=G&y0@b`CfqRyPfbHIBb|Z_4?%`d#&HTASGiM=B z-99%^62LZgMS%*~NwaD6je}>+&$2G%`L9)+z|MRlkU^xsSL!~mL;%}n0qj06OCHdW zM%h%_3XxD)xc`yydlp)Pn6SLMqdE>s>0$pc(b!<=Wwc@eLCH#*ThEOeW8 zsx49N{7PT)(Q8p2M84hGYBC%b2D6(S$s*KaG%*_MlF7pe>P-yWN0M2|rDNb} z`9S~}F$&0;aS-QfdeKZ%VFOsnleq2swhyHsep-GIcv=RI#72ze`VtB+H*8M7i(nD& zNGK5}X!+3};Ye)60CsksM6i_$$r2}M6~KbT0M;y|I^#S%6F^{v0Q!jg@ZrOU4<9~! b_yGO`P09~d&_v_(00000NkvXXu0mjfy957q literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/meta.json b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/meta.json index 8bdcab815b..f6da0b95f9 100644 --- a/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/meta.json @@ -1,14 +1,35 @@ { "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShued (github) ", + "license": "All right reserved", + "copyright": "Created by vladimir.s ", "size": { "x": 48, "y": 84 }, "states": [ { - "name": "base" + "name": "full" + }, + { + "name": "empty" + }, + { + "name": "frame" + }, + { + "name": "warning", + "delays": [ + [ + 0.3, + 0.1, + 0.1, + 0.1, + 0.3, + 0.1, + 0.1, + 0.1 + ] + ] } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/warning.png b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/warning.png new file mode 100644 index 0000000000000000000000000000000000000000..f3f92a345053cdd405e74ca2793f02f2cde2f567 GIT binary patch literal 7698 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Tiles/Dirt/attributions.yml b/Resources/Textures/_CP14/Tiles/Dirt/attributions.yml index d30242a465..1adbb66ee3 100644 --- a/Resources/Textures/_CP14/Tiles/Dirt/attributions.yml +++ b/Resources/Textures/_CP14/Tiles/Dirt/attributions.yml @@ -4,6 +4,6 @@ source: "https://github.com/crystallpunk-14/crystall-punk-14/" - files: ["double_edge.png", "single_edge.png"] - license: "CLA" + license: "CC-BY-SA-3.0" copyright: "Created by TheShuEd" source: "https://github.com/crystallpunk-14/crystall-punk-14/" \ No newline at end of file diff --git a/Resources/Textures/_CP14/Tiles/attributions.yml b/Resources/Textures/_CP14/Tiles/attributions.yml index 398e628577..37ad5d8e09 100644 --- a/Resources/Textures/_CP14/Tiles/attributions.yml +++ b/Resources/Textures/_CP14/Tiles/attributions.yml @@ -12,7 +12,7 @@ source: "https://github.com/crystallpunk-14/crystall-punk-14/" - files: ["stonebricks.png", "stonebricks_small_carved_1.png", "stonebricks_small_carved_2.png", "stonebricks_square_carved.png"] - license: "CLA" + license: "All right reserved" copyright: "Created by Jaraten" source: "https://github.com/crystallpunk-14/crystall-punk-14/" @@ -27,6 +27,6 @@ source: "https://github.com/tgstation/tgstation/" - files: ["woodplanks_big_burned.png", "woodplanks_burned.png", "woodplanks_cruciform_burned.png", "woodplanks_stairways_burned.png"] - license: "CLA" + license: "All right reserved" copyright: "Created by Jaraten" source: "https://github.com/crystallpunk-14/crystall-punk-14/"