Я скучаю так очень, забери меня срочно

This commit is contained in:
Remuchi
2024-03-28 00:13:42 +07:00
parent 1076530ad8
commit fa18556a8f
34 changed files with 246 additions and 304 deletions

View File

@@ -1,11 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
<<<<<<<< HEAD:Resources/Textures/White/Fluff/DOOMMAX/cap_cap.rsi/meta.json
"copyright": "Made by Gargarien for DOOMMAX",
========
"copyright": "Sprited by Hülle#2562 (Discord), resprite by icekot8",
>>>>>>>> ae3d745430e3c5250d19553429e7cda2b8050d10:Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/meta.json
"size": {
"x": 32,
"y": 32

View File

@@ -11,11 +11,7 @@
"name": "icon"
},
{
<<<<<<<< HEAD:Resources/Textures/White/Fluff/HSKveez/hardsuit.rsi/meta.json
"name": "equipped-OUTERCLOTHING",
========
"name": "equipped-INNERCLOTHING",
>>>>>>>> ae3d745430e3c5250d19553429e7cda2b8050d10:Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/meta.json
"directions": 4
},
{

View File

@@ -11,11 +11,7 @@
"name": "icon"
},
{
<<<<<<<< HEAD:Resources/Textures/White/Fluff/Vtergot/strictgloves.rsi/meta.json
"name": "equipped-HAND",
========
"name": "equipped-BELT",
>>>>>>>> ae3d745430e3c5250d19553429e7cda2b8050d10:Resources/Textures/Clothing/Belt/emt.rsi/meta.json
"directions": 4
},
{