tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,254 Commits 3 Branches 5 Tags
d2a1eae2d994fa79ff6b2fb4b0f9dd12c9d0116b
Commit Graph

99 Commits

Author SHA1 Message Date
cool dolphin
a34ee7c300 Add delicious mopwata (#23740) 
* added delicious mopwata

* added mopwata, the reagent

* fixed issues, changed color, added more possible fills
 2024-01-08 19:24:32 -07:00
Ubaser
172fcaf2d4 Rename Goldschläger to Gildlager (#23223) 
* add

* fix

* catalog

* migration

* conflicts..

* uh

* test

* m

* fix fr

* line?

* beg

* suffering

* um

* fix

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-01-07 02:34:15 +11:00
Velcroboy
ff75b1be56 Salami does melee dmg (#23041) 
* Add melee dmg to salami

* Bump up dmg to 6, 1 more than a punch

* Add in-hand and wielded sprites, and adjust swing angle

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
 2023-12-27 19:59:14 -07:00
Velcroboy
a4ed13af4a Remove duplicate milks (#22721) 
* Remove duplicate milks

* Migration

* Inventories

* Guidebook

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
 2023-12-18 15:51:39 -07:00
themias
e7de7fa075 Add fill layers to Hot Cocoa drink (#22419) 2023-12-12 17:01:24 -07:00
IProduceWidgets
b279f5c910 Jar now fills (#22384) 
* Jar

* jar rsi
 2023-12-12 00:54:15 -07:00
Nim
460bfdc73c Space cobra 1.1 (#20298) 
* space cobra again

* didn't see

* fix

* Dirty

* space spider

* license

* component

* sprite update

* visibility

* fix

* fix visibility
 2023-12-06 20:25:57 -05:00
DoubleRiceEddiedd
33fb768791 New mutation species plant, Lemoon Tree (#22023) 
* Adding Lemoon as lemon's mutation

* Adding lemoon cake

* remove tag that forget to delete
 2023-11-30 16:44:23 -05:00
Ubaser
de601208ea Add metamorphic "Blood" sprite (#21596) 
* add

* forgot to remove

* maybe fix
 2023-11-28 00:09:55 -07:00
Velcroboy
808555ade6 Adds slices for banana cream pie and mime tart (#21043) 2023-11-19 12:15:02 -08:00
phunnyguy
c92b99f6ba Tortilla dough, Taco shells, and Tacos (#20797) 
LGTM!
 2023-10-18 14:03:23 -07:00
deltanedas
6af7c90b73 make tinned foods use openable (#19884) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-10-06 17:35:32 -07:00
deltanedas
0d22d2d1f2 rouny meat and steak (#20526) 
* lost friendship flavor

* add rouny steak

* rouny special meat

* rouny meat textures

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-28 00:07:08 -04:00
Арт
0c9c68027a Added corn in butter (#19448) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-09-20 19:51:08 +10:00
Velcroboy
1de23dc4d0 Adds Ganja Brownies (#19222) 2023-09-06 21:21:14 -04:00
potato1234_x
149e58d30a revamp getmore inventory (#19372) 2023-08-23 17:49:25 -04:00
Tollhouse
8dedabbb8f Dan's Soaked Smokes (#19150) 
* Added all the basics I think I needed for the basic cigs to show up in vendors and game. Need to implement the randomizer to grab varied chems from a list.

* Forgot a png

* Smokes work just need sprite work and random

* First pass on random cigs

* Cigarettes are named now just randomization left

* Finished on my end.

* Whoops

* Nutrient is not availiable for smokes I guess?

* Testing fixes

* Dunno found this on the filledbookshelf might work here?

* I dont know what Im doing wrong but I think this might work.

* Trying with orgroups in the pack YAML

* It seems to not like the food chems. Commented them out.

* THC is also a no go. Also increased storage size of pack to total pool. Given the low prob should still should never hit max volume.

* I have a sneaky suspicion its the size of the container and pool of fill items.

* Messed with the size of the cigarrettes so they all have a chance to fit and the size of box stays consistent.

* Apparently non whole number size is a no go.

* Cartons were to small and added maxamount on cigarettes.

* Amount: 0 caused odd errors. removed and changed maxamount to 2.

* Reworked randomization system to try and use weightedRandom instead of prob in storageFill

* Wrong weightedRandom

* Rework of a rework. Good on my end. Simplified the randomization to bare minimum.

* Added gas station dick pill vibe to all the names.
 2023-08-15 18:27:18 -06:00
Interrobang01
3457729ba4 Added Mustard (#18930) 2023-08-09 19:38:36 -06:00
SpaceCat
fc4c964e61 adds champagne (#18344) 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
 2023-07-28 17:54:36 +02:00
OctoRocket
0d2bf9d23c [Add] Adds HoS Flask (#18268) 
* [Add] Adds HoS fask

* Added flask base
 2023-07-27 13:41:33 -06:00
potato1234_x
ee8407f8c3 nukie drink more like, uh, cringe (#18349) 2023-07-26 20:17:22 -06:00
deathride58
a32fbb37ce Chevre and chevre accessories - Adds chevre, crostini, and chevre chaud to the game (#17968) 2023-07-11 21:00:30 -06:00
Jessetriesagain
9a12aade93 Simple Tweak to Ale Sprite to look more like a type of Ale (#17757) 
Co-authored-by: Jessepretendstocode <j14527998@gmail.com>
 2023-07-03 15:34:26 -06:00
Slava0135
9c976d517e Add space lube tube (#17387) 2023-06-27 22:48:06 -04:00
lzk
335ee13caf Taco! (#17635) 2023-06-26 13:05:07 +10:00
SonicHDC
7c609c913e Dumplings (#16966) 2023-06-15 12:45:30 +10:00
Slava0135
e554958be6 Add space glue tube (#16600) 2023-05-20 12:42:38 +10:00
Jackal298
ed05998f4c Changeling Sting Sprites Update (#16620) 
I updated the sprites for the changeling sting
 2023-05-19 14:11:25 -06:00
deltanedas
22088f693b manly dorf is now like oily oaf (#16349) 2023-05-13 08:14:56 -04:00
Velcroboy
74c1a17888 Removes duplicate fortune cookie (#16304) 
Co-authored-by: Jeff <velcroboy333@hotmail.com>
 2023-05-11 00:20:27 +10:00
deltanedas
21166406d8 condiment rework (#16247) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-05-10 21:36:47 +10:00
potato1234_x
c2a5ca96e8 TG Station Burgers (#15217) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-05-06 17:43:09 +10:00
potato1234_x
aded6efc0a TG Station Bread (#15234) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-05-06 17:41:32 +10:00
lapatison
1a466388c1 [Frozen] Soups tweaks (#15110) 
Co-authored-by: Moony <moony@hellomouse.net>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-05-06 17:36:33 +10:00
Floofi
982ab015f3 The Martinez drink from cyberpunk 2077 (#15421) 
* added 'The Martinez' drink made with 1 ice, 1 lemon juice, 2 vodka, and 2 cola
---------
 2023-05-03 18:23:43 -04:00
iller_saver
369bdcc3d1 New smokable: Vape! (#13072) 2023-05-02 00:34:11 +10:00
potato1234_x
24e6088dd7 Salt & Pepper Shakers (#15808) 2023-04-29 18:42:44 +10:00
keronshb
0f7e7da450 Ratvarian Language and CogChamp (#15639) 2023-04-29 18:34:19 +10:00
Puro
4443850de3 [Drink] Robust nukie drink (#15051) 
* [Drink] Robust nukie drink

only syndie.

* [desc]grammar fix

* [Meta] newline at the end
 2023-04-03 00:42:37 -06:00
lapatison
ccbf8b5748 Watermelon and grapes (#14587) 2023-03-25 08:15:21 -04:00
potato1234_x
51778afe6f TG Vending Machines + Tweaks (#14703) 
* d

d

* engivend misalignment

* sustenance vendor

* Revert "sustenance vendor"

This reverts commit 2f4fb47df4529e93b7fc69da1b7a10e8a7c9f2c2.

* shamblers juice

* pwrgame

* most food/drink machines

* robotech deluxe, centdrobe and some restock boxes

* copyright + salv vend

* tweaks

* restock box + more tweaks

* yaml linter fail

* divide vendor contents

* divide contents 2
 2023-03-24 02:54:47 -06:00
adamsong
980c3ef799 Improved solution container visuals (#13791) 2023-03-23 14:49:42 +11:00
lapatison
71393c5d19 Soybean and rice plants, tofu, tofu bread recipe (#13989) 2023-03-05 22:52:03 -04:00
Moony
cc0c516e02 Improves bartending with some tweaks. (#14169) 
* Improves bartending with some tweaks.
- Glasses got resprited and now support fill levels.
-

* New glass type and improve shotglass visuals.

* oobsy

* fixes

* get flasked

* flask

* flask

---------

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
 2023-02-18 19:00:31 -06:00
Fluffiest Floofers
adf9ccbe8a Cabbage, Red Onion and related salads. (#14161) 
* Cabbage

That's it, just cabbage.

* Up RestockSeed Cargo price.

2000 -> 2100

* Coleslawn, Caesar and Kimchi.

Requires red onions so I also added it to the list.

* Update Resources/Prototypes/Recipes/Cooking/meal_recipes.yml

Fix kimchi's incorrect name.

Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>

---------

Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
 2023-02-18 17:52:58 -06:00
lapatison
f21534eefa Vinegar, Mayonnaise, Ketchunaise (#13288) 2023-01-20 05:46:42 -08:00
Jackrost
78deed3925 Singulo drink - speed up animation (#13484) 2023-01-15 09:01:14 -04:00
Nemanja
f80cd98c92 mug solution level visuals (#13251) 2023-01-07 19:09:33 -08:00
metalgearsloth
945101e5e4 Fix a bunch of invalid rsi files (#13104) 2022-12-20 09:36:59 +01:00
Pieter-Jan Briers
14f8b4e6d5 Use new validate-rsis for workflow (#12997) 
* Use new validate-rsis for workflow

* A

* Add python deps

* --ignore-installed

* Make it only work on RSI changes again.

* Fix a bunch of RSIs.
 2022-12-20 06:31:17 +01:00