tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,546 Commits 3 Branches 5 Tags
956652e111e30b8efde22eceb51a0e2f9d331c38
Commit Graph

163 Commits

Author SHA1 Message Date
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
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
Galactic Chimp
61f1c8a05c #3898 open sprite field for drink comp (#4235) 
* temp

* #3898 some progress on DrinkCanVisualizer

* Fixed implementation

* Moved drink can sprite layer definition to abstract parent

* Added open drink can sprites

* #3898 - fixes for drink cans' sprite field after merge + moved UpdateAppeareance from DrinkComponent to DrinkSystem

* Update Content.Server/Nutrition/EntitySystems/DrinkSystem.cs

* #3898 removed obsolete comment

Co-authored-by: Javier Guardia Fernández <DrSmugleaf@users.noreply.github.com>
 2021-10-03 15:56:29 +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
Swept
c55f3fd478 Adds mapped storage for lots of entities + a botanical belt (#4342) 
* Cleans up belt stuff and some sprites

* Tag cleanup and sheathed sword

* Adds plant belt for botany chads and maps it's items

* CE belt, will most likely child it to utility instead

* Merges belt_icon and belt_mob into the same RSI

* Cut out alpha layers for wirecutters

* Added lots of equipped-BELT sprites for various items

* Medical, Janitor, Security, Assault, Chief Engineer, Utility and Botany have mapped storage layers

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2021-07-25 17:21:18 +10: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
Swept
465eaa87d3 Deprecates DrinkFoodVisualizer.cs in favor of SolutionContainerVisualizer.cs (#3876) 
* Initial

* Removes DrinkFoodVisualizer.cs

* Tests
 2021-04-21 21:12:37 +00:00
Pieter-Jan Briers
dc11ebf760 Fix all broken RSI files. 2021-03-09 22:06:17 +01:00
Swept
c9c9d8bdeb Cigarette packs now use StackVisualizer's sprite specifier (#3530) 2021-03-07 20:20:00 +01:00