cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,453 Commits 6 Branches 0 Tags
f656dd6dfb6f67e81cb155535f0e26af6b6c58f3
Commit Graph

299 Commits

Author SHA1 Message Date
Atermonera
223fb23423 Merge pull request #6811 from Schnayy/mwsprites 
Deluxe microwave sprites work
 2020-03-12 03:21:45 -04:00
Cerebulon
80f7f3afb2 Adds more machine button sounds (#6802) 
* Adds more machine button sounds

* chang
 2020-03-11 20:32:06 -04:00
Atermonera
d39b10b144 Merge pull request #6803 from Schnayy/CookingUpdate1 
Cooking adjustments
 2020-03-10 18:41:02 -04:00
Novacat
f63fa398b9 Update thecake.dm 2020-03-03 16:15:54 -05:00
Schnayy
7bee18a2d7 Let them finally eat cake 2020-03-03 15:57:10 -05:00
Atermonera
7f5f8daf1b Merge pull request #6774 from Schnayy/spritefix-march 
Sprite fixes
 2020-03-03 01:47:45 -05:00
Novacat
65c9b4087f Merge pull request #6627 from VOREStation/aro-carafes 
Adds carafes and pitchers
 2020-03-01 10:52:28 -05:00
Novacat
b44f8e0911 Merge pull request #6592 from VOREStation/vchat-rebase 
VChat: Redone chat output in Vue.js
 2020-03-01 10:51:29 -05:00
Atermonera
d116feb648 Merge pull request #6747 from Neerti/pigs_in_blanket 
Changes Pigs in a Blanket recipe
 2020-02-26 21:02:34 -05:00
Atermonera
c1fe64ba6a Merge pull request #6717 from LeighKnapenberger/master 
Fixes Mint Apple Sparkle having a recipe, but no drink
 2020-02-24 16:00:57 -05:00
Atermonera
11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Aronai Sieyes
55790864bd Adds carafes and pitchers 
Also adds them to the bartender vendor.
 2020-02-20 22:17:32 -05:00
Arokha Sieyes
1d9e5be122 Replace \image macro with bicon() 2020-02-19 19:55:01 -05:00
Arokha Sieyes
d5b820fc58 VChat: Redone chat output in Vue.js 
Co-authored-by: Leshana <Leshana@users.noreply.github.com>
 2020-02-19 19:55:01 -05:00
Novacat
4f4a29b5fc Merge pull request #6568 from VOREStation/stream 
Remove use of <<
 2020-02-14 09:34:12 -05:00
Heroman3003
718feb1ebe Adds pineapple pizzabox (#6682) 2020-02-13 17:11:43 -05:00
Atermonera
cae97cf4c0 Merge pull request #6659 from Darlantanis/MetamorphicPintGlas 
Metamorphic Pint Glass
 2020-02-13 00:31:59 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Novacat
33c13b4a28 Merge pull request #6551 from Heroman3003/pizza-un-nerf 
Undoes unnecesary nerfs on pizzas
 2020-02-10 00:48:02 -05:00
Heroman
292a403d6a Undoes unnecesary nerfs on pizzas 2020-02-10 10:01:02 +10:00
Atermonera
c9e3257d17 2020 Civilian Wing Overhaul 2020-02-08 13:56:05 -05:00
Atermonera
4e523c9b5e Merge pull request #6649 from Trexdude/patch-1 
Fixes Bagel Poppy Recipe
 2020-01-25 22:16:18 -05:00
Schnayy
98d0b5a2bc Adds drink sprites for missing ones. Replaces lemonade to match the other -ade drinks. (#6644) 2020-01-23 23:52:12 -05:00
Novacat
0679ed4042 Merge pull request #6481 from VOREStation/upstream-merge-6632 
[MIRROR] Move Microwave recipes to their own subtype of the recipe datum.
 2020-01-21 01:44:50 -05:00
Novacat
ae5fe87e38 Update microwave.dm 2020-01-21 01:36:15 -05:00
Novacat
1688d86772 Merge pull request #6478 from VOREStation/upstream-merge-6621 
[MIRROR] Moar descriptions for things
 2020-01-21 01:33:06 -05:00
Unknown
c6a709b5e4 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-6632 2020-01-21 01:28:43 -05:00
Unknown
f163a60eed Updoot 2020-01-21 01:24:28 -05:00
Novacat
c72899c7e6 Update microwave.dm 2020-01-21 01:13:37 -05:00
Atermonera
f7da338790 Move Microwave recipes to their own subtype of the recipe datum. 2020-01-21 00:35:38 -05:00
Atermonera
d10a72a77f Adds a mega cooking recipe 2020-01-20 23:15:01 -05:00
Atermonera
9b93339969 Moar descriptions for things 2020-01-20 22:50:39 -05:00
Ketrai
28eb142141 Adds a recipe for food cubes 2020-01-08 19:45:49 +01:00
Ketrai
c8531c827f Fixed conflicts. Adds water bottle to the machine coz logic. 2020-01-07 23:07:50 +01:00
Ketrai
9112a9a2b6 Food cubes 
woop


removes a line of unneeded code
 2020-01-07 22:51:12 +01:00
Novacat
f2fb0d9f6a Merge pull request #6360 from Ketrai/sharksbranch 
Adds a new fish, measelsharks!
 2019-12-29 15:11:46 -05:00
Ketrai
15c1c45b34 Makes it so you can use sharkmeat for fish-dishes 2019-12-23 17:57:13 +01:00
Cerebulon
183b1d99b1 Coffee Shop Revamp 2019-12-22 22:54:01 -05:00
Ketrai
0e65a0b8a6 Adds sharks 2019-12-22 17:32:49 +01:00
TheFurryFeline
9c830286ef Food Trash Fixy 
Helllloooo? Roast beef's on a plate, not a hecking tray! Fixing the resulting trash.

Changelog notes: 
- Changes Roast Beef trash to a plate, not waffles.
 2019-11-30 15:23:55 -05:00
Atermonera
a45472b446 Update Chat System to use to_chat(src, "") instead of src << "" 2019-11-05 19:22:38 -05:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Unknown
9fbb5c247e Glucose Container 2019-10-13 16:14:59 -04:00
Heroman
d82c986d0a Makes sushi require fish meat 2019-09-20 05:59:16 +10:00
Unknown
853f3964a3 Pathing errors 2019-08-31 00:57:37 -04:00
Unknown
9467621800 Fixes some errors 2019-08-31 00:35:19 -04:00
Unknown
0d73c8ad76 Early Polaris Ports 
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434

No vorestation edit markings because they are polariscode ports.
 2019-08-30 23:55:58 -04:00
Mechoid
ae48659a68 Exploration Expansion 1: Or, How I Learned To Love The Tree 2019-08-21 17:23:07 -04:00
Heroman
4dc79f669e Ports early fixes 2019-08-19 10:00:46 +10:00
Atermonera
0469a309cc Adds NOCONDUCT to Some Items 2019-08-08 16:07:50 -04:00