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 2fb6c276eb..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/empty.png b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/empty.png new file mode 100644 index 0000000000..2776f38c16 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/empty.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/frame.png b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/frame.png new file mode 100644 index 0000000000..3a79a330c9 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/frame.png differ 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 0000000000..1c32e92fcc Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/full.png differ 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 0000000000..f3f92a3450 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/warning.png differ 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/"