diff --git a/Content.Shared/Actions/ActionGrantComponent.cs b/Content.Shared/Actions/ActionGrantComponent.cs index d666799ea16..94c3a0bbd1d 100644 --- a/Content.Shared/Actions/ActionGrantComponent.cs +++ b/Content.Shared/Actions/ActionGrantComponent.cs @@ -14,10 +14,4 @@ public sealed partial class ActionGrantComponent : Component [DataField, AutoNetworkedField] public List ActionEntities = new(); - - /// - /// Actions will only be available if the item is in the clothing slot. - /// - [DataField, AutoNetworkedField] - public bool ActiveIfWorn; } diff --git a/Content.Shared/Actions/ActionGrantSystem.cs b/Content.Shared/Actions/ActionGrantSystem.cs index e5b737f28fd..f73ecf8a460 100644 --- a/Content.Shared/Actions/ActionGrantSystem.cs +++ b/Content.Shared/Actions/ActionGrantSystem.cs @@ -1,5 +1,3 @@ -using Content.Shared.Inventory; - namespace Content.Shared.Actions; /// @@ -19,13 +17,9 @@ public override void Initialize() private void OnItemGet(Entity ent, ref GetItemActionsEvent args) { - if (!TryComp(ent.Owner, out ActionGrantComponent? grant)) return; - if (ent.Comp.ActiveIfWorn && (args.SlotFlags == null || args.SlotFlags == SlotFlags.POCKET)) - return; - foreach (var action in grant.ActionEntities) { args.AddAction(action); diff --git a/Content.Shared/Actions/ItemActionGrantComponent.cs b/Content.Shared/Actions/ItemActionGrantComponent.cs index db722d0c467..d1769b51a2f 100644 --- a/Content.Shared/Actions/ItemActionGrantComponent.cs +++ b/Content.Shared/Actions/ItemActionGrantComponent.cs @@ -11,10 +11,4 @@ public sealed partial class ItemActionGrantComponent : Component { [DataField(required: true), AutoNetworkedField, AlwaysPushInheritance] public List Actions = new(); - - /// - /// Actions will only be available if the item is in the clothing slot. - /// - [DataField, AutoNetworkedField] - public bool ActiveIfWorn; } diff --git a/Content.Shared/Movement/Components/JumpAbilityComponent.cs b/Content.Shared/Movement/Components/JumpAbilityComponent.cs deleted file mode 100644 index 6da91615787..00000000000 --- a/Content.Shared/Movement/Components/JumpAbilityComponent.cs +++ /dev/null @@ -1,36 +0,0 @@ -using Content.Shared.Actions; -using Content.Shared.Movement.Systems; -using Robust.Shared.Audio; -using Robust.Shared.GameStates; - -namespace Content.Shared.Movement.Components; - -/// -/// A component for configuring the settings for the jump action. -/// To give the jump action to an entity use and . -/// The basic action prototype is "ActionGravityJump". -/// -[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedJumpAbilitySystem))] -public sealed partial class JumpAbilityComponent : Component -{ - /// - /// How far you will jump (in tiles). - /// - [DataField, AutoNetworkedField] - public float JumpDistance = 5f; - - /// - /// Basic “throwing” speed for TryThrow method. - /// - [DataField, AutoNetworkedField] - public float JumpThrowSpeed = 10f; - - /// - /// This gets played whenever the jump action is used. - /// - [DataField, AutoNetworkedField] - public SoundSpecifier? JumpSound; -} - -public sealed partial class GravityJumpEvent : InstantActionEvent; - diff --git a/Content.Shared/Movement/Systems/SharedJumpAbilitySystem.cs b/Content.Shared/Movement/Systems/SharedJumpAbilitySystem.cs deleted file mode 100644 index ac720cae68f..00000000000 --- a/Content.Shared/Movement/Systems/SharedJumpAbilitySystem.cs +++ /dev/null @@ -1,35 +0,0 @@ -using Content.Shared.Gravity; -using Content.Shared.Movement.Components; -using Content.Shared.Throwing; -using Robust.Shared.Audio.Systems; - -namespace Content.Shared.Movement.Systems; - -public sealed partial class SharedJumpAbilitySystem : EntitySystem -{ - [Dependency] private readonly ThrowingSystem _throwing = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedGravitySystem _gravity = default!; - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnGravityJump); - } - - private void OnGravityJump(Entity entity, ref GravityJumpEvent args) - { - if (_gravity.IsWeightless(args.Performer)) - return; - - var xform = Transform(args.Performer); - var throwing = xform.LocalRotation.ToWorldVec() * entity.Comp.JumpDistance; - var direction = xform.Coordinates.Offset(throwing); // to make the character jump in the direction he's looking - - _throwing.TryThrow(args.Performer, direction, entity.Comp.JumpThrowSpeed); - - _audio.PlayPredicted(entity.Comp.JumpSound, args.Performer, args.Performer); - args.Handled = true; - } -} diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml index efac498a3bd..9471e9bc0ee 100644 --- a/Resources/Audio/Effects/attributions.yml +++ b/Resources/Audio/Effects/attributions.yml @@ -247,11 +247,6 @@ copyright: "Created by mattroks101 for Bee Station. cig_snuff converted to mono" source: "https://github.com/BeeStation/BeeStation-Hornet/pull/29" -- files: [stealthoff.ogg] - copyright: 'TGStation at d4f678a1772007ff8d7eddd21cf7218c8e07bfc0' - license: "CC-BY-SA-3.0" - source: https://github.com/tgstation/tgstation/commit/d4f678a1772007ff8d7eddd21cf7218c8e07bfc0 - - files: ["soft_thump.ogg"] license: "CC-BY-4.0" copyright: "Clipped by FairlySadPanda (Github) from a sound created by CheChoDj (Freesound)" @@ -260,4 +255,4 @@ - files: [card_drag.ogg] copyright: 'created by Tao7891; perryprog (GitHub) downmixed to mono' license: CC0-1.0 - source: https://github.com/space-wizards/space-station-14/pull/37363 + source: https://github.com/space-wizards/space-station-14/pull/37363 \ No newline at end of file diff --git a/Resources/Audio/Effects/stealthoff.ogg b/Resources/Audio/Effects/stealthoff.ogg deleted file mode 100644 index d78706e9cdc..00000000000 Binary files a/Resources/Audio/Effects/stealthoff.ogg and /dev/null differ diff --git a/Resources/Locale/en-US/_white/markings/reptilian.ftl b/Resources/Locale/en-US/_white/markings/reptilian.ftl deleted file mode 100644 index d4683a3e7c2..00000000000 --- a/Resources/Locale/en-US/_white/markings/reptilian.ftl +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com> -# SPDX-FileCopyrightText: 2025 Aiden -# SPDX-FileCopyrightText: 2025 PuroSlavKing <103608145+PuroSlavKing@users.noreply.github.com> -# SPDX-FileCopyrightText: 2025 coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> -# -# SPDX-License-Identifier: AGPL-3.0-or-later -# SNOUT -marking-LizardShoutEasternDragon= Lizard, eastern dragon -marking-LizardShoutEasternDragon-eastern_dragon = Outer -marking-LizardShoutEasternDragon-eastern_dragon_overlay = Inner - -marking-LizardShoutEasternDragonUsiki= Lizard, eastern dragon (Mustache) -marking-LizardShoutEasternDragonUsiki-eastern_dragon = Outer -marking-LizardShoutEasternDragonUsiki-eastern_dragon_overlay = Inner -marking-LizardShoutEasternDragonUsiki-eastern_dragon_usiki = Mustache diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml index 7d510d51512..eb3ad300f50 100644 --- a/Resources/Prototypes/Actions/types.yml +++ b/Resources/Prototypes/Actions/types.yml @@ -359,15 +359,3 @@ useDelay: 1 itemIconStyle: BigAction event: !type:ToggleActionEvent - -- type: entity - id: ActionGravityJump - name: Jump - description: Activating the advanced propulsion system, you propel yourself a short distance in the direction of your gaze. - components: - - type: InstantAction - useDelay: 8 - icon: - sprite: Interface/Actions/jump.rsi - state: icon - event: !type:GravityJumpEvent {} diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml index 54925f8848b..65e45fe6f23 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml @@ -181,31 +181,4 @@ - type: StaticPrice price: 75 - type: Tag - tags: [] - -- type: entity - parent: ClothingShoesBase - id: ClothingShoesBootsJump - name: jump boots - description: High-tech boots that give you the incredible ability to JUMP! With these boots you can jump over lava, chasms and weird chemicals on the floor! - components: - - type: Sprite - sprite: Clothing/Shoes/Boots/jumpboots.rsi - layers: - - state: icon - - type: Clothing - sprite: Clothing/Shoes/Boots/jumpboots.rsi - - type: JumpAbility - jumpDistance: 4 - jumpSound: /Audio/Effects/stealthoff.ogg - - type: ActionGrant - actions: - - ActionGravityJump - - type: ItemActionGrant - actions: - - ActionGravityJump - activeIfWorn: true - - type: StaticPrice - price: 220 - - type: Tag - tags: [] + tags: [ ] diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml index 22336efced8..716cf59d9be 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml @@ -37,7 +37,6 @@ - ClothingShoesBootsMagSci - NFClothingShoesBootsMoon # Frontier: use NF variant - ClothingShoesBootsSpeed - - ClothingShoesBootsJump - ClothingBackpackHolding - ClothingBackpackSatchelHolding - ClothingBackpackDuffelHolding diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml index 812d8b9070a..e3f53ffdcee 100644 --- a/Resources/Prototypes/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/Recipes/Lathes/misc.yml @@ -159,16 +159,6 @@ Silver: 500 Bluespace: 200 #DeltaV -- type: latheRecipe - id: ClothingShoesBootsJump - result: ClothingShoesBootsJump - completetime: 2 - materials: - Steel: 1400 - Plastic: 600 - Silver: 200 - Plasma: 200 - - type: latheRecipe id: ModularReceiver result: ModularReceiver diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 571a78cc868..773de0ec64a 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -17,7 +17,6 @@ - BorgModuleGrapplingGun - OreProcessorIndustrialMachineCircuitboard - ClothingMaskWeldingGas - - ClothingShoesBootsJump - MechEquipmentDrill # Goobstation - type: technology diff --git a/Resources/Prototypes/_HL/Entities/Mobs/Player/synth.yml b/Resources/Prototypes/_HL/Entities/Mobs/Player/synth.yml index 200d85de49c..95ad8fe0225 100644 --- a/Resources/Prototypes/_HL/Entities/Mobs/Player/synth.yml +++ b/Resources/Prototypes/_HL/Entities/Mobs/Player/synth.yml @@ -2,6 +2,4 @@ save: false name: Urist McSynth parent: BaseMobSynth - id: MobSynth - components: - - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. + id: MobSynth \ No newline at end of file diff --git a/Resources/Prototypes/_HL/Entities/Mobs/Species/synth.yml b/Resources/Prototypes/_HL/Entities/Mobs/Species/synth.yml index f116172e080..b841d498447 100644 --- a/Resources/Prototypes/_HL/Entities/Mobs/Species/synth.yml +++ b/Resources/Prototypes/_HL/Entities/Mobs/Species/synth.yml @@ -13,6 +13,13 @@ damageModifierSet: Synth damageContainer: Synth - type: HLSynth + - type: Tag + tags: + - Synth + - CanPilot + - FootstepSound + - DoorBumpOpener + - AnomalyHost - type: Thirst - type: DamageVisuals damageOverlayGroups: diff --git a/Resources/Prototypes/_White/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/_White/Entities/Mobs/Customization/Markings/reptilian.yml deleted file mode 100644 index 69ef66026a7..00000000000 --- a/Resources/Prototypes/_White/Entities/Mobs/Customization/Markings/reptilian.yml +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com> -# SPDX-FileCopyrightText: 2025 PuroSlavKing <103608145+PuroSlavKing@users.noreply.github.com> -# SPDX-FileCopyrightText: 2025 coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> -# -# SPDX-License-Identifier: AGPL-3.0-or-later -# SNOUT -- type: marking - id: LizardShoutEasternDragon - bodyPart: Snout - markingCategory: Snout - speciesRestriction: [Reptilian] - sprites: - - sprite: _White/Mobs/Customization/snouts.rsi - state: eastern_dragon - - sprite: _White/Mobs/Customization/snouts.rsi - state: eastern_dragon_overlay - -- type: marking - id: LizardShoutEasternDragonUsiki - bodyPart: Snout - markingCategory: Snout - speciesRestriction: [Reptilian] - sprites: - - sprite: _White/Mobs/Customization/snouts.rsi - state: eastern_dragon - - sprite: _White/Mobs/Customization/snouts.rsi - state: eastern_dragon_overlay - - sprite: _White/Mobs/Customization/snouts.rsi - state: eastern_dragon_usiki diff --git a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/equipped-FEET-vox.png deleted file mode 100644 index e01c5d36380..00000000000 Binary files a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/equipped-FEET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/equipped-FEET.png deleted file mode 100644 index 06c62f2869a..00000000000 Binary files a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/equipped-FEET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/icon.png deleted file mode 100644 index 8a548ba6a4b..00000000000 Binary files a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/inhand-left.png deleted file mode 100644 index 7c1c8fa1228..00000000000 Binary files a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/inhand-right.png deleted file mode 100644 index f7ee26e9a86..00000000000 Binary files a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/meta.json deleted file mode 100644 index faaa2fe6bb7..00000000000 --- a/Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/meta.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cd6ba31a1b5891133c14b9ebba4a4479143b5167", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-FEET", - "directions": 4 - }, - { - "name": "equipped-FEET-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Interface/Actions/jump.rsi/icon.png b/Resources/Textures/Interface/Actions/jump.rsi/icon.png deleted file mode 100644 index 46af10ae279..00000000000 Binary files a/Resources/Textures/Interface/Actions/jump.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Interface/Actions/jump.rsi/meta.json b/Resources/Textures/Interface/Actions/jump.rsi/meta.json deleted file mode 100644 index 7a2119f3fbd..00000000000 --- a/Resources/Textures/Interface/Actions/jump.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a373b4cb08298523d40acc14f9c390a0c403fc31", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_White/Mobs/Customization/snouts.rsi/eastern_dragon.png b/Resources/Textures/_White/Mobs/Customization/snouts.rsi/eastern_dragon.png deleted file mode 100644 index 184305e0a5c..00000000000 Binary files a/Resources/Textures/_White/Mobs/Customization/snouts.rsi/eastern_dragon.png and /dev/null differ diff --git a/Resources/Textures/_White/Mobs/Customization/snouts.rsi/eastern_dragon_overlay.png b/Resources/Textures/_White/Mobs/Customization/snouts.rsi/eastern_dragon_overlay.png deleted file mode 100644 index d761bd383e8..00000000000 Binary files a/Resources/Textures/_White/Mobs/Customization/snouts.rsi/eastern_dragon_overlay.png and /dev/null differ diff --git a/Resources/Textures/_White/Mobs/Customization/snouts.rsi/eastern_dragon_usiki.png b/Resources/Textures/_White/Mobs/Customization/snouts.rsi/eastern_dragon_usiki.png deleted file mode 100644 index 1993c6b4fce..00000000000 Binary files a/Resources/Textures/_White/Mobs/Customization/snouts.rsi/eastern_dragon_usiki.png and /dev/null differ diff --git a/Resources/Textures/_White/Mobs/Customization/snouts.rsi/meta.json b/Resources/Textures/_White/Mobs/Customization/snouts.rsi/meta.json deleted file mode 100644 index 6bd25520072..00000000000 --- a/Resources/Textures/_White/Mobs/Customization/snouts.rsi/meta.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from S.P.L.U.R.T at commit https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/02617f9b08d7767e2feb137a8c96650342bd3c0a | Edited, resprited and reshaded by PuroSlavKing (Github), further edited by NotLivyathan (GitHub)", - "states": [ - { - "name": "eastern_dragon", - "directions": 4 - }, - { - "name": "eastern_dragon_overlay", - "directions": 4 - }, - { - "name": "eastern_dragon_usiki", - "directions": 4 - } - ] -}