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

95 Commits

Author SHA1 Message Date
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
Interrobang01
3457729ba4 Added Mustard (#18930) 2023-08-09 19:38:36 -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
lzk
335ee13caf Taco! (#17635) 2023-06-26 13:05:07 +10:00
SonicHDC
7c609c913e Dumplings (#16966) 2023-06-15 12:45:30 +10: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
potato1234_x
24e6088dd7 Salt & Pepper Shakers (#15808) 2023-04-29 18:42:44 +10:00
lapatison
ccbf8b5748 Watermelon and grapes (#14587) 2023-03-25 08:15:21 -04:00
lapatison
71393c5d19 Soybean and rice plants, tofu, tofu bread recipe (#13989) 2023-03-05 22:52:03 -04: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
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
Nemanja
635142aa1c ian fortnite burger (#11435) 2022-09-20 19:16:59 -07:00
CormosLemming
e227f208bc Changes popcorn sprite to have the number fourteen instead of thirteen. (#10134) 2022-07-30 19:56:04 -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
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
Rane
8f860157f7 Vitamins, Protein, new reagents for almost every food, new recipes (#6607) 2022-02-17 18:27:57 -07:00
Peptide90
06bd086ba5 Fix for slime butchering into human meat (#6292) 2022-01-24 23:46:43 +11:00
Michael Phillips
b36c9395d6 Additional Hydroponics vegetables - Chili + Recipes (#5966) 2022-01-05 00:51:22 +11:00
Ygg01
14b401f9b3 Puddle refactor 2: Spillastic boogaloo (#4784) 
* Refactor PuddleComponent

* Move puddle effects into separate RSIs

Basically egg/tomato/powder puddle will be moved into separate
/Textures/Fluids RSIs

* Fix YAML for puddles

* Fix issues sloth pointed out.

* Ensure Puddle Component are properly added when spawned

* Remove unnecessary method init puddle with starting maxVolume

* Addressed ElectroSr comments

* Add Resolves

* Try fix error in ensureSolution

* Puddle unanchoring

* Address some issues with puddles

* Fix continue -> return
 2021-10-27 19:24:18 +11:00
Swept
106a5078de Fixes chocolate/energy bar (#4503) 2021-08-22 00:35:24 +00:00
Swept
9d22869e58 Adds a ton more inhands (#4488) 
* Removed useless loc and added inhands for some lamps

* Adds a ton of inhands to the game

* Actually adds the pill inhand

* Update Resources/Textures/Objects/Misc/utensils.rsi/meta.json

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

* Update Resources/Textures/Objects/Tools/rcd.rsi/meta.json

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
 2021-08-20 05:36:32 +00:00
DmitriyRubetskoy
d10885742b Omnizine and donk-pockets (#4250) 
Co-authored-by: Swept <sweptwastaken@protonmail.com>
 2021-07-03 01:16:21 +00:00
Swept
74d044a4a9 Adds more splat and tweaks PuddleComponent.cs (#3942) 
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
 2021-05-21 00:19:18 +00:00
SweptWasTaken
d45b0a4907 Removes a vestigal plate 2021-05-07 23:28:12 -07:00
Swept
6376e60b78 Massive Food PR (#3436) 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
 2021-05-03 13:17:22 +02:00
Pieter-Jan Briers
dc11ebf760 Fix all broken RSI files. 2021-03-09 22:06:17 +01:00
Swept
a57db85208 Swept commits JSON genocide. (#2991) 
* Clothing Folder Complete

* All Textures 1st Pass

* All Textures 2nd Pass

* All Textures 3rd Pass PLUS Manual Tweaking

* 5th Pass MORE MANUAL

* Fixes flares

* 4th Pass (I skipped over)

* The 6th Pass (Finality) - With Manual Fixes
 2021-01-13 23:04:38 +11:00
mirrorcult
7977992e5a Add kitchen knife & sliceable foods (#2891) 
* sliceable food, kitchen knives

* sprite fixes, sounds

* add to vendor

* address reviews

* address reviews

* stereo -> mono

* fix wrong amount of nutriment being removed

* oops im dumb

* meta.json

* fix merge

* probably fix test

* remove all instances of [ComponentReference(typeof(IAfterInteract))]

Co-authored-by: cyclowns <cyclowns@protonmail.ch>
 2021-01-07 12:48:08 +11:00
Víctor Aguilera Puerto
484eb0bba4 Botany (#2357) 
* plants and seeds go brrrr

* update plants

* P L A N T

* brrrr

* Hydroponics actually work! How about that?

* Reuse resource path in visualizer

* They lied to us.

* Several stuffs

* more werk

* Add a bunch of plants

* Logs go brr.

* Brrr moment.

* Remove unused method

* Important comment.

* Seed inventory, yo!

* tomato moment

* Balance consumption

* Makes hydroponics pourable

* Adds plant metabolism effect for sugar, the same as glucose.

* Eggplant moment

* Apple moment

* Corn moment

* Chanterelle mushroom moment

* prototype tweaks

* Seed extractor moment

* typo

* IPlantMetabolizable doc improvement

* I should trust my gut instinct more often.

* egg-plant.....

* localization

* Make WaterLevel and NutritionLevel setters private

* Less code repetition! Wooo!
 2020-10-26 23:19:46 +01:00
ike709
b1771ff27b oi you got a loicense for that mate? (#1643) 2020-08-11 02:39:49 +02:00
Swept
b7dbd74947 Adds Memory Leek (#1640) 
* It is done

* Fixed attribution
 2020-08-11 01:53:19 +02:00
Víctor Aguilera Puerto
626c8c51a1 Adds slippery items (#1321) 
* Start work on Slippery Component

* Slips work

* Add banana peel

* Add required slip speed

* Add slip sound

* Adds soap

* Make soapnt, soapsyndie and soapdeluxe inherit soap

* Adds homemade soap and omega soap

* Fix slipping not taking into account the entity being in a container
 2020-07-09 17:00:37 +02:00
AJCM-git
ae41d03ec6 Re-organizing the Resources folder. Part 1. (#1234) 
* First commit

* Lockers

* Lockers electric boogaloo

* Crates and Lockers

* Almost finishing the Textures folder

* Updating texture paths. Reminder to fix:
* Lockers
* Windows
* Vending Machines
* APC
* Catwalks
* Bedsheets and Cloaks
* Status effects

* dont know what happened here

* Commit before merge

* re-organizing

* Lockers broken

* Commit before merge

* Submodule

* renaming

* Fixing most issues

* forgot these ones

* Updating submodule

* typo

* Fixing some paths

* fixing some paths

* updating submodule

* (hopefully) fixing the submodule
 2020-07-07 19:19:00 +02:00