12 Commits

Author SHA1 Message Date
ThereDrD0
85b86f2026 Revert gersoon (#502)
* Revert "Изменено"

This reverts commit 985048acc6.

* fix naser
2024-07-26 22:06:15 +03:00
Gersoon
2e0704bb13 Изменено (#500)
Ээээааа. Я не туда насрал
2024-07-26 19:40:56 +03:00
Gersoon
985048acc6 Изменено
Тайлы, декали, спрайты
Добавлено
Ебаные горршки и всё ыыа
2024-07-26 18:38:36 +02:00
ThereDrD0
1acc84c21c 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>
2024-07-23 20:37:15 +03:00
Pieter-Jan Briers
89db4409a4 Remove CRLF, enforce with workflow (#26401)
* Check for CRLF in actions workflow

Make emisse weep

* Copy paste bottom text

* I would like to thank StackOverflow for this spite PR.

* Mention file name in message because the workflow tab doesn't display it.

* dos2unix everything
2024-03-24 22:06:17 +01:00
Ko4ergaPunk
909b2aaa2d New wooden furniture (#26182)
* ю

* Fences

* bench, stairs and fence shadow

* small gate desc

* empty

* empty

* destructible

* price fix
2024-03-18 00:18:58 +03:00
MACMAN2003
f0e8695a91 Clockwork structures and furniture (#24673)
* sprites

something something strength and certainty of steel (except this is brass)

* test1

* commas it was commas

* commas and brackets

* LET THERE BE BRASS

* brass-glass-etc-windows-thindows-floors-lattice

* ALL THE STRUCTURES!!

"Which structures did you add?"
"all."

* buyable brass

and on the first day the quartermaster said "let there be brass" and all the cargo techs stopped inve$ting in awe

* Update windoor.yml

i forgor 💀

* Update tiles.ftl

* i hate random capital letters

* linter fix 1

whew, thank god for linters

* fix 2

* maybe this

shot in the dark, idk what the hell i'm doing hopefully this fixes it?

* fix attempt 1

weather to true, maybe the thingy got confused?

* remove clockwork lattice

it's fixed the test fail... but at what cost?

* changes 1

* fix clockwork windoor

* FLOORS

HAHAHA LET THERE BE FLOORS

* try linter fix 1

i love linters they find things i'd never catch myself

* tweaks fixes 1

fixes merge conflict and does more stuff part two later because i'm tired

* tweaks fixes 2

i should probably do this stuff during the day when i have more energy but eh

* Update assembly.yml

* Update chairs.yml

* fix door sprites

somehow the deny_unlit was broken for all the clockwork doors

* fix glass.yml
2024-03-06 03:25:59 +03:00
SonicHDC
6e0466fb25 Bench and fixes (#19748)
* Bench Proto

* Bench sprites

* Update meta.json

* Grammatic fixes

* Update meta.json

* Add files via upload

* Delete Resources/Textures/Structures/Furniture/chairs.rsi/steel-bench-overlay.png

* Meta

* Spaces

Final changes in git web

* Directions fix

Bar and stool fixes

* Final proto fixes

* Physics

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2023-09-09 08:56:10 -04:00
Flareguy
5b9ed564d5 ports shiptest's chair sprites (with paradise's palette) (#19645) 2023-08-29 17:32:32 -06:00
Nemanja
9946bd1f61 Sheet-meister 2000 (#16686) 2023-06-15 10:49:23 +10:00
Zymem
e9e8c8e1e5 Added cursed chair (#6052) 2022-01-10 20:17:22 -06:00
Swept
e34888373a Respriting the codebase (#4820)
* Walls

* Airlocks mostly ported

* Disposal Unit

* Tiles

* Lighting

* Catwalk

* Windows

* Some vending machine work

* More Vending Machines

* Rest of vending machine sprites ported

* Fixes to vending machines

* Tables (This took a lot of work)

* Fixes low walls being required for window smoothing
- Also replaces window damage visualization

* Plasma Window

* APC

* SMES + Reorganized parts.yml

* Furniture and Organization and Removed Shelf

* Renamed seats.yml to chairs.yml

* Dispensers

* Lazy-fixed the glass airlocks

* Don't need this no more

* Tilez

* blue circuit my fucking beloved

* Switches lights to cev one

* Conveyors and Switch

* Reorients lights

* !ALERT! MAP CHANGES !ALERT!

Co-authored-by: Vera Aguilera Puerto <gradientvera@outlook.com>
2021-10-15 11:58:40 +02:00