Merge remote-tracking branch 'upstream/master' into upstream
# Conflicts: # Content.Client/Access/AccessOverlay.cs # Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs # Content.Client/Access/UI/IdCardConsoleWindow.xaml # Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs # Content.Client/Chemistry/UI/InjectorStatusControl.cs # Content.Client/StatusIcon/StatusIconOverlay.cs # Content.Client/Stylesheets/StyleNano.cs # Content.Client/UserInterface/Systems/Chat/ChatUIController.cs # Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml # Content.Server/Access/Systems/IdCardConsoleSystem.cs # Content.Server/Administration/Commands/AGhost.cs # Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs # Content.Server/Connection/ConnectionManager.cs # Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs # Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs # Content.Server/Resist/EscapeInventorySystem.cs # Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs # Content.Shared/Access/Components/IdCardConsoleComponent.cs # Content.Shared/Anomaly/SharedAnomalySystem.cs # Content.Shared/Bed/Sleep/SharedSleepingSystem.cs # Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs # Content.Shared/Lock/LockSystem.cs # Content.Shared/RCD/Systems/RCDSystem.cs # Content.Shared/Roles/JobPrototype.cs # Content.Shared/StatusIcon/StatusIconPrototype.cs # Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs # Resources/Audio/Machines/attributions.yml # Resources/Locale/en-US/rcd/components/rcd-component.ftl # Resources/Maps/reach.yml # Resources/Prototypes/Catalog/Cargo/cargo_vending.yml # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml # Resources/Prototypes/DeviceLinking/sink_ports.yml # Resources/Prototypes/Entities/Clothing/Back/duffel.yml # Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml # Resources/Prototypes/Entities/Clothing/Neck/misc.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml # Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml # Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml # Resources/Prototypes/Entities/Objects/Magic/books.yml # Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml # Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml # Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml # Resources/Prototypes/Entities/Objects/Misc/tiles.yml # Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml # Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml # Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml # Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml # Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml # Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml # Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml # Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml # Resources/Prototypes/Entities/Structures/Walls/grille.yml # Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml # Resources/Prototypes/Recipes/Crafting/improvised.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/Roles/Jobs/Security/security_officer.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Prototypes/StatusEffects/health.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Prototypes/lobbyscreens.yml # Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/equipped-OUTERCLOTHING-body-slim.png # Resources/Textures/Decals/bricktile.rsi/white_box.png # Resources/Textures/Objects/Misc/books.rsi/meta.json # Resources/migration.yml
This commit is contained in:
Remuchi
@@ -159,11 +159,11 @@ public sealed class DumpableSystem : EntitySystem
|
||||
{
|
||||
dumped = true;
|
||||
|
||||
var targetPos = _transformSystem.GetWorldPosition(args.Args.Target.Value);
|
||||
var (targetPos, targetRot) = _transformSystem.GetWorldPositionRotation(args.Args.Target.Value);
|
||||
|
||||
foreach (var entity in dumpQueue)
|
||||
{
|
||||
_transformSystem.SetWorldPosition(entity, targetPos + _random.NextVector2Box() / 4);
|
||||
_transformSystem.SetWorldPositionRotation(entity, targetPos + _random.NextVector2Box() / 4, targetRot);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
222
Content.Shared/Storage/EntitySystems/SecretStashSystem.cs
Normal file
222
Content.Shared/Storage/EntitySystems/SecretStashSystem.cs
Normal file
@@ -0,0 +1,222 @@
|
||||
using Content.Shared.Popups;
|
||||
using Content.Shared.Storage.Components;
|
||||
using Content.Shared.Destructible;
|
||||
using Content.Shared.Hands.Components;
|
||||
using Content.Shared.Hands.EntitySystems;
|
||||
using Content.Shared.Item;
|
||||
using Robust.Shared.Containers;
|
||||
using Content.Shared.Interaction;
|
||||
using Content.Shared.Tools.Systems;
|
||||
using Content.Shared.Examine;
|
||||
|
||||
namespace Content.Shared.Storage.EntitySystems
|
||||
{
|
||||
/// <summary>
|
||||
/// Secret Stash allows an item to be hidden within.
|
||||
/// </summary>
|
||||
public sealed class SecretStashSystem : EntitySystem
|
||||
{
|
||||
[Dependency] private readonly SharedPopupSystem _popupSystem = default!;
|
||||
[Dependency] private readonly SharedHandsSystem _handsSystem = default!;
|
||||
[Dependency] private readonly SharedContainerSystem _containerSystem = default!;
|
||||
[Dependency] private readonly SharedItemSystem _item = default!;
|
||||
[Dependency] private readonly SharedToolSystem _tool = default!;
|
||||
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
SubscribeLocalEvent<SecretStashComponent, ComponentInit>(OnInit);
|
||||
SubscribeLocalEvent<SecretStashComponent, DestructionEventArgs>(OnDestroyed);
|
||||
SubscribeLocalEvent<SecretStashComponent, StashPryDoAfterEvent>(OnSecretStashPried);
|
||||
SubscribeLocalEvent<SecretStashComponent, InteractUsingEvent>(OnInteractUsing);
|
||||
SubscribeLocalEvent<SecretStashComponent, InteractHandEvent>(OnInteractHand);
|
||||
SubscribeLocalEvent<SecretStashComponent, ExaminedEvent>(OnExamine);
|
||||
}
|
||||
|
||||
private void OnInit(EntityUid uid, SecretStashComponent component, ComponentInit args)
|
||||
{
|
||||
component.ItemContainer = _containerSystem.EnsureContainer<ContainerSlot>(uid, "stash", out _);
|
||||
}
|
||||
|
||||
private void OnDestroyed(EntityUid uid, SecretStashComponent component, DestructionEventArgs args)
|
||||
{
|
||||
_containerSystem.EmptyContainer(component.ItemContainer);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Is there something inside secret stash item container?
|
||||
/// </summary>
|
||||
public bool HasItemInside(EntityUid uid, SecretStashComponent? component = null)
|
||||
{
|
||||
if (!Resolve(uid, ref component))
|
||||
return false;
|
||||
return component.ItemContainer.ContainedEntity != null;
|
||||
}
|
||||
|
||||
private void OnInteractUsing(EntityUid uid, SecretStashComponent component, InteractUsingEvent args)
|
||||
{
|
||||
if (args.Handled)
|
||||
return;
|
||||
|
||||
if (!component.OpenableStash)
|
||||
return;
|
||||
|
||||
// is player trying place or lift off cistern lid?
|
||||
if (_tool.UseTool(args.Used, args.User, uid, component.PryDoorTime, component.PryingQuality, new StashPryDoAfterEvent()))
|
||||
args.Handled = true;
|
||||
// maybe player is trying to hide something inside cistern?
|
||||
else if (component.ToggleOpen)
|
||||
{
|
||||
TryHideItem(uid, args.User, args.Used);
|
||||
args.Handled = true;
|
||||
}
|
||||
}
|
||||
|
||||
private void OnInteractHand(EntityUid uid, SecretStashComponent component, InteractHandEvent args)
|
||||
{
|
||||
if (args.Handled)
|
||||
return;
|
||||
|
||||
if (!component.OpenableStash)
|
||||
return;
|
||||
|
||||
// trying to get something from stash?
|
||||
if (component.ToggleOpen)
|
||||
{
|
||||
var gotItem = TryGetItem(uid, args.User);
|
||||
if (gotItem)
|
||||
{
|
||||
args.Handled = true;
|
||||
return;
|
||||
}
|
||||
}
|
||||
args.Handled = true;
|
||||
}
|
||||
|
||||
private void OnSecretStashPried(EntityUid uid, SecretStashComponent component, StashPryDoAfterEvent args)
|
||||
{
|
||||
if (args.Cancelled)
|
||||
return;
|
||||
|
||||
ToggleOpen(uid, component);
|
||||
}
|
||||
|
||||
public void ToggleOpen(EntityUid uid, SecretStashComponent? component = null, MetaDataComponent? meta = null)
|
||||
{
|
||||
if (!Resolve(uid, ref component))
|
||||
return;
|
||||
|
||||
component.ToggleOpen = !component.ToggleOpen;
|
||||
|
||||
UpdateAppearance(uid, component);
|
||||
Dirty(uid, component, meta);
|
||||
}
|
||||
|
||||
private void UpdateAppearance(EntityUid uid, SecretStashComponent? component = null)
|
||||
{
|
||||
if (!Resolve(uid, ref component))
|
||||
return;
|
||||
|
||||
_appearance.SetData(uid, StashVisuals.DoorVisualState, component.ToggleOpen ? DoorVisualState.DoorOpen : DoorVisualState.DoorClosed);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Tries to hide item inside secret stash from hands of user.
|
||||
/// </summary>
|
||||
/// <returns>True if item was hidden inside stash</returns>
|
||||
public bool TryHideItem(EntityUid uid, EntityUid userUid, EntityUid itemToHideUid,
|
||||
SecretStashComponent? component = null, ItemComponent? item = null,
|
||||
HandsComponent? hands = null)
|
||||
{
|
||||
if (!Resolve(uid, ref component))
|
||||
return false;
|
||||
if (!Resolve(itemToHideUid, ref item))
|
||||
return false;
|
||||
if (!Resolve(userUid, ref hands))
|
||||
return false;
|
||||
|
||||
// check if secret stash is already occupied
|
||||
var container = component.ItemContainer;
|
||||
if (container.ContainedEntity != null)
|
||||
{
|
||||
var msg = Loc.GetString("comp-secret-stash-action-hide-container-not-empty");
|
||||
_popupSystem.PopupClient(msg, uid, userUid);
|
||||
return false;
|
||||
}
|
||||
|
||||
// check if item is too big to fit into secret stash
|
||||
if (_item.GetSizePrototype(item.Size) > _item.GetSizePrototype(component.MaxItemSize))
|
||||
{
|
||||
var msg = Loc.GetString("comp-secret-stash-action-hide-item-too-big",
|
||||
("item", itemToHideUid), ("stash", GetSecretPartName(uid, component)));
|
||||
_popupSystem.PopupClient(msg, uid, userUid);
|
||||
return false;
|
||||
}
|
||||
|
||||
// try to move item from hands to stash container
|
||||
if (!_handsSystem.TryDropIntoContainer(userUid, itemToHideUid, container))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// all done, show success message
|
||||
var successMsg = Loc.GetString("comp-secret-stash-action-hide-success",
|
||||
("item", itemToHideUid), ("this", GetSecretPartName(uid, component)));
|
||||
_popupSystem.PopupClient(successMsg, uid, userUid);
|
||||
return true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Try get item and place it in users hand.
|
||||
/// If user can't take it by hands, will drop item from container.
|
||||
/// </summary>
|
||||
/// <returns>True if user received item</returns>
|
||||
public bool TryGetItem(EntityUid uid, EntityUid userUid, SecretStashComponent? component = null,
|
||||
HandsComponent? hands = null)
|
||||
{
|
||||
if (!Resolve(uid, ref component))
|
||||
return false;
|
||||
if (!Resolve(userUid, ref hands))
|
||||
return false;
|
||||
|
||||
// check if secret stash has something inside
|
||||
var container = component.ItemContainer;
|
||||
if (container.ContainedEntity == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
_handsSystem.PickupOrDrop(userUid, container.ContainedEntity.Value, handsComp: hands);
|
||||
|
||||
// show success message
|
||||
var successMsg = Loc.GetString("comp-secret-stash-action-get-item-found-something",
|
||||
("stash", GetSecretPartName(uid, component)));
|
||||
_popupSystem.PopupClient(successMsg, uid, userUid);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private void OnExamine(EntityUid uid, SecretStashComponent component, ExaminedEvent args)
|
||||
{
|
||||
if (args.IsInDetailsRange && component.ToggleOpen)
|
||||
{
|
||||
if (HasItemInside(uid))
|
||||
{
|
||||
var msg = Loc.GetString(component.ExamineStash);
|
||||
args.PushMarkup(msg);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private string GetSecretPartName(EntityUid uid, SecretStashComponent stash)
|
||||
{
|
||||
if (stash.SecretPartName != "")
|
||||
return Loc.GetString(stash.SecretPartName);
|
||||
|
||||
var entityName = Loc.GetString("comp-secret-stash-secret-part-name", ("this", uid));
|
||||
|
||||
return entityName;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user