tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extinguisher cabinet (#1976)

Browse Source 
* 1779 Add extinguisher cabinet base item, rsi, and class based on potted plant

* Pretty much the rest of the owl

* Allow construction

* no more deconstruction

* pr fixes
This commit is contained in:
Moses
2020-09-01 18:41:35 -05:00
committed by GitHub
parent dbbe3088f8
commit 6a4b856961
13 changed files with 305 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Content.Client/GameObjects/Components/ExtinguisherCabinetVisualizer.cs Normal file
View File

@@ -0,0 +1,41 @@
using Content.Shared.GameObjects.Components;
using Robust.Client.GameObjects;
using Robust.Client.Interfaces.GameObjects.Components;
namespace Content.Client.GameObjects.Components
{
public class ExtinguisherCabinetVisualizer : AppearanceVisualizer
{
private string _prefix;
public override void OnChangeData(AppearanceComponent component)
{
base.OnChangeData(component);
var sprite = component.Owner.GetComponent<ISpriteComponent>();
if (component.TryGetData(ExtinguisherCabinetVisuals.IsOpen, out bool isOpen))
{
if (isOpen)
{
if (component.TryGetData(ExtinguisherCabinetVisuals.ContainsExtinguisher, out bool contains))
{
if (contains)
{
sprite.LayerSetState(0, "extinguisher_full");
}
else
{
sprite.LayerSetState(0, "extinguisher_empty");
}
}
}
else
{
sprite.LayerSetState(0, "extinguisher_closed");
}
}
}
}
}

128
Content.Server/GameObjects/Components/ExtinguisherCabinetComponent.cs Normal file
View File

@@ -0,0 +1,128 @@
using System.Threading.Tasks;
using Content.Server.GameObjects.Components.GUI;
using Content.Server.GameObjects.Components.Items;
using Content.Server.GameObjects.Components.Items.Storage;
using Content.Server.Interfaces.GameObjects.Components.Items;
using Content.Shared.Audio;
using Content.Shared.GameObjects.Components;
using Content.Shared.Interfaces;
using Content.Shared.Interfaces.GameObjects.Components;
using Robust.Server.GameObjects;
using Robust.Server.GameObjects.Components.Container;
using Robust.Server.GameObjects.EntitySystems;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Localization;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components
{
[RegisterComponent]
[ComponentReference(typeof(IActivate))]
public class ExtinguisherCabinetComponent : Component, IInteractUsing, IInteractHand, IActivate
{
public override string Name => "ExtinguisherCabinet";
private bool _opened = false;
private string _doorSound;
[ViewVariables] protected ContainerSlot ItemContainer;
[ViewVariables] public string DoorSound => _doorSound;
public override void Initialize()
{
base.Initialize();
ItemContainer =
ContainerManagerComponent.Ensure<ContainerSlot>("extinguisher_cabinet", Owner, out _);
}
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _doorSound, "doorSound", "/Audio/Machines/machine_switch.ogg");
}
async Task<bool> IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs)
{
if (!_opened)
{
_opened = true;
ClickLatchSound();
}
else
{
if (ItemContainer.ContainedEntity != null || !eventArgs.Using.HasComponent<FireExtinguisherComponent>())
{
return false;
}
var handsComponent = eventArgs.User.GetComponent<IHandsComponent>();
if (!handsComponent.Drop(eventArgs.Using, ItemContainer))
{
return false;
}
}
UpdateVisuals();
return true;
}
bool IInteractHand.InteractHand(InteractHandEventArgs eventArgs)
{
if (_opened)
{
if (ItemContainer.ContainedEntity == null)
{
_opened = false;
ClickLatchSound();
}
else if (eventArgs.User.TryGetComponent(out HandsComponent hands))
{
Owner.PopupMessage(eventArgs.User,
Loc.GetString("You take {0:extinguisherName} from the {1:cabinetName}", ItemContainer.ContainedEntity.Name, Owner.Name));
hands.PutInHandOrDrop(ItemContainer.ContainedEntity.GetComponent<ItemComponent>());
}
else if (ItemContainer.Remove(ItemContainer.ContainedEntity))
{
ItemContainer.ContainedEntity.Transform.GridPosition = Owner.Transform.GridPosition;
}
}
else
{
_opened = true;
ClickLatchSound();
}
UpdateVisuals();
return true;
}
void IActivate.Activate(ActivateEventArgs eventArgs)
{
_opened = !_opened;
ClickLatchSound();
UpdateVisuals();
}
private void UpdateVisuals()
{
if (Owner.TryGetComponent(out AppearanceComponent appearance))
{
appearance.SetData(ExtinguisherCabinetVisuals.IsOpen, _opened);
appearance.SetData(ExtinguisherCabinetVisuals.ContainsExtinguisher, ItemContainer.ContainedEntity != null);
}
}
private void ClickLatchSound()
{
EntitySystem.Get<AudioSystem>() // Don't have original click, this sounds close
.PlayFromEntity(DoorSound, Owner, AudioHelpers.WithVariation(0.15f));
}
}
}

