From 3b94336d747b56665482db62eaa2db2953266c54 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 29 Jul 2023 18:41:57 +0300 Subject: [PATCH 01/10] Walls for the mime ship --- .../Entities/Structures/Windows/window.yml | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Windows/window.yml diff --git a/Resources/Prototypes/_NF/Entities/Structures/Windows/window.yml b/Resources/Prototypes/_NF/Entities/Structures/Windows/window.yml new file mode 100644 index 00000000000..390548159f9 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Windows/window.yml @@ -0,0 +1,42 @@ +# Mime + +- type: entity + id: WallInvisibleShip + name: Invisible Wall + suffix: Ship + components: + - type: Sprite + drawdepth: WallTops + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.5,-0.5,0.5,0.5" + mask: + - FullTileMask + layer: + - GlassLayer + - type: Damageable + damageContainer: Inorganic + damageModifierSet: RGlass + - type: Physics + bodyType: Static + - type: Airtight + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: InteractionPopup + interactSuccessString: comp-window-knock + messagePerceivedByOthers: comp-window-knock + interactSuccessSound: + path: /Audio/Effects/glass_knock.ogg \ No newline at end of file From c60b47ad0d070ccf63f379aa61b8805d19ebfcf5 Mon Sep 17 00:00:00 2001 From: Leander-0 Date: Sat, 29 Jul 2023 23:43:41 -0400 Subject: [PATCH 02/10] nerf heavy armor --- .../Entities/Clothing/OuterClothing/armor.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 06cdb94fa17..0cfe5dd9631 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -127,13 +127,14 @@ - type: Armor modifiers: coefficients: - Blunt: 0.2 - Slash: 0.2 - Piercing: 0.2 - Heat: 0.5 - Radiation: 0 + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.5 + Heat: 0.7 Caustic: 0.75 - type: GroupExamine + - type: ExplosionResistance + damageCoefficient: 0.7 - type: entity parent: ClothingOuterArmorHeavy From d2598c749015a1cdf6796f5d527469c3e415d22a Mon Sep 17 00:00:00 2001 From: Leander-0 Date: Sun, 30 Jul 2023 00:46:51 -0400 Subject: [PATCH 03/10] remove MobstateComponent from puppet --- Resources/Prototypes/Entities/Objects/Fun/puppet.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Fun/puppet.yml b/Resources/Prototypes/Entities/Objects/Fun/puppet.yml index 845a4b97c61..5e4f69aad6c 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/puppet.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/puppet.yml @@ -19,9 +19,6 @@ - type: TypingIndicator proto: robot - type: Actions - - type: MobState - allowedStates: - - Alive - type: MeleeWeapon hidden: true soundHit: From 1c2aa737a9dca1d9e9b3b15da8f8d5376ba230ab Mon Sep 17 00:00:00 2001 From: OCO_Omega <42233446+OCOtheOmega@users.noreply.github.com> Date: Mon, 31 Jul 2023 01:11:34 +0300 Subject: [PATCH 04/10] Update HumanoidCharacterProfile.cs --- Content.Shared/Preferences/HumanoidCharacterProfile.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs index 0cb624fa95a..c779229e8a3 100644 --- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs +++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs @@ -417,7 +417,15 @@ public void EnsureValid() var configManager = IoCManager.Resolve(); if (configManager.GetCVar(CCVars.RestrictedNames)) { - name = Regex.Replace(name, @"[^A-Z,a-z,0-9, -]", string.Empty); + name = Regex.Replace(name, @"[^\u0041-\u005A,\u0061-\u007A,\u00C0-\u00D6,\u00D8-\u00F6,\u00F8-\u00FF,\u0100-\u017F, -]", string.Empty); + /* + * 0041-005A Basic Latin: Uppercase Latin Alphabet + * 0061-007A Basic Latin: Lowercase Latin Alphabet + * 00C0-00D6 Latin-1 Supplement: Letters I + * 00D8-00F6 Latin-1 Supplement: Letters II + * 00F8-00FF Latin-1 Supplement: Letters III + * 0100-017F Latin Extended A: European Latin + */ } if (configManager.GetCVar(CCVars.ICNameCase)) From 2c8a1f4c4ce6cc561460abfe8b025b595d7a31c7 Mon Sep 17 00:00:00 2001 From: OCO_Omega <42233446+OCOtheOmega@users.noreply.github.com> Date: Mon, 31 Jul 2023 01:18:51 +0300 Subject: [PATCH 05/10] Update CCVars.cs --- Content.Shared/CCVar/CCVars.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 95d263df35c..88bd5da4528 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -1396,7 +1396,7 @@ public static readonly CVarDef /// Restricts IC character names to alphanumeric chars. /// public static readonly CVarDef RestrictedNames = - CVarDef.Create("ic.restricted_names", true, CVar.SERVER | CVar.REPLICATED); + CVarDef.Create("ic.restricted_names", false, CVar.SERVER | CVar.REPLICATED); /// /// Allows flavor text (character descriptions) From 841b1dd3789d9f00ad486cee051f3c83dc743bbd Mon Sep 17 00:00:00 2001 From: OCO_Omega <42233446+OCOtheOmega@users.noreply.github.com> Date: Mon, 31 Jul 2023 01:47:37 +0300 Subject: [PATCH 06/10] Update CCVars.cs --- Content.Shared/CCVar/CCVars.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 88bd5da4528..95d263df35c 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -1396,7 +1396,7 @@ public static readonly CVarDef /// Restricts IC character names to alphanumeric chars. /// public static readonly CVarDef RestrictedNames = - CVarDef.Create("ic.restricted_names", false, CVar.SERVER | CVar.REPLICATED); + CVarDef.Create("ic.restricted_names", true, CVar.SERVER | CVar.REPLICATED); /// /// Allows flavor text (character descriptions) From 446f05a7c364e4e8c6bc0232359bdef3bab74bef Mon Sep 17 00:00:00 2001 From: Dvir Date: Mon, 31 Jul 2023 02:21:53 +0300 Subject: [PATCH 07/10] Buffed security suits to not be shit. --- .../Clothing/OuterClothing/hardsuits.yml | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 503d2aab610..cc1883dd2b8 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -12,6 +12,9 @@ sprite: Clothing/OuterClothing/Hardsuits/basic.rsi - type: Clothing sprite: Clothing/OuterClothing/Hardsuits/basic.rsi + - type: ClothingSpeedModifier + walkModifier: 0.80 + sprintModifier: 0.80 - type: Armor modifiers: coefficients: @@ -23,9 +26,6 @@ Caustic: 0.85 - type: ExplosionResistance damageCoefficient: 0.9 - - type: ClothingSpeedModifier - walkModifier: 0.80 - sprintModifier: 0.80 - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitBasic - type: StaticPrice @@ -173,8 +173,8 @@ highPressureMultiplier: 0.525 lowPressureMultiplier: 10000 - type: ClothingSpeedModifier - walkModifier: 0.7 - sprintModifier: 0.7 + walkModifier: 0.85 + sprintModifier: 0.75 - type: Armor modifiers: coefficients: @@ -203,7 +203,7 @@ highPressureMultiplier: 0.3 lowPressureMultiplier: 5500 - type: ClothingSpeedModifier - walkModifier: 0.8 + walkModifier: 0.90 sprintModifier: 0.85 - type: Armor modifiers: @@ -230,6 +230,9 @@ - type: PressureProtection highPressureMultiplier: 0.525 lowPressureMultiplier: 10000 + - type: ClothingSpeedModifier + walkModifier: 0.85 + sprintModifier: 0.75 - type: Armor modifiers: coefficients: @@ -384,7 +387,7 @@ highPressureMultiplier: 0.45 lowPressureMultiplier: 10000 - type: ClothingSpeedModifier - walkModifier: 0.75 + walkModifier: 0.85 sprintModifier: 0.75 - type: Armor modifiers: @@ -795,6 +798,9 @@ - type: PressureProtection highPressureMultiplier: 0.525 lowPressureMultiplier: 10000 + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.9 - type: Armor modifiers: coefficients: @@ -809,6 +815,3 @@ node: clownHardsuit - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitClown - - type: ClothingSpeedModifier - walkModifier: 0.9 - sprintModifier: 0.9 From 073fe1062a0e5b98ab1756a8d497fb6a0bccc174 Mon Sep 17 00:00:00 2001 From: Cheackraze <71046427+Cheackraze@users.noreply.github.com> Date: Mon, 31 Jul 2023 02:06:42 -0400 Subject: [PATCH 08/10] add job slot customization --- ...lStationRecordConsoleBoundUserInterface.cs | 23 +++++++++ .../GeneralStationRecordConsoleWindow.xaml | 11 ++++- .../GeneralStationRecordConsoleWindow.xaml.cs | 49 +++++++++++++++---- Content.Client/StationRecords/JobRow.xaml | 24 +++++++++ Content.Client/StationRecords/JobRow.xaml.cs | 17 +++++++ .../GeneralStationRecordConsoleSystem.cs | 21 ++++++-- .../GeneralStationRecordsFilter.cs | 13 +++++ ...SharedGeneralStationRecordConsoleSystem.cs | 7 ++- 8 files changed, 149 insertions(+), 16 deletions(-) create mode 100644 Content.Client/StationRecords/JobRow.xaml create mode 100644 Content.Client/StationRecords/JobRow.xaml.cs diff --git a/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs b/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs index 0743312e119..9330f67b08d 100644 --- a/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs +++ b/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs @@ -1,5 +1,7 @@ using Content.Shared.StationRecords; using Robust.Client.GameObjects; +using Robust.Client.UserInterface.Controls; +using static Robust.Client.UserInterface.Controls.BaseButton; namespace Content.Client.StationRecords; @@ -19,6 +21,8 @@ protected override void Open() _window = new(); _window.OnKeySelected += OnKeySelected; _window.OnFiltersChanged += OnFiltersChanged; + _window.OnJobAdd += OnJobsAdd; + _window.OnJobSubtract += OnJobsSubtract; _window.OnClose += Close; _window.OpenCentered(); @@ -36,6 +40,25 @@ private void OnFiltersChanged( SendMessage(msg); } + private void OnJobsAdd(ButtonEventArgs args) + { + if (args.Button.Parent?.Parent is not JobRow row || row.Job == null) + { + return; + } + + AdjustStationJobMsg msg = new(row.Job, 1); + SendMessage(msg); + } + private void OnJobsSubtract(ButtonEventArgs args) + { + if (args.Button.Parent?.Parent is not JobRow row || row.Job == null) + { + return; + } + AdjustStationJobMsg msg = new(row.Job, -1); + SendMessage(msg); + } protected override void UpdateState(BoundUserInterfaceState state) { base.UpdateState(state); diff --git a/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml b/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml index a915d329bc3..1dfee5eb2b4 100644 --- a/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml +++ b/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml @@ -2,7 +2,7 @@ Title="{Loc 'general-station-record-console-window-title'}" MinSize="750 500"> - + @@ -11,11 +11,18 @@ - +