Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync
# Conflicts: # .github/CODEOWNERS # Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs # Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs # Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs # Resources/Prototypes/Entities/Effects/chemistry_effects.yml # Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml # Resources/Prototypes/GameRules/meteorswarms.yml # Resources/Prototypes/Procedural/dungeon_configs.yml
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 720 B After Width: | Height: | Size: 696 B |
|
Before Width: | Height: | Size: 519 B After Width: | Height: | Size: 510 B |
@@ -5,7 +5,7 @@
|
||||
"y": 32
|
||||
},
|
||||
"license": "CC-BY-NC-SA-3.0",
|
||||
"copyright": "Taken from https://github.com/goonstation/goonstation at commit e77d85d9c1d93aa32da7702737ceeac2b56738ac, slightly modified by PixelTK",
|
||||
"copyright": "Taken from https://github.com/goonstation/goonstation at commit e77d85d9c1d93aa32da7702737ceeac2b56738ac, slightly modified by PixelTK, ID slots made by YoungThugSS14",
|
||||
"states": [
|
||||
{
|
||||
"name": "back"
|
||||
@@ -79,9 +79,6 @@
|
||||
{
|
||||
"name": "inventory"
|
||||
},
|
||||
{
|
||||
"name": "pda"
|
||||
},
|
||||
{
|
||||
"name": "web"
|
||||
}
|
||||
|
||||
|
Before Width: | Height: | Size: 442 B After Width: | Height: | Size: 491 B |
|
Before Width: | Height: | Size: 491 B |
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 744 B |
|
Before Width: | Height: | Size: 116 B After Width: | Height: | Size: 410 B |
|
Before Width: | Height: | Size: 126 B After Width: | Height: | Size: 417 B |
|
Before Width: | Height: | Size: 126 B After Width: | Height: | Size: 420 B |
|
Before Width: | Height: | Size: 119 B After Width: | Height: | Size: 415 B |
@@ -1,8 +1,7 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github)",
|
||||
|
||||
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github)",
|
||||
"size": {
|
||||
"x": 8,
|
||||
"y": 8
|
||||
@@ -172,9 +171,11 @@
|
||||
},
|
||||
{
|
||||
"name": "MindShield",
|
||||
"delays":
|
||||
[
|
||||
[1.0,1.0]
|
||||
"delays": [
|
||||
[
|
||||
1.0,
|
||||
1.0
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
|
||||
55
Resources/Textures/Interface/Nano/circular_arrow.svg
Normal file
@@ -0,0 +1,55 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
width="16"
|
||||
height="16"
|
||||
viewBox="0 0 16 16"
|
||||
version="1.1"
|
||||
id="svg1"
|
||||
sodipodi:docname="circular_arrow.svg"
|
||||
inkscape:version="1.4 (e7c3feb100, 2024-10-09)"
|
||||
inkscape:export-filename="circular_arrow.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="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg">
|
||||
<defs
|
||||
id="defs1" />
|
||||
<sodipodi:namedview
|
||||
id="namedview1"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:showpageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pagecheckerboard="0"
|
||||
inkscape:deskcolor="#d1d1d1"
|
||||
inkscape:zoom="36.59352"
|
||||
inkscape:cx="7.6926188"
|
||||
inkscape:cy="5.4927758"
|
||||
inkscape:window-width="1916"
|
||||
inkscape:window-height="1052"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="24"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="svg1" />
|
||||
<path
|
||||
style="fill:none;stroke:#ffffff;stroke-width:1.88594;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path1"
|
||||
sodipodi:type="arc"
|
||||
sodipodi:cx="7.9993391"
|
||||
sodipodi:cy="7.9987197"
|
||||
sodipodi:rx="6.5130019"
|
||||
sodipodi:ry="6.5130019"
|
||||
sodipodi:start="0"
|
||||
sodipodi:end="5.4159597"
|
||||
sodipodi:open="true"
|
||||
sodipodi:arc-type="arc"
|
||||
d="M 14.512341,7.9987197 A 6.5130019,6.5130019 0 0 1 9.4003633,14.359248 6.5130019,6.5130019 0 0 1 2.0890911,10.73517 6.5130019,6.5130019 0 0 1 4.0555857,2.8154772 6.5130019,6.5130019 0 0 1 12.212891,3.0323148" />
|
||||
<path
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.942969px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="M 12.014511,2.7028302 C 11.498189,3.2130834 9.1989617,4.6865508 9.1989617,4.6865508 L 14.507321,5.8461445 13.605416,0.58932093 c 0,0 -1.074584,1.60325607 -1.590905,2.11350927 z"
|
||||
id="path2"
|
||||
sodipodi:nodetypes="zcccz" />
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.1 KiB |
BIN
Resources/Textures/Interface/Nano/circular_arrow.svg.96dpi.png
Normal file
|
After Width: | Height: | Size: 449 B |
@@ -0,0 +1,2 @@
|
||||
sample:
|
||||
filter: true
|
||||
|
Before Width: | Height: | Size: 599 B After Width: | Height: | Size: 591 B |
|
Before Width: | Height: | Size: 243 B After Width: | Height: | Size: 330 B |
|
Before Width: | Height: | Size: 501 B After Width: | Height: | Size: 465 B |