19
Content.Server/GameObjects/Components/ExtinguisherCabinetFilledComponent.cs Normal file
View File

@@ -0,0 +1,19 @@
using Content.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components
{
[RegisterComponent]
public class ExtinguisherCabinetFilledComponent : ExtinguisherCabinetComponent
{
public override string Name => "ExtinguisherCabinetFilled";
public override void Initialize()
{
base.Initialize();
ItemContainer.Insert(Owner.EntityManager.SpawnEntity("FireExtinguisher", Owner.Transform.GridPosition));
}
}
}

14
Content.Server/GameObjects/Components/Items/FireExtinguisherComponent.cs Normal file
View File

@@ -0,0 +1,14 @@
using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.Random;
using Robust.Shared.Prototypes;
namespace Content.Server.GameObjects.Components.Items
{
[RegisterComponent]
public class FireExtinguisherComponent : Component
{
public override string Name => "FireExtinguisher";
}
}

12
Content.Shared/GameObjects/Components/ExtinguisherCabinet.cs Normal file
View File

@@ -0,0 +1,12 @@
using System;
using Robust.Shared.Serialization;
namespace Content.Shared.GameObjects.Components
{
[Serializable, NetSerializable]
public enum ExtinguisherCabinetVisuals
{
IsOpen,
ContainsExtinguisher
}
}

26
Resources/Prototypes/Entities/Constructible/Walls/extinguisher_cabinet.yml Normal file
View File

@@ -0,0 +1,26 @@
- type: entity
id: ExtinguisherCabinet
name: extinguisher cabinet
abstract: true
description: A small wall mounted cabinet designed to hold a fire extinguisher.
components:
- type: Clickable
- type: InteractionOutline
- type: Sprite
sprite: Constructible/Misc/extinguisher_cabinet.rsi
state: extinguisher_closed
- type: Icon
sprite: Constructible/Misc/extinguisher_cabinet.rsi
state: extinguisher_closed
- type: ExtinguisherCabinet
- type: Appearance
visuals:
- type: ExtinguisherCabinetVisualizer
placement:
mode: SnapgridCenter
- type: entity
id: ExtinguisherCabinetFilled
parent: ExtinguisherCabinet
components:
- type: ExtinguisherCabinetFilled

1
Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
View File

@@ -27,3 +27,4 @@
fuelType: chem.H2O
fuelName: water
fuelCost: 50
- type: FireExtinguisher

17
Resources/Prototypes/Recipes/Construction/misc.yml
View File

@@ -10,3 +10,20 @@
steps:
- material: Metal
amount: 1
- type: construction
id: ExtinguisherCabinet
name: extinguisher cabinet
category: Items/Misc
keywords: [misc]
placementMode: SnapgridCenter
canBuildInImpassable: true
description: A small wall mounted cabinet designed to hold a fire extinguisher.
icon: Constructible/Misc/extinguisher_cabinet.rsi/extinguisher_closed.png
result: ExtinguisherCabinet
steps:
- material: Metal
amount: 2
icon:
sprite: Constructible/Misc/extinguisher_cabinet.rsi
state: extinguisher_closed

BIN
Resources/Textures/Constructible/Misc/extinguisher_cabinet.rsi/extinguisher_closed.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 432 B

BIN
Resources/Textures/Constructible/Misc/extinguisher_cabinet.rsi/extinguisher_empty.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 405 B

BIN
Resources/Textures/Constructible/Misc/extinguisher_cabinet.rsi/extinguisher_full.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 498 B

BIN
Resources/Textures/Constructible/Misc/extinguisher_cabinet.rsi/extinguisher_mini.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 468 B

47
Resources/Textures/Constructible/Misc/extinguisher_cabinet.rsi/meta.json Normal file
View File

@@ -0,0 +1,47 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation at commit d0d81185f09ca30d3b0856d476544240dba0de53",
"states": [
{
"name": "extinguisher_closed",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "extinguisher_empty",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "extinguisher_full",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "extinguisher_mini",
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}