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

175 Commits

Author SHA1 Message Date
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
Mervill
07da6ba416 Rename Kahlua to Coffee Liqueur (#12525) 
Closes https://github.com/space-wizards/space-station-14/issues/10486
 2022-11-16 12:59:43 -08:00
Nemanja
635142aa1c ian fortnite burger (#11435) 2022-09-20 19:16:59 -07:00
lapatison
d5f562648b Opened soda can texture fix (#11420) 2022-09-19 16:47:45 -07:00
themias
d36a58dd2e Add visualizer to hot coffee and tea (#11211) 2022-09-11 20:53:48 -07:00
Visne
906edc592d Fix/improve smokeables (#10497) 2022-08-13 22:20:31 -07:00
CormosLemming
e227f208bc Changes popcorn sprite to have the number fourteen instead of thirteen. (#10134) 2022-07-30 19:56:04 -07:00
lapatison
f94e3743b2 Centered shot glass sprite (#9986) 2022-07-23 18:47:02 -07:00
KIBORG04
71c8d08e4c Kvass (#9082) 
* add kvass

* nevermind

* forgot about double 's'

* Update tanks.yml

* gotovo

* Update meta.json
 2022-07-11 23:11:12 -07:00
CrudeWax
c210239f45 Fishy swarmers: Carp content and Space Dragon! (#7395) 
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-06-16 14:14:06 +10:00
ZeroDayDaemon
a8937db9e1 Funny dog mug (#8224) 2022-05-18 11:21:38 -07:00
Pieter-Jan Briers
63b9cd0b92 Adds suppermatter (#7633) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-05-12 19:44:17 +10:00
Peptide90
3b54566e5b Changs chinese food vending machine (#7754) 
* new chinese food items from paradise

* made soy sauce salty

* new snacks based on the new assets

* chang assets 1

* chang vending machine

* rsi animation and fix

* rsi path fix

* misc changes

* fortune cookie snacks complete with fortunes

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml

darn Americans

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2022-05-11 00:17:24 -07:00
EmoGarbage404
d953f88530 MRE boxes (#7726) 2022-04-30 14:24:37 -07:00
EmoGarbage404
6405ac6d9b Corgi Meat Objective (#7304) 2022-03-28 13:52:45 -07:00
Peptide90
ef04d6f513 remove redbull and brown ale copyright (#6801) 2022-02-19 18:07:18 -07:00
Rane
8f860157f7 Vitamins, Protein, new reagents for almost every food, new recipes (#6607) 2022-02-17 18:27:57 -07:00
Peptide90
7de1953c4c replaced nuka cola with nuclear cola (#6379) 2022-01-30 18:10:15 +11:00
Plasmaguy
cee179d078 Root beer, ice cream, and root beer floats (#6334) 2022-01-27 18:33:27 +11:00
Peptide90
06bd086ba5 Fix for slime butchering into human meat (#6292) 2022-01-24 23:46:43 +11:00
Rane
053674645a Added Syndicate Smokes (#6149) 
* Added Syndicate Smokes

* Removed BOM (maybe?)
 2022-01-13 17:06:31 -08:00
Michael Phillips
b36c9395d6 Additional Hydroponics vegetables - Chili + Recipes (#5966) 2022-01-05 00:51:22 +11:00
Peptide90
5d15787b04 Copyright purge (#5788) 2021-12-15 13:43:12 +11:00
Mith-randalf
4ed0b57ea6 Adds open icon for tonic water (#5502) 2021-11-25 12:35:01 +11:00
ZeroDayDaemon
293186b563 Bartending Content & Bug Fixes (#5038) 2021-10-31 14:57:05 +01:00