Cherry picks 6 (#486)
* inital * force them to WRITE * b * new system * aaaa * b * bbbb * translations * add tts support for evacuation reason * PaddedStool_Sprite&Prototype 8 colors of pudded stool. * PaddedStool_Crafting * ComfyChair_Sprites&Prototype * ComfyChair_Crafting * Sofa_Sprites&Prototype * Sofa_Crafting * Sofa_SpriteFix * Sofa_RemoveSomeSprites * Revert "Sofa_RemoveSomeSprites" This reverts commit b110e9bda9a75cf6337c4efacd4888967d0e1fe6. * Revert "Sofa_SpriteFix" This reverts commit bfa8a17c16c57d2f70d64eb8dd54ae94ac48b248. * Revert "Sofa_Crafting" This reverts commit 89daadcb1e9d45a84281a5fdf998ab6c6f6b0f9b. * Revert "Sofa_Sprites&Prototype" This reverts commit 73cd0be403e03b1852a4632e1b6a8ca7526c5622. * Revert "ComfyChair_Crafting" This reverts commit 940f9665dd998090b43bca596ef3800c0c6ba89b. * Revert "ComfyChair_Sprites&Prototype" This reverts commit 2c909de5d3e3f4ab5efa1cbef6b5feda32d05a80. * Revert "PaddedStool_Crafting" This reverts commit 82040ba82c0190f2a52614fd3573e77586d73802. * Revert "PaddedStool_Sprite&Prototype" This reverts commit c5241a03ffeccbb4a18ab0f108d05c4fe1e047ba. * Sprites&Meta * Crafting * Tweaks * PaddedStool_tweaks * Add Random Spawners * remove old colored chairs * Sprites&Meta * Changing prototypes * Adding to Theater vend * Sprite_Change * Sprite_Change * Prototype_Changes Is this exactly how it should be?... * add bouquet * Not very useful functionality has been removed * Update toys.yml * Now you need cloth to made bouquet * Update toys.yml * I hope. I done right * Update toys.yml * Update bouquet.yml * Update toys.yml * Update Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> * add musician jumpskirt to loadouts * better bouquet * pAIs can now be inserted into plushies. * No more bad bleed * More Tourniquets, hopefully fixed YML check. * deals a bit of bloodloss * Reduce Stack Count. * fix tourniquet * add migrations for old chair types and add few new --------- Co-authored-by: Mr. 27 <koolthunder019@gmail.com> Co-authored-by: Арт <123451459+JustArt1m@users.noreply.github.com> Co-authored-by: Green resomi <135062489+Yeah-I-listening-Hollywood-undead@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: Moomoobeef <moomoobeef@protonmail.com> Co-authored-by: PoorMansDreams <andyroblox14@gmail.com>
This commit is contained in:
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 567 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
@@ -1,103 +1,108 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278, meat.png is CC0-1.0 by EmoGarbage404 (github) for Space Station 14. chair.png and its derrivatives taken from shiptest at commit https://github.com/shiptest-ss13/Shiptest/commit/f761c784812e827960a66cd10aac17ebc6edfac3, palette for chair.png, steel-bench.png and chair-greyscale.png taken from paradise equivalent chairs at commit https://github.com/ParadiseSS13/Paradise/commit/5ce5a66c814c4a60118d24885389357fd0240002, steel by SonicHDC, brass chair.png taken from tgstation at https://github.com/tgstation/tgstation/blob/b7e7779c19b76449c290aaf2150fb93545b1a79a/icons/obj/chairs.dmi, wooden bench by Ko4erga (discord)",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "bar",
|
||||
"directions": 4
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278, meat.png is CC0-1.0 by EmoGarbage404 (github) for Space Station 14. chair.png and its derrivatives taken from shiptest at commit https://github.com/shiptest-ss13/Shiptest/commit/f761c784812e827960a66cd10aac17ebc6edfac3, palette for chair.png, steel-bench.png and chair-greyscale.png taken from paradise equivalent chairs at commit https://github.com/ParadiseSS13/Paradise/commit/5ce5a66c814c4a60118d24885389357fd0240002, steel by SonicHDC, brass chair.png taken from tgstation at https://github.com/tgstation/tgstation/blob/b7e7779c19b76449c290aaf2150fb93545b1a79a/icons/obj/chairs.dmi, pufi-greyscale pufi-greyscale-overlay comfy-greyscale comfy-overlay-greyscale sprited by github:DreamlyJack(624946166152298517)",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
{
|
||||
"name": "bar-knocked",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "chair",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "chair-knocked",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "chair-greyscale",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "chair-greyscale-knocked",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "comfy",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "comfy-overlay",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "meat",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "office-dark",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "office-white",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "shuttle",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "shuttle-overlay",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "stool",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "stool-knocked",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "wooden",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "wooden-bench",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "wooden-wings",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "wooden-wings-knocked",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "ritual",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "cursed",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "steel-bench",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "brass_chair",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
"states": [
|
||||
{
|
||||
"name": "bar",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "bar-knocked",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "chair",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "chair-knocked",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "chair-greyscale",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "chair-greyscale-knocked",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "meat",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "office-dark",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "office-white",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "shuttle",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "shuttle-overlay",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "stool",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "stool-knocked",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "wooden",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "wooden-wings",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "wooden-wings-knocked",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "ritual",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "cursed",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "steel-bench",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "brass_chair",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "pufi-box-greyscale"
|
||||
},
|
||||
{
|
||||
"name": "comfy-greyscale",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "comfy-random"
|
||||
},
|
||||
{
|
||||
"name": "pufi-box-random"
|
||||
},
|
||||
{
|
||||
"name": "wooden-bench",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 346 B |
Binary file not shown.
|
After Width: | Height: | Size: 862 B |
Reference in New Issue
Block a user