From ef02f8c18cb1c5423c9d7bae3aea5b1fa6ac2b86 Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Thu, 18 Jul 2024 00:04:51 +0200 Subject: [PATCH 01/26] Temporarily remove Vox from space ninja and Unknown Shuttle ghostroles (#30099) * no vox ninjas * blacklist vox from UnknownShuttleEvent --- Resources/Prototypes/Entities/Mobs/Player/humanoid.yml | 10 ++++++++++ Resources/Prototypes/GameRules/events.yml | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index 5bcc33b5f6..47baca6134 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -607,6 +607,8 @@ - type: randomHumanoidSettings id: LostCargoTechnician parent: EventHumanoid + speciesBlacklist: + - Vox components: - type: GhostRole name: ghost-role-information-lost-cargo-technical-name @@ -658,6 +660,8 @@ id: ClownTroupe parent: EventHumanoid randomizeName: false + speciesBlacklist: + - Vox components: - type: GhostRole name: ghost-role-information-clown-troupe-name @@ -708,6 +712,8 @@ - type: randomHumanoidSettings id: TravelingChef parent: EventHumanoid + speciesBlacklist: + - Vox components: - type: GhostRole name: ghost-role-information-traveling-chef-name @@ -768,6 +774,8 @@ - type: randomHumanoidSettings id: DisasterVictimHead parent: EventHumanoidMindShielded + speciesBlacklist: + - Vox components: - type: GhostRole name: ghost-role-information-disaster-victim-name @@ -826,6 +834,8 @@ - type: randomHumanoidSettings id: SyndieDisasterVictim parent: EventHumanoid + speciesBlacklist: + - Vox components: - type: NpcFactionMember factions: diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 0b183039a9..7784b72556 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -151,6 +151,10 @@ minimumPlayers: 30 - type: SpaceSpawnRule - type: AntagLoadProfileRule + # Vox disabled until loadouts work on AntagSelection-based spawns + speciesOverride: Human + speciesOverrideBlacklist: + - Vox - type: AntagObjectives objectives: - StealResearchObjective From 2d5bb92f463d964c096904af64c7e442be4aaeed Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 17 Jul 2024 22:05:58 +0000 Subject: [PATCH 02/26] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index fd909d6b12..99fa3976e3 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: EmoGarbage404 - changes: - - message: Fixed cargo telepads not teleporting in orders from linked consoles. - type: Fix - id: 6429 - time: '2024-04-23T12:07:12.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27255 - author: Plykiya changes: - message: Do-after bars of other players are now shaded and harder to see in the @@ -3804,3 +3797,11 @@ id: 6928 time: '2024-07-17T13:50:25.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30033 +- author: Errant + changes: + - message: Vox are temporarily removed from Space Ninjas and all Unknown Shuttle + ghostroles, until code supports giving them species-specific gear. + type: Tweak + id: 6929 + time: '2024-07-17T22:04:51.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30099 From e1f429b6b3a7759587d26a99e741d66e37a32add Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Thu, 18 Jul 2024 01:37:03 +0300 Subject: [PATCH 03/26] DungeonSystem.Rooms bugfix (#30125) Update DungeonSystem.Rooms.cs --- Content.Server/Procedural/DungeonSystem.Rooms.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Procedural/DungeonSystem.Rooms.cs b/Content.Server/Procedural/DungeonSystem.Rooms.cs index 8a1606c488..20d64acff1 100644 --- a/Content.Server/Procedural/DungeonSystem.Rooms.cs +++ b/Content.Server/Procedural/DungeonSystem.Rooms.cs @@ -118,7 +118,7 @@ public sealed partial class DungeonSystem // go BRRNNTTT on existing stuff if (clearExisting) { - var gridBounds = new Box2(Vector2.Transform(Vector2.Zero, roomTransform), Vector2.Transform(room.Size, roomTransform)); + var gridBounds = new Box2(Vector2.Transform(-room.Size/2, roomTransform), Vector2.Transform(room.Size/2, roomTransform)); _entitySet.Clear(); // Polygon skin moment gridBounds = gridBounds.Enlarged(-0.05f); From c7ea0490a67ec503f36e2ddeedb93a45dc914ce9 Mon Sep 17 00:00:00 2001 From: kbailey-git <84491830+kbailey-git@users.noreply.github.com> Date: Wed, 17 Jul 2024 15:54:08 -0700 Subject: [PATCH 04/26] Updated slime storage capacity text in guidebook (#30121) --- Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml b/Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml index 0374d4cb95..2c11508749 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml @@ -18,7 +18,7 @@ - Slimepeople have an [bold]internal 2x2 storage inventory[/bold] inside of their slime membrane. Anyone can see what's inside and take it out of you without asking, + Slimepeople have an [bold]internal 2x3 storage inventory[/bold] inside of their slime membrane. Anyone can see what's inside and take it out of you without asking, so be careful. They [bold]don't drop their internal storage when they morph into a geras, however![/bold] Slimepeople have slight accelerated regeneration compared to other humanoids. They're also capable of hardening their fists, and as such have stronger punches, From 95b56ad4ce8cd9f1be995c5d9a02a612e5434316 Mon Sep 17 00:00:00 2001 From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Date: Wed, 17 Jul 2024 19:40:54 -0500 Subject: [PATCH 05/26] Prevent Quantum Spin Inverter from Teleporting Things into Microwaves (#29200) * Prevent Quantum Spin Inverter from Teleporting Things into Microwaves * Simplifies code, GetTeleportingEntity instead of TryGet, adds failed teleport message * remove using Linguini.Syntax.Ast; * capital... * re-add CanInsert and Fixes microwave issue * beb * beeb --- .../Kitchen/EntitySystems/MicrowaveSystem.cs | 27 +++++++++++++++++++ .../Systems/SwapTeleporterSystem.cs | 23 +++++++++++----- .../Locale/en-US/portal/swap-teleporter.ftl | 1 + 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs index eefa539149..71986ae859 100644 --- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs @@ -79,6 +79,7 @@ namespace Content.Server.Kitchen.EntitySystems SubscribeLocalEvent(OnContentUpdate); SubscribeLocalEvent(OnContentUpdate); SubscribeLocalEvent(OnInteractUsing, after: new[] { typeof(AnchorableSystem) }); + SubscribeLocalEvent(OnInsertAttempt); SubscribeLocalEvent(OnBreak); SubscribeLocalEvent(OnPowerChanged); SubscribeLocalEvent(OnAnchorChanged); @@ -309,6 +310,32 @@ namespace Content.Server.Kitchen.EntitySystems UpdateUserInterfaceState(uid, component); } + private void OnInsertAttempt(Entity ent, ref ContainerIsInsertingAttemptEvent args) + { + if (ent.Comp.Broken) + { + args.Cancel(); + return; + } + + if (TryComp(args.EntityUid, out var item)) + { + if (_item.GetSizePrototype(item.Size) > _item.GetSizePrototype(ent.Comp.MaxItemSize)) + { + args.Cancel(); + return; + } + } + else + { + args.Cancel(); + return; + } + + if (ent.Comp.Storage.Count >= ent.Comp.Capacity) + args.Cancel(); + } + private void OnInteractUsing(Entity ent, ref InteractUsingEvent args) { if (args.Handled) diff --git a/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs b/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs index 58c249fec5..a5ad77d43b 100644 --- a/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs +++ b/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs @@ -150,8 +150,19 @@ public sealed class SwapTeleporterSystem : EntitySystem return; } - var teleEnt = GetTeleportingEntity((uid, xform)); - var otherTeleEnt = GetTeleportingEntity((linkedEnt, Transform(linkedEnt))); + var (teleEnt, cont) = GetTeleportingEntity((uid, xform)); + var (otherTeleEnt, otherCont) = GetTeleportingEntity((linkedEnt, Transform(linkedEnt))); + + if (otherCont != null && !_container.CanInsert(teleEnt, otherCont) || + cont != null && !_container.CanInsert(otherTeleEnt, cont)) + { + _popup.PopupEntity(Loc.GetString("swap-teleporter-popup-teleport-fail", + ("entity", Identity.Entity(linkedEnt, EntityManager))), + teleEnt, + teleEnt, + PopupType.MediumCaution); + return; + } _popup.PopupEntity(Loc.GetString("swap-teleporter-popup-teleport-other", ("entity", Identity.Entity(linkedEnt, EntityManager))), @@ -184,20 +195,20 @@ public sealed class SwapTeleporterSystem : EntitySystem DestroyLink(linked, user); // the linked one is shown globally } - private EntityUid GetTeleportingEntity(Entity ent) + private (EntityUid, BaseContainer?) GetTeleportingEntity(Entity ent) { var parent = ent.Comp.ParentUid; if (_container.TryGetOuterContainer(ent, ent, out var container)) parent = container.Owner; if (HasComp(parent) || HasComp(parent)) - return ent; + return (ent, container); if (!_xformQuery.TryGetComponent(parent, out var parentXform) || parentXform.Anchored) - return ent; + return (ent, container); if (!TryComp(parent, out var body) || body.BodyType == BodyType.Static) - return ent; + return (ent, container); return GetTeleportingEntity((parent, parentXform)); } diff --git a/Resources/Locale/en-US/portal/swap-teleporter.ftl b/Resources/Locale/en-US/portal/swap-teleporter.ftl index f13fa9be42..0040ad0a88 100644 --- a/Resources/Locale/en-US/portal/swap-teleporter.ftl +++ b/Resources/Locale/en-US/portal/swap-teleporter.ftl @@ -5,6 +5,7 @@ swap-teleporter-popup-link-destroyed = Quantum link destroyed! swap-teleporter-popup-teleport-cancel-time = It's still recharging! swap-teleporter-popup-teleport-cancel-link = It's not linked with another device! swap-teleporter-popup-teleport-other = {CAPITALIZE(THE($entity))} activates, and you find yourself somewhere else. +swap-teleporter-popup-teleport-fail = {CAPITALIZE(THE($entity))} activates and fails to transport you anywhere. swap-teleporter-verb-destroy-link = Destroy Quantum Link From 3f014e84ebf3dd860ec3595ad59f580fcff3b852 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Thu, 18 Jul 2024 02:41:15 +0200 Subject: [PATCH 06/26] minor SharedInteractionSystem cleanup (#30139) cleanup SharedInteractionSystem --- Content.Shared/Interaction/SharedInteractionSystem.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index 48076ca360..c32b4bcf78 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -38,8 +38,6 @@ using Robust.Shared.Serialization; using Robust.Shared.Timing; using Robust.Shared.Utility; -#pragma warning disable 618 - namespace Content.Shared.Interaction { /// @@ -522,11 +520,11 @@ namespace Content.Shared.Interaction protected bool ValidateInteractAndFace(EntityUid user, EntityCoordinates coordinates) { // Verify user is on the same map as the entity they clicked on - if (coordinates.GetMapId(EntityManager) != Transform(user).MapID) + if (_transform.GetMapId(coordinates) != Transform(user).MapID) return false; if (!HasComp(user)) - _rotateToFaceSystem.TryFaceCoordinates(user, coordinates.ToMapPos(EntityManager, _transform)); + _rotateToFaceSystem.TryFaceCoordinates(user, _transform.ToMapCoordinates(coordinates).Position); return true; } @@ -859,7 +857,7 @@ namespace Content.Shared.Interaction Ignored? predicate = null, bool popup = false) { - return InRangeUnobstructed(origin, other.ToMap(EntityManager, _transform), range, collisionMask, predicate, popup); + return InRangeUnobstructed(origin, _transform.ToMapCoordinates(other), range, collisionMask, predicate, popup); } /// @@ -966,7 +964,7 @@ namespace Content.Shared.Interaction /// public void InteractDoAfter(EntityUid user, EntityUid used, EntityUid? target, EntityCoordinates clickLocation, bool canReach) { - if (target is {Valid: false}) + if (target is { Valid: false }) target = null; var afterInteractEvent = new AfterInteractEvent(user, used, target, clickLocation, canReach); From d7b2e728821697210a8d67ec0464dba642c0ff3c Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 18 Jul 2024 00:42:02 +0000 Subject: [PATCH 07/26] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 99fa3976e3..c768ac40e7 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Plykiya - changes: - - message: Do-after bars of other players are now shaded and harder to see in the - dark. - type: Tweak - id: 6430 - time: '2024-04-24T02:42:34.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27273 - author: Blackern5000 changes: - message: The cargo telepad is now tier 2 technology rather than tier 3. @@ -3805,3 +3797,11 @@ id: 6929 time: '2024-07-17T22:04:51.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30099 +- author: Cojoke-dot + changes: + - message: You can no longer teleport objects that should not be in other objects + into other objects with the Quantum Spin Inverter + type: Fix + id: 6930 + time: '2024-07-18T00:40:54.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29200 From 961a553fa2e335bfb7edbf7c4dd2214aa68c2014 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Wed, 17 Jul 2024 17:48:08 -0700 Subject: [PATCH 08/26] Fix stun batons using excess charges when thrown (#30136) Fix stun batons Co-authored-by: plykiya --- Content.Shared/Damage/Systems/StaminaSystem.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Content.Shared/Damage/Systems/StaminaSystem.cs b/Content.Shared/Damage/Systems/StaminaSystem.cs index 1f9a7f1dd8..a5c8a4b38d 100644 --- a/Content.Shared/Damage/Systems/StaminaSystem.cs +++ b/Content.Shared/Damage/Systems/StaminaSystem.cs @@ -192,6 +192,11 @@ public sealed partial class StaminaSystem : EntitySystem private void OnCollide(EntityUid uid, StaminaDamageOnCollideComponent component, EntityUid target) { + // you can't inflict stamina damage on things with no stamina component + // this prevents stun batons from using up charges when throwing it at lockers or lights + if (!HasComp(target)) + return; + var ev = new StaminaDamageOnHitAttemptEvent(); RaiseLocalEvent(uid, ref ev); if (ev.Cancelled) From 58a2a4c932dfa5593221de1d315470fc4ffa8976 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 18 Jul 2024 00:49:15 +0000 Subject: [PATCH 09/26] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index c768ac40e7..2ba6a098e0 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Blackern5000 - changes: - - message: The cargo telepad is now tier 2 technology rather than tier 3. - type: Tweak - id: 6431 - time: '2024-04-24T13:21:29.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26270 - author: FungiFellow changes: - message: Truncheon now fits in SecBelt @@ -3805,3 +3798,10 @@ id: 6930 time: '2024-07-18T00:40:54.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29200 +- author: Plykiya + changes: + - message: Stun batons no longer use up charges when hitting objects without stamina. + type: Fix + id: 6931 + time: '2024-07-18T00:48:09.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30136 From 73111b5170d76cfe2df0e5c21e1b6e923ec214ec Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Thu, 18 Jul 2024 07:17:57 +0000 Subject: [PATCH 10/26] fix(dev_map): resave dev map (#30098) fix(dev_map): Resave devmap Co-authored-by: 4llv07e --- Resources/Maps/Test/dev_map.yml | 121 +++----------------------------- 1 file changed, 10 insertions(+), 111 deletions(-) diff --git a/Resources/Maps/Test/dev_map.yml b/Resources/Maps/Test/dev_map.yml index ca885d584b..520a4da5ae 100644 --- a/Resources/Maps/Test/dev_map.yml +++ b/Resources/Maps/Test/dev_map.yml @@ -385,11 +385,11 @@ entities: - type: Transform - type: Map - type: PhysicsMap + - type: GridTree + - type: MovedGrids - type: Broadphase - type: OccluderTree - type: LoadedMap - - type: GridTree - - type: MovedGrids - proto: AirAlarm entities: - uid: 800 @@ -401,8 +401,6 @@ entities: - type: DeviceList devices: - 801 - - type: AtmosDevice - joinedGrid: 179 - proto: AirCanister entities: - uid: 458 @@ -410,8 +408,6 @@ entities: - type: Transform pos: 7.5,-0.5 parent: 179 - - type: AtmosDevice - joinedGrid: 179 - proto: Airlock entities: - uid: 48 @@ -901,33 +897,21 @@ entities: - type: Transform pos: -2.5,-14.5 parent: 179 - - type: DeviceLinkSink - links: - - 1013 - uid: 697 components: - type: Transform pos: 1.5,-14.5 parent: 179 - - type: DeviceLinkSink - links: - - 1014 - uid: 698 components: - type: Transform pos: 1.5,-16.5 parent: 179 - - type: DeviceLinkSink - links: - - 1014 - uid: 984 components: - type: Transform pos: -2.5,-16.5 parent: 179 - - type: DeviceLinkSink - links: - - 1013 - proto: BoozeDispenser entities: - uid: 752 @@ -2660,13 +2644,6 @@ entities: - type: Transform pos: 24.5,5.5 parent: 179 -- proto: chem_master - entities: - - uid: 311 - components: - - type: Transform - pos: 8.5,11.5 - parent: 179 - proto: ChemDispenser entities: - uid: 583 @@ -2704,6 +2681,13 @@ entities: - type: Transform pos: 6.4651074,9.828774 parent: 179 +- proto: ChemMaster + entities: + - uid: 311 + components: + - type: Transform + pos: 8.5,11.5 + parent: 179 - proto: ChemMasterMachineCircuitboard entities: - uid: 718 @@ -3031,27 +3015,18 @@ entities: - type: Transform pos: -2.5,-15.5 parent: 179 - - type: DeviceLinkSink - links: - - 699 - uid: 259 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-14.5 parent: 179 - - type: DeviceLinkSink - links: - - 983 - uid: 463 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-16.5 parent: 179 - - type: DeviceLinkSink - links: - - 983 - uid: 677 components: - type: Transform @@ -3063,61 +3038,40 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,11.5 parent: 179 - - type: DeviceLinkSink - links: - - 722 - uid: 720 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,11.5 parent: 179 - - type: DeviceLinkSink - links: - - 722 - uid: 721 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,11.5 parent: 179 - - type: DeviceLinkSink - links: - - 722 - uid: 985 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-13.5 parent: 179 - - type: DeviceLinkSink - links: - - 983 - uid: 989 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-15.5 parent: 179 - - type: DeviceLinkSink - links: - - 983 - uid: 990 components: - type: Transform pos: -2.5,-13.5 parent: 179 - - type: DeviceLinkSink - links: - - 699 - uid: 991 components: - type: Transform pos: -2.5,-16.5 parent: 179 - - type: DeviceLinkSink - links: - - 699 - proto: CrateEngineeringToolbox entities: - uid: 692 @@ -3575,8 +3529,6 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-3.5 parent: 179 - - type: AtmosDevice - joinedGrid: 179 - proto: GasMixer entities: - uid: 747 @@ -3585,8 +3537,6 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-2.5 parent: 179 - - type: AtmosDevice - joinedGrid: 179 - proto: GasOutletInjector entities: - uid: 429 @@ -3595,8 +3545,6 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,-1.5 parent: 179 - - type: AtmosDevice - joinedGrid: 179 - proto: GasPipeBend entities: - uid: 727 @@ -3635,8 +3583,6 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,-0.5 parent: 179 - - type: AtmosDevice - joinedGrid: 179 - proto: GasPressurePump entities: - uid: 171 @@ -3645,8 +3591,6 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-3.5 parent: 179 - - type: AtmosDevice - joinedGrid: 179 - proto: GasValve entities: - uid: 168 @@ -3655,8 +3599,6 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-2.5 parent: 179 - - type: AtmosDevice - joinedGrid: 179 - proto: GasVentPump entities: - uid: 729 @@ -3665,8 +3607,6 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,-3.5 parent: 179 - - type: AtmosDevice - joinedGrid: 179 - proto: GasVentScrubber entities: - uid: 452 @@ -3675,8 +3615,6 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,-2.5 parent: 179 - - type: AtmosDevice - joinedGrid: 179 - proto: GasVolumePump entities: - uid: 160 @@ -3685,8 +3623,6 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-1.5 parent: 179 - - type: AtmosDevice - joinedGrid: 179 - proto: GeigerCounter entities: - uid: 759 @@ -4223,9 +4159,6 @@ entities: - type: Transform pos: 12.5,24.5 parent: 179 - - type: DeviceLinkSink - links: - - 1083 - proto: MachineFrame entities: - uid: 533 @@ -4379,8 +4312,6 @@ entities: - type: Transform pos: 7.5,-1.5 parent: 179 - - type: AtmosDevice - joinedGrid: 179 - proto: Ointment entities: - uid: 148 @@ -4400,8 +4331,6 @@ entities: - type: Transform pos: 7.5,-3.5 parent: 179 - - type: AtmosDevice - joinedGrid: 179 - proto: PaperBin10 entities: - uid: 977 @@ -4435,8 +4364,6 @@ entities: - type: Transform pos: 7.5,-2.5 parent: 179 - - type: AtmosDevice - joinedGrid: 179 - proto: PlasticFlapsAirtightClear entities: - uid: 997 @@ -5112,7 +5039,7 @@ entities: - type: Transform pos: -6.5,-12.5 parent: 179 -- proto: soda_dispenser +- proto: SodaDispenser entities: - uid: 751 components: @@ -5164,20 +5091,6 @@ entities: - type: Transform pos: -3.5,4.5 parent: 179 -- proto: SpawnVehicleATV - entities: - - uid: 1176 - components: - - type: Transform - pos: -7.5,1.5 - parent: 179 -- proto: SpawnVehicleJanicart - entities: - - uid: 904 - components: - - type: Transform - pos: 5.5,16.5 - parent: 179 - proto: Spear entities: - uid: 185 @@ -5809,20 +5722,6 @@ entities: - type: Transform pos: -7.5,4.5 parent: 179 -- proto: VehicleKeyATV - entities: - - uid: 1187 - components: - - type: Transform - pos: -6.8905525,1.5128828 - parent: 179 -- proto: VehicleKeyJanicart - entities: - - uid: 14 - components: - - type: Transform - pos: 6.5,16.5 - parent: 179 - proto: VendingMachineCigs entities: - uid: 870 From 77b1113d5d9ae7479b9fe924954d7257d87ba159 Mon Sep 17 00:00:00 2001 From: Jaraten <116667537+Jaraten@users.noreply.github.com> Date: Thu, 18 Jul 2024 16:11:59 +0300 Subject: [PATCH 11/26] Walls upd (#333) * wewe * oops * oooopsss 2 --- .../_CP14/Entities/Structures/Walls/walls.yml | 14 +++++- .../Structures/Walls/cyan_wall.rsi/full.png | Bin 0 -> 1352 bytes .../Structures/Walls/cyan_wall.rsi/meta.json | 46 ++++++++++++++++++ .../Structures/Walls/cyan_wall.rsi/wall0.png | Bin 0 -> 1899 bytes .../Structures/Walls/cyan_wall.rsi/wall1.png | Bin 0 -> 1074 bytes .../Structures/Walls/cyan_wall.rsi/wall2.png | Bin 0 -> 1899 bytes .../Structures/Walls/cyan_wall.rsi/wall3.png | Bin 0 -> 1065 bytes .../Structures/Walls/cyan_wall.rsi/wall4.png | Bin 0 -> 1093 bytes .../Structures/Walls/cyan_wall.rsi/wall5.png | Bin 0 -> 752 bytes .../Structures/Walls/cyan_wall.rsi/wall6.png | Bin 0 -> 1109 bytes .../Structures/Walls/cyan_wall.rsi/wall7.png | Bin 0 -> 267 bytes .../Walls/whitebricks_stone_wall.rsi/full.png | Bin 1166 -> 1633 bytes .../whitebricks_stone_wall.rsi/meta.json | 2 +- .../stonebricks0.png | Bin 1700 -> 2189 bytes .../stonebricks1.png | Bin 1229 -> 1542 bytes .../stonebricks2.png | Bin 1696 -> 2183 bytes .../stonebricks3.png | Bin 1251 -> 1548 bytes .../stonebricks4.png | Bin 1218 -> 1507 bytes .../stonebricks5.png | Bin 803 -> 870 bytes .../stonebricks6.png | Bin 1258 -> 1528 bytes .../Walls/wooden_wall.rsi/meta.json | 2 +- 21 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/full.png create mode 100644 Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall0.png create mode 100644 Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall1.png create mode 100644 Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall2.png create mode 100644 Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall3.png create mode 100644 Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall4.png create mode 100644 Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall5.png create mode 100644 Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall6.png create mode 100644 Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall7.png diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml index 45d0c5c7c7..d41f6e698a 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml @@ -116,4 +116,16 @@ acts: [ "Destruction" ] - type: Construction graph: CP14WallWood - node: WallCardboard \ No newline at end of file + node: WallCardboard + +- type: entity + id: CP14WallCyan + name: cyan wall + parent: CP14BaseWall + components: + - type: Sprite + sprite: _CP14/Structures/Walls/cyan_wall.rsi + - type: Icon + sprite: _CP14/Structures/Walls/cyan_wall.rsi + - type: IconSmooth + base: wall diff --git a/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/full.png new file mode 100644 index 0000000000000000000000000000000000000000..86405c060b308435934cae22ded4a1ee9c26686f GIT binary patch literal 1352 zcmV-O1-JT%P)Px)0!c(cRA_W-uf!?(RLidvNz+*M52PW(onn{`NZ_ z5@2mr91J^(=9*u~?W&+kkI0IIe5&j(Hqw$taa0ATHlFTa_V>$?De#@-&@ z{q+ZYcZlld762d&Bkt^bZlXg))d~@tgaM`jgJD(h;=5OP|Mm<3Flt>wrNAOW#xVBc zwT{9G0D!Ti$YNt`TT|53BTb#zLgr%{gn$*_KRZ4|uhX3oAkpYrJfgsN5tL$;N0SM{ z9Ki`pph|B=z(W2%VhqvP2e6rHsRHq<;y43NB$|X6blXt%SXk3Zlxiqr5{0?X!mQa7 z35X;BAPQLG_rB5VbkhVxOeWJT^SwY$SeXQ(Fvv3B8%l~_FN_vWDTo%OofF~l6#FOK% zmPSSefcJ0D@a*^yjx$Krgko}%>p&4jatXb9BG%-p_|NNf4M!w&T~Fn5U^aVsB&yrn?cKSGLUf_d0L{xkH zNuAsUCsz(W*h8E(FTjEj>hq%mlr0NEzyP-c&ze=PwEorgt+}(XNDE^7*DntN0Hi&& zd3jw(19>Erl8LR&M+w67K z#BB}tr9PaPMB7A;yz}M#F%1JaVvaa*sdtpL5uU{Ubd3lW>h_fxvgp`>Up~&>lgDiSQ z&P?+3i=rwbt|AacU#Le~2D>vmSSUJr`PG$0pAex@sbND%-SYZVUcajVMVwqY*&?KR zAbV>`!|wDK&Vo2&1j>XIkBg86A#^SI?*1DRcBh}YQ_AraLkLO-Rw4#Hn_obB`h73V zBr9*j1Ua5UMiPbCp)8<5&(7WdMG}i->{ z@~W8D<~EEg+(ku*j3NbzVXFALUI8G~g!1;-wQsSp^Yl)^i(urr=w7w)D3}#JBiEfJ zqOxVpNL-zBr_Tx=MtTD$)9w$Gc0*HPJN?;q>&9^cRD#u)+!}tgyoW0{;Ln)wAzHK6&>50000< KMNUMnLSTZCYjfoQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/meta.json new file mode 100644 index 0000000000..f9383e70b7 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 64 + }, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "Created by jaraten (Discord/Github) for CrystallPunk14", + "states": [ + { + "name": "wall0", + "directions": 4 + }, + { + "name": "wall1", + "directions": 4 + }, + { + "name": "wall2", + "directions": 4 + }, + { + "name": "wall3", + "directions": 4 + }, + { + "name": "wall4", + "directions": 4 + }, + { + "name": "wall5", + "directions": 4 + }, + { + "name": "wall6", + "directions": 4 + }, + { + "name": "wall7", + "directions": 4 + }, + { + "name": "full" + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall0.png b/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall0.png new file mode 100644 index 0000000000000000000000000000000000000000..2573966a9869b5b21e37b590f35f09549b623df5 GIT binary patch literal 1899 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall4.png b/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall4.png new file mode 100644 index 0000000000000000000000000000000000000000..962f25a4039c7ebd5f2accedd35d1fb26593740c GIT binary patch literal 1093 zcmV-L1iJf)P)Px&|4BqaRCt{2oy%_8Koo}m5NvQN3JJL^k}jx}MU<$?rd?F(OZHK^=nF*Zrkh4; zl|`jSjZ(ECTtmTNjOl_Je8XI3;xh^7+XV2~XXf)YfyxZB=H)cQsDuj8sH9vDzNf>01Keb z05vRtBBv*(i_ z`!<>qeSr5#Qq!I<5_R@vKwbl0luEw$xqKluz3lsl0}ljP(VOb8~1K=x4VCH zh2ppg$bekHyfwhflWGES#K}oz3@M`kxq!GP0E{FAMaU@l_*l}8B)}{QL7o{K(qfYj zgR_W}Q`~wke0=2v1ZkTcsmD{I3B=*;1H65KjI$3s0s+9J8B}Zc(vPi-fT*_ay$}LM zouAAO5Ku(GGVNMcZ6Fsgt?=^5S9qS{kjN*S_tdkPGl)^=;o@S4eO>!!QiPFbu;m3?s-tWsgKjOEr6g00000 LNkvXXu0mjfSS0lx literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall5.png b/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall5.png new file mode 100644 index 0000000000000000000000000000000000000000..005c4094698d81a4b6a0020bffefa602b98ba4c9 GIT binary patch literal 752 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?oFfgt1ba4!+ znDh3|d4DNK8P*TWn|hO`Ub+>upwr7UOJU{oIFBEjt6y#OwR$&&+PYaPQTeuSf0k0GW&M^?wNo5_SbIu&#LZTU2eDUZB=pI ztMk7tf7s=`-E%m}#A~%b|AKTwDc7%W&g{ucU`puRVEy4wYSD|&?@zz6Kg(G6bC$z9 z=T~3L$~U~V@(s~`YAyf1Txdx@!}UzQt+v;V*ZT7xD3(d6TX_H7mgr?)Uow{1h<~_K zxBKdfnb(%H8&n;d>sNltT%OIg;iB-jJKHjAs~E1S+h~0;cj9We%ed_V`-9(M7E+NP zzV3edJ?z^03;hhN2i`Hve%TwK7B2Do_Q!+kQpJzWxX<~lTQz1*`0v~@hAG|(^C}K$ zSO>m%&Je}0^_S`DF9Kc+Pm5R?3aT=`pFf{j!Wki6B6ED#leHSk3NvetX;=%s6^e+B zOqwd^#Q9*=y@V-qPuMh^`YwM>)zt+Bs66qx&Ye=ky5zn{!N=D!3>SVx9{hMPZ^t$6 zFMe_iNv}0ue@b5Qo-^;srZb-yI2e!2S7Tt%zmyphZ<=27`{B%edh_+CeW=jw3!goE zT55i()Pd*x?>BCm=AcrvIqHsSoR)oOCd0hP3+gJ3IrVh)qo>U~Wzx|1oT)xubRGMX zxrvt3LWChym3%eOMEK g5=JgA|Lp4-n4;H5A4+wf3{1idp00i_>zopr0LNNSu>b%7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall6.png b/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall6.png new file mode 100644 index 0000000000000000000000000000000000000000..6929f7bff2eab530db8348527366c82f37cf7c0b GIT binary patch literal 1109 zcmV-b1giUqP)Px(4@pEpRCt{2ozGL+KorNnA_0O!LGi~yd!REO9G%fiFP-VB=l-)j^dE4hmtN{j zJ03byN5{5`$`26&NeDgAgbKJHLV$X;3IH%ID{tyUGYag)#zc zZEuszu~-1G;Jtt=LeeNB02M3%bpc!&wK{Y?o48#i1ZdRiWVV$M zfD)wy=-W=>Hih1$0YFPH4`xlfvwMIyM{l9$a{z!JUygBhdLmo~5tM2H6eKQyd-t2o zR??FUG{Z0q!!QiPFbu;m48t%C!!QiPFbu;m z3yAPs{mS0q%g7g+enkE1slgW&wJ3BoQErJlzr^p0X zfBL7!Q>+S`hVUdQ_s-5T`?GI5V=YC6$x^~CpuDl^9T$r8T|003r$AVMw|7EK5X&^Jv0CenfEZkdx6wC(=* z7fyd7P11-9VD$h1jzY^|=0V&AjJAw&kRdF9;|M(nk|XW{ibV6r!qerc3qTDEKwSW8 zNZ-YQ`Su?OgZC2@gax2305v3wru^*e9td48I;2J}fIFt>Cu$fiIGzZ+00A1cI!bG+ zk>?GgHztDYVKgOTfPW{csQpF4?!FAjTfpl|W$bgISc*+AdmNEmfUDn^vFE$S=lwN>bfH)Tbh9U%okWq0jFKIamFinIY zD|%j2p9%GnE?<`M1aTmwXD`aE@Aea(t81A1aR@+ z`QS6Z%z+RWr37djotc81)04Lk8My#vPkOx6OX5$w1zZZ$xByRy> z_(fPwKka{?A{U_d&?L1_F2KhRqo2mEZ-((;Yh&Fz_OrFIKKA+g=JxsjGy$~(5K z;mq^a`2|dC*d4Cq^JsU5eg9qa9xM4gEX(xHi=tEz)U?shUl}d@-pH&x!!QiPFbu;m b%);^ys*F%8VuoFe00000NkvXXu0mjf>vr%z literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall7.png b/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall7.png new file mode 100644 index 0000000000000000000000000000000000000000..d5cbf40e2b7603a2b75b09b44791d8765e9fc319 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2IY&KR978JR zyuD+{)nFjP>iGEY`!&7hKUzZPyln12s@A%0aXIh#^(P+||M+lTc!691E-Za_sr<{@ zx>w)x8yLPe%)*X=_JKje-5UJ>yFa`vE7-5#!k2dcIQ*Z*o9PO377h$Et!y`At|v>a SwhxaiNXXOG&t;ucLK6VY`d-Qa literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/full.png index 9391a33578a73a228209efa28bcb571a4fb3a3fd..ab2d71768a0d51c1f50771b8103332e2e0b84c1a 100644 GIT binary patch delta 1604 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 diff --git a/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/meta.json index b7171db752..93941391b0 100644 --- a/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "All rights reserved for the CrystallPunk14 project only", - "copyright": "By jaraten(discord)", + "copyright": "Created by jaraten (Discord/Github) for CrystallPunk14", "size": { "x": 32, "y": 64 diff --git a/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks0.png b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks0.png index 7ab923fd9c389e1e50cf581c89883a03e0e4c190..f768d03ed35f581f9b59bf721f56b987869cc588 100644 GIT binary patch delta 2164 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 diff --git a/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks1.png b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks1.png index 6cdfc12f738556219d4544c4c64e10f31b50dd2d..5adb38da7bbc899ef2a5ba91b98ec1e8cf2ddc8f 100644 GIT binary patch delta 1512 zcmV3_eC1l&e@>4b0b-XS@trB%pA#K}B^jKRF+Ay}k;2FjaOds}Mux5*<|zXJ?6soy_2~sT4A{yTFpX5h zJo#J}v-69{=dyV4aOK#1Zvwdhrjf$^xdn_2T}M8b{m=X-$yry0f&=OSR;s(6W8ydfRI0n7 zU!S}QSQ+yG0A9U(2>>|X-VSxY5o(_D`t#G>1O#eO=iA%mej`qj=cJGeV6Qo_GUl;q zenj48=d}WP6G&bBD9{ruuRm|)PiVzJE&zal04<^w!+$%P7eDo|0MrGb=FAHah6$3I zm@a3&2Cx9s1)xT|D?BkirgeVd_Oxyhw9q!7`M>@+n4MpgQ(OLdI(3duOl67urjf$X zSKpJGpmq)D?MVUv2CiL^ze~%ju-A&PGKM@30GnH`+%}DrJeLw}4-i51_nC5A{HOhs zm%TknIe(`Yhv0z_YJixr72Cj(D9t7?`}_2VvSFYtz=MY?o?ifPie=bN3DYz8Jhi|n zmgTlTjS6i6M6lvv1#o19enXVUm04YCv<0|7x8V6zQ3Le{Z9An{2%#;&t(!Lh)NgIJ zQ^Jowdc(e8);z3}IOXa+z%*jqPm1lqkYJ%8G#gWsO+vB1*us@xW}K@4^Vu3ZV3 zqJQcGap(?*_GC!y6e$SB1AyZ@J^o>`7$wHR0D&+BXkdKmVx~qt zz-H%0jkW*-pI-$4EIoRRu4D(k9Qi_~xs@t*+^Wpur@Ncp145k>?Ct6H?0n^l^>L73-H8#3ZNdO%I4NK zfVwa{ZdC@G?Cg-+{&Oe@r3Q#VcHDZK7qvkRP|Xu3v<3Lsx(uM+reE#v0|3g;{y|r= z1D2T%7~RsN$LR0N;L^np0nks2YYX6S*R|RU06-#fA&@Qv+N;&@Y<)xb(xIR&fPV-| z1g=(bktV3sUdZOLSF7Q@L_+uS+Gq>VC~)<-s0sdjiNpo$)x3)&DbN<+I8$q8dcrIj zhG7_nVHk#C7=~dei1dAdiSaRv4i5r2Tqxm`wBP;JCGz(M)ko%WfMmIRZ%@**hM1Db z1=!qj<+|dx;^}ZJSY{geToyn5@_$>Dmu*UA5o#4BZ!3nYR4$*=0W}?Da%Y_vM>dJX7xC^0D$-Hu`^c#0C=Xyq85PM1Jr;` zBNh4hfLs9JWUt%*U&KNHfbM$&vG4%OA#yBgfC!pmh#U_AGDhHoD^Wo%fcWpriPE!n z8w8HNHbXHUAQ!-PO33H3XJLCVG+CG;n O0000uj0q$x$wv+O%c}M*|Ql$EP zuJ68n@7)idZwAb)Z)~0efU3@$w4i^SnLnBj0G>U4GDErlO@GS8HhBE#A-;b5X^w+_ zfYs*xSf0Js{z#h6ONCtk09cs2ZT{YC9iw@#5j!7L=VN)Id8x1q&^l-Xh@1V^_6}5a zKAzS;p4d$;1Id3ZaZbGc|BeCm+EQwIxA!IUTrwX8b^%JITO(*b0ILsE zDZB*~UI21WFxpES*K145NA1Z`DZB*~UVy^40^}ILJ)=X#%5XS2YctIm9V%7?$g7A8 zmCQq80QDcNZ)}duqv!L}=JH>^d`>L_39Wj6JC!4ecui_ybhN)J<1z7-J`8Yak!&koXb$tw6R5}b#VzIzi zzHu8)=!2ofn(^_ZuWP)D_vh!8jfGqr3($V8Nvl}5(~CWQ?fWi>Ko-FGbxvhGuN*UX z7b>nH3()QK09-uPG&j&9>AwM>^?8?iYb%hu!hbpj41xhXuRP)sQKC=Yg+2gasVl6l zK=%dGf?V`C8520MB7nAnyr-Yc??Mv@Sa5;X=Urm~8vV4pou2t6aU~Fv1!z84Gl4H{ z3@}M-;KWKRkc|9EAJ?(LSH8)sdxzZ6`vHHSu73Jiy}oXzH)07c!~wDZ$x&e5c~>I8 zAb$vgAP9mW2!bF8#m4$7vE<_EdTj}%(k+~x{zA9+1#jQINAtlNfIkzeZ(hA9*7pJn z_3E^5naflJ$XYDvf*4o+8~x?noGhS1h75EQJt zz$Bl*v<})%R35kj3%FCcYkpa%s&ZzzY=7ZDnVGr(LI2pqfaIn~9I#n{E3E*_4ib8w zAQxbE=??N14-$P`5WAj{hih_QCXHTERKDeA< zF!g`$Ba~$YdJ+W~on*0z^aQyJ5QU>va6$mi7QqPtfKd^q_02JR5Clf&2c|iV=6{3$ zs;Z!>3VW@60Jv;3NWvKx0OCzz-o67iVHY53`W&r*6E2_w;2y)hoe*Gadnfn&Rqi$9 zgaCRhpo3tNYuy#*9v!j^02I6@$o;B}eLi4zc9ygY&Dq(R>?uk?1mG?JHzELc0k{zX zxC_9I2*6zcZbSg?0&pV&a2J3Z5hj4U0D>S0f*=TjAP9mW2-D^_&v%)&32|1<00000 LNkvXXu0mjfd@Lpv diff --git a/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks2.png b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks2.png index 17cd061795760fad5301ad3b5acc76abea4621f1..b72dc5192d0a69ec5eb2157914f13ed37cf6a151 100644 GIT binary patch delta 2158 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 N002ovPDHLkV1nFoA@TqK diff --git a/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks3.png b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks3.png index c3a26e8b342d742a58da5c82a94145a302e74e3a..9608d980746ecf6cc9d5ad0947346638481c0db4 100644 GIT binary patch delta 1518 zcmV{{`IdNo7w_)OGV?uV-p826G=rC~q!7N6HFCXS9008XuoOJp00vrZxB@CEG ztZts6Od9ix%NWX}@#yht!+dW8xd5gS!`#9WMu#tBD3kur{Kv`D3R3+i2)rKP?f)XI ztGrVluv4zO_J3C&F5rCpoah2r?BzzWOo6E7}V*`PQG7{;~PqOe6j~0Ns0@Sp<06~}_ zsfo$b_ANjQKwSZ9q=&*&lM_ zoxJSti+}Pty)Xn11keK5j4j&+jznoTftgCm-^vDov;dDDueyE#z{wS0J9*5^K6JGL zCs*Lx-ZUzt1z^Fl#R}la2)%~Lj|;Q9)JO|3x3J{;6%hmV25md}PzWI{z_qL60BV;u z+sWhS>puXf`GB~b_1(8_(_`t>NM8j+Hy;}rjpqA*lSnEef^%9o;U6D!S7G@y+C$ljc>Eoz;1R1E?w}M zqJQWEVHgevwlX9Ra#+(A#o=j(MhU=YiWCIm0YKwHkM}m2-6e*>0D&L`sAGKM!%X!? zfX&WTjkEv*UtRX8?d_ z_Hz`AC0AOpSn?gCATSf`iFN@1Hn+BYX@5JV3ZmUzzJN=IPkvA$Exq~KX>rqtxgMFNMyUX{lgCgd zjiF2$6XRD@7Tpl#Z;sx$c^g3U*MHC=#?9NfGkq`ckDgV{O+00Juhlss$kT z05M?Gh$){cBNqTT-s|@N7oiXUp!=RcC_Lc)gIWIabz61;7Bt21I2-~b4BrP=R6#BP z`|q>h+wL+59DQwu;(mZ!0B5#d*w!~gY?_>696&xF(9zK$^*zG<{r!_aA3%u~fVu+I zXaT4zK#dlFx&qW_0jMiLjTV5q0@P>$s4GB?7J#|}8jVJy(P%UpjYgxz?&djJ3c delta 1219 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 AEdT%j diff --git a/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks5.png b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks5.png index 546fdb4ee29dfa8b52e1ad7edc5f899b588e3c50..1f10e4c648f0f1af53ce3247ececf49e4ebe8deb 100644 GIT binary patch delta 835 zcmZ3?_KaOE<&EW6v+A`gt-fAif!=C%UGgiHA zV_d1SCuPo}+SWz48mIRtZ#U?^b7;-ZZNicpw(f0S`*v=3@ImhxS(kZ#RQ=#B7cOUD zaF@4x{JVeBO1rxZ`|H^LzfrH*?{{&zbb!|UMIm-eUtZ>AXgHZMW!c*nM#k2~i*_y( zu5W(c%XUthm%-uBH{Ia30n;beD=&H-RN>+DmrdQMp_3r7fR*XL3BO{DQG>K4bl_dh`64?bF_MX7YMeb1tv5Ntnaf z`p7VBT0_pU%~NDMerj&mUEi?wt!(zqeKY>^E(`Wtqo+Tsy#9CMJjTz(#%muteXPF` zwU7I=5(mT7tg}I73eT21ERAx`OBDOb{(bGzYA4O6-M`uWme@P&65uL0*mB|fqlq3W zA@&Py=B$!G;KH_nIYF8E2IGc_jBgljfZdwHV9j7=)F8_sEqQ>?fkUxHzzIYglDhnt z>0s2uZ=y;4=5Ybn*#oX|ZC@{xm|UObaLYR(_2s;!PvQ;FGaTz_aGW9iq2_bw>l>}E zLCe_o)cxk$_)_yo(&Y}{*v(Vkai@OX^8R|}XC^B{(*|4Z1>(#2-MpR(`?xKh9+z`w zKF`+k90_N*UmU4`ex_Zgcm2wHp4``B6IhCBze$BMH* zW}FTBrTO8-$zTR?-D0=NQ}P%XfZ@8W@Ax_nrUksAY%(ht8KRs+Z?$VjJal1WX`Rq0 z%x1v75J=3Ixcr;(%}-`O5l1yhAlU$&(F=-pH_X5Uha8x=_J^%-%QD4^MK?qkfWXt$ K&t;ucLK6Us+};Vj&6~6%IecT*=A(ExVyU` zHL=rdQTgO+u3a^Z+o!Glq8ammLH5Ei5kJAZFKc8ZD*x|M{atsJv1xAYnRn;To_ou8 z;>)jQcLtA3whRv2FCY8&oB!wY!@sTf)PB~hx1H^O+J0m5rGMFz>-BFxxO`EOVZqg$ z2fv={GyJ!D%e{+XZJP3axqdZ<4Nn+F|L-z=!Ibj z7kzJd!P-$LT42R~=GoB z?;Web2R(=N_9wODN;ig|<$LocrLzKfd(m@r7TW8Z$h2_DgKJ`tic6>|4HFPB@j!kmR-IY7R@F z+T*1@>mrn|yxmgx@$Dt|&C(BR_&(I99PTcB$N2Qs2PMTRXRB5UuUW;%zcgW1kh+A> zxpoJRynTGnnWoHF(w@(Kpsq;g*V>K1;P|(4;|p5{rVYFai;Z1)r0-WP5^t!RB(mY( z8OG}qlfTFb>}7D|VSL6b7~4=PseIt?TN5B7o%4ssk_)UimQ2=bKN05A^#AM0OGj-h zn%;EW{j^hAk26Wq=MszOEE~bY*DaMDIVOCpw)k{UEw*9JICComWexPcs?j6Jj(U_qqVlK+n>{PRiw7gle$8Gyjk)z4*}Q$iB}1W9Lp diff --git a/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks6.png b/Resources/Textures/_CP14/Structures/Walls/whitebricks_stone_wall.rsi/stonebricks6.png index ee5a977b0c8a42850dc6451f155579e7c4aaf02b..70b76284c8c3c97ff4bd61e7b99041c3f55270e6 100644 GIT binary patch delta 1498 zcmV<01tt3G3HS?;FnRgd~y%4GC2UpzdjR06`}9| z@z-a9s3H^|FflfYiLp`4FDxl9pWFig;FJ4b0H}F`>Lx($0l=~0W-6(?36OgLGaLYn zWL$aqv;fs4j36WFflf& zynON?2-KbfOd|m+lWRQ>0FDFS^whZWvZcn-M;xB@!nxTQOizvT{{Cp}A4DC_jnXDy z8VMN5IN8Y059LjO>Vc;j$^~HkJ=FwAJtRSpb$O~EdVl;-8Uw6M4xi4A;^CujLSZ~W z-~r;;KMW`rV0vnt4}ZfT0%H$_J2fO6(S>Q0B z+ymwpmN37t6pCLTAP|7{06;jJ0BJ7}29$dMYx{P|2}L(3Jr-|kYdiCNfFB132c+`> zp_mb(M1KoFT>)ye0Mr$rMhie)0cx}W)D@sc3qV}~YP0~<6`)27KwSZiMx)VaG#ZUY zqtR$I8r4X@o1dGV@vIMEiyu!~{vs}r{OrM37k|INhabF$Og8UHGgC>v0)%aa5!VNW zg}|1``0e^Ml5sAKnMyWXQ!g3?(gK)9;?y;NR)0DRBN=bFuJ-+N*(yjO-TuCO@UbTb z__h6Ji=wSe?&9wm`fYU`8@U385`#RgvhxBP**u1ladch1g7WG*PX~ZXrHZbu2)eFb zku6>tX#pxbFHouOaN~fQf#PRFdUZ#(*uao>zj$om#AR~r9UTCG{k=Wk{CsiqVmAS1 zpnu5z-d;m`dq)SXbjFirrVQEQrFrcuMeB_|Yo00s-8mYM4K!rtiDZn}E`- zv#+rZ=ceUfj%op@D?m-l3qTrxjvx)9E$;zZ0O|@*Lw<_P-0Y0h{jYfbXanRyaN*}~ z582chn?q!0i!HCLdD0o;;cJucek5fBxqk=r^+rAW2$`{V$>AHU+1#R)&caM31KoHX zniyc096o6(?kxmrB8g&%_sBx-0VBf(|NQ0G-+B5;6RqMsvXBcP8r>{SoIVeFDxF*a z(I6|Gt-VA^d5sibumlac0QJV1MuH3Bd%chzgdm~l27%+FHSCgu`GqCio4gA#9e)5G zKY7}4{O0xX_b>KXKx&A36!#sH-Y7qHP1Ul5tb(AJ$t?w z=&^g`9so23Lh(~f=da$=Sy<_8AUy)P2Z)BAHNXYg8;}RVKNo*IeEj4oe|;{-0|5NM z71K!g21eN+NbUhFxQU2?ksrHt^nV%j`6J{4)RW2P8`^g5;V9XV{=bR=q8E6M+G!FL zgMwawy1-`|2|Rng=zAS|O02(6266$|dBWY%2yWfH1^{p>Rg|47Mut-ujP(Nm3dJp~ z|D8s6G=jIxA@uYF6AQ?n1L}q+6b&{asj%d5!j_|0N}>jrEPRaBXHeaymVcj$Nnxm)xbm` zj{#+;dSbro?jm3K*Z004L?9P{wd>VC{sI7Wc3uVm#0L63*KKb*ye9}M00JRs0*ubi z%P2clxbCj6@r?b0gFwqA_fr5d_%Vu`TWD`<O7l40EV0kC~ zeO|}~Xcpj33y!DdYcv{-Mx)VaG#ZUYqtP_uKO=%^-^MLUb^rhX07*qoM6N<$g2sKi AbN~PV delta 1226 zcmV;*1U38k3+f4wFndBWfF|{|74z zd-o2E4D9S(x>g7zcEp4fijYtxM2AWwdc7H#;{@3_t_FvqxssFak zAG>0!w~4qBYv(R6e^*lXol0t%lVo%T02mBUE31=S0BQOvt>(k@xNI@J7y>4im+w|m z54i;Z!1~$>0N|*g+~D|};e`PG&nM~lH!&j$SmDJGh#N7sdYdG5dm(^Cb%?=*!S%Hj zB%|qZP+`zSaDQP?Mgf(e!eIaN30d9b7Lbh25I5r7vp`jNVF7XoNGDh&UI_5|?R(=h zfuzh#&;=9q=U(l8`jagKFxfvioE#s2nH(Q~naFnml$34(rjRx(^{tXhoM1MjQKr6G zDvtum=*$@RsUUHJ(&^pg_^QIW0P}ckY5vJ5ab5jC<9}R$GN0YcfIJhVrV;_vXL~vB zr;oq%p|Er(n0=g0MrY_fYL{K@+>j(fuiw5eyV|)SNrbj~o8cxxDn8@^l?$LcK_4Ko z0NME;1A-R-87j{Ne+))mbX;OJw+;YHOG{SI^jB9`)@`tXGePPGP{RUHH-H)zfVu(H zumIEzpnrx1pl$#)EC6)_s9^!98$eC)0x%52Fbu;m48t%C6CT!c^ZN&f>H2`8b${8l zKp3Z53EDN(!%|###W=VyC3>Ks$fbH!qG%JXj@WEr7b{ zQ8jhB6;7Iac5$Q+OXL6tJ^<6bK-6tm7$>X5)PLo$MGS_g#_OuwCv3vmGP#?!x~i+i ztJ)GfFU|y*ce{I4+v4YieSqyhkXvMajely}Wo99-r`}c*{M18~82Uu2a&Hlk5fc&(YoHv;DH5;OrKXmf%3MsX zd6fsmnJG2N`r1linJwfNpm!=ZoVzY*7|I-c4F|aZuim`VKKB9C<9hn}JUQ3OB=lK!s8bwtrB02sxP=LX-0 znq}BPE-HuLMzsj7 zjV3zX=}MALw~f|D6TO{n?X${%;RArYbF0Vo)Hg_^qXf)DWl_8kKz2xsMS54GXn(b| zPOEq!0Pxoe#8^yy!nGv`aiLx3S_p3h$ac(?m!Ac>0R0ai)A+B7kXnSe&>}%m!n7#l z0u*&fo{MUc<`4e6ArRG~Ts+U3zv>UN(ZLq-JV1;EqG(m~{%TkRrh>>6xwo^e_fsD$OVX^)f;2Jv=AXKG)oa Date: Thu, 18 Jul 2024 20:43:20 +0200 Subject: [PATCH 12/26] Correct .editorconfig to use no space after casting (#30132) --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index a5dfab07a5..1583c600aa 100644 --- a/.editorconfig +++ b/.editorconfig @@ -129,7 +129,7 @@ csharp_indent_braces = false csharp_indent_switch_labels = true # Space preferences -csharp_space_after_cast = true +csharp_space_after_cast = false csharp_space_after_colon_in_inheritance_clause = true csharp_space_after_comma = true csharp_space_after_dot = false From 437fc936a2faacd409c56b164fd4cb1974d2f454 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Thu, 18 Jul 2024 22:29:20 +0300 Subject: [PATCH 13/26] LatheSystem independently of energy (#30148) * Update LatheSystem.cs * Emo --- Content.Server/Power/EntitySystems/StaticPowerSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Power/EntitySystems/StaticPowerSystem.cs b/Content.Server/Power/EntitySystems/StaticPowerSystem.cs index 9e11d9311a..61a23e501d 100644 --- a/Content.Server/Power/EntitySystems/StaticPowerSystem.cs +++ b/Content.Server/Power/EntitySystems/StaticPowerSystem.cs @@ -9,7 +9,7 @@ public static class StaticPowerSystem public static bool IsPowered(this EntitySystem system, EntityUid uid, IEntityManager entManager, ApcPowerReceiverComponent? receiver = null) { if (receiver == null && !entManager.TryGetComponent(uid, out receiver)) - return false; + return true; return receiver.Powered; } From dec6a1c2caef49c492f2834e0d43e5dce174e3e0 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Thu, 18 Jul 2024 23:40:06 +0300 Subject: [PATCH 14/26] Ru localization update (#335) * Update entities.ftl * Update ContentLocalizationManager.cs * Update ContentLocalizationManager.cs * Update entities.ftl --- .../ContentLocalizationManager.cs | 14 ++- .../ru-RU/_CP14/_PROTO/entities/entities.ftl | 90 ++++++++++++------- 2 files changed, 69 insertions(+), 35 deletions(-) diff --git a/Content.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs index df1f6151b0..fc9cd6a613 100644 --- a/Content.Shared/Localizations/ContentLocalizationManager.cs +++ b/Content.Shared/Localizations/ContentLocalizationManager.cs @@ -10,7 +10,7 @@ namespace Content.Shared.Localizations [Dependency] private readonly ILocalizationManager _loc = default!; // If you want to change your codebase's language, do it here. - private const string Culture = "en-US"; // CrystallPunk-Localization. "ru-RU" or "en-US" + private const string Culture = "ru-RU"; // CrystallPunk-Localization. "ru-RU" or "en-US" /// /// Custom format strings used for parsing and displaying minutes:seconds timespans. @@ -25,9 +25,19 @@ namespace Content.Shared.Localizations public void Initialize() { + //Ru localization var culture = new CultureInfo(Culture); - _loc.LoadCulture(culture); + + var fallbackCulture = new CultureInfo("en-US"); + _loc.LoadCulture(fallbackCulture); + _loc.SetFallbackCluture(fallbackCulture); + // + + //Eng localization + //var culture = new CultureInfo(Culture); + // + _loc.AddFunction(culture, "PRESSURE", FormatPressure); _loc.AddFunction(culture, "POWERWATTS", FormatPowerWatts); _loc.AddFunction(culture, "POWERJOULES", FormatPowerJoules); diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index fb44fc6eaf..7b6ed19e5c 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -1,3 +1,5 @@ +ent-CP14SeedTest = FUCK test SEED + ent-CP14Fire = огонь .desc = Это огонь! .suffix = cp14 @@ -275,24 +277,6 @@ ent-CP14Nail110 = { ent-CP14Nail1 } .desc = { ent-CP14Nail1.desc } .suffix = 10 -ent-CP14BloodGrass = кровьтрава - .desc = Самое скучное и распространенное растение, растущее в дикой природе. Известна своими питательными свойствами. - -ent-CP14AgaricMushroom = мухомор - .desc = Этот ядовитый гриб часто можно встретить вблизи водоемов или других влажных мест. Не рекомендуется для употребления в пищу. - -ent-CP14ChromiumSlime = хромиевая слизь - .desc = Это редкое густое вещество можно обнаружить в потоке воды, как будто оно обладает собственным разумом. При попытке изменить саму слизь - она меняет реагент, с которым взаимодействует. - -ent-CP14WildSage = корень дикого шалфея - .desc = Корень повсеместно распространенного лекарственного растения, неплохо заживляющего физические повреждения и вызывающего откашливание. - -ent-CP14QuartzShard = грубый кварц - .desc = природный кристалл, являющийся естественным накопителем магической энергии. Его цвет отражает качество кристалла - чем выше спектр излучения, тем выше уровень утечки энергии. - -ent-CP14LumiMushroom = люмигриб - .desc = Слабо светящийся гриб. Часто используется алхимиками как средство для концентрации растворов. - ent-CP14Cauldron = котел .desc = Тяжелый котелок. Он не такой громоздкий, как чан, но его можно нести в руках. @@ -338,6 +322,27 @@ ent-CP14VialSmallLumiMushroom = { ent-CP14VialTiny } .desc = { ent-CP14VialTiny.desc } .suffix = Люмигриб +ent-CP14Wheat = сноп пшеницы + .desc = У вас есть выбор: посадить семена обратно в землю, либо пустить их в муку. + +ent-CP14BloodGrass = кровьтрава + .desc = Самое скучное и распространенное растение, растущее в дикой природе. Известна своими питательными свойствами. + +ent-CP14AgaricMushroom = мухомор + .desc = Этот ядовитый гриб часто можно встретить вблизи водоемов или других влажных мест. Не рекомендуется для употребления в пищу. + +ent-CP14ChromiumSlime = хромиевая слизь + .desc = Это редкое густое вещество можно обнаружить в потоке воды, как будто оно обладает собственным разумом. При попытке изменить саму слизь - она меняет реагент, с которым взаимодействует. + +ent-CP14WildSage = корень дикого шалфея + .desc = Корень повсеместно распространенного лекарственного растения, неплохо заживляющего физические повреждения и вызывающего откашливание. + +ent-CP14QuartzShard = грубый кварц + .desc = природный кристалл, являющийся естественным накопителем магической энергии. Его цвет отражает качество кристалла - чем выше спектр излучения, тем выше уровень утечки энергии. + +ent-CP14LumiMushroom = люмигриб + .desc = Слабо светящийся гриб. Часто используется алхимиками как средство для концентрации растворов. + ent-CP14EnergyCrystalBase = None .desc = Обработанные кристаллы кварца являются прекрасными хранителями магической энергии. А специальные разъемы позволяют удобно вставлять их в магические устройства, превращая в энергетические батарейки. @@ -364,12 +369,15 @@ ent-CP14Bucket = ведро ent-CP14OldLantern = Старая Лампа .desc = Пережиток прошлого техномагии. Большой, тяжелый, непрактичный. Таким приятно разве что бить по голове. -ent-CP14BaseSharpeningStone = точильный камень - .desc = Позволит заточить притупленное оружие. Если перестараться, вы вполне можете сточить оружие полностью. - ent-CP14Shovel = лопата .desc = Орудие для вскапывания земли, рытья грядок или могил. +ent-CP14Hoe = мотыга + .desc = Фермерский инструмент для подготовки почвы под посадки, либо очистки от сорняков. + +ent-CP14BaseSharpeningStone = точильный камень + .desc = Позволит заточить притупленное оружие. Если перестараться, вы вполне можете сточить оружие полностью. + ent-CP14BaseBattleHammer = боевой молот .desc = A big heavy hammer! Bruh! @@ -695,6 +703,34 @@ ent-CP14WallmountBarShelfB = { ent-CP14WallmountBarShelfA } ent-CP14FrameWooden = каркас деревянной стены .desc = Деревянный каркас для деревянных стен любых видов. +ent-CP14AlchemyFurnaceDebug = { ent-CP14AlchemyFurnace } + .desc = { ent-CP14AlchemyFurnace.desc } + +ent-CP14AlchemyFurnace = алхимическая печь + .desc = Печь, работающая на дровах, угле или любом другом горящем материале. Удобна для подогрева алхимических зелий. + +ent-CP14AlchemyNormalizer = нормализатор растворов + .desc = Алхимический прибор, удаляющий мелкий осадок из растворов и стабилизирующий его для дальнейшей работы + +ent-CP14BaseVat = чан + .desc = Очень большой чан для хранения огромного количества жидкости. Тяжелый, неудобный для переноски. + +ent-CP14PloughedGround = вскопанная почва + +ent-CP14SeedbedDefault = лоток для семян + +ent-CP14GatherableWildBase = { ent-CP14GatherableBase } + .desc = { ent-CP14GatherableBase.desc } + +ent-CP14GatherablePlantBase = { ent-CP14GatherableBase } + .desc = { ent-CP14GatherableBase.desc } + +ent-CP14PlantWheat = пщеница + .desc = Наиболее популярная культура. Непритязательна, и открывает дорогу к разнообразию мучных изделий. + +ent-CP14PlantWheatDeath = мертвая пшеница + .desc = Грустное зрелище потерянной еды. + ent-CP14GatherableBloodgrass = кровьтрава .desc = Самое скучное и распространенное растение, которое можно встретить в природе, - это темно-коричневая трава. .suffix = Gatherable @@ -715,18 +751,6 @@ ent-CP14GatherableLumiMushroom = люмигрибы .desc = Слабо светящийся гриб. Часто используется алхимиками как средство для концентрации растворов. .suffix = Gatherable -ent-CP14AlchemyFurnaceDebug = { ent-CP14AlchemyFurnace } - .desc = { ent-CP14AlchemyFurnace.desc } - -ent-CP14AlchemyFurnace = алхимическая печь - .desc = Печь, работающая на дровах, угле или любом другом горящем материале. Удобна для подогрева алхимических зелий. - -ent-CP14AlchemyNormalizer = нормализатор растворов - .desc = Алхимический прибор, удаляющий мелкий осадок из растворов и стабилизирующий его для дальнейшей работы - -ent-CP14BaseVat = чан - .desc = Очень большой чан для хранения огромного количества жидкости. Тяжелый, неудобный для переноски. - ent-CP14ChestGeneric = сундук .desc = Chest. From 2bf17fdc35cdb2bc74e1e465b63718cf5100fdd0 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Fri, 19 Jul 2024 00:03:08 +0300 Subject: [PATCH 15/26] Content pack (#337) * added rope * black shirt replace * Update migration.yml * more berets * loadout update * captain role and jacket * bruhh captain cap * add one-handed sword * shield! * Update entities.ftl --- .../Locale/en-US/_CP14/job/department.ftl | 8 +-- Resources/Locale/en-US/_CP14/job/job.ftl | 3 + .../Locale/en-US/_CP14/loadouts/loadout.ftl | 15 ++++ .../Locale/en-US/_CP14/loadouts/test.ftl | 8 --- .../ru-RU/_CP14/_PROTO/entities/entities.ftl | 36 +++++++++- .../Locale/ru-RU/_CP14/job/department.ftl | 8 +-- Resources/Locale/ru-RU/_CP14/job/job.ftl | 3 + .../Locale/ru-RU/_CP14/loadouts/loadout.ftl | 14 ++++ .../Locale/ru-RU/_CP14/loadouts/test.ftl | 8 --- .../Cloak/{cloak.yml => basic_cloak.yml} | 15 +++- .../_CP14/Entities/Clothing/Head/helmets.yml | 41 +++++++++-- .../_CP14/Entities/Clothing/Shirt/shirt.yml | 8 +-- .../Spawners/Random/battle_royale_temp.yml | 6 +- .../_CP14/Entities/Objects/Tools/rope.yml | 34 +++++++++ .../Entities/Objects/Weapons/Melee/shield.yml | 65 ++++++++++++++++++ .../Entities/Objects/Weapons/Melee/sword.yml | 36 ++++++++++ .../{Mercenary/adventurer.yml => basic.yml} | 34 ++++++--- .../_CP14/Loadouts/Jobs/captain.yml | 19 +++++ .../_CP14/Loadouts/loadout_groups.yml | 65 +++++++++++------- .../_CP14/Loadouts/role_loadouts.yml | 44 +++++++----- .../_CP14/Roles/Jobs/Command/captain.yml | 16 +++++ .../Roles/Jobs/Fun/misc_startinggear.yml | 2 +- .../Jobs/{Free => Mercenary}/adventurer.yml | 13 ---- .../_CP14/Roles/Jobs/Mercenary/alchemist.yml | 17 +++++ .../_CP14/Roles/Jobs/departments.yml | 4 +- .../_CP14/Roles/play_time_tracker.yml | 5 +- .../Prototypes/_CP14/StatusEffects/job.yml | 9 ++- .../captain_jacket.rsi/equipped-CLOAK.png | Bin 0 -> 1103 bytes .../Cloak/captain_jacket.rsi/icon.png | Bin 0 -> 631 bytes .../captain_jacket.rsi}/meta.json | 2 +- .../Head/Beret/black.rsi/equipped-HELMET.png | Bin 0 -> 463 bytes .../Clothing/Head/Beret/black.rsi/icon.png | Bin 0 -> 224 bytes .../Beret/{white.rsi => black.rsi}/meta.json | 0 .../Head/Beret/blue.rsi/equipped-HELMET.png | Bin 0 -> 509 bytes .../Clothing/Head/Beret/blue.rsi/icon.png | Bin 0 -> 228 bytes .../Clothing/Head/Beret/blue.rsi/meta.json | 18 +++++ .../Head/Beret/white.rsi/equipped-HELMET.png | Bin 473 -> 0 bytes .../Clothing/Head/Beret/white.rsi/icon.png | Bin 226 -> 0 bytes .../Head/Beret/yellow.rsi/equipped-HELMET.png | Bin 0 -> 483 bytes .../Clothing/Head/Beret/yellow.rsi/icon.png | Bin 0 -> 239 bytes .../Clothing/Head/Beret/yellow.rsi/meta.json | 18 +++++ .../Head/captain_cap.rsi/equipped-HELMET.png | Bin 0 -> 536 bytes .../Clothing/Head/captain_cap.rsi/icon.png | Bin 0 -> 329 bytes .../Clothing/Head/captain_cap.rsi/meta.json | 18 +++++ .../Shirt/Cotton/black.rsi/equipped-SHIRT.png | Bin 0 -> 876 bytes .../Clothing/Shirt/Cotton/black.rsi/icon.png | Bin 0 -> 441 bytes .../Clothing/Shirt/Cotton/black.rsi/meta.json | 18 +++++ .../Cotton/dark_blue.rsi/equipped-SHIRT.png | Bin 888 -> 0 bytes .../Shirt/Cotton/dark_blue.rsi/icon.png | Bin 435 -> 0 bytes .../Misc/job_icons.rsi/Alchemist.png | Bin 241 -> 202 bytes .../Interface/Misc/job_icons.rsi/Captain.png | Bin 0 -> 244 bytes .../Interface/Misc/job_icons.rsi/meta.json | 3 + .../Objects/Tools/rope.rsi/body-overlay-2.png | Bin 0 -> 701 bytes .../Objects/Tools/rope.rsi/body-overlay-4.png | Bin 0 -> 701 bytes .../_CP14/Objects/Tools/rope.rsi/icon.png | Bin 0 -> 513 bytes .../Objects/Tools/rope.rsi/inhand-left.png | Bin 0 -> 669 bytes .../Objects/Tools/rope.rsi/inhand-right.png | Bin 0 -> 667 bytes .../_CP14/Objects/Tools/rope.rsi/meta.json | 30 ++++++++ .../battleStaff.rsi/inhand-left.png | Bin 802 -> 799 bytes .../battleStaff.rsi/inhand-right.png | Bin 799 -> 802 bytes .../Weapons/Melee/Dagger/dagger.rsi/icon.png | Bin 342 -> 298 bytes .../Shield/shield.rsi/equipped-BACKPACK.png | Bin 0 -> 388 bytes .../Weapons/Melee/Shield/shield.rsi/icon.png | Bin 0 -> 551 bytes .../Melee/Shield/shield.rsi/inhand-left.png | Bin 0 -> 824 bytes .../Melee/Shield/shield.rsi/inhand-right.png | Bin 0 -> 838 bytes .../Weapons/Melee/Shield/shield.rsi/meta.json | 26 +++++++ .../Sword/sword.rsi/equipped-BACKPACK.png | Bin 0 -> 479 bytes .../Weapons/Melee/Sword/sword.rsi/icon.png | Bin 0 -> 319 bytes .../Melee/Sword/sword.rsi/inhand-left.png | Bin 0 -> 760 bytes .../Melee/Sword/sword.rsi/inhand-right.png | Bin 0 -> 788 bytes .../Weapons/Melee/Sword/sword.rsi/meta.json | 26 +++++++ Resources/migration.yml | 5 +- 72 files changed, 595 insertions(+), 105 deletions(-) create mode 100644 Resources/Locale/en-US/_CP14/loadouts/loadout.ftl delete mode 100644 Resources/Locale/en-US/_CP14/loadouts/test.ftl create mode 100644 Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl delete mode 100644 Resources/Locale/ru-RU/_CP14/loadouts/test.ftl rename Resources/Prototypes/_CP14/Entities/Clothing/Cloak/{cloak.yml => basic_cloak.yml} (83%) create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Tools/rope.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sword.yml rename Resources/Prototypes/_CP14/Loadouts/Jobs/{Mercenary/adventurer.yml => basic.yml} (88%) create mode 100644 Resources/Prototypes/_CP14/Loadouts/Jobs/captain.yml create mode 100644 Resources/Prototypes/_CP14/Roles/Jobs/Command/captain.yml rename Resources/Prototypes/_CP14/Roles/Jobs/{Free => Mercenary}/adventurer.yml (56%) create mode 100644 Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/alchemist.yml create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/captain_jacket.rsi/equipped-CLOAK.png create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/captain_jacket.rsi/icon.png rename Resources/Textures/_CP14/Clothing/{Shirt/Cotton/dark_blue.rsi => Cloak/captain_jacket.rsi}/meta.json (89%) create mode 100644 Resources/Textures/_CP14/Clothing/Head/Beret/black.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_CP14/Clothing/Head/Beret/black.rsi/icon.png rename Resources/Textures/_CP14/Clothing/Head/Beret/{white.rsi => black.rsi}/meta.json (100%) create mode 100644 Resources/Textures/_CP14/Clothing/Head/Beret/blue.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_CP14/Clothing/Head/Beret/blue.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Head/Beret/blue.rsi/meta.json delete mode 100644 Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/equipped-HELMET.png delete mode 100644 Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Head/Beret/yellow.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_CP14/Clothing/Head/Beret/yellow.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Head/Beret/yellow.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/Head/captain_cap.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_CP14/Clothing/Head/captain_cap.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Head/captain_cap.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Cotton/black.rsi/equipped-SHIRT.png create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Cotton/black.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Cotton/black.rsi/meta.json delete mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Cotton/dark_blue.rsi/equipped-SHIRT.png delete mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Cotton/dark_blue.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/Captain.png create mode 100644 Resources/Textures/_CP14/Objects/Tools/rope.rsi/body-overlay-2.png create mode 100644 Resources/Textures/_CP14/Objects/Tools/rope.rsi/body-overlay-4.png create mode 100644 Resources/Textures/_CP14/Objects/Tools/rope.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/Tools/rope.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/Tools/rope.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/Tools/rope.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/sword.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/sword.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/sword.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/sword.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/sword.rsi/meta.json diff --git a/Resources/Locale/en-US/_CP14/job/department.ftl b/Resources/Locale/en-US/_CP14/job/department.ftl index 40994a378d..57bcd52419 100644 --- a/Resources/Locale/en-US/_CP14/job/department.ftl +++ b/Resources/Locale/en-US/_CP14/job/department.ftl @@ -1,5 +1,5 @@ -department-CP14Free = Free civilians -department-CP14Free-desc = Individuals who are not burdened by contracts and work for the government, but do not receive free assistance from it either. Find your own way of earning a living. +department-CP14Mercenary = Mercenaries +department-CP14Mercenary-desc = People who joined the expedition to make some money. -department-CP14Command = Officers of the Law -department-CP14Command-desc = Persons working directly for government officials. Bound by a magical contract, they cannot act against the interests of the state. \ No newline at end of file +department-CP14Command = Expedition organizers +department-CP14Command-desc = Persons responsible for carrying out the task assigned from the great house. \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/job/job.ftl b/Resources/Locale/en-US/_CP14/job/job.ftl index a08501e62c..b0d62d2350 100644 --- a/Resources/Locale/en-US/_CP14/job/job.ftl +++ b/Resources/Locale/en-US/_CP14/job/job.ftl @@ -1,3 +1,6 @@ +cp14-job-name-captain = Expedition captain +cp14-job-desc-captain = You are the most important person in this expedition. Organize its participants and manage the processes to complete the task set from the management. + cp14-job-name-adventurer = Adventurer cp14-job-desc-adventurer = A hunter of thrills, riches and fame, constantly risking his life. Search for valuables in dangerous places and sell them to the settlement. diff --git a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl new file mode 100644 index 0000000000..122d3a3a68 --- /dev/null +++ b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl @@ -0,0 +1,15 @@ +# Basic + +cp14-loadout-basic-cloak = Cloak +cp14-loadout-basic-eyes = Goggles +cp14-loadout-basic-gloves = Gloves +cp14-loadout-basic-head = Head +cp14-loadout-basic-mask = Mask +cp14-loadout-basic-pants = Pants +cp14-loadout-basic-shirt = Shirt +cp14-loadout-basic-shoes = Shoes + +# Org + +cp14-loadout-captain-cloak = Captain's cloak +cp14-loadout-captain-head = Captain's head \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/loadouts/test.ftl b/Resources/Locale/en-US/_CP14/loadouts/test.ftl deleted file mode 100644 index 619bd83ea1..0000000000 --- a/Resources/Locale/en-US/_CP14/loadouts/test.ftl +++ /dev/null @@ -1,8 +0,0 @@ -cp14-loadout-test-cloak = Cloak -cp14-loadout-test-eyes = Goggles -cp14-loadout-test-gloves = Gloves -cp14-loadout-test-head = Headgear -cp14-loadout-test-mask = Mask -cp14-loadout-test-pants = Pants -cp14-loadout-test-shirt = Shirt -cp14-loadout-test-shoes = Shoes \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index 7b6ed19e5c..e398d4b786 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -45,6 +45,9 @@ ent-CP14ClothingCloakSimpleWhite = белый плащ ent-CP14ClothingCloakSimpleDarkBlue = { ent-CP14ClothingCloakSimpleWhite } .desc = { ent-CP14ClothingCloakSimpleWhite.desc } +ent-CP14ClothingCloakCaptainJacket = капитанский жилет + .desc = Белое золото говорит о том, что вы смотрите на серьезного представителя власти. + ent-CP14ClothingEyesMonocle = монокль .desc = Аристократично и красиво. @@ -78,9 +81,18 @@ ent-CP14ClothingHeadRedBeret = красный берет ent-CP14ClothingHeadPurpleBeret = фиолетовый берет .desc = Это берет. -ent-CP14ClothingHeadWhiteBeret = белый берет +ent-CP14ClothingHeadYellowBeret = желтый берет .desc = Это берет. +ent-CP14ClothingHeadBlueBeret = синий берет + .desc = Это берет. + +ent-CP14ClothingHeadBlackBeret = черный берет + .desc = Это берет. + +ent-CP14ClothingHeadCaptainCap = капитанская кепка + .desc = Нет, ну вы посмотрите какой красавчик! + ent-CP14ClothingMaskSinner = маска грешника .desc = Маска предназначенная для ношения не самыми светлыми личностями. Палачи надевают их на себя и на жертву перед казнью. @@ -97,9 +109,9 @@ ent-CP14ClothingPantsLoincloth = набедренная повязка .desc = Свободные, ничего не мешает, да еще и выглядят экстремально брутально ent-CP14ClothingShirtCottonBlue = хлопковая синяя рубаха - .desc = Приятный на ощупь материал, удобная свободная форма рубашки. + .desc = { ent-CP14ClothingShirtCottonBlue.desc } -ent-CP14ClothingShirtCottonBlueDark = хлопковая темная рубаха +ent-CP14ClothingShirtCottonBlack = хлопковая черная рубаха .desc = { ent-CP14ClothingShirtCottonBlue.desc } ent-CP14ClothingShirtCottonPurple = хлопковая фиолетовая рубаха @@ -375,6 +387,9 @@ ent-CP14Shovel = лопата ent-CP14Hoe = мотыга .desc = Фермерский инструмент для подготовки почвы под посадки, либо очистки от сорняков. +ent-CP14Rope = веревка + .desc = Многофункциональная веревка. Ей можно связать что-нить. Или кого-нибудь. + ent-CP14BaseSharpeningStone = точильный камень .desc = Позволит заточить притупленное оружие. Если перестараться, вы вполне можете сточить оружие полностью. @@ -396,12 +411,18 @@ ent-CP14BaseLightHammer = легкий молот ent-CP14BaseMace = булава .desc = Тяжелый кусок металла на длинной палке. Что может быть проще? +ent-CP14BaseShield = щит + .desc = Деревянный щит, способный выдержать несколько ударов. + ent-CP14BaseSickle = серп .desc = Изначально разработанное как оружие против травы, серп внезапно показал себя хорош и в более кровавой жатве. ent-CP14BaseThrowableSpear = метательное копьё .desc = Оружие, исправно выполняющее свой долг еще со времен эпохи великанов. +ent-CP14BaseSword = меч + .desc = Золотой стандарт холодного оружия. Средняя длина, удобная рукоять и никаких излишеств. + ent-CP14BaseTwoHandedSword = двуручный меч .desc = Мощное оружие, требующее огромной силы и умения для эффективного использования. @@ -835,6 +856,9 @@ ent-CP14WallWooden = деревянная стена ent-CP14WallCardboard = картонная стена .desc = Тонкая, непрочная стена из бумаги и картона. Популярна в теплых странах. +ent-CP14WallCyan = голубая стена + .desc = { ent-CP14BaseWall.desc } + ent-CP14BaseFenceWood = деревянный забор .desc = Деревянный кусок ограды. Надеюсь, за ним находится сад бабушки. @@ -877,6 +901,12 @@ ent-CP14WindowStoneBrick = окно в стене из каменного кир ent-CP14WindowWooden = wooden window .desc = A wooden wall with a glass window in it. +ent-CP14ClothingHeadWhiteBeret = белый берет + .desc = Это берет. + +ent-CP14ClothingShirtCottonBlueDark = хлопковая темная рубаха + .desc = { ent-CP14ClothingShirtCottonBlue.desc } + ent-CP14ClothingEyesGoldGlasses = золотые очки .desc = Аристократично, модно, да еще и с позолотой. diff --git a/Resources/Locale/ru-RU/_CP14/job/department.ftl b/Resources/Locale/ru-RU/_CP14/job/department.ftl index b986d3e38e..1c7939bf68 100644 --- a/Resources/Locale/ru-RU/_CP14/job/department.ftl +++ b/Resources/Locale/ru-RU/_CP14/job/department.ftl @@ -1,5 +1,5 @@ -department-CP14Free = Свободные гражданские -department-CP14Free-desc = Лица, не обремененные контрактами и работой на государство, но и не получающие от него бесплатной помощи. Найдите свой способ заработка. +department-CP14Mercenary = Наемники +department-CP14Mercenary-desc = Лица, присоединившиеся к экспедиции с целью подзаработать деньжат. -department-CP14Command = Служители закона -department-CP14Command-desc = Лица, напрямую работающие на представителей власти. Связанные магическим контрактом, они не могут действовать против интересов государства. \ No newline at end of file +department-CP14Command = Организаторы экспедиции +department-CP14Command-desc = Лица, ответственные за выполнение поставленной от великого дома задачи. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/job/job.ftl b/Resources/Locale/ru-RU/_CP14/job/job.ftl index ed42e09684..3bdaf9d784 100644 --- a/Resources/Locale/ru-RU/_CP14/job/job.ftl +++ b/Resources/Locale/ru-RU/_CP14/job/job.ftl @@ -1,3 +1,6 @@ +cp14-job-name-captain = Капитан экспедиции +cp14-job-desc-captain = Вы - самая важная персона в этой экспедиции. Организуйте ее участников и руководите процессами, чтобы выполнить поставленную от руководства задачу. + cp14-job-name-adventurer = Авантюрист cp14-job-desc-adventurer = Охотник за острыми эмоциями, богатствами и славой, постоянно рискующий своей жизнью. Ищите ценности в опасных местах, и продавайте их поселению. diff --git a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl new file mode 100644 index 0000000000..97debab8de --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl @@ -0,0 +1,14 @@ +# Basic + +cp14-loadout-basic-cloak = Накидка +cp14-loadout-basic-eyes = Очки +cp14-loadout-basic-gloves = Перчатки +cp14-loadout-basic-head = Головa +cp14-loadout-basic-mask = Маска +cp14-loadout-basic-pants = Штаны +cp14-loadout-basic-shirt = Рубашка +cp14-loadout-basic-shoes = Обувь + +# Org + +cp14-loadout-captain-cloak = Капитанская накидка \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/loadouts/test.ftl b/Resources/Locale/ru-RU/_CP14/loadouts/test.ftl deleted file mode 100644 index 360953347f..0000000000 --- a/Resources/Locale/ru-RU/_CP14/loadouts/test.ftl +++ /dev/null @@ -1,8 +0,0 @@ -cp14-loadout-test-cloak = Накидка -cp14-loadout-test-eyes = Очки -cp14-loadout-test-gloves = Перчатки -cp14-loadout-test-head = Головной убор -cp14-loadout-test-mask = Маска -cp14-loadout-test-pants = Штаны -cp14-loadout-test-shirt = Рубашка -cp14-loadout-test-shoes = Обувь \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/cloak.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/basic_cloak.yml similarity index 83% rename from Resources/Prototypes/_CP14/Entities/Clothing/Cloak/cloak.yml rename to Resources/Prototypes/_CP14/Entities/Clothing/Cloak/basic_cloak.yml index bdbefd1a58..42c292cf81 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/cloak.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/basic_cloak.yml @@ -84,4 +84,17 @@ - type: Sprite sprite: _CP14/Clothing/Cloak/Simple/dark_blue.rsi - type: Clothing - sprite: _CP14/Clothing/Cloak/Simple/dark_blue.rsi \ No newline at end of file + sprite: _CP14/Clothing/Cloak/Simple/dark_blue.rsi + +- type: entity + parent: + - CP14ClothingCloakBase + - ClothingSlotBase + id: CP14ClothingCloakCaptainJacket + name: captain's jacket + description: the colors white and gold tell you that you're looking at a higher power. + components: + - type: Sprite + sprite: _CP14/Clothing/Cloak/captain_jacket.rsi + - type: Clothing + sprite: _CP14/Clothing/Cloak/captain_jacket.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml index a66c6ce598..6368a1d215 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml @@ -71,11 +71,44 @@ - type: entity parent: CP14ClothingHeadBase - id: CP14ClothingHeadWhiteBeret - name: white beret + id: CP14ClothingHeadYellowBeret + name: yellow beret description: this is beret. components: - type: Sprite - sprite: _CP14/Clothing/Head/Beret/white.rsi + sprite: _CP14/Clothing/Head/Beret/yellow.rsi - type: Clothing - sprite: _CP14/Clothing/Head/Beret/white.rsi \ No newline at end of file + sprite: _CP14/Clothing/Head/Beret/yellow.rsi + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadBlueBeret + name: blue beret + description: this is beret. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Beret/blue.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Beret/blue.rsi + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadBlackBeret + name: black beret + description: this is beret. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Beret/black.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Beret/black.rsi + +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadCaptainCap + name: captain's cap + description: No, look how handsome he is! + components: + - type: Sprite + sprite: _CP14/Clothing/Head/captain_cap.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/captain_cap.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml index 0b8f48dc5e..1e89cc6ae7 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml @@ -24,14 +24,14 @@ - type: entity parent: CP14ClothingShirtBase - id: CP14ClothingShirtCottonBlueDark - name: cotton dark shirt + id: CP14ClothingShirtCottonBlack + name: cotton black shirt description: Pleasant to the touch material, in a comfortable loose shirt shape. components: - type: Sprite - sprite: _CP14/Clothing/Shirt/Cotton/dark_blue.rsi + sprite: _CP14/Clothing/Shirt/Cotton/black.rsi - type: Clothing - sprite: _CP14/Clothing/Shirt/Cotton/dark_blue.rsi + sprite: _CP14/Clothing/Shirt/Cotton/black.rsi - type: entity parent: CP14ClothingShirtBase diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml index 28d59d8835..e838548ff0 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml @@ -83,13 +83,15 @@ - CP14ClothingHeadTriangularHatGolden - CP14ClothingHeadRedBeret - CP14ClothingHeadPurpleBeret - - CP14ClothingHeadWhiteBeret + - CP14ClothingHeadYellowBeret + - CP14ClothingHeadBlueBeret + - CP14ClothingHeadBlackBeret - CP14ClothingPantsTrouserWhite - CP14ClothingPantsTrouserDarkBlue - CP14ClothingPantsAristocratic - CP14ClothingPantsLoincloth - CP14ClothingShirtCottonBlue - - CP14ClothingShirtCottonBlueDark + - CP14ClothingShirtCottonBlack - CP14ClothingShirtCottonPurple - CP14ClothingShirtCottonRed - CP14ClothingShirtCottonWhite diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/rope.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/rope.yml new file mode 100644 index 0000000000..62e8ba7c22 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/rope.yml @@ -0,0 +1,34 @@ +- type: entity + id: CP14Rope + parent: BaseItem + name: rope + description: Multifunctional rope. You can tie something with it. Or someone. + components: + - type: Item + size: Small + storedRotation: 90 + - type: Handcuff + cuffedRSI: _CP14/Objects/Tools/rope.rsi + bodyIconState: body-overlay + startCuffSound: + path: /Audio/Items/Handcuffs/rope_start.ogg + endCuffSound: + path: /Audio/Items/Handcuffs/rope_end.ogg + startUncuffSound: + path: /Audio/Items/Handcuffs/rope_start.ogg + endUncuffSound: + path: /Audio/Items/Handcuffs/rope_breakout.ogg + startBreakoutSound: + path: /Audio/Items/Handcuffs/rope_takeoff.ogg + - type: Sprite + sprite: _CP14/Objects/Tools/rope.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: 90 + resetOnHandSelected: false + animation: WeaponArcDisarm + damage: + types: + Blunt: 0 + - type: UseDelay + delay: 3 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml new file mode 100644 index 0000000000..c07e439b8b --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml @@ -0,0 +1,65 @@ +- type: entity + id: CP14BaseShield + parent: BaseItem + name: shield + description: A wooden shield capable of withstanding multiple blows. + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/Shield/shield.rsi + state: icon + - type: Item + sprite: _CP14/Objects/Weapons/Melee/Shield/shield.rsi + size: Ginormous + - type: Blocking + passiveBlockModifier: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + activeBlockModifier: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 + Heat: 0.8 + flatReductions: + Blunt: 1 + Slash: 1 + Piercing: 1 + Heat: 1 + - type: Clothing + equipDelay: 0.45 + unequipDelay: 0.45 + sprite: _CP14/Objects/Weapons/Melee/Shield/shield.rsi + quickEquip: false + breakOnMove: false + slots: + - back + - type: Damageable + damageContainer: Shield + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 140 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 100 #This is probably enough damage before it breaks + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + SheetSteel: + min: 2 + max: 2 + SheetGlass: + min: 2 + max: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sword.yml new file mode 100644 index 0000000000..0c9dcca964 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sword.yml @@ -0,0 +1,36 @@ +- type: entity + id: CP14BaseSword + parent: + - BaseItem + - CP14BaseWeaponDestructible + - CP14BaseWeaponSharp + - CP14BaseWeaponChemical + - CP14BaseWeaponLight + name: sword + description: the gold standard of edged weapons. Medium length, comfortable grip. No frills. + components: + - type: Item + size: Normal + storedRotation: -45 + - type: Clothing + equipDelay: 0.45 + unequipDelay: 0.45 + sprite: _CP14/Objects/Weapons/Melee/Sword/sword.rsi + quickEquip: false + breakOnMove: false + slots: + - back + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/Sword/sword.rsi + layers: + - state: icon + - type: MeleeWeapon + attackRate: 1.5 + wideAnimationRotation: 210 + wideAnimation: CP14WeaponArcSlash + cPAnimationLength: 0.18 + damage: + types: + Slash: 12 + soundHit: + collection: MetalThud \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/Mercenary/adventurer.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/basic.yml similarity index 88% rename from Resources/Prototypes/_CP14/Loadouts/Jobs/Mercenary/adventurer.yml rename to Resources/Prototypes/_CP14/Loadouts/Jobs/basic.yml index 9b50e50e8f..bc40ef5725 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/Mercenary/adventurer.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/basic.yml @@ -127,13 +127,31 @@ head: CP14ClothingHeadPurpleBeret - type: loadout - id: CP14ClothingHeadWhiteBeret - equipment: CP14ClothingHeadWhiteBeret + id: CP14ClothingHeadYellowBeret + equipment: CP14ClothingHeadYellowBeret - type: startingGear - id: CP14ClothingHeadWhiteBeret + id: CP14ClothingHeadYellowBeret equipment: - head: CP14ClothingHeadWhiteBeret + head: CP14ClothingHeadYellowBeret + +- type: loadout + id: CP14ClothingHeadBlueBeret + equipment: CP14ClothingHeadBlueBeret + +- type: startingGear + id: CP14ClothingHeadBlueBeret + equipment: + head: CP14ClothingHeadBlueBeret + +- type: loadout + id: CP14ClothingHeadBlackBeret + equipment: CP14ClothingHeadBlackBeret + +- type: startingGear + id: CP14ClothingHeadBlackBeret + equipment: + head: CP14ClothingHeadBlackBeret # Mask @@ -200,13 +218,13 @@ - type: loadout - id: CP14ClothingShirtCottonBlueDark - equipment: CP14ClothingShirtCottonBlueDark + id: CP14ClothingShirtCottonBlack + equipment: CP14ClothingShirtCottonBlack - type: startingGear - id: CP14ClothingShirtCottonBlueDark + id: CP14ClothingShirtCottonBlack equipment: - shirt: CP14ClothingShirtCottonBlueDark + shirt: CP14ClothingShirtCottonBlack - type: loadout diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/captain.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/captain.yml new file mode 100644 index 0000000000..73fd36551c --- /dev/null +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/captain.yml @@ -0,0 +1,19 @@ +# Head +- type: loadout + id: CP14ClothingHeadCaptainCap + equipment: CP14ClothingHeadCaptainCap + +- type: startingGear + id: CP14ClothingHeadCaptainCap + equipment: + head: CP14ClothingHeadCaptainCap + +# Cloak +- type: loadout + id: CP14ClothingCloakCaptainJacket + equipment: CP14ClothingCloakCaptainJacket + +- type: startingGear + id: CP14ClothingCloakCaptainJacket + equipment: + cloak: CP14ClothingCloakCaptainJacket \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/loadout_groups.yml b/Resources/Prototypes/_CP14/Loadouts/loadout_groups.yml index 1806304c3f..db70d8b56c 100644 --- a/Resources/Prototypes/_CP14/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_CP14/Loadouts/loadout_groups.yml @@ -1,6 +1,8 @@ +# Basic + - type: loadoutGroup - id: CP14TestCloak - name: cp14-loadout-test-cloak + id: CP14BasicCloak + name: cp14-loadout-basic-cloak minLimit: 0 loadouts: - CP14ClothingCloakSimpleWhite @@ -10,23 +12,29 @@ - CP14ClothingCloakFurcapeBlue - type: loadoutGroup - id: CP14TestEyes - name: cp14-loadout-test-eyes + id: CP14BasicEyes + name: cp14-loadout-basic-eyes minLimit: 0 loadouts: - CP14ClothingEyesMonocle - CP14ClothingEyesGlasses - type: loadoutGroup - id: CP14TestGloves - name: cp14-loadout-test-gloves + id: CP14BasicGloves + name: cp14-loadout-basic-gloves minLimit: 0 loadouts: - CP14Girdles +- type: loadoutGroup + id: CP14BasicMask + name: cp14-loadout-basic-mask + minLimit: 0 + loadouts: + - CP14Sinner - type: loadoutGroup - id: CP14TestHead - name: cp14-loadout-test-head + id: CP14BasicHead + name: cp14-loadout-basic-head minLimit: 0 loadouts: - CP14ClothingHeadMetalHeadband @@ -34,18 +42,13 @@ - CP14ClothingHeadTriangularHatGolden - CP14ClothingHeadRedBeret - CP14ClothingHeadPurpleBeret - - CP14ClothingHeadWhiteBeret + - CP14ClothingHeadYellowBeret + - CP14ClothingHeadBlueBeret + - CP14ClothingHeadBlackBeret - type: loadoutGroup - id: CP14TestMask - name: cp14-loadout-test-mask - minLimit: 0 - loadouts: - - CP14Sinner - -- type: loadoutGroup - id: CP14TestPants - name: cp14-loadout-test-pants + id: CP14BasicPants + name: cp14-loadout-basic-pants loadouts: - CP14ClothingPantsTrouserWhite - CP14ClothingPantsTrouserDarkBlue @@ -53,20 +56,34 @@ - CP14ClothingPantsLoincloth - type: loadoutGroup - id: CP14TestShirt - name: cp14-loadout-test-shirt + id: CP14BasicShirt + name: cp14-loadout-basic-shirt loadouts: - CP14ClothingShirtCottonWhite - CP14ClothingShirtCottonBlue - - CP14ClothingShirtCottonBlueDark + - CP14ClothingShirtCottonBlack - CP14ClothingShirtCottonPurple - CP14ClothingShirtCottonRed - CP14ClothingShirtCottonYellow - type: loadoutGroup - id: CP14TestShoes - name: cp14-loadout-test-shoes + id: CP14BasicShoes + name: cp14-loadout-basic-shoes loadouts: - CP14ShoesBlack - CP14ShoesAristocraticBlack - - CP14ShoesSandals \ No newline at end of file + - CP14ShoesSandals + +# Command + +- type: loadoutGroup + id: CP14CaptainHead + name: cp14-loadout-captain-head + loadouts: + - CP14ClothingHeadCaptainCap + +- type: loadoutGroup + id: CP14CaptainCloak + name: cp14-loadout-captain-cloak + loadouts: + - CP14ClothingCloakCaptainJacket \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml index c2914e4e9c..f54e61305a 100644 --- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml @@ -1,23 +1,35 @@ - type: roleLoadout id: JobCP14Adventurer groups: - - CP14TestHead - - CP14TestEyes - - CP14TestMask - - CP14TestCloak - - CP14TestGloves - - CP14TestShirt - - CP14TestPants - - CP14TestShoes + - CP14BasicHead + - CP14BasicEyes + - CP14BasicMask + - CP14BasicCloak + - CP14BasicGloves + - CP14BasicShirt + - CP14BasicPants + - CP14BasicShoes - type: roleLoadout id: JobCP14Alchemist groups: - - CP14TestHead - - CP14TestEyes - - CP14TestMask - - CP14TestCloak - - CP14TestGloves - - CP14TestShirt - - CP14TestPants - - CP14TestShoes \ No newline at end of file + - CP14BasicHead #TODO + - CP14BasicEyes + - CP14BasicMask + - CP14BasicCloak #TODO + - CP14BasicGloves + - CP14BasicShirt + - CP14BasicPants + - CP14BasicShoes + +- type: roleLoadout + id: JobCP14Captain + groups: + - CP14CaptainHead + - CP14BasicEyes + - CP14BasicMask + - CP14CaptainCloak + - CP14BasicGloves + - CP14BasicShirt + - CP14BasicPants + - CP14BasicShoes \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Command/captain.yml new file mode 100644 index 0000000000..224d679091 --- /dev/null +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Command/captain.yml @@ -0,0 +1,16 @@ +- type: job + id: CP14Captain + name: cp14-job-name-captain + description: cp14-job-desc-captain + playTimeTracker: CP14JobCaptain + startingGear: CP14CaptainGear + icon: "CP14JobIconCaptain" + requireAdminNotify: true + joinNotifyCrew: true + canBeAntag: false + supervisors: cp14-job-supervisors-command + +- type: startingGear + id: CP14CaptainGear + equipment: + belt1: CP14WalletFilledTest \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Fun/misc_startinggear.yml index 690029225d..38c36b53db 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Fun/misc_startinggear.yml @@ -2,7 +2,7 @@ id: CP14DeathMatchGear equipment: cloak: CP14ClothingCloakFurcapeBlue - shirt: CP14ClothingShirtCottonBlueDark + shirt: CP14ClothingShirtCottonBlack pants: CP14ClothingPantsLoincloth shoes: CP14ClothingShoesSandals inhand: diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Free/adventurer.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml similarity index 56% rename from Resources/Prototypes/_CP14/Roles/Jobs/Free/adventurer.yml rename to Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml index d2b2e4b0b0..a944a4417a 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Free/adventurer.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml @@ -11,19 +11,6 @@ skills: - Warcraft -- type: job - id: CP14Alchemist - name: cp14-job-name-alchemist - description: cp14-job-desc-alchemist - playTimeTracker: CP14JobAlchemist - startingGear: CP14AdventurerGear #TODO - icon: "CP14JobIconAlchemist" - supervisors: cp14-job-supervisors-command - special: - - !type:CP14AddSkillSpecial - skills: - - Alchemy - - type: startingGear id: CP14AdventurerGear equipment: diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/alchemist.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/alchemist.yml new file mode 100644 index 0000000000..730f4725c5 --- /dev/null +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/alchemist.yml @@ -0,0 +1,17 @@ +- type: job + id: CP14Alchemist + name: cp14-job-name-alchemist + description: cp14-job-desc-alchemist + playTimeTracker: CP14JobAlchemist + startingGear: CP14AlchemistGear + icon: "CP14JobIconAlchemist" + supervisors: cp14-job-supervisors-command + special: + - !type:CP14AddSkillSpecial + skills: + - Alchemy + +- type: startingGear + id: CP14AlchemistGear + equipment: + belt1: CP14WalletFilledTest \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml b/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml index 28aa2a5fe4..c2de998e89 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml @@ -1,5 +1,5 @@ - type: department - id: CP14Free + id: CP14Mercenary description: department-CP14Free-desc color: "#429976" roles: @@ -10,3 +10,5 @@ id: CP14Command description: department-CP14Command-desc color: "#fadb3e" + roles: + - CP14Captain diff --git a/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml b/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml index f2138b65ec..86877f6f23 100644 --- a/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml +++ b/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml @@ -4,4 +4,7 @@ id: CP14JobAdventurer - type: playTimeTracker - id: CP14JobAlchemist \ No newline at end of file + id: CP14JobAlchemist + +- type: playTimeTracker + id: CP14JobCaptain \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/StatusEffects/job.yml b/Resources/Prototypes/_CP14/StatusEffects/job.yml index 481b8201bb..e9e8153a53 100644 --- a/Resources/Prototypes/_CP14/StatusEffects/job.yml +++ b/Resources/Prototypes/_CP14/StatusEffects/job.yml @@ -17,4 +17,11 @@ id: CP14JobIconAlchemist icon: sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi - state: Alchemist \ No newline at end of file + state: Alchemist + +- type: statusIcon + parent: CP14JobIcon + id: CP14JobIconCaptain + icon: + sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi + state: Captain \ No newline at end of file diff --git a/Resources/Textures/_CP14/Clothing/Cloak/captain_jacket.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/captain_jacket.rsi/equipped-CLOAK.png new file mode 100644 index 0000000000000000000000000000000000000000..1aeb3ec16e82d4c539b35d617afae7541d1c68a3 GIT binary patch literal 1103 zcmV-V1hD&wP)Px(2}wjjRCt{2nm=e$K^(`w6&)-c#32|c1w$yUJZvhZq_YZ%L)B43OD8LWgF=cr zC^*!Tf)NDKEi_cSHFeN{twR?d5@Hfc66DcB2()A<9VAPJbBMoieI~ED_a~ux9|%oy z_wIZ5>-~N&y!!$Yi9{liNd8xPj_QyIDa=383pHEC=j~H?_w7f^Yi1`#S#Tn);H`x;>5YR??(=}7a3>t-f9p!q2JaH_`H1z0C4m52L#53T3(Y(71`?jTL6Hd zr)Jv@ApP_A7V&86O3N`9;_GbZP1sg_EX3EDR@rBXkixXeJ~Qge_gjds8}>D$pG*~5 zGFAL*?1lJxqfJ!*gi&K6q_BKC2dz|r65T{!EP!OH*mU4zs>u3c0VvT;Xr&7B=^PRv z#ZnOT`o6Ez_1ADew8}oCmv6Yg(I%>Y(x}lt(hEOU5G!1ScfbVzjlX)l11_l9Dii>j zLKzYF3gGSqmQAd@i9P^$XOaK_Un~Fs_%)M6Un~IMpZ5Tul`2B|h5>lCT0_uN!_I0L z&(l+Q`nWD=G~u}yF`QQ8P(3wJ?wWu#7^{F24HGy)T&wCMl!yNzsAGdxAS5h z*J-GK+9>Zu^$m-l9<5YC%smhNF4&8VvzU7xTB#y3oF$a#X1(S_H!Y1L6aYfaRxOE| z<-(Q8ToV$L%Q$PY!&(4oUpiAC^^~-t>Vto!J)Q0O9xQ1Rm|)@!R*AS zE!Dr7K2YCE3EI> zWSxQnO@W|=1LlH%>;gdWKXjbjbrOk0B9TZW5{X12kx2e?5+Q}{MaG%cLr*6#JGZtU zit=U!|46T64?oQ?J284_ZX!VtdX&VQ6~b#9006J+Y*!yg(Rt+J^~(UnjS)iU0>!{9 zgx59@^wb*Pwekye0$w}lsUf_!fnwm5&=^7~z?&6_R(^p_z-yZ|X0#muI{l#o2s)TB za*a3%Ia2t!kTF7ka%Du@XM=jP#8UKO59MDsb^)&$7#r%De(;jnYK&-x-guBq6`7G~ z!b!-G!S6mZ#tfm;Vf_I_rcmx`4WKy?T{$4>_71Q*jwyo#Pb=4mli2APx%F-b&0R9J=Wls{||VHn1L7(3XIhB8nghJg^H4Ytt1l+|cFIvCxwq=u=uIA}tn z9ctoG4TCgs!R@<7*rpg_G`<@Cx2 z6Ts8Ww+cWZlV^Hv27m`kmrVfQq8AlaKTL?BDzJSt2EdKyugDfF6f*f9-SpfH-t%Wj z-Ms}sz$Fh=ffIUyLt%r+)*bEmH_6@x9 zMC6pTiR6+|duI^3O>)h1Rsnc@@Yz(VA1h{2;O4svT^ftkLEO8`_s|Y*o7L2LM$dm> z1%@^GlQX(g&`GIWN3^e#yz~i+)uFA&y}O9^bxP&>D0ZUv&nL4sBfjX@Icbr-Z7jNVzu4iDuW{a-xZpYZI!j688Ia zAD>P}>Tq?uELZMmYpq&?iK$7NZ{on{Q#102socKzO#9MA?EY{27#J8B`~XBk*4To2 R5GMct002ovPDHLkV1kO~CT{=$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Cotton/dark_blue.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/captain_jacket.rsi/meta.json similarity index 89% rename from Resources/Textures/_CP14/Clothing/Shirt/Cotton/dark_blue.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Cloak/captain_jacket.rsi/meta.json index 8163f4aba3..e19dbe65a9 100644 --- a/Resources/Textures/_CP14/Clothing/Shirt/Cotton/dark_blue.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Cloak/captain_jacket.rsi/meta.json @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "equipped-SHIRT", + "name": "equipped-CLOAK", "directions": 4 } ] diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/black.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Beret/black.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..c1d5dc2cf63236277fead427e6225eb3dcf69b72 GIT binary patch literal 463 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zJ3U<-Ln`LH zy|vN*kb?-@2maCrs|1H-ho$z}BZo}K7fWxH~nxxvXdFK=u6&1LR! z+y1ELBLA*?2N)b8HRsF;O?p19yYijuhS~mU_Pz293{zk2wD|8K6t~*^P%m55`dal5 zwVvP30oA!OZ5v-z&ZQ zZ0^t|@b^6kquVy}(6?9y~ny=wK`gl*|NDar68Pd?%Q)BT$cb&ddwv6Bh{4m<&t;ucLK6UM?$AX5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/black.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Beret/black.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4e5a732a211cda0ff5d3d32812bbaf7e06097b13 GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}vpiiKLn2z= zURub-#KYH@;W9x&3lt`Y99sh_%}V7ZmX|Jj~!Z@VStE0q;SR zqy*jdbAC@*c9bFaa)eSYbJ4@hLXP$C*p@8a`RMl78*h1arp;dedjFj7uI)NXN}tT{ YwZ1irUZMA@0O(2vPgg&ebxsLQ0QO>EQUCw| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Beret/black.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Head/Beret/black.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/blue.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Beret/blue.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..dcacb0faedded243432d1bb1c7426d0b9810104c GIT binary patch literal 509 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zw|lxchE&XX zduyZLp#TxK2mh5gIeA)^HcL-7WRaL7D-$78!z5&Ow}M&y-htkWN7M@p4ExquX&AP2 z_RiQngU>{fv7dR1mJ96ZzcU_s^$0I+iVs8wLNOLHbaAx+@mMc^i$MV<~POv$@=#Et}a8u`wtOw z=U;8{-YFuI)pqYzeowaP%}z<{NUL*m=CMA{db=*eEb%ojN7M0p$DEcgZhTghb!@AE zh2U$a4zNApA zciEbGr{BptbbVGoyhCjN-ed8B`K3$ly;_sYCx`@eS44XptZ`_GJ;Tnh(5&{vn*TF0 z+!Q|6FbKRl@$2m?Ssu@vS%M4<#(x67vl+j7P{jG@iGm;BF~6p1l`*&fs7qcyw^{7w z!~QAW6BaT1_6OXToXdUOPA)eWxPXSv$I(y$;SVef}6AW^TynjJTD r&RSjh%=qwe{mpiDB?MSx|B74X$*~FA*?xV%_+;>O^>bP0l+XkKp|jyA literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/blue.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Beret/blue.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..68bc978622da4fc3bab2f296ca0f63d06bbbfa23 GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}^E_P~Ln2y} z6C_v{Cy4Yk1sZUjVEDw9^}n>V_kZwV9k(Krm#?J$rx24%oX{O RO&{n|22WQ%mvv4FO#l{^Sf&5~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/blue.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Beret/blue.rsi/meta.json new file mode 100644 index 0000000000..e6f822d30d --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Beret/blue.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "CrystallPunk14, by Prazat", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/equipped-HELMET.png deleted file mode 100644 index 2d84c241fa7399f8d23e730d3a8ff088058389b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 473 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zCwsa$hE&XX zduwmjp#%}O2jMSlZ!{^qdXw_!==FtvP246wV_7t1-}z}jii`Z5rhR^<5VH2#m#1eVNH5 z-aByZ;Vu31>t~#`Gnnsx^sB4=3*H=FhN(rIOCR05mcDNLnHr8|KMUUaE$3%g5j&^* z^?Z*mbLp?8i_aap`?K%;&q=pd?z~s@ddJ;;@$+Bv=IBZ~Jz|`3=-i>+oRY1-ru>;3 zai`&I@W%JYj(FNI1mF4o=Y(7P;pIN}86$ZjN)CEO?z&xj=8voR@~gWpJuLqDN0aL) zQ^R}dk~i5lTuXJEznDEEEfGPYO;(TU&GHUVy;frssNH&?*F>S}AuN471KCb!9xc_R$X+0Ou zKPxm+GdDMx9qLV=%Wv>)?TKcU>x$>tS^ED!m7CXr1pcki|E+Ua@#WN)@xZuZ@O1Ta JS?83{1OPK@-%tPm diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Beret/white.rsi/icon.png deleted file mode 100644 index 1fafb5dd481e865355782a04b21ea0aaf52993d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}b39!fLn2z= zUNYo576DlOtXU5%zd!wEH|6Zv+U_} zXFh7|=s3Y~vq*H0{$c%1X~}k#@oitrCf8WMDPQLEx#9CuDTb~)j1M-kGUR?|dGIg8 zSNYksPfF$UFYS<6@V?4>Nv?yIjhlJn5a diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/yellow.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Beret/yellow.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..9b066ed291629773dd1fc9b5e174c76cf50063f9 GIT binary patch literal 483 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z=X$z0hE&XX zduy-Xp#%}O2h)$RyjZ|#(J{GqvBAw&M*V|Vk6M4=>)Bj>!P>y^PIL3cMpyL&lTt07 zEuDOSeC9LPE&cy+f=E)${IyS?f0<(zdoH>uV0G!bdGC27(v*wpUiAd*uhRAW?|WPmhzwUl8=lWZXlLFV|8uV;R-DdXc?dy^~uqm(T z14GktrMJhPL{>BG`jKRGI_JtBS+QSyC*(G)d1-Kwb@#TVefjse>MuSme0M(NPt4B+ zU7r#~4}5Za`%9|)&{o~2x5APvT#&#Q?>$bJem0ogKEckg+O+n@_xAmPZV8WT7&hEG z@#^XqGbf=)Nk)bb)yyCB0;ceHi1V5A<*3U~*sipG>ujLtMWOILa{S%qaV2&NQOcGr zd)_!r+bS=5ecO~cM|N@H>^(1P8m4Vi;-4JTZXqvV_iuW2g%T3@wYZMq?1GbDZg!vI Q1;!eKr>mdKI;Vst0L`u2Pyhe` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/yellow.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Beret/yellow.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..784d442f27f6738fa8c79cad5dc21b26ff856258 GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}D?MEtLn2y} z6C_v{Cy4Yk1sZUjVEDw9^}n>V_kZwV9kC*lj~_o7$-EOtO-T4~prEDUJD*$786{6c zW@hHY?P~?RZ@T`J009e?7D*6Yx2NLt0U-GB`K$UQ8OI=wnj5b^&X1kKpQpL&C=U?a zm)oOw)Z>y&!`Xt8?)thve%9;@qPxx}9bL70i!bx}WwREj*sOeGtTNk>%k7{B*j+qY a3=EpmraRBaeC_}`n!(f6&t;ucLK6VUZ&%s? literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Head/Beret/yellow.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Beret/yellow.rsi/meta.json new file mode 100644 index 0000000000..e6f822d30d --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/Beret/yellow.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "CrystallPunk14, by Prazat", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Head/captain_cap.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/captain_cap.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..1995eec88c2c1ab71eb56fbd68d8252de5fd3096 GIT binary patch literal 536 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zFL}B+hE&XX zduzWpQ=$yphvh3e>KrBuxHPwf$gC8c=BfDnKaaAuJX>a9{PwVKn&{z~i()=cyWKL)x;4B$n6oTGnuBVAbJZF!R3zuA;*es}Fp7bNf{|Bsn`z-hhzCubP0l+XkKS<>)T literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Head/captain_cap.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/captain_cap.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..16813bf499615ac08468b83d491d54db233b5014 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<%$_ceArY;~ z2@h#f1Op<|C5IO6C+x!&)xa4UP=8} z!O{zT2c70~JO4X!G@r-nZ@a`ho2sJ^5*Imc*~udM>*b2S;ss|DE*M=(Hn=b)vB9!w zaRG14+5Ue5JD!TKvrpVn_D<+<`(0xRv)G-k7iz?uxKt{4O4`JqO^ztnkU4TGnvpUXO@geCw>0FW*K literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Head/captain_cap.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/captain_cap.rsi/meta.json new file mode 100644 index 0000000000..e6e59a1821 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/captain_cap.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "CrystallPunk14, by Jaraten", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Cotton/black.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Cotton/black.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000000000000000000000000000000000..347073e063f07d1e750639a7f74dad33963bb502 GIT binary patch literal 876 zcmV-y1C#uTP)Px&CP_p=RCt{2nmvo#KoEvsg%pzPLSpZVI}9%5!i5`mDGX`S-(Sd2%U`%YO~6Gu z6L4Y3sW2Q#aS>8sYt?OvyIEE`+15%Y5y(7^7wyM8JNqHw8GvCJhG7`yKgDUma?mIi7P9FdcS&BkRxSoe`5CT9e{dbodWJ!WTN&wJ<2SSwE1VZ4DrMkY5 z5?PX58oCix{X>=l0LDRBntWUR_vb2UWl4Yx83!Teijtq83W0M+Fv z)ajc}pyxyz{j&~`@(4QDY4QZ%`MiyT5R+(zKnO)EV4llRN~FmX=+f%K&+QL{;#%v6 z;<~iWiQ+|*^ou+%-4mxcdj$6J#@TJxPLb#OW_5jEd)?e-uJ7wU)V}LQxZAEBb3C(- zc4M_n?Wyl2jf-~x8B%?A$WrZLa~qy&--YUUrzYPfe>(gAFl70 z4C)(N2-o)!2%&QYjIelP8arSbE!8BN=~y5IL`irkC(z_+Apn$YnnW|${7r8a7Y2BV4>sNbW=N_o z6jjX;=#x6FeY|l_*>(==OYl{u#>*}k8d`mmHZj81`2j%r)iPx$b4f%&R9J=WlCh40KoEw1E?2Njm+aS&WheW8GrNGrVzK-e=E1TJqqyy=38T232g}ZyOWyhvg;Cu4 zY77AQ*nD0M;QziF7^NTpB~x!G@sP-xvJzgr-T;&v7+Fq%xw!DW$SD1Fm)7{%>S`eq*hMw2OK z!J^kyymxI9RrpT7;Cdc%eEpUgETsx>Na?>#jb=5y5!0<@qod-;B*Sy jF;VqU_ZExA@+bHK@sYA_e^8d100000NkvXXu0mjfNTI;f literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Cotton/black.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Cotton/black.rsi/meta.json new file mode 100644 index 0000000000..24e83f9ea6 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Shirt/Cotton/black.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "CrystallPunk14, by Jaraten and TheShuEd", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SHIRT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Cotton/dark_blue.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Cotton/dark_blue.rsi/equipped-SHIRT.png deleted file mode 100644 index 40f4f7bfeb82eb901107e60c372b6e8889690b12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 888 zcmV-;1Bd*HP)Px&GD$>1RCt{2n$1qzKoo^fstN%yQ1ep(i>L@TL}Ed+ii*0cM3&w55&B?#g;eSS zsiMj%MFJ_^qyl*n5IAw1I6q?JF04Bmj1$j{6E?ly2IEZT+&ObSmU1t^Fbu;m4D+9o zQyo|;SHj0}A6FOW6TfqGd=f4!uApA4D$lEnK#Sig6afIu#;<2%4vHTD0Jly<%Y@WH^5Ov` zE>LBRDe=V^wQxKMa>vH=f-e_1Z@IMghm4NnrMA&oB(bFbu;m48t%C!!QiP%mM9Ra^-^KJQ^WP z$P$y*;AxEtFKvdrXw&8hAf+~#gj|P{g-hj1_);cJYMNNK-iT_EDq5v608gs1lmR=1 zqH;YxD@j>M#aWY*ys`muvjPA#FV8^D6M$YCX=oWhDMqE}VbD$N*qAr6rW}hLqbkaWV7*q&`S&-XGE2qK)6ZYS zq#l8JB5VEp@l7;QP*;dfm00U7FlpkKT)eC)r@Lu&TKhGa6bKMCF+Gm^S*J_Ia~&)! zt{`vOGcjKKH5g|Qc<@{YX>GK#;_Bi&_c-pua~KEp5!!!QiPFoJ)LeE`DUd>y6$ O0000Px$ZAnByR9J=Wlg(1lF)?bjyXhj#U<~HRZd#acdFSSyGbeWd4u`|}FEm>nqUi>S>d|zAG+Uj>o_$V| ziWiDCsEsxbnb35DsEsxX#TwF>h&4dPrCb>RP*Lh3fo7{iDoPyyAmz%bOe9KxijU1f zNMP6C*c=4U+UaG2i ze0nCOs>*8HPWbR`@?9=fPZsp>QH|akqPXx zUCwcKeg(jP5trgMHtPkx)-F3wOJb*#`@07s-72BFHyyEGmWEUb0RCQR*?j1E9V5=+ da5$Vl!4Isulla}o)}#Oc002ovPDHLkV1n{oy&eDn diff --git a/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/Alchemist.png b/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/Alchemist.png index 57edab2487e2859f8647f76bd2e1641d07aaf16b..fd3d67a35e0abd6e5b3e47393564934eb00a68ce 100644 GIT binary patch delta 161 zcmV;S0ABy`0m=c8F@JHwHmhp|gQw;HZf@c*Aq3Z*u1WRaTN P00000NkvXXu0mjfr8Y+6 delta 200 zcmV;(05|{20r3HlF@LK`L_t&-m5q=g4ue1tMc{*X6Xm)G&C~)x{MHIN3R0GAKk3r`s06a$-w+-~IUf%{P zs+Okf0cg6OqG}Da$Cg;rL|)dc1$kM2+SwBE&!65I_Bq*WO&2}@0000Px#u1Q2eR2Y?wkg*DaU=)Qv!@A?9omvb!u5$UyV`IS-uj^kLii1g>nmAb4JP?W@oNWap$odLPu zjJ_@_v~IDd;d;BlO?R9M!}IoB9B_sXqcUDEAw>!mvNS=n6ACYfqan uAAh)cfcI@uDj-VY#j;_YQUTUKe|iIYr9y+-HW@nr0000Px%cS%G+RCt{2nlXzSQ4q&}2LVYVCU8U+4z5fk1)aTW{+PcQ@Bg1br$mmB?C! zO^Ew^o!9NOoD?Lj2wN{o06O!)qT2CFi2Yz$ts*Xv0*C`(whfb<7mqEROfwbW#kPy@ z&MS+D0ffV7v9NG5B^*Ye-mBNDiy(B+dC}I_3yeQMD3=o73(6&WDH>Z7@Z({OI6zk$ z;9~wdipHE)D;ph9gtcU|bimnMS98JYneh1ZoT`!80pTzrh#hniqzKk))inziK^FjK zHXo=sk`k_6lf?nvXTYZY@4NSWNQz_AIp7;drXcg4#)l@)w~yCinpc+&KzpO^7QC^Xg3=USnF8lZP;w>4JL_; za9mLL^YBD4VnHGsRLW{KQGCM%5r+MFa3&7X@Phgga zUCae+LKZI?qCbkpYw=}uLFNR+_uODU93g?oe84`>fcswmq}^;dnGul0!|HH`51A97 zr$j_hTGSHAz7N2qM#C|TRve&b1$^*!04xU;!~us`xJKzMY_EqieDDff@3TWMI*ntF j%`gnZFbu;mjN{`Em2jYei0~;)00000NkvXXu0mjfIQ2Z# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Tools/rope.rsi/body-overlay-4.png b/Resources/Textures/_CP14/Objects/Tools/rope.rsi/body-overlay-4.png new file mode 100644 index 0000000000000000000000000000000000000000..57c7a232f96d5bd12882357b5b182fe2c563960c GIT binary patch literal 701 zcmV;u0z&Px%cS%G+RCt{2nlXzSQ4q&}2LVYVCU8U+4z5fk1)aTW{+PcQ@Bg1br$mmB?C! zO^Ew^o!9NOoD?Lj2wN{o06O!)qT2CFi2Yz$ts*Xv0*C`(whfb<7mqEROfwbW#kPy@ z&MS+D0ffV7v9NG5B^*Ye-mBNDiy(B+dC}I_3yeQMD3=o73(6&WDH>Z7@Z({OI6zk$ z;9~wdipHE)D;ph9gtcU|bimnMS98JYneh1ZoT`!80pTzrh#hniqzKk))inziK^FjK zHXo=sk`k_6lf?nvXTYZY@4NSWNQz_AIp7;drXcg4#)l@)w~yCinpc+&KzpO^7QC^Xg3=USnF8lZP;w>4JL_; za9mLL^YBD4VnHGsRLW{KQGCM%5r+MFa3&7X@Phgga zUCae+LKZI?qCbkpYw=}uLFNR+_uODU93g?oe84`>fcswmq}^;dnGul0!|HH`51A97 zr$j_hTGSHAz7N2qM#C|TRve&b1$^*!04xU;!~us`xJKzMY_EqieDDff@3TWMI*ntF j%`gnZFbu;mjN{`Em2jYei0~;)00000NkvXXu0mjfIQ2Z# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Tools/rope.rsi/icon.png b/Resources/Textures/_CP14/Objects/Tools/rope.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bdea36a5277f5882f81690da932b63a7bc823688 GIT binary patch literal 513 zcmV+c0{;DpP)Px$yGcYrR9J=Wm9c8VP#A@er4U@i2x15X;+Dywi(LdkxKnh?6LifJ^Z|T=uI>dl z+er`v7hM#bxMa-wx!M%saYNCm|Tj8cbDBJaX zYQgq=ELJXuM-8QFz%&S5Z+G}yeE|S$&&PVZLw_{M*`9w+KGmW|gPx%S4l)cRCt{2+A)jbKoke?zsG@W6Oskl5D3K1YQZ#XV8p?rFLz{|4_(?uXJK$a$Qob-?v z0;&l2Qg1#l1jb3vXc5Q@u-%_7$D6Xo>+G#{?;5YOx7Mbt|G6eL@&e4}i`GsYE`RH` zfI8lZ17`EZ-9@|=c>&VVQ09d|;It7By4o!e54s4PHu6Gf74cTzsTWlJ+wonjmTRrs zce_7fwOk_}bPMR)Z}I zbSaVjC~7m&r9@T$n~5$ZvI5vlbU$nI11f0?sAJQK?zN`F7^E#=E74UbhB3$raGmJt zUX0E;72RPBvI5NJiyRG zN3Rpz*l?n&yti2*gR(|-JZn99NLwI`JdBf`wM3U<7=!E%Q2&kXueH@U`+67yfV}tI zr1JqbcK**gzWY8zr8$g2J|JNe)iB1F_Z7c}|2O^swhBIL5*c_c00000NkvXXu0mjf DiSIWh literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Tools/rope.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Tools/rope.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a2a956e5d1af739ad0724e7391681b2fbbc7b258 GIT binary patch literal 667 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>U<&ngaSW-L z^Y)hg>P-bA>>t+i^Luos2y`l3xmL1p+U-js7NzbB_imkjx#~OjzUBohUB#L2J2(l% zHAQcUnYG9H#^nz`cFP3@Tg=zoXn(x<`SMD>0}{zShR49fzl~~-GZJTB-2C`NR^rTw zrjp!`|4-g>cvjD1ztxS`#d%A84jnRD3}nm=V_u}9qNZS1ah>1L^!HXTkod}*?XTNA zCQnc?Wc039ecODw_V?%4*7r5Izev2cvq;QbzhudGE^mdpTAuS8uFpQAzf!7t@5H`` zKljbu$9 zySEnz&Nn;pNoUMMcJh*_7BeKu*4PC#__qk^4>ipy?_ zIX;+nbm6rlzmIP#o9@VPvBvCxq0Qq7rHuZ?`mw2{|Md?e0>Kb?Bv=Wn_)KB~7b!qDM-;UD_EgWBd z3z{hWq32*{^x4@H<>nOZh$;Si)<-qq8%*Eh2QK%ft4!Pi)LX>#=Br!R?seCEqHhsRyFmH47#n6qs=l0iYuos@*eL3q%)it0s x78Zs&l?97BwD~L<9ctOti-Nx&17K=n@O1TaS?83{1OQO&Icfj^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Tools/rope.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tools/rope.rsi/meta.json new file mode 100644 index 0000000000..c04b08fbf7 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Tools/rope.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "Created by TheShuEd (github) for CrystallPunk14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "body-overlay-2", + "directions": 4 + }, + { + "name": "body-overlay-4", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/inhand-left.png index 5ebd956fd43b93cf086115559645612332e0028f..c4b8e03a82fb504ddf1b8a2ccc76d00b200129d5 100644 GIT binary patch delta 762 zcmV9yF@M=fL_t(|obBDQYZFl%2k>8{i{M~za0o(fNgPAF#Dj{HU3!ay zTe~^!krrw|l-o2?XrXj)khW0l_#A4*2HGQc@4fH4d*9C= z@a`S&z02M2{oXGkL_|bHlu;Z{RIfi&=zf^c>km~NPqg3LoPW;7K5ma?YkRD-NoVBd zzQUlcx=~oDRnUz>6$W)9_jJQVqidTxB@^wUd^`A!?t;He&VCU?E1*a?`++*G$mr}B z;R?9c{6ZkhOEq*i{Is#YqDF(Z@wYjyfGbq0WjWkGLU+SYomOOJ_KRr#5-y7G;{$XT z{AK#Re;R)Srho9gAISFX7vT!HgtH$AG5bXTD`2(Ja57Yln*G)XVE5$A_9YW_qfqUh zoXO7K#CjOr`T!tqGKqK3{vz(0r3HHn@^03-CJgGT(~6+0z(%}332X%{FV$pzAwXST zL>TXv(V(q1)>j}i&{n)Z3G_?&aQ{du)iUJTjQ9UF8h^B{{}$Mc_a}kx2YmgqXFdMT zc>k0zs9Vb^?e&N7H=qAG6AiVMdzqUYPa+~BA|fIpA|fIpB63KP%hZ^rWlOTiWonX` zsv|TrUlVShJbjUA^=nN_@iF1{){jr}{__WPH_rLC3c69KvYzF@H(NBiEV4th~9%XU#h4;JKlB_3vy$9A|2WD|%u3K@WBuilnKBp1I0m1~^A&&w? zzytPni(+d#;+{s>dhMD#Iocp-H}z4@>Q6?6@oX+k zMuD*f=ubvoo%!o<>RsSdw#!A@5#ZF*5Sn^53HIqXl`qhWfUWIF?ClnH=invwe8I`l zzU;MYK|cK{6Zrz=2w2-#71vj{I%9i}EniTtCc!`bDSzF3fl_50&d2|=o-b&&I>G+) zc}N_Ulxs?teh1{TcG3WRF8}}l0000000000`D3d2h_z-Nd4mKDBa`Kr%4I1Wy>(n+ zvK&)+0dm`0CqpBN<#;wXRt>KF4*2@HE?zxbF);_PI8}^%P%c|-Zp4kE7+I@0H-uX; z_Z=R03x7@(BgaumhH^KIidF=qFCrU#b@EF4hRkMV9es5)XfMFa7tc-119aGEY?N0< zuBoE2kvb!Xaldcw#E)+mCO!&Og|;bk4lZq|LAx3N007{}(R>8|g6_#x^AX=RWn9fi zNFu<;O&M475wf2kr;^th(uC6cPhYI}y(3wGGg)8|gj(nX+u8<>|R|u?0000003PQb1v)M#m`{#P00000NkvXXu0mjfwryK~ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/inhand-right.png index c4b8e03a82fb504ddf1b8a2ccc76d00b200129d5..5ebd956fd43b93cf086115559645612332e0028f 100644 GIT binary patch delta 765 zcmV~^A&&w? zzytPni(+d#;+{s>dhMD#Iocp-H}z4@>Q6?6@oX+k zMuD*f=ubvoo%!o<>RsSdw#!A@5#ZF*5Sn^53HIqXl`qhWfUWIF?ClnH=invwe8I`l zzU;MYK|cK{6Zrz=2w2-#71vj{I%9i}EniTtCc!`bDSzF3fl_50&d2|=o-b&&I>G+) zc}N_Ulxs?teh1{TcG3WRF8}}l0000000000`D3d2h_z-Nd4mKDBa`Kr%4I1Wy>(n+ zvK&)+0dm`0CqpBN<#;wXRt>KF4*2@HE?zxbF);_PI8}^%P%c|-Zp4kE7+I@0H-uX; z_Z=R03x7@(BgaumhH^KIidF=qFCrU#b@EF4hRkMV9es5)XfMFa7tc-119aGEY?N0< zuBoE2kvb!Xaldcw#E)+mCO!&Og|;bk4lZq|LAx3N007{}(R>8|g6_#x^AX=RWn9fi zNFu<;O&M475wf2kr;^th(uC6cPhYI}y(3wGGg)8|gj(nX+u8<>|R|u?0000003PQb1v)M#m`{#P00000NkvXXu0mjfwryK~ delta 762 zcmV9yF@M=fL_t(|obBDQYZFl%2k>8{i{M~za0o(fNgPAF#Dj{HU3!ay zTe~^!krrw|l-o2?XrXj)khW0l_#A4*2HGQc@4fH4d*9C= z@a`S&z02M2{oXGkL_|bHlu;Z{RIfi&=zf^c>km~NPqg3LoPW;7K5ma?YkRD-NoVBd zzQUlcx=~oDRnUz>6$W)9_jJQVqidTxB@^wUd^`A!?t;He&VCU?E1*a?`++*G$mr}B z;R?9c{6ZkhOEq*i{Is#YqDF(Z@wYjyfGbq0WjWkGLU+SYomOOJ_KRr#5-y7G;{$XT z{AK#Re;R)Srho9gAISFX7vT!HgtH$AG5bXTD`2(Ja57Yln*G)XVE5$A_9YW_qfqUh zoXO7K#CjOr`T!tqGKqK3{vz(0r3HHn@^03-CJgGT(~6+0z(%}332X%{FV$pzAwXST zL>TXv(V(q1)>j}i&{n)Z3G_?&aQ{du)iUJTjQ9UF8h^B{{}$Mc_a}kx2YmgqXFdMT zc>k0zs9Vb^?e&N7H=qAG6AiVMdzqUYPa+~BA|fIpA|fIpB63KP%hZ^rWlOTiWonX` zsv|TrUlVShJbjUA^=nN_@iF1{){jr}{__WPH_rLC3c69KvYzF@H(NBiEV4th~9%XU#h4;JKlB_3vy$9A|2WD|%u3K@WBuilnKBp1I0m1xDR31}e_$pIkt*lD$?S1qAo711;b0D#Tuit&7<6%uPS>~`t=c;Rw? zV!7WYx;%D37IGlsAD9kYGT-mi<&gvIS_PeUC3QK&Fw9Tz0qtsHh~rhj(f|Me07*qo IM6N<$f@gzxDgXcg delta 303 zcmV+~0nq-c0@ebMFn<9MNkl z7jTwy(0!sT2PB6uyc$z**2krPilNg306e~Z;C8ic9Ypxx&2&odp9fU?FJ#Y8+Wrrr zMyBL|zzi&|BPep~+K5~z!06n=Wb7G{TP&8N;0Fx=dbh^{%5eYy002ovPDHLkV1gwg Bi*En` diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/equipped-BACKPACK.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..9b65325e4507ad01b0cf06dbca1384db87e586cd GIT binary patch literal 388 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z?L1u^Ln`LH zy=tF*$U)}V$Kyfb;*R0&FI8$8?{d{L?qhED-s}-uE1Xog@xsDN_NHuw=s1THDaKrL zwNhRNw3i614`cQG)t|k8zNTeg!Fm1tyC(y!_+US^uA0&HNa2*XeOsfRw{DtKS7&Lj z-M2XBMM>!DX{w&5OHz+@i#&XiJ^lOMM;52jn6K}-uKjw?)~v|Qjnx~B`!+6Pm~H?6 z&!>5XzauBL`I(msuDQunC$K6^cXga*=1i}1Z|BZBYpi-QhTr`9GKo5YXTR2&$`+JX zetdYB-%0i49hQ4J?RP7WM+7t2bDV8d_v~J&?%B2H_uk6Nh*I9ZW0P|Xzi#mfPqVhM z+dE5o;l+0=?iUxQZd%5yvhsehcW;^drC+~p+p%=FOxJnc(0j3BQ~4!vPJW=rkimoZ ZRm@ZQGd#8@?Aiqq_jL7hS?83{1OT=6qmuvt literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..670e6debd2fda4ba3eb980cfaa04569979a46832 GIT binary patch literal 551 zcmV+?0@(eDP)Px$;Ymb6R9J=Wl|O6SKp4h<3N8^^3eK8rLR0BbJawsyyB5+dn}sM1cq!;hbjuhb z5sbBUvp;~r7>uXj!DwPx%@<~KNRCt{2nm zSVVDAkdSoiRH17iTPCODO-VLIr&L`|O_RP3$2-qdA@_VQHSqhu!EtcE_j|wheed_+ z_X7xmAP9mW2!eP@Fy?Z`T&{bZXF80A9UmXJ4VnKpXBX5u)h`%x`R2Pf{L|alJfF!# zUPZ=So=r{gd3%y~e^=|N&yY%EjJbR(mq)@fV8u-UKyhukXXnMrkB*qIVv&U-h0*}r zN5V291>qsSeE6tE1-R$t)Vbfj&G)!*LTqf`MeUpxl@9G|z5p37sSSU}U` zNLbOF_genE*H@h2$HLK(QLa=Kdh4Ss0Ac5>xQUtRDI}9=jDoB@&KUR==Sa&KRGM~YOoiVq?`|@ zKwXmuGz0+XpYsGk5ClOG1VIo4K@bG-pXpak|4EZgO$<~JlvjsGM@($aE@-RghY^Z< z%vf4FMEZfKMh_1U!HSz;%;hrOD9RPkkH!YZTrO&kR@_9wGO(4)OQ}wI07N-U7h>{J zOYRS$y+cGd;YJJ@6=(~9j#9QDVHs$892>;~(sOwnpSJUa0~ut~ydq$WUBcMx#+fxl+Be4Wf3DC{;jq)d8Tl zAX=_eQ9o-TH5NlS4azEDAS<_wx%}s62lca7uPx&07*naRCt{2+P_O1VHgMS?=`K_TPn>|=om9e5DbM%7pX(WIw>7AJp_+JG=%&K z9Yquug%VD;PWBH7WXt4qypv|L=#(0l%a3}#9n$xDCb^53-i3=i9}uD@Z=UzL=YGKR z0E7@i2qA=!r-m_|Gp2L5_dFl8fOtJSo0R+tY*Y%%YXCa?@Ekv5I#*ID{^k8!Uik2C zU?#(&JI>YQJWtQeImZ9YX%TIE696DbBZ$cob~8%P;^RP`kT5+JL1B5VZ~Q$85Sx$5 zV^{HDOy^%eefIR3z7=3+v`p*uI8=c=@$bOx9USuRzjf=IfS4?yW^m-SA`&YKE^qDt z0Iy!Y@HJS!mC6+q&(5sf=CY~;07l#Sm^oHJX8#EBcmhj{3y`Cc2VW9aON$GhKjWAH zZF>{d>N!f~%7fEjm@gTXQn>;pm9h@E{k8aix1Q&KQn`YQ>o#UyPhdBrU~=*q@3H63){iL^4$G9Cgvv+XF_2X{< zI#>TUAJ;>_c{_0n1mGIC>xLe?2qAHEmo$qE8#AM0p8fn{`BWatv zwYi7oIRX8|WN9QxaBFi9%Tofx(YFG!b&bcB=L!%*5|=l3NUSKxYem!y9_UC-kR54H z39ttuMv`ZQ0ruetqh+F0uAo{yhnOe} zl1P5N;qPhpUlnlvy$EqfxVUZyTB@S$o!(M?UDxw-fPF~9J~@)tih(~61<|4QQ~|lH zDkax90CaAB;x14#c<4uGoD7xGy@Nyk^T)AO4dXC5;$-NcX?TJVLdf|01L_Z1`?jh4 QHvj+t07*qoM6N<$f(?Cz-~a#s literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/meta.json new file mode 100644 index 0000000000..3399c8c70d --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "Created by TheShuEd (Github) for CrystallPunk", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/sword.rsi/equipped-BACKPACK.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/sword.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..c3a81e95f56d55743391751cbc61c2fee113328c GIT binary patch literal 479 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D%zXL`CghE&XX zduM&t;Q*22AMYRgb0kEOB`P>@g{%u}8u!-C!l9wH4Yr4#e0g)`$eEahtMm(=mv!C`iJUF+rd?y28>&F-_tr;^#n zzq|^XRPy=9tDw!9XLRc9&ZzulE&RTx;AQc9rKcrxULBn-*6qrpsBzk8s$<2MnoHB4 z9X<1?XlKYIl~bSZd_DK=A6HiMA`KPK%vrmxt2OAJ(PRI!D4h7-n_>=?W6i$=3?%IqPrJ$-d9b{ zUK4rm>XTi?FOvV5&+oe%=XHER?q4Ppa~KlL_is>ZFW)G%)CnZv>FVdQ&MBb@0H^2H Ap8x;= literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/sword.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/sword.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..af8fcc6106387f9d570d9e3dad0ebabf9e51f071 GIT binary patch literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}KRsO>LoyoQ zUNiJ!4iss97%#{ot+=h9-PpHf0k?;!hdLv-bab}&^ao69f|hSBWo){t^H{9^=5cR9 zwlzT~_WCnDk3R5l?%`Ak0YM;`7@U}P^~|gK{g3^Xtxm!_v|Fv6l-c3zJIv;dDXMo*$)DqJmJ#WT{$;4_EU*@ zveu@1b*)niY!}{-v#WQS&cE@^v(n8w@_(&=|4X#0e#h4yVX#9Zs$a$iENFgU?+y$E N22WQ%mvv4FO#oqdf^z@> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/sword.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/sword.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..4953abafe71e5490f75c861a6db2c0580c6e1018 GIT binary patch literal 760 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-HD>VA|yA;uumf z=k1-1*&>c2Y#;JNIhJt7+)7Q{Zu#&-)pn~Letbb46RufJjmb^b4Ue6B?bsuQ8?4)I z*((TLNMkzOFqKjIV3tmi@HJM!C*Sri|Ni%s$!6>O)w7dtRx$`;fQx#%YL_c2%Y?RG zt6#A3#nYRfF+R((%EVS7~j`&YY#zCJ=DlG)N%m;dk3h5hk{5r=D`<-hQ<3ds4Rb^Q7C`PJE6r`Eoz- zr@Bpi{-&Q*lS4zNKCSE%V472`w7=_**_%ZgD${-|Pi5G3$*rPMui)HKfu@%uOW;LH6BGE)*8UmV|AYS~w6x$pjm&zEn;<=ZL99GIQnZ)jz+gMX2Q zozu=3&$uQ_t@*k7YL{oExztqtVyc`s`(InVht_juy>;t1h5UWlQ*e7*#;jvc)L%OD zl?Kfeow%gS|9FQJ2Z!Q<%vl+0mD^?&raWV7j6YwzbRyF&M;_ZNo?DrJ?UJ4N@0zW? zny5?tipvvxN*&_uIZozHkb0G3)vzv4LP*hrxAa#!(}XLsuS{m2WxK0fd^|*Vf=u>d zhN>m)R)!67FBkgpEO1Uv%rTK+=!1R>) alk;zNxPz>s{X<|WP)Px%&PhZ;RCt{2+%ag|KorLD=e7{Y5^$z~5m-wKrd|u44Bd($Lzk=_I%O)JGj%SW zI%h4E4uz5}ph?|Z3dwQ?accuz0-3HuIODW-qr0=tvi1M%K8yR_lWZsVL;wH)00000 z000000001}gNu_RGwStC=sJ%=7Z~;W=Hlci_(C?#>G|bK)(H+kWOWy_N%HAc>-y$a zLc8Ee$csn4zPY}+m3(^D3R!2CCaoP*#0PO9i`1M;p|G0L2`Br)J z{6Or+cgGV+)6}^Ty((8JWv1`nipX6MuRmsu>i}Db-SI^7JeN+VBg5e^P5@b!8LhPp z1_QA{xVGLlncolBE^xjDDW!}}+^6NXQIaI0wU(kNoL}qwDagJ_k|fS=wyn}MZFM>w z(OQdA%IQ;)QvgaSqqU~`7qA8C+67JlQ2ooU=>q52&ZMN#TD^k4u=DdY16qsd&lpi~D? z{qF33xqdObM=523761SM000000000000000XpTC}xLC=oh)s5OJe-9v=pLFu_b_TG zjSiqYo=CF4H{1C3?vA{B`84V^H1c20?U@IywH$o=G@E8K`%y^;tZJCiswt&R zmSrZ-bFt^0Z5OO#^F;#3)hu&*ektwUohp|0Vk|34@akDxe1{qNvZs3H&$iWVurl>rCkYPqm5ap)`x?s5|0r(CxYJzA# z#)S;F+h)-MpbHj@`g1h%hW-^b0M}tgO|X_f$dnys)CAE3pbKh(SwsMUruzd{TuD(# SSYS#30000 CrystallPunk migration zone end From 2fb2cde1253f08488df14cb3c6bc6735903cc0fc Mon Sep 17 00:00:00 2001 From: Smirnov Peter <131467813+Sh18RW@users.noreply.github.com> Date: Fri, 19 Jul 2024 01:34:18 +0300 Subject: [PATCH 16/26] Add item checking for moth food (#30019) * Add ContainerContainer component checking for moth food * Use ItemSlotsComponent checking on food item --- Content.Server/Nutrition/EntitySystems/FoodSystem.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs index fc9d228b05..d609f737e7 100644 --- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs @@ -10,7 +10,6 @@ using Content.Shared.Administration.Logs; using Content.Shared.Body.Components; using Content.Shared.Body.Organ; using Content.Shared.Chemistry; -using Content.Shared.Chemistry.Reagent; using Content.Shared.Database; using Content.Shared.DoAfter; using Content.Shared.FixedPoint; @@ -31,6 +30,7 @@ using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Utility; using System.Linq; +using Content.Shared.Containers.ItemSlots; using Robust.Server.GameObjects; using Content.Shared.Whitelist; @@ -138,6 +138,16 @@ public sealed class FoodSystem : EntitySystem return (false, true); } + // Checks for used item slots + if (TryComp(food, out var itemSlots)) + { + if (itemSlots.Slots.Any(slot => slot.Value.HasItem)) + { + _popup.PopupEntity(Loc.GetString("food-has-used-storage", ("food", food)), user, user); + return (false, true); + } + } + var flavors = _flavorProfile.GetLocalizedFlavorsMessage(food, user, foodSolution); if (GetUsesRemaining(food, foodComp) <= 0) From 0c2b56962267d006965b4b3b3ee20fbbbfdb0280 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 18 Jul 2024 22:35:26 +0000 Subject: [PATCH 17/26] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 2ba6a098e0..e2ceb5193a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: FungiFellow - changes: - - message: Truncheon now fits in SecBelt - type: Tweak - id: 6432 - time: '2024-04-24T13:43:56.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27281 - author: pigeonpeas changes: - message: Adds a trash bag to the advanced cleaning module. @@ -3805,3 +3798,10 @@ id: 6931 time: '2024-07-18T00:48:09.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30136 +- author: Sh18RW + changes: + - message: Moth can't eat boots with an item more + type: Fix + id: 6932 + time: '2024-07-18T22:34:18.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30019 From 3ef5f521e2e162b2372b563cc0879313deddcd7b Mon Sep 17 00:00:00 2001 From: portfiend <109661617+portfiend@users.noreply.github.com> Date: Thu, 18 Jul 2024 18:36:53 -0400 Subject: [PATCH 18/26] fix: give reptilians species mask sprites in lobby (#30095) --- Resources/Prototypes/Entities/Mobs/Species/reptilian.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml index ad543620cf..0d93e6fe51 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml @@ -71,5 +71,11 @@ components: - type: HumanoidAppearance species: Reptilian + hideLayersOnEquip: + - Snout + - HeadTop + - HeadSide + - type: Inventory + speciesId: reptilian #Weh From d30b45f23f17d396c7c55ce33806939d9af66c94 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 18 Jul 2024 22:37:59 +0000 Subject: [PATCH 19/26] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index e2ceb5193a..6f0ba27d30 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: pigeonpeas - changes: - - message: Adds a trash bag to the advanced cleaning module. - type: Add - id: 6433 - time: '2024-04-24T21:27:34.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27226 - author: Beck Thompson changes: - message: Radio jammer now has 3 selectable power operating levels and a battery @@ -3805,3 +3798,10 @@ id: 6932 time: '2024-07-18T22:34:18.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30019 +- author: portfiend + changes: + - message: Reptilians display correct mask sprites in character customization screen. + type: Fix + id: 6933 + time: '2024-07-18T22:36:53.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30095 From 84fe6bcde4acc7334523c46c9564dcc8d79015de Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Thu, 18 Jul 2024 17:21:01 -0700 Subject: [PATCH 20/26] Fix arrow pointing animation (#30134) Fixa the arrows Co-authored-by: plykiya --- Content.Server/Pointing/EntitySystems/PointingSystem.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Content.Server/Pointing/EntitySystems/PointingSystem.cs b/Content.Server/Pointing/EntitySystems/PointingSystem.cs index 4b7f50fb86..f2f60f3063 100644 --- a/Content.Server/Pointing/EntitySystems/PointingSystem.cs +++ b/Content.Server/Pointing/EntitySystems/PointingSystem.cs @@ -152,9 +152,7 @@ namespace Content.Server.Pointing.EntitySystems if (TryComp(arrow, out var pointing)) { - if (TryComp(player, out TransformComponent? xformPlayer)) - pointing.StartPosition = _transform.ToCoordinates((player, xformPlayer), _transform.ToMapCoordinates(xformPlayer.Coordinates)).Position; - + pointing.StartPosition = _transform.ToCoordinates((arrow, Transform(arrow)), _transform.ToMapCoordinates(Transform(player).Coordinates)).Position; pointing.EndTime = _gameTiming.CurTime + PointDuration; Dirty(arrow, pointing); From b57174007c8d455d10cfa6a2e8563993e935838e Mon Sep 17 00:00:00 2001 From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Date: Thu, 18 Jul 2024 19:22:23 -0500 Subject: [PATCH 21/26] Remove all Assigned Values that are Never Used (#30110) Remove all Assigned Values that are never used --- .../Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs | 1 - Content.Client/Construction/ConstructionSystem.cs | 1 - Content.Client/Lathe/UI/LatheMenu.xaml.cs | 1 - Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs | 1 - Content.Server/Ame/EntitySystems/AmeControllerSystem.cs | 2 -- Content.Server/Chat/Systems/ChatSystem.cs | 1 - Content.Server/Cluwne/CluwneSystem.cs | 1 - Content.Server/Doors/Systems/FirelockSystem.cs | 1 - Content.Server/Dragon/DragonSystem.cs | 1 - Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs | 1 - Content.Server/GameTicking/Rules/SecretRuleSystem.cs | 1 - Content.Server/GameTicking/Rules/ThiefRuleSystem.cs | 2 -- Content.Server/GameTicking/Rules/TraitorRuleSystem.cs | 1 - Content.Server/Instruments/InstrumentSystem.cs | 1 - Content.Server/Medical/DefibrillatorSystem.cs | 1 - Content.Server/Ninja/Systems/SpaceNinjaSystem.cs | 3 --- Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs | 1 - .../Players/PlayTimeTracking/PlayTimeTrackingSystem.cs | 1 - Content.Server/Power/EntitySystems/PowerNetSystem.cs | 1 - Content.Server/Power/EntitySystems/PowerReceiverSystem.cs | 1 - Content.Server/Procedural/DungeonSystem.cs | 1 - Content.Server/Silicons/Borgs/BorgSystem.cs | 1 - Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs | 1 - Content.Server/Station/Systems/StationSystem.cs | 2 -- Content.Server/Traits/TraitSystem.cs | 1 - Content.Shared/Actions/SharedActionsSystem.cs | 1 - Content.Shared/Beeper/Systems/ProximityBeeperSystem.cs | 2 -- Content.Shared/Clothing/ClothingSpeedModifierSystem.cs | 3 --- Content.Shared/Movement/Pulling/Systems/PullingSystem.cs | 1 - Content.Shared/Ninja/Systems/DashAbilitySystem.cs | 1 - 30 files changed, 38 deletions(-) diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs index 78eefa3462..7082617c94 100644 --- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs @@ -14,7 +14,6 @@ namespace Content.Client.Administration.UI.Tabs.ObjectsTab; public sealed partial class ObjectsTab : Control { [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; private readonly Color _altColor = Color.FromHex("#292B38"); private readonly Color _defaultColor = Color.FromHex("#2F2F3B"); diff --git a/Content.Client/Construction/ConstructionSystem.cs b/Content.Client/Construction/ConstructionSystem.cs index 889c992f7f..f909b23423 100644 --- a/Content.Client/Construction/ConstructionSystem.cs +++ b/Content.Client/Construction/ConstructionSystem.cs @@ -26,7 +26,6 @@ namespace Content.Client.Construction { [Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; [Dependency] private readonly ExamineSystemShared _examineSystem = default!; [Dependency] private readonly SharedTransformSystem _transformSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml.cs b/Content.Client/Lathe/UI/LatheMenu.xaml.cs index 265130d15d..f2f52b67b5 100644 --- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs +++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs @@ -21,7 +21,6 @@ public sealed partial class LatheMenu : DefaultWindow { [Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IResourceCache _resources = default!; private EntityUid _owner; private readonly SpriteSystem _spriteSystem; diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs index 2c71fa8c40..ac51cdbac5 100644 --- a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs +++ b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs @@ -17,7 +17,6 @@ namespace Content.Client.VendingMachines.UI { [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; private readonly Dictionary _dummies = []; diff --git a/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs b/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs index eda9158273..bac2648307 100644 --- a/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs +++ b/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs @@ -22,8 +22,6 @@ namespace Content.Server.Ame.EntitySystems; public sealed class AmeControllerSystem : EntitySystem { [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly IChatManager _chatManager = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly AppearanceSystem _appearanceSystem = default!; [Dependency] private readonly SharedAudioSystem _audioSystem = default!; diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs index 5358cdb442..88b306c6ad 100644 --- a/Content.Server/Chat/Systems/ChatSystem.cs +++ b/Content.Server/Chat/Systems/ChatSystem.cs @@ -60,7 +60,6 @@ public sealed partial class ChatSystem : SharedChatSystem [Dependency] private readonly StationSystem _stationSystem = default!; [Dependency] private readonly MobStateSystem _mobStateSystem = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; [Dependency] private readonly ReplacementAccentSystem _wordreplacement = default!; [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; [Dependency] private readonly ExamineSystemShared _examineSystem = default!; diff --git a/Content.Server/Cluwne/CluwneSystem.cs b/Content.Server/Cluwne/CluwneSystem.cs index 18d82659de..f24f0143f3 100644 --- a/Content.Server/Cluwne/CluwneSystem.cs +++ b/Content.Server/Cluwne/CluwneSystem.cs @@ -29,7 +29,6 @@ public sealed class CluwneSystem : EntitySystem [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly ChatSystem _chat = default!; [Dependency] private readonly AutoEmoteSystem _autoEmote = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; [Dependency] private readonly NameModifierSystem _nameMod = default!; public override void Initialize() diff --git a/Content.Server/Doors/Systems/FirelockSystem.cs b/Content.Server/Doors/Systems/FirelockSystem.cs index 93ee18f683..87e5887c42 100644 --- a/Content.Server/Doors/Systems/FirelockSystem.cs +++ b/Content.Server/Doors/Systems/FirelockSystem.cs @@ -16,7 +16,6 @@ namespace Content.Server.Doors.Systems public sealed class FirelockSystem : SharedFirelockSystem { [Dependency] private readonly SharedDoorSystem _doorSystem = default!; - [Dependency] private readonly AtmosAlarmableSystem _atmosAlarmable = default!; [Dependency] private readonly AtmosphereSystem _atmosSystem = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!; [Dependency] private readonly SharedMapSystem _mapping = default!; diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs index e626edeb26..1f15def5ce 100644 --- a/Content.Server/Dragon/DragonSystem.cs +++ b/Content.Server/Dragon/DragonSystem.cs @@ -24,7 +24,6 @@ public sealed partial class DragonSystem : EntitySystem [Dependency] private readonly MovementSpeedModifierSystem _movement = default!; [Dependency] private readonly NpcFactionSystem _faction = default!; [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly RoleSystem _role = default!; [Dependency] private readonly SharedActionsSystem _actions = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; diff --git a/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs b/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs index 3594242bcd..d2686ecdcd 100644 --- a/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs @@ -13,7 +13,6 @@ public sealed class LoadMapRuleSystem : GameRuleSystem [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly MapSystem _map = default!; [Dependency] private readonly MapLoaderSystem _mapLoader = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; [Dependency] private readonly TransformSystem _transform = default!; [Dependency] private readonly GridPreloaderSystem _gridPreloader = default!; diff --git a/Content.Server/GameTicking/Rules/SecretRuleSystem.cs b/Content.Server/GameTicking/Rules/SecretRuleSystem.cs index 8608f250d4..e82cecde36 100644 --- a/Content.Server/GameTicking/Rules/SecretRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/SecretRuleSystem.cs @@ -21,7 +21,6 @@ public sealed class SecretRuleSystem : GameRuleSystem [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IConfigurationManager _configurationManager = default!; [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IChatManager _chatManager = default!; [Dependency] private readonly IComponentFactory _compFact = default!; private string _ruleCompName = default!; diff --git a/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs b/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs index faec4a9e9c..074b4c0df7 100644 --- a/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs @@ -12,10 +12,8 @@ namespace Content.Server.GameTicking.Rules; public sealed class ThiefRuleSystem : GameRuleSystem { - [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly MindSystem _mindSystem = default!; [Dependency] private readonly AntagSelectionSystem _antag = default!; - [Dependency] private readonly ObjectivesSystem _objectives = default!; public override void Initialize() { diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs index 17442da857..a96020d0e3 100644 --- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs @@ -29,7 +29,6 @@ public sealed class TraitorRuleSystem : GameRuleSystem [Dependency] private readonly MindSystem _mindSystem = default!; [Dependency] private readonly SharedRoleSystem _roleSystem = default!; [Dependency] private readonly SharedJobSystem _jobs = default!; - [Dependency] private readonly ObjectivesSystem _objectives = default!; public override void Initialize() { diff --git a/Content.Server/Instruments/InstrumentSystem.cs b/Content.Server/Instruments/InstrumentSystem.cs index 6814b596dc..f74dd7fb13 100644 --- a/Content.Server/Instruments/InstrumentSystem.cs +++ b/Content.Server/Instruments/InstrumentSystem.cs @@ -30,7 +30,6 @@ public sealed partial class InstrumentSystem : SharedInstrumentSystem [Dependency] private readonly UserInterfaceSystem _bui = default!; [Dependency] private readonly PopupSystem _popup = default!; [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly InteractionSystem _interactions = default!; [Dependency] private readonly ExamineSystemShared _examineSystem = default!; private const float MaxInstrumentBandRange = 10f; diff --git a/Content.Server/Medical/DefibrillatorSystem.cs b/Content.Server/Medical/DefibrillatorSystem.cs index 1896f51edd..b6b50d4215 100644 --- a/Content.Server/Medical/DefibrillatorSystem.cs +++ b/Content.Server/Medical/DefibrillatorSystem.cs @@ -46,7 +46,6 @@ public sealed class DefibrillatorSystem : EntitySystem [Dependency] private readonly PowerCellSystem _powerCell = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; [Dependency] private readonly SharedMindSystem _mind = default!; /// diff --git a/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs b/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs index 28ab633227..1ece045774 100644 --- a/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs +++ b/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs @@ -32,10 +32,7 @@ public sealed class SpaceNinjaSystem : SharedSpaceNinjaSystem [Dependency] private readonly AlertsSystem _alerts = default!; [Dependency] private readonly BatterySystem _battery = default!; [Dependency] private readonly CodeConditionSystem _codeCondition = default!; - [Dependency] private readonly IChatManager _chatMan = default!; [Dependency] private readonly PowerCellSystem _powerCell = default!; - [Dependency] private readonly RoleSystem _role = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedMindSystem _mind = default!; public override void Initialize() diff --git a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs index f5d434090e..ac3df5868f 100644 --- a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs @@ -17,7 +17,6 @@ namespace Content.Server.Nutrition.EntitySystems { [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; [Dependency] private readonly TransformSystem _xformSystem = default!; public override void Initialize() diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs index 09956e313f..ea6f0ad3f4 100644 --- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs +++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs @@ -35,7 +35,6 @@ public sealed class PlayTimeTrackingSystem : EntitySystem [Dependency] private readonly MindSystem _minds = default!; [Dependency] private readonly PlayTimeTrackingManager _tracking = default!; [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly SharedRoleSystem _role = default!; public override void Initialize() { diff --git a/Content.Server/Power/EntitySystems/PowerNetSystem.cs b/Content.Server/Power/EntitySystems/PowerNetSystem.cs index 6c35ba2008..a7098649ce 100644 --- a/Content.Server/Power/EntitySystems/PowerNetSystem.cs +++ b/Content.Server/Power/EntitySystems/PowerNetSystem.cs @@ -22,7 +22,6 @@ namespace Content.Server.Power.EntitySystems [Dependency] private readonly PowerNetConnectorSystem _powerNetConnector = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; [Dependency] private readonly IParallelManager _parMan = default!; - [Dependency] private readonly PowerReceiverSystem _powerReceiver = default!; private readonly PowerState _powerState = new(); private readonly HashSet _powerNetReconnectQueue = new(); diff --git a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs index 51520f0464..191d3fc4bd 100644 --- a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs +++ b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs @@ -21,7 +21,6 @@ namespace Content.Server.Power.EntitySystems { [Dependency] private readonly IAdminLogManager _adminLogger = default!; [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly AppearanceSystem _appearance = default!; [Dependency] private readonly AudioSystem _audio = default!; private EntityQuery _recQuery; private EntityQuery _provQuery; diff --git a/Content.Server/Procedural/DungeonSystem.cs b/Content.Server/Procedural/DungeonSystem.cs index b73e843fff..9a7abb7e33 100644 --- a/Content.Server/Procedural/DungeonSystem.cs +++ b/Content.Server/Procedural/DungeonSystem.cs @@ -33,7 +33,6 @@ public sealed partial class DungeonSystem : SharedDungeonSystem [Dependency] private readonly AnchorableSystem _anchorable = default!; [Dependency] private readonly DecalSystem _decals = default!; [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly TagSystem _tag = default!; [Dependency] private readonly TileSystem _tile = default!; [Dependency] private readonly MapLoaderSystem _loader = default!; [Dependency] private readonly SharedMapSystem _maps = default!; diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs index 1c40e9489e..3f32afbffb 100644 --- a/Content.Server/Silicons/Borgs/BorgSystem.cs +++ b/Content.Server/Silicons/Borgs/BorgSystem.cs @@ -40,7 +40,6 @@ public sealed partial class BorgSystem : SharedBorgSystem [Dependency] private readonly IBanManager _banManager = default!; [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedAccessSystem _access = default!; [Dependency] private readonly ActionsSystem _actions = default!; [Dependency] private readonly AlertsSystem _alerts = default!; [Dependency] private readonly DeviceNetworkSystem _deviceNetwork = default!; diff --git a/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs b/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs index e145e233e9..8a918bd2fd 100644 --- a/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs +++ b/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs @@ -17,7 +17,6 @@ public sealed partial class StationJobsSystem { [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IBanManager _banManager = default!; - [Dependency] private readonly PlayTimeTrackingSystem _playTime = default!; private Dictionary> _jobsByWeight = default!; private List _orderedWeights = default!; diff --git a/Content.Server/Station/Systems/StationSystem.cs b/Content.Server/Station/Systems/StationSystem.cs index 84e44b6469..5930eef39b 100644 --- a/Content.Server/Station/Systems/StationSystem.cs +++ b/Content.Server/Station/Systems/StationSystem.cs @@ -27,10 +27,8 @@ namespace Content.Server.Station.Systems; [PublicAPI] public sealed class StationSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _cfgManager = default!; [Dependency] private readonly ILogManager _logManager = default!; [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly ChatSystem _chatSystem = default!; [Dependency] private readonly GameTicker _ticker = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs index f41512b6ac..3bd540a304 100644 --- a/Content.Server/Traits/TraitSystem.cs +++ b/Content.Server/Traits/TraitSystem.cs @@ -11,7 +11,6 @@ namespace Content.Server.Traits; public sealed class TraitSystem : EntitySystem { [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly ISerializationManager _serializationManager = default!; [Dependency] private readonly SharedHandsSystem _sharedHandsSystem = default!; [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs index 013348eb4f..ca6bd1dcc2 100644 --- a/Content.Shared/Actions/SharedActionsSystem.cs +++ b/Content.Shared/Actions/SharedActionsSystem.cs @@ -25,7 +25,6 @@ public abstract class SharedActionsSystem : EntitySystem [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; [Dependency] private readonly RotateToFaceSystem _rotateToFaceSystem = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedTransformSystem _transformSystem = default!; diff --git a/Content.Shared/Beeper/Systems/ProximityBeeperSystem.cs b/Content.Shared/Beeper/Systems/ProximityBeeperSystem.cs index ed3c6366c1..9830e165e5 100644 --- a/Content.Shared/Beeper/Systems/ProximityBeeperSystem.cs +++ b/Content.Shared/Beeper/Systems/ProximityBeeperSystem.cs @@ -12,8 +12,6 @@ namespace Content.Shared.Beeper.Systems; /// public sealed class ProximityBeeperSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly ProximityDetectionSystem _proximity = default!; [Dependency] private readonly BeeperSystem _beeper = default!; /// diff --git a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs index c1efe0b3dd..897f379156 100644 --- a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs +++ b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs @@ -14,13 +14,10 @@ namespace Content.Shared.Clothing; public sealed class ClothingSpeedModifierSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly ClothingSpeedModifierSystem _clothingSpeedModifier = default!; [Dependency] private readonly SharedContainerSystem _container = default!; [Dependency] private readonly ExamineSystemShared _examine = default!; [Dependency] private readonly MovementSpeedModifierSystem _movementSpeed = default!; [Dependency] private readonly ItemToggleSystem _toggle = default!; - [Dependency] private readonly SharedPowerCellSystem _powerCell = default!; public override void Initialize() { diff --git a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs index f563440af0..557c316e26 100644 --- a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs +++ b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs @@ -43,7 +43,6 @@ public sealed class PullingSystem : EntitySystem [Dependency] private readonly SharedHandsSystem _handsSystem = default!; [Dependency] private readonly SharedInteractionSystem _interaction = default!; [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; [Dependency] private readonly HeldSpeedModifierSystem _clothingMoveSpeed = default!; public override void Initialize() diff --git a/Content.Shared/Ninja/Systems/DashAbilitySystem.cs b/Content.Shared/Ninja/Systems/DashAbilitySystem.cs index 1385219e47..09be108505 100644 --- a/Content.Shared/Ninja/Systems/DashAbilitySystem.cs +++ b/Content.Shared/Ninja/Systems/DashAbilitySystem.cs @@ -18,7 +18,6 @@ public sealed class DashAbilitySystem : EntitySystem { [Dependency] private readonly ActionContainerSystem _actionContainer = default!; [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedChargesSystem _charges = default!; [Dependency] private readonly SharedHandsSystem _hands = default!; [Dependency] private readonly ExamineSystemShared _examine = default!; From 6d18dff33de3e94ebcfaa00a7b89243bf5110f84 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Thu, 18 Jul 2024 18:08:52 -0700 Subject: [PATCH 22/26] Fix for thrown items dealing damage twice to first target (#30115) * FUCK YOU * fine --------- Co-authored-by: plykiya --- .../Damage/Systems/DamageOtherOnHitSystem.cs | 36 ++++++++----------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs index ff4d1cabe9..8a7b3df0b2 100644 --- a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs +++ b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs @@ -32,31 +32,25 @@ namespace Content.Server.Damage.Systems private void OnDoHit(EntityUid uid, DamageOtherOnHitComponent component, ThrowDoHitEvent args) { - if (!TerminatingOrDeleted(args.Target)) + if (TerminatingOrDeleted(args.Target)) + return; + + var dmg = _damageable.TryChangeDamage(args.Target, component.Damage, component.IgnoreResistances, origin: args.Component.Thrower); + + // Log damage only for mobs. Useful for when people throw spears at each other, but also avoids log-spam when explosions send glass shards flying. + if (dmg != null && HasComp(args.Target)) + _adminLogger.Add(LogType.ThrowHit, $"{ToPrettyString(args.Target):target} received {dmg.GetTotal():damage} damage from collision"); + + if (dmg is { Empty: false }) { - var dmg = _damageable.TryChangeDamage(args.Target, component.Damage, component.IgnoreResistances, origin: args.Component.Thrower); - - // Log damage only for mobs. Useful for when people throw spears at each other, but also avoids log-spam when explosions send glass shards flying. - if (dmg != null && HasComp(args.Target)) - _adminLogger.Add(LogType.ThrowHit, $"{ToPrettyString(args.Target):target} received {dmg.GetTotal():damage} damage from collision"); - - if (dmg is { Empty: false }) - { - _color.RaiseEffect(Color.Red, new List() { args.Target }, Filter.Pvs(args.Target, entityManager: EntityManager)); - } - - _guns.PlayImpactSound(args.Target, dmg, null, false); - if (TryComp(uid, out var body) && body.LinearVelocity.LengthSquared() > 0f) - { - var direction = body.LinearVelocity.Normalized(); - _sharedCameraRecoil.KickCamera(args.Target, direction); - } + _color.RaiseEffect(Color.Red, new List() { args.Target }, Filter.Pvs(args.Target, entityManager: EntityManager)); } - // TODO: If more stuff touches this then handle it after. - if (TryComp(uid, out var physics)) + _guns.PlayImpactSound(args.Target, dmg, null, false); + if (TryComp(uid, out var body) && body.LinearVelocity.LengthSquared() > 0f) { - _thrownItem.LandComponent(args.Thrown, args.Component, physics, false); + var direction = body.LinearVelocity.Normalized(); + _sharedCameraRecoil.KickCamera(args.Target, direction); } } From 56ee4da5352d94e45bfe45977a2ac05a16785430 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 19 Jul 2024 01:10:01 +0000 Subject: [PATCH 23/26] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 6f0ba27d30..74a116880f 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Beck Thompson - changes: - - message: Radio jammer now has 3 selectable power operating levels and a battery - level led indicator! - type: Tweak - id: 6434 - time: '2024-04-25T02:19:17.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/25912 - author: cooldolphin changes: - message: Three variants of glasses are now available in the loadout menu. @@ -3805,3 +3797,11 @@ id: 6933 time: '2024-07-18T22:36:53.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30095 +- author: Plykiya + changes: + - message: You no longer deal double damage to your first target when throwing an + item. + type: Fix + id: 6934 + time: '2024-07-19T01:08:52.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30115 From 6005a9f4cb9604a6c8cb5621746df7e078c12fbd Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Fri, 19 Jul 2024 16:19:15 +1000 Subject: [PATCH 24/26] Fix door access in mapping mode (#30030) Fix shouldn't break anythingTM. --- .../DeviceNetwork/Systems/NetworkConfiguratorSystem.cs | 4 ++-- Content.Shared/Access/Systems/AccessReaderSystem.cs | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs index 402d005dd4..59b58c6933 100644 --- a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs @@ -423,11 +423,11 @@ public sealed class NetworkConfiguratorSystem : SharedNetworkConfiguratorSystem if (Delay(configurator)) return; - if (!targetUid.HasValue || !configurator.ActiveDeviceLink.HasValue || !TryComp(userUid, out ActorComponent? actor) || !AccessCheck(targetUid.Value, userUid, configurator)) + if (!targetUid.HasValue || !configurator.ActiveDeviceLink.HasValue || !AccessCheck(targetUid.Value, userUid, configurator)) return; - _uiSystem.OpenUi(configuratorUid, NetworkConfiguratorUiKey.Link, actor.PlayerSession); + _uiSystem.OpenUi(configuratorUid, NetworkConfiguratorUiKey.Link, userUid); configurator.DeviceLinkTarget = targetUid; diff --git a/Content.Shared/Access/Systems/AccessReaderSystem.cs b/Content.Shared/Access/Systems/AccessReaderSystem.cs index 5d1932a959..2e0737c6ab 100644 --- a/Content.Shared/Access/Systems/AccessReaderSystem.cs +++ b/Content.Shared/Access/Systems/AccessReaderSystem.cs @@ -155,7 +155,12 @@ public sealed class AccessReaderSystem : EntitySystem return IsAllowedInternal(access, stationKeys, reader); if (!_containerSystem.TryGetContainer(target, reader.ContainerAccessProvider, out var container)) - return Paused(target); // when mapping, containers with electronics arent spawned + return false; + + // If entity is paused then always allow it at this point. + // Door electronics is kind of a mess but yeah, it should only be an unpaused ent interacting with it + if (Paused(target)) + return true; foreach (var entity in container.ContainedEntities) { From d6e0114126f778c298763d05fa59ee62c28f595a Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Fri, 19 Jul 2024 11:13:35 +0300 Subject: [PATCH 25/26] randomize iconSmoothing (#28158) * randomize iconSmoothing * Revert "randomize iconSmoothing" This reverts commit 094356f975737c0af24ce39d849aec7852b9af6e. * try 2 * trying work with client-server communication * still dont work * Tayrtahn good suggestion * remove outdated code * Fix! * move data to Appearance * Update RandomIconSmoothComponent.cs --- .../ClientRandomIconSmoothSystem.cs | 29 ++++++++ .../IconSmoothing/IconSmoothComponent.cs | 2 +- .../IconSmoothing/IconSmoothSystem.cs | 35 +++++++--- .../IconSmoothing/RandomIconSmoothSystem.cs | 26 +++++++ .../RandomIconSmoothComponent.cs | 16 +++++ .../SharedRandomIconSmoothSystem.cs | 12 ++++ .../Entities/Structures/Walls/walls.yml | 5 ++ .../Structures/Walls/mining.rsi/meta.json | 66 +++++++++++++----- .../Structures/Walls/mining.rsi/miningB0.png | Bin 0 -> 1192 bytes .../Structures/Walls/mining.rsi/miningB1.png | Bin 0 -> 1470 bytes .../Structures/Walls/mining.rsi/miningB2.png | Bin 0 -> 1192 bytes .../Structures/Walls/mining.rsi/miningB3.png | Bin 0 -> 1470 bytes .../Structures/Walls/mining.rsi/miningB4.png | Bin 0 -> 1446 bytes .../Structures/Walls/mining.rsi/miningB5.png | Bin 0 -> 1451 bytes .../Structures/Walls/mining.rsi/miningB6.png | Bin 0 -> 1446 bytes .../Structures/Walls/mining.rsi/miningB7.png | Bin 0 -> 962 bytes 16 files changed, 165 insertions(+), 26 deletions(-) create mode 100644 Content.Client/IconSmoothing/ClientRandomIconSmoothSystem.cs create mode 100644 Content.Server/IconSmoothing/RandomIconSmoothSystem.cs create mode 100644 Content.Shared/IconSmoothing/RandomIconSmoothComponent.cs create mode 100644 Content.Shared/IconSmoothing/SharedRandomIconSmoothSystem.cs create mode 100644 Resources/Textures/Structures/Walls/mining.rsi/miningB0.png create mode 100644 Resources/Textures/Structures/Walls/mining.rsi/miningB1.png create mode 100644 Resources/Textures/Structures/Walls/mining.rsi/miningB2.png create mode 100644 Resources/Textures/Structures/Walls/mining.rsi/miningB3.png create mode 100644 Resources/Textures/Structures/Walls/mining.rsi/miningB4.png create mode 100644 Resources/Textures/Structures/Walls/mining.rsi/miningB5.png create mode 100644 Resources/Textures/Structures/Walls/mining.rsi/miningB6.png create mode 100644 Resources/Textures/Structures/Walls/mining.rsi/miningB7.png diff --git a/Content.Client/IconSmoothing/ClientRandomIconSmoothSystem.cs b/Content.Client/IconSmoothing/ClientRandomIconSmoothSystem.cs new file mode 100644 index 0000000000..73db9e1ab9 --- /dev/null +++ b/Content.Client/IconSmoothing/ClientRandomIconSmoothSystem.cs @@ -0,0 +1,29 @@ +using Content.Shared.IconSmoothing; +using Robust.Client.GameObjects; + +namespace Content.Client.IconSmoothing; + +public sealed class ClientRandomIconSmoothSystem : SharedRandomIconSmoothSystem +{ + [Dependency] private readonly IconSmoothSystem _iconSmooth = default!; + [Dependency] private readonly AppearanceSystem _appearance = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnAppearanceChange); + } + + private void OnAppearanceChange(Entity ent, ref AppearanceChangeEvent args) + { + if (!TryComp(ent, out var smooth)) + return; + + if (!_appearance.TryGetData(ent, RandomIconSmoothState.State, out var state, args.Component)) + return; + + smooth.StateBase = state; + _iconSmooth.SetStateBase(ent, smooth, state); + } +} diff --git a/Content.Client/IconSmoothing/IconSmoothComponent.cs b/Content.Client/IconSmoothing/IconSmoothComponent.cs index 88b1f613cb..040198529c 100644 --- a/Content.Client/IconSmoothing/IconSmoothComponent.cs +++ b/Content.Client/IconSmoothing/IconSmoothComponent.cs @@ -30,7 +30,7 @@ namespace Content.Client.IconSmoothing /// Prepended to the RSI state. /// [ViewVariables(VVAccess.ReadWrite), DataField("base")] - public string StateBase { get; private set; } = string.Empty; + public string StateBase { get; set; } = string.Empty; [DataField("shader", customTypeSerializer:typeof(PrototypeIdSerializer))] public string? Shader; diff --git a/Content.Client/IconSmoothing/IconSmoothSystem.cs b/Content.Client/IconSmoothing/IconSmoothSystem.cs index 4b02560846..11ca75bc82 100644 --- a/Content.Client/IconSmoothing/IconSmoothSystem.cs +++ b/Content.Client/IconSmoothing/IconSmoothSystem.cs @@ -55,6 +55,33 @@ namespace Content.Client.IconSmoothing if (component.Mode != IconSmoothingMode.Corners || !TryComp(uid, out SpriteComponent? sprite)) return; + SetCornerLayers(sprite, component); + + if (component.Shader != null) + { + sprite.LayerSetShader(CornerLayers.SE, component.Shader); + sprite.LayerSetShader(CornerLayers.NE, component.Shader); + sprite.LayerSetShader(CornerLayers.NW, component.Shader); + sprite.LayerSetShader(CornerLayers.SW, component.Shader); + } + } + + public void SetStateBase(EntityUid uid, IconSmoothComponent component, string newState) + { + if (!TryComp(uid, out var sprite)) + return; + + component.StateBase = newState; + SetCornerLayers(sprite, component); + } + + private void SetCornerLayers(SpriteComponent sprite, IconSmoothComponent component) + { + sprite.LayerMapRemove(CornerLayers.SE); + sprite.LayerMapRemove(CornerLayers.NE); + sprite.LayerMapRemove(CornerLayers.NW); + sprite.LayerMapRemove(CornerLayers.SW); + var state0 = $"{component.StateBase}0"; sprite.LayerMapSet(CornerLayers.SE, sprite.AddLayerState(state0)); sprite.LayerSetDirOffset(CornerLayers.SE, DirectionOffset.None); @@ -64,14 +91,6 @@ namespace Content.Client.IconSmoothing sprite.LayerSetDirOffset(CornerLayers.NW, DirectionOffset.Flip); sprite.LayerMapSet(CornerLayers.SW, sprite.AddLayerState(state0)); sprite.LayerSetDirOffset(CornerLayers.SW, DirectionOffset.Clockwise); - - if (component.Shader != null) - { - sprite.LayerSetShader(CornerLayers.SE, component.Shader); - sprite.LayerSetShader(CornerLayers.NE, component.Shader); - sprite.LayerSetShader(CornerLayers.NW, component.Shader); - sprite.LayerSetShader(CornerLayers.SW, component.Shader); - } } private void OnShutdown(EntityUid uid, IconSmoothComponent component, ComponentShutdown args) diff --git a/Content.Server/IconSmoothing/RandomIconSmoothSystem.cs b/Content.Server/IconSmoothing/RandomIconSmoothSystem.cs new file mode 100644 index 0000000000..4ddfb17ac8 --- /dev/null +++ b/Content.Server/IconSmoothing/RandomIconSmoothSystem.cs @@ -0,0 +1,26 @@ +using Content.Shared.IconSmoothing; +using Robust.Shared.Random; + +namespace Content.Server.IconSmoothing; + +public sealed partial class RandomIconSmoothSystem : SharedRandomIconSmoothSystem +{ + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnMapInit); + } + + private void OnMapInit(Entity ent, ref MapInitEvent args) + { + if (ent.Comp.RandomStates.Count == 0) + return; + + var state = _random.Pick(ent.Comp.RandomStates); + _appearance.SetData(ent, RandomIconSmoothState.State, state); + } +} diff --git a/Content.Shared/IconSmoothing/RandomIconSmoothComponent.cs b/Content.Shared/IconSmoothing/RandomIconSmoothComponent.cs new file mode 100644 index 0000000000..6cdf167b29 --- /dev/null +++ b/Content.Shared/IconSmoothing/RandomIconSmoothComponent.cs @@ -0,0 +1,16 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.IconSmoothing; + +/// +/// Allow randomize StateBase of IconSmoothComponent for random visual variation +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class RandomIconSmoothComponent : Component +{ + /// + /// StateBase will be randomly selected from this list. Allows to randomize the visual. + /// + [DataField(required: true)] + public List RandomStates = new(); +} diff --git a/Content.Shared/IconSmoothing/SharedRandomIconSmoothSystem.cs b/Content.Shared/IconSmoothing/SharedRandomIconSmoothSystem.cs new file mode 100644 index 0000000000..5cb5299858 --- /dev/null +++ b/Content.Shared/IconSmoothing/SharedRandomIconSmoothSystem.cs @@ -0,0 +1,12 @@ +using Robust.Shared.Serialization; + +namespace Content.Shared.IconSmoothing; + +public abstract class SharedRandomIconSmoothSystem : EntitySystem +{ +} +[Serializable, NetSerializable] +public enum RandomIconSmoothState : byte +{ + State +} diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 7af9981255..1ab770812a 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -1109,6 +1109,11 @@ - type: IconSmooth key: walls base: mining + - type: RandomIconSmooth + randomStates: + - mining + - miningB + - type: Appearance - type: entity parent: WallShuttleDiagonal diff --git a/Resources/Textures/Structures/Walls/mining.rsi/meta.json b/Resources/Textures/Structures/Walls/mining.rsi/meta.json index 4ce4691c51..77f4322998 100644 --- a/Resources/Textures/Structures/Walls/mining.rsi/meta.json +++ b/Resources/Textures/Structures/Walls/mining.rsi/meta.json @@ -7,40 +7,72 @@ "y": 32 }, "states": [ - { + { "name": "full" }, - { + { "name": "mining0", - "directions": 4 + "directions": 4 }, - { + { "name": "mining1", - "directions": 4 + "directions": 4 }, - { + { "name": "mining2", - "directions": 4 + "directions": 4 }, - { + { "name": "mining3", - "directions": 4 + "directions": 4 }, - { + { "name": "mining4", - "directions": 4 + "directions": 4 }, - { + { "name": "mining5", - "directions": 4 + "directions": 4 }, - { + { "name": "mining6", - "directions": 4 + "directions": 4 }, - { + { "name": "mining7", - "directions": 4 + "directions": 4 + }, + { + "name": "miningB0", + "directions": 4 + }, + { + "name": "miningB1", + "directions": 4 + }, + { + "name": "miningB2", + "directions": 4 + }, + { + "name": "miningB3", + "directions": 4 + }, + { + "name": "miningB4", + "directions": 4 + }, + { + "name": "miningB5", + "directions": 4 + }, + { + "name": "miningB6", + "directions": 4 + }, + { + "name": "miningB7", + "directions": 4 } ] } diff --git a/Resources/Textures/Structures/Walls/mining.rsi/miningB0.png b/Resources/Textures/Structures/Walls/mining.rsi/miningB0.png new file mode 100644 index 0000000000000000000000000000000000000000..f65f066b65aa26487dec4d03b79e560239294cff GIT binary patch literal 1192 zcmV;Z1XufsP)Px(Vo5|nRCt`-TTN=*Fckh$x|&^(jAj$M8cd<|08@jHP>L^CdWRfB;P?Qg5X7uX zH+C(P-E5}|^=V{{JxMFI7XBbiMwa8~`RTpy{pbb@W3$!d*BC z!dKcZV$TFG|f7^z#N*UnHe{#&seq& zFW`ba0)6KBTa;yquIua^Aq1q9Q0g)GdC3UCRc|tM08o}C?(gqMTcYnflw}F6^*S_Q ziue$^u0@{jFbq#tC^Wtr9^m?ar4A^H0!kf5a~QiFu|+esLLOi+9UizEa5}Aw3DOqG z^BwB?!R~n>wv+R>+iesLNWuoVZ#K)sNd2Xhzr8?f$As8IO1T~;2$=mm4E-N}h7zG* z0T7k_n|~e%kLN=XWeaf5QB~Efn&$ZqN&!Vtpzn#$>}HwX|3t6=7|T$WCBA+8IvVf$ zpD4?6#Mb)0yKrSoBiIWJLyxv?C$Eu47~lQ@N*yi|9ZMrv0E}h0adz?i8#a^X7~fKe zq5&?Z7@P6!^@z`>q6twnz$Ysd)BEET(_iEM{~N(Za2R@rteivEckkXqO8I+^(Fm9D zq=G13K&i*8u{q`QT%@uEqG-T=zXt$IVW+}ZADr_jR5ldBEbQ*?jSbzVl9uOdCei68 zKVwkYP(-1^A3uIV-*+Po05H-5r4ARx4W%9z7eEvnKn#x-=2m(LsaSm<(RsjgNKFt? zcz_SLyhXqJRzDS&7{vyJ+`qI9NG2t=6r$t2>|B>5)pDOJrSYQ5G^SR5EZ_esqL?n3g6wmInf(`jtWzdL|6qC z9){l5>k0mMiWXg@Vhf_!0M7Yr^~TK;xLqEpgu_uZpsK2iw0K=VpsFe;^_X-t>@Llz+-1}CEc0000Px)cu7P-RCt`-ThD9bMil#?ycD7+LJ$O?lx_wOm`o<{{dS2AmHRA&XKV)F zZzD;P&Eo-lwpaa@En#DLKqf43QNZQC<+hEn0MGNJXR~7FW%K9oJWq=S)b0ccaq-#q z89v;%@%&ka(+dlLjiZx!Ve*GJZNOGBF8XJ(ITmns`RGPK6xYLjyYK-=Cv%)$SU1Ya zaX{u;EI^qEwOYH`k6(O@>+6330H+rgj!x!F{T8#B|#T#Z9 zzn?$L@cQKz4)<*w?k}G6Sp;$=?QOr)GJ~p6_5p;r`1@%S-~Kkav#)3woz4p|_KWK4 zm7&D~l4Lc7T}5t^Br(DQlocQgu}WaM&9W>lUR)JgEMRdzTOunWn_Fgj8)5;T=OK>A zD@jYae;&+iHk(FRfbte(+ji#rA7L;UlzaiDQ@HL903b~l_W;mr=Eqq|sq%SV6#4=D;aXTj<~)mv{(SYuL@dwAs9>H`)$N=z73}7^k!rm zqtQt9^~z9IK`Ar^Py;WeJF(E?|+o;Hj=S9;4sy z6+FNsXi>oFg(d9m%SU1nJjZVew1vg_F}I2Z`hFY3VN^&%l#bN=o(EfW!UzRapjya|l3QQ6`t* z0eV;g>&7VlCulL5J3=NGRbR^vn+$>dGNQ-aCZ4f`Q65RH%N#J#?l90RqG4> Y0~R0y=v@s6*Z=?k07*qoM6N<$f>*Mv2><{9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Walls/mining.rsi/miningB2.png b/Resources/Textures/Structures/Walls/mining.rsi/miningB2.png new file mode 100644 index 0000000000000000000000000000000000000000..f65f066b65aa26487dec4d03b79e560239294cff GIT binary patch literal 1192 zcmV;Z1XufsP)Px(Vo5|nRCt`-TTN=*Fckh$x|&^(jAj$M8cd<|08@jHP>L^CdWRfB;P?Qg5X7uX zH+C(P-E5}|^=V{{JxMFI7XBbiMwa8~`RTpy{pbb@W3$!d*BC z!dKcZV$TFG|f7^z#N*UnHe{#&seq& zFW`ba0)6KBTa;yquIua^Aq1q9Q0g)GdC3UCRc|tM08o}C?(gqMTcYnflw}F6^*S_Q ziue$^u0@{jFbq#tC^Wtr9^m?ar4A^H0!kf5a~QiFu|+esLLOi+9UizEa5}Aw3DOqG z^BwB?!R~n>wv+R>+iesLNWuoVZ#K)sNd2Xhzr8?f$As8IO1T~;2$=mm4E-N}h7zG* z0T7k_n|~e%kLN=XWeaf5QB~Efn&$ZqN&!Vtpzn#$>}HwX|3t6=7|T$WCBA+8IvVf$ zpD4?6#Mb)0yKrSoBiIWJLyxv?C$Eu47~lQ@N*yi|9ZMrv0E}h0adz?i8#a^X7~fKe zq5&?Z7@P6!^@z`>q6twnz$Ysd)BEET(_iEM{~N(Za2R@rteivEckkXqO8I+^(Fm9D zq=G13K&i*8u{q`QT%@uEqG-T=zXt$IVW+}ZADr_jR5ldBEbQ*?jSbzVl9uOdCei68 zKVwkYP(-1^A3uIV-*+Po05H-5r4ARx4W%9z7eEvnKn#x-=2m(LsaSm<(RsjgNKFt? zcz_SLyhXqJRzDS&7{vyJ+`qI9NG2t=6r$t2>|B>5)pDOJrSYQ5G^SR5EZ_esqL?n3g6wmInf(`jtWzdL|6qC z9){l5>k0mMiWXg@Vhf_!0M7Yr^~TK;xLqEpgu_uZpsK2iw0K=VpsFe;^_X-t>@Llz+-1}CEc0000Px)cu7P-RCt`-ThD9bMil#?ycD7+LJ$O?lx_wOm`o<{{dS2AmHRA&XKV)F zZzD;P&Eo-lwpaa@En#DLKqf43QNZQC<+hEn0MGNJXR~7FW%K9oJWq=S)b0ccaq-#q z89v;%@%&ka(+dlLjiZx!Ve*GJZNOGBF8XJ(ITmns`RGPK6xYLjyYK-=Cv%)$SU1Ya zaX{u;EI^qEwOYH`k6(O@>+6330H+rgj!x!F{T8#B|#T#Z9 zzn?$L@cQKz4)<*w?k}G6Sp;$=?QOr)GJ~p6_5p;r`1@%S-~Kkav#)3woz4p|_KWK4 zm7&D~l4Lc7T}5t^Br(DQlocQgu}WaM&9W>lUR)JgEMRdzTOunWn_Fgj8)5;T=OK>A zD@jYae;&+iHk(FRfbte(+ji#rA7L;UlzaiDQ@HL903b~l_W;mr=Eqq|sq%SV6#4=D;aXTj<~)mv{(SYuL@dwAs9>H`)$N=z73}7^k!rm zqtQt9^~z9IK`Ar^Py;WeJF(E?|+o;Hj=S9;4sy z6+FNsXi>oFg(d9m%SU1nJjZVew1vg_F}I2Z`hFY3VN^&%l#bN=o(EfW!UzRapjya|l3QQ6`t* z0eV;g>&7VlCulL5J3=NGRbR^vn+$>dGNQ-aCZ4f`Q65RH%N#J#?l90RqG4> Y0~R0y=v@s6*Z=?k07*qoM6N<$f>*Mv2><{9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Walls/mining.rsi/miningB4.png b/Resources/Textures/Structures/Walls/mining.rsi/miningB4.png new file mode 100644 index 0000000000000000000000000000000000000000..1412f0026964552f50657b6c65ef5cb0c17fe7dc GIT binary patch literal 1446 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 kxjW2r1Vp#ksp Date: Fri, 19 Jul 2024 11:20:34 +0300 Subject: [PATCH 26/26] Update ContentLocalizationManager.cs --- Content.Shared/Localizations/ContentLocalizationManager.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Content.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs index fc9cd6a613..451ee617bc 100644 --- a/Content.Shared/Localizations/ContentLocalizationManager.cs +++ b/Content.Shared/Localizations/ContentLocalizationManager.cs @@ -25,8 +25,8 @@ namespace Content.Shared.Localizations public void Initialize() { - //Ru localization var culture = new CultureInfo(Culture); + // Uncomment for Ru localization _loc.LoadCulture(culture); var fallbackCulture = new CultureInfo("en-US"); @@ -34,10 +34,6 @@ namespace Content.Shared.Localizations _loc.SetFallbackCluture(fallbackCulture); // - //Eng localization - //var culture = new CultureInfo(Culture); - // - _loc.AddFunction(culture, "PRESSURE", FormatPressure); _loc.AddFunction(culture, "POWERWATTS", FormatPowerWatts); _loc.AddFunction(culture, "POWERJOULES", FormatPowerJoules);