Commit Graph

52 Commits

Author SHA1 Message Date
Quasr
f0512d0e0f Bring sky blue carpet in line with other carpets (#40867)
* add table and curtains as constructables; carpet now in printer

* add textures

* whoops, didn't mean to change that

* textures v2

* add open curtain proto

---------

Co-authored-by: Quasr <~182430031+quasr-9@users.noreply.github.com>
2025-10-16 13:25:39 +00:00
Tao
4821bff941 Fun with cardboard! (#37363)
* learning???

* made card walls work, then made game unlaunchable (:

* Still broken, added notes that I thought of while in bed

* wall, door, table and chair are now bare min functional, yay

* learnt why not to web edit...

* added floors, walls and floors fully complete

* added swords, shields, armour, helmets and arrows

* added funny sound and cleanup small issues

* cleanup

* cleanup

* credited myself

* card to cardboard

* fixed licence issue and meta thingy

* adjusted arrow stam-damage

* made card carpets more regular

* simplified sprite, reduced stam damage

* formatting fixes

---------

Co-authored-by: beck-thompson <beck314159@hotmail.com>
2025-08-06 12:58:07 -04:00
SlamBamActionman
9af0b354e3 Exo Station - Upstream Playtest Version (#33144)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-06-15 12:10:22 -07:00
Xeri Marai
18fa45addd Improve Potted Plant Movability and Availability (#37591)
* Added Purchasable Potted Plant Crate

* Removing some whitespace that made it in elsewhere

* Making Potted Plants Items and pickupable

* Revert Making potted plants not fade

This reverts part of commit a50a7def80c06e5be68a37263306007739952a28.

* Adding self to credits

* Fixing sus spacing
2025-06-05 19:36:31 -04:00
Booblesnoot42
b7dfd60517 Resprite main altars (#35685)
* resprite main altars

* updated meta.json
2025-04-20 17:09:00 -04:00
SeamLesss
a0c78e7b18 Medical Item In-Hand Sprites (#34984)
* Bruizepack fix and Gauze

* tourniquet sprites added

* medipen sprites

* bodybag sprites

* handheld crew moniter sprites

* implanter sprites

* rollerbed sprites

* health analyzer sprite

* bloodpack sprite

* small rollerbed change

* attributuions + spacing fix

* fixed?

* RAAAAAGH ITS DONE

* actually good code

* Update Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/meta.json

* Update Resources/Textures/Objects/Specific/Medical/healthanalyzer.rsi/meta.json
2025-03-19 22:18:01 -04:00
Flareguy
35bc4090c2 Fixes some common iconsmoothing oddities (#32051)
fixes smoothing stuff
2024-09-10 17:20:49 -06:00
Nim
84af71eb7c Golden toilet (#31049)
* golden toilet

* Destructible

* sprite

* fix

* copyright
2024-08-15 13:23:59 -06:00
MilenVolf
c8a72e1aa6 Fix toilet texture & fixture (#28125)
* Fix toilet texture & fixture

Passangers that got stuck between wall and a toilet will thank you

* Fix mask, add layer None
2024-05-19 16:04:55 -06:00
brainfood1183
5f063d2d6d Toilet Upgrade (needs review) (#22133)
* Toilet Draft

* fixes

* toilets now have secret stash to place items in cistern.

* fixes

* plungers now unblock toilets.

* fix sprite

* new sprites and fix

* fixes

* improve seat sprites.

* fix

* removed visualisersystem changed to genericvisualizers

* flush sound for toilets and copyright for toilet sprites.

* fix atrributions

* fixes

* fix datafield flushtime

* sprite improvements

* fixes

* multiple changes

* fix

* fix

* fixes remove vv

* moved stash related functions to secret stash system from toilet.

* fix

* fix

* changes for recent review.

* fix

* fix
2024-03-31 14:21:18 +11: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
OnyxTheBrave
05f282f5ce Changed black carpet texture to correctly align itself. (#26358) 2024-03-23 11:39:40 +03: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
Ed
84cbcb93ca Fancy table (#25562)
* blue

* others

* add white table

* add crafting carpets

* finish carpets

* tags

* crafting

* pip

* finish
2024-02-26 16:11:20 -07:00
Nim
016d35645f Solo bench (#24203)
* solo bench

* price

* fix

* comfy

* 111

* clear
2024-01-23 17:15:48 -05:00
Moomoobeef
c64c98ec1d New sprites for books on bookshelves in order to look less sad. (#22874)
Changed sprites for books on bookshelves, added one missing sprite
2023-12-23 00:34:19 -05:00
Tunguso4ka
911e39f029 Resprited carpet sprites (#22674)
Updated carpet sprites
2023-12-20 22:32:38 -07:00
ERROR404
fe1c301be5 New plant (#22704)
New plant
2023-12-19 21:57:02 -07:00
Nim
d1241c5735 psychologist bed (#22223) 2023-12-08 00:24:34 -05: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
PixelTK
74bd86af2f Arachnid RE-REWORK (#19138)
* tasty silk and webby crates

* winter coat

* fuck

* Move some files around and stuff

* FUCK

* Web closet finished

* what the fuck

* brain empty

* loss

* loss 2

* fuck

* web typing indicators

* minor spelling mistake, I lost.

* hiss

* changed

* And they said "Let's remove pockets", funniest shit I've ever heard.

* 2 seconds of stun

* fuck it we pr

* resprite

* dummy

* arachnid creampie sprite

* different + more "natural" crate sprites

* Webbing suits and webbing dresses.

* and other stuff I forgot to commit.

* and gone.

* no

* Cloth.

* I forgot to commit this? What???

* Eyes.

* Comment trimming

* winter coat resprite
2023-09-04 13:02:54 -07:00
Flareguy
5b9ed564d5 ports shiptest's chair sprites (with paradise's palette) (#19645) 2023-08-29 17:32:32 -06:00
Emisse
5cacc2aa5c make the smaller sinks look good again (#19198)
* make sinks loog good

* meta
2023-08-15 23:44:14 -06:00
PixelTK
f189b73fe5 Arachnid rework (#18631)
* Merge before I fuck up anything again

* craft whitelist

* Sericulture

* Spider

* gone

* quickly fixed

* and coders taketh away

* And we take more away

* sericulture improvements

* arachnid

* better webbed

* OH WAIT

* test fail
2023-08-13 01:38:05 -06:00
Topy
b85c902189 Added sink (#14348) 2023-06-30 18:10:47 -04:00
Nemanja
9946bd1f61 Sheet-meister 2000 (#16686) 2023-06-15 10:49:23 +10:00
Kit0vras
140aa89ba4 usable bookshelf (#15333)
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-05-06 12:20:02 +10:00
brainfood1183
2fba2b18ab Adds Bananium (#14663) 2023-04-29 15:38:09 +10:00
Visne
028b5b1029 Add credit to Tomb of the Unknown Employee sprite (#13652) 2023-01-22 17:57:08 -08:00
metalgearsloth
798a880a82 Fix some more rsis (#13107) 2022-12-20 09:37:34 +01:00
YanehCheck
c9e470e24e Removed a weird offset in closed_toilet_seat_up.png (#11711) 2022-10-05 21:53:41 -05:00
Francesco
a00d180c32 feat: Ports the Tomb of the Unknown Employee (#11664) 2022-10-02 14:26:46 -07:00
Nemanja
5c330dd401 Folding Chairs (#11398)
* folding chair

* rsi moment
2022-09-18 12:47:31 -05:00
Nemanja
1470957e7e Night At The Orchestra [All the Instruments] (#9364) 2022-08-08 12:21:54 +10:00
Deahaka
689b03ce4a Altars add (#9678) 2022-07-15 02:17:26 -07:00
Deahaka
ed0cf3a3b4 Operating table add (#9687) 2022-07-14 19:50:59 -07:00
ChilbroBaggins
ad46c4669a Textures to make lamps mappable to East/West. (#9414)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2022-07-07 11:47:05 -07:00
Peptide90
a3b8c08210 Adds metal and wood counters (#7688) 2022-04-30 14:28:03 -07:00
Rane
5376aed6ea Beds, Medical Beds, Stasis Beds (#6695) 2022-04-15 15:53:52 -07:00
EmoGarbage404
1488c9a4f2 Brass Instruments (#7291) 2022-04-08 14:12:44 -07:00
T-Stalker
8f1ec1a09e Adds dresser, television, and a fireplace (#7327) 2022-03-29 13:17:34 +11:00
Lamrr
b063a57584 Adds a memorial object (#6647)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-02-13 20:20:52 -07:00
Jack Fox
2d2fe12291 Update Keyboards (#6687) 2022-02-13 15:35:56 -07:00
Lamrr
44d2f8066b Adds digital audio workstation. (#6342) 2022-02-04 14:17:09 -07:00
Fishfish458
d0b37c0872 Add cup ramen and sinks (#6403)
Co-authored-by: fishfish458 <fishfish458>
2022-01-31 23:16:49 -07:00
Lamrr
c30e4b36db Adds dog bed and bed construction. (#6263) 2022-01-30 15:47:12 +11:00
Zymem
e9e8c8e1e5 Added cursed chair (#6052) 2022-01-10 20:17:22 -06:00
metalgearsloth
e5e144d99c Rollerbeds (#5681) 2021-12-29 15:57:20 +11:00
AJCM-git
380f5d77f3 More tiles and some cleanup (#5608) 2021-12-11 16:08:33 -07:00