* add headset component

* add basic headset logic

* fix formatting in listening component, add dependency to headset

* test function for headset

* implement headset as listener

* ANNIHILATES ListeningComponent, refactor of radio/listener sys

* basic headset functionality

* rename RadioComponent to HandheldRadioComponent

* change channel to list of channels

* basic headset implementation complete

* message now always excludes ';'

* add radio color; state channel freq. and source name

* undocumented game breaking bug commit (DO NOT RESEARCH)
actually just changes frequency from 1457 (what signalers are set to by default) to 1459, the actual frequency for common

* Add more sprites

* Reorganizes

* Added job headsets

* Adds headset as an ignored component

* Jobs now spawn with headsets

* remove system.tracing

* Catchup commits

* Add headset property serialization

* Turn GetChannels into a property

* ListenRange property and serializatioon

* Adjust interfaces

* Address reviews

* Cleanup

* Address reviews

* Update rsi

* Fix licenses and copyright

* Fix missing textures

* Merge fixes

* Move headset textures from objects/devices to clothing/ears

* Fix rsi state names and add equipped states

* Fix headsets not working

* Add missing brackets to channel number in chat

* heck

* Fix broken rsi

* Fix radio id and names

* Put quotes around headset messages

* Fix method names

* Fix handheld radios

* Fix capitalization when using radio channels and trim

* Remove unnecessary dependency

* Indent that

* Separate this part

* Goodbye icons

* Implement IActivate in HandheldRadioComponent

* Add examine tooltip to radios and headsets

* Rename IListen methods

Co-authored-by: Bright <nsmoak10@yahoo.com>
Co-authored-by: Swept <jamesurquhartwebb@gmail.com>
Co-authored-by: Bright0 <55061890+Bright0@users.noreply.github.com>
This commit is contained in:
DrSmugleaf
2020-10-07 14:02:12 +02:00
committed by GitHub
parent 20eac0de84
commit a984076574
104 changed files with 1313 additions and 172 deletions

View File

@@ -202,6 +202,9 @@ namespace Content.Client.Chat
case ChatChannel.Server:
color = Color.Orange;
break;
case ChatChannel.Radio:
color = Color.Green;
break;
case ChatChannel.OOC:
color = Color.LightSkyBlue;
break;

View File

@@ -177,7 +177,8 @@
"BlockGameArcade",
"KitchenSpike",
"Butcherable",
"Rehydratable"
"Rehydratable",
"Headset",
};
}
}

View File

