Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions Content.Shared/Actions/ActionGrantComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,4 @@ public sealed partial class ActionGrantComponent : Component

[DataField, AutoNetworkedField]
public List<EntityUid> ActionEntities = new();

/// <summary>
/// Actions will only be available if the item is in the clothing slot.
/// </summary>
[DataField, AutoNetworkedField]
public bool ActiveIfWorn;
}
6 changes: 0 additions & 6 deletions Content.Shared/Actions/ActionGrantSystem.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
using Content.Shared.Inventory;

namespace Content.Shared.Actions;

/// <summary>
Expand All @@ -19,13 +17,9 @@ public override void Initialize()

private void OnItemGet(Entity<ItemActionGrantComponent> 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);
Expand Down
6 changes: 0 additions & 6 deletions Content.Shared/Actions/ItemActionGrantComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,4 @@ public sealed partial class ItemActionGrantComponent : Component
{
[DataField(required: true), AutoNetworkedField, AlwaysPushInheritance]
public List<EntProtoId> Actions = new();

/// <summary>
/// Actions will only be available if the item is in the clothing slot.
/// </summary>
[DataField, AutoNetworkedField]
public bool ActiveIfWorn;
}
36 changes: 0 additions & 36 deletions Content.Shared/Movement/Components/JumpAbilityComponent.cs

This file was deleted.

35 changes: 0 additions & 35 deletions Content.Shared/Movement/Systems/SharedJumpAbilitySystem.cs

This file was deleted.

7 changes: 1 addition & 6 deletions Resources/Audio/Effects/attributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand All @@ -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
Binary file removed Resources/Audio/Effects/stealthoff.ogg
Binary file not shown.
15 changes: 0 additions & 15 deletions Resources/Locale/en-US/_white/markings/reptilian.ftl

This file was deleted.

12 changes: 0 additions & 12 deletions Resources/Prototypes/Actions/types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
29 changes: 1 addition & 28 deletions Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: [ ]
1 change: 0 additions & 1 deletion Resources/Prototypes/Recipes/Lathes/Packs/science.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
- ClothingShoesBootsMagSci
- NFClothingShoesBootsMoon # Frontier: use NF variant
- ClothingShoesBootsSpeed
- ClothingShoesBootsJump
- ClothingBackpackHolding
- ClothingBackpackSatchelHolding
- ClothingBackpackDuffelHolding
Expand Down
10 changes: 0 additions & 10 deletions Resources/Prototypes/Recipes/Lathes/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/Research/industrial.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
- BorgModuleGrapplingGun
- OreProcessorIndustrialMachineCircuitboard
- ClothingMaskWeldingGas
- ClothingShoesBootsJump
- MechEquipmentDrill # Goobstation

- type: technology
Expand Down
4 changes: 1 addition & 3 deletions Resources/Prototypes/_HL/Entities/Mobs/Player/synth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
save: false
name: Urist McSynth
parent: BaseMobSynth
id: MobSynth
components:
- type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
id: MobSynth
7 changes: 7 additions & 0 deletions Resources/Prototypes/_HL/Entities/Mobs/Species/synth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@
damageModifierSet: Synth
damageContainer: Synth
- type: HLSynth
- type: Tag
tags:
- Synth
- CanPilot
- FootstepSound
- DoorBumpOpener
- AnomalyHost
- type: Thirst
- type: DamageVisuals
damageOverlayGroups:
Expand Down

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
30 changes: 0 additions & 30 deletions Resources/Textures/Clothing/Shoes/Boots/jumpboots.rsi/meta.json

This file was deleted.

Binary file not shown.
14 changes: 0 additions & 14 deletions Resources/Textures/Interface/Actions/jump.rsi/meta.json

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
23 changes: 0 additions & 23 deletions Resources/Textures/_White/Mobs/Customization/snouts.rsi/meta.json

This file was deleted.

Loading