juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,328 Commits 57 Branches 0 Tags
ed065e8a3dbecb688b8aef1c1d597794de1503ef
Commit Graph

15825 Commits

Author SHA1 Message Date
Nim
a846966515 Slimes can drink fourteenloko (#25889) 
* fourteenloko

* inverse
 2024-03-07 15:50:10 -05:00
PJBot
7b7b8642f5 Automatic changelog update 2024-03-07 19:39:03 +00:00
Alzore
5f61380209 Vegan Meatball (#24650) 
* veganmeatball

* testedthis

* moreplant
 2024-03-07 22:37:57 +03:00
PJBot
5252057144 Automatic changelog update 2024-03-07 19:19:44 +00:00
beck-thompson
4b359466cc Lawdrobe update (#25299) 
* Minor lawdrobe changes

* Updates to advertisements, thank you messages, and emaged / contraband inventory

* Removed the 9th lawdrobe advertisement as it was unused

* Removed soap

---------

Co-authored-by: beck <beck3629@uw.edu>
 2024-03-07 22:18:39 +03:00
PJBot
8d08284e11 Automatic changelog update 2024-03-07 17:55:06 +00:00
Doctor-Cpu
2033dd0337 remove cargo pallet from cargo request (#25882) 2024-03-07 12:53:57 -05:00
shamp
90063db717 Fix body bags sliding under doors (#25325) 2024-03-06 22:35:48 -08:00
Decortex
cef8a17726 ATV resprite (#25885) 
* Delete Resources/Textures/Objects/Vehicles/atv.rsi/vehicle.png

* Add files via upload

* Delete Resources/Textures/Objects/Vehicles/atv.rsi/Vehicle.png.png

* Add files via upload

* Update meta.json

* Update meta.json

* .
 2024-03-07 08:36:00 +03:00
slarticodefast
87c89eacd4 Fix datafield name (#25651) 2024-03-06 18:31:10 -08:00
Mr. 27
2c2be09956 Monkeys can wear all types of masks, not just breath/gas masks (#25816) 
* clown mask real

* Update masks.yml
 2024-03-07 02:02:06 +03:00
PJBot
6da400980b Automatic changelog update 2024-03-06 17:20:07 +00:00
Tayrtahn
56454b6c16 Make flasks fit in dispensers again (#25883) 
Added FitsInDispenser to FlaskBase
 2024-03-06 18:19:01 +01:00
PJBot
4228305b12 Automatic changelog update 2024-03-06 02:04:13 +00:00
Brandon Hu
974c4b9219 adds barber scissors to hristov bundle (#25695) 
bald update

Co-authored-by: Kadeo64 <108914677+Kadeo64@users.noreply.github.com>
 2024-03-06 05:03:07 +03:00
PJBot
72b0889359 Automatic changelog update 2024-03-06 01:45:31 +00:00
PJBot
89831d77a4 Automatic changelog update 2024-03-06 01:43:14 +00:00
PJBot
8e2ebdd121 Automatic changelog update 2024-03-06 01:42:09 +00:00
Арт
2ba28cc3d2 New cloth & hair (#25772) 
* Clothing sprites & meta

* Changing prototypes & sprites

Rename sprites folder, edit prototypes and meta

* Hair_sprites_&_prototype

Add hair sprites and change prototype

* Update meta.json

* Rename added hair

* Revert "Changing prototypes & sprites"

This reverts commit 801cadbdaa90cfb5e7ae43cd7d017e20b40cdc98.

* Revert "Clothing sprites & meta"

This reverts commit 73442163fd8bc8f49207e616b415dc0f26d6ef32.
 2024-03-06 04:42:05 +03:00
PJBot
623aa799a9 Automatic changelog update 2024-03-06 01:40:53 +00:00
I.K
091332787e Update wideswing rotations (#25868) 
* Added appropriate wideAnimationRotation fields to items that needed it

* Modified some wideAnimationRotation
 2024-03-06 12:40:03 +11:00
Ko4ergaPunk
0ab4acedeb Post light update (#25814) 
* penis

* done
 2024-03-06 04:39:47 +03:00
PJBot
be1864939e Automatic changelog update 2024-03-06 01:38:29 +00:00
Froffy025
8e8156a6a7 Add water to water tiles. (#25825) 
* update

* rename tank to pool. bigger arbitrary #. remove bad copy paste part.
 2024-03-06 04:37:24 +03:00
PJBot
55cebb3b56 Automatic changelog update 2024-03-06 01:37:10 +00:00
Ps3Moira
8a154d3fd7 Separate Certain Walls (#25674) 
Separate Walls
 2024-03-06 12:36:04 +11:00
Pieter-Jan Briers
d385c1bb23 Paper save button, back to ctrl+enter save. (#25870) 
* Revert "Change keybindings for paper (#25853)"

This reverts commit 4b56996fcd.

* Add a save button to the paper editing UI instead.
 2024-03-06 12:35:26 +11:00
PJBot
b5066dc4c6 Automatic changelog update 2024-03-06 01:34:26 +00:00
lzk
907403759c Allow livestock and artifact crate to go under plastic flaps (#25862) 2024-03-06 04:33:20 +03:00
deepdarkdepths
d3b981f354 Fixes glowsticks being unable to be inserted into trashbags (#25863) 
Glowstick now garbo
 2024-03-06 02:29:02 +01:00
PJBot
d938763242 Automatic changelog update 2024-03-06 01:18:55 +00:00
deepdarkdepths
7e9c3b8814 Adds paramedic cap to the uniform printer (#25861) 
Update lathe+clothing.yml
 2024-03-06 12:17:50 +11:00
PJBot
9036e59ee8 Automatic changelog update 2024-03-06 00:27:05 +00: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
Jay
b66bad25ca Add nutribricks to other survival boxes (#25749) 2024-03-05 13:01:41 -08:00
PJBot
35d0d0b59a Automatic changelog update 2024-03-05 20:59:01 +00:00
Whisper
4d0ec65f35 the bladed flatcap (#25780) 2024-03-05 12:57:54 -08:00
Brandon Hu
4b56996fcd Change keybindings for paper (#25853) 
fix: sane keybindings?
 2024-03-05 18:19:14 +11:00
PJBot
926b1407f6 Automatic changelog update 2024-03-05 04:35:24 +00:00
PJBot
7d841d4df1 Automatic changelog update 2024-03-05 03:14:56 +00:00
Emisse
5a77e523c1 resave europa (#25848) 
europa
 2024-03-04 16:52:58 -07:00
PJBot
1e8b683c5b Automatic changelog update 2024-03-04 23:52:19 +00:00
Lawdog
f4754febb1 Shot glass max volume decrease (#25847) 
Lower Volume
 2024-03-04 16:51:12 -07:00
Emisse
79b1c0e26d resave origin (#25846) 
origin update
 2024-03-04 16:41:08 -07:00
Emisse
40fb39e7d1 resave fland (#25845) 
fland update
 2024-03-04 16:29:08 -07:00
Ed
bdcf144442 Frozen hydroponic dungeon (#25837) 
+dungen
 2024-03-04 16:13:34 -07:00
PJBot
163a527483 Automatic changelog update 2024-03-04 22:37:13 +00:00
Nairod
7944badd00 Lathe-able Welding Masks (#25842) 
* Lathe-able Welding Masks

* Fix Composition Tests
 2024-03-05 09:36:06 +11:00
lzk
da9775709b Suffix for boxes of hugs (#25829) 2024-03-05 00:45:45 +11:00
Ed
ace8285440 Mineshaft (#25733) 
* content

* catwalks

* fix fucking icons

* finish PR

* +1 room

* fix
 2024-03-03 23:32:33 -07:00