@@ -1,14 +1,21 @@
using System.Collections.Generic;
using System.Linq;
using Content.Server.GameObjects.Components;
using Content.Server.GameObjects.Components.GUI;
using Content.Server.GameObjects.Components.Headset;
using Content.Server.GameObjects.Components.Items.Storage;
using Content.Server.GameObjects.Components.Observer;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces;
using Content.Server.Interfaces.Chat;
using Content.Shared.Chat;
using Content.Shared.GameObjects.Components.Inventory;
using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.Interfaces;
using Robust.Server.Console;
using Robust.Server.Interfaces.GameObjects;
using Robust.Server.Interfaces.Player;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC;
@@ -37,7 +44,6 @@ namespace Content.Server.Chat
//TODO: make prio based?
private List<TransformChat> _chatTransformHandlers;
[Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
[Dependency] private readonly IServerNetManager _netManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IMoMMILink _mommiLink = default!;
@@ -90,16 +96,16 @@ namespace Content.Server.Chat
return;
}
// Get entity's PlayerSession
IPlayerSession playerSession = source.GetComponent<IActorComponent>().playerSession;
// Check if message exceeds the character limit if the sender is a player
if (playerSession != null)
if (message.Length > MaxMessageLength)
{
DispatchServerMessage(playerSession, Loc.GetString(MaxLengthExceededMessage, MaxMessageLength));
return;
}
if (source.TryGetComponent(out IActorComponent actor) &&
message.Length > MaxMessageLength)
{
var feedback = Loc.GetString(MaxLengthExceededMessage, MaxMessageLength);
DispatchServerMessage(actor.playerSession, feedback);
return;
}
foreach (var handler in _chatTransformHandlers)
{
@@ -107,21 +113,47 @@ namespace Content.Server.Chat
message = handler(source, message);
}
// Ensure the first letter inside the message string is always a capital letter
message = message[0].ToString().ToUpper() + message.Remove(0,1);
message = message.Trim();
var pos = source.Transform.Coordinates;
var clients = _playerManager.GetPlayersInRange(pos, VoiceRange).Select(p => p.ConnectedClient);
if (message.StartsWith(';'))
{
// Remove semicolon
message = message.Substring(1).TrimStart();
// Capitalize first letter
message = message[0].ToString().ToUpper() +
message.Remove(0,1);
if (source.TryGetComponent(out InventoryComponent inventory) &&
inventory.TryGetSlotItem(EquipmentSlotDefines.Slots.EARS, out ItemComponent item) &&
item.Owner.TryGetComponent(out HeadsetComponent headset))
{
headset.RadioRequested = true;
}
else
{
source.PopupMessage(Loc.GetString("You don't have a headset on!"));
}
}
else
{
// Capitalize first letter
message = message[0].ToString().ToUpper() +
message.Remove(0,1);
}
var listeners = EntitySystem.Get<ListeningSystem>();
listeners.PingListeners(source, message);
var msg = _netManager.CreateNetMessage<MsgChatMessage>();
msg.Channel = ChatChannel.Local;
msg.Message = message;
msg.MessageWrap = $"{source.Name} says, \"{{0}}\"";
msg.MessageWrap = Loc.GetString("{0} says, \"{{0}}\"", source.Name);
msg.SenderEntity = source.Uid;
_netManager.ServerSendToMany(msg, clients.ToList());
var listeners = _entitySystemManager.GetEntitySystem<ListeningSystem>();
listeners.PingListeners(source, pos, message);
}
public void EntityMe(IEntity source, string action)

View File

@@ -0,0 +1,104 @@
using System.Collections.Generic;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces;
using Content.Shared.Chat;
using Content.Shared.GameObjects.EntitySystems;
using Robust.Server.Interfaces.GameObjects;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Serialization;
using Robust.Shared.Utility;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Headset
{
[RegisterComponent]
[ComponentReference(typeof(IRadio))]
[ComponentReference(typeof(IListen))]
public class HeadsetComponent : Component, IListen, IRadio, IExamine
{
[Dependency] private readonly IServerNetManager _netManager = default!;
public override string Name => "Headset";
private RadioSystem _radioSystem = default!;
private List<int> _channels = new List<int>();
[ViewVariables(VVAccess.ReadWrite)]
private int BroadcastFrequency { get; set; }
[ViewVariables(VVAccess.ReadWrite)]
public int ListenRange { get; private set; }
public IReadOnlyList<int> Channels => _channels;
public bool RadioRequested { get; set; }
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
// Only listens to speech in exact same position
serializer.DataField(this, h => h.ListenRange, "listenRange", 0);
serializer.DataField(ref _channels, "channels", new List<int> {1459});
serializer.DataField(this, h => h.BroadcastFrequency, "broadcastChannel", 1459);
}
public override void Initialize()
{
base.Initialize();
_radioSystem = EntitySystem.Get<RadioSystem>();
}
public bool CanListen(string message, IEntity source)
{
return RadioRequested;
}
public void Receive(string message, int channel, IEntity source)
{
if (ContainerHelpers.TryGetContainer(Owner, out var container))
{
if (!container.Owner.TryGetComponent(out IActorComponent actor))
return;
var playerChannel = actor.playerSession.ConnectedClient;
var msg = _netManager.CreateNetMessage<MsgChatMessage>();
msg.Channel = ChatChannel.Radio;
msg.Message = message;
msg.MessageWrap = Loc.GetString("[{0}] {1} says, \"{{0}}\"", channel, source.Name);
_netManager.ServerSendMessage(msg, playerChannel);
}
}
public void Listen(string message, IEntity speaker)
{
Broadcast(message, speaker);
}
public void Broadcast(string message, IEntity speaker)
{
_radioSystem.SpreadMessage(this, speaker, message, BroadcastFrequency);
RadioRequested = false;
}
public void Examine(FormattedMessage message, bool inDetailsRange)
{
message.AddText(Loc.GetString("It is set to broadcast over the {0} frequency.", BroadcastFrequency));
message.AddText(Loc.GetString("A small screen on the headset displays the following available frequencies:"));
message.AddText("\n");
message.AddText(Loc.GetString("Use {0} for the currently tuned frequency.", ";"));
}
}
}

