From ae5924072fd6b2497bae0bcb04f0abf29178d492 Mon Sep 17 00:00:00 2001 From: Swept Date: Fri, 6 Mar 2020 19:08:02 +0000 Subject: [PATCH 1/4] 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 2/4] =?UTF-8?q?Leather=20gloves=20now=20have=20HeatResista?= =?UTF-8?q?nce=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 3/4] 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