Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Add Alt-click functionality (#4497)

Browse Source 
* Fix ItemSlot Bug

* Add Alt-use Key

* Fix TransferAmount window bug

* Alt-click functionality

* Added AltInteract verbs

* Add new verbs

* verb icons

* Changed Comments

* Change Comments

* Fix disposal verbs

* Changed Get...() to Get...OrNull()

* Changed alt-interact combat behaviour

* Update verb icons

* Inventory interact event

* Add Alt+E secondary binding

* Add alt-z keybinding

* Rename AltUse -> AltActivateItemInWorld
This commit is contained in:
Leon Friedrich
2021-08-22 03:20:18 +10:00
committed by GitHub
parent ad5f7bb71b
commit 486dc6ca62
51 changed files with 748 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
Resources/Textures/Interface/VerbIcons/climb.svg Normal file
View File

@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
version="1"
viewBox="0 0 32 32"
id="svg4"
sodipodi:docname="climb.svg"
width="32"
height="32"
inkscape:version="1.1 (c68e22c387, 2021-05-23)"
inkscape:export-filename="C:\Users\ElectroSR\Documents\GitHub\space-station-14\Resources\Textures\Interface\VerbIcons\pickup.svg.192dpi.png"
inkscape:export-xdpi="192"
inkscape:export-ydpi="192"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<metadata
id="metadata10">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs8">
<symbol
id="UpArrow">
<title
id="title4024">Up Arrow</title>
<path
d="M 36,9 58,31 58,46 42,30 42,62 30,62 30,30 14,46 14,31 z"
style="stroke:none"
id="path4026" />
</symbol>
</defs>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1284"
inkscape:window-height="1081"
id="namedview6"
showgrid="false"
inkscape:pagecheckerboard="true"
inkscape:zoom="22.627417"
inkscape:cx="8.4631843"
inkscape:cy="18.760427"
inkscape:window-x="578"
inkscape:window-y="502"
inkscape:window-maximized="0"
inkscape:current-layer="svg4" />
<use
xlink:href="#UpArrow"
style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:0, 11.00000008;stroke-dashoffset:0;fill-opacity:1"
id="use12482"
x="0"
y="0"
width="100%"
height="100%"
transform="matrix(0.52591705,0,0,0.52591705,-3.0032019,-3.4294343)" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

89
Resources/Textures/Interface/VerbIcons/delete_transparent.svg Normal file
View File

@@ -0,0 +1,89 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
viewBox="0 0 32 32"
version="1.1"
id="svg6"
sodipodi:docname="delete_white.svg"
width="32"
height="32"
inkscape:version="1.1 (c68e22c387, 2021-05-23)"
inkscape:export-filename="C:\Users\ElectroSR\Documents\GitHub\space-station-14\Resources\Textures\Interface\VerbIcons\delete_transparent.svg.192dpi.png"
inkscape:export-xdpi="192"
inkscape:export-ydpi="192"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<metadata
id="metadata12">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs10">
<color-profile
name="Agfa-:-Swop-Standard"
xlink:href="../../../../../../../../../WINDOWS/system32/spool/drivers/color/RSWOP.icm"
id="color-profile1466" />
</defs>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1271"
inkscape:window-height="1272"
id="namedview8"
showgrid="true"
inkscape:pagecheckerboard="true"
showguides="true"
inkscape:guide-bbox="true"
inkscape:zoom="16"
inkscape:cx="11.21875"
inkscape:cy="13.0625"
inkscape:window-x="341"
inkscape:window-y="107"
inkscape:window-maximized="0"
inkscape:current-layer="svg6">
<inkscape:grid
type="xygrid"
id="grid837"
empspacing="4" />
<sodipodi:guide
position="24.91123,3.1839064"
orientation="-0.99756278,0.069774599"
id="guide848" />
<sodipodi:guide
position="6.8635256,3.1839064"
orientation="-0.99830447,-0.058208125"
id="guide850" />
</sodipodi:namedview>
<g
id="g846"
transform="translate(0.99999985,0.4620656)"
style="fill:#ffffff;fill-opacity:1">
<path
id="path2"
style="fill:#ffffff;fill-opacity:1;stroke-width:0.225696"
d="M 11.875975,2.7218408 11.26413,4.2466048 H 3.8056135 L 3.3542233,7.7523717 H 26.645777 L 26.194387,4.2466048 H 18.73587 l -0.611845,-1.524764 z" />
<path
style="fill:#ffffff;fill-opacity:1;stroke-width:0.225696"
d="M 20.609312,9 V 25.675027 H 18.976634 V 9 H 15.704055 V 25.675027 H 14.071152 V 9 H 10.573781 V 25.675027 H 8.9413298 V 9 H 4.7350507 L 5.8742488,28.537934 H 23.898367 L 25.264949,9 Z"
id="path841"
sodipodi:nodetypes="ccccccccccccccccc" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
Resources/Textures/Interface/VerbIcons/delete_transparent.svg.192dpi.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 650 B

3
Resources/Textures/Interface/VerbIcons/delete_transparent.svg.192dpi.png.yml Normal file
View File

@@ -0,0 +1,3 @@
#variant of delete.svg, with transparent background
sample:
filter: true

90
Resources/Textures/Interface/VerbIcons/information.svg Normal file
View File

@@ -0,0 +1,90 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
version="1"
viewBox="0 0 32 32"
id="svg4"
sodipodi:docname="information.svg"
width="32"
height="32"
inkscape:version="1.1 (c68e22c387, 2021-05-23)"
inkscape:export-filename="C:\Users\ElectroSR\Documents\GitHub\space-station-14\Resources\Textures\Interface\VerbIcons\information.svg.192dpi.png"
inkscape:export-xdpi="192"
inkscape:export-ydpi="192"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<metadata
id="metadata10">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs8">
<symbol
id="Information">
<title
id="title622">Information</title>
<circle
cx="36"
cy="36"
r="24"
style="fill:none;stroke-width:6"
id="circle624" />
<path
d="m 27,32 c 0,-5 1,-11 9,-11 4,0 8,3 8,7 0,4 -2,6 -4,7 -2,1 -4,2 -4,5 0,3 0,6 0,6"
style="fill:none;stroke-width:6"
id="path626" />
<rect
x="33"
y="48"
width="6"
height="6"
style="stroke:none"
id="rect628" />
</symbol>
</defs>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1271"
inkscape:window-height="1081"
id="namedview6"
showgrid="false"
inkscape:pagecheckerboard="true"
inkscape:zoom="35.2"
inkscape:cx="13.508523"
inkscape:cy="14.701705"
inkscape:window-x="1119"
inkscape:window-y="319"
inkscape:window-maximized="0"
inkscape:current-layer="svg4" />
<use
xlink:href="#Information"
style="fill:#ffffff;stroke:#ffffff;stroke-opacity:1"
id="use4000"
x="0"
y="0"
width="100%"
height="100%"
transform="matrix(0.48863637,0,0,0.48863637,-1.5909093,-1.5909093)"
inkscape:export-filename="C:\Users\ElectroSR\Documents\GitHub\space-station-14\Resources\Textures\Interface\VerbIcons\information.svg.192dpi.png"
inkscape:export-xdpi="192"
inkscape:export-ydpi="192" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
Resources/Textures/Interface/VerbIcons/information.svg.192dpi.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

2
Resources/Textures/Interface/VerbIcons/information.svg.192dpi.png.yml Normal file
View File

@@ -0,0 +1,2 @@
sample:
filter: true

77
Resources/Textures/Interface/VerbIcons/pickup.svg Normal file
View File

@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
version="1"
viewBox="0 0 32 32"
id="svg4"
sodipodi:docname="pickup.svg"
width="32"
height="32"
inkscape:version="1.1 (c68e22c387, 2021-05-23)"
inkscape:export-filename="C:\Users\Pieter-Jan Briers\Projects\space-station-14\Resources\Textures\Interface\VerbIcons\anchor.svg.96dpi.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<metadata
id="metadata10">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs8">
<symbol
id="UpArrow">
<title
id="title4024">Up Arrow</title>
<path
d="M 36,9 58,31 58,46 42,30 42,62 30,62 30,30 14,46 14,31 z"
style="stroke:none"
id="path4026" />
</symbol>
</defs>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="2560"
inkscape:window-height="1417"
id="namedview6"
showgrid="false"
inkscape:pagecheckerboard="true"
inkscape:zoom="22.627417"
inkscape:cx="8.4852814"
inkscape:cy="18.760427"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="svg4" />
<use
xlink:href="#UpArrow"
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:0, 11;stroke-dashoffset:0"
id="use12482"
x="0"
y="0"
width="100%"
height="100%"
transform="matrix(0.46866551,0,0,0.46866551,-0.87195836,-0.6376256)"
inkscape:export-filename="C:\Users\ElectroSR\Documents\GitHub\space-station-14\Resources\Textures\Interface\VerbIcons\pickup.svg.192dpi.png"
inkscape:export-xdpi="192"
inkscape:export-ydpi="192" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
Resources/Textures/Interface/VerbIcons/pickup.svg.192dpi.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 513 B

2
Resources/Textures/Interface/VerbIcons/pickup.svg.192dpi.png.yml Normal file
View File

@@ -0,0 +1,2 @@
sample:
filter: true

3
Resources/Textures/Interface/hammer_sca;ed.svg.192dpi.png.yml Normal file
View File

@@ -0,0 +1,3 @@
#this is just a copy of hammer.svg, but scaled and adjusted slightly so that it can be used as a right-click context menu icon.
sample:
filter: true

76
Resources/Textures/Interface/hammer_scaled.svg Normal file
View File

@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
version="1"
viewBox="0 0 32 32"
id="svg4"
sodipodi:docname="hammer_scaled.svg"
width="32"
height="32"
inkscape:version="1.1 (c68e22c387, 2021-05-23)"
inkscape:export-filename="C:\Users\ElectroSR\Documents\GitHub\space-station-14\Resources\Textures\Interface\hammer_scaled.svg.192dpi.png"
inkscape:export-xdpi="192"
inkscape:export-ydpi="192"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<metadata
id="metadata10">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs8">
<symbol
id="UpArrow">
<title
id="title4024">Up Arrow</title>
<path
d="M 36,9 58,31 58,46 42,30 42,62 30,62 30,30 14,46 14,31 z"
style="stroke:none"
id="path4026" />
</symbol>
</defs>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="2560"
inkscape:window-height="1417"
id="namedview6"
showgrid="false"
inkscape:pagecheckerboard="true"
inkscape:zoom="22.627417"
inkscape:cx="5.8778251"
inkscape:cy="12.926796"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="svg4" />
<g
transform="matrix(3.1774603,0,0,3.1774603,246.59289,376.58527)"
id="layer1">
<path
id="path34"
d="m -70.236934,-117.55773 -0.861483,0.0297 c -0.04048,0.001 -0.07832,0.0195 -0.105569,0.0503 l -0.102658,0.11563 -0.112713,-0.10822 c -0.03016,-0.0288 -0.06958,-0.044 -0.109802,-0.0429 l -1.723231,0.0593 c -0.345546,0.0119 -0.924454,0.0318 -1.479814,0.65811 -0.555096,0.62585 -0.529432,1.18144 -0.51144,1.58708 0.0029,0.064 0.0426,0.12052 0.100806,0.14295 0.05821,0.0227 0.123296,0.007 0.164571,-0.04 0.827352,-0.93271 1.309423,-0.67016 1.599935,-0.39139 0.241565,0.23159 0.245269,0.55176 0.259557,0.73109 h 1.480872 c 0.0463,-0.33388 0.127,-0.82923 0.259028,-0.9535 l 0.154516,0.14827 c 0.03016,0.0288 0.06959,0.044 0.109802,0.0428 l 1.077119,-0.0371 c 0.04022,-0.002 0.07832,-0.0195 0.105569,-0.0503 l 0.0034,-0.004 c 0.02752,-0.033 0.04022,-0.0765 0.03519,-0.11983 l -0.184679,-1.67522 c -0.0093,-0.0833 -0.07858,-0.14548 -0.159015,-0.14294 z"
style="clip-rule:evenodd;fill:#ffffff;fill-opacity:0.941176;fill-rule:evenodd;stroke-width:0.264583" />
<path
id="path36"
d="m -73.125919,-110.25648 c -0.004,0.22704 0.07726,0.43934 0.242094,0.61087 0.313531,0.32631 0.832379,0.31758 1.157287,-0.0195 0.165365,-0.17174 0.256381,-0.40722 0.249767,-0.64571 l -0.163777,-4.08366 h -1.485371 z"
style="clip-rule:evenodd;fill:#ffffff;fill-opacity:0.941176;fill-rule:evenodd;stroke-width:0.264583" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
Resources/Textures/Interface/hammer_scaled.svg.192dpi.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 812 B