View File

@@ -1,23 +0,0 @@
using Content.Server.Interfaces;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
namespace Content.Server.GameObjects.Components
{
[RegisterComponent]
public class ListeningComponent : Component
{
public override string Name => "Listening";
public void PassSpeechData(string speech, IEntity source, float distance)
{
foreach (var listener in Owner.GetAllComponents<IListen>())
{
if (distance > listener.GetListenRange()) { continue; }
listener.HeardSpeech(speech, source);
}
}
}
}

View File

@@ -0,0 +1,126 @@
using System.Collections.Generic;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces;
using Content.Server.Interfaces.Chat;
using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.Interfaces;
using Content.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Serialization;
using Robust.Shared.Utility;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Radio
{
[RegisterComponent]
[ComponentReference(typeof(IRadio))]
[ComponentReference(typeof(IListen))]
public class HandheldRadioComponent : Component, IUse, IListen, IRadio, IActivate, IExamine
{
[Dependency] private readonly IChatManager _chatManager = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
public override string Name => "Radio";
private RadioSystem _radioSystem = default!;
private bool _radioOn;
private List<int> _channels = new List<int>();
[ViewVariables(VVAccess.ReadWrite)]
private int BroadcastFrequency { get; set; }
[ViewVariables(VVAccess.ReadWrite)]
public int ListenRange { get; private set; }
[ViewVariables(VVAccess.ReadWrite)]
public bool RadioOn
{
get => _radioOn;
private set
{
_radioOn = value;
Dirty();
}
}
[ViewVariables] public IReadOnlyList<int> Channels => _channels;
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(this, h => h.ListenRange, "listenRange", 7);
serializer.DataField(ref _channels, "channels", new List<int> {1459});
serializer.DataField(this, h => h.BroadcastFrequency, "broadcastChannel", 1459);
}
public override void Initialize()
{
base.Initialize();
_radioSystem = EntitySystem.Get<RadioSystem>();
RadioOn = false;
}
public void Speak(string message)
{
_chatManager.EntitySay(Owner, message);
}
public bool Use(IEntity user)
{
RadioOn = !RadioOn;
var message = Loc.GetString($"The radio is now {(RadioOn ? "on" : "off")}.");
Owner.PopupMessage(user, message);
return true;
}
public bool UseEntity(UseEntityEventArgs eventArgs)
{
return Use(eventArgs.User);
}
public bool CanListen(string message, IEntity source)
{
return RadioOn &&
Owner.Transform.Coordinates.TryDistance(_entityManager, source.Transform.Coordinates, out var distance) &&
distance <= ListenRange;
}
public void Receive(string message, int channel, IEntity speaker)
{
if (RadioOn)
{
Speak(message);
}
}
public void Listen(string message, IEntity speaker)
{
Broadcast(message, speaker);
}
public void Broadcast(string message, IEntity speaker)
{
_radioSystem.SpreadMessage(this, speaker, message, BroadcastFrequency);
}
public void Activate(ActivateEventArgs eventArgs)
{
Use(eventArgs.User);
}
public void Examine(FormattedMessage message, bool inDetailsRange)
{
message.AddText(Loc.GetString("It is set to broadcast over the {0} frequency.", BroadcastFrequency));
}
}
}

View File

@@ -1,82 +0,0 @@
using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces;
using Content.Server.Interfaces.Chat;
using Content.Shared.Interfaces;
using Content.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components
{
[RegisterComponent]
class RadioComponent : Component, IUse, IListen
{
[Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
[Dependency] private readonly IChatManager _chatManager = default!;
public override string Name => "Radio";
private bool _radioOn;
private int _listenRange = 7;
private RadioSystem _radioSystem = default!;
[ViewVariables]
public bool RadioOn
{
get => _radioOn;
private set
{
_radioOn = value;
Dirty();
}
}
public override void Initialize()
{
base.Initialize();
_radioSystem = _entitySystemManager.GetEntitySystem<RadioSystem>();
RadioOn = false;
}
public void PassOnMessage(string message)
{
if(RadioOn)
{
_radioSystem.SpreadMessage(Owner, message);
}
}
public void Speaker(string message)
{
_chatManager.EntitySay(Owner, message);
}
public bool UseEntity(UseEntityEventArgs eventArgs)
{
RadioOn = !RadioOn;
if(RadioOn)
{
Owner.PopupMessage(eventArgs.User, "The radio is now on.");
}
else
{
Owner.PopupMessage(eventArgs.User, "The radio is now off.");
}
return true;
}
public void HeardSpeech(string speech, IEntity source)
{
PassOnMessage(speech);
}
public int GetListenRange()
{
return _listenRange;
}
}
}

View File

@@ -1,22 +1,22 @@
using Content.Server.GameObjects.Components;
using Content.Server.Interfaces;
using JetBrains.Annotations;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Map;
namespace Content.Server.GameObjects.EntitySystems
{
internal sealed class ListeningSystem : EntitySystem
[UsedImplicitly]
public class ListeningSystem : EntitySystem
{
public void PingListeners(IEntity source, EntityCoordinates sourcePos, string message)
public void PingListeners(IEntity source, string message)
{
foreach (var listener in ComponentManager.EntityQuery<ListeningComponent>())
foreach (var listener in ComponentManager.EntityQuery<IListen>())
{
if (!sourcePos.TryDistance(EntityManager, listener.Owner.Transform.Coordinates, out var distance))
// TODO: Map Position distance
if (listener.CanListen(message, source))
{
return;
listener.Listen(message, source);
}
listener.PassSpeechData(message, source, distance);
}
}
}

View File

@@ -1,31 +1,37 @@
using System.Collections.Generic;
using Content.Server.GameObjects.Components;
using Content.Server.Interfaces;
using System.Collections.Generic;
using System.Linq;
using JetBrains.Annotations;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects;
namespace Content.Server.GameObjects.EntitySystems
{
internal sealed class RadioSystem : EntitySystem
[UsedImplicitly]
public class RadioSystem : EntitySystem
{
private readonly List<string> _messages = new List<string>();
private List<string> _messages;
public void SpreadMessage(IEntity source, string message)
public override void Initialize()
{
if (_messages.Contains(message))
{
return;
}
base.Initialize();
_messages = new List<string>();
}
public void SpreadMessage(IRadio source, IEntity speaker, string message, int channel)
{
if (_messages.Contains(message)) return;
_messages.Add(message);
foreach (var radio in ComponentManager.EntityQuery<RadioComponent>())
foreach (var radio in ComponentManager.EntityQuery<IRadio>())
{
if (radio.Owner == source || !radio.RadioOn)
if (radio.Channels.Contains(channel))
{
continue;
//TODO: once voice identity gets added, pass into receiver via source.GetSpeakerVoice()
radio.Receive(message, channel, speaker);
}
radio.Speaker(message);
}
_messages.Remove(message);

View File

@@ -1,14 +1,21 @@
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Map;
using System;
using System.Collections.Generic;
using System.Text;
namespace Content.Server.Interfaces
{
/// <summary>
/// Interface for objects such as radios meant to have an effect when speech is heard.
/// Interface for objects such as radios meant to have an effect when speech is
/// heard. Requires component reference.
/// </summary>
public interface IListen
public interface IListen : IComponent
{
void HeardSpeech(string speech, IEntity source);
int ListenRange { get; }
int GetListenRange();
bool CanListen(string message, IEntity source);
void Listen(string message, IEntity speaker);
}
}

View File

@@ -0,0 +1,16 @@
using Robust.Shared.Interfaces.GameObjects;
using System;
using System.Collections.Generic;
using System.Text;
namespace Content.Server.Interfaces
{
public interface IRadio
{
IReadOnlyList<int> Channels { get; }
void Receive(string message, int channel, IEntity speaker);
void Broadcast(string message, IEntity speaker);
}
}

View File

@@ -1,14 +0,0 @@
- type: entity
parent: Clothing
id: RadioHeadsetEars
name: headset radio
description: The radio to keep up to date in real time with fun onboard station activities
components:
- type: Sprite
sprite: Clothing/Earpieces/headset.rsi
state: headset
- type: Clothing
Slots:
- ears
sprite: Clothing/Earpieces/headset.rsi

View File

@@ -0,0 +1,123 @@
- type: entity
parent: Clothing
id: HeadsetBase
name: headset
abstract: true
description: An updated, modular intercom that fits over the head. Takes encryption keys.
components:
- type: Headset
- type: Clothing
Slots:
- ears
sprite: Clothing/Ears/Headsets/base.rsi
- type: entity
parent: HeadsetBase
id: HeadsetCargo
name: cargo headset
description: A headset used by the QM and his slaves.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/cargo.rsi
state: icon
- type: entity
parent: HeadsetBase
id: HeadsetCentCom
name: centcomm headset
description: A headset used by the upper echelons of Nanotrasen.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/centcom.rsi
state: icon
- type: entity
parent: HeadsetBase
id: HeadsetCommand
name: command headset
description: A headset with a commanding channel.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/command.rsi
state: icon
- type: entity
parent: HeadsetBase
id: HeadsetEngineering
name: engineering headset
description: When the engineers wish to chat like girls.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/engineering.rsi
state: icon
- type: entity
parent: HeadsetBase
id: HeadsetMedical
name: medical headset
description: A headset for the trained staff of the medbay.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/medical.rsi
state: icon
- type: entity
parent: HeadsetBase
id: HeadsetMedicalScience
name: medical research headset
description: A headset that is a result of the mating between medical and science.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/medicalscience.rsi
state: icon
- type: entity
parent: HeadsetBase
id: HeadsetMining
name: mining headset
description: Headset used by shaft miners.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/mining.rsi
state: icon
- type: entity
parent: HeadsetBase
id: HeadsetRobotics
name: robotics headset
description: Made specifically for the roboticists, who cannot decide between departments.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/robotics.rsi
state: icon
- type: entity
parent: HeadsetBase
id: HeadsetScience
name: science headset
description: A sciency headset. Like usual.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/science.rsi
state: icon
- type: entity
parent: HeadsetBase
id: HeadsetSecurity
name: security headset
description: This is used by your elite security force.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/security.rsi
state: icon
- type: entity
parent: HeadsetBase
id: HeadsetService
name: service headset
description: Headset used by the service staff, tasked with keeping the station full, happy and clean.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/service.rsi
state: icon

View File

@@ -0,0 +1,88 @@
- type: entity
parent: Clothing
id: HeadsetBaseAlt
name: headset
abstract: true
description: An updated, modular intercom that fits over the head. Takes encryption keys.
components:
- type: Headset
- type: entity
parent: HeadsetBaseAlt
id: HeadsetCargoAlt
name: cargo overear-headset
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/cargo.rsi
state: icon_alt
- type: Clothing
Slots:
- ears
sprite: Clothing/Ears/Headsets/cargo.rsi
- type: entity
parent: HeadsetBaseAlt
id: HeadsetCommandAlt
name: command overear-headset
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/command.rsi
state: icon_alt
- type: Clothing
Slots:
- ears
sprite: Clothing/Ears/Headsets/command.rsi
- type: entity
parent: HeadsetBaseAlt
id: HeadsetEngineeringAlt
name: engineering overear-headset
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/engineering.rsi
state: icon_alt
- type: Clothing
Slots:
- ears
sprite: Clothing/Ears/Headsets/engineering.rsi
- type: entity
parent: HeadsetBaseAlt
id: HeadsetMedicalAlt
name: medical overear-headset
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/medical.rsi
state: icon_alt
- type: Clothing
Slots:
- ears
sprite: Clothing/Ears/Headsets/medical.rsi
- type: entity
parent: HeadsetBaseAlt
id: HeadsetSecurityAlt
name: security overear-headset
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/security.rsi
state: icon_alt
- type: Clothing
Slots:
- ears
sprite: Clothing/Ears/Headsets/security.rsi
- type: entity
parent: HeadsetBaseAlt
id: HeadsetSyndicateAlt
name: syndicate overear-headset
description: A syndicate headset that can be used to hear all radio frequencies. Protects ears from flashbangs.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/syndicate.rsi
state: icon_alt
- type: Clothing
Slots:
- ears
sprite: Clothing/Ears/Headsets/syndicate.rsi

View File

@@ -1,16 +1,19 @@
- type: entity
name: "baseradio"
name: radio
parent: BaseItem
id: BaseRadio
id: RadioBase
abstract: true
- type: entity
name: "Handheld Radio"
name: handheld radio
description: A handy handheld radio.
parent: BaseRadio
id: handrad
parent: RadioBase
id: RadioHandheld
components:
- type: Sprite
texture: Objects/Devices/radio.png
- type: Listening
- type: Radio
- type: Sprite
sprite: Objects/Devices/communication.rsi
state: walkietalkie
- type: Icon
sprite: Objects/Devices/communication.rsi
state: walkietalkie

View File

@@ -18,3 +18,4 @@
backpack: BackpackClothingFilled
shoes: ShoesBlack
idcard: CargoPDA
ears: HeadsetCargo

View File

@@ -16,3 +16,4 @@
backpack: BackpackClothingFilled
shoes: ShoesBlack
idcard: AssistantPDA
ears: HeadsetService

View File

@@ -18,3 +18,4 @@
backpack: BackpackClothingFilled
shoes: ShoesBlack
idcard: BartenderPDA
ears: HeadsetService

View File

@@ -17,3 +17,4 @@
backpack: BackpackClothingFilled
shoes: ShoesBlack
idcard: ChefPDA
ears: HeadsetService

View File

@@ -20,3 +20,4 @@
mask: MaskClown
pocket1: BikeHorn
idcard: ClownPDA
ears: HeadsetService

View File

@@ -18,3 +18,4 @@
shoes: ShoesGaloshes
head: HatPurplesoft
idcard: JanitorPDA
ears: HeadsetService

View File

@@ -23,3 +23,4 @@
pocket2: Paper
mask: MaskMime
idcard: MimePDA
ears: HeadsetService

View File

@@ -35,3 +35,4 @@
gloves: GlovesCaptain
outerclothing: OuterclothingCaparmor
idcard: CaptainPDA
ears: HeadsetCommand

View File

@@ -27,3 +27,4 @@
shoes: ShoesBrown
head: HatHopcap
idcard: HoPPDA
ears: HeadsetCommand

View File

@@ -23,3 +23,4 @@
shoes: ShoesBrown
idcard: CEPDA
belt: UtilityBeltClothingFilled
ears: HeadsetEngineeringAlt

View File

@@ -21,3 +21,4 @@
outerclothing: OuterclothingHazard
idcard: EngineerPDA
belt: UtilityBeltClothingFilled
ears: HeadsetEngineering

View File

@@ -23,3 +23,4 @@
shoes: ShoesBrown
outerclothing: OuterclothingLabcoatcmo
idcard: CMOPDA
ears: HeadsetMedicalAlt

View File

@@ -19,3 +19,4 @@
shoes: ShoesWhite
outerclothing: OuterclothingLabcoatmedspecopen
idcard: MedicalPDA
ears: HeadsetMedical

View File

@@ -22,3 +22,4 @@
shoes: ShoesBrown
outerclothing: OuterclothingLabcoatopen
idcard: RnDPDA
ears: HeadsetScienceAlt

View File

@@ -19,3 +19,4 @@
shoes: ShoesWhite
outerclothing: OuterclothingLabcoat
idcard: SciencePDA
ears: HeadsetScience

View File

@@ -24,3 +24,4 @@
eyes: SecGlasses
head: HatBeretHoS
idcard: HoSPDA
ears: HeadsetSecurityAlt

View File

@@ -21,3 +21,4 @@
eyes: SecGlasses
outerclothing: OuterclothingArmorVest
idcard: SecurityPDA
ears: HeadsetSecurity

Binary file not shown.

Before

Width:  |  Height:  |  Size: 298 B

View File

@@ -1 +0,0 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "equipped-EARS", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "headset", "directions": 1, "delays": [[1.0]]}]}

Binary file not shown.

After

Width:  |  Height:  |  Size: 279 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 309 B

View File

@@ -0,0 +1,47 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
"states": [
{
"name": "equipped-EARS",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "cypherkey",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "icon",
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 317 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 323 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 326 B

View File

@@ -0,0 +1,56 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
"states": [
{
"name": "equipped-EARS",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "cargo_cypherkey",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "icon",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "qm_cypherkey",
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 307 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 286 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 315 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 469 B

View File

@@ -0,0 +1,38 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
"states": [
{
"name": "cent_cypherkey",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "icon",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "icon_alt",
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 282 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 334 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 294 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 325 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 504 B

View File

@@ -0,0 +1,65 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
"states": [
{
"name": "equipped-EARS",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "com_cypherkey",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "icon",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "icon_alt",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "hop_cypherkey",
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 295 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 296 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 401 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 282 B

View File

@@ -0,0 +1,56 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
"states": [
{
"name": "equipped-EARS",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "ce_cypherkey",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "eng_cypherkey",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "icon",
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 301 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 323 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 287 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 469 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 304 B

View File

@@ -0,0 +1,65 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
"states": [
{
"name": "equipped-EARS",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "cmo_cypherkey",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "med_cypherkey",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "icon",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "icon_alt",
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 316 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 329 B

View File

@@ -0,0 +1,29 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
"states": [
{
"name": "medsci_cypherkey",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "icon",
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 396 B

View File

@@ -0,0 +1,29 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
"states": [
{
"name": "mine_cypherkey",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "icon",
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 316 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 296 B

View File

@@ -0,0 +1,29 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
"states": [
{
"name": "rob_cypherkey",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "icon",
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 339 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 311 B

View File

@@ -0,0 +1,38 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
"states": [
{
"name": "rd_cypherkey",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "sci_cypherkey",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "icon",
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 300 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 293 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 354 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 288 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 283 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 455 B

View File

@@ -0,0 +1,65 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
"states": [
{
"name": "equipped-EARS",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "hos_cypherkey",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "sec_cypherkey",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "icon",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "icon_alt",
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 289 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 311 B

View File

@@ -0,0 +1,29 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
"states": [
{
"name": "srv_cypherkey",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "icon",
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 320 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 306 B

View File

@@ -0,0 +1,20 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
"states": [
{
"name": "srvmed_cypherkey",
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 320 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 294 B

View File

@@ -0,0 +1,29 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
"states": [
{
"name": "srvsec_cypherkey",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "icon",
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 306 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 331 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 485 B

View File

@@ -0,0 +1,47 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
"states": [
{
"name": "equipped-EARS",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "syn_cypherkey",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "icon_alt",
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 291 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 317 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 253 B

View File

@@ -0,0 +1,93 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6",
"states": [
{
"name": "beacon",
"directions": 1,
"delays": [
[
1.8,
0.1
]
]
},
{
"name": "beacon_dead",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "signaller",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "signaller-inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "signaller-inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "walkietalkie",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "walkietalkie-off",
"directions": 1,
"delays": [
[
1
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 300 B

Some files were not shown because too many files have changed in this diff Show More