diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs index 628e698d311ca2..d0618f762a15b0 100644 --- a/Content.Client/Lobby/LobbyState.cs +++ b/Content.Client/Lobby/LobbyState.cs @@ -71,7 +71,7 @@ protected override void Startup() }; LayoutContainer.SetAnchorPreset(_lobby, LayoutContainer.LayoutPreset.Wide); - _lobby.ServerName.Text = _baseClient.GameInfo?.ServerName; //The eye of refactor gazes upon you... + _lobby.ServerName.Text = "Hippie Station Official Server"; //The eye of refactor gazes upon you... UpdateLobbyUi(); _lobby.CharacterPreview.CharacterSetupButton.OnPressed += OnSetupPressed; diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml index 5cd7e1132ed698..fe91ec743c5b34 100644 --- a/Content.Client/Lobby/UI/LobbyGui.xaml +++ b/Content.Client/Lobby/UI/LobbyGui.xaml @@ -51,7 +51,7 @@ - diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs index 58f68ff45821ef..a4707429ee67af 100644 --- a/Content.Client/Stylesheets/StyleNano.cs +++ b/Content.Client/Stylesheets/StyleNano.cs @@ -85,6 +85,7 @@ public sealed class StyleNano : StyleBase public static readonly Color GoodGreenFore = Color.FromHex("#31843E"); public static readonly Color ConcerningOrangeFore = Color.FromHex("#A5762F"); public static readonly Color DangerousRedFore = Color.FromHex("#BB3232"); + public static readonly Color HippieBlue = Color.FromHex("#214478"); public static readonly Color DisabledFore = Color.FromHex("#5A5A5A"); public static readonly Color ButtonColorDefault = Color.FromHex("#464966"); @@ -478,6 +479,7 @@ public StyleNano(IResourceCache resCache) : base(resCache) var sliderFillWhite = new StyleBoxTexture(sliderFillBox) { Modulate = Color.White }; var boxFont13 = resCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13); + var comicFont20 = resCache.GetFont("/Fonts/qd-better-comic-sans-font/Qdbettercomicsansboldalternates.ttf", 20); var insetBack = new StyleBoxTexture { @@ -1012,8 +1014,8 @@ public StyleNano(IResourceCache resCache) : base(resCache) new StyleRule(new SelectorElement(typeof(Label), new[] {StyleClassLabelHeadingBigger}, null, null), new[] { - new StyleProperty(Label.StylePropertyFont, notoSansBold20), - new StyleProperty(Label.StylePropertyFontColor, NanoGold), + new StyleProperty(Label.StylePropertyFont, comicFont20), + new StyleProperty(Label.StylePropertyFontColor, HippieBlue), }), // Small Label diff --git a/Content.Server/Speech/Components/VocalComponent.cs b/Content.Server/Speech/Components/VocalComponent.cs index 4ebce82d9d3a3f..208f69520e0033 100644 --- a/Content.Server/Speech/Components/VocalComponent.cs +++ b/Content.Server/Speech/Components/VocalComponent.cs @@ -27,6 +27,9 @@ public sealed class VocalComponent : Component [DataField("screamId", customTypeSerializer: typeof(PrototypeIdSerializer))] public string ScreamId = "Scream"; + [DataField("fartId", customTypeSerializer: typeof(PrototypeIdSerializer))] + public string FartId = "Fart"; + [DataField("wilhelm")] public SoundSpecifier Wilhelm = new SoundPathSpecifier("/Audio/Voice/Human/wilhelm_scream.ogg"); @@ -39,6 +42,12 @@ public sealed class VocalComponent : Component [DataField("screamAction")] public InstantAction? ScreamAction; + [DataField("fartActionId", customTypeSerializer: typeof(PrototypeIdSerializer))] + public string FartActionId = "Fart"; + + [DataField("fartAction")] + public InstantAction? FartAction; + /// /// Currently loaded emote sounds prototype, based on entity sex. /// Null if no valid prototype for entity sex was found. @@ -51,3 +60,7 @@ public sealed class ScreamActionEvent : InstantActionEvent { } +public sealed class FartActionEvent : InstantActionEvent +{ + +} diff --git a/Content.Server/Speech/EntitySystems/VocalSystem.cs b/Content.Server/Speech/EntitySystems/VocalSystem.cs index 244b5124c298fd..e79492d41c708a 100644 --- a/Content.Server/Speech/EntitySystems/VocalSystem.cs +++ b/Content.Server/Speech/EntitySystems/VocalSystem.cs @@ -27,11 +27,17 @@ public override void Initialize() SubscribeLocalEvent(OnSexChanged); SubscribeLocalEvent(OnEmote); SubscribeLocalEvent(OnScreamAction); + SubscribeLocalEvent(OnFartAction); } private void OnMapInit(EntityUid uid, VocalComponent component, MapInitEvent args) { // try to add scream action when vocal comp added + if (_proto.TryIndex(component.FartActionId, out InstantActionPrototype? protofart)) + { + component.FartAction = new InstantAction(protofart); + _actions.AddAction(uid, component.FartAction, null); + } if (_proto.TryIndex(component.ScreamActionId, out InstantActionPrototype? proto)) { component.ScreamAction = new InstantAction(proto); @@ -71,6 +77,15 @@ private void OnEmote(EntityUid uid, VocalComponent component, ref EmoteEvent arg args.Handled = _chat.TryPlayEmoteSound(uid, component.EmoteSounds, args.Emote); } + private void OnFartAction(EntityUid uid, VocalComponent component, FartActionEvent args) + { + if (args.Handled) + return; + + _chat.TryEmoteWithChat(uid, component.FartActionId); + args.Handled = true; + } + private void OnScreamAction(EntityUid uid, VocalComponent component, ScreamActionEvent args) { if (args.Handled) diff --git a/Content.Server/Weapons/Melee/EnergySword/Components/EnergySwordComponent.cs b/Content.Server/Weapons/Melee/EnergySword/Components/EnergySwordComponent.cs index b482c6c738b649..720610b2235027 100644 --- a/Content.Server/Weapons/Melee/EnergySword/Components/EnergySwordComponent.cs +++ b/Content.Server/Weapons/Melee/EnergySword/Components/EnergySwordComponent.cs @@ -46,7 +46,8 @@ internal sealed class EnergySwordComponent : Component Color.DodgerBlue, Color.Aqua, Color.MediumSpringGreen, - Color.MediumOrchid + Color.MediumOrchid, + Color.White }; [DataField("litDamageBonus")] diff --git a/Content.Shared/Clothing/Components/StickyClothingComponent.cs b/Content.Shared/Clothing/Components/StickyClothingComponent.cs new file mode 100644 index 00000000000000..2ef8475df6659a --- /dev/null +++ b/Content.Shared/Clothing/Components/StickyClothingComponent.cs @@ -0,0 +1,17 @@ +using Content.Shared.Clothing.EntitySystems; +using Content.Shared.Inventory; +using Robust.Shared.Audio; +using Robust.Shared.Serialization; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; + +namespace Content.Shared.Clothing.Components; + +[Access(typeof(StickyClothingSystem))] +[RegisterComponent] +public sealed class StickyClothingComponent : Component +{ + /// + /// Is that clothing is worn? + /// + public bool IsActive = false; +} diff --git a/Content.Shared/Clothing/EntitySystems/StickyClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/StickyClothingSystem.cs new file mode 100644 index 00000000000000..3924cdd344eb9e --- /dev/null +++ b/Content.Shared/Clothing/EntitySystems/StickyClothingSystem.cs @@ -0,0 +1,34 @@ +using Content.Shared.Clothing.Components; +using Content.Shared.Inventory; +using Content.Shared.Inventory.Events; +using Content.Shared.Interaction.Components; +using Content.Shared.Item; +using Content.Shared.Tag; +using Robust.Shared.Prototypes; +using Robust.Shared.Network; +using Robust.Shared.Utility; + +namespace Content.Shared.Clothing.EntitySystems; + +public sealed class StickyClothingSystem : EntitySystem +{ + [Dependency] private readonly IComponentFactory _componentFactory = default!; + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnGotEquipped); + } + + private void OnGotEquipped(EntityUid uid, StickyClothingComponent component, GotEquippedEvent args) + { + if (!TryComp(uid, out ClothingComponent? clothing)) + return; + + // check if entity was actually used as clothing + // not just taken in pockets or something + var isCorrectSlot = clothing.Slots.HasFlag(args.SlotFlags); + if (!isCorrectSlot) return; + + EnsureComp(uid); + } +} diff --git a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs index e55c45bba57f93..ab785f3d88a555 100644 --- a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs +++ b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs @@ -22,8 +22,8 @@ public sealed class MovementSpeedModifierComponent : Component public const float DefaultFriction = 20f; public const float DefaultFrictionNoInput = 20f; - public const float DefaultBaseWalkSpeed = 2.5f; - public const float DefaultBaseSprintSpeed = 4.5f; + public const float DefaultBaseWalkSpeed = 3.5f; + public const float DefaultBaseSprintSpeed = 7f; [ViewVariables] public float WalkSpeedModifier = 1.0f; diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs index 4936cc2e2612e9..e1ac8b931f5e22 100644 --- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs +++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs @@ -160,7 +160,9 @@ public sealed class MeleeWeaponComponentState : ComponentState public string WideAnimation; public float Range; - public MeleeWeaponComponentState(float attackRate, bool attacking, TimeSpan nextAttack, TimeSpan? windupStart, string clickAnimation, string wideAnimation, float range) + public SoundSpecifier? HitSound; + + public MeleeWeaponComponentState(float attackRate, bool attacking, TimeSpan nextAttack, TimeSpan? windupStart, string clickAnimation, string wideAnimation, float range,SoundSpecifier? hitSound) { AttackRate = attackRate; Attacking = attacking; @@ -169,5 +171,6 @@ public MeleeWeaponComponentState(float attackRate, bool attacking, TimeSpan next ClickAnimation = clickAnimation; WideAnimation = wideAnimation; Range = range; + HitSound = hitSound; } } diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs index a96699260ecd5c..c548434a212008 100644 --- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs +++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs @@ -208,7 +208,7 @@ private void OnDisarmAttack(DisarmAttackEvent msg, EntitySessionEventArgs args) private void OnGetState(EntityUid uid, MeleeWeaponComponent component, ref ComponentGetState args) { args.State = new MeleeWeaponComponentState(component.AttackRate, component.Attacking, component.NextAttack, - component.WindUpStart, component.ClickAnimation, component.WideAnimation, component.Range); + component.WindUpStart, component.ClickAnimation, component.WideAnimation, component.Range,component.HitSound); } private void OnHandleState(EntityUid uid, MeleeWeaponComponent component, ref ComponentHandleState args) @@ -224,6 +224,7 @@ private void OnHandleState(EntityUid uid, MeleeWeaponComponent component, ref Co component.ClickAnimation = state.ClickAnimation; component.WideAnimation = state.WideAnimation; component.Range = state.Range; + component.HitSound = state.HitSound; } public MeleeWeaponComponent? GetWeapon(EntityUid entity) diff --git a/Resources/Audio/Effects/Emotes/fart.ogg b/Resources/Audio/Effects/Emotes/fart.ogg new file mode 100644 index 00000000000000..0b6fb1d6f79406 Binary files /dev/null and b/Resources/Audio/Effects/Emotes/fart.ogg differ diff --git a/Resources/Audio/Effects/Emotes/fartmassive.ogg b/Resources/Audio/Effects/Emotes/fartmassive.ogg new file mode 100644 index 00000000000000..ef2c219151717a Binary files /dev/null and b/Resources/Audio/Effects/Emotes/fartmassive.ogg differ diff --git a/Resources/Audio/Items/sheath.ogg b/Resources/Audio/Items/sheath.ogg new file mode 100644 index 00000000000000..9e1d5cdc0097d2 Binary files /dev/null and b/Resources/Audio/Items/sheath.ogg differ diff --git a/Resources/Audio/Items/unsheath.ogg b/Resources/Audio/Items/unsheath.ogg new file mode 100644 index 00000000000000..09867f5966a152 Binary files /dev/null and b/Resources/Audio/Items/unsheath.ogg differ diff --git a/Resources/Audio/Lobby/Monument.ogg b/Resources/Audio/Lobby/Monument.ogg deleted file mode 100644 index f27554f57f7411..00000000000000 Binary files a/Resources/Audio/Lobby/Monument.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/Spac_Stac.ogg b/Resources/Audio/Lobby/Spac_Stac.ogg deleted file mode 100644 index 59be95d844c814..00000000000000 Binary files a/Resources/Audio/Lobby/Spac_Stac.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/admiral_tintin.ogg b/Resources/Audio/Lobby/admiral_tintin.ogg new file mode 100644 index 00000000000000..77b2c24a7a70cc Binary files /dev/null and b/Resources/Audio/Lobby/admiral_tintin.ogg differ diff --git a/Resources/Audio/Lobby/atomicamnesiammx.ogg b/Resources/Audio/Lobby/atomicamnesiammx.ogg deleted file mode 100644 index 5cd6c8823c71fc..00000000000000 Binary files a/Resources/Audio/Lobby/atomicamnesiammx.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/blowout.ogg b/Resources/Audio/Lobby/blowout.ogg new file mode 100644 index 00000000000000..52a452137888c2 Binary files /dev/null and b/Resources/Audio/Lobby/blowout.ogg differ diff --git a/Resources/Audio/Lobby/comet_haley.ogg b/Resources/Audio/Lobby/comet_haley.ogg deleted file mode 100644 index 3b2eed5ed6c3c3..00000000000000 Binary files a/Resources/Audio/Lobby/comet_haley.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/every_light_is_blinking_at_once.ogg b/Resources/Audio/Lobby/every_light_is_blinking_at_once.ogg deleted file mode 100644 index ef19f504f2cd30..00000000000000 Binary files a/Resources/Audio/Lobby/every_light_is_blinking_at_once.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/grey.ogg b/Resources/Audio/Lobby/grey.ogg new file mode 100644 index 00000000000000..cb05497370461f Binary files /dev/null and b/Resources/Audio/Lobby/grey.ogg differ diff --git a/Resources/Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg b/Resources/Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg deleted file mode 100644 index d7d1eacf5ae189..00000000000000 Binary files a/Resources/Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/linus_akesson.ogg b/Resources/Audio/Lobby/linus_akesson.ogg new file mode 100644 index 00000000000000..2387f41208f8a3 Binary files /dev/null and b/Resources/Audio/Lobby/linus_akesson.ogg differ diff --git a/Resources/Audio/Lobby/marhaba.ogg b/Resources/Audio/Lobby/marhaba.ogg deleted file mode 100644 index 7aa5902f15a411..00000000000000 Binary files a/Resources/Audio/Lobby/marhaba.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/nounverber_vape.ogg b/Resources/Audio/Lobby/nounverber_vape.ogg new file mode 100644 index 00000000000000..3af9ff5bb4f132 Binary files /dev/null and b/Resources/Audio/Lobby/nounverber_vape.ogg differ diff --git a/Resources/Audio/Lobby/panic_track.ogg b/Resources/Audio/Lobby/panic_track.ogg new file mode 100644 index 00000000000000..5af2faf40c71be Binary files /dev/null and b/Resources/Audio/Lobby/panic_track.ogg differ diff --git a/Resources/Audio/Lobby/pwmur.ogg b/Resources/Audio/Lobby/pwmur.ogg deleted file mode 100644 index b10df084deaea9..00000000000000 Binary files a/Resources/Audio/Lobby/pwmur.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/roll_the_dice.ogg b/Resources/Audio/Lobby/roll_the_dice.ogg new file mode 100644 index 00000000000000..f20794c0052373 Binary files /dev/null and b/Resources/Audio/Lobby/roll_the_dice.ogg differ diff --git a/Resources/Audio/Lobby/singuloose.ogg b/Resources/Audio/Lobby/singuloose.ogg deleted file mode 100644 index 5fb70bf2e6ca53..00000000000000 Binary files a/Resources/Audio/Lobby/singuloose.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/vibe_ace.ogg b/Resources/Audio/Lobby/vibe_ace.ogg deleted file mode 100644 index b1590196912af0..00000000000000 Binary files a/Resources/Audio/Lobby/vibe_ace.ogg and /dev/null differ diff --git a/Resources/Audio/Weapons/hfblade-music1.ogg b/Resources/Audio/Weapons/hfblade-music1.ogg new file mode 100644 index 00000000000000..d10f46a6c00d0c Binary files /dev/null and b/Resources/Audio/Weapons/hfblade-music1.ogg differ diff --git a/Resources/Audio/Weapons/rapierhit.ogg b/Resources/Audio/Weapons/rapierhit.ogg new file mode 100644 index 00000000000000..401fcf9677c84d Binary files /dev/null and b/Resources/Audio/Weapons/rapierhit.ogg differ diff --git a/Resources/Fonts/qd-better-comic-sans-font/Qdbettercomicsans.ttf b/Resources/Fonts/qd-better-comic-sans-font/Qdbettercomicsans.ttf new file mode 100644 index 00000000000000..376168cc39a36c Binary files /dev/null and b/Resources/Fonts/qd-better-comic-sans-font/Qdbettercomicsans.ttf differ diff --git a/Resources/Fonts/qd-better-comic-sans-font/Qdbettercomicsansalternates.ttf b/Resources/Fonts/qd-better-comic-sans-font/Qdbettercomicsansalternates.ttf new file mode 100644 index 00000000000000..54b7c18cd618f4 Binary files /dev/null and b/Resources/Fonts/qd-better-comic-sans-font/Qdbettercomicsansalternates.ttf differ diff --git a/Resources/Fonts/qd-better-comic-sans-font/Qdbettercomicsansbold.ttf b/Resources/Fonts/qd-better-comic-sans-font/Qdbettercomicsansbold.ttf new file mode 100644 index 00000000000000..b266871f2718a8 Binary files /dev/null and b/Resources/Fonts/qd-better-comic-sans-font/Qdbettercomicsansbold.ttf differ diff --git a/Resources/Fonts/qd-better-comic-sans-font/Qdbettercomicsansboldalternates.ttf b/Resources/Fonts/qd-better-comic-sans-font/Qdbettercomicsansboldalternates.ttf new file mode 100644 index 00000000000000..1827934050e05e Binary files /dev/null and b/Resources/Fonts/qd-better-comic-sans-font/Qdbettercomicsansboldalternates.ttf differ diff --git a/Resources/Fonts/qd-better-comic-sans-font/info.txt b/Resources/Fonts/qd-better-comic-sans-font/info.txt new file mode 100644 index 00000000000000..dc915ef6eeb5af --- /dev/null +++ b/Resources/Fonts/qd-better-comic-sans-font/info.txt @@ -0,0 +1,2 @@ +license: Public Domain +link: https://www.fontspace.com/qd-better-comic-sans-font-f41648 \ No newline at end of file diff --git a/Resources/Locale/en-US/actions/actions/vocal.ftl b/Resources/Locale/en-US/actions/actions/vocal.ftl index 97cf7fae94afbf..3a1c1f6b57badc 100644 --- a/Resources/Locale/en-US/actions/actions/vocal.ftl +++ b/Resources/Locale/en-US/actions/actions/vocal.ftl @@ -1,2 +1,5 @@ action-name-scream = Scream action-description-scream = AAAAAAAAAAAAAAAAAAAAAAAAA + +action-name-fart = Fart +action-description-fart = BWOMPFF! diff --git a/Resources/Locale/en-US/game-ticking/game-ticker.ftl b/Resources/Locale/en-US/game-ticking/game-ticker.ftl index 0a6fceb89e5175..995ca3172b0558 100644 --- a/Resources/Locale/en-US/game-ticking/game-ticker.ftl +++ b/Resources/Locale/en-US/game-ticking/game-ticker.ftl @@ -6,14 +6,14 @@ game-ticker-unknown-role = Unknown game-ticker-delay-start = Round start has been delayed for {$seconds} seconds. game-ticker-pause-start = Round start has been paused. game-ticker-pause-start-resumed = Round start countdown is now resumed. -game-ticker-player-join-game-message = Welcome to Space Station 14! If this is your first time playing, be sure to read the game rules, and don't be afraid to ask for help in LOOC (local OOC) or OOC (usually available only between rounds). -game-ticker-get-info-text = Hi and welcome to [color=white]Space Station 14![/color] +game-ticker-player-join-game-message = Welcome to Hippie Station! If this is your first time playing, be sure to read the game rules, and don't be afraid to ask for help in LOOC (local OOC) or OOC (usually available only between rounds). +game-ticker-get-info-text = Hi and welcome to [color=white]Hippie Station![/color] The current round is: [color=white]#{$roundId}[/color] The current player count is: [color=white]{$playerCount}[/color] The current map is: [color=white]{$mapName}[/color] The current game mode is: [color=white]{$gmTitle}[/color] >[color=yellow]{$desc}[/color] -game-ticker-get-info-preround-text = Hi and welcome to [color=white]Space Station 14![/color] +game-ticker-get-info-preround-text = Hi and welcome to [color=white]Hippie Station![/color] The current round is: [color=white]#{$roundId}[/color] The current player count is: [color=white]{$playerCount}[/color] ([color=white]{$readyCount}[/color] {$readyCount -> [one] is diff --git a/Resources/Locale/en-US/info/rules.ftl b/Resources/Locale/en-US/info/rules.ftl index 6bf813c94d3e23..9d2598c838a536 100644 --- a/Resources/Locale/en-US/info/rules.ftl +++ b/Resources/Locale/en-US/info/rules.ftl @@ -1,6 +1,6 @@ # Rules -ui-rules-header = Wizard's Den Official Server Rules -ui-rules-header-rp = Wizard's Den Roleplay Official Server Rules +ui-rules-header = Hippie Station Official Server Rules +ui-rules-header-rp = Hippie Station Official Server Rules ui-rules-accept = I have read and agree to follow the rules ui-rules-wait = The accept button will be enabled after {$time} seconds. diff --git a/Resources/Locale/en-US/launcher/launcher-connecting.ftl b/Resources/Locale/en-US/launcher/launcher-connecting.ftl index c4fb51d266becb..0379a5b8a66698 100644 --- a/Resources/Locale/en-US/launcher/launcher-connecting.ftl +++ b/Resources/Locale/en-US/launcher/launcher-connecting.ftl @@ -1,6 +1,6 @@ ### Connecting dialog when you start up the game -connecting-title = Space Station 14 +connecting-title = Hippie Station connecting-exit = Exit connecting-retry = Retry connecting-reconnect = Reconnect diff --git a/Resources/Locale/en-US/lobby/lobby-gui.ftl b/Resources/Locale/en-US/lobby/lobby-gui.ftl index 6407104163f090..2dc57cdd911738 100644 --- a/Resources/Locale/en-US/lobby/lobby-gui.ftl +++ b/Resources/Locale/en-US/lobby/lobby-gui.ftl @@ -1,5 +1,4 @@ -ui-lobby-title = Lobby -ui-lobby-ahelp-button = AHelp +ui-lobby-ahelp-button = AHelp ui-lobby-options-button = Options ui-lobby-leave-button = Leave ui-lobby-observe-button = Observe diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 12d15201abde37..c1671bbc8a191c 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -14,6 +14,9 @@ uplink-rifle-mosin-desc = A bolt action service rifle that has seen many wars. N uplink-esword-name = Energy Sword uplink-esword-desc = A very dangerous energy sword. Can be stored in pockets when turned off. Makes a lot of noise when used or turned on. +uplink-hfblade-name = High Frequency Blade +uplink-hfblade-desc = An electric katana that weakens the molecular bonds of whatever it touches. Perfect for slicing off the limbs of your coworkers. Avoid using a multitool on it. + uplink-edagger-name = Energy Dagger uplink-edagger-desc = A small energy blade conveniently disguised in the form of a pen. @@ -211,8 +214,8 @@ uplink-revolver-cap-gun-desc = Looks almost like the real thing! Ages 8 and up. uplink-syndicate-stamp-name = Syndicate Rubber Btamp uplink-syndicate-stamp-desc = A rubber stamp for stamping important documents. -uplink-cat-ears-name = Cat Ears -uplink-cat-ears-desc = UwU +uplink-cat-ears-name = Anime Cat Ears +uplink-cat-ears-desc = Will make everyone hate you, but do you really care? uplink-outlaw-hat-name = Outlaw Hat uplink-outlaw-hat-desc = A hat that makes you look like you carry a notched pistol, numbered one and nineteen more. diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml index 0a31a73e41794d..bd618e738d67f9 100644 --- a/Resources/Prototypes/Actions/types.yml +++ b/Resources/Prototypes/Actions/types.yml @@ -1,3 +1,12 @@ +- type: instantAction + id: Fart + useDelay: 10 + icon: Interface/Actions/butt.png + name: action-name-fart + description: action-description-fart + serverEvent: !type:FartActionEvent + checkCanInteract: false + - type: instantAction id: Scream useDelay: 10 diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index 1310e4155c9e9a..6f7fa24be4bcd3 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -84,6 +84,15 @@ contents: - id: CaptainSabre +- type: entity + id: ClothingBeltSheathHfFilled + parent: ClothingBeltSheathHf + suffix: Filled + components: + - type: StorageFill + contents: + - id: HfBlade + - type: entity id: ClothingBeltMilitaryWebbingMedFilled parent: ClothingBeltMilitaryWebbingMed diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index ba23f6988dbe6e..56f3f75fe7f343 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -54,6 +54,17 @@ categories: - UplinkWeapons +- type: listing + id: UplinkHFblade + name: uplink-hfblade-name + description: uplink-hfblade-desc + icon: { sprite: /Textures/Objects/Weapons/Melee/hf_blade.rsi, state: icon } + productEntity: ClothingBeltSheathHfFilled + cost: + Telecrystal: 20 + categories: + - UplinkWeapons + - type: listing id: UplinkEnergyDagger name: uplink-edagger-name @@ -818,7 +829,7 @@ id: UplinkCatEars name: uplink-cat-ears-name description: uplink-cat-ears-desc - productEntity: ClothingHeadHatCatEars + productEntity: ClothingHeadHatCatEarsCursed cost: Telecrystal: 26 categories: @@ -864,16 +875,6 @@ categories: - UplinkPointless -- type: listing - id: UplinkOperativeSkirt - name: uplink-operative-skirt-name - description: uplink-operative-skirt-desc - productEntity: ClothingUniformJumpskirtOperative - cost: - Telecrystal: 1 - categories: - - UplinkPointless - - type: listing id: UplinkBalloon name: uplink-balloon-name diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index e822825a131b71..95315f3c50d7ae 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -377,6 +377,8 @@ sprite: Clothing/Belt/sheath.rsi - type: Storage capacity: 15 + storageInsertSound: /Audio/Items/sheath.ogg + storageRemoveSound: /Audio/Items/unsheath.ogg whitelist: tags: - CaptainSabre @@ -388,6 +390,31 @@ - CaptainSabre - type: Appearance +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltSheathHf + name: edgelord's sheath + description: A strange sheath designed to hold an electric blade of some sort. One could only imagine how edgy this guy's musical preference is. + components: + - type: Sprite + sprite: Clothing/Belt/hf_sheath.rsi + state: sheath + - type: Clothing + sprite: Clothing/Belt/hf_sheath.rsi + - type: Storage + capacity: 15 + storageInsertSound: /Audio/Items/sheath.ogg + storageRemoveSound: /Audio/Items/unsheath.ogg + whitelist: + tags: + - HfBlade + - type: ItemMapper + mapLayers: + sheath-sabre: + whitelist: + tags: + - HfBlade + - type: Appearance # Belts without visualizers - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 1f1a8b4146d5d6..a2cb86ebef5b1a 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -157,6 +157,23 @@ - type: AddAccentClothing accent: OwOAccent +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatCatEarsCursed + name: cat ears + description: "NYAH!" + components: + - type: Tag + tags: # ignore "WhitelistChameleon" tag + - DroneUsable + - type: Sprite + sprite: Clothing/Head/Hats/catears.rsi + - type: Clothing + sprite: Clothing/Head/Hats/catears.rsi + - type: AddAccentClothing + accent: OwOAccent + - type: StickyClothing + - type: entity parent: ClothingHeadBase id: ClothingHeadHatSquid diff --git a/Resources/Prototypes/Entities/Effects/weapon_arc.yml b/Resources/Prototypes/Entities/Effects/weapon_arc.yml index 37b180b66f321c..7f5cd626ed3959 100644 --- a/Resources/Prototypes/Entities/Effects/weapon_arc.yml +++ b/Resources/Prototypes/Entities/Effects/weapon_arc.yml @@ -44,6 +44,18 @@ - type: WeaponArcVisuals animation: Slash +- type: entity + id: WeaponArcSlashHf + parent: WeaponArcStatic + noSpawn: true + components: + - type: WeaponArcVisuals + fadeOut: false + - type: Sprite + state: hf_slash + - type: TimedDespawn + lifetime: 0.2 + - type: entity id: WeaponArcBite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml index 3061e29e11237d..d9ca6e7f916dda 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml @@ -64,6 +64,8 @@ Blunt: 10 Slash: 20 Structural: 3 + soundHit: + path: /Audio/Weapons/bladeslice.ogg - type: Wieldable - type: IncreaseDamageOnWield damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml index 315ce9bc578f88..7c5b529b5fcafb 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -19,6 +19,8 @@ Blunt: 5 Slash: 13 Structural: 7 + soundHit: + path: /Audio/Weapons/bladeslice.ogg - type: Wieldable - type: IncreaseDamageOnWield damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/hf_blade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/hf_blade.yml new file mode 100644 index 00000000000000..ded8d467c99e7c --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/hf_blade.yml @@ -0,0 +1,62 @@ +- type: entity + name: high frequency blade + parent: BaseItem + id: HfBlade + description: RULES OF NATURE + components: + - type: EnergySword + litDamageBonus: + types: + Slash: 19 + Heat: 19 + Blunt: -4.5 + litDisarmMalus: 0.6 + onHitOn: !type:SoundPathSpecifier + path: /Audio/Weapons/rapierhit.ogg + activateSound: !type:SoundPathSpecifier + path: /Audio/Weapons/hfblade-music1.ogg + colorOptions: + - White + - type: Sprite + sprite: Objects/Weapons/Melee/hf_blade.rsi + layers: + - state: hf_blade + - state: hf_blade_on + color: "#FFFFFF" + visible: false + shader: unshaded + map: [ "blade" ] + - type: MeleeWeapon + attackRate: 1.5 + soundHit: + path: /Audio/Weapons/genhit1.ogg + damage: + types: + Blunt: 4.5 + animation: WeaponArcSlashHf + - type: Item + size: 15 + sprite: Objects/Weapons/Melee/hf_blade.rsi + - type: Tag + tags: + - HfBlade + - type: UseDelay + delay: 1.0 + - type: PointLight + netsync: false + enabled: false + radius: 2 + energy: 2 + color: red + - type: Appearance + - type: ToggleableLightVisuals + spriteLayer: blade + inhandVisuals: + left: + - state: inhand-left-blade + shader: unshaded + right: + - state: inhand-right-blade + shader: unshaded + - type: DisarmMalus + malus: 0 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index dd70ca9b632091..c0de667329e345 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -13,6 +13,8 @@ damage: types: Slash: 17 #cmon, it has to be at least BETTER than the rest. + soundHit: + path: /Audio/Weapons/rapierhit.ogg - type: Item size: 15 sprite: Objects/Weapons/Melee/captain_sabre.rsi diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 0952d57887cdbc..64a71efec2bd84 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -6,12 +6,12 @@ requirements: - !type:RoleTimeRequirement role: JobSalvageSpecialist - time: 3600 + time: 0 - !type:DepartmentTimeRequirement department: Cargo - time: 18000 + time: 0 - !type:OverallPlaytimeRequirement - time: 108000 + time: 0 weight: 10 startingGear: QuartermasterGear icon: "QuarterMaster" diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index 369a91625e8fce..9d8cbdaa813680 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Cargo - time: 3600 + time: 0 icon: "ShaftMiner" startingGear: SalvageSpecialistGear supervisors: job-supervisors-hop-qm diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml index de08bbd18c486b..25880eb62ee50a 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Civilian - time: 1800 + time: 0 startingGear: BartenderGear icon: "Bartender" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml index 22bfb78cd72a86..17683a63b7e49f 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Civilian - time: 1800 + time: 0 startingGear: ChefGear icon: "Chef" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index d06a97c7c5fc43..04979c9d35c276 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -6,15 +6,15 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 18000 + time: 0 - !type:DepartmentTimeRequirement department: Medical - time: 18000 + time: 0 - !type:DepartmentTimeRequirement department: Security - time: 18000 + time: 0 - !type:OverallPlaytimeRequirement - time: 108000 + time: 0 weight: 20 startingGear: CaptainGear icon: "Captain" diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index a35abbd1a56e77..1cc8945c039531 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -6,15 +6,15 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 3600 + time: 0 - !type:DepartmentTimeRequirement department: Medical - time: 3600 + time: 0 - !type:DepartmentTimeRequirement department: Security - time: 3600 + time: 0 - !type:OverallPlaytimeRequirement - time: 108000 + time: 0 weight: 20 startingGear: HoPGear icon: "HeadOfPersonnel" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index 55f6e47378ab85..91eefdafb39237 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 3600 + time: 0 startingGear: AtmosphericTechnicianGear icon: "AtmosphericTechnician" supervisors: job-supervisors-ce diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 7eb3b43ccebdd1..966b2010402805 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -6,12 +6,12 @@ requirements: - !type:RoleTimeRequirement role: JobAtmosphericTechnician - time: 3600 + time: 0 - !type:DepartmentTimeRequirement department: Engineering - time: 18000 + time: 0 - !type:OverallPlaytimeRequirement - time: 108000 + time: 0 weight: 10 startingGear: ChiefEngineerGear icon: "ChiefEngineer" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index 0b90792ca8f32e..dee46d5ddd914f 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 1800 + time: 0 startingGear: StationEngineerGear icon: "StationEngineer" supervisors: job-supervisors-ce diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index 23faec9a596c82..69ece5a3cc8137 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Medical - time: 1800 + time: 0 startingGear: ChemistGear icon: "Chemist" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 089f2d7a03d6bb..a0e824b6ff4f30 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -8,9 +8,9 @@ requirements: - !type:DepartmentTimeRequirement department: Medical - time: 18000 + time: 0 - !type:OverallPlaytimeRequirement - time: 108000 + time: 0 weight: 10 startingGear: CMOGear icon: "ChiefMedicalOfficer" diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml index 849ba9d0174f77..a7655c76527bf0 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Medical - time: 1800 + time: 0 startingGear: DoctorGear icon: "MedicalDoctor" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index b2bf4e160544bd..bc06fe22dcb5e3 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -6,9 +6,9 @@ requirements: - !type:DepartmentTimeRequirement department: Science - time: 18000 + time: 0 - !type:OverallPlaytimeRequirement - time: 108000 + time: 0 weight: 10 startingGear: ResearchDirectorGear icon: "ResearchDirector" diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index debec221a6f3f1..8a6e17aa206495 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Science - time: 1800 + time: 0 startingGear: ScientistGear icon: "Scientist" supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index 392442df775628..317f9e944b7c9b 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Security - time: 3600 + time: 0 startingGear: DetectiveGear icon: "Detective" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index f4e42e2c169af3..5c82813e4077ea 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -6,12 +6,12 @@ requirements: - !type:RoleTimeRequirement role: JobWarden - time: 3600 + time: 0 - !type:DepartmentTimeRequirement department: Security - time: 18000 + time: 0 - !type:OverallPlaytimeRequirement - time: 108000 + time: 0 weight: 10 startingGear: HoSGear icon: "HeadOfSecurity" diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index a55d88be9d8740..525b695ec6a445 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Security - time: 1800 + time: 0 startingGear: SecurityOfficerGear icon: "SecurityOfficer" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 8768c2873b9349..279e7455dd4f9a 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Security - time: 10800 + time: 0 startingGear: WardenGear icon: "Warden" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/SoundCollections/emotes.yml b/Resources/Prototypes/SoundCollections/emotes.yml index bc9bd7838e8ce2..e457aa154cb143 100644 --- a/Resources/Prototypes/SoundCollections/emotes.yml +++ b/Resources/Prototypes/SoundCollections/emotes.yml @@ -30,3 +30,8 @@ - /Audio/Voice/Diona/diona_rustle1.ogg - /Audio/Voice/Diona/diona_rustle2.ogg - /Audio/Voice/Diona/diona_rustle3.ogg + +- type: soundCollection + id: Farts + files: + - /Audio/Effects/Emotes/fart.ogg diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml index e3a2fc9bb6f1a1..fde51150f67b84 100644 --- a/Resources/Prototypes/SoundCollections/lobby.yml +++ b/Resources/Prototypes/SoundCollections/lobby.yml @@ -5,14 +5,12 @@ - /Audio/Lobby/absconditus.ogg - /Audio/Lobby/space_asshole.ogg - /Audio/Lobby/endless_space.ogg - - /Audio/Lobby/atomicamnesiammx.ogg - - /Audio/Lobby/singuloose.ogg - - /Audio/Lobby/comet_haley.ogg - - /Audio/Lobby/marhaba.ogg - /Audio/Lobby/title3.ogg - /Audio/Lobby/mod.flip-flap.ogg - - /Audio/Lobby/Monument.ogg - - /Audio/Lobby/Spac_Stac.ogg - - /Audio/Lobby/pwmur.ogg - - /Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg - - /Audio/Lobby/every_light_is_blinking_at_once.ogg + - /Audio/Lobby/roll_the_dice.ogg + - /Audio/Lobby/blowout.ogg + - /Audio/Lobby/admiral_tintin.ogg + - /Audio/Lobby/grey.ogg + - /Audio/Lobby/linus_akesson.ogg + - /Audio/Lobby/nounverber_vape.ogg + - /Audio/Lobby/panic_track.ogg diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index 88af527c39ad75..beb149a581084a 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -8,6 +8,8 @@ collection: MaleScreams Laugh: collection: MaleLaugh + Fart: + collection: Farts - type: emoteSounds id: FemaleHuman @@ -18,6 +20,8 @@ collection: FemaleScreams Laugh: collection: FemaleLaugh + Fart: + collection: Farts - type: emoteSounds id: UnisexReptilian @@ -28,6 +32,8 @@ path: /Audio/Voice/Reptilian/reptilian_scream.ogg Laugh: path: /Audio/Animals/lizard_happy.ogg + Fart: + collection: Farts - type: emoteSounds id: UnisexVox @@ -43,6 +49,8 @@ path: /Audio/Voice/Diona/diona_scream.ogg Laugh: collection: DionaLaugh + Fart: + collection: Farts params: variation: 0.125 diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index d308825a659360..57866dd024a5e3 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -53,6 +53,14 @@ - giggling - giggled +- type: emote + id: Fart + category: Vocal + chatMessages: [farts, lets out a massive fart] + chatTriggers: + - farts + - fart + # hand emotes - type: emote id: Clap diff --git a/Resources/Prototypes/lobbyscreens.yml b/Resources/Prototypes/lobbyscreens.yml index 0aec6d6231e762..b047c58198b07d 100644 --- a/Resources/Prototypes/lobbyscreens.yml +++ b/Resources/Prototypes/lobbyscreens.yml @@ -1,19 +1,43 @@ - type: lobbyBackground - id: Robotics - background: /Textures/LobbyScreens/robotics.png + id: Entertainment + background: /Textures/LobbyScreens/entertainment.png - type: lobbyBackground - id: Supermatter - background: /Textures/LobbyScreens/supermatter.png + id: Arrest + background: /Textures/LobbyScreens/arrest.png - type: lobbyBackground - id: Warden - background: /Textures/LobbyScreens/warden.png + id: Mime + background: /Textures/LobbyScreens/mime.png - type: lobbyBackground - id: Pharmacy - background: /Textures/LobbyScreens/pharmacy.png + id: Security + background: /Textures/LobbyScreens/security.png - type: lobbyBackground - id: SSXIV - background: /Textures/LobbyScreens/ssxiv.png + id: Captain + background: /Textures/LobbyScreens/captain.png + +- type: lobbyBackground + id: Galactic + background: /Textures/LobbyScreens/galactic.png + +- type: lobbyBackground + id: Memes + background: /Textures/LobbyScreens/rare+memes.png + +- type: lobbyBackground + id: Shitsec + background: /Textures/LobbyScreens/shitsec.png + +- type: lobbyBackground + id: Syndicate + background: /Textures/LobbyScreens/syndicate.png + +- type: lobbyBackground + id: Honkday + background: /Textures/LobbyScreens/honkday.png + +- type: lobbyBackground + id: Law + background: /Textures/LobbyScreens/law.png diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 312d1a197edb50..920448dbd54b36 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -286,6 +286,9 @@ - type: Tag id: Head +- type: Tag + id: HfBlade + - type: Tag id: HideContextMenu diff --git a/Resources/Server Info/Gameplay.txt b/Resources/Server Info/Gameplay.txt index 0cbe66ac6b7e8c..a25eb701c6984d 100644 --- a/Resources/Server Info/Gameplay.txt +++ b/Resources/Server Info/Gameplay.txt @@ -1,22 +1,8 @@ -If you’re new to roleplaying or are unfamiliar with IC and OOC please read on. If not, skip to the next section. - -SS14 is at its core a roleplaying game - You play a role on the station through your character which you can customise from the lobby prior to joining the game. You can select the roles or jobs your character plays via the customisation menu too. Therefore when you’re in a round playing your character, you are IC or In Character. When you’re in character you forget any knowledge of previous rounds or essentially of the outside world and you play as if you’re a member of the ships crew. - -Therefore, OOC or Out of Character is any conversations you have outside of the game world e.g. in the OOC chat, on discord or with your friends. You shouldn’t discuss the current round or anything that’s IC (in character) in out of character OOC chats. Likewise anything you see or read in OOC cannot be used by your character in game such as if someone on discord names a traitor or tells you they’re dying in a certain location and for you to go help them. This is known as metagaming and will get you banned if discovered. - -If you suspect a player in game is metagaming (e.g. you’re a traitor and they just walk up to you and kill you without you doing anything to antagonise them) then report them via ahelp or discord. - -To summarise, when you’re in game, don’t discuss the round anywhere else until the round is over and don’t share information about the round in OOC such as if you’re dying, where you are or if you find a traitor. - - -Traitors, antagonists, RDM and “self antag” - -If in your character customisation settings you selected the chance to become an antagonist (antag) or other traitor role, it is not guaranteed that you will be one. When a traitor gamemode round starts there is a random roll of all the players who selected the chance to become a traitor and only some get selected. They will be notified they are a traitor in chat and will have a set of objectives they can view by pressing C. - -Being an antagonist is not an excuse to go on a murder spree and your job is to complete your objectives which on occasion will include escaping alive or dying a glorious death. How you complete your objectives is up to you so murder is valid but try to have fun (ideally not at everyones expense but that’s up to you). - -If you suspect an antagonist such as a traitor or cultist etc report them to security as fast as possible and if necessary do what you can to protect yourself. Remember traitors are people too so ideally they should be arrested and prosecuted under space law and not just murdered (but do what you need to do to survive). - -RDM or random deathmatch is the act of killing someone for no reason or attempting to. If you are being attacked it is likely the other person could be an antag but if you’re unsure, ask the admins for help (ahelp) to check this when convenient. - -Self antag or self antagonising is when you are NOT an antagonist which is determined at round start on traitor modes, and you go out of your way to break the law, damage the station or commit murder. Breaking the law is not inherently self antagging, but murdering, attacking, attempting to break into high security areas etc are examples of self antagging and will get you banned. Unless you are an official antagonist then you are a normal member of the crew who’s only objective is to complete their shift in their designated role. +Space Station 14 is a multiplayer sandbox that has a heavy focus on player interaction. In the year 2557, the megacorporation Nanotrasen has employed +you as a staff member onboard their latest state of the art research station. Nanotrasen claims to be researching plasma, a mysterious new substance, +but rumors are abound that the station is little more than a twisted social experiment... + +Players are assigned a role onboard the station - from a scientist performing research and development of new technologies, to a lowly janitor, +there's a ton of interesting ways to play. More importantly than assigning jobs, the game also randomly chooses a round type. Ranging from an all out +assault on the station by nuclear operatives, a sinister cult sacrificing crewmembers to summon their god, or just some good ol' fashioned traitors, +every round on Space Station 14 is different. diff --git a/Resources/Server Info/Intro.txt b/Resources/Server Info/Intro.txt index 57994251bc09e5..cbf99a3c6a5baa 100644 --- a/Resources/Server Info/Intro.txt +++ b/Resources/Server Info/Intro.txt @@ -1,8 +1 @@ -Welcome to Space Station 14! You have just started your shift aboard a Nanotrasen space station and along with your crewmates should cooperate, perform your job role to the best of your ability and have fun (not at the expense of others hopefully). - -Please make sure you understand the server rules (F1) and if you have any questions, consult this guide, your colleagues on shift in person or over radio or via discord. You can also ask admins for help (ahelp) by hitting the escape key > admin help and typing a message to any online admins. Especially do this if you witness someone breaking rules. - -To reiterate, you are all a crew of people who work together (even the clown) and you should not be harming each other unless you have an extremely good reason (self defence) and even then, call security over radio, stun and detain, do not commit murder as a non antagonist (see antagonist further down). - - -Instead of intents, we have combat mode. Check controls below for its keybind. You can't attack anybody with it off, so no more hitting yourself with your own crowbar. +Before getting into anything else, it's important to note that since SS14 is such an open ended game that has other people in it, when you get in game and try to follow the guide,things may go wrong - the station might have been almost entirely consumed by asingularity, a traitor could attack you with a powerful weapon, or something no one couldhave predicted will kill you. It's important to not let death get to you diff --git a/Resources/Server Info/RP_Rules.txt b/Resources/Server Info/RP_Rules.txt index 5aa8ed6068735a..9ff7a8e64eb9e7 100644 --- a/Resources/Server Info/RP_Rules.txt +++ b/Resources/Server Info/RP_Rules.txt @@ -1,119 +1,47 @@ -[color=#ff0000]YOU MUST BE AT LEAST 16 YEARS OF AGE TO PLAY ON WIZARD'S DEN SERVERS. ANY USER SUSPECTED OF BEING UNDER 16 YEARS OF AGE WILL BE BANNED UNTIL THEY ARE OF AGE.[/color] - -[color=#ff0000]DISCONNECTING FROM OR IGNORING/EVADING ADMIN-HELPS WILL RESULT IN AN APPEAL ONLY BAN.[/color] - -[color=#ff0000]This is the "short" form of the rules, which has all the information any regular player should need. You can find the "long" form of the rules with more examples & clarifications of any ambiguity on our [color=#a4885c]wiki.spacestation14.io[/color], should you need it. Some RP-specific documents available on the wiki such as Space Law, the Standard Operating Procedure, and the Alert Procedure will be mentioned here and are expected to be followed. [/color] - -[color=#a4885c]0.[/color] [color=#a4885c]The[/color] [color=#ffd700]Golden[/color] [color=#a4885c]Rule.[/color] Admins may excercise discretion with rules as they see fit. If you rule lawyer or line skirt, you will get removed. Admins will answer for use of this privilege. +[color=#ff0000]YOU MUST BE AT LEAST 18 YEARS OF AGE TO PLAY ON Hippie Station. ANY USER SUSPECTED OF BEING UNDER 18 YEARS OF AGE WILL BE BANNED UNTIL THEY ARE OF AGE.[/color] [color=#ff0000]ZERO TOLERANCE RULES[/color] -[color=#a4885c]1.[/color] Absolutely no hate speech, slurs, bigotry, IC specism (demeaning other characters in-game due to their in-game race), or anything even remotely similar. (YOU WILL GET PERMABANNED) +[color=#a4885c]1.[/color] Absolutely no Erotic Roleplay (ERP) or sexual content, including direct or indirect mentions of sexual behavior or actions. -[color=#a4885c]2.[/color] Absolutely no Erotic Roleplay (ERP) or sexual content, including direct or indirect mentions of sexual behavior or actions. (YOU WILL GET PERMABANNED) (Leeway is given to insults, ex: 'You are a dickhead', do not push it) - -[color=#a4885c]3.[/color] Don't communicate in-game/in-character information through methods outside of the game (such as talking in Discord with other users actively playing or by talking to your sibling across the room while you are both playing). This is referred to as "Metacomming" and we are not able to police it, therefore it is strictly forbidden. (BOTH OR ALL OF YOU WILL GET PERMABANNED) - -[color=#a4885c]4.[/color] Attempting to evade game bans will result in an automatic appeal-only permanent ban that is only appealable after six months. Attempting to evade job bans will result in an appeal-only permanent ban. (YOU WILL GET BANNED MUCH WORSE THAN YOU ALREADY WERE) +[color=#a4885c]2.[/color] Don't communicate in-game/in-character information through methods outside of the game (such as talking in Discord with other users actively playing or by talking to your sibling across the room while you are both playing). This is referred to as "Metacomming" and we are not able to police it, therefore it is strictly forbidden. [color=#ff0000]GENERAL ETIQUETTE[/color] -[color=#a4885c]5.[/color] These are English servers. Speak only English in IC and OOC. - -[color=#a4885c]6.[/color] Don't use exploits or external programs to play, gain an advantage, or disrupt the round/server. This includes autoclickers and auto-hotkey scripts. +[color=#a4885c]3.[/color] Don't use exploits or external programs to play, gain an advantage, or disrupt the round/server. This includes autoclickers and auto-hotkey scripts. -[color=#a4885c]7.[/color] Don't "multi-key" (utilize multiple alt accounts). Users knowingly using multiple SS14 accounts will have all of their accounts banned. - -[color=#a4885c]8.[/color] Do not ignore the admin help relay or abuse it by flooding it with garbage, checking for admins before stating a problem (ex: "hello?", "any admins?"), or sending messages of no substance. All admin helps are sent to the SS14 Discord. +[color=#a4885c]4.[/color] Don't "multi-key" (utilize multiple alt accounts). Users knowingly using multiple SS14 accounts will have all of their accounts banned. [color=#ff0000]IN GAME & ROLEPLAY RULES[/color] -[color=#a4885c]9.[/color] Pick a realistic name that could appear on a birth certificate with at least a first and last name (leeway is given to this for Clowns, Mimes, and non-human races). - - Names of notable famous or fictional persons or names that resemble/parody them are strictly forbidden. You are not clever if you slightly change a famous name around. Terrible names open you up to being politely reminded to change it, smited, or instantly banned, depending on severity. - -[color=#a4885c]10.[/color] Act like an actual human being on a space station in a low-roleplay (LRP) environment. Do not use text speak or emoticons IC, and do not refer to OOC things like admins in-game. - -[color=#a4885c]11.[/color] Don't be a dick. You are playing a multiplayer game with other people who also want to enjoy the game. +[color=#a4885c]5.[/color] Don't be a dick. You are playing a multiplayer game with other people who also want to enjoy the game. - Do not intentionally make other players' lives hell for your own amusement. - Antagonists have lots of leeway with this rule and may kill/sabotage as they see fit, but if it degrades the experience for majority of the rest of the server you will be told to stop. - [color=#ff0000]THE ROUND IS NOT OVER UNTIL THE END-ROUND SUMMARY APPEARS. KILLING SOMEONE FOR NO REASON BEFORE THIS WILL BE HANDLED ACCORDINGLY.[/color] -[color=#a4885c]12.[/color] Don't harass or target players across rounds for actions in prior rounds or for actions outside of the game (this is referred to as "Metagrudging".) +[color=#a4885c]6.[/color] Don't harass or target players across rounds for actions in prior rounds or for actions outside of the game (this is referred to as "Metagrudging".) - Annoying players for IC reasons in the current round is fine; doing it across rounds or as a ghost role after they kill you is not. -[color=#a4885c]13.[/color] Don't use information gained from outside your character's knowledge to gain an advantage (this is referred to as "Metagaming"). +[color=#a4885c]7.[/color] Don't use information gained from outside your character's knowledge to gain an advantage (this is referred to as "Metagaming"). - Using information you gain from outside your own character (such as spectating while a ghost, through screenshots or metacomms, or other means) to your advantage is strictly forbidden. You remember all events up until you fall unconscious, even after cloning. If you take a ghost role, unless otherwise stated, you DO NOT REMEMBER ANYTHING from your past life. -[color=#a4885c]14.[/color] Follow escalation rules and don't murder someone for slipping you, use common sense. +[color=#a4885c]8.[/color] Follow escalation rules and don't murder someone for slipping you, use common sense. - You can defend yourself to the extent of protecting your own life. - Security is unique in escalation and can escalate to less lethal to arrest criminals as needed. - - Don't outright leave people to die if you get in a fight, make an effort to heal them or bring them to Medbay. - - Adminhelp the situation if you think someone is over-escalating. - - Department strikes, revolutions (ex: cargonia and any variation thereof), or cults are antagonist-only activites and are forbidden without admin permission. -[color=#a4885c]15.[/color] Don't immediately ghost or suicide from your role if you do not get antagonist (referred to as "Antag-rolling"). +[color=#a4885c]9.[/color] Don't immediately ghost or suicide from your role if you do not get antagonist (referred to as "Antag-rolling"). - This is not fair to other players actually waiting patiently for an antagonist round. Alternatively, if you do not want to play an antagonist or do not want to cause conflict, do not opt-in for antagonist roles. -[color=#a4885c]16.[/color] Don't rush for or prepare equipment unrelated to your job for no purpose other then to have it "just in case" (referred to as "Powergaming"). - - A medical doctor does not need insulated gloves, and the Head of Personnel does not need to give themselves armory access so they can go grab a gun. - - Don't manufacture weapons, bombs, or death poisons before you know of any reason you would need them. - -[color=#a4885c]17.[/color] Intentionally making yourself a major problem/annoyance/disruption for the crew or other players at large while not an antagonist is forbidden (referred to as "self-antagging"). +[color=#a4885c]10.[/color] Intentionally making yourself a major problem/annoyance/disruption for the crew or other players at large while not an antagonist is forbidden (referred to as "self-antagging"). [color=#ff0000]SECURITY & COMMAND RULES[/color] -If you regularly play Security or Command roles and got this far, I applaud you for reading. - -[color=#a4885c]18.[/color] If you sign up for a Command or Security role, you are expected to know the basics of the game, your job, and the job(s) you supervise, if any. - - Failure to know your job or how to play the game in general as Command or Security is liable to result in a job ban. - - As a Command or Security role, don't make friends with antagonists and trade contraband with them. - - Don't engage in common troublemaker behavior and lawbreaking as a Command or Security role. - - Do not immediately abandon your position as a Command role and go do whatever you want instead of managing your department/the station. - -[color=#a4885c]19.[/color] Security/Command should try to remain non-lethal and effect arrests, except in the following special circumstances, where they may choose to use lethal force: - - Lethal force is used against you (ex: firearms, lasers, disabling weapons with intent to kill, deadly melee weapons) - - Suspect is wearing clothing or showing immediately dangerous equipment only used by enemy agents/antagonists (ex: Syndicate EVA Suit, Bloodred Hardsuit, Holoparasite, C-20R, etc.) - - You determine that your life or the life of an innocent is in immediate danger - - The suspect is unable to be safely detained by less-lethal means - - If no other reasonable options are readily available and allowing the suspect to continue would be an unreasonable danger to the station/crew - -Security/Command will be expected to answer for use of lethal force. Security/Command will be expected to effect arrests on criminals and prevent them from dying while in custody, even if lethal force is used, unless there is strong reason to believe the criminal is an antagonist. Security/Command is strongly encouraged, but not required, to clone antagonists and effect a permabrigging or other sentence as deemed appropriate. - -[color=#a4885c]20.[/color] Security/Command are expected to protect detainees in their custody to the best of their ability so as long as it does not come to unreasonable risk to themselves, the crew or the station at large to do so. - - Brig times should generally not exceed 10 minutes. Repeat offenders or antagonists may be permabrigged. - - Detainees that die in your custody must be cloned unless they have been (legally) executed or there is strong reason to believe they are an antagonist. - - Executions must be for a permabriggable crime and approved by the Captain/Acting Captain, who will answer for approving it alongside Security's chain of command. Security is beholden to [color=#FFFFFF]Space Law.[/color]. - -[color=#ff0000]RP SERVER SPECIFIC RULES[/color] - -[color=#a4885c]21.[/color] This server is a "Roleplay Expected" server. We define this as performing your assigned duties, "doing your job". This means it is important to do what is expected out of your department and not what would be expected out of other departments. - - Don’t do other peoples jobs for them. Opt in for the role you intend to play or change your job by visiting the Head of Personnel. Failure to do your basic duties may result in a job ban. - -[color=#a4885c]22.[/color] Each round exists independently of all other rounds. While friendships persisting through rounds is okay, using experiences from other rounds to give an advantage or disadvantage to other players is not permitted. - -[color=#a4885c]23.[/color] New Life Rule is in effect - Do not use information obtained while dead or from a previous life upon returning to the land of the living. Even if you are cloned, you do not remember the events culminating in your death. - -[color=#a4885c]24.[/color] Do your best not to interact negatively with SSD/AFK players. Moving them to safety is acceptable; killing, looting, or otherwise griefing them while they are away is not. - - SSD characters are players who are disconnected or AFK. It is possible for players to return to SSD bodies. Players become catatonic when they take a ghost spawner role or commit suicide. Players are NOT able to return to these bodies without admin intervention. - - If the player in question is an antag’s target or they are being secured by security, interactions to finish what is required of your duties/objectives are always acceptable. - - Ahelping about an SSD/AFK player may grant an exception to this rule. - - This does not apply to players that are catatonic, although needlessly killing or harming catatonic players is discouraged. - -[color=#a4885c]25.[/color] As mentioned above, [color=#ff0000]Space Law, Standard Operating Procedure and Alert Procedure policy/guidelines are expected to be adhered to[/color]. These can be found at wiki.spacestation14.io. - -[color=#ff0000]Command Rules[/color] -[color=#a4885c]26.[/color] The following jobs: Captain, HOP, HOS, CE, RD, CMO, and QM should ahelp when they need to stop playing. Do not play these roles if you do not expect to be able to finish the round. - - These roles must exhibit some competency. Incompetence can result in a job ban. Command roles are designed to lead and manage departments first and do second. They are not intended to become do-it-all members of their departments. - - Crew promoted to acting heads of staff must step down when an official head of staff arrives at the station. This is to prevent confusion with the chain of command when the new player arrives. +[color=#a4885c]11.[/color] If you sign up for a Command role, you are expected to know the basics of the game, your job, and the job(s) you supervise, if any. -[color=#a4885c]27.[/color] In the absence of a captain, the Head of Personnel must serve as acting captain. In the absence of a captain or HoP, the other command staff should choose an acting captain by consensus, in accordance with the Standard Operating Procedure. - - Only command staff may serve as acting captain. Acting departmental heads and regular crew may not serve as acting captain. - - An acting captain may fill in for decisions that require the captain’s authorization, but may not run the station and its departments, nor are they privy to the captain’s equipment or access, with exceptions for the command headset and nuke disk. + -Security/Command will be expected to answer for use of lethal force. + -Security/Command will be expected to effect arrests on criminals and prevent them from dying while in custody, even if lethal force is used, + unless there is strong reason to believe the criminal is an antagonist. Security/Command is strongly encouraged, but not required, to clone antagonists and effect a permabrigging or other sentence as deemed appropriate. -[color=#ff0000]Antagonist and Ghost Role Policy[/color] +[color=#a4885c]12.[/color] Security/Command are expected to protect detainees in their custody to the best of their ability so as long as it does not come to unreasonable risk to themselves, the crew or the station at large to do so. -[color=#a4885c]28.[/color] Antagonists exist to move the round forward and make things interesting and fun for everyone involved. The point isn't to "win", kill everyone else, or anything like that. - - Do not spawn camp or prevent others from entering the round safely. - - Do what is needed for your goals. Causing chaos in a department with a bomb is okay, but destroying half the station when you only need to steal magboots is an example of going extremely overboard. - - Team antag objectives take precedence over solo antag objectives. - - Ghost spawner roles must follow their flavor text upon taking said role. + -Brig times should generally not exceed 10 minutes. Repeat offenders or antagonists may be permabrigged. diff --git a/Resources/Server Info/Rules.txt b/Resources/Server Info/Rules.txt index a46269b96c5774..1d52ef6305dc25 100644 --- a/Resources/Server Info/Rules.txt +++ b/Resources/Server Info/Rules.txt @@ -1,84 +1,53 @@ -[color=#ff0000]YOU MUST BE AT LEAST 16 YEARS OF AGE TO PLAY ON WIZARD'S DEN SERVERS. ANY USER SUSPECTED OF BEING UNDER 16 YEARS OF AGE WILL BE BANNED UNTIL THEY ARE OF AGE.[/color] - -[color=#ff0000]DISCONNECTING FROM OR IGNORING/EVADING ADMIN-HELPS WILL RESULT IN AN APPEAL ONLY BAN.[/color] - -This is the "short" form of the rules, which has all the information any regular player should need. You can find the "long" form of the rules with more examples & clarifications of any ambiguity on our wiki at [color=#a4885c]wiki.spacestation14.io[/color], should you need it. - -[color=#a4885c]0.[/color] [color=#a4885c]The[/color] [color=#ffd700]Golden[/color] [color=#a4885c]Rule.[/color] Admins may excercise discretion with rules as they see fit. If you rule lawyer or line skirt, you will get removed. Admins will answer for use of this privilege. +[color=#ff0000]YOU MUST BE AT LEAST 18 YEARS OF AGE TO PLAY ON Hippie Station. ANY USER SUSPECTED OF BEING UNDER 18 YEARS OF AGE WILL BE BANNED UNTIL THEY ARE OF AGE.[/color] [color=#ff0000]ZERO TOLERANCE RULES[/color] -[color=#a4885c]1.[/color] Absolutely no hate speech, slurs, bigotry, IC specism (demeaning other characters in-game due to their in-game race), or anything even remotely similar. (YOU WILL GET PERMABANNED) - -[color=#a4885c]2.[/color] Absolutely no Erotic Roleplay (ERP) or sexual content, including direct or indirect mentions of sexual behavior or actions. (YOU WILL GET PERMABANNED) (Leeway is given to insults, ex: 'You are a dickhead', do not push it) +[color=#a4885c]1.[/color] Absolutely no Erotic Roleplay (ERP) or sexual content, including direct or indirect mentions of sexual behavior or actions. -[color=#a4885c]3.[/color] Don't communicate in-game/in-character information through methods outside of the game (such as talking in Discord with other users actively playing or by talking to your sibling across the room while you are both playing). This is referred to as "Metacomming" and we are not able to police it, therefore it is strictly forbidden. (BOTH OR ALL OF YOU WILL GET PERMABANNED) - -[color=#a4885c]4.[/color] Attempting to evade game bans will result in an automatic appeal-only permanent ban that is only appealable after six months. Attempting to evade job bans will result in an appeal-only permanent ban. (YOU WILL GET BANNED MUCH WORSE THAN YOU ALREADY WERE) +[color=#a4885c]2.[/color] Don't communicate in-game/in-character information through methods outside of the game (such as talking in Discord with other users actively playing or by talking to your sibling across the room while you are both playing). This is referred to as "Metacomming" and we are not able to police it, therefore it is strictly forbidden. [color=#ff0000]GENERAL ETIQUETTE[/color] -[color=#a4885c]5.[/color] These are English servers. Speak only English in IC and OOC. - -[color=#a4885c]6.[/color] Don't use exploits or external programs to play, gain an advantage, or disrupt the round/server. This includes autoclickers and auto-hotkey scripts. +[color=#a4885c]3.[/color] Don't use exploits or external programs to play, gain an advantage, or disrupt the round/server. This includes autoclickers and auto-hotkey scripts. -[color=#a4885c]7.[/color] Don't "multi-key" (utilize multiple alt accounts). Users knowingly using multiple SS14 accounts will have all of their accounts banned. - -[color=#a4885c]8.[/color] Do not ignore the admin help relay or abuse it by flooding it with garbage, checking for admins before stating a problem (ex: "hello?", "any admins?"), or sending messages of no substance. All admin helps are sent to the SS14 Discord. +[color=#a4885c]4.[/color] Don't "multi-key" (utilize multiple alt accounts). Users knowingly using multiple SS14 accounts will have all of their accounts banned. [color=#ff0000]IN GAME & ROLEPLAY RULES[/color] -[color=#a4885c]9.[/color] Pick a realistic name that could appear on a birth certificate with at least a first and last name (leeway is given to this for Clowns, Mimes, and non-human races). - - Names of notable famous or fictional persons or names that resemble/parody them are strictly forbidden. You are not clever if you slightly change a famous name around. Terrible names open you up to being politely reminded to change it, smited, or instantly banned, depending on severity. - -[color=#a4885c]10.[/color] Act like an actual human being on a space station in a low-roleplay (LRP) environment. Do not use text speak or emoticons IC, and do not refer to OOC things like admins in-game. - -[color=#a4885c]11.[/color] Don't be a dick. You are playing a multiplayer game with other people who also want to enjoy the game. +[color=#a4885c]5.[/color] Don't be a dick. You are playing a multiplayer game with other people who also want to enjoy the game. - Do not intentionally make other players' lives hell for your own amusement. - Antagonists have lots of leeway with this rule and may kill/sabotage as they see fit, but if it degrades the experience for majority of the rest of the server you will be told to stop. - [color=#ff0000]THE ROUND IS NOT OVER UNTIL THE END-ROUND SUMMARY APPEARS. KILLING SOMEONE FOR NO REASON BEFORE THIS WILL BE HANDLED ACCORDINGLY.[/color] -[color=#a4885c]12.[/color] Don't harass or target players across rounds for actions in prior rounds or for actions outside of the game (this is referred to as "Metagrudging".) +[color=#a4885c]6.[/color] Don't harass or target players across rounds for actions in prior rounds or for actions outside of the game (this is referred to as "Metagrudging".) - Annoying players for IC reasons in the current round is fine; doing it across rounds or as a ghost role after they kill you is not. -[color=#a4885c]13.[/color] Don't use information gained from outside your character's knowledge to gain an advantage (this is referred to as "Metagaming"). +[color=#a4885c]7.[/color] Don't use information gained from outside your character's knowledge to gain an advantage (this is referred to as "Metagaming"). - Using information you gain from outside your own character (such as spectating while a ghost, through screenshots or metacomms, or other means) to your advantage is strictly forbidden. You remember all events up until you fall unconscious, even after cloning. If you take a ghost role, unless otherwise stated, you DO NOT REMEMBER ANYTHING from your past life. -[color=#a4885c]14.[/color] Follow escalation rules and don't murder someone for slipping you, use common sense. +[color=#a4885c]8.[/color] Follow escalation rules and don't murder someone for slipping you, use common sense. - You can defend yourself to the extent of protecting your own life. - Security is unique in escalation and can escalate to less lethal to arrest criminals as needed. - - Don't outright leave people to die if you get in a fight, make an effort to heal them or bring them to Medbay. - - Adminhelp the situation if you think someone is over-escalating. - - Department strikes, revolutions (ex: cargonia and any variation thereof), or cults are antagonist-only activites and are forbidden without admin permission. - -[color=#a4885c]15.[/color] Don't immediately ghost or suicide from your role if you do not get antagonist (referred to as "Antag-rolling"). - - This is not fair to other players actually waiting patiently for an antagonist round. Alternatively, if you do not want to play an antagonist or do not want to cause conflict, do not opt-in for antagonist roles. -[color=#a4885c]16.[/color] Don't rush for or prepare equipment unrelated to your job for no purpose other then to have it "just in case" (referred to as "Powergaming"). - - A medical doctor does not need insulated gloves, and the Head of Personnel does not need to give themselves armory access so they can go grab a gun. - - Don't manufacture weapons, bombs, or death poisons before you know of any reason you would need them. +[color=#a4885c]9.[/color] Don't immediately ghost or suicide from your role if you do not get antagonist (referred to as "Antag-rolling"). + - This is not fair to other players actually waiting patiently for an antagonist + round. Alternatively, if you do not want to play an antagonist or do not want + to cause conflict, do not opt-in for antagonist roles. -[color=#a4885c]17.[/color] Intentionally making yourself a major problem/annoyance/disruption for the crew or other players at large while not an antagonist is forbidden (referred to as "self-antagging"). +[color=#a4885c]10.[/color] Intentionally making yourself a major problem/annoyance/disruption for the crew or other players at large while not an antagonist is forbidden (referred to as "self-antagging"). [color=#ff0000]SECURITY & COMMAND RULES[/color] -If you regularly play Security or Command roles and got this far, I applaud you for reading. - -[color=#a4885c]18.[/color] If you sign up for a Command or Security role, you are expected to know the basics of the game, your job, and the job(s) you supervise, if any. - - Failure to know your job or how to play the game in general as Command or Security is liable to result in a job ban. - - As a Command or Security role, don't make friends with antagonists and trade contraband with them. - - Don't engage in common troublemaker behavior and lawbreaking as a Command or Security role. - - Do not immediately abandon your position as a Command role and go do whatever you want instead of managing your department/the station. - -[color=#a4885c]19.[/color] Security/Command should try to remain non-lethal and effect arrests, except in the following special circumstances, where they may choose to use lethal force: - - Lethal force is used against you (ex: firearms, lasers, disabling weapons with intent to kill, deadly melee weapons) - - Suspect is wearing clothing or showing immediately dangerous equipment only used by enemy agents/antagonists (ex: Syndicate EVA Suit, Bloodred Hardsuit, Holoparasite, C-20R, etc.) - - You determine that your life or the life of an innocent is in immediate danger - - The suspect is unable to be safely detained by less-lethal means - - If no other reasonable options are readily available and allowing the suspect to continue would be an unreasonable danger to the station/crew - -Security/Command will be expected to answer for use of lethal force. Security/Command will be expected to effect arrests on criminals and prevent them from dying while in custody, even if lethal force is used, unless there is strong reason to believe the criminal is an antagonist. Security/Command is strongly encouraged, but not required, to clone antagonists and effect a permabrigging or other sentence as deemed appropriate. - -[color=#a4885c]20.[/color] Security/Command are expected to protect detainees in their custody to the best of their ability so as long as it does not come to unreasonable risk to themselves, the crew or the station at large to do so. - - Brig times should generally not exceed 10 minutes. Repeat offenders or antagonists may be permabrigged. - - Detainees that die in your custody must be cloned unless they have been (legally) executed or there is strong reason to believe they are an antagonist. - - Executions must be for a permabriggable crime and approved by the Captain/Acting Captain, who will answer for approving it alongside Security's chain of command. As there is no space law, Security/Command acts to maintain the safety of the station and its inhabitants, as well as Nanotrasen assets. + +[color=#a4885c]11.[/color] If you sign up for a Command role, you are expected to know the basics of the game, your job, and the job(s) you supervise, if any. + + - Security/Command will be expected to answer for use of lethal force. + + - Security/Command will be expected to effect arrests on criminals and + prevent them from dying while in custody, even if lethal force is used, + unless there is strong reason to believe the criminal is an antagonist. + + - Security/Command is strongly encouraged, but not required, to clone antagonists and effect a permabrigging or other sentence as deemed appropriate. + +[color=#a4885c]12.[/color] Security/Command are expected to protect detainees in their custody to the best of their ability so as long as it does not come to unreasonable risk to themselves, the crew or the station at large to do so. + + -Brig times should generally not exceed 10 minutes. Repeat offenders or antagonists may be permabrigged. diff --git a/Resources/Textures/Clothing/Belt/hf_sheath.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/hf_sheath.rsi/equipped-BELT.png new file mode 100644 index 00000000000000..25e898b4feb4fa Binary files /dev/null and b/Resources/Textures/Clothing/Belt/hf_sheath.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Clothing/Belt/hf_sheath.rsi/meta.json b/Resources/Textures/Clothing/Belt/hf_sheath.rsi/meta.json new file mode 100644 index 00000000000000..e549767f3a7b36 --- /dev/null +++ b/Resources/Textures/Clothing/Belt/hf_sheath.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/555fa0ed9f380509156d94131bd8a3f1c1fee1cf", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "sheath-sabre-equipped-BELT", + "directions": 4 + }, + { + "name": "sheath-sabre" + }, + { + "name": "sheath" + } + ] +} diff --git a/Resources/Textures/Clothing/Belt/hf_sheath.rsi/sheath-sabre-equipped-BELT.png b/Resources/Textures/Clothing/Belt/hf_sheath.rsi/sheath-sabre-equipped-BELT.png new file mode 100644 index 00000000000000..032a9e53d62a00 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/hf_sheath.rsi/sheath-sabre-equipped-BELT.png differ diff --git a/Resources/Textures/Clothing/Belt/hf_sheath.rsi/sheath-sabre.png b/Resources/Textures/Clothing/Belt/hf_sheath.rsi/sheath-sabre.png new file mode 100644 index 00000000000000..e8deb6807c41c5 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/hf_sheath.rsi/sheath-sabre.png differ diff --git a/Resources/Textures/Clothing/Belt/hf_sheath.rsi/sheath.png b/Resources/Textures/Clothing/Belt/hf_sheath.rsi/sheath.png new file mode 100644 index 00000000000000..bcc4fe3c24f3c8 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/hf_sheath.rsi/sheath.png differ diff --git a/Resources/Textures/Effects/arcs.rsi/hf_slash.png b/Resources/Textures/Effects/arcs.rsi/hf_slash.png new file mode 100644 index 00000000000000..2657fdb84dd89b Binary files /dev/null and b/Resources/Textures/Effects/arcs.rsi/hf_slash.png differ diff --git a/Resources/Textures/Effects/arcs.rsi/meta.json b/Resources/Textures/Effects/arcs.rsi/meta.json index 681c523cd938dd..7fa9d37bfb1ee0 100644 --- a/Resources/Textures/Effects/arcs.rsi/meta.json +++ b/Resources/Textures/Effects/arcs.rsi/meta.json @@ -77,6 +77,9 @@ { "name": "slash" }, + { + "name": "hf_slash" + }, { "name": "fist" } diff --git a/Resources/Textures/Interface/Actions/butt.png b/Resources/Textures/Interface/Actions/butt.png new file mode 100644 index 00000000000000..f67e97721e84c5 Binary files /dev/null and b/Resources/Textures/Interface/Actions/butt.png differ diff --git a/Resources/Textures/LobbyScreens/arrest.png b/Resources/Textures/LobbyScreens/arrest.png new file mode 100644 index 00000000000000..dee97e99291970 Binary files /dev/null and b/Resources/Textures/LobbyScreens/arrest.png differ diff --git a/Resources/Textures/LobbyScreens/pharmacy.png.yml b/Resources/Textures/LobbyScreens/arrest.png.yml similarity index 100% rename from Resources/Textures/LobbyScreens/pharmacy.png.yml rename to Resources/Textures/LobbyScreens/arrest.png.yml diff --git a/Resources/Textures/LobbyScreens/captain.png b/Resources/Textures/LobbyScreens/captain.png new file mode 100644 index 00000000000000..ae798ff7682372 Binary files /dev/null and b/Resources/Textures/LobbyScreens/captain.png differ diff --git a/Resources/Textures/LobbyScreens/warden.png.yml b/Resources/Textures/LobbyScreens/captain.png.yml similarity index 100% rename from Resources/Textures/LobbyScreens/warden.png.yml rename to Resources/Textures/LobbyScreens/captain.png.yml diff --git a/Resources/Textures/LobbyScreens/entertainment.png b/Resources/Textures/LobbyScreens/entertainment.png new file mode 100644 index 00000000000000..bdadf0394a2519 Binary files /dev/null and b/Resources/Textures/LobbyScreens/entertainment.png differ diff --git a/Resources/Textures/LobbyScreens/entertainment.png.yml b/Resources/Textures/LobbyScreens/entertainment.png.yml new file mode 100644 index 00000000000000..51ff40335ef67e --- /dev/null +++ b/Resources/Textures/LobbyScreens/entertainment.png.yml @@ -0,0 +1,2 @@ +sample: + filter: false diff --git a/Resources/Textures/LobbyScreens/galactic.png b/Resources/Textures/LobbyScreens/galactic.png new file mode 100644 index 00000000000000..6578bdbdc92287 Binary files /dev/null and b/Resources/Textures/LobbyScreens/galactic.png differ diff --git a/Resources/Textures/LobbyScreens/galactic.png.yml b/Resources/Textures/LobbyScreens/galactic.png.yml new file mode 100644 index 00000000000000..51ff40335ef67e --- /dev/null +++ b/Resources/Textures/LobbyScreens/galactic.png.yml @@ -0,0 +1,2 @@ +sample: + filter: false diff --git a/Resources/Textures/LobbyScreens/honkday.png b/Resources/Textures/LobbyScreens/honkday.png new file mode 100644 index 00000000000000..dba9e99a1ecad7 Binary files /dev/null and b/Resources/Textures/LobbyScreens/honkday.png differ diff --git a/Resources/Textures/LobbyScreens/honkday.png.yml b/Resources/Textures/LobbyScreens/honkday.png.yml new file mode 100644 index 00000000000000..51ff40335ef67e --- /dev/null +++ b/Resources/Textures/LobbyScreens/honkday.png.yml @@ -0,0 +1,2 @@ +sample: + filter: false diff --git a/Resources/Textures/LobbyScreens/law.png b/Resources/Textures/LobbyScreens/law.png new file mode 100644 index 00000000000000..ff3beda8c4a37f Binary files /dev/null and b/Resources/Textures/LobbyScreens/law.png differ diff --git a/Resources/Textures/LobbyScreens/law.png.yml b/Resources/Textures/LobbyScreens/law.png.yml new file mode 100644 index 00000000000000..51ff40335ef67e --- /dev/null +++ b/Resources/Textures/LobbyScreens/law.png.yml @@ -0,0 +1,2 @@ +sample: + filter: false diff --git a/Resources/Textures/LobbyScreens/mime.png b/Resources/Textures/LobbyScreens/mime.png new file mode 100644 index 00000000000000..1b635d5bf2d4d0 Binary files /dev/null and b/Resources/Textures/LobbyScreens/mime.png differ diff --git a/Resources/Textures/LobbyScreens/mime.png.yml b/Resources/Textures/LobbyScreens/mime.png.yml new file mode 100644 index 00000000000000..51ff40335ef67e --- /dev/null +++ b/Resources/Textures/LobbyScreens/mime.png.yml @@ -0,0 +1,2 @@ +sample: + filter: false diff --git a/Resources/Textures/LobbyScreens/pharmacy.png b/Resources/Textures/LobbyScreens/pharmacy.png deleted file mode 100644 index d49aa9ca995e62..00000000000000 Binary files a/Resources/Textures/LobbyScreens/pharmacy.png and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/rare+memes.png b/Resources/Textures/LobbyScreens/rare+memes.png new file mode 100644 index 00000000000000..607fb623e3dcb0 Binary files /dev/null and b/Resources/Textures/LobbyScreens/rare+memes.png differ diff --git a/Resources/Textures/LobbyScreens/rare+memes.yml b/Resources/Textures/LobbyScreens/rare+memes.yml new file mode 100644 index 00000000000000..51ff40335ef67e --- /dev/null +++ b/Resources/Textures/LobbyScreens/rare+memes.yml @@ -0,0 +1,2 @@ +sample: + filter: false diff --git a/Resources/Textures/LobbyScreens/robotics.png b/Resources/Textures/LobbyScreens/robotics.png deleted file mode 100644 index e39282810e9498..00000000000000 Binary files a/Resources/Textures/LobbyScreens/robotics.png and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/robotics.png.yml b/Resources/Textures/LobbyScreens/robotics.png.yml deleted file mode 100644 index dabd6601f78603..00000000000000 --- a/Resources/Textures/LobbyScreens/robotics.png.yml +++ /dev/null @@ -1,2 +0,0 @@ -sample: - filter: true diff --git a/Resources/Textures/LobbyScreens/security.png b/Resources/Textures/LobbyScreens/security.png new file mode 100644 index 00000000000000..9c63aaa9df117c Binary files /dev/null and b/Resources/Textures/LobbyScreens/security.png differ diff --git a/Resources/Textures/LobbyScreens/security.png.yml b/Resources/Textures/LobbyScreens/security.png.yml new file mode 100644 index 00000000000000..51ff40335ef67e --- /dev/null +++ b/Resources/Textures/LobbyScreens/security.png.yml @@ -0,0 +1,2 @@ +sample: + filter: false diff --git a/Resources/Textures/LobbyScreens/shitsec.png b/Resources/Textures/LobbyScreens/shitsec.png new file mode 100644 index 00000000000000..bc99d9f4760eff Binary files /dev/null and b/Resources/Textures/LobbyScreens/shitsec.png differ diff --git a/Resources/Textures/LobbyScreens/shitsec.png.yml b/Resources/Textures/LobbyScreens/shitsec.png.yml new file mode 100644 index 00000000000000..51ff40335ef67e --- /dev/null +++ b/Resources/Textures/LobbyScreens/shitsec.png.yml @@ -0,0 +1,2 @@ +sample: + filter: false diff --git a/Resources/Textures/LobbyScreens/ssxiv.png b/Resources/Textures/LobbyScreens/ssxiv.png deleted file mode 100644 index ffa20f43b04cf1..00000000000000 Binary files a/Resources/Textures/LobbyScreens/ssxiv.png and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/ssxiv.png.yml b/Resources/Textures/LobbyScreens/ssxiv.png.yml deleted file mode 100644 index dabd6601f78603..00000000000000 --- a/Resources/Textures/LobbyScreens/ssxiv.png.yml +++ /dev/null @@ -1,2 +0,0 @@ -sample: - filter: true diff --git a/Resources/Textures/LobbyScreens/supermatter.png b/Resources/Textures/LobbyScreens/supermatter.png deleted file mode 100644 index 1cc7c6ce402a47..00000000000000 Binary files a/Resources/Textures/LobbyScreens/supermatter.png and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/supermatter.png.yml b/Resources/Textures/LobbyScreens/supermatter.png.yml deleted file mode 100644 index dabd6601f78603..00000000000000 --- a/Resources/Textures/LobbyScreens/supermatter.png.yml +++ /dev/null @@ -1,2 +0,0 @@ -sample: - filter: true diff --git a/Resources/Textures/LobbyScreens/syndicate.png b/Resources/Textures/LobbyScreens/syndicate.png new file mode 100644 index 00000000000000..996712178938fb Binary files /dev/null and b/Resources/Textures/LobbyScreens/syndicate.png differ diff --git a/Resources/Textures/LobbyScreens/syndicate.png.yml b/Resources/Textures/LobbyScreens/syndicate.png.yml new file mode 100644 index 00000000000000..51ff40335ef67e --- /dev/null +++ b/Resources/Textures/LobbyScreens/syndicate.png.yml @@ -0,0 +1,2 @@ +sample: + filter: false diff --git a/Resources/Textures/LobbyScreens/warden.png b/Resources/Textures/LobbyScreens/warden.png deleted file mode 100644 index 925a1a9e8a5acb..00000000000000 Binary files a/Resources/Textures/LobbyScreens/warden.png and /dev/null differ diff --git a/Resources/Textures/Logo/icon.ico b/Resources/Textures/Logo/icon.ico index a985e4d51e2b6f..240d0edec4d333 100644 Binary files a/Resources/Textures/Logo/icon.ico and b/Resources/Textures/Logo/icon.ico differ diff --git a/Resources/Textures/Logo/icon/icon-128x128.png b/Resources/Textures/Logo/icon/icon-128x128.png index f8b9345bd13405..df5b5bc9e33b0e 100644 Binary files a/Resources/Textures/Logo/icon/icon-128x128.png and b/Resources/Textures/Logo/icon/icon-128x128.png differ diff --git a/Resources/Textures/Logo/icon/icon-16x16.png b/Resources/Textures/Logo/icon/icon-16x16.png index a02d968cea63e1..9d967a936c8160 100644 Binary files a/Resources/Textures/Logo/icon/icon-16x16.png and b/Resources/Textures/Logo/icon/icon-16x16.png differ diff --git a/Resources/Textures/Logo/icon/icon-24x24.png b/Resources/Textures/Logo/icon/icon-24x24.png index 0fe5c3c58797fe..0c7f395402a527 100644 Binary files a/Resources/Textures/Logo/icon/icon-24x24.png and b/Resources/Textures/Logo/icon/icon-24x24.png differ diff --git a/Resources/Textures/Logo/icon/icon-256x256.png b/Resources/Textures/Logo/icon/icon-256x256.png index 6bbe1ef4b41ed1..e2dea824e68a8a 100644 Binary files a/Resources/Textures/Logo/icon/icon-256x256.png and b/Resources/Textures/Logo/icon/icon-256x256.png differ diff --git a/Resources/Textures/Logo/icon/icon-32x32.png b/Resources/Textures/Logo/icon/icon-32x32.png index 5081ca7fb13bf6..80f437c1e0b7fb 100644 Binary files a/Resources/Textures/Logo/icon/icon-32x32.png and b/Resources/Textures/Logo/icon/icon-32x32.png differ diff --git a/Resources/Textures/Logo/icon/icon-48x48.png b/Resources/Textures/Logo/icon/icon-48x48.png index 002c729897366b..c9d1c4f5d8e585 100644 Binary files a/Resources/Textures/Logo/icon/icon-48x48.png and b/Resources/Textures/Logo/icon/icon-48x48.png differ diff --git a/Resources/Textures/Logo/icon/icon-64x64.png b/Resources/Textures/Logo/icon/icon-64x64.png index 9958b5492ceba1..b4c9488b0761ff 100644 Binary files a/Resources/Textures/Logo/icon/icon-64x64.png and b/Resources/Textures/Logo/icon/icon-64x64.png differ diff --git a/Resources/Textures/Logo/logo.png b/Resources/Textures/Logo/logo.png index dedf697562a9c6..96890057c476df 100644 Binary files a/Resources/Textures/Logo/logo.png and b/Resources/Textures/Logo/logo.png differ diff --git a/Resources/Textures/Logo/logo.svg b/Resources/Textures/Logo/logo.svg index bffdb31c2afad4..2df08feacf614d 100644 --- a/Resources/Textures/Logo/logo.svg +++ b/Resources/Textures/Logo/logo.svg @@ -1,152 +1,12 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/hf_blade.png b/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/hf_blade.png new file mode 100644 index 00000000000000..19054683dbf8cf Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/hf_blade.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/hf_blade_on - Kopie.png b/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/hf_blade_on - Kopie.png new file mode 100644 index 00000000000000..ec5504502b6c2e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/hf_blade_on - Kopie.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/hf_blade_on.png b/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/hf_blade_on.png new file mode 100644 index 00000000000000..49cdaba9967bde Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/hf_blade_on.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/icon.png new file mode 100644 index 00000000000000..19054683dbf8cf Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/inhand-left-blade.png b/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/inhand-left-blade.png new file mode 100644 index 00000000000000..bd24e9a9770eef Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/inhand-left-blade.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/inhand-left.png new file mode 100644 index 00000000000000..6c905cb10f6990 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/inhand-right-blade.png b/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/inhand-right-blade.png new file mode 100644 index 00000000000000..cbca0ae0cfba46 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/inhand-right-blade.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/inhand-right.png new file mode 100644 index 00000000000000..9ffb6fd4acb290 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/meta.json new file mode 100644 index 00000000000000..97f55ef315a3f3 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/hf_blade.rsi/meta.json @@ -0,0 +1,78 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "hf_blade" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "hf_blade_on", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/manifest.yml b/Resources/manifest.yml index 67991181939ffe..285ce2d651355c 100644 --- a/Resources/manifest.yml +++ b/Resources/manifest.yml @@ -1,4 +1,4 @@ -defaultWindowTitle: Space Station 14 +defaultWindowTitle: Hippie Station windowIconSet: /Textures/Logo/icon splashLogo: /Textures/Logo/logo.png