cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-07 14:50:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,167 Commits 8 Branches 26 Tags
488fdf85eccdfc61c7f1c212bc9d285a04594de8
Commit Graph

396 Commits

Author SHA1 Message Date
Unknown
bed3322ca2 Final Fixes 2021-02-07 20:17:05 -05:00
Unknown
7b416d5448 Compatibility tweaks 2021-02-07 20:05:13 -05:00
Novacat
c71d37c0e9 Update recipes_microwave.dm 2021-02-06 21:11:29 -05:00
Novacat
6cca2aef01 Update recipes_grill.dm 2021-02-06 20:56:36 -05:00
Novacat
0be390cf22 Update recipes_fryer.dm 2021-02-06 20:56:00 -05:00
Novacat
00873bc0b5 Update recipes_grill.dm 2021-02-06 20:53:54 -05:00
Novacat
2a7bb0dceb Update oven.dm 2021-02-06 20:52:35 -05:00
Schnayy
94a1966f3a Absurd Amount of Food Fixes 2021-02-06 20:21:02 -05:00
Unknown
6bdcc1c239 Virgo 3B update 2021-02-02 10:00:01 -05:00
Cerebulon
974bcbd3a8 Renamed a meme + cinnamon bun sprite. (#7840) 
* Filth + Graffiti Fixes

* Gigpuddied

* death to changes
 2021-01-25 20:28:04 -05:00
Schnayy
6597643ffc Merge pull request #7822 from H0lySquirr3l/master 
Adds Chicken noodle soup
 2021-01-24 19:39:00 -05:00
H0lySquirr3l
450d977937 Update recipes_microwave.dm 2021-01-23 10:26:25 -06:00
H0lySquirr3l
70b9f05da6 Update snacks.dm 2021-01-23 10:25:46 -06:00
Silver
9a3869d338 Adding New Foods 
Adds the Following Foods:
Gigapuddi
Happy Gigapuddi
Angry Gigapuddi
Omurice
Heart Omurice
Face Omurice
Suppermatter
Suppermatter Slice
Exciting Suppermatter
Exciting Suppermatter Slice
Cinnamon Bun

Also adds the following Festive Foods:
Buche de Noel
Turkey
 2020-11-13 21:58:33 -06:00
Verkister
d771a57663 Merge pull request #9288 from VOREStation/upstream-merge-7701 
[MIRROR] Adds the Frostbelle
 2020-11-08 19:04:32 +02:00
Atermonera
983790fa6d Merge pull request #7701 from Mechoid/Frostbelle 
Adds the Frostbelle
 2020-11-07 15:20:42 -05:00
Mechoid
019926cbc7 Fresh Meat, Leatherworking 2020-11-07 15:08:04 -05:00
Verkister
750868ed4e Merge pull request #9240 from VOREStation/upstream-merge-7732 
[MIRROR] Makes the recipe dump take catalysts into account
 2020-10-18 15:34:11 +03:00
Verkister
2cf4d38b66 Merge pull request #9233 from VOREStation/upstream-merge-7723 
[MIRROR] Makes the recipe dump take coatings into account
 2020-10-18 15:31:08 +03:00
Verkister
0ed639054d Merge pull request #9228 from VOREStation/upstream-merge-7711 
[MIRROR] fix infinite ratburgers
 2020-10-18 15:28:58 +03:00
Meghan-Rossi
4c9a63bec1 Makes the recipe dump take catalysts into account (#7732) 
Makes the recipe dump provide information on catalysts needed for food and drink recipes.
 2020-10-17 06:14:40 -04:00
Meghan-Rossi
78fa0c490a Makes the recipe dump take coatings into account (#7723) 
Makes the recipe dump provide information on coatings needed for food recipes.
 2020-10-17 02:11:25 -04:00
Meghan-Rossi
91b19a9407 fix infinite ratburgers (#7711) 
fixes https://github.com/PolarisSS13/Polaris/issues/7709 (mice used in mouse burgers not being used up)
 2020-10-17 02:06:07 -04:00
Riley
14e1243a87 Drink addons and sprites 2020-10-16 05:40:14 -04:00
Atermonera
7729934492 Merge pull request #7690 from Mechoid/Berry 
Berry
 2020-09-26 17:00:01 -04:00
Novacat
41c8e4a671 Merge pull request #9032 from VOREStation/upstream-merge-7475 
[MIRROR] Hydro upkeep
 2020-09-21 19:42:43 -04:00
Novacat
e72d810c31 Update _appliance.dm 2020-09-21 13:54:40 -04:00
Novacat
23d0b9a699 Update _appliance.dm 2020-09-21 13:54:02 -04:00
Cerebulon
95ff8c2080 Tweaks to pickup/equip sounds. 2020-09-20 06:57:07 -04:00
Mechoid
68a37c64fa Hydro upkeep 2020-09-16 19:40:41 -04:00
listerla
becef24a2c carot -> carrot (#7612) 2020-09-05 09:28:43 -04:00
ShadowLarkens
c32f05e1f7 TGUI Civilian 
UI's Converted:
 - Aurora Cooking
 - Chaplain Book Selection
 - ColorMate
 - Cryo Storage
 - Holodeck
 - Jukebox
 - Looking Glass
 - Microwave
 - Newscasters
 - Timeclock
 - Vending Machine Improvements
 2020-09-02 13:32:42 -07:00
Cerebulon
7c57c7c0bd Vendor enhancement fixes (#7577) 
* Vendor enhancement fixes

* skrellsnax trash, tuna name
 2020-08-30 02:49:00 -04:00
Novacat
28c19ee066 Merge pull request #8868 from VOREStation/upstream-merge-7571 
[MIRROR] Colony Director -> Site Manager
 2020-08-28 13:17:58 -04:00
Novacat
f6e61ea8f1 Merge pull request #8658 from Rykka-Stormheart/shep-dev-ambience-additions 
Massive Ambience and Sound Overhaul + Addition
 2020-08-28 00:47:23 -04:00
Novacat
46ae945283 Merge pull request #8871 from VOREStation/upstream-merge-7575 
[MIRROR] Make it so beer bottles are filled. No longer get scammed!
 2020-08-28 00:21:41 -04:00
Atermonera
f426b13bde Merge pull request #7575 from lbnesquik/Kot-Beer-IS-FOR-MEN 
Make it so beer bottles are filled. No longer get scammed!
 2020-08-27 21:31:30 -04:00
Atermonera
21c1b12ef1 Colony Director -> Site Manager 2020-08-27 20:43:04 -04:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Atermonera
dcd6ae56ca Merge pull request #7550 from Khloross/cookingfix 
Fix combinination_cook() creating items with no reagents
 2020-08-27 19:46:28 -04:00
Killian
afaa0e650c ChewMAX Bar Fix (#7540) 
* Update robotics.dm

* Update scanner.dm

* Update snacks.dm
 2020-08-26 03:49:29 -04:00
Novacat
a6efe9acbb Merge pull request #8756 from VOREStation/upstream-merge-7449 
[MIRROR] Flavour Enhancement: Vending
 2020-08-21 13:32:37 -04:00
Novacat
4dc293b831 Merge pull request #8784 from VOREStation/upstream-merge-7521 
[MIRROR] Adds metamorphic pint glasses to RSF, autolathe, supply packs
 2020-08-21 01:42:13 -04:00
Atermonera
4a6d87c3a5 Merge pull request #7521 from Meghan-Rossi/metapint 
Adds metamorphic pint glasses to RSF, autolathe, supply packs
 2020-08-21 01:28:23 -04:00
Atermonera
0ebcca246e Merge pull request #7518 from Meghan-Rossi/borgcookfix 
Fix cyborgs not being able to cook
 2020-08-21 01:25:40 -04:00
Atermonera
1e9e8c2c60 Flavour Enhancement: Vending 2020-08-20 21:25:31 -04:00
Riley
4b5a2c60d2 Merge remote-tracking branch 'origin/clara-dev-pink-moo-drink' into clara-dev-pink-moo-drink 2020-08-13 04:11:14 -04:00
Riley
80bc172478 Merge remote-tracking branch 'VORE_MASTER/master' into clara-dev-pink-moo-drink 2020-08-13 04:08:40 -04:00
Novacat
e4b5b8ea2d Merge pull request #8661 from ShadowLarkens/med_pass_2 
TGUI Medical: Second Pass
 2020-08-12 20:01:12 -04:00
Atermonera
194056340e Merge pull request #7447 from Cyantime/patch-3 
Gives NOREACT flag back to fixed microwaves
 2020-08-12 14:23:19 -04:00