Commit Graph

22 Commits

Author SHA1 Message Date
Velcroboy b8da8dc295 Allow hamster cages to sit on tables (#37953)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2025-11-23 15:22:26 -06:00
pathetic meowmeow fd728fdd08
Early cherrypick of Departmental Economy (#36445) (#3458)
* Departmental Economy (#36445)

* Cargo Accounts, Request Consoles, and lock boxes

* Funding Allocation Computer

* final changes

* test fix

* remove dumb code

* ScarKy0 review

* first cour

* second cour

* Update machines.yml

* review

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
(cherry picked from commit 12b75beeab27f8905d6d3f07b7bbda2cfd859b5e)

* Fix station income instantly accumulating roundstart (#36572)

Fix station money accumulating roundstart

(cherry picked from commit ed3e4c7d4ea82f000ef963e393d01f73484417a9)

* DeltaV departmental economy

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-04-16 22:05:13 +00:00
SpaceRox1244 5702679c3e Adds paper label visuals to closets and lockers (#33318)
* Modifies label sprites and adds label visuals to closets

* Removes redundant GenericVisualizer component
2024-12-07 16:11:25 +00:00
Verm b8e216318c
You can now see paper on crates (with color!) (#26834)
* Implement changes on not-cooked branch

* Made it work

* Fix update appearance calls

* Fix extra indents, clean-up code, fix tests hopefully

* Fix hammy cagecrate

* Fix messing up the yml, add artifact crate specific labels back in

* Visual Studio hates yml, sad

* Seperate the colors for cargonia

* sorry json

* make label move with artifact door

* Apply suggestion changes

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

* Fix remaining crate offsets, add a few for livestock and graves (why are you labeling graves) and coffin label sprites (why are you labeling coffins??)

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
(cherry picked from commit 96ad9002f1d6390bf666c74ddfd871a45a8fe1df)
2024-04-21 21:56:49 +02: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
Emisse 3268ea3d92
plastic hydro crates (#19112) 2023-08-14 02:29:01 -05:00
Emisse b3c8dff61c
o2 crate recolour (#19113)
* o2 crate recolour

* fix inside of box shading
2023-08-14 02:28:53 -05:00
Emisse 603f990f8a
engi crate recolor (#19094) 2023-08-14 00:17:07 -04:00
potato1234_x f4bbe3603d
Add trash carts and janitorial trash carts (#18996)
* everything

* half loot
2023-08-12 13:05:32 -06:00
potato1234_x fbecde1f68
ice (#18985) 2023-08-11 01:28:26 -06:00
Nemanja 9eee1adcb9
The Cratening (#18972)
* so it begins

* The Cratening

* welded sprites
2023-08-10 19:12:38 -05:00
Hyenh ede3e89851
Adds Syndicate Crate (#18497)
* Retextures surplus crates.

* Adds locale name+desc.

* Removes period from ent names.
2023-07-31 14:28:15 -06:00
AjexRose 7ef7fb2096
Retexture of command crate (#18294) 2023-07-25 14:18:01 -06:00
Tunguso4ka 730285290a
coffin and two graves (#18213) 2023-07-23 21:13:10 -06:00
brainfood1183 c99585c94f
Toy Box filled with toys (ready for merge) (#16252) 2023-06-03 13:31:47 +10:00
Chris e6012a3956
Add secure chemistry crates and jugs (#15211) 2023-04-24 09:53:17 +10:00
potato1234_x 41f8b401da
Misc sprite changes (#15011) 2023-04-14 12:43:49 -07:00
brainfood1183 8e817e2b97
pirate content (#11799)
* pirate content

* pirate content

* merge

* merge

* update launchers

* trying to fix launcher error

* merge

* merge

* merge

* fix for launchers

* update to held cannon sprite

* attempt to fix issue

* first updates in long time

* changes mostly to sprites

* more sprite fixes

* more sprite changes

* json fixes

* small update

* new pirate crate

* update

* updae json

* fix eva

* update accent

* fix accentcomp

* improved pirate chest

* accent localized

* station to docks

* modified the pirate ship

* changed pda spawns for firstmate nad piratecaptain to passenger pdas

* fixes

* pirate accent

* removed  spacing in shotgun.yml

* redo accent

* fix

* removed no spawn from helmet hardsuit

* suffix capitalization

* tweaks

* a

* jusdt fixing up the hi and yes which are both replacement and not replacement and replaced.

* pirate accent fixes

* desc fix

---------

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2023-04-09 22:47:40 -07:00
brainfood1183 375ca1e22b
Hamster Pet (GhostRoleMob) (#12813) 2022-12-06 15:28:05 -08:00
Morb cc3f9d631f
Remove yml boilerplate for crates (#11982) 2022-10-22 15:37:27 -07:00
Alex Evgrashin 2d34ded94d
Artifact container (#7822)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2022-04-28 15:03:39 -07:00
Swept 5f9ba812ca
Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00