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

Attempts to fix all physics bugs at once (#3610)

Browse Source 
* Fixed Rack/Shelf

* Fixes bookshelf, bed

* Placeable for beds for bedsheets

* Bunch of Physics changes, ask metalgearsloth about em'

* More modifications

* More

* Other stuff

* Organizes entities yaml a little bit

* Something new

* Fixed, happy with the state of this rn

* A

* A

* Ye

* E

* Done for now...

* Applied Reviws

* Changes

* Fix the robust commit

* Fixes tests?

* E

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
This commit is contained in:
Swept
2021-03-26 01:51:26 +00:00
committed by GitHub
parent 1499468157
commit 29d02a3740
58 changed files with 383 additions and 1108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Resources/Textures/Constructible/Misc/bookshelf.rsi/base.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 154 B

BIN
Resources/Textures/Constructible/Misc/bookshelf.rsi/book-0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 154 B

After

Width:  |  Height:  |  Size: 94 B

BIN
Resources/Textures/Constructible/Misc/bookshelf.rsi/book-1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 257 B

After

Width:  |  Height:  |  Size: 269 B

BIN
Resources/Textures/Constructible/Misc/bookshelf.rsi/book-2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 320 B

After

Width:  |  Height:  |  Size: 355 B

BIN
Resources/Textures/Constructible/Misc/bookshelf.rsi/book-3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 369 B

After

Width:  |  Height:  |  Size: 466 B

BIN
Resources/Textures/Constructible/Misc/bookshelf.rsi/book-4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 384 B

After

Width:  |  Height:  |  Size: 506 B

BIN
Resources/Textures/Constructible/Misc/bookshelf.rsi/book-5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 441 B

After

Width:  |  Height:  |  Size: 617 B

51
Resources/Textures/Constructible/Misc/bookshelf.rsi/meta.json
View File

@@ -1,59 +1,32 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f777c8ddf7a529b002df17909566d5d93b8ad201",
"size": {
"x": 32,
"y": 32,
"license":"CC-BY-SA-3.0",
"copyright":"Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f777c8ddf7a529b002df17909566d5d93b8ad201",
"y": 32
},
"states": [
{
"name": "book-0",
"delays": [
[
1.0
]
]
"name": "base"
},
{
"name": "book-1",
"delays": [
[
1.0
]
]
"name": "book-0"
},
{
"name": "book-2",
"delays": [
[
1.0
]
]
"name": "book-1"
},
{
"name": "book-3",
"delays": [
[
1.0
]
]
"name": "book-2"
},
{
"name": "book-4",
"delays": [
[
1.0
]
]
"name": "book-3"
},
{
"name": "book-5",
"delays": [
[
1.0
]
]
"name": "book-4"
},
{
"name": "book-5"
}
]
}

380
Resources/Textures/Constructible/Misc/furniture.rsi/meta.json
View File

@@ -1,5 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0",
"size": {
"x": 32,
"y": 32
@@ -7,425 +9,101 @@
"states": [
{
"name": "armchair_preview",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"directions": 4
},
{
"name": "bar_chair",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"directions": 4
},
{
"name": "bar_chair_over",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"directions": 4
},
{
"name": "bar_stool",
"delays": [
[
1
]
]
"name": "bar_stool"
},
{
"name": "bed",
"delays": [
[
1
]
]
"name": "bed"
},
{
"name": "chair",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"directions": 4
},
{
"name": "chair_armrest",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"directions": 4
},
{
"name": "chair_padding",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"directions": 4
},
{
"name": "chair_padding_over",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"directions": 4
},
{
"name": "chair_preview",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"directions": 4
},
{
"name": "comfychair_preview",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"directions": 4
},
{
"name": "officechair_dark",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"directions": 4
},
{
"name": "officechair_white",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"directions": 4
},
{
"name": "onestar_chair_grey",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "psychbed"
},
{
"name": "onestar_chair_red",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "psychbed",
"delays": [
[
1
]
]
},
{
"name": "psychbed_padding",
"delays": [
[
1
]
]
"name": "psychbed_padding"
},
{
"name": "shuttle_chair",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"directions": 4
},
{
"name": "stool_base",
"delays": [
[
1
]
]
"name": "stool_base"
},
{
"name": "stool_padded_preview",
"delays": [
[
1
]
]
"name": "stool_padded_preview"
},
{
"name": "stool_padding",
"delays": [
[
1
]
]
"name": "stool_padding"
},
{
"name": "stool_preview",
"delays": [
[
1
]
]
"name": "stool_preview"
},
{
"name": "w_overlay",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"directions": 4
},
{
"name": "wheelchair",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"directions": 4
},
{
"name": "wheelchair_folded",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"directions": 4
},
{
"name": "wooden_chair",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"directions": 4
},
{
"name": "wooden_chair_wings",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"directions": 4
},
{
"name": "shelf",
"delays": [
[
1
]
]
"name": "shelf"
},
{
"name": "rack",
"delays": [
[
1
]
]
"name": "rack"
}
]
}

BIN
Resources/Textures/Constructible/Misc/furniture.rsi/onestar_chair_grey.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 591 B

BIN
Resources/Textures/Constructible/Misc/furniture.rsi/onestar_chair_red.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 591 B