From 526111923cc379944a65f88174907ea16e447444 Mon Sep 17 00:00:00 2001 From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Date: Thu, 20 Feb 2020 01:19:59 -0800 Subject: [PATCH 01/15] Refactor Controls to default to MouseFilterMode.Ignore --- Content.Client/Chat/ChatBox.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Content.Client/Chat/ChatBox.cs b/Content.Client/Chat/ChatBox.cs index 3ad087d1ae..87bbebba1b 100644 --- a/Content.Client/Chat/ChatBox.cs +++ b/Content.Client/Chat/ChatBox.cs @@ -43,6 +43,7 @@ namespace Content.Client.Chat AnchorLeft = 1.0f; AnchorRight = 1.0f;*/ + MouseFilter = MouseFilterMode.Stop; var outerVBox = new VBoxContainer(); From 4bdb45731adbf930189a3a6369e37ddd36bf5aea Mon Sep 17 00:00:00 2001 From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Date: Thu, 20 Feb 2020 01:21:23 -0800 Subject: [PATCH 02/15] Clean up MouseFilterMode.Ignore from Controls --- Content.Client/Chat/ChatManager.cs | 7 ++----- Content.Client/Chat/SpeechBubble.cs | 5 +---- .../Components/Storage/ClientStorageComponent.cs | 7 +++---- Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs | 7 +------ Content.Client/UserInterface/CharacterSetupGui.cs | 2 -- Content.Client/UserInterface/GameHud.cs | 7 +------ Content.Client/UserInterface/HandsGui.cs | 6 +----- Content.Client/UserInterface/ItemSlotButton.cs | 2 -- Content.Client/UserInterface/StatusEffectsUI.cs | 3 +-- 9 files changed, 10 insertions(+), 36 deletions(-) diff --git a/Content.Client/Chat/ChatManager.cs b/Content.Client/Chat/ChatManager.cs index e0ee549fbd..a2a3e04ae7 100644 --- a/Content.Client/Chat/ChatManager.cs +++ b/Content.Client/Chat/ChatManager.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Content.Client.Interfaces.Chat; using Content.Shared.Chat; using Robust.Client.Console; @@ -81,10 +81,7 @@ namespace Content.Client.Chat { _netManager.RegisterNetMessage(MsgChatMessage.NAME, _onChatMessage); - _speechBubbleRoot = new LayoutContainer - { - MouseFilter = Control.MouseFilterMode.Ignore - }; + _speechBubbleRoot = new LayoutContainer(); LayoutContainer.SetAnchorPreset(_speechBubbleRoot, LayoutContainer.LayoutPreset.Wide); _userInterfaceManager.StateRoot.AddChild(_speechBubbleRoot); _speechBubbleRoot.SetPositionFirst(); diff --git a/Content.Client/Chat/SpeechBubble.cs b/Content.Client/Chat/SpeechBubble.cs index 01453c12f0..2766ab1b0b 100644 --- a/Content.Client/Chat/SpeechBubble.cs +++ b/Content.Client/Chat/SpeechBubble.cs @@ -1,4 +1,4 @@ -using Content.Client.Interfaces.Chat; +using Content.Client.Interfaces.Chat; using Robust.Client.Interfaces.Graphics.ClientEye; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; @@ -44,14 +44,12 @@ namespace Content.Client.Chat _senderEntity = senderEntity; _eyeManager = eyeManager; - MouseFilter = MouseFilterMode.Ignore; // Use text clipping so new messages don't overlap old ones being pushed up. RectClipContent = true; var label = new RichTextLabel { MaxWidth = 256, - MouseFilter = MouseFilterMode.Ignore }; label.SetMessage(text); @@ -59,7 +57,6 @@ namespace Content.Client.Chat { StyleClasses = { "tooltipBox" }, Children = { label }, - MouseFilter = MouseFilterMode.Ignore, ModulateSelfOverride = Color.White.WithAlpha(0.75f) }; diff --git a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs b/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs index a1491a0a7a..f66c6c7751 100644 --- a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs +++ b/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs @@ -242,23 +242,22 @@ namespace Content.Client.GameObjects.Components.Storage }; AddChild(ActualButton); - var hBoxContainer = new HBoxContainer {MouseFilter = MouseFilterMode.Ignore}; + var hBoxContainer = new HBoxContainer(); EntitySpriteView = new SpriteView { - CustomMinimumSize = new Vector2(32.0f, 32.0f), MouseFilter = MouseFilterMode.Ignore + CustomMinimumSize = new Vector2(32.0f, 32.0f) }; EntityName = new Label { SizeFlagsVertical = SizeFlags.ShrinkCenter, Text = "Backpack", - MouseFilter = MouseFilterMode.Ignore }; hBoxContainer.AddChild(EntitySpriteView); hBoxContainer.AddChild(EntityName); EntityControl = new Control { - SizeFlagsHorizontal = SizeFlags.FillExpand, MouseFilter = MouseFilterMode.Ignore + SizeFlagsHorizontal = SizeFlags.FillExpand }; EntitySize = new Label { diff --git a/Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs b/Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs index 53b350bdd0..30b8238d20 100644 --- a/Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs +++ b/Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs @@ -345,14 +345,12 @@ namespace Content.Client.UserInterface.Cargo var hBox = new HBoxContainer { - SizeFlagsHorizontal = SizeFlags.FillExpand, - MouseFilter = MouseFilterMode.Ignore + SizeFlagsHorizontal = SizeFlags.FillExpand }; Icon = new TextureRect { CustomMinimumSize = new Vector2(32.0f, 32.0f), - MouseFilter = MouseFilterMode.Ignore, RectClipContent = true }; hBox.AddChild(Icon); @@ -366,7 +364,6 @@ namespace Content.Client.UserInterface.Cargo var panel = new PanelContainer { PanelOverride = new StyleBoxFlat { BackgroundColor = new Color(37, 37, 42) }, - MouseFilter = MouseFilterMode.Ignore }; PointCost = new Label { @@ -396,13 +393,11 @@ namespace Content.Client.UserInterface.Cargo var hBox = new HBoxContainer { SizeFlagsHorizontal = SizeFlags.FillExpand, - MouseFilter = MouseFilterMode.Ignore }; Icon = new TextureRect { CustomMinimumSize = new Vector2(32.0f, 32.0f), - MouseFilter = MouseFilterMode.Ignore, RectClipContent = true }; hBox.AddChild(Icon); diff --git a/Content.Client/UserInterface/CharacterSetupGui.cs b/Content.Client/UserInterface/CharacterSetupGui.cs index ca738faeb3..910df07ad4 100644 --- a/Content.Client/UserInterface/CharacterSetupGui.cs +++ b/Content.Client/UserInterface/CharacterSetupGui.cs @@ -231,7 +231,6 @@ namespace Content.Client.UserInterface { Sprite = _previewDummy.GetComponent(), Scale = (2, 2), - MouseFilter = MouseFilterMode.Ignore, OverrideDirection = Direction.South }; @@ -264,7 +263,6 @@ namespace Content.Client.UserInterface var internalHBox = new HBoxContainer { SizeFlagsHorizontal = SizeFlags.FillExpand, - MouseFilter = MouseFilterMode.Ignore, SeparationOverride = 0, Children = { diff --git a/Content.Client/UserInterface/GameHud.cs b/Content.Client/UserInterface/GameHud.cs index 7367a82caa..fdfd3e624c 100644 --- a/Content.Client/UserInterface/GameHud.cs +++ b/Content.Client/UserInterface/GameHud.cs @@ -107,7 +107,7 @@ namespace Content.Client.UserInterface public void Initialize() { - RootControl = new LayoutContainer {MouseFilter = Control.MouseFilterMode.Ignore}; + RootControl = new LayoutContainer(); LayoutContainer.SetAnchorPreset(RootControl, LayoutContainer.LayoutPreset.Wide); var escapeTexture = _resourceCache.GetTexture("/Textures/UserInterface/hamburger.svg.96dpi.png"); @@ -237,7 +237,6 @@ namespace Content.Client.UserInterface HandsContainer = new MarginContainer { - MouseFilter = MouseFilterMode.Ignore, SizeFlagsVertical = Control.SizeFlags.ShrinkEnd }; @@ -353,13 +352,11 @@ namespace Content.Client.UserInterface AddChild(new MarginContainer { - MouseFilter = MouseFilterMode.Ignore, MarginTopOverride = 4, Children = { new VBoxContainer { - MouseFilter = MouseFilterMode.Ignore, Children = { (_textureRect = new TextureRect @@ -367,7 +364,6 @@ namespace Content.Client.UserInterface Texture = texture, SizeFlagsHorizontal = SizeFlags.ShrinkCenter, SizeFlagsVertical = SizeFlags.Expand | SizeFlags.ShrinkCenter, - MouseFilter = MouseFilterMode.Ignore, ModulateSelfOverride = ColorNormal, CustomMinimumSize = (0, 32), Stretch = TextureRect.StretchMode.KeepCentered @@ -376,7 +372,6 @@ namespace Content.Client.UserInterface { Text = keyName, SizeFlagsHorizontal = SizeFlags.ShrinkCenter, - MouseFilter = MouseFilterMode.Ignore, ModulateSelfOverride = ColorNormal, StyleClasses = {StyleClassLabelTopButton} }) diff --git a/Content.Client/UserInterface/HandsGui.cs b/Content.Client/UserInterface/HandsGui.cs index 0f66d323a3..2356d7e24e 100644 --- a/Content.Client/UserInterface/HandsGui.cs +++ b/Content.Client/UserInterface/HandsGui.cs @@ -39,8 +39,6 @@ namespace Content.Client.UserInterface { IoCManager.InjectDependencies(this); - MouseFilter = MouseFilterMode.Ignore; - var textureHandLeft = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/hand_l.png"); var textureHandRight = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/hand_r.png"); var textureHandActive = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/hand_active.png"); @@ -54,8 +52,7 @@ namespace Content.Client.UserInterface var hBox = new HBoxContainer { SeparationOverride = 0, - Children = {_rightStatusPanel, _rightButton, _leftButton, _leftStatusPanel}, - MouseFilter = MouseFilterMode.Ignore + Children = {_rightStatusPanel, _rightButton, _leftButton, _leftStatusPanel} }; AddChild(hBox); @@ -68,7 +65,6 @@ namespace Content.Client.UserInterface // Active hand _leftButton.AddChild(ActiveHandRect = new TextureRect { - MouseFilter = MouseFilterMode.Ignore, Texture = textureHandActive, TextureScale = (2, 2) }); diff --git a/Content.Client/UserInterface/ItemSlotButton.cs b/Content.Client/UserInterface/ItemSlotButton.cs index a6b0e0fa49..f27583f737 100644 --- a/Content.Client/UserInterface/ItemSlotButton.cs +++ b/Content.Client/UserInterface/ItemSlotButton.cs @@ -31,7 +31,6 @@ namespace Content.Client.GameObjects AddChild(SpriteView = new SpriteView { - MouseFilter = MouseFilterMode.Ignore, Scale = (2, 2), OverrideDirection = Direction.South }); @@ -52,7 +51,6 @@ namespace Content.Client.GameObjects { SizeFlagsHorizontal = SizeFlags.ShrinkCenter, SizeFlagsVertical = SizeFlags.ShrinkCenter, - MouseFilter = MouseFilterMode.Ignore, Stretch = TextureRect.StretchMode.KeepCentered, TextureScale = (2, 2), Visible = false, diff --git a/Content.Client/UserInterface/StatusEffectsUI.cs b/Content.Client/UserInterface/StatusEffectsUI.cs index 2e09c01a2f..e6f0fc044f 100644 --- a/Content.Client/UserInterface/StatusEffectsUI.cs +++ b/Content.Client/UserInterface/StatusEffectsUI.cs @@ -1,4 +1,4 @@ -using Robust.Client.UserInterface; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; namespace Content.Client.UserInterface @@ -14,7 +14,6 @@ namespace Content.Client.UserInterface public StatusEffectsUI() { _vBox = new VBoxContainer(); - MouseFilter = Control.MouseFilterMode.Ignore; AddChild(_vBox); LayoutContainer.SetGrowHorizontal(this, LayoutContainer.GrowDirection.Begin); From 14f6cbb84525882b87b4cba2297eb222fa225e6b Mon Sep 17 00:00:00 2001 From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Date: Tue, 25 Feb 2020 16:52:18 -0800 Subject: [PATCH 03/15] Refactor ContainerButtons to use a StyleClass for formatting instead of typeof --- Content.Client/UserInterface/NanoStyle.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Content.Client/UserInterface/NanoStyle.cs b/Content.Client/UserInterface/NanoStyle.cs index bd5bd73a60..97cdd91310 100644 --- a/Content.Client/UserInterface/NanoStyle.cs +++ b/Content.Client/UserInterface/NanoStyle.cs @@ -307,19 +307,19 @@ namespace Content.Client.UserInterface }), // Regular buttons! - new StyleRule(new SelectorElement(typeof(Button), null, null, new[] {ContainerButton.StylePseudoClassNormal}), new[] + new StyleRule(new SelectorElement(typeof(ContainerButton), new[] { ContainerButton.StyleClassButton }, null, new[] {ContainerButton.StylePseudoClassNormal}), new[] { new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonNormal), }), - new StyleRule(new SelectorElement(typeof(Button), null, null, new[] {ContainerButton.StylePseudoClassHover}), new[] + new StyleRule(new SelectorElement(typeof(ContainerButton), new[] { ContainerButton.StyleClassButton }, null, new[] {ContainerButton.StylePseudoClassHover}), new[] { new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonHover), }), - new StyleRule(new SelectorElement(typeof(Button), null, null, new[] {ContainerButton.StylePseudoClassPressed}), new[] + new StyleRule(new SelectorElement(typeof(ContainerButton), new[] { ContainerButton.StyleClassButton }, null, new[] {ContainerButton.StylePseudoClassPressed}), new[] { new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonPressed), }), - new StyleRule(new SelectorElement(typeof(Button), null, null, new[] {ContainerButton.StylePseudoClassDisabled}), new[] + new StyleRule(new SelectorElement(typeof(ContainerButton), new[] { ContainerButton.StyleClassButton }, null, new[] {ContainerButton.StylePseudoClassDisabled}), new[] { new StyleProperty(ContainerButton.StylePropertyStyleBox, buttonDisabled), }), From 3edfdb8763ba2b5a00daf6d43142d41960060b33 Mon Sep 17 00:00:00 2001 From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Date: Tue, 25 Feb 2020 17:03:46 -0800 Subject: [PATCH 04/15] Refactor CharacterSetupButton into a ContainerButton --- .../UserInterface/CharacterSetupGui.cs | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/Content.Client/UserInterface/CharacterSetupGui.cs b/Content.Client/UserInterface/CharacterSetupGui.cs index 910df07ad4..3f4291deeb 100644 --- a/Content.Client/UserInterface/CharacterSetupGui.cs +++ b/Content.Client/UserInterface/CharacterSetupGui.cs @@ -141,6 +141,7 @@ namespace Content.Client.UserInterface { preferencesManager.CreateCharacter(HumanoidCharacterProfile.Default()); UpdateUI(); + args.Event.Handle(); }; hBox.AddChild(new PanelContainer @@ -179,13 +180,14 @@ namespace Content.Client.UserInterface _charactersVBox.AddChild(characterPickerButton); var characterIndexCopy = characterIndex; - characterPickerButton.ActualButton.OnPressed += args => + characterPickerButton.OnPressed += args => { _humanoidProfileEditor.Profile = (HumanoidCharacterProfile) character; _humanoidProfileEditor.CharacterSlot = characterIndexCopy; _humanoidProfileEditor.UpdateControls(); _preferencesManager.SelectCharacter(character); UpdateUI(); + args.Event.Handle(); }; characterIndex++; } @@ -195,9 +197,8 @@ namespace Content.Client.UserInterface _charactersVBox.AddChild(_createNewCharacterButton); } - private class CharacterPickerButton : Control + private class CharacterPickerButton : ContainerButton { - public readonly Button ActualButton; private IEntity _previewDummy; public CharacterPickerButton( @@ -206,6 +207,10 @@ namespace Content.Client.UserInterface ButtonGroup group, ICharacterProfile profile) { + AddStyleClass(StyleClassButton); + ToggleMode = true; + Group = group; + _previewDummy = entityManager.SpawnEntity("HumanMob_Dummy", MapCoordinates.Nullspace); _previewDummy.GetComponent().UpdateFromProfile(profile); var humanoid = profile as HumanoidCharacterProfile; @@ -216,16 +221,8 @@ namespace Content.Client.UserInterface var isSelectedCharacter = profile == preferencesManager.Preferences.SelectedCharacter; - ActualButton = new Button - { - SizeFlagsHorizontal = SizeFlags.FillExpand, - SizeFlagsVertical = SizeFlags.FillExpand, - ToggleMode = true, - Group = group - }; if (isSelectedCharacter) - ActualButton.Pressed = true; - AddChild(ActualButton); + Pressed = true; var view = new SpriteView { From ae5924072fd6b2497bae0bcb04f0abf29178d492 Mon Sep 17 00:00:00 2001 From: Swept Date: Fri, 6 Mar 2020 19:08:02 +0000 Subject: [PATCH 05/15] I can see clearly now (#778) * Updates and crafting recipe * Updated descriptions --- .../Prototypes/Construction/structures.yml | 64 ++++++- .../Prototypes/Entities/buildings/walls.yml | 3 + .../Prototypes/Entities/buildings/windows.yml | 12 +- .../Textures/Buildings/rwindow.rsi/full.png | Bin 0 -> 575 bytes .../Textures/Buildings/rwindow.rsi/meta.json | 165 +++++++++++++++++- .../Textures/Buildings/window.rsi/full.png | Bin 0 -> 366 bytes .../Textures/Buildings/window.rsi/meta.json | 165 +++++++++++++++++- 7 files changed, 400 insertions(+), 9 deletions(-) create mode 100644 Resources/Textures/Buildings/rwindow.rsi/full.png create mode 100644 Resources/Textures/Buildings/window.rsi/full.png diff --git a/Resources/Prototypes/Construction/structures.yml b/Resources/Prototypes/Construction/structures.yml index 15dbd08963..459fb5f2f7 100644 --- a/Resources/Prototypes/Construction/structures.yml +++ b/Resources/Prototypes/Construction/structures.yml @@ -19,7 +19,7 @@ - material: Metal amount: 2 reverse: - tool: Welder + tool: Wrench - type: construction name: Table @@ -33,3 +33,65 @@ steps: - material: Metal amount: 2 + +- type: construction + name: Window + id: window + category: Structures + description: Clear. + icon: + sprite: Buildings/window.rsi + state: full + objecttype: Structure + result: window + placementmode: SnapgridCenter + steps: + - material: Glass + amount: 2 + +- type: construction + name: Low Wall + id: low_wall + category: Structures + description: A low wall used for mounting windows. + icon: + sprite: Buildings/low_wall.rsi + state: metal + objecttype: Structure + result: low_wall + placementmode: SnapgridCenter + steps: + - material: Metal + amount: 2 + icon: Buildings/wall_girder.png + reverse: + tool: Wrench + + - material: Metal + amount: 2 + reverse: + tool: Wrench + +- type: construction + name: Rein Window + id: rwindow + category: Structures + description: Clear but tough. + icon: + sprite: Buildings/rwindow.rsi + state: full + objecttype: Structure + result: rwindow + placementmode: SnapgridCenter + steps: + - material: Glass + amount: 2 + reverse: + tool: Wrench + +# Should be replaced with Metal Rods when someone puts them in. + - material: Metal + amount: 2 + reverse: + # Should be replaced with Wirecutter when someone makes it work. + tool: Wrench diff --git a/Resources/Prototypes/Entities/buildings/walls.yml b/Resources/Prototypes/Entities/buildings/walls.yml index 5bd0e7f08c..92af17e090 100644 --- a/Resources/Prototypes/Entities/buildings/walls.yml +++ b/Resources/Prototypes/Entities/buildings/walls.yml @@ -13,8 +13,10 @@ - type: Sprite netsync: false drawdepth: Walls + - type: Icon state: full + - type: Collidable shapes: - !type:PhysShapeAabb @@ -26,6 +28,7 @@ - type: Occluder sizeX: 32 sizeY: 32 + - type: SnapGrid offset: Center diff --git a/Resources/Prototypes/Entities/buildings/windows.yml b/Resources/Prototypes/Entities/buildings/windows.yml index 279dbd654c..fefb671a8b 100644 --- a/Resources/Prototypes/Entities/buildings/windows.yml +++ b/Resources/Prototypes/Entities/buildings/windows.yml @@ -2,6 +2,10 @@ id: window name: Window description: Don't smudge up the glass down there. + placement: + mode: SnapgridCenter + snap: + - Window components: - type: Clickable - type: InteractionOutline @@ -13,7 +17,7 @@ - type: Icon sprite: Buildings/window.rsi - state: window0 + state: full - type: Collidable shapes: @@ -30,10 +34,6 @@ - type: Window base: window - placement: - snap: - - Wall - - type: entity id: rwindow name: Reinforced Window @@ -48,4 +48,4 @@ - type: Icon sprite: Buildings/rwindow.rsi - state: rwindow0 + state: full diff --git a/Resources/Textures/Buildings/rwindow.rsi/full.png b/Resources/Textures/Buildings/rwindow.rsi/full.png new file mode 100644 index 0000000000000000000000000000000000000000..b54c1e59b7b03f071edd209b65ef8c3e106e16ae GIT binary patch literal 575 zcmV-F0>J%=P)1t>K}hhDkaI~u4S^#Ua!nS`M$+gX5IcW}osHPo`4{X33oAQGbq5C`w~fap z1jAxs*kp~DI}c27EcW)un%Udg&D!N{hW+N7cb@N?nbnZ!+4C0wynnk8e@ex`TxR+c zfE)LM@!y}lxGew4)2s&Y`qj&oy|OX@ckE#H8Y0`Q0#K^u0GQer>^{EDePfThUI?ri zI;VU({zC646Ue7>m+s+r(cbNAvc04LX0IX6^VL9XYG2T7fB)b#>G=QJ>1*9&0m zp}96z|JM}+zWuNelqcwVag;2;Lp&T25R$`6X0=c+}KaVo8(;U}6t=XAiE<+i!c^^N$U%UE5(| z576A30J!c501fYZ!X?zv*Yp93#sYIZ=MIEEH2`xwr)Vs|O&OrmZgF6qV2x(i=9MZ# zI_(yR-ET_1v0p*jQtE&xdsR0pIjH0!vX|D_(e_FJe*0BrjZWyaTYNa~N9INzLD5(! zZ=7UpBtYEieI1xy7uEt;r+QV7YXO$4*W9hxqe>S-0hY-%cMDOT#U5o|$^d@#Nhjr3|d;eSw`eO)5)kt)yRT7p2=>%4*T=@q6fl-q%#(<@9|D6a#rPOr#wff8^z#mASME6#@#09?~*)MM27 zUHn9Cr%C=Z8Y6+_{96L};s}TVd~W^S9_jy$oL5w$1b3~XqN0N222ZhzPgA}1m;e9( M07*qoM6N<$f;)wv-T(jq literal 0 HcmV?d00001 diff --git a/Resources/Textures/Buildings/window.rsi/meta.json b/Resources/Textures/Buildings/window.rsi/meta.json index 906d239759..b3ba878755 100644 --- a/Resources/Textures/Buildings/window.rsi/meta.json +++ b/Resources/Textures/Buildings/window.rsi/meta.json @@ -1 +1,164 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c0293684320e7b70cbcac932b8dddeee35f3a51f/icons/obj/structures/windows.dmi", "states": [{"name": "window0", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window1", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window2", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window3", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window4", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window5", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window6", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "window7", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c0293684320e7b70cbcac932b8dddeee35f3a51f/icons/obj/structures/windows.dmi", + "states": [ + { + "name": "full", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "window0", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "window1", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "window2", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "window3", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "window4", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "window5", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "window6", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "window7", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} From 5747eb5fac0106889ddbc1e39e925c1590b44455 Mon Sep 17 00:00:00 2001 From: PrPleGoo Date: Fri, 6 Mar 2020 20:10:52 +0100 Subject: [PATCH 06/15] =?UTF-8?q?Leather=20gloves=20now=20have=20HeatResis?= =?UTF-8?q?tance=20at=20the=20default=20heat=20of=20bu=E2=80=A6=20(#784)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Leather gloves now have HeatResistance at the default heat of bulbs. * Remove trailing whitespace * Changed Leather gloves to Botanist's leather gloves * Fixed quotes and removed Heat Resistance from glubs --- Resources/Prototypes/Entities/items/clothing/gloves.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/items/clothing/gloves.yml b/Resources/Prototypes/Entities/items/clothing/gloves.yml index a6b84530c3..2a6001bca3 100644 --- a/Resources/Prototypes/Entities/items/clothing/gloves.yml +++ b/Resources/Prototypes/Entities/items/clothing/gloves.yml @@ -456,8 +456,8 @@ - type: entity parent: GlovesBase id: GlovesLeather - name: Leather gloves - description: '' + name: 'Botanist''s leather gloves' + description: 'These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin. They''re also quite warm.' components: - type: Sprite sprite: Clothing/Gloves/leather.rsi @@ -465,6 +465,7 @@ sprite: Clothing/Gloves/leather.rsi - type: Clothing sprite: Clothing/Gloves/leather.rsi + HeatResistance: 1400 - type: entity parent: GlovesBase @@ -776,5 +777,4 @@ - type: Icon sprite: Clothing/Gloves/yellow.rsi - type: Clothing - HeatResistance: 1500 sprite: Clothing/Gloves/yellow.rsi From e17ffbd76fe03a217d72c26bd1fcbe820ba4cec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Aguilera=20Puerto?= <6766154+Zumorica@users.noreply.github.com> Date: Fri, 6 Mar 2020 20:11:24 +0100 Subject: [PATCH 07/15] Adds verb categories (#766) * Adds verb categories * Update Content.Shared/GameObjects/Verbs/Verb.cs Co-Authored-By: Pieter-Jan Briers * Make GetCategory virtual Co-authored-by: Pieter-Jan Briers --- .../GameObjects/EntitySystems/VerbSystem.cs | 60 ++++++++++++++++--- .../GlobalVerbs/ViewVariablesVerb.cs | 2 + .../Components/Chemistry/SolutionComponent.cs | 2 +- .../Components/RotatableComponent.cs | 4 ++ .../GameObjects/EntitySystems/VerbSystem.cs | 4 +- Content.Server/GlobalVerbs/ControlMobVerb.cs | 2 + Content.Server/GlobalVerbs/RejuvenateVerb.cs | 2 + .../VerbSystemMessages.cs | 4 +- .../GameObjects/Verbs/GlobalVerb.cs | 7 +++ Content.Shared/GameObjects/Verbs/Verb.cs | 22 +++++++ 10 files changed, 97 insertions(+), 12 deletions(-) diff --git a/Content.Client/GameObjects/EntitySystems/VerbSystem.cs b/Content.Client/GameObjects/EntitySystems/VerbSystem.cs index 832ea53501..c88bf50150 100644 --- a/Content.Client/GameObjects/EntitySystems/VerbSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/VerbSystem.cs @@ -121,7 +121,7 @@ namespace Content.Client.GameObjects.EntitySystems DebugTools.AssertNotNull(_currentPopup); - var buttons = new List