diff --git a/Content.Server/EntryPoint.cs b/Content.Server/EntryPoint.cs index 450519faa9..7e08028eb0 100644 --- a/Content.Server/EntryPoint.cs +++ b/Content.Server/EntryPoint.cs @@ -178,6 +178,9 @@ namespace Content.Server factory.Register(); + factory.Register(); + factory.Register(); + IoCManager.Register(); IoCManager.Register(); IoCManager.Register(); diff --git a/Content.Server/GameObjects/Components/Sound/EmitSoundOnUseComponent].cs b/Content.Server/GameObjects/Components/Sound/EmitSoundOnUseComponent].cs new file mode 100644 index 0000000000..05b6383eb5 --- /dev/null +++ b/Content.Server/GameObjects/Components/Sound/EmitSoundOnUseComponent].cs @@ -0,0 +1,47 @@ +using System; +using System.Collections.Generic; +using Robust.Shared.GameObjects; +using Robust.Shared.Log; +using Robust.Shared.Utility; +using YamlDotNet.RepresentationModel; +using Content.Server.Interfaces; +using Content.Shared.GameObjects; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; +using Content.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects.EntitySystems; +using Content.Shared.Audio; +using Robust.Shared.Prototypes; +using Robust.Shared.IoC; +using Robust.Shared.Audio; + +namespace Content.Server.GameObjects.Components.Sound +{ + /// + /// Simple sound emitter that emits sound on use in hand + /// + public class EmitSoundOnUseComponent : Component, IUse + { + /// + /// + public override string Name => "EmitSoundOnUse"; + + public string _soundName; + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + serializer.DataField(ref _soundName, "sound", ""); + } + + bool IUse.UseEntity(UseEntityEventArgs eventArgs) + { + if (!string.IsNullOrWhiteSpace(_soundName)) + { + Owner.GetComponent().Play(_soundName, AudioParams.Default.WithVolume(-2f)); + return true; + } + return false; + } + } +} diff --git a/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs b/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs new file mode 100644 index 0000000000..f7ed7e3aa4 --- /dev/null +++ b/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs @@ -0,0 +1,59 @@ +using System; +using System.Collections.Generic; +using Robust.Shared.GameObjects; +using Robust.Shared.Log; +using Robust.Shared.Utility; +using YamlDotNet.RepresentationModel; +using Content.Server.Interfaces; +using Content.Shared.GameObjects; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; +using Content.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects.EntitySystems; +using Content.Shared.Audio; +using Robust.Shared.Prototypes; +using Robust.Shared.IoC; +using Robust.Shared.Maths; +using Robust.Shared.Audio; + +namespace Content.Server.GameObjects.Components.Sound +{ + /// + /// Changes footstep sound + /// + public class FootstepModifierComponent : Component + { + #pragma warning disable 649 + [Dependency] private readonly IPrototypeManager _prototypeManager; + #pragma warning restore 649 + /// + /// + private Random _footstepRandom; + + public override string Name => "FootstepModifier"; + + public string _soundCollectionName; + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + serializer.DataField(ref _soundCollectionName, "footstepSoundCollection", ""); + } + + public override void Initialize() + { + base.Initialize(); + _footstepRandom = new Random(Owner.Uid.GetHashCode() ^ DateTime.Now.GetHashCode()); + } + + public void PlayFootstep() + { + if (!string.IsNullOrWhiteSpace(_soundCollectionName)) + { + var soundCollection = _prototypeManager.Index(_soundCollectionName); + var file = _footstepRandom.Pick(soundCollection.PickFiles); + Owner.GetComponent().Play(file, AudioParams.Default.WithVolume(-2f)); + } + } + } +} diff --git a/Content.Server/GameObjects/EntitySystems/MoverSystem.cs b/Content.Server/GameObjects/EntitySystems/MoverSystem.cs index 7d3624d81c..9d6dfafc6c 100644 --- a/Content.Server/GameObjects/EntitySystems/MoverSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/MoverSystem.cs @@ -21,6 +21,8 @@ using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Players; using Robust.Shared.Prototypes; +using Content.Server.GameObjects.Components.Sound; +using Content.Shared.GameObjects.Components.Inventory; namespace Content.Server.GameObjects.EntitySystems { @@ -149,7 +151,16 @@ namespace Content.Server.GameObjects.EntitySystems if (mover.StepSoundDistance > distanceNeeded) { mover.StepSoundDistance = 0; - PlayFootstepSound(transform.GridPosition); + if (mover.Owner.TryGetComponent(out var inventory) + && inventory.TryGetSlotItem(EquipmentSlotDefines.Slots.SHOES, out var item) + && item.Owner.TryGetComponent(out var modifier)) + { + modifier.PlayFootstep(); + } + else + { + PlayFootstepSound(transform.GridPosition); + } } } } diff --git a/Resources/Audio/effects/footsteps/clownstep1.ogg b/Resources/Audio/effects/footsteps/clownstep1.ogg new file mode 100644 index 0000000000..740fb5fd9f Binary files /dev/null and b/Resources/Audio/effects/footsteps/clownstep1.ogg differ diff --git a/Resources/Audio/effects/footsteps/clownstep2.ogg b/Resources/Audio/effects/footsteps/clownstep2.ogg new file mode 100644 index 0000000000..5a5426b3fe Binary files /dev/null and b/Resources/Audio/effects/footsteps/clownstep2.ogg differ diff --git a/Resources/Audio/effects/footsteps/sources.txt b/Resources/Audio/effects/footsteps/sources.txt index ca35309007..b065629097 100644 --- a/Resources/Audio/effects/footsteps/sources.txt +++ b/Resources/Audio/effects/footsteps/sources.txt @@ -1 +1,4 @@ -Sounds in this folder taken from here: https://github.com/discordia-space/CEV-Eris/tree/04f9e57ecf8a1c89ae2cba0f6803b6c5e9887c15/sound/effects/footstep +Sounds in this folder taken from here: +https://github.com/discordia-space/CEV-Eris/tree/04f9e57ecf8a1c89ae2cba0f6803b6c5e9887c15/sound/effects/footstep +https://github.com/tgstation/tgstation/tree/f8ee37afc00bce1ad421615eaa0e4cbddd5eea90/sound/effects +https://github.com/vgstation-coders/vgstation13/tree/fbe7abec4cbadf2ad01369838828704fd7ca81ea/sound/effects \ No newline at end of file diff --git a/Resources/Audio/effects/footsteps/suitstep1.ogg b/Resources/Audio/effects/footsteps/suitstep1.ogg new file mode 100644 index 0000000000..8de7412490 Binary files /dev/null and b/Resources/Audio/effects/footsteps/suitstep1.ogg differ diff --git a/Resources/Audio/effects/footsteps/suitstep2.ogg b/Resources/Audio/effects/footsteps/suitstep2.ogg new file mode 100644 index 0000000000..56396fb71e Binary files /dev/null and b/Resources/Audio/effects/footsteps/suitstep2.ogg differ diff --git a/Resources/Audio/items/bikehorn.ogg b/Resources/Audio/items/bikehorn.ogg new file mode 100644 index 0000000000..91b4585d43 Binary files /dev/null and b/Resources/Audio/items/bikehorn.ogg differ diff --git a/Resources/Prototypes/Entities/Clothing/backpacks.yml b/Resources/Prototypes/Entities/Clothing/backpacks.yml index fd7e691c49..c2ca6f2991 100644 --- a/Resources/Prototypes/Entities/Clothing/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/backpacks.yml @@ -17,3 +17,37 @@ sprite: Clothing/backpack.rsi - type: Storage Capacity: 100 + +- type: entity + parent: BackpackClothing + id: ClownPack + name: Giggles Von Honkerton + description: It's a backpack made by Honk! Co. + components: + - type: Sprite + sprite: Clothing/backpack_clown.rsi + state: icon + + - type: Icon + sprite: Clothing/backpack_clown.rsi + state: icon + + - type: Clothing + sprite: Clothing/backpack_clown.rsi + +- type: entity + parent: BackpackClothing + id: SecPack + name: Security Backpack + description: It's a very robust backpack. + components: + - type: Sprite + sprite: Clothing/backpack_sec.rsi + state: icon + + - type: Icon + sprite: Clothing/backpack_sec.rsi + state: icon + + - type: Clothing + sprite: Clothing/backpack_sec.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/eyes.yml b/Resources/Prototypes/Entities/Clothing/eyes.yml index b79f273749..e9974afbf0 100644 --- a/Resources/Prototypes/Entities/Clothing/eyes.yml +++ b/Resources/Prototypes/Entities/Clothing/eyes.yml @@ -37,3 +37,18 @@ state: sunglasses - type: Clothing sprite: Clothing/sunglasses.rsi + +- type: entity + parent: GlassesBase + id: SecGlasses + name: Security Sunglasses + description: Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes. Often worn by budget security officers. + components: + - type: Sprite + sprite: Clothing/sunglasses_sec.rsi + state: icon + - type: Icon + sprite: Clothing/sunglasses_sec.rsi + state: icon + - type: Clothing + sprite: Clothing/sunglasses_sec.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/helmets.yml b/Resources/Prototypes/Entities/Clothing/helmets.yml index c53e55a095..056bb679f2 100644 --- a/Resources/Prototypes/Entities/Clothing/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/helmets.yml @@ -1,18 +1,33 @@ - type: entity parent: Clothing - id: HelmetSecurity - name: Security Helmet + id: BaseHelmet + name: Helmet description: "A slick logo covers the ear: \"Concussions are better than holes!\"" components: - type: Sprite - sprite: Clothing/helmet_sec.rsi + sprite: Clothing/helmet_combat.rsi state: helmet - type: Icon - sprite: Clothing/helmet_sec.rsi + sprite: Clothing/helmet_combat.rsi state: helmet - type: Clothing Slots: - head + sprite: Clothing/helmet_combat.rsi + +- type: entity + parent: BaseHelmet + id: HelmetSecurity + name: Tactical Helmet + description: Standard Security gear. Protects the head from impacts. Can be attached with a flashlight. + components: + - type: Sprite + sprite: Clothing/helmet_sec.rsi + state: icon + - type: Icon + sprite: Clothing/helmet_sec.rsi + state: icon + - type: Clothing sprite: Clothing/helmet_sec.rsi - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/masks.yml b/Resources/Prototypes/Entities/Clothing/masks.yml index ffda280bc1..9a0c7d2388 100644 --- a/Resources/Prototypes/Entities/Clothing/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/masks.yml @@ -33,3 +33,18 @@ state: breath - type: Clothing sprite: Clothing/mask_breath.rsi + +- type: entity + parent: MasksBase + id: MaskClown + name: Clown Wig and Mask + description: A true prankster's facial attire. A clown is incomplete without his wig and mask. + components: + - type: Sprite + sprite: Clothing/mask_clown.rsi + state: icon + - type: Icon + sprite: Clothing/mask_clown.rsi + state: icon + - type: Clothing + sprite: Clothing/mask_clown.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/shoes.yml b/Resources/Prototypes/Entities/Clothing/shoes.yml index 94adc7c0e9..59c970247b 100644 --- a/Resources/Prototypes/Entities/Clothing/shoes.yml +++ b/Resources/Prototypes/Entities/Clothing/shoes.yml @@ -41,3 +41,45 @@ - type: Clothing sprite: Clothing/shoes_white.rsi + +- type: entity + parent: ShoesBase + id: ClownShoes + name: Clown Shoes + description: The prankster's standard-issue clowning shoes. Damn they're huge! + components: + - type: Sprite + sprite: Clothing/shoes_clown.rsi + state: icon + + - type: Icon + sprite: Clothing/shoes_clown.rsi + state: icon + + - type: Clothing + sprite: Clothing/shoes_clown.rsi + + - type: Sound + - type: FootstepModifier + footstepSoundCollection: footstep_clown + +- type: entity + parent: ShoesBase + id: JackbootShoes + name: Jackboots + description: Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time. + components: + - type: Sprite + sprite: Clothing/shoes_jackboots.rsi + state: icon + + - type: Icon + sprite: Clothing/shoes_jackboots.rsi + state: icon + + - type: Clothing + sprite: Clothing/shoes_jackboots.rsi + + - type: Sound + - type: FootstepModifier + footstepSoundCollection: footstep_heavy diff --git a/Resources/Prototypes/Entities/Clothing/uniforms.yml b/Resources/Prototypes/Entities/Clothing/uniforms.yml index 2d5afb217f..160b6844c5 100644 --- a/Resources/Prototypes/Entities/Clothing/uniforms.yml +++ b/Resources/Prototypes/Entities/Clothing/uniforms.yml @@ -74,3 +74,37 @@ - type: Clothing sprite: Clothing/uniform_assistant.rsi + +- type: entity + parent: UniformBase + id: UniformClown + name: Clown Suit + description: HONK! + components: + - type: Sprite + sprite: Clothing/uniform_clown.rsi + state: icon + + - type: Icon + sprite: Clothing/uniform_clown.rsi + state: icon + + - type: Clothing + sprite: Clothing/uniform_clown.rsi + +- type: entity + parent: UniformBase + id: UniformSec + name: Security Jumpsuit + description: A jumpsuit made of strong material, providing robust protection. + components: + - type: Sprite + sprite: Clothing/uniform_sec.rsi + state: icon + + - type: Icon + sprite: Clothing/uniform_sec.rsi + state: icon + + - type: Clothing + sprite: Clothing/uniform_sec.rsi diff --git a/Resources/Prototypes/Entities/Items.yml b/Resources/Prototypes/Entities/Items.yml index d4874e8adf..9a8e9a04a2 100644 --- a/Resources/Prototypes/Entities/Items.yml +++ b/Resources/Prototypes/Entities/Items.yml @@ -114,3 +114,25 @@ state: lantern_off - type: PointLight state: Off + +- type: entity + name: Bike Horn + parent: BaseItem + id: BikeHorn + description: A horn off of a bicycle. + components: + - type: Sprite + sprite: Objects/bikehorn.rsi + state: icon + + - type: Icon + sprite: Objects/bikehorn.rsi + state: icon + + - type: Item + Size: 5 + sprite: Objects/bikehorn.rsi + + - type: Sound + - type: EmitSoundOnUse + sound: /Audio/items/bikehorn.ogg diff --git a/Resources/Prototypes/SoundCollections/footsteps.yml b/Resources/Prototypes/SoundCollections/footsteps.yml index 7b8f14121d..e58763a3db 100644 --- a/Resources/Prototypes/SoundCollections/footsteps.yml +++ b/Resources/Prototypes/SoundCollections/footsteps.yml @@ -25,3 +25,14 @@ - /Audio/effects/footsteps/plating4.ogg - /Audio/effects/footsteps/plating5.ogg +- type: sound_collection + id: footstep_clown + files: + - /Audio/effects/footsteps/clownstep1.ogg + - /Audio/effects/footsteps/clownstep2.ogg + +- type: sound_collection + id: footstep_heavy + files: + - /Audio/effects/footsteps/suitstep1.ogg + - /Audio/effects/footsteps/suitstep2.ogg \ No newline at end of file diff --git a/Resources/Textures/Clothing/backpack_clown.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/backpack_clown.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..df29738999 Binary files /dev/null and b/Resources/Textures/Clothing/backpack_clown.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/backpack_clown.rsi/icon.png b/Resources/Textures/Clothing/backpack_clown.rsi/icon.png new file mode 100644 index 0000000000..5c3120c882 Binary files /dev/null and b/Resources/Textures/Clothing/backpack_clown.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/backpack_clown.rsi/inhand-left.png b/Resources/Textures/Clothing/backpack_clown.rsi/inhand-left.png new file mode 100644 index 0000000000..57814f0f9a Binary files /dev/null and b/Resources/Textures/Clothing/backpack_clown.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/backpack_clown.rsi/inhand-right.png b/Resources/Textures/Clothing/backpack_clown.rsi/inhand-right.png new file mode 100644 index 0000000000..9f0b0ad81c Binary files /dev/null and b/Resources/Textures/Clothing/backpack_clown.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/backpack_clown.rsi/meta.json b/Resources/Textures/Clothing/backpack_clown.rsi/meta.json new file mode 100644 index 0000000000..a29f6c8a12 --- /dev/null +++ b/Resources/Textures/Clothing/backpack_clown.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [{"name": "equipped-BACKPACK", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Clothing/backpack_sec.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/backpack_sec.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..597ad90d3d Binary files /dev/null and b/Resources/Textures/Clothing/backpack_sec.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/backpack_sec.rsi/icon.png b/Resources/Textures/Clothing/backpack_sec.rsi/icon.png new file mode 100644 index 0000000000..28761c9708 Binary files /dev/null and b/Resources/Textures/Clothing/backpack_sec.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/backpack_sec.rsi/inhand-left.png b/Resources/Textures/Clothing/backpack_sec.rsi/inhand-left.png new file mode 100644 index 0000000000..97996f4e07 Binary files /dev/null and b/Resources/Textures/Clothing/backpack_sec.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/backpack_sec.rsi/inhand-right.png b/Resources/Textures/Clothing/backpack_sec.rsi/inhand-right.png new file mode 100644 index 0000000000..818680281b Binary files /dev/null and b/Resources/Textures/Clothing/backpack_sec.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/backpack_sec.rsi/meta.json b/Resources/Textures/Clothing/backpack_sec.rsi/meta.json new file mode 100644 index 0000000000..a29f6c8a12 --- /dev/null +++ b/Resources/Textures/Clothing/backpack_sec.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [{"name": "equipped-BACKPACK", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Clothing/helmet_combat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/helmet_combat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..4eab46dab3 Binary files /dev/null and b/Resources/Textures/Clothing/helmet_combat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/helmet_sec.rsi/helmet.png b/Resources/Textures/Clothing/helmet_combat.rsi/helmet.png similarity index 100% rename from Resources/Textures/Clothing/helmet_sec.rsi/helmet.png rename to Resources/Textures/Clothing/helmet_combat.rsi/helmet.png diff --git a/Resources/Textures/Clothing/helmet_combat.rsi/meta.json b/Resources/Textures/Clothing/helmet_combat.rsi/meta.json new file mode 100644 index 0000000000..3f9020d7c2 --- /dev/null +++ b/Resources/Textures/Clothing/helmet_combat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "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-HELMET", + "directions": 4, + "delays": [ + [ 1.0 ], + [ 1.0 ], + [ 1.0 ], + [ 1.0 ] + ] + }, + { + "name": "helmet", + "directions": 1, + "delays": [ [ 1.0 ] ] + } + ] +} diff --git a/Resources/Textures/Clothing/helmet_sec.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/helmet_sec.rsi/equipped-HELMET.png index 4eab46dab3..cb58d5a1c0 100644 Binary files a/Resources/Textures/Clothing/helmet_sec.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/helmet_sec.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/helmet_sec.rsi/icon.png b/Resources/Textures/Clothing/helmet_sec.rsi/icon.png new file mode 100644 index 0000000000..e0bdc0ef5f Binary files /dev/null and b/Resources/Textures/Clothing/helmet_sec.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/helmet_sec.rsi/inhand-left.png b/Resources/Textures/Clothing/helmet_sec.rsi/inhand-left.png new file mode 100644 index 0000000000..a991f00ea1 Binary files /dev/null and b/Resources/Textures/Clothing/helmet_sec.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/helmet_sec.rsi/inhand-right.png b/Resources/Textures/Clothing/helmet_sec.rsi/inhand-right.png new file mode 100644 index 0000000000..2bc679ab29 Binary files /dev/null and b/Resources/Textures/Clothing/helmet_sec.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/helmet_sec.rsi/meta.json b/Resources/Textures/Clothing/helmet_sec.rsi/meta.json index 3f9020d7c2..6496645616 100644 --- a/Resources/Textures/Clothing/helmet_sec.rsi/meta.json +++ b/Resources/Textures/Clothing/helmet_sec.rsi/meta.json @@ -1,26 +1 @@ -{ - "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-HELMET", - "directions": 4, - "delays": [ - [ 1.0 ], - [ 1.0 ], - [ 1.0 ], - [ 1.0 ] - ] - }, - { - "name": "helmet", - "directions": 1, - "delays": [ [ 1.0 ] ] - } - ] -} +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [{"name": "equipped-HELMET", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Clothing/mask_clown.rsi/equipped-MASK.png b/Resources/Textures/Clothing/mask_clown.rsi/equipped-MASK.png new file mode 100644 index 0000000000..d2b0f392a0 Binary files /dev/null and b/Resources/Textures/Clothing/mask_clown.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/mask_clown.rsi/icon.png b/Resources/Textures/Clothing/mask_clown.rsi/icon.png new file mode 100644 index 0000000000..ddc11ca3a5 Binary files /dev/null and b/Resources/Textures/Clothing/mask_clown.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/mask_clown.rsi/inhand-left.png b/Resources/Textures/Clothing/mask_clown.rsi/inhand-left.png new file mode 100644 index 0000000000..72f12804fa Binary files /dev/null and b/Resources/Textures/Clothing/mask_clown.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/mask_clown.rsi/inhand-right.png b/Resources/Textures/Clothing/mask_clown.rsi/inhand-right.png new file mode 100644 index 0000000000..8767fadb03 Binary files /dev/null and b/Resources/Textures/Clothing/mask_clown.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/mask_clown.rsi/meta.json b/Resources/Textures/Clothing/mask_clown.rsi/meta.json new file mode 100644 index 0000000000..0fadeb20fc --- /dev/null +++ b/Resources/Textures/Clothing/mask_clown.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [{"name": "equipped-MASK", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Clothing/shoes_clown.rsi/equipped-FEET.png b/Resources/Textures/Clothing/shoes_clown.rsi/equipped-FEET.png new file mode 100644 index 0000000000..0389b222f2 Binary files /dev/null and b/Resources/Textures/Clothing/shoes_clown.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/shoes_clown.rsi/icon.png b/Resources/Textures/Clothing/shoes_clown.rsi/icon.png new file mode 100644 index 0000000000..fb983e0b2c Binary files /dev/null and b/Resources/Textures/Clothing/shoes_clown.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/shoes_clown.rsi/inhand-left.png b/Resources/Textures/Clothing/shoes_clown.rsi/inhand-left.png new file mode 100644 index 0000000000..c94e0b7a61 Binary files /dev/null and b/Resources/Textures/Clothing/shoes_clown.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/shoes_clown.rsi/inhand-right.png b/Resources/Textures/Clothing/shoes_clown.rsi/inhand-right.png new file mode 100644 index 0000000000..215c8fc987 Binary files /dev/null and b/Resources/Textures/Clothing/shoes_clown.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/shoes_clown.rsi/meta.json b/Resources/Textures/Clothing/shoes_clown.rsi/meta.json new file mode 100644 index 0000000000..538c5326d1 --- /dev/null +++ b/Resources/Textures/Clothing/shoes_clown.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [{"name": "equipped-FEET", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Clothing/shoes_jackboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/shoes_jackboots.rsi/equipped-FEET.png new file mode 100644 index 0000000000..a8fc9e7302 Binary files /dev/null and b/Resources/Textures/Clothing/shoes_jackboots.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/shoes_jackboots.rsi/icon.png b/Resources/Textures/Clothing/shoes_jackboots.rsi/icon.png new file mode 100644 index 0000000000..190b813cc3 Binary files /dev/null and b/Resources/Textures/Clothing/shoes_jackboots.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/shoes_jackboots.rsi/inhand-left.png b/Resources/Textures/Clothing/shoes_jackboots.rsi/inhand-left.png new file mode 100644 index 0000000000..03bdacf9fb Binary files /dev/null and b/Resources/Textures/Clothing/shoes_jackboots.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/shoes_jackboots.rsi/inhand-right.png b/Resources/Textures/Clothing/shoes_jackboots.rsi/inhand-right.png new file mode 100644 index 0000000000..f00d861ca5 Binary files /dev/null and b/Resources/Textures/Clothing/shoes_jackboots.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/shoes_jackboots.rsi/meta.json b/Resources/Textures/Clothing/shoes_jackboots.rsi/meta.json new file mode 100644 index 0000000000..538c5326d1 --- /dev/null +++ b/Resources/Textures/Clothing/shoes_jackboots.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [{"name": "equipped-FEET", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Clothing/sunglasses_sec.rsi/equipped-EYES.png b/Resources/Textures/Clothing/sunglasses_sec.rsi/equipped-EYES.png new file mode 100644 index 0000000000..62e8bb0a2f Binary files /dev/null and b/Resources/Textures/Clothing/sunglasses_sec.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/sunglasses_sec.rsi/icon.png b/Resources/Textures/Clothing/sunglasses_sec.rsi/icon.png new file mode 100644 index 0000000000..bb46a99276 Binary files /dev/null and b/Resources/Textures/Clothing/sunglasses_sec.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/sunglasses_sec.rsi/inhand-left.png b/Resources/Textures/Clothing/sunglasses_sec.rsi/inhand-left.png new file mode 100644 index 0000000000..9712db9d5f Binary files /dev/null and b/Resources/Textures/Clothing/sunglasses_sec.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/sunglasses_sec.rsi/inhand-right.png b/Resources/Textures/Clothing/sunglasses_sec.rsi/inhand-right.png new file mode 100644 index 0000000000..2a225f98bc Binary files /dev/null and b/Resources/Textures/Clothing/sunglasses_sec.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/sunglasses_sec.rsi/meta.json b/Resources/Textures/Clothing/sunglasses_sec.rsi/meta.json new file mode 100644 index 0000000000..531a93c399 --- /dev/null +++ b/Resources/Textures/Clothing/sunglasses_sec.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [{"name": "equipped-EYES", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Clothing/uniform_clown.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/uniform_clown.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..3fe3856e33 Binary files /dev/null and b/Resources/Textures/Clothing/uniform_clown.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/uniform_clown.rsi/icon.png b/Resources/Textures/Clothing/uniform_clown.rsi/icon.png new file mode 100644 index 0000000000..c9b53df654 Binary files /dev/null and b/Resources/Textures/Clothing/uniform_clown.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/uniform_clown.rsi/inhand-left.png b/Resources/Textures/Clothing/uniform_clown.rsi/inhand-left.png new file mode 100644 index 0000000000..48cbc3898b Binary files /dev/null and b/Resources/Textures/Clothing/uniform_clown.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/uniform_clown.rsi/inhand-right.png b/Resources/Textures/Clothing/uniform_clown.rsi/inhand-right.png new file mode 100644 index 0000000000..965b9229cb Binary files /dev/null and b/Resources/Textures/Clothing/uniform_clown.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/uniform_clown.rsi/meta.json b/Resources/Textures/Clothing/uniform_clown.rsi/meta.json new file mode 100644 index 0000000000..16408ad188 --- /dev/null +++ b/Resources/Textures/Clothing/uniform_clown.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [{"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Clothing/uniform_sec.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/uniform_sec.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..0b70362132 Binary files /dev/null and b/Resources/Textures/Clothing/uniform_sec.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/uniform_sec.rsi/icon.png b/Resources/Textures/Clothing/uniform_sec.rsi/icon.png new file mode 100644 index 0000000000..4e2aefba0e Binary files /dev/null and b/Resources/Textures/Clothing/uniform_sec.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/uniform_sec.rsi/inhand-left.png b/Resources/Textures/Clothing/uniform_sec.rsi/inhand-left.png new file mode 100644 index 0000000000..7a2fab4918 Binary files /dev/null and b/Resources/Textures/Clothing/uniform_sec.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/uniform_sec.rsi/inhand-right.png b/Resources/Textures/Clothing/uniform_sec.rsi/inhand-right.png new file mode 100644 index 0000000000..8a3b1671ac Binary files /dev/null and b/Resources/Textures/Clothing/uniform_sec.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/uniform_sec.rsi/meta.json b/Resources/Textures/Clothing/uniform_sec.rsi/meta.json new file mode 100644 index 0000000000..16408ad188 --- /dev/null +++ b/Resources/Textures/Clothing/uniform_sec.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [{"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/bikehorn.rsi/icon.png b/Resources/Textures/Objects/bikehorn.rsi/icon.png new file mode 100644 index 0000000000..9b9003c1f6 Binary files /dev/null and b/Resources/Textures/Objects/bikehorn.rsi/icon.png differ diff --git a/Resources/Textures/Objects/bikehorn.rsi/inhand-left.png b/Resources/Textures/Objects/bikehorn.rsi/inhand-left.png new file mode 100644 index 0000000000..5187c5e533 Binary files /dev/null and b/Resources/Textures/Objects/bikehorn.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/bikehorn.rsi/inhand-right.png b/Resources/Textures/Objects/bikehorn.rsi/inhand-right.png new file mode 100644 index 0000000000..3e343a34f3 Binary files /dev/null and b/Resources/Textures/Objects/bikehorn.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/bikehorn.rsi/meta.json b/Resources/Textures/Objects/bikehorn.rsi/meta.json new file mode 100644 index 0000000000..6bdaa41229 --- /dev/null +++ b/Resources/Textures/Objects/bikehorn.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [{"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file