diff --git a/Content.Client/Overlays/StencilOverlay.cs b/Content.Client/Overlays/StencilOverlay.cs index 46745a0e62..672da437dd 100644 --- a/Content.Client/Overlays/StencilOverlay.cs +++ b/Content.Client/Overlays/StencilOverlay.cs @@ -57,6 +57,13 @@ public sealed partial class StencilOverlay : Overlay _blep = _clyde.CreateRenderTarget(args.Viewport.Size, new RenderTargetFormatParameters(RenderTargetColorFormat.Rgba8Srgb), name: "weather-stencil"); } + //CP14 Overlays + if (_entManager.TryGetComponent(mapUid, out var worldEdge)) + { + DrawWorldEdge(args, worldEdge, invMatrix); + } + //CP14 Overlays end + if (_entManager.TryGetComponent(mapUid, out var comp)) { foreach (var (proto, weather) in comp.Weather) @@ -79,11 +86,6 @@ public sealed partial class StencilOverlay : Overlay { DrawCloudShadows(args, shadows, invMatrix); } - - if (_entManager.TryGetComponent(mapUid, out var worldEdge)) - { - DrawWorldEdge(args, worldEdge, invMatrix); - } //CP14 Overlays end args.WorldHandle.UseShader(null); diff --git a/Content.Server/_CP14/FootStep/CP14FootprintsSystem.cs b/Content.Server/_CP14/Footprints/CP14FootprintsSystem.cs similarity index 65% rename from Content.Server/_CP14/FootStep/CP14FootprintsSystem.cs rename to Content.Server/_CP14/Footprints/CP14FootprintsSystem.cs index 2dd0ad1003..31e4129a07 100644 --- a/Content.Server/_CP14/FootStep/CP14FootprintsSystem.cs +++ b/Content.Server/_CP14/Footprints/CP14FootprintsSystem.cs @@ -1,5 +1,8 @@ using System.Numerics; +using Content.Server._CP14.Footprints.Components; using Content.Server.Decals; +using Content.Shared._CP14.Decals; +using Content.Shared.DoAfter; using Content.Shared.Fluids; using Content.Shared.Fluids.Components; using Content.Shared.Interaction; @@ -12,7 +15,7 @@ using Robust.Shared.Map.Components; using Robust.Shared.Physics.Events; using Robust.Shared.Prototypes; -namespace Content.Server._CP14.FootStep; +namespace Content.Server._CP14.Footprints; public sealed class CP14FootprintsSystem : EntitySystem { @@ -20,28 +23,28 @@ public sealed class CP14FootprintsSystem : EntitySystem [Dependency] private readonly SharedMapSystem _maps = default!; [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!; [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly TransformSystem _transform = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(OnTrailerMove); - SubscribeLocalEvent(OnTrailerCollide); + SubscribeLocalEvent(OnTrailerMove); + SubscribeLocalEvent(OnTrailerCollide); SubscribeLocalEvent(OnHolderEquipped); SubscribeLocalEvent(OnHolderUnequipped); - SubscribeLocalEvent(OnBeforeInteract); + SubscribeLocalEvent(OnAfterInteract); + SubscribeLocalEvent(OnCleanDoAfter); } - private void OnBeforeInteract(Entity ent, ref BeforeRangedInteractEvent args) + private void OnCleanDoAfter(Entity ent, ref CP14DecalCleanerDoAfterEvent args) { - if (!args.CanReach) + if (args.Cancelled || args.Handled) return; - // Remove old decals var gridUid = Transform(ent).GridUid; if (gridUid is null) return; @@ -49,27 +52,43 @@ public sealed class CP14FootprintsSystem : EntitySystem if (!TryComp(gridUid, out var map)) return; - var vec = _transform.GetGridOrMapTilePosition(ent); - var tileCenterVec = vec + map.TileSizeHalfVector; - - var oldDecals = _decal.GetDecalsInRange(gridUid.Value, tileCenterVec, ent.Comp.Range); - - if (oldDecals.Count > 0) - { - _audio.PlayPvs(ent.Comp.Sound, args.ClickLocation); - SpawnAtPosition(ent.Comp.SpawnEffect, args.ClickLocation); - } + var coord = EntityManager.GetCoordinates(args.ClickLocation); + _audio.PlayPvs(ent.Comp.Sound, coord); + SpawnAtPosition(ent.Comp.SpawnEffect, coord); + var oldDecals = _decal.GetDecalsInRange(gridUid.Value, args.ClickLocation.Position, ent.Comp.Range); foreach (var (id, decal) in oldDecals) { if (decal.Cleanable) _decal.RemoveDecal(gridUid.Value, id); } + + args.Handled = true; + } + + private void OnAfterInteract(Entity ent, ref AfterInteractEvent args) + { + if (!args.CanReach && !args.Handled) + return; + + var doAfter = new DoAfterArgs(EntityManager, + args.User, + ent.Comp.Delay, + new CP14DecalCleanerDoAfterEvent(EntityManager.GetNetCoordinates(args.ClickLocation)), + ent) + { + BreakOnMove = true, + BreakOnDamage = true, + NeedHand = true, + }; + _doAfter.TryStartDoAfter(doAfter); + + args.Handled = true; } private void OnHolderUnequipped(Entity ent, ref GotUnequippedEvent args) { - if (!TryComp(args.Equipee, out var trailer)) + if (!TryComp(args.Equipee, out var trailer)) return; trailer.holder = null; @@ -82,13 +101,13 @@ public sealed class CP14FootprintsSystem : EntitySystem private void OnHolderEquipped(Entity ent, ref GotEquippedEvent args) { - if (!TryComp(args.Equipee, out var trailer)) + if (!TryComp(args.Equipee, out var trailer)) return; trailer.holder = ent.Comp; } - private void OnTrailerCollide(Entity ent, ref StartCollideEvent args) + private void OnTrailerCollide(Entity ent, ref StartCollideEvent args) { if (ent.Comp.holder is null) return; @@ -114,7 +133,7 @@ public sealed class CP14FootprintsSystem : EntitySystem comp.Intensity = 1f; } - private void OnTrailerMove(Entity ent, ref MoveEvent args) + private void OnTrailerMove(Entity ent, ref MoveEvent args) { if (ent.Comp.holder is null) return; diff --git a/Content.Server/_CP14/FootStep/CP14DecalCleanerComponent.cs b/Content.Server/_CP14/Footprints/Components/CP14DecalCleanerComponent.cs similarity index 55% rename from Content.Server/_CP14/FootStep/CP14DecalCleanerComponent.cs rename to Content.Server/_CP14/Footprints/Components/CP14DecalCleanerComponent.cs index 299e510604..6dc10958a2 100644 --- a/Content.Server/_CP14/FootStep/CP14DecalCleanerComponent.cs +++ b/Content.Server/_CP14/Footprints/Components/CP14DecalCleanerComponent.cs @@ -1,20 +1,26 @@ using Robust.Shared.Audio; using Robust.Shared.Prototypes; -namespace Content.Server._CP14.FootStep; +namespace Content.Server._CP14.Footprints.Components; /// -/// +/// allows you to remove cleanable decals from tiles with a short delay. /// [RegisterComponent, Access(typeof(CP14FootprintsSystem))] public sealed partial class CP14DecalCleanerComponent : Component { [DataField] - public SoundSpecifier Sound = new SoundCollectionSpecifier("CP14Broom"); + public SoundSpecifier Sound = new SoundCollectionSpecifier("CP14Broom") + { + Params = AudioParams.Default.WithVariation(0.2f), + }; [DataField] public EntProtoId? SpawnEffect = "CP14DustEffect"; [DataField] - public float Range = 1.5f; + public float Range = 1.2f; + + [DataField] + public TimeSpan Delay = TimeSpan.FromSeconds(0.75f); } diff --git a/Content.Server/_CP14/FootStep/CP14FootprintHolderComponent.cs b/Content.Server/_CP14/Footprints/Components/CP14FootprintHolderComponent.cs similarity index 93% rename from Content.Server/_CP14/FootStep/CP14FootprintHolderComponent.cs rename to Content.Server/_CP14/Footprints/Components/CP14FootprintHolderComponent.cs index 49d748ba99..ade85f5c5f 100644 --- a/Content.Server/_CP14/FootStep/CP14FootprintHolderComponent.cs +++ b/Content.Server/_CP14/Footprints/Components/CP14FootprintHolderComponent.cs @@ -2,7 +2,7 @@ using Content.Shared.Decals; using Content.Shared.FixedPoint; using Robust.Shared.Prototypes; -namespace Content.Server._CP14.FootStep; +namespace Content.Server._CP14.Footprints.Components; /// /// stores the type of footprints and their settings. diff --git a/Content.Server/_CP14/FootStep/CP14FootprintTrailerComponent.cs b/Content.Server/_CP14/Footprints/Components/CP14FootprintTrailerComponent.cs similarity index 87% rename from Content.Server/_CP14/FootStep/CP14FootprintTrailerComponent.cs rename to Content.Server/_CP14/Footprints/Components/CP14FootprintTrailerComponent.cs index 1367f39f71..0af4e60444 100644 --- a/Content.Server/_CP14/FootStep/CP14FootprintTrailerComponent.cs +++ b/Content.Server/_CP14/Footprints/Components/CP14FootprintTrailerComponent.cs @@ -1,5 +1,4 @@ - -namespace Content.Server._CP14.FootStep; +namespace Content.Server._CP14.Footprints.Components; /// /// allows an entity to leave footprints on the tiles diff --git a/Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs b/Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs index 21e1713425..023d024a05 100644 --- a/Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs +++ b/Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs @@ -6,7 +6,7 @@ namespace Content.Shared.Fluids; public abstract partial class SharedPuddleSystem { [ValidatePrototypeId] - private const string Water = "CP14Water"; //CP14 Water + private const string Water = "Water"; public static readonly string[] EvaporationReagents = [Water]; diff --git a/Content.Shared/_CP14/Decals/CP14DecalCleanerEvents.cs b/Content.Shared/_CP14/Decals/CP14DecalCleanerEvents.cs new file mode 100644 index 0000000000..b2d038fc80 --- /dev/null +++ b/Content.Shared/_CP14/Decals/CP14DecalCleanerEvents.cs @@ -0,0 +1,18 @@ +using Content.Shared.DoAfter; +using Robust.Shared.Map; +using Robust.Shared.Serialization; + +namespace Content.Shared._CP14.Decals; + +[Serializable, NetSerializable] +public sealed partial class CP14DecalCleanerDoAfterEvent : DoAfterEvent +{ + public NetCoordinates ClickLocation; + + public CP14DecalCleanerDoAfterEvent(NetCoordinates click) + { + ClickLocation = click; + } + + public override DoAfterEvent Clone() => this; +} diff --git a/Resources/Locale/en-US/_CP14/markings/human-hair.ftl b/Resources/Locale/en-US/_CP14/markings/human-hair.ftl index a61f59f628..6f213fd47f 100644 --- a/Resources/Locale/en-US/_CP14/markings/human-hair.ftl +++ b/Resources/Locale/en-US/_CP14/markings/human-hair.ftl @@ -16,4 +16,5 @@ marking-CP14HumanHairSwept2 = Swept marking-CP14HumanHairUpdo = Updo marking-CP14HumanHairVLongFringe = Straight bangs marking-CP14HumanHairVolaju = Volaju -marking-CP14HumanHairWisp = Wisp \ No newline at end of file +marking-CP14HumanHairWisp = Wisp +marking-CP14HumanHairMaxyShagy = Maximum Shagginess \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl b/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl index dab7acdb9d..107d93b486 100644 --- a/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl +++ b/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl @@ -16,4 +16,5 @@ marking-CP14HumanHairSwept2 = Суровый взгляд marking-CP14HumanHairUpdo = Пучок marking-CP14HumanHairVLongFringe = Прямая челка marking-CP14HumanHairVolaju = Вояж -marking-CP14HumanHairWisp = Огонек \ No newline at end of file +marking-CP14HumanHairWisp = Огонек +marking-CP14HumanHairMaxyShagy = Максимальная лохматость \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml index 95478839fe..ebfb0ef7ee 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml @@ -148,4 +148,12 @@ markingCategory: Hair sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi - state: wisp \ No newline at end of file + state: wisp + +- type: marking + id: CP14HumanHairMaxyShagy + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _CP14/Mobs/Customization/human_hair.rsi + state: maxy_shagy \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/paper.yml b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/paper.yml new file mode 100644 index 0000000000..39ac636582 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/paper.yml @@ -0,0 +1,74 @@ +- type: entity + parent: BaseItem + id: CP14BasePaper + abstract: true + components: + - type: Paper + - type: PaperLabelType + - type: ActivatableUI + key: enum.PaperUiKey.Key + requiresComplex: false + - type: UserInterface + interfaces: + enum.PaperUiKey.Key: + type: PaperBoundUserInterface + - type: Item + size: Tiny + - type: Appearance + - type: PaperVisuals + - type: Flammable + fireSpread: true + alwaysCombustible: true + damage: + types: + Heat: 1 + - type: FireVisuals + sprite: Effects/fire.rsi + normalState: fire + - type: Damageable + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + Ash: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Food + solution: food + delay: 7 + forceFeedDelay: 7 + - type: FlavorProfile + flavors: + - paper + - type: BadFood + - type: SolutionContainerManager + solutions: + food: + maxVol: 1 + reagents: + - ReagentId: Fiber + Quantity: 1 + +- type: entity + parent: CP14BasePaper + id: CP14Paper + name: paper + description: A piece of white paper + components: + - type: Sprite + sprite: _CP14/Objects/Bureaucracy/paper.rsi + layers: + - state: paper + - state: paper_filled + map: ["enum.PaperVisualLayers.Writing"] + visible: false + #- state: paper_stamp-generic + # map: ["enum.PaperVisualLayers.Stamp"] + # visible: false \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/pen.yml b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/pen.yml new file mode 100644 index 0000000000..2a470fe6c2 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/pen.yml @@ -0,0 +1,54 @@ +- type: entity + parent: Pen + id: CP14PenFeather + name: fountain pen + description: A sharp clipped feather of a bird, adapted as a writing implement. + components: + - type: Sprite + sprite: _CP14/Objects/Bureaucracy/pens.rsi + state: feather + - type: Item + sprite: _CP14/Objects/Bureaucracy/pens.rsi + heldPrefix: feather + size: Tiny + - type: Tag + tags: + - Write + - Pen + - CP14InkwellFittable + +# TODO: Чернильницу нужно доделать. Перо должно быть видно, пока оно внутри чернильницы. Предмет должен быть через ItemSlots, чтобы перо вставлять забирать можно было кликом. Нужно добавить прикольные звуки вставляния, выставляния. И добавить механ, который будет требовать периодически макать перо в чернильницу. +- type: entity + parent: BaseItem + id: CP14Inkwell + name: inkwell + description: An endless (for now) source of ink for your letters + components: + - type: Sprite + sprite: _CP14/Objects/Bureaucracy/inkwell.rsi + drawdepth: SmallObjects + layers: + - state: icon + - state: feather + map: ["enum.StorageFillLayers.Fill"] + visible: false + #- type: Appearance + #- type: StorageFillVisualizer + # maxFillLevels: 1 + # fillBaseName: fill + - type: Pullable + - type: Storage + grid: + - 0,0,0,0 + maxItemSize: Tiny + whitelist: + tags: + - CP14InkwellFittable + - type: UserInterface + interfaces: + enum.StorageUiKey.Key: + type: StorageBoundUserInterface + - type: InteractionOutline + - type: ContainerContainer + containers: + storagebase: !type:Container \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml index b5f069b2ef..84c2c082d0 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml @@ -210,7 +210,7 @@ Quantity: 4 - ReagentId: Vitamin Quantity: 2 - - ReagentId: CP14Water + - ReagentId: Water Quantity: 3 - type: FoodSequenceElement entries: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/mop.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml similarity index 57% rename from Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/mop.yml rename to Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml index 4baad5ae55..3d2228f3d8 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/mop.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml @@ -31,4 +31,27 @@ solutions: absorbed: maxVol: 100 - - type: CP14DecalCleaner \ No newline at end of file + +- type: entity + id: CP14BaseBroom + parent: + - BaseItem + - CP14BaseWeaponDestructible + name: wooden broom + description: Sweeps up dried footprints and other stains from the floor + components: + - type: Item + size: Large + sprite: _CP14/Objects/Tools/broom.rsi + - type: Sprite + sprite: _CP14/Objects/Tools/broom.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: 10 + damage: + types: + Blunt: 2 + soundHit: + collection: MetalThud + - type: CP14DecalCleaner + delay: 0.75 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Floor/floorWater.yml b/Resources/Prototypes/_CP14/Entities/Structures/Floor/floorWater.yml index c0a45c8aa4..a43fe59ee1 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Floor/floorWater.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Floor/floorWater.yml @@ -52,7 +52,7 @@ pool: maxVol: 9999999 #.inf seems to break the whole yaml file, but would definitely be preferable. reagents: - - ReagentId: CP14Water + - ReagentId: Water Quantity: 9999999 - type: DrainableSolution solution: pool diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml index 4ac4aabab9..ff4bc0459c 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml @@ -101,7 +101,7 @@ solutions: barrel: reagents: - - ReagentId: CP14Water + - ReagentId: Water Quantity: 300 - type: entity diff --git a/Resources/Prototypes/_CP14/PlantMetabolizer/metabolizers.yml b/Resources/Prototypes/_CP14/PlantMetabolizer/metabolizers.yml index ce99925717..71019305a5 100644 --- a/Resources/Prototypes/_CP14/PlantMetabolizer/metabolizers.yml +++ b/Resources/Prototypes/_CP14/PlantMetabolizer/metabolizers.yml @@ -1,6 +1,6 @@ - type: CP14PlantMetabolizer id: Base metabolization: - CP14Water: + Water: - !type:AffectPlantValues resource: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/_CP14/Reagents/Consumable/Drink/drinks.yml deleted file mode 100644 index 7c71713db4..0000000000 --- a/Resources/Prototypes/_CP14/Reagents/Consumable/Drink/drinks.yml +++ /dev/null @@ -1,7 +0,0 @@ -- type: reagent - parent: Water - id: CP14Water - name: cp14-reagent-name-water - desc: cp14-reagent-desc-water - flavor: CP14Water - color: "#75b1f0" \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml index 6e35926de5..4a1725f17c 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml @@ -41,4 +41,14 @@ stacks: CP14WoodenPlanks: 2 CP14Cloth: 1 - result: CP14BaseMop \ No newline at end of file + result: CP14BaseMop + +- type: CP14Recipe + id: CP14BaseBroom + tag: CP14RecipeWorkbench + craftTime: 3 + entities: + CP14Wheat: 2 + stacks: + CP14WoodenPlanks: 2 + result: CP14BaseBroom \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml index 62d5f7f71e..eca6c68975 100644 --- a/Resources/Prototypes/_CP14/tags.yml +++ b/Resources/Prototypes/_CP14/tags.yml @@ -31,6 +31,9 @@ - type: Tag id: CP14Plate +- type: Tag + id: CP14InkwellFittable + - type: Tag id: CP14RecipeSewing diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/maxy_shagy.png b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/maxy_shagy.png new file mode 100644 index 0000000000..6dd320e371 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/maxy_shagy.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json index 5abd04498f..070d6339bc 100644 --- a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json @@ -4,7 +4,7 @@ "x": 48, "y": 48 }, - "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, adapted to CrystallPunk by TheShuEd. Crazybald by TheShuEd", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, adapted to CrystallPunk by TheShuEd. Crazybald by TheShuEd, maxy_shagy by Max Gab", "license": "CC-BY-SA-3.0", "states": [ { @@ -55,6 +55,10 @@ "name": "doublebun", "directions": 4 }, + { + "name": "maxy_shagy", + "directions": 4 + }, { "name": "ponytail7", "directions": 4 diff --git a/Resources/Textures/_CP14/Objects/Bureaucracy/inkwell.rsi/feather.png b/Resources/Textures/_CP14/Objects/Bureaucracy/inkwell.rsi/feather.png new file mode 100644 index 0000000000..a6e8702a3f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Bureaucracy/inkwell.rsi/feather.png differ diff --git a/Resources/Textures/_CP14/Objects/Bureaucracy/inkwell.rsi/icon.png b/Resources/Textures/_CP14/Objects/Bureaucracy/inkwell.rsi/icon.png new file mode 100644 index 0000000000..317c759725 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Bureaucracy/inkwell.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Bureaucracy/inkwell.rsi/ink_storage_big.png b/Resources/Textures/_CP14/Objects/Bureaucracy/inkwell.rsi/ink_storage_big.png new file mode 100644 index 0000000000..d0ad0aa1f4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Bureaucracy/inkwell.rsi/ink_storage_big.png differ diff --git a/Resources/Textures/_CP14/Objects/Bureaucracy/inkwell.rsi/ink_storage_small.png b/Resources/Textures/_CP14/Objects/Bureaucracy/inkwell.rsi/ink_storage_small.png new file mode 100644 index 0000000000..58900867c1 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Bureaucracy/inkwell.rsi/ink_storage_small.png differ diff --git a/Resources/Textures/_CP14/Objects/Bureaucracy/inkwell.rsi/meta.json b/Resources/Textures/_CP14/Objects/Bureaucracy/inkwell.rsi/meta.json new file mode 100644 index 0000000000..9e3349b619 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Bureaucracy/inkwell.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by Max Gab for CrystallPunk", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "feather" + }, + { + "name": "ink_storage_big" + }, + { + "name": "ink_storage_small" + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/inhand-left.png new file mode 100644 index 0000000000..9677a81825 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/inhand-right.png new file mode 100644 index 0000000000..1df4f5591d Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/meta.json b/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/meta.json new file mode 100644 index 0000000000..86b75fe46a --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by Max Gab for CrystallPunk", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "paper" + }, + { + "name": "paper_filled" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/paper.png b/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/paper.png new file mode 100644 index 0000000000..ae0e1dfe7b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/paper.png differ diff --git a/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/paper_filled.png b/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/paper_filled.png new file mode 100644 index 0000000000..7effee5a6b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/paper_filled.png differ diff --git a/Resources/Textures/_CP14/Objects/Bureaucracy/pens.rsi/feather-inhand-left.png b/Resources/Textures/_CP14/Objects/Bureaucracy/pens.rsi/feather-inhand-left.png new file mode 100644 index 0000000000..494b937814 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Bureaucracy/pens.rsi/feather-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Bureaucracy/pens.rsi/feather-inhand-right.png b/Resources/Textures/_CP14/Objects/Bureaucracy/pens.rsi/feather-inhand-right.png new file mode 100644 index 0000000000..9f8531be25 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Bureaucracy/pens.rsi/feather-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Bureaucracy/pens.rsi/feather.png b/Resources/Textures/_CP14/Objects/Bureaucracy/pens.rsi/feather.png new file mode 100644 index 0000000000..4505b5a92f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Bureaucracy/pens.rsi/feather.png differ diff --git a/Resources/Textures/_CP14/Objects/Bureaucracy/pens.rsi/meta.json b/Resources/Textures/_CP14/Objects/Bureaucracy/pens.rsi/meta.json new file mode 100644 index 0000000000..e879744d72 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Bureaucracy/pens.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by Max Gab for CrystallPunk", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "feather" + }, + { + "name": "feather-inhand-left", + "directions": 4 + }, + { + "name": "feather-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Tools/broom.rsi/icon.png b/Resources/Textures/_CP14/Objects/Tools/broom.rsi/icon.png new file mode 100644 index 0000000000..0db1a2c1cf Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/broom.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/broom.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Tools/broom.rsi/inhand-left.png new file mode 100644 index 0000000000..18271f04c9 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/broom.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/broom.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Tools/broom.rsi/inhand-right.png new file mode 100644 index 0000000000..0b9bd2b8a0 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/broom.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/broom.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tools/broom.rsi/meta.json new file mode 100644 index 0000000000..eb8797e92a --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Tools/broom.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by TheShuEd (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Tools/mop.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tools/mop.rsi/meta.json index 5c9ce6b77e..052bad48bb 100644 --- a/Resources/Textures/_CP14/Objects/Tools/mop.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Tools/mop.rsi/meta.json @@ -18,11 +18,11 @@ "name": "inhand-right", "directions": 4 }, - { + { "name": "wielded-inhand-left", "directions": 4 }, - { + { "name": "wielded-inhand-right", "directions": 